diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 3f39ed4a40..a735dd1843 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -44,6 +44,7 @@ Challenge=Expert
 Edit=Edit
 Couple=Couple
 Routine=Routine
+Crazy=Crazy
 
 [CourseDifficulty]
 Beginner=BEGINNER
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index dfa4c55a55..a68c89210b 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -292,7 +292,8 @@ SortLevel5Color=color("0,1,0,1")
 # something else. Mostly for custom games and game emulation, PIU for example.
 
 # The names of which
-Names="DanceCoupleBeginner,DanceCoupleEasy,DanceCoupleMedium,DanceCoupleHard,DanceCoupleExpert"
+Names="PumpHard"
+# Names="DanceCoupleBeginner,DanceCoupleEasy,DanceCoupleMedium,DanceCoupleHard,DanceCoupleExpert,PumpHard"
 # That get remapped to
 DanceCoupleBeginnerStepsType="StepsType_Dance_Couple"
 DanceCoupleBeginnerDifficulty="Difficulty_Beginner"
@@ -309,7 +310,23 @@ DanceCoupleHardString="Hard"
 DanceCoupleExpertStepsType="StepsType_Dance_Couple"
 DanceCoupleExpertDifficulty="Difficulty_Expert"
 DanceCoupleExpertString="Expert"
-
+#
+PumpHardStepsType="StepsType_Pump_Single"
+PumpHardDifficulty="Difficulty_Hard"
+PumpHardCourseType="CourseType_Nonstop"
+PumpHardString="Crazy"
+#
+# Difficulty_Beginner-StepsType_Pump_Single=Easy
+# Difficulty_Easy-StepsType_Pump_Single=Normal
+# Difficulty_Medium-StepsType_Pump_Single=Hard
+# Difficulty_Hard-StepsType_Pump_Single=Crazy
+# Difficulty_Medium-StepsType_Pump_Halfdouble=Half-Double
+# Difficulty_Medium-StepsType_Pump_Double=Freestyle
+# Difficulty_Hard-StepsType_Pump_Double=Nightmare
+# Difficulty_Edit-StepsType_Pump_Single=Edit
+# Difficulty_Edit-StepsType_Pump_Halfdouble=Edit
+# Difficulty_Edit-StepsType_Pump_Double=Edit
+# Course=Progressive
 [CustomScoring]
 # Custom scoring, usually good for custom games.
 
diff --git a/Themes/default/Graphics/ScreenTitleMenu SystemDirection/default.lua b/Themes/default/Graphics/ScreenTitleMenu SystemDirection/default.lua
index 0e2ffa3620..f27f3acb64 100644
--- a/Themes/default/Graphics/ScreenTitleMenu SystemDirection/default.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu SystemDirection/default.lua	
@@ -5,7 +5,18 @@ local tInfo = {
 	{"TimingDifficulty","Difficulty"},
 };
 local fSpacingX = 72;
-
+local function MakeDisplayBar( fZoomX, fZoomY )
+	return Def.ActorFrame {
+		Def.Quad {
+			InitCommand=cmd(vertalign,bottom;y,1;zoomto,fZoomX+2,fZoomY+2);
+			OnCommand=cmd(diffuse,Color("Black"));
+		};
+		Def.Quad {
+			InitCommand=cmd(vertalign,bottom;zoomto,fZoomX,fZoomY);
+			OnCommand=cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow"));
+		};
+	};
+end
 local function MakeIcon( sTarget )
 	local t = Def.ActorFrame {
 		LoadActor(THEME:GetPathG("MenuTimer","Frame"));
@@ -15,11 +26,65 @@ local function MakeIcon( sTarget )
 		};
 		--
 		LoadFont("Common Normal") .. {
-			Text="TEST";
--- 			Text=( PREFSMAN:GetPreference("EventMode") ) and "∞" or PREFSMAN:GetPreference("SongsPerPlay");
-			OnCommand=cmd(settext,"4");
+			Text="0";
+			OnCommand=cmd(settext,
+			( PREFSMAN:GetPreference("EventMode") ) and "∞" or PREFSMAN:GetPreference("SongsPerPlay")
+			);
 			Condition=sTarget[1] == "EventMode";
 		};
