diff --git a/stepmania/src/StepManiaXbox.sln b/stepmania/src/StepManiaXbox.sln
index cdc642ca39..f77921b4ed 100644
--- a/stepmania/src/StepManiaXbox.sln
+++ b/stepmania/src/StepManiaXbox.sln
@@ -8,44 +8,23 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug Xbox
-		ConfigName.1 = DebugXbox Win32
-		ConfigName.2 = DebugXbox Xbox
-		ConfigName.3 = Release Win32
-		ConfigName.4 = Release Xbox
+		ConfigName.1 = Release Xbox
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.0 = {93B36940-E3EB-4E3C-9F53-CB3322CE05C5}
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.1 = {A2476C8A-C34D-460F-9E58-6F5C616412DB}
+		{670745A6-106B-420D-A2A9-D4F89A23986E}.0 = {A2476C8A-C34D-460F-9E58-6F5C616412DB}
+		{670745A6-106B-420D-A2A9-D4F89A23986E}.1 = {93B36940-E3EB-4E3C-9F53-CB3322CE05C5}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug Xbox.ActiveCfg = Debug|Xbox
 		{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug Xbox.Build.0 = Debug|Xbox
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.DebugXbox Win32.ActiveCfg = Debug|Xbox
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.DebugXbox Win32.Build.0 = Debug|Xbox
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.DebugXbox Xbox.ActiveCfg = Debug|Xbox
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.DebugXbox Xbox.Build.0 = Debug|Xbox
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.Release Win32.ActiveCfg = Release|Win32
-		{670745A6-106B-420D-A2A9-D4F89A23986E}.Release Win32.Build.0 = Release|Win32
 		{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}.DebugXbox Win32.ActiveCfg = DebugXbox|Win32
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.DebugXbox Win32.Build.0 = DebugXbox|Win32
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.DebugXbox Xbox.ActiveCfg = DebugXbox|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.DebugXbox Xbox.Build.0 = DebugXbox|Xbox
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Release Win32.ActiveCfg = Release|Win32
-		{93B36940-E3EB-4E3C-9F53-CB3322CE05C5}.Release Win32.Build.0 = Release|Win32
 		{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 = DebugXbox|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Debug Xbox.Build.0 = DebugXbox|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.DebugXbox Win32.ActiveCfg = DebugXbox|Win32
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.DebugXbox Win32.Build.0 = DebugXbox|Win32
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.DebugXbox Xbox.ActiveCfg = DebugXbox|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.DebugXbox Xbox.Build.0 = DebugXbox|Xbox
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Release Win32.ActiveCfg = Release|Win32
-		{A2476C8A-C34D-460F-9E58-6F5C616412DB}.Release Win32.Build.0 = Release|Win32
+		{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
diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj
index 67371ea717..2b1cd7666e 100644
--- a/stepmania/src/StepManiaXbox.vcproj
+++ b/stepmania/src/StepManiaXbox.vcproj
@@ -111,7 +111,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /FIXED:NO /FORCE:MULTIPLE"
-				AdditionalDependencies="xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib debug\verstub.obj"
+				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"
@@ -133,7 +133,7 @@ cl
 			<Tool
 				Name="XboxDeploymentTool"
 				ExcludedFromBuild="FALSE"
-				RemotePath="xe:\$(SolutionName)\default.xbe"
+				RemotePath="xe:\$(SolutionName)\default-dbg.xbe"
 				Progress="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
@@ -277,7 +277,8 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="XboxDeploymentTool"
-				ExcludedFromBuild="TRUE"
+				ExcludedFromBuild="FALSE"
+				RemotePath="xe:\$(SolutionName)\default-rls.xbe"
 				Progress="TRUE"
 				ForceCopy="FALSE"/>
 			<Tool
@@ -375,6 +376,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="ScreenEvaluation.h">
 			</File>
+			<File
+				RelativePath="ScreenEvaluationMultiplayer.cpp">
+			</File>
+			<File
+				RelativePath="ScreenEvaluationMultiplayer.h">
+			</File>
 			<File
 				RelativePath="ScreenExit.cpp">
 			</File>
@@ -399,6 +406,12 @@ 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>
@@ -916,6 +929,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="LuaBinding.h">
 			</File>
+			<File
+				RelativePath="LuaExpressionTransform.cpp">
+			</File>
+			<File
+				RelativePath="LuaExpressionTransform.h">
+			</File>
 			<File
 				RelativePath="LuaFunctions.h">
 			</File>
@@ -1430,10 +1449,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					RelativePath="archutils\Win32\arch_setup.cpp">
 				</File>
 				<File
-					RelativePath="archutils\Win32\arch_setup.h">
+					RelativePath=".\archutils\Xbox\arch_setup.h">
 				</File>
 				<File
-					RelativePath=".\archutils\Xbox\arch_setup.h">
+					RelativePath="archutils\Win32\arch_setup.h">
 				</File>
 				<File
 					RelativePath="archutils\Xbox\custom_launch_params.cpp">