diff --git a/src/.editorconfig b/src/.editorconfig
index c9db1cb..99a756c 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -134,7 +134,7 @@ csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 resharper_wrap_before_first_type_parameter_constraint = true
-resharper_wrap_extends_list_style =  chop_always
+resharper_wrap_extends_list_style = chop_always
 resharper_wrap_after_dot_in_method_calls = false
 resharper_wrap_before_binary_pattern_op = false
 resharper_wrap_object_and_collection_initializer_style = chop_always
@@ -161,11 +161,12 @@ resharper_braces_for_fixed = required
 resharper_braces_for_for = required
 
 # Xml files
-[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props}]
+[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}]
 indent_size = 2
 # https://www.jetbrains.com/help/resharper/EditorConfig_XML_XmlCodeStylePageSchema.html#resharper_xml_blank_line_after_pi
 resharper_blank_line_after_pi = false
 resharper_space_before_self_closing = true
+ij_xml_space_inside_empty_tag = true
 
 [*.json]
 indent_size = 2
\ No newline at end of file
diff --git a/src/NUnitTests/CalculatorTests.cs b/src/NUnitTests/CalculatorTests.cs
index 29153eb..3349e41 100644
--- a/src/NUnitTests/CalculatorTests.cs
+++ b/src/NUnitTests/CalculatorTests.cs
@@ -17,7 +17,7 @@ public Task Should_Add_Numbers()
 
         // Raise click event on the button:
         window.AddButton.Focus();
-        window.KeyPress(Key.Enter, RawInputModifiers.None);
+        window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None);
 
         Assert.That(window.ResultBox.Text, Is.EqualTo("30"));
         return Verify(window);
diff --git a/src/Shared.sln.DotSettings b/src/Shared.sln.DotSettings
index 500b0d7..b0a1a6f 100644
--- a/src/Shared.sln.DotSettings
+++ b/src/Shared.sln.DotSettings
@@ -36,6 +36,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective_002EGlobal/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceAsyncWithTaskReturn/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateLocalFunctionsWithJumpStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyConditionalTernaryExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralAsInterpolationArgument/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryStatementsCanBeMerged/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">ERROR</s:String>
@@ -151,7 +152,10 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_METHOD_CALL/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/ProtobufCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentSubtags/@EntryValue">RemoveIndent</s:String>
diff --git a/src/XUnitTests/CalculatorTests.cs b/src/XUnitTests/CalculatorTests.cs
index 7596da8..281a7b4 100644
--- a/src/XUnitTests/CalculatorTests.cs
+++ b/src/XUnitTests/CalculatorTests.cs
@@ -17,7 +17,7 @@ public Task Should_Add_Numbers()
 
         // Raise click event on the button:
         window.AddButton.Focus();
-        window.KeyPress(Key.Enter, RawInputModifiers.None);
+        window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None);
 
         Assert.Equal("30", window.ResultBox.Text);
         return Verify(window);