diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj
index 19312cbf42..1831dfbea3 100644
--- a/stepmania/src/StepManiaXbox.vcproj
+++ b/stepmania/src/StepManiaXbox.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.0"
+	Version="7.00"
 	Name="StepMania"
 	SccProjectName=""
 	SccLocalPath=""
@@ -79,14 +79,8 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Xbox"
@@ -220,14 +214,8 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
 			<Tool
 				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Xbox"
@@ -293,8 +281,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				TitleImage=""/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
 		<Filter
 			Name="Screens"
@@ -317,12 +303,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 +315,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 +340,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,12 +357,6 @@ 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>
@@ -407,6 +387,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenGameplay.h">
 			</File>
+			<File
+				RelativePath="ScreenGameplayMultiplayer.cpp">
+			</File>
+			<File
+				RelativePath="ScreenGameplayMultiplayer.h">
+			</File>
 			<File
 				RelativePath="ScreenHowToPlay.cpp">
 			</File>
@@ -419,18 +405,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 +489,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>
@@ -551,12 +567,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenReloadSongs.h">
 			</File>
+			<File
+				RelativePath="ScreenSMOnlineLogin.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSMOnlineLogin.h">
+			</File>
 			<File
 				RelativePath="ScreenSandbox.cpp">
 			</File>
 			<File
 				RelativePath="ScreenSandbox.h">
 			</File>
+			<File
+				RelativePath="ScreenSaveSync.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSaveSync.h">
+			</File>
 			<File
 				RelativePath="ScreenSelect.cpp">
 			</File>
@@ -611,18 +639,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenSetTime.h">
 			</File>
-			<File
-				RelativePath="ScreenSMOnlineLogin.cpp">
-			</File>
-			<File
-				RelativePath="ScreenSMOnlineLogin.h">
-			</File>
 			<File
 				RelativePath="ScreenSongOptions.cpp">
 			</File>
 			<File
 				RelativePath="ScreenSongOptions.h">
 			</File>
+			<File
+				RelativePath="ScreenSplash.cpp">
+			</File>
+			<File
+				RelativePath="ScreenSplash.h">
+			</File>
 			<File
 				RelativePath="ScreenStage.cpp">
 			</File>
@@ -630,10 +658,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				RelativePath="ScreenStage.h">
 			</File>
 			<File
-				RelativePath="ScreenStyleSplash.cpp">
+				RelativePath="ScreenSyncOverlay.cpp">
 			</File>
 			<File
-				RelativePath="ScreenStyleSplash.h">
+				RelativePath="ScreenSyncOverlay.h">
 			</File>
 			<File
 				RelativePath=".\ScreenSystemLayer.cpp">
@@ -717,6 +745,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="AutoKeysounds.h">
 			</File>
+			<File
+				RelativePath="BackgroundUtil.cpp">
+			</File>
+			<File
+				RelativePath="BackgroundUtil.h">
+			</File>
 			<File
 				RelativePath="BannerCache.cpp">
 			</File>
@@ -759,12 +793,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 +847,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 +892,12 @@ 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="LuaFunctions.h">
 			</File>
@@ -885,6 +940,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="NoteFieldPositioning.h">
 			</File>
+			<File
+				RelativePath="NoteTypes.cpp">
+			</File>
+			<File
+				RelativePath="NoteTypes.h">
+			</File>
 			<File
 				RelativePath="NotesLoader.cpp">
 			</File>
@@ -927,12 +988,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="NotesWriterSM.h">
 			</File>
-			<File
-				RelativePath="NoteTypes.cpp">
-			</File>
-			<File
-				RelativePath="NoteTypes.h">
-			</File>
 			<File
 				RelativePath=".\OptionRowHandler.cpp">
 			</File>
@@ -1065,6 +1120,9 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="StyleUtil.h">
 			</File>
+			<File
+				RelativePath="SubscriptionManager.h">
+			</File>
 			<File
 				RelativePath="ThemeMetric.h">
 			</File>
@@ -1118,12 +1176,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 		<Filter
 			Name="StepMania"
 			Filter="">
-			<File
-				RelativePath=".\global.cpp">
-			</File>
-			<File
-				RelativePath=".\global.h">
-			</File>
 			<File
 				RelativePath="ProductInfo.h">
 			</File>
@@ -1136,6 +1188,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\StepMania.h">
 			</File>
+			<File
+				RelativePath=".\global.cpp">
+			</File>
+			<File
+				RelativePath=".\global.h">
+			</File>
 			<Filter
 				Name="arch"
 				Filter="">
@@ -1326,6 +1384,24 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<Filter
 				Name="system"
 				Filter="">
+				<File
+					RelativePath="GameLoop.cpp">
+				</File>
+				<File
+					RelativePath="GameLoop.h">
+				</File>
+				<File
+					RelativePath="archutils\Xbox\GraphicsWindow.cpp">
+				</File>
+				<File
+					RelativePath="archutils\Xbox\GraphicsWindow.h">
+				</File>
+				<File
+					RelativePath=".\archutils\Xbox\VirtualMemory.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Xbox\VirtualMemory.h">
+				</File>
 				<File
 					RelativePath="archutils\Win32\arch_setup.cpp">
 				</File>
