diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir
deleted file mode 100644
index e80b2145da..0000000000
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage background.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_shared background fade in
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png
deleted file mode 100644
index 4678cec17c..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/banner frame (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
index f815a7632c..91006d3165 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
@@ -1,3 +1,5 @@
+local t = LoadFallbackB( "decorations" );
+
 local p1x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1X' )
 local p1y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1Y' )
 local p2x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2X' )
@@ -5,11 +7,10 @@ local p2y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2Y' )
 p1y = p1y + 75 -- It starts 75 pixels down from the top of the Bonus frame.
 p2y = p2y + 75
 
-return Def.ActorFrame {
-	LoadActor("life graph", PLAYER_1) .. {
-		InitCommand = cmd(x,p1x;y,p1y);
-	};
-	LoadActor("life graph", PLAYER_2) .. {
-		InitCommand = cmd(x,p2x;y,p2y);
-	};
-}
+t[#t+1] = LoadActor("life graph", PLAYER_1) .. {
+	InitCommand = cmd(x,p1x;y,p1y);
+};
+t[#t+1] = LoadActor("life graph", PLAYER_2) .. {
+	InitCommand = cmd(x,p2x;y,p2y);
+};
+return t;
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png
deleted file mode 100644
index 85337b4f58..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/grade frame (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua
index b1e6eaecb2..a2c8787338 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage in.lua	
@@ -7,57 +7,10 @@ local t = Def.ActorFrame {
 		Condition=not STATSMAN:GetCurStageStats():AllFailed();
 		OnCommand=cmd(diffusealpha,1;linear,0.4;diffusealpha,0);
 	};
-	LoadActor( "_black.png" ) .. {
+	LoadActor( "_black" ) .. {
 		Condition=STATSMAN:GetCurStageStats():AllFailed();
 		InitCommand=cmd(stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM);
 		OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
 	};
-	-- Cleared
-	Def.ActorFrame {
-		Condition=GAMESTATE:GetPlayMode() ~= PLAY_MODE_BATTLE and GAMESTATE:GetPlayMode() ~= PLAY_MODE_RAVE;
-		LoadActor( "ScreenGameplay out/_extra1.png" ) .. {
-			Condition=GAMESTATE:IsExtraStage();
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,not GAMESTATE:HasEarnedExtraStage());
-			OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0);
-		};
-		LoadActor( "ScreenGameplay out/_extra2.png" ) .. {
-			Condition=GAMESTATE:IsExtraStage2();
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,not GAMESTATE:HasEarnedExtraStage());
-			OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0);
-		};
-		LoadActor( "ScreenGameplay failed/failed.png" ) .. {
-			Condition=STATSMAN:GetCurStageStats():AllFailed();
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			OnCommand=cmd(diffusealpha,0.4;linear,0.2;diffusealpha,0);
-		};
-		LoadActor( "ScreenGameplay out/cleared.png" ) .. {
-			Condition=not STATSMAN:GetCurStageStats():AllFailed();
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,GAMESTATE:HasEarnedExtraStage());
-			OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
-		};
-	};
-	-- Winner
-	Def.ActorFrame {
-		Condition=GAMESTATE:GetPlayMode() == PLAY_MODE_BATTLE or GAMESTATE:GetPlayMode() == PLAY_MODE_RAVE;
-		LoadActor( "ScreenGameplay out/p1 win.png" ) .. {
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_1));
-			OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
-		};
-		LoadActor("ScreenGameplay out/p2 win.png" ) .. {
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsWinner(PLAYER_2));
-			OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
-		};
-		LoadActor( "ScreenGameplay out/draw.png" ) .. {
-			InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-			StartTransitioningCommand=cmd(hide_if,not GAMESTATE:IsDraw());
-			OnCommand=cmd(diffusealpha,1;linear,0.2;diffusealpha,0);
-		};
-	};
-
 };
 return t;
diff --git a/stepmania/Themes/default/BGAnimations/_black.lua b/stepmania/Themes/default/BGAnimations/_black.lua
deleted file mode 100644
index ee46c8fb45..0000000000
--- a/stepmania/Themes/default/BGAnimations/_black.lua
+++ /dev/null
@@ -1 +0,0 @@
-return LoadActor("_black.png");