diff --git a/Build/Setup/dxwebsetup.exe b/Build/Setup/dxwebsetup.exe
index aea6472f..3e3ad173 100644
Binary files a/Build/Setup/dxwebsetup.exe and b/Build/Setup/dxwebsetup.exe differ
diff --git a/Build/Setup/vcredist_x86.exe b/Build/Setup/vcredist_x86.exe
new file mode 100644
index 00000000..47f87a0e
Binary files /dev/null and b/Build/Setup/vcredist_x86.exe differ
diff --git a/Build/msvcm80.dll b/Build/msvcm80.dll
deleted file mode 100644
index c751385b..00000000
Binary files a/Build/msvcm80.dll and /dev/null differ
diff --git a/Build/msvcp80.dll b/Build/msvcp80.dll
deleted file mode 100644
index f0b52ebf..00000000
Binary files a/Build/msvcp80.dll and /dev/null differ
diff --git a/Build/msvcr80.dll b/Build/msvcr80.dll
deleted file mode 100644
index 53c005ef..00000000
Binary files a/Build/msvcr80.dll and /dev/null differ
diff --git a/Resources/dxwebsetup.exe b/Resources/dxwebsetup.exe
index aea6472f..3e3ad173 100644
Binary files a/Resources/dxwebsetup.exe and b/Resources/dxwebsetup.exe differ
diff --git a/Resources/vcredist_x86.exe b/Resources/vcredist_x86.exe
new file mode 100644
index 00000000..47f87a0e
Binary files /dev/null and b/Resources/vcredist_x86.exe differ
diff --git a/Setup/builder2_setup.iss b/Setup/builder2_setup.iss
index d5bd0679..2a7d43e5 100644
--- a/Setup/builder2_setup.iss
+++ b/Setup/builder2_setup.iss
@@ -50,16 +50,20 @@ Name: {group}\{cm:UninstallProgram,Doom Builder}; Filename: {uninstallexe}
 Name: {commondesktop}\Doom Builder; Filename: {app}\Builder.exe; Tasks: desktopicon
 
 [Run]
+Filename: {app}\Setup\vcredist_x86.exe; StatusMsg: Setup is updating required files...; Parameters: /Q
+Filename: {app}\Setup\dxwebsetup.exe; Parameters: /Q; StatusMsg: Setup is updating Microsoft DirectX....
 
 [UninstallDelete]
 Name: {localappdata}\Doom Builder; Type: filesandordirs
 [InstallDelete]
 Name: {app}\Builder.pdb; Type: files
+[Registry]
+Root: HKLM; Subkey: SOFTWARE\CodeImp\Doom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
 [Code]
 // Global variables
 var
-	page_info_dx: TOutputMsgWizardPage;
-	page_setup_dx: TOutputProgressWizardPage;
+	//page_info_dx: TOutputMsgWizardPage;
+	//page_setup_dx: TOutputProgressWizardPage;
 	page_info_net: TOutputMsgWizardPage;
 	page_setup_net: TOutputProgressWizardPage;
 
@@ -70,9 +74,10 @@ var
 procedure InitializeWizard();
 begin
 	// Make custom pages
