diff --git a/KeyboardSchemes/IntelliJ.vssettings b/KeyboardSchemes/IntelliJ.vssettings
index dc80253..dc1436a 100644
--- a/KeyboardSchemes/IntelliJ.vssettings
+++ b/KeyboardSchemes/IntelliJ.vssettings
@@ -361,7 +361,7 @@
           <!--<Shortcut Command="Refactor.Rename" Scope="Text Editor">F2</Shortcut>-->
           <!-- Editting shortcuts -->
           <Shortcut Command="Edit.SelectCurrentWord" Scope="Global">Ctrl+Shift+W</Shortcut>   <!-- Will be applied if HotCommands not available -->
-          <!--<Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>-->
+          <Shortcut Command="Edit.GoToFindCombo" Scope="Global">Ctrl+/</Shortcut>   <!-- Fallback at Text Editor scope if HotCommands not enabled -->
           <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, S</Shortcut>
           <Shortcut Command="Edit.SurroundWith" Scope="Global">Ctrl+K, Ctrl+S</Shortcut>
           <Shortcut Command="Edit.InsertSnippet" Scope="Global">Ctrl+K, X</Shortcut>
diff --git a/KeyboardSchemes/KeyboardSchemes.csproj b/KeyboardSchemes/KeyboardSchemes.csproj
index 3367e9f..897cc12 100644
--- a/KeyboardSchemes/KeyboardSchemes.csproj
+++ b/KeyboardSchemes/KeyboardSchemes.csproj
@@ -32,7 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="VSKs" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="Brief.vssettings" />
     <Content Include="Emacs.vssettings" />
@@ -43,9 +45,11 @@
     <Content Include="Visual C++ 6.vssettings" />
     <Content Include="Visual CSharp 2005.vssettings" />
     <Content Include="Visual Studio 6.vssettings" />
+    <Content Include="VSKs\IntelliJ for C#.vsk" />
+    <Content Include="VSKs\KeyboardImportErrors-WithHotCommands.txt" />
+    <Content Include="VSKs\KeyboardImportErrors.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="VSKs\IntelliJ.vsk" />
     <None Include="KeymapRefs\IntelliJIDEA_ReferenceCard.pdf" />
     <None Include="KeymapRefs\ReSharperCppDefaultKeymap_VSscheme.pdf" />
     <None Include="KeymapRefs\ReSharper_DefaultKeymap_IDEAscheme.pdf" />
diff --git a/KeyboardSchemes/VSKs/IntelliJ for C#.vsk b/KeyboardSchemes/VSKs/IntelliJ for C#.vsk
index af8c46e..3fe78e5 100644
Binary files a/KeyboardSchemes/VSKs/IntelliJ for C#.vsk and b/KeyboardSchemes/VSKs/IntelliJ for C#.vsk differ