diff --git a/Src/Inputs/InputSystem.cpp b/Src/Inputs/InputSystem.cpp
index 7f03750..8e6e7aa 100644
--- a/Src/Inputs/InputSystem.cpp
+++ b/Src/Inputs/InputSystem.cpp
@@ -418,6 +418,7 @@ CInputSystem::CInputSystem(const char *systemName)
     m_dispW(0),
     m_dispH(0),
     m_grabMouse(false),
+    m_window(NULL),
     name(systemName)
 {
   m_emptySource = new CMultiInputSource();
@@ -1548,6 +1549,14 @@ CInputSource *CInputSystem::CreateJoySource(int joyNum, EJoyPart joyPart)
   return NULL;
 }
 
+
+void CInputSystem::SetWindow(SDL_Window* window)
+{
+  if (m_window != NULL)
+    ErrorLog("CDirectInputSystem::setWindow: window already set");
+  m_window = window;
+}
+
 bool CInputSystem::Initialize()
 {
   // Initialize subclass
diff --git a/Src/Inputs/InputSystem.h b/Src/Inputs/InputSystem.h
index 4d861ee..78d4bac 100644
--- a/Src/Inputs/InputSystem.h
+++ b/Src/Inputs/InputSystem.h
@@ -37,6 +37,8 @@ using namespace std;
 #include "MultiInputSource.h"
 #include "Util/NewConfig.h"
 
+#include "SDL.h"
+
 class CInput;
 class CInputSource;
 
@@ -527,6 +529,8 @@ protected:
   // Flag to indicate if system has grabbed mouse
   bool m_grabMouse;
 
+  SDL_Window* m_window;
+
   /*
    * Constructs an input system with the given name.
    */
@@ -739,8 +743,11 @@ public:
   // Name of this input system
   const char *name;
 
+
   virtual ~CInputSystem();
 
+  void SetWindow(SDL_Window* window);
+
   /*
    * Initializes the input system.  Must be called before any other methods are used.
    * Returns false if unable to initialize the system.
diff --git a/Src/Inputs/Inputs.cpp b/Src/Inputs/Inputs.cpp
index 42510a8..8bb792b 100644
--- a/Src/Inputs/Inputs.cpp
+++ b/Src/Inputs/Inputs.cpp
@@ -276,6 +276,11 @@ CInputs::~CInputs()
 	m_inputs.clear();
 }
 
+void CInputs::SetWindow(SDL_Window* window)
+{
+  m_system->SetWindow(window);
+}
+
 CSwitchInput *CInputs::AddSwitchInput(const char *id, const char *label, unsigned gameFlags, const char *defaultMapping, 
 	UINT16 offVal, UINT16 onVal)
 {
diff --git a/Src/Inputs/Inputs.h b/Src/Inputs/Inputs.h
index 04999a4..7299857 100644
--- a/Src/Inputs/Inputs.h
+++ b/Src/Inputs/Inputs.h
@@ -31,6 +31,8 @@
 #include "Types.h"
 #include "Util/NewConfig.h"
 
+#include "SDL.h"
+
 #include <vector>
 using namespace std;
 
@@ -240,6 +242,7 @@ public:
    */
   ~CInputs();
 
+  void SetWindow(SDL_Window* window);
   /*
    * Returns the number of available inputs.
    */
diff --git a/Src/Model3/IEmulator.h b/Src/Model3/IEmulator.h
index e1f2942..4a6f3be 100644
--- a/Src/Model3/IEmulator.h
+++ b/Src/Model3/IEmulator.h
@@ -208,9 +208,20 @@ public:
    * Destructor. Must free all resources.
    */
   
+  IEmulator() : m_window(NULL)
+  {
+  }
   virtual ~IEmulator(void)
   {
   }
+
+  void SetWindow(SDL_Window* window)
+  {
+    m_window = window;
+  }
+
+protected:
+  SDL_Window* m_window;
 };
 
 #endif  // INCLUDED_IEMULATOR_H
diff --git a/Src/Model3/Model3.cpp b/Src/Model3/Model3.cpp
index 517c30e..4e2c9eb 100644
--- a/Src/Model3/Model3.cpp
+++ b/Src/Model3/Model3.cpp
@@ -2015,7 +2015,10 @@ void CModel3::RenderFrame(void)
     TileGen.EndFrame();
   }
 
-  EndFrameVideo();
+  if (m_window)
+    EndFrameVideo(m_window);
+  else
+    ErrorLog("CModel3::RenderFrame: window not set");
 
   timings.renderTicks = CThread::GetTicks() - start;
 }
@@ -2846,16 +2849,16 @@ bool CModel3::LoadGame(const Game &game, const ROMSet &rom_set)
   if (DSB)
     extra_hw.insert(Util::Format() << "Digital Sound Board (Type " << game.mpeg_board << ")");
   if (rom_set.get_rom("driveboard_program").size)
-    extra_hw.insert("Drive Board");
-  if (game.encryption_key)
-    extra_hw.insert("Security Board");
-  if (!game.version.empty())
-    std::cout << "    Title:          " << game.title << " (" << game.version << ")" << std::endl;
-  else
-    std::cout << "    Title:          " << game.title << std::endl;
-  std::cout << "    ROM Set:        " << game.name << std::endl;
-  std::cout << "    Developer:      " << game.manufacturer << std::endl;
-  std::cout << "    Year:           " << game.year << std::endl;
+    extra_hw.insert("Drive Board");
+  if (game.encryption_key)
+    extra_hw.insert("Security Board");
+  if (!game.version.empty())
+    std::cout << "    Title:          " << game.title << " (" << game.version << ")" << std::endl;
+  else
+    std::cout << "    Title:          " << game.title << std::endl;
+  std::cout << "    ROM Set:        " << game.name << std::endl;
+  std::cout << "    Developer:      " << game.manufacturer << std::endl;
+  std::cout << "    Year:           " << game.year << std::endl;
   std::cout << "    Stepping:       " << game.stepping << std::endl;
   if (!extra_hw.empty())
     std::cout << "    Extra Hardware: " << Util::Format(", ").Join(extra_hw) << std::endl;
diff --git a/Src/Model3/Model3.h b/Src/Model3/Model3.h
index ea6dbaf..d0890aa 100644
--- a/Src/Model3/Model3.h
+++ b/Src/Model3/Model3.h
@@ -33,6 +33,8 @@
 #include "Model3/Crypto.h"
 #include "Util/NewConfig.h"
 
