diff --git a/Source/3rd Party/7zip/7zip.vcproj b/Source/3rd Party/7zip/7zip.vcproj
index d2a7c18e5..22ea1b571 100644
--- a/Source/3rd Party/7zip/7zip.vcproj	
+++ b/Source/3rd Party/7zip/7zip.vcproj	
@@ -38,6 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UsePrecompiledHeader="0"
+				DisableSpecificWarnings="4127"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -90,6 +91,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UsePrecompiledHeader="0"
+				DisableSpecificWarnings="4127"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/Source/3rd Party/wx/src/zlib/trees.c b/Source/3rd Party/wx/src/zlib/trees.c
index 7a0480286..d07b20532 100644
--- a/Source/3rd Party/wx/src/zlib/trees.c	
+++ b/Source/3rd Party/wx/src/zlib/trees.c	
@@ -203,7 +203,7 @@ local void send_bits(s, value, length)
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
+        s->bi_buf |= (value << s->bi_valid) & 0xFFFF;
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
         s->bi_valid += length - Buf_size;
diff --git a/Source/3rd Party/wx/wx_base.vcproj b/Source/3rd Party/wx/wx_base.vcproj
index 10e598f32..c3fe5d048 100644
--- a/Source/3rd Party/wx/wx_base.vcproj	
+++ b/Source/3rd Party/wx/wx_base.vcproj	
@@ -39,7 +39,6 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="lib\vc_lib\mswud,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib"
 				PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				RuntimeLibrary="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
 			/>
@@ -96,7 +95,6 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="lib\vc_lib\mswu,include,src\tiff\libtiff,src\jpeg,src\png,src\zlib,src\regex,src\expat\lib"
 				PreprocessorDefinitions=";_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				RuntimeLibrary="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
 			/>
@@ -678,9 +676,9 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h&#x0D;&#x0A;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
+						Description="Creating lib\vc_lib\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; lib\vc_lib\mswud\wx\setup.h&#x0D;&#x0A;"
+						Outputs="lib\vc_lib\mswud\wx\setup.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -688,9 +686,9 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h&#x0D;&#x0A;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
+						Description="Creating lib\vc_lib\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; lib\vc_lib\mswu\wx\setup.h&#x0D;&#x0A;"
+						Outputs="lib\vc_lib\mswu\wx\setup.h"
 					/>
 				</FileConfiguration>
 			</File>
@@ -738,9 +736,9 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						Description="Creating lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
+						Outputs="lib\vc_lib\mswud\wx\msw\rcdefs.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -748,9 +746,9 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						Description="Creating lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
+						Outputs="lib\vc_lib\mswu\wx\msw\rcdefs.h"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/Source/3rd Party/wx/wx_core.vcproj b/Source/3rd Party/wx/wx_core.vcproj
index 6d3a9b0f0..3afbfa91c 100644
--- a/Source/3rd Party/wx/wx_core.vcproj	
+++ b/Source/3rd Party/wx/wx_core.vcproj	
@@ -39,7 +39,6 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
 				PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
-				RuntimeLibrary="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
 			/>
@@ -96,7 +95,6 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
 				PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
-				RuntimeLibrary="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
 			/>
@@ -4059,11 +4057,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\ribbon\panel.h"
+				RelativePath="include\wx\panel.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\panel.h"
+				RelativePath="include\wx\ribbon\panel.h"
 				>
 			</File>
 			<File
@@ -4411,11 +4409,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\toplevel.h"
+				RelativePath="include\wx\persist\toplevel.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\toplevel.h"
+				RelativePath="include\wx\toplevel.h"
 				>
 			</File>
 			<File
@@ -4423,11 +4421,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\treebook.h"
+				RelativePath="include\wx\persist\treebook.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\treebook.h"
+				RelativePath="include\wx\treebook.h"
 				>
 			</File>
 			<File
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcproj b/Source/3rd Party/wx/wx_wxjpeg.vcproj
index fdef5f6d3..41944d771 100644
--- a/Source/3rd Party/wx/wx_wxjpeg.vcproj	
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcproj	
@@ -39,8 +39,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="lib\vc_lib\mswud"
 				PreprocessorDefinitions="_LIB"
-				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -95,8 +95,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
 				PreprocessorDefinitions="_LIB"
-				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/Source/3rd Party/wx/wx_wxpng.vcproj b/Source/3rd Party/wx/wx_wxpng.vcproj
index 666828625..384bfe2b8 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcproj	
@@ -39,8 +39,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="src\zlib"
 				PreprocessorDefinitions="_LIB"
-				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -95,8 +95,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="src\zlib"
 				PreprocessorDefinitions="_LIB"
-				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcproj b/Source/3rd Party/wx/wx_wxzlib.vcproj
index 624722b45..fe2485438 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcproj	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcproj	
@@ -37,8 +37,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -92,8 +92,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="_LIB"
-				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/Source/3rd Party/zlib/zlib.vcproj b/Source/3rd Party/zlib/zlib.vcproj
index b327cbe22..1fcd1ebc9 100644
--- a/Source/3rd Party/zlib/zlib.vcproj	
+++ b/Source/3rd Party/zlib/zlib.vcproj	
@@ -91,6 +91,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UsePrecompiledHeader="0"
+				WarningLevel="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"