diff --git a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
index 7a9f8d9a6..f822df5a0 100644
--- a/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
+++ b/source2/Build/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -16,6 +16,8 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Cosmos.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -99,6 +101,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Cosmos.snk" />
     <None Include="Cosmos.targets" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj
index f3dfcee3a..af106bca2 100644
--- a/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj
+++ b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.Debug.HostProcess.csproj
@@ -16,6 +16,8 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Cosmos.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,6 +55,9 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Cosmos.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.snk b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.snk
new file mode 100644
index 000000000..68808d392
Binary files /dev/null and b/source2/Debug/Cosmos.Debug.HostProcess/Cosmos.snk differ
diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
index 47d6b65ce..a5bbe9b81 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
@@ -15,9 +15,8 @@
     <OldToolsVersion>2.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Cosmos.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -133,6 +132,9 @@
       <Name>Cosmos.Debug.HostProcess</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Cosmos.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.snk b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.snk
new file mode 100644
index 000000000..68808d392
Binary files /dev/null and b/source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.snk differ
diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
index 8066c2f20..9dfaf6e88 100644
--- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
+++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj
@@ -135,9 +135,9 @@
     <Compile Include="VSProjectNode.cs" />
     <Compile Include="VSProject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="Templates\Projects\CosmosProject\AssemblyInfo.cs" />
-    <None Include="Templates\Projects\CosmosProject\Program.cs" />
-    <None Include="Templates\Projects\CosmosProject\Kernel.Cosmos" />
+    <ZipProject Include="Templates\Projects\CosmosProject\AssemblyInfo.cs" />
+    <ZipProject Include="Templates\Projects\CosmosProject\Program.cs" />
+    <ZipProject Include="Templates\Projects\CosmosProject\CosmosProject.Cosmos" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VSPackage.resx">
@@ -150,6 +150,7 @@
     <None Include="Key.snk" />
     <Content Include="PLKResponse.html" />
     <Content Include="Resources\Cosmos.ico" />
+    <ZipProject Include="Templates\Projects\CosmosProject\CosmosProject.ico" />
     <EmbeddedResource Include="BuildOptionsPropertyPage.resx">
       <DependentUpon>BuildOptionsPropertyPage.cs</DependentUpon>
     </EmbeddedResource>
@@ -181,7 +182,8 @@
     <EmbeddedResource Include="VMOptionsQemu.resx">
       <DependentUpon>VMOptionsQemu.cs</DependentUpon>
     </EmbeddedResource>
-    <Content Include="Templates\Projects\CosmosProject\Kernel.ico" />
+    <ZipProject Include="Templates\Projects\CosmosProject\CosmosProject.vstemplate" />
+    <ZipProject Include="Templates\Projects\CosmosProject\Kernel.ico" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.Cosmos b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.Cosmos
similarity index 100%
rename from source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/Kernel.Cosmos
rename to source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.Cosmos
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.ico b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.ico
new file mode 100644
index 000000000..fcdc40183
Binary files /dev/null and b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.ico differ
diff --git a/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate
new file mode 100644
index 000000000..4bdf19cc3
--- /dev/null
+++ b/source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject/CosmosProject.vstemplate
@@ -0,0 +1,19 @@
+<VSTemplate Version="2.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Cosmos Project</Name>
+    <Description>A project for creating a Cosmos Kernel</Description>
+    <Icon>Kernel.ico</Icon>
+    <ProjectType>Cosmos</ProjectType>
+    <SortOrder>50</SortOrder>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>CosmosProject</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="Kernel.Cosmos" ReplaceParameters="true">
+      <ProjectItem ReplaceParameters="true" OpenInEditor="true">Program.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" OpenInEditor="false">AssemblyInfo.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+</VSTemplate>
diff --git a/source2/VSIP/Cosmos.VS.Package/VSProject.cs b/source2/VSIP/Cosmos.VS.Package/VSProject.cs
index fe552a51e..3ba0fda32 100644
--- a/source2/VSIP/Cosmos.VS.Package/VSProject.cs
+++ b/source2/VSIP/Cosmos.VS.Package/VSProject.cs
@@ -43,10 +43,9 @@ namespace Cosmos.VS.Package {
       "Cosmos", // This is the overall group name in new project on left side
       "Cosmos Project Files (*.Cosmos);*.Cosmos",
       "Cosmos", "Cosmos",
-      @"..\..\Templates\Projects\CosmosProject"
+      @"..\Templates\Projects\CosmosProject"
       , LanguageVsTemplate = "CosmosProject"
       , NewProjectRequireNewFolderVsTemplate = false)]
-
   // Property Pages
 	//[ProvideObject(typeof(PropPageEnvironment), RegisterUsing = RegistrationMethod.CodeBase)]
 	//[ProvideObject(typeof(PropPageTest), RegisterUsing = RegistrationMethod.CodeBase)]