diff --git a/scripts/installer/Installer32.wxs b/scripts/installer/Installer32.wxs
index 4ab4ea083..606377b17 100644
--- a/scripts/installer/Installer32.wxs
+++ b/scripts/installer/Installer32.wxs
@@ -8,7 +8,7 @@
       InstallerVersion='301' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
     <UI> 
-       <Error Id="25000">Please use the 64-bit installer</Error> 
+      <Error Id="25000">Please use the 64-bit installer</Error>
     </UI> 
 
     <Property Id="MajorMinorVersion">$(env.RENDERDOC_VERSION)</Property>
@@ -16,7 +16,7 @@
     <CustomAction Id="Need64BitVersion" Error="25000" /> 
 
     <InstallUISequence> 
-       <Custom Action="Need64BitVersion" Before="AppSearch">VersionNT64</Custom> 
+      <Custom Action="Need64BitVersion" Before="AppSearch">VersionNT64</Custom>
     </InstallUISequence> 
 
     <InstallExecuteSequence>
@@ -25,10 +25,10 @@
 
     <Upgrade Id="D320753C-4B18-4905-A752-E68959943E7D">
       <UpgradeVersion Minimum="0.18.0"
-                      IncludeMinimum="yes"
-                      IncludeMaximum="yes"
-                      Maximum="$(env.RENDERDOC_VERSION).0"
-                      Property="OLDERVERSIONBEINGUPGRADED" />
+        IncludeMinimum="yes"
+        IncludeMaximum="yes"
+        Maximum="$(env.RENDERDOC_VERSION).0"
+        Property="OLDERVERSIONBEINGUPGRADED" />
       <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONDETECTED" Minimum="$(env.RENDERDOC_VERSION).0" IncludeMinimum="no" />
     </Upgrade>
 
@@ -77,7 +77,7 @@
               Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
               Value='[#qrenderdocEXE]'
               Type="expandable" />
-            
+
           </Component>
 
           <Component Id='RenderDocCPP' Guid='2E6F718F-8BCC-4D41-9688-E99CF2F6B303'>
@@ -90,7 +90,7 @@
             <File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release32/symsrv.yes' />
 
             <File Id='RenderDocAPIheader' Name='renderdoc_app.h' DiskId='1' Source='dist/Release32/renderdoc_app.h' />
-            
+
             <RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
               Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
               Value='RenderDoc Thumbnail Handler' 
@@ -208,7 +208,7 @@
           </Component>
         </Directory>
       </Directory>
-     
+
       <Component Id="ImageOpenWith" Guid="1F56AF06-3E83-4D7E-85A2-6A309A55FF4F">
         <RegistryValue Root="HKLM" Id="RDCOpenWithCommand" Action="write" KeyPath='yes'
           Key="Software\Classes\Applications\qrenderdoc.exe\shell\open\command"
@@ -267,14 +267,14 @@
         <RegistryValue Root="HKLM" Id="RDCOpenWithProgidPSD" Action="write"
           Key="Software\Classes\.psd\OpenWithProgids" Name='RenderDoc.RDCCapture.1'  Value='' Type="string" />
       </Component>
-     
+
       <Component Id="ImageThumbnailProvider" Guid="51E29C24-61F0-4F40-AB17-D66A97B3D543">
         <RegistryValue Root="HKLM" Id="RDCProvider" Action="write" KeyPath='yes'
           Key="Software\Classes\RenderDoc.RDCCapture.1\ShellEx\{e357fccd-a995-4576-b01f-234630154e96}" 
           Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
           Type="expandable" />
       </Component>
-      
+
       <Component Id="FileExtensionRDC" Guid="5F21081F-59A8-43EE-8E95-170335FC3EF4">
         <ProgId Id='RenderDoc.RDCCapture.1' Description='RenderDoc Capture Log (.rdc)'>
           <Extension Id='rdc' />
diff --git a/scripts/installer/Installer64.wxs b/scripts/installer/Installer64.wxs
index 830ed23e8..f1be3a5df 100644
--- a/scripts/installer/Installer64.wxs
+++ b/scripts/installer/Installer64.wxs
@@ -15,16 +15,16 @@
 
     <Upgrade Id="D320753C-4B18-4905-A752-E68959943E7D">
       <UpgradeVersion Minimum="0.18.0"
