diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua
index 384aee7718..c3b901f9c8 100644
--- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua	
+++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua	
@@ -23,6 +23,14 @@ t[#t+1] = Def.ActorFrame {
 t[#t+1] = Def.ActorFrame {
 	FOV=90;
 	InitCommand=cmd(x,-192;zoom,0.9);
+	-- Main Shadow
+	LoadActor( gc:GetName() ) .. {
+		InitCommand=cmd(x,2;y,2;diffuse,Color("Black");diffusealpha,0;zoom,0.75);
+		GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,0;zoom,1;decelerate,0.25;diffusealpha,0.5;pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;);
+		LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.25;diffusealpha,0;zoom,0.75;);
+		OffFocusedCommand=cmd(finishtweening;stopeffect;glow,colors[gc:GetName()];decelerate,1.75;rotationy,360*1;);
+	};
+	-- Main Emblem
 	LoadActor( gc:GetName() ) .. {
 		InitCommand=cmd(diffusealpha,0;zoom,0.75);
 		GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.25;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;);
diff --git a/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua b/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua
index fbad9900e6..9f23d79cab 100644
--- a/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu CurrentGametype.lua	
@@ -2,7 +2,7 @@ local curGameName = GAMESTATE:GetCurrentGame():GetName();
 
 local t = Def.ActorFrame{
 	LoadFont("Common Normal") .. {
-		InitCommand=cmd(horizalign,right;zoom,0.5;);
+		InitCommand=cmd(horizalign,left;zoom,0.5;);
 		BeginCommand=function(self)
 			self:settextf( Screen.String("CurrentGametype"), curGameName );
 		end;
diff --git a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua
index 9adb1bdaee..904f92cdf9 100644
--- a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
@@ -1,5 +1,5 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
+--[[ 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
 		OnCommand=function(self)
 			if GetLifeDifficulty() < 3 then
 				(cmd(diffuseshift;effectcolor1,Color("Blue");effectcolor2,ColorDarkTone(Color("Blue"));effectperiod,1.25))(self);
@@ -9,7 +9,7 @@ return Def.ActorFrame {
 				(cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow")))(self);
 			end;
 		end;
-	};
+	}; --]]
 	LoadFont("Common Normal") .. {
 		Text=GetLifeDifficulty();
 		AltText="";
diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua
index e3c631dc50..a705c86e76 100644
--- a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
@@ -1,5 +1,5 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
+--[[ 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
 		OnCommand=function(self)
 			if GetTimingDifficulty() == 7 then
 				(cmd(glowshift;diffuse,Color("Yellow");diffuserightedge,Color("Red");effectcolor1,Colors.Alpha( Color("Red"), 0.5 );effectcolor2,Color("Invisible");effectperiod,1.25/2))(self);
@@ -11,7 +11,7 @@ return Def.ActorFrame {
 				(cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow")))(self);
 			end;
 		end;
-	};
+	}; --]]
 	LoadFont("Common Normal") .. {
 		Text=GetTimingDifficulty();
 		AltText="";
diff --git a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua
index 8289571a6e..f754202e9a 100644
--- a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
@@ -1,6 +1,6 @@
 return Def.ActorFrame {
 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
-		OnCommand=cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow"));
+		OnCommand=cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow");diffusealpha,0.25);
 	};
 	LoadFont("Common Normal") .. {
 		Text=ProductID();
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 385dad779c..bc77a478ff 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -671,10 +671,10 @@ ArtistPrependString=""
 AfterSetCommand=%TextBannerAfterSet
 
 [ScreenSystemLayer]
-CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;strokecolor,Color("Black");diffusebottomedge,PlayerColor(PLAYER_1);
+CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1);
 CreditsP1OffCommand=
 #
-CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;strokecolor,Color("Black");diffusebottomedge,PlayerColor(PLAYER_2);
+CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2);
 CreditsP2OffCommand=
 [ScreenWithMenuElements]
 WaitForChildrenBeforeTweening=true
@@ -818,23 +818,23 @@ LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;
 LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0
 #
 ShowCurrentGametype=true
-CurrentGametypeX=SCREEN_WIDTH*0.99
+CurrentGametypeX=SCREEN_WIDTH*0.01
 CurrentGametypeY=SCREEN_HEIGHT*0.1575
 CurrentGametypeOnCommand=vertalign,bottom;
-CurrentGametypeOffCommand=linear,0.5;cropright,1
-#
-ShowLifeDifficulty=true
-LifeDifficultyX=SCREEN_LEFT+84
-LifeDifficultyY=SCREEN_TOP+64
-LifeDifficultyOnCommand=
-LifeDifficultyOffCommand=
+CurrentGametypeOffCommand=linear,0.5;cropleft,1
 #
 ShowTimingDifficulty=true
 TimingDifficultyX=SCREEN_LEFT+84
-TimingDifficultyY=SCREEN_TOP+32-8
+TimingDifficultyY=SCREEN_TOP+24
 TimingDifficultyOnCommand=
 TimingDifficultyOffCommand=
 #
+ShowLifeDifficulty=true
+LifeDifficultyX=SCREEN_LEFT+84
+LifeDifficultyY=SCREEN_TOP+48
+LifeDifficultyOnCommand=
+LifeDifficultyOffCommand=
+#
 ShowSystemDirection=false
 SystemDirectionX=SCREEN_LEFT+40
 SystemDirectionY=SCREEN_TOP+24