+#include "SDL.h"
+
 /*
  * FrameTimings
  *
@@ -284,6 +286,7 @@ private:
   CDriveBoard DriveBoard;     // Drive board
   CCrypto     m_cryptoDevice; // Encryption device
   CJTAG       m_jtag;         // JTAG interface
+
 };
 
 
diff --git a/Src/OSD/SDL/Audio.cpp b/Src/OSD/SDL/Audio.cpp
index 8811727..402c236 100755
--- a/Src/OSD/SDL/Audio.cpp
+++ b/Src/OSD/SDL/Audio.cpp
@@ -58,6 +58,7 @@ static unsigned playSamples = 512;  // Size (in samples) of callback play buffer
 static UINT32 audioBufferSize = 0;  // Size (in bytes) of audio buffer
 static INT8	*audioBuffer = NULL;    // Audio buffer
 
+
 static UINT32 writePos = 0;         // Current position at which writing into buffer
 static UINT32 playPos = 0;          // Current position at which playing data in buffer via callback
 
@@ -69,6 +70,8 @@ static unsigned overRuns = 0;       // Number of buffer over-runs that have occu
 static AudioCallbackFPtr callback = NULL; // Pointer to audio callback that is called when audio buffer is less than half empty
 static void *callbackData = NULL;         // Pointer to data to be passed to audio callback when it is called
 
+static SDL_AudioDeviceID audioDevice = 0;
+
 void SetAudioCallback(AudioCallbackFPtr newCallback, void *newData)
 {
 	// Lock audio whilst changing callback pointers
@@ -228,6 +231,7 @@ static void LogAudioInfo(SDL_AudioSpec *fmt)
 
 bool OpenAudio()
 {
+
 	// Initialize SDL audio sub-system
 	if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0)
 		return ErrorLog("Unable to initialize SDL audio sub-system: %s\n", SDL_GetError());
@@ -237,13 +241,14 @@ bool OpenAudio()
 	memset(&fmt, 0, sizeof(SDL_AudioSpec));
 	fmt.freq = SAMPLE_RATE;
 	fmt.channels = NUM_CHANNELS;
-	fmt.format = AUDIO_S16SYS;
+  fmt.format = AUDIO_S16SYS;
 	fmt.samples = playSamples;
 	fmt.callback = PlayCallback;
 	
 	// Try opening SDL audio output with that specification
 	SDL_AudioSpec obtained;
-	if (SDL_OpenAudio(&fmt, &obtained) < 0)
+  audioDevice = SDL_OpenAudioDevice(NULL, 0, &fmt, &obtained, 0);
+	if (audioDevice == 0)
 		return ErrorLog("Unable to open 44.1KHz 2-channel audio with SDL: %s\n", SDL_GetError());
 	LogAudioInfo(&obtained);
 		
@@ -276,7 +281,7 @@ bool OpenAudio()
 	overRuns = 0;
 
 	// Start audio playing
-	SDL_PauseAudio(0);
+	SDL_PauseAudioDevice(audioDevice, 0);
 	return OKAY;
 }
 
@@ -431,7 +436,8 @@ Finish:
 void CloseAudio()
 {
 	// Close SDL audio output
-	SDL_CloseAudio();
+	SDL_CloseAudioDevice(audioDevice);
+  audioDevice = 0;
 
 	// Delete audio buffer
 	if (audioBuffer != NULL)
diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
index feccc43..e0a9550 100644
--- a/Src/OSD/SDL/Main.cpp
+++ b/Src/OSD/SDL/Main.cpp
@@ -103,12 +103,14 @@ static unsigned  xOffset, yOffset;      // offset of renderer output within Open
 static unsigned  xRes, yRes;            // renderer output resolution (can be smaller than GL viewport)
 static unsigned  totalXRes, totalYRes;  // total resolution (the whole GL viewport)
 
-static bool SetGLGeometry(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio)
+static bool SetGLGeometry(SDL_Window* window, unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio)
 {
   // What resolution did we actually get?
-  const SDL_VideoInfo *VideoInfo = SDL_GetVideoInfo();
-  *totalXResPtr = VideoInfo->current_w;
-  *totalYResPtr = VideoInfo->current_h;
+  int w, h;
+  SDL_GetWindowSize(window, &w, &h);
+  *totalXResPtr = w;
+  *totalYResPtr = h;
+
   
   // If required, fix the aspect ratio of the resolution that the user passed to match Model 3 ratio
   float xRes = float(*xResPtr);
@@ -127,10 +129,10 @@ static bool SetGLGeometry(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *
   *yOffsetPtr = (*yResPtr - (unsigned) yRes)/2;
   
   // If the desired resolution is smaller than what we got, re-center again
-  if (int(*xResPtr) < VideoInfo->current_w)
-    *xOffsetPtr += (VideoInfo->current_w - *xResPtr)/2;
-  if (int(*yResPtr) < VideoInfo->current_h)
-    *yOffsetPtr += (VideoInfo->current_h - *yResPtr)/2;
+  if (int(*xResPtr) < w)
+    *xOffsetPtr += (w - *xResPtr)/2;
+  if (int(*yResPtr) < h)
+    *yOffsetPtr += (h - *yResPtr)/2;
   
   // OpenGL initialization
   glViewport(0,0,*xResPtr,*yResPtr);
@@ -150,7 +152,7 @@ static bool SetGLGeometry(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *
   for (int i = 0; i < 2; i++)
   {
     glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-    SDL_GL_SwapBuffers();
+    SDL_GL_SwapWindow(window);
   }
   
   // Write back resolution parameters
@@ -184,56 +186,119 @@ static bool SetGLGeometry(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *
  * NOTE: keepAspectRatio should always be true. It has not yet been tested with
  * the wide screen hack.
  */
-static bool CreateGLScreen(const char *caption, unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio, bool fullScreen)
+static SDL_Window* CreateGLScreen(int screenNum, const char *caption, unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio, bool fullScreen)
 {
   GLenum err;
   
   // Initialize video subsystem
   if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0)
-    return ErrorLog("Unable to initialize SDL video subsystem: %s\n", SDL_GetError());
+  {
+    ErrorLog("Unable to initialize SDL video subsystem: %s\n", SDL_GetError());
+    return NULL;
+  }
     
+  int numScreens = SDL_GetNumVideoDisplays();
+  if ((screenNum < 0) || (screenNum >= numScreens))
+  {
+    ErrorLog("Invalid screen number specified");
+    return NULL;
+  }
+
+
   // Important GL attributes
   SDL_GL_SetAttribute(SDL_GL_RED_SIZE,8);
   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE,8);
   SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE,8);
   SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE,24);
-  SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,8);
+  SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE,8);
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER,1);
 
   // Set vsync
-  SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, s_runtime_config["VSync"].ValueAsDefault<bool>(false) ? 1 : 0);
+  SDL_GL_SetSwapInterval(s_runtime_config["VSync"].ValueAsDefault<bool>(false) ? 1 : 0);
 
   // Set video mode
-  if (SDL_SetVideoMode(*xResPtr,*yResPtr,0,SDL_OPENGL|(fullScreen?SDL_FULLSCREEN|SDL_HWSURFACE:0)) == NULL)
+  int x = 0, y = 0;
+  SDL_Rect displayBounds;
+  if (SDL_GetDisplayBounds(screenNum, &displayBounds) < 0)
   {
-    ErrorLog("Unable to create an OpenGL display: %s\n", SDL_GetError());
-    return FAIL;
+    ErrorLog("Unable to get screen bounds: %s\n", SDL_GetError());
+    return NULL;
+  }
+  x = displayBounds.x;
+  y = displayBounds.y;
+  if (!fullScreen)
+  {
+    x = +40;
+    y = +40;
+  }
+
+  SDL_Window* window = SDL_CreateWindow(caption, x, y, *xResPtr, *yResPtr, (fullScreen ? SDL_WINDOW_FULLSCREEN : 0) | SDL_WINDOW_OPENGL);
+  if (window == NULL)
+  {
+    ErrorLog("Unable to create an SDL display: %s\n", SDL_GetError());
+    return NULL;
+  }
+  SDL_GLContext glContext = SDL_GL_CreateContext(window);
+  if (glContext == NULL)
+  {
+	  ErrorLog("Unable to create an OpenGL context: %s\n", SDL_GetError());
+	  return NULL;
   }
     
