9 files changed, 9 insertions, 9 deletions
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs
index 7bd7388b..8f453a05 100644
--- a/src/Release/Setup Files/Product64.wxs
+++ b/src/Release/Setup Files/Product64.wxs
@@ -4,7 +4,7 @@
 
 	<!-- FullProductVersion's first 3 parts MUST BE incremented at each release in order 
 			for upgrades to work ; Windows Installer ignores the 4th part -->
-	<?define var.FullProductVersion = 1.24.25?>
+	<?define var.FullProductVersion = 1.25.7?>
 	<?define var.ProductName = VeraCrypt $(var.FullProductVersion)?>
 
 	<!-- Unique GUID identifying this family of product (32-bit and 64-bit have the same) -->
@@ -12,7 +12,7 @@
   
 	<!-- Unique GUID identifying this product release (32-bit and 64-bit have different ones) -->
 	<!-- MUST BE regenerated for each new release -->
-	<?define var.ProductGuid = {4B0DDCE8-2DAC-4350-8F5E-632BD9BA9209}?>
+	<?define var.ProductGuid = {5660AE59-4AFF-4BE7-9DF5-6656D55537A3}?>
 
 	<!-- Unique GUID identifying a particular Windows Installer package -->
 	<!-- When compiling a product, it should not be set in order to allow it to be generated for each build -->
@@ -1115,7 +1115,7 @@
 			
 				<!-- MSI already removes all values and subkeys that it creates : no need to set Action="createAndRemoveOnUninstall" -->
 				<RegistryKey 		Root="HKLM" Key="SOFTWARE\Classes\VeraCryptVolume\DefaultIcon" >
-					<RegistryValue 	Type="string" Value="[APPLICATIONROOTFOLDER]\VeraCrypt.exe,1" KeyPath="yes" />
+					<RegistryValue 	Type="string" Value="[APPLICATIONROOTFOLDER]VeraCrypt.exe,1" KeyPath="yes" />
 				</RegistryKey>
 			</Component>
 			
@@ -1126,7 +1126,7 @@
 			
 				<!-- MSI already removes all values and subkeys that it creates : no need to set Action="createAndRemoveOnUninstall" -->
 				<RegistryKey 		Root="HKLM" Key="SOFTWARE\Classes\VeraCryptVolume\Shell\open\command" >
-					<RegistryValue 	Type="string" Value="&quot;[APPLICATIONROOTFOLDER]\VeraCrypt.exe&quot; /v &quot;%%1&quot;" KeyPath="yes" />
+					<RegistryValue 	Type="string" Value="&quot;[APPLICATIONROOTFOLDER]VeraCrypt.exe&quot; /v &quot;%1&quot;" KeyPath="yes" />
 				</RegistryKey>
 			</Component>
 			
diff --git a/src/Release/Setup Files/build_msi_x64.bat b/src/Release/Setup Files/build_msi_x64.bat
index 476625b0..e610160a 100644
--- a/src/Release/Setup Files/build_msi_x64.bat
+++ b/src/Release/Setup Files/build_msi_x64.bat
@@ -118,7 +118,7 @@ cd %MSI_BUILDPATH%
 @if NOT "%ERRORLEVEL%" == "0" goto msi_failed
 "%VC_DIR_WIX%\candle.exe" -dLang=en -arch x64 -ext WixUIExtension -ext WiXUtilExtension Custom_InstallDirDlg.wxs -out out\64\en-us\Custom_InstallDirDlg.wixobj
 @if NOT "%ERRORLEVEL%" == "0" goto msi_failed
-"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_%1_Setup_en-us.msi -pdbout out\64\en-us\VeraCrypt_%1_Setup_en-us.wixpdb -sice:ICE09
+"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_Setup_%1_en-us.msi -pdbout out\64\en-us\VeraCrypt_Setup_%1_en-us.wixpdb -sice:ICE09
 @if NOT "%ERRORLEVEL%" == "0" goto msi_failed
 
 ::------------------------------------
@@ -129,8 +129,8 @@ cd %MSI_BUILDPATH%
 @set OUT_PATH=%cd%\out\64\
 @echo [INFO] OUT_PATH=%OUT_PATH%
 
-@set MSI_FILE_IN=VeraCrypt_%1_Setup
-@set MSI_FILE_OUT=VeraCrypt_%1_Setup_x64
+@set MSI_FILE_IN=VeraCrypt_Setup_%1
+@set MSI_FILE_OUT=VeraCrypt_Setup_x64_%1
 
 :: Check if all the MSI files were built
 @set LANG=en-us
@@ -152,7 +152,7 @@ cd %MSI_BUILDPATH%
 mkdir bin
 @copy /Y "%OUT_PATH%\%MSI_FILE_OUT%.msi" "%cd%\bin\%MSI_FILE_OUT%.msi"
 @set LANG=en-us
-@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_IN%_x64_%LANG%.msi"
+@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_OUT%_%LANG%.msi"
 @rmdir /S /Q "%cd%\out"
 
 goto END
diff --git a/src/Release/Setup Files/veracrypt-arm64.cat b/src/Release/Setup Files/veracrypt-arm64.cat
index 2f72e7d0..7dd138e0 100644
--- a/src/Release/Setup Files/veracrypt-arm64.cat
+++ b/src/Release/Setup Files/veracrypt-arm64.cat
diff --git a/src/Release/Setup Files/veracrypt-arm64.sys b/src/Release/Setup Files/veracrypt-arm64.sys
index 60cb99ae..fd4a65df 100644
--- a/src/Release/Setup Files/veracrypt-arm64.sys
+++ b/src/Release/Setup Files/veracrypt-arm64.sys
diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat
index 36706341..02cd7159 100644
--- a/src/Release/Setup Files/veracrypt-x64.cat
+++ b/src/Release/Setup Files/veracrypt-x64.cat
diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys
index cae02099..a7969ab3 100644
--- a/src/Release/Setup Files/veracrypt-x64.sys
+++ b/src/Release/Setup Files/veracrypt-x64.sys
diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf
index 2b8fed00..a9c1bea3 100644
--- a/src/Release/Setup Files/veracrypt.Inf
+++ b/src/Release/Setup Files/veracrypt.Inf
@@ -10,7 +10,7 @@ signature   = "$Windows NT$"
 Class       = "Encryption"                              ;This is determined by the work this filter driver does
 ClassGuid   = {a0a701c0-a511-42ff-aa6c-06dc0395576f}    ;This value is determined by the Class
 Provider    = %ProviderString%
-DriverVer   = 01/01/2020,1.24.25.0
+DriverVer   = 12/29/2021,1.25.6.1
 CatalogFile = veracrypt.cat
 
 
diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat
index 9fe26bb1..655ec398 100644
--- a/src/Release/Setup Files/veracrypt.cat
+++ b/src/Release/Setup Files/veracrypt.cat
diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys
index 25f7f8e3..730d0f57 100644
--- a/src/Release/Setup Files/veracrypt.sys
+++ b/src/Release/Setup Files/veracrypt.sys