diff --git a/Installers/VS2019/HandyControl_VS2019.sln b/Installers/VS2019/HandyControl_VS2019.sln
index 5554fd02..6e2908e9 100644
--- a/Installers/VS2019/HandyControl_VS2019.sln
+++ b/Installers/VS2019/HandyControl_VS2019.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Template", "HandyControl_Template\HandyControl_Template.csproj", "{A9911E14-0CDF-4C25-B458-F16816D55E60}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_VS2019", "HandyControl_VS2019\HandyControl_VS2019.csproj", "{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}"
 EndProject
 Global
@@ -13,10 +11,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A9911E14-0CDF-4C25-B458-F16816D55E60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9911E14-0CDF-4C25-B458-F16816D55E60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9911E14-0CDF-4C25-B458-F16816D55E60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9911E14-0CDF-4C25-B458-F16816D55E60}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F0F7B9E-C150-4FAA-9274-4F6F0A96B8CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
index 364099da..621606c8 100644
--- a/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
+++ b/Installers/VS2019/HandyControl_VS2019/HandyControl_VS2019.csproj
@@ -49,7 +49,11 @@
     <Compile Include="HandyControl_VS2019Package.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ProjectTemplates\WpfApp1.zip">
+    <Content Include="ProjectTemplates\WpfApp.zip">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Packages\handycontrol.1.5.5.nupkg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -78,15 +82,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HandyControl_Template\HandyControl_Template.csproj">
-      <Project>{A9911E14-0CDF-4C25-B458-F16816D55E60}</Project>
-      <Name>HandyControl_Template</Name>
-      <VSIXSubPath>ProjectTemplates</VSIXSubPath>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
diff --git a/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg b/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg
new file mode 100644
index 00000000..9f36d145
Binary files /dev/null and b/Installers/VS2019/HandyControl_VS2019/Packages/handycontrol.1.5.5.nupkg differ
diff --git a/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp1.zip b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip
similarity index 84%
rename from Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp1.zip
rename to Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip
index 656ee624..49c6c43a 100644
Binary files a/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp1.zip and b/Installers/VS2019/HandyControl_VS2019/ProjectTemplates/WpfApp.zip differ
diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
index 80b69255..b6a8b158 100644
--- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
+++ b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest
@@ -25,6 +25,6 @@
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WpfApp1.zip" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\WpfApp.zip" />
     </Assets>
 </PackageManifest>