diff --git a/stepmania/src/StepManiaXbox-2003.sln b/stepmania/src/StepManiaXbox-2003.sln
index 409f5374f8..cf86e41b39 100644
--- a/stepmania/src/StepManiaXbox-2003.sln
+++ b/stepmania/src/StepManiaXbox-2003.sln
@@ -1,5 +1,15 @@
 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}
+	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
@@ -13,6 +23,14 @@ 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 = DebugXbox|Xbox
+		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Debug Xbox.Build.0 = DebugXbox|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
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		DPBuild = 5
diff --git a/stepmania/src/StepManiaXbox-2003.vcproj b/stepmania/src/StepManiaXbox-2003.vcproj
index d2ebd94087..b9566c974e 100644
--- a/stepmania/src/StepManiaXbox-2003.vcproj
+++ b/stepmania/src/StepManiaXbox-2003.vcproj
@@ -100,9 +100,10 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				Optimization="0"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.0/include""
-				PreprocessorDefinitions="WIN32,_XBOX,XBOX,_DEBUG,OGG_ONLY,_INC_WINDOWS"
+				PreprocessorDefinitions="WIN32,_XBOX,XBOX,NDEBUG,_XDBG"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="global.h"
 				PrecompiledHeaderFile=".\Debug/StepMania.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -115,35 +116,44 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386 /FIXED:NO"
-				AdditionalDependencies="xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib debug\verstub.obj"
+				AdditionalOptions="/MACHINE:I386 /FIXED:NO /FORCE:MULTIPLE"
+				AdditionalDependencies="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"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libcd,libcmt"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/StepManiaXbox-debug.pdb"/>
+				ProgramDatabaseFile=".\Debug/StepManiaXbox-debug.pdb"
+				OptimizeReferences="0"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)StepMania.vdi ia32.vdi"/>
+				Description="disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)StepMania.vdi ia32.vdi"
+				ExcludedFromBuild="TRUE"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
 				CommandLine="disasm\verinc
 cl                                                                                                                                                                                    /Zl                                                                                                                                                                                    /nologo                                                                                                                                                                                    /c                                                                                                                                                                                    verstub.cpp                                                                                                                                                                                    /Fo$(IntDir)\
-"/>
+"
+				ExcludedFromBuild="TRUE"/>
 			<Tool
-				Name="XboxDeploymentTool"/>
+				Name="XboxDeploymentTool"
+				ExcludedFromBuild="FALSE"
+				RemotePath="xe:\$(SolutionName)\default-dbg.xbe"
+				Progress="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
-				FileName="../default.xbe"
+				FileName="../default-debug.xbe"
 				StackSize="0x10000"
 				IncludeDebugInfo="TRUE"
 				LimitAvailableMemoryTo64MB="TRUE"
 				SuppressStartupBanner="TRUE"
 				XboxGameRating="5"
-				TitleName="StepmaniaX"/>
+				TitleInfo=""
+				TitleName="StepmaniaX"
+				TitleImage=".\archutils\Xbox\smicon.XBX"
+				SaveGameImage=".\archutils\Xbox\saveblue.XBX"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -238,6 +248,7 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="3"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;lua-5.0/include&quot;"
 				PreprocessorDefinitions="WIN32,_XBOX,XBOX,NDEBUG"
@@ -279,8 +290,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="XboxDeploymentTool"
+				ExcludedFromBuild="FALSE"
+				RemotePath="xe:\$(SolutionName)\default-rls.xbe"
 				Progress="TRUE"
-				ForceCopy="TRUE"/>
+				ForceCopy="FALSE"/>
 			<Tool
 				Name="XboxImageTool"
 				FileName="../default.xbe"
@@ -288,6 +301,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				IncludeDebugInfo="TRUE"
 				SuppressStartupBanner="TRUE"
 				TitleID=""
+				XboxGameRating="5"
 				TitleInfo=""
 				TitleName="StepmaniaX"
 				TitleImage=""/>
@@ -317,12 +331,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenBookkeeping.h">
 			</File>
-			<File
-				RelativePath="ScreenBranch.cpp">
-			</File>
-			<File
-				RelativePath="ScreenBranch.h">
-			</File>
 			<File
 				RelativePath="ScreenCenterImage.cpp">
 			</File>
@@ -335,6 +343,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenCredits.h">
 			</File>
+			<File
+				RelativePath="ScreenDebugOverlay.cpp">
+			</File>
+			<File
+				RelativePath="ScreenDebugOverlay.h">
+			</File>
 			<File
 				RelativePath="ScreenDemonstration.cpp">
 			</File>
@@ -354,10 +368,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath="ScreenEdit.h">
 			</File>
 			<File
-				RelativePath="ScreenEditCoursesMenu.cpp">
+				RelativePath="ScreenEditCourseMods.cpp">
 			</File>
 			<File
