diff --git a/config.py b/config.py
index 7df3e218..ff0b7fed 100644
--- a/config.py
+++ b/config.py
@@ -33,7 +33,7 @@ appcmdname = 'EDMC'
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
 # NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
-_static_appversion = '5.3.0-beta1'
+_static_appversion = '5.3.0-beta2'
 _cached_version: Optional[semantic_version.Version] = None
 copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD'
 
diff --git a/setup.py b/setup.py
index bfab647d..ba88ce7c 100755
--- a/setup.py
+++ b/setup.py
@@ -212,7 +212,7 @@ elif sys.platform == 'win32':
             'WinSparkle.dll',
             'WinSparkle.pdb',  # For debugging - don't include in package
             'EUROCAPS.TTF',
-            'Changelog.md',
+            'ChangeLog.md',
             'commodity.csv',
             'rare_commodity.csv',
             'snd_good.wav',
@@ -351,6 +351,30 @@ elif sys.platform == 'win32':
 
     program_files_folder.insert(0, directory_win32)
     # Append the Feature/ComponentRef listing to match
+    feature = template_tree.find('.//{*}Feature[@Id="Complete"][@Level="1"]')
+    if feature is None:
+        raise ValueError(f'{template_file}: Expected Feature element with Id="Complete" Level="1"')
+
+    # This isn't part of the components
+    feature.append(
+        etree.Element(
+            'ComponentRef',
+            attrib={
+                'Id': 'RegistryEntries'
+            },
+            nsmap=directory_win32.nsmap
+        )
+    )
+    for c in directory_win32.findall('.//{*}Component'):
+        feature.append(
+            etree.Element(
+                'ComponentRef',
+                attrib={
+                    'Id': c.get('Id')
+                },
+                nsmap=directory_win32.nsmap
+            )
+        )
 
     # Insert what we now have into the template and write it out
     template_tree.write(
diff --git a/wix/template.wxs b/wix/template.wxs
index 0d365919..7e4409a4 100644
--- a/wix/template.wxs
+++ b/wix/template.wxs
@@ -6,119 +6,119 @@
 <?define UPGRADECODE = "9df571ae-d56d-46e6-af79-4e72ad54efe6" ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*"
-			 Name="$(var.PRODUCTLONGNAME)"
-			 Version="$(var.PRODUCTVERSION)"
-			 UpgradeCode="$(var.UPGRADECODE)"
-			 Language="!(bind.fileLanguage.EDMarketConnector.exe)"
-			 Manufacturer="EDCD">
+    <Product Id="*"
+             Name="$(var.PRODUCTLONGNAME)"
+             Version="$(var.PRODUCTVERSION)"
+             UpgradeCode="$(var.UPGRADECODE)"
+             Language="!(bind.fileLanguage.EDMarketConnector.exe)"
+             Manufacturer="EDCD">
 
-		<Package Id="*" Keywords="Installer"
-				 InstallScope="perMachine"
-				 Description="$(var.PRODUCTLONGNAME) installer"
-				 InstallerVersion="300" Compressed="yes"
-				 Platform="x86"
-				 Languages="1033,1029,1031,1034,1035,1036,1038,1040,1041,1043,1045,1046,1049,1058,1062,2052,2070,2074,6170,1060,1053,18,0" />
-				 <!--        en   cs,  de   es   fi   fr   hu   it   ja   nl   pl  pt-BR ru   uk  lv zh-CN pt-PT sr-Latn sr-Latn-BA sl sv-SE ko neutral -->
-				 <!-- https://msdn.microsoft.com/en-gb/goglobal/bb964664.aspx -->
+        <Package Id="*" Keywords="Installer"
+                 InstallScope="perMachine"
+                 Description="$(var.PRODUCTLONGNAME) installer"
+                 InstallerVersion="300" Compressed="yes"
+                 Platform="x86"
+                 Languages="1033,1029,1031,1034,1035,1036,1038,1040,1041,1043,1045,1046,1049,1058,1062,2052,2070,2074,6170,1060,1053,18,0" />
+                 <!--        en   cs,  de   es   fi   fr   hu   it   ja   nl   pl  pt-BR ru   uk  lv zh-CN pt-PT sr-Latn sr-Latn-BA sl sv-SE ko neutral -->
+                 <!-- https://msdn.microsoft.com/en-gb/goglobal/bb964664.aspx -->
 
-		<!-- Always reinstall since patching is problematic -->
-		<!-- http://www.joyofsetup.com/2010/01/16/major-upgrades-now-easier-than-ever/ -->
-		<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+        <!-- Always reinstall since patching is problematic -->
+        <!-- http://www.joyofsetup.com/2010/01/16/major-upgrades-now-easier-than-ever/ -->
+        <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
-		<Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
+        <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
 
-		<Icon Id="EDMarketConnector.exe" SourceFile="EDMarketConnector.ico"/>
+        <Icon Id="EDMarketConnector.exe" SourceFile="EDMarketConnector.ico"/>
 
-		<!-- For Add/Remove programs -->
-		<Property Id="ARPPRODUCTICON" Value="EDMarketConnector.exe" />
-		<Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />	<!-- Remove modify - also set by WixUI_Minimal -->
-		<Property Id="ARPHELPLINK" Value="https://github.com/EDCD/EDMarketConnector/wiki" />
+        <!-- For Add/Remove programs -->
+        <Property Id="ARPPRODUCTICON" Value="EDMarketConnector.exe" />
+        <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />    <!-- Remove modify - also set by WixUI_Minimal -->
+        <Property Id="ARPHELPLINK" Value="https://github.com/EDCD/EDMarketConnector/wiki" />
 
-		<!-- Set INSTALLDIR from ARPINSTALLLOCATION if replacing/upgrading -->
-		<!-- https://wyrdfish.wordpress.com/2012/07/20/msi-writing-guidelines-this-may-be-out-of-date/ -->
-		<Property Id="ARPINSTALLLOCATION">
-			<RegistrySearch Id="GetARPINSTALLLOCATION"
-							Root="HKLM"
-							Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[WIX_UPGRADE_DETECTED]"
-							Name="InstallLocation"
-							Type="raw" />
-		</Property>
-		<CustomAction Id="SetINSTALLDIR" Property="INSTALLDIR" Value="[ARPINSTALLLOCATION]" />
-		<InstallUISequence>
-			<Custom Action="SetINSTALLDIR" After="AppSearch">
-				WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
-			</Custom>
-		</InstallUISequence>
-		<InstallExecuteSequence>
-			<Custom Action="SetINSTALLDIR" After="AppSearch">
-				WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
-			</Custom>
-		</InstallExecuteSequence>
+        <!-- Set INSTALLDIR from ARPINSTALLLOCATION if replacing/upgrading -->
+        <!-- https://wyrdfish.wordpress.com/2012/07/20/msi-writing-guidelines-this-may-be-out-of-date/ -->
+        <Property Id="ARPINSTALLLOCATION">
+            <RegistrySearch Id="GetARPINSTALLLOCATION"
+                            Root="HKLM"
+                            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[WIX_UPGRADE_DETECTED]"
+                            Name="InstallLocation"
+                            Type="raw" />
+        </Property>
+        <CustomAction Id="SetINSTALLDIR" Property="INSTALLDIR" Value="[ARPINSTALLLOCATION]" />
+        <InstallUISequence>
+            <Custom Action="SetINSTALLDIR" After="AppSearch">
+                WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
+            </Custom>
+        </InstallUISequence>
+        <InstallExecuteSequence>
+            <Custom Action="SetINSTALLDIR" After="AppSearch">
+                WIX_UPGRADE_DETECTED AND ARPINSTALLLOCATION
+            </Custom>
+        </InstallExecuteSequence>
 
-		<!-- Set ARPINSTALLLOCATION from INSTALLDIR if new install -->
-		<!-- http://blogs.technet.com/b/alexshev/archive/2008/02/09/from-msi-to-wix-part-2.aspx -->
-		<CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
-		<InstallExecuteSequence>
-			<Custom Action="SetARPINSTALLLOCATION" After="InstallValidate">
-				NOT Installed
-			</Custom>
-		</InstallExecuteSequence>
+        <!-- Set ARPINSTALLLOCATION from INSTALLDIR if new install -->
+        <!-- http://blogs.technet.com/b/alexshev/archive/2008/02/09/from-msi-to-wix-part-2.aspx -->
+        <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+        <InstallExecuteSequence>
+            <Custom Action="SetARPINSTALLLOCATION" After="InstallValidate">
+                NOT Installed
+            </Custom>
+        </InstallExecuteSequence>
 
-		<!-- Launch app after upgrade -->
-		<Property Id="LAUNCH" Value="yes" />
-		<CustomAction Id="DoLaunch"
-					  Directory="INSTALLDIR"
-					  ExeCommand='"[INSTALLDIR]EDMarketConnector.exe"'
-					  Return="asyncNoWait"
-					  Execute="deferred"
-					  Impersonate="yes"
-					  />
-		<InstallExecuteSequence>
-			<!-- http://alekdavis.blogspot.co.uk/2013/05/wix-woes-what-is-your-installer-doing.html -->
-			<Custom Action="DoLaunch" Before="InstallFinalize">
-				NOT Installed AND LAUNCH ~= "yes"
-			</Custom>
-		</InstallExecuteSequence>
+        <!-- Launch app after upgrade -->
+        <Property Id="LAUNCH" Value="yes" />
+        <CustomAction Id="DoLaunch"
+                      Directory="INSTALLDIR"
+                      ExeCommand='"[INSTALLDIR]EDMarketConnector.exe"'
+                      Return="asyncNoWait"
+                      Execute="deferred"
+                      Impersonate="yes"
+                      />
+        <InstallExecuteSequence>
+            <!-- http://alekdavis.blogspot.co.uk/2013/05/wix-woes-what-is-your-installer-doing.html -->
+            <Custom Action="DoLaunch" Before="InstallFinalize">
+                NOT Installed AND LAUNCH ~= "yes"
+            </Custom>
+        </InstallExecuteSequence>
 
-		<Directory Id="TARGETDIR" Name="SourceDir">
+        <Directory Id="TARGETDIR" Name="SourceDir">
 
-			<!-- http://wixtoolset.org/documentation/manual/v3/howtos/files_and_registry/write_a_registry_entry.html -->
-			<Component Id="RegistryEntries" Guid="*">
-				<RegistryKey Root="HKCR" Key="edmc">
-					<RegistryValue Type="string" Value="$(var.PRODUCTLONGNAME)"/>
-					<RegistryValue Type="string" Name="URL Protocol" Value=""/>
-					<RegistryKey Key="DefaultIcon">
-						<RegistryValue Type="string" Value="[INSTALLDIR]EDMarketConnector.exe,0"/>
-					</RegistryKey>
-					<RegistryKey Key="shell">
-						<RegistryKey Key="open">
-							<RegistryKey Key="command">
-								<RegistryValue Type="string" Value='"[INSTALLDIR]EDMarketConnector.exe" "%1"'/>
-							</RegistryKey>
-							<RegistryKey Key="ddeexec">
-								<RegistryValue Type="string" Value='Open("%1")'/>
-							</RegistryKey>
-						</RegistryKey>
-					</RegistryKey>
-				</RegistryKey>
-			</Component>
+            <!-- http://wixtoolset.org/documentation/manual/v3/howtos/files_and_registry/write_a_registry_entry.html -->
+            <Component Id="RegistryEntries" Guid="*">
+                <RegistryKey Root="HKCR" Key="edmc">
+                    <RegistryValue Type="string" Value="$(var.PRODUCTLONGNAME)"/>
+                    <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                    <RegistryKey Key="DefaultIcon">
+                        <RegistryValue Type="string" Value="[INSTALLDIR]EDMarketConnector.exe,0"/>
+                    </RegistryKey>
+                    <RegistryKey Key="shell">
+                        <RegistryKey Key="open">
+                            <RegistryKey Key="command">
+                                <RegistryValue Type="string" Value='"[INSTALLDIR]EDMarketConnector.exe" "%1"'/>
+                            </RegistryKey>
+                            <RegistryKey Key="ddeexec">
+                                <RegistryValue Type="string" Value='Open("%1")'/>
+                            </RegistryKey>
+                        </RegistryKey>
+                    </RegistryKey>
+                </RegistryKey>
+            </Component>
 
-			<!-- Generate with `heat.exe dir dist.win32 -ag -sfrag -suid -out foo.wxs` -->
-			<!-- Sadly too late for auto-generated Component UUIDs -->
+            <!-- Generate with `heat.exe dir dist.win32 -ag -sfrag -suid -out foo.wxs` -->
+            <!-- Sadly too late for auto-generated Component UUIDs -->
 
-			<Directory Id="ProgramFilesFolder">
-			</Directory>
+            <Directory Id="ProgramFilesFolder">
+            </Directory>
 
-			<Directory Id="ProgramMenuFolder" Name="Programs">
-			</Directory>
+            <Directory Id="ProgramMenuFolder" Name="Programs">
+            </Directory>
 
-		</Directory>
+        </Directory>
 
-		<Feature Id='Complete' Level='1'>
-		</Feature>
+        <Feature Id='Complete' Level='1'>
+        </Feature>
 
-	</Product>
+    </Product>
 </Wix>
 
 <!-- Local Variables: -->