diff --git a/stepmania/SDL.dll b/stepmania/SDL.dll
index 8e917e5f87..f9d6747140 100644
Binary files a/stepmania/SDL.dll and b/stepmania/SDL.dll differ
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 6d5918b730..ca5150ffbf 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 60000
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -61,7 +61,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # Begin Special Build Tool
 IntDir=.\../Debug6
-TargetDir=\stepmania\stepmania
+TargetDir=\temp\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
 PreLink_Cmds=disasm\verinc                                                                                                                                         	cl                                                                                                                                          /Zl                                                                                                                                          /nologo                                                                                                                                          /c                                                                                                                                          verstub.cpp                                                                                                                                          /Fo$(IntDir)\ 
@@ -82,23 +82,23 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Intermediate_Dir "StepMania___Xbox_Debug___VC6"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+XBCP=xbecopy.exe
+# ADD BASE XBCP /NOLOGO
+# ADD XBCP /NOLOGO
+XBE=imagebld.exe
+# ADD BASE XBE /nologo /stack:0x10000 /debug
+# ADD XBE /nologo /stack:0x10000 /debug
 LINK32=link.exe
 # ADD BASE LINK32 $(intdir)\verstub.obj kernel32.lib shell32.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
 # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # ADD LINK32 $(intdir)\verstub.obj kernel32.lib shell32.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
-XBE=imagebld.exe
-# ADD BASE XBE /nologo /stack:0x10000 /debug
-# ADD XBE /nologo /stack:0x10000 /debug
-XBCP=xbecopy.exe
-# ADD BASE XBCP /NOLOGO
-# ADD XBCP /NOLOGO
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
 # Begin Special Build Tool
 IntDir=.\StepMania___Xbox_Debug___VC6
 TargetDir=.\StepMania___Xbox_Debug___VC6
@@ -141,7 +141,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /pdb:none
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\stepmania\stepmania
+TargetDir=\temp\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
 PreLink_Cmds=disasm\verinc                                                                                                                                         	cl                                                                                                                                          /Zl                                                                                                                                          /nologo                                                                                                                                          /c                                                                                                                                          verstub.cpp                                                                                                                                          /Fo$(IntDir)\ 
@@ -1510,7 +1510,7 @@ SOURCE=.\arch\InputHandler\InputHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\arch\InputHandler\InputHandler_SDL.cpp
+SOURCE=.\arch\InputHandler\InputHandler_DirectInput.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"
 
@@ -1523,7 +1523,7 @@ SOURCE=.\arch\InputHandler\InputHandler_SDL.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\arch\InputHandler\InputHandler_SDL.h
+SOURCE=.\arch\InputHandler\InputHandler_DirectInput.h
 # End Source File
 # Begin Source File
 
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 0cd35c2fe8..ba61d0a95a 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -915,10 +915,10 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 						RelativePath="arch\InputHandler\InputHandler.h">
 					</File>
 					<File
-						RelativePath="arch\InputHandler\InputHandler_SDL.cpp">
+						RelativePath="arch\InputHandler\InputHandler_DirectInput.cpp">
 					</File>
 					<File
-						RelativePath="arch\InputHandler\InputHandler_SDL.h">
+						RelativePath="arch\InputHandler\InputHandler_DirectInput.h">
 					</File>
 					<File
 						RelativePath="arch\InputHandler\InputHandler_Win32_Pump.cpp">