diff --git a/Project64.sln b/Project64.sln
index 03fd2c8f2..7dfb6a744 100644
Binary files a/Project64.sln and b/Project64.sln differ
diff --git a/Source/3rd Party/sdl/sdl2.vcproj b/Source/3rd Party/sdl/sdl2.vcproj
index dad6c2dad..b36964bd3 100644
--- a/Source/3rd Party/sdl/sdl2.vcproj	
+++ b/Source/3rd Party/sdl/sdl2.vcproj	
@@ -132,51 +132,51 @@
 			Name="API Headers"
 			>
 			<File
-				RelativePath="..\..\include\SDL.h"
+				RelativePath=".\include\SDL.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_assert.h"
+				RelativePath=".\include\SDL_assert.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_atomic.h"
+				RelativePath=".\include\SDL_atomic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_audio.h"
+				RelativePath=".\include\SDL_audio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_bits.h"
+				RelativePath=".\include\SDL_bits.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_blendmode.h"
+				RelativePath=".\include\SDL_blendmode.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_clipboard.h"
+				RelativePath=".\include\SDL_clipboard.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_config.h"
+				RelativePath=".\include\SDL_config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_config_windows.h"
+				RelativePath=".\include\SDL_config_windows.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_copying.h"
+				RelativePath=".\include\SDL_copying.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_cpuinfo.h"
+				RelativePath=".\include\SDL_cpuinfo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_egl.h"
+				RelativePath=".\include\SDL_egl.h"
 				>
 			</File>
 			<File
@@ -184,163 +184,163 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_endian.h"
+				RelativePath=".\include\SDL_endian.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_error.h"
+				RelativePath=".\include\SDL_error.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_events.h"
+				RelativePath=".\include\SDL_events.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_filesystem.h"
+				RelativePath=".\include\SDL_filesystem.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_gamecontroller.h"
+				RelativePath=".\include\SDL_gamecontroller.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_gesture.h"
+				RelativePath=".\include\SDL_gesture.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_haptic.h"
+				RelativePath=".\include\SDL_haptic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_hints.h"
+				RelativePath=".\include\SDL_hints.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_joystick.h"
+				RelativePath=".\include\SDL_joystick.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_keyboard.h"
+				RelativePath=".\include\SDL_keyboard.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_keycode.h"
+				RelativePath=".\include\SDL_keycode.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_loadso.h"
+				RelativePath=".\include\SDL_loadso.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_log.h"
+				RelativePath=".\include\SDL_log.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_main.h"
+				RelativePath=".\include\SDL_main.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_messagebox.h"
+				RelativePath=".\include\SDL_messagebox.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_mouse.h"
+				RelativePath=".\include\SDL_mouse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_mutex.h"
+				RelativePath=".\include\SDL_mutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_name.h"
+				RelativePath=".\include\SDL_name.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_opengl.h"
+				RelativePath=".\include\SDL_opengl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_opengles.h"
+				RelativePath=".\include\SDL_opengles.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_pixels.h"
+				RelativePath=".\include\SDL_pixels.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_platform.h"
+				RelativePath=".\include\SDL_platform.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_power.h"
+				RelativePath=".\include\SDL_power.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_quit.h"
+				RelativePath=".\include\SDL_quit.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_rect.h"
+				RelativePath=".\include\SDL_rect.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_render.h"
+				RelativePath=".\include\SDL_render.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_revision.h"
+				RelativePath=".\include\SDL_revision.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_rwops.h"
+				RelativePath=".\include\SDL_rwops.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_scancode.h"
+				RelativePath=".\include\SDL_scancode.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_shape.h"
+				RelativePath=".\include\SDL_shape.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_stdinc.h"
+				RelativePath=".\include\SDL_stdinc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_surface.h"
+				RelativePath=".\include\SDL_surface.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_system.h"
+				RelativePath=".\include\SDL_system.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_syswm.h"
+				RelativePath=".\include\SDL_syswm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_thread.h"
+				RelativePath=".\include\SDL_thread.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_timer.h"
+				RelativePath=".\include\SDL_timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_touch.h"
+				RelativePath=".\include\SDL_touch.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_types.h"
+				RelativePath=".\include\SDL_types.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_version.h"
+				RelativePath=".\include\SDL_version.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SDL_video.h"
+				RelativePath=".\include\SDL_video.h"
 				>
 			</File>
 			<File
