diff --git a/platforms/Windows/bundle/swift_side.png b/platforms/Windows/bundle/swift_side.png
index 41af4ab1..449822c1 100644
Binary files a/platforms/Windows/bundle/swift_side.png and b/platforms/Windows/bundle/swift_side.png differ
diff --git a/platforms/Windows/bundle/swift_side.svvg b/platforms/Windows/bundle/swift_side.svvg
new file mode 100644
index 00000000..8e396240
--- /dev/null
+++ b/platforms/Windows/bundle/swift_side.svvg
@@ -0,0 +1,127 @@
+<svg width="724" height="2000" viewBox="0 0 181 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="181" height="500" transform="translate(0.334686)" fill="#F05138"/>
+<g opacity="0.7">
+<rect opacity="0.5" x="2" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.6" x="43.5304" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="85.0607" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="98.9042" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="112.748" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="140.435" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="154.278" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="374.409" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="2" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="15.8434" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="29.6869" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="85.0607" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="98.9042" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="112.748" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="140.435" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.8" x="154.278" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="388.252" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="2" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="15.8434" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="29.6869" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="85.0607" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="98.9042" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="112.748" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="140.435" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="154.278" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.7" x="168.121" y="402.096" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="2" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="85.0607" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="98.9042" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="112.748" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="140.435" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="154.278" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="168.121" y="415.939" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.8" x="2" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="43.5304" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="85.0607" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="98.9042" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="112.748" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="140.435" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="154.278" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="429.783" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="2" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="85.0607" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="98.9042" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="112.748" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="126.591" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="140.435" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="154.278" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="443.626" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="2" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.8" x="85.0607" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.8" x="98.9042" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="112.748" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.4" x="140.435" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="154.278" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="457.47" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="2" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="71.2173" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="85.0607" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.5" x="98.9042" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="112.748" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="126.591" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.6" x="140.435" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="154.278" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="168.121" y="471.313" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="2" y="485.157" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="15.8434" y="485.157" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="29.6869" y="485.157" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="43.5304" y="485.157" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+<rect opacity="0.2" x="57.3738" y="485.157" width="9.84345" height="9.84345" rx="2.01613" fill="white"/>
+</g>
+<path d="M113.319 144.664C102.641 150.948 87.9754 151.588 73.2438 145.161C61.7515 140.179 51.9121 131.594 45 120.518C48.2211 123.11 51.7308 125.257 55.4473 126.91C70.6732 134.011 85.9321 133.692 96.643 126.91C82.5047 115.319 69.7719 101.863 58.7429 86.8566C56.8341 84.6791 55.1337 82.2999 53.6676 79.7551C65.2487 90.2368 77.5675 99.7341 90.5131 108.161C81.0834 97.8596 72.4117 86.7832 64.5762 75.0325C77.6445 88.5388 92.0061 100.513 107.42 110.753L109.068 111.748C109.514 110.588 109.899 109.403 110.221 108.197C113.78 94.988 109.727 79.9681 100.829 67.5403C121.426 80.2167 133.62 104.042 128.545 123.998C128.545 124.531 128.281 125.063 128.117 125.596L128.281 125.809C138.465 138.769 135.664 152.475 134.378 149.883C128.809 139.053 118.493 142.391 113.319 144.664Z" fill="#FEFEFE"/>
+<rect opacity="0.2" x="150.375" y="227" width="20.1613" height="20.1613" rx="4.12942" fill="white"/>
+<rect opacity="0.2" x="112.214" y="320.726" width="20.1613" height="20.1613" rx="4.12942" fill="white"/>
+<rect opacity="0.2" x="32.754" y="147.419" width="20.1613" height="20.1613" rx="4.12942" fill="white"/>
+<rect opacity="0.2" x="14.4476" y="12.25" width="32.2581" height="32.2581" rx="6.60707" fill="white"/>
+<rect opacity="0.6" x="118.198" y="276.29" width="13.1048" height="13.1048" rx="2.91219" fill="white"/>
+<rect opacity="0.6" x="56.7057" y="357.952" width="10.0806" height="10.0806" rx="2.91219" fill="white"/>
+<rect opacity="0.6" x="121.246" y="169.355" width="21.1694" height="21.1694" rx="2.91219" fill="white"/>
+<rect opacity="0.5" x="143.319" y="55.4435" width="18.1452" height="18.1452" rx="4.03226" fill="white"/>
+<rect opacity="0.3" x="26.5363" y="274.274" width="18.1452" height="18.1452" rx="4.03226" fill="white"/>
+<rect opacity="0.2" x="74.9395" y="231.927" width="12.0968" height="12.0968" rx="2.68817" fill="white"/>
+<rect opacity="0.2" x="75.8831" y="309.556" width="12.0968" height="12.0968" rx="2.68817" fill="white"/>
+<rect opacity="0.2" x="17.4073" y="218" width="22.9483" height="22.9483" rx="4.70025" fill="white"/>
+</svg>
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 22100e47..288c9419 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -9,13 +9,13 @@
     <Font Id="2" Height="-18" Weight="500" Foreground="graytext">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
 
