diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/_warning.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/_warning.png
similarity index 100%
rename from stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/_warning.png
rename to stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/_warning.png
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/bumper.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/bumper.png
similarity index 100%
rename from stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/bumper.png
rename to stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/bumper.png
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
similarity index 84%
rename from stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua
rename to stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index a16e1a3ae0..9d693cdb6f 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -1,17 +1,17 @@
-local t = Def.ActorFrame {
-	LoadActor("_warning") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;
-			vertalign,top;
-			wag;effectmagnitude,0,0,10;effectperiod,2;
-		);
-		OnCommand=cmd(diffusealpha,0);
-		ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1);
-		HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0);
-	};
-	LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
-	LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
-	LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
-
-};
-
-return t;
+local t = Def.ActorFrame {
+	LoadActor("_warning") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;
+			vertalign,top;
+			wag;effectmagnitude,0,0,10;effectperiod,2;
+		);
+		OnCommand=cmd(diffusealpha,0);
+		ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1);
+		HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0);
+	};
+	LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" );
+	LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" );
+	--LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" );
+
+};
+
+return t;
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/mod bar.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/mod bar.png
similarity index 100%
rename from stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/mod bar.png
rename to stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/mod bar.png
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua
deleted file mode 100644
index f1eab9d090..0000000000
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua	
+++ /dev/null
@@ -1,2 +0,0 @@
-return Def.ActorFrame {
-};
diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24.ini b/stepmania/Themes/default/Fonts/_venacti bold 24.ini
index e7c5dc1b90..9d95844ab8 100755
--- a/stepmania/Themes/default/Fonts/_venacti bold 24.ini	
+++ b/stepmania/Themes/default/Fonts/_venacti bold 24.ini	
@@ -5,6 +5,7 @@ LineSpacing=29
 DrawExtraPixelsLeft=2
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
+DefaultStrokeColor=#FFFFFF00
 0=0
 1=0
 2=0
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 9e1617abb6..51858e87d8 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -39,6 +39,11 @@ function DifficultyDisplayTypeToDarkColor( ddt )
 	return { c[1]/2, c[2]/2, c[3]/2, c[4] };
 end
 
+function DifficultyDisplayTypeToLightColor( ddt ) 
+	local c = DifficultyDisplayTypeToColor(ddt);
+	return { scale(c[1],0,1,0.5,1), scale(c[2],0,1,0.5,1), scale(c[3],0,1,0.5,1), c[4] };
+end
+
 function CourseDifficutlyToColor( cd )
 	local c = CourseDifficultyColors[cd]
 	if c then return c end
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 6dc1df7b15..180ccaffbf 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -964,7 +964,7 @@ SongNumberP2OffCommand=linear,0.5;addy,-100
 ShowScoreInRave=true
 ScoreFrameX=SCREEN_CENTER_X
 ScoreFrameY=SCREEN_BOTTOM
-ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100
+ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100;draworder,2
 ScoreFrameOffCommand=linear,0.5;addy,100
 ScoreP1X=SCREEN_CENTER_X-220
 ScoreP1Y=SCREEN_CENTER_Y+214
@@ -1978,12 +1978,12 @@ ZeroMeterString="?"
 MeterX=30
 MeterY=0
 MeterOnCommand=shadowlength,0;zoom,0.5
-MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
+MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
 ShowDescription=true
 DescriptionX=-10
 DescriptionY=0
 DescriptionOnCommand=zoom,0.5;shadowlength,0;uppercase,true;
-DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
+DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
 ShowAutogen=true
 AutogenX=0
 AutogenY=0
@@ -4424,4 +4424,8 @@ FrameY=0
 TextX=0
 TextY=0
 TextOnCommand=shadowlength,0;
-TextLoadCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end
\ No newline at end of file
+TextLoadCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end
+
+[RollingNumbers]
+TextFormat="%9.0f"
+ApproachSeconds=0.2