diff --git a/.editorconfig b/.editorconfig
index d2e5b066..53b779e8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -27,22 +27,60 @@ dotnet_style_qualification_for_property = false:suggestion
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
 
 # ReSharper properties
+resharper_align_multiline_switch_expression = true
+resharper_align_multline_type_parameter_constrains = true
 resharper_blank_lines_after_block_statements = 0
+resharper_blank_lines_after_multiline_statements = 1
+resharper_blank_lines_around_field = 1
+resharper_blank_lines_around_invocable = 1
+resharper_blank_lines_around_single_line_auto_property = 1
+resharper_blank_lines_around_single_line_invocable = 0
+resharper_blank_lines_around_single_line_property = 1
+resharper_blank_lines_around_single_line_type = 0
+resharper_blank_lines_around_type = 1
+resharper_braces_for_lock = not_required
 resharper_csharp_blank_lines_around_field = 0
-resharper_csharp_blank_lines_around_invocable = 0
-resharper_csharp_blank_lines_around_type = 0
+resharper_csharp_blank_lines_around_single_line_invocable = 0
 resharper_csharp_int_align_comments = true
 resharper_csharp_keep_blank_lines_in_declarations = 1
-resharper_csharp_max_line_length = 368
-resharper_csharp_wrap_lines = false
+resharper_csharp_max_line_length = 150
+resharper_csharp_stick_comment = false
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_multiple_type_parameter_constraints_style = chop_always
+resharper_csharp_wrap_parameters_style = chop_if_long
+resharper_indent_anonymous_method_block = false
+resharper_int_align = false
+resharper_keep_existing_declaration_parens_arrangement = false
+resharper_keep_existing_embedded_arrangement = false
+resharper_keep_existing_expr_member_arrangement = false
+resharper_keep_existing_initializer_arrangement = true
+resharper_keep_existing_linebreaks = false
+resharper_keep_existing_property_patterns_arrangement = true
+resharper_keep_existing_switch_expression_arrangement = false
+resharper_max_array_initializer_elements_on_line = 7
+resharper_max_formal_parameters_on_line = 7
+resharper_max_initializer_elements_on_line = 1
+resharper_max_invocation_arguments_on_line = 7
+resharper_nested_ternary_style = compact
+resharper_place_attribute_on_same_line = false
 resharper_place_expr_accessor_on_single_line = true
 resharper_place_expr_method_on_single_line = true
+resharper_place_expr_property_on_single_line = true
 resharper_place_field_attribute_on_same_line = false
+resharper_place_linq_into_on_new_line = false
 resharper_place_simple_embedded_statement_on_same_line = false
-resharper_place_simple_initializer_on_single_line = false
+resharper_place_simple_initializer_on_single_line = true
+resharper_place_simple_switch_expression_on_single_line = true
+resharper_show_autodetect_configure_formatting_tip = false
+resharper_space_around_arrow_op = true
+resharper_space_within_single_line_array_initializer_braces = false
 resharper_use_indent_from_vs = false
-resharper_wrap_array_initializer_style = chop_if_long
-resharper_wrap_object_and_collection_initializer_style = chop_always
+resharper_wrap_array_initializer_style = wrap_if_long
+resharper_wrap_before_arrow_with_expressions = true
+resharper_wrap_chained_method_calls = chop_if_long
+resharper_wrap_object_and_collection_initializer_style = wrap_if_long
+resharper_wrap_switch_expression = chop_if_long
+resharper_wrap_verbatim_interpolated_strings = chop_if_long
 
 # ReSharper inspection severities
 resharper_arrange_redundant_parentheses_highlighting = hint