diff --git a/Project64.sln b/Project64.sln
index 7dfb6a744..0984cbcd6 100644
Binary files a/Project64.sln and b/Project64.sln differ
diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
index ce3c88474..a2668b8cf 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj	
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -42,6 +42,7 @@
       <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -53,6 +54,7 @@
     <ClCompile Include="src\common\cmdline.cpp" />
     <ClCompile Include="src\common\config.cpp" />
     <ClCompile Include="src\common\convauto.cpp" />
+    <ClCompile Include="src\common\datacmn.cpp" />
     <ClCompile Include="src\common\datetime.cpp" />
     <ClCompile Include="src\common\datstrm.cpp" />
     <ClCompile Include="src\common\dircmn.cpp" />
@@ -115,6 +117,7 @@
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\variant.cpp" />
     <ClCompile Include="src\common\wfstream.cpp" />
+    <ClCompile Include="src\common\wxchar.cpp" />
     <ClCompile Include="src\common\xti.cpp" />
     <ClCompile Include="src\common\xtistrm.cpp" />
     <ClCompile Include="src\common\zipstrm.cpp" />
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
index 9ffd46ae0..efdb44d8b 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -288,6 +288,12 @@
     <ClCompile Include="src\msw\volume.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\common\datacmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wxchar.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 813d250ab..22e255a88 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -44,7 +44,11 @@
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
+    <Lib>
+      <AdditionalDependencies>Comctl32.lib;Rpcrt4.lib</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\common\accesscmn.cpp" />
@@ -80,6 +84,7 @@
     </ClCompile>
     <ClCompile Include="src\common\effects.cpp" />
     <ClCompile Include="src\common\event.cpp" />
+    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\fddlgcmn.cpp" />
     <ClCompile Include="src\common\filepickercmn.cpp" />
     <ClCompile Include="src\common\fldlgcmn.cpp" />
@@ -133,6 +138,7 @@
     <ClCompile Include="src\common\stockitem.cpp" />
     <ClCompile Include="src\common\tbarbase.cpp" />
     <ClCompile Include="src\common\textcmn.cpp" />
+    <ClCompile Include="src\common\timercmn.cpp" />
     <ClCompile Include="src\common\toplvcmn.cpp" />
     <ClCompile Include="src\common\treebase.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
@@ -141,7 +147,9 @@
     <ClCompile Include="src\common\valtext.cpp" />
     <ClCompile Include="src\common\wincmn.cpp" />
     <ClCompile Include="src\common\xpmdecod.cpp" />
+    <ClCompile Include="src\generic\panelg.cpp" />
     <ClCompile Include="src\msw\accel.cpp" />
+    <ClCompile Include="src\msw\gsockmsw.cpp" />
     <ClCompile Include="src\msw\ole\access.cpp" />
     <ClCompile Include="src\msw\ole\activex.cpp">
       <PrecompiledHeader>
@@ -242,14 +250,18 @@
     <ClCompile Include="src\msw\renderer.cpp" />
     <ClCompile Include="src\msw\scrolbar.cpp" />
     <ClCompile Include="src\msw\settings.cpp" />
+    <ClCompile Include="src\msw\slider95.cpp" />
     <ClCompile Include="src\msw\spinbutt.cpp" />
     <ClCompile Include="src\msw\spinctrl.cpp" />
     <ClCompile Include="src\msw\statbmp.cpp" />
     <ClCompile Include="src\msw\statbox.cpp" />
+    <ClCompile Include="src\msw\statbr95.cpp" />
     <ClCompile Include="src\msw\statline.cpp" />
     <ClCompile Include="src\msw\stattext.cpp" />
+    <ClCompile Include="src\msw\tbar95.cpp" />
     <ClCompile Include="src\msw\textctrl.cpp" />
     <ClCompile Include="src\msw\tglbtn.cpp" />
+    <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\tooltip.cpp" />
     <ClCompile Include="src\msw\toplevel.cpp" />
     <ClCompile Include="src\msw\treectrl.cpp" />
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
index 9f3d8dda4..475735b49 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -678,6 +678,30 @@
     <ClCompile Include="src\generic\vscroll.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\generic\panelg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statbr95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\slider95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\tbar95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gsockmsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\evtloopcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\timercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\timer.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h">
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj
index c488db3a3..998623bc3 100644
--- a/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxjpeg</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxjpeg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxjpegd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxjpegd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj
index ca0c0d0a2..dd9f2f4f6 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxpng</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxpng</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxpngd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxpngd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj
index db40fd576..937374cbb 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxzlib</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxzlib</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxzlibd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxzlibd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>