diff --git a/.editorconfig b/.editorconfig
index 0e4f800e0..0ae30cf95 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -57,12 +57,12 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
-dotnet_style_parentheses_in_arithmetic_binary_operators =always_for_clarity:suggestion
-dotnet_style_parentheses_in_other_binary_operators =always_for_clarity:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
-dotnet_style_parentheses_in_other_operators=always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
 dotnet_style_object_initializer = false
 dotnet_style_qualification_for_event = true:suggestion
 dotnet_style_qualification_for_field = true:suggestion
@@ -78,7 +78,7 @@ csharp_space_before_comma = false
 csharp_space_after_keywords_in_control_flow_statements = true
 csharp_space_after_comma = true
 csharp_space_after_cast = false
-csharp_space_around_binary_operators  = before_and_after
+csharp_space_around_binary_operators = before_and_after
 csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = none
@@ -101,7 +101,7 @@ resharper_braces_for_ifelse = required_for_multiline
 resharper_can_use_global_alias = false
 resharper_csharp_align_multiline_parameter = true
 resharper_csharp_align_multiple_declaration = true
-resharper_csharp_empty_block_style = together_same_line
+resharper_csharp_empty_block_style = multiline
 resharper_csharp_int_align_comments = true
 resharper_csharp_new_line_before_while = true
 resharper_csharp_wrap_after_declaration_lpar = true
@@ -133,13 +133,13 @@ resharper_suggest_var_or_type_built_in_types_highlighting = hint
 resharper_suggest_var_or_type_elsewhere_highlighting = hint
 resharper_suggest_var_or_type_simple_types_highlighting = hint
 resharper_unused_auto_property_accessor_global_highlighting = none
-csharp_style_deconstructed_variable_declaration=true:silent
+csharp_style_deconstructed_variable_declaration = true:silent
 
 [*.{appxmanifest,asax,ascx,aspx,axaml,axml,build,c,c++,cc,cginc,compute,config,cp,cpp,cs,cshtml,csproj,css,cu,cuh,cxx,dbml,discomap,dtd,h,hh,hlsl,hlsli,hlslinc,hpp,htm,html,hxx,inc,inl,ino,ipp,js,json,jsproj,jsx,lsproj,master,mpp,mq4,mq5,mqh,njsproj,nuspec,paml,proj,props,proto,razor,resjson,resw,resx,skin,StyleCop,targets,tasks,tpp,ts,tsx,usf,ush,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
 indent_style = space
 indent_size = 4
 tab_width = 4
-dotnet_style_parentheses_in_other_operators=always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
 
 [*.{yaml,yml}]
 indent_style = space