diff --git a/Themes/_fallback/Fonts/ScoreDisplayLifeTime DeltaSeconds.redir b/Themes/_fallback/Fonts/ScoreDisplayLifeTime DeltaSeconds.redir
new file mode 100644
index 0000000000..5c6053f7f1
--- /dev/null
+++ b/Themes/_fallback/Fonts/ScoreDisplayLifeTime DeltaSeconds.redir	
@@ -0,0 +1 @@
+Common Normal
\ No newline at end of file
diff --git a/Themes/_fallback/Fonts/ScoreDisplayLifeTime TimeRemaining.redir b/Themes/_fallback/Fonts/ScoreDisplayLifeTime TimeRemaining.redir
new file mode 100644
index 0000000000..5c6053f7f1
--- /dev/null
+++ b/Themes/_fallback/Fonts/ScoreDisplayLifeTime TimeRemaining.redir	
@@ -0,0 +1 @@
+Common Normal
\ No newline at end of file
diff --git a/Themes/_fallback/Graphics/LifeMeterTime background.redir b/Themes/_fallback/Graphics/LifeMeterTime background.redir
new file mode 100644
index 0000000000..a5b594146c
--- /dev/null
+++ b/Themes/_fallback/Graphics/LifeMeterTime background.redir	
@@ -0,0 +1 @@
+LifeMeterBar under
\ No newline at end of file
diff --git a/Themes/_fallback/Graphics/LifeMeterTime frame.redir b/Themes/_fallback/Graphics/LifeMeterTime frame.redir
new file mode 100644
index 0000000000..8e4934c1fa
--- /dev/null
+++ b/Themes/_fallback/Graphics/LifeMeterTime frame.redir	
@@ -0,0 +1 @@
+LifeMeterBar frame
\ No newline at end of file
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index c4898e748b..e4a4be3786 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -247,7 +247,7 @@ ChallengeMeterText=Challenge Rank
 DoubleEasyMeterText=Easy Rank (Double)
 DoubleMediumMeterText=Medium Rank (Double)
 DoubleHardMeterText=Hard Rank (Double)
-DoubleChallengeMeterText=Challenege Rank (Double)
+DoubleChallengeMeterText=Challenge Rank (Double)
 LengthText=Length
 MediumMeterText=Medium Rank
 PopularityText=Player's Best!
diff --git a/Themes/_fallback/Sounds/LifeMeterTime GainLife.ogg b/Themes/_fallback/Sounds/LifeMeterTime GainLife.ogg
new file mode 100644
index 0000000000..5fda23a847
Binary files /dev/null and b/Themes/_fallback/Sounds/LifeMeterTime GainLife.ogg differ
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 1077fbdaf6..28dc9d12a1 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -49,7 +49,7 @@ FixedProfiles=false
 NumFixedProfiles=1
 
 [SongManager]
-NumSongGroupColors=1
+NumSongGroupColors=10
 NumCourseGroupColors=1
 #
 ExtraColorMeter=10
@@ -59,7 +59,17 @@ UseUnlockColor=false
 UsePreferredSortColor=false
 MoveUnlocksToBottomOfPreferredSort=false
 #
+# Lots of themes want more than one group color, so let them have this.
 SongGroupColor1=color("#00aeef") -- blue
+SongGroupColor2=color("#00aeef") -- blue
+SongGroupColor3=color("#00aeef") -- blue
+SongGroupColor4=color("#00aeef") -- blue
+SongGroupColor5=color("#00aeef") -- blue
+SongGroupColor6=color("#00aeef") -- blue
+SongGroupColor7=color("#00aeef") -- blue
+SongGroupColor8=color("#00aeef") -- blue
+SongGroupColor9=color("#00aeef") -- blue
+SongGroupColor10=color("#00aeef") -- blue
 CourseGroupColor1=color("1,1,1,1")
 UnlockColor=color("1,0.5,0,1")
 ExtraColor=color("#ff0000")	-- red
@@ -381,7 +391,7 @@ DangerThreshold=0.3
 InitialValue=0.5
 MeterWidth=0.0
 MeterHeight=0.0
-MinLifeTime=1.0
+MinLifeTime=25.5
 
 [LyricDisplay]
 LyricFrontChangedCommand=LyricCommand,"Front"
@@ -497,7 +507,10 @@ RightY=12
 [MenuTimer]
 WarningStart=10
 WarningBeepStart=10
-MaxStallSeconds=7.5
+# I don't like it 
+# -- Midiman
+# MaxStallSeconds=7.5
+MaxStallSeconds=0
 #
 Text1OnCommand=stopeffect;stoptweening;shadowlength,0;
 Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds); return ""..digit end
diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua
index 67cf41db03..ab83f074c5 100644
--- a/Themes/default/Graphics/Player combo/default.lua	
+++ b/Themes/default/Graphics/Player combo/default.lua	
@@ -28,7 +28,23 @@ local t = Def.ActorFrame {
 		c.Number:visible(false);
 		c.Label:visible(false);
 	end;
-
+	-- Milestones:
+	-- 25,50,100,250,600 Multiples;
+--[[ 		if (iCombo % 100) == 0 then
+			c.OneHundredMilestone:playcommand("Milestone");
+		elseif (iCombo % 250) == 0 then
+			-- It should really be 1000 but thats slightly unattainable, since
+			-- combo doesnt save over now.
+			c.OneThousandMilestone:playcommand("Milestone");
+		else
+			return
+		end; --]]
+	TwentyFiveMilestoneCommand=function(self,parent)
+		(cmd(rotationz,125;decelerate,0.125;rotationz,0))(self);
+	end;
+	ToastyAchievedMessageCommand=function(self,parent)
+		(cmd(stopeffect;spin;effectperiod,1))(self);
+	end;
 	ComboCommand=function(self, param)
 		local iCombo = param.Misses or param.Combo;
 		if not iCombo or iCombo < ShowComboAt then
@@ -70,15 +86,6 @@ local t = Def.ActorFrame {
 		Pulse( c.Number, param );
 -- 		Pulse( c.Label, param );
 		-- Milestone Logic
-		if (iCombo % 100) == 0 then
-			c.OneHundredMilestone:playcommand("Milestone");
-		elseif (iCombo % 250) == 0 then
-			-- It should really be 1000 but thats slightly unattainable, since
-			-- combo doesnt save over now.
-			c.OneThousandMilestone:playcommand("Milestone");
-		else
-			return
-		end;
 	end;
 	ScoreChangedMessageCommand=function(self,param)
 		local iToastyCombo = param.ToastyCombo;
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 019e95d806..50dccb9516 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -267,7 +267,16 @@ PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,B
 PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5)
 
 [SongManager]
-SongGroupColor1=BoostColor(Color("Orange"),1.25)
+SongGroupColor1=BoostColor(Color("Orange"),1.2)
+SongGroupColor2=BoostColor(Color("Orange"),1.25)
+SongGroupColor3=BoostColor(Color("Orange"),1.25)
+SongGroupColor4=BoostColor(Color("Orange"),1.25)
+SongGroupColor5=BoostColor(Color("Orange"),1.25)
+SongGroupColor6=BoostColor(Color("Orange"),1.25)
+SongGroupColor7=BoostColor(Color("Orange"),1.25)
+SongGroupColor8=BoostColor(Color("Orange"),1.25)
+SongGroupColor9=BoostColor(Color("Orange"),1.25)
+SongGroupColor10=BoostColor(Color("Orange"),1.25)
 CourseGroupColor1=color("1,1,1,1")
 UnlockColor=color("1,0.5,0,1")
 ExtraColor=color("#ff0000")	-- red