diff --git a/stepmania/src/StepManiaXbox-2003.sln b/stepmania/src/StepManiaXbox-2003.sln
index f211b92870..be8c825d24 100644
--- a/stepmania/src/StepManiaXbox-2003.sln
+++ b/stepmania/src/StepManiaXbox-2003.sln
@@ -1,24 +1,17 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StepMania", "StepManiaXbox-2003.vcproj", "{670745A6-106B-420D-A2A9-D4F89A23986E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5} = {93B36940-E3EB-4E3C-9F53-CB3322CE05C5}
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB} = {A2476C8A-C34D-460F-9E58-6F5C616412DB}
 		{CA22B79A-E8A9-4BFB-A297-42231F2213F2} = {CA22B79A-E8A9-4BFB-A297-42231F2213F2}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLua", "lua-5.0\src\LibLua-2003.vcproj", "{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLuaLib", "lua-5.0\src\lib\LibLuaLib-2003.vcproj", "{A2476C8A-C34D-460F-9E58-6F5C616412DB}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xboxmad", "mad-0.15.1b\xboxmad\xboxmad-2003.vcproj", "{CA22B79A-E8A9-4BFB-A297-42231F2213F2}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug Xbox = Debug Xbox
 		Release Xbox = Release Xbox
@@ -28,14 +21,6 @@ Global
 		{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug Xbox.Build.0 = Debug|Xbox
 		{670745A6-106B-420D-A2A9-D4F89A23986E}.Release Xbox.ActiveCfg = Release|Xbox
 		{670745A6-106B-420D-A2A9-D4F89A23986E}.Release Xbox.Build.0 = Release|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Debug Xbox.ActiveCfg = Debug|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Debug Xbox.Build.0 = Debug|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Release Xbox.ActiveCfg = Release|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Release Xbox.Build.0 = Release|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Debug Xbox.ActiveCfg = Release|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Debug Xbox.Build.0 = Release|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Release Xbox.ActiveCfg = Release|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Release Xbox.Build.0 = Release|Xbox
 		{CA22B79A-E8A9-4BFB-A297-42231F2213F2}.Debug Xbox.ActiveCfg = Debug|Xbox
 		{CA22B79A-E8A9-4BFB-A297-42231F2213F2}.Debug Xbox.Build.0 = Debug|Xbox
 		{CA22B79A-E8A9-4BFB-A297-42231F2213F2}.Release Xbox.ActiveCfg = Release|Xbox
diff --git a/stepmania/src/StepManiaXbox-2003.vcproj b/stepmania/src/StepManiaXbox-2003.vcproj
index ca2f3c90ab..ab27508947 100644
--- a/stepmania/src/StepManiaXbox-2003.vcproj
+++ b/stepmania/src/StepManiaXbox-2003.vcproj
@@ -102,6 +102,7 @@ cl
 				AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1/include";baseclasses\"
 				PreprocessorDefinitions="WIN32,_XBOX,XBOX,NDEBUG,_XDBG"
 				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="global.h"
 				PrecompiledHeaderFile=".\Debug/StepMania.pch"
@@ -119,7 +120,7 @@ cl
 				AdditionalOptions="/MACHINE:I386 /FIXED:NO /FORCE:MULTIPLE"
 				AdditionalDependencies="libpng/lib/xboxlibpng.lib xbdm.lib xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib debug\verstub.obj"
 				OutputFile="../StepManiaXbox-debug.exe"
-				LinkIncremental="0"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libcd,libcmt"
 				GenerateDebugInformation="TRUE"
@@ -138,7 +139,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 "/>
 			<Tool
 				Name="XboxDeploymentTool"
-				ExcludedFromBuild="FALSE"
+				ExcludedFromBuild="TRUE"
 				RemotePath="xe:\StepmaniaXbox\default-dbg.xbe"
 				Progress="TRUE"/>
 			<Tool
@@ -256,6 +257,7 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="global.h"
 				PrecompiledHeaderFile="$(IntDir)/StepMania.pch"
@@ -299,13 +301,15 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				Name="XboxImageTool"
 				FileName="../default.xbe"
 				StackSize="0x10000"
-				IncludeDebugInfo="TRUE"
+				IncludeDebugInfo="FALSE"
 				SuppressStartupBanner="TRUE"
-				TitleID=""
+				TitleID="0x33342530"
+				AltID="0x30253433"
 				XboxGameRating="5"
 				TitleInfo=""
 				TitleName="StepmaniaX"
-				TitleImage=""/>
+				TitleImage=".\archutils\Xbox\smicon.XBX"
+				SaveGameImage=".\archutils\Xbox\saveblue.XBX"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -1149,6 +1153,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScoreKeeper.h">
 			</File>
+			<File
+				RelativePath=".\ScoreKeeperGuitar.cpp">
+			</File>
+			<File
+				RelativePath=".\ScoreKeeperGuitar.h">
+			</File>
 			<File
 				RelativePath=".\ScoreKeeperNormal.cpp">
 			</File>
@@ -1325,9 +1335,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath="arch\arch_default.h">
 				</File>
-				<File
-					RelativePath="arch\arch_platform.h">
-				</File>
 				<Filter
 					Name="LoadingWindow"
 					Filter="">
@@ -1353,6 +1360,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\Sound\DSoundHelpers.h">
 					</File>
+					<File
+						RelativePath=".\arch\Sound\RageSoundDriver.cpp">
+					</File>
 					<File
 						RelativePath="arch\Sound\RageSoundDriver.h">
 					</File>
@@ -1475,6 +1485,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\MemoryCard\MemoryCardDriver_Null.h">
 					</File>
+					<File
+						RelativePath=".\arch\MemoryCard\MemoryCardDriverThreaded_Xbox.cpp">
+					</File>
+					<File
+						RelativePath=".\arch\MemoryCard\MemoryCardDriverThreaded_Xbox.h">
+					</File>
 				</Filter>
 				<Filter
 					Name="Dialog"
@@ -1485,6 +1501,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\Dialog\Dialog.h">
 					</File>
+					<File
+						RelativePath=".\arch\Dialog\DialogDriver.cpp">
+					</File>
 					<File
 						RelativePath="arch\Dialog\DialogDriver.h">
 					</File>
@@ -2226,6 +2245,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageSoundPosMap.h">
 			</File>
+			<File
+				RelativePath=".\RageSoundReader.cpp">
+			</File>
 			<File
 				RelativePath="RageSoundReader.h">
 			</File>
@@ -2247,30 +2269,30 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageSoundReader_MP3.h">
 			</File>
+			<File
+				RelativePath=".\RageSoundReader_PitchChange.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSoundReader_PitchChange.h">
+			</File>
 			<File
 				RelativePath="RageSoundReader_Preload.cpp">
 			</File>
 			<File
 				RelativePath="RageSoundReader_Preload.h">
 			</File>
-			<File
-				RelativePath="RageSoundReader_Resample.cpp">
-			</File>
-			<File
-				RelativePath="RageSoundReader_Resample.h">
-			</File>
-			<File
-				RelativePath="RageSoundReader_Resample_Fast.cpp">
-			</File>
-			<File
-				RelativePath="RageSoundReader_Resample_Fast.h">
-			</File>
 			<File
 				RelativePath="RageSoundReader_Resample_Good.cpp">
 			</File>
 			<File
 				RelativePath="RageSoundReader_Resample_Good.h">
 			</File>
+			<File
+				RelativePath=".\RageSoundReader_SpeedChange.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSoundReader_SpeedChange.h">
+			</File>
 			<File
 				RelativePath="RageSoundReader_Vorbisfile.cpp">
 			</File>
@@ -2641,6 +2663,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\GameManager.h">
 			</File>
+			<File
+				RelativePath=".\GamePreferences.cpp">
+			</File>
+			<File
+				RelativePath=".\GamePreferences.h">
+			</File>
 			<File
 				RelativePath="GameSoundManager.cpp">
 			</File>
@@ -2701,12 +2729,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="NetworkSyncManager.h">
 			</File>
-			<File
-				RelativePath="NetworkSyncServer.cpp">
-			</File>
-			<File
-				RelativePath="NetworkSyncServer.h">
-			</File>
 			<File
 				RelativePath="NoteSkinManager.cpp">
 			</File>
@@ -3088,15 +3110,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\lua-5.1\src\ltm.h">
 			</File>
-			<File
-				RelativePath=".\lua-5.1\src\lua.c">
-			</File>
 			<File
 				RelativePath=".\lua-5.1\src\lua.h">
 			</File>
-			<File
-				RelativePath=".\lua-5.1\src\luac.c">
-			</File>
 			<File
 				RelativePath=".\lua-5.1\src\luaconf.h">
 			</File>
@@ -3125,12 +3141,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath=".\lua-5.1\src\print.c">
 			</File>
 		</Filter>
-		<File
-			RelativePath="archutils\Win32\DialogCrashHeader.bmp">
-		</File>
-		<File
-			RelativePath="archutils\Win32\DialogErrorHeader.bmp">
-		</File>
 		<File
 			RelativePath="StepMania.xpm">
 		</File>