diff --git a/Source/3rd Party/wx/include/wx/msw/setup.h b/Source/3rd Party/wx/include/wx/msw/setup.h
index 4c907eca6..ecd6c3986 100644
--- a/Source/3rd Party/wx/include/wx/msw/setup.h	
+++ b/Source/3rd Party/wx/include/wx/msw/setup.h	
@@ -727,7 +727,7 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_WEBVIEW 1
+#define wxUSE_WEBVIEW 0
 
 // Use the IE wxWebView backend
 //
diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
index ea4a1860d..31c853297 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj	
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -51,11 +51,13 @@
     <ClCompile Include="src\common\arcall.cpp" />
     <ClCompile Include="src\common\arcfind.cpp" />
     <ClCompile Include="src\common\archive.cpp" />
+    <ClCompile Include="src\common\arrstr.cpp" />
     <ClCompile Include="src\common\clntdata.cpp" />
     <ClCompile Include="src\common\cmdline.cpp" />
     <ClCompile Include="src\common\config.cpp" />
     <ClCompile Include="src\common\convauto.cpp" />
     <ClCompile Include="src\common\datetime.cpp" />
+    <ClCompile Include="src\common\datetimefmt.cpp" />
     <ClCompile Include="src\common\datstrm.cpp" />
     <ClCompile Include="src\common\dircmn.cpp" />
     <ClCompile Include="src\common\dummy.cpp">
@@ -112,11 +114,13 @@
     <ClCompile Include="src\common\strconv.cpp" />
     <ClCompile Include="src\common\stream.cpp" />
     <ClCompile Include="src\common\string.cpp" />
+    <ClCompile Include="src\common\strvararg.cpp" />
     <ClCompile Include="src\common\sysopt.cpp" />
     <ClCompile Include="src\common\tarstrm.cpp" />
     <ClCompile Include="src\common\textbuf.cpp" />
     <ClCompile Include="src\common\textfile.cpp" />
     <ClCompile Include="src\common\tokenzr.cpp" />
+    <ClCompile Include="src\common\translation.cpp" />
     <ClCompile Include="src\common\txtstrm.cpp" />
     <ClCompile Include="src\common\uri.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
index 9ffd46ae0..0de333b0f 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -288,6 +288,18 @@
     <ClCompile Include="src\msw\volume.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\common\translation.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\strvararg.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arrstr.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\datetimefmt.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\msw\version.rc">
diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj
index c13c758e5..02de9c043 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -59,6 +59,7 @@
     <ClCompile Include="src\common\artstd.cpp" />
     <ClCompile Include="src\common\bmpbase.cpp" />
     <ClCompile Include="src\common\bookctrl.cpp" />
+    <ClCompile Include="src\common\btncmn.cpp" />
     <ClCompile Include="src\common\choiccmn.cpp" />
     <ClCompile Include="src\common\clipcmn.cpp" />
     <ClCompile Include="src\common\clrpickercmn.cpp" />
@@ -124,6 +125,7 @@
     <ClCompile Include="src\common\msgout.cpp" />
     <ClCompile Include="src\common\nbkbase.cpp" />
     <ClCompile Include="src\common\overlaycmn.cpp" />
+    <ClCompile Include="src\common\panelcmn.cpp" />
     <ClCompile Include="src\common\paper.cpp" />
     <ClCompile Include="src\common\pickerbase.cpp" />
     <ClCompile Include="src\common\popupcmn.cpp" />
@@ -136,9 +138,12 @@
     <ClCompile Include="src\common\sizer.cpp" />
     <ClCompile Include="src\common\srchcmn.cpp" />
     <ClCompile Include="src\common\statbar.cpp" />
+    <ClCompile Include="src\common\statboxcmn.cpp" />
+    <ClCompile Include="src\common\stattextcmn.cpp" />
     <ClCompile Include="src\common\stockitem.cpp" />
     <ClCompile Include="src\common\tbarbase.cpp" />
     <ClCompile Include="src\common\textcmn.cpp" />
+    <ClCompile Include="src\common\textentrycmn.cpp" />
     <ClCompile Include="src\common\timercmn.cpp" />
     <ClCompile Include="src\common\toplvcmn.cpp" />
     <ClCompile Include="src\common\treebase.cpp" />
@@ -149,6 +154,8 @@
     <ClCompile Include="src\common\wincmn.cpp" />
     <ClCompile Include="src\common\xpmdecod.cpp" />
     <ClCompile Include="src\msw\accel.cpp" />
+    <ClCompile Include="src\msw\anybutton.cpp" />
+    <ClCompile Include="src\msw\nonownedwnd.cpp" />
     <ClCompile Include="src\msw\ole\access.cpp" />
     <ClCompile Include="src\msw\ole\activex.cpp">
       <PrecompiledHeader>
@@ -255,6 +262,7 @@
     </ClCompile>
     <ClCompile Include="src\msw\ownerdrw.cpp" />
     <ClCompile Include="src\msw\palette.cpp" />
+    <ClCompile Include="src\msw\panel.cpp" />
     <ClCompile Include="src\msw\pen.cpp" />
     <ClCompile Include="src\msw\popupwin.cpp" />
     <ClCompile Include="src\msw\printdlg.cpp">
@@ -284,6 +292,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="src\msw\textentry.cpp" />
     <ClCompile Include="src\msw\tglbtn.cpp" />
     <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\tooltip.cpp" />
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
index ad136d9ab..7ba1d4bd9 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -687,6 +687,33 @@
     <ClCompile Include="src\msw\timer.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\common\panelcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\panel.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nonownedwnd.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\anybutton.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\btncmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stattextcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statboxcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textentrycmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\textentry.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h">