-                      IncludeMinimum="yes"
-                      IncludeMaximum="yes"
-                      Maximum="$(env.RENDERDOC_VERSION).0"
-                      Property="OLDERVERSIONBEINGUPGRADED" />
+        IncludeMinimum="yes"
+        IncludeMaximum="yes"
+        Maximum="$(env.RENDERDOC_VERSION).0"
+        Property="OLDERVERSIONBEINGUPGRADED" />
       <UpgradeVersion OnlyDetect="yes" Property="NEWERVERSIONDETECTED" Minimum="$(env.RENDERDOC_VERSION).0" IncludeMinimum="no" />
     </Upgrade>
 
-    <Condition Message="A later version of [ProductName] is already installed"> 
+    <Condition Message="A later version of [ProductName] is already installed">
       NOT NEWERVERSIONDETECTED
-    </Condition> 
+    </Condition>
 
     <Media Id='1' Cabinet='renderdoc.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
     <Property Id='DiskPrompt' Value="RenderDoc Installation [1]" />
@@ -38,182 +38,182 @@
               <Shortcut Id="startmenuRenderDoc" Directory="ProgramMenuDir" Name="RenderDoc" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="yes" />
             </File>
 
-						<RegistryValue Root="HKLM" Id="VerbRDC" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command" 
-							Value='"[#qrenderdocEXE]" "%1"'
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCCapture.1" 
-							Value='RenderDoc Capture Log (.rdc)' 
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon" 
-							Value='[#qrenderdocEXE]'
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID" 
-							Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
-							Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbRDC" Action="write"
+              Key="Software\Classes\RenderDoc.RDCCapture.1\shell\open\command"
+              Value='"[#qrenderdocEXE]" "%1"'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbDescRDC" Action="write"
+              Key="Software\Classes\RenderDoc.RDCCapture.1"
+              Value='RenderDoc Capture Log (.rdc)'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbIconRDC" Action="write"
+              Key="Software\Classes\RenderDoc.RDCCapture.1\DefaultIcon"
+              Value='[#qrenderdocEXE]'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="RDCProgIDCLSID" Action="write"
+              Key="Software\Classes\RenderDoc.RDCCapture.1\CLSID"
+              Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}'
+              Type="expandable" />
 
-						<RegistryValue Root="HKLM" Id="VerbCAP" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command" 
-							Value='"[#qrenderdocEXE]" "%1"'
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCSettings.1" 
-							Value='RenderDoc Capture Settings (.cap)' 
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write" 
-							Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon" 
-							Value='[#qrenderdocEXE]'
-							Type="expandable" />
-						
-					</Component>
+            <RegistryValue Root="HKLM" Id="VerbCAP" Action="write"
+              Key="Software\Classes\RenderDoc.RDCSettings.1\shell\open\command"
+              Value='"[#qrenderdocEXE]" "%1"'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbDescCAP" Action="write"
+              Key="Software\Classes\RenderDoc.RDCSettings.1"
+              Value='RenderDoc Capture Settings (.cap)'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="VerbIconCAP" Action="write"
+              Key="Software\Classes\RenderDoc.RDCSettings.1\DefaultIcon"
+              Value='[#qrenderdocEXE]'
+              Type="expandable" />
 
-					<Component Id='RenderDocCPP' Win64="yes" Guid='9D5949F9-0447-47B6-829D-77465E1FDAD9'>
-						<File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/renderdoc.dll' KeyPath='yes' />
-						<File Id='RenderDocJSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/renderdoc.json' />
-						<File Id='D3DCompiler47DLL64' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/d3dcompiler_47.dll' />
-						<File Id='RenderDocSHIM' Name='renderdocshim64.dll' DiskId='1' Source='dist/Release64/renderdocshim64.dll' />
-						<File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/dbghelp.dll' />
-						<File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/symsrv.dll' />
-						<File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/symsrv.yes' />
-						
-						<File Id='RenderDocAPIheader' Name='renderdoc_app.h' DiskId='1' Source='dist/Release64/renderdoc_app.h' />
-            
-						<RegistryValue Root="HKLM" Id="RDCCLSID" Action="write" 
-							Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
-							Value='RenderDoc Thumbnail Handler' 
-							Type="expandable" />
-						<RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write" 
-							Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
-							Value='[#RenderDocCPP]' 
-							Type="expandable" />
+          </Component>
 
