diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index b4a8fdc72d..d362916c0f 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1165,8 +1165,12 @@ LineSpacing=16
 LineButtonX=SCREEN_CENTER_X-50
 LineFunctionX=SCREEN_CENTER_X-30
 
+ButtonTextOnCommand=NoStroke;zoom,0.8
+FunctionTextOnCommand=NoStroke;zoom,0.8
+
 PageStartX=SCREEN_CENTER_X-100
-PageSpacingX=100
+PageSpacingX=120
+PageTextOnCommand=NoStroke;zoom,0.75
 PageTextGainFocusCommand=diffuse,color("1,1,1,1")
 PageTextLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1")
 
@@ -1181,8 +1185,6 @@ HeaderTextOnCommand=diffusebottomedge,color("0.5,0.5,0.5,1");strokecolor,color("
 HeaderTextOffCommand=
 
 LineOnCommand=zoom,0.75
-LineOnColor=color("1.0,1.0,1.0,1.0")
-LineOffColor=color("0.5,0.5,0.5,1.0")
 #
 [ScreenSystemLayer]
 Class="ScreenSystemLayer"
diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp
index 546af08ca7..972ff0747d 100644
--- a/src/ScreenDebugOverlay.cpp
+++ b/src/ScreenDebugOverlay.cpp
@@ -260,6 +260,8 @@ void ScreenDebugOverlay::Init()
 		p->SetName( "PageText" );
 		p->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "page") );
 		LOAD_ALL_COMMANDS( p );
+		// xxx: I shouldn't have to do this:
+		ON_COMMAND( p );
 		// todo: Y value is still hardcoded. -aj
 		p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 );
 		p->SetText( *s + " (" + sButton + ")" );
@@ -277,9 +279,11 @@ void ScreenDebugOverlay::Init()
 			p->SetHorizAlign( align_right );
 			p->SetText( "blah" );
 			//p->SetShadowLength( 2 );
+			LOAD_ALL_COMMANDS( *p );
+			// xxx: I shouldn't have to do this:
+			ON_COMMAND( p );
 			m_vptextButton.push_back( p );
 			this->AddChild( p );
-			LOAD_ALL_COMMANDS( *p );
 		}
 		{
 			BitmapText *p = new BitmapText;
@@ -288,9 +292,11 @@ void ScreenDebugOverlay::Init()
 			p->SetHorizAlign( align_left );
 			p->SetText( "blah" );
 			//p->SetShadowLength( 2 );
+			LOAD_ALL_COMMANDS( *p );
+			// xxx: I shouldn't have to do this:
+			ON_COMMAND( p );
 			m_vptextFunction.push_back( p );
 			this->AddChild( p );
-			LOAD_ALL_COMMANDS( *p );
 		}
 	}