-				RelativePath="ScreenEditCoursesMenu.h">
+				RelativePath="ScreenEditCourseMods.h">
 			</File>
 			<File
 				RelativePath="ScreenEditMenu.cpp">
@@ -371,18 +385,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenEnding.h">
 			</File>
-			<File
-				RelativePath="ScreenEndlessBreak.cpp">
-			</File>
-			<File
-				RelativePath="ScreenEndlessBreak.h">
-			</File>
 			<File
 				RelativePath="ScreenEvaluation.cpp">
 			</File>
 			<File
 				RelativePath="ScreenEvaluation.h">
 			</File>
+			<File
+				RelativePath="ScreenEvaluationMultiplayer.cpp">
+			</File>
+			<File
+				RelativePath="ScreenEvaluationMultiplayer.h">
+			</File>
 			<File
 				RelativePath="ScreenExit.cpp">
 			</File>
@@ -407,6 +421,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenGameplay.h">
 			</File>
+			<File
+				RelativePath="ScreenGameplayLesson.cpp">
+			</File>
+			<File
+				RelativePath="ScreenGameplayLesson.h">
+			</File>
+			<File
+				RelativePath="ScreenGameplayMultiplayer.cpp">
+			</File>
+			<File
+				RelativePath="ScreenGameplayMultiplayer.h">
+			</File>
+			<File
+				RelativePath="ScreenGameplayNormal.cpp">
+			</File>
+			<File
+				RelativePath="ScreenGameplayNormal.h">
+			</File>
 			<File
 				RelativePath="ScreenHowToPlay.cpp">
 			</File>
@@ -419,18 +451,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenInstructions.h">
 			</File>
+			<File
+				RelativePath="ScreenJoinMultiplayer.cpp">
+			</File>
+			<File
+				RelativePath="ScreenJoinMultiplayer.h">
+			</File>
 			<File
 				RelativePath="ScreenJukebox.cpp">
 			</File>
 			<File
 				RelativePath="ScreenJukebox.h">
 			</File>
-			<File
-				RelativePath="ScreenLogo.cpp">
-			</File>
-			<File
-				RelativePath="ScreenLogo.h">
-			</File>
 			<File
 				RelativePath="ScreenMapControllers.cpp">
 			</File>
@@ -503,6 +535,36 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenOptions.h">
 			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourse.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourse.h">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourseEntry.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourseEntry.h">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditProfile.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditProfile.h">
+			</File>
+			<File
+				RelativePath="ScreenOptionsManageCourses.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsManageCourses.h">
+			</File>
+			<File
+				RelativePath="ScreenOptionsManageProfiles.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsManageProfiles.h">
+			</File>
 			<File
 				RelativePath="ScreenOptionsMaster.cpp">
 			</File>
@@ -557,6 +619,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenSandbox.h">
 			</File>
+			<File
+				RelativePath="ScreenSaveSync.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSaveSync.h">
+			</File>
 			<File
 				RelativePath="ScreenSelect.cpp">
 			</File>
@@ -623,12 +691,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenSongOptions.h">
 			</File>
+			<File
+				RelativePath="ScreenSplash.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSplash.h">
+			</File>
 			<File
 				RelativePath="ScreenStage.cpp">
 			</File>
 			<File
 				RelativePath="ScreenStage.h">
 			</File>
+			<File
+				RelativePath="ScreenSyncOverlay.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSyncOverlay.h">
+			</File>
 			<File
 				RelativePath=".\ScreenSystemLayer.cpp">
 			</File>
@@ -712,10 +792,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath="AutoKeysounds.h">
 			</File>
 			<File
-				RelativePath=".\BackgroundUtil.cpp">
+				RelativePath="BackgroundUtil.cpp">
 			</File>
 			<File
-				RelativePath=".\BackgroundUtil.h">
+				RelativePath="BackgroundUtil.h">
 			</File>
 			<File
 				RelativePath="BannerCache.cpp">
@@ -759,12 +839,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="Course.h">
 			</File>
+			<File
+				RelativePath="CourseLoaderCRS.cpp">
+			</File>
+			<File
+				RelativePath="CourseLoaderCRS.h">
+			</File>
 			<File
 				RelativePath="CourseUtil.cpp">
 			</File>
 			<File
 				RelativePath="CourseUtil.h">
 			</File>
+			<File
+				RelativePath="CourseWriterCRS.cpp">
+			</File>
+			<File
+				RelativePath="CourseWriterCRS.h">
+			</File>
 			<File
 				RelativePath="DateTime.cpp">
 			</File>
@@ -801,6 +893,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="FontCharmaps.h">
 			</File>
+			<File
+				RelativePath="Foreach.h">
+			</File>
 			<File
 				RelativePath="Game.cpp">
 			</File>