-  // Create window caption
-  SDL_WM_SetCaption(caption,NULL);
     
   // Initialize GLEW, allowing us to use features beyond OpenGL 1.2
   err = glewInit();
   if (GLEW_OK != err)
   {
     ErrorLog("OpenGL initialization failed: %s\n", glewGetErrorString(err));
-    return FAIL;
+    return NULL;
   }
     
-  return SetGLGeometry(xOffsetPtr, yOffsetPtr, xResPtr, yResPtr, totalXResPtr, totalYResPtr, keepAspectRatio);
+  if (SetGLGeometry(window, xOffsetPtr, yOffsetPtr, xResPtr, yResPtr, totalXResPtr, totalYResPtr, keepAspectRatio) == FAIL)
+  {
+    SDL_DestroyWindow(window);
+    return NULL;
+  }
+
+  return window;
 }
 
-static bool ResizeGLScreen(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio, bool fullScreen)
+static bool ResizeGLScreen(SDL_Window* window, unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned *xResPtr, unsigned *yResPtr, unsigned *totalXResPtr, unsigned *totalYResPtr, bool keepAspectRatio, bool fullScreen)
 {
   // Set video mode
-  if (SDL_SetVideoMode(*xResPtr,*yResPtr,0,SDL_OPENGL|(fullScreen?SDL_FULLSCREEN|SDL_HWSURFACE:0)) == NULL)
+  Uint32 flags = SDL_GetWindowFlags(window);
+  if (fullScreen)
+    flags = flags | SDL_WINDOW_FULLSCREEN;
+  else
+    flags = flags & ~SDL_WINDOW_FULLSCREEN;
+  if (SDL_SetWindowFullscreen(window, flags) < 0)
   {
-    ErrorLog("Unable to create an OpenGL display: %s\n", SDL_GetError());
+    ErrorLog("Unable to set window fullscreen mode: %s\n", SDL_GetError());
     return FAIL;
   }
+  if (fullScreen)
+  {
+    SDL_DisplayMode mode;
+    if (SDL_GetWindowDisplayMode(window, &mode) < 0)
+    {
+      ErrorLog("Can't get current display mode: %s\n", SDL_GetError());
+      return FAIL;
+    }
+    mode.w = *xResPtr;
+    mode.h = *yResPtr;
+    if (SDL_SetWindowDisplayMode(window, &mode) < 0)
+    {
+      ErrorLog("Can't set display mode: %s\n", SDL_GetError());
+      return FAIL;
+    }
+  }
+  else
+  {
+    SDL_SetWindowSize(window, *xResPtr, *yResPtr);
+  }
+  
     
-  return SetGLGeometry(xOffsetPtr, yOffsetPtr, xResPtr, yResPtr, totalXResPtr, totalYResPtr, keepAspectRatio);
+  return SetGLGeometry(window, xOffsetPtr, yOffsetPtr, xResPtr, yResPtr, totalXResPtr, totalYResPtr, keepAspectRatio);
 }
 
 /*
@@ -242,12 +307,12 @@ static bool ResizeGLScreen(unsigned *xOffsetPtr, unsigned *yOffsetPtr, unsigned
  * Queries and prints OpenGL information. A full list of extensions can
  * optionally be printed.
  */