-						<RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer" Action="write"
-							Key="Software\Khronos\Vulkan\ImplicitLayers" 
-							Name='[#RenderDocJSON]'
-							Value='0'
-							Type="integer" />
-					</Component>
+          <Component Id='RenderDocCPP' Win64="yes" Guid='9D5949F9-0447-47B6-829D-77465E1FDAD9'>
+            <File Id='RenderDocCPP' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/renderdoc.dll' KeyPath='yes' />
+            <File Id='RenderDocJSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/renderdoc.json' />
+            <File Id='D3DCompiler47DLL64' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/d3dcompiler_47.dll' />
+            <File Id='RenderDocSHIM' Name='renderdocshim64.dll' DiskId='1' Source='dist/Release64/renderdocshim64.dll' />
+            <File Id='dbghelpDLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/dbghelp.dll' />
+            <File Id='symsrvDLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/symsrv.dll' />
+            <File Id='symsrvYES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/symsrv.yes' />
 
-					<Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
-						<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
-					</Component>
+            <File Id='RenderDocAPIheader' Name='renderdoc_app.h' DiskId='1' Source='dist/Release64/renderdoc_app.h' />
 
-					<Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
-						<File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/renderdoccmd.exe' KeyPath='yes' />
-					</Component>
+            <RegistryValue Root="HKLM" Id="RDCCLSID" Action="write"
+              Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}"
+              Value='RenderDoc Thumbnail Handler'
+              Type="expandable" />
+            <RegistryValue Root="HKLM" Id="RDCCLSIDServer" Action="write"
+              Key="Software\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32"
+              Value='[#RenderDocCPP]'
+              Type="expandable" />
 
-					<Component Id='Qt' Win64="yes" Guid='E1BC516F-F611-4C7B-8F3E-A459F026FC4E'>
-						<File Id='Qt5Core' Name='Qt5Core.dll' DiskId='1' Source='dist/Release64/Qt5Core.dll' KeyPath='yes' />
-						<File Id='Qt5Gui' Name='Qt5Gui.dll' DiskId='1' Source='dist/Release64/Qt5Gui.dll' />
-						<File Id='Qt5Network' Name='Qt5Network.dll' DiskId='1' Source='dist/Release64/Qt5Network.dll' />
-						<File Id='Qt5Svg' Name='Qt5Svg.dll' DiskId='1' Source='dist/Release64/Qt5Svg.dll' />
-						<File Id='Qt5Widgets' Name='Qt5Widgets.dll' DiskId='1' Source='dist/Release64/Qt5Widgets.dll' />
-						<File Id='libeay32' Name='libeay32.dll' DiskId='1' Source='dist/Release64/libeay32.dll' />
-						<File Id='ssleay32' Name='ssleay32.dll' DiskId='1' Source='dist/Release64/ssleay32.dll' />
-					</Component>
+            <RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer" Action="write"
+              Key="Software\Khronos\Vulkan\ImplicitLayers"
+              Name='[#RenderDocJSON]'
+              Value='0'
+              Type="integer" />
+          </Component>
 
-					<Component Id='Python' Win64="yes" Guid='CE2C9D5B-9040-47C7-8E42-B79B52AE93EB'>
-						<File Id='Python36' Name='python36.dll' DiskId='1' Source='dist/Release64/python36.dll' KeyPath='yes' />
-						<File Id='PythonLibsZIP' Name='python36.zip' DiskId='1' Source='dist/Release64/python36.zip' />
-						<File Id='CTypes' Name='_ctypes.pyd' DiskId='1' Source='dist/Release64/_ctypes.pyd' />
-						<File Id='Shiboken2' Name='shiboken2.dll' DiskId='1' Source='dist/Release64/shiboken2.dll' />
-					</Component>
+          <Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
+            <File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
+          </Component>
 
-					<Component Id='Documentation' Win64="yes" Guid='C49ABF1D-1D73-469B-A44A-DD9470E85F19'>
-						<File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release64/renderdoc.chm' KeyPath='yes'>
-							<Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
-						</File>
-					</Component>
+          <Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
+            <File Id='RenderDocCMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/renderdoccmd.exe' KeyPath='yes' />
+          </Component>
 
