diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 848d443c77..e93d0899a3 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1004,6 +1004,16 @@ MaxComboX=-1000
 MaxComboY=-1000
 MaxComboOnCommand=zoom,0
 MaxComboOffCommand=
+OniGameOverP1X=SCREEN_CENTER_X-160
+OniGameOverP1Y=SCREEN_TOP-200
+OniGameOverP1OnCommand=diffusealpha,0
+OniGameOverP1OffCommand=
+OniGameOverP1DieCommand=diffusealpha,1;bounceend,0.5;y,SCREEN_CENTER_Y;bob;effectperiod,4;effectmagnitude,0,6,0
+OniGameOverP2X=SCREEN_CENTER_X+160
+OniGameOverP2Y=SCREEN_TOP-200
+OniGameOverP2OnCommand=diffusealpha,0
+OniGameOverP2OffCommand=
+OniGameOverP2DieCommand=diffusealpha,1;bounceend,0.5;y,SCREEN_CENTER_Y;bob;effectperiod,4;effectmagnitude,0,6,0
 LifeFrameX=SCREEN_CENTER_X+0
 LifeFrameY=SCREEN_CENTER_Y-204
 LifeFrameOnCommand=addy,-100;sleep,0.5;linear,1;addy,100
@@ -3421,6 +3431,7 @@ StepsTypeColor5=1.0,1,1.0,1
 SongScoreRowsToShow=6
 SongScoreSecondsPerRow=0.4
 ManualScroling=0
+ShowSurvivalTime=0
 
 BannerX=SCREEN_CENTER_X+197
 BannerY=SCREEN_CENTER_Y-196
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index e627ec7ce9..cb50bb0069 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -274,11 +274,9 @@ void ScreenGameplay::Init()
 		m_Player[p].SetY( SCREEN_CENTER_Y );
 		this->AddChild( &m_Player[p] );
 	
-		m_sprOniGameOver[p].SetName( ssprintf("OniGameOver%i", p+1) );
+		m_sprOniGameOver[p].SetName( ssprintf("OniGameOverP%i",p+1) );
 		m_sprOniGameOver[p].Load( THEME->GetPathG(m_sName,"oni gameover") );
-		m_sprOniGameOver[p].SetX( fPlayerX );
-		m_sprOniGameOver[p].SetY( SCREEN_TOP - m_sprOniGameOver[p].GetZoomedHeight()/2 );
-		m_sprOniGameOver[p].SetDiffuse( RageColor(1,1,1,0) );	// 0 alpha so we don't waste time drawing while not visible
+		SET_XY_AND_ON_COMMAND( m_sprOniGameOver[p] );
 		this->AddChild( &m_sprOniGameOver[p] );
 	}
 
@@ -917,8 +915,7 @@ void ScreenGameplay::LoadNextSong()
 		m_ActiveAttackList[p].Refresh();
 
 		// reset oni game over graphic
-		m_sprOniGameOver[p].SetY( SCREEN_TOP - m_sprOniGameOver[p].GetZoomedHeight()/2 );
-		m_sprOniGameOver[p].SetDiffuse( RageColor(1,1,1,0) );	// 0 alpha so we don't waste time drawing while not visible
+		SET_XY_AND_ON_COMMAND( m_sprOniGameOver[p] );
 
 		if( GAMESTATE->m_SongOptions.m_LifeType==SongOptions::LIFE_BATTERY && STATSMAN->m_CurStageStats.m_player[p].bFailed )	// already failed
 			ShowOniGameOver(p);
@@ -2633,10 +2630,7 @@ void ScreenGameplay::TweenOffScreen()
 
 void ScreenGameplay::ShowOniGameOver( PlayerNumber pn )
 {
-	m_sprOniGameOver[pn].SetDiffuse( RageColor(1,1,1,1) );
-	m_sprOniGameOver[pn].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
-	m_sprOniGameOver[pn].SetY( SCREEN_CENTER_Y );
-	m_sprOniGameOver[pn].SetEffectBob( 4, RageVector3(0,6,0) );
+	m_sprOniGameOver[pn].PlayCommand( "Die" );
 }
 
 /*