diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index b88df192e1..b116330b0f 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 
 #include "ScreenTestFonts.h"
+#include "FontManager.h"
 
 static const float LineWidth = 400;
 static const float LineHeight = 50;
@@ -17,12 +18,39 @@ ScreenTestFonts::ScreenTestFonts()
 	Vline.SetDiffuse( RageColor(0, 1, 0, .8f) );
 	this->AddChild(&Vline);
 	
+	curfont.SetXY( CENTER_X, CENTER_Y+100 );
+	curfont.LoadFromFont( "Themes/default/Fonts/header1" );
+	curfont.SetZoom(.5);
+	this->AddChild(&curfont);
+
 	txt.SetXY( CENTER_X, CENTER_Y );
-	txt.LoadFromFont( "Themes/default/Fonts/header1" );
-	txt.SetText( "Foo" );
-	this->AddChild(&txt);
+	SetFont( "Themes/default/Fonts/header1" );
+	SetText( "Foo" );
 }
 
+void ScreenTestFonts::SetText(CString text)
+{
+	txt.SetText(""); /* force it */
+	txt.SetText(text);
+	curtext = text;
+}
+void ScreenTestFonts::SetFont(CString font)
+{
+	txt.LoadFromFont( font );
+	curfont.SetText(font);
+	/* The font changed, so we need to reset the text or it'll be
+	 * misaligned. */
+	SetText(curtext);
+}
+
+void ScreenTestFonts::Draw()
+{
+	/* Draw this manually, so we can breakpoint here ... */
+	txt.Draw();
+	Screen::Draw();
+}
+
+
 void ScreenTestFonts::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( type != IET_FIRST_PRESS )
@@ -37,19 +65,21 @@ void ScreenTestFonts::Input( const DeviceInput& DeviceI, const InputEventType ty
 	case '.': txt.SetHorizAlign(align_center); break;
 	case '/': txt.SetHorizAlign(align_right); break;
 
-	case '1': txt.SetText("Waaai"); break;
+	case '1': SetText("Waaai"); break;
 		/* These two kanji are currently two different sizes (20 and 32 pix),
 		 * and they should be vertically centered with the other text: */
-	case '2': txt.SetText("WAAI &kakumei1;"); break;
-	case '3': txt.SetText("WAAI &oni;"); break;
+	case '2': SetText("WAAI &kakumei1;"); break;
+	case '3': SetText("WAAI &oni;"); break;
 
-	case '4': txt.SetText("WAAI\nWAAI"); break;
-	case '5': txt.SetText("WAAI &oni;\nWAAI"); break;
+	case '4': SetText("WAAI\nWAAI"); break;
+	case '5': SetText("WAAI &oni;\nWAAI"); break;
 
-	case 'q': txt.LoadFromFont( "Themes/default/Fonts/header1" ); break;
-	case 'w': txt.LoadFromFont( "Themes/default/Fonts/header2" ); break;
-	case 'e': txt.LoadFromFont( "Themes/default/Fonts/Normal" ); break;
-	case 'r': txt.LoadFromFont( "Themes/default/Fonts/titlemenu" ); break;
+	case 'q': SetFont( "Themes/default/Fonts/header1" ); break;
+	case 'w': SetFont( "Themes/default/Fonts/header2" ); break;
+	case 'e': SetFont( "Themes/default/Fonts/Normal" ); break;
+	case 'r': SetFont( "Themes/SMMAX2/Fonts/titlemenu" ); break;
+
+	case 'z': FONT->ReloadFonts(); SetText(curtext); break;
 	}
 }
 
diff --git a/stepmania/src/ScreenTestFonts.h b/stepmania/src/ScreenTestFonts.h
index 6674a49beb..863eb6843d 100644
--- a/stepmania/src/ScreenTestFonts.h
+++ b/stepmania/src/ScreenTestFonts.h
@@ -11,8 +11,13 @@ public:
 	ScreenTestFonts();
 
 	BitmapText txt;
+	BitmapText curfont;
 	Quad Vline, Hline;
 	void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
+	void Draw();
+	CString			curtext;
+	void SetText(CString txt);
+	void SetFont(CString font);
 };
 
 #endif