diff --git a/Source/3rd Party/sdl/sdl2.vcxproj b/Source/3rd Party/sdl/sdl2.vcxproj
index 28470b937..f45391b9b 100644
--- a/Source/3rd Party/sdl/sdl2.vcxproj	
+++ b/Source/3rd Party/sdl/sdl2.vcxproj	
@@ -35,78 +35,271 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader />
-      <DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>include;$(Root)Source/3rd Party/directx/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
+    <Lib>
+      <AdditionalDependencies>version.lib;imm32.lib;winmm.lib</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="7z.h" />
-    <ClInclude Include="7zAlloc.h" />
-    <ClInclude Include="7zBuf.h" />
-    <ClInclude Include="7zCrc.h" />
-    <ClInclude Include="7zFile.h" />
-    <ClInclude Include="7zTypes.h" />
-    <ClInclude Include="7zVersion.h" />
-    <ClInclude Include="Alloc.h" />
-    <ClInclude Include="Bcj2.h" />
-    <ClInclude Include="Bra.h" />
-    <ClInclude Include="CpuArch.h" />
-    <ClInclude Include="Delta.h" />
-    <ClInclude Include="LzFind.h" />
-    <ClInclude Include="LzFindMt.h" />
-    <ClInclude Include="LzHash.h" />
-    <ClInclude Include="Lzma2Dec.h" />
-    <ClInclude Include="Lzma2Enc.h" />
-    <ClInclude Include="Lzma86.h" />
-    <ClInclude Include="LzmaDec.h" />
-    <ClInclude Include="LzmaEnc.h" />
-    <ClInclude Include="LzmaLib.h" />
-    <ClInclude Include="MtCoder.h" />
-    <ClInclude Include="Ppmd.h" />
-    <ClInclude Include="Ppmd7.h" />
-    <ClInclude Include="RotateDefs.h" />
-    <ClInclude Include="Sha256.h" />
-    <ClInclude Include="Threads.h" />
-    <ClInclude Include="Types.h" />
-    <ClInclude Include="Xz.h" />
-    <ClInclude Include="XzCrc64.h" />
-    <ClInclude Include="XzEnc.h" />
+    <ClInclude Include=".\include\SDL.h" />
+    <ClInclude Include=".\include\SDL_assert.h" />
+    <ClInclude Include=".\include\SDL_atomic.h" />
+    <ClInclude Include=".\include\SDL_audio.h" />
+    <ClInclude Include=".\include\SDL_bits.h" />
+    <ClInclude Include=".\include\SDL_blendmode.h" />
+    <ClInclude Include=".\include\SDL_clipboard.h" />
+    <ClInclude Include=".\include\SDL_config.h" />
+    <ClInclude Include=".\include\SDL_config_windows.h" />
+    <ClInclude Include=".\include\SDL_copying.h" />
+    <ClInclude Include=".\include\SDL_cpuinfo.h" />
+    <ClInclude Include=".\include\SDL_egl.h" />
+    <ClInclude Include=".\include\SDL_endian.h" />
+    <ClInclude Include=".\include\SDL_error.h" />
+    <ClInclude Include=".\include\SDL_events.h" />
+    <ClInclude Include=".\include\SDL_filesystem.h" />
+    <ClInclude Include=".\include\SDL_gamecontroller.h" />
+    <ClInclude Include=".\include\SDL_gesture.h" />
+    <ClInclude Include=".\include\SDL_haptic.h" />
+    <ClInclude Include=".\include\SDL_hints.h" />
+    <ClInclude Include=".\include\SDL_joystick.h" />
+    <ClInclude Include=".\include\SDL_keyboard.h" />
+    <ClInclude Include=".\include\SDL_keycode.h" />
+    <ClInclude Include=".\include\SDL_loadso.h" />
+    <ClInclude Include=".\include\SDL_log.h" />
+    <ClInclude Include=".\include\SDL_main.h" />
+    <ClInclude Include=".\include\SDL_messagebox.h" />
+    <ClInclude Include=".\include\SDL_mouse.h" />
+    <ClInclude Include=".\include\SDL_mutex.h" />
+    <ClInclude Include=".\include\SDL_name.h" />
+    <ClInclude Include=".\include\SDL_opengl.h" />
+    <ClInclude Include=".\include\SDL_opengles.h" />
+    <ClInclude Include=".\include\SDL_pixels.h" />
+    <ClInclude Include=".\include\SDL_platform.h" />
+    <ClInclude Include=".\include\SDL_power.h" />
+    <ClInclude Include=".\include\SDL_quit.h" />
+    <ClInclude Include=".\include\SDL_rect.h" />
+    <ClInclude Include=".\include\SDL_render.h" />
+    <ClInclude Include=".\include\SDL_revision.h" />
+    <ClInclude Include=".\include\SDL_rwops.h" />
+    <ClInclude Include=".\include\SDL_scancode.h" />
+    <ClInclude Include=".\include\SDL_shape.h" />
+    <ClInclude Include=".\include\SDL_stdinc.h" />
+    <ClInclude Include=".\include\SDL_surface.h" />
+    <ClInclude Include=".\include\SDL_system.h" />
+    <ClInclude Include=".\include\SDL_syswm.h" />
+    <ClInclude Include=".\include\SDL_thread.h" />
+    <ClInclude Include=".\include\SDL_timer.h" />
+    <ClInclude Include=".\include\SDL_touch.h" />
+    <ClInclude Include=".\include\SDL_types.h" />
+    <ClInclude Include=".\include\SDL_version.h" />
+    <ClInclude Include=".\include\SDL_video.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\audio\directsound\directx.h" />
+    <ClInclude Include="src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="src\audio\SDL_audiomem.h" />
+    <ClInclude Include="src\audio\SDL_audio_c.h" />
+    <ClInclude Include="src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="src\audio\SDL_wave.h" />
+    <ClInclude Include="src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="src\core\windows\SDL_windows.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="src\events\blank_cursor.h" />
+    <ClInclude Include="src\events\default_cursor.h" />
+    <ClInclude Include="src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="src\events\SDL_events_c.h" />
+    <ClInclude Include="src\events\SDL_gesture_c.h" />
+    <ClInclude Include="src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="src\events\SDL_mouse_c.h" />
+    <ClInclude Include="src\events\SDL_sysevents.h" />
+    <ClInclude Include="src\events\SDL_touch_c.h" />
+    <ClInclude Include="src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="src\libm\math.h" />
+    <ClInclude Include="src\libm\math_private.h" />
+    <ClInclude Include="src\render\mmx.h" />
+    <ClInclude Include="src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="src\render\SDL_d3dmath.h" />
+    <ClInclude Include="src\render\SDL_sysrender.h" />
+    <ClInclude Include="src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="src\render\software\SDL_blendline.h" />
+    <ClInclude Include="src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="src\render\software\SDL_draw.h" />
+    <ClInclude Include="src\render\software\SDL_drawline.h" />
+    <ClInclude Include="src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="src\render\software\SDL_rotate.h" />
+    <ClInclude Include="src\SDL_error_c.h" />
+    <ClInclude Include="src\SDL_hints_c.h" />
+    <ClInclude Include="src\thread\SDL_systhread.h" />
+    <ClInclude Include="src\thread\SDL_thread_c.h" />
+    <ClInclude Include="src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="src\timer\SDL_systimer.h" />
+    <ClInclude Include="src\timer\SDL_timer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="src\video\SDL_blit.h" />
+    <ClInclude Include="src\video\SDL_blit_auto.h" />
+    <ClInclude Include="src\video\SDL_blit_copy.h" />
+    <ClInclude Include="src\video\SDL_blit_slow.h" />
+    <ClInclude Include="src\video\sdl_egl_c.h" />
+    <ClInclude Include="src\video\SDL_glesfuncs.h" />
+    <ClInclude Include="src\video\SDL_glfuncs.h" />
+    <ClInclude Include="src\video\SDL_pixels_c.h" />
+    <ClInclude Include="src\video\SDL_rect_c.h" />
+    <ClInclude Include="src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="src\video\SDL_shape_internals.h" />
+    <ClInclude Include="src\video\SDL_sysvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="src\video\windows\wmmsg.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="7zAlloc.c" />
-    <ClCompile Include="7zBuf.c" />
-    <ClCompile Include="7zBuf2.c" />
-    <ClCompile Include="7zCrc.c" />
-    <ClCompile Include="7zCrcOpt.c" />
-    <ClCompile Include="7zDec.c" />
-    <ClCompile Include="7zFile.c" />
-    <ClCompile Include="7zIn.c" />
-    <ClCompile Include="7zStream.c" />
-    <ClCompile Include="Alloc.c" />
-    <ClCompile Include="Bcj2.c" />
-    <ClCompile Include="Bra.c" />
-    <ClCompile Include="Bra86.c" />
-    <ClCompile Include="BraIA64.c" />
-    <ClCompile Include="CpuArch.c" />
-    <ClCompile Include="Delta.c" />
-    <ClCompile Include="LzFind.c" />
-    <ClCompile Include="LzFindMt.c" />
-    <ClCompile Include="Lzma2Dec.c" />
-    <ClCompile Include="Lzma2Enc.c" />
-    <ClCompile Include="Lzma86Dec.c" />
-    <ClCompile Include="Lzma86Enc.c" />
-    <ClCompile Include="LzmaDec.c" />
-    <ClCompile Include="LzmaEnc.c" />
-    <ClCompile Include="LzmaLib.c" />
-    <ClCompile Include="MtCoder.c" />
-    <ClCompile Include="Ppmd7.c" />
-    <ClCompile Include="Ppmd7Dec.c" />
-    <ClCompile Include="Ppmd7Enc.c" />
-    <ClCompile Include="Sha256.c" />
-    <ClCompile Include="Threads.c" />
-    <ClCompile Include="Xz.c" />
-    <ClCompile Include="XzCrc64.c" />
-    <ClCompile Include="XzDec.c" />
-    <ClCompile Include="XzEnc.c" />
-    <ClCompile Include="XzIn.c" />
+    <ClCompile Include="src\atomic\SDL_atomic.c" />
+    <ClCompile Include="src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="src\audio\SDL_audio.c" />
+    <ClCompile Include="src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="src\audio\SDL_audiodev.c" />
+    <ClCompile Include="src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="src\audio\SDL_mixer.c" />
+    <ClCompile Include="src\audio\SDL_wave.c" />
+    <ClCompile Include="src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="src\audio\xaudio2\SDL_xaudio2.c" />
+    <ClCompile Include="src\core\windows\SDL_windows.c" />
+    <ClCompile Include="src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="src\events\SDL_dropevents.c" />
+    <ClCompile Include="src\events\SDL_events.c" />
+    <ClCompile Include="src\events\SDL_gesture.c" />
+    <ClCompile Include="src\events\SDL_keyboard.c" />
+    <ClCompile Include="src\events\SDL_mouse.c" />
+    <ClCompile Include="src\events\SDL_quit.c" />
+    <ClCompile Include="src\events\SDL_touch.c" />
+    <ClCompile Include="src\events\SDL_windowevents.c" />
+    <ClCompile Include="src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="src\file\SDL_rwops.c" />
+    <ClCompile Include="src\haptic\SDL_haptic.c" />
+    <ClCompile Include="src\haptic\windows\SDL_syshaptic.c" />
+    <ClCompile Include="src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="src\joystick\SDL_joystick.c" />
+    <ClCompile Include="src\joystick\windows\SDL_dxjoystick.c" />
+    <ClCompile Include="src\joystick\windows\SDL_mmjoystick.c" />
+    <ClCompile Include="src\libm\e_atan2.c" />
+    <ClCompile Include="src\libm\e_log.c" />
+    <ClCompile Include="src\libm\e_pow.c" />
+    <ClCompile Include="src\libm\e_rem_pio2.c" />
+    <ClCompile Include="src\libm\e_sqrt.c" />
+    <ClCompile Include="src\libm\k_cos.c" />
+    <ClCompile Include="src\libm\k_rem_pio2.c" />
+    <ClCompile Include="src\libm\k_sin.c" />
+    <ClCompile Include="src\libm\s_atan.c" />
+    <ClCompile Include="src\libm\s_copysign.c" />
+    <ClCompile Include="src\libm\s_cos.c" />
+    <ClCompile Include="src\libm\s_fabs.c" />
+    <ClCompile Include="src\libm\s_floor.c" />
+    <ClCompile Include="src\libm\s_scalbn.c" />
+    <ClCompile Include="src\libm\s_sin.c" />
+    <ClCompile Include="src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="src\power\SDL_power.c" />
+    <ClCompile Include="src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="src\render\SDL_d3dmath.c" />
+    <ClCompile Include="src\render\SDL_render.c" />
+    <ClCompile Include="src\render\SDL_yuv_mmx.c" />
+    <ClCompile Include="src\render\SDL_yuv_sw.c" />
+    <ClCompile Include="src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="src\render\software\SDL_blendline.c" />
+    <ClCompile Include="src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="src\render\software\SDL_drawline.c" />
+    <ClCompile Include="src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="src\render\software\SDL_rotate.c" />
+    <ClCompile Include="src\SDL.c" />
+    <ClCompile Include="src\SDL_assert.c" />
+    <ClCompile Include="src\SDL_error.c" />
+    <ClCompile Include="src\SDL_hints.c" />
+    <ClCompile Include="src\SDL_log.c" />
+    <ClCompile Include="src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="src\stdlib\SDL_string.c" />
+    <ClCompile Include="src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="src\thread\SDL_thread.c" />
+    <ClCompile Include="src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="src\timer\SDL_timer.c" />
+    <ClCompile Include="src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="src\video\SDL_blit.c" />
+    <ClCompile Include="src\video\SDL_blit_0.c" />
+    <ClCompile Include="src\video\SDL_blit_1.c" />
+    <ClCompile Include="src\video\SDL_blit_A.c" />
+    <ClCompile Include="src\video\SDL_blit_auto.c" />
+    <ClCompile Include="src\video\SDL_blit_copy.c" />
+    <ClCompile Include="src\video\SDL_blit_N.c" />
+    <ClCompile Include="src\video\SDL_blit_slow.c" />
+    <ClCompile Include="src\video\SDL_bmp.c" />
+    <ClCompile Include="src\video\SDL_clipboard.c" />
+    <ClCompile Include="src\video\SDL_egl.c" />
+    <ClCompile Include="src\video\SDL_fillrect.c" />
+    <ClCompile Include="src\video\SDL_pixels.c" />
+    <ClCompile Include="src\video\SDL_rect.c" />
+    <ClCompile Include="src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="src\video\SDL_shape.c" />
+    <ClCompile Include="src\video\SDL_stretch.c" />
+    <ClCompile Include="src\video\SDL_surface.c" />
+    <ClCompile Include="src\video\SDL_video.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="src\video\windows\SDL_windowswindow.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\main\windows\version.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/sdl/sdl2.vcxproj.filters b/Source/3rd Party/sdl/sdl2.vcxproj.filters
index 641392304..bb76d082d 100644
--- a/Source/3rd Party/sdl/sdl2.vcxproj.filters	
+++ b/Source/3rd Party/sdl/sdl2.vcxproj.filters	
@@ -1,218 +1,376 @@
 <?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>{5eb82abf-a87d-43e6-b765-7e70ec0a5df0}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{a0c6ef27-6c55-4c16-99d4-e912bc363ca5}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    <Filter Include="API Headers">
