diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/_diamond.png b/Themes/default/BGAnimations/ScreenGameOver underlay/_diamond.png
new file mode 100644
index 0000000000..6673fbb984
Binary files /dev/null and b/Themes/default/BGAnimations/ScreenGameOver underlay/_diamond.png differ
diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/_sound.ogg b/Themes/default/BGAnimations/ScreenGameOver underlay/_sound.ogg
new file mode 100644
index 0000000000..5a06dcb68c
Binary files /dev/null and b/Themes/default/BGAnimations/ScreenGameOver underlay/_sound.ogg differ
diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua
index d53e40b5ca..f40af10fb0 100644
--- a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua	
+++ b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua	
@@ -11,19 +11,35 @@ return Def.ActorFrame {
 						sleep,timer_seconds/2;  
 						linear,timer_seconds/2-0.5;diffusealpha,0.8),
 		},
-		-- Warning Fade
-		Def.Quad {
-			InitCommand=cmd(y,-4;scaletoclipped,SCREEN_WIDTH,164),
-			OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5;
-						  linear,timer_seconds;zoomtoheight,164*0.75),
-		}
 	},
-	--
+	
+	Def.Quad {
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT),
+		OnCommand=cmd(diffuse,color("#000000");),
+	},	
+	
+	LoadActor("_diamond") .. {
+		InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add');
+		OnCommand=cmd(rotationz,0;zoom,0.5;diffusealpha,0.6;linear,2;zoom,1;diffusealpha,0);
+	};
+	
+	LoadActor("_sound") .. {
+		OnCommand=cmd(queuecommand,"Sound";);
+		SoundCommand=cmd(play);
+	};	
+	
 	LoadActor(THEME:GetPathG("ScreenGameOver","gameover"))..{
-		InitCommand=cmd(y,-16;shadowlength,2)
+		OnCommand=cmd(zoomx,1.1;diffusealpha,0;decelerate,0.6;diffusealpha,1;zoomx,1;);
 	},
-	LoadFont("Common Normal")..{
-		Text=ScreenString("Play again soon!"),
-		InitCommand=cmd(y,36;shadowlength,2)
-	}
+	
+	LoadFont("Common Condensed")..{
+		Text=ScreenString("Play again soon!");
+		InitCommand=cmd(y,68;shadowlength,2);
+		OnCommand=cmd(diffusealpha,0;sleep,2;linear,0.3;diffusealpha,1;);
+	},
+	
+	Def.Quad {
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,color("#a80b0b");diffusealpha,1;decelerate,0.4;diffusealpha,0;);
+	},	
 }
diff --git a/Themes/default/BGAnimations/ScreenTestInput underlay.lua b/Themes/default/BGAnimations/ScreenTestInput underlay.lua
new file mode 100644
index 0000000000..865885946c
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenTestInput underlay.lua	
@@ -0,0 +1,17 @@
+return Def.ActorFrame {
+	Def.Quad {
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;Center);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;decelerate,0.3;diffusealpha,0.7;);
+		OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0;);
+	};
+	Def.DeviceList {
+		Font="Common Italic Condensed",
+		InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+130;zoom,0.8;halign,0;diffuse,color("#FFFFFF"););
+		OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0;);
+	};
+
+	Def.InputList {
+		Font="Common Condensed",
+		InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y;zoom,1;halign,0;vertspacing,8;strokecolor,color("#000000"););
+	};
+};
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 82c67d63f5..0b7e3c3046 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -369,7 +369,7 @@ DisqualifyP2X=SCREEN_CENTER_X+176
 DisqualifyP2Y=SCREEN_BOTTOM-98
 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2
 #
-ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT
+ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.275;x,SCREEN_LEFT
 ContainerOffCommand=decelerate,0.35;addx,SCREEN_WIDTH;
 CursorOnCommand=
 #
@@ -534,8 +534,8 @@ LineHighlightChangeCommand=
 LineHighlightChangeToExitCommand=
 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-219+43*offsetFromCenter) end
 NumRowsShown=12
-ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT
-ContainerOffCommand=decelerate,0.35;addx,SCREEN_WIDTH;
+ContainerOnCommand=diffusealpha,0;decelerate,0.086;diffusealpha,1;
+ContainerOffCommand=decelerate,0.12;diffusealpha,0;
 CursorOnCommand=
 ColorDisabled=color("0.37,0.16,0.29,0.5")