diff --git a/src/.editorconfig b/src/.editorconfig
index c9040640..5f2d7b13 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -50,7 +50,7 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
 
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = always:warning
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
 
 # Expression-level preferences
 dotnet_prefer_system_hash_code = true
@@ -89,7 +89,7 @@ dotnet_style_allow_statement_immediately_after_block_experimental = false:warnin
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = true:suggestion
 csharp_style_var_for_built_in_types = true:warning
 csharp_style_var_when_type_is_apparent = true:warning
 
@@ -219,8 +219,14 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
 dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
 dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 
+dotnet_naming_rule.no_single_letter_names.severity = error
+dotnet_naming_rule.no_single_letter_names.symbols = parameters_and_variables
+dotnet_naming_rule.no_single_letter_names.style = descriptive_names
+
 # Symbol specifications
 
+dotnet_naming_symbols.parameters_and_variables.applicable_kinds = parameter, local
+
 dotnet_naming_symbols.interface.applicable_kinds = interface
 dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.interface.required_modifiers = 
@@ -235,6 +241,9 @@ dotnet_naming_symbols.non_field_members.required_modifiers =
 
 # Naming styles
 
+dotnet_naming_style.descriptive_names.capitalization = camel_case
+dotnet_naming_style.descriptive_names.minimum_word_length = 2
+
 dotnet_naming_style.pascal_case.required_prefix = 
 dotnet_naming_style.pascal_case.required_suffix = 
 dotnet_naming_style.pascal_case.word_separator = 
@@ -277,7 +286,7 @@ dotnet_diagnostic.IDE0003.severity = warning
 dotnet_diagnostic.IDE0004.severity = warning
 
 # IDE0005: Remove unnecessary import
-dotnet_diagnostic.IDE0005.severity = warning
+dotnet_diagnostic.IDE0005.severity = none
 
 # IDE0005_gen: Remove unnecessary import (NotConfigurable)
 #dotnet_diagnostic.IDE0005_gen.severity = silent
@@ -388,7 +397,7 @@ dotnet_diagnostic.IDE0044.severity = warning
 dotnet_diagnostic.IDE0045.severity = warning
 
 # IDE0046: Use conditional expression for return
-dotnet_diagnostic.IDE0046.severity = warning
+dotnet_diagnostic.IDE0046.severity = suggestion
 
 # IDE0047: Remove unnecessary parentheses
 dotnet_diagnostic.IDE0047.severity = warning
@@ -4865,3 +4874,4 @@ dotnet_diagnostic.xUnit3000.severity = warning
 
 # xUnit3001: Classes that implement Xunit.Abstractions.IXunitSerializable must have a public parameterless constructor
 dotnet_diagnostic.xUnit3001.severity = warning
+