diff --git a/README.md b/README.md
index 7bf1853..6e22c80 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,13 @@
-# WiX Toolset Visual Studio Extension (aka: Votive)
+# WiX v3 - Visual Studio Extension (aka: Votive)
 
-This repository contains the code for the WiX Toolset Visual Studio Extension. To install
+This repository contains the code for the WiX v3 - Visual Studio Extension. To install
 the extension, use the Extension Manager inside Visual Studio or visit the 
 [Visual Studio Marketplace][marketplace].
 
-The following links will take you to more details:
+**Note:** This Visual Studio Extension DOES NOT support WiX v4 based projects. To load
+WiX v4 projects in Visual Studio, install [HeatWave for VS2022][heatwave] (or [for VS2019][heatwave16]).
 
-## [Home page](http://wixtoolset.org/ "WiX Toolset home page")
-## [Releases](http://wixtoolset.org/releases/ "WiX Toolset stable and weekly releases")
-## [Bugs and feature requests](http://wixtoolset.org/issues/ "Files bugs and feature requests for WiX Toolset ")
-## [Manual](http://wixtoolset.org/documentation/manual/ "WiX Toolset manuals and documentation links")
-## [Hacking on WiX](http://wixtoolset.org/development/ "About development on the WiX Toolset")
 
 [marketplace]: https://marketplace.visualstudio.com/search?term=wix%20toolset&target=VS&sortBy=Relevance
