12 files changed, 252 insertions, 789 deletions
diff --git a/src/SetupDLL/ComSetup.cpp b/src/SetupDLL/ComSetup.cpp
index 07c3360a..e1ab2cfd 100644
--- a/src/SetupDLL/ComSetup.cpp
+++ b/src/SetupDLL/ComSetup.cpp
@@ -2,11 +2,11 @@
  Derived from source code of TrueCrypt 7.1a, which is
  Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file) 
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
 */
 
@@ -21,12 +21,17 @@
 #include <statreg.h>
 #include <windows.h>
 #include "ComSetup.h"
 #include "Dlgcode.h"
 #include "Resource.h"
-#include "../Mount/MainCom_i.c"
-#include "../Format/FormatCom_i.c"
+
+#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
+        EXTERN_C __declspec(selectany) const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+
+// Define GUIDs of "VeraCrypt.exe and" "VeraCrypt Format.exe" type libraries
+MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptMainCom, 0x9ACF6176, 0x5FC4, 0x4690, 0xA0, 0x25, 0xB3, 0x30, 0x6A, 0x50, 0xEB, 0x6A);
+MIDL_DEFINE_GUID(GUID, LIBID_TrueCryptFormatCom, 0x56327DDA, 0xF1A7, 0x4e13, 0xB1, 0x28, 0x52, 0x0D, 0x12, 0x9B, 0xDE, 0xF6);
 
 /* 
  * Same as RegisterComServers() in Setup project, but 
  * instead of using GetModuleFileNameW() to get this 
  * DLL's path as setupModule which will not work because
diff --git a/src/SetupDLL/ComSetup.h b/src/SetupDLL/ComSetup.h
index 85d0f249..f8253dca 100644
--- a/src/SetupDLL/ComSetup.h
+++ b/src/SetupDLL/ComSetup.h
@@ -2,11 +2,11 @@
  Derived from source code of TrueCrypt 7.1a, which is
  Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
 */
 
diff --git a/src/SetupDLL/Dir.c b/src/SetupDLL/Dir.c
index 3275567f..1451ee9f 100644
--- a/src/SetupDLL/Dir.c
+++ b/src/SetupDLL/Dir.c
@@ -4,11 +4,11 @@
  Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
  and which is governed by the 'License Agreement for Encryption for the Masses'
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
 #include "Tcdefs.h"
@@ -63,60 +63,60 @@ mkfulldir (wchar_t *oriPath, BOOL bCheckonly)
 		return 0;
 }
 
 
 int
