diff --git a/HotKeys.sln b/HotKeys.sln
index e3662fa..e66e823 100644
--- a/HotKeys.sln
+++ b/HotKeys.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27307.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotKeysVSIX", "HotKeysVSIX\HotKeysVSIX.csproj", "{F93438EE-344E-478F-9A73-AAD23BE22CB5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardSchemes", "KeyboardSchemes\KeyboardSchemes.csproj", "{1D623713-09DB-4C72-AFFE-CBC59BF14DA1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{F93438EE-344E-478F-9A73-AAD23BE22CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F93438EE-344E-478F-9A73-AAD23BE22CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F93438EE-344E-478F-9A73-AAD23BE22CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D623713-09DB-4C72-AFFE-CBC59BF14DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D623713-09DB-4C72-AFFE-CBC59BF14DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D623713-09DB-4C72-AFFE-CBC59BF14DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D623713-09DB-4C72-AFFE-CBC59BF14DA1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/HotKeysVSIX/CamelHump Nav with VSTricks.vssettings b/HotKeysVSIX/CamelHump Nav with VSTricks.vssettings
new file mode 100644
index 0000000..5cde02e
--- /dev/null
+++ b/HotKeysVSIX/CamelHump Nav with VSTricks.vssettings	
@@ -0,0 +1,41 @@
+<UserSettings>
+  <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
+  <Category name="Environment_Group" RegisteredName="Environment_Group">
+    <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
+      <KeyboardShortcuts Version="8.0">
+        <ScopeDefinitions>
+          <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}"/>
+          <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}"/>
+        </ScopeDefinitions>
+        <!--<ShortcutsSchemeDef Name="CamelHump Navigation">-->
+        <!--</ShortcutsSchemeDef>-->
+        <UserShortcuts>
+
+          <!--Need VSTricks for CamelCase navigation, selection and deletion.-->
+
+          <!--CamelHump navigation and selection (Ctrl key shortcuts)-->
+          <Shortcut Command="Edit.SubWordNext" Scope="Text Editor">Ctrl+Right Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordPrevious" Scope="Text Editor">Ctrl+Left Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordNextExtend" Scope="Text Editor">Ctrl+Shift+Right Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordPreviousExtend" Scope="Text Editor">Ctrl+Shift+Left Arrow</Shortcut>
+          <!--<Shortcut Command="Edit.SubWordNextExtendColumn" Scope="Text Editor">Ctrl+Shift+Right Arrow</Shortcut>  --><!-- Not required. User can release Alt key for part word navigation during box selection mode -->
+          <!--<Shortcut Command="Edit.SubWordPreviousExtendColumn" Scope="Text Editor">Ctrl+Shift+Left Arrow</Shortcut>  --><!-- Not required. User can release Alt key for part word navigation during box selection mode -->
+          <!--Backspace and Delete-->
+          <Shortcut Command="Edit.SubWordDeletetoEnd" Scope="Text Editor">Ctrl+Del</Shortcut>
+          <Shortcut Command="Edit.SubWordDeletetoStart" Scope="Text Editor">Ctrl+Bkspce</Shortcut>
+
+          <!--Create shortcuts for the Full-Word navigation and selection (Ctrl+Alt shortcuts)-->
+          <Shortcut Command="Edit.WordNext" Scope="Text Editor">Ctrl+Alt+Right Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordPrevious" Scope="Text Editor">Ctrl+Alt+Left Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordNextExtend" Scope="Text Editor">Ctrl+Alt+Shift+Right Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordPreviousExtend" Scope="Text Editor">Ctrl+Alt+Shift+Left Arrow</Shortcut>  <!--Invented by JEC-->
+          <!--Create shortcuts for the Full-Word backspace and delete -->
+          <RemoveShortcut Command="View.TaskRunnerExplorer" Scope="Global">Ctrl+Alt+Bkspce</RemoveShortcut>
+          <Shortcut Command="Edit.WordDeleteToStart" Scope="Text Editor">Ctrl+Alt+Bkspce</Shortcut>
+          <Shortcut Command="Edit.WordDeleteToEnd" Scope="Text Editor">Alt+Del</Shortcut>  <!-- Would otherwise use Ctrl+Alt+Del for consistency, but ... well... you konw. ;-) Alt+Del will have to do. -->
+
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/HotKeysVSIX/HotKeysVSIX.csproj b/HotKeysVSIX/HotKeysVSIX.csproj
index 6e01e51..d9d54f1 100644
--- a/HotKeysVSIX/HotKeysVSIX.csproj
+++ b/HotKeysVSIX/HotKeysVSIX.csproj
@@ -48,13 +48,33 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="CamelHump Nav with VSTricks.vssettings">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="EmbeddedVSIX\KeyboardShortcutsManager-v2.1.0.vsix">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="IntelliJ for CSharp.vsk">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="VS Universal.vssettings">
+      <SubType>Designer</SubType>
+    </Content>
+    <None Include="packages.config" />
+    <Content Include="ReSharper %28IDEA style%29.vsk">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="ReSharper %28VS Style%29.vsk">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
+    <Content Include="Visual CSharp 2015.vsk">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <None Include="VS Universal.vsk" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="ReleaseNotes.txt">
@@ -79,6 +99,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.9-beta\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/HotKeysVSIX/HotKeysVSIX.csproj.user b/HotKeysVSIX/HotKeysVSIX.csproj.user
deleted file mode 100644
index 9b86104..0000000
--- a/HotKeysVSIX/HotKeysVSIX.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/HotKeysVSIX/IntelliJ for CSharp.vsk b/HotKeysVSIX/IntelliJ for CSharp.vsk
new file mode 100644
index 0000000..a936ba9
Binary files /dev/null and b/HotKeysVSIX/IntelliJ for CSharp.vsk differ
diff --git a/HotKeysVSIX/ReSharper (IDEA style).vsk b/HotKeysVSIX/ReSharper (IDEA style).vsk
new file mode 100644
index 0000000..59d0d7b
Binary files /dev/null and b/HotKeysVSIX/ReSharper (IDEA style).vsk differ
diff --git a/HotKeysVSIX/ReSharper (VS Style).vsk b/HotKeysVSIX/ReSharper (VS Style).vsk
new file mode 100644
index 0000000..7c8b917
Binary files /dev/null and b/HotKeysVSIX/ReSharper (VS Style).vsk differ
diff --git a/HotKeysVSIX/ReleaseNotes.txt b/HotKeysVSIX/ReleaseNotes.txt
index c079ecc..7604b76 100644
--- a/HotKeysVSIX/ReleaseNotes.txt
+++ b/HotKeysVSIX/ReleaseNotes.txt
@@ -1,6 +1,8 @@
 Hot Keys - Keyboard Shortcuts
 by Justin Clareburt
 12-Jul-2019: v3.0.0 Basic upgrade for VS2019 compatibility. Included VSShortcutManager-v2.1.0
+12-Oct-2018: v2.1.0 Added VS Universal mapping scheme. Also added CamelHump Nav with VSTricks.
+26-Aug-2018: v2.0.7 Added VS2017 Mapping scheme and user shortcuts
 16-Jan-2018: v2.0.2 Added shortcuts for new VS features: Duplicate Text and Expland Selection
 12-Jan-2018: v2.0.1 Embedded Keyboard Shortcuts Manager and supplied IntelliJ and R# VS and IDEA shortcut defs
 12-Aug-2017: v2.0.0 Moved to VSIX instead of MSI