-					<Directory Id='qtplugins' Name='qtplugins'>
-						<Directory Id='qtplugins_imageformats' Name='imageformats'>
-							<Component Id='qt_imgplugin' Win64="yes" Guid='4346BD2C-4005-47FF-BEE7-9C30978EF7E5'>
-								<File Id='qsvg' Name='qsvg.dll' DiskId='1' Source='dist/Release64/qtplugins/imageformats/qsvg.dll' KeyPath='yes' />
-							</Component>
-						</Directory>
+          <Component Id='Qt' Win64="yes" Guid='E1BC516F-F611-4C7B-8F3E-A459F026FC4E'>
+            <File Id='Qt5Core' Name='Qt5Core.dll' DiskId='1' Source='dist/Release64/Qt5Core.dll' KeyPath='yes' />
+            <File Id='Qt5Gui' Name='Qt5Gui.dll' DiskId='1' Source='dist/Release64/Qt5Gui.dll' />
+            <File Id='Qt5Network' Name='Qt5Network.dll' DiskId='1' Source='dist/Release64/Qt5Network.dll' />
+            <File Id='Qt5Svg' Name='Qt5Svg.dll' DiskId='1' Source='dist/Release64/Qt5Svg.dll' />
+            <File Id='Qt5Widgets' Name='Qt5Widgets.dll' DiskId='1' Source='dist/Release64/Qt5Widgets.dll' />
+            <File Id='libeay32' Name='libeay32.dll' DiskId='1' Source='dist/Release64/libeay32.dll' />
+            <File Id='ssleay32' Name='ssleay32.dll' DiskId='1' Source='dist/Release64/ssleay32.dll' />
+          </Component>
 
-						<Directory Id='qtplugins_platform' Name='platforms'>
-							<Component Id='qt_platplugin' Win64="yes" Guid='9C12C689-DFAE-4958-8CEE-D573867B2E98'>
-								<File Id='qwindows' Name='qwindows.dll' DiskId='1' Source='dist/Release64/qtplugins/platforms/qwindows.dll' KeyPath='yes' />
-							</Component>
-						</Directory>
-					</Directory>
+          <Component Id='Python' Win64="yes" Guid='CE2C9D5B-9040-47C7-8E42-B79B52AE93EB'>
+            <File Id='Python36' Name='python36.dll' DiskId='1' Source='dist/Release64/python36.dll' KeyPath='yes' />
+            <File Id='PythonLibsZIP' Name='python36.zip' DiskId='1' Source='dist/Release64/python36.zip' />
+            <File Id='CTypes' Name='_ctypes.pyd' DiskId='1' Source='dist/Release64/_ctypes.pyd' />
+            <File Id='Shiboken2' Name='shiboken2.dll' DiskId='1' Source='dist/Release64/shiboken2.dll' />
+          </Component>
 
-					<Directory Id='PySide2' Name='PySide2'>
-						<Component Id='PySide2Deps' Win64="yes" Guid='A864541A-DDC3-4149-B03F-A48B7ED16DAB'>
-							<File Id='pyside2dll' Name='pyside2.dll' DiskId='1' Source='dist/Release64/PySide2/pyside2.dll' KeyPath='yes' />
-							<File Id='PS2QtCore' Name='QtCore.pyd' DiskId='1' Source='dist/Release64/PySide2/QtCore.pyd' />
-							<File Id='PS2QtGui' Name='QtGui.pyd' DiskId='1' Source='dist/Release64/PySide2/QtGui.pyd' />
-							<File Id='PS2QtWidgets' Name='QtWidgets.pyd' DiskId='1' Source='dist/Release64/PySide2/QtWidgets.pyd' />
-							<File Id='PS2utils' Name='_utils.py' DiskId='1' Source='dist/Release64/PySide2/_utils.py' />
-							<File Id='PS2init' Name='__init__.py' DiskId='1' Source='dist/Release64/PySide2/__init__.py' />
-						</Component>
-					</Directory>
+          <Component Id='Documentation' Win64="yes" Guid='C49ABF1D-1D73-469B-A44A-DD9470E85F19'>
+            <File Id='Documentation' Name='renderdoc.chm' DiskId='1' Source='dist/Release64/renderdoc.chm' KeyPath='yes'>
+              <Shortcut Id="startmenuDocs" Directory="ProgramMenuDir" Name="RenderDoc Documentation" Icon='chm.ico' Advertise="yes" />
+            </File>
+          </Component>
 