-mkfulldir_internal (wchar_t *path)
+mkfulldir_internal(wchar_t* path)
 {
-	wchar_t *token;
-	struct _stat st;
-	static wchar_t tokpath[_MAX_PATH];
-	static wchar_t trail[_MAX_PATH];
-
-	if (wcslen(path) >= _MAX_PATH)
-	{
-		// directory name will be truncated so return failure to avoid unexepected behavior
-		return -1;
-	}
-
-	StringCbCopyW (tokpath, _MAX_PATH, path);
-	trail[0] = L'\0';
-
-	token = wcstok (tokpath, L"\\/");
-
-	if (tokpath[0] == L'\\' && tokpath[1] == L'\\')
-	{			/* unc */
-		trail[0] = tokpath[0];
-		trail[1] = tokpath[1];
-		trail[2] = L'\0';
-		if (token)
-		{
-			StringCbCatW (trail, _MAX_PATH, token);
-			StringCbCatW (trail, _MAX_PATH, L"\\");
-			token = wcstok (NULL, L"\\/");
-			if (token)
-			{		/* get share name */
-				StringCbCatW (trail, _MAX_PATH, token);
-				StringCbCatW (trail, _MAX_PATH, L"\\");
-			}
-			token = wcstok (NULL, L"\\/");
-		}
-	}
-
-	if (tokpath[1] == L':')
-	{			/* drive letter */
-		StringCbCatW (trail, _MAX_PATH, tokpath);
-		StringCbCatW (trail, _MAX_PATH, L"\\");
-		token = wcstok (NULL, L"\\/");
-	}
-
-	while (token != NULL)
-	{
-		int x;
-		StringCbCatW (trail, _MAX_PATH, token);
-		x = _wmkdir (trail);
-		StringCbCatW (trail, _MAX_PATH, L"\\");
-		token = wcstok (NULL, L"\\/");
-	}
-
-	return _wstat (path, &st);
+    wchar_t* token;
+    wchar_t* next_token = NULL;
+    struct _stat st;
+    static wchar_t tokpath[_MAX_PATH];
+    static wchar_t trail[_MAX_PATH];
+
+    if (wcslen(path) >= _MAX_PATH)
+    {
+        // directory name will be truncated so return failure to avoid unexpected behavior
+        return -1;
+    }
+
+    StringCbCopyW(tokpath, _MAX_PATH, path);
+    trail[0] = L'\0';
+
+    token = wcstok_s(tokpath, L"\\/", &next_token);
+    if (tokpath[0] == L'\\' && tokpath[1] == L'\\')
+    {           /* unc */
+        trail[0] = tokpath[0];
+        trail[1] = tokpath[1];
+        trail[2] = L'\0';
+        if (token)
+        {
+            StringCbCatW(trail, _MAX_PATH, token);
+            StringCbCatW(trail, _MAX_PATH, L"\\");
+            token = wcstok_s(NULL, L"\\/", &next_token);
+            if (token)
+            {       /* get share name */
+                StringCbCatW(trail, _MAX_PATH, token);
+                StringCbCatW(trail, _MAX_PATH, L"\\");
+            }
+            token = wcstok_s(NULL, L"\\/", &next_token);
+        }
+    }
+
+    if (tokpath[1] == L':')
+    {           /* drive letter */
+        StringCbCatW(trail, _MAX_PATH, tokpath);
+        StringCbCatW(trail, _MAX_PATH, L"\\");
+        token = wcstok_s(NULL, L"\\/", &next_token);
+    }
+
+    while (token != NULL)
+    {
+        int x;
+        StringCbCatW(trail, _MAX_PATH, token);
+        x = _wmkdir(trail);
+        StringCbCatW(trail, _MAX_PATH, L"\\");
+        token = wcstok_s(NULL, L"\\/", &next_token);
+    }
+
+    return _wstat(path, &st);
 }
diff --git a/src/SetupDLL/Dir.h b/src/SetupDLL/Dir.h
index fb9dfc6b..68bb44f0 100644
--- a/src/SetupDLL/Dir.h
+++ b/src/SetupDLL/Dir.h
@@ -4,11 +4,11 @@
  Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
  and which is governed by the 'License Agreement for Encryption for the Masses'
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
 #ifdef __cplusplus
diff --git a/src/SetupDLL/Resource.h b/src/SetupDLL/Resource.h
index b5b7d466..62246068 100644
--- a/src/SetupDLL/Resource.h
+++ b/src/SetupDLL/Resource.h
@@ -41,10 +41,11 @@
 #define IDR_LANG_TH                     55
 #define IDR_LANG_TR                     56
 #define IDR_LANG_UK                     57
 #define IDR_LANG_UZ                     58
 #define IDR_LANG_ZHTW                   59
+#define IDR_LANG_NB                     60
 #define IDD_INSTALL                     101
 #define IDD_INSTALL_OPTIONS_PAGE_DLG    102
 #define IDD_UNINSTALL                   103
 #define IDI_SETUP                       104
 #define IDR_SETUP_RSRC_HEADER           105
diff --git a/src/SetupDLL/Setup.c b/src/SetupDLL/Setup.c
index 1c3782dd..1f6f414d 100644
--- a/src/SetupDLL/Setup.c
+++ b/src/SetupDLL/Setup.c
@@ -4,11 +4,11 @@
  Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
  and which is governed by the 'License Agreement for Encryption for the Masses'
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
 #include "Tcdefs.h"