+		Def.ActorFrame {
+			-- Life goes up to 1-5
+			Def.ActorFrame {
+				InitCommand=cmd(y,12);
+				MakeDisplayBar( 6, 5 ) .. {
+					InitCommand=cmd(x,-16;visible,( GetLifeDifficulty() >= 1 ));
+				};
+				MakeDisplayBar( 6, 9 ) .. {
+					InitCommand=cmd(x,-8;visible,( GetLifeDifficulty() >= 2 ));
+				};
+				MakeDisplayBar( 6, 13 ) .. {
+					InitCommand=cmd(x,0;visible,( GetLifeDifficulty() >= 3 ));
+				};
+				MakeDisplayBar( 6, 16 ) .. {
+					InitCommand=cmd(x,8;visible,( GetLifeDifficulty() >= 4 ));
+				};
+				MakeDisplayBar( 6, 20 ) .. {
+					InitCommand=cmd(x,16;visible,( GetLifeDifficulty() >= 5 ));
+				};
+			};
+			Condition=sTarget[1] == "LifeDifficulty";
+		};
+		Def.ActorFrame {
+			-- Timing goes up to 1-8
+			Def.ActorFrame {
+				InitCommand=cmd(y,12);
+				MakeDisplayBar( 4, 5 ) .. {
+					InitCommand=cmd(x,-20;visible,( GetTimingDifficulty() >= 1 ));
+				};
+				MakeDisplayBar( 4, 9 ) .. {
+					InitCommand=cmd(x,-15;visible,( GetTimingDifficulty() >= 2 ));
+				};
+				MakeDisplayBar( 4, 13 ) .. {
+					InitCommand=cmd(x,-10;visible,( GetTimingDifficulty() >= 3 ));
+				};
+				MakeDisplayBar( 4, 16 ) .. {
+					InitCommand=cmd(x,-5;visible,( GetTimingDifficulty() >= 4 ));
+				};
+				MakeDisplayBar( 4, 20 ) .. {
+					InitCommand=cmd(x,5;visible,( GetTimingDifficulty() >= 5 ));
+				};
+				MakeDisplayBar( 4, 20 ) .. {
+					InitCommand=cmd(x,10;visible,( GetTimingDifficulty() >= 6 ));
+				};
+				MakeDisplayBar( 4, 20 ) .. {
+					InitCommand=cmd(x,15;visible,( GetTimingDifficulty() >= 7 ));
+				};
+				MakeDisplayBar( 4, 20 ) .. {
+					InitCommand=cmd(x,20;visible,( GetTimingDifficulty() >= 8 ));
+				};
+			};
+			Condition=sTarget[1] == "TimingDifficulty";
+		};
 		--
 --[[ 		for i=1,8 do
 			t[#t+1] = Def.Quad {
diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua
index 13703c735e..dab5375a8c 100644
--- a/Themes/default/Scripts/03 ThemePrefs.lua	
+++ b/Themes/default/Scripts/03 ThemePrefs.lua	
@@ -102,6 +102,7 @@ function UserPrefGameplayShowScore()
 			end;
 			WritePrefToFile("UserPrefGameplayShowScore",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
@@ -137,6 +138,7 @@ function UserPrefGameplayShowStepsDisplay()
 			end;
 			WritePrefToFile("UserPrefGameplayShowStepsDisplay",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
@@ -172,6 +174,7 @@ function UserPrefShowLotsaOptions()
 			end;
 			WritePrefToFile("UserPrefShowLotsaOptions",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
@@ -223,6 +226,7 @@ function UserPrefAutoSetStyle()
 			end;
 			WritePrefToFile("UserPrefAutoSetStyle",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
@@ -259,6 +263,7 @@ function UserPrefNotePosition()
 			end;
 			WritePrefToFile("UserPrefNotePosition",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
@@ -294,6 +299,7 @@ function UserPrefLongFail()
 			end;
 			WritePrefToFile("UserPrefLongFail",val);
 			MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();	
 		end;
 	};
 	setmetatable( t, t );
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 688ef0c7f2..f98f212434 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -223,8 +223,9 @@ GradeP2Y=8
 GradesShowMachine=true
 
 [OptionRow]
-TitleOnCommand=shadowlength,0;uppercase,true;wrapwidthpixels,136;maxheight,42;zoom,0.6
-TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat'
+TitleOnCommand=shadowlength,0;skewx,-0.1;uppercase,true;wrapwidthpixels,136;maxheight,42;zoom,0.6
+TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;
+# TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat'
 TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect;
 [OptionRowMiniMenu]
 Fallback="OptionRow"