Changes.diff

diff --git a/owncloud.wxs b/owncloud.wxs
index d24d042..2272f33 100644
--- a/owncloud.wxs
+++ b/thunderbird.wxs
@@ -1,28 +1,25 @@
 <?xml version='1.0'?>
-<?define PrevProductVersion = "1.8.2"?> <!-- Match previous ownCloud Client version -->
-<?define ProductVersion = "1.8.3"?> <!-- Match ownCloud Client version -->
-<?define ExeSourceFile = "ownCloud-1.8.3.5213-setup.exe"?> <!-- Match new .exe : use a relative path -->
+<?define PrevProductVersion = "1.8"?> <!-- Match previous Thunderbird version, can be `ProductVersion-1` if new install -->
+<?define ProductVersion = "38.0.1"?> <!-- Match new client version -->
+<?define ExeSourceFile = "Thunderbird-setup.exe"?> <!-- Match new .exe : use a relative path -->
 <?define ProductCode = "3142DDC0-C003-42F5-BD44-527B8C728A3D"?> <!-- Regenerate for new upgrade -->
-<?define ProductUpgradeCode = "4FA0ABC1-704A-4248-8BC4-34247B1F6D37"?> <!-- When upgrading, move previous ProductCode here -->
+<?define ProductUpgradeCode = "4FA0ABC1-704A-4248-8BC4-34247B1F6D37"?> <!-- When upgrading, move previous ProductCode here. Can be all zeros if new install -->
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
         <Product Id='*'
                 UpgradeCode="$(var.ProductUpgradeCode)"
-                Name='ownCloud Sync Client'
+                Name='Thunderbird Email Client'
                 Language='1033'
                 Version='$(var.ProductVersion)'
-                Manufacturer='Penn Manor ownCloud'>
-                <UIRef Id="WixUI_Minimal" />
-                <WixVariable Id="WixUILicenseRtf"
-                        Value="Licese.rtf" />
+                Manufacturer='MSI Thunderbird'>
                 <Package Id='$(var.ProductCode)'
-                        Description='ownCloud Client $(var.ProductVersion)'
+                        Description='Thunderbird $(var.ProductVersion)'
                         InstallerVersion='200'
                         Compressed='yes' />
                 <Media Id='1' Cabinet='setup.cab' EmbedCab='yes' />
                 <Directory Id='TARGETDIR' Name='SourceDir'>
                         <Directory Id="TempFolder">
                                 <Directory Id="INSTALLLOCATION" Name="~_tmpdir">
-                                        <Component Id='MyComponent' DiskId='1' Guid='B3514243-DFB8-4BB1-8495-ED6153468361'>
+                                        <Component Id='MyComponent' DiskId='1' Guid='B3514243-DFB8-4BB1-8495-ED6153468361'> <!-- New GUID HERE FOR NEW FILE -->
                                                 <File Id="File0" Name="$(var.ExeSourceFile)" Source="$(var.ExeSourceFile)" />
                                         </Component>
                                 </Directory>
@@ -61,17 +58,9 @@
                         ExeCommand="$(var.ExeSourceFile) /S"
                         HideTarget="no"
                         Impersonate="no" />
-                <CustomAction Id="RegisterShell"
-                        Return="check"
-                        Execute="deferred"
-                        FileKey="File0"
-                        ExeCommand="regsvr32.exe /s ownCloud\shellext\OCContextMenu_x86.dll"
-                        HideTarget="no"
-                        Impersonate="no" />
                 <InstallExecuteSequence>
                         <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
                         <Custom Action="RunWrapExe" After="InstallFiles">NOT REMOVE~="ALL"</Custom>
-                        <Custom Action="RegisterShell" After="RunWrapExe" />
                         <RemoveExistingProducts After="InstallFinalize" />
                 </InstallExecuteSequence>
         </Product>

gistfile1.xml

<?xml version='1.0'?>
<?define PrevProductVersion = "1.8"?> <!-- Match previous Thunderbird version, can be `ProductVersion-1` if new install -->
<?define ProductVersion = "38.0.1"?> <!-- Match new client version -->
<?define ExeSourceFile = "Thunderbird-setup.exe"?> <!-- Match new .exe : use a relative path -->
<?define ProductCode = "3142DDC0-C003-42F5-BD44-527B8C728A3D"?> <!-- Regenerate for new upgrade -->
<?define ProductUpgradeCode = "4FA0ABC1-704A-4248-8BC4-34247B1F6D37"?> <!-- When upgrading, move previous ProductCode here. Can be all zeros if new install -->
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
        <Product Id='*'
                UpgradeCode="$(var.ProductUpgradeCode)"
                Name='Thunderbird Email Client'
                Language='1033'
                Version='$(var.ProductVersion)'
                Manufacturer='MSI Thunderbird'>
                <Package Id='$(var.ProductCode)'
                        Description='Thunderbird $(var.ProductVersion)'
                        InstallerVersion='200'
                        Compressed='yes' />
                <Media Id='1' Cabinet='setup.cab' EmbedCab='yes' />
                <Directory Id='TARGETDIR' Name='SourceDir'>
                        <Directory Id="TempFolder">
                                <Directory Id="INSTALLLOCATION" Name="~_tmpdir">
                                        <Component Id='MyComponent' DiskId='1' Guid='B3514243-DFB8-4BB1-8495-ED6153468361'> <!-- New GUID HERE FOR NEW FILE -->
                                                <File Id="File0" Name="$(var.ExeSourceFile)" Source="$(var.ExeSourceFile)" />
                                        </Component>
                                </Directory>
                        </Directory>
                </Directory>
                <Upgrade Id="$(var.ProductUpgradeCode)">
                        <UpgradeVersion Minimum="$(var.ProductVersion)"
                                IncludeMinimum="no"
                                OnlyDetect="yes"
                                Language="1033"
                                Property="NEWPRODUCTFOUND" />
                        <UpgradeVersion Minimum="$(var.PrevProductVersion)"
                                IncludeMinimum="yes"
                                Maximum="$(var.ProductVersion)"
                                IncludeMaximum="no"
                                Language="1033"
                                Property="UPGRADEFOUND" />
                </Upgrade>
                <Property Id="ARPSYSTEMCOMPONENT" Value="1" />
                <Feature Id='InstallFeature' Title='Install Feature' Level='1'>
                        <ComponentRef Id='MyComponent' />
                </Feature>

                <!-- Prevent downgrading -->
                <CustomAction Id="PreventDowngrading" Error="Newer version already installed." />

                <InstallUISequence>
                        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
                </InstallUISequence>

                <!-- Run Action -->
                <CustomAction Id="RunWrapExe"
                        Return="ignore"
                        Execute="deferred"
                        FileKey="File0"
                        ExeCommand="$(var.ExeSourceFile) /S"
                        HideTarget="no"
                        Impersonate="no" />
                <InstallExecuteSequence>
                        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
                        <Custom Action="RunWrapExe" After="InstallFiles">NOT REMOVE~="ALL"</Custom>
                        <RemoveExistingProducts After="InstallFinalize" />
                </InstallExecuteSequence>
        </Product>
</Wix>