@@ -843,6 +938,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="Inventory.h">
 			</File>
+			<File
+				RelativePath="LuaBinding.cpp">
+			</File>
+			<File
+				RelativePath="LuaBinding.h">
+			</File>
+			<File
+				RelativePath="LuaExpressionTransform.cpp">
+			</File>
+			<File
+				RelativePath="LuaExpressionTransform.h">
+			</File>
 			<File
 				RelativePath="LuaFunctions.h">
 			</File>
@@ -957,6 +1064,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="PlayerOptions.h">
 			</File>
+			<File
+				RelativePath="PlayerScoreList.cpp">
+			</File>
+			<File
+				RelativePath="PlayerScoreList.h">
+			</File>
 			<File
 				RelativePath=".\PlayerStageStats.cpp">
 			</File>
@@ -1065,6 +1178,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="StyleUtil.h">
 			</File>
+			<File
+				RelativePath="SubscriptionManager.h">
+			</File>
 			<File
 				RelativePath="ThemeMetric.h">
 			</File>
@@ -1163,6 +1279,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath=".\arch\LoadingWindow\LoadingWindow_Xbox.h">
 					</File>
+					<File
+						RelativePath="arch\LoadingWindow\Selector_LoadingWindow.h">
+					</File>
 				</Filter>
 				<Filter
 					Name="Sound"
@@ -1200,6 +1319,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\Sound\RageSoundDriver_Null.h">
 					</File>
+					<File
+						RelativePath="arch\Sound\Selector_RageSoundDriver.h">
+					</File>
 				</Filter>
 				<Filter
 					Name="ArchHooks"
@@ -1251,12 +1373,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					<File
 						RelativePath="arch\MovieTexture\MovieTexture.h">
 					</File>
-					<File
-						RelativePath=".\arch\MovieTexture\MovieTexture_FFMpeg.cpp">
-					</File>
-					<File
-						RelativePath=".\arch\MovieTexture\MovieTexture_FFMpeg.h">
-					</File>
 					<File
 						RelativePath="arch\MovieTexture\MovieTexture_Null.cpp">
 					</File>
@@ -1341,6 +1457,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath="archutils\Xbox\custom_launch_params.h">
 				</File>
+				<File
+					RelativePath="GameLoop.cpp">
+				</File>
+				<File
+					RelativePath="GameLoop.h">
+				</File>
 				<File
 					RelativePath="archutils\Xbox\GraphicsWindow.cpp">
 				</File>
@@ -1458,18 +1580,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="DualScrollBar.h">
 			</File>
-			<File
-				RelativePath="EditCoursesMenu.cpp">
-			</File>
-			<File
-				RelativePath="EditCoursesMenu.h">
-			</File>
-			<File
-				RelativePath="EditCoursesSongMenu.cpp">
-			</File>
-			<File
-				RelativePath="EditCoursesSongMenu.h">
-			</File>
 			<File
 				RelativePath="EditMenu.cpp">
 			</File>
@@ -1494,12 +1604,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="GraphDisplay.h">
 			</File>
-			<File
-				RelativePath="GrooveGraph.cpp">
-			</File>
-			<File
-				RelativePath="GrooveGraph.h">
-			</File>
 			<File
 				RelativePath="GrooveRadar.cpp">
 			</File>
@@ -1597,10 +1701,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath="PaneDisplay.h">
 			</File>
 			<File
-				RelativePath=".\RoomWheel.cpp">
+				RelativePath="RoomWheel.cpp">
 			</File>
 			<File
-				RelativePath=".\RoomWheel.h">
+				RelativePath="RoomWheel.h">
 			</File>
 			<File
 				RelativePath="ScrollBar.cpp">
@@ -2165,6 +2269,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\RageTextureManager.h">
 			</File>
+			<File
+				RelativePath="RageTexturePreloader.cpp">
+			</File>
+			<File
+				RelativePath="RageTexturePreloader.h">
+			</File>
 			<File
 				RelativePath="RageThreads.cpp">
 			</File>
@@ -2276,6 +2386,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ActorScroller.h">
 			</File>
+			<File
+				RelativePath="ActorSound.cpp">
+			</File>
+			<File
+				RelativePath="ActorSound.h">
+			</File>
 			<File
 				RelativePath="ActorUtil.cpp">
 			</File>
@@ -2312,6 +2428,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ModelTypes.h">
 			</File>
+			<File
+				RelativePath="Quad.cpp">
+			</File>
 			<File
 				RelativePath="Quad.h">
 			</File>
@@ -2343,6 +2462,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="Bookkeeper.h">
 			</File>
+			<File
+				RelativePath="CharacterManager.cpp">
+			</File>
+			<File
+				RelativePath="CharacterManager.h">
+			</File>
 			<File
 				RelativePath="CryptManager.cpp">
 			</File>