diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua
index 5b2ec621ae..2743a1bb14 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
@@ -45,7 +45,7 @@ return Def.ActorFrame {
 	};
 
 	-- messages
-	LoadFont("blaster") .. {
+	LoadFont("common normal") .. {
 		Text = "How To Play StepMania",
 		InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,0);
 		OnCommand=cmd(diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
diff --git a/stepmania/Themes/default/BGAnimations/ScreenRanking underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenRanking underlay/default.lua
index b77863203d..c17b6ab2ed 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenRanking underlay/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenRanking underlay/default.lua	
@@ -1,4 +1,4 @@
-return LoadFont("blaster") .. {
+return LoadFont("common normal") .. {
 	Text = "Best Ranking",
 	InitCommand = cmd(horizalign,'HorizAlign_Left';x,SCREEN_LEFT+48;y,SCREEN_TOP+32;shadowlength,0)
 }
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_banner mask (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_banner mask (doubleres).png
index 7b4e634c55..2149e4f388 100644
Binary files a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_banner mask (doubleres).png and b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_banner mask (doubleres).png differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index 9d885e85ed..3755352e35 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -49,8 +49,8 @@ local function OptionsArea(pn)
 		LoadActor( "option icon header" ) .. {
 		
 		};
-		LoadFont("_terminator two 32" ) .. {
-			InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
+		LoadFont("_terminator two 18px" ) .. {
+			InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,PlayerColor(pn);shadowlength,0;);
 		};
 	};
 	t[#t+1] = Def.ModIconRow {
@@ -118,7 +118,7 @@ t[#t+1] = Def.ActorFrame {
 	LoadActor( THEME:GetPathG("MusicSortDisplay","frame") ) .. {
 	
 	};
-	LoadFont( "_sf square head bold 28" ) .. {
+	LoadFont( "_sf square head 13px" ) .. {
 		InitCommand=cmd(maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800"););
 		SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) ));
 		SortOrderChangedMessageCommand=cmd(playcommand,"Set");
@@ -159,7 +159,7 @@ t[#t+1] = Def.PaneDisplay {
 t[#t+1] = Def.BPMDisplay {
 	File=THEME:GetPathF("BPMDisplay", "bpm");
 	Name="BPMDisplay";
-	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
+	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;zoomx,0.8;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
 	OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6);
 	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6);
 	SetCommand=function(self) self:SetFromGameState() end;
@@ -192,7 +192,7 @@ t[#t+1] = LoadActor( "stop icon" ) .. {
 	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
 };
 	
-t[#t+1] = LoadFont("_regra 32 bold") .. {
+t[#t+1] = LoadFont("_regra Bold 16px") .. {
 	InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360);
 	SetCommand=function(self) 
 			local s = "---";
@@ -208,8 +208,8 @@ t[#t+1] = LoadFont("_regra 32 bold") .. {
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
 	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
 };
-t[#t+1] = LoadFont("_regra 32 bold") .. {
-	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
+t[#t+1] = LoadFont("_regra Bold 16px") .. {
+	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y+4;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"););
 	SetCommand=function(self) 
 			local s = "---";
 			local song = GAMESTATE:GetCurrentSong(); 
@@ -331,7 +331,7 @@ t[#t+1] = Def.ActorFrame{
 	HideCommand=cmd(linear,0.2;diffusealpha,0);
 	
 	LoadActor("long balloon");
-	LoadFont("_terminator two 32")..{
+	LoadFont("_terminator two 30px")..{
 		Name="SongLength";
 		InitCommand=cmd(x,-56;y,-10;shadowlength,0;diffuse,color("#E2E2E2");diffusebottomedge,color("#CECECE");strokecolor,color("#00000000"));
 		SetCommand=function(self)
@@ -342,7 +342,7 @@ t[#t+1] = Def.ActorFrame{
 			self:settext( time );
 		end;
 	};
-	LoadFont("_venacti 24")..{
+	LoadFont("_venacti bold 24px")..{
 		Name="NumStages";
 		InitCommand=cmd(x,32;y,-4;shadowlength,0;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000"));
 		SetCommand=function(self)
@@ -361,7 +361,7 @@ t[#t+1] = Def.ActorFrame{
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
 };
 
-t[#t+1] = LoadFont("_numbers2") .. {
+t[#t+1] = LoadFont("common normal") .. {
 	InitCommand=cmd(x,SCREEN_CENTER_X+262;y,SCREEN_CENTER_Y);
 	OnCommand=cmd(shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH);
 	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH);
@@ -400,8 +400,8 @@ if not GAMESTATE:IsCourseMode() then
 						self:visible( true );
 					end;
 				};
-				LoadFont( "_terminator two 32" ) .. {
-					InitCommand=cmd(x,-4;y,-3;settext,"P1";diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
+				LoadFont( "_terminator two 18px" ) .. {
+					InitCommand=cmd(x,-4;y,-3;settext,"P1";diffuse,PlayerColor("PlayerNumber_P1");shadowlength,0;);
 					BeginCommand=cmd(player,"PlayerNumber_P1";);
 					PlayerJoinedMessageCommand=function(self,param )
 						if param.Player ~= "PlayerNumber_P1" then return end;
@@ -425,8 +425,8 @@ if not GAMESTATE:IsCourseMode() then
 						self:visible( true );
 					end;
 				};
-				LoadFont( "_terminator two 32" ) .. {
-					InitCommand=cmd(x,4;y,-3;settext,"P2";diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000"););
+				LoadFont( "_terminator two 18px" ) .. {
+					InitCommand=cmd(x,4;y,-3;settext,"P2";diffuse,PlayerColor("PlayerNumber_P2");shadowlength,0;);
 					BeginCommand=cmd(player,"PlayerNumber_P2";);
 					PlayerJoinedMessageCommand=function(self,param )
 						if param.Player ~= "PlayerNumber_P2" then return end;
diff --git a/stepmania/Themes/default/Fonts/BPMDisplay bpm.redir b/stepmania/Themes/default/Fonts/BPMDisplay bpm.redir
index 9dc7c484af..50d1da28bd 100755
--- a/stepmania/Themes/default/Fonts/BPMDisplay bpm.redir	
+++ b/stepmania/Themes/default/Fonts/BPMDisplay bpm.redir	
@@ -1 +1 @@
-_zosma 60 bold
\ No newline at end of file
+_zosma Bold 30px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/CourseEntryDisplay number.redir b/stepmania/Themes/default/Fonts/CourseEntryDisplay number.redir
index ba41a9d72b..8b94917099 100644
--- a/stepmania/Themes/default/Fonts/CourseEntryDisplay number.redir	
+++ b/stepmania/Themes/default/Fonts/CourseEntryDisplay number.redir	
@@ -1 +1 @@
-_shared2
+Common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir
index 353539dbf7..fe8018ad24 100644
--- a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir	
+++ b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir	
@@ -1 +1 @@
-_venacti bold 26
\ No newline at end of file
+_venacti bold 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir
index 353539dbf7..fe8018ad24 100644
--- a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir	
+++ b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir	
@@ -1 +1 @@
-_venacti bold 26
\ No newline at end of file
+_venacti bold 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main-stroke] 2x1 (doubleres).png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main-stroke] 2x1 (doubleres).png
new file mode 100644
index 0000000000..f9739d6646
Binary files /dev/null and b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main-stroke] 2x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main] 2x1 (doubleres).png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main] 2x1 (doubleres).png
new file mode 100644
index 0000000000..6b1e631982
Binary files /dev/null and b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks [main] 2x1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini
index e62be97534..f191641450 100644
--- a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini	
+++ b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini	
@@ -1,4 +1,4 @@
 [main]
 AdvanceExtraPixels=0
-0=26
-1=26
+0=13
+1=13
diff --git a/stepmania/Themes/default/Fonts/LyricDisplay text.redir b/stepmania/Themes/default/Fonts/LyricDisplay text.redir
index ba41a9d72b..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/LyricDisplay text.redir	
+++ b/stepmania/Themes/default/Fonts/LyricDisplay text.redir	
@@ -1 +1 @@
-_shared2
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ModIcon text.redir b/stepmania/Themes/default/Fonts/ModIcon text.redir
index 8f50bdf9db..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/ModIcon text.redir	
+++ b/stepmania/Themes/default/Fonts/ModIcon text.redir	
@@ -1 +1 @@
-_option icon
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem Mode.redir b/stepmania/Themes/default/Fonts/MusicWheelItem Mode.redir
index c7b301f980..66030e897a 100755
--- a/stepmania/Themes/default/Fonts/MusicWheelItem Mode.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem Mode.redir	
@@ -1 +1 @@
-_terminator two 36
\ No newline at end of file
+_terminator two 40px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCollapsed.redir b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCollapsed.redir
index 0a288cabe1..e3efea95aa 100755
--- a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCollapsed.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCollapsed.redir	
@@ -1 +1 @@
-_terminator two 32
\ No newline at end of file
+_terminator two 18px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir
index 2bf4aa159a..fa9b325295 100755
--- a/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem SectionCount.redir	
@@ -1 +1 @@
-_venacti bold 12
+_venacti bold 13px
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem SectionExpanded.redir b/stepmania/Themes/default/Fonts/MusicWheelItem SectionExpanded.redir
index 0a288cabe1..e3efea95aa 100755
--- a/stepmania/Themes/default/Fonts/MusicWheelItem SectionExpanded.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem SectionExpanded.redir	
@@ -1 +1 @@
-_terminator two 32
\ No newline at end of file
+_terminator two 18px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem course.redir b/stepmania/Themes/default/Fonts/MusicWheelItem course.redir
index ba41a9d72b..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem course.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem course.redir	
@@ -1 +1 @@
-_shared2
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir
index 8463ae69a6..f1e1a2de0d 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir	
@@ -1 +1 @@
-_terminator two 50
\ No newline at end of file
+_terminator two 24px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir
index c7b301f980..66030e897a 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir	
@@ -1 +1 @@
-_terminator two 36
\ No newline at end of file
+_terminator two 40px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/OptionRow Title.redir b/stepmania/Themes/default/Fonts/OptionRow Title.redir
index 0a288cabe1..481bff52f2 100644
--- a/stepmania/Themes/default/Fonts/OptionRow Title.redir	
+++ b/stepmania/Themes/default/Fonts/OptionRow Title.redir	
@@ -1 +1 @@
-_terminator two 32
\ No newline at end of file
+_terminator two 30px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/PaneDisplay count.redir b/stepmania/Themes/default/Fonts/PaneDisplay count.redir
index 66fb5b1677..6272ef61a7 100755
--- a/stepmania/Themes/default/Fonts/PaneDisplay count.redir	
+++ b/stepmania/Themes/default/Fonts/PaneDisplay count.redir	
@@ -1 +1 @@
-_venacti bold fixed-width 24
\ No newline at end of file
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/PaneDisplay name.redir b/stepmania/Themes/default/Fonts/PaneDisplay name.redir
index c7b301f980..6d33ff9170 100755
--- a/stepmania/Themes/default/Fonts/PaneDisplay name.redir	
+++ b/stepmania/Themes/default/Fonts/PaneDisplay name.redir	
@@ -1 +1 @@
-_terminator two 36
\ No newline at end of file
+_terminator two 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/PaneDisplay score.redir b/stepmania/Themes/default/Fonts/PaneDisplay score.redir
index c7b301f980..6d33ff9170 100755
--- a/stepmania/Themes/default/Fonts/PaneDisplay score.redir	
+++ b/stepmania/Themes/default/Fonts/PaneDisplay score.redir	
@@ -1 +1 @@
-_terminator two 36
\ No newline at end of file
+_terminator two 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/RoomWheel text.redir b/stepmania/Themes/default/Fonts/RoomWheel text.redir
index 8aa3a86152..8dcdd76ca1 100644
--- a/stepmania/Themes/default/Fonts/RoomWheel text.redir	
+++ b/stepmania/Themes/default/Fonts/RoomWheel text.redir	
@@ -1 +1 @@
-_terminator two 32
+_terminator two 30px
diff --git a/stepmania/Themes/default/Fonts/RoomWheelItem text.redir b/stepmania/Themes/default/Fonts/RoomWheelItem text.redir
index 8aa3a86152..8dcdd76ca1 100644
--- a/stepmania/Themes/default/Fonts/RoomWheelItem text.redir	
+++ b/stepmania/Themes/default/Fonts/RoomWheelItem text.redir	
@@ -1 +1 @@
-_terminator two 32
+_terminator two 30px
diff --git a/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir b/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir
index c2ad940a89..695562aab4 100644
--- a/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenGameplay StageDisplay.redir	
@@ -1 +1 @@
-_sf square head 32
\ No newline at end of file
+_sf square head 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenGameplay StepsDescription.redir b/stepmania/Themes/default/Fonts/ScreenGameplay StepsDescription.redir
index ba41a9d72b..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/ScreenGameplay StepsDescription.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenGameplay StepsDescription.redir	
@@ -1 +1 @@
-_shared2
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenMusicScroll thanks.redir b/stepmania/Themes/default/Fonts/ScreenMusicScroll thanks.redir
index d685a05acd..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/ScreenMusicScroll thanks.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenMusicScroll thanks.redir	
@@ -1 +1 @@
-blaster
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenNetEvaluation names.redir b/stepmania/Themes/default/Fonts/ScreenNetEvaluation names.redir
index 8696c8d713..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/ScreenNetEvaluation names.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenNetEvaluation names.redir	
@@ -1 +1 @@
-blaster
\ No newline at end of file
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir b/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir
index f764d36eff..fe8018ad24 100644
--- a/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenOptions explanation.redir	
@@ -1 +1 @@
-_venacti bold 12
\ No newline at end of file
+_venacti bold 13px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenSelectMusic score.redir b/stepmania/Themes/default/Fonts/ScreenSelectMusic score.redir
new file mode 100644
index 0000000000..3c21a0245a
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenSelectMusic score.redir	
@@ -0,0 +1 @@
+Common Normal
diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir b/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir
index a498e7c2c6..6272ef61a7 100644
--- a/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir	
@@ -1 +1 @@
-_shared2
\ No newline at end of file
+common normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir
index c2ad940a89..e3efea95aa 100644
--- a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir	
+++ b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir	
@@ -1 +1 @@
-_sf square head 32
\ No newline at end of file
+_terminator two 18px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/TextBanner text.redir b/stepmania/Themes/default/Fonts/TextBanner text.redir
index c2bd76238f..52fe33a464 100644
--- a/stepmania/Themes/default/Fonts/TextBanner text.redir	
+++ b/stepmania/Themes/default/Fonts/TextBanner text.redir	
@@ -1 +1 @@
-_regra bold 36
\ No newline at end of file
+_regra Bold 16px
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main-stroke] (doubleres).png b/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main-stroke] (doubleres).png
new file mode 100644
index 0000000000..36485b899d
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main-stroke] (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main] (doubleres).png b/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main] (doubleres).png
new file mode 100644
index 0000000000..810d52a778
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_game chars 16px 1x9 [main] (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_game chars 16px 1x9.ini b/stepmania/Themes/default/Fonts/_game chars 16px 1x9.ini
new file mode 100644
index 0000000000..a758e8a6e9
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_game chars 16px 1x9.ini	
@@ -0,0 +1,34 @@
+# The characters in this font are actually much larger than 16 pixels.
+# The "16px" indicates what size uppercase letter this font is meant
+# for, not necessarily the actual size of the characters.
+
+[main]
+0=24
+1=24
+2=18
+3=18
+4=24
+5=24
+6=18
+7=18
+8=40
+
+# Don't load this font grayscale.
+TextureHints=16bpp
+
+Top=8
+Baseline=18
+
+map up=0
+map down=1
+map left=2
+map right=3
+map menuup=4
+map menudown=5
+map menuleft=6
+map menuright=7
+map start=8
+
+# Do this to use a different glyph for a game character:
+# map pump up=1
+
diff --git a/stepmania/Themes/default/Fonts/_regra Bold 16px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_regra Bold 16px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..59bf7fc0c8
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_regra Bold 16px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_regra Bold 16px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_regra Bold 16px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..a9e66ca423
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_regra Bold 16px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_regra Bold 16px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_regra Bold 16px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..55e8f709e6
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_regra Bold 16px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_regra Bold 16px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_regra Bold 16px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..0369cc4e01
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_regra Bold 16px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_regra Bold 16px.ini b/stepmania/Themes/default/Fonts/_regra Bold 16px.ini
new file mode 100644
index 0000000000..ab802d738a
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_regra Bold 16px.ini	
@@ -0,0 +1,353 @@
+[common]
+Baseline=17
+Top=5
+LineSpacing=19
+DrawExtraPixelsLeft=1
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+DefaultStrokeColor=#FFFFFF00
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=5
+1=4
+2=6
+3=10
+4=8
+5=15
+6=10
+7=4
+8=6
+9=6
+10=8
+11=9
+12=4
+13=7
+14=4
+15=8
+16=9
+17=6
+18=9
+19=9
+20=8
+21=9
+22=10
+23=9
+24=10
+25=10
+26=4
+27=4
+28=8
+29=10
+30=8
+31=9
+32=11
+33=9
+34=10
+35=10
+36=10
+37=10
+38=10
+39=10
+40=10
+41=4
+42=8
+43=9
+44=8
+45=14
+46=11
+47=10
+48=10
+49=10
+50=10
+51=10
+52=8
+53=10
+54=9
+55=15
+56=11
+57=9
+58=9
+59=5
+60=8
+61=5
+62=9
+63=10
+64=5
+65=9
+66=9
+67=9
+68=9
+69=9
+70=5
+71=9
+72=9
+73=4
+74=4
+75=8
+76=4
+77=13
+78=9
+79=9
+80=9
+81=9
+82=6
+83=9
+84=4
+85=9
+86=8
+87=12
+88=9
+89=9
+90=8
+91=6
+92=4
+93=6
+94=10
+95=10
+96=4
+97=28
+98=7
+99=13
+100=9
+101=9
+102=7
+103=16
+104=10
+105=5
+106=17
+107=9
+108=4
+109=4
+110=7
+111=7
+112=7
+113=11
+114=18
+115=7
+116=16
+117=9
+118=5
+119=14
+120=8
+121=9
+122=7
+123=4
+124=9
+125=10
+126=10
+127=9
+128=4
+129=8
+130=6
+131=13
+132=8
+133=9
+134=30
+135=7
+136=13
+137=22
+138=7
+139=21
+140=6
+141=7
+142=5
+143=9
+144=9
+145=4
+146=4
+147=5
+148=8
+149=9
+150=14
+151=15
+152=15
+153=9
+154=9
+155=9
+156=9
+157=9
+158=9
+159=9
+160=15
+161=10
+162=10
+163=10
+164=10
+165=10
+166=4
+167=4
+168=4
+169=4
+170=10
+171=11
+172=10
+173=10
+174=10
+175=10
+176=10
+177=8
+178=10
+179=10
+180=10
+181=10
+182=10
+183=9
+184=9
+185=9
+186=9
+187=9
+188=9
+189=9
+190=9
+191=9
+192=14
+193=9
+194=9
+195=9
+196=9
+197=9
+198=4
+199=4
+200=4
+201=4
+202=9
+203=9
+204=9
+205=9
+206=9
+207=9
+208=9
+209=9
+210=9
+211=9
+212=9
+213=9
+214=9
+215=9
+216=9
+217=9
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=7
+1=6
+2=14
+3=8
+4=10
+5=6
+6=6
+7=8
+8=6
+9=10
+10=6
+11=6
+12=6
+13=7
+14=9
+15=6
+16=7
+17=6
+18=12
+19=5
+20=5
+21=6
+22=6
+23=7
+24=4
+25=9
+26=6
+27=6
+28=6
+29=15
+30=8
+31=6
+32=6
+33=9
+34=9
+35=6
+36=9
+37=6
+38=6
+39=10
+40=6
+41=10
+42=6
+43=10
+44=6
+45=4
+46=4
+47=6
+48=6
+49=6
+50=6
+51=10
+52=10
+53=6
+54=10
+55=8
+56=6
+57=6
+58=10
+59=6
+60=10
+61=9
+62=6
+63=9
+64=6
+65=9
+66=9
+67=6
+68=9
+69=6
+70=6
+71=9
+72=6
+73=9
+74=6
+75=9
+76=6
+77=4
+78=4
+79=6
+80=6
+81=6
+82=6
+83=9
+84=9
+85=6
+86=9
+87=9
+88=6
+89=6
+90=9
+91=6
+92=9
+93=9
+94=6
+95=8
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..ed388bfc0a
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..bfb83b4340
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px.ini b/stepmania/Themes/default/Fonts/_sf square head 13px.ini
new file mode 100644
index 0000000000..c065cff15f
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_sf square head 13px.ini	
@@ -0,0 +1,353 @@
+[common]
+Baseline=11
+Top=2
+LineSpacing=13
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+DefaultStrokeColor=#FFFFFF00
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=5
+1=2
+2=4
+3=7
+4=10
+5=12
+6=10
+7=2
+8=3
+9=3
+10=7
+11=7
+12=2
+13=7
+14=2
+15=4
+16=10
+17=10
+18=10
+19=10
+20=10
+21=10
+22=10
+23=10
+24=10
+25=10
+26=2
+27=2
+28=6
+29=7
+30=6
+31=10
+32=10
+33=10
+34=10
+35=10
+36=10
+37=10
+38=10
+39=10
+40=10
+41=10
+42=10
+43=10
+44=10
+45=12
+46=10
+47=10
+48=10
+49=10
+50=10
+51=10
+52=10
+53=10
+54=10
+55=12
+56=10
+57=10
+58=10
+59=3
+60=4
+61=3
+62=10
+63=9
+64=12
+65=10
+66=10
+67=10
+68=10
+69=10
+70=10
+71=10
+72=10
+73=2
+74=2
+75=10
+76=2
+77=12
+78=10
+79=10
+80=10
+81=10
+82=10
+83=10
+84=10
+85=10
+86=10
+87=12
+88=10
+89=10
+90=10
+91=3
+92=2
+93=3
+94=12
+95=12
+96=2
+97=12
+98=4
+99=12
+100=12
+101=12
+102=12
+103=12
+104=16
+105=12
+106=16
+107=16
+108=2
+109=2
+110=4
+111=4
+112=12
+113=18
+114=19
+115=12
+116=12
+117=16
+118=12
+119=12
+120=16
+121=12
+122=16
+123=2
+124=10
+125=12
+126=12
+127=12
+128=16
+129=12
+130=12
+131=12
+132=12
+133=12
+134=16
+135=16
+136=12
+137=16
+138=16
+139=12
+140=16
+141=16
+142=12
+143=12
+144=12
+145=16
+146=12
+147=16
+148=12
+149=12
+150=16
+151=16
+152=16
+153=10
+154=22
+155=22
+156=22
+157=22
+158=22
+159=22
+160=33
+161=16
+162=16
+163=16
+164=12
+165=16
+166=5
+167=5
+168=5
+169=5
+170=16
+171=18
+172=19
+173=19
+174=19
+175=19
+176=19
+177=16
+178=12
+179=18
+180=18
+181=18
+182=18
+183=16
+184=16
+185=12
+186=12
+187=12
+188=12
+189=12
+190=12
+191=12
+192=12
+193=12
+194=12
+195=12
+196=12
+197=12
+198=12
+199=12
+200=12
+201=12
+202=16
+203=12
+204=12
+205=12
+206=12
+207=12
+208=12
+209=16
+210=12
+211=12
+212=12
+213=12
+214=12
+215=16
+216=16
+217=12
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=16
+1=16
+2=12
+3=16
+4=12
+5=16
+6=16
+7=12
+8=12
+9=16
+10=16
+11=16
+12=16
+13=16
+14=16
+15=16
+16=16
+17=16
+18=12
+19=16
+20=12
+21=16
+22=16
+23=12
+24=12
+25=16
+26=16
+27=16
+28=16
+29=9
+30=16
+31=16
+32=16
+33=22
+34=22
+35=16
+36=22
+37=16
+38=16
+39=16
+40=16
+41=16
+42=16
+43=16
+44=16
+45=5
+46=5
+47=16
+48=16
+49=16
+50=16
+51=19
+52=19
+53=16
+54=19
+55=16
+56=16
+57=16
+58=18
+59=16
+60=18
+61=16
+62=16
+63=12
+64=16
+65=12
+66=12
+67=16
+68=12
+69=16
+70=16
+71=12
+72=16
+73=12
+74=16
+75=12
+76=16
+77=12
+78=12
+79=16
+80=16
+81=16
+82=16
+83=12
+84=12
+85=16
+86=12
+87=16
+88=16
+89=16
+90=12
+91=16
+92=12
+93=16
+94=16
+95=12
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..0fd42f0877
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..de38705f05
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini b/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini
new file mode 100644
index 0000000000..5a278ceae8
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini	
@@ -0,0 +1,352 @@
+[common]
+Baseline=21
+Top=2
+LineSpacing=25
+DrawExtraPixelsLeft=1
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=10
+1=4
+2=8
+3=15
+4=20
+5=25
+6=20
+7=4
+8=7
+9=7
+10=14
+11=14
+12=4
+13=14
+14=4
+15=9
+16=20
+17=20
+18=20
+19=20
+20=20
+21=20
+22=20
+23=20
+24=20
+25=20
+26=4
+27=4
+28=12
+29=14
+30=12
+31=20
+32=20
+33=20
+34=20
+35=20
+36=20
+37=20
+38=20
+39=20
+40=20
+41=20
+42=20
+43=20
+44=20
+45=25
+46=20
+47=20
+48=20
+49=20
+50=20
+51=20
+52=20
+53=20
+54=20
+55=25
+56=20
+57=20
+58=20
+59=7
+60=9
+61=7
+62=20
+63=18
+64=7
+65=20
+66=20
+67=20
+68=20
+69=20
+70=20
+71=20
+72=20
+73=4
+74=4
+75=20
+76=4
+77=25
+78=20
+79=20
+80=20
+81=20
+82=20
+83=20
+84=20
+85=20
+86=20
+87=25
+88=20
+89=20
+90=20
+91=7
+92=4
+93=7
+94=15
+95=6
+96=4
+97=6
+98=8
+99=6
+100=6
+101=6
+102=6
+103=6
+104=6
+105=6
+106=6
+107=6
+108=4
+109=4
+110=8
+111=8
+112=6
+113=6
+114=6
+115=6
+116=6
+117=6
+118=6
+119=6
+120=6
+121=6
+122=6
+123=4
+124=20
+125=12
+126=9
+127=14
+128=5
+129=9
+130=12
+131=9
+132=10
+133=12
+134=12
+135=12
+136=9
+137=12
+138=12
+139=12
+140=12
+141=12
+142=12
+143=12
+144=13
+145=12
+146=12
+147=12
+148=9
+149=12
+150=12
+151=12
+152=12
+153=20
+154=12
+155=12
+156=12
+157=12
+158=12
+159=12
+160=17
+161=12
+162=12
+163=12
+164=12
+165=12
+166=10
+167=10
+168=10
+169=10
+170=14
+171=15
+172=13
+173=13
+174=13
+175=13
+176=13
+177=10
+178=12
+179=15
+180=15
+181=15
+182=15
+183=14
+184=13
+185=13
+186=10
+187=10
+188=10
+189=10
+190=10
+191=10
+192=12
+193=7
+194=6
+195=6
+196=6
+197=6
+198=4
+199=4
+200=4
+201=4
+202=9
+203=11
+204=9
+205=9
+206=9
+207=9
+208=9
+209=12
+210=9
+211=9
+212=9
+213=9
+214=9
+215=9
+216=12
+217=9
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=6
+1=6
+2=6
+3=6
+4=9
+5=6
+6=6
+7=9
+8=12
+9=6
+10=6
+11=6
+12=6
+13=12
+14=6
+15=6
+16=12
+17=6
+18=6
+19=6
+20=12
+21=6
+22=6
+23=6
+24=12
+25=6
+26=6
+27=6
+28=6
+29=6
+30=6
+31=6
+32=6
+33=12
+34=12
+35=6
+36=12
+37=6
+38=6
+39=12
+40=6
+41=12
+42=6
+43=12
+44=6
+45=10
+46=10
+47=6
+48=6
+49=6
+50=6
+51=13
+52=13
+53=6
+54=13
+55=10
+56=6
+57=6
+58=15
+59=6
+60=15
+61=14
+62=6
+63=13
+64=6
+65=10
+66=10
+67=6
+68=10
+69=6
+70=6
+71=7
+72=6
+73=6
+74=6
+75=6
+76=6
+77=4
+78=4
+79=6
+80=6
+81=6
+82=6
+83=9
+84=9
+85=6
+86=9
+87=12
+88=6
+89=6
+90=9
+91=6
+92=9
+93=9
+94=6
+95=6
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..18c9c01913
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..18c9c01913
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..db29d98444
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..db29d98444
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px.ini b/stepmania/Themes/default/Fonts/_terminator two 13px.ini
new file mode 100644
index 0000000000..ce10d075e7
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_terminator two 13px.ini	
@@ -0,0 +1,352 @@
+[common]
+Baseline=13
+Top=2
+LineSpacing=13
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=9
+1=3
+2=4
+3=12
+4=8
+5=11
+6=9
+7=2
+8=4
+9=4
+10=9
+11=9
+12=3
+13=9
+14=3
+15=6
+16=8
+17=5
+18=8
+19=8
+20=8
+21=8
+22=8
+23=8
+24=8
+25=8
+26=3
+27=3
+28=12
+29=9
+30=12
+31=8
+32=7
+33=10
+34=10
+35=8
+36=10
+37=8
+38=8
+39=10
+40=9
+41=3
+42=10
+43=10
+44=8
+45=10
+46=10
+47=10
+48=10
+49=10
+50=10
+51=10
+52=9
+53=10
+54=10
+55=10
+56=10
+57=10
+58=10
+59=4
+60=6
+61=4
+62=7
+63=7
+64=7
+65=12
+66=10
+67=8
+68=10
+69=8
+70=8
+71=10
+72=9
+73=3
+74=10
+75=10
+76=8
+77=10
+78=10
+79=10
+80=10
+81=10
+82=10
+83=10
+84=9
+85=10
+86=12
+87=10
+88=10
+89=10
+90=10
+91=5
+92=3
+93=5
+94=7
+95=9
+96=9
+97=7
+98=7
+99=7
+100=7
+101=7
+102=7
+103=7
+104=9
+105=7
+106=8
+107=9
+108=3
+109=3
+110=5
+111=5
+112=7
+113=10
+114=10
+115=7
+116=7
+117=9
+118=7
+119=7
+120=9
+121=7
+122=9
+123=7
+124=7
+125=7
+126=7
+127=7
+128=9
+129=7
+130=7
+131=7
+132=7
+133=7
+134=9
+135=9
+136=7
+137=9
+138=9
+139=7
+140=9
+141=9
+142=7
+143=7
+144=7
+145=9
+146=7
+147=9
+148=7
+149=7
+150=9
+151=9
+152=9
+153=7
+154=12
+155=12
+156=12
+157=12
+158=12
+159=12
+160=18
+161=8
+162=8
+163=8
+164=7
+165=8
+166=3
+167=3
+168=3
+169=3
+170=9
+171=10
+172=10
+173=10
+174=10
+175=10
+176=10
+177=9
+178=7
+179=10
+180=10
+181=10
+182=10
+183=9
+184=9
+185=7
+186=7
+187=7
+188=7
+189=7
+190=7
+191=7
+192=7
+193=7
+194=7
+195=7
+196=7
+197=7
+198=7
+199=7
+200=7
+201=7
+202=9
+203=7
+204=7
+205=7
+206=7
+207=7
+208=7
+209=9
+210=7
+211=7
+212=7
+213=7
+214=7
+215=9
+216=9
+217=7
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=9
+1=9
+2=7
+3=9
+4=7
+5=9
+6=9
+7=7
+8=7
+9=9
+10=9
+11=9
+12=9
+13=9
+14=9
+15=9
+16=9
+17=9
+18=7
+19=9
+20=7
+21=9
+22=9
+23=7
+24=7
+25=9
+26=9
+27=9
+28=9
+29=7
+30=9
+31=9
+32=9
+33=12
+34=12
+35=9
+36=12
+37=9
+38=9
+39=8
+40=9
+41=8
+42=9
+43=8
+44=9
+45=3
+46=3
+47=9
+48=9
+49=9
+50=9
+51=10
+52=10
+53=9
+54=10
+55=9
+56=9
+57=9
+58=10
+59=9
+60=10
+61=9
+62=9
+63=7
+64=9
+65=7
+66=7
+67=9
+68=7
+69=9
+70=9
+71=7
+72=9
+73=7
+74=9
+75=7
+76=9
+77=7
+78=7
+79=9
+80=9
+81=9
+82=9
+83=7
+84=7
+85=9
+86=7
+87=9
+88=9
+89=9
+90=7
+91=9
+92=7
+93=9
+94=9
+95=7
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px.ini b/stepmania/Themes/default/Fonts/_terminator two 18px.ini
index d1d745b2bd..b9d50e80ba 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 18px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 18px.ini	
@@ -2,8 +2,8 @@
 Baseline=17
 Top=2
 LineSpacing=18
-DrawExtraPixelsLeft=1
-DrawExtraPixelsRight=0
+DrawExtraPixelsLeft=3
+DrawExtraPixelsRight=2
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
 
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..e77e48bc0b
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..9d3f532bef
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..a2afc1e544
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..d78ab33e9f
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px.ini b/stepmania/Themes/default/Fonts/_terminator two 24px.ini
new file mode 100644
index 0000000000..f2966c41da
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_terminator two 24px.ini	
@@ -0,0 +1,352 @@
+[common]
+Baseline=22
+Top=2
+LineSpacing=24
+DrawExtraPixelsLeft=1
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=16
+1=5
+2=7
+3=23
+4=16
+5=20
+6=16
+7=4
+8=7
+9=7
+10=17
+11=17
+12=5
+13=17
+14=5
+15=11
+16=16
+17=8
+18=16
+19=16
+20=15
+21=16
+22=16
+23=16
+24=15
+25=16
+26=5
+27=5
+28=22
+29=17
+30=22
+31=14
+32=12
+33=19
+34=18
+35=16
+36=18
+37=16
+38=16
+39=19
+40=17
+41=5
+42=19
+43=18
+44=16
+45=19
+46=18
+47=19
+48=18
+49=19
+50=18
+51=19
+52=17
+53=18
+54=19
+55=19
+56=19
+57=19
+58=19
+59=7
+60=11
+61=7
+62=12
+63=12
+64=12
+65=22
+66=18
+67=16
+68=18
+69=16
+70=15
+71=19
+72=17
+73=5
+74=19
+75=18
+76=16
+77=19
+78=18
+79=19
+80=18
+81=19
+82=18
+83=19
+84=17
+85=18
+86=22
+87=19
+88=19
+89=19
+90=19
+91=8
+92=5
+93=8
+94=12
+95=12
+96=16
+97=12
+98=12
+99=12
+100=12
+101=12
+102=12
+103=12
+104=16
+105=12
+106=16
+107=16
+108=5
+109=5
+110=10
+111=10
+112=12
+113=18
+114=19
+115=12
+116=12
+117=16
+118=12
+119=12
+120=16
+121=12
+122=16
+123=12
+124=12
+125=12
+126=12
+127=12
+128=16
+129=12
+130=12
+131=12
+132=12
+133=12
+134=16
+135=16
+136=12
+137=16
+138=16
+139=12
+140=16
+141=16
+142=12
+143=12
+144=12
+145=16
+146=12
+147=16
+148=12
+149=12
+150=16
+151=16
+152=16
+153=12
+154=22
+155=22
+156=22
+157=22
+158=22
+159=22
+160=33
+161=16
+162=16
+163=16
+164=12
+165=16
+166=5
+167=5
+168=5
+169=5
+170=16
+171=18
+172=19
+173=19
+174=19
+175=19
+176=19
+177=16
+178=12
+179=18
+180=18
+181=18
+182=18
+183=16
+184=16
+185=12
+186=12
+187=12
+188=12
+189=12
+190=12
+191=12
+192=12
+193=12
+194=12
+195=12
+196=12
+197=12
+198=12
+199=12
+200=12
+201=12
+202=16
+203=12
+204=12
+205=12
+206=12
+207=12
+208=12
+209=16
+210=12
+211=12
+212=12
+213=12
+214=12
+215=16
+216=16
+217=12
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=16
+1=16
+2=12
+3=16
+4=12
+5=16
+6=16
+7=12
+8=12
+9=16
+10=16
+11=16
+12=16
+13=16
+14=16
+15=16
+16=16
+17=16
+18=12
+19=16
+20=12
+21=16
+22=16
+23=12
+24=12
+25=16
+26=16
+27=16
+28=16
+29=9
+30=16
+31=16
+32=16
+33=22
+34=22
+35=16
+36=22
+37=16
+38=16
+39=16
+40=16
+41=16
+42=16
+43=16
+44=16
+45=5
+46=5
+47=16
+48=16
+49=16
+50=16
+51=19
+52=19
+53=16
+54=19
+55=16
+56=16
+57=16
+58=18
+59=16
+60=18
+61=16
+62=16
+63=12
+64=16
+65=12
+66=12
+67=16
+68=12
+69=16
+70=16
+71=12
+72=16
+73=12
+74=16
+75=12
+76=16
+77=12
+78=12
+79=16
+80=16
+81=16
+82=16
+83=12
+84=12
+85=16
+86=12
+87=16
+88=16
+89=16
+90=12
+91=16
+92=12
+93=16
+94=16
+95=12
diff --git a/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..43c7f2ce6c
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..43c7f2ce6c
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_zosma Bold 30px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_zosma Bold 30px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_zosma Bold 30px [main-stroke] 15x15 (doubleres).png
new file mode 100644
index 0000000000..59ab812fdf
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_zosma Bold 30px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_zosma Bold 30px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_zosma Bold 30px [main] 15x15 (doubleres).png
new file mode 100644
index 0000000000..59ab812fdf
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_zosma Bold 30px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_zosma Bold 30px.ini b/stepmania/Themes/default/Fonts/_zosma Bold 30px.ini
new file mode 100644
index 0000000000..5e7bf87e4e
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_zosma Bold 30px.ini	
@@ -0,0 +1,352 @@
+[common]
+Baseline=29
+Top=5
+LineSpacing=33
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+
+[main]
+Line  0= !"#$%&'()*+,-.
+Line  1=/0123456789:;<=
+Line  2=>?@ABCDEFGHIJKL
+Line  3=MNOPQRSTUVWXYZ[
+Line  4=\]^_`abcdefghij
+Line  5=klmnopqrstuvwxy
+Line  6=z{|}~€‚ƒ„…†‡ˆ‰Š
+Line  7=‹ŒŽ‘’“”•–—˜™š›œ
+Line  8=žŸ ¡¢£¤¥¦§¨©ª«¬
+Line  9=­®¯°±²³´µ¶·¸¹º»
+Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
+Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ
+Line 12=ÚÛÜÝÞßàáâãäåæçè
+Line 13=éêëìíîïðñòóôõö÷
+Line 14=øùúûüýþÿ
+
+0=18
+1=10
+2=13
+3=18
+4=25
+5=23
+6=28
+7=8
+8=14
+9=14
+10=15
+11=18
+12=8
+13=13
+14=8
+15=14
+16=28
+17=12
+18=28
+19=28
+20=29
+21=28
+22=30
+23=29
+24=30
+25=30
+26=8
+27=8
+28=18
+29=19
+30=18
+31=26
+32=28
+33=30
+34=29
+35=28
+36=30
+37=28
+38=28
+39=30
+40=30
+41=9
+42=24
+43=29
+44=25
+45=35
+46=30
+47=30
+48=30
+49=30
+50=29
+51=28
+52=25
+53=29
+54=30
+55=34
+56=30
+57=29
+58=30
+59=12
+60=14
+61=12
+62=18
+63=17
+64=12
+65=30
+66=29
+67=28
+68=30
+69=28
+70=28
+71=30
+72=30
+73=9
+74=24
+75=29
+76=25
+77=35
+78=30
+79=30
+80=30
+81=30
+82=29
+83=28
+84=25
+85=29
+86=30
+87=34
+88=30
+89=29
+90=30
+91=13
+92=8
+93=13
+94=19
+95=28
+96=8
+97=28
+98=13
+99=27
+100=18
+101=18
+102=14
+103=31
+104=28
+105=13
+106=43
+107=30
+108=8
+109=8
+110=13
+111=13
+112=13
+113=21
+114=34
+115=14
+116=26
+117=28
+118=13
+119=43
+120=30
+121=29
+122=6
+123=10
+124=25
+125=26
+126=30
+127=29
+128=30
+129=30
+130=13
+131=23
+132=18
+133=19
+134=30
+135=12
+136=16
+137=22
+138=13
+139=21
+140=12
+141=12
+142=12
+143=30
+144=18
+145=8
+146=10
+147=12
+148=18
+149=19
+150=12
+151=12
+152=12
+153=26
+154=30
+155=30
+156=30
+157=30
+158=30
+159=30
+160=48
+161=28
+162=28
+163=28
+164=28
+165=28
+166=9
+167=9
+168=9
+169=9
+170=30
+171=30
+172=30
+173=30
+174=30
+175=30
+176=30
+177=19
+178=30
+179=29
+180=29
+181=29
+182=29
+183=29
+184=30
+185=56
+186=30
+187=30
+188=30
+189=30
+190=30
+191=30
+192=48
+193=28
+194=28
+195=28
+196=28
+197=28
+198=9
+199=9
+200=9
+201=9
+202=30
+203=30
+204=30
+205=30
+206=30
+207=30
+208=30
+209=19
+210=30
+211=29
+212=29
+213=29
+214=29
+215=29
+216=30
+217=29
+
+[alt]
+Line 0= Ą˘Ł¤ĽŚ§¨Š
+Line 1=ŞŤŹ­ŽŻ°ą˛ł
+Line 2=´ľśˇ¸šşťź˝
+Line 3=žżŔÁÂĂÄĹĆÇ
+Line 4=ČÉĘËĚÍÎĎĐŃ
+Line 5=ŇÓÔŐÖ×ŘŮÚŰ
+Line 6=ÜÝŢßŕáâăäĺ
+Line 7=ćçčéęëěíîď
+Line 8=đńňóôőö÷řů
+Line 9=úűüýţ˙
+
+0=6
+1=6
+2=14
+3=25
+4=30
+5=6
+6=6
+7=30
+8=13
+9=28
+10=6
+11=6
+12=6
+13=12
+14=30
+15=6
+16=13
+17=6
+18=12
+19=25
+20=12
+21=6
+22=6
+23=14
+24=10
+25=28
+26=6
+27=6
+28=6
+29=15
+30=30
+31=6
+32=6
+33=30
+34=30
+35=6
+36=30
+37=6
+38=6
+39=28
+40=6
+41=28
+42=6
+43=28
+44=6
+45=9
+46=9
+47=6
+48=6
+49=6
+50=6
+51=30
+52=30
+53=6
+54=30
+55=19
+56=6
+57=6
+58=29
+59=6
+60=29
+61=29
+62=6
+63=56
+64=6
+65=30
+66=30
+67=6
+68=30
+69=6
+70=6
+71=28
+72=6
+73=28
+74=6
+75=28
+76=6
+77=9
+78=9
+79=6
+80=6
+81=6
+82=6
+83=30
+84=30
+85=6
+86=30
+87=19
+88=6
+89=6
+90=29
+91=6
+92=29
+93=29
+94=6
+95=8
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua
index a562f2c14b..d4e90b5853 100755
--- a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua	
@@ -24,10 +24,10 @@ local t = Def.ActorFrame {
 			InitCommand=cmd(y,170;vertalign,bottom;);
 		};
 		LoadFont( "_terminator two 40px" ) .. {
-			InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,1.2;zoomtowidth,300;rotationz,-90;diffuse,c;strokecolor,color("#00000044");shadowlengthx,4;shadowlengthy,0;);
+			InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,1.3;zoomtowidth,300;rotationz,-90;diffuse,c;strokecolor,color("#00000044");shadowlengthx,4;shadowlengthy,0;);
 		};
 		LoadFont( "_venacti Bold 24px" ) .. {
-			InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#00000044"););
+			InitCommand=cmd(horizalign,right;vertalign,bottom;x,70;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#00000044"););
 		};
 	};
 	Def.ActorFrame {
diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua
index 13d33b732c..1ce6415b73 100644
--- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua	
@@ -1,7 +1,7 @@
 local s = THEME:GetString( 'ScreenTitleMenu', Var("GameCommand"):GetText() );
 local t = Def.ActorFrame {
-	LoadFont("_venacti bold 30px") ..{
-		InitCommand=cmd(uppercase,true;settext,s;horizalign,center;shadowlengthx,0;shadowlengthy,2;);
+	LoadFont("_venacti bold 24px") ..{
+		InitCommand=cmd(uppercase,true;settext,s;horizalign,center;shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000044"););
 		GainFocusCommand=cmd(stoptweening;diffuseshift;effectperiod,0.5;effectcolor1,0.5,1,0.5,1;effectcolor2,0.25,0.5,0.25,1;);
 		LoseFocusCommand=cmd(stoptweening;stopeffect);
 		DisabledCommand=cmd(diffuse,0.5,0.5,0.5,1);
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua
index bfe248733c..ba9598fc94 100644
--- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua	
@@ -4,7 +4,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. {
 		LoadActor( "notify" ) .. {
 			OnCommand=cmd();
 		};
-		LoadFont( "_venacti bold 30" ) .. {
+		LoadFont( "_venacti bold 15px" ) .. {
 			InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;);
 		};
 	};
@@ -13,7 +13,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. {
 		LoadActor( "notify" ) .. {
 			OnCommand=cmd(zoomx,-1);
 		};
-		LoadFont( "_venacti bold 30" ) .. {
+		LoadFont( "_venacti bold 15px" ) .. {
 			InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;);
 		};
 	};
diff --git a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua
index f43f5250f9..1d3d8065f4 100644
--- a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua
+++ b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua
@@ -4,7 +4,7 @@ return Def.ActorFrame {
 	LoadActor("frame") .. {
 		InitCommand=cmd(y,4;);
 	};
-	LoadFont("_sf square head 32") .. {
+	LoadFont("_sf square head 13px") .. {
 		InitCommand=cmd(settext,string.upper(JudgmentLineToLocalizedString(jl));diffuse,JudgmentLineToColor(jl);strokecolor,JudgmentLineToStrokeColor(jl);shadowlength,0;maxwidth,180);
 	};
 };
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_footer small (doubleres).png b/stepmania/Themes/default/Graphics/_footer small (doubleres).png
index e813b5ba5c..a0b26b8af2 100755
Binary files a/stepmania/Themes/default/Graphics/_footer small (doubleres).png and b/stepmania/Themes/default/Graphics/_footer small (doubleres).png differ
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index fdb789ee6e..5df07b42f5 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -1279,7 +1279,7 @@ You have changed the timing of=You have changed the timing of
 [ScreenWithMenuElements]
 ; Put all help text in this one group and have metrics look up the strings here.  That will help make sure
 ; that strings are in a consistent style and that strings aren't duplicated.
-HelpTextNormal=Use &LEFT; &RIGHT; to select, then press &START;
+HelpTextNormal=Use &MENULEFT;&MENURIGHT; to select, then press &START;
 HelpTextSelectMusic=Use &LEFT; &RIGHT; to select, then press &START;
 HelpTextDifficultyPart=&UP;&UP; easier difficulty     &DOWN;&DOWN; harder difficulty
 HelpTextOptions=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options   &START; to accept changes
@@ -1294,7 +1294,7 @@ HelpTextTextEntry=Type a value using the keyboard.  Press Enter to finish.
 HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done
 HelpTextOnline=smonline.us to connect to official Stepmania Online Server::Check out Stepmaniaonline.com for more information
 HelpTextNetSelectMusic=Ctrl + Enter to enter room/select song
-HelpTextBookkeeping=Press &LEFT &RIGHT to cycle data.  Press ESCAPE when done.
+HelpTextBookkeeping=Press &MENULEFT;&MENURIGHT; to cycle data.  Press ESCAPE when done.
 
 [ScreenSelectGroup]
 ALL MUSIC=ALL MUSIC
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 7c60294bd9..043262bced 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -1,6 +1,6 @@
 function PlayerColor( pn )
-	if pn == PLAYER_1 then return color("1.0,0.5,0.2,1") end	-- orange
-	if pn == PLAYER_2 then return color("0.4,1.0,0.8,1") end	-- sea green
+	if pn == PLAYER_1 then return color("#baa200") end	-- orange
+	if pn == PLAYER_2 then return color("#83b767") end	-- sea green
 	return color("1,1,1,1")
 end
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 05d8f04119..90d8e640e9 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -122,7 +122,7 @@ IdleTimeoutSeconds=30
 IdleTimeoutScreen=THEME:GetMetric("Common","FirstAttractScreen")
 GameLogoX=SCREEN_CENTER_X
 GameLogoY=SCREEN_CENTER_Y-110
-GameLogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.2
+GameLogoOnCommand=zoomy,0;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.2
 GameLogoOffCommand=
 
 [ScreenExit]
@@ -2050,7 +2050,7 @@ FooterOnCommand=draworder,-1;vertalign,bottom
 FooterOffCommand=
 HelpX=SCREEN_CENTER_X
 HelpY=SCREEN_BOTTOM-20
-HelpOnCommand=shadowlength,0;strokecolor,color("#4e4e4e");draworder,1;zoomy,0;linear,0.5;zoomy,1;
+HelpOnCommand=shadowlength,0;strokecolor,color("#4e4e4e");draworder,1;zoomy,0;linear,0.5;zoomy,1;diffuseblink;
 HelpOffCommand=linear,0.5;zoomy,0
 MemoryCardDisplayP1X=SCREEN_LEFT+10;
 MemoryCardDisplayP1Y=SCREEN_CENTER_Y+220
@@ -3238,7 +3238,7 @@ NextScreen="ScreenHowToPlay"
 PrevScreen="ScreenCompany"
 GameLogoX=SCREEN_CENTER_X
 GameLogoY=SCREEN_CENTER_Y
-GameLogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.0;effectcolor2,1,1,1,0.2
+GameLogoOnCommand=zoomy,0;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.0;effectcolor2,1,1,1,0.2
 GameLogoOffCommand=
 
 [ScreenHowToPlay]
@@ -4250,11 +4250,11 @@ ShiftP1Y=0
 ShiftP2X=40
 ShiftP2Y=0
 CountFormat="%3.0f"
-NumStepsTextX=4+74*-0.5
+NumStepsTextX=-18+64*-0.5
 NumStepsTextY=16*-1
 NumStepsTextOnCommand=shadowlength,0;
 NumStepsTextOffCommand=linear,0.1;diffusealpha,0;
-NumStepsLabelX=-16-4+74*-0.5
+NumStepsLabelX=-34-4+64*-0.5
 NumStepsLabelY=16*-1
 NumStepsLabelOnCommand=horizalign,right
 NumStepsLabelOffCommand=linear,0.1;diffusealpha,0;
@@ -4267,11 +4267,11 @@ NumStepsLevel5=624;diffuse,#FF8800  -- 500-624   (orange)
 NumStepsLevel6=749;diffuse,#FF6600  -- 625-749   (darker orange)
 NumStepsLevel7=1000;diffuse,#00C0FF -- 750-999   (AJ Blue)
 NumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red)
-JumpsTextX=4+74*-0.5
+JumpsTextX=-18+64*-0.5
 JumpsTextY=16*0
 JumpsTextOnCommand=shadowlength,0;
 JumpsTextOffCommand=linear,0.1;diffusealpha,0;
-JumpsLabelX=-16+74*-0.5
+JumpsLabelX=-34+64*-0.5
 JumpsLabelY=16*0
 JumpsLabelOnCommand=horizalign,right
 JumpsLabelOffCommand=linear,0.1;diffusealpha,0;
@@ -4282,12 +4282,12 @@ JumpsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
 JumpsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
 JumpsLevel5=449;diffuse,#00C0FF   -- 200-450  (AJ Blue)
 JumpsLevel6=9999;diffuse,#FF0000  -- 450-inf  (red)
-HoldsTextX=4+74*-0.5
-HoldsTextY=16*1
+HoldsTextX=-18+64*1.5
+HoldsTextY=16*-1
 HoldsTextOnCommand=shadowlength,0;
 HoldsTextOffCommand=linear,0.1;diffusealpha,0;
-HoldsLabelX=-16+74*-0.5
-HoldsLabelY=16*1
+HoldsLabelX=-34+64*1.5
+HoldsLabelY=16*-1
 HoldsLabelOnCommand=horizalign,right
 HoldsLabelOffCommand=linear,0.1;diffusealpha,0;
 HoldsNumLevels=5
@@ -4296,11 +4296,11 @@ HoldsLevel2=49;diffuse,#00FF00    -- 1-49     (green)
 HoldsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
 HoldsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
 HoldsLevel5=9999;diffuse,#FF0000  -- 200-inf  (red)
-MinesTextX=4+74*0.5
+MinesTextX=-18+64*0.5
 MinesTextY=16*-1
 MinesTextOnCommand=shadowlength,0;
 MinesTextOffCommand=linear,0.1;diffusealpha,0;
-MinesLabelX=-16+74*0.5
+MinesLabelX=-34+64*0.5
 MinesLabelY=16*-1
 MinesLabelOnCommand=horizalign,right
 MinesLabelOffCommand=linear,0.1;diffusealpha,0;
@@ -4311,11 +4311,11 @@ MinesLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
 MinesLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
 MinesLevel5=999;diffuse,#00C0FF   -- 200-999  (AJ Blue)
 MinesLevel6=9999;diffuse,#FF0000  -- 1000-inf (red)
-HandsTextX=4+74*0.5
+HandsTextX=-18+64*0.5
 HandsTextY=16*0
 HandsTextOnCommand=shadowlength,0;
 HandsTextOffCommand=linear,0.1;diffusealpha,0;
-HandsLabelX=-16+74*0.5
+HandsLabelX=-34+64*0.5
 HandsLabelY=16*0
 HandsLabelOnCommand=horizalign,right
 HandsLabelOffCommand=linear,0.1;diffusealpha,0;
@@ -4325,12 +4325,12 @@ HandsLevel2=14;diffuse,#00FF00    -- 1-7     (green)
 HandsLevel3=34;diffuse,#FFFF00    -- 8-34    (yellow)
 HandsLevel4=99;diffuse,#FF8800   -- 35-99  (orange)
 HandsLevel5=9999;diffuse,#FF0000  -- 100-inf  (red)
-RollsTextX=4+74*0.5
-RollsTextY=16*1
+RollsTextX=-18+64*1.5
+RollsTextY=16*0
 RollsTextOnCommand=shadowlength,0;
 RollsTextOffCommand=linear,0.1;diffusealpha,0;
-RollsLabelX=-16+74*0.5
-RollsLabelY=16*1
+RollsLabelX=-34+64*1.5
+RollsLabelY=16*0
 RollsLabelOnCommand=horizalign,right
 RollsLabelOffCommand=linear,0.1;diffusealpha,0;
 RollsNumLevels=5
@@ -4339,12 +4339,12 @@ RollsLevel2=49;diffuse,#00FF00    -- 1-49     (green)
 RollsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
 RollsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
 RollsLevel5=9999;diffuse,#FF0000  -- 200-inf  (red)
-MachineHighScoreTextX=100
-MachineHighScoreTextY=10
+MachineHighScoreTextX=170
+MachineHighScoreTextY=16*-1
 MachineHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
 MachineHighScoreTextOffCommand=linear,0.1;diffusealpha,0;
-MachineHighScoreLabelX=0
-MachineHighScoreLabelY=0
+MachineHighScoreLabelX=
+MachineHighScoreLabelY=
 MachineHighScoreLabelOnCommand=visible,false;
 MachineHighScoreNumLevels=12
 MachineHighScoreLevel1=1;diffuse,#FFFFFF    -- No Play (white)
@@ -4359,8 +4359,8 @@ MachineHighScoreLevel9=79;diffuse,#66FF00   -- 70-79% (Less Greenish Yellow)
 MachineHighScoreLevel10=89;diffuse,#33FF00  -- 80-89% (Least Greenish Yellow)
 MachineHighScoreLevel11=99;diffuse,#00FF00  -- 90-99% (Green)
 MachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue)
-MachineHighNameTextX=100
-MachineHighNameTextY=-10
+MachineHighNameTextX=120
+MachineHighNameTextY=16*-1
 MachineHighNameTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
 MachineHighNameTextOffCommand=linear,0.1;diffusealpha,0;
 MachineHighNameLabelX=
@@ -4368,9 +4368,9 @@ MachineHighNameLabelY=
 MachineHighNameLabelOnCommand=visible,false;
 MachineHighNameLabelOffCommand=
 MachineHighNameNumLevels=0
-ProfileHighScoreTextX=
-ProfileHighScoreTextY=
-ProfileHighScoreTextOnCommand=visible,false;
+ProfileHighScoreTextX=145
+ProfileHighScoreTextY=16*0
+ProfileHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
 ProfileHighScoreTextOffCommand=
 ProfileHighScoreLabelX=
 ProfileHighScoreLabelY=