-static void PrintGLInfo(bool createScreen, bool infoLog, bool printExtensions)
+static void PrintGLInfo(int screenNum, bool createScreen, bool infoLog, bool printExtensions)
 {
   unsigned xOffset, yOffset, xRes=496, yRes=384, totalXRes, totalYRes;  
   if (createScreen)
   {
-    if (OKAY != CreateGLScreen("Supermodel - Querying OpenGL Information...", &xOffset, &yOffset, &xRes, &yRes, &totalXRes, &totalYRes, false, false))
+    if (OKAY != CreateGLScreen(screenNum, "Supermodel - Querying OpenGL Information...", &xOffset, &yOffset, &xRes, &yRes, &totalXRes, &totalYRes, false, false))
     {
       ErrorLog("Unable to query OpenGL.\n");
       return;
@@ -747,14 +812,14 @@ bool BeginFrameVideo()
   return true;
 }
 
-void EndFrameVideo()
+void EndFrameVideo(SDL_Window* window)
 {
   // Show crosshairs for light gun games
   if (videoInputs)
     UpdateCrosshairs(videoInputs, s_runtime_config["Crosshairs"].ValueAs<unsigned>());
 
   // Swap the buffers
-  SDL_GL_SwapBuffers();
+  SDL_GL_SwapWindow(window);
 }
 
 static void SuperSleep(UINT32 time)
@@ -776,7 +841,7 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
 {
   CLogger *oldLogger = 0;
 #else
-int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *Inputs, COutputs *Outputs)
+int Supermodel(int screenNum, const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *Inputs, COutputs *Outputs)
 {         
 #endif // SUPERMODEL_DEBUGGER
   unsigned  prevFPSTicks;
@@ -802,11 +867,15 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
   totalXRes = xRes = s_runtime_config["XResolution"].ValueAs<unsigned>();
   totalYRes = yRes = s_runtime_config["YResolution"].ValueAs<unsigned>();
   sprintf(baseTitleStr, "Supermodel - %s", game.title.c_str());
-  if (OKAY != CreateGLScreen(baseTitleStr, &xOffset, &yOffset ,&xRes, &yRes, &totalXRes, &totalYRes, true, s_runtime_config["FullScreen"].ValueAs<bool>()))
+  SDL_Window* gameWindow = CreateGLScreen(screenNum, baseTitleStr, &xOffset, &yOffset, &xRes, &yRes, &totalXRes, &totalYRes, true, s_runtime_config["FullScreen"].ValueAs<bool>());
+  if (gameWindow == NULL)
     return 1;
 
+  Model3->SetWindow(gameWindow);
+  Inputs->SetWindow(gameWindow);
+
   // Info log GL information 
-  PrintGLInfo(false, true, false);
+  PrintGLInfo(screenNum, false, true, false);
   
   // Initialize audio system
   if (OKAY != OpenAudio())
@@ -939,13 +1008,13 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
         Model3->PauseThreads();
         SetAudioEnabled(false);
         sprintf(titleStr, "%s (Paused)", baseTitleStr);
-        SDL_WM_SetCaption(titleStr,NULL);
+        SDL_SetWindowTitle(gameWindow, titleStr);
       }
       else
       {
         Model3->ResumeThreads();
         SetAudioEnabled(true);
-        SDL_WM_SetCaption(baseTitleStr,NULL);
+        SDL_SetWindowTitle(gameWindow, baseTitleStr);
       }
       
       // Send paused value as output
@@ -966,7 +1035,7 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
       // Resize screen
       totalXRes = xRes = s_runtime_config["XResolution"].ValueAs<unsigned>();
       totalYRes = yRes = s_runtime_config["YResolution"].ValueAs<unsigned>();
-      if (OKAY != ResizeGLScreen(&xOffset,&yOffset,&xRes,&yRes,&totalXRes,&totalYRes,true,s_runtime_config["FullScreen"].ValueAs<bool>()))
+      if (OKAY != ResizeGLScreen(gameWindow, &xOffset,&yOffset,&xRes,&yRes,&totalXRes,&totalYRes,true,s_runtime_config["FullScreen"].ValueAs<bool>()))
         goto QuitError;
 
       // Recreate renderers and attach to the emulator
@@ -1133,7 +1202,7 @@ int Supermodel(const Game &game, ROMSet *rom_set, IEmulator *Model3, CInputs *In
       if((currentFPSTicks-prevFPSTicks) >= 1000)  // update FPS every 1 second (each tick is 1 ms)
       {
         sprintf(titleStr, "%s - %1.1f FPS%s", baseTitleStr, (float)fpsFramesElapsed/((float)(currentFPSTicks-prevFPSTicks)/1000.0f), paused ? " (Paused)" : "");
-        SDL_WM_SetCaption(titleStr,NULL);
+        SDL_SetWindowTitle(gameWindow, titleStr);
         prevFPSTicks = currentFPSTicks;     // reset tick count
         fpsFramesElapsed = 0;         // reset frame count
       }
@@ -1198,7 +1267,7 @@ static const char s_configFilePath[] = { "Config/Supermodel.ini" };
 static const char s_gameXMLFilePath[] = { "Config/Games.xml" };
 
 // Create and configure inputs
-static bool ConfigureInputs(CInputs *Inputs, Util::Config::Node *config, bool configure)
+static bool ConfigureInputs(int screenNum, CInputs *Inputs, Util::Config::Node *config, bool configure)
 {
   static const char configFileComment[] = {
     ";\n"
@@ -1213,9 +1282,11 @@ static bool ConfigureInputs(CInputs *Inputs, Util::Config::Node *config, bool co
   {
     // Open an SDL window 
     unsigned xOffset, yOffset, xRes=496, yRes=384;
-    if (OKAY != CreateGLScreen("Supermodel - Configuring Inputs...", &xOffset, &yOffset, &xRes, &yRes, &totalXRes, &totalYRes, false, false))
+    SDL_Window* screen = CreateGLScreen(screenNum, "Supermodel - Configuring Inputs...", &xOffset, &yOffset, &xRes, &yRes, &totalXRes, &totalYRes, false, false);
+    if  (screen==NULL)
       return (bool) ErrorLog("Unable to start SDL to configure inputs.\n");
-    
+    Inputs->SetWindow(screen);
+
     // Configure the inputs
     if (Inputs->ConfigureInputs(NULL, xOffset, yOffset, xRes, yRes))
     {
@@ -1246,16 +1317,16 @@ static void PrintGameList(const std::string &xml_file, const std::map<std::strin
   for (auto &v: games)
   {
     const Game &game = v.second;
-    printf("    %s", game.name.c_str());
-    for (int i = game.name.length(); i < 9; i++)  // pad for alignment (no game ID should be more than 9 letters)
-      printf(" ");
-    if (!game.version.empty())
-      printf("       %s (%s)\n", game.title.c_str(), game.version.c_str());
-    else
-      printf("       %s\n", game.title.c_str());
-  }
-}
-
+    printf("    %s", game.name.c_str());
+    for (int i = game.name.length(); i < 9; i++)  // pad for alignment (no game ID should be more than 9 letters)
+      printf(" ");
+    if (!game.version.empty())
+      printf("       %s (%s)\n", game.title.c_str(), game.version.c_str());
+    else
+      printf("       %s\n", game.title.c_str());
+  }
+}
+
 static void LogConfig(const Util::Config::Node &config)
 {
   InfoLog("Runtime configuration:");
@@ -1434,7 +1505,8 @@ static ParsedCommandLine ParseCommandLine(int argc, char **argv)
     { "-music-volume",          "MusicVolume"             },
     { "-balance",               "Balance"                 },
     { "-input-system",          "InputSystem"             },
-    { "-outputs",               "Outputs"                 }
+    { "-outputs",               "Outputs"                 },
+    { "-screen", "Screen" }
   };
   const std::map<std::string, std::pair<std::string, bool>> bool_options
   { // -option
@@ -1468,6 +1540,7 @@ static ParsedCommandLine ParseCommandLine(int argc, char **argv)
 #endif
     
   };
+  cmd_line.config.Set("Screen", 0);
   for (int i = 1; i < argc; i++)
   {
     std::string arg(argv[i]);
@@ -1600,7 +1673,7 @@ int main(int argc, char **argv)
   }
   if (cmd_line.print_gl_info)
   {
-    PrintGLInfo(true, false, false);
+    PrintGLInfo(cmd_line.config["Screen"].ValueAs<int>(), true, false, false);
     return 0;
   }
 #ifdef DEBUG
@@ -1651,6 +1724,8 @@ int main(int argc, char **argv)
     return 1;
   }
   
+  int screenNum = s_runtime_config["Screen"].ValueAs<int>();
+
   // Create Model 3 emulator
 #ifdef DEBUG
   IEmulator *Model3 = s_gfxStatePath.empty() ? static_cast<IEmulator *>(new CModel3(s_runtime_config)) : static_cast<IEmulator *>(new CModel3GraphicsState(s_runtime_config, s_gfxStatePath));
@@ -1700,7 +1775,7 @@ int main(int argc, char **argv)
   // NOTE: fileConfig is passed so that the global section is used for input settings
   // and because this function may write out a new config file, which must preserve
   // all sections. We don't want to pollute the output with built-in defaults.
-  if (ConfigureInputs(Inputs, &fileConfig, cmd_line.config_inputs))
+  if (ConfigureInputs(screenNum, Inputs, &fileConfig, cmd_line.config_inputs))
   {
     exitCode = 1;
     goto Exit;
@@ -1755,7 +1830,7 @@ int main(int argc, char **argv)
     delete Debugger;
 #else
   // Fire up Supermodel
-  exitCode = Supermodel(game, &rom_set, Model3, Inputs, Outputs);
+  exitCode = Supermodel(screenNum, game, &rom_set, Model3, Inputs, Outputs);
 #endif // SUPERMODEL_DEBUGGER
   delete Model3;
 
diff --git a/Src/OSD/SDL/SDLInputSystem.cpp b/Src/OSD/SDL/SDLInputSystem.cpp
index 6d9164d..1ba2462 100644
--- a/Src/OSD/SDL/SDLInputSystem.cpp
+++ b/Src/OSD/SDL/SDLInputSystem.cpp
@@ -34,152 +34,134 @@ using namespace std;
 SDLKeyMapStruct CSDLInputSystem::s_keyMap[] =
 {
 	// General keys
-	{ "BACKSPACE",				SDLK_BACKSPACE },
-	{ "TAB",					SDLK_TAB },
-	{ "CLEAR",					SDLK_CLEAR },
-	{ "RETURN",					SDLK_RETURN },
-	{ "PAUSE",					SDLK_PAUSE },
-	{ "ESCAPE",					SDLK_ESCAPE },
-	{ "SPACE",					SDLK_SPACE },
-	{ "EXCLAIM",				SDLK_EXCLAIM },
-	{ "DBLQUOTE",				SDLK_QUOTEDBL },
-	{ "HASH",					SDLK_HASH },
-	{ "DOLLAR",					SDLK_DOLLAR },
-	{ "AMPERSAND",				SDLK_AMPERSAND },
-	{ "QUOTE",					SDLK_QUOTE },
-	{ "LEFTPAREN",				SDLK_LEFTPAREN },
-	{ "RIGHTPAREN",				SDLK_RIGHTPAREN },
-	{ "ASTERISK",				SDLK_ASTERISK },
-	{ "PLUS",					SDLK_PLUS },
-	{ "COMMA",					SDLK_COMMA },
-	{ "MINUS",					SDLK_MINUS },
-	{ "PERIOD",					SDLK_PERIOD },
-	{ "SLASH",					SDLK_SLASH },
-	{ "0",						SDLK_0 },
-	{ "1",						SDLK_1 },
-	{ "2",						SDLK_2 },
-	{ "3",						SDLK_3 },
-	{ "4",						SDLK_4 },
-	{ "5",						SDLK_5 },
-	{ "6",						SDLK_6 },
-	{ "7",						SDLK_7 },
-	{ "8",						SDLK_8 },
-	{ "9",						SDLK_9 },
-	{ "COLON",					SDLK_COLON },
-	{ "SEMICOLON",				SDLK_SEMICOLON },
-	{ "LESS",					SDLK_LESS },
-	{ "EQUALS",					SDLK_EQUALS },
-	{ "GREATER",				SDLK_GREATER },
-	{ "QUESTION",				SDLK_QUESTION },
-	{ "AT",						SDLK_AT },
-	{ "LEFTBRACKET",			SDLK_LEFTBRACKET },
-	{ "BACKSLASH",				SDLK_BACKSLASH },
-	{ "RIGHTBRACKET",			SDLK_RIGHTBRACKET },
-	{ "CARET",					SDLK_CARET },
-	{ "UNDERSCORE",				SDLK_UNDERSCORE },
-	{ "BACKQUOTE",				SDLK_BACKQUOTE },
-	{ "A",						SDLK_a },
-	{ "B",						SDLK_b },
-	{ "C",						SDLK_c },
-	{ "D",						SDLK_d },
-	{ "E",						SDLK_e },
-	{ "F",						SDLK_f },
-	{ "G",						SDLK_g },
-	{ "H",						SDLK_h },
-	{ "I",						SDLK_i },
-	{ "J",						SDLK_j },
-	{ "K",						SDLK_k },
-	{ "L",						SDLK_l },
-	{ "M",						SDLK_m },
-	{ "N",						SDLK_n },
-	{ "O",						SDLK_o },
-	{ "P",						SDLK_p },
-	{ "Q",						SDLK_q },
-	{ "R",						SDLK_r },
-	{ "S",						SDLK_s },
-	{ "T",						SDLK_t },
-	{ "U",						SDLK_u },
-	{ "V",						SDLK_v },
-	{ "W",						SDLK_w },
-	{ "X",						SDLK_x },
-	{ "Y",						SDLK_y },
-	{ "Z",						SDLK_z },
-	{ "DEL",					SDLK_DELETE },
+	{ "BACKSPACE",				SDL_SCANCODE_BACKSPACE },
+	{ "TAB",					SDL_SCANCODE_TAB },
+	{ "CLEAR",					SDL_SCANCODE_CLEAR },
+	{ "RETURN",					SDL_SCANCODE_RETURN },
+	{ "PAUSE",					SDL_SCANCODE_PAUSE },
+	{ "ESCAPE",					SDL_SCANCODE_ESCAPE },
+  { "COMMA", SDL_SCANCODE_COMMA },
+  { "MINUS", SDL_SCANCODE_MINUS },
+  { "PERIOD", SDL_SCANCODE_PERIOD },
+  { "SLASH", SDL_SCANCODE_SLASH },
+  { "0", SDL_SCANCODE_0 },
+  { "1", SDL_SCANCODE_1 },
+  { "2", SDL_SCANCODE_2 },
+  { "3", SDL_SCANCODE_3 },
+  { "4", SDL_SCANCODE_4 },
+  { "5", SDL_SCANCODE_5 },
+  { "6", SDL_SCANCODE_6 },
+  { "7", SDL_SCANCODE_7 },
+  { "8", SDL_SCANCODE_8 },
+  { "9", SDL_SCANCODE_9 },
+  { "KEYPADCOLON", SDL_SCANCODE_KP_COLON },
+  { "SEMICOLON", SDL_SCANCODE_SEMICOLON },
+  { "EQUALS", SDL_SCANCODE_EQUALS },
+  { "LEFTBRACKET", SDL_SCANCODE_LEFTBRACKET },
+  { "BACKSLASH", SDL_SCANCODE_BACKSLASH },
+  { "RIGHTBRACKET", SDL_SCANCODE_RIGHTBRACKET },
+  { "BACKQUOTE", SDL_SCANCODE_GRAVE },
+  { "A", SDL_SCANCODE_A },
+  { "B", SDL_SCANCODE_B },
+  { "C", SDL_SCANCODE_C },
+  { "D", SDL_SCANCODE_D },
+  { "E", SDL_SCANCODE_E },
+  { "F", SDL_SCANCODE_F },
+  { "G", SDL_SCANCODE_G },
+  { "H", SDL_SCANCODE_H },
+  { "I", SDL_SCANCODE_I },
+  { "J", SDL_SCANCODE_J },
+  { "K", SDL_SCANCODE_K },
+  { "L", SDL_SCANCODE_L },
+  { "M", SDL_SCANCODE_M },
+  { "N", SDL_SCANCODE_N },
+  { "O", SDL_SCANCODE_O },
+  { "P", SDL_SCANCODE_P },
+  { "Q", SDL_SCANCODE_Q },
+  { "R", SDL_SCANCODE_R },
+  { "S", SDL_SCANCODE_S },
+  { "T", SDL_SCANCODE_T },
+  { "U", SDL_SCANCODE_U },
+  { "V", SDL_SCANCODE_V },
+  { "W", SDL_SCANCODE_W },
+  { "X", SDL_SCANCODE_X },
+  { "Y", SDL_SCANCODE_Y },
+  { "Z", SDL_SCANCODE_Z },
+  { "DEL", SDL_SCANCODE_DELETE },
 	
 	// Keypad
-	{ "KEYPAD0",				SDLK_KP0 },
-	{ "KEYPAD1",				SDLK_KP1 },
-	{ "KEYPAD2",				SDLK_KP2 },
-	{ "KEYPAD3",				SDLK_KP3 },
-	{ "KEYPAD4",				SDLK_KP4 },
-	{ "KEYPAD5",				SDLK_KP5 },
-	{ "KEYPAD6",				SDLK_KP6 },
-	{ "KEYPAD7",				SDLK_KP7 },
-	{ "KEYPAD8",				SDLK_KP8 },
-	{ "KEYPAD9",				SDLK_KP9 },
-	{ "KEYPADPERIOD",			SDLK_KP_PERIOD },
-	{ "KEYPADDIVIDE",			SDLK_KP_DIVIDE },
-	{ "KEYPADMULTIPLY",			SDLK_KP_MULTIPLY },
-	{ "KEYPADMINUS",			SDLK_KP_MINUS },
-	{ "KEYPADPLUS",				SDLK_KP_PLUS },
-	{ "KEYPADENTER",			SDLK_KP_ENTER },
-	{ "KEYPADEQUALS",			SDLK_KP_EQUALS },
+  { "KEYPAD0", SDL_SCANCODE_KP_0 },
+  { "KEYPAD1", SDL_SCANCODE_KP_1 },
+  { "KEYPAD2", SDL_SCANCODE_KP_2 },
+  { "KEYPAD3", SDL_SCANCODE_KP_3 },
+  { "KEYPAD4", SDL_SCANCODE_KP_4 },
+  { "KEYPAD5", SDL_SCANCODE_KP_5 },
+  { "KEYPAD6", SDL_SCANCODE_KP_6 },
+  { "KEYPAD7", SDL_SCANCODE_KP_7 },
+  { "KEYPAD8", SDL_SCANCODE_KP_8 },
+  { "KEYPAD9", SDL_SCANCODE_KP_9 },
+  { "KEYPADPERIOD", SDL_SCANCODE_KP_PERIOD },
+  { "KEYPADDIVIDE", SDL_SCANCODE_KP_DIVIDE },
+  { "KEYPADMULTIPLY", SDL_SCANCODE_KP_MULTIPLY },
+  { "KEYPADMINUS", SDL_SCANCODE_KP_MINUS },
+  { "KEYPADPLUS", SDL_SCANCODE_KP_PLUS },
+  { "KEYPADENTER", SDL_SCANCODE_KP_ENTER },
+  { "KEYPADEQUALS", SDL_SCANCODE_KP_EQUALS },
 	
 	// Arrows + Home/End Pad
-	{ "UP",						SDLK_UP },
-	{ "DOWN",					SDLK_DOWN },
-	{ "RIGHT",					SDLK_RIGHT },
-	{ "LEFT",					SDLK_LEFT },
-	{ "INSERT",					SDLK_INSERT },
-	{ "HOME",					SDLK_HOME },
-	{ "END",					SDLK_END },
-	{ "PGUP",					SDLK_PAGEUP },
-	{ "PGDN",					SDLK_PAGEDOWN },
+  { "UP", SDL_SCANCODE_UP },
+  { "DOWN", SDL_SCANCODE_DOWN },
+  { "RIGHT", SDL_SCANCODE_RIGHT },
+  { "LEFT", SDL_SCANCODE_LEFT },
+  { "INSERT", SDL_SCANCODE_INSERT },
+  { "HOME", SDL_SCANCODE_HOME },
+  { "END", SDL_SCANCODE_END },
+  { "PGUP", SDL_SCANCODE_PAGEUP },
+  { "PGDN", SDL_SCANCODE_PAGEDOWN },
 
 	// Function Key
-	{ "F1",						SDLK_F1 },
-	{ "F2",						SDLK_F2 },
-	{ "F3",						SDLK_F3 },
-	{ "F4",						SDLK_F4 },
-	{ "F5",						SDLK_F5 },
-	{ "F6",						SDLK_F6 },
-	{ "F7",						SDLK_F7 },
-	{ "F8",						SDLK_F8 },
-	{ "F9",						SDLK_F9 },
-	{ "F10",					SDLK_F10 },
-	{ "F11",					SDLK_F11 },
-	{ "F12",					SDLK_F12 },
-	{ "F13",					SDLK_F13 },
-	{ "F14",					SDLK_F14 },
-	{ "F15",					SDLK_F15 },
+  { "F1", SDL_SCANCODE_F1 },
+  { "F2", SDL_SCANCODE_F2 },
+  { "F3", SDL_SCANCODE_F3 },
+  { "F4", SDL_SCANCODE_F4 },
+  { "F5", SDL_SCANCODE_F5 },
+  { "F6", SDL_SCANCODE_F6 },
+  { "F7", SDL_SCANCODE_F7 },
+  { "F8", SDL_SCANCODE_F8 },
+  { "F9", SDL_SCANCODE_F9 },
+  { "F10", SDL_SCANCODE_F10 },
+  { "F11", SDL_SCANCODE_F11 },
+  { "F12", SDL_SCANCODE_F12 },
+  { "F13", SDL_SCANCODE_F13 },
+  { "F14", SDL_SCANCODE_F14 },
+  { "F15", SDL_SCANCODE_F15 },
     
 	// Modifier Keys  
 	// Removed Numlock, Capslock and Scrollock as don't seem to be handled well by SDL
 	//{ "NUMLOCK",				SDLK_NUMLOCK },
 	//{ "CAPSLOCK",				SDLK_CAPSLOCK },
 	//{ "SCROLLLOCK",				SDLK_SCROLLOCK },
-	{ "RIGHTSHIFT",				SDLK_RSHIFT },
-	{ "LEFTSHIFT",				SDLK_LSHIFT },
-	{ "RIGHTCTRL",				SDLK_RCTRL },
-	{ "LEFTCTRL",				SDLK_LCTRL },
-	{ "RIGHTALT",				SDLK_RALT },
-	{ "LEFTALT",				SDLK_LALT },
-	{ "RIGHTMETA",				SDLK_RMETA },
-	{ "LEFTMETA",				SDLK_LMETA },
-	{ "RIGHTWINDOWS",			SDLK_RSUPER },
-	{ "LEFTWINDOWS",			SDLK_LSUPER },
-	{ "ALTGR",					SDLK_MODE },
-	{ "COMPOSE",				SDLK_COMPOSE },
+  { "RIGHTSHIFT", SDL_SCANCODE_RSHIFT },
+  { "LEFTSHIFT", SDL_SCANCODE_LSHIFT },
+  { "RIGHTCTRL", SDL_SCANCODE_RCTRL },
+  { "LEFTCTRL", SDL_SCANCODE_LCTRL },
+  { "RIGHTALT", SDL_SCANCODE_RALT },
+  { "LEFTALT", SDL_SCANCODE_LALT },
+  { "RIGHTMETA", SDL_SCANCODE_RGUI },
+  { "LEFTMETA", SDL_SCANCODE_LGUI },
+  { "RIGHTWINDOWS", SDL_SCANCODE_RGUI },
+  { "LEFTWINDOWS", SDL_SCANCODE_LGUI },
+  { "ALTGR", SDL_SCANCODE_MODE },
+  { "COMPOSE", SDL_SCANCODE_APPLICATION },
     
 	// Other
-	{ "HELP",					SDLK_HELP },
-	{ "PRINT",					SDLK_PRINT },
-	{ "SYSREQ",					SDLK_SYSREQ },
-	{ "BREAK",					SDLK_BREAK },
-	{ "MENU",					SDLK_MENU },
-	{ "POWER",					SDLK_POWER },
-	{ "EURO",					SDLK_EURO },
-	{ "UNDO",					SDLK_UNDO }
+  { "HELP", SDL_SCANCODE_HELP },
+  { "PRINT", SDL_SCANCODE_PRINTSCREEN },
+  { "SYSREQ", SDL_SCANCODE_SYSREQ },
+  { "BREAK", SDL_SCANCODE_PAUSE },
+  { "MENU", SDL_SCANCODE_MENU },
+  { "POWER", SDL_SCANCODE_POWER },
+  { "UNDO", SDL_SCANCODE_UNDO }
 };
 
 CSDLInputSystem::CSDLInputSystem() 
@@ -213,7 +195,7 @@ void CSDLInputSystem::OpenJoysticks()
 		
 		// Gather joystick details (name, num POVs & buttons and which axes are available)
 		JoyDetails joyDetails;
-		const char *pName = SDL_JoystickName(joyNum);
+		const char *pName = SDL_JoystickName(joystick);
 		strncpy(joyDetails.name, pName, MAX_NAME_LENGTH);
 		joyDetails.name[MAX_NAME_LENGTH] = '\0';
 		joyDetails.numAxes = SDL_JoystickNumAxes(joystick);
@@ -282,7 +264,7 @@ const char *CSDLInputSystem::GetKeyName(int keyIndex)
 bool CSDLInputSystem::IsKeyPressed(int kbdNum, int keyIndex)
 {
 	// Get SDL key for given index and check if currently pressed
-	SDLKey sdlKey = s_keyMap[keyIndex].sdlKey;
+	SDL_Keycode sdlKey = s_keyMap[keyIndex].sdlKey;
 	return !!m_keyState[sdlKey];
 }
 
@@ -400,25 +382,22 @@ bool CSDLInputSystem::Poll()
 	{
 		if (e.type == SDL_QUIT)
 			return false; 	
-		else if (e.type == SDL_MOUSEBUTTONDOWN)
+		else if (e.type == SDL_MOUSEWHEEL)
 		{
 			// Mouse wheel movements are not returned by SDL_GetMouseState below, so they are handled here instead
 			// The mouse absolute Z-axis value and mouse wheel direction value are updated appropriately
-			if (e.button.button == SDL_BUTTON_WHEELUP)
-			{
-				m_mouseZ += 5;
-				m_mouseWheelDir = 1;
-			}
-			else if (e.button.button == SDL_BUTTON_WHEELDOWN)
-			{
-				m_mouseZ -= 5;
-				m_mouseWheelDir = -1;
-			}
+      m_mouseZ += e.wheel.y;
+      if (e.wheel.y < 0)
+        m_mouseWheelDir = -1;
+      else if (e.wheel.y > 0)
+        m_mouseWheelDir = 1;
+      else
+        m_mouseWheelDir = 0;
 		}
 	}
 
 	// Get key state from SDL
-	m_keyState = SDL_GetKeyState(NULL);
+	m_keyState = SDL_GetKeyboardState(NULL);
 
 	// Get mouse state from SDL (except mouse wheel which was handled earlier)
 	m_mouseButtons = SDL_GetMouseState(&m_mouseX, &m_mouseY);
@@ -431,4 +410,4 @@ bool CSDLInputSystem::Poll()
 void CSDLInputSystem::SetMouseVisibility(bool visible)
 {
 	SDL_ShowCursor(visible ? SDL_ENABLE : SDL_DISABLE);  	
-}
+}
diff --git a/Src/OSD/SDL/SDLInputSystem.h b/Src/OSD/SDL/SDLInputSystem.h
index 2e15030..c853d9c 100644
--- a/Src/OSD/SDL/SDLInputSystem.h
+++ b/Src/OSD/SDL/SDLInputSystem.h
@@ -46,7 +46,7 @@ using namespace std;
 struct SDLKeyMapStruct
 {
 	const char *keyName;
-	SDLKey sdlKey;
+	SDL_Scancode sdlKey;
 };
 
 /*
@@ -65,7 +65,7 @@ private:
 	vector<JoyDetails> m_joyDetails;
 
 	// Current key state obtained from SDL
-	Uint8 *m_keyState;
+	const Uint8 *m_keyState;
 
 	// Current mouse state obtained from SDL
 	int m_mouseX;
diff --git a/Src/OSD/SDL/Thread.cpp b/Src/OSD/SDL/Thread.cpp
index 5a61f20..61c3374 100755
--- a/Src/OSD/SDL/Thread.cpp
+++ b/Src/OSD/SDL/Thread.cpp
@@ -47,7 +47,7 @@ UINT32 CThread::GetTicks()
 
 CThread *CThread::CreateThread(ThreadStart start, void *startParam)
 {
-	SDL_Thread *impl = SDL_CreateThread(start, startParam);
+	SDL_Thread *impl = SDL_CreateThread(start, "", startParam);
 	if (impl == NULL)
 		return NULL;
 	return new CThread(impl);
@@ -89,7 +89,8 @@ CThread::CThread(void *impl) : m_impl(impl)
 
 CThread::~CThread()
 {
-	Kill();
+  if (m_impl != NULL)
+    ErrorLog("In ~CThread but thread still active.");
 }
 
 UINT32 CThread::GetId()
@@ -97,12 +98,6 @@ UINT32 CThread::GetId()
 	return SDL_GetThreadID((SDL_Thread*)m_impl);
 }
 
-void CThread::Kill()
-{
-	if (m_impl != NULL)
-		SDL_KillThread((SDL_Thread*)m_impl);
-	m_impl = NULL;
-}
 
 int CThread::Wait()
 {
diff --git a/Src/OSD/Thread.h b/Src/OSD/Thread.h
index d3ca28c..53b5cd0 100755
--- a/Src/OSD/Thread.h
+++ b/Src/OSD/Thread.h
@@ -108,13 +108,6 @@ public:
 	 */
 	UINT32 GetId();
 
-	/*
-	 * Kill
-	 *
-	 * Kills this thread.
-	 */
-	void Kill();
-
 	/*
 	 * Wait
 	 *
diff --git a/Src/OSD/Video.h b/Src/OSD/Video.h
index da5eba8..b2321df 100755
--- a/Src/OSD/Video.h
+++ b/Src/OSD/Video.h
@@ -28,6 +28,8 @@
 #ifndef INCLUDED_VIDEO_H
 #define INCLUDED_VIDEO_H
 
+#include "SDL.h"
+
 /*
  * BeginFrameVideo()
  *
@@ -42,6 +44,6 @@ extern bool BeginFrameVideo();
  *
  * Called at end of rendering of video frame.  Can be used by OSD layer to overlay graphics on screen.
  */
-extern void EndFrameVideo();
+extern void EndFrameVideo(SDL_Window* window);
 
 #endif	// INCLUDED_VIDEO_H
diff --git a/Src/OSD/Windows/DirectInputSystem.cpp b/Src/OSD/Windows/DirectInputSystem.cpp
index d607103..d3adbba 100644
--- a/Src/OSD/Windows/DirectInputSystem.cpp
+++ b/Src/OSD/Windows/DirectInputSystem.cpp
@@ -442,6 +442,7 @@ CDirectInputSystem::CDirectInputSystem(const Util::Config::Node &config, bool us
 	memset(&m_diMseState, 0, sizeof(m_diMseState));
 }
 
+
 CDirectInputSystem::~CDirectInputSystem()
 {
 	CloseKeyboardsAndMice();
@@ -2048,11 +2049,17 @@ bool CDirectInputSystem::Poll()
 	// See if keyboard, mice and joysticks have been activated yet
 	if (!m_activated)
 	{
+    if (!m_window)
+    {
+      ErrorLog("CDirectInputSystem::Poll: activation but window not set");
+      return false;
+    }
+
 		// If not, then get Window handle of SDL window
 		SDL_SysWMinfo info;
         SDL_VERSION(&info.version);
-        if (SDL_GetWMInfo(&info)) 
-			m_hwnd = info.window;
+        if (SDL_GetWindowWMInfo(m_window, &info)) 
+			      m_hwnd = info.info.win.window;
 		
 		// Tell SDL to pass on all Windows events
 		// Removed - see below
diff --git a/Src/OSD/Windows/DirectInputSystem.h b/Src/OSD/Windows/DirectInputSystem.h
index 2b03976..8d5e2ae 100644
--- a/Src/OSD/Windows/DirectInputSystem.h
+++ b/Src/OSD/Windows/DirectInputSystem.h
@@ -236,6 +236,8 @@ public:
 	 */
 	CDirectInputSystem(const Util::Config::Node &config, bool useRawInput, bool useXInput);
 
+  void setWindow(SDL_Window* window);
+
 	~CDirectInputSystem();
 
 	int GetNumKeyboards();	
diff --git a/VS2008/Musashi68K/Musashi68K.vcxproj b/VS2008/Musashi68K/Musashi68K.vcxproj
index 6db21df..1d6b66d 100644
--- a/VS2008/Musashi68K/Musashi68K.vcxproj
+++ b/VS2008/Musashi68K/Musashi68K.vcxproj
@@ -143,7 +143,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
diff --git a/VS2008/SDL/SDL.vcxproj b/VS2008/SDL/SDL.vcxproj
index efe9fe8..4105500 100644
--- a/VS2008/SDL/SDL.vcxproj
+++ b/VS2008/SDL/SDL.vcxproj
@@ -18,6 +18,239 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\atomic\SDL_atomic.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audio.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audiodev.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_mixer.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_wave.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\wasapi\SDL_wasapi.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\core\windows\SDL_windows.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\core\windows\SDL_xinput.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_dropevents.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_events.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_gesture.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_keyboard.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_mouse.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_quit.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_touch.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_windowevents.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\file\SDL_rwops.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\haptic\SDL_haptic.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_dinputhaptic.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_windowshaptic.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_xinputhaptic.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\SDL_joystick.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_dinputjoystick.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_mmjoystick.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_windowsjoystick.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_xinputjoystick.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\e_atan2.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\e_log.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\e_pow.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\e_rem_pio2.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\e_sqrt.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\k_cos.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\k_rem_pio2.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\k_sin.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\k_tan.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_atan.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_copysign.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_cos.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_fabs.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_floor.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_scalbn.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_sin.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\libm\s_tan.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\power\SDL_power.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\direct3d11\SDL_render_winrt.cpp" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_d3dmath.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_render.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_yuv_mmx.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_yuv_sw.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendline.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_drawline.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_rotate.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL_assert.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL_dataqueue.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL_error.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL_hints.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\SDL_log.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\stdlib\SDL_string.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\SDL_thread.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\timer\SDL_timer.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_0.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_1.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_A.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_auto.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_copy.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_N.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_slow.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_bmp.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_clipboard.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_egl.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_fillrect.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_pixels.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_rect.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_shape.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_stretch.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_surface.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_video.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_vulkan_utils.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsvulkan.c" />
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowswindow.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_audio_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\SDL_wave.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\wasapi\SDL_wasapi.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\core\windows\SDL_directx.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\core\windows\SDL_windows.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\core\windows\SDL_xinput.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\blank_cursor.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\default_cursor.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\scancodes_darwin.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\scancodes_linux.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\scancodes_windows.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\scancodes_xfree86.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_events_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_gesture_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_mouse_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_sysevents.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_touch_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\haptic\SDL_haptic_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_dinputhaptic_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_windowshaptic_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\haptic\windows\SDL_xinputhaptic_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\SDL_gamecontrollerdb.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_dinputjoystick_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_windowsjoystick_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\joystick\windows\SDL_xinputjoystick_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\libm\math_libm.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\libm\math_private.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\power\SDL_syspower.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\direct3d11\SDL_render_winrt.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\mmx.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\opengles2\SDL_gles2funcs.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\opengles2\SDL_shaders_gles2.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\opengl\SDL_glfuncs.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_d3dmath.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_sysrender.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_yuv_mmx_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendline.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_draw.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_drawline.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\render\software\SDL_rotate.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\SDL_assert_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\SDL_dataqueue.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\SDL_error_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\SDL_internal.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\thread\SDL_systhread.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\thread\SDL_thread_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\timer\SDL_timer_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_auto.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_copy.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_blit_slow.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_egl_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_pixels_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_rect_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_shape_internals.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_sysvideo.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\SDL_vulkan_internal.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_msctf.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowsvulkan.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="..\..\Libraries\SDL2-2.0.6\src\video\windows\wmmsg.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
     <RootNamespace>SDL</RootNamespace>
@@ -96,7 +329,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -139,7 +372,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -158,7 +391,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;dxguid.lib;version.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -184,7 +417,7 @@
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -227,7 +460,7 @@
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -247,7 +480,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;dxguid.lib;version.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -260,120 +493,6 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiomem.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_sysaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_syscdrom.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_events_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_sysevents.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_sysjoystick.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\SDL_error_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_systhread.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_systimer.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_leaks.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_sysvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuvfuncs.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_lowvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\Wmmsg.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_vkeys.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events_c.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.h" />
-    <ClInclude Include="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv_c.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\disk\SDL_diskaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\dummy\SDL_dummyaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_audiocvt.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_mixer_MMX_VC.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\SDL_wave.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\windib\SDL_dibaudio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\audio\windx5\SDL_dx5audio.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cdrom\SDL_cdrom.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cdrom\win32\SDL_syscdrom.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\cpuinfo\SDL_cpuinfo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_active.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_events.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_expose.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_keyboard.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_mouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_quit.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\events\SDL_resize.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\file\SDL_rwops.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\joystick\SDL_joystick.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\joystick\win32\SDL_mmjoystick.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\loadso\win32\SDL_sysloadso.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL_error.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\SDL_fatal.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_getenv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_iconv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_malloc.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_qsort.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_stdlib.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\stdlib\SDL_string.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\generic\SDL_syscond.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\SDL_thread.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_sysmutex.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_syssem.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\thread\win32\SDL_systhread.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\timer\SDL_timer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\timer\win32\SDL_systimer.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullmouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\dummy\SDL_nullvideo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_0.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_1.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_A.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_blit_N.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_bmp.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_cursor.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_gamma.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_pixels.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_RLEaccel.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_stretch.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_surface.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_video.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\SDL_yuv_sw.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_sysmouse.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_syswm.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\wincommon\SDL_wingl.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibevents.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windib\SDL_dibvideo.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5events.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\Windx5\SDL_dx5video.c" />
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\src\video\windx5\SDL_dx5yuv.c" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/VS2008/SDLmain/SDLmain.vcxproj b/VS2008/SDLmain/SDLmain.vcxproj
index 2ed3d66..3e15264 100644
--- a/VS2008/SDLmain/SDLmain.vcxproj
+++ b/VS2008/SDLmain/SDLmain.vcxproj
@@ -18,6 +18,9 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Libraries\SDL2-2.0.6\src\main\windows\SDL_windows_main.c" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>
     <RootNamespace>SDLmain</RootNamespace>
@@ -85,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -110,7 +113,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -132,7 +135,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader />
@@ -156,7 +159,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Libraries\SDL-1.2.14\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Libraries\SDL2-2.0.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader />
@@ -174,9 +177,6 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\Libraries\SDL-1.2.14\Src\Main\Win32\SDL_win32_main.c" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/VS2008/Supermodel.vcxproj b/VS2008/Supermodel.vcxproj
index c90a0e5..e802a34 100644
--- a/VS2008/Supermodel.vcxproj
+++ b/VS2008/Supermodel.vcxproj
@@ -92,7 +92,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -125,7 +125,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -156,7 +156,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     <ClCompile>
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -192,7 +192,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     <ClCompile>
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>false</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL-1.2.14\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Src;..\Src\OSD;..\Src\OSD\SDL;..\Src\OSD\Windows;..\Libraries\zlib-1.2.4;..\Libraries\SDL2-2.0.6\include;$(DXSDK_DIR)\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>SUPERMODEL_WIN32;INLINE=static __inline;_MBCS;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC</PreprocessorDefinitions>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -200,6 +200,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;WbemUuid.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>