diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png
new file mode 100644
index 0000000000..d1bba7b439
Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua
new file mode 100644
index 0000000000..d6f8bb696f
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua	
@@ -0,0 +1,18 @@
+local children = { };
+
+if GAMESTATE:IsExtraStage() then
+	children[#children+1] = LoadActor("_extra score frame") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-208);
+		OnCommand=cmd(addy,-100;sleep,0.5;linear,1;addy,100);
+		OffCommand=cmd(linear,1;addy,-100);
+	};
+else
+	local sFile = GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "_oni score frame" or "_score frame";
+	children[#children+1] = LoadActor(sFile) .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+208);
+		OnCommand=cmd(addy,100;linear,0.5;addy,-100);
+		OffCommand=cmd(linear,0.5;addy,100);
+	};
+end
+
+return Def.ActorFrame { children = children };
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua
index f5a1f6249b..62ef0ee4e6 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay underlay/default.lua	
@@ -10,19 +10,4 @@ local children = {
 	};
 };
 
-if GAMESTATE:IsExtraStage() then
-	children[#children+1] = LoadActor("_extra score frame") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-208);
-		OnCommand=cmd(addy,-100;sleep,0.5;linear,1;addy,100);
-		OffCommand=cmd(linear,1;addy,-100);
-	};
-else
-	local sFile = GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "_oni score frame" or "_score frame";
-	children[#children+1] = LoadActor(sFile) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+208);
-		OnCommand=cmd(addy,100;linear,0.5;addy,-100);
-		OffCommand=cmd(linear,0.5;addy,100);
-	};
-end
-
 return Def.ActorFrame { children = children };
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index e3ba50d3e4..2473059241 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -840,12 +840,12 @@ CourseSongNumberChangeOutCommand=
 ShowScoreInRave=true
 ScoreP1X=SCREEN_CENTER_X-208
 ScoreP1Y=SCREEN_CENTER_Y+202
-ScoreP1OnCommand=addy,100;linear,1;addy,-100
-ScoreP1OffCommand=linear,1;addy,100
+ScoreP1OnCommand=addy,100;linear,1;addy,-100;draworder,120;
+ScoreP1OffCommand=linear,1;addy,100;
 ScoreP2X=SCREEN_CENTER_X+210
 ScoreP2Y=SCREEN_CENTER_Y+202
-ScoreP2OnCommand=addy,100;linear,1;addy,-100
-ScoreP2OffCommand=linear,1;addy,100
+ScoreP2OnCommand=addy,100;linear,1;addy,-100;draworder,120;
+ScoreP2OffCommand=linear,1;addy,100;
 SecondaryScoreP1X=SCREEN_CENTER_X-20
 SecondaryScoreP1Y=SCREEN_CENTER_Y+0
 SecondaryScoreP1OnCommand=