diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index e4ad019b90..f54a5124e1 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2612,10 +2612,14 @@ MappedToP2S1Command=x,SCREEN_CENTER_X+120
 MappedToP2S2Command=x,SCREEN_CENTER_X+195
 MappedToP2S3Command=x,SCREEN_CENTER_X+270
 MappedToOnCommand=diffuse,#808080;zoom,0.5;shadowlength,0;maxwidth,150
-MappedToWaitingCommand=diffuse,#FF8080;pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,1
+MappedToWaitingCommand=diffuse,#FF8080;pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
 MappedToMappedInputCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
 MappedToGainFocusCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
 MappedToLoseFocusCommand=diffuse,#808080;stopeffect
+DevicesX=SCREEN_CENTER_X
+DevicesY=SCREEN_TOP+30
+DevicesOnCommand=zoom,0.6;diffusealpha,0;linear,0.5;diffusealpha,1
+DevicesOffCommand=linear,0.5;diffusealpha,0
 
 [ScreenCenterImage]
 Class=ScreenCenterImage
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 72a63c4c62..74989d5299 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -40,9 +40,8 @@ void ScreenMapControllers::Init()
 
 
 	m_textDevices.LoadFromFont( THEME->GetPathF("Common","normal") );
-	m_textDevices.SetXY( SCREEN_CENTER_X, SCREEN_TOP+30 );
-	m_textDevices.SetDiffuse( RageColor(1,1,1,1) );
-	m_textDevices.SetZoom( 0.6f );
+	m_textDevices.SetName( "Devices" );
+	SET_XY_AND_ON_COMMAND( m_textDevices );
 	this->AddChild( &m_textDevices );
 
 
@@ -422,6 +421,7 @@ void ScreenMapControllers::TweenOffScreen()
 	ScreenWithMenuElements::TweenOffScreen();
 
 	OFF_COMMAND( m_LineScroller );
+	OFF_COMMAND( m_textDevices );
 }
 
 Actor *ScreenMapControllers::GetActorWithFocus()