diff --git a/HotKeys.sln b/HotKeys.sln
new file mode 100644
index 0000000..e3662fa
--- /dev/null
+++ b/HotKeys.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+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
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F93438EE-344E-478F-9A73-AAD23BE22CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {92272CF9-4F0F-4E70-9C69-9E5BEBE4EF00}
+	EndGlobalSection
+EndGlobal
diff --git a/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager.vsix b/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager.vsix
new file mode 100644
index 0000000..c9af96e
Binary files /dev/null and b/HotKeysVSIX/EmbeddedVSIX/KeyboardShortcutsManager.vsix differ
diff --git a/HotKeysVSIX/HotKeysVSIX.csproj b/HotKeysVSIX/HotKeysVSIX.csproj
new file mode 100644
index 0000000..4fddd67
--- /dev/null
+++ b/HotKeysVSIX/HotKeysVSIX.csproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{F93438EE-344E-478F-9A73-AAD23BE22CB5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>HotKeys</RootNamespace>
+    <AssemblyName>HotKeys</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+    <StartAction>Program</StartAction>
+    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="EmbeddedVSIX\KeyboardShortcutsManager.vsix">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ReleaseNotes.txt">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="IntelliJ IDEA.vssettings">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="ReSharper %28IDEA style%29.vssettings">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="ReSharper %28VS style%29.vssettings">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\HotKeysIcon.png" />
+    <Content Include="Resources\HotKeysPreviewImage.png">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Resources\Market_HotKeys_128x.png">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </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. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/HotKeysVSIX/IntelliJ IDEA.vssettings b/HotKeysVSIX/IntelliJ IDEA.vssettings
new file mode 100644
index 0000000..134f6cd
--- /dev/null
+++ b/HotKeysVSIX/IntelliJ IDEA.vssettings	
@@ -0,0 +1,307 @@
+<UserSettings>
+  <ApplicationIdentity version="15.0"/>
+  <ToolsOptions>
+    <ToolsOptionsCategory name="Environment" RegisteredName="Environment"/>
+  </ToolsOptions>
+  <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" PackageName="Visual Studio Environment Package">
+      <Version>15.0.0.0</Version>
+      <KeyboardShortcuts>
+        <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="F# Interactive" 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>
+        <DefaultShortcuts>
+          <Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>
+          <Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>
+        </DefaultShortcuts>
+        <ShortcutsScheme/>
+        <UserShortcuts>
+          <!-- Editing Key bindings -->
+          <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+Space</Shortcut>
+          <Shortcut Command="Edit.SmartCompleteWord" Scope="Text Editor">Ctrl+Shift+Space</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.CompleteStatement" Scope="Text Editor">Ctrl+Shift+Enter</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+P</Shortcut>
+          <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+Q</Shortcut>
+          <Shortcut Command="Edit.ShowDocumentation" Scope="Text Editor">Shift+F1</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.ShowErrorInfo" Scope="Text Editor">Ctrl+F1</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.GenerateCode" Scope="Text Editor">Alt+Insert</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.OverrideMethods" Scope="Text Editor">Ctrl+O</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.ImplementMethods" Scope="Text Editor">Ctrl+I</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.SurroundWith" Scope="Text Editor">Ctrl+Alt+T</Shortcut>
+          <Shortcut Command="Edit.ToggleComment" Scope="Text Editor">Ctrl+/</Shortcut>  <!-- NYI HotCommands.ToggleLineComment. Near-match. Should be ToggleLineComment -->
+          <Shortcut Command="Edit.ToggleBlockComment" Scope="Text Editor">Ctrl+Shift+/</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.ContractSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.IncreaseSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Fallback to HotCommands.IncreaseSelection-->
+          <Shortcut Command="Edit.DecreaseSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Fallback to HotCommands.DecreaseSelection-->
+          <!--<Shortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</Shortcut>   --><!-- Fallback command not available -->
+          <Shortcut Command="Edit.ShowContextInfo" Scope="Text Editor">Alt+Q</Shortcut>  <!-- NYI -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Alt+Enter</Shortcut>
+          <!--Shortcut Command="Edit.FormatCode" Scope="Text Editor">Ctrl+Alt+L</Shortcut-->  <!-- HotCommands.FormatCode  IntelliJ: Reformat Code. Offers choice of selection/document where appropriate. -->
+          <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+Alt+L</Shortcut>  <!-- Near-match -->
+          <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+Shift+Alt+L</Shortcut>  <!-- Introduced shortcut! for Near-match -->
+          <Shortcut Command="EditorContextMenus.CodeWindow.OrganizeUsings.RemoveAndSort" Scope="Text Editor">Ctrl+Alt+O</Shortcut>  <!-- "OptimizeImports" -->
+          <Shortcut Command="Edit.FormatIndents" Scope="Text Editor">Ctrl+Alt+I</Shortcut>  <!-- NYI [Auto-indent line(s)]-->
+          <!--<Shortcut Command="Edit.IncreaseLineIndent" Scope="Text Editor">Tab</Shortcut>-->  <!-- Near-match. Not near enough to replace existing key behaviour -->
+          <!--<Shortcut Command="Edit.DecreaseLineIndent" Scope="Text Editor">Shift+Tab</Shortcut>-->  <!-- Near-match. Not near enough to replace existing key behaviour -->
+          <Shortcut Command="Edit.Cut" Scope="Text Editor">Ctrl+X</Shortcut>
+          <Shortcut Command="Edit.Cut" Scope="Text Editor">Shift+Del</Shortcut>
+          <Shortcut Command="Edit.Copy" Scope="Text Editor">Ctrl+C</Shortcut>
+          <Shortcut Command="Edit.Copy" Scope="Text Editor">Ctrl+Ins</Shortcut>
+          <Shortcut Command="Edit.Paste" Scope="Text Editor">Ctrl+V</Shortcut>
+          <Shortcut Command="Edit.Paste" Scope="Text Editor">Shift+Ins</Shortcut>
+          <Shortcut Command="Edit.CycleClipboardRing" Scope="Text Editor">Ctrl+Shift+V</Shortcut>
+          <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Implemented in VS2017 v15.6 -->
+          <Shortcut Command="Edit.DuplicateSelection" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback to HotCommands for older versions of VS. -->
+          <RemoveShortcut Command="Edit.Redo" Scope="Global">Ctrl+Y</RemoveShortcut>
+          <Shortcut Command="Edit.LineDelete" Scope="Text Editor">Ctrl+Y</Shortcut>
+          <Shortcut Command="Edit.JoinLines" Scope="Text Editor">Ctrl+Shift+J</Shortcut>  <!-- NYI Near match for Smart Join lines - Hot Commands Join Line -->
+          <Shortcut Command="Edit.SmartBreakLine" Scope="Text Editor">Ctrl+Enter</Shortcut>  <!-- [Smart line split] C# behaviour is a near-match. Actually just does LineOpenBelow. -->
+          <Shortcut Command="Edit.LineOpenBelow" Scope="Text Editor">Shift+Enter</Shortcut>  <!-- [Start new line] -->
+          <Shortcut Command="Edit.ToggleCase" Scope="Text Editor">Ctrl+Shift+U</Shortcut>
+          <Shortcut Command="Edit.SelectToStartBrace" Scope="Text Editor">Ctrl+Shift+[</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.SelectToEndBrace" Scope="Text Editor">Ctrl+Shift+]</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.WordDeleteToEnd" Scope="Text Editor">Ctrl+Del</Shortcut>
+          <Shortcut Command="Edit.WordDeleteToStart" Scope="Text Editor">Ctrl+Bkspce</Shortcut>
+          <Shortcut Command="Window.CloseDocumentWindow" Scope="Text Editor">Ctrl+F4</Shortcut>
+          <!-- 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>  <!-- Introduced shortcut. IntelliJ uses Ctrl+Shift+= for ExpandCurrentRegion. -->
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseCurrentRegion" Scope="Text Editor">Ctrl+-</Shortcut>
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+Num +</Shortcut>
+          <Shortcut Command="Edit.ExpandAllOutlining" Scope="Text Editor">Ctrl+Shift+=</Shortcut>  <!-- Modified shortcut. IntelliJ uses Ctrl+Shift+= for ExpandCurrentRegion. -->
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+Num -</Shortcut>
+          <Shortcut Command="Edit.CollapseAllOutlining" Scope="Text Editor">Ctrl+Shift+-</Shortcut>
+          <!-- Search/Replace -->
+          <Shortcut Command="Edit.GoToAll" Scope="Global">Shift, Shift</Shortcut>  <!-- [Search everywhere] Alt: Window.QuickLaunch (?) -->
+          <!--<Shortcut Command="Edit.NavigateTo" Scope="Global">Shift, Shift</Shortcut>-->  <!--Double-Shift shortcut does not work in VS -->
+          <!-- [Search everywhere] Alt: Window.QuickLaunch (?) -->          <Shortcut Command="Edit.Find" Scope="Global">Ctrl+F</Shortcut>
+          <Shortcut Command="Edit.Find" Scope="Text Editor">Ctrl+F</Shortcut>  <!-- Future-proof override -->
+          <Shortcut Command="Edit.FindNext" Scope="Global">F3</Shortcut>
+          <Shortcut Command="Edit.FindPrevious" Scope="Global">Shift+F3</Shortcut>
+          <Shortcut Command="Edit.Replace" Scope="Global">Ctrl+R</Shortcut>
+          <Shortcut Command="Edit.Replace" Scope="Text Editor">Ctrl+R</Shortcut>  <!-- Force override -->
+          <Shortcut Command="Edit.FindinFiles" Scope="Global">Ctrl+Shift+F</Shortcut>
+          <Shortcut Command="Edit.ReplaceinFiles" Scope="Global">Ctrl+Shift+R</Shortcut>
+          <Shortcut Command="Edit.SearchStructurally" Scope="Global">Ctrl+Shift+S</Shortcut>  <!-- NYI - IntelliJ Ultimate Edition only -->
+          <Shortcut Command="Edit.ReplaceStructurally" Scope="Global">Ctrl+Shift+M</Shortcut>  <!-- NYI - IntelliJ Ultimate Edition only -->
+          <!-- Usage Search -->
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Alt+F7</Shortcut>
+          <Shortcut Command="Edit.FindUsagesInFile" Scope="Global">Ctrl+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command -->
+          <Shortcut Command="Edit.HighlightUsagesInFile" Scope="Global">Ctrl+Shift+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command. This happens automatically with setting applied. -->
+          <Shortcut Command="Edit.ShowUsages" Scope="Global">Ctrl+Alt+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command -->
+          <!-- Compile and Run-->
+          <Shortcut Command="Build.BuildSolution" Scope="Global">Ctrl+F9</Shortcut>  <!-- Near-match: [Build project] Chosen as more sensible command since IntelliJ does not handle multi-project solutions whereas VS does. -->
+          <!--<Shortcut Command="Build.BuildOnlyProject" Scope="Global">Ctrl+F9</Shortcut>-->  <!-- Alternative choice for build project, or compile (?) -->
+          <Shortcut Command="Build.Compile" Scope="Global">Ctrl+Shift+F9</Shortcut>  <!-- Compile selected file, package or module -->
+          <Shortcut Command="SelectConfigurationAndRun" Scope="Global">Alt+Shift+F10</Shortcut>  <!-- NYI -->
+          <Shortcut Command="SelectConfigurationAndDebug" Scope="Global">Alt+Shift+F9</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Debug.StartWithoutDebugging" Scope="Global">Shift+F10</Shortcut> <!-- [Run] -->
+          <Shortcut Command="Debug.Start" Scope="Global">Shift+F9</Shortcut>  <!-- [Debug] -->
+          <Shortcut Command="Debug.RunContextConfigFromEditor" Scope="Global">Ctrl+Shift+F10</Shortcut>  <!-- NYI -->
+          <!-- Debugging -->
+          <!-- Consider defining these shortcuts at TextEditor and Debugger scope only to avoid unnecessary Global key bindings -->
+          <Shortcut Command="Debug.StepOver" Scope="Global">F8</Shortcut>
+          <Shortcut Command="Debug.StepInto" Scope="Global">F7</Shortcut>
+          <Shortcut Command="Debug.SmartStepInto" Scope="Global">Shift+F7</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Debug.StepOut" Scope="Global">Shift+F8</Shortcut>
+          <Shortcut Command="Debug.RunToCursor" Scope="Global">Alt+F9</Shortcut>
+          <Shortcut Command="Debug.Immediate" Scope="Global">Alt+F8</Shortcut>  <!-- Near-match [Evaluate expression] Alternative: Debug.EvaluateStatement (?) -->
+          <Shortcut Command="Debug.Start" Scope="Global">F9</Shortcut>  <!-- ?? [Resume] -->
+          <Shortcut Command="Debug.ToggleBreakpoint" Scope="Global">Ctrl+F8</Shortcut>
+          <Shortcut Command="Debug.Breakpoints" Scope="Global">Ctrl+Shift+F8</Shortcut>
+          <!-- Navigation -->
+          <!-- VS2017+ shortcuts: Edit.GoTo.. -->
+          <Shortcut Command="Edit.GoToType" Scope="Global">Ctrl+N</Shortcut>
+          <Shortcut Command="Edit.GoToFile" Scope="Global">Ctrl+Shift+N</Shortcut>
+          <Shortcut Command="Edit.GoToSymbol" Scope="Global">Ctrl+Shift+Alt+N</Shortcut>
+          <!-- VS2015 shortcuts: Edit.NavigateTo -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+N</Shortcut> <!-- [VS2015] Near-match [GoTo Class/Type] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+Shift+N</Shortcut> <!-- [VS2015] Near-match [GoTo File] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+Shift+Alt+N</Shortcut> <!-- [VS2015] Near-match [GoTo Symbol] -->
+          <!-- Other navigation shortcuts -->
+          <Shortcut Command="Window.NextTab" Scope="Global">Alt+Right Arrow</Shortcut>
+          <Shortcut Command="Window.NextTab" Scope="Text Editor">Alt+Right Arrow</Shortcut>  <!-- Need to override any TextEditor bindings that could block this global call -->
+          <Shortcut Command="Window.NextTab" Scope="Workflow Designer">Alt+Right Arrow</Shortcut>  <!-- Override to remove existing shortcut -->
+          <Shortcut Command="Window.PreviousTab" Scope="Global">Alt+Left Arrow</Shortcut>
+          <Shortcut Command="Window.PreviousTab" Scope="Text Editor">Alt+Left Arrow</Shortcut>  <!-- Override to remove existing shortcut -->
+          <Shortcut Command="Window.PreviousTab" Scope="Workflow Designer">Alt+Left Arrow</Shortcut>  <!-- Override to remove existing shortcut -->
+          <Shortcut Command="Window.NextToolWindow" Scope="Global">F12</Shortcut>   <!-- New! NYI - [GoTo Most Previous (Recently Active) Tool Window] -->
+          <Shortcut Command="Window.ActivateDocumentWindow" Scope="Global">Esc</Shortcut>
+          <Shortcut Command="Window.AutoHide" Scope="Global">Shift+Esc</Shortcut>  <!-- Near-match for Window.HideLastActiveWindow. Note: Sets window to auto-hide mode, so will not open docked next time. -->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Global">Ctrl+Shift+F4</Shortcut>  <!-- Near-match -->  <!-- Should close most recent tool window -->
+          <Shortcut Command="Edit.GoTo" Scope="Global">Ctrl+G</Shortcut>  <!-- [GoTo Line] -->
+          <Shortcut Command="Window.RecentFilesPopup" Scope="Global">Ctrl+E</Shortcut>  <!-- NYI (Try to find in VS) -->
+          <Shortcut Command="View.NavigateBackward" Scope="Global">Ctrl+Alt+Left Arrow</Shortcut>
+          <Shortcut Command="View.NavigateBackward" Scope="HTML Editor Design View">Ctrl+Alt+Left Arrow</Shortcut>  <!-- Override to remove existing shortcut -->
+          <Shortcut Command="View.NavigateForward" Scope="Global">Ctrl+Alt+Right Arrow</Shortcut>
+          <Shortcut Command="View.NavigateForward" Scope="HTML Editor Design View">Ctrl+Alt+Right Arrow</Shortcut>  <!-- Override to remove existing shortcut -->
+          <Shortcut Command="Navigate.GoToLastEditLocation" Scope="Global">Ctrl+Shift+Bkspce</Shortcut>  <!-- NYI -->
+          <Shortcut Command="View.SelectCurrentFileOrSymbolInAnyView" Scope="Global">Alt+F1</Shortcut>  <!-- NYI - [Select current file or symbol in any view] -->
+          <Shortcut Command="Edit.GoToDefinition" Scope="Text Editor">Ctrl+B</Shortcut>  <!-- [GoTo Declaration] -->
+          <Shortcut Command="Edit.GoToImplementation" Scope="Text Editor">Ctrl+Alt+B</Shortcut>
+          <Shortcut Command="Edit.OpenQuickDefLookup" Scope="Text Editor">Ctrl+Shift+I</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.GoToTypeDeclaration" Scope="Text Editor">Ctrl+Shift+B</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.GoToSuperMethod" Scope="Text Editor">Ctrl+U</Shortcut>    <!-- NYI - Go To super-method/super-class -->
+          <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Alt+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Alt+Down Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveToCodeBlockStart" Scope="Text Editor">Ctrl+[</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.MoveToCodeBlockEnd" Scope="Text Editor">Ctrl+]</Shortcut>  <!-- NYI -->
+          <Shortcut Command="FileStructurePopup" Scope="Global">Ctrl+F12</Shortcut>  <!-- NYI -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+H</Shortcut>  <!-- Near-match (?) Show.TypeHierarchy -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+Shift+H</Shortcut>  <!-- Near-match (?) Show.MethodHierarchy -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+Alt+H</Shortcut>  <!-- Near-match (?) Not context aware. Only opens Tool window. -->
+          <Shortcut Command="View.NextError" Scope="Global">F2</Shortcut>
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+F2</Shortcut>
+          <Shortcut Command="View.ViewCode" Scope="Global">F4</Shortcut>   <!-- EditSource/ViewSource. Note: On Project file should open Properties -->
+          <Shortcut Command="View.ViewCode" Scope="Global">Ctrl+Enter</Shortcut>
+          <Shortcut Command="Window.MoveToNavigationBar" Scope="Text Editor">Alt+Home</Shortcut>   <!-- Near Match (?) -->  <!-- Should be Global.ShowNavigationBar -->
+          <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">F11</Shortcut>
+          <Shortcut Command="ToggleBookmarkWithMnemonic" Scope="Text Editor">Ctrl+F11</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.0" Scope="Global">Ctrl+0</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.1" Scope="Global">Ctrl+1</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.2" Scope="Global">Ctrl+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.3" Scope="Global">Ctrl+3</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.4" Scope="Global">Ctrl+4</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.5" Scope="Global">Ctrl+5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.6" Scope="Global">Ctrl+6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.7" Scope="Global">Ctrl+7</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.8" Scope="Global">Ctrl+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.9" Scope="Global">Ctrl+9</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Shift+F11</Shortcut>
+          <!-- Refactoring -->
+          <Shortcut Command="File.Copy" Scope="Solution Explorer">F5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="File.Move" Scope="Solution Explorer">F6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Refactoring.Move" Scope="Text Editor">F6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Refactoring.SafeDelete" Scope="Solution Explorer">Alt+Del</Shortcut>   <!-- NYI(?) -->  <!-- Solution Explorer only ? -->
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">Shift+F6</Shortcut>
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">Shift+F6</Shortcut>
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Text Editor">Ctrl+F6</Shortcut>         <!-- Opens Change Signature Dialog -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+Alt+N</Shortcut>   <!-- IWC / Partial-Impl -->  <!-- Refactoring.Inline - Analyzers exist: Inline temporary variable. Could not find Inline Method. -->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+Alt+M</Shortcut>
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+Alt+V</Shortcut>   <!-- IWC -->  <!-- Refactoring.ExtractVariable - Analyzers exist: Introduce local (for one, or all) -->
+          <Shortcut Command="Refactoring.ExtractField" Scope="Text Editor">Ctrl+Alt+F</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Refactoring.ExtractConstant" Scope="Text Editor">Ctrl+Alt+C</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Refactoring.ExtractParameter" Scope="Text Editor">Ctrl+Alt+P</Shortcut>   <!-- NYI(?) -->
+          <!-- Source Control / Local History -->
+          <Shortcut Command="Team.Git.GoToGitSynchronization" Scope="Global">Ctrl+Shift+K</Shortcut>   <!-- Near-match -->  <!-- !! Changed shortcut from Ctrl+K (IDEA) to Ctrl+Shift+K (Rider) to free up Ctrl+Kk chord for old C# mappings --> <!-- SourceControl.PushDialog -->
+          <Shortcut Command="Team.Git.GoToGitSynchronization" Scope="Text Editor">Ctrl+Shift+K</Shortcut>   <!-- Force override --> <!-- !! Changed shortcut from Ctrl+K (IDEA) to Ctrl+Shift+K (Rider) to free up Ctrl+Kk chord for old C# mappings --> <!-- SourceControl.PushDialog -->
+          <Shortcut Command="Team.Git.GoToGitSynchronization" Scope="Workflow Designer">Ctrl+Shift+K</Shortcut>   <!-- Force override --> <!-- !! Changed shortcut from Ctrl+K (IDEA) to Ctrl+Shift+K (Rider) to free up Ctrl+Kk chord for old C# mappings --> <!-- SourceControl.PushDialog -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Global">Ctrl+T</Shortcut>   <!-- Near-match -->  <!-- SourceControl.PullDialog -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Text Editor">Ctrl+T</Shortcut>   <!-- Force override --> <!-- SourceControl.PullDialog -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="View Designer">Ctrl+T</Shortcut>   <!-- Force override --> <!-- SourceControl.PullDialog -->
+          <Shortcut Command="View.TfsTeamExplorer" Scope="Query Designer">Ctrl+T</Shortcut>   <!-- Force override -->  <!-- SourceControl.PullDialog -->
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Text Editor">Shift+Alt+C</Shortcut>   <!-- Near-match (Git History instead of Local History) -->  <!-- LocalHistory.ViewRecentChanges -->
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Solution Explorer">Shift+Alt+C</Shortcut>  <!-- Additional placement -->
+          <Shortcut Command="Team.Git.ViewHistory" Scope="Team Explorer">Shift+Alt+C</Shortcut>   <!-- Additional placement -->
+          <Shortcut Command="SourceControl.QuickPopup" Scope="Text Editor">Alt+`</Shortcut>   <!-- NYI(?) -->
+          <!-- Live Templates -->
+          <Shortcut Command="SurroundWithLiveTemplate" Scope="Text Editor">Ctrl+Alt+J</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Edit.InsertSnippet" Scope="Text Editor">Ctrl+J</Shortcut>   <!-- Near-match - InsertLiveTemplate -->
+          <!-- Note: Several live templates are defined. eg. iter, inst, itco, itit, itli, psf, thr -->
+          <!-- General -->
+          <Shortcut Command="View.Output" Scope="Global">Alt+0</Shortcut>   <!-- Near-match (?) Messages -->
+          <Shortcut Command="View.Output" Scope="Team Explorer">Alt+0</Shortcut>   <!--Force override -->
+          <Shortcut Command="View.Output" Scope="Text Editor">Alt+0</Shortcut>   <!--Future-proof override -->
+          <Shortcut Command="View.SolutionExplorer" Scope="Global">Alt+1</Shortcut>
+          <Shortcut Command="View.SolutionExplorer" Scope="Team Explorer">Alt+1</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.SolutionExplorer" Scope="JSON Editor">Alt+1</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.SolutionExplorer" Scope="Merge Editor Window">Alt+1</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.SolutionExplorer" Scope="Text Editor">Alt+1</Shortcut>   <!-- Future-proof override -->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Solution Explorer">Alt+1</Shortcut>   <!-- Tricky toggle feature. Could use Window.ActivateDocumentWindow -->
+          <Shortcut Command="OpenToolWindow.Favorites" Scope="Global">Alt+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Alt+3</Shortcut>   <!-- Could also map to View.FindResults1 or View.FindResults2 -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Team Explorer">Alt+3</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Merge Editor Window">Alt+3</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Text Editor">Alt+3</Shortcut>   <!-- Future-proof override -->
+          <Shortcut Command="View.Output" Scope="Global">Alt+4</Shortcut>   <!-- Near-match -->  <!-- OpenToolWindow.Run -->
+          <Shortcut Command="View.Output" Scope="Team Explorer">Alt+4</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.Output" Scope="Text Editor">Alt+4</Shortcut>   <!-- Future-proof override -->
+          <Shortcut Command="View.Output" Scope="Global">Alt+5</Shortcut>   <!-- Near-match -->  <!-- OpenToolWindow.Debug -->
+          <Shortcut Command="View.Output" Scope="Team Explorer">Alt+5</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.Output" Scope="Text Editor">Alt+5</Shortcut>   <!-- Future-proof overrider -->
+          <Shortcut Command="View.TaskList" Scope="Global">Alt+6</Shortcut>
+          <Shortcut Command="View.TaskList" Scope="Team Explorer">Alt+6</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.TaskList" Scope="Text Editor">Alt+6</Shortcut>   <!-- Future-proof override -->
+          <Shortcut Command="View.DocumentOutline" Scope="Global">Alt+7</Shortcut>   <!-- Near-match/Same-match? OpenToolWindow.Structure  or View.ClassView -->
+          <Shortcut Command="View.DocumentOutline" Scope="Team Explorer">Alt+7</Shortcut>   <!-- Force override -->
+          <Shortcut Command="View.DocumentOutline" Scope="Text Editor">Alt+7</Shortcut>   <!-- Future-proof override -->
+          <Shortcut Command="OpenToolWindow.Hierarchy" Scope="Global">Alt+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Team.Git.GoToGitChanges" Scope="Global">Alt+9</Shortcut>
+          <Shortcut Command="Team.Git.GoToGitChanges" Scope="Text Editor">Alt+9</Shortcut>  <!-- Future-proof override -->
+          <Shortcut Command="Window.CloseToolWindow" Scope="Team Explorer">Alt+9</Shortcut>   <!-- Getting tricky here for a toggle option. Could use Window.ActivateDocumentWindow -->
+          <Shortcut Command="File.SaveAll" Scope="Global">Ctrl+S</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Project.SynchronizeAllFolders" Scope="Global">Ctrl+Alt+Y</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Window.AutoHideAll" Scope="Global">Ctrl+Shift+F12</Shortcut>   <!-- Near-match: ToggleMaximizingEditor -->
+          <Shortcut Command="AddToFavorites" Scope="Global">Alt+Shift+F</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="InspectCurrentFileWithCurrentProfile" Scope="Global">Alt+Shift+I</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="QuickSwitchCurrentScheme" Scope="Global">Ctrl+`</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="Tools.Options" Scope="Global">Ctrl+Alt+S</Shortcut>   <!-- Near-match(?) OpenSettingsDialog -->
+          <Shortcut Command="ClassViewContextMenus.ClassViewMultiselectProjectreferencesItems.Properties" Scope="Global">Ctrl+Alt+Shift+S</Shortcut>   <!-- Near-match(?) OpenProjectStructureDialog -->
+          <Shortcut Command="Window.QuickLaunch" Scope="Global">Ctrl+Shift+A</Shortcut>   <!-- Near-match: FindAction -->
+          <Shortcut Command="Window.NextDocumentWindowNav" Scope="Global">Ctrl+Tab</Shortcut>   <!-- NYI(?) --><!-- SwitchBetweenTabsAndToolWindow: Implement as two features: Global and TextEditor ? -->
+          <!-- Extras -->
+          <Shortcut Command="Edit.MoveSelectedLinesUp" Scope="Text Editor">Ctrl+Shift+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveSelectedLinesDown" Scope="Text Editor">Ctrl+Shift+Down Arrow</Shortcut>
+          <Shortcut Command="Window.NextToolWindow" Scope="Difference Viewer">Esc</Shortcut>   <!-- Allows you to return to the Tool Window that launch the DiffViewer -->  <!-- Contentious: Overrides Esc = Edit.SelectionCancel (ie. clear "find" selection) -->
+          <Shortcut Command="Team.Git.CompareWithUnmodified" Scope="Team Explorer">Ctrl+D</Shortcut>
+          <!--Shortcut Command="Edit.QuickInfo" Scope="Global">Ctrl+Q</Shortcut-->  <!-- Force override of Global Quick Info shortcut -->  <!-- Bug: Unable to override text inside Quick Launch search box -->
+          <!-- Introduced shortcut to dock took window -->
+          <Shortcut Command="Window.Dock" Scope="Global">Ctrl+Ins</Shortcut>
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/HotKeysVSIX/Properties/AssemblyInfo.cs b/HotKeysVSIX/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..a6ca544
--- /dev/null
+++ b/HotKeysVSIX/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HotKeys")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HotKeys")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/HotKeysVSIX/ReSharper (IDEA style).vssettings b/HotKeysVSIX/ReSharper (IDEA style).vssettings
new file mode 100644
index 0000000..241e4d1
--- /dev/null
+++ b/HotKeysVSIX/ReSharper (IDEA style).vssettings	
@@ -0,0 +1,214 @@
+<UserSettings>
+  <ApplicationIdentity version="15.0"/>
+  <ToolsOptions>
+    <ToolsOptionsCategory name="Environment" RegisteredName="Environment"/>
+  </ToolsOptions>
+  <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" PackageName="Visual Studio Environment Package">
+      <Version>15.0.0.0</Version>
+      <KeyboardShortcuts>
+        <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="F# Interactive" 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>
+        <DefaultShortcuts>
+          <Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>
+          <Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>
+        </DefaultShortcuts>
+        <ShortcutsScheme/>
+        <UserShortcuts>
+          <!-- Editing Key bindings -->
+          <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+Space</Shortcut>   <!-- Symbol Code Completion -->
+          <Shortcut Command="Edit.SmartCompleteWord" Scope="Text Editor">Ctrl+Shift+Space</Shortcut>  <!-- NYI -->  <!-- Smart code completion -->
+          <Shortcut Command="InsertSymbolCompletion" Scope="Text Editor">Ctrl+Alt+Space</Shortcut>  <!-- NYI (?)-->  <!-- Insert symbol completion -->
+          <Shortcut Command="Edit.CompleteStatement" Scope="Text Editor">Ctrl+Shift+Enter</Shortcut>  <!-- NYI -->  <!-- Complete statement -->
+          <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+P</Shortcut>  <!-- Parameter Info -->
+          <Shortcut Command="Edit.ParameterInfoPrevious" Scope="Text Editor">Ctrl+Shift+P</Shortcut>   <!-- Go to previous signature (in paramter info) -->
+          <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+Q</Shortcut>    <!-- Quick documentation -->
+          <!-- Move code up/down/left/right -->
+          <Shortcut Command="Edit.MoveSelectedLinesUp" Scope="Text Editor">Ctrl+Shift+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveSelectedLinesDown" Scope="Text Editor">Ctrl+Shift+Down Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveSelectedLinesLeft" Scope="Text Editor">Ctrl+Shift+Left Arrow</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.MoveSelectedLinesRight" Scope="Text Editor">Ctrl+Shift+Right Arrow</Shortcut>  <!-- NYI -->
+          <!--Shortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</Shortcut-->   <!-- Near-match - IncreaseSelection Need this if HotCommands not available -->
+          <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.ContractSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.IncreaseSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Fallback to HotCommands.IncreaseSelection-->
+          <Shortcut Command="Edit.DecreaseSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Fallback to HotCommands.DecreaseSelection-->
+          <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Implemented in VS2017 v15.6 -->
+          <Shortcut Command="Edit.DuplicateSelection" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback to HotCommands for older versions of VS. -->
+          <Shortcut Command="Edit.SelectContainingDeclaration" Scope="Text Editor">Ctrl+Shift+[</Shortcut>  <!-- NYI (?) Select containing declaration -->
+          <Shortcut Command="Edit.ToggleComment" Scope="Text Editor">Ctrl+/</Shortcut>  <!-- NYI HotCommands.ToggleLineComment. Near-match. Should be ToggleLineComment -->
+          <Shortcut Command="Edit.ToggleBlockComment" Scope="Text Editor">Ctrl+Shift+/</Shortcut>  <!-- NYI -->
+          <!-- Generate code -->
+          <!-- Live Templates -->
+          <Shortcut Command="Edit.GenerateCode" Scope="Text Editor">Alt+Insert</Shortcut>  <!-- NYI Generate constructors, properties, implementing/overriding members, etc -->
+          <Shortcut Command="Edit.InsertSnippet" Scope="Text Editor">Ctrl+J</Shortcut>   <!-- Near-match - InsertLiveTemplate -->
+          <Shortcut Command="SurroundWithLiveTemplate" Scope="Text Editor">Ctrl+Alt+J</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="CreateFileFromTemplate" Scope="Global">Ctrl+Alt+Insert</Shortcut>  <!-- NYI Create file from template -->
+          <Shortcut Command="CreateFileFromTemplate" Scope="Solution Explorer">Alt+Insert</Shortcut>  <!-- NYI Create file from template -->
+          <Shortcut Command="Navigate.GoToLastEditLocation" Scope="Global">Ctrl+Shift+Bkspce</Shortcut>  <!-- NYI Go to last edit location -->
+          <Shortcut Command="View.RecentFiles" Scope="Global">Ctrl+E</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="View.RecentEdits" Scope="Global">Ctrl+Shift+Alt+Bkspce</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="GoTo.RelatedFiles" Scope="Global">Ctrl+Shift+Alt+G</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+`</Shortcut>
+          <Shortcut Command="GoToNumberedBookmark.0" Scope="Global">Ctrl+0</Shortcut>   <!-- NYI(?) Go to bookmark -->
+          <Shortcut Command="GoToNumberedBookmark.1" Scope="Global">Ctrl+1</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.2" Scope="Global">Ctrl+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.3" Scope="Global">Ctrl+3</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.4" Scope="Global">Ctrl+4</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.5" Scope="Global">Ctrl+5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.6" Scope="Global">Ctrl+6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.7" Scope="Global">Ctrl+7</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.8" Scope="Global">Ctrl+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.9" Scope="Global">Ctrl+9</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.0" Scope="Global">Ctrl+Shift+0</Shortcut>   <!-- NYI(?) Set/Remove bokmark -->
+          <Shortcut Command="ToggleNumberedBookmark.1" Scope="Global">Ctrl+Shift+1</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.2" Scope="Global">Ctrl+Shift+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.3" Scope="Global">Ctrl+Shift+3</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.4" Scope="Global">Ctrl+Shift+4</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.5" Scope="Global">Ctrl+Shift+5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.6" Scope="Global">Ctrl+Shift+6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.7" Scope="Global">Ctrl+Shift+7</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.8" Scope="Global">Ctrl+Shift+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.9" Scope="Global">Ctrl+Shift+9</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleBookmarkWithMnemonic" Scope="Text Editor">Ctrl+F11</Shortcut>   <!-- NYI(?) Not in ReShaper map -->
+          <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">F11</Shortcut>   <!-- NYI(?) Not in ReShaper map -->
+          <!-- Explore -->
+          <!-- VS2017 shortcuts -->
+          <Shortcut Command="Edit.GoToAll" Scope="Global">Ctrl+N</Shortcut>  <!-- VS2017+ -->
+          <!--Shortcut Command="Edit.GoToType" Scope="Global">Ctrl+N, Ctrl+N</Shortcut-->  <!-- VS2017+ - Cannot do this because it introduces a chord that conflicts with Ctrl+N -->
+          <Shortcut Command="Edit.GoToSymbol" Scope="Global">Ctrl+Shift+Alt+N</Shortcut>  <!-- VS2017+ -->
+          <Shortcut Command="Edit.GoToFile" Scope="Global">Ctrl+Shift+N</Shortcut>  <!-- VS2017+ -->
+          <Shortcut Command="Edit.GoToMember" Scope="Global">Ctrl+F12</Shortcut>  <!-- VS2017+ -->
+          <!-- VS2015 shortcuts -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+N</Shortcut>  <!-- Near-match [GoTo everything] QuickLaunch or NavigateTo ?? -->
+          <!--Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+N, Ctrl+N</Shortcut-->  <!-- Near-match [GoTo Type] Cannot do this because it introduces a chord that conflicts with Ctrl+N -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+Shift+Alt+N</Shortcut>  <!-- Near-match [GoTo Symbol] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+Shift+N</Shortcut>  <!-- Near-match [GoTo File] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+F12</Shortcut>  <!-- Near-match [GoTo Member] -->
+          <!-- Find usages -->
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Alt+F7</Shortcut>
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+Alt+F7</Shortcut>  <!-- NYI Find usages (advanced) -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+Alt+U</Shortcut>   <!-- Could also map to View.FindResults1 or View.FindResults2 - Used for Alt+3 -->
+          <Shortcut Command="Edit.HighlightUsagesInFile" Scope="Global">Ctrl+Shift+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command. This happens automatically with setting applied. -->
+          <Shortcut Command="Edit.PreviousHighlightedReference" Scope="Global">Ctrl+Alt+Up Arrow</Shortcut>  <!-- NYI GoToPreviousUsage Could be Edit.FindPrevious -->
+          <Shortcut Command="Edit.NextHighlightedReference" Scope="Global">Ctrl+Alt+Down Arrow</Shortcut>  <!-- NYI GoToNextUsage. Could be Edit.FindNext -->
+          <Shortcut Command="Edit.FindUsagesInFile" Scope="Global">Ctrl+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command (Not in ReShaper map) -->
+          <Shortcut Command="Edit.ShowUsages" Scope="Global">Ctrl+Alt+F7</Shortcut>  <!-- NYI/Broken? Need to find VS command (Not in ReShaper map) -->
+          <Shortcut Command="View.AnalyzeReferences" Scope="Global">Ctrl+Alt+Y</Shortcut>  <!-- NYI (?) Analyze References window -->
+          <!-- Navigate to -->
+          <!--<Shortcut Command="Edit.GoToAll" Scope="Text Editor">Ctrl+Shift+G</Shortcut>  --><!-- Navigate To (VS2017) -->
+          <!--<Shortcut Command="Edit.NavigateTo" Scope="Text Editor">Ctrl+Shift+G</Shortcut>  --><!-- Navigate To (VS2015) -->
+          <Shortcut Command="Edit.GoToDefinition" Scope="Text Editor">Ctrl+B</Shortcut>  <!-- [GoTo Declaration] -->
+          <Shortcut Command="Edit.GoToTypeOfSymbol" Scope="Text Editor">Ctrl+Shift+T</Shortcut>  <!-- NYI(?) Go to type of symbol -->
+          <Shortcut Command="Edit.GoToTypeDeclaration" Scope="Text Editor">Ctrl+Shift+B</Shortcut>  <!-- NYI (Not on ReSharper map) -->
+          <Shortcut Command="Edit.GoToImplementation" Scope="Text Editor">Ctrl+Shift+Alt+B</Shortcut>
+          <Shortcut Command="Edit.GoToSuperMethod" Scope="Text Editor">Ctrl+U</Shortcut>    <!-- NYI - Go To base symboles -->
+          <Shortcut Command="Edit.GoToDerivedSymbole" Scope="Text Editor">Ctrl+Alt+B</Shortcut>    <!-- NYI - Go To derived symbols -->
+          <Shortcut Command="Edit.GoToUsage" Scope="Text Editor">Ctrl+Alt+F7</Shortcut>    <!-- NYI - Go To usage (?? What is this ??) -->
+          <!-- File structure -->
+          <Shortcut Command="View.DocumentOutline" Scope="Text Editor">Ctrl+F11</Shortcut>    <!-- NYI (Near-match) - File structure -->
+          <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Alt+Down Arrow</Shortcut>   <!-- Go to next member/tag -->
+          <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Alt+Up Arrow</Shortcut>   <!-- Go to previous member/tag -->
+          <Shortcut Command="Edit.MoveToCodeBlockStart" Scope="Text Editor">Ctrl+[</Shortcut>  <!-- NYI -->    <!-- Go to containing declaration -->
+          <Shortcut Command="Edit.MoveToCodeBlockEnd" Scope="Text Editor">Ctrl+]</Shortcut>  <!-- NYI (Not in ReSharper map) -->
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+Alt+.</Shortcut>      <!-- To-do items window -->
+          <Shortcut Command="View.StackTrace" Scope="Global">Ctrl+Alt+.</Shortcut>      <!-- NYI(?) Explore Stack Trace -->
+          <Shortcut Command="LocateInSolutionExplorer" Scope="Global">Ctrl+Alt+.</Shortcut>      <!-- NYI(Must be somewhere!) Locate in Solution Explorer -->
+          <!-- Improve -->
+          <Shortcut Command="ShowQuickFixes" Scope="Global">Alt+Enter</Shortcut>
+          <Shortcut Command="InspectThis" Scope="Global">Ctrl+Shift+Alt+A</Shortcut>
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+E, H</Shortcut>  <!-- Near-match (?) ViewTypeHierarchy. Not context aware. Only opens Tool window. -->
+          <Shortcut Command="View.NextError" Scope="Global">F12</Shortcut>    <!-- NYI. Near-match. GoToNextHighlight  (Edit.NextHighlightedReference?) -->
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+F12</Shortcut>   <!-- NYI. Near-match. GoToPreviousHighlight  (Edit.PreviousHighlightedReference?) -->
+          <Shortcut Command="View.NextError" Scope="Global">Alt+F12</Shortcut>
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+F12</Shortcut>
+          <!-- Refactoring -->
+          <Shortcut Command="Refactor.This" Scope="Global">Ctrl+Shift+R</Shortcut>    <!-- Refactor this. Open Edit->Refactor menu ? -->
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">F2</Shortcut>
+          <!--<Shortcut Command="File.Rename" Scope="Solution Explorer">Shift+R</Shortcut>-->   <!-- Cannot get this to work -->
+          <Shortcut Command="File.Move" Scope="Solution Explorer">F6</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="Refactoring.Move" Scope="Text Editor">F6</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="Refactoring.SafeDelete" Scope="Solution Explorer">Alt+Del</Shortcut>   <!-- NYI(?) Safe Delete -->  <!-- Solution Explorer only ? -->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+Alt+M</Shortcut>
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+Alt+V</Shortcut>   <!-- IWC IntroduceVariable -->  <!-- Refactoring.IntroduceVariable - Analyzers exist: Introduce local (for one, or all) -->
+          <Shortcut Command="Refactoring.ExtractField" Scope="Text Editor">Ctrl+Alt+D</Shortcut>   <!-- NYI(?) Introduce field -->
+          <Shortcut Command="Refactoring.ExtractParameter" Scope="Text Editor">Ctrl+Alt+P</Shortcut>   <!-- NYI(?) Introduce parameter -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+Alt+N</Shortcut>   <!-- IWC / Partial-Impl -->  <!-- Refactoring.Inline - Analyzers exist: Inline temporary variable. Could not find Inline Method. -->
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Text Editor">Ctrl+F6</Shortcut>         <!-- Change Signature Dialog -->
+          <Shortcut Command="File.Copy" Scope="Solution Explorer">F5</Shortcut>   <!-- NYI(?) (Not in ReSharper map) -->
+          <Shortcut Command="Refactoring.ExtractConstant" Scope="Text Editor">Ctrl+Alt+C</Shortcut>   <!-- NYI(?) (Not in ReSharper map) -->
+          <!-- Code cleanup -->
+          <Shortcut Command="CodeCleanup" Scope="Text Editor">Ctrl+Alt+F</Shortcut>   <!-- NYI(?) Code cleanup -->
+          <Shortcut Command="ApplyCodeStyle" Scope="Text Editor">Ctrl+Alt+S</Shortcut>   <!-- NYI(?) Apply Code style -->
+          <!--Shortcut Command="Edit.FormatCode" Scope="Text Editor">Ctrl+Alt+L</Shortcut-->  <!-- HotCommands.FormatCode  IntelliJ: Reformat Code. Offers choice of selection/document where appropriate. -->
+          <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+Alt+L</Shortcut>  <!-- Near-match -->
+          <Shortcut Command="Edit.FormatSelection" Scope="Text Editor">Ctrl+Shift+Alt+L</Shortcut>  <!-- Introduced shortcut! for Near-match -->
+          <!-- Run unit tests -->
+          <Shortcut Command="TestExplorer.RunAllTestsInContext" Scope="Global">Ctrl+T, R</Shortcut>  <!-- NYI(?) RunUnitTests -->
+          <Shortcut Command="TestExplorer.DebugAllTestsInContext" Scope="Global">Ctrl+T, D</Shortcut>  <!-- NYI(?) DebugUnitTests (TestExplorer.DebugAllTests)-->
+          <Shortcut Command="TestExplorer.RunAllTests" Scope="Global">Ctrl+T, L</Shortcut>  <!-- NYI(?) RunAllTestsFromSolution -->
+          <Shortcut Command="TestExplorer.RunCurrentSession" Scope="Global">Ctrl+T, Y</Shortcut>  <!-- NYI(?) RunCurrentSession -->
+          <Shortcut Command="TestExplorer.RepeatLastRun" Scope="Global">Ctrl+T, T</Shortcut>  <!-- NYI(?) RepeatPreviousRun -->
+          <Shortcut Command="UnitTestExplorer" Scope="Global">Ctrl+Alt+T</Shortcut>  <!-- NYI(?) UnitTestExplorer -->
+          <Shortcut Command="UnitTestSessions" Scope="Global">Ctrl+Alt+R</Shortcut>  <!-- NYI(?) UnitTestSessions -->
+          <!-- Other ReSharper shortcuts -->
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Global">Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Text Editor">Ctrl+Shift+L</Shortcut>
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/HotKeysVSIX/ReSharper (VS style).vssettings b/HotKeysVSIX/ReSharper (VS style).vssettings
new file mode 100644
index 0000000..3b08bd4
--- /dev/null
+++ b/HotKeysVSIX/ReSharper (VS style).vssettings	
@@ -0,0 +1,240 @@
+<UserSettings>
+  <ApplicationIdentity version="15.0"/>
+  <ToolsOptions>
+    <ToolsOptionsCategory name="Environment" RegisteredName="Environment"/>
+  </ToolsOptions>
+  <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" PackageName="Visual Studio Environment Package">
+      <Version>15.0.0.0</Version>
+      <KeyboardShortcuts>
+        <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="F# Interactive" 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>
+        <DefaultShortcuts>
+          <Shortcut Command="View.ViewCode" Scope="Global">F7</Shortcut>
+          <Shortcut Command="View.ViewDesigner" Scope="Global">Shift+F7</Shortcut>
+        </DefaultShortcuts>
+        <ShortcutsScheme/>
+        <UserShortcuts>
+          <!-- Editing Key bindings -->
+          <Shortcut Command="Edit.CompleteWord" Scope="Text Editor">Ctrl+Space</Shortcut>   <!-- Symbol Code Completion -->
+          <Shortcut Command="Edit.SmartCompleteWord" Scope="Text Editor">Ctrl+Alt+Space</Shortcut>  <!-- NYI -->  <!-- Smart code completion -->
+          <Shortcut Command="InsertSymbolCompletion" Scope="Text Editor">Shift+Alt+Space</Shortcut>  <!-- NYI (?)-->  <!-- Insert symbol completion -->
+          <Shortcut Command="Edit.CompleteStatement" Scope="Text Editor">Ctrl+Shift+Enter</Shortcut>  <!-- NYI -->  <!-- Complete statement -->
+          <Shortcut Command="Edit.ParameterInfo" Scope="Text Editor">Ctrl+Shift+Space</Shortcut>  <!-- Parameter Info -->
+          <Shortcut Command="Edit.ParameterInfoPrevious" Scope="Text Editor">Ctrl+Shift+Alt+Space</Shortcut>   <!-- Go to previous signature (in paramter info) -->
+          <Shortcut Command="Edit.QuickInfo" Scope="Text Editor">Ctrl+Shift+F1</Shortcut>    <!-- Quick documentation -->
+          <!-- Move code up/down/left/right -->
+          <Shortcut Command="Edit.MoveSelectedLinesUp" Scope="Text Editor">Ctrl+Shift+Alt+Up Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveSelectedLinesDown" Scope="Text Editor">Ctrl+Shift+Alt+Down Arrow</Shortcut>
+          <Shortcut Command="Edit.MoveSelectedLinesLeft" Scope="Text Editor">Ctrl+Shift+Alt+Left Arrow</Shortcut>  <!-- NYI -->
+          <Shortcut Command="Edit.MoveSelectedLinesRight" Scope="Text Editor">Ctrl+Shift+Alt+Right Arrow</Shortcut>  <!-- NYI -->
+          <!--Shortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</Shortcut-->   <!-- Near-match - IncreaseSelection Need this if HotCommands not available -->
+          <Shortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.ContractSelection" Scope="Text Editor">Ctrl+Shift+W</Shortcut>  <!-- Available VS2017 v15.5 -->
+          <Shortcut Command="Edit.IncreaseSelection" Scope="Text Editor">Ctrl+Alt+Right Arrow</Shortcut>  <!-- Fallback to HotCommands.IncreaseSelection-->
+          <Shortcut Command="Edit.DecreaseSelection" Scope="Text Editor">Ctrl+Alt+Left Arrow</Shortcut>  <!-- Fallback to HotCommands.DecreaseSelection-->
+          <Shortcut Command="Edit.Duplicate" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Implemented in VS2017 v15.6 -->
+          <Shortcut Command="Edit.DuplicateSelection" Scope="Text Editor">Ctrl+D</Shortcut>  <!-- Fallback to HotCommands for older versions of VS. -->
+          <Shortcut Command="Edit.SelectContainingDeclaration" Scope="Text Editor">Ctrl+Shift+[</Shortcut>  <!-- NYI (?) Select containing declaration -->
+          <Shortcut Command="Edit.ToggleComment" Scope="Text Editor">Ctrl+Alt+/</Shortcut>  <!-- NYI HotCommands.ToggleLineComment. Near-match. Should be ToggleLineComment -->
+          <Shortcut Command="Edit.ToggleBlockComment" Scope="Text Editor">Ctrl+Shift+/</Shortcut>  <!-- NYI -->
+          <!-- Generate code -->
+          <!-- Live Templates -->
+          <Shortcut Command="Edit.GenerateCode" Scope="Text Editor">Alt+Insert</Shortcut>  <!-- NYI Generate constructors, properties, implementing/overriding members, etc -->
+          <Shortcut Command="Edit.InsertSnippet" Scope="Text Editor">Ctrl+E, J</Shortcut>   <!-- Near-match - InsertLiveTemplate -->
+          <Shortcut Command="SurroundWithLiveTemplate" Scope="Text Editor">Ctrl+E, U</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="CreateFileFromTemplate" Scope="Solution Explorer">Alt+Insert</Shortcut>  <!-- NYI Create file from template -->
+          <Shortcut Command="Navigate.GoToLastEditLocation" Scope="Global">Ctrl+Shift+Bkspce</Shortcut>  <!-- NYI Go to last edit location -->
+          <Shortcut Command="View.RecentFiles" Scope="Global">Ctrl+,</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="View.RecentEdits" Scope="Global">Ctrl+Shift+,</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="GoTo.RelatedFiles" Scope="Global">Ctrl+Alt+F7</Shortcut>  <!-- NYI (?) -->
+          <Shortcut Command="View.BookmarkWindow" Scope="Global">Ctrl+`</Shortcut>
+          <Shortcut Command="GoToNumberedBookmark.0" Scope="Global">Ctrl+0</Shortcut>   <!-- NYI(?) Go to bookmark -->
+          <Shortcut Command="GoToNumberedBookmark.1" Scope="Global">Ctrl+1</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.2" Scope="Global">Ctrl+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.3" Scope="Global">Ctrl+3</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.4" Scope="Global">Ctrl+4</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.5" Scope="Global">Ctrl+5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.6" Scope="Global">Ctrl+6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.7" Scope="Global">Ctrl+7</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.8" Scope="Global">Ctrl+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="GoToNumberedBookmark.9" Scope="Global">Ctrl+9</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.0" Scope="Global">Ctrl+Shift+0</Shortcut>   <!-- NYI(?) Set/Remove bokmark -->
+          <Shortcut Command="ToggleNumberedBookmark.1" Scope="Global">Ctrl+Shift+1</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.2" Scope="Global">Ctrl+Shift+2</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.3" Scope="Global">Ctrl+Shift+3</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.4" Scope="Global">Ctrl+Shift+4</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.5" Scope="Global">Ctrl+Shift+5</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.6" Scope="Global">Ctrl+Shift+6</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.7" Scope="Global">Ctrl+Shift+7</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.8" Scope="Global">Ctrl+Shift+8</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleNumberedBookmark.9" Scope="Global">Ctrl+Shift+9</Shortcut>   <!-- NYI(?) -->
+          <Shortcut Command="ToggleBookmarkWithMnemonic" Scope="Text Editor">Ctrl+F11</Shortcut>   <!-- NYI(?) Not in ReShaper map -->
+          <Shortcut Command="Edit.ToggleBookmark" Scope="Text Editor">F11</Shortcut>   <!-- NYI(?) Not in ReShaper map -->
+          <!-- Explore -->
+          <!-- VS2017+ shortcuts = Edit.GoTo.. VS2015 shortcuts = Edit.NavigateTo -->
+          <Shortcut Command="Edit.GoToAll" Scope="Global">Ctrl+T</Shortcut>
+          <Shortcut Command="Edit.GoToAll" Scope="Text Editor">Ctrl+T</Shortcut>
+          <Shortcut Command="Edit.GoToAll" Scope="View Designer">Ctrl+T</Shortcut>
+          <Shortcut Command="Edit.GoToAll" Scope="Query Designer">Ctrl+T</Shortcut>
+          <!--Shortcut Command="Edit.GoToType" Scope="Global">Ctrl+T, Ctrl+T</Shortcut-->  <!-- [GoTo Type] Cannot do this because it introduces a chord that conflicts with Ctrl+T -->
+          <Shortcut Command="Edit.GoToSymbol" Scope="Global">Shift+Alt+T</Shortcut>
+          <Shortcut Command="Edit.GoToSymbol" Scope="Text Editor">Shift+Alt+T</Shortcut>
+          <Shortcut Command="Edit.GoToFile" Scope="Global">Ctrl+Shift+T</Shortcut>
+          <Shortcut Command="Edit.GoToFile" Scope="Text Editor">Ctrl+Shift+T</Shortcut>
+          <Shortcut Command="Edit.GoToFile" Scope="Coded UI Test Editor">Ctrl+Shift+T</Shortcut>
+          <Shortcut Command="Edit.GoToMember" Scope="Global">Alt+\</Shortcut>
+          <!-- VS2015 shortcuts -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+T</Shortcut>  <!-- Near-match [GoTo everything] QuickLaunch or NavigateTo ?? -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Text Editor">Ctrl+T</Shortcut>  <!-- Near-match [GoTo everything] QuickLaunch or NavigateTo ?? -->
+          <Shortcut Command="Edit.NavigateTo" Scope="View Designer">Ctrl+T</Shortcut>  <!-- Near-match [GoTo everything] QuickLaunch or NavigateTo ?? -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Query Designer">Ctrl+T</Shortcut>  <!-- Near-match [GoTo everything] QuickLaunch or NavigateTo ?? -->
+          <!--Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+T, Ctrl+T</Shortcut-->  <!-- Near-match [GoTo Type] Cannot do this because it introduces a chord that conflicts with Ctrl+N -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Shift+Alt+T</Shortcut>  <!-- Near-match [GoTo Symbol] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Text Editor">Shift+Alt+T</Shortcut>  <!-- Near-match [GoTo Symbol] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Ctrl+Shift+T</Shortcut>  <!-- Near-match [GoTo File] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Text Editor">Ctrl+Shift+T</Shortcut>  <!-- Near-match [GoTo File] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Coded UI Test Editor">Ctrl+Shift+T</Shortcut>  <!-- Near-match [GoTo File] -->
+          <Shortcut Command="Edit.NavigateTo" Scope="Global">Alt+\</Shortcut>  <!-- Near-match [GoTo Member] -->
+          <!-- Find usages -->
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Shift+F12</Shortcut>
+          <Shortcut Command="Edit.FindAllReferences" Scope="Global">Ctrl+Shift+Alt+F12</Shortcut>  <!-- NYI Find usages (advanced) -->
+          <Shortcut Command="View.FindSymbolResults" Scope="Global">Ctrl+Alt+F12</Shortcut>   <!-- Could also map to View.FindResults1 or View.FindResults2 - Used for Alt+3 -->
+          <Shortcut Command="Edit.HighlightUsagesInFile" Scope="Global">Shift+Alt+F11</Shortcut>  <!-- NYI/Broken? Need to find VS command. This happens automatically with setting applied. -->
+          <Shortcut Command="Edit.PreviousHighlightedReference" Scope="Global">Ctrl+Alt+PgUp</Shortcut>  <!-- NYI GoToPreviousUsage Could be Edit.FindPrevious -->
+          <Shortcut Command="Edit.NextHighlightedReference" Scope="Global">Ctrl+Alt+PgDn</Shortcut>  <!-- NYI GoToNextUsage. Could be Edit.FindNext -->
+          <!--<Shortcut Command="Edit.FindUsagesInFile" Scope="Global">Ctrl+F7</Shortcut>-->  <!-- NYI/Broken? Need to find VS command (Not in ReShaper map) -->
+          <!--<Shortcut Command="Edit.ShowUsages" Scope="Global">Ctrl+Alt+F7</Shortcut>-->  <!-- NYI/Broken? Need to find VS command (Not in ReShaper map) -->
+          <Shortcut Command="View.AnalyzeReferences" Scope="Global">Ctrl+Alt+Y</Shortcut>  <!-- NYI (?) Analyze References window -->
+          <!-- Navigate to -->
+          <!--<Shortcut Command="Edit.NavigateTo" Scope="Text Editor">Alt+`</Shortcut>-->  <!-- Navigate To (Context menu?) -->  <!-- Choosing not to overrider default CodeLens shortcut -->
+          <Shortcut Command="Edit.GoToDefinition" Scope="Text Editor">F12</Shortcut>  <!-- [GoTo Declaration] -->
+          <Shortcut Command="Edit.GoToTypeDeclaration" Scope="Text Editor">Ctrl+Shift+F11</Shortcut>  <!-- NYI(?) Go to type of symbol. Could this be GoToTypeDeclaration? -->
+          <Shortcut Command="Edit.GoToImplementation" Scope="Text Editor">Ctrl+F12</Shortcut>
+          <Shortcut Command="Edit.GoToSuperMethod" Scope="Text Editor">Alt+Home</Shortcut>    <!-- NYI - Go To base symboles -->
+          <Shortcut Command="Edit.GoToDerivedSymbols" Scope="Text Editor">Alt+End</Shortcut>    <!-- NYI - Go To derived symbols -->
+          <Shortcut Command="Edit.GoToUsage" Scope="Text Editor">Shift+Alt+F12</Shortcut>    <!-- NYI - Go To usage (?? What is this ??) -->
+          <!-- File structure -->
+          <Shortcut Command="View.DocumentOutline" Scope="Text Editor">Ctrl+Alt+F</Shortcut>    <!-- NYI (Near-match) - File structure -->
+          <Shortcut Command="Edit.NextMethod" Scope="Text Editor">Alt+Down Arrow</Shortcut>   <!-- Go to next member/tag -->
+          <Shortcut Command="Edit.PreviousMethod" Scope="Text Editor">Alt+Up Arrow</Shortcut>   <!-- Go to previous member/tag -->
+          <Shortcut Command="Edit.MoveToCodeBlockStart" Scope="Text Editor">Ctrl+[</Shortcut>  <!-- NYI -->    <!-- Go to containing declaration -->
+          <Shortcut Command="Edit.MoveToCodeBlockEnd" Scope="Text Editor">Ctrl+]</Shortcut>  <!-- NYI (Not in ReSharper map) -->
+          <Shortcut Command="View.TaskList" Scope="Global">Ctrl+Alt+D</Shortcut>      <!-- To-do items window -->
+          <Shortcut Command="View.StackTrace" Scope="Global">Ctrl+E, T</Shortcut>      <!-- NYI(?) Explore Stack Trace -->
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Global">Shift+Alt+L</Shortcut>      <!-- Locate in Solution Explorer -->
+          <!-- Improve -->
+          <Shortcut Command="ShowQuickFixes" Scope="Global">Alt+Enter</Shortcut>
+          <Shortcut Command="InspectThis" Scope="Global">Ctrl+Shift+Alt+A</Shortcut>
+          <Shortcut Command="View.InspectionResults" Scope="Global">Ctrl+Alt+V</Shortcut>  <!-- NYI(?) Inspection results window -->
+          <Shortcut Command="View.CallHierarchy" Scope="Global">Ctrl+E, H</Shortcut>  <!-- Near-match (?) ViewTypeHierarchy. Not context aware. Only opens Tool window. -->
+          <Shortcut Command="Edit.GoToNextLocation" Scope="Global">Alt+PgDn</Shortcut>    <!-- (NYI?) Near-match. GoToNextHighlight (error/warning/suggestion) -->
+          <Shortcut Command="Edit.GoToPrevLocation" Scope="Global">Alt+PgUp</Shortcut>   <!-- (NYI?) Near-match. GoToPreviousHighlight (error/warning/suggestion) -->
+          <Shortcut Command="View.NextError" Scope="Global">Shift+Alt+PgDn</Shortcut>
+          <Shortcut Command="View.PreviousError" Scope="Global">Shift+Alt+PgUp</Shortcut>
+          <!-- Refactoring -->
+          <Shortcut Command="Refactor.This" Scope="Global">Ctrl+Shift+R</Shortcut>    <!-- Refactor this. Open Edit->Refactor menu ? -->
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, R</Shortcut>
+          <Shortcut Command="Refactor.Rename" Scope="Global">Ctrl+R, Ctrl+R</Shortcut>  <!-- In Default map -->
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">Ctrl+R, R</Shortcut>
+          <Shortcut Command="Refactor.Rename" Scope="Text Editor">Ctrl+R, Ctrl+R</Shortcut>
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">Ctrl+R, R</Shortcut>
+          <Shortcut Command="File.Rename" Scope="Solution Explorer">Ctrl+R, Ctrl+R</Shortcut>
+          <Shortcut Command="File.Move" Scope="Solution Explorer">Ctrl+R, O</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="File.Move" Scope="Solution Explorer">Ctrl+R, Ctrl+O</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="Refactoring.Move" Scope="Text Editor">Ctrl+R, O</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="Refactoring.Move" Scope="Text Editor">Ctrl+R, Ctrl+O</Shortcut>   <!-- NYI(?) Move type or static member -->
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Text Editor">Ctrl+R, D</Shortcut>   <!-- NYI(?) Safe Delete -->
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Text Editor">Ctrl+R, Ctrl+D</Shortcut>   <!-- NYI(?) Safe Delete -->
+          <Shortcut Command="Refactor.RemoveParameters" Scope="Text Editor">Alt+Del</Shortcut>   <!-- NYI(?) Safe Delete -->
+          <Shortcut Command="Refactoring.SafeDelete" Scope="Solution Explorer">Ctrl+R, D</Shortcut>   <!-- NYI(?) Safe Delete -->  <!-- Solution Explorer only ? -->
+          <Shortcut Command="Refactoring.SafeDelete" Scope="Solution Explorer">Ctrl+R, Ctrl+D</Shortcut>   <!-- NYI(?) Safe Delete -->  <!-- Solution Explorer only ? -->
+          <Shortcut Command="Refactoring.SafeDelete" Scope="Solution Explorer">Alt+Del</Shortcut>   <!-- NYI(?) Safe Delete -->  <!-- Solution Explorer only ? -->
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+R, M</Shortcut>
+          <Shortcut Command="Refactor.ExtractMethod" Scope="Text Editor">Ctrl+R, Ctrl+M</Shortcut>
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, V</Shortcut>   <!-- IWC IntroduceVariable -->  <!-- Refactoring.IntroduceVariable - Analyzers exist: Introduce local (for one, or all) -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, Ctrl+V</Shortcut>   <!-- IWC IntroduceVariable -->  <!-- Refactoring.IntroduceVariable - Analyzers exist: Introduce local (for one, or all) -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, F</Shortcut>   <!-- Introduce field - need command - only available on analyzer -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, Ctrl+F</Shortcut>   <!-- Introduce field - need command - only available on analyzer -->
+          <Shortcut Command="Refactoring.ExtractParameter" Scope="Text Editor">Ctrl+R, P</Shortcut>   <!-- NYI(?) Introduce parameter -->
+          <Shortcut Command="Refactoring.ExtractParameter" Scope="Text Editor">Ctrl+R, Ctrl+P</Shortcut>   <!-- NYI(?) Introduce parameter -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, I</Shortcut>   <!-- IWC / Partial-Impl -->  <!-- Refactoring.Inline - Analyzers exist: Inline temporary variable. Could not find Inline Method. -->
+          <Shortcut Command="View.QuickActions" Scope="Text Editor">Ctrl+R, Ctrl+I</Shortcut>   <!-- IWC / Partial-Impl -->  <!-- Refactoring.Inline - Analyzers exist: Inline temporary variable. Could not find Inline Method. -->
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Text Editor">Ctrl+R, S</Shortcut>         <!-- Change Signature Dialog -->
+          <Shortcut Command="Refactor.ReorderParameters" Scope="Text Editor">Ctrl+R, Ctrl+S</Shortcut>         <!-- Change Signature Dialog -->
+          <!--<Shortcut Command="File.Copy" Scope="Solution Explorer">F5</Shortcut>-->  <!-- NYI(?) (Not in ReSharper map) -->
+          <!--<Shortcut Command="Refactoring.ExtractConstant" Scope="Text Editor">Ctrl+Alt+C</Shortcut>-->   <!-- NYI(?) (Not in ReSharper map) -->
+          <!-- Code cleanup -->
+          <Shortcut Command="CodeCleanup" Scope="Text Editor">Ctrl+E, C</Shortcut>   <!-- NYI(?) Code cleanup -->
+          <Shortcut Command="CodeCleanup" Scope="Text Editor">Ctrl+E, Ctrl+C</Shortcut>   <!-- NYI(?) Code cleanup -->
+          <Shortcut Command="ApplyCodeStyle" Scope="Text Editor">Ctrl+Alt+S</Shortcut>   <!-- NYI(?) Apply code style -->
+          <!--Shortcut Command="Edit.FormatCode" Scope="Text Editor">Ctrl+Alt+Enter</Shortcut-->  <!-- HotCommands.FormatCode  IntelliJ: Reformat Code. Offers choice of selection/document where appropriate. -->
+          <Shortcut Command="Edit.FormatDocument" Scope="Text Editor">Ctrl+Alt+Enter</Shortcut>  <!-- Near-match -->
+          <!-- Run unit tests -->
+          <Shortcut Command="TestExplorer.RunAllTestsInContext" Scope="Global">Ctrl+U, R</Shortcut>  <!-- NYI(?) RunUnitTests -->
+          <Shortcut Command="TestExplorer.DebugAllTestsInContext" Scope="Global">Ctrl+U, D</Shortcut>  <!-- NYI(?) DebugUnitTests (TestExplorer.DebugAllTests)-->
+          <Shortcut Command="TestExplorer.RunAllTests" Scope="Global">Ctrl+U, L</Shortcut>  <!-- NYI(?) RunAllTestsFromSolution -->
+          <Shortcut Command="TestExplorer.RunCurrentSession" Scope="Global">Ctrl+U, Y</Shortcut>  <!-- NYI(?) RunCurrentSession -->
+          <Shortcut Command="TestExplorer.RepeatLastRun" Scope="Global">Ctrl+U, T</Shortcut>  <!-- NYI(?) RepeatPreviousRun -->
+          <Shortcut Command="UnitTestExplorer" Scope="Global">Ctrl+Alt+U</Shortcut>  <!-- NYI(?) UnitTestExplorer -->
+          <Shortcut Command="UnitTestSessions" Scope="Global">Ctrl+Alt+T</Shortcut>  <!-- NYI(?) UnitTestSessions -->
+          <!-- Other ReSharper shortcuts -->
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Global">Ctrl+Shift+L</Shortcut>
+          <Shortcut Command="SolutionExplorer.SyncWithActiveDocument" Scope="Text Editor">Ctrl+Shift+L</Shortcut>
+        </UserShortcuts>
+      </KeyboardShortcuts>
+    </Category>
+  </Category>
+</UserSettings>
diff --git a/HotKeysVSIX/ReleaseNotes.txt b/HotKeysVSIX/ReleaseNotes.txt
new file mode 100644
index 0000000..542bfce
--- /dev/null
+++ b/HotKeysVSIX/ReleaseNotes.txt
@@ -0,0 +1,8 @@
+Hot Keys - Keyboard 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
+05-Feb-2017: v1.2.2 Removed IntelliJ Build/Debug shortcuts from ReSharper schemes
+30-Nov-2016: v1.2.1 Updated shortcuts for Version Control tool windows
+21-Nov-2016: v1.2.0 Added Visual C# 2017 mapping
+02-Nov-2016: v1.0.0 Initial Release
\ No newline at end of file
diff --git a/HotKeysVSIX/Resources/HotKeysIcon.png b/HotKeysVSIX/Resources/HotKeysIcon.png
new file mode 100644
index 0000000..8fc589c
Binary files /dev/null and b/HotKeysVSIX/Resources/HotKeysIcon.png differ
diff --git a/HotKeysVSIX/Resources/HotKeysPreviewImage.png b/HotKeysVSIX/Resources/HotKeysPreviewImage.png
new file mode 100644
index 0000000..1e37674
Binary files /dev/null and b/HotKeysVSIX/Resources/HotKeysPreviewImage.png differ
diff --git a/HotKeysVSIX/Resources/Market_HotKeys_128x.png b/HotKeysVSIX/Resources/Market_HotKeys_128x.png
new file mode 100644
index 0000000..cfdecdb
Binary files /dev/null and b/HotKeysVSIX/Resources/Market_HotKeys_128x.png differ
diff --git a/HotKeysVSIX/source.extension.vsixmanifest b/HotKeysVSIX/source.extension.vsixmanifest
new file mode 100644
index 0000000..bcfc0f5
--- /dev/null
+++ b/HotKeysVSIX/source.extension.vsixmanifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="HotKeys.e18a1a2b-78e5-4f4c-aade-448d36fd6016" Version="2.0.2" Language="en-US" Publisher="Justin Clareburt" />
+        <DisplayName>Hot Keys - Keyboard Shortcuts</DisplayName>
+        <Description xml:space="preserve">Installs alternative keyboard mapping schemes to work with Visual Studio.</Description>
+        <MoreInfo>https://aka.ms/hotkeys2017</MoreInfo>
+        <ReleaseNotes>ReleaseNotes.txt</ReleaseNotes>
+        <Icon>Resources\Market_HotKeys_128x.png</Icon>
+        <PreviewImage>Resources\HotKeysPreviewImage.png</PreviewImage>
+    </Metadata>
+    <Installation>
+        <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="[15.0,16.0)" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+        <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
+        <Dependency d:Source="File" Version="[1.0.6,)" d:InstallSource="Embed" DisplayName="Keyboard Shortcuts Manager" Id="VSShortcutsManager.d8578b8b-cb70-49ee-b009-9e659c413f4b" Location="EmbeddedVSIX\KeyboardShortcutsManager.vsix" />
+    </Dependencies>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+</PackageManifest>
diff --git a/KeyBindings.sln b/KeyBindings.sln
deleted file mode 100644
index dce352e..0000000
--- a/KeyBindings.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlashComments", "SlashComments\SlashComments.csproj", "{AAA24CE2-80BF-4F19-8BDC-4C2CAA6FBC2B}"
-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
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AAA24CE2-80BF-4F19-8BDC-4C2CAA6FBC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAA24CE2-80BF-4F19-8BDC-4C2CAA6FBC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAA24CE2-80BF-4F19-8BDC-4C2CAA6FBC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAA24CE2-80BF-4F19-8BDC-4C2CAA6FBC2B}.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
-	EndGlobalSection
-EndGlobal
diff --git a/KeyboardSchemes/KeyboardSchemes.csproj b/KeyboardSchemes/KeyboardSchemes.csproj
index 399e532..e8dd6af 100644
--- a/KeyboardSchemes/KeyboardSchemes.csproj
+++ b/KeyboardSchemes/KeyboardSchemes.csproj
@@ -41,13 +41,6 @@
     <Content Include="Installer\HotKeysPreviewImage.png" />
     <Content Include="Installer\License.rtf" />
     <Content Include="Installer\ReleaseNotes.txt" />
-    <Content Include="VSKs\IntelliJ for C#.vsk" />
-    <Content Include="VSKs\IntelliJ-ImportLog.txt" />
-    <Content Include="VSKs\ReSharper for IDEA.vsk" />
-    <Content Include="VSKs\ReSharper for VS C#.vsk" />
-    <Content Include="VSKs\ReSharperForIDEA-ImportLog.txt" />
-    <Content Include="VSKs\ReSharperForVSC#-ImportLogs.txt" />
-    <Content Include="VSKs\Visual C# 2015.vsk" />
     <Content Include="VSSettings\Brief.vssettings" />
     <Content Include="VSSettings\Emacs.vssettings" />
     <Content Include="VSSettings\IntelliJ.vssettings">
@@ -81,6 +74,9 @@
     <None Include="KeymapRefs\VSCode-keyboard-shortcuts-linux.pdf" />
     <None Include="KeymapRefs\VSCode-keyboard-shortcuts-windows.pdf" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="VSKs\" />
+  </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
new file mode 100644
index 0000000..944ec00
--- /dev/null
+++ b/KeyboardSchemes/KeyboardSchemes.csproj.user
@@ -0,0 +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>
+  </PropertyGroup>
+</Project>
\ No newline at end of file