+      <UniqueIdentifier>{80dab642-b512-42eb-b781-c1d3c091fdb1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="7z.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zAlloc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_assert.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zBuf.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_atomic.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zCrc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_audio.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zFile.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_bits.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zTypes.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_blendmode.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="7zVersion.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_clipboard.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Alloc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_config.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Bcj2.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_config_windows.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Bra.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_copying.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="CpuArch.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_cpuinfo.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Delta.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_egl.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzFind.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="src\video\sdl_egl_c.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzFindMt.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_endian.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzHash.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_error.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Lzma2Dec.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_events.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Lzma2Enc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_filesystem.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Lzma86.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_gamecontroller.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzmaDec.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_gesture.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzmaEnc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_haptic.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="LzmaLib.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_hints.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="MtCoder.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_joystick.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Ppmd.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_keyboard.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Ppmd7.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_keycode.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="RotateDefs.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_loadso.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Sha256.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_log.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Threads.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_main.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Types.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_messagebox.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xz.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_mouse.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="XzCrc64.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_mutex.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="XzEnc.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include=".\include\SDL_name.h">
+      <Filter>API Headers</Filter>
     </ClInclude>
+    <ClInclude Include=".\include\SDL_opengl.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_opengles.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_pixels.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_platform.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_power.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_quit.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_rect.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_render.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_revision.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_rwops.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_scancode.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_shape.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_stdinc.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_surface.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_system.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_syswm.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_thread.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_timer.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_touch.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_types.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_version.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_video.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\windows\SDL_windowsopengles.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\events\blank_cursor.h" />
+    <ClInclude Include="src\events\default_cursor.h" />
+    <ClInclude Include="src\audio\directsound\directx.h" />
+    <ClInclude Include="src\libm\math.h" />
+    <ClInclude Include="src\libm\math_private.h" />
+    <ClInclude Include="src\render\mmx.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\audio\SDL_audio_c.h" />
+    <ClInclude Include="src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="src\audio\SDL_audiomem.h" />
+    <ClInclude Include="src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="src\render\software\SDL_blendline.h" />
+    <ClInclude Include="src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="src\video\SDL_blit.h" />
+    <ClInclude Include="src\video\SDL_blit_auto.h" />
+    <ClInclude Include="src\video\SDL_blit_copy.h" />
+    <ClInclude Include="src\video\SDL_blit_slow.h" />
+    <ClInclude Include="src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="src\render\SDL_d3dmath.h" />
+    <ClInclude Include="src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="src\render\software\SDL_draw.h" />
+    <ClInclude Include="src\render\software\SDL_drawline.h" />
+    <ClInclude Include="src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="src\SDL_error_c.h" />
+    <ClInclude Include="src\events\SDL_events_c.h" />
+    <ClInclude Include="src\events\SDL_gesture_c.h" />
+    <ClInclude Include="src\video\SDL_glesfuncs.h" />
+    <ClInclude Include="src\video\SDL_glfuncs.h" />
+    <ClInclude Include="src\SDL_hints_c.h" />
+    <ClInclude Include="src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="src\events\SDL_mouse_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="src\video\SDL_pixels_c.h" />
+    <ClInclude Include="src\video\SDL_rect_c.h" />
+    <ClInclude Include="src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="src\render\software\SDL_rotate.h" />
+    <ClInclude Include="src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="src\video\SDL_shape_internals.h" />
+    <ClInclude Include="src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="src\events\SDL_sysevents.h" />
+    <ClInclude Include="src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="src\render\SDL_sysrender.h" />
+    <ClInclude Include="src\thread\SDL_systhread.h" />
+    <ClInclude Include="src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="src\timer\SDL_systimer.h" />
+    <ClInclude Include="src\video\SDL_sysvideo.h" />
+    <ClInclude Include="src\thread\SDL_thread_c.h" />
+    <ClInclude Include="src\timer\SDL_timer_c.h" />
+    <ClInclude Include="src\events\SDL_touch_c.h" />
+    <ClInclude Include="src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="src\audio\SDL_wave.h" />
+    <ClInclude Include="src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="src\core\windows\SDL_windows.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="src\video\windows\wmmsg.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="7zAlloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zBuf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zBuf2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zCrc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zCrcOpt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zDec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zFile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zIn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="7zStream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bcj2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bra.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bra86.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BraIA64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CpuArch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Delta.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzFind.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzFindMt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lzma2Dec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lzma2Enc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lzma86Dec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Lzma86Enc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaDec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaEnc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaLib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MtCoder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Ppmd7.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Ppmd7Dec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Ppmd7Enc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Sha256.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Threads.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Xz.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XzCrc64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XzDec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XzEnc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="XzIn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="src\libm\e_atan2.c" />
+    <ClCompile Include="src\libm\e_log.c" />
+    <ClCompile Include="src\libm\e_pow.c" />
+    <ClCompile Include="src\libm\e_rem_pio2.c" />
+    <ClCompile Include="src\libm\e_sqrt.c" />
+    <ClCompile Include="src\libm\k_cos.c" />
+    <ClCompile Include="src\libm\k_rem_pio2.c" />
+    <ClCompile Include="src\libm\k_sin.c" />
+    <ClCompile Include="src\libm\s_atan.c" />
+    <ClCompile Include="src\libm\s_copysign.c" />
+    <ClCompile Include="src\libm\s_cos.c" />
+    <ClCompile Include="src\libm\s_fabs.c" />
+    <ClCompile Include="src\libm\s_floor.c" />
+    <ClCompile Include="src\libm\s_scalbn.c" />
+    <ClCompile Include="src\libm\s_sin.c" />
+    <ClCompile Include="src\SDL.c" />
+    <ClCompile Include="src\SDL_assert.c" />
+    <ClCompile Include="src\atomic\SDL_atomic.c" />
+    <ClCompile Include="src\audio\SDL_audio.c" />
+    <ClCompile Include="src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="src\audio\SDL_audiodev.c" />
+    <ClCompile Include="src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="src\render\software\SDL_blendline.c" />
+    <ClCompile Include="src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="src\video\SDL_blit.c" />
+    <ClCompile Include="src\video\SDL_blit_0.c" />
+    <ClCompile Include="src\video\SDL_blit_1.c" />
+    <ClCompile Include="src\video\SDL_blit_A.c" />
+    <ClCompile Include="src\video\SDL_blit_auto.c" />
+    <ClCompile Include="src\video\SDL_blit_copy.c" />
+    <ClCompile Include="src\video\SDL_blit_N.c" />
+    <ClCompile Include="src\video\SDL_blit_slow.c" />
+    <ClCompile Include="src\video\SDL_bmp.c" />
+    <ClCompile Include="src\video\SDL_clipboard.c" />
+    <ClCompile Include="src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="src\render\SDL_d3dmath.c" />
+    <ClCompile Include="src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="src\render\software\SDL_drawline.c" />
+    <ClCompile Include="src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="src\events\SDL_dropevents.c" />
+    <ClCompile Include="src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="src\joystick\windows\SDL_dxjoystick.c" />
+    <ClCompile Include="src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="src\video\SDL_egl.c" />
+    <ClCompile Include="src\SDL_error.c" />
+    <ClCompile Include="src\events\SDL_events.c" />
+    <ClCompile Include="src\video\SDL_fillrect.c" />
+    <ClCompile Include="src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="src\events\SDL_gesture.c" />
+    <ClCompile Include="src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="src\haptic\SDL_haptic.c" />
+    <ClCompile Include="src\SDL_hints.c" />
+    <ClCompile Include="src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="src\joystick\SDL_joystick.c" />
+    <ClCompile Include="src\events\SDL_keyboard.c" />
+    <ClCompile Include="src\SDL_log.c" />
+    <ClCompile Include="src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="src\audio\SDL_mixer.c" />
+    <ClCompile Include="src\joystick\windows\SDL_mmjoystick.c" />
+    <ClCompile Include="src\events\SDL_mouse.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="src\video\SDL_pixels.c" />
+    <ClCompile Include="src\power\SDL_power.c" />
+    <ClCompile Include="src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="src\events\SDL_quit.c" />
+    <ClCompile Include="src\video\SDL_rect.c" />
+    <ClCompile Include="src\render\SDL_render.c" />
+    <ClCompile Include="src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="src\render\software\SDL_rotate.c" />
+    <ClCompile Include="src\file\SDL_rwops.c" />
+    <ClCompile Include="src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="src\video\SDL_shape.c" />
+    <ClCompile Include="src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="src\video\SDL_stretch.c" />
+    <ClCompile Include="src\stdlib\SDL_string.c" />
+    <ClCompile Include="src\video\SDL_surface.c" />
+    <ClCompile Include="src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="src\haptic\windows\SDL_syshaptic.c" />
+    <ClCompile Include="src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="src\thread\SDL_thread.c" />
+    <ClCompile Include="src\timer\SDL_timer.c" />
+    <ClCompile Include="src\events\SDL_touch.c" />
+    <ClCompile Include="src\video\SDL_video.c" />
+    <ClCompile Include="src\audio\SDL_wave.c" />
+    <ClCompile Include="src\events\SDL_windowevents.c" />
+    <ClCompile Include="src\core\windows\SDL_windows.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="src\audio\xaudio2\SDL_xaudio2.c" />
+    <ClCompile Include="src\render\SDL_yuv_mmx.c" />
+    <ClCompile Include="src\render\SDL_yuv_sw.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\main\windows\version.rc" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj
index 902bc07b9..663b12cd2 100644
--- a/Source/Glide64/Glide64.vcxproj
+++ b/Source/Glide64/Glide64.vcxproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source\3rd Party\sdl\include;$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;$(Root)Source/Glitch64/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
@@ -85,7 +85,6 @@
     <ClInclude Include="DepthBufferRender.h" />
     <ClInclude Include="Ext_TxFilter.h" />
     <ClInclude Include="FBtoScreen.h" />
-    <ClInclude Include="Gfx #1.3.h" />
     <ClInclude Include="GlideExtensions.h" />
     <ClInclude Include="Keys.h" />
     <ClInclude Include="rdp.h" />
@@ -96,16 +95,13 @@
   <ItemGroup>
     <ClCompile Include="CRC.cpp" />
     <ClCompile Include="TexCache.cpp" />
-    <ClCompile Include="Texture.asm.cpp" />
     <ClCompile Include="Config.cpp" />
     <ClCompile Include="3dmath.cpp" />
-    <ClCompile Include="3dmathSIMD.asm.cpp" />
     <ClCompile Include="Combine.cpp" />
     <ClCompile Include="Debugger.cpp" />
     <ClCompile Include="DepthBufferRender.cpp" />
     <ClCompile Include="Ext_TxFilter.cpp" />
     <ClCompile Include="FBtoScreen.cpp" />
-    <ClCompile Include="FixedPoint.asm.cpp" />
     <ClCompile Include="Keys.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="rdp.cpp" />
@@ -128,6 +124,9 @@
     <ResourceCompile Include="Glide64.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\3rd Party\sdl\sdl2.vcxproj">
+      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\3rd Party\wx\wx_base.vcxproj">
       <Project>{427f1dcd-3bed-4010-9322-077a4c06d871}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters
index 3641fcf10..abe1572ee 100644
--- a/Source/Glide64/Glide64.vcxproj.filters
+++ b/Source/Glide64/Glide64.vcxproj.filters
@@ -121,7 +121,6 @@
     <ClInclude Include="DepthBufferRender.h" />
     <ClInclude Include="Ext_TxFilter.h" />
     <ClInclude Include="FBtoScreen.h" />
-    <ClInclude Include="Gfx #1.3.h" />
     <ClInclude Include="GlideExtensions.h" />
     <ClInclude Include="Keys.h" />
     <ClInclude Include="rdp.h" />
@@ -136,20 +135,15 @@
     <ClCompile Include="TexCache.cpp">
       <Filter>Texture</Filter>
     </ClCompile>
-    <ClCompile Include="Texture.asm.cpp">
-      <Filter>Texture</Filter>
-    </ClCompile>
     <ClCompile Include="Config.cpp">
       <Filter>Config</Filter>
     </ClCompile>
     <ClCompile Include="3dmath.cpp" />
-    <ClCompile Include="3dmathSIMD.asm.cpp" />
     <ClCompile Include="Combine.cpp" />
     <ClCompile Include="Debugger.cpp" />
     <ClCompile Include="DepthBufferRender.cpp" />
     <ClCompile Include="Ext_TxFilter.cpp" />
     <ClCompile Include="FBtoScreen.cpp" />
-    <ClCompile Include="FixedPoint.asm.cpp" />
     <ClCompile Include="Keys.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="rdp.cpp" />
diff --git a/Source/Glitch64/Glitch64.vcxproj b/Source/Glitch64/Glitch64.vcxproj
index abab01241..2df29fbf4 100644
--- a/Source/Glitch64/Glitch64.vcxproj
+++ b/Source/Glitch64/Glitch64.vcxproj
@@ -33,7 +33,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/sdl/include;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
     </ClCompile>
     <Lib>
@@ -41,14 +41,12 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="3dfx-mangling.h" />
-    <ClInclude Include="main.h" />
+    <ClCompile Include="OGLcombiner.cpp" />
+    <ClCompile Include="OGLgeometry.cpp" />
+    <ClCompile Include="OGLglitchmain.cpp" />
+    <ClCompile Include="OGLtextures.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="combiner.cpp" />
-    <ClCompile Include="geometry.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="textures.cpp" />
-    <ClCompile Include="vram.cpp" />
+    <ClInclude Include="glitchmain.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Glitch64/Glitch64.vcxproj.filters b/Source/Glitch64/Glitch64.vcxproj.filters
index 76f38032a..ce5a98aad 100644
--- a/Source/Glitch64/Glitch64.vcxproj.filters
+++ b/Source/Glitch64/Glitch64.vcxproj.filters
@@ -11,28 +11,22 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="3dfx-mangling.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
+    <ClCompile Include="OGLcombiner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLgeometry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLglitchmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLtextures.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="combiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="textures.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClInclude Include="glitchmain.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file