diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos
index 9d41e4c4c..e02f6adac 100644
--- a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos	
+++ b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos	
@@ -55,6 +55,6 @@
     </ProjectReference>
   </ItemGroup>
   
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
+  <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
   
 </Project>
\ No newline at end of file
diff --git a/Demos/Guess/GuessKernelBoot.Cosmos b/Demos/Guess/GuessKernelBoot.Cosmos
index e7c889f72..c6f06dbb2 100644
--- a/Demos/Guess/GuessKernelBoot.Cosmos
+++ b/Demos/Guess/GuessKernelBoot.Cosmos
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.Net.Sdk">
-  
+
   <PropertyGroup>
     <TargetFramework>net462</TargetFramework>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <BinFormat>elf</BinFormat>
     <DebugEnabled>True</DebugEnabled>
@@ -26,7 +26,7 @@
     <None Remove="*" />
     <Compile Remove="*" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\source\Cosmos.Core.Plugs.Asm\Cosmos.Core.Plugs.Asm.csproj">
       <Name>Cosmos.Core.Plugs.Asm</Name>
@@ -53,7 +53,7 @@
       <Project>{e35e0dbf-555f-4d38-8f28-acdfa9dc97bd}</Project>
     </ProjectReference>
   </ItemGroup>
-  
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-  
+
+  <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
+
 </Project>
diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss
index 74225c792..da6274c9f 100644
--- a/Setup/Cosmos.iss
+++ b/Setup/Cosmos.iss
@@ -115,7 +115,7 @@ Source: ".\Build\VSIP\Cosmos.VS.ProjectSystem.vsix"; DestDir: "{app}\VSIX\"; Fla
 ;Source: ".\Build\VSIP\Cosmos.VS.DebugEngine.vsix"; DestDir: "{app}"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\XSharp.VS.vsix"; DestDir: "{app}\VSIX\"; Flags: ignoreversion uninsremovereadonly
 ; MSBuild targets
-Source: ".\Build\VSIP\Cosmos.targets"; DestDir: "{code:GetMSBuildDirectory}\Cosmos"; Flags: ignoreversion uninsremovereadonly
+;Source: ".\Build\VSIP\Cosmos.targets"; DestDir: "{code:GetMSBuildDirectory}\Cosmos"; Flags: ignoreversion uninsremovereadonly
 
 [Registry]
 ; Regiter .xs Extension
@@ -143,7 +143,7 @@ Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /a Cosmos.VS
 
 [UninstallRun]
 Filename: "{code:GetVsixInstallCommand}"; Parameters: "{code:GetVsixUninstallParams|Cosmos.VS.ProjectSystem}"
-Filename: "{code:GetVsixInstallCommand}"; Parameters: "{code:GetVsixUninstallParams|XSharp.VS}"
+;Filename: "{code:GetVsixInstallCommand}"; Parameters: "{code:GetVsixUninstallParams|XSharp.VS}"
 
 [Code]
 function ExecWithResult(const Filename, Params, WorkingDir: String; const ShowCmd: Integer;
diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos
index eb8dc492e..0be34cde7 100644
--- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos
+++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos
@@ -32,6 +32,6 @@
     <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
+  <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
 
 </Project>
\ No newline at end of file
diff --git a/source/Cosmos.VS.Wizards/CosmosProject.Cosmos b/source/Cosmos.VS.Wizards/CosmosProject.Cosmos
index 30f9e9926..cb9c0b339 100644
--- a/source/Cosmos.VS.Wizards/CosmosProject.Cosmos
+++ b/source/Cosmos.VS.Wizards/CosmosProject.Cosmos
@@ -39,6 +39,6 @@
     <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
+  <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
 
 </Project>
\ No newline at end of file