diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 93f09dc3e2..ae05e1eb2c 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3151,7 +3151,7 @@ FooterOnCommand=hidden,0
 FooterOffCommand=
 StyleIcon=0
 MemoryCardIcons=0
-TimerSeconds=5
+TimerSeconds=6
 TimerStealth=1
 ForceTimer=1
 TimerX=
@@ -3298,6 +3298,7 @@ DancePointsZoom=2
 [ScreenRanking]
 Class=ScreenRanking
 Fallback=ScreenAttract
+TimerSeconds=-1
 StepsTypesToHide=dance-couple,dance-solo,pump-halfdouble
 ShowCategories=1
 CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs
@@ -3305,7 +3306,7 @@ ShowAllStepsScores=0
 ShowAllCourseScores=0
 DifficultiesToShow=easy,medium,hard,challenge
 NextScreen=ScreenUnlock
-SecondsPerPage=10
+SecondsPerPage=5
 PageFadeSeconds=1.0
 NoScoreName=STEP
 RowSpacingX=0
@@ -3439,6 +3440,7 @@ NextScreen=ScreenHowToPlay
 [ScreenHowToPlay]
 Class=ScreenHowToPlay
 Fallback=ScreenAttract
+TimerSeconds=25
 NextScreen=ScreenDemonstration
 SecondsToShow=25
 UseLifeMeterBar=1
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 14c4cee5b7..6cadfce9b6 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -103,7 +103,7 @@ void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventTy
 			SCREENMAN->PostMessageToTopScreen( SM_BeginFadingOut, 0 );
 			break;
 		}
-	}
+	}	
 
 //	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
@@ -112,21 +112,6 @@ void ScreenAttract::Update( float fDelta )
 {
 	if( IsFirstUpdate() )
 	{
-		// The shared background isn't loaded until the screen is actually 
-		// showing.  The background is loaded by the time of the first update.
-		if( AutoBeginFadingOut() )
-		{
-			const Actor &background = *SCREENMAN->m_pSharedBGA;
-			float fTimeUntilBeginFadingOut = background.GetTweenTimeLeft() - m_Out.GetTweenTimeLeft();
-			if( fTimeUntilBeginFadingOut < 0 )
-			{
-				LOG->Warn( "Screen '%s' Out BGAnimation (%f seconds) is longer than Background BGAnimation (%f seconds); background BGA will be truncated",
-					m_sName.c_str(), m_Out.GetTweenTimeLeft(), background.GetTweenTimeLeft() );
-				fTimeUntilBeginFadingOut = 0;
-			}
-			this->PostScreenMessage( SM_BeginFadingOut, fTimeUntilBeginFadingOut );
-		}
-		
 		if( GAMESTATE->IsTimeToPlayAttractSounds() )
 			SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
 		else
@@ -139,6 +124,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
 	{
+	case SM_MenuTimer:
 	case SM_BeginFadingOut:
 		if( !m_Out.IsTransitioning() )
 			m_Out.StartTransitioning( SM_GoToNextScreen );
diff --git a/stepmania/src/ScreenAttract.h b/stepmania/src/ScreenAttract.h
index 74326492ca..24dceee2ed 100644
--- a/stepmania/src/ScreenAttract.h
+++ b/stepmania/src/ScreenAttract.h
@@ -19,7 +19,6 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 protected:
-	virtual bool AutoBeginFadingOut() const { return true; }
 };
 
 
diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h
index 844f50c81c..9537114ddb 100644
--- a/stepmania/src/ScreenRanking.h
+++ b/stepmania/src/ScreenRanking.h
@@ -36,8 +36,6 @@ public:
 	void HandleScreenMessage( const ScreenMessage SM );
 
 protected:
-	virtual bool AutoBeginFadingOut() const { return false; }
-
 	struct PageToShow
 	{
 		PageToShow()