diff --git a/stepmania/Themes/default/BGAnimations/ScreenStage decorations/Stage_Demo.lua b/stepmania/Themes/default/BGAnimations/ScreenStage decorations/Stage_Demo.lua
new file mode 100644
index 0000000000..3335d17146
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenStage decorations/Stage_Demo.lua	
@@ -0,0 +1,3 @@
+return Def.ActorFrame {
+
+};
diff --git a/stepmania/Themes/default/BGAnimations/ScreenStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenStage decorations/default.lua
index 5f1430214a..6f8e810a3e 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenStage decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenStage decorations/default.lua	
@@ -1,11 +1,9 @@
-local t = {};
-t[#t+1] = Def.ActorFrame {
-	LoadActor("horizon") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
-	};
-	LoadActor("sun") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
-	};
+local t = Def.ActorFrame {};
+t[#t+1] = LoadActor("horizon") .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
+};
+t[#t+1] = LoadActor("sun") .. {
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
 };
 local InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;);
 local OnCommand=cmd(cropbottom,1;linear,0.5;cropbottom,0;sleep,10;);
diff --git a/stepmania/Themes/default/BGAnimations/ScreenStage in.lua b/stepmania/Themes/default/BGAnimations/ScreenStage in.lua
new file mode 100644
index 0000000000..320d4a18f9
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenStage in.lua	
@@ -0,0 +1 @@
+return Def.Actor { StartTransitioningCommand=cmd(sleep,2;); }
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua
index 4716c1a6ed..d42f24bc23 100644
--- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua	
@@ -8,7 +8,7 @@ return Def.ActorFrame {
 			InitCommand=cmd(horizalign,left;y,4);
 		};
 		LoadFont( "_sf sports night ns upright 26px header text" ) .. {
-			InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15;zoomx,1.2;);
+			InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15;zoomx,1.2;maxwidth,250;);
 			Name="HeaderText";
 		};
 		LoadFont( "_venacti 10px header subtext" ) .. {
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 21724d088c..73740c246c 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -1924,4 +1924,8 @@ Zulu=isiZulu
 
 [ScreenPlayerOptions]
 HeaderText=Select Modifiers
-HeaderSubText=Challenge yourself to achieve ultimate skill!
\ No newline at end of file
+HeaderSubText=Challenge yourself to achieve the ultimate skill!
+
+[ScreenSongOptions]
+HeaderText=Song Modifiers
+HeaderSubText=You picked a great song.  Now let's dance!
\ No newline at end of file
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 557cadb098..117b33cb08 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -805,22 +805,18 @@ Fallback="ScreenWithMenuElements2"
 
 [ScreenSplash]
 Class="ScreenSplash"
-Fallback="ScreenWithMenuElements"
-MinimumLoadDelaySeconds=2
+Fallback="ScreenWithMenuElementsBlank"
+MinimumScreenPrepareDelaySeconds=0
 AllowStartToSkip=false
-PrepareScreen=false
+PrepareScreen=
 
 [ScreenStage]
-Class="ScreenStage"
-Fallback="Screen"
+Fallback="ScreenSplash"
+PrepareScreen=GetGameplayScreen()
 NextScreen=GetGameplayScreen()
 PrevScreen=SongSelectionScreen()
 LightsMode="LightsMode_Stage"
-// This is the minimum delay after the "in" transition before the
-// "out" transition will begin.  (NextScreen is loaded during this
-// time.)
-MinimumDelay=10
-AllowBack=true
+TimerSeconds=3
 
 [ScreenGameplay]
 Class="ScreenGameplayNormal"
@@ -2134,16 +2130,16 @@ RowInitCommand=
 RowOnCommand=
 RowOffCommand=
 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end
-ExplanationP1X=SCREEN_CENTER_X-250
-ExplanationP1Y=SCREEN_CENTER_Y+182
+ExplanationP1X=SCREEN_CENTER_X-300
+ExplanationP1Y=SCREEN_CENTER_Y+184
 ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
 ExplanationP1OffCommand=
 ExplanationP2X=SCREEN_CENTER_X+250
-ExplanationP2Y=SCREEN_CENTER_Y+182
+ExplanationP2Y=SCREEN_CENTER_Y+184
 ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
 ExplanationP2OffCommand=
 ExplanationTogetherX=SCREEN_CENTER_X-302
-ExplanationTogetherY=SCREEN_CENTER_Y+182
+ExplanationTogetherY=SCREEN_CENTER_Y+184
 ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
 ExplanationTogetherOffCommand=
 DisqualifyP1X=
@@ -4264,7 +4260,7 @@ TimerSeconds=-1
 [PaneDisplay]
 ShiftP1X=-40
 ShiftP1Y=0
-ShiftP2X=-40
+ShiftP2X=-70
 ShiftP2Y=0
 CountFormat="%3.0f"
 NumStepsTextX=-18+64*-0.5