diff --git a/BUILDING.md b/BUILDING.md
index 4f55e70..103301d 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -3,6 +3,6 @@
 To build this installer yourself you need the following:
 
 - [Visual Studio 2022 Community](https://visualstudio.microsoft.com/vs/)
-- [Heatwave for VS 2022 Extension](https://marketplace.visualstudio.com/items?itemName=FireGiant.FireGiantHeatWaveDev17)
-- [Wix v4.0 and later](https://github.com/wixtoolset/wix/releases)
-- [IsWix v5 and later](https://github.com/iswix-llc/iswix/releases)
\ No newline at end of file
+- [Wix v3.11 and later](https://wixtoolset.org/releases/)
+- [Wix VS 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension)
+- [IsWix v4.15.34.0 and later](https://github.com/iswix-llc/iswix/releases)
\ No newline at end of file
diff --git a/ffmpeg_essentials/FFmpeg Essentials/Code/Features.wxs b/ffmpeg_essentials/FFmpeg Essentials/Code/Features.wxs
index 7a18842..63f53b7 100644
--- a/ffmpeg_essentials/FFmpeg Essentials/Code/Features.wxs	
+++ b/ffmpeg_essentials/FFmpeg Essentials/Code/Features.wxs	
@@ -1,17 +1,20 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment><Feature Id="FFmpeg_Essentials" Title="Core Files (6.0.0)" Description="Installs all the files needed for FFmpeg Essentials. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" AllowAbsent="no">
-      <MergeRef Id="FFmpeg_EssentialsMM" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="INSTALLLOCATION" Name="FFmpeg">
+          <Merge Id="FFmpeg_EssentialsMM" SourceFile="..\FFmpeg EssentialsMM\bin\Release\FFmpeg_EssentialsMM.msm" DiskId="1" Language="1033"/>
+        </Directory>
+      </Directory>
+    </Directory>
+    <Feature Id="FFmpeg_Essentials" Title="Core Files (6.0.0)" Description="Installs all the files needed for FFmpeg Essentials. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" Absent="disallow">
+      <MergeRef Id="FFmpeg_EssentialsMM"/>
     </Feature>
 	  <Feature Id="FFmpeg_path" Title="PATH" Description="Add FFmpeg install location to SYSTEM PATH for easy Terminal use." Level="1" AllowAdvertise="no">
 		  <Component Id="add_to_path" Guid="cda0842e-f774-4aaa-8ab0-7d5147609a15" Directory="TARGETDIR">
 			  <Environment Id="PATH" Name="PATH" Value="[INSTALLLOCATION]bin" Permanent="no" Part="last" Action="set" System="yes" />
 		  </Component>
 	  </Feature>
-  
-      <StandardDirectory Id="ProgramFiles64Folder">
-        <Directory Id="INSTALLLOCATION" Name="FFmpeg">
-          <Merge Id="FFmpeg_EssentialsMM" SourceFile="..\FFmpeg EssentialsMM\bin\Release\FFmpeg_EssentialsMM.msm" DiskId="1" Language="1033" />
-        </Directory>
-      </StandardDirectory>
-    </Fragment>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_essentials/FFmpeg Essentials/Code/IISMeta.wxs b/ffmpeg_essentials/FFmpeg Essentials/Code/IISMeta.wxs
index 37c067b..e87624b 100644
--- a/ffmpeg_essentials/FFmpeg Essentials/Code/IISMeta.wxs	
+++ b/ffmpeg_essentials/FFmpeg Essentials/Code/IISMeta.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
   <Fragment>
     
     <ComponentGroup Id="webSite">
@@ -10,14 +11,14 @@
     <Property Id="ASPNETINSTALLED">
       <RegistrySearch Id="findASPNETINSTALLED" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Type="raw" />
     </Property>
-    <Launch Condition="Installed OR NETFRAMEWORK45" Message="[ProductName] requires Microsoft .NET Framework 4.5." />
-    <Launch Condition="Installed OR IISMAJORVERSION" Message="[ProductName] requires Microsoft IIS" />
-    <Launch Condition="Installed OR ASPNETINSTALLED=&quot;#1&quot;" Message="[ProductName] requires the ASP.NET role service for IIS" />
+    <Condition Message="[ProductName] requires Microsoft .NET Framework 4.5.">Installed OR NETFRAMEWORK45</Condition>
+    <Condition Message="[ProductName] requires Microsoft IIS">Installed OR IISMAJORVERSION</Condition>
+    <Condition Message="[ProductName] requires the ASP.NET role service for IIS">Installed OR ASPNETINSTALLED="#1"</Condition>
     
     <DirectoryRef Id="INSTALLLOCATION">
       <Directory Id="webSite" Name="WebSite">
         <Component Id="webSite" Guid="904eeda9-da9c-49df-9630-ac32998ae79f" KeyPath="yes">
-          <iis:WebAppPool Id="webSite" Name="FFmpeg_Essentials" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated" />
+          <iis:WebAppPool Id="webSite" Name="FFmpeg_Essentials" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated"/>
           <iis:WebSite Id="webSite" SiteId="*" Description="FFmpeg_Essentials Web Site" Directory="webSite" ConfigureIfExists="no">
             <iis:WebAddress Id="webSite" Port="8080" />
             <iis:WebDirProperties Id="webSite" AnonymousAccess="yes" WindowsAuthentication="no" />
diff --git a/ffmpeg_essentials/FFmpeg Essentials/Code/Product.wxs b/ffmpeg_essentials/FFmpeg Essentials/Code/Product.wxs
index 2b1c09e..8a1c25c 100644
--- a/ffmpeg_essentials/FFmpeg Essentials/Code/Product.wxs	
+++ b/ffmpeg_essentials/FFmpeg Essentials/Code/Product.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- 
   MSIProductVersion is defined in FFmpeg_Essentials.wixproj as 0.0.1 for local desktop builds.  
   You should pass in the MSBuild Property 'MSIProductVersion' to override it during an automated build.
@@ -7,15 +8,15 @@
   The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
   is a seamless uninstall/reinstall.
   -->
-  <Package Name="FFmpeg Essentials" Language="1033" Version="6.0.0.20230306" Manufacturer="icedterminal" UpgradeCode="384a74ec-865a-4907-8561-9de765ee6e14" InstallerVersion="301">
-    <SummaryInformation Manufacturer="icedterminal" />
+  <Product Id="*" Name="FFmpeg Essentials" Language="1033" Version="6.1.0.20231219" Manufacturer="icedterminal" UpgradeCode="384a74ec-865a-4907-8561-9de765ee6e14">
+    <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Manufacturer="icedterminal" Platform="x64" InstallPrivileges="elevated" />
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <!-- Major Upgrade Rule to disallow downgrades -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <!--Common Launch Condition-->
     <!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
     <PropertyRef Id="NETFRAMEWORK40FULL" />
-    <Launch Condition="Installed OR NETFRAMEWORK40FULL" Message="[ProductName] requires .NET Framework 4.0." />
+    <Condition Message="[ProductName] requires .NET Framework 4.0.">Installed OR NETFRAMEWORK40FULL</Condition>
     <!-- Include User Interface Experience -->
     <Icon Id="Icon.ico" SourceFile="Resources\Icon.ico" />
     <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
@@ -23,5 +24,5 @@
     <UIRef Id="UI" />
     <!-- Include Features and Directories Fragment -->
     <DirectoryRef Id="INSTALLLOCATION" />
-  </Package>
+  </Product>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_essentials/FFmpeg Essentials/Code/UI-CustomDialog.wxs b/ffmpeg_essentials/FFmpeg Essentials/Code/UI-CustomDialog.wxs
index c8fa978..1a9cfc3 100644
--- a/ffmpeg_essentials/FFmpeg Essentials/Code/UI-CustomDialog.wxs	
+++ b/ffmpeg_essentials/FFmpeg Essentials/Code/UI-CustomDialog.wxs	
@@ -1,41 +1,42 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI Id="CustomDlg">
       <Dialog Id="CustomDlg" Height="270" Width="370" Title="[ProductName] Setup">
         
         <!-- Header -->
-        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes" />
-        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes" />
-        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner"/>
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes"/>
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes"/>
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>
 
         <!-- Body  -->
-        <Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes" />
-        <Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM" />
+        <Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes"/>
+        <Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM"/>
 
         
         <!-- Footer -->
-        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
         <Control Id="Next" Type="PushButton" Text="&amp;Next" TabSkip="no" Default="yes" Height="17" Width="56" X="236" Y="243">
-          <Publish Event="NewDialog" Value="CustomizeDlg" />
+          <Publish Event="NewDialog" Value="CustomizeDlg"/>
         </Control>
-        <Control Id="Cancel" Type="PushButton" Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
-          <Publish Event="SpawnDialog" Value="CancelDlg" />
+        <Control Id="Cancel" Type="PushButton"  Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
+          <Publish Event="SpawnDialog" Value="CancelDlg"/>
         </Control>
-        <Control Id="Back" Type="PushButton" Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
-          <Publish Event="NewDialog" Value="LicenseAgreementDlg" />
+        <Control Id="Back" Type="PushButton"  Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg"/>
         </Control>
         
       </Dialog>
       
       <!-- Insert into dialog sequencing by inserting control events on previous and next dialogs-->
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg" />
-      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3" Condition="NOT Installed" />
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg">1</Publish>
+      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3">NOT Installed</Publish>
 
     </UI>
 
     <!-- Make Property a SecureCustom Property-->
-    <Property Id="CUSTOM" Secure="yes" />
+    <Property Id="CUSTOM" Secure="yes"/>
     
     <!-- Note: You must author a registry component somewhere in your installer to persist the property for later retrieval
     Example:
@@ -47,15 +48,17 @@
     -->
 
     <!-- Attempt to retrieve previously persisted property -->
-    <Property Id="FINDCUSTOM" Secure="yes">
-      <RegistrySearch Id="CustomerNumber" Root="HKLM" Key="SOFTWARE\CompanyName\ProductName" Name="Custom" Type="raw" />
+    <Property Id='FINDCUSTOM' Secure='yes'>
+      <RegistrySearch Id='CustomerNumber' Root='HKLM'
+                   Key='SOFTWARE\CompanyName\ProductName'
+                   Name='Custom' Type='raw' />
     </Property>
 
     <!-- Assign default value if retrieval failed -->
-    <SetProperty Id="FINDCUSTOM" Value="default value" After="AppSearch" Sequence="first" Condition="Not FINDCUSTOM" />
+    <SetProperty Id='FINDCUSTOM' Value='default value' After='AppSearch' Sequence='first'>Not FINDCUSTOM</SetProperty>
 
     <!-- Assign retrieved / defaulted value to actual property if it doesn't already have a value -->
-    <SetProperty Id="CUSTOM" Value="[FINDCUSTOM]" After="SetFINDCUSTOM" Sequence="first" Condition="Not CUSTOM" />
+    <SetProperty Id='CUSTOM' Value='[FINDCUSTOM]' After='SetFINDCUSTOM' Sequence='first'>Not CUSTOM</SetProperty>
 
   </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_essentials/FFmpeg Essentials/Code/UI.wxs b/ffmpeg_essentials/FFmpeg Essentials/Code/UI.wxs
index 372225f..6bafab2 100644
--- a/ffmpeg_essentials/FFmpeg Essentials/Code/UI.wxs	
+++ b/ffmpeg_essentials/FFmpeg Essentials/Code/UI.wxs	
@@ -1,9 +1,10 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI Id="UI">
       
       <!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
-      <ui:WixUI Id="WixUI_FeatureTree" />
+      <UIRef Id="WixUI_FeatureTree"/>
       
       <!--Uncomment to inject a custom dialog into the install wizard loop -->
       <!--<UIRef Id="CustomDlg"/>-->
diff --git a/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMM.wxs b/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMM.wxs
index 83b3f1d..dfd6605 100644
--- a/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMM.wxs	
+++ b/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMM.wxs	
@@ -1,147 +1,149 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define ComponentRules="OneToOne"?>
   <!-- SourceDir instructs IsWiX the location of the directory that contains files for this merge module -->
   <?define SourceDir="..\Deploy"?>
-  <Module Id="FFmpeg_EssentialsMM" Language="1033" Version="1.0.0.0" Guid="8f6f0ff7-7faa-47c0-9689-6ae56f8c9dcd" InstallerVersion="200"><SummaryInformation Manufacturer="FFmpeg_EssentialsMM" />
-    
-    <ComponentGroupRef Id="Custom" />
-  
+  <Module Id="FFmpeg_EssentialsMM" Language="1033" Version="1.0.0.0">
+    <Package Id="8f6f0ff7-7faa-47c0-9689-6ae56f8c9dcd" Manufacturer="FFmpeg_EssentialsMM" InstallerVersion="200" Platform="x64" />
+    <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="MergeRedirectFolder">
-        <Component Id="owc08C959AF4C2883BEBDD9830863C05E9E" Guid="0a3d45eb-02e4-a772-acdb-d6fefb9f9907" Bitness="always64">
+        <Component Id="owc08C959AF4C2883BEBDD9830863C05E9E" Guid="0a3d45eb-02e4-a772-acdb-d6fefb9f9907" Win64="yes">
           <File Id="owf08C959AF4C2883BEBDD9830863C05E9E" Source="$(var.SourceDir)\LICENSE" KeyPath="yes" />
         </Component>
-        <Component Id="owc6ABCE39088313A1F73B10CBF69535177" Guid="10b53fab-9964-4056-aa2d-00d7710b142e" Bitness="always64">
+        <Component Id="owc6ABCE39088313A1F73B10CBF69535177" Guid="10b53fab-9964-4056-aa2d-00d7710b142e" Win64="yes">
           <File Id="owf6ABCE39088313A1F73B10CBF69535177" Source="$(var.SourceDir)\README.txt" KeyPath="yes" />
         </Component>
         <Directory Id="owd00BD073775AEE2E88B74CCEE86DD7715" Name="bin">
-          <Component Id="owc821B5ECB16D00ECC4229120AAAFC34B2" Guid="b7555294-4d12-0c2b-f808-bde3580b3c4e" Bitness="always64">
+          <Component Id="owc821B5ECB16D00ECC4229120AAAFC34B2" Guid="b7555294-4d12-0c2b-f808-bde3580b3c4e" Win64="yes">
             <File Id="owf821B5ECB16D00ECC4229120AAAFC34B2" Source="$(var.SourceDir)\bin\ffmpeg.exe" KeyPath="yes" />
           </Component>
-          <Component Id="owcD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Guid="6c61e16f-c04f-2d1d-6658-ad22d8e7709f" Bitness="always64">
+          <Component Id="owcD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Guid="6c61e16f-c04f-2d1d-6658-ad22d8e7709f" Win64="yes">
             <File Id="owfD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Source="$(var.SourceDir)\bin\ffplay.exe" KeyPath="yes" />
           </Component>
-          <Component Id="owcA21AE33C17F53B247A615911CB552BDF" Guid="0a2b6d0a-dd43-4159-59e8-f412a7b00b90" Bitness="always64">
+          <Component Id="owcA21AE33C17F53B247A615911CB552BDF" Guid="0a2b6d0a-dd43-4159-59e8-f412a7b00b90" Win64="yes">
             <File Id="owfA21AE33C17F53B247A615911CB552BDF" Source="$(var.SourceDir)\bin\ffprobe.exe" KeyPath="yes" />
           </Component>
         </Directory>
         <Directory Id="owd0DF125009D34AC89D0543485919A4284" Name="doc">
-          <Component Id="owc56AD4C391B187FB1FCE1B136F1620AAE" Guid="60f47ea1-9977-8a15-b09d-244255aeba06" Bitness="always64">
+          <Component Id="owc56AD4C391B187FB1FCE1B136F1620AAE" Guid="60f47ea1-9977-8a15-b09d-244255aeba06" Win64="yes">
             <File Id="owf56AD4C391B187FB1FCE1B136F1620AAE" Source="$(var.SourceDir)\doc\bootstrap.min.css" KeyPath="yes" />
           </Component>
-          <Component Id="owc86DEA0BC3D7BB685247BA51753991968" Guid="fdc2e7b7-724d-1c23-23c8-4367b40b04b8" Bitness="always64">
+          <Component Id="owc86DEA0BC3D7BB685247BA51753991968" Guid="fdc2e7b7-724d-1c23-23c8-4367b40b04b8" Win64="yes">
             <File Id="owf86DEA0BC3D7BB685247BA51753991968" Source="$(var.SourceDir)\doc\default.css" KeyPath="yes" />
           </Component>
-          <Component Id="owcE8E370914445B946988D91DEE0846C04" Guid="ed2637dd-0b41-a35c-a34e-a53f8ac81a66" Bitness="always64">
+          <Component Id="owcE8E370914445B946988D91DEE0846C04" Guid="ed2637dd-0b41-a35c-a34e-a53f8ac81a66" Win64="yes">
             <File Id="owfE8E370914445B946988D91DEE0846C04" Source="$(var.SourceDir)\doc\developer.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCAF9A11C0193B6B7E3CB16545BF39B5F" Guid="a1b223cd-b752-81d3-34e5-dcddae590d1a" Bitness="always64">
+          <Component Id="owcCAF9A11C0193B6B7E3CB16545BF39B5F" Guid="a1b223cd-b752-81d3-34e5-dcddae590d1a" Win64="yes">
             <File Id="owfCAF9A11C0193B6B7E3CB16545BF39B5F" Source="$(var.SourceDir)\doc\faq.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc29BB3ED031CBB3840224FFF7B8BEACEA" Guid="04fc5c84-bfd6-7f52-e866-47e2035ea4e2" Bitness="always64">
+          <Component Id="owc29BB3ED031CBB3840224FFF7B8BEACEA" Guid="04fc5c84-bfd6-7f52-e866-47e2035ea4e2" Win64="yes">
             <File Id="owf29BB3ED031CBB3840224FFF7B8BEACEA" Source="$(var.SourceDir)\doc\fate.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcDDA10CB1D2BEA2170F6E1AD6E92C4334" Guid="9bdf64e4-37df-38b0-826d-15fa2d394a45" Bitness="always64">
+          <Component Id="owcDDA10CB1D2BEA2170F6E1AD6E92C4334" Guid="9bdf64e4-37df-38b0-826d-15fa2d394a45" Win64="yes">
             <File Id="owfDDA10CB1D2BEA2170F6E1AD6E92C4334" Source="$(var.SourceDir)\doc\ffmpeg.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc2AE255B6235BDD852C45D309B4C631DC" Guid="85237364-bd71-87e2-409f-7f838a45bca1" Bitness="always64">
+          <Component Id="owc2AE255B6235BDD852C45D309B4C631DC" Guid="85237364-bd71-87e2-409f-7f838a45bca1" Win64="yes">
             <File Id="owf2AE255B6235BDD852C45D309B4C631DC" Source="$(var.SourceDir)\doc\ffmpeg-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcE2E0860EA651363F1D05A6CDA657CE69" Guid="5533fd38-a405-810a-f7c2-95007b530fbf" Bitness="always64">
+          <Component Id="owcE2E0860EA651363F1D05A6CDA657CE69" Guid="5533fd38-a405-810a-f7c2-95007b530fbf" Win64="yes">
             <File Id="owfE2E0860EA651363F1D05A6CDA657CE69" Source="$(var.SourceDir)\doc\ffmpeg-bitstream-filters.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcB198E9B8BD3288F87266080BD37F897F" Guid="14cc724c-46dd-6c02-8d7d-480793b737e9" Bitness="always64">
+          <Component Id="owcB198E9B8BD3288F87266080BD37F897F" Guid="14cc724c-46dd-6c02-8d7d-480793b737e9" Win64="yes">
             <File Id="owfB198E9B8BD3288F87266080BD37F897F" Source="$(var.SourceDir)\doc\ffmpeg-codecs.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc4EE38F90B0E2637266AA7CA3D409A163" Guid="546d7e9d-07b3-24bd-d52c-9fc2866d92a2" Bitness="always64">
+          <Component Id="owc4EE38F90B0E2637266AA7CA3D409A163" Guid="546d7e9d-07b3-24bd-d52c-9fc2866d92a2" Win64="yes">
             <File Id="owf4EE38F90B0E2637266AA7CA3D409A163" Source="$(var.SourceDir)\doc\ffmpeg-devices.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc47CF4AE5DF1FC7044F630C27F75F824B" Guid="8b9836ac-c87a-36b6-97e0-2320e9286676" Bitness="always64">
+          <Component Id="owc47CF4AE5DF1FC7044F630C27F75F824B" Guid="8b9836ac-c87a-36b6-97e0-2320e9286676" Win64="yes">
             <File Id="owf47CF4AE5DF1FC7044F630C27F75F824B" Source="$(var.SourceDir)\doc\ffmpeg-filters.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc55607D41CF0B17A2C3751B8C5A1489D7" Guid="879322c5-72ba-3b5b-0044-2562475d77fa" Bitness="always64">
+          <Component Id="owc55607D41CF0B17A2C3751B8C5A1489D7" Guid="879322c5-72ba-3b5b-0044-2562475d77fa" Win64="yes">
             <File Id="owf55607D41CF0B17A2C3751B8C5A1489D7" Source="$(var.SourceDir)\doc\ffmpeg-formats.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcEED967D62EE2144510B785B5A6E04C6C" Guid="b4b1b748-d427-10ad-a04e-e4a6aa3eb064" Bitness="always64">
+          <Component Id="owcEED967D62EE2144510B785B5A6E04C6C" Guid="b4b1b748-d427-10ad-a04e-e4a6aa3eb064" Win64="yes">
             <File Id="owfEED967D62EE2144510B785B5A6E04C6C" Source="$(var.SourceDir)\doc\ffmpeg-protocols.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBDEFEEC7E5C0AF8CF080172496ED869B" Guid="866a3bae-e762-629a-9268-81378be0c9d8" Bitness="always64">
+          <Component Id="owcBDEFEEC7E5C0AF8CF080172496ED869B" Guid="866a3bae-e762-629a-9268-81378be0c9d8" Win64="yes">
             <File Id="owfBDEFEEC7E5C0AF8CF080172496ED869B" Source="$(var.SourceDir)\doc\ffmpeg-resampler.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCB0BA93E45A6C661FE47D4AF1A596904" Guid="a7c6bc9e-25ba-be98-1bf7-961ce6ed1a16" Bitness="always64">
+          <Component Id="owcCB0BA93E45A6C661FE47D4AF1A596904" Guid="a7c6bc9e-25ba-be98-1bf7-961ce6ed1a16" Win64="yes">
             <File Id="owfCB0BA93E45A6C661FE47D4AF1A596904" Source="$(var.SourceDir)\doc\ffmpeg-scaler.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcF34E583856AE21807F784561D7403CAF" Guid="945dc7c6-627f-393a-ed13-6a59a490dce3" Bitness="always64">
+          <Component Id="owcF34E583856AE21807F784561D7403CAF" Guid="945dc7c6-627f-393a-ed13-6a59a490dce3" Win64="yes">
             <File Id="owfF34E583856AE21807F784561D7403CAF" Source="$(var.SourceDir)\doc\ffmpeg-utils.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc3A28894551B07B451C7431B6D6FA9E88" Guid="9121ea1d-de27-f617-499c-bfc91ce1d23e" Bitness="always64">
+          <Component Id="owc3A28894551B07B451C7431B6D6FA9E88" Guid="9121ea1d-de27-f617-499c-bfc91ce1d23e" Win64="yes">
             <File Id="owf3A28894551B07B451C7431B6D6FA9E88" Source="$(var.SourceDir)\doc\ffplay.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBDC7DC34D48B70AABCDAE2D9B7C751DC" Guid="8226f13e-15ac-a9e5-6c1d-c692ff1d6273" Bitness="always64">
+          <Component Id="owcBDC7DC34D48B70AABCDAE2D9B7C751DC" Guid="8226f13e-15ac-a9e5-6c1d-c692ff1d6273" Win64="yes">
             <File Id="owfBDC7DC34D48B70AABCDAE2D9B7C751DC" Source="$(var.SourceDir)\doc\ffplay-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcB9872B1281CFBA154A755EFF21B11BAF" Guid="ac853aa2-4b46-303e-7d8d-bc850a9d1dfe" Bitness="always64">
+          <Component Id="owcB9872B1281CFBA154A755EFF21B11BAF" Guid="ac853aa2-4b46-303e-7d8d-bc850a9d1dfe" Win64="yes">
             <File Id="owfB9872B1281CFBA154A755EFF21B11BAF" Source="$(var.SourceDir)\doc\ffprobe.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc4D7B2302CCE54DCBD64C789959E2552C" Guid="0762b84a-285c-6346-0bd0-45765fb8468e" Bitness="always64">
+          <Component Id="owc4D7B2302CCE54DCBD64C789959E2552C" Guid="0762b84a-285c-6346-0bd0-45765fb8468e" Win64="yes">
             <File Id="owf4D7B2302CCE54DCBD64C789959E2552C" Source="$(var.SourceDir)\doc\ffprobe-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc593E7C81CBFDC92FDD7B6BC023566582" Guid="61a436d3-77b0-5a30-cc1e-d0541afc04aa" Bitness="always64">
+          <Component Id="owc593E7C81CBFDC92FDD7B6BC023566582" Guid="61a436d3-77b0-5a30-cc1e-d0541afc04aa" Win64="yes">
             <File Id="owf593E7C81CBFDC92FDD7B6BC023566582" Source="$(var.SourceDir)\doc\general.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc44381380E25DA23DB4197D6A5EEAF025" Guid="fa6c36e9-1ece-1f81-2d8d-c0e64a5a12d8" Bitness="always64">
+          <Component Id="owc44381380E25DA23DB4197D6A5EEAF025" Guid="fa6c36e9-1ece-1f81-2d8d-c0e64a5a12d8" Win64="yes">
             <File Id="owf44381380E25DA23DB4197D6A5EEAF025" Source="$(var.SourceDir)\doc\git-howto.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc47CFB032CC4BF3059DF30EEDDCB7EBB1" Guid="4cd8dea9-422b-ece2-3ed7-025706654412" Bitness="always64">
+          <Component Id="owc47CFB032CC4BF3059DF30EEDDCB7EBB1" Guid="4cd8dea9-422b-ece2-3ed7-025706654412" Win64="yes">
             <File Id="owf47CFB032CC4BF3059DF30EEDDCB7EBB1" Source="$(var.SourceDir)\doc\libavcodec.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc19DB140AB621C913D4D895F9709C1B98" Guid="ec660f5f-2ae1-427f-6d63-68e10ba1f82a" Bitness="always64">
+          <Component Id="owc19DB140AB621C913D4D895F9709C1B98" Guid="ec660f5f-2ae1-427f-6d63-68e10ba1f82a" Win64="yes">
             <File Id="owf19DB140AB621C913D4D895F9709C1B98" Source="$(var.SourceDir)\doc\libavdevice.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCA505CC3396F6ECC5600A9363E18E872" Guid="4ef3c565-e2e1-3852-d728-d80b96142b66" Bitness="always64">
+          <Component Id="owcCA505CC3396F6ECC5600A9363E18E872" Guid="4ef3c565-e2e1-3852-d728-d80b96142b66" Win64="yes">
             <File Id="owfCA505CC3396F6ECC5600A9363E18E872" Source="$(var.SourceDir)\doc\libavfilter.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc2A1330243A6755CC983129714679E18D" Guid="45884a28-48e2-58f8-4537-a3f4825ca3b0" Bitness="always64">
+          <Component Id="owc2A1330243A6755CC983129714679E18D" Guid="45884a28-48e2-58f8-4537-a3f4825ca3b0" Win64="yes">
             <File Id="owf2A1330243A6755CC983129714679E18D" Source="$(var.SourceDir)\doc\libavformat.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc5ED2AFA60254ECFDF980321DCBDE602B" Guid="166474bd-e8ee-be30-7105-f4efb5f6da9b" Bitness="always64">
+          <Component Id="owc5ED2AFA60254ECFDF980321DCBDE602B" Guid="166474bd-e8ee-be30-7105-f4efb5f6da9b" Win64="yes">
             <File Id="owf5ED2AFA60254ECFDF980321DCBDE602B" Source="$(var.SourceDir)\doc\libavutil.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcFDA14257B94FC4D94560641AEFC9DFF5" Guid="85367f8b-6882-80c3-3833-bb8bb756b736" Bitness="always64">
+          <Component Id="owcFDA14257B94FC4D94560641AEFC9DFF5" Guid="85367f8b-6882-80c3-3833-bb8bb756b736" Win64="yes">
             <File Id="owfFDA14257B94FC4D94560641AEFC9DFF5" Source="$(var.SourceDir)\doc\libswresample.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc5FA4CAC49D525BA0950C2C7547F98AE1" Guid="6c1e8283-98df-08c0-1ef1-64eb8a77145b" Bitness="always64">
+          <Component Id="owc5FA4CAC49D525BA0950C2C7547F98AE1" Guid="6c1e8283-98df-08c0-1ef1-64eb8a77145b" Win64="yes">
             <File Id="owf5FA4CAC49D525BA0950C2C7547F98AE1" Source="$(var.SourceDir)\doc\libswscale.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc0FE58754EA93D8FEF7AD398DD6534E58" Guid="0bb87367-2ff8-abaf-e88a-011e1a9bd102" Bitness="always64">
+          <Component Id="owc0FE58754EA93D8FEF7AD398DD6534E58" Guid="0bb87367-2ff8-abaf-e88a-011e1a9bd102" Win64="yes">
             <File Id="owf0FE58754EA93D8FEF7AD398DD6534E58" Source="$(var.SourceDir)\doc\mailing-list-faq.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc9EC2C5244EA54F539E08929A9FFE411B" Guid="3d79b9b0-6903-22ce-72c4-3e41b3bcb055" Bitness="always64">
+          <Component Id="owc9EC2C5244EA54F539E08929A9FFE411B" Guid="3d79b9b0-6903-22ce-72c4-3e41b3bcb055" Win64="yes">
             <File Id="owf9EC2C5244EA54F539E08929A9FFE411B" Source="$(var.SourceDir)\doc\nut.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBE9464447F1B856BAAF92001FD8CAE38" Guid="2f3ad145-e159-5f2e-22f6-2bc67dec17af" Bitness="always64">
+          <Component Id="owcBE9464447F1B856BAAF92001FD8CAE38" Guid="2f3ad145-e159-5f2e-22f6-2bc67dec17af" Win64="yes">
             <File Id="owfBE9464447F1B856BAAF92001FD8CAE38" Source="$(var.SourceDir)\doc\platform.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCA47BF12B1F7F02566A31CAC268B1352" Guid="1bee2353-9065-5c7f-800a-8d10745ec8c0" Bitness="always64">
+          <Component Id="owcCA47BF12B1F7F02566A31CAC268B1352" Guid="1bee2353-9065-5c7f-800a-8d10745ec8c0" Win64="yes">
             <File Id="owfCA47BF12B1F7F02566A31CAC268B1352" Source="$(var.SourceDir)\doc\style.min.css" KeyPath="yes" />
           </Component>
         </Directory>
         <Directory Id="owd086C316AD54353041089371B95CFC3D9" Name="presets">
-          <Component Id="owc707AFEE8A6F7F93F6B3766886E242D89" Guid="d77eb2c5-aa45-8d10-3e0f-bfd1c36c6ab3" Bitness="always64">
+          <Component Id="owc707AFEE8A6F7F93F6B3766886E242D89" Guid="d77eb2c5-aa45-8d10-3e0f-bfd1c36c6ab3" Win64="yes">
             <File Id="owf707AFEE8A6F7F93F6B3766886E242D89" Source="$(var.SourceDir)\presets\libvpx-1080p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owc103CC1CAD3C414C41D30E6353BCF695F" Guid="59038795-d036-df89-d0bd-4b5412ce0f74" Bitness="always64">
+          <Component Id="owc103CC1CAD3C414C41D30E6353BCF695F" Guid="59038795-d036-df89-d0bd-4b5412ce0f74" Win64="yes">
             <File Id="owf103CC1CAD3C414C41D30E6353BCF695F" Source="$(var.SourceDir)\presets\libvpx-1080p50_60.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcEB9AE661F14D81A8EC6D16C18152D407" Guid="2b662c5e-4a45-6957-b4c0-659853f9c15c" Bitness="always64">
+          <Component Id="owcEB9AE661F14D81A8EC6D16C18152D407" Guid="2b662c5e-4a45-6957-b4c0-659853f9c15c" Win64="yes">
             <File Id="owfEB9AE661F14D81A8EC6D16C18152D407" Source="$(var.SourceDir)\presets\libvpx-360p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcA8A4E2218D300550C5F7F14FE06B6985" Guid="614eb248-6358-ee78-6e1c-65b0da75c7ec" Bitness="always64">
+          <Component Id="owcA8A4E2218D300550C5F7F14FE06B6985" Guid="614eb248-6358-ee78-6e1c-65b0da75c7ec" Win64="yes">
             <File Id="owfA8A4E2218D300550C5F7F14FE06B6985" Source="$(var.SourceDir)\presets\libvpx-720p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcCCB3245511379F8702D8239352DBE80A" Guid="ffee9383-2d76-2d69-79ea-62dcc0a408b0" Bitness="always64">
+          <Component Id="owcCCB3245511379F8702D8239352DBE80A" Guid="ffee9383-2d76-2d69-79ea-62dcc0a408b0" Win64="yes">
             <File Id="owfCCB3245511379F8702D8239352DBE80A" Source="$(var.SourceDir)\presets\libvpx-720p50_60.ffpreset" KeyPath="yes" />
           </Component>
         </Directory>
       </Directory>
-    </Module>
+    </Directory>
+    <ComponentGroupRef Id="Custom" />
+  </Module>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMMcustom.wxs b/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMMcustom.wxs
index 65be790..90dcac4 100644
--- a/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMMcustom.wxs	
+++ b/ffmpeg_essentials/FFmpeg EssentialsMM/FFmpeg_EssentialsMMcustom.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     
     <!-- Reference Custom Components Below -->
diff --git a/ffmpeg_full/FFmpeg Full/Code/Features.wxs b/ffmpeg_full/FFmpeg Full/Code/Features.wxs
index dd61fc4..b8d1e48 100644
--- a/ffmpeg_full/FFmpeg Full/Code/Features.wxs	
+++ b/ffmpeg_full/FFmpeg Full/Code/Features.wxs	
@@ -1,17 +1,20 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment><Feature Id="FFmpeg_Full" Title="Core files (6.0.0)" Description="Installs all the files needed for FFmpeg Full. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" AllowAbsent="no">
-      <MergeRef Id="FFmpeg_FullMM" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFiles64Folder">
+        <Directory Id="INSTALLLOCATION" Name="FFmpeg">
+          <Merge Id="FFmpeg_FullMM" SourceFile="..\FFmpeg FullMM\bin\x64\Release\FFmpeg_FullMM.msm" DiskId="1" Language="1033"/>
+        </Directory>
+      </Directory>
+    </Directory>
+    <Feature Id="FFmpeg_Full" Title="Core files (6.0.0)" Description="Installs all the files needed for FFmpeg Full. This is required." Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION" Absent="disallow">
+      <MergeRef Id="FFmpeg_FullMM"/>
     </Feature>
 	<Feature Id="FFmpeg_path" Title="PATH" Description="Add FFmpeg install location to SYSTEM PATH for easy Terminal use." Level="1" AllowAdvertise="no">
       <Component Id="add_to_path" Guid="cda0842e-f774-4aaa-8ab0-7d5147609a15" Directory="TARGETDIR">
 		<Environment Id="PATH" Name="PATH" Value="[INSTALLLOCATION]bin" Permanent="no" Part="last" Action="set" System="yes" />
       </Component>
 	</Feature>
-  
-      <StandardDirectory Id="ProgramFiles64Folder">
-        <Directory Id="INSTALLLOCATION" Name="FFmpeg">
-          <Merge Id="FFmpeg_FullMM" SourceFile="..\FFmpeg FullMM\bin\x64\Release\FFmpeg_FullMM.msm" DiskId="1" Language="1033" />
-        </Directory>
-      </StandardDirectory>
-    </Fragment>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_full/FFmpeg Full/Code/IISMeta.wxs b/ffmpeg_full/FFmpeg Full/Code/IISMeta.wxs
index 5a013e4..3025a1d 100644
--- a/ffmpeg_full/FFmpeg Full/Code/IISMeta.wxs	
+++ b/ffmpeg_full/FFmpeg Full/Code/IISMeta.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
   <Fragment>
     
     <ComponentGroup Id="webSite">
@@ -10,14 +11,14 @@
     <Property Id="ASPNETINSTALLED">
       <RegistrySearch Id="findASPNETINSTALLED" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Type="raw" />
     </Property>
-    <Launch Condition="Installed OR NETFRAMEWORK45" Message="[ProductName] requires Microsoft .NET Framework 4.5." />
-    <Launch Condition="Installed OR IISMAJORVERSION" Message="[ProductName] requires Microsoft IIS" />
-    <Launch Condition="Installed OR ASPNETINSTALLED=&quot;#1&quot;" Message="[ProductName] requires the ASP.NET role service for IIS" />
+    <Condition Message="[ProductName] requires Microsoft .NET Framework 4.5.">Installed OR NETFRAMEWORK45</Condition>
+    <Condition Message="[ProductName] requires Microsoft IIS">Installed OR IISMAJORVERSION</Condition>
+    <Condition Message="[ProductName] requires the ASP.NET role service for IIS">Installed OR ASPNETINSTALLED="#1"</Condition>
     
     <DirectoryRef Id="INSTALLLOCATION">
       <Directory Id="webSite" Name="WebSite">
         <Component Id="webSite" Guid="a701b83a-bad9-4d56-b9da-7abe31eba09a" KeyPath="yes">
-          <iis:WebAppPool Id="webSite" Name="FFmpeg_Full" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated" />
+          <iis:WebAppPool Id="webSite" Name="FFmpeg_Full" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated"/>
           <iis:WebSite Id="webSite" SiteId="*" Description="FFmpeg_Full Web Site" Directory="webSite" ConfigureIfExists="no">
             <iis:WebAddress Id="webSite" Port="8080" />
             <iis:WebDirProperties Id="webSite" AnonymousAccess="yes" WindowsAuthentication="no" />
diff --git a/ffmpeg_full/FFmpeg Full/Code/Product.wxs b/ffmpeg_full/FFmpeg Full/Code/Product.wxs
index 18bcf61..4eb21e0 100644
--- a/ffmpeg_full/FFmpeg Full/Code/Product.wxs	
+++ b/ffmpeg_full/FFmpeg Full/Code/Product.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!-- 
   MSIProductVersion is defined in FFmpeg_Full.wixproj as 0.0.1 for local desktop builds.  
   You should pass in the MSBuild Property 'MSIProductVersion' to override it during an automated build.
@@ -7,15 +8,15 @@
   The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
   is a seamless uninstall/reinstall.
   -->
-  <Package Name="FFmpeg Full" Language="1033" Version="6.0.0.20230306" Manufacturer="icedterminal" UpgradeCode="a9012d89-3ecb-41bb-ab5d-f6caf69ea491" InstallerVersion="301">
-    <SummaryInformation Manufacturer="icedterminal" />
+  <Product Id="*" Name="FFmpeg Full" Language="1033" Version="6.1.0.20231219" Manufacturer="icedterminal" UpgradeCode="a9012d89-3ecb-41bb-ab5d-f6caf69ea491">
+    <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform="x64" Manufacturer="icedterminal" InstallPrivileges="elevated" />
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <!-- Major Upgrade Rule to disallow downgrades -->
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <!--Common Launch Condition-->
     <!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
     <PropertyRef Id="NETFRAMEWORK40FULL" />
-    <Launch Condition="Installed OR NETFRAMEWORK40FULL" Message="[ProductName] requires .NET Framework 4.0." />
+    <Condition Message="[ProductName] requires .NET Framework 4.0.">Installed OR NETFRAMEWORK40FULL</Condition>
     <!-- Include User Interface Experience -->
     <Icon Id="Icon.ico" SourceFile="Resources\Icon.ico" />
     <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
@@ -23,5 +24,5 @@
     <UIRef Id="UI" />
     <!-- Include Features and Directories Fragment -->
     <DirectoryRef Id="INSTALLLOCATION" />
-  </Package>
+  </Product>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_full/FFmpeg Full/Code/UI-CustomDialog.wxs b/ffmpeg_full/FFmpeg Full/Code/UI-CustomDialog.wxs
index c8fa978..1a9cfc3 100644
--- a/ffmpeg_full/FFmpeg Full/Code/UI-CustomDialog.wxs	
+++ b/ffmpeg_full/FFmpeg Full/Code/UI-CustomDialog.wxs	
@@ -1,41 +1,42 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI Id="CustomDlg">
       <Dialog Id="CustomDlg" Height="270" Width="370" Title="[ProductName] Setup">
         
         <!-- Header -->
-        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes" />
-        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes" />
-        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner"/>
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes"/>
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes"/>
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>
 
         <!-- Body  -->
-        <Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes" />
-        <Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM" />
+        <Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes"/>
+        <Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM"/>
 
         
         <!-- Footer -->
-        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
         <Control Id="Next" Type="PushButton" Text="&amp;Next" TabSkip="no" Default="yes" Height="17" Width="56" X="236" Y="243">
-          <Publish Event="NewDialog" Value="CustomizeDlg" />
+          <Publish Event="NewDialog" Value="CustomizeDlg"/>
         </Control>
-        <Control Id="Cancel" Type="PushButton" Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
-          <Publish Event="SpawnDialog" Value="CancelDlg" />
+        <Control Id="Cancel" Type="PushButton"  Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
+          <Publish Event="SpawnDialog" Value="CancelDlg"/>
         </Control>
-        <Control Id="Back" Type="PushButton" Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
-          <Publish Event="NewDialog" Value="LicenseAgreementDlg" />
+        <Control Id="Back" Type="PushButton"  Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg"/>
         </Control>
         
       </Dialog>
       
       <!-- Insert into dialog sequencing by inserting control events on previous and next dialogs-->
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg" />
-      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3" Condition="NOT Installed" />
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg">1</Publish>
+      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3">NOT Installed</Publish>
 
     </UI>
 
     <!-- Make Property a SecureCustom Property-->
-    <Property Id="CUSTOM" Secure="yes" />
+    <Property Id="CUSTOM" Secure="yes"/>
     
     <!-- Note: You must author a registry component somewhere in your installer to persist the property for later retrieval
     Example:
@@ -47,15 +48,17 @@
     -->
 
     <!-- Attempt to retrieve previously persisted property -->
-    <Property Id="FINDCUSTOM" Secure="yes">
-      <RegistrySearch Id="CustomerNumber" Root="HKLM" Key="SOFTWARE\CompanyName\ProductName" Name="Custom" Type="raw" />
+    <Property Id='FINDCUSTOM' Secure='yes'>
+      <RegistrySearch Id='CustomerNumber' Root='HKLM'
+                   Key='SOFTWARE\CompanyName\ProductName'
+                   Name='Custom' Type='raw' />
     </Property>
 
     <!-- Assign default value if retrieval failed -->
-    <SetProperty Id="FINDCUSTOM" Value="default value" After="AppSearch" Sequence="first" Condition="Not FINDCUSTOM" />
+    <SetProperty Id='FINDCUSTOM' Value='default value' After='AppSearch' Sequence='first'>Not FINDCUSTOM</SetProperty>
 
     <!-- Assign retrieved / defaulted value to actual property if it doesn't already have a value -->
-    <SetProperty Id="CUSTOM" Value="[FINDCUSTOM]" After="SetFINDCUSTOM" Sequence="first" Condition="Not CUSTOM" />
+    <SetProperty Id='CUSTOM' Value='[FINDCUSTOM]' After='SetFINDCUSTOM' Sequence='first'>Not CUSTOM</SetProperty>
 
   </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_full/FFmpeg Full/Code/UI.wxs b/ffmpeg_full/FFmpeg Full/Code/UI.wxs
index 372225f..6bafab2 100644
--- a/ffmpeg_full/FFmpeg Full/Code/UI.wxs	
+++ b/ffmpeg_full/FFmpeg Full/Code/UI.wxs	
@@ -1,9 +1,10 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <UI Id="UI">
       
       <!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
-      <ui:WixUI Id="WixUI_FeatureTree" />
+      <UIRef Id="WixUI_FeatureTree"/>
       
       <!--Uncomment to inject a custom dialog into the install wizard loop -->
       <!--<UIRef Id="CustomDlg"/>-->
diff --git a/ffmpeg_full/FFmpeg Full/obj/x64/Release/FFmpeg Full.wixproj.FileList.txt b/ffmpeg_full/FFmpeg Full/obj/x64/Release/FFmpeg Full.wixproj.FileList.txt
index ed7639f..8cc22f0 100644
--- a/ffmpeg_full/FFmpeg Full/obj/x64/Release/FFmpeg Full.wixproj.FileList.txt	
+++ b/ffmpeg_full/FFmpeg Full/obj/x64/Release/FFmpeg Full.wixproj.FileList.txt	
@@ -1,10 +1,2 @@
 C:\Users\icedterminal\GitHub\ffmpeg-installer\ffmpeg_full\FFmpeg Full\bin\x64\Release\FFmpeg_Full.msi
 C:\Users\icedterminal\GitHub\ffmpeg-installer\ffmpeg_full\FFmpeg Full\bin\x64\Release\FFmpeg_Full.wixpdb
-obj\x64\Release\pth6045926D87D23FDAB11C395029C0FFE9\Product.wixobj
-obj\x64\Release\pth6045926D87D23FDAB11C395029C0FFE9\Features.wixobj
-obj\x64\Release\pth6045926D87D23FDAB11C395029C0FFE9\IISMeta.wixobj
-obj\x64\Release\pth6045926D87D23FDAB11C395029C0FFE9\UI.wixobj
-obj\x64\Release\pth6045926D87D23FDAB11C395029C0FFE9\UI-CustomDialog.wixobj
-obj\x64\Release\FFmpeg Full.wixproj.BindContentsFileListnull.txt
-obj\x64\Release\FFmpeg Full.wixproj.BindOutputsFileListnull.txt
-obj\x64\Release\FFmpeg Full.wixproj.BindBuiltOutputsFileListnull.txt
diff --git a/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMM.wxs b/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMM.wxs
index add7aec..88a67ca 100644
--- a/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMM.wxs	
+++ b/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMM.wxs	
@@ -1,147 +1,149 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define ComponentRules="OneToOne"?>
   <!-- SourceDir instructs IsWiX the location of the directory that contains files for this merge module -->
   <?define SourceDir="..\Deploy"?>
-  <Module Id="FFmpeg_FullMM" Language="1033" Version="1.0.0.0" Guid="1c9e90d2-3e29-4398-92a8-dd78da739375" InstallerVersion="200"><SummaryInformation Manufacturer="FFmpeg_FullMM" />
-    
-    <ComponentGroupRef Id="Custom" />
-  
+  <Module Id="FFmpeg_FullMM" Language="1033" Version="1.0.0.0">
+    <Package Id="1c9e90d2-3e29-4398-92a8-dd78da739375" Manufacturer="FFmpeg_FullMM" InstallerVersion="200" Platform="x64" />
+    <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="MergeRedirectFolder">
-        <Component Id="owc08C959AF4C2883BEBDD9830863C05E9E" Guid="0a3d45eb-02e4-a772-acdb-d6fefb9f9907" Bitness="always64">
+        <Component Id="owc08C959AF4C2883BEBDD9830863C05E9E" Guid="0a3d45eb-02e4-a772-acdb-d6fefb9f9907" Win64="yes">
           <File Id="owf08C959AF4C2883BEBDD9830863C05E9E" Source="$(var.SourceDir)\LICENSE" KeyPath="yes" />
         </Component>
-        <Component Id="owc6ABCE39088313A1F73B10CBF69535177" Guid="10b53fab-9964-4056-aa2d-00d7710b142e" Bitness="always64">
+        <Component Id="owc6ABCE39088313A1F73B10CBF69535177" Guid="10b53fab-9964-4056-aa2d-00d7710b142e" Win64="yes">
           <File Id="owf6ABCE39088313A1F73B10CBF69535177" Source="$(var.SourceDir)\README.txt" KeyPath="yes" />
         </Component>
         <Directory Id="owd00BD073775AEE2E88B74CCEE86DD7715" Name="bin">
-          <Component Id="owc821B5ECB16D00ECC4229120AAAFC34B2" Guid="b7555294-4d12-0c2b-f808-bde3580b3c4e" Bitness="always64">
+          <Component Id="owc821B5ECB16D00ECC4229120AAAFC34B2" Guid="b7555294-4d12-0c2b-f808-bde3580b3c4e" Win64="yes">
             <File Id="owf821B5ECB16D00ECC4229120AAAFC34B2" Source="$(var.SourceDir)\bin\ffmpeg.exe" KeyPath="yes" />
           </Component>
-          <Component Id="owcD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Guid="6c61e16f-c04f-2d1d-6658-ad22d8e7709f" Bitness="always64">
+          <Component Id="owcD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Guid="6c61e16f-c04f-2d1d-6658-ad22d8e7709f" Win64="yes">
             <File Id="owfD7B68A8B6AB0EB7C54CB0C9068E1CE2C" Source="$(var.SourceDir)\bin\ffplay.exe" KeyPath="yes" />
           </Component>
-          <Component Id="owcA21AE33C17F53B247A615911CB552BDF" Guid="0a2b6d0a-dd43-4159-59e8-f412a7b00b90" Bitness="always64">
+          <Component Id="owcA21AE33C17F53B247A615911CB552BDF" Guid="0a2b6d0a-dd43-4159-59e8-f412a7b00b90" Win64="yes">
             <File Id="owfA21AE33C17F53B247A615911CB552BDF" Source="$(var.SourceDir)\bin\ffprobe.exe" KeyPath="yes" />
           </Component>
         </Directory>
         <Directory Id="owd0DF125009D34AC89D0543485919A4284" Name="doc">
-          <Component Id="owc56AD4C391B187FB1FCE1B136F1620AAE" Guid="60f47ea1-9977-8a15-b09d-244255aeba06" Bitness="always64">
+          <Component Id="owc56AD4C391B187FB1FCE1B136F1620AAE" Guid="60f47ea1-9977-8a15-b09d-244255aeba06" Win64="yes">
             <File Id="owf56AD4C391B187FB1FCE1B136F1620AAE" Source="$(var.SourceDir)\doc\bootstrap.min.css" KeyPath="yes" />
           </Component>
-          <Component Id="owc86DEA0BC3D7BB685247BA51753991968" Guid="fdc2e7b7-724d-1c23-23c8-4367b40b04b8" Bitness="always64">
+          <Component Id="owc86DEA0BC3D7BB685247BA51753991968" Guid="fdc2e7b7-724d-1c23-23c8-4367b40b04b8" Win64="yes">
             <File Id="owf86DEA0BC3D7BB685247BA51753991968" Source="$(var.SourceDir)\doc\default.css" KeyPath="yes" />
           </Component>
-          <Component Id="owcE8E370914445B946988D91DEE0846C04" Guid="ed2637dd-0b41-a35c-a34e-a53f8ac81a66" Bitness="always64">
+          <Component Id="owcE8E370914445B946988D91DEE0846C04" Guid="ed2637dd-0b41-a35c-a34e-a53f8ac81a66" Win64="yes">
             <File Id="owfE8E370914445B946988D91DEE0846C04" Source="$(var.SourceDir)\doc\developer.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCAF9A11C0193B6B7E3CB16545BF39B5F" Guid="a1b223cd-b752-81d3-34e5-dcddae590d1a" Bitness="always64">
+          <Component Id="owcCAF9A11C0193B6B7E3CB16545BF39B5F" Guid="a1b223cd-b752-81d3-34e5-dcddae590d1a" Win64="yes">
             <File Id="owfCAF9A11C0193B6B7E3CB16545BF39B5F" Source="$(var.SourceDir)\doc\faq.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc29BB3ED031CBB3840224FFF7B8BEACEA" Guid="04fc5c84-bfd6-7f52-e866-47e2035ea4e2" Bitness="always64">
+          <Component Id="owc29BB3ED031CBB3840224FFF7B8BEACEA" Guid="04fc5c84-bfd6-7f52-e866-47e2035ea4e2" Win64="yes">
             <File Id="owf29BB3ED031CBB3840224FFF7B8BEACEA" Source="$(var.SourceDir)\doc\fate.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcDDA10CB1D2BEA2170F6E1AD6E92C4334" Guid="9bdf64e4-37df-38b0-826d-15fa2d394a45" Bitness="always64">
+          <Component Id="owcDDA10CB1D2BEA2170F6E1AD6E92C4334" Guid="9bdf64e4-37df-38b0-826d-15fa2d394a45" Win64="yes">
             <File Id="owfDDA10CB1D2BEA2170F6E1AD6E92C4334" Source="$(var.SourceDir)\doc\ffmpeg.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc2AE255B6235BDD852C45D309B4C631DC" Guid="85237364-bd71-87e2-409f-7f838a45bca1" Bitness="always64">
+          <Component Id="owc2AE255B6235BDD852C45D309B4C631DC" Guid="85237364-bd71-87e2-409f-7f838a45bca1" Win64="yes">
             <File Id="owf2AE255B6235BDD852C45D309B4C631DC" Source="$(var.SourceDir)\doc\ffmpeg-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcE2E0860EA651363F1D05A6CDA657CE69" Guid="5533fd38-a405-810a-f7c2-95007b530fbf" Bitness="always64">
+          <Component Id="owcE2E0860EA651363F1D05A6CDA657CE69" Guid="5533fd38-a405-810a-f7c2-95007b530fbf" Win64="yes">
             <File Id="owfE2E0860EA651363F1D05A6CDA657CE69" Source="$(var.SourceDir)\doc\ffmpeg-bitstream-filters.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcB198E9B8BD3288F87266080BD37F897F" Guid="14cc724c-46dd-6c02-8d7d-480793b737e9" Bitness="always64">
+          <Component Id="owcB198E9B8BD3288F87266080BD37F897F" Guid="14cc724c-46dd-6c02-8d7d-480793b737e9" Win64="yes">
             <File Id="owfB198E9B8BD3288F87266080BD37F897F" Source="$(var.SourceDir)\doc\ffmpeg-codecs.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc4EE38F90B0E2637266AA7CA3D409A163" Guid="546d7e9d-07b3-24bd-d52c-9fc2866d92a2" Bitness="always64">
+          <Component Id="owc4EE38F90B0E2637266AA7CA3D409A163" Guid="546d7e9d-07b3-24bd-d52c-9fc2866d92a2" Win64="yes">
             <File Id="owf4EE38F90B0E2637266AA7CA3D409A163" Source="$(var.SourceDir)\doc\ffmpeg-devices.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc47CF4AE5DF1FC7044F630C27F75F824B" Guid="8b9836ac-c87a-36b6-97e0-2320e9286676" Bitness="always64">
+          <Component Id="owc47CF4AE5DF1FC7044F630C27F75F824B" Guid="8b9836ac-c87a-36b6-97e0-2320e9286676" Win64="yes">
             <File Id="owf47CF4AE5DF1FC7044F630C27F75F824B" Source="$(var.SourceDir)\doc\ffmpeg-filters.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc55607D41CF0B17A2C3751B8C5A1489D7" Guid="879322c5-72ba-3b5b-0044-2562475d77fa" Bitness="always64">
+          <Component Id="owc55607D41CF0B17A2C3751B8C5A1489D7" Guid="879322c5-72ba-3b5b-0044-2562475d77fa" Win64="yes">
             <File Id="owf55607D41CF0B17A2C3751B8C5A1489D7" Source="$(var.SourceDir)\doc\ffmpeg-formats.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcEED967D62EE2144510B785B5A6E04C6C" Guid="b4b1b748-d427-10ad-a04e-e4a6aa3eb064" Bitness="always64">
+          <Component Id="owcEED967D62EE2144510B785B5A6E04C6C" Guid="b4b1b748-d427-10ad-a04e-e4a6aa3eb064" Win64="yes">
             <File Id="owfEED967D62EE2144510B785B5A6E04C6C" Source="$(var.SourceDir)\doc\ffmpeg-protocols.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBDEFEEC7E5C0AF8CF080172496ED869B" Guid="866a3bae-e762-629a-9268-81378be0c9d8" Bitness="always64">
+          <Component Id="owcBDEFEEC7E5C0AF8CF080172496ED869B" Guid="866a3bae-e762-629a-9268-81378be0c9d8" Win64="yes">
             <File Id="owfBDEFEEC7E5C0AF8CF080172496ED869B" Source="$(var.SourceDir)\doc\ffmpeg-resampler.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCB0BA93E45A6C661FE47D4AF1A596904" Guid="a7c6bc9e-25ba-be98-1bf7-961ce6ed1a16" Bitness="always64">
+          <Component Id="owcCB0BA93E45A6C661FE47D4AF1A596904" Guid="a7c6bc9e-25ba-be98-1bf7-961ce6ed1a16" Win64="yes">
             <File Id="owfCB0BA93E45A6C661FE47D4AF1A596904" Source="$(var.SourceDir)\doc\ffmpeg-scaler.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcF34E583856AE21807F784561D7403CAF" Guid="945dc7c6-627f-393a-ed13-6a59a490dce3" Bitness="always64">
+          <Component Id="owcF34E583856AE21807F784561D7403CAF" Guid="945dc7c6-627f-393a-ed13-6a59a490dce3" Win64="yes">
             <File Id="owfF34E583856AE21807F784561D7403CAF" Source="$(var.SourceDir)\doc\ffmpeg-utils.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc3A28894551B07B451C7431B6D6FA9E88" Guid="9121ea1d-de27-f617-499c-bfc91ce1d23e" Bitness="always64">
+          <Component Id="owc3A28894551B07B451C7431B6D6FA9E88" Guid="9121ea1d-de27-f617-499c-bfc91ce1d23e" Win64="yes">
             <File Id="owf3A28894551B07B451C7431B6D6FA9E88" Source="$(var.SourceDir)\doc\ffplay.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBDC7DC34D48B70AABCDAE2D9B7C751DC" Guid="8226f13e-15ac-a9e5-6c1d-c692ff1d6273" Bitness="always64">
+          <Component Id="owcBDC7DC34D48B70AABCDAE2D9B7C751DC" Guid="8226f13e-15ac-a9e5-6c1d-c692ff1d6273" Win64="yes">
             <File Id="owfBDC7DC34D48B70AABCDAE2D9B7C751DC" Source="$(var.SourceDir)\doc\ffplay-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcB9872B1281CFBA154A755EFF21B11BAF" Guid="ac853aa2-4b46-303e-7d8d-bc850a9d1dfe" Bitness="always64">
+          <Component Id="owcB9872B1281CFBA154A755EFF21B11BAF" Guid="ac853aa2-4b46-303e-7d8d-bc850a9d1dfe" Win64="yes">
             <File Id="owfB9872B1281CFBA154A755EFF21B11BAF" Source="$(var.SourceDir)\doc\ffprobe.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc4D7B2302CCE54DCBD64C789959E2552C" Guid="0762b84a-285c-6346-0bd0-45765fb8468e" Bitness="always64">
+          <Component Id="owc4D7B2302CCE54DCBD64C789959E2552C" Guid="0762b84a-285c-6346-0bd0-45765fb8468e" Win64="yes">
             <File Id="owf4D7B2302CCE54DCBD64C789959E2552C" Source="$(var.SourceDir)\doc\ffprobe-all.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc593E7C81CBFDC92FDD7B6BC023566582" Guid="61a436d3-77b0-5a30-cc1e-d0541afc04aa" Bitness="always64">
+          <Component Id="owc593E7C81CBFDC92FDD7B6BC023566582" Guid="61a436d3-77b0-5a30-cc1e-d0541afc04aa" Win64="yes">
             <File Id="owf593E7C81CBFDC92FDD7B6BC023566582" Source="$(var.SourceDir)\doc\general.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc44381380E25DA23DB4197D6A5EEAF025" Guid="fa6c36e9-1ece-1f81-2d8d-c0e64a5a12d8" Bitness="always64">
+          <Component Id="owc44381380E25DA23DB4197D6A5EEAF025" Guid="fa6c36e9-1ece-1f81-2d8d-c0e64a5a12d8" Win64="yes">
             <File Id="owf44381380E25DA23DB4197D6A5EEAF025" Source="$(var.SourceDir)\doc\git-howto.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc47CFB032CC4BF3059DF30EEDDCB7EBB1" Guid="4cd8dea9-422b-ece2-3ed7-025706654412" Bitness="always64">
+          <Component Id="owc47CFB032CC4BF3059DF30EEDDCB7EBB1" Guid="4cd8dea9-422b-ece2-3ed7-025706654412" Win64="yes">
             <File Id="owf47CFB032CC4BF3059DF30EEDDCB7EBB1" Source="$(var.SourceDir)\doc\libavcodec.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc19DB140AB621C913D4D895F9709C1B98" Guid="ec660f5f-2ae1-427f-6d63-68e10ba1f82a" Bitness="always64">
+          <Component Id="owc19DB140AB621C913D4D895F9709C1B98" Guid="ec660f5f-2ae1-427f-6d63-68e10ba1f82a" Win64="yes">
             <File Id="owf19DB140AB621C913D4D895F9709C1B98" Source="$(var.SourceDir)\doc\libavdevice.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCA505CC3396F6ECC5600A9363E18E872" Guid="4ef3c565-e2e1-3852-d728-d80b96142b66" Bitness="always64">
+          <Component Id="owcCA505CC3396F6ECC5600A9363E18E872" Guid="4ef3c565-e2e1-3852-d728-d80b96142b66" Win64="yes">
             <File Id="owfCA505CC3396F6ECC5600A9363E18E872" Source="$(var.SourceDir)\doc\libavfilter.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc2A1330243A6755CC983129714679E18D" Guid="45884a28-48e2-58f8-4537-a3f4825ca3b0" Bitness="always64">
+          <Component Id="owc2A1330243A6755CC983129714679E18D" Guid="45884a28-48e2-58f8-4537-a3f4825ca3b0" Win64="yes">
             <File Id="owf2A1330243A6755CC983129714679E18D" Source="$(var.SourceDir)\doc\libavformat.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc5ED2AFA60254ECFDF980321DCBDE602B" Guid="166474bd-e8ee-be30-7105-f4efb5f6da9b" Bitness="always64">
+          <Component Id="owc5ED2AFA60254ECFDF980321DCBDE602B" Guid="166474bd-e8ee-be30-7105-f4efb5f6da9b" Win64="yes">
             <File Id="owf5ED2AFA60254ECFDF980321DCBDE602B" Source="$(var.SourceDir)\doc\libavutil.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcFDA14257B94FC4D94560641AEFC9DFF5" Guid="85367f8b-6882-80c3-3833-bb8bb756b736" Bitness="always64">
+          <Component Id="owcFDA14257B94FC4D94560641AEFC9DFF5" Guid="85367f8b-6882-80c3-3833-bb8bb756b736" Win64="yes">
             <File Id="owfFDA14257B94FC4D94560641AEFC9DFF5" Source="$(var.SourceDir)\doc\libswresample.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc5FA4CAC49D525BA0950C2C7547F98AE1" Guid="6c1e8283-98df-08c0-1ef1-64eb8a77145b" Bitness="always64">
+          <Component Id="owc5FA4CAC49D525BA0950C2C7547F98AE1" Guid="6c1e8283-98df-08c0-1ef1-64eb8a77145b" Win64="yes">
             <File Id="owf5FA4CAC49D525BA0950C2C7547F98AE1" Source="$(var.SourceDir)\doc\libswscale.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc0FE58754EA93D8FEF7AD398DD6534E58" Guid="0bb87367-2ff8-abaf-e88a-011e1a9bd102" Bitness="always64">
+          <Component Id="owc0FE58754EA93D8FEF7AD398DD6534E58" Guid="0bb87367-2ff8-abaf-e88a-011e1a9bd102" Win64="yes">
             <File Id="owf0FE58754EA93D8FEF7AD398DD6534E58" Source="$(var.SourceDir)\doc\mailing-list-faq.html" KeyPath="yes" />
           </Component>
-          <Component Id="owc9EC2C5244EA54F539E08929A9FFE411B" Guid="3d79b9b0-6903-22ce-72c4-3e41b3bcb055" Bitness="always64">
+          <Component Id="owc9EC2C5244EA54F539E08929A9FFE411B" Guid="3d79b9b0-6903-22ce-72c4-3e41b3bcb055" Win64="yes">
             <File Id="owf9EC2C5244EA54F539E08929A9FFE411B" Source="$(var.SourceDir)\doc\nut.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcBE9464447F1B856BAAF92001FD8CAE38" Guid="2f3ad145-e159-5f2e-22f6-2bc67dec17af" Bitness="always64">
+          <Component Id="owcBE9464447F1B856BAAF92001FD8CAE38" Guid="2f3ad145-e159-5f2e-22f6-2bc67dec17af" Win64="yes">
             <File Id="owfBE9464447F1B856BAAF92001FD8CAE38" Source="$(var.SourceDir)\doc\platform.html" KeyPath="yes" />
           </Component>
-          <Component Id="owcCA47BF12B1F7F02566A31CAC268B1352" Guid="1bee2353-9065-5c7f-800a-8d10745ec8c0" Bitness="always64">
+          <Component Id="owcCA47BF12B1F7F02566A31CAC268B1352" Guid="1bee2353-9065-5c7f-800a-8d10745ec8c0" Win64="yes">
             <File Id="owfCA47BF12B1F7F02566A31CAC268B1352" Source="$(var.SourceDir)\doc\style.min.css" KeyPath="yes" />
           </Component>
         </Directory>
         <Directory Id="owd086C316AD54353041089371B95CFC3D9" Name="presets">
-          <Component Id="owc707AFEE8A6F7F93F6B3766886E242D89" Guid="d77eb2c5-aa45-8d10-3e0f-bfd1c36c6ab3" Bitness="always64">
+          <Component Id="owc707AFEE8A6F7F93F6B3766886E242D89" Guid="d77eb2c5-aa45-8d10-3e0f-bfd1c36c6ab3" Win64="yes">
             <File Id="owf707AFEE8A6F7F93F6B3766886E242D89" Source="$(var.SourceDir)\presets\libvpx-1080p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owc103CC1CAD3C414C41D30E6353BCF695F" Guid="59038795-d036-df89-d0bd-4b5412ce0f74" Bitness="always64">
+          <Component Id="owc103CC1CAD3C414C41D30E6353BCF695F" Guid="59038795-d036-df89-d0bd-4b5412ce0f74" Win64="yes">
             <File Id="owf103CC1CAD3C414C41D30E6353BCF695F" Source="$(var.SourceDir)\presets\libvpx-1080p50_60.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcEB9AE661F14D81A8EC6D16C18152D407" Guid="2b662c5e-4a45-6957-b4c0-659853f9c15c" Bitness="always64">
+          <Component Id="owcEB9AE661F14D81A8EC6D16C18152D407" Guid="2b662c5e-4a45-6957-b4c0-659853f9c15c" Win64="yes">
             <File Id="owfEB9AE661F14D81A8EC6D16C18152D407" Source="$(var.SourceDir)\presets\libvpx-360p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcA8A4E2218D300550C5F7F14FE06B6985" Guid="614eb248-6358-ee78-6e1c-65b0da75c7ec" Bitness="always64">
+          <Component Id="owcA8A4E2218D300550C5F7F14FE06B6985" Guid="614eb248-6358-ee78-6e1c-65b0da75c7ec" Win64="yes">
             <File Id="owfA8A4E2218D300550C5F7F14FE06B6985" Source="$(var.SourceDir)\presets\libvpx-720p.ffpreset" KeyPath="yes" />
           </Component>
-          <Component Id="owcCCB3245511379F8702D8239352DBE80A" Guid="ffee9383-2d76-2d69-79ea-62dcc0a408b0" Bitness="always64">
+          <Component Id="owcCCB3245511379F8702D8239352DBE80A" Guid="ffee9383-2d76-2d69-79ea-62dcc0a408b0" Win64="yes">
             <File Id="owfCCB3245511379F8702D8239352DBE80A" Source="$(var.SourceDir)\presets\libvpx-720p50_60.ffpreset" KeyPath="yes" />
           </Component>
         </Directory>
       </Directory>
-    </Module>
+    </Directory>
+    <ComponentGroupRef Id="Custom" />
+  </Module>
 </Wix>
\ No newline at end of file
diff --git a/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMMcustom.wxs b/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMMcustom.wxs
index 65be790..90dcac4 100644
--- a/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMMcustom.wxs	
+++ b/ffmpeg_full/FFmpeg FullMM/FFmpeg_FullMMcustom.wxs	
@@ -1,4 +1,5 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     
     <!-- Reference Custom Components Below -->
diff --git a/ffmpeg_full/FFmpeg FullMM/obj/x64/Release/FFmpeg FullMM.wixproj.FileList.txt b/ffmpeg_full/FFmpeg FullMM/obj/x64/Release/FFmpeg FullMM.wixproj.FileList.txt
index acea9d7..22ccda8 100644
--- a/ffmpeg_full/FFmpeg FullMM/obj/x64/Release/FFmpeg FullMM.wixproj.FileList.txt	
+++ b/ffmpeg_full/FFmpeg FullMM/obj/x64/Release/FFmpeg FullMM.wixproj.FileList.txt	
@@ -1,7 +1,2 @@
 C:\Users\icedterminal\GitHub\ffmpeg-installer\ffmpeg_full\FFmpeg FullMM\bin\x64\Release\FFmpeg_FullMM.msm
 C:\Users\icedterminal\GitHub\ffmpeg-installer\ffmpeg_full\FFmpeg FullMM\bin\x64\Release\FFmpeg_FullMM.wixpdb
-obj\x64\Release\FFmpeg_FullMM.wixobj
-obj\x64\Release\FFmpeg_FullMMcustom.wixobj
-obj\x64\Release\FFmpeg FullMM.wixproj.BindContentsFileListnull.txt
-obj\x64\Release\FFmpeg FullMM.wixproj.BindOutputsFileListnull.txt
-obj\x64\Release\FFmpeg FullMM.wixproj.BindBuiltOutputsFileListnull.txt