-	page_info_dx := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft DirectX', '', 'Setup will now start the installation and/or update of your Microsoft DirectX version. Press Next to begin.');
-	page_setup_dx := CreateOutputProgressPage('Installing Microsoft DirectX', 'Setup is installing Microsoft DirectX, please wait...');
-	page_info_net := CreateOutputMsgPage(page_info_dx.ID, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
+	//page_info_dx := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft DirectX', '', 'Setup will now start the installation and/or update of your Microsoft DirectX version. Press Next to begin.');
+	//page_setup_dx := CreateOutputProgressPage('Installing Microsoft DirectX', 'Setup is installing Microsoft DirectX, please wait...');
+	//page_info_net := CreateOutputMsgPage(page_info_dx.ID, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
+	page_info_net := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
 	page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework', 'Setup is installing Microsoft.NET Framework, please wait...');
 end;
 
@@ -96,16 +101,16 @@ var
 begin
 
 	// Next pressed on DX info page?
-	if(CurPage = page_info_dx.ID) then
-	begin
-		// Show progress page and run setup
-		page_setup_dx.Show;
-		try
-			ShellExec('open', ExpandConstant('{app}\Setup\dxwebsetup.exe'), '', '/Q', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
-		finally
-			page_setup_dx.Hide;
-		end;
-	end
+	//if(CurPage = page_info_dx.ID) then
+	//begin
+	//	// Show progress page and run setup
+	//	page_setup_dx.Show;
+	//	try
+	//		ShellExec('open', ExpandConstant('{app}\Setup\dxwebsetup.exe'), '', '/Q', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
+	//	finally
+	//		page_setup_dx.Hide;
+	//	end;
+	//end
 
 	// Next pressed on .NET info page?
 	if(CurPage = page_info_net.ID) then
@@ -113,7 +118,7 @@ begin
 		// Show progress page and run setup
 		page_setup_net.Show;
 		try
-			ShellExec('open', ExpandConstant('{app}\Setup\dotnetfx35setup.exe'), '', '/noreboot', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
+			ShellExec('open', ExpandConstant('{app}\Setup\dotnetfx35setup.exe'), '', '/QB', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
 		finally
 			page_setup_net.Hide;
 		end;
@@ -125,5 +130,6 @@ end;
 
 
 
-[Registry]
-Root: HKLM; Subkey: SOFTWARE\CodeImp\Doom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
+
+
+
diff --git a/Setup/builder2debug_setup.iss b/Setup/builder2debug_setup.iss
index 159e3a55..58a8a740 100644
--- a/Setup/builder2debug_setup.iss
+++ b/Setup/builder2debug_setup.iss
@@ -50,14 +50,20 @@ Name: {group}\{cm:UninstallProgram,Doom Builder}; Filename: {uninstallexe}
 Name: {commondesktop}\Doom Builder; Filename: {app}\Builder.exe; Tasks: desktopicon
 
 [Run]
+Filename: {app}\Setup\vcredist_x86.exe; StatusMsg: Setup is updating required files...; Parameters: /Q
+Filename: {app}\Setup\dxwebsetup.exe; Parameters: /Q; StatusMsg: Setup is updating Microsoft DirectX....
 
 [UninstallDelete]
 Name: {localappdata}\Doom Builder; Type: files
+[Registry]
+Root: HKLM; Subkey: SOFTWARE\CodeImp\Doom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
+
+
 [Code]
 // Global variables
 var
-	page_info_dx: TOutputMsgWizardPage;
-	page_setup_dx: TOutputProgressWizardPage;
+	//page_info_dx: TOutputMsgWizardPage;
+	//page_setup_dx: TOutputProgressWizardPage;
 	page_info_net: TOutputMsgWizardPage;
 	page_setup_net: TOutputProgressWizardPage;
 
@@ -68,9 +74,10 @@ var
 procedure InitializeWizard();
 begin
 	// Make custom pages
-	page_info_dx := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft DirectX', '', 'Setup will now start the installation and/or update of your Microsoft DirectX version. Press Next to begin.');
-	page_setup_dx := CreateOutputProgressPage('Installing Microsoft DirectX', 'Setup is installing Microsoft DirectX, please wait...');
-	page_info_net := CreateOutputMsgPage(page_info_dx.ID, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
+	//page_info_dx := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft DirectX', '', 'Setup will now start the installation and/or update of your Microsoft DirectX version. Press Next to begin.');
+	//page_setup_dx := CreateOutputProgressPage('Installing Microsoft DirectX', 'Setup is installing Microsoft DirectX, please wait...');
+	//page_info_net := CreateOutputMsgPage(page_info_dx.ID, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
+	page_info_net := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft .NET Framework', '', 'Setup will now start the installation and/or update of your Microsoft .NET Framework. Press Next to begin.');
 	page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework', 'Setup is installing Microsoft.NET Framework, please wait...');
 end;
 
@@ -94,16 +101,16 @@ var
 begin
 
 	// Next pressed on DX info page?
-	if(CurPage = page_info_dx.ID) then
-	begin
-		// Show progress page and run setup
-		page_setup_dx.Show;
-		try
-			ShellExec('open', ExpandConstant('{app}\Setup\dxwebsetup.exe'), '', '/Q', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
-		finally
-			page_setup_dx.Hide;
-		end;
-	end
+	//if(CurPage = page_info_dx.ID) then
+	//begin
+	//	// Show progress page and run setup
+	//	page_setup_dx.Show;
+	//	try
+	//		ShellExec('open', ExpandConstant('{app}\Setup\dxwebsetup.exe'), '', '/Q', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
+	//	finally
+	//		page_setup_dx.Hide;
+	//	end;
+	//end
 
 	// Next pressed on .NET info page?
 	if(CurPage = page_info_net.ID) then
@@ -111,7 +118,7 @@ begin
 		// Show progress page and run setup
 		page_setup_net.Show;
 		try
-			ShellExec('open', ExpandConstant('{app}\Setup\dotnetfx35setup.exe'), '', '/noreboot', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
+			ShellExec('open', ExpandConstant('{app}\Setup\dotnetfx35setup.exe'), '', '/QB', SW_SHOW, ewWaitUntilTerminated, ErrorCode);
 		finally
 			page_setup_net.Hide;
 		end;
@@ -123,7 +130,6 @@ end;
 
 
 
-[Registry]
-Root: HKLM; Subkey: SOFTWARE\CodeImp\Doom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
+