+[heatwave]: https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17
+[heatwave16]: https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev16
diff --git a/src/Schemas/v3/redirects/wix.ca.targets b/src/Schemas/v3/redirects/wix.ca.targets
index d2b9c7c..fc2eaff 100644
--- a/src/Schemas/v3/redirects/wix.ca.targets
+++ b/src/Schemas/v3/redirects/wix.ca.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.ca.targets" Condition=" Exists('$(WixMSBuildFolder)wix.ca.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Schemas/v3/redirects/wix.nativeca.targets b/src/Schemas/v3/redirects/wix.nativeca.targets
index 8abbed6..16f5967 100644
--- a/src/Schemas/v3/redirects/wix.nativeca.targets
+++ b/src/Schemas/v3/redirects/wix.nativeca.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.nativeca.targets" Condition=" Exists('$(WixMSBuildFolder)wix.nativeca.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixNativeCATargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.nativeca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.nativeca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Schemas/v3/redirects/wix.targets b/src/Schemas/v3/redirects/wix.targets
index 2f5f6dc..ec24616 100644
--- a/src/Schemas/v3/redirects/wix.targets
+++ b/src/Schemas/v3/redirects/wix.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.targets" Condition=" Exists('$(WixMSBuildFolder)wix.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Schemas/v3/source.extension.vsixmanifest b/src/Schemas/v3/source.extension.vsixmanifest
index 4220efc..10efa97 100644
--- a/src/Schemas/v3/source.extension.vsixmanifest
+++ b/src/Schemas/v3/source.extension.vsixmanifest
@@ -4,7 +4,7 @@
     <Identity Id="WixToolset.VisualStudioExtension.Schemas3" Version="|v3schemas;GetBuildVersion|" Language="en-US" Publisher="WiX Toolset" />
     <DisplayName>WiX Toolset v3 Schemas for Visual Studio</DisplayName>
     <Description>Visual Studio integraion for the WiX Toolset v3 schemas</Description>
-    <MoreInfo>http://wixtoolset.org/</MoreInfo>
+    <MoreInfo>https://wixtoolset.org/</MoreInfo>
     <Icon>WixLogo.png</Icon>
     <PreviewImage>WixLogo.png</PreviewImage>
   </Metadata>
diff --git a/src/Schemas/v3/v3schemas.csproj b/src/Schemas/v3/v3schemas.csproj
index c009319..2cae68b 100644
--- a/src/Schemas/v3/v3schemas.csproj
+++ b/src/Schemas/v3/v3schemas.csproj
@@ -16,6 +16,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Templates/v3/Projects/CustomActionCPP/CustomAction.vcxproj b/src/Templates/v3/Projects/CustomActionCPP/CustomAction.vcxproj
index b8829bc..f21698b 100644
--- a/src/Templates/v3/Projects/CustomActionCPP/CustomAction.vcxproj
+++ b/src/Templates/v3/Projects/CustomActionCPP/CustomAction.vcxproj
@@ -120,7 +120,7 @@
 	<Import Project="$(WixNativeCATargetsPath)" Condition=" '$(WixNativeCATargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.NativeCA.targets" Condition=" '$(WixNativeCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.NativeCA.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixNativeCATargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 
 	<ImportGroup Label="ExtensionTargets">
diff --git a/src/Templates/v3/Projects/CustomActionCS/CustomAction.csproj b/src/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
index 261db17..b8dd03a 100644
--- a/src/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
+++ b/src/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
@@ -53,6 +53,6 @@
 	<Import Project="$(WixCATargetsPath)" Condition=" '$(WixCATargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets" Condition=" '$(WixCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 </Project>
diff --git a/src/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj b/src/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
index 3bbce19..c00e6a8 100644
--- a/src/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
+++ b/src/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
@@ -61,6 +61,6 @@ $endif$
 	<Import Project="$(WixCATargetsPath)" Condition=" '$(WixCATargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets" Condition=" '$(WixCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 </Project>
diff --git a/src/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj b/src/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
index a6bef7f..69968e0 100644
--- a/src/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
+++ b/src/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
@@ -30,7 +30,7 @@
 	<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj b/src/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
index f7ab9d3..a1c41b4 100644
--- a/src/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
+++ b/src/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
@@ -24,7 +24,7 @@
 	<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj b/src/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
index 2d369b5..845a108 100644
--- a/src/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
+++ b/src/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
@@ -24,7 +24,7 @@
 	<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/Templates/v3/Projects/WixProject/SetupProject.wixproj b/src/Templates/v3/Projects/WixProject/SetupProject.wixproj
index fb6ecd8..1347154 100644
--- a/src/Templates/v3/Projects/WixProject/SetupProject.wixproj
+++ b/src/Templates/v3/Projects/WixProject/SetupProject.wixproj
@@ -24,7 +24,7 @@
 	<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
 	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-		<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/Templates/v3/v3templates.csproj b/src/Templates/v3/v3templates.csproj
index 17c6a91..dc71cd8 100644
--- a/src/Templates/v3/v3templates.csproj
+++ b/src/Templates/v3/v3templates.csproj
@@ -17,6 +17,8 @@
     <VsTemplateLanguage>WiX</VsTemplateLanguage>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\..\tools\WixBuild.csproj.props" />
   <ItemDefinitionGroup>
diff --git a/src/Votive2010/Votive2010.csproj b/src/Votive2010/Votive2010.csproj
index 23eff75..ee09730 100644
--- a/src/Votive2010/Votive2010.csproj
+++ b/src/Votive2010/Votive2010.csproj
@@ -17,6 +17,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2010/source.extension.vsixmanifest b/src/Votive2010/source.extension.vsixmanifest
index 855e3d8..08866c2 100644
--- a/src/Votive2010/source.extension.vsixmanifest
+++ b/src/Votive2010/source.extension.vsixmanifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
   <Identifier Id="WixToolset.VisualStudioExtension.Dev10">
-    <Name>Wix Toolset Visual Studio 2010 Extension</Name>
+    <Name>WiX v3 - Visual Studio 2010 Extension</Name>
     <Author>WiX Toolset</Author>
     <Version>|Votive2010;GetBuildVersion|</Version>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfoUrl>http://wixtoolset.org/</MoreInfoUrl>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfoUrl>https://wixtoolset.org/</MoreInfoUrl>
     <Icon>WixLogoDev10.png</Icon>
     <PreviewImage>WixLogoDev10.png</PreviewImage>
     <SupportedProducts>
diff --git a/src/Votive2012/Votive2012.csproj b/src/Votive2012/Votive2012.csproj
index 4557ea4..9c72412 100644
--- a/src/Votive2012/Votive2012.csproj
+++ b/src/Votive2012/Votive2012.csproj
@@ -17,6 +17,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2012/source.extension.vsixmanifest b/src/Votive2012/source.extension.vsixmanifest
index 2a90f6e..4df330e 100644
--- a/src/Votive2012/source.extension.vsixmanifest
+++ b/src/Votive2012/source.extension.vsixmanifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
   <Identifier Id="WixToolset.VisualStudioExtension.Dev11">
-    <Name>Wix Toolset Visual Studio 2012 Extension</Name>
+    <Name>WiX v3 - Visual Studio 2012 Extension</Name>
     <Author>WiX Toolset</Author>
     <Version>|Votive2012;GetBuildVersion|</Version>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfoUrl>http://wixtoolset.org/</MoreInfoUrl>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfoUrl>https://wixtoolset.org/</MoreInfoUrl>
     <Icon>WixLogoDev11.png</Icon>
     <PreviewImage>WixLogoDev11.png</PreviewImage>
     <SupportedProducts>
diff --git a/src/Votive2013/Votive2013.csproj b/src/Votive2013/Votive2013.csproj
index 50fbfcd..f5bf85e 100644
--- a/src/Votive2013/Votive2013.csproj
+++ b/src/Votive2013/Votive2013.csproj
@@ -17,6 +17,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2013/source.extension.vsixmanifest b/src/Votive2013/source.extension.vsixmanifest
index eb68f93..0998d66 100644
--- a/src/Votive2013/source.extension.vsixmanifest
+++ b/src/Votive2013/source.extension.vsixmanifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
   <Identifier Id="WixToolset.VisualStudioExtension.Dev12">
-    <Name>Wix Toolset Visual Studio 2013 Extension</Name>
+    <Name>WiX v3 - Visual Studio 2013 Extension</Name>
     <Author>WiX Toolset</Author>
     <Version>|Votive2013;GetBuildVersion|</Version>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfoUrl>http://wixtoolset.org/</MoreInfoUrl>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfoUrl>https://wixtoolset.org/</MoreInfoUrl>
     <Icon>WixLogoDev12.png</Icon>
     <PreviewImage>WixLogoDev12.png</PreviewImage>
     <SupportedProducts>
diff --git a/src/Votive2015/Votive2015.csproj b/src/Votive2015/Votive2015.csproj
index 7bf18cc..08032fe 100644
--- a/src/Votive2015/Votive2015.csproj
+++ b/src/Votive2015/Votive2015.csproj
@@ -15,6 +15,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2015/source.extension.vsixmanifest b/src/Votive2015/source.extension.vsixmanifest
index 64d14a5..36a6b1a 100644
--- a/src/Votive2015/source.extension.vsixmanifest
+++ b/src/Votive2015/source.extension.vsixmanifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
   <Identifier Id="WixToolset.VisualStudioExtension.Dev14">
-    <Name>Wix Toolset Visual Studio 2015 Extension</Name>
+    <Name>WiX v3 - Visual Studio 2015 Extension</Name>
     <Author>WiX Toolset</Author>
     <Version>|Votive2015;GetBuildVersion|</Version>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfoUrl>http://wixtoolset.org/</MoreInfoUrl>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfoUrl>https://wixtoolset.org/</MoreInfoUrl>
     <Icon>WixLogoDev14.png</Icon>
     <PreviewImage>WixLogoDev14.png</PreviewImage>
     <SupportedProducts>
diff --git a/src/Votive2017/Votive2017.csproj b/src/Votive2017/Votive2017.csproj
index 18b7944..a8439dc 100644
--- a/src/Votive2017/Votive2017.csproj
+++ b/src/Votive2017/Votive2017.csproj
@@ -16,6 +16,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2017/redirects/v3/wix.ca.targets b/src/Votive2017/redirects/v3/wix.ca.targets
index d2b9c7c..fc2eaff 100644
--- a/src/Votive2017/redirects/v3/wix.ca.targets
+++ b/src/Votive2017/redirects/v3/wix.ca.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.ca.targets" Condition=" Exists('$(WixMSBuildFolder)wix.ca.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Votive2017/redirects/v3/wix.nativeca.targets b/src/Votive2017/redirects/v3/wix.nativeca.targets
index 8abbed6..16f5967 100644
--- a/src/Votive2017/redirects/v3/wix.nativeca.targets
+++ b/src/Votive2017/redirects/v3/wix.nativeca.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.nativeca.targets" Condition=" Exists('$(WixMSBuildFolder)wix.nativeca.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixNativeCATargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.nativeca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.nativeca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Votive2017/redirects/v3/wix.targets b/src/Votive2017/redirects/v3/wix.targets
index 2f5f6dc..ec24616 100644
--- a/src/Votive2017/redirects/v3/wix.targets
+++ b/src/Votive2017/redirects/v3/wix.targets
@@ -7,6 +7,6 @@
 
   <Import Project="$(WixMSBuildFolder)wix.targets" Condition=" Exists('$(WixMSBuildFolder)wix.targets') " />
   <Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
+    <Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11, see https://wixtoolset.org/releases/v3.11/stable" />
   </Target>
 </Project>
diff --git a/src/Votive2017/source.extension.vsixmanifest b/src/Votive2017/source.extension.vsixmanifest
index 5646e72..d185733 100644
--- a/src/Votive2017/source.extension.vsixmanifest
+++ b/src/Votive2017/source.extension.vsixmanifest
@@ -2,9 +2,9 @@
 <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="WixToolset.VisualStudioExtension.Dev15" Version="|Votive2017;GetBuildVersion|" Language="en-US" Publisher="WiX Toolset" />
-    <DisplayName>Wix Toolset Visual Studio 2017 Extension</DisplayName>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfo>http://wixtoolset.org/</MoreInfo>
+    <DisplayName>WiX v3 - Visual Studio 2017 Extension</DisplayName>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfo>https://wixtoolset.org/</MoreInfo>
     <Icon>WixLogoDev15.png</Icon>
     <PreviewImage>WixLogoDev15.png</PreviewImage>
   </Metadata>
diff --git a/src/Votive2019/Votive2019.csproj b/src/Votive2019/Votive2019.csproj
index 537b508..b836079 100644
--- a/src/Votive2019/Votive2019.csproj
+++ b/src/Votive2019/Votive2019.csproj
@@ -16,6 +16,8 @@
     <DeployVSTemplates>false</DeployVSTemplates>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/src/Votive2019/source.extension.vsixmanifest b/src/Votive2019/source.extension.vsixmanifest
index 7b7b9f8..fa40f1a 100644
--- a/src/Votive2019/source.extension.vsixmanifest
+++ b/src/Votive2019/source.extension.vsixmanifest
@@ -2,9 +2,9 @@
 <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="WixToolset.VisualStudioExtension.Dev16" Version="|Votive2019;GetBuildVersion|" Language="en-US" Publisher="WiX Toolset" />
-    <DisplayName>Wix Toolset Visual Studio 2019 Extension</DisplayName>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfo>http://wixtoolset.org/</MoreInfo>
+    <DisplayName>WiX v3 - Visual Studio 2019 Extension</DisplayName>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfo>https://wixtoolset.org/</MoreInfo>
     <Icon>WixLogoDev16.png</Icon>
     <PreviewImage>WixLogoDev16.png</PreviewImage>
   </Metadata>
diff --git a/src/Votive2022/source.extension.vsixmanifest b/src/Votive2022/source.extension.vsixmanifest
index d0d2a83..5be0dcb 100644
--- a/src/Votive2022/source.extension.vsixmanifest
+++ b/src/Votive2022/source.extension.vsixmanifest
@@ -2,9 +2,9 @@
 <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="WixToolset.VisualStudioExtension.Dev17" Version="|Votive2022;GetBuildVersion|" Language="en-US" Publisher="WiX Toolset" />
-    <DisplayName>Wix Toolset Visual Studio 2022 Extension</DisplayName>
-    <Description>Visual Studio integration for the WiX Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
-    <MoreInfo>http://wixtoolset.org/</MoreInfo>
+    <DisplayName>WiX v3 - Visual Studio 2022 Extension</DisplayName>
+    <Description>Visual Studio integration for the WiX v3 Toolset - the most powerful set of tools available to create your Windows installation experience.</Description>
+    <MoreInfo>https://wixtoolset.org/</MoreInfo>
     <Icon>WixLogoDev17.png</Icon>
     <PreviewImage>WixLogoDev17.png</PreviewImage>
   </Metadata>
diff --git a/src/common/WixDistribution.cs b/src/common/WixDistribution.cs
index d95122e..c05a94a 100644
--- a/src/common/WixDistribution.cs
+++ b/src/common/WixDistribution.cs
@@ -26,7 +26,7 @@ internal static class WixDistribution
         /// <summary>
         /// News URL for the distribution.
         /// </summary>
-        public static string NewsUrl = "http://wixtoolset.org/news/";
+        public static string NewsUrl = "https://wixtoolset.org/news/";
 
         /// <summary>
         /// Short product name for the distribution.
@@ -36,12 +36,12 @@ internal static class WixDistribution
         /// <summary>
         /// Support URL for the distribution.
         /// </summary>
-        public static string SupportUrl = "http://wixtoolset.org/";
+        public static string SupportUrl = "https://wixtoolset.org/";
 
         /// <summary>
         /// Telemetry URL format for the distribution.
         /// </summary>
-        public static string TelemetryUrlFormat = "http://wixtoolset.org/telemetry/v{0}/?r={1}";
+        public static string TelemetryUrlFormat = "https://wixtoolset.org/telemetry/v{0}/?r={1}";
 
         public static string ReplacePlaceholders(string original, Assembly assembly)
         {
diff --git a/src/common/WixDistribution.wxl b/src/common/WixDistribution.wxl
index 78b7240..7678878 100644
--- a/src/common/WixDistribution.wxl
+++ b/src/common/WixDistribution.wxl
@@ -8,6 +8,6 @@
     <String Id="Product" Overridable="yes">WiX Toolset Visual Studio Extension</String>
     <String Id="Regid" Overridable="yes">wixtoolset.org</String>
     <String Id="ShortProduct" Overridable="yes">WiX Toolset</String>
-    <String Id="SupportUrl" Overridable="yes">http://wixtoolset.org</String>
-    <String Id="UpdateUrl" Overridable="yes">http://wixtoolset.org/releases/feed/v3.11</String>
+    <String Id="SupportUrl" Overridable="yes">https://wixtoolset.org</String>
+    <String Id="UpdateUrl" Overridable="yes">https://wixtoolset.org/releases/feed/v3.11</String>
 </WixLocalization>
diff --git a/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
index 0df7f7c..906d30a 100644
--- a/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
+++ b/src/votive.shared/Templates/v3/Projects/CustomActionCS/CustomAction.csproj
@@ -53,6 +53,6 @@
 	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 	<Import Project="$(WixCATargetsPath)" Condition=" Exists('$(WixCATargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixCATargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 </Project>
diff --git a/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
index 2a9e776..9378a02 100644
--- a/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
+++ b/src/votive.shared/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj
@@ -61,6 +61,6 @@ $endif$
 	<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 	<Import Project="$(WixCATargetsPath)" Condition=" Exists('$(WixCATargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixCATargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
  </Project>
diff --git a/src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj b/src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
index bae015e..6c40547 100644
--- a/src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
+++ b/src/votive.shared/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj
@@ -30,7 +30,7 @@
 	</ItemGroup>
 	<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj b/src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
index 5e65837..5218110 100644
--- a/src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
+++ b/src/votive.shared/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj
@@ -24,7 +24,7 @@
 	</ItemGroup>
 	<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj b/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
index 03069b7..6d9c206 100644
--- a/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
+++ b/src/votive.shared/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj
@@ -24,7 +24,7 @@
 	</ItemGroup>
 	<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj b/src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj
index b6d4f20..35aaf8e 100644
--- a/src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj
+++ b/src/votive.shared/Templates/v3/Projects/WixProject/SetupProject.wixproj
@@ -24,7 +24,7 @@
 	</ItemGroup>
 	<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
 	<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
-		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+		<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
 	</Target>
 	<!--
 	$loc_WIXPROJ_TOMODIFY_LINE1$
diff --git a/src/votive/votive.csproj b/src/votive/votive.csproj
index 6862de9..901ef0c 100644
--- a/src/votive/votive.csproj
+++ b/src/votive/votive.csproj
@@ -17,6 +17,8 @@
     <VsTemplateLanguage>WiX</VsTemplateLanguage>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="..\..\tools\WixBuild.csproj.props" />
   <ItemGroup>
diff --git a/tools/WixBuild.Signing.targets b/tools/WixBuild.Signing.targets
index 1671da3..f379bc9 100644
--- a/tools/WixBuild.Signing.targets
+++ b/tools/WixBuild.Signing.targets
@@ -9,7 +9,7 @@
     <_SigningAppSettingsPath>$(MSBuildThisFileDirectory)appsettings.json</_SigningAppSettingsPath>
     <_SigningFilterNonePath>$(MSBuildThisFileDirectory)signing-filter.none.txt</_SigningFilterNonePath>
     <_SigningName>WiX Toolset</_SigningName>
-    <_SigningUrl>http://wixtoolset.org</_SigningUrl>
+    <_SigningUrl>https://wixtoolset.org</_SigningUrl>
     <AfterBuildDependsOn>$(AfterBuildDependsOn);SignFiles</AfterBuildDependsOn>
   </PropertyGroup>