@@ -1468,11 +1468,11 @@ BOOL DoDriverUnload_Dll (MSIHANDLE hInstaller, HWND hwnd)
 			if (bResult)
 			{
 				if (volumesMounted != 0)
 				{
 					bOK = FALSE;
-					MSILogAndShow(hInstaller, MSI_WARNING_LEVEL, GetString ("DISMOUNT_ALL_FIRST"));
+					MSILogAndShow(hInstaller, MSI_WARNING_LEVEL, GetString ("UNMOUNT_ALL_FIRST"));
 				}
 			}
 			else
 			{
 				bOK = FALSE;
@@ -2334,10 +2334,42 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
 	BootEncryption	bootEnc(NULL);
 	std::wstring	szInstallDir	= L"";
 	UINT			uiRet           = ERROR_INSTALL_FAILURE;
 	BOOL			bOK				= TRUE;
 	WCHAR			szCurrentDir[MAX_PATH];
+	const wchar_t* 	oldFileNames[] = {
+		L"docs\\html\\en\\AddNewSystemVar.jpg",
+		L"docs\\html\\en\\CertificateCannotBeVerified.jpg",
+		L"docs\\html\\en\\CertVerifyFails.jpg",
+		L"docs\\html\\en\\DistributionPackageDamaged.jpg",
+		L"docs\\html\\en\\DownloadVS2010.jpg",
+		L"docs\\html\\en\\DownloadVS2019.jpg",
+		L"docs\\html\\en\\DownloadVSBuildTools.jpg",
+		L"docs\\html\\en\\gzipCommandLine.jpg",
+		L"docs\\html\\en\\NasmCommandLine.jpg",
+		L"docs\\html\\en\\RegeditPermissions-1.jpg",
+		L"docs\\html\\en\\RegeditPermissions-2.jpg",
+		L"docs\\html\\en\\RegeditPermissions-3.jpg",
+		L"docs\\html\\en\\RegeditPermissions-4.jpg",
+		L"docs\\html\\en\\SelectAdvancedSystemSettings.jpg",
+		L"docs\\html\\en\\SelectEnvironmentVariables.jpg",
+		L"docs\\html\\en\\SelectPathVariable.jpg",
+		L"docs\\html\\en\\SelectThisPC.jpg",
+		L"docs\\html\\en\\upxCommandLine.jpg",
+		L"docs\\html\\en\\VS2010BuildSolution.jpg",
+		L"docs\\html\\en\\VS2010Win32Config.jpg",
+		L"docs\\html\\en\\VS2010X64Config.jpg",
+		L"docs\\html\\en\\VS2019ARM64Config.jpg",
+		L"docs\\html\\en\\VS2019BuildSolution.jpg",
+		L"docs\\html\\en\\YasmCommandLine.jpg",
+		L"docs\\html\\en\\BCH_Logo_48x30.png",
+		L"docs\\html\\en\\LinuxPrepAndBuild.sh",
+		L"docs\\html\\en\\LinuxPrepAndBuild.zip",
+		L"docs\\html\\en\\RIPEMD-160.html",
+		L"docs\\html\\en\\ru\\BCH_Logo_48x30.png",
+		L"Languages\\Language.ru - Copy.xml",
+	};
 
 	MSILog(hInstaller, MSI_INFO_LEVEL, L"Begin VC_CustomAction_PostInstall");
 
 	//  Get INSTALLDIR to see where we're being installed.
 	uiStat = MsiGetProperty(hInstaller, TEXT("CustomActionData"), (LPWSTR)TEXT(""), &cchValueBuf);
@@ -2444,30 +2476,39 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
 	{
 		BOOL bResult = FALSE;
 		WIN32_FIND_DATA f;
 		HANDLE h;
 		wchar_t szTmp[TC_MAX_PATH];
+		size_t i;
 
 		// delete "VeraCrypt Setup.exe" if it exists
 		StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), L"VeraCrypt Setup.exe");
 		if (FileExists(szTmp))
 		{
 			ForceDeleteFile(szTmp);
 		}
 
+		// delete files wrongly installed by previous versions in installation folder
+		for (i = 0; i < ARRAYSIZE(oldFileNames); i++)
+		{
+			StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), oldFileNames[i]);
+			if (FileExists(szTmp))
+			{
+				ForceDeleteFile(szTmp);
+			}
+		}
+
 		StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), L"VeraCrypt.exe");
 