-					<Directory Id='plugins' Name='plugins'>
-						<Directory Id='plugins_amd' Name='amd'>
-							<Directory Id='plugins_amd_isa' Name='isa'>
-								<Component Id='gcn_plugin' Win64="yes" Guid='02B13D5B-DA43-4AFF-B35B-CF4A241C2CEE'>
-									<File Id='amdspvEXE' Name='amdspv.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/amdspv.exe' KeyPath='yes' />
-									<File Id='spvgenDLL' Name='spvgen.dll' DiskId='1' Source='dist/Release64/plugins/amd/isa/spvgen.dll' />
-									<File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/VirtualContext.exe' />
-								</Component>
-							</Directory>
-						</Directory>
+          <Directory Id='qtplugins' Name='qtplugins'>
+            <Directory Id='qtplugins_imageformats' Name='imageformats'>
+              <Component Id='qt_imgplugin' Win64="yes" Guid='4346BD2C-4005-47FF-BEE7-9C30978EF7E5'>
+                <File Id='qsvg' Name='qsvg.dll' DiskId='1' Source='dist/Release64/qtplugins/imageformats/qsvg.dll' KeyPath='yes' />
+              </Component>
+            </Directory>
 
-						<Directory Id='plugins_android' Name='android'>
-							<Component Id='android_plugin' Win64="yes" Guid='328B7D53-1323-4D9B-8966-3D8567E3723B'>
-								<File Id='APKarm32' Name='org.renderdoc.renderdoccmd.arm32.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm32.apk' KeyPath='yes' />
-								<File Id='APKarm64' Name='org.renderdoc.renderdoccmd.arm64.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm64.apk' />
-								<File Id='aapt' Name='aapt.exe' DiskId='1' Source='dist/Release64/plugins/android/aapt.exe' />
-								<File Id='adb' Name='adb.exe' DiskId='1' Source='dist/Release64/plugins/android/adb.exe' />
-								<File Id='AdbWinApi' Name='AdbWinApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinApi.dll' />
-								<File Id='AdbWinUsbApi' Name='AdbWinUsbApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinUsbApi.dll' />
-								<File Id='apksigner' Name='apksigner.jar' DiskId='1' Source='dist/Release64/plugins/android/apksigner.jar' />
-								<File Id='keystore' Name='renderdoc.keystore' DiskId='1' Source='dist/Release64/plugins/android/renderdoc.keystore' />
-								<File Id='zipalign' Name='zipalign.exe' DiskId='1' Source='dist/Release64/plugins/android/zipalign.exe' />
-							</Component>
-						</Directory>
+            <Directory Id='qtplugins_platform' Name='platforms'>
+              <Component Id='qt_platplugin' Win64="yes" Guid='9C12C689-DFAE-4958-8CEE-D573867B2E98'>
+                <File Id='qwindows' Name='qwindows.dll' DiskId='1' Source='dist/Release64/qtplugins/platforms/qwindows.dll' KeyPath='yes' />
+              </Component>
+            </Directory>
+          </Directory>
 
-						<Directory Id='plugins_spirv' Name='spirv'>
-							<Component Id='spirv_plugin' Win64="yes" Guid='15566608-0D77-42D2-9B6C-D43698C4C46D'>
-								<File Id='spirvcross' Name='spirv-cross.exe' DiskId='1' Source='dist/Release64/plugins/spirv/spirv-cross.exe' KeyPath='yes' />
-								<File Id='spirvdis' Name='spirv-dis.exe' DiskId='1' Source='dist/Release64/plugins/spirv/spirv-dis.exe' />
-							</Component>
-						</Directory>
-					</Directory>
+          <Directory Id='PySide2' Name='PySide2'>
+            <Component Id='PySide2Deps' Win64="yes" Guid='A864541A-DDC3-4149-B03F-A48B7ED16DAB'>
+              <File Id='pyside2dll' Name='pyside2.dll' DiskId='1' Source='dist/Release64/PySide2/pyside2.dll' KeyPath='yes' />
+              <File Id='PS2QtCore' Name='QtCore.pyd' DiskId='1' Source='dist/Release64/PySide2/QtCore.pyd' />
+              <File Id='PS2QtGui' Name='QtGui.pyd' DiskId='1' Source='dist/Release64/PySide2/QtGui.pyd' />
+              <File Id='PS2QtWidgets' Name='QtWidgets.pyd' DiskId='1' Source='dist/Release64/PySide2/QtWidgets.pyd' />
+              <File Id='PS2utils' Name='_utils.py' DiskId='1' Source='dist/Release64/PySide2/_utils.py' />
+              <File Id='PS2init' Name='__init__.py' DiskId='1' Source='dist/Release64/PySide2/__init__.py' />
+            </Component>
+          </Directory>
 