-    <Window Width="614" Height="456" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
-        <ImageControl X="0" Y="0" Width="165" Height="456" ImageFile="swift_side.png"/>
-        <Label X="176" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
+    <Window Width="630" Height="500" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
+        <ImageControl X="0" Y="0" Width="181" Height="500" ImageFile="swift_side.png"/>
+        <Label X="192" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
 
         <Page Name="Help">
-            <Label X="176" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Label>
-            <Label X="176" Y="91" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Label>
+            <Label X="192" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Label>
+            <Label X="192" Y="91" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Label>
             <Button Name="HelpCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.HelpCloseButton)</Text>
                 <CloseWindowAction />
@@ -23,18 +23,18 @@
         </Page>
 
         <Page Name="Loading">
-            <Label X="176" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes" Visible="no" Name="CheckingForUpdatesLabel" />
+            <Label X="192" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes" Visible="no" Name="CheckingForUpdatesLabel" />
         </Page>
 
         <Page Name="Install">
-            <Label X="176" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label>
-            <Label X="176" Y="91" Width="-11" Height="64" FontId="3" DisablePrefix="yes">
+            <Label X="192" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label>
+            <Label X="192" Y="91" Width="-11" Height="64" FontId="3" DisablePrefix="yes">
                 <Text Condition="WixStdBASuppressOptionsUI">#(loc.InstallMessage)</Text>
                 <Text Condition="NOT WixStdBASuppressOptionsUI">#(loc.InstallMessageOptions)</Text>
             </Label>
-            <Hypertext Name="EulaHyperlink" X="176" Y="-73" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
-            <Label Name="InstallVersion" X="176" Y="-103" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
-            <Checkbox Name="EulaAcceptCheckbox" X="176" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
+            <Hypertext Name="EulaHyperlink" X="192" Y="-73" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
+            <Label Name="InstallVersion" X="192" Y="-103" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
+            <Checkbox Name="EulaAcceptCheckbox" X="192" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
             <Button Name="InstallUpdateButton" X="11" Y="-11" Width="200" Height="23" TabStop="yes" FontId="0" EnableCondition="WixStdBAUpdateAvailable" HideWhenDisabled="yes">#(loc.UpdateButton)</Button>
             <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" VisibleCondition="NOT WixStdBASuppressOptionsUI">
                 <Text>#(loc.InstallOptionsButton)</Text>
@@ -48,31 +48,31 @@
         </Page>
 
         <Page Name="Options">
-            <Label X="176" Y="46" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Label>
-            <Editbox Name="InstallRoot" X="176" Y="70" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
+            <Label X="192" Y="46" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Label>
+            <Editbox Name="InstallRoot" X="192" Y="70" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
             <Button Name="BrowseButton" X="-11" Y="69" Width="75" Height="23" TabStop="yes" FontId="3">
                 <Text>#(loc.OptionsBrowseButton)</Text>
                 <BrowseDirectoryAction VariableName="InstallRoot" />
             </Button>
 
-            <Label X="176" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallRTL" X="176" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsPlatform" X="176" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="194" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="212" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="194" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="212" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKX86" X="194" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistX86" X="212" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidPlatform" X="176" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="194" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
+            <Label X="192" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
+            <Checkbox Name="OptionsInstallBLD" X="192" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="192" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="192" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="192" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallRTL" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsPlatform" X="192" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="210" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="228" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="210" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="228" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKX86" X="210" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistX86" X="228" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidPlatform" X="192" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="210" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="210" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM" X="210" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKX86" X="210" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
 
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
@@ -86,13 +86,13 @@
 
         <Page Name="Progress">
             <Label X="176" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
-            <Label Name="OverallProgressPackageText" X="176" Y="89" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
-            <Progressbar Name="OverallCalculatedProgressbar" X="176" Y="111" Width="-11" Height="20" />
+            <Label Name="OverallProgressPackageText" X="192" Y="89" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
+            <Progressbar Name="OverallCalculatedProgressbar" X="192" Y="111" Width="-11" Height="20" />
             <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
         </Page>
 
         <Page Name="Modify">
-            <Label X="176" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
+            <Label X="192" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
             <Button Name="ModifyUpdateButton" X="11" Y="-11" Width="200" Height="23" TabStop="yes" FontId="0" EnableCondition="WixStdBAUpdateAvailable" HideWhenDisabled="yes">#(loc.UpdateButton)</Button>
             <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
             <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
@@ -103,7 +103,7 @@
         </Page>
 
         <Page Name="Success">
-            <Label X="176" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
+            <Label X="192" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
                 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
@@ -114,7 +114,7 @@
                 <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-            <Label X="176" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
+            <Label X="192" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
                 <Text>#(loc.SuccessRestartText)</Text>
                 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallRestartText)</Text>
             </Label>
@@ -126,7 +126,7 @@
         </Page>
 
         <Page Name="Failure">
-            <Label X="176" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
+            <Label X="192" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
                 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
@@ -136,9 +136,9 @@
                 <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
                 <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
-            <Hypertext Name="FailureLogFileLink" X="176" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-            <Hypertext Name="FailureMessageText" X="176" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-            <Label X="176" Y="-57" Width="-11" Height="80" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
+            <Hypertext Name="FailureLogFileLink" X="192" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+            <Hypertext Name="FailureMessageText" X="192" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
+            <Label X="192" Y="-57" Width="-11" Height="80" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
             <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
             <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.FailureCloseButton)</Text>