@@ -1341,29 +1417,11 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				<File
 					RelativePath="archutils\Xbox\custom_launch_params.h">
 				</File>
-				<File
-					RelativePath="archutils\Xbox\GraphicsWindow.cpp">
-				</File>
-				<File
-					RelativePath="archutils\Xbox\GraphicsWindow.h">
-				</File>
-				<File
-					RelativePath=".\archutils\Xbox\VirtualMemory.cpp">
-				</File>
-				<File
-					RelativePath=".\archutils\Xbox\VirtualMemory.h">
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Actors used in Gameplay and Menus"
 			Filter="">
-			<File
-				RelativePath=".\Banner.cpp">
-			</File>
-			<File
-				RelativePath=".\Banner.h">
-			</File>
 			<File
 				RelativePath="BGAnimation.cpp">
 			</File>
@@ -1376,6 +1434,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="BGAnimationLayer.h">
 			</File>
+			<File
+				RelativePath=".\Banner.cpp">
+			</File>
+			<File
+				RelativePath=".\Banner.h">
+			</File>
 			<File
 				RelativePath="DifficultyIcon.cpp">
 			</File>
@@ -1458,18 +1522,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 +1546,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>
@@ -1596,6 +1642,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="PaneDisplay.h">
 			</File>
+			<File
+				RelativePath="RoomWheel.cpp">
+			</File>
+			<File
+				RelativePath="RoomWheel.h">
+			</File>
 			<File
 				RelativePath="ScrollBar.cpp">
 			</File>
@@ -1672,12 +1724,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="BeginnerHelper.h">
 			</File>
-			<File
-				RelativePath="CharacterHead.cpp">
-			</File>
-			<File
-				RelativePath="CharacterHead.h">
-			</File>
 			<File
 				RelativePath="CombinedLifeMeter.h">
 			</File>
@@ -2075,6 +2121,30 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageSurface.h">
 			</File>
+			<File
+				RelativePath="RageSurfaceUtils.cpp">
+			</File>
+			<File
+				RelativePath="RageSurfaceUtils.h">
+			</File>
+			<File
+				RelativePath=".\RageSurfaceUtils_Dither.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSurfaceUtils_Dither.h">
+			</File>
+			<File
+				RelativePath="RageSurfaceUtils_Palettize.cpp">
+			</File>
+			<File
+				RelativePath="RageSurfaceUtils_Palettize.h">
+			</File>
+			<File
+				RelativePath=".\RageSurfaceUtils_Zoom.cpp">
+			</File>
+			<File
+				RelativePath=".\RageSurfaceUtils_Zoom.h">
+			</File>
 			<File
 				RelativePath="RageSurface_Load.cpp">
 			</File>
@@ -2123,30 +2193,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\RageSurface_Save_JPEG.h">
 			</File>
-			<File
-				RelativePath="RageSurfaceUtils.cpp">
-			</File>
-			<File
-				RelativePath="RageSurfaceUtils.h">
-			</File>
-			<File
-				RelativePath=".\RageSurfaceUtils_Dither.cpp">
-			</File>
-			<File
-				RelativePath=".\RageSurfaceUtils_Dither.h">
-			</File>
-			<File
-				RelativePath="RageSurfaceUtils_Palettize.cpp">
-			</File>
-			<File
-				RelativePath="RageSurfaceUtils_Palettize.h">
-			</File>
-			<File
-				RelativePath=".\RageSurfaceUtils_Zoom.cpp">
-			</File>
-			<File
-				RelativePath=".\RageSurfaceUtils_Zoom.h">
-			</File>
 			<File
 				RelativePath=".\RageTexture.cpp">
 			</File>
@@ -2165,6 +2211,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>
@@ -2312,6 +2364,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,18 +2398,18 @@ 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>
 			<File
 				RelativePath="CryptManager.h">
 			</File>
-			<File
-				RelativePath="ezsockets.cpp">
-			</File>
-			<File
-				RelativePath="ezsockets.h">
-			</File>
 			<File
 				RelativePath=".\FontManager.cpp">
 			</File>
@@ -2481,6 +2536,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\UnlockManager.h">
 			</File>
+			<File
+				RelativePath="ezsockets.cpp">
+			</File>
+			<File
+				RelativePath="ezsockets.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Crypto"
@@ -2512,18 +2573,18 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="crypto\CryptPrime.h">
 			</File>
-			<File
-				RelativePath="crypto\CryptRand.cpp">
-			</File>
-			<File
-				RelativePath="crypto\CryptRand.h">
-			</File>
 			<File
 				RelativePath="crypto\CryptRSA.cpp">
 			</File>
 			<File
 				RelativePath="crypto\CryptRSA.h">
 			</File>
+			<File
+				RelativePath="crypto\CryptRand.cpp">
+			</File>
+			<File
+				RelativePath="crypto\CryptRand.h">
+			</File>
 			<File
 				RelativePath="crypto\CryptSH512.cpp">
 			</File>