-					<Directory Id='renderdocX86' Name='x86'>
-						<Component Id='renderdocX86Bins' Win64="yes" Guid='EB58A048-899A-4239-B229-DA9781C431F8'>
-							<File Id='renderdocX86DLL' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/x86/renderdoc.dll' KeyPath='yes' />
-							<File Id='renderdocX86JSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/x86/renderdoc.json' />
-							<File Id='renderdocshimX86DLL' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release64/x86/renderdocshim32.dll' />
-							<File Id='renderdocX86CMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/x86/renderdoccmd.exe' />
-							<File Id='dbghelp32DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/x86/dbghelp.dll' />
-							<File Id='symsrv32DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/x86/symsrv.dll' />
-							<File Id='symsrv32YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/x86/symsrv.yes' />
+          <Directory Id='plugins' Name='plugins'>
+            <Directory Id='plugins_amd' Name='amd'>
+              <Directory Id='plugins_amd_isa' Name='isa'>
+                <Component Id='gcn_plugin' Win64="yes" Guid='02B13D5B-DA43-4AFF-B35B-CF4A241C2CEE'>
+                  <File Id='amdspvEXE' Name='amdspv.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/amdspv.exe' KeyPath='yes' />
+                  <File Id='spvgenDLL' Name='spvgen.dll' DiskId='1' Source='dist/Release64/plugins/amd/isa/spvgen.dll' />
+                  <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/VirtualContext.exe' />
+                </Component>
+              </Directory>
+            </Directory>
 
-							<File Id='D3DCompiler47DLL32' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/x86/d3dcompiler_47.dll' />
-								
-							<RegistryValue Root="HKLM" Id="RDCCLSID32" Action="write" 
-								Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}" 
-								Value='RenderDoc Thumbnail Handler' 
-								Type="expandable" />
-							<RegistryValue Root="HKLM" Id="RDCCLSIDServer32" Action="write" 
-								Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32" 
-								Value='[#renderdocX86DLL]' 
-								Type="expandable" />
+            <Directory Id='plugins_android' Name='android'>
+              <Component Id='android_plugin' Win64="yes" Guid='328B7D53-1323-4D9B-8966-3D8567E3723B'>
+                <File Id='APKarm32' Name='org.renderdoc.renderdoccmd.arm32.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm32.apk' KeyPath='yes' />
+                <File Id='APKarm64' Name='org.renderdoc.renderdoccmd.arm64.apk' DiskId='1' Source='dist/Release64/plugins/android/org.renderdoc.renderdoccmd.arm64.apk' />
+                <File Id='aapt' Name='aapt.exe' DiskId='1' Source='dist/Release64/plugins/android/aapt.exe' />
+                <File Id='adb' Name='adb.exe' DiskId='1' Source='dist/Release64/plugins/android/adb.exe' />
+                <File Id='AdbWinApi' Name='AdbWinApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinApi.dll' />
+                <File Id='AdbWinUsbApi' Name='AdbWinUsbApi.dll' DiskId='1' Source='dist/Release64/plugins/android/AdbWinUsbApi.dll' />
+                <File Id='apksigner' Name='apksigner.jar' DiskId='1' Source='dist/Release64/plugins/android/apksigner.jar' />
+                <File Id='keystore' Name='renderdoc.keystore' DiskId='1' Source='dist/Release64/plugins/android/renderdoc.keystore' />
+                <File Id='zipalign' Name='zipalign.exe' DiskId='1' Source='dist/Release64/plugins/android/zipalign.exe' />
+              </Component>
+            </Directory>
 
