diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 9ab22c7af5..be36c2b166 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,11 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 2011????
 --------------------------------------------------------------------------------
 
+2011/09/22
+----------
+* [ScreenDebugOverlay] Replaced hardcoded toggle command with
+  ButtonTextToggledCommand metric. [AJ]
+
 2011/09/21
 ----------
 * [FadingBanner] Added LoadRandom(), LoadRoulette(), LoadFallback(),
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 65fed6206f..c4f289c381 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1355,6 +1355,7 @@ LineButtonX=SCREEN_CENTER_X-50
 LineFunctionX=SCREEN_CENTER_X-30
 
 ButtonTextOnCommand=NoStroke;zoom,0.8
+ButtonTextToggledCommand=accelerate,0.025;glow,color("1,0,0,1");sleep,0.125;decelerate,0.2;glow,color("1,0,0,0");
 FunctionTextOnCommand=NoStroke;zoom,0.8
 
 PageStartX=SCREEN_CENTER_X-100
@@ -1372,8 +1373,6 @@ HeaderTextX=SCREEN_LEFT+80
 HeaderTextY=SCREEN_TOP+18
 HeaderTextOnCommand=diffusebottomedge,color("0.5,0.5,0.5,1");strokecolor,color("0,0,0,0.5")
 HeaderTextOffCommand=
-
-LineOnCommand=zoom,0.75
 #
 
 [ScreenSystemLayer]
diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp
index 4b698123b7..1ca2b3c179 100644
--- a/src/ScreenDebugOverlay.cpp
+++ b/src/ScreenDebugOverlay.cpp
@@ -496,18 +496,10 @@ bool ScreenDebugOverlay::OverlayInput( const InputEventPlus &input )
 			// update text to show the effect of what changed above
 			UpdateText();
 
-			// blink the text to show what changed
+			// show what changed
 			BitmapText &bt = *m_vptextButton[i];
 			bt.FinishTweening();
-			// blink 5 times instead of 8
-			// TODO: make this all metrics instead -aj
-			for( i=0; i<5; i++ )
-			{
-				bt.SetGlow( RageColor(1,0,0,1) );
-				bt.Sleep(0.1f);
-				bt.SetGlow( RageColor(1,0,0,0) );
-				bt.Sleep(0.1f);
-			}
+			bt.PlayCommand("Toggled");
 
 			return true;
 		}