diff --git a/HotKeysVSIX/VS Universal.vsk b/HotKeysVSIX/VS Universal.vsk
new file mode 100644
index 0000000..1f68b91
Binary files /dev/null and b/HotKeysVSIX/VS Universal.vsk differ
diff --git a/HotKeysVSIX/VS Universal.vssettings b/HotKeysVSIX/VS Universal.vssettings
new file mode 100644
index 0000000..4ff5e2b
--- /dev/null
+++ b/HotKeysVSIX/VS Universal.vssettings	
@@ -0,0 +1,552 @@
+<UserSettings>
+  <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
+  <Category name="Environment_Group" RegisteredName="Environment_Group">
+    <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
+      <KeyboardShortcuts Version="8.0">
+        <ScopeDefinitions>
+          <Scope Name="Team Explorer" ID="{7AA20502-9463-47B7-BF43-341BAF51157C}"/>
+          <Scope Name="VC Dialog Editor" ID="{543E0C02-8C85-4E43-933A-5EF320E3431F}"/>
+          <Scope Name="Find All References Tool Window" ID="{1FA1FD06-3592-4D1D-AC75-0B953320140C}"/>
+          <Scope Name="Live Property Explorer" ID="{31FC2115-5126-4A87-B2F7-77EAAB65048B}"/>
+          <Scope Name="XML (Text) Editor" ID="{FA3CD31E-987B-443A-9B81-186104E8DAC1}"/>
+          <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, T-SQL PDW Editor" ID="{C9626B29-6A42-411C-BD76-DAD855C86913}"/>
+          <Scope Name="Work Item Results View" ID="{7026002D-01F6-44E7-95CF-A896C00DA3F8}"/>
+          <Scope Name="ADO.NET Entity Data Model Designer" ID="{C99AEA30-8E36-4515-B76F-496F5A48A6AA}"/>
+          <Scope Name="Solution Explorer" ID="{3AE79031-E1BC-11D0-8F78-00A0C9110057}"/>
+          <Scope Name="Query Designer" ID="{B2C40B32-3A37-4CA9-97B9-FA44248B69FF}"/>
+          <Scope Name="CSharp Editor with Encoding" ID="{08467B34-B90F-4D91-BDCA-EB8C8CF3033A}"/>
+          <Scope Name="WebBrowser" ID="{E8B06F41-6D01-11D2-AA7D-00C04F990343}"/>
+          <Scope Name="CSS Editor" ID="{A5401142-F49D-43DB-90B1-F57BA349E55C}"/>
+          <Scope Name="DataSet Editor" ID="{B334A759-F450-40A5-BE2A-65937BCD5415}"/>
+          <Scope Name="XAML Designer" ID="{E9B8485C-1217-4277-9ED6-C825A5AC1968}"/>
+          <Scope Name="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}" ID="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}"/>
+          <Scope Name="View Designer" ID="{B968E165-98E0-41F0-8FBE-A8ED1D246A90}"/>
+          <Scope Name="XAML Editor" ID="{A4F9FF65-A78C-4650-866D-5069CC4127CF}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, Table Designer" ID="{2366CF66-2394-4701-AFCA-37ED7FD41648}"/>
+          <Scope Name="Microsoft Visual Basic Editor" ID="{2C015C70-C72C-11D0-88C3-00A0C9110049}"/>
+          <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}"/>
+          <Scope Name="HTML Editor" ID="{40D31677-CBC0-4297-A9EF-89D907823A98}"/>
+          <Scope Name="Live Visual Tree" ID="{A2EAF38F-A0AD-4503-91F8-5F004A69A040}"/>
+          <Scope Name="Work Item Query View" ID="{B6303490-B828-410C-9216-AE727D0E282D}"/>
+          <Scope Name="DOM Explorer" ID="{01E50993-E6A4-491E-AB3F-3A9939DE3524}"/>
+          <Scope Name="Team Foundation Build Detail Editor" ID="{86306A97-84F2-4F5A-889B-1318501AEB5F}"/>
+          <Scope Name="Database Designer" ID="{CFF78A9B-78A3-45A3-9142-0267AFC261FA}"/>
+          <Scope Name="Work Item Editor" ID="{40A91D9D-8076-4D28-87C5-5AF9F0ACFE0F}"/>
+          <Scope Name="JSON Editor" ID="{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"/>
+          <Scope Name="CSharp Editor" ID="{A6C744A8-0E4A-4FC6-886A-064283054674}"/>
+          <Scope Name="VC String Editor" ID="{58442DA9-10DA-4AA9-A2AF-96E4D481379B}"/>
+          <Scope Name="Interactive Window" ID="{2D0A56AA-9527-4B78-B6E6-EBE6E05DA749}"/>
+          <Scope Name="Merge Editor Window" ID="{9A9A8AAA-ACD2-4DB6-BD81-8D64176C52B6}"/>
+          <Scope Name="Microsoft Visual Basic Code Page Editor" ID="{6C33E1AA-1401-4536-AB67-0E21E6E569DA}"/>
+          <Scope Name="Settings Designer" ID="{515231AD-C9DC-4AA3-808F-E1B65E72081C}"/>
+          <Scope Name="Windows Forms Designer" ID="{BA09E2AF-9DF2-4068-B2F0-4C7E5CC19E2F}"/>
+          <Scope Name="Markdown Editor" ID="{B3984FB3-6A50-488A-A8A5-1EA6929ADF43}"/>
+          <Scope Name="VC Accelerator Editor" ID="{EB56D0B5-BEE7-4D0C-8BE6-88A8ED256695}"/>
+          <Scope Name="Managed Resources Editor" ID="{FEA4DCC9-3645-44CD-92E7-84B55A16465C}"/>
+          <Scope Name="FSharpEditorFactory" ID="{8A5AA6CF-46E3-4520-A70A-7393D15233E9}"/>
+          <Scope Name="JavaScript Console" ID="{074F1AD9-308B-488C-861E-CF88182E2788}"/>
+          <Scope Name="Difference Viewer" ID="{79D52DDF-52BC-43F1-9663-B3E85CDCA912}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, Schema Compare" ID="{00E9D2E3-9044-47D1-978C-BE2825249219}"/>
+          <Scope Name="Table Designer" ID="{4194FEE5-6777-419F-A5FC-47A536DF1BDB}"/>
+          <Scope Name="HTML Editor Design View" ID="{CB3FCFEA-03DF-11D1-81D2-00A0C91BBEE3}"/>
+          <Scope Name="HTML Editor Source View" ID="{CB3FCFEB-03DF-11D1-81D2-00A0C91BBEE3}"/>
+          <Scope Name="VC Image Editor" ID="{C0BA70ED-069E-412B-9C06-7442E28A11B9}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, T-SQL Editor" ID="{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}"/>
+          <Scope Name="Query Results" ID="{0058A1F7-65F3-4DB9-B3D0-CA7E64DD73CD}"/>
+          <Scope Name="Test Explorer" ID="{E1B7D1F8-9B3C-49B1-8F4F-BFC63A88835D}"/>
+          <Scope Name="XML Schema Designer" ID="{DEE6CEF9-3BCA-449A-82A6-FC757D6956FB}"/>
+        </ScopeDefinitions>
+        <!--<ShortcutsSchemeDef Name="VS Universal">-->
+        <UserShortcuts>
+          <!-- Tool Window Shortcuts -->
+          <!-- All changed from Ctrl+W to Ctrl+\ from base Visual C# 2005-->
+          <!--<Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+\, N</Shortcut>    --><!-- No such thing. View.Notifications uses 'N' -->
+          <!--<Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+\, Ctrl+N</Shortcut>    -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+\, K</Shortcut>    
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+\, Ctrl+K</Shortcut>
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, M</Shortcut>    <!-- Fix add "tfs" to command name -->    <!-- Already in system -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, Ctrl+M</Shortcut>    <!-- Fix add "tfs" to command name -->    <!-- Already in system -->
+          <!--<Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+\, S</Shortcut>-->  <!-- Conflict with SQL Server Explorer -->
+          <!--<Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+\, Ctrl+S</Shortcut>--><!-- Conflict with SQL Server Explorer -->
+          <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+\, P</Shortcut>
+          <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+\, Ctrl+P</Shortcut>
+          <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+\, J</Shortcut>
+          <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+\, Ctrl+J</Shortcut>
+          <!--<Shortcut Command="View.Toolbox" Scope="Global">Ctrl+\, X</Shortcut>    --><!-- Conflict with Cloud Explorer -->
+          <!--<Shortcut Command="View.Toolbox" Scope="Global">Ctrl+\, Ctrl+X</Shortcut>    --><!-- Conflict with Cloud Explorer -->
+          <Shortcut Command="View.ClassView" Scope="Global">Ctrl+\, C</Shortcut>
+          <Shortcut Command="View.ClassView" Scope="Global">Ctrl+\, Ctrl+C</Shortcut>
+          <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+\, L</Shortcut>
+          <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+\, Ctrl+L</Shortcut>
+          <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+\, R</Shortcut>
+          <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+\, Ctrl+R</Shortcut>
+          <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+\, U</Shortcut>
+          <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+\, Ctrl+U</Shortcut>
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+\, T</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+\, Ctrl+T</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+\, E</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+\, Ctrl+E</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+\, A</Shortcut>
+          <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+\, Ctrl+A</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+\, O</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+\, Ctrl+O</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+Alt+O</Shortcut>  <!-- Default -->
+          <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+\, D</Shortcut>
+          <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+\, Ctrl+D</Shortcut>
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+\, Q</Shortcut>
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+\, Ctrl+Q</Shortcut>
+          <!--<Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, B</Shortcut>-->  <!-- Already on Ctrl+Alt+K and Ctrl+K, W. Make room for Background Task Status Center status bar icon. -->
+          <!--<Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Ctrl+B</Shortcut>-->
+          <!--<Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+\, W</Shortcut>    --><!-- Reserve for Window Management menu on status bar (HotWindows) Already on Ctrl+Alt+R -->
+          <!--<Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+\, Ctrl+W</Shortcut>    --><!-- Reserve for Window Management menu on status bar (HotWindows) -->
+          <!--<Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+\, G</Shortcut>-->  <!-- Use this for GitHub instead -->
+          <!--<Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+\, Ctrl+G</Shortcut>-->
+          <Shortcut Command="View.TaskRunnerExplorer" Scope="Global">Ctrl+\, Ctrl+Bkspce</Shortcut>
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Shift+K</Shortcut>  <!--To free Ctrl+K, W for WordWrap-->
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Ctrl+Shift+K</Shortcut>  <!--To free Ctrl+K, W for WordWrap-->
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+Alt+E</Shortcut>  <!-- Invented by JEC for convenience -->
+
+          <!-- Toggle Close Tool Windows -->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Solution Explorer">Ctrl+Alt+L</Shortcut>
+          <Shortcut Command="Window.CloseToolWindow" Scope="Test Explorer">Ctrl+\, Ctrl+Shift+T</Shortcut>   <!--Match with new Test Explorer shortcut (ideally Ctrl+\, Ctrl+T)-->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Test Explorer">Ctrl+\, Shift+T</Shortcut>   <!--Match with new Test Explorer shortcut (ideally Ctrl+\, Ctrl+T)-->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, Ctrl+M</Shortcut>
+          <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, M</Shortcut>  <!-- Toogle alt-chord -->
+
+          <!-- Do we want to use F6 for build (or for NextPane)? -->
+          <!--<Shortcut Command="Build.BuildSolution" Scope="Global">F6</Shortcut>-->
+          <!--<Shortcut Command="Build.BuildSelection" Scope="Global">Shift+F6</Shortcut>-->
+
+          <!-- Debug Window shortcuts. Most of these are currently using Ctrl+Alt+?? shortcuts -->
+          <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+Alt+D, B</Shortcut>
+          <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+Alt+D, W</Shortcut>
+          <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+Alt+D, A</Shortcut>
+          <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+Alt+D, L</Shortcut>
+          <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+Alt+D, I</Shortcut>
+          <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+Alt+D, C</Shortcut>
+          <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+Alt+D, T</Shortcut>
+          <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+Alt+D, M</Shortcut>
+          <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+Alt+D, P</Shortcut>
+          <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+Alt+D, H</Shortcut>
+          <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+Alt+D, V</Shortcut>
+          <!--<Shortcut Command="Debug.Disassembly" Scope="Global">Ctrl+Alt+D, D</Shortcut>   --><!-- Default Ctrl+Alt+D is for Debug.Disassembly -->
+          <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+Alt+D, D</Shortcut>  <!-- Maybe this is a good replacement for Debug.Disassembly -->
+          <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+Alt+D, R</Shortcut>
+          <!--<Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+Alt+D, E</Shortcut>  --><!-- No longer exists -->
+          <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+Alt+D, Q</Shortcut>
+          <!--<Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+Alt+D, N</Shortcut>  --><!-- Replaced by Debug.BreakAtFunction ? -->
+          <Shortcut Command="Debug.FunctionBreakpoint" Scope="Global">Ctrl+Alt+D, N</Shortcut>
+          <!--Parallel windows shortcuts (using Ctrl+Shift+D by default and Ctrl+D in Visual C# 2005 scheme) -->
+          <Shortcut Command="Debug.ParallelStacks" Scope="Global">Ctrl+Alt+D, S</Shortcut>  <!-- Default is Ctrl+Shift+D, D -->
+          <Shortcut Command="Debug.ParallelWatch1" Scope="Global">Ctrl+Alt+D, 1</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch2" Scope="Global">Ctrl+Alt+D, 2</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch3" Scope="Global">Ctrl+Alt+D, 3</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch4" Scope="Global">Ctrl+Alt+D, 4</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.Tasks" Scope="Global">Ctrl+Alt+D, K</Shortcut>  <!-- Debug.ParallelTasks no longer exists. Badly mapped in VS C# 2005 scheme -->
+          <!--Debug Memory shortcuts (1-4 are on Ctrl+Alt+M chord by default)-->
+          <!--<Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Alt+D, Y</Shortcut>-->
+          <!--Create new shortcuts for Debug.Memory and free up the Ctrl+Alt+M shortcut-->
+          <RemoveShortcut Command="Debug.Memory1" Scope="Global">Ctrl+Alt+M, 1</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory2" Scope="Global">Ctrl+Alt+M, 2</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory3" Scope="Global">Ctrl+Alt+M, 3</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory4" Scope="Global">Ctrl+Alt+M, 4</RemoveShortcut>
+          <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Shift+M, 1</Shortcut>
+          <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+1</Shortcut>
+          <Shortcut Command="Debug.Memory2" Scope="Global">Ctrl+Shift+M, 2</Shortcut>
+          <Shortcut Command="Debug.Memory2" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+2</Shortcut>
+          <Shortcut Command="Debug.Memory3" Scope="Global">Ctrl+Shift+M, 3</Shortcut>
+          <Shortcut Command="Debug.Memory3" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+3</Shortcut>
+          <Shortcut Command="Debug.Memory4" Scope="Global">Ctrl+Shift+M, 4</Shortcut>
+          <Shortcut Command="Debug.Memory4" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+4</Shortcut>
+
+          <!-- Refactoring -->
+          <!--These are all default shortcuts - adding them here for clarity-->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, Ctrl+M</Shortcut>
+          <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, Ctrl+E</Shortcut>
+          <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, Ctrl+I</Shortcut>
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, Ctrl+O</Shortcut>  <!-- Seems to be the same as RemoveParameters -->
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, Ctrl+V</Shortcut>  <!-- Seems to be the same as ReorderParameters -->
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, Ctrl+R</Shortcut>
+          <!-- Additional bindings on top of existing default Ctrl/Ctrl chords -->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, M</Shortcut>
+          <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, E</Shortcut>
+          <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, I</Shortcut>
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, O</Shortcut>
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, V</Shortcut>
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, R</Shortcut>
+
+          <!-- Rename in different scopes (Default global F2 = View.EditLabel) -->
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>   <!-- Introduced by JEC. Not in Visual C# 2005 -->
+
+          <!--Introduce new refactoring shortcuts (without chords)-->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+Alt+M</Shortcut>
+          <!--These commands are not exposed in VS yet-->
+          <!--<Shortcut Command="Refactor.ExtractLocalVariable" Scope="Text Editor">Ctrl+Alt+V</Shortcut>-->
+          <!--<Shortcut Command="Refactor.Inline" Scope="Text Editor">Ctrl+Alt+I</Shortcut>-->
+          <!--<Shortcut Command="Refactor.ExtractParameter" Scope="Text Editor">Ctrl+Alt+P</Shortcut>-->
+
+          <!--Re-bind Remove and Sort Usings to Ctrl+R, Ctrl+U-->
+          <RemoveShortcut Command="EditorContextMenus.CodeWindow.RemoveAndSort" Scope="Text Editor">Ctrl+R, G</RemoveShortcut>
+          <Shortcut Command="EditorContextMenus.CodeWindow.RemoveAndSort" Scope="Text Editor">Ctrl+R, Ctrl+U</Shortcut>  <!-- Currently on Ctrl+R, Ctrl+G -->
+          <!--Special treatment: Separate command appears on the Edit->IntelliSense menu. Give it the short-form chord so users can discover the shortcut.-->
+          <Shortcut Command="Edit.RemoveAndSort" Scope="Text Editor">Ctrl+R, U</Shortcut>  <!-- Not bound in default mapping -->
+
+          <!-- Help -->
+          <!-- No need to define chords for help. Only Help.ViewHelp exists and can use default system shortcut Ctrl+F1 -->
+          <!--<Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, M</Shortcut>  --><!-- No such thing in VS2017 -->
+          <!--<Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, Ctrl+M</Shortcut>-->
+          <!--<Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, V</Shortcut>-->
+          <!--<Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, Ctrl+V</Shortcut>-->
+
+          <!-- Code/Design toggle -->
+          <!-- Do we really need these? They seem to be Default Shortcuts when exporting shortcuts in vssettings -->
+          <!--<Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>-->
+          <!--<Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>-->
+
+          <!-- Editor shortcuts from Visual C# 2005 scheme -->
+          <!--<Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, M</Shortcut>  --><!-- no such thing -->
+          <!--<Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, Ctrl+M</Shortcut>-->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, R</Shortcut>  --><!-- Default uses Shift+F12 -->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, Ctrl+R</Shortcut>-->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+F12</Shortcut>  --><!-- Already in system -->
+          <!--<Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, P</Shortcut>  --><!-- Default is Ctrl+Shift+Space. NextBookmark uses Ctrl+K, P  -->
+          <!--<Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, Ctrl+P</Shortcut>-->
+          <!-- IntelliSense -->
+          <!--<Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, L</Shortcut>   --><!-- Default is Ctrl+J. ClearBookmarks uses Ctrl+K, L -->
+          <!--<Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, Ctrl+L</Shortcut>  --><!-- Default is Ctrl+J -->
+          <!--<Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, W</Shortcut>  --><!-- Default is Ctrl+Space (or Alt+RightArrow) -->
+          <!--<Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>  --><!-- Default is Ctrl+Space (or Alt+RightArrow) -->
+
+          <!-- Additional shortcuts to compliment the Ctrl+K, Ctrl+?? chords -->
+          <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, S</Shortcut>
+          <Shortcut Command="Edit.InsertSnippet" Scope="Global">Ctrl+K, X</Shortcut>
+          <!--<Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, I</Shortcut>-->
+
+          <!--<Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, A</Shortcut>-->  <!-- Default is Ctrl+K, Ctrl+A -->
+          <!--<Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, Ctrl+A</Shortcut>-->
+          <!--<Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, \</Shortcut>  --><!--Default is Ctrl+K, Ctrl+\-->
+          <!--<Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+\</Shortcut>-->
+          <!--<Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, S</Shortcut>  --><!-- Default is Ctrl+R, W. But this quite nice. :-) -->
+          <!--<Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+S</Shortcut>  --><!-- Default is Ctrl+R, W -->
+          <!--<Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, T</Shortcut>   --><!-- Default is Ctrl+K, Ctrl+H. Default Ctrl+E, T is ShowTestExplorer -->
+          <!--<Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, Ctrl+T</Shortcut>--><!-- Default is Ctrl+K, Ctrl+H. Default Ctrl+E, Ctrl+T is TaskStatusCenter -->
+          <!-- Additional shortcuts to compliment the Ctrl+E, Ctrl+?? chords -->
+          <!--<Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, W</Shortcut>  --><!--Don't do this. Clear Ctrl+E, for Expand Selection-->
+          <!--<RemoveShortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, Ctrl+W</RemoveShortcut>-->
+
+          <!-- Outlining -->
+          <!-- Additional shortcuts to compliment the Ctrl+M, Ctrl+?? Outlining chords -->
+          <Shortcut Command="Edit.ToggleOutliningExpansion" Scope="Text Editor">Ctrl+M, M</Shortcut>
+          <Shortcut Command="Edit.ToggleAllOutlining" Scope="Text Editor">Ctrl+M, L</Shortcut>
+          <Shortcut Command="Edit.StopOutlining" Scope="Text Editor">Ctrl+M, P</Shortcut>
+          <Shortcut Command="Edit.CollapsetoDefinitions" Scope="Text Editor">Ctrl+M, O</Shortcut>
+
+          <!-- Comment/Format-->
+          <!--<Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, C</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+C</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, U</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+U</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, D</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, Ctrl+D</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, F</Shortcut> --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, Ctrl+F</Shortcut> --><!-- Redundant -->
+
+          <!-- Bookmarks -->
+          <!-- These are already on the Ctrl+K chord in the default -->
+          <!--<Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, E</Shortcut>-->
+          <!--<Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, Ctrl+E</Shortcut>-->
+          <!--<Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, C</Shortcut>  --><!-- Ctrl+K, L -->
+          <!--<Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, Ctrl+C</Shortcut>-->
+          <!--<Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, T</Shortcut>  --><!-- Ctrl+K, K -->
+          <!--<Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, Ctrl+T</Shortcut>-->
+          <!--<Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, N</Shortcut> --><!-- Ctrl+K, N -->
+          <!--<Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, Ctrl+N</Shortcut>-->
+          <!--<Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, P</Shortcut> --><!-- Ctrl+K, P -->
+          <!--<Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, Ctrl+P</Shortcut>-->
+
+          <!-- Special -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Alt+Enter</Shortcut>  <!-- Already in system -->
+          <Shortcut Command="Project.AddClass" Scope="Global">Shift+Alt+C</Shortcut>
+          <!--<Shortcut Command="Edit.SelectCurrentWord" Scope="Global">Ctrl+Shift+W</Shortcut>  -->  <!-- Added because Ctrl+W will be used for Close Document -->  <!-- Removed because ExpandSelection can do current word and Ctrl+Shift+W does open web browser -->
+          <!--<Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>-->  <!-- Deprecating this Should be reserved for Edit.ToggleLineComment -->
+
+          <!-- TODO: Keep this up-to-date with the latest Visual C# 2005 scheme -->
+
+          <!-- ======================== -->
+          <!-- New Shortcuts for VS2017 -->
+          <!-- ======================== -->
+
+          <!-- Special -->
+          <!--<Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>-->  <!-- Moved into section above (to keep near Rename shortcuts) -->
+          <RemoveShortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</RemoveShortcut>  <!-- remove this so that global commands will work on Ctrl+W -->
+          <!--<Shortcut Command="Window.CloseDocumentWindow" Scope="Global">Ctrl+W</Shortcut>   --><!-- This replaces many global -->
+          <Shortcut Command="File.Close" Scope="Global">Ctrl+W</Shortcut>   <!-- This replaces many global -->
+          <RemoveShortcut Command="Edit.DecreaseSelection" Scope="Text Editor">Ctrl+Shift+W</RemoveShortcut>
+          <RemoveShortcut Command="File.ViewinBrowser" Scope="Global">Ctrl+Shift+W</RemoveShortcut>
+          <Shortcut Command="File.ViewinBrowser" Scope="Global">Ctrl+Shift+R</Shortcut>
+          <Shortcut Command="Window.CloseAllDocuments" Scope="Global">Ctrl+Shift+W</Shortcut>
+
+          <!--<Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  --><!-- "OptimizeImports" -->
+          <Shortcut Command="File.CloseSolution" Scope="Global">Ctrl+F4</Shortcut>
+          <Shortcut Command="File.Exit" Scope="Global">Alt+F4</Shortcut>
+          <Shortcut Command="Tools.Options" Scope="Global">Ctrl+Alt+S</Shortcut>  <!--Like "Settings"-->
+
+          <!-- Navigation -->
+          <Shortcut Command="View.NavigateBackward" Scope="Global">Alt+Left Arrow</Shortcut>    <!-- Overrides Global View.Backward (Alt+Left Arrow) -->
+          <Shortcut Command="View.NavigateForward" Scope="Global">Alt+Right Arrow</Shortcut>  <!-- Overrides Global View.NavigateForward -->
+          <Shortcut Command="View.NavigateForward" Scope="Text Editor">Alt+Right Arrow</Shortcut>  <!-- Override TextEditor bindings (Edit.CompleteWord) -->
+          <!--<Shortcut Command="View.NavigateForward" Scope="Workflow Designer">Alt+Right Arrow</Shortcut>  --><!-- Override to remove existing shortcut (Edit.CompleteWord) VS2015 only -->
+          <!-- Note: Alt+Left/Right conflicts with Global View.Forward/Backward (used by WebBrowser)-->
+          <Shortcut Command="View.Backward" Scope="WebBrowser">Alt+Left Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+          <Shortcut Command="View.Forward" Scope="WebBrowser">Alt+Right Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+
+          <!-- Document Navigation shortcuts -->
+          <!-- Clear Ctrl+PgUp/Dn keys from Text Editor -->
+          <RemoveShortcut Command="Edit.ViewTop" Scope="Text Editor">Ctrl+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewBottom" Scope="Text Editor">Ctrl+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewTopExtend" Scope="Text Editor">Ctrl+Shift+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewBottomExtend" Scope="Text Editor">Ctrl+Shift+PgDn</RemoveShortcut>
+          <!-- Clear Ctrl+PgUp/Dn keys from HTML Editor -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="HTML Editor Design View">Ctrl+PgUp</RemoveShortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="HTML Editor Source View">Ctrl+PgUp</RemoveShortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <RemoveShortcut Command="View.NextView" Scope="HTML Editor Design View">Ctrl+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="View.NextView" Scope="HTML Editor Source View">Ctrl+PgDn</RemoveShortcut>
+          <!-- Clear Ctrl+Alt+PgUp/Dn keys from Global scope -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="Global">Ctrl+Alt+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Window.NextTab" Scope="Global">Ctrl+Alt+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="Window.PreviousTabandAddtoSelection" Scope="Global">Ctrl+Shift+Alt+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Window.NextTabandAddtoSelection" Scope="Global">Ctrl+Shift+Alt+PgDn</RemoveShortcut>
+          <!-- New shortcuts for Global Document Navigation -->
+          <Shortcut Command="Window.PreviousTab" Scope="Global">Ctrl+PgUp</Shortcut>  <!-- VS default -->
+          <Shortcut Command="Window.NextTab" Scope="Global">Ctrl+PgDn</Shortcut>  <!-- VS default -->
+          <Shortcut Command="Window.PreviousTabandAddtoSelection" Scope="Global">Ctrl+Shift+PgUp</Shortcut>
+          <Shortcut Command="Window.NextTabandAddtoSelection" Scope="Global">Ctrl+Shift+PgDn</Shortcut>
+          <!-- New shortcuts for View Top/Bottom + extend selection in Text Editor -->
+          <Shortcut Command="Edit.ViewTop" Scope="Text Editor">Alt+Home</Shortcut>   <!-- New! New shortcut (chosen by JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgUp -->
+          <Shortcut Command="Edit.ViewBottom" Scope="Text Editor">Alt+End</Shortcut> <!-- New! New shortcut (chosen by JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgDn -->
+          <Shortcut Command="Edit.ViewTopExtend" Scope="Text Editor">Shift+Alt+Home</Shortcut>
+          <Shortcut Command="Edit.ViewBottomExtend" Scope="Text Editor">Shift+Alt+End</Shortcut>
+          <!-- New shortcuts for the Web Forms Desginer/Source -->
+          <Shortcut Command="Window.PreviousTab" Scope="HTML Editor Design View">Ctrl+Alt+PgUp</Shortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <Shortcut Command="Window.PreviousTab" Scope="HTML Editor Source View">Ctrl+Alt+PgUp</Shortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <Shortcut Command="View.NextView" Scope="HTML Editor Design View">Ctrl+Alt+PgDn</Shortcut>
+          <Shortcut Command="View.NextView" Scope="HTML Editor Source View">Ctrl+Alt+PgDn</Shortcut>
+
+          <!--Split Window shortcuts (from Sublime)-->
+          <!--Create New Tab Group-->
+          <Shortcut Command="Window.NewVerticalTabGroup" Scope="Global">Ctrl+\, Ctrl+Right Arrow</Shortcut>
+          <Shortcut Command="Window.NewHorizontalTabGroup" Scope="Global">Ctrl+\, Ctrl+Down Arrow</Shortcut>
+          <!--Move document to other tab group-->
+          <Shortcut Command="Window.MovetoNextTabGroup" Scope="Global">Ctrl+\, Ctrl+PgDn</Shortcut>
+          <Shortcut Command="Window.MovetoPreviousTabGroup" Scope="Global">Ctrl+\, Ctrl+PgUp</Shortcut>
+          <!--Close tab group-->
+          <Shortcut Command="OtherContextMenus.EasyMDIToolWindow.MoveAlltoPreviousTabGroup" Scope="Global">Ctrl+\, Ctrl+Home</Shortcut>
+          <Shortcut Command="OtherContextMenus.EasyMDIToolWindow.MoveAlltoNextTabGroup" Scope="Global">Ctrl+\, Ctrl+End</Shortcut>
+          <!--Floating/Docking -->
+          <Shortcut Command="Window.Float" Scope="Global">Ctrl+\, Ctrl+Enter</Shortcut>
+          <Shortcut Command="Window.FloatAll" Scope="Global">Ctrl+\, Ctrl+Shift+Enter</Shortcut>
+          <Shortcut Command="Window.MoveToMainDocumentGroup" Scope="Global">Ctrl+\, Ctrl+Shift+Bkspce</Shortcut>
+          <!--VS seems to be missing commands for Navigating to next/previous tab group -->
+
+          <!-- In-Editor navigation -->
+          <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Ctrl+Alt+Up Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+          <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Ctrl+Alt+Down Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+
+          <!-- Provide replacements for shortcuts taken in GoToMethodAbove/Below (Ctrl+Alt+Up/Down) -->
+          <RemoveShortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+Alt+=</RemoveShortcut>
+          <Shortcut Command="EditorContextMenus.Navigate.GoToContainingBlock" Scope="Text Editor">Ctrl+Alt+PgUp</Shortcut>
+          <Shortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+Alt+PgUp</Shortcut>
+          <Shortcut Command="Window.ShowEzMDIFileList" Scope="Global">Ctrl+Alt+End</Shortcut>
+
+          <!--Already in the system, but want to ensure they are part of this scheme-->
+          <Shortcut Command="Edit.NextHighlightedReference" Scope="Text Editor">Ctrl+Shift+Down Arrow</Shortcut>
+          <Shortcut Command="Edit.PreviousHighlightedReference" Scope="Text Editor">Ctrl+Shift+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.LineOpenAbove" Scope="Text Editor">Ctrl+Enter</Shortcut>
+          <Shortcut Command="Edit.LineOpenBelow" Scope="Text Editor">Ctrl+Shift+Enter</Shortcut>
+
+          <!-- Outlining shortcuts (Expand/Collapse sections of code) -->
+          <RemoveShortcut Command="View.NavigateBackward" Scope="Global">Ctrl+-</RemoveShortcut>       <!-- Remove this shortcut - needed for Outlining-->
+          <RemoveShortcut Command="View.NavigateForward" Scope="Global">Ctrl+Shift+-</RemoveShortcut>  <!-- Remove this shortcut - needed for Outlining-->
+          <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+Num +</Shortcut>
+          <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+=</Shortcut>
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+-</Shortcut>  <!-- Overrides View.NavigateBackward -->
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+Num +</Shortcut>
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+=</Shortcut>
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+-</Shortcut>  <!-- Overrides View.NavigateForward -->
+
+          <!-- GoTo Next Error / Previous Error -->
+          <Shortcut Command="Edit.GoToNextIssueinFile" Scope="Global">Alt+PgDn</Shortcut>    <!--Default shortcut-->
+          <Shortcut Command="Edit.GoToPreviousIssueinFile" Scope="Global">Alt+PgUp</Shortcut>   <!--Default shortcut-->
+          <Shortcut Command="View.NextError" Scope="Global">Shift+Alt+PgDn</Shortcut>
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+PgUp</Shortcut>
+
+          <!-- Window Navigation shortcuts -->
+          <!-- Docking and Hiding Toolwindows -->
+          <Shortcut Command="Window.AutoHide" Scope="Global">Shift+Ins</Shortcut>
+          <Shortcut Command="Window.AutoHideAll" Scope="Global">Shift+Alt+Ins</Shortcut>
+          <Shortcut Command="Window.Dock" Scope="Global">Ctrl+Ins</Shortcut>
+          <Shortcut Command="Window.DockasTabbedDocument" Scope="Global">Ctrl+Shift+Ins</Shortcut>
+          <!--Tool Window Nav-->
+          <Shortcut Command="Window.NextToolWindowNav" Scope="Global">Ctrl+`</Shortcut>   <!--Default is Ctrl+F7-->
+          <Shortcut Command="Window.PreviousToolWindowNav" Scope="Global">Ctrl+Shift+`</Shortcut>   <!--Default is Ctrl+Shift+F7-->
+
+          <!--Editor Shortcuts-->
+          <Shortcut Command="Edit.SelectAll" Scope="Text Editor">Ctrl+A</Shortcut> <!-- This is already the default, but putting it here to make sure -->
+          <Shortcut Command="Edit.Redo" Scope="Global">Ctrl+Shift+Z</Shortcut>
+          <Shortcut Command="Edit.Redo" Scope="Text Editor">Ctrl+Y</Shortcut>   <!-- Default in system -->
+          <Shortcut Command="Edit.LineDelete" Scope="Text Editor">Ctrl+Shift+Del</Shortcut>  <!--System default is Ctrl+Shift+L-->
+
+          <!--Toggle Comment -->
+          <!-- Unable to assign Toggle Line comment or Toggle Block comment -->
+          <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+/</Shortcut>
+          <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+Shift+/</Shortcut>
+
+          <!-- Expand Selection shortcuts -->
+          <!--Reassign default shortcuts on Ctrl+E and Ctrl+Shift+E-->
+          <!--Move Word Wrap to Ctrl+K,W. Push BookmarkWindow to Ctrl+\ chord like other windows-->
+          <RemoveShortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, Ctrl+W</RemoveShortcut>
+          <RemoveShortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+K, Ctrl+W</RemoveShortcut>
+          <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+K, W</Shortcut>   <!--Introduced by JEC-->
+          <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>   <!--Introduced by JEC-->
+          <!--Test Explorer-->
+          <RemoveShortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+E, T</RemoveShortcut>
+          <Shortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+\, Ctrl+Shift+T</Shortcut>  <!--Should find a better shortcut for this. Maybe Ctrl+\, Ctrl+T - which is on TaskList by default-->
+          <Shortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+\, Shift+T</Shortcut>
+          <!--Code Covereage Reults-->
+          <RemoveShortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+E, C</RemoveShortcut>
+          <Shortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+\, Ctrl+V</Shortcut>
+          <Shortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+\, V</Shortcut>
+          <!--Ctrl+E in CSharp scope-->
+          <RemoveShortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+E, E</RemoveShortcut>
+          <RemoveShortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+E, Ctrl+E</RemoveShortcut>
+          <Shortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+K, I</Shortcut>
+          <Shortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+K, Ctrl+I</Shortcut>
+          <!--Ctrl+Shift+E-->
+          <RemoveShortcut Command="View.ResourceView" Scope="Global">Ctrl+Shift+E</RemoveShortcut>   <!--Assigned to Ctrl+\, Ctrl+R-->
+          <!--Apply Expand Selection shortcuts (Text Editor) -->
+          <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+E</Shortcut>
+          <Shortcut Command="Edit.ContractseSelection" Scope="Text Editor">Ctrl+Shift+E</Shortcut>   <!--Watch out for the strange spelling in this command-->
+
+          <!--  Ctrl+D shortcuts - Sublime use Ctrl+D for NextMatching, JetBrains use Ctrl+D for Duplicate -->
+          <!--Put Duplicate on Ctrl+D-->
+          <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Already in system -->
+          <!--Put Multi-caret shortcuts on Ctrl+Shift+D -->
+          <Shortcut Command="Edit.InsertNextMatchingCaret" Scope="Text Editor">Ctrl+Shift+D</Shortcut>
+          <Shortcut Command="Edit.InsertCaretsatAllMatching" Scope="Text Editor">Ctrl+Shift+Alt+D</Shortcut>
+
+          <!-- Source control shortcuts -->
+          <!-- Fetch, Pull, Push -->
+          <Shortcut Command="Team.Git.Fetch" Scope="Global">Ctrl+Shift+K, F</Shortcut>
+          <Shortcut Command="Team.Git.Fetch" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+F</Shortcut>
+          <Shortcut Command="Team.Git.Pull" Scope="Global">Ctrl+Shift+K, L</Shortcut>
+          <Shortcut Command="Team.Git.Pull" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="Team.Git.Push" Scope="Global">Ctrl+Shift+K, P</Shortcut>
+          <Shortcut Command="Team.Git.Push" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+P</Shortcut>
+
+          <!-- Reserving shortcuts for commands (when they become global) -->
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Global">Ctrl+\, H</Shortcut>
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Global">Ctrl+\, Ctrl+H</Shortcut>
+          <Shortcut Command="Team.Git.CreateBranch" Scope="Global">Ctrl+Shift+K, N</Shortcut>
+          <Shortcut Command="Team.Git.CreateBranch" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+N</Shortcut>
+
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+Alt+G</Shortcut>
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+\, G</Shortcut>
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+\, Ctrl+G</Shortcut>
+
+          <!-- New Status Bar button shortcuts -->
+          <RemoveShortcut Command="View.PendingChanges" Scope="Global">Ctrl+Alt+F7</RemoveShortcut>
+          <RemoveShortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+E, Ctrl+C</RemoveShortcut>
+          <RemoveShortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+E, Ctrl+T</RemoveShortcut>
+          <Shortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+\, Y</Shortcut>
+          <Shortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+\, Ctrl+Y</Shortcut>
+          <Shortcut Command="View.PendingChanges" Scope="Global">Ctrl+\, I</Shortcut>
+          <Shortcut Command="View.PendingChanges" Scope="Global">Ctrl+\, Ctrl+I</Shortcut>
+          <Shortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+\, B</Shortcut>
+          <Shortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+\, Ctrl+B</Shortcut>
+
+          <!--Navigation shortcuts-->
+          <Shortcut Command="Edit.GoToDefinition" Scope="Global">Ctrl+B</Shortcut>
+          <Shortcut Command="Edit.GoToImplementation" Scope="Global">Ctrl+Alt+B</Shortcut>
+          <!-- Continue to use Ctrl+Shift+B for Build -->
+          <Shortcut Command="Build.BuildSolution" Scope="Global">Ctrl+Shift+B</Shortcut>   <!--Default shortcut-->
+
+          <!--Add new shortcuts for Find References (Usages) and Find Symbol-->
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+U</Shortcut>  <!--Like "Usages"-->
+          <Shortcut Command="Edit.QuickFindSymbol" Scope="Global">Ctrl+Shift+U</Shortcut>   <!--This is the old Find References command. Find something better for this shortcut. Maybe GoToBase or GoToParent -->
+          <!--Clear the Ctrl+U/Ctrl+Shift+U chords - Provide alternative shortcuts for Make Upper/Lower case-->
+          <RemoveShortcut Command="Edit.MakeLowercase" Scope="Text Editor">Ctrl+U</RemoveShortcut>
+          <RemoveShortcut Command="Edit.MakeUppercase" Scope="Text Editor">Ctrl+Shift+U</RemoveShortcut>
+          <Shortcut Command="Edit.MakeLowercase" Scope="Text Editor">Ctrl+Shift+K, Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="Edit.MakeUppercase" Scope="Text Editor">Ctrl+Shift+K, Ctrl+Shift+U</Shortcut>
+
+          <!--GoTo shortcuts-->
+          <Shortcut Command="Edit.GoToAll" Scope="Global">Ctrl+T</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="Edit.GoToFile" Scope="Global">Ctrl+P</Shortcut>  <!--GoToFile on Ctrl+P like VSCode-->
+          <Shortcut Command="Edit.GoToType" Scope="Global">Ctrl+Shift+P</Shortcut>
+          <Shortcut Command="Edit.GoToSymbol" Scope="Global">Ctrl+Shift+Alt+P</Shortcut>
+          <Shortcut Command="Edit.GoToMember" Scope="Global">Alt+\</Shortcut>   <!-- Like ReSharper -->
+          <Shortcut Command="Edit.GoTo" Scope="Global">Ctrl+G</Shortcut>   <!-- GoToLine (Default shortcut) -->
+
+          <!--Placing these here just for clarity-->
+          <Shortcut Command="File.OpenFile" Scope="Global">Ctrl+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenProject" Scope="Global">Ctrl+Shift+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenFolder" Scope="Global">Ctrl+Shift+Alt+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenWebSite" Scope="Global">Shift+Alt+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.NewFile" Scope="Global">Ctrl+N</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.NewProject" Scope="Global">Ctrl+Shift+N</Shortcut>  <!--Default shortcut-->
+
+          <!---Move GoToLine from Ctrl+G to Ctrl+L - Hold off on this -->
+          <!--Free the Ctrl+L shortcut-->
+          <!--<RemoveShortcut Command="Edit.LineCut" Scope="Text Editor">Ctrl+L</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Format.ConverttoHyperlink" Scope="HTML Editor Design View">Ctrl+L</RemoveShortcut>-->
+          <!--<Shortcut Command="Edit.LineCut" Scope="Text Editor">Shift+Del</Shortcut>  --><!--Instead of Cut, will do LineCut-->
+          <!--Move GoToLine over to Ctrl+L-->
+          <!--<Shortcut Command="Edit.GoTo" Scope="Text Editor">Ctrl+L</Shortcut>-->
+          <!--Can now free the Ctrl+G shortcut-->
+          <!--<RemoveShortcut Command="Edit.GoTo" Scope="Global">Ctrl+G</RemoveShortcut>-->
+          
+          <!--Free the Ctrl+I shortcut - Can use it for Quick Info or Parameter Info-->
+          <!--Move IncrementalSearch to Alt+F3-->
+          <Shortcut Command="Edit.IncrementalSearch" Scope="Global">Alt+F3</Shortcut>
+          <Shortcut Command="Edit.ReverseIncrementalSearch" Scope="Global">Shift+Alt+F3</Shortcut>
+          <RemoveShortcut Command="Edit.StopSearch" Scope="Global">Alt+F3, S</RemoveShortcut>  <!--Need to find a replacement for this-->
+          <RemoveShortcut Command="Edit.IncrementalSearch" Scope="Text Editor">Ctrl+I</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ReverseIncrementalSearch" Scope="Text Editor">Ctrl+Shift+I</RemoveShortcut>
+
+          <!-- Quick Launch - Move QuickLaunch to Alt+Q like Office and free the Ctrl+Q key - Hold off on this -->
+          <!--<RemoveShortcut Command="Window.ActivateQuickLaunch" Scope="Global">Ctrl+Q</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Window.ActivateQuickLaunchPreviousCategory" Scope="Global">Ctrl+Shift+Q</RemoveShortcut>-->
+          <Shortcut Command="Window.ActivateQuickLaunch" Scope="Global">Alt+Q</Shortcut>
+          <Shortcut Command="Window.ActivateQuickLaunchPreviousCategory" Scope="Global">Shift+Alt+Q</Shortcut>
+
+          <!--Shortcuts for Method and Parameter info-->
+          <!--<RemoveShortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, Ctrl+I</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Edit.QuickInfo" Scope="Find All References Tool Window">Ctrl+K, Ctrl+I</RemoveShortcut>-->
+          <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+I</Shortcut>
+          <Shortcut Command="Edit.QuickInfo" Scope="Find All References Tool Window">Ctrl+I</Shortcut>
+          <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+Shift+I</Shortcut>
+          <!--Can free up Ctrl+Shift+Space - maybe reserve for Smart Type Completion when it's delivered. Hold off for now -->
+          <!--<RemoveShortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+Shift+Space</RemoveShortcut>-->
+
+          <!--Containing Block-->
+          <Shortcut Command="EditorContextMenus.Navigate.GoToContainingBlock" Scope="Text Editor">Ctrl+[</Shortcut>
+          <Shortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+[</Shortcut>
+          <Shortcut Command="Edit.GotoBrace" Scope="Text Editor">Ctrl+]</Shortcut>    <!-- Default -->
+          <Shortcut Command="Edit.GotoBraceExtend" Scope="Text Editor">Ctrl+Shift+]</Shortcut>    <!-- Default -->
+          <!--Find new global shortcuts for keys blocked by ContainingBlock shortcuts (Ctrl+[)-->
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Global">Shift+Alt+L</Shortcut>
+          <!--TODO: Consider these Solution Explorer shortcuts, which are Global by default. Move to SolnExpl scope for now.-->
+          <Shortcut Command="SolutionExplorer.PendingChangesFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+P</Shortcut>
+          <Shortcut Command="SolutionExplorer.OpenFilesFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+O</Shortcut>
+          <Shortcut Command="SolutionExplorer.ErrorsFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+E</Shortcut>
+
+        <!--</ShortcutsSchemeDef>-->
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/HotKeysVSIX/Visual CSharp 2015.vsk b/HotKeysVSIX/Visual CSharp 2015.vsk
new file mode 100644
index 0000000..8fc510a
Binary files /dev/null and b/HotKeysVSIX/Visual CSharp 2015.vsk differ
diff --git a/HotKeysVSIX/packages.config b/HotKeysVSIX/packages.config
new file mode 100644
index 0000000..ba2b449
--- /dev/null
+++ b/HotKeysVSIX/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.8.9-beta" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/KeyboardSchemes/KeyboardSchemes.csproj b/KeyboardSchemes/KeyboardSchemes.csproj
index e8dd6af..044f5b8 100644
--- a/KeyboardSchemes/KeyboardSchemes.csproj
+++ b/KeyboardSchemes/KeyboardSchemes.csproj
@@ -41,7 +41,13 @@
     <Content Include="Installer\HotKeysPreviewImage.png" />
     <Content Include="Installer\License.rtf" />
     <Content Include="Installer\ReleaseNotes.txt" />
+    <Content Include="VSKs\2015\IntelliJ-ImportLog.txt" />
+    <Content Include="VSKs\2015\ReSharperForIDEA-ImportLog.txt" />
+    <Content Include="VSKs\2015\ReSharperForVSC#-ImportLogs.txt" />
     <Content Include="VSSettings\Brief.vssettings" />
+    <Content Include="VSSettings\CamelHump Nav with VSTricks.vssettings">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="VSSettings\Emacs.vssettings" />
     <Content Include="VSSettings\IntelliJ.vssettings">
       <SubType>Designer</SubType>
@@ -63,6 +69,9 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="VSSettings\Visual Studio 6.vssettings" />
+    <Content Include="VSSettings\VS Universal.vssettings">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="Installer\Build2015MSI.bat" />
@@ -71,12 +80,23 @@
     <None Include="KeymapRefs\ReSharperCppDefaultKeymap_VSscheme.pdf" />
     <None Include="KeymapRefs\ReSharper_DefaultKeymap_IDEAscheme.pdf" />
     <None Include="KeymapRefs\ReSharper_DefaultKeymap_VSscheme.pdf" />
+    <None Include="KeymapRefs\VS Universal Mapping Scheme.pdf" />
     <None Include="KeymapRefs\VSCode-keyboard-shortcuts-linux.pdf" />
     <None Include="KeymapRefs\VSCode-keyboard-shortcuts-windows.pdf" />
+    <None Include="VSKs\2015\IntelliJ for C#.vsk" />
+    <None Include="VSKs\2015\ReSharper for IDEA.vsk" />
+    <None Include="VSKs\2015\ReSharper for VS C#.vsk" />
+    <None Include="VSKs\2015\Visual C# 2015.vsk" />
+    <None Include="VSKs\2017\IntelliJ for C#.vsk" />
+    <None Include="VSKs\2017\ReSharper for IDEA.vsk" />
+    <None Include="VSKs\2017\ReSharper for VS C#.vsk" />
+    <None Include="VSKs\2017\Sublime with C#.vsk" />
+    <None Include="VSKs\2017\Sublime with C++.vsk" />
+    <None Include="VSKs\2017\Visual C# 2015.vsk" />
+    <None Include="VSKs\2017\Visual C# 2017.vsk" />
+    <None Include="VSKs\2017\VS Universal.vsk" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="VSKs\" />
-  </ItemGroup>
+  <ItemGroup />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/KeyboardSchemes/KeyboardSchemes.csproj.user b/KeyboardSchemes/KeyboardSchemes.csproj.user
index 944ec00..6cbe588 100644
--- a/KeyboardSchemes/KeyboardSchemes.csproj.user
+++ b/KeyboardSchemes/KeyboardSchemes.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/KeyboardSchemes/KeymapRefs/VS Universal Mapping Scheme.pdf b/KeyboardSchemes/KeymapRefs/VS Universal Mapping Scheme.pdf
new file mode 100644
index 0000000..0427a1a
Binary files /dev/null and b/KeyboardSchemes/KeymapRefs/VS Universal Mapping Scheme.pdf differ
diff --git a/KeyboardSchemes/VSKs/2017/VS Universal.vsk b/KeyboardSchemes/VSKs/2017/VS Universal.vsk
new file mode 100644
index 0000000..4c0c85a
Binary files /dev/null and b/KeyboardSchemes/VSKs/2017/VS Universal.vsk differ
diff --git a/KeyboardSchemes/VSKs/2017/Visual C# 2017.vsk b/KeyboardSchemes/VSKs/2017/Visual C# 2017.vsk
new file mode 100644
index 0000000..f565ed9
Binary files /dev/null and b/KeyboardSchemes/VSKs/2017/Visual C# 2017.vsk differ
diff --git a/KeyboardSchemes/VSSettings/CamelHump Nav with VSTricks.vssettings b/KeyboardSchemes/VSSettings/CamelHump Nav with VSTricks.vssettings
new file mode 100644
index 0000000..a32573f
--- /dev/null
+++ b/KeyboardSchemes/VSSettings/CamelHump Nav with VSTricks.vssettings	
@@ -0,0 +1,37 @@
+<UserSettings>
+  <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
+  <Category name="Environment_Group" RegisteredName="Environment_Group">
+    <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
+      <KeyboardShortcuts Version="8.0">
+        <ScopeDefinitions>
+          <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}"/>
+          <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}"/>
+        </ScopeDefinitions>
+        <ShortcutsScheme>VS Universal</ShortcutsScheme>
+        <!--<ShortcutsSchemeDef Name="CamelHump Navigation">-->
+        <UserShortcuts>
+          <!--Need VSTricks for CamelCase navigation, selection and deletion.-->
+          <!--CamelHump navigation and selection (Ctrl key shortcuts)-->
+          <Shortcut Command="Edit.SubWordNext" Scope="Text Editor">Ctrl+Right Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordPrevious" Scope="Text Editor">Ctrl+Left Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordNextExtend" Scope="Text Editor">Ctrl+Shift+Right Arrow</Shortcut>
+          <Shortcut Command="Edit.SubWordPreviousExtend" Scope="Text Editor">Ctrl+Shift+Left Arrow</Shortcut>
+          <!--<Shortcut Command="Edit.SubWordNextExtendColumn" Scope="Text Editor">Ctrl+Shift+Right Arrow</Shortcut>  --><!-- Not required. User can release Alt key for part word navigation during box selection mode -->
+          <!--<Shortcut Command="Edit.SubWordPreviousExtendColumn" Scope="Text Editor">Ctrl+Shift+Left Arrow</Shortcut>  --><!-- Not required. User can release Alt key for part word navigation during box selection mode -->
+          <!--Backspace and Delete-->
+          <Shortcut Command="Edit.SubWordDeletetoEnd" Scope="Text Editor">Ctrl+Del</Shortcut>
+          <Shortcut Command="Edit.SubWordDeletetoStart" Scope="Text Editor">Ctrl+Bkspce</Shortcut>
+          <!--Create shortcuts for the Full-Word navigation and selection (Ctrl+Alt shortcuts)-->
+          <Shortcut Command="Edit.WordNext" Scope="Text Editor">Ctrl+Alt+Right Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordPrevious" Scope="Text Editor">Ctrl+Alt+Left Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordNextExtend" Scope="Text Editor">Ctrl+Alt+Shift+Right Arrow</Shortcut>  <!--Invented by JEC-->
+          <Shortcut Command="Edit.WordPreviousExtend" Scope="Text Editor">Ctrl+Alt+Shift+Left Arrow</Shortcut>  <!--Invented by JEC-->
+          <!--Create shortcuts for the Full-Word backspace and delete -->
+          <RemoveShortcut Command="View.TaskRunnerExplorer" Scope="Global">Ctrl+Alt+Bkspce</RemoveShortcut>
+          <Shortcut Command="Edit.WordDeleteToStart" Scope="Text Editor">Ctrl+Alt+Bkspce</Shortcut>
+          <Shortcut Command="Edit.WordDeleteToEnd" Scope="Text Editor">Alt+Del</Shortcut>  <!-- Would otherwise use Ctrl+Alt+Del for consistency, but ... well... you konw. ;-) Alt+Del will have to do. -->
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/KeyboardSchemes/VSSettings/VS Universal.vssettings b/KeyboardSchemes/VSSettings/VS Universal.vssettings
new file mode 100644
index 0000000..21ce78c
--- /dev/null
+++ b/KeyboardSchemes/VSSettings/VS Universal.vssettings	
@@ -0,0 +1,552 @@
+<UserSettings>
+  <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
+  <Category name="Environment_Group" RegisteredName="Environment_Group">
+    <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
+      <KeyboardShortcuts Version="8.0">
+        <ScopeDefinitions>
+          <Scope Name="Team Explorer" ID="{7AA20502-9463-47B7-BF43-341BAF51157C}"/>
+          <Scope Name="VC Dialog Editor" ID="{543E0C02-8C85-4E43-933A-5EF320E3431F}"/>
+          <Scope Name="Find All References Tool Window" ID="{1FA1FD06-3592-4D1D-AC75-0B953320140C}"/>
+          <Scope Name="Live Property Explorer" ID="{31FC2115-5126-4A87-B2F7-77EAAB65048B}"/>
+          <Scope Name="XML (Text) Editor" ID="{FA3CD31E-987B-443A-9B81-186104E8DAC1}"/>
+          <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, T-SQL PDW Editor" ID="{C9626B29-6A42-411C-BD76-DAD855C86913}"/>
+          <Scope Name="Work Item Results View" ID="{7026002D-01F6-44E7-95CF-A896C00DA3F8}"/>
+          <Scope Name="ADO.NET Entity Data Model Designer" ID="{C99AEA30-8E36-4515-B76F-496F5A48A6AA}"/>
+          <Scope Name="Solution Explorer" ID="{3AE79031-E1BC-11D0-8F78-00A0C9110057}"/>
+          <Scope Name="Query Designer" ID="{B2C40B32-3A37-4CA9-97B9-FA44248B69FF}"/>
+          <Scope Name="CSharp Editor with Encoding" ID="{08467B34-B90F-4D91-BDCA-EB8C8CF3033A}"/>
+          <Scope Name="WebBrowser" ID="{E8B06F41-6D01-11D2-AA7D-00C04F990343}"/>
+          <Scope Name="CSS Editor" ID="{A5401142-F49D-43DB-90B1-F57BA349E55C}"/>
+          <Scope Name="DataSet Editor" ID="{B334A759-F450-40A5-BE2A-65937BCD5415}"/>
+          <Scope Name="XAML Designer" ID="{E9B8485C-1217-4277-9ED6-C825A5AC1968}"/>
+          <Scope Name="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}" ID="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}"/>
+          <Scope Name="View Designer" ID="{B968E165-98E0-41F0-8FBE-A8ED1D246A90}"/>
+          <Scope Name="XAML Editor" ID="{A4F9FF65-A78C-4650-866D-5069CC4127CF}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, Table Designer" ID="{2366CF66-2394-4701-AFCA-37ED7FD41648}"/>
+          <Scope Name="Microsoft Visual Basic Editor" ID="{2C015C70-C72C-11D0-88C3-00A0C9110049}"/>
+          <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}"/>
+          <Scope Name="HTML Editor" ID="{40D31677-CBC0-4297-A9EF-89D907823A98}"/>
+          <Scope Name="Live Visual Tree" ID="{A2EAF38F-A0AD-4503-91F8-5F004A69A040}"/>
+          <Scope Name="Work Item Query View" ID="{B6303490-B828-410C-9216-AE727D0E282D}"/>
+          <Scope Name="DOM Explorer" ID="{01E50993-E6A4-491E-AB3F-3A9939DE3524}"/>
+          <Scope Name="Team Foundation Build Detail Editor" ID="{86306A97-84F2-4F5A-889B-1318501AEB5F}"/>
+          <Scope Name="Database Designer" ID="{CFF78A9B-78A3-45A3-9142-0267AFC261FA}"/>
+          <Scope Name="Work Item Editor" ID="{40A91D9D-8076-4D28-87C5-5AF9F0ACFE0F}"/>
+          <Scope Name="JSON Editor" ID="{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"/>
+          <Scope Name="CSharp Editor" ID="{A6C744A8-0E4A-4FC6-886A-064283054674}"/>
+          <Scope Name="VC String Editor" ID="{58442DA9-10DA-4AA9-A2AF-96E4D481379B}"/>
+          <Scope Name="Interactive Window" ID="{2D0A56AA-9527-4B78-B6E6-EBE6E05DA749}"/>
+          <Scope Name="Merge Editor Window" ID="{9A9A8AAA-ACD2-4DB6-BD81-8D64176C52B6}"/>
+          <Scope Name="Microsoft Visual Basic Code Page Editor" ID="{6C33E1AA-1401-4536-AB67-0E21E6E569DA}"/>
+          <Scope Name="Settings Designer" ID="{515231AD-C9DC-4AA3-808F-E1B65E72081C}"/>
+          <Scope Name="Windows Forms Designer" ID="{BA09E2AF-9DF2-4068-B2F0-4C7E5CC19E2F}"/>
+          <Scope Name="Markdown Editor" ID="{B3984FB3-6A50-488A-A8A5-1EA6929ADF43}"/>
+          <Scope Name="VC Accelerator Editor" ID="{EB56D0B5-BEE7-4D0C-8BE6-88A8ED256695}"/>
+          <Scope Name="Managed Resources Editor" ID="{FEA4DCC9-3645-44CD-92E7-84B55A16465C}"/>
+          <Scope Name="FSharpEditorFactory" ID="{8A5AA6CF-46E3-4520-A70A-7393D15233E9}"/>
+          <Scope Name="JavaScript Console" ID="{074F1AD9-308B-488C-861E-CF88182E2788}"/>
+          <Scope Name="Difference Viewer" ID="{79D52DDF-52BC-43F1-9663-B3E85CDCA912}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, Schema Compare" ID="{00E9D2E3-9044-47D1-978C-BE2825249219}"/>
+          <Scope Name="Table Designer" ID="{4194FEE5-6777-419F-A5FC-47A536DF1BDB}"/>
+          <Scope Name="HTML Editor Design View" ID="{CB3FCFEA-03DF-11D1-81D2-00A0C91BBEE3}"/>
+          <Scope Name="HTML Editor Source View" ID="{CB3FCFEB-03DF-11D1-81D2-00A0C91BBEE3}"/>
+          <Scope Name="VC Image Editor" ID="{C0BA70ED-069E-412B-9C06-7442E28A11B9}"/>
+          <Scope Name="Microsoft SQL Server Data Tools, T-SQL Editor" ID="{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}"/>
+          <Scope Name="Query Results" ID="{0058A1F7-65F3-4DB9-B3D0-CA7E64DD73CD}"/>
+          <Scope Name="Test Explorer" ID="{E1B7D1F8-9B3C-49B1-8F4F-BFC63A88835D}"/>
+          <Scope Name="XML Schema Designer" ID="{DEE6CEF9-3BCA-449A-82A6-FC757D6956FB}"/>
+        </ScopeDefinitions>
+        <ShortcutsSchemeDef Name="VS Universal">
+        <!--<UserShortcuts>-->
+          <!-- Tool Window Shortcuts -->
+          <!-- All changed from Ctrl+W to Ctrl+\ from base Visual C# 2005-->
+          <!--<Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+\, N</Shortcut>    --><!-- No such thing. View.Notifications uses 'N' -->
+          <!--<Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+\, Ctrl+N</Shortcut>    -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+\, K</Shortcut>    
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+\, Ctrl+K</Shortcut>
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, M</Shortcut>    <!-- Fix add "tfs" to command name -->    <!-- Already in system -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, Ctrl+M</Shortcut>    <!-- Fix add "tfs" to command name -->    <!-- Already in system -->
+          <!--<Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+\, S</Shortcut>-->  <!-- Conflict with SQL Server Explorer -->
+          <!--<Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+\, Ctrl+S</Shortcut>--><!-- Conflict with SQL Server Explorer -->
+          <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+\, P</Shortcut>
+          <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+\, Ctrl+P</Shortcut>
+          <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+\, J</Shortcut>
+          <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+\, Ctrl+J</Shortcut>
+          <!--<Shortcut Command="View.Toolbox" Scope="Global">Ctrl+\, X</Shortcut>    --><!-- Conflict with Cloud Explorer -->
+          <!--<Shortcut Command="View.Toolbox" Scope="Global">Ctrl+\, Ctrl+X</Shortcut>    --><!-- Conflict with Cloud Explorer -->
+          <Shortcut Command="View.ClassView" Scope="Global">Ctrl+\, C</Shortcut>
+          <Shortcut Command="View.ClassView" Scope="Global">Ctrl+\, Ctrl+C</Shortcut>
+          <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+\, L</Shortcut>
+          <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+\, Ctrl+L</Shortcut>
+          <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+\, R</Shortcut>
+          <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+\, Ctrl+R</Shortcut>
+          <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+\, U</Shortcut>
+          <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+\, Ctrl+U</Shortcut>
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+\, T</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+\, Ctrl+T</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+\, E</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+\, Ctrl+E</Shortcut>    <!-- Already in system --> 
+          <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+\, A</Shortcut>
+          <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+\, Ctrl+A</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+\, O</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+\, Ctrl+O</Shortcut>
+          <Shortcut Command="View.Output" Scope="Global">Ctrl+Alt+O</Shortcut>  <!-- Default -->
+          <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+\, D</Shortcut>
+          <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+\, Ctrl+D</Shortcut>
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+\, Q</Shortcut>
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+\, Ctrl+Q</Shortcut>
+          <!--<Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, B</Shortcut>-->  <!-- Already on Ctrl+Alt+K and Ctrl+K, W. Make room for Background Task Status Center status bar icon. -->
+          <!--<Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Ctrl+B</Shortcut>-->
+          <!--<Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+\, W</Shortcut>    --><!-- Reserve for Window Management menu on status bar (HotWindows) Already on Ctrl+Alt+R -->
+          <!--<Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+\, Ctrl+W</Shortcut>    --><!-- Reserve for Window Management menu on status bar (HotWindows) -->
+          <!--<Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+\, G</Shortcut>-->  <!-- Use this for GitHub instead -->
+          <!--<Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+\, Ctrl+G</Shortcut>-->
+          <Shortcut Command="View.TaskRunnerExplorer" Scope="Global">Ctrl+\, Ctrl+Bkspce</Shortcut>
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Shift+K</Shortcut>  <!--To free Ctrl+K, W for WordWrap-->
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+\, Ctrl+Shift+K</Shortcut>  <!--To free Ctrl+K, W for WordWrap-->
+          <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+Alt+E</Shortcut>  <!-- Invented by JEC for convenience -->
+
+          <!-- Toggle Close Tool Windows -->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Solution Explorer">Ctrl+Alt+L</Shortcut>
+          <Shortcut Command="Window.CloseToolWindow" Scope="Test Explorer">Ctrl+\, Ctrl+Shift+T</Shortcut>   <!--Match with new Test Explorer shortcut (ideally Ctrl+\, Ctrl+T)-->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Test Explorer">Ctrl+\, Shift+T</Shortcut>   <!--Match with new Test Explorer shortcut (ideally Ctrl+\, Ctrl+T)-->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, Ctrl+M</Shortcut>
+          <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, M</Shortcut>  <!-- Toogle alt-chord -->
+
+          <!-- Do we want to use F6 for build (or for NextPane)? -->
+          <!--<Shortcut Command="Build.BuildSolution" Scope="Global">F6</Shortcut>-->
+          <!--<Shortcut Command="Build.BuildSelection" Scope="Global">Shift+F6</Shortcut>-->
+
+          <!-- Debug Window shortcuts. Most of these are currently using Ctrl+Alt+?? shortcuts -->
+          <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+Alt+D, B</Shortcut>
+          <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+Alt+D, W</Shortcut>
+          <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+Alt+D, A</Shortcut>
+          <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+Alt+D, L</Shortcut>
+          <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+Alt+D, I</Shortcut>
+          <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+Alt+D, C</Shortcut>
+          <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+Alt+D, T</Shortcut>
+          <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+Alt+D, M</Shortcut>
+          <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+Alt+D, P</Shortcut>
+          <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+Alt+D, H</Shortcut>
+          <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+Alt+D, V</Shortcut>
+          <!--<Shortcut Command="Debug.Disassembly" Scope="Global">Ctrl+Alt+D, D</Shortcut>   --><!-- Default Ctrl+Alt+D is for Debug.Disassembly -->
+          <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+Alt+D, D</Shortcut>  <!-- Maybe this is a good replacement for Debug.Disassembly -->
+          <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+Alt+D, R</Shortcut>
+          <!--<Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+Alt+D, E</Shortcut>  --><!-- No longer exists -->
+          <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+Alt+D, Q</Shortcut>
+          <!--<Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+Alt+D, N</Shortcut>  --><!-- Replaced by Debug.BreakAtFunction ? -->
+          <Shortcut Command="Debug.FunctionBreakpoint" Scope="Global">Ctrl+Alt+D, N</Shortcut>
+          <!--Parallel windows shortcuts (using Ctrl+Shift+D by default and Ctrl+D in Visual C# 2005 scheme) -->
+          <Shortcut Command="Debug.ParallelStacks" Scope="Global">Ctrl+Alt+D, S</Shortcut>  <!-- Default is Ctrl+Shift+D, D -->
+          <Shortcut Command="Debug.ParallelWatch1" Scope="Global">Ctrl+Alt+D, 1</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch2" Scope="Global">Ctrl+Alt+D, 2</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch3" Scope="Global">Ctrl+Alt+D, 3</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.ParallelWatch4" Scope="Global">Ctrl+Alt+D, 4</Shortcut>  <!-- Introduced by JEC -->
+          <Shortcut Command="Debug.Tasks" Scope="Global">Ctrl+Alt+D, K</Shortcut>  <!-- Debug.ParallelTasks no longer exists. Badly mapped in VS C# 2005 scheme -->
+          <!--Debug Memory shortcuts (1-4 are on Ctrl+Alt+M chord by default)-->
+          <!--<Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Alt+D, Y</Shortcut>-->
+          <!--Create new shortcuts for Debug.Memory and free up the Ctrl+Alt+M shortcut-->
+          <RemoveShortcut Command="Debug.Memory1" Scope="Global">Ctrl+Alt+M, 1</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory2" Scope="Global">Ctrl+Alt+M, 2</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory3" Scope="Global">Ctrl+Alt+M, 3</RemoveShortcut>
+          <RemoveShortcut Command="Debug.Memory4" Scope="Global">Ctrl+Alt+M, 4</RemoveShortcut>
+          <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Shift+M, 1</Shortcut>
+          <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+1</Shortcut>
+          <Shortcut Command="Debug.Memory2" Scope="Global">Ctrl+Shift+M, 2</Shortcut>
+          <Shortcut Command="Debug.Memory2" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+2</Shortcut>
+          <Shortcut Command="Debug.Memory3" Scope="Global">Ctrl+Shift+M, 3</Shortcut>
+          <Shortcut Command="Debug.Memory3" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+3</Shortcut>
+          <Shortcut Command="Debug.Memory4" Scope="Global">Ctrl+Shift+M, 4</Shortcut>
+          <Shortcut Command="Debug.Memory4" Scope="Global">Ctrl+Shift+M, Ctrl+Shift+4</Shortcut>
+
+          <!-- Refactoring -->
+          <!--These are all default shortcuts - adding them here for clarity-->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, Ctrl+M</Shortcut>
+          <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, Ctrl+E</Shortcut>
+          <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, Ctrl+I</Shortcut>
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, Ctrl+O</Shortcut>  <!-- Seems to be the same as RemoveParameters -->
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, Ctrl+V</Shortcut>  <!-- Seems to be the same as ReorderParameters -->
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, Ctrl+R</Shortcut>
+          <!-- Additional bindings on top of existing default Ctrl/Ctrl chords -->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, M</Shortcut>
+          <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, E</Shortcut>
+          <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, I</Shortcut>
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, O</Shortcut>
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, V</Shortcut>
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, R</Shortcut>
+
+          <!-- Rename in different scopes (Default global F2 = View.EditLabel) -->
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>   <!-- Introduced by JEC. Not in Visual C# 2005 -->
+
+          <!--Introduce new refactoring shortcuts (without chords)-->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+Alt+M</Shortcut>
+          <!--These commands are not exposed in VS yet-->
+          <!--<Shortcut Command="Refactor.ExtractLocalVariable" Scope="Text Editor">Ctrl+Alt+V</Shortcut>-->
+          <!--<Shortcut Command="Refactor.Inline" Scope="Text Editor">Ctrl+Alt+I</Shortcut>-->
+          <!--<Shortcut Command="Refactor.ExtractParameter" Scope="Text Editor">Ctrl+Alt+P</Shortcut>-->
+
+          <!--Re-bind Remove and Sort Usings to Ctrl+R, Ctrl+U-->
+          <RemoveShortcut Command="EditorContextMenus.CodeWindow.RemoveAndSort" Scope="Text Editor">Ctrl+R, G</RemoveShortcut>
+          <Shortcut Command="EditorContextMenus.CodeWindow.RemoveAndSort" Scope="Text Editor">Ctrl+R, Ctrl+U</Shortcut>  <!-- Currently on Ctrl+R, Ctrl+G -->
+          <!--Special treatment: Separate command appears on the Edit->IntelliSense menu. Give it the short-form chord so users can discover the shortcut.-->
+          <Shortcut Command="Edit.RemoveAndSort" Scope="Text Editor">Ctrl+R, U</Shortcut>  <!-- Not bound in default mapping -->
+
+          <!-- Help -->
+          <!-- No need to define chords for help. Only Help.ViewHelp exists and can use default system shortcut Ctrl+F1 -->
+          <!--<Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, M</Shortcut>  --><!-- No such thing in VS2017 -->
+          <!--<Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, Ctrl+M</Shortcut>-->
+          <!--<Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, V</Shortcut>-->
+          <!--<Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, Ctrl+V</Shortcut>-->
+
+          <!-- Code/Design toggle -->
+          <!-- Do we really need these? They seem to be Default Shortcuts when exporting shortcuts in vssettings -->
+          <!--<Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>-->
+          <!--<Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>-->
+
+          <!-- Editor shortcuts from Visual C# 2005 scheme -->
+          <!--<Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, M</Shortcut>  --><!-- no such thing -->
+          <!--<Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, Ctrl+M</Shortcut>-->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, R</Shortcut>  --><!-- Default uses Shift+F12 -->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, Ctrl+R</Shortcut>-->
+          <!--<Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+F12</Shortcut>  --><!-- Already in system -->
+          <!--<Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, P</Shortcut>  --><!-- Default is Ctrl+Shift+Space. NextBookmark uses Ctrl+K, P  -->
+          <!--<Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, Ctrl+P</Shortcut>-->
+          <!-- IntelliSense -->
+          <!--<Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, L</Shortcut>   --><!-- Default is Ctrl+J. ClearBookmarks uses Ctrl+K, L -->
+          <!--<Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, Ctrl+L</Shortcut>  --><!-- Default is Ctrl+J -->
+          <!--<Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, W</Shortcut>  --><!-- Default is Ctrl+Space (or Alt+RightArrow) -->
+          <!--<Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>  --><!-- Default is Ctrl+Space (or Alt+RightArrow) -->
+
+          <!-- Additional shortcuts to compliment the Ctrl+K, Ctrl+?? chords -->
+          <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, S</Shortcut>
+          <Shortcut Command="Edit.InsertSnippet" Scope="Global">Ctrl+K, X</Shortcut>
+          <!--<Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, I</Shortcut>-->
+
+          <!--<Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, A</Shortcut>-->  <!-- Default is Ctrl+K, Ctrl+A -->
+          <!--<Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, Ctrl+A</Shortcut>-->
+          <!--<Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, \</Shortcut>  --><!--Default is Ctrl+K, Ctrl+\-->
+          <!--<Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+\</Shortcut>-->
+          <!--<Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, S</Shortcut>  --><!-- Default is Ctrl+R, W. But this quite nice. :-) -->
+          <!--<Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+S</Shortcut>  --><!-- Default is Ctrl+R, W -->
+          <!--<Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, T</Shortcut>   --><!-- Default is Ctrl+K, Ctrl+H. Default Ctrl+E, T is ShowTestExplorer -->
+          <!--<Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, Ctrl+T</Shortcut>--><!-- Default is Ctrl+K, Ctrl+H. Default Ctrl+E, Ctrl+T is TaskStatusCenter -->
+          <!-- Additional shortcuts to compliment the Ctrl+E, Ctrl+?? chords -->
+          <!--<Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, W</Shortcut>  --><!--Don't do this. Clear Ctrl+E, for Expand Selection-->
+          <!--<RemoveShortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, Ctrl+W</RemoveShortcut>-->
+
+          <!-- Outlining -->
+          <!-- Additional shortcuts to compliment the Ctrl+M, Ctrl+?? Outlining chords -->
+          <Shortcut Command="Edit.ToggleOutliningExpansion" Scope="Text Editor">Ctrl+M, M</Shortcut>
+          <Shortcut Command="Edit.ToggleAllOutlining" Scope="Text Editor">Ctrl+M, L</Shortcut>
+          <Shortcut Command="Edit.StopOutlining" Scope="Text Editor">Ctrl+M, P</Shortcut>
+          <Shortcut Command="Edit.CollapsetoDefinitions" Scope="Text Editor">Ctrl+M, O</Shortcut>
+
+          <!-- Comment/Format-->
+          <!--<Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, C</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+C</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, U</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+U</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, D</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, Ctrl+D</Shortcut>  --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, F</Shortcut> --><!-- Redundant -->
+          <!--<Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, Ctrl+F</Shortcut> --><!-- Redundant -->
+
+          <!-- Bookmarks -->
+          <!-- These are already on the Ctrl+K chord in the default -->
+          <!--<Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, E</Shortcut>-->
+          <!--<Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, Ctrl+E</Shortcut>-->
+          <!--<Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, C</Shortcut>  --><!-- Ctrl+K, L -->
+          <!--<Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, Ctrl+C</Shortcut>-->
+          <!--<Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, T</Shortcut>  --><!-- Ctrl+K, K -->
+          <!--<Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, Ctrl+T</Shortcut>-->
+          <!--<Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, N</Shortcut> --><!-- Ctrl+K, N -->
+          <!--<Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, Ctrl+N</Shortcut>-->
+          <!--<Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, P</Shortcut> --><!-- Ctrl+K, P -->
+          <!--<Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, Ctrl+P</Shortcut>-->
+
+          <!-- Special -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Alt+Enter</Shortcut>  <!-- Already in system -->
+          <Shortcut Command="Project.AddClass" Scope="Global">Shift+Alt+C</Shortcut>
+          <!--<Shortcut Command="Edit.SelectCurrentWord" Scope="Global">Ctrl+Shift+W</Shortcut>  -->  <!-- Added because Ctrl+W will be used for Close Document -->  <!-- Removed because ExpandSelection can do current word and Ctrl+Shift+W does open web browser -->
+          <!--<Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>-->  <!-- Deprecating this Should be reserved for Edit.ToggleLineComment -->
+
+          <!-- TODO: Keep this up-to-date with the latest Visual C# 2005 scheme -->
+
+          <!-- ======================== -->
+          <!-- New Shortcuts for VS2017 -->
+          <!-- ======================== -->
+
+          <!-- Special -->
+          <!--<Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>-->  <!-- Moved into section above (to keep near Rename shortcuts) -->
+          <RemoveShortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</RemoveShortcut>  <!-- remove this so that global commands will work on Ctrl+W -->
+          <!--<Shortcut Command="Window.CloseDocumentWindow" Scope="Global">Ctrl+W</Shortcut>   --><!-- This replaces many global -->
+          <Shortcut Command="File.Close" Scope="Global">Ctrl+W</Shortcut>   <!-- This replaces many global -->
+          <RemoveShortcut Command="Edit.DecreaseSelection" Scope="Text Editor">Ctrl+Shift+W</RemoveShortcut>
+          <RemoveShortcut Command="File.ViewinBrowser" Scope="Global">Ctrl+Shift+W</RemoveShortcut>
+          <Shortcut Command="File.ViewinBrowser" Scope="Global">Ctrl+Shift+R</Shortcut>
+          <Shortcut Command="Window.CloseAllDocuments" Scope="Global">Ctrl+Shift+W</Shortcut>
+
+          <!--<Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  --><!-- "OptimizeImports" -->
+          <Shortcut Command="File.CloseSolution" Scope="Global">Ctrl+F4</Shortcut>
+          <Shortcut Command="File.Exit" Scope="Global">Alt+F4</Shortcut>
+          <Shortcut Command="Tools.Options" Scope="Global">Ctrl+Alt+S</Shortcut>  <!--Like "Settings"-->
+
+          <!-- Navigation -->
+          <Shortcut Command="View.NavigateBackward" Scope="Global">Alt+Left Arrow</Shortcut>    <!-- Overrides Global View.Backward (Alt+Left Arrow) -->
+          <Shortcut Command="View.NavigateForward" Scope="Global">Alt+Right Arrow</Shortcut>  <!-- Overrides Global View.NavigateForward -->
+          <Shortcut Command="View.NavigateForward" Scope="Text Editor">Alt+Right Arrow</Shortcut>  <!-- Override TextEditor bindings (Edit.CompleteWord) -->
+          <!--<Shortcut Command="View.NavigateForward" Scope="Workflow Designer">Alt+Right Arrow</Shortcut>  --><!-- Override to remove existing shortcut (Edit.CompleteWord) VS2015 only -->
+          <!-- Note: Alt+Left/Right conflicts with Global View.Forward/Backward (used by WebBrowser)-->
+          <Shortcut Command="View.Backward" Scope="WebBrowser">Alt+Left Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+          <Shortcut Command="View.Forward" Scope="WebBrowser">Alt+Right Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+
+          <!-- Document Navigation shortcuts -->
+          <!-- Clear Ctrl+PgUp/Dn keys from Text Editor -->
+          <RemoveShortcut Command="Edit.ViewTop" Scope="Text Editor">Ctrl+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewBottom" Scope="Text Editor">Ctrl+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewTopExtend" Scope="Text Editor">Ctrl+Shift+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ViewBottomExtend" Scope="Text Editor">Ctrl+Shift+PgDn</RemoveShortcut>
+          <!-- Clear Ctrl+PgUp/Dn keys from HTML Editor -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="HTML Editor Design View">Ctrl+PgUp</RemoveShortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="HTML Editor Source View">Ctrl+PgUp</RemoveShortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <RemoveShortcut Command="View.NextView" Scope="HTML Editor Design View">Ctrl+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="View.NextView" Scope="HTML Editor Source View">Ctrl+PgDn</RemoveShortcut>
+          <!-- Clear Ctrl+Alt+PgUp/Dn keys from Global scope -->
+          <RemoveShortcut Command="Window.PreviousTab" Scope="Global">Ctrl+Alt+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Window.NextTab" Scope="Global">Ctrl+Alt+PgDn</RemoveShortcut>
+          <RemoveShortcut Command="Window.PreviousTabandAddtoSelection" Scope="Global">Ctrl+Shift+Alt+PgUp</RemoveShortcut>
+          <RemoveShortcut Command="Window.NextTabandAddtoSelection" Scope="Global">Ctrl+Shift+Alt+PgDn</RemoveShortcut>
+          <!-- New shortcuts for Global Document Navigation -->
+          <Shortcut Command="Window.PreviousTab" Scope="Global">Ctrl+PgUp</Shortcut>  <!-- VS default -->
+          <Shortcut Command="Window.NextTab" Scope="Global">Ctrl+PgDn</Shortcut>  <!-- VS default -->
+          <Shortcut Command="Window.PreviousTabandAddtoSelection" Scope="Global">Ctrl+Shift+PgUp</Shortcut>
+          <Shortcut Command="Window.NextTabandAddtoSelection" Scope="Global">Ctrl+Shift+PgDn</Shortcut>
+          <!-- New shortcuts for View Top/Bottom + extend selection in Text Editor -->
+          <Shortcut Command="Edit.ViewTop" Scope="Text Editor">Alt+Home</Shortcut>   <!-- New! New shortcut (chosen by JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgUp -->
+          <Shortcut Command="Edit.ViewBottom" Scope="Text Editor">Alt+End</Shortcut> <!-- New! New shortcut (chosen by JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgDn -->
+          <Shortcut Command="Edit.ViewTopExtend" Scope="Text Editor">Shift+Alt+Home</Shortcut>
+          <Shortcut Command="Edit.ViewBottomExtend" Scope="Text Editor">Shift+Alt+End</Shortcut>
+          <!-- New shortcuts for the Web Forms Desginer/Source -->
+          <Shortcut Command="Window.PreviousTab" Scope="HTML Editor Design View">Ctrl+Alt+PgUp</Shortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <Shortcut Command="Window.PreviousTab" Scope="HTML Editor Source View">Ctrl+Alt+PgUp</Shortcut>  <!-- This is weird. Should be View.PreviousView -->
+          <Shortcut Command="View.NextView" Scope="HTML Editor Design View">Ctrl+Alt+PgDn</Shortcut>
+          <Shortcut Command="View.NextView" Scope="HTML Editor Source View">Ctrl+Alt+PgDn</Shortcut>
+
+          <!--Split Window shortcuts (from Sublime)-->
+          <!--Create New Tab Group-->
+          <Shortcut Command="Window.NewVerticalTabGroup" Scope="Global">Ctrl+\, Ctrl+Right Arrow</Shortcut>
+          <Shortcut Command="Window.NewHorizontalTabGroup" Scope="Global">Ctrl+\, Ctrl+Down Arrow</Shortcut>
+          <!--Move document to other tab group-->
+          <Shortcut Command="Window.MovetoNextTabGroup" Scope="Global">Ctrl+\, Ctrl+PgDn</Shortcut>
+          <Shortcut Command="Window.MovetoPreviousTabGroup" Scope="Global">Ctrl+\, Ctrl+PgUp</Shortcut>
+          <!--Close tab group-->
+          <Shortcut Command="OtherContextMenus.EasyMDIToolWindow.MoveAlltoPreviousTabGroup" Scope="Global">Ctrl+\, Ctrl+Home</Shortcut>
+          <Shortcut Command="OtherContextMenus.EasyMDIToolWindow.MoveAlltoNextTabGroup" Scope="Global">Ctrl+\, Ctrl+End</Shortcut>
+          <!--Floating/Docking -->
+          <Shortcut Command="Window.Float" Scope="Global">Ctrl+\, Ctrl+Enter</Shortcut>
+          <Shortcut Command="Window.FloatAll" Scope="Global">Ctrl+\, Ctrl+Shift+Enter</Shortcut>
+          <Shortcut Command="Window.MoveToMainDocumentGroup" Scope="Global">Ctrl+\, Ctrl+Shift+Bkspce</Shortcut>
+          <!--VS seems to be missing commands for Navigating to next/previous tab group -->
+
+          <!-- In-Editor navigation -->
+          <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Ctrl+Alt+Up Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+          <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Ctrl+Alt+Down Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+          <!-- Provide replacements for shortcuts taken in GoToMethodAbove/Below (Ctrl+Alt+Up/Down) -->
+          <Shortcut Command="Window.ShowEzMDIFileList" Scope="Global">Ctrl+Alt+End</Shortcut>
+
+          <!--Containing Block-->
+          <RemoveShortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+Alt+=</RemoveShortcut>  <!-- Take away the default shortcut. Might be more useful for something else. -->
+          <!--<Shortcut Command="EditorContextMenus.Navigate.GoToContainingBlock" Scope="Text Editor">Ctrl+Alt+PgUp</Shortcut>-->
+          <!--<Shortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+Alt+PgUp</Shortcut>-->
+          <Shortcut Command="EditorContextMenus.Navigate.GoToContainingBlock" Scope="Text Editor">Ctrl+[</Shortcut>
+          <Shortcut Command="Edit.ExpandSelectiontoContainingBlock" Scope="Text Editor">Ctrl+Shift+[</Shortcut>
+          <!-- Go To Brace ie. { } -->
+          <Shortcut Command="Edit.GotoBrace" Scope="Text Editor">Ctrl+]</Shortcut>    <!-- Default -->
+          <Shortcut Command="Edit.GotoBraceExtend" Scope="Text Editor">Ctrl+Shift+]</Shortcut>    <!-- Default -->
+          <!--Find new global shortcuts for keys blocked by ContainingBlock shortcuts (Ctrl+[)-->
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Global">Shift+Alt+L</Shortcut>
+          <!--TODO: Consider these Solution Explorer shortcuts, which are Global by default. Move to SolnExpl scope for now.-->
+          <Shortcut Command="SolutionExplorer.PendingChangesFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+P</Shortcut>
+          <Shortcut Command="SolutionExplorer.OpenFilesFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+O</Shortcut>
+          <Shortcut Command="SolutionExplorer.ErrorsFilter" Scope="Solution Explorer">Ctrl+[, Ctrl+E</Shortcut>
+
+          <!--Already in the system, but want to ensure they are part of this scheme-->
+          <Shortcut Command="Edit.NextHighlightedReference" Scope="Text Editor">Ctrl+Shift+Down Arrow</Shortcut>
+          <Shortcut Command="Edit.PreviousHighlightedReference" Scope="Text Editor">Ctrl+Shift+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.LineOpenAbove" Scope="Text Editor">Ctrl+Enter</Shortcut>
+          <Shortcut Command="Edit.LineOpenBelow" Scope="Text Editor">Ctrl+Shift+Enter</Shortcut>
+
+          <!-- Outlining shortcuts (Expand/Collapse sections of code) -->
+          <RemoveShortcut Command="View.NavigateBackward" Scope="Global">Ctrl+-</RemoveShortcut>       <!-- Remove this shortcut - needed for Outlining-->
+          <RemoveShortcut Command="View.NavigateForward" Scope="Global">Ctrl+Shift+-</RemoveShortcut>  <!-- Remove this shortcut - needed for Outlining-->
+          <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+Num +</Shortcut>
+          <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+=</Shortcut>
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+-</Shortcut>  <!-- Overrides View.NavigateBackward -->
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+Num +</Shortcut>
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+=</Shortcut>
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+-</Shortcut>  <!-- Overrides View.NavigateForward -->
+
+          <!-- GoTo Next Error / Previous Error -->
+          <Shortcut Command="Edit.GoToNextIssueinFile" Scope="Global">Alt+PgDn</Shortcut>    <!--Default shortcut-->
+          <Shortcut Command="Edit.GoToPreviousIssueinFile" Scope="Global">Alt+PgUp</Shortcut>   <!--Default shortcut-->
+          <Shortcut Command="View.NextError" Scope="Global">Shift+Alt+PgDn</Shortcut>
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+PgUp</Shortcut>
+
+          <!-- Window Navigation shortcuts -->
+          <!-- Docking and Hiding Toolwindows -->
+          <Shortcut Command="Window.AutoHide" Scope="Global">Shift+Ins</Shortcut>
+          <Shortcut Command="Window.AutoHideAll" Scope="Global">Shift+Alt+Ins</Shortcut>
+          <Shortcut Command="Window.Dock" Scope="Global">Ctrl+Ins</Shortcut>
+          <Shortcut Command="Window.DockasTabbedDocument" Scope="Global">Ctrl+Shift+Ins</Shortcut>
+          <!--Tool Window Nav-->
+          <Shortcut Command="Window.NextToolWindowNav" Scope="Global">Ctrl+`</Shortcut>   <!--Default is Ctrl+F7-->
+          <Shortcut Command="Window.PreviousToolWindowNav" Scope="Global">Ctrl+Shift+`</Shortcut>   <!--Default is Ctrl+Shift+F7-->
+
+          <!--Editor Shortcuts-->
+          <Shortcut Command="Edit.SelectAll" Scope="Text Editor">Ctrl+A</Shortcut> <!-- This is already the default, but putting it here to make sure -->
+          <Shortcut Command="Edit.Redo" Scope="Global">Ctrl+Shift+Z</Shortcut>
+          <Shortcut Command="Edit.Redo" Scope="Text Editor">Ctrl+Y</Shortcut>   <!-- Default in system -->
+          <Shortcut Command="Edit.LineDelete" Scope="Text Editor">Ctrl+Shift+Del</Shortcut>  <!--System default is Ctrl+Shift+L-->
+
+          <!--Toggle Comment -->
+          <!-- Unable to assign Toggle Line comment or Toggle Block comment -->
+          <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+/</Shortcut>
+          <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+Shift+/</Shortcut>
+
+          <!-- Expand Selection shortcuts -->
+          <!--Reassign default shortcuts on Ctrl+E and Ctrl+Shift+E-->
+          <!--Move Word Wrap to Ctrl+K,W. Push BookmarkWindow to Ctrl+\ chord like other windows-->
+          <RemoveShortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, Ctrl+W</RemoveShortcut>
+          <RemoveShortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+K, Ctrl+W</RemoveShortcut>
+          <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+K, W</Shortcut>   <!--Introduced by JEC-->
+          <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>   <!--Introduced by JEC-->
+          <!--Test Explorer-->
+          <RemoveShortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+E, T</RemoveShortcut>
+          <Shortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+\, Ctrl+Shift+T</Shortcut>  <!--Should find a better shortcut for this. Maybe Ctrl+\, Ctrl+T - which is on TaskList by default-->
+          <Shortcut Command="TestExplorer.ShowTestExplorer" Scope="Global">Ctrl+\, Shift+T</Shortcut>
+          <!--Code Covereage Reults-->
+          <RemoveShortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+E, C</RemoveShortcut>
+          <Shortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+\, Ctrl+V</Shortcut>
+          <Shortcut Command="Test.CodeCoverageResults" Scope="Global">Ctrl+\, V</Shortcut>
+          <!--Ctrl+E in CSharp scope-->
+          <RemoveShortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+E, E</RemoveShortcut>
+          <RemoveShortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+E, Ctrl+E</RemoveShortcut>
+          <Shortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+K, I</Shortcut>
+          <Shortcut Command="InteractiveConsole.ExecuteInInteractive" Scope="CSharp Editor">Ctrl+K, Ctrl+I</Shortcut>
+          <!--Ctrl+Shift+E-->
+          <RemoveShortcut Command="View.ResourceView" Scope="Global">Ctrl+Shift+E</RemoveShortcut>   <!--Assigned to Ctrl+\, Ctrl+R-->
+          <!--Apply Expand Selection shortcuts (Text Editor) -->
+          <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+E</Shortcut>
+          <Shortcut Command="Edit.ContractseSelection" Scope="Text Editor">Ctrl+Shift+E</Shortcut>   <!--Watch out for the strange spelling in this command-->
+
+          <!--  Ctrl+D shortcuts - Sublime use Ctrl+D for NextMatching, JetBrains use Ctrl+D for Duplicate -->
+          <!--Put Duplicate on Ctrl+D-->
+          <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Already in system -->
+          <!--Put Multi-caret shortcuts on Ctrl+Shift+D -->
+          <Shortcut Command="Edit.InsertNextMatchingCaret" Scope="Text Editor">Ctrl+Shift+D</Shortcut>
+          <Shortcut Command="Edit.InsertCaretsatAllMatching" Scope="Text Editor">Ctrl+Shift+Alt+D</Shortcut>
+
+          <!-- Source control shortcuts -->
+          <!-- Fetch, Pull, Push -->
+          <Shortcut Command="Team.Git.Fetch" Scope="Global">Ctrl+Shift+K, F</Shortcut>
+          <Shortcut Command="Team.Git.Fetch" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+F</Shortcut>
+          <Shortcut Command="Team.Git.Pull" Scope="Global">Ctrl+Shift+K, L</Shortcut>
+          <Shortcut Command="Team.Git.Pull" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="Team.Git.Push" Scope="Global">Ctrl+Shift+K, P</Shortcut>
+          <Shortcut Command="Team.Git.Push" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+P</Shortcut>
+
+          <!-- Reserving shortcuts for commands (when they become global) -->
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Global">Ctrl+\, H</Shortcut>
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Global">Ctrl+\, Ctrl+H</Shortcut>
+          <Shortcut Command="Team.Git.CreateBranch" Scope="Global">Ctrl+Shift+K, N</Shortcut>
+          <Shortcut Command="Team.Git.CreateBranch" Scope="Global">Ctrl+Shift+K, Ctrl+Shift+N</Shortcut>
+
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+Alt+G</Shortcut>
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+\, G</Shortcut>
+          <Shortcut Command="GitHub.ShowGitHubPane" Scope="Global">Ctrl+\, Ctrl+G</Shortcut>
+
+          <!-- New Status Bar button shortcuts -->
+          <RemoveShortcut Command="View.PendingChanges" Scope="Global">Ctrl+Alt+F7</RemoveShortcut>
+          <RemoveShortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+E, Ctrl+C</RemoveShortcut>
+          <RemoveShortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+E, Ctrl+T</RemoveShortcut>
+          <Shortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+\, Y</Shortcut>
+          <Shortcut Command="View.UnpublishedCommits" Scope="Global">Ctrl+\, Ctrl+Y</Shortcut>
+          <Shortcut Command="View.PendingChanges" Scope="Global">Ctrl+\, I</Shortcut>
+          <Shortcut Command="View.PendingChanges" Scope="Global">Ctrl+\, Ctrl+I</Shortcut>
+          <Shortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+\, B</Shortcut>
+          <Shortcut Command="View.ShowTaskStatusCenter" Scope="Global">Ctrl+\, Ctrl+B</Shortcut>
+
+          <!--Navigation shortcuts-->
+          <Shortcut Command="Edit.GoToDefinition" Scope="Global">Ctrl+B</Shortcut>
+          <Shortcut Command="Edit.GoToImplementation" Scope="Global">Ctrl+Alt+B</Shortcut>
+          <!-- Continue to use Ctrl+Shift+B for Build -->
+          <Shortcut Command="Build.BuildSolution" Scope="Global">Ctrl+Shift+B</Shortcut>   <!--Default shortcut-->
+
+          <!--Add new shortcuts for Find References (Usages) and Find Symbol-->
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+U</Shortcut>  <!--Like "Usages"-->
+          <Shortcut Command="Edit.QuickFindSymbol" Scope="Global">Ctrl+Shift+U</Shortcut>   <!--This is the old Find References command. Find something better for this shortcut. Maybe GoToBase or GoToParent -->
+          <!--Clear the Ctrl+U/Ctrl+Shift+U chords - Provide alternative shortcuts for Make Upper/Lower case-->
+          <RemoveShortcut Command="Edit.MakeLowercase" Scope="Text Editor">Ctrl+U</RemoveShortcut>
+          <RemoveShortcut Command="Edit.MakeUppercase" Scope="Text Editor">Ctrl+Shift+U</RemoveShortcut>
+          <Shortcut Command="Edit.MakeLowercase" Scope="Text Editor">Ctrl+Shift+K, Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="Edit.MakeUppercase" Scope="Text Editor">Ctrl+Shift+K, Ctrl+Shift+U</Shortcut>
+
+          <!--GoTo shortcuts-->
+          <Shortcut Command="Edit.GoToAll" Scope="Global">Ctrl+T</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="Edit.GoToFile" Scope="Global">Ctrl+P</Shortcut>  <!--GoToFile on Ctrl+P like VSCode-->
+          <Shortcut Command="Edit.GoToType" Scope="Global">Ctrl+Shift+P</Shortcut>
+          <Shortcut Command="Edit.GoToSymbol" Scope="Global">Ctrl+Shift+Alt+P</Shortcut>
+          <Shortcut Command="Edit.GoToMember" Scope="Global">Alt+\</Shortcut>   <!-- Like ReSharper -->
+          <Shortcut Command="Edit.GoTo" Scope="Global">Ctrl+G</Shortcut>   <!-- GoToLine (Default shortcut) -->
+
+          <!--Placing these here just for clarity-->
+          <Shortcut Command="File.OpenFile" Scope="Global">Ctrl+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenProject" Scope="Global">Ctrl+Shift+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenFolder" Scope="Global">Ctrl+Shift+Alt+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.OpenWebSite" Scope="Global">Shift+Alt+O</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.NewFile" Scope="Global">Ctrl+N</Shortcut>  <!--Default shortcut-->
+          <Shortcut Command="File.NewProject" Scope="Global">Ctrl+Shift+N</Shortcut>  <!--Default shortcut-->
+
+          <!---Move GoToLine from Ctrl+G to Ctrl+L - Hold off on this -->
+          <!--Free the Ctrl+L shortcut-->
+          <!--<RemoveShortcut Command="Edit.LineCut" Scope="Text Editor">Ctrl+L</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Format.ConverttoHyperlink" Scope="HTML Editor Design View">Ctrl+L</RemoveShortcut>-->
+          <!--<Shortcut Command="Edit.LineCut" Scope="Text Editor">Shift+Del</Shortcut>  --><!--Instead of Cut, will do LineCut-->
+          <!--Move GoToLine over to Ctrl+L-->
+          <!--<Shortcut Command="Edit.GoTo" Scope="Text Editor">Ctrl+L</Shortcut>-->
+          <!--Can now free the Ctrl+G shortcut-->
+          <!--<RemoveShortcut Command="Edit.GoTo" Scope="Global">Ctrl+G</RemoveShortcut>-->
+          
+          <!--Free the Ctrl+I shortcut - Can use it for Quick Info or Parameter Info-->
+          <!--Move IncrementalSearch to Alt+F3-->
+          <Shortcut Command="Edit.IncrementalSearch" Scope="Global">Alt+F3</Shortcut>
+          <Shortcut Command="Edit.ReverseIncrementalSearch" Scope="Global">Shift+Alt+F3</Shortcut>
+          <RemoveShortcut Command="Edit.StopSearch" Scope="Global">Alt+F3, S</RemoveShortcut>  <!--Need to find a replacement for this-->
+          <RemoveShortcut Command="Edit.IncrementalSearch" Scope="Text Editor">Ctrl+I</RemoveShortcut>
+          <RemoveShortcut Command="Edit.ReverseIncrementalSearch" Scope="Text Editor">Ctrl+Shift+I</RemoveShortcut>
+
+          <!-- Quick Launch - Move QuickLaunch to Alt+Q like Office and free the Ctrl+Q key - Hold off on this -->
+          <!--<RemoveShortcut Command="Window.ActivateQuickLaunch" Scope="Global">Ctrl+Q</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Window.ActivateQuickLaunchPreviousCategory" Scope="Global">Ctrl+Shift+Q</RemoveShortcut>-->
+          <Shortcut Command="Window.ActivateQuickLaunch" Scope="Global">Alt+Q</Shortcut>
+          <Shortcut Command="Window.ActivateQuickLaunchPreviousCategory" Scope="Global">Shift+Alt+Q</Shortcut>
+
+          <!--Shortcuts for Method and Parameter info-->
+          <!--<RemoveShortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, Ctrl+I</RemoveShortcut>-->
+          <!--<RemoveShortcut Command="Edit.QuickInfo" Scope="Find All References Tool Window">Ctrl+K, Ctrl+I</RemoveShortcut>-->
+          <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+I</Shortcut>
+          <Shortcut Command="Edit.QuickInfo" Scope="Find All References Tool Window">Ctrl+I</Shortcut>
+          <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+Shift+I</Shortcut>
+          <!--Can free up Ctrl+Shift+Space - maybe reserve for Smart Type Completion when it's delivered. Hold off for now -->
+          <!--<RemoveShortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+Shift+Space</RemoveShortcut>-->
+
+        </ShortcutsSchemeDef>
+        <!--</UserShortcuts>-->
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/KeyboardSchemes/VSSettings/Visual CSharp 2015.vssettings b/KeyboardSchemes/VSSettings/Visual CSharp 2015.vssettings
index 62e7ec1..000565a 100644
--- a/KeyboardSchemes/VSSettings/Visual CSharp 2015.vssettings	
+++ b/KeyboardSchemes/VSSettings/Visual CSharp 2015.vssettings	
@@ -1,234 +1,273 @@
 <UserSettings>
-    <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
-    <Category name="Environment_Group" RegisteredName="Environment_Group">
-        <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
-            <KeyboardShortcuts Version="8.0">
-                <ScopeDefinitions>
-                    <Scope Name="Class Diagram" ID="{59B0B277-7DDF-4E36-A3ED-02DAC5B9E2FA}" />
-                    <Scope Name="Deployment Diagram" ID="{D056D361-43FC-4DDD-8559-0D40EB8C77D7}" />
-                    <Scope Name="Logical Datacenter Diagram" ID="{222AC579-87F1-44CE-AE8C-B7D95931ED9F}" />
-                    <Scope Name="Application Connection Diagram" ID="{5A1FF380-5684-4D47-8E04-BDED2D53DCA4}" />
-                    <Scope Name="{FB87333B-16C8-400E-BC8F-F6B890410582}" ID="{FB87333B-16C8-400E-BC8F-F6B890410582}" />
-                    <Scope Name="XML Editor Data View" ID="{F482F8AF-1E66-4760-919E-964707265994}" />
-                    <Scope Name="XML Editor Schema View" ID="{E6631B5B-2EAB-41E8-82FD-6469645C76C9}" />
-                    <Scope Name="HTML Editor Source View" ID="{CB3FCFEB-03DF-11D1-81D2-00A0C91BBEE3}" />
-                    <Scope Name="Managed Resources Editor" ID="{FEA4DCC9-3645-44CD-92E7-84B55A16465C}" />
-                    <Scope Name="DataSet Editor" ID="{B334A759-F450-40A5-BE2A-65937BCD5415}" />
-                    <Scope Name="HTML Editor Design View" ID="{CB3FCFEA-03DF-11D1-81D2-00A0C91BBEE3}" />
-                    <Scope Name="Windows Forms Designer" ID="{BA09E2AF-9DF2-4068-B2F0-4C7E5CC19E2F}" />
-                    <Scope Name="{28D4A6C1-6FBF-42A9-8CC7-A705F524AEC8}" ID="{28D4A6C1-6FBF-42A9-8CC7-A705F524AEC8}" />
-                    <Scope Name="TOC Editor" ID="{75DC5041-469F-11D3-8F04-00C04F5E0C38}" />
-                    <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}" />
-                    <Scope Name="{F17BDAE0-A16D-11D0-9F04-00A0C911004F}" ID="{F17BDAE0-A16D-11D0-9F04-00A0C911004F}" />
-                    <Scope Name="WebBrowser" ID="{E8B06F41-6D01-11D2-AA7D-00C04F990343}" />
-                    <Scope Name="View Designer" ID="{B968E165-98E0-41F0-8FBE-A8ED1D246A90}" />
-                    <Scope Name="Query Designer" ID="{B2C40B32-3A37-4CA9-97B9-FA44248B69FF}" />
-                    <Scope Name="VC Accelerator Editor" ID="{EB56D0B5-BEE7-4D0C-8BE6-88A8ED256695}" />
-                    <Scope Name="VC String Editor" ID="{58442DA9-10DA-4AA9-A2AF-96E4D481379B}" />
-                    <Scope Name="VC Image Editor" ID="{C0BA70ED-069E-412B-9C06-7442E28A11B9}" />
-                    <Scope Name="VC Dialog Editor" ID="{543E0C02-8C85-4E43-933A-5EF320E3431F}" />
-                    <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}" />
-                </ScopeDefinitions>
-                <ShortcutsSchemeDef Name="Visual C# 2015">
-                    <Shortcut Command="Project.AddClass" Scope="Global">Shift+Alt+C</Shortcut>
-                    <Shortcut Command="Edit.SelectCurrentWord" Scope="Global">Ctrl+Shift+W</Shortcut>
-                    <Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>
-                    <Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+W, N</Shortcut>
-                    <Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+W, Ctrl+N</Shortcut>
-                    <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+W, K</Shortcut>
-                    <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+W, Ctrl+K</Shortcut>
-                    <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+W, M</Shortcut>    <!-- Fix -->
-                    <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+W, Ctrl+M</Shortcut>    <!-- Fix -->
-                    <Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+W, S</Shortcut>
-                    <Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+W, Ctrl+S</Shortcut>
-                    <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+W, P</Shortcut>
-                    <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+W, Ctrl+P</Shortcut>
-                    <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+W, J</Shortcut>
-                    <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+W, Ctrl+J</Shortcut>
-                    <Shortcut Command="View.Toolbox" Scope="Global">Ctrl+W, X</Shortcut>
-                    <Shortcut Command="View.Toolbox" Scope="Global">Ctrl+W, Ctrl+X</Shortcut>
-                    <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, M</Shortcut>
-                    <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, E</Shortcut>
-                    <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, I</Shortcut>
-                    <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, O</Shortcut>
-                    <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, V</Shortcut>
-                    <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, R</Shortcut>
-                    <Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>
-                    <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, S</Shortcut>
-                    <Shortcut Command="Edit.InsertSnippet" Scope="Global">Ctrl+K, X</Shortcut>
-                    <Shortcut Command="Build.BuildSolution" Scope="Global">F6</Shortcut>
-                    <Shortcut Command="Build.BuildSelection" Scope="Global">Shift+F6</Shortcut>
-                    <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+D, B</Shortcut>
-                    <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+D, Ctrl+B</Shortcut>
-                    <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+D, W</Shortcut>
-                    <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+D, Ctrl+W</Shortcut>
-                    <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+D, A</Shortcut>
-                    <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+D, Ctrl+A</Shortcut>
-                    <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+D, L</Shortcut>
-                    <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+D, Ctrl+L</Shortcut>
-                    <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+D, I</Shortcut>
-                    <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+D, Ctrl+I</Shortcut>
-                    <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+D, C</Shortcut>
-                    <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+D, Ctrl+C</Shortcut>
-                    <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+D, T</Shortcut>
-                    <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+D, Ctrl+T</Shortcut>
-                    <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+D, M</Shortcut>
-                    <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+D, Ctrl+M</Shortcut>
-                    <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+D, P</Shortcut>
-                    <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+D, Ctrl+P</Shortcut>
-                    <Shortcut Command="Debug.ParallelStacks" Scope="Global">CTRL+D,S</Shortcut>
-                    <Shortcut Command="Debug.ParallelStacks" Scope="Global">CTRL+D,CTRL+S</Shortcut>
-                    <Shortcut Command="Debug.ParallelTasks" Scope="Global">CTRL+D,K</Shortcut>
-                    <Shortcut Command="Debug.ParallelTasks" Scope="Global">CTRL+D,CTRL+K</Shortcut>
-                    <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+D, H</Shortcut>
-                    <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+D, Ctrl+H</Shortcut>
-                    <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+D, V</Shortcut>
-                    <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+D, Ctrl+V</Shortcut>
-                    <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+D, Y</Shortcut>
-                    <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+D, Ctrl+Y</Shortcut>
-                    <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+D, D</Shortcut>
-                    <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+D, Ctrl+D</Shortcut>
-                    <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+D, R</Shortcut>
-                    <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+D, Ctrl+R</Shortcut>
-                    <Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+D, E</Shortcut>
-                    <Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+D, Ctrl+E</Shortcut>
-                    <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+D, Q</Shortcut>
-                    <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+D, Ctrl+Q</Shortcut>
-                    <Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+D, N</Shortcut>
-                    <Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+D, Ctrl+N</Shortcut>
-                    <Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, V</Shortcut>
-                    <Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, Ctrl+V</Shortcut>
-                    <Shortcut Command="View.ClassView" Scope="Global">Ctrl+W, C</Shortcut>
-                    <Shortcut Command="View.ClassView" Scope="Global">Ctrl+W, Ctrl+C</Shortcut>
-                    <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+W, L</Shortcut>
-                    <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+W, Ctrl+L</Shortcut>
-                    <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+W, R</Shortcut>
-                    <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+W, Ctrl+R</Shortcut>
-                    <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+W, U</Shortcut>
-                    <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+W, Ctrl+U</Shortcut>
-                    <Shortcut Command="View.TaskList" Scope="Global">Ctrl+W, T</Shortcut>
-                    <Shortcut Command="View.TaskList" Scope="Global">Ctrl+W, Ctrl+T</Shortcut>
-                    <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+W, E</Shortcut>
-                    <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+W, Ctrl+E</Shortcut>
-                    <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+W, A</Shortcut>
-                    <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+W, Ctrl+A</Shortcut>
-                    <Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>
-                    <Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>
-                    <Shortcut Command="View.Output" Scope="Global">Ctrl+W, O</Shortcut>
-                    <Shortcut Command="View.Output" Scope="Global">Ctrl+W, Ctrl+O</Shortcut>
-                    <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+W, D</Shortcut>
-                    <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+W, Ctrl+D</Shortcut>
-                    <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+W, Q</Shortcut>
-                    <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+W, Ctrl+Q</Shortcut>
-                    <Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, E</Shortcut>
-                    <Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, Ctrl+E</Shortcut>
-                    <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+W, B</Shortcut>
-                    <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+W, Ctrl+B</Shortcut>
-                    <Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+W, W</Shortcut>
-                    <Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+W, Ctrl+W</Shortcut>
-                    <Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, M</Shortcut>
-                    <Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, Ctrl+M</Shortcut>
-                    <Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, M</Shortcut>
-                    <Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, Ctrl+M</Shortcut>
-                    <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, R</Shortcut>
-                    <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, Ctrl+R</Shortcut>
-                    <Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+F12</Shortcut>
-                    <Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, A</Shortcut>
-                    <Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, Ctrl+A</Shortcut>
-                    <Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, \</Shortcut>
-                    <Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+\</Shortcut>
-                    <Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, C</Shortcut>
-                    <Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, Ctrl+C</Shortcut>
-                    <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, T</Shortcut>
-                    <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, Ctrl+T</Shortcut>
-                    <Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, N</Shortcut>
-                    <Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, Ctrl+N</Shortcut>
-                    <Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, P</Shortcut>
-                    <Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, Ctrl+P</Shortcut>
-                    <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, P</Shortcut>
-                    <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, Ctrl+P</Shortcut>
-                    <Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, S</Shortcut>
-                    <Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+S</Shortcut>
-                    <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, W</Shortcut>
-                    <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>
-                    <Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, L</Shortcut>
-                    <Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, Ctrl+L</Shortcut>
-                    <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, F</Shortcut>
-                    <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, Ctrl+F</Shortcut>
-                    <Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, T</Shortcut>
-                    <Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, Ctrl+T</Shortcut>
-                    <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, I</Shortcut>
-                    <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, W</Shortcut>
-                    <Shortcut Command="Edit.ToggleOutliningExpansion" Scope="Text Editor">Ctrl+M, M</Shortcut>
-                    <Shortcut Command="Edit.ToggleAllOutlining" Scope="Text Editor">Ctrl+M, L</Shortcut>
-                    <Shortcut Command="Edit.StopOutlining" Scope="Text Editor">Ctrl+M, P</Shortcut>
-                    <Shortcut Command="Edit.CollapsetoDefinitions" Scope="Text Editor">Ctrl+M, O</Shortcut>
-                    <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, C</Shortcut>
-                    <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+C</Shortcut>
-                    <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, U</Shortcut>
-                    <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+U</Shortcut>
-                    <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, D</Shortcut>
-                    <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, Ctrl+D</Shortcut>
-                    <Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+W, G</Shortcut>
-                    <Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+W, Ctrl+G</Shortcut>
+  <ApplicationIdentity version="8.0.40218.0" name="Microsoft Development Environment" />
+  <Category name="Environment_Group" RegisteredName="Environment_Group">
+      <Category name="Environment_KeyBindings" Category="{F09035F1-80D2-4312-8EC4-4D354A4BCB4C}" Package="{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}" RegisteredName="Environment_KeyBindings">
+          <KeyboardShortcuts Version="8.0">
+              <ScopeDefinitions>
+                <Scope Name="Team Explorer" ID="{7AA20502-9463-47B7-BF43-341BAF51157C}"/>
+                <Scope Name="VC Dialog Editor" ID="{543E0C02-8C85-4E43-933A-5EF320E3431F}"/>
+                <Scope Name="Find All References Tool Window" ID="{1FA1FD06-3592-4D1D-AC75-0B953320140C}"/>
+                <Scope Name="Live Property Explorer" ID="{31FC2115-5126-4A87-B2F7-77EAAB65048B}"/>
+                <Scope Name="XML (Text) Editor" ID="{FA3CD31E-987B-443A-9B81-186104E8DAC1}"/>
+                <Scope Name="Text Editor" ID="{8B382828-6202-11D1-8870-0000F87579D2}"/>
+                <Scope Name="Microsoft SQL Server Data Tools, T-SQL PDW Editor" ID="{C9626B29-6A42-411C-BD76-DAD855C86913}"/>
+                <Scope Name="Work Item Results View" ID="{7026002D-01F6-44E7-95CF-A896C00DA3F8}"/>
+                <Scope Name="ADO.NET Entity Data Model Designer" ID="{C99AEA30-8E36-4515-B76F-496F5A48A6AA}"/>
+                <Scope Name="Solution Explorer" ID="{3AE79031-E1BC-11D0-8F78-00A0C9110057}"/>
+                <Scope Name="Query Designer" ID="{B2C40B32-3A37-4CA9-97B9-FA44248B69FF}"/>
+                <Scope Name="CSharp Editor with Encoding" ID="{08467B34-B90F-4D91-BDCA-EB8C8CF3033A}"/>
+                <Scope Name="WebBrowser" ID="{E8B06F41-6D01-11D2-AA7D-00C04F990343}"/>
+                <Scope Name="CSS Editor" ID="{A5401142-F49D-43DB-90B1-F57BA349E55C}"/>
+                <Scope Name="DataSet Editor" ID="{B334A759-F450-40A5-BE2A-65937BCD5415}"/>
+                <Scope Name="XAML Designer" ID="{E9B8485C-1217-4277-9ED6-C825A5AC1968}"/>
+                <Scope Name="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}" ID="{DEE22B65-9761-4A26-8FB2-759B971D6DFC}"/>
+                <Scope Name="View Designer" ID="{B968E165-98E0-41F0-8FBE-A8ED1D246A90}"/>
+                <Scope Name="XAML Editor" ID="{A4F9FF65-A78C-4650-866D-5069CC4127CF}"/>
+                <Scope Name="Microsoft SQL Server Data Tools, Table Designer" ID="{2366CF66-2394-4701-AFCA-37ED7FD41648}"/>
+                <Scope Name="Microsoft Visual Basic Editor" ID="{2C015C70-C72C-11D0-88C3-00A0C9110049}"/>
+                <Scope Name="Global" ID="{5EFC7975-14BC-11CF-9B2B-00AA00573819}"/>
+                <Scope Name="HTML Editor" ID="{40D31677-CBC0-4297-A9EF-89D907823A98}"/>
+                <Scope Name="Live Visual Tree" ID="{A2EAF38F-A0AD-4503-91F8-5F004A69A040}"/>
+                <Scope Name="Work Item Query View" ID="{B6303490-B828-410C-9216-AE727D0E282D}"/>
+                <Scope Name="DOM Explorer" ID="{01E50993-E6A4-491E-AB3F-3A9939DE3524}"/>
+                <Scope Name="Team Foundation Build Detail Editor" ID="{86306A97-84F2-4F5A-889B-1318501AEB5F}"/>
+                <Scope Name="Database Designer" ID="{CFF78A9B-78A3-45A3-9142-0267AFC261FA}"/>
+                <Scope Name="Work Item Editor" ID="{40A91D9D-8076-4D28-87C5-5AF9F0ACFE0F}"/>
+                <Scope Name="JSON Editor" ID="{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"/>
+                <Scope Name="CSharp Editor" ID="{A6C744A8-0E4A-4FC6-886A-064283054674}"/>
+                <Scope Name="VC String Editor" ID="{58442DA9-10DA-4AA9-A2AF-96E4D481379B}"/>
+                <Scope Name="Interactive Window" ID="{2D0A56AA-9527-4B78-B6E6-EBE6E05DA749}"/>
+                <Scope Name="Merge Editor Window" ID="{9A9A8AAA-ACD2-4DB6-BD81-8D64176C52B6}"/>
+                <Scope Name="Microsoft Visual Basic Code Page Editor" ID="{6C33E1AA-1401-4536-AB67-0E21E6E569DA}"/>
+                <Scope Name="Settings Designer" ID="{515231AD-C9DC-4AA3-808F-E1B65E72081C}"/>
+                <Scope Name="Windows Forms Designer" ID="{BA09E2AF-9DF2-4068-B2F0-4C7E5CC19E2F}"/>
+                <Scope Name="Markdown Editor" ID="{B3984FB3-6A50-488A-A8A5-1EA6929ADF43}"/>
+                <Scope Name="VC Accelerator Editor" ID="{EB56D0B5-BEE7-4D0C-8BE6-88A8ED256695}"/>
+                <Scope Name="Managed Resources Editor" ID="{FEA4DCC9-3645-44CD-92E7-84B55A16465C}"/>
+                <Scope Name="FSharpEditorFactory" ID="{8A5AA6CF-46E3-4520-A70A-7393D15233E9}"/>
+                <Scope Name="JavaScript Console" ID="{074F1AD9-308B-488C-861E-CF88182E2788}"/>
+                <Scope Name="Difference Viewer" ID="{79D52DDF-52BC-43F1-9663-B3E85CDCA912}"/>
+                <Scope Name="Microsoft SQL Server Data Tools, Schema Compare" ID="{00E9D2E3-9044-47D1-978C-BE2825249219}"/>
+                <Scope Name="Table Designer" ID="{4194FEE5-6777-419F-A5FC-47A536DF1BDB}"/>
+                <Scope Name="HTML Editor Design View" ID="{CB3FCFEA-03DF-11D1-81D2-00A0C91BBEE3}"/>
+                <Scope Name="HTML Editor Source View" ID="{CB3FCFEB-03DF-11D1-81D2-00A0C91BBEE3}"/>
+                <Scope Name="VC Image Editor" ID="{C0BA70ED-069E-412B-9C06-7442E28A11B9}"/>
+                <Scope Name="Microsoft SQL Server Data Tools, T-SQL Editor" ID="{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}"/>
+                <Scope Name="Query Results" ID="{0058A1F7-65F3-4DB9-B3D0-CA7E64DD73CD}"/>
+                <Scope Name="Test Explorer" ID="{E1B7D1F8-9B3C-49B1-8F4F-BFC63A88835D}"/>
+                <Scope Name="XML Schema Designer" ID="{DEE6CEF9-3BCA-449A-82A6-FC757D6956FB}"/>
+              </ScopeDefinitions>
+              <ShortcutsSchemeDef Name="Visual C# 2015">
+                <Shortcut Command="Project.AddClass" Scope="Global">Shift+Alt+C</Shortcut>
+                <Shortcut Command="Edit.SelectCurrentWord" Scope="Global">Ctrl+Shift+W</Shortcut>
+                <Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>
+                <Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+W, N</Shortcut>
+                <Shortcut Command="View.ArchitectureExplorer" Scope="Global">Ctrl+W, Ctrl+N</Shortcut>
+                <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+W, K</Shortcut>
+                <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+W, Ctrl+K</Shortcut>
+                <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+W, M</Shortcut>    <!-- Fix -->
+                <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+W, Ctrl+M</Shortcut>    <!-- Fix -->
+                <Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+W, S</Shortcut>
+                <Shortcut Command="View.SolutionExplorer" Scope="Global">Ctrl+W, Ctrl+S</Shortcut>
+                <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+W, P</Shortcut>
+                <Shortcut Command="View.PropertiesWindow" Scope="Global">Ctrl+W, Ctrl+P</Shortcut>
+                <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+W, J</Shortcut>
+                <Shortcut Command="View.ObjectBrowser" Scope="Global">Ctrl+W, Ctrl+J</Shortcut>
+                <Shortcut Command="View.Toolbox" Scope="Global">Ctrl+W, X</Shortcut>
+                <Shortcut Command="View.Toolbox" Scope="Global">Ctrl+W, Ctrl+X</Shortcut>
+                <Shortcut Command="Refactor.ExtractMethod" Scope="Global">Ctrl+R, M</Shortcut>
+                <Shortcut Command="Refactor.EncapsulateField" Scope="Global">Ctrl+R, E</Shortcut>
+                <Shortcut Command="Refactor.ExtractInterface" Scope="Global">Ctrl+R, I</Shortcut>
+                <Shortcut Command="Refactor.ReorderParameters" Scope="Global">Ctrl+R, O</Shortcut>
+                <Shortcut Command="Refactor.RemoveParameters" Scope="Global">Ctrl+R, V</Shortcut>
+                <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, R</Shortcut>
+                <Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>
+                <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, S</Shortcut>
+                <Shortcut Command="Edit.InsertSnippet" Scope="Global">Ctrl+K, X</Shortcut>
+                <Shortcut Command="Build.BuildSolution" Scope="Global">F6</Shortcut>
+                <Shortcut Command="Build.BuildSelection" Scope="Global">Shift+F6</Shortcut>
+                <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+D, B</Shortcut>
+                <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+D, Ctrl+B</Shortcut>
+                <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+D, W</Shortcut>
+                <Shortcut Command="Debug.Watch1" Scope="Global">Ctrl+D, Ctrl+W</Shortcut>
+                <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+D, A</Shortcut>
+                <Shortcut Command="Debug.Autos" Scope="Global">Ctrl+D, Ctrl+A</Shortcut>
+                <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+D, L</Shortcut>
+                <Shortcut Command="Debug.Locals" Scope="Global">Ctrl+D, Ctrl+L</Shortcut>
+                <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+D, I</Shortcut>
+                <Shortcut Command="Debug.Immediate" Scope="Global">Ctrl+D, Ctrl+I</Shortcut>
+                <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+D, C</Shortcut>
+                <Shortcut Command="Debug.CallStack" Scope="Global">Ctrl+D, Ctrl+C</Shortcut>
+                <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+D, T</Shortcut>
+                <Shortcut Command="Debug.Threads" Scope="Global">Ctrl+D, Ctrl+T</Shortcut>
+                <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+D, M</Shortcut>
+                <Shortcut Command="Debug.Modules" Scope="Global">Ctrl+D, Ctrl+M</Shortcut>
+                <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+D, P</Shortcut>
+                <Shortcut Command="Debug.Processes" Scope="Global">Ctrl+D, Ctrl+P</Shortcut>
+                <Shortcut Command="Debug.ParallelStacks" Scope="Global">CTRL+D,S</Shortcut>
+                <Shortcut Command="Debug.ParallelStacks" Scope="Global">CTRL+D,CTRL+S</Shortcut>
+                <Shortcut Command="Debug.ParallelTasks" Scope="Global">CTRL+D,K</Shortcut>
+                <Shortcut Command="Debug.ParallelTasks" Scope="Global">CTRL+D,CTRL+K</Shortcut>
+                <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+D, H</Shortcut>
+                <Shortcut Command="Debug.IntelliTraceCalls" Scope="Global">Ctrl+D, Ctrl+H</Shortcut>
+                <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+D, V</Shortcut>
+                <Shortcut Command="Debug.IntelliTraceEvents" Scope="Global">Ctrl+D, Ctrl+V</Shortcut>
+                <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+D, Y</Shortcut>
+                <Shortcut Command="Debug.Memory1" Scope="Global">Ctrl+D, Ctrl+Y</Shortcut>
+                <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+D, D</Shortcut>
+                <Shortcut Command="Debug.ToggleDisassembly" Scope="Global">Ctrl+D, Ctrl+D</Shortcut>
+                <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+D, R</Shortcut>
+                <Shortcut Command="Debug.Registers" Scope="Global">Ctrl+D, Ctrl+R</Shortcut>
+                <Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+D, E</Shortcut>
+                <Shortcut Command="Debug.Exceptions" Scope="Global">Ctrl+D, Ctrl+E</Shortcut>
+                <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+D, Q</Shortcut>
+                <Shortcut Command="Debug.QuickWatch" Scope="Global">Ctrl+D, Ctrl+Q</Shortcut>
+                <Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+D, N</Shortcut>
+                <Shortcut Command="Debug.BreakAtFunction" Scope="Global">Ctrl+D, Ctrl+N</Shortcut>
+                <Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, V</Shortcut>
+                <Shortcut Command="Help.ViewHelp" Scope="Global">Ctrl+F1, Ctrl+V</Shortcut>
+                <Shortcut Command="View.ClassView" Scope="Global">Ctrl+W, C</Shortcut>
+                <Shortcut Command="View.ClassView" Scope="Global">Ctrl+W, Ctrl+C</Shortcut>
+                <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+W, L</Shortcut>
+                <Shortcut Command="View.ServerExplorer" Scope="Global">Ctrl+W, Ctrl+L</Shortcut>
+                <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+W, R</Shortcut>
+                <Shortcut Command="View.ResourceView" Scope="Global">Ctrl+W, Ctrl+R</Shortcut>
+                <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+W, U</Shortcut>
+                <Shortcut Command="View.DocumentOutline" Scope="Global">Ctrl+W, Ctrl+U</Shortcut>
+                <Shortcut Command="View.TaskList" Scope="Global">Ctrl+W, T</Shortcut>
+                <Shortcut Command="View.TaskList" Scope="Global">Ctrl+W, Ctrl+T</Shortcut>
+                <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+W, E</Shortcut>
+                <Shortcut Command="View.ErrorList" Scope="Global">Ctrl+W, Ctrl+E</Shortcut>
+                <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+W, A</Shortcut>
+                <Shortcut Command="View.CommandWindow" Scope="Global">Ctrl+W, Ctrl+A</Shortcut>
+                <Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>
+                <Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>
+                <Shortcut Command="View.Output" Scope="Global">Ctrl+W, O</Shortcut>
+                <Shortcut Command="View.Output" Scope="Global">Ctrl+W, Ctrl+O</Shortcut>
+                <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+W, D</Shortcut>
+                <Shortcut Command="View.CodeDefinitionWindow" Scope="Global">Ctrl+W, Ctrl+D</Shortcut>
+                <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+W, Q</Shortcut>
+                <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+W, Ctrl+Q</Shortcut>
+                <Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, E</Shortcut>
+                <Shortcut Command="Edit.EnableBookmark" Scope="Text Editor">Ctrl+B, Ctrl+E</Shortcut>
+                <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+W, B</Shortcut>
+                <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+W, Ctrl+B</Shortcut>
+                <Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+W, W</Shortcut>
+                <Shortcut Command="View.WebBrowser" Scope="Global">Ctrl+W, Ctrl+W</Shortcut>
+                <Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, M</Shortcut>
+                <Shortcut Command="Help.ManageHelpSettings" Scope="Global">Ctrl+F1, Ctrl+M</Shortcut>
+                <Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, M</Shortcut>
+                <Shortcut Command="Edit.GenerateMethod" Scope="Global">Ctrl+K, Ctrl+M</Shortcut>
+                <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, R</Shortcut>
+                <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+K, Ctrl+R</Shortcut>
+                <Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+F12</Shortcut>
+                <Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, A</Shortcut>
+                <Shortcut Command="Edit.SwapAnchor" Scope="Text Editor">Ctrl+E, Ctrl+A</Shortcut>
+                <Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, \</Shortcut>
+                <Shortcut Command="Edit.DeleteHorizontalWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+\</Shortcut>
+                <Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, C</Shortcut>
+                <Shortcut Command="Edit.ClearBookmarks" Scope="Text Editor">Ctrl+B, Ctrl+C</Shortcut>
+                <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, T</Shortcut>
+                <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">Ctrl+B, Ctrl+T</Shortcut>
+                <Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, N</Shortcut>
+                <Shortcut Command="Edit.NextBookmark" Scope="Text Editor">Ctrl+B, Ctrl+N</Shortcut>
+                <Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, P</Shortcut>
+                <Shortcut Command="Edit.PreviousBookmark" Scope="Text Editor">Ctrl+B, Ctrl+P</Shortcut>
+                <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, P</Shortcut>
+                <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+K, Ctrl+P</Shortcut>
+                <Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, S</Shortcut>
+                <Shortcut Command="Edit.ViewWhiteSpace" Scope="Text Editor">Ctrl+E, Ctrl+S</Shortcut>
+                <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, W</Shortcut>
+                <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+K, Ctrl+W</Shortcut>
+                <Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, L</Shortcut>
+                <Shortcut Command="Edit.ListMembers" Scope="Text Editor">Ctrl+K, Ctrl+L</Shortcut>
+                <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, F</Shortcut>
+                <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+E, Ctrl+F</Shortcut>
+                <Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, T</Shortcut>
+                <Shortcut Command="Edit.ToggleTaskListShortcut" Scope="Text Editor">Ctrl+E, Ctrl+T</Shortcut>
+                <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+K, I</Shortcut>
+                <Shortcut Command="Edit.ToggleWordWrap" Scope="Text Editor">Ctrl+E, W</Shortcut>
+                <Shortcut Command="Edit.ToggleOutliningExpansion" Scope="Text Editor">Ctrl+M, M</Shortcut>
+                <Shortcut Command="Edit.ToggleAllOutlining" Scope="Text Editor">Ctrl+M, L</Shortcut>
+                <Shortcut Command="Edit.StopOutlining" Scope="Text Editor">Ctrl+M, P</Shortcut>
+                <Shortcut Command="Edit.CollapsetoDefinitions" Scope="Text Editor">Ctrl+M, O</Shortcut>
+                <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, C</Shortcut>
+                <Shortcut Command="Edit.CommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+C</Shortcut>
+                <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, U</Shortcut>
+                <Shortcut Command="Edit.UncommentSelection" Scope="Text Editor">Ctrl+E, Ctrl+U</Shortcut>
+                <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, D</Shortcut>
+                <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+E, Ctrl+D</Shortcut>
+                <Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+W, G</Shortcut>
+                <Shortcut Command="View.PendingCheckins" Scope="Global">Ctrl+W, Ctrl+G</Shortcut>
 
-                    <Shortcut Command="View.QuickActions" Scope="Text Editor">Alt+Enter</Shortcut>
+                <Shortcut Command="View.QuickActions" Scope="Text Editor">Alt+Enter</Shortcut>
 
-                    <!-- ======================== -->
-                    <!-- New Shortcuts for VS2015 -->
-                    <!-- ======================== -->
+                <!-- ======================== -->
+                <!-- New Shortcuts for VS2015 -->
+                <!-- ======================== -->
 
-                    <!-- Global Window Shortcuts -->
-                    <!-- Toggle Close Tool Windows -->
-                    <Shortcut Command="Window.CloseToolWindow" Scope="Solution Explorer">Ctrl+Alt+L</Shortcut>   <!-- Tricky toggle feature -->
-                    <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, M</Shortcut>
-                    <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, Ctrl+M</Shortcut>   <!-- Part of default mapping - included for consistency and future proof -->
-                    <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, M</Shortcut>    <!-- Tricky toggle feature -->
-                    <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, Ctrl+M</Shortcut>    <!-- Tricky toggle feature -->
+                <!-- Navigation -->
+                <Shortcut Command="View.NavigateBackward" Scope="Global">Alt+Left Arrow</Shortcut>    <!-- Overrides Global View.Backward (Alt+Left Arrow) -->
+                <Shortcut Command="View.NavigateForward" Scope="Global">Alt+Right Arrow</Shortcut>  <!-- Overrides Global View.NavigateForward -->
+                <Shortcut Command="View.NavigateForward" Scope="Text Editor">Alt+Right Arrow</Shortcut>  <!-- Override TextEditor bindings (Edit.CompleteWord) -->
+                <Shortcut Command="View.NavigateForward" Scope="Workflow Designer">Alt+Right Arrow</Shortcut>  <!-- Override to remove existing shortcut (Edit.CompleteWord)-->
+                <!-- Note: Alt+Left/Right conflicts with Global View.Forward/Backward (used by WebBrowser)-->
+                <Shortcut Command="View.Backward" Scope="WebBrowser">Alt+Left Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+                <Shortcut Command="View.Forward" Scope="WebBrowser">Alt+Right Arrow</Shortcut>  <!-- Replace the shortcuts for the Web Browser scope -->
+                <!-- Document Navigation -->
+                <!-- Alternative NextTab/PreviousTab mappings --> 
+                <RemoveShortcut Command="Edit.ViewTop" Scope="Text Editor">Ctrl+PgUp</RemoveShortcut>
+                <RemoveShortcut Command="Edit.ViewBottom" Scope="Text Editor">Ctrl+PgDn</RemoveShortcut>
+                <Shortcut Command="Edit.ViewTop" Scope="Text Editor">Alt+Home</Shortcut>   <!-- New! New shortcut (chosenby JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgUp -->
+                <Shortcut Command="Edit.ViewBottom" Scope="Text Editor">Alt+End</Shortcut> <!-- New! New shortcut (chosenby JustCla) for Edit.ViewTop. Makes up for removing Ctrl+PgDn -->
+                <!-- In-Editor navigation -->
+                <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Ctrl+Alt+Up Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+                <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Ctrl+Alt+Down Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
 
-                    <!-- Navigation -->
-                    <!-- Document Navigation -->   <!-- Note: Ctrl+PgUp/PgDn conflicts with Edit.ViewTop/ViewBottom -->
-                    <Shortcut Command="Window.NextTab" Scope="Text Editor">Ctrl+PgDn</Shortcut>   <!-- Restore Global control for Ctrl+PgDn -->
-                    <Shortcut Command="Window.PreviousTab" Scope="Text Editor">Ctrl+PgUp</Shortcut> <!-- Restore Global control for Ctrl+PgUp -->
-                    <!-- Alternative NextTab/PreviousTab mappings -->    <!-- Note: Alt+Left/Right conflicts with Global View.Forward/Backward -->
-                    <Shortcut Command="View.NavigateForward" Scope="Global">Alt+Right Arrow</Shortcut>  <!-- Overrides Global View.NavigateForward -->
-                    <Shortcut Command="View.NavigateForward" Scope="Text Editor">Alt+Right Arrow</Shortcut>  <!-- Override TextEditor bindings (Edit.CompleteWord) -->
-                    <Shortcut Command="View.NavigateForward" Scope="Workflow Designer">Alt+Right Arrow</Shortcut>  <!-- Override to remove existing shortcut (Edit.CompleteWord)-->
-                    <Shortcut Command="View.NavigateBackward" Scope="Global">Alt+Left Arrow</Shortcut>    <!-- Overrides Global View.Backward (Alt+Left Arrow) -->
-                    <!-- In-Editor navigation -->
-                    <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Ctrl+Alt+Up Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
-                    <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Ctrl+Alt+Down Arrow</Shortcut>     <!-- New! New keyboard binding (chosen by JustCla) Conflicts with HotCommands binding. -->
+                <!-- Outlining shortcuts (Expand/Collapse sections of code) -->
+                <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+Num +</Shortcut>
+                <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+=</Shortcut>
+                <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+Num -</Shortcut>
+                <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+-</Shortcut>  <!-- Overrides View.NavigateBackward -->
+                <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+Num +</Shortcut>
+                <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+=</Shortcut>
+                <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+Num -</Shortcut>
+                <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+-</Shortcut>  <!-- Overrides View.NavigateForward -->
+                <!-- Old VS Outlining shortcuts (provide Ctrl+M,[char] shortcut chords to add to existing Ctrl+M,Ctrl+[char] chords -->
+                <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+M, S</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+M, E</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+M, A</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+M, X</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.CollapseTag" Scope="Text Editor">Ctrl+M, T</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.HideSelection" Scope="Text Editor">Ctrl+M, H</Shortcut>  <!-- Adding this -->
+                <Shortcut Command="Edit.StopHidingCurrent" Scope="Text Editor">Ctrl+M, U</Shortcut>  <!-- Adding this -->
 
-                    <!-- Outlining shortcuts (Expand/Collapse sections of code) -->
-                    <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+Num +</Shortcut>
-                    <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+=</Shortcut>
-                    <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+Num -</Shortcut>
-                    <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+-</Shortcut>  <!-- Overrides View.NavigateBackward -->
-                    <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+Num +</Shortcut>
-                    <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+=</Shortcut>
-                    <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+Num -</Shortcut>
-                    <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+-</Shortcut>  <!-- Overrides View.NavigateForward -->
-                    <!-- Old VS Outlining shortcuts (provide Ctrl+M,[char] shortcut chords to add to existing Ctrl+M,Ctrl+[char] chords -->
-                    <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+M, S</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.ExpandCurrentRegion" Scope="Text Editor">Ctrl+M, E</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+M, A</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+M, X</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.CollapseTag" Scope="Text Editor">Ctrl+M, T</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.HideSelection" Scope="Text Editor">Ctrl+M, H</Shortcut>  <!-- Adding this -->
-                    <Shortcut Command="Edit.StopHidingCurrent" Scope="Text Editor">Ctrl+M, U</Shortcut>  <!-- Adding this -->
+                <!-- GoTo Next Error / Previous Error -->  <!-- New shortcuts. (Borrowed from ReSharper for VS C# ) -->
+                <Shortcut Command="View.NextError" Scope="Global">Alt+PgDn</Shortcut>    <!-- NYI. Near-match. GoToNextHighlight -->
+                <Shortcut Command="View.PreviousError" Scope="Global">Alt+PgUp</Shortcut>   <!-- NYI. Near-match. GoToPreviousHighlight -->
+                <Shortcut Command="View.NextError" Scope="Global">Shift+Alt+PgDn</Shortcut>
+                <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+PgUp</Shortcut>
 
-                    <!-- GoTo Next Error / Previous Error -->  <!-- New shortcuts. (Borrowed from ReSharper for VS C# ) -->
-                    <Shortcut Command="View.NextError" Scope="Global">Alt+PgDn</Shortcut>    <!-- NYI. Near-match. GoToNextHighlight -->
-                    <Shortcut Command="View.PreviousError" Scope="Global">Alt+PgUp</Shortcut>   <!-- NYI. Near-match. GoToPreviousHighlight -->
-                    <Shortcut Command="View.NextError" Scope="Global">Shift+Alt+PgDn</Shortcut>
-                    <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+PgUp</Shortcut>
+                <!-- Window Navigation shortcuts -->
+                <Shortcut Command="Window.AutoHide" Scope="Global">Shift+Ins</Shortcut>
+                <Shortcut Command="Window.AutoHideAll" Scope="Global">Shift+Alt+Ins</Shortcut>
+                <Shortcut Command="Window.Dock" Scope="Global">Ctrl+Ins</Shortcut>
+                <Shortcut Command="Window.DockasTabbedDocument" Scope="Global">Ctrl+Shift+Ins</Shortcut>
+                <!-- Tool Window Shortcuts -->
+                <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, Ctrl+M</Shortcut>   <!-- Part of default mapping - included for consistency and future proof -->
+                <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+\, M</Shortcut>  <!-- East alternative chord -->
+                <!-- Toggle Close Tool Windows -->
+                <Shortcut Command="Window.CloseToolWindow" Scope="Solution Explorer">Ctrl+Alt+L</Shortcut>
+                <Shortcut Command="Window.CloseToolWindow" Scope="Test Explorer">Ctrl+E, T</Shortcut>
+                <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, Ctrl+M</Shortcut>
+                <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Ctrl+\, M</Shortcut>  <!-- Toogle alt-chord -->
 
-                    <!-- Special -->
-                    <Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>
-                    <!--<Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  &lt;!&ndash; "OptimizeImports" &ndash;&gt;-->
+                <!-- Special -->
+                <Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>
+                <!--<Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  &lt;!&ndash; "OptimizeImports" &ndash;&gt;-->
 
-                </ShortcutsSchemeDef>
-            </KeyboardShortcuts>
-        </Category>
-    </Category>
+              </ShortcutsSchemeDef>
+          </KeyboardShortcuts>
+      </Category>
+  </Category>
 </UserSettings>