-							<RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer32" Action="write"
-								Key="Software\Wow6432Node\Khronos\Vulkan\ImplicitLayers" 
-								Name='[#renderdocX86JSON]'
-								Value='0'
-								Type="integer" />
+            <Directory Id='plugins_spirv' Name='spirv'>
+              <Component Id='spirv_plugin' Win64="yes" Guid='15566608-0D77-42D2-9B6C-D43698C4C46D'>
+                <File Id='spirvcross' Name='spirv-cross.exe' DiskId='1' Source='dist/Release64/plugins/spirv/spirv-cross.exe' KeyPath='yes' />
+                <File Id='spirvdis' Name='spirv-dis.exe' DiskId='1' Source='dist/Release64/plugins/spirv/spirv-dis.exe' />
+              </Component>
+            </Directory>
+          </Directory>
 
-						</Component>
+          <Directory Id='renderdocX86' Name='x86'>
+            <Component Id='renderdocX86Bins' Win64="yes" Guid='EB58A048-899A-4239-B229-DA9781C431F8'>
+              <File Id='renderdocX86DLL' Name='renderdoc.dll' DiskId='1' Source='dist/Release64/x86/renderdoc.dll' KeyPath='yes' />
+              <File Id='renderdocX86JSON' Name='renderdoc.json' DiskId='1' Source='dist/Release64/x86/renderdoc.json' />
+              <File Id='renderdocshimX86DLL' Name='renderdocshim32.dll' DiskId='1' Source='dist/Release64/x86/renderdocshim32.dll' />
+              <File Id='renderdocX86CMD' Name='renderdoccmd.exe' DiskId='1' Source='dist/Release64/x86/renderdoccmd.exe' />
+              <File Id='dbghelp32DLL' Name='dbghelp.dll' DiskId='1' Source='dist/Release64/x86/dbghelp.dll' />
+              <File Id='symsrv32DLL' Name='symsrv.dll' DiskId='1' Source='dist/Release64/x86/symsrv.dll' />
+              <File Id='symsrv32YES' Name='symsrv.yes' DiskId='1' Source='dist/Release64/x86/symsrv.yes' />
+
+              <File Id='D3DCompiler47DLL32' Name='d3dcompiler_47.dll' DiskId='1' Source='dist/Release64/x86/d3dcompiler_47.dll' />
+
+              <RegistryValue Root="HKLM" Id="RDCCLSID32" Action="write"
+                Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}"
+                Value='RenderDoc Thumbnail Handler'
+                Type="expandable" />
+              <RegistryValue Root="HKLM" Id="RDCCLSIDServer32" Action="write"
+                Key="Software\Wow6432Node\Classes\CLSID\{5D6BF029-A6BA-417A-8523-120492B1DCE3}\InprocServer32"
+                Value='[#renderdocX86DLL]'
+                Type="expandable" />
+
+              <RegistryValue Root="HKLM" Id="RDCVulkanImplicitLayer32" Action="write"
+                Key="Software\Wow6432Node\Khronos\Vulkan\ImplicitLayers"
+                Name='[#renderdocX86JSON]'
+                Value='0'
+                Type="integer" />
+
+            </Component>
 
           </Directory>
 
@@ -287,11 +287,11 @@
       </Component>
       <Component Id="ImageThumbnailProvider" Guid="E79B67C0-1128-4471-80C5-6233EF37414C">
         <RegistryValue Root="HKLM" Id="RDCProvider" Action="write" KeyPath='yes'
-          Key="Software\Classes\RenderDoc.RDCCapture.1\ShellEx\{e357fccd-a995-4576-b01f-234630154e96}" 
-          Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}' 
+          Key="Software\Classes\RenderDoc.RDCCapture.1\ShellEx\{e357fccd-a995-4576-b01f-234630154e96}"
+          Value='{5D6BF029-A6BA-417A-8523-120492B1DCE3}'
           Type="expandable" />
       </Component>
-      
+
       <Component Id="FileExtensionRDC" Guid="65374649-9C72-40A1-97EC-F92BAE7C80F4">
         <ProgId Id='RenderDoc.RDCCapture.1' Description='RenderDoc Capture Log (.rdc)'>
           <Extension Id='rdc' />