diff --git a/Themes/default/Graphics/CombinedLifeMeterTug seperator.redir b/Themes/default/Graphics/CombinedLifeMeterTug seperator.redir
new file mode 100644
index 0000000000..e184650b4e
--- /dev/null
+++ b/Themes/default/Graphics/CombinedLifeMeterTug seperator.redir	
@@ -0,0 +1 @@
+_CombinedLifeMeterTug seperator
\ No newline at end of file
diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir
index 04b2ead777..4d26295a4a 100644
--- a/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir	
+++ b/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir	
@@ -1 +1 @@
-_blank
\ No newline at end of file
+_CombinedLifeMeterTug stream p1
\ No newline at end of file
diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir
index 04b2ead777..5189a43350 100644
--- a/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir	
+++ b/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir	
@@ -1 +1 @@
-_blank
\ No newline at end of file
+_CombinedLifeMeterTug stream p2
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua
index def4121879..899f82eb43 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
@@ -15,6 +15,23 @@ if not PREFSMAN:GetPreference("EventMode") then
 	for s in ivalues(Stage) do
 		stages[#stages+1] = MakeBitmapTest() .. {
 			SetCommand=function(self, params)
+				local tRemap = {
+					Stage_1st		= 1,
+					Stage_2nd		= 2,
+					Stage_3rd		= 3,
+					Stage_4th		= 4,
+					Stage_5th		= 5,
+					Stage_6th		= 6,
+--[[ 					'Stage_Next'	= 6,
+					'Stage_Final'	= 7,
+					'Stage_Extra1'	= 8,
+					'Stage_Extra2'	= 9,
+					'Stage_Nonstop'	= 10,
+					'Stage_Oni'		= 11,
+					'Stage_Endless'	= 12,
+					'Stage_Event'	= 13,
+					'Stage_Demo'	= 14, --]]
+				}
 				local Stage = GAMESTATE:GetCurrentStage();
 				local StageIndex = GAMESTATE:GetCurrentStageIndex();
 				local screen = SCREENMAN:GetTopScreen();
@@ -26,14 +43,19 @@ if not PREFSMAN:GetPreference("EventMode") then
 					StageIndex = ss:GetStageIndex();
 				end
 				self:visible( Stage == s );
-				if Stage == 'Stage_Event' then
-					self:settext( StageToLocalizedString(Stage) .. " Mode" );
+				
+				if tRemap[Stage] == PREFSMAN:GetPreference("SongsPerPlay") then
+					Stage = 'Stage_Final';
+-- 					s = 7;
 				else
-					self:settext( StageToLocalizedString(Stage) .. " Stage" );
-				end
-				self:diffuse( StageToColor(s) );
--- 				self:diffusebottomedge( ColorMidTone(StageToColor(s)) );
-				self:strokecolor( cStageOutlineColor );
+					Stage = Stage;
+					s = s;
+				end;
+				self:settext( StageToLocalizedString(Stage) .. " Stage" );
+-- 				self:settext( StageToLocalizedString(Stage) .. " Stage" );
+				self:diffuse( (Stage == 'Stage_Final') and StageToColor('Stage_Final') or StageToColor(s) );
+				self:diffusebottomedge( (Stage == 'Stage_Final') and ColorMidTone(StageToColor('Stage_Final')) or ColorMidTone(StageToColor(s)) );
+				self:strokecolor( (Stage == 'Stage_Final') and ColorDarkTone(StageToColor('Stage_Final')) or ColorDarkTone(StageToColor(s)) );
 			end;
 		}
 	end
diff --git a/Themes/default/Graphics/_CombinedLifeMeterTug separator.png b/Themes/default/Graphics/_CombinedLifeMeterTug separator.png
new file mode 100644
index 0000000000..9b90f459be
Binary files /dev/null and b/Themes/default/Graphics/_CombinedLifeMeterTug separator.png differ
diff --git a/Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png b/Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png
new file mode 100644
index 0000000000..4e78cfd471
Binary files /dev/null and b/Themes/default/Graphics/_CombinedLifeMeterTug stream p1.png differ
diff --git a/Themes/default/Graphics/_CombinedLifeMeterTug stream p2.png b/Themes/default/Graphics/_CombinedLifeMeterTug stream p2.png
new file mode 100644
index 0000000000..0cfd3f4a64
Binary files /dev/null and b/Themes/default/Graphics/_CombinedLifeMeterTug stream p2.png differ
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 91c5e41dec..05f3bbce4b 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -229,7 +229,7 @@ GradesShowMachine=true
 
 [OptionRow]
 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.125;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]