-		if (Is64BitOs ())
-			EnableWow64FsRedirection (FALSE);
+		EnableWow64FsRedirection (FALSE);
 
 		wstring servicePath = GetServiceConfigPath (_T(TC_APP_NAME) L".exe", false);
 		wstring serviceLegacyPath = GetServiceConfigPath (_T(TC_APP_NAME) L".exe", true);
 		wstring favoritesFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false);
 		wstring favoritesLegacyFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, true);
 
-		if (Is64BitOs ()
-			&& FileExists (favoritesLegacyFile.c_str())
+		if (FileExists (favoritesLegacyFile.c_str())
 			&& !FileExists (favoritesFile.c_str()))
 		{
 			// copy the favorites XML file to the native system directory
 			bResult = CopyFile (favoritesLegacyFile.c_str(), favoritesFile.c_str(), FALSE);
 		}
@@ -2520,28 +2561,25 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
 				}
 			}
 			catch (...) {}
 		}
 
-		if (Is64BitOs ())
+		// delete files from legacy path
+		if (FileExists (favoritesLegacyFile.c_str()))
 		{
-			// delete files from legacy path
-			if (FileExists (favoritesLegacyFile.c_str()))
-			{
-				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostInstall: REMOVING %s", favoritesLegacyFile.c_str());
-				ForceDeleteFile (favoritesLegacyFile.c_str());
-			}
-
-			if (FileExists (serviceLegacyPath.c_str()))
-			{
-				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostInstall: REMOVING %s", serviceLegacyPath.c_str());
-				ForceDeleteFile (serviceLegacyPath.c_str());
-			}
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostInstall: REMOVING %s", favoritesLegacyFile.c_str());
+			ForceDeleteFile (favoritesLegacyFile.c_str());
+		}
 
-			EnableWow64FsRedirection (TRUE);
+		if (FileExists (serviceLegacyPath.c_str()))
+		{
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostInstall: REMOVING %s", serviceLegacyPath.c_str());
+			ForceDeleteFile (serviceLegacyPath.c_str());
 		}
 
+		EnableWow64FsRedirection (TRUE);
+
 		if (bResult == FALSE)
 		{
 			LPVOID lpMsgBuf;
 			DWORD dwError = GetLastError ();
 			wchar_t szTmp2[700];
@@ -2609,11 +2647,11 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
 
 				FindClose (h);
 			}
 		
 			// remvove legacy files that are not needed anymore
-			for (int i = 0; i < sizeof (szLegacyFiles) / sizeof (szLegacyFiles[0]); i++)
+			for (i = 0; i < sizeof (szLegacyFiles) / sizeof (szLegacyFiles[0]); i++)
 			{
 				StatDeleteFile (szLegacyFiles [i], TRUE);
 			}
 
 			SetCurrentDirectory(szCurrentDir);
@@ -2975,10 +3013,74 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PreUninstall(MSIHANDLE hInstaller)
 end:
 	MSILog(hInstaller, MSI_INFO_LEVEL, L"End VC_CustomAction_PreUninstall");
 	return uiRet;
 }
 
