diff --git a/ChangeLog b/ChangeLog
index a8dbbfa94..04efeb976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Bug fixes:
 
 Enhancements:
 - #6836 Enabling Github Code Scanning
+- #6841 Windows installer has been updated.
 
 v1.12.x-snapshot
 ===========
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index 539f33116..1d18807fa 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -5,7 +5,6 @@
 		<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
 		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
 		<MediaTemplate EmbedCab="yes"/>
-		<UIRef Id="WixUI_InstallDir"/>
 		<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
 		<Upgrade Id="$(var.UpgradeGuid)">
 			<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
@@ -26,13 +25,13 @@
 
 				<RegistryKey Id="synergyc" Root="HKLM"
 					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					Action="createAndRemoveOnUninstall">
+					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
 					<RegistryValue Type="string" Name="[INSTALLFOLDER]synergyc.exe" Value="~ HIGHDPIAWARE WIN7RTM"/>
 				</RegistryKey>
 
 				<RegistryKey Id="synergy" Root="HKLM"
 					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					Action="createAndRemoveOnUninstall">
+					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
 					<RegistryValue Type="string" Name="[INSTALLFOLDER]synergy.exe" Value="~ HIGHDPIAWARE WIN7RTM"/>
 				</RegistryKey>
 				<!-- Windows 8 and later only -->
@@ -44,9 +43,11 @@
         <Merge Id="VC_Redist" SourceFile="$(var.DisPath)\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
       <?endif ?>
 		</DirectoryRef>
+		<Property Id="SynergyCommonBackground">common_background</Property>
+		<Binary Id="common_background" SourceFile="$(var.ResPath)\common_background.png"/>
 		<Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/>
-		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp"/>
-		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp"/>
+		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.png"/>
+		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.png"/>
 		<Property Id="ARPPRODUCTICON" Value="synergy.ico"/>
 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
 		<Property Id="LEGACY_UNINSTALL_EXISTS">
@@ -58,18 +59,7 @@
     </Condition>
 		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
 		<UI>
-		    <UIRef Id="WixUI_InstallDir" />
-		    <Publish Dialog="WelcomeDlg"
-		          Control="Next"
-			  Event="NewDialog"
-			  Value="InstallDirDlg"
-			  Order="2">1</Publish>
-			<Publish Dialog="InstallDirDlg"
-			  Control="Back"
-			  Event="NewDialog"
-			  Value="WelcomeDlg"
-			  Order="2">1</Publish>
-			<Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>
+			<UIRef Id="SynergyDlgSequence" />
 		</UI>
 	</Product>
 	<Fragment>
diff --git a/dist/wix/Synergy.wixproj b/dist/wix/Synergy.wixproj
index b340455f8..c3420922b 100644
--- a/dist/wix/Synergy.wixproj
+++ b/dist/wix/Synergy.wixproj
@@ -10,6 +10,12 @@
     <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(SolutionDir)/SynergyWelcome.wxs" />
+    <Compile Include="$(SolutionDir)/SynergyInstallDlg.wxs" />
+    <Compile Include="$(SolutionDir)/SynergyBrowseDlg.wxs" />
+    <Compile Include="$(SolutionDir)/SynergyVerifyReadyDlg.wxs" />
+    <Compile Include="$(SolutionDir)/SynergyMaintenanceTypeDlg.wxs" />
+    <Compile Include="$(SolutionDir)/SynergyDlgSequence.wxs" />
     <Compile Include="$(SolutionDir)/Product.wxs" />
     <Content Include="$(SolutionDir)/Include.wxi" />
 
diff --git a/dist/wix/SynergyBrowseDlg.wxs b/dist/wix/SynergyBrowseDlg.wxs
new file mode 100644
index 000000000..4751af4f9
--- /dev/null
+++ b/dist/wix/SynergyBrowseDlg.wxs
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+      <UI>
+         <Dialog Id="SynergyBrowseDlg" Width="370" Height="270" Title="!(loc.BrowseDlg_Title)">
+            <Control Id="PathEdit" Type="PathEdit" X="25" Y="202" Width="320" Height="18" Property="_BrowseProperty" Indirect="yes" />
+            <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUIOK)">
+               <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
+               <Publish Event="EndDialog" Value="Return">1</Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+               <Publish Event="Reset" Value="0">1</Publish>
+               <Publish Event="EndDialog" Value="Return">1</Publish>
+            </Control>
+            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlgComboLabel)" />
+            <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
+               <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
+            </Control>
+            <Control Id="WixUI_Bmp_Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgWixUI_Bmp_UpTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgWixUI_Bmp_Up)">
+               <Publish Event="DirectoryListUp" Value="0">1</Publish>
+            </Control>
+            <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlgNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="!(loc.BrowseDlgNewFolder)">
+               <Publish Event="DirectoryListNew" Value="0">1</Publish>
+            </Control>
+            <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
+            <Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
+         </Dialog>
+      </UI>
+   </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/dist/wix/SynergyDlgSequence.wxs b/dist/wix/SynergyDlgSequence.wxs
new file mode 100644
index 000000000..2b736202c
--- /dev/null
+++ b/dist/wix/SynergyDlgSequence.wxs
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_LicenseAgreementDlg
+ - WixUI_InstallDirDlg
+ - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+Maintenance dialog sequence:
+ - WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_InstallDirDlg
+ - WixUI_VerifyReadyDlg
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI Id="SynergyDlgSequence">
+            <TextStyle Id="WixUI_Font_Normal" FaceName="Roboto" Size="9" />
+            <TextStyle Id="WixUI_Font_Bigger" FaceName="Roboto" Size="14" />
+            <TextStyle Id="WixUI_Font_Title" FaceName="Roboto" Size="12" Bold="yes"  Blue="255" Red="255" Green="255"/>
+
+            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+            <Property Id="WixUI_Mode" Value="InstallDir" />
+
+            <DialogRef Id="BrowseDlg" />
+            <DialogRef Id="DiskCostDlg" />
+            <DialogRef Id="ErrorDlg" />
+            <DialogRef Id="FatalError" />
+            <DialogRef Id="FilesInUse" />
+            <DialogRef Id="MsiRMFilesInUse" />
+            <DialogRef Id="PrepareDlg" />
+            <DialogRef Id="ProgressDlg" />
+            <DialogRef Id="ResumeDlg" />
+            <DialogRef Id="UserExit" />
+            
+            <Publish Dialog="SynergyBrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+            <Publish Dialog="SynergyBrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="StartGui">NOT Installed</Publish>
+
+            <Publish Dialog="SynergyWelcome" Control="Next" Event="NewDialog" Value="SynergyInstallDirDlg" Order="1">1</Publish>
+            <Publish Dialog="SynergyWelcome" Control="Next" Event="NewDialog" Value="SynergyVerifyReadyDlg">Installed AND PATCH</Publish>
+
+            <Publish Dialog="SynergyInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="Next" Event="NewDialog" Value="SynergyVerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="SynergyBrowseDlg" Order="2">1</Publish>
+            <Publish Dialog="SynergyInstallDirDlg" Control="Back" Event="NewDialog" Value="SynergyWelcome" Order="2">1</Publish>
+            
+            <Publish Dialog="SynergyVerifyReadyDlg" Control="Back" Event="NewDialog" Value="SynergyInstallDirDlg" Order="1">NOT Installed</Publish>
+            <Publish Dialog="SynergyVerifyReadyDlg" Control="Back" Event="NewDialog" Value="SynergyMaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+            <Publish Dialog="SynergyVerifyReadyDlg" Control="Back" Event="NewDialog" Value="SynergyInstallDirDlg" Order="2">Installed AND PATCH</Publish>
+
+            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="SynergyMaintenanceTypeDlg">1</Publish>
+
+            <Publish Dialog="SynergyMaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="SynergyVerifyReadyDlg">1</Publish>
+            <Publish Dialog="SynergyMaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="SynergyVerifyReadyDlg">1</Publish>
+            <Publish Dialog="SynergyMaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+            <Property Id="ARPNOMODIFY" Value="1" />
+        </UI>
+
+        <UIRef Id="WixUI_Common" />
+    </Fragment>
+</Wix>
diff --git a/dist/wix/SynergyInstallDlg.wxs b/dist/wix/SynergyInstallDlg.wxs
new file mode 100644
index 000000000..358205ba2
--- /dev/null
+++ b/dist/wix/SynergyInstallDlg.wxs
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <?include Include.wxi?>
+   <Fragment>
+      <UI Id="SynergyInstallDirDlg">
+         <Dialog Id="SynergyInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
+            <Control Id="Title" Type="Text" X="15" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+            
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+               <Publish Event="SpawnDialog" Value="CancelDlg" />
+            </Control>
+
+            <Control Id="InstallDirDlgBackground" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[SynergyCommonBackground]" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+            <Control Id="FolderLabel" Transparent="yes" Type="Text" X="20" Y="70" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+            <Control Id="Folder" Type="PathEdit" X="20" Y="90" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+            <Control Id="ChangeFolder" Type="PushButton" X="20" Y="112" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
+         </Dialog>
+      </UI>
+   </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/dist/wix/SynergyMaintenanceTypeDlg.wxs b/dist/wix/SynergyMaintenanceTypeDlg.wxs
new file mode 100644
index 000000000..6e451a54c
--- /dev/null
+++ b/dist/wix/SynergyMaintenanceTypeDlg.wxs
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Microsoft Corporation.  All rights reserved.
+    
+    The use and distribution terms for this software are covered by the
+    Common Public License 1.0 (http://opensource.org/licenses/cpl1.0.php)
+    which can be found in the file CPL.TXT at the root of this distribution.
+    By using this software in any fashion, you are agreeing to be bound by
+    the terms of this license.
+    
+    You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+      <UI>
+         <Dialog Id="SynergyMaintenanceTypeDlg" Width="370" Height="270" Title="!(loc.MaintenanceTypeDlg_Title)">
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[SynergyCommonBackground]" />
+            <Control Id="ChangeButton" Type="PushButton" X="40" Y="65" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgChangeButtonTooltip)" Default="yes" Text="!(loc.MaintenanceTypeDlgChangeButton)">
+               <Publish Property="WixUI_InstallMode" Value="Change">1</Publish>
+               <Condition Action="disable">ARPNOMODIFY</Condition>
+            </Control>
+            <Control Id="ChangeText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" Text="!(loc.MaintenanceTypeDlgChangeText)">
+               <Condition Action="hide">ARPNOMODIFY</Condition>
+            </Control>
+            <Control Id="ChangeDisabledText" Transparent="yes" Type="Text" X="60" Y="85" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgChangeDisabledText)" Hidden="yes">
+               <Condition Action="show">ARPNOMODIFY</Condition>
+            </Control>
+            <Control Id="RepairButton" Type="PushButton" X="40" Y="118" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRepairButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRepairButton)">
+               <Publish Property="WixUI_InstallMode" Value="Repair">1</Publish>
+               <Condition Action="disable">ARPNOREPAIR</Condition>
+            </Control>
+            <Control Id="RepairText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" Text="!(loc.MaintenanceTypeDlgRepairText)">
+               <Condition Action="hide">ARPNOREPAIR</Condition>
+            </Control>
+            <Control Id="RepairDisabledText" Transparent="yes" Type="Text" X="60" Y="138" Width="280" Height="30" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRepairDisabledText)" Hidden="yes">
+               <Condition Action="show">ARPNOREPAIR</Condition>
+            </Control>
+            <Control Id="RemoveButton" Type="PushButton" X="40" Y="171" Width="80" Height="17" ToolTip="!(loc.MaintenanceTypeDlgRemoveButtonTooltip)" Text="!(loc.MaintenanceTypeDlgRemoveButton)">
+               <Publish Property="WixUI_InstallMode" Value="Remove">1</Publish>
+               <Condition Action="disable">ARPNOREMOVE</Condition>
+            </Control>
+            <Control Id="RemoveText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveText)">
+               <Condition Action="hide">ARPNOREMOVE</Condition>
+            </Control>
+            <Control Id="RemoveDisabledText" Transparent="yes" Type="Text" X="60" Y="191" Width="280" Height="20" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgRemoveDisabledText)" Hidden="yes">
+               <Condition Action="show">ARPNOREMOVE</Condition>
+            </Control>
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUINext)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            </Control>
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Title" Type="Text" X="15" Y="15" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceTypeDlgTitle)" />
+         </Dialog>
+      </UI>
+   </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/dist/wix/SynergyVerifyReadyDlg.wxs b/dist/wix/SynergyVerifyReadyDlg.wxs
new file mode 100644
index 000000000..4226df711
--- /dev/null
+++ b/dist/wix/SynergyVerifyReadyDlg.wxs
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <?include Include.wxi?>
+   <Fragment>
+      <UI>
+         <Dialog Id="SynergyVerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
+            <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
+               <Condition Action="show">NOT Installed AND ALLUSERS</Condition>
+               <Condition Action="enable">NOT Installed</Condition>
+               <Condition Action="default">NOT Installed</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">
+               <Condition Action="show">NOT Installed AND NOT ALLUSERS</Condition>
+               <Condition Action="enable">NOT Installed</Condition>
+               <Condition Action="default">NOT Installed</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="Change" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
+               <Condition Action="show">WixUI_InstallMode = "Change" AND ALLUSERS AND (ADDLOCAL OR REMOVE)</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
+               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="ChangeNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgChange)">
+               <Condition Action="show">WixUI_InstallMode = "Change" AND (NOT ALLUSERS OR (NOT ADDLOCAL AND NOT REMOVE))</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Change"</Condition>
+               <Condition Action="default">WixUI_InstallMode = "Change"</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="Repair" Type="PushButton" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRepair)">
+               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Repair"</Condition>
+               <Condition Action="default">WixUI_InstallMode = "Repair"</Condition>
+               <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="Remove" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
+               <Condition Action="show">WixUI_InstallMode = "Remove" AND ALLUSERS</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
+               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="RemoveNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgRemove)">
+               <Condition Action="show">WixUI_InstallMode = "Remove" AND NOT ALLUSERS</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Remove"</Condition>
+               <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="Update" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
+               <Condition Action="show">WixUI_InstallMode = "Update" AND ALLUSERS</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+            <Control Id="UpdateNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgUpdate)">
+               <Condition Action="show">WixUI_InstallMode = "Update" AND NOT ALLUSERS</Condition>
+               <Condition Action="enable">WixUI_InstallMode = "Update"</Condition>
+               <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+               <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+               <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+               <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+            </Control>
+
+            <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="{\WixUI_Font_Title}Ready to install">
+               <Condition Action="show">NOT Installed</Condition>
+            </Control>
+            <Control Id="InstallText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
+               <Condition Action="show">NOT Installed</Condition>
+            </Control>
+            <Control Id="ChangeTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeTitle)">
+               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
+            </Control>
+            <Control Id="ChangeText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgChangeText)">
+               <Condition Action="show">WixUI_InstallMode = "Change"</Condition>
+            </Control>
+            <Control Id="RepairTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRepairTitle)">
+               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+            </Control>
+            <Control Id="RepairText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRepairText)">
+               <Condition Action="show">WixUI_InstallMode = "Repair"</Condition>
+            </Control>
+            <Control Id="RemoveTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgRemoveTitle)">
+               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+            </Control>
+            <Control Id="RemoveText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgRemoveText)">
+               <Condition Action="show">WixUI_InstallMode = "Remove"</Condition>
+            </Control>
+            <Control Id="UpdateTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgUpdateTitle)">
+               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+            </Control>
+            <Control Id="UpdateText" Transparent="yes" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" NoPrefix="yes" Text="!(loc.VerifyReadyDlgUpdateText)">
+               <Condition Action="show">WixUI_InstallMode = "Update"</Condition>
+            </Control>
+
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            </Control>
+            <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
+               <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
+            </Control>
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[SynergyCommonBackground]" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+         </Dialog>
+      </UI>
+   </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/dist/wix/SynergyWelcome.wxs b/dist/wix/SynergyWelcome.wxs
new file mode 100644
index 000000000..380d11059
--- /dev/null
+++ b/dist/wix/SynergyWelcome.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <?include Include.wxi?>
+   <Fragment>
+      <UI Id="SynergyWelcome">
+         <Property Id="SynergyWelcomeBackground">welcome_background</Property>
+         <Binary Id="welcome_background" SourceFile="$(var.ResPath)\welcome_background.png"/>
+
+         <Dialog Id="SynergyWelcome" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+               <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            </Control>
+            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[SynergyWelcomeBackground]" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+         </Dialog>
+
+         <InstallUISequence>
+            <Show Dialog="SynergyWelcome" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
+         </InstallUISequence>
+      </UI>
+   </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/res/banner.bmp b/res/banner.bmp
deleted file mode 100644
index 418746c86..000000000
Binary files a/res/banner.bmp and /dev/null differ
diff --git a/res/banner.png b/res/banner.png
new file mode 100644
index 000000000..cbf9b4675
Binary files /dev/null and b/res/banner.png differ
diff --git a/res/common_background.png b/res/common_background.png
new file mode 100644
index 000000000..647e8b40c
Binary files /dev/null and b/res/common_background.png differ
diff --git a/res/dialog.bmp b/res/dialog.bmp
deleted file mode 100644
index 2a8ee61b6..000000000
Binary files a/res/dialog.bmp and /dev/null differ
diff --git a/res/dialog.png b/res/dialog.png
new file mode 100644
index 000000000..c43c94470
Binary files /dev/null and b/res/dialog.png differ
diff --git a/res/welcome_background.png b/res/welcome_background.png
new file mode 100644
index 000000000..cbc306b21
Binary files /dev/null and b/res/welcome_background.png differ