diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 33de1140f9..2d35029aa2 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -733,6 +733,8 @@ CourseHasModsOnCommand=
 OptionsMessageX=320
 OptionsMessageY=240
 OptionsMessageOnCommand=zoomy,0;linear,0.25;zoomy,1;sleep,1;linear,0.25;zoomy,0
+OverlayOnCommand=
+OverlayOffCommand=
 CourseContentsX=160
 CourseContentsY=336
 CourseContentsOnCommand=
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index df28e4e07b..99b9b21135 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -318,9 +318,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
 		}
 	}
 
-	m_bgOverlay.SetName( "BGAOverlay");
-	m_bgOverlay.LoadFromAniDir( THEME->GetPathToB("ScreenSelectMusic Overlay"));
-	this->AddChild( &m_bgOverlay );
+	m_Overlay.SetName( "Overlay");
+	m_Overlay.LoadFromAniDir( THEME->GetPathB(m_sName, "overlay"));
+	this->AddChild( &m_Overlay );
 
 	m_bgOptionsOut.Load( THEME->GetPathToB(m_sName+" options out") );
 //	this->AddChild( &m_bgOptionsOut ); // drawn on top
@@ -535,6 +535,7 @@ void ScreenSelectMusic::TweenOnScreen()
 	ON_COMMAND( m_MusicWheel );
 	ON_COMMAND( m_Artist );
 	ON_COMMAND( m_MachineRank );
+	ON_COMMAND( m_Overlay );
 
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{		
@@ -588,6 +589,7 @@ void ScreenSelectMusic::TweenOffScreen()
 	OFF_COMMAND( m_sprCourseHasMods );
 	OFF_COMMAND( m_Artist );
 	OFF_COMMAND( m_MachineRank );
+	OFF_COMMAND( m_Overlay );
 
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{		
diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h
index ff0ac43903..555901f5ff 100644
--- a/stepmania/src/ScreenSelectMusic.h
+++ b/stepmania/src/ScreenSelectMusic.h
@@ -114,7 +114,7 @@ protected:
 	float				m_fSampleStartSeconds, m_fSampleLengthSeconds;
 	bool				m_bAllowOptionsMenu, m_bAllowOptionsMenuRepeat;
 
-	BGAnimation			m_bgOverlay;
+	BGAnimation			m_Overlay;
 	Transition			m_bgOptionsOut;
 	Transition			m_bgNoOptionsOut;