+static BOOL DirectoryExists (const wchar_t *dirName)
+{
+	DWORD attrib = GetFileAttributes (dirName);
+	return (attrib != INVALID_FILE_ATTRIBUTES && (attrib & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+static BOOL DeleteContentsOnReboot(LPCTSTR pszDir) {
+    TCHAR szPath[MAX_PATH];
+	TCHAR szSubPath[MAX_PATH];
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind;
+	BOOL bHasBackslash = FALSE;
+	// check if pszDir ends with a backslash
+	if (pszDir[_tcslen(pszDir) - 1] == '\\')
+	{
+		bHasBackslash = TRUE;
+	}
+
+    // Prepare the path for FindFirstFile
+	if (bHasBackslash)
+		StringCchPrintf(szPath, MAX_PATH, TEXT("%s*"), pszDir);
+	else
+    	StringCchPrintf(szPath, MAX_PATH, TEXT("%s\\*"), pszDir);
+
+    hFind = FindFirstFile(szPath, &FindFileData);
+    if (hFind == INVALID_HANDLE_VALUE) {
+        return FALSE;
+    }
+
+    BOOL result = TRUE;
+
+    do {
+        if (_tcscmp(FindFileData.cFileName, TEXT(".")) != 0 &&
+            _tcscmp(FindFileData.cFileName, TEXT("..")) != 0) {
+
+			if (bHasBackslash)
+				StringCchPrintf(szSubPath, MAX_PATH, TEXT("%s%s"), pszDir, FindFileData.cFileName);
+			else
+            	StringCchPrintf(szSubPath, MAX_PATH, TEXT("%s\\%s"), pszDir, FindFileData.cFileName);
+
+            if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+                // Recursive call to handle subdirectories
+                if (!DeleteContentsOnReboot(szSubPath)) {
+                    result = FALSE; // Track failures but attempt to continue
+                }
+            } else {
+                // Schedule the file for deletion
+                if (!MoveFileEx(szSubPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT)) {
+                    result = FALSE; // Track failures
+                }
+            }
+        }
+    } while (FindNextFile(hFind, &FindFileData) != 0);
+
+    FindClose(hFind);
+
+    // Schedule the root directory for deletion, only if not done already
+    if (!MoveFileEx(pszDir, NULL, MOVEFILE_DELAY_UNTIL_REBOOT)) {
+        result = FALSE;
+    }
+
+    return result;
+}
+
 /* 
  * Same as Setup.c, function DoUninstall(), but 
  * without the actual installation, it only performs 
  * post install operations (after DoFilesInstall and last parts 
  * of DoFilesInstall / DoRegUninstall).
@@ -3114,12 +3216,11 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostUninstall(MSIHANDLE hInstaller)
 		DoServiceUninstall_Dll (hInstaller, hwndDlg, L"VeraCryptService");
 	}
 
 	//	Last part of DoFilesInstall()
 	{
-		if (Is64BitOs ())
-			EnableWow64FsRedirection (FALSE);
+		EnableWow64FsRedirection (FALSE);
 
 		wstring servicePath = GetServiceConfigPath (_T(TC_APP_NAME) L".exe", false);
 		wstring serviceLegacyPath = GetServiceConfigPath (_T(TC_APP_NAME) L".exe", true);
 		wstring favoritesFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, false);
 		wstring favoritesLegacyFile = GetServiceConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES, true);
@@ -3135,25 +3236,49 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostUninstall(MSIHANDLE hInstaller)
 		{
 			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", servicePath.c_str());
 			ForceDeleteFile (servicePath.c_str());
 		}
 
-		if (Is64BitOs ())
+		if (FileExists (favoritesLegacyFile.c_str()))
+		{
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", favoritesLegacyFile.c_str());
+			ForceDeleteFile (favoritesLegacyFile.c_str());
+		}
+
+		if (FileExists (serviceLegacyPath.c_str()))
+		{
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", serviceLegacyPath.c_str());
+			ForceDeleteFile (serviceLegacyPath.c_str());
+		}
+
+		EnableWow64FsRedirection (TRUE);
+
+		// remove the installation folder is case it remains after uninstall
+		if (DirectoryExists (szInstallDir.c_str()))
 		{
-			if (FileExists (favoritesLegacyFile.c_str()))
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", szInstallDir.c_str());
+			if(DeleteDirectory (szInstallDir.c_str()))
 			{
-				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", favoritesLegacyFile.c_str());
-				ForceDeleteFile (favoritesLegacyFile.c_str());
+				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: %s removed", szInstallDir.c_str());
 			}
-
-			if (FileExists (serviceLegacyPath.c_str()))
+			else
 			{
-				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: REMOVING %s", serviceLegacyPath.c_str());
-				ForceDeleteFile (serviceLegacyPath.c_str());
+				MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: %s could not be removed. Scheduling removal on reboot", szInstallDir.c_str());
+				if (DeleteContentsOnReboot(szInstallDir.c_str()))
+				{
+					bRestartRequired = TRUE;
+					MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: %s scheduled for removal on reboot", szInstallDir.c_str());
+				}
+				else
+				{
+					MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: %s could not be scheduled for removal on reboot", szInstallDir.c_str());
+				}
 			}
-
-			EnableWow64FsRedirection (TRUE);
+		}
+		else
+		{
+			MSILog(hInstaller, MSI_ERROR_LEVEL, L"VC_CustomAction_PostUninstall: %s does not exist", szInstallDir.c_str());
 		}
 	}
 
 	if (bSystemRestore && !bTempSkipSysRestore)
 		SetSystemRestorePoint_Dll (hInstaller, TRUE);
@@ -3354,10 +3479,11 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_DoChecks(MSIHANDLE hInstaller)
 	if (bRestartRequired)
 	{		
 		if (bDisableReboot)
 		{
 			MSILog(hInstaller, MSI_INFO_LEVEL, L"VC_CustomAction_DoChecks: reboot is required but it is disabled because \"REBOOT\" specifies ReallySuppress");
+			uiRet = ERROR_SUCCESS;
 		}
 		else
 		{
 			MSILog(hInstaller, MSI_INFO_LEVEL, L"VC_CustomAction_DoChecks: reboot is required");
 			uiRet = MsiSetProperty(hInstaller, L"ISREBOOTREQUIRED", L"1");
@@ -3390,6 +3516,6 @@ DllMain(
 	 * in Dlgcode.c, MapResource() function.
 	 */
 	hInst = hInstDLL;
 
     return TRUE;
-}
-\ No newline at end of file
+}
diff --git a/src/SetupDLL/Setup.h b/src/SetupDLL/Setup.h
index e38dd75a..19448f40 100644
--- a/src/SetupDLL/Setup.h
+++ b/src/SetupDLL/Setup.h
@@ -4,11 +4,11 @@
  Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
  and which is governed by the 'License Agreement for Encryption for the Masses'
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
 #ifndef SETUP_H
@@ -40,22 +40,17 @@ static wchar_t *szFiles[]=
 static wchar_t *szCompressedFiles[]=
 {
 	L"License.txt",
 	L"LICENSE",
 	L"NOTICE",
-	L"VeraCrypt.exe",
-	L"VeraCryptExpander.exe",
-	L"VeraCrypt Format.exe",
 	L"VeraCrypt-x64.exe",
 	L"VeraCryptExpander-x64.exe",
 	L"VeraCrypt Format-x64.exe",
 	L"VeraCrypt-arm64.exe",
 	L"VeraCryptExpander-arm64.exe",
 	L"VeraCrypt Format-arm64.exe",
 	L"veracrypt.inf",
-	L"veracrypt.cat",
-	L"veracrypt.sys",
 	L"veracrypt-x64.cat",
 	L"veracrypt-x64.sys",
 	L"veracrypt-arm64.cat",
 	L"veracrypt-arm64.sys",
 	L"Languages.zip",
@@ -72,11 +67,10 @@ static wchar_t *szLegacyFiles[]=
 	L"VeraCryptExpander-x64.exe",
 	L"VeraCrypt Format-x64.exe",
 	L"veracrypt-x64.sys",
 };
 
-#define FILENAME_64BIT_DRIVER	L"veracrypt-x64.sys"
 #define NBR_COMPRESSED_FILES (sizeof(szCompressedFiles) / sizeof(szCompressedFiles[0]))
 
 void localcleanup (void);
 BOOL StatDeleteFile ( wchar_t *lpszFile, BOOL bCheckForOldFile );
 BOOL StatRemoveDirectory ( wchar_t *lpszDir );
diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc
index 5fd26482..26a3d4fc 100644
--- a/src/SetupDLL/Setup.rc
+++ b/src/SetupDLL/Setup.rc
@@ -26,12 +26,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,26,8,0
- PRODUCTVERSION 1,26,8,0
+ FILEVERSION 1,26,20,0
+ PRODUCTVERSION 1,26,20,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
@@ -44,15 +44,15 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCryptSetup"
-            VALUE "FileVersion", "1.26.8"
+            VALUE "FileVersion", "1.26.20"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCryptSetup.dll"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.26.8"
+            VALUE "ProductVersion", "1.26.20"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", 0x409, 1200
@@ -107,10 +107,11 @@ IDR_LANG_HE             LANGUAGES               "..\\..\\Translations\\Language.
 IDR_LANG_HU             LANGUAGES               "..\\..\\Translations\\Language.hu.xml"
 IDR_LANG_ID             LANGUAGES               "..\\..\\Translations\\Language.id.xml"
 IDR_LANG_KA             LANGUAGES               "..\\..\\Translations\\Language.ka.xml"
 IDR_LANG_KO             LANGUAGES               "..\\..\\Translations\\Language.ko.xml"
 IDR_LANG_LV             LANGUAGES               "..\\..\\Translations\\Language.lv.xml"
+IDR_LANG_NB             LANGUAGES               "..\\..\\Translations\\Language.nb.xml"
 IDR_LANG_NN             LANGUAGES               "..\\..\\Translations\\Language.nn.xml"
 IDR_LANG_PTBR           LANGUAGES               "..\\..\\Translations\\Language.pt-br.xml"
 IDR_LANG_SK             LANGUAGES               "..\\..\\Translations\\Language.sk.xml"
 IDR_LANG_SL             LANGUAGES               "..\\..\\Translations\\Language.sl.xml"
 IDR_LANG_SV             LANGUAGES               "..\\..\\Translations\\Language.sv.xml"
diff --git a/src/SetupDLL/Setup.vcxproj.filters b/src/SetupDLL/Setup.vcxproj.filters
deleted file mode 100644
index d747363f..00000000
--- a/src/SetupDLL/Setup.vcxproj.filters
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Common">
-      <UniqueIdentifier>{6073052c-2d95-47a0-95d8-5960d4c1d1c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files\Common">
-      <UniqueIdentifier>{a540fb0a-850b-4cb9-85f9-ade0112ebb50}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ComSetup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Dir.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SelfExtract.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Setup.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Wizard.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Xml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\BootEncryption.cpp">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Crc.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Dictionary.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Dlgcode.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Language.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Registry.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Endian.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ComSetup.rgs">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="Setup.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\Common\VeraCrypt.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="VeraCrypt_setup.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="VeraCrypt_setup_background.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\Common\VeraCrypt_Volume.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="..\Common\Language.xml">
-      <Filter>Resource Files\Common</Filter>
-    </None>
-    <None Include="..\Resources\Texts\License.rtf">
-      <Filter>Resource Files\Common</Filter>
-    </None>
-    <None Include="..\Common\Textual_logo_288dpi.bmp">
-      <Filter>Resource Files\Common</Filter>
-    </None>
-    <None Include="..\Common\Textual_logo_96dpi.bmp">
-      <Filter>Resource Files\Common</Filter>
-    </None>
-    <None Include="..\Common\Textual_logo_background.bmp">
-      <Filter>Resource Files\Common</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Common\Apidrvr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Combo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ComSetup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Crc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Dir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Dlgcode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Exception.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Inflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Language.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SelfExtract.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Setup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Tcdefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Wizard.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="Setup.manifest">
-      <Filter>Resource Files</Filter>
-    </Manifest>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Setup.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="..\Common\Common.rc">
-      <Filter>Resource Files\Common</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/src/SetupDLL/Setup.vcxproj.user b/src/SetupDLL/Setup.vcxproj.user
deleted file mode 100644
index ace9a86a..00000000
--- a/src/SetupDLL/Setup.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
-\ No newline at end of file
diff --git a/src/SetupDLL/SetupDLL.vcproj b/src/SetupDLL/SetupDLL.vcproj
deleted file mode 100644
index a1a6a81f..00000000
--- a/src/SetupDLL/SetupDLL.vcproj
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Setup"
-	ProjectGUID="{DF5F654D-BD44-4E31-B92E-B68074DC37A8}"
-	RootNamespace="Setup"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
-				PreprocessorDefinitions="SETUP;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4057;4100;4127;4201;4505;4701;4706"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="libcmtd.lib atlsd.lib mpr.lib"
-				OutputFile="$(OutDir)/VeraCryptSetup.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				UACExecutionLevel="2"
-				DelayLoadDLLs="user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/Setup.pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="Setup.manifest"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy Debug\VeraCryptSetup.exe &quot;..\Debug\Setup Files\VeraCrypt Setup.exe&quot; &gt;NUL:&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/w34189"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
-				PreprocessorDefinitions="SETUP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="true"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)/"
-				WarningLevel="4"
-				DebugInformationFormat="0"
-				DisableSpecificWarnings="4057;4100;4127;4201;4505;4701;4706"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/IGNORE:4089"
-				AdditionalDependencies="mpr.lib"
-				OutputFile="$(OutDir)/VeraCryptSetup.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				UACExecutionLevel="2"
-				DelayLoadDLLs="user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll"
-				GenerateDebugInformation="false"
-				GenerateMapFile="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="Setup.manifest"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\VeraCryptSetup.exe &quot;..\Release\Setup Files\VeraCrypt Setup.exe&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ComSetup.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ComSetup.rgs"
-				>
-			</File>
-			<File
-				RelativePath=".\Dir.c"
-				>
-			</File>
-			<File
-				RelativePath=".\SelfExtract.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Setup.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\Wizard.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Common\Xml.c"
-				>
-			</File>
-			<Filter
-				Name="Common"
-				>
-				<File
-					RelativePath="..\Common\BootEncryption.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Crc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Dictionary.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\Common\Dlgcode.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\Common\Endian.c"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Inflate.c"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Language.c"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Registry.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\Common\Apidrvr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Combo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ComSetup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Crc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Dir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Dlgcode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Exception.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Inflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Language.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Registry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SelfExtract.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\Tcdefs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Wizard.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\Setup.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\Setup.manifest"
-				>
-			</File>
-			<File
-				RelativePath=".\Setup.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\VeraCrypt.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\VeraCrypt_setup.bmp"
-				>
-			</File>
-			<File
-				RelativePath=".\VeraCrypt_setup_background.bmp"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\VeraCrypt_Volume.ico"
-				>
-			</File>
-			<Filter
-				Name="Common"
-				>
-				<File
-					RelativePath="..\Common\Common.rc"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\Common\Language.xml"
-					>
-				</File>
-				<File
-					RelativePath="..\Resources\Texts\License.rtf"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Textual_logo_288dpi.bmp"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Textual_logo_96dpi.bmp"
-					>
-				</File>
-				<File
-					RelativePath="..\Common\Textual_logo_background.bmp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/SetupDLL/SetupDLL.vcxproj b/src/SetupDLL/SetupDLL.vcxproj
index 7eb24a66..576738d4 100644
--- a/src/SetupDLL/SetupDLL.vcxproj
+++ b/src/SetupDLL/SetupDLL.vcxproj
@@ -17,26 +17,27 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{ADD324E2-ADC8-402E-87EB-03E4E26B1B49}</ProjectGuid>
     <RootNamespace>Setup</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>SetupDLL</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -52,19 +53,19 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)Debug\SetupDLL\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
     <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">$(ProjectDir)Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)Release\SetupDLL\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">$(ProjectDir)Release\SetupDLL\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">false</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</GenerateManifest>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VeraCryptSetup</TargetName>
@@ -86,21 +87,22 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;msi.lib;libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;msi.lib;libcmtd.lib;atls.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptSetup.dll</OutputFile>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)Setup.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>SetupDLL.def</ModuleDefinitionFile>
+      <GenerateMapFile>true</GenerateMapFile>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>Setup.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PostBuildEvent>
@@ -122,17 +124,18 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" &gt;NUL:
       <AssemblerOutput>All</AssemblerOutput>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4995;4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
       <AdditionalOptions>/IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;atls.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptSetup.dll</OutputFile>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -151,11 +154,11 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" &gt;NUL:
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">
     <ClCompile>
       <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;..\Common\lzma;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SETUP;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SETUP_DLL;SETUP;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <AssemblerOutput>All</AssemblerOutput>
@@ -164,14 +167,14 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" &gt;NUL:
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalOptions>/IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>version.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)VeraCryptSetup.exe</OutputFile>
+      <AdditionalDependencies>version.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)VeraCryptSetup.dll</OutputFile>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -253,27 +256,9 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" &gt;NUL:
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Boot\Windows\Boot.vcxproj">
-      <Project>{8b7f059f-e4c7-4e11-88f5-ee8b8433072e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ExpandVolume\ExpandVolume.vcxproj">
-      <Project>{9715ff1d-599b-4bbc-ad96-bef6e08ff827}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Format\Format.vcxproj">
-      <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Mount\Mount.vcxproj">
-      <Project>{e4c40f94-e7f9-4981-86e4-186b46f993f3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>