diff --git a/.editorconfig b/.editorconfig
index 99b0609..9a88a72 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,9 +20,10 @@ csharp_preferred_modifier_order = public, private, protected, internal, file, ne
 csharp_space_after_keywords_in_control_flow_statements = false
 csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_prefer_utf8_string_literals = true:warning
-csharp_style_var_elsewhere = false:none
+csharp_style_var_elsewhere = false:suggestion
 csharp_style_var_for_built_in_types = false:suggestion
-csharp_using_directive_placement = inside_namespace:silent
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_using_directive_placement = outside_namespace:silent
 dotnet_naming_rule.private_constants_rule.import_to_resharper = as_predefined
 dotnet_naming_rule.private_constants_rule.severity = warning
 dotnet_naming_rule.private_constants_rule.style = all_upper_style
@@ -84,6 +85,7 @@ resharper_constructor_or_destructor_body = expression_body
 resharper_csharp_align_first_arg_by_paren = true
 resharper_csharp_empty_block_style = together_same_line
 resharper_csharp_place_comments_at_first_column = true
+resharper_csharp_prefer_qualified_reference = false
 resharper_default_value_when_type_not_evident = default_expression
 resharper_enforce_line_ending_style = true
 resharper_formatter_off_tag = @formatter:off
@@ -121,6 +123,8 @@ resharper_outdent_dots = true
 resharper_outdent_statement_labels = true
 resharper_parentheses_redundancy_style = remove
 resharper_place_attribute_on_same_line = false
+resharper_place_simple_embedded_statement_on_same_line = false
+resharper_qualified_using_at_nested_scope = true
 resharper_show_autodetect_configure_formatting_tip = false
 resharper_simple_block_style = on_single_line
 resharper_simple_case_statement_style = line_break
@@ -138,6 +142,7 @@ resharper_space_within_empty_braces = false
 resharper_toplevel_function_declaration_return_type_style = on_single_line
 resharper_toplevel_function_definition_return_type_style = on_single_line
 resharper_use_indent_from_vs = false
+resharper_wrap_after_dot_in_method_calls = true
 resharper_wrap_base_clause_style = chop_if_long
 resharper_wrap_braced_init_list_style = chop_if_long
 resharper_wrap_ctor_initializer_style = chop_if_long