diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index ab23f589d8..9f57baa9f3 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -649,6 +649,7 @@ MeterSetCommand=%function(self,param) \
 	end; \
 	if param.Meter then \
 		if param.Meter >= 10 then \
+			self:textglowmode('TextGlowMode_Inner'); \
 			self:glowshift(); \
 		else \
 			self:stopeffect(); \
diff --git a/Themes/themekit/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/themekit/BGAnimations/ScreenWithMenuElements background/default.lua
index b97fb0767e..d3ebaea695 100644
--- a/Themes/themekit/BGAnimations/ScreenWithMenuElements background/default.lua	
+++ b/Themes/themekit/BGAnimations/ScreenWithMenuElements background/default.lua	
@@ -1,8 +1,62 @@
-return Def.ActorFrame {
+local t = Def.ActorFrame {};
+--
+--[[ local tGridSizeMajor = { 32, 32 };
+local tGridSizeMinor = { 16, 16 };
+local function CreateDebugGrid()
+	local t = Def.ActorFrame {};
+	local numX = math.ceil(SCREEN_WIDTH/tGridSizeMajor[1])
+	local numY = math.ceil(SCREEN_HEIGHT/tGridSizeMajor[2])
+	local offset = ( math.ceil(SCREEN_WIDTH/tGridSizeMajor[1]) - SCREEN_WIDTH ) + SCREEN_WIDTH;
+	for a=1,numY do
+		for b=1,numX do 
+			t[#t+1] = Def.Quad {
+				InitCommand=cmd(x,b*tGridSizeMajor[1]-(tGridSizeMajor[1]/2);y,a*tGridSizeMajor[2]-(tGridSizeMajor[2]/2));
+				OnCommand=cmd(zoomto,tGridSizeMajor[1]-2,tGridSizeMajor[2]-2;diffuse,color("1,1,1,0.25"));
+			};
+		end;
+	end;
+	return t
+end --]]
+
+--
+t[#t+1] = Def.ActorFrame {
 	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-	
-	Def.Quad {
-		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
-		OnCommand=cmd(diffuse,color("0.25,0.15,0.25,1"));
+	LoadActor("VOL1-29-NTSC") .. {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffusealpha,0.75);
 	};
-};
\ No newline at end of file
+};
+--
+local bShow = 0;
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(visible,false);
+	ToggleConsoleDisplayMessageCommand=function(self)
+		bShow = 1 - bShow;
+		self:visible( bShow == 1 );
+	end;
+	-- Grid
+	LoadActor("_32") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	};
+	LoadActor("_16") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16);
+		OnCommand=cmd(diffuse,color("1,1,1,0.125"));
+	};
+--[[ 	LoadActor("_8") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/8,SCREEN_HEIGHT/8);
+		OnCommand=cmd(diffuse,color("#00BFE833"));
+	}; --]]
+	-- Left
+	Def.Quad {
+		InitCommand=cmd(horizalign,left;x,SCREEN_LEFT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	};
+	-- Right
+	Def.Quad {
+		InitCommand=cmd(horizalign,right;x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
+	};
+};
+--
+return t
\ No newline at end of file
diff --git a/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations/default.lua b/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations/default.lua
index 9d64c662cd..d69d08b791 100644
--- a/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations/default.lua	
+++ b/Themes/themekit/BGAnimations/ScreenWithMenuElements decorations/default.lua	
@@ -2,8 +2,6 @@
 -- I prefer to keep these optional, incase another screen wants to hide 
 -- these elements.
 local t = Def.ActorFrame {};
-
 t[#t+1] = StandardDecorationFromFileOptional("Header","Header");
 t[#t+1] = StandardDecorationFromFileOptional("Footer","Footer");
-
 return t
\ No newline at end of file
diff --git a/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua b/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua
index 13448248c9..84e2da8460 100644
--- a/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua	
+++ b/Themes/themekit/Graphics/ScreenTitleMenu scroll.lua	
@@ -4,10 +4,8 @@ local t = Def.ActorFrame {};
 
 t[#t+1] = LoadFont("Common Normal") .. {
     Text=gc:GetText();
-	InitCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemInitCommand");
-	GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemGainFocusCommand");
-	LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","ScrollerItemGainFocusCommand");
 };
 
-
+t.GainFocusCommand=cmd(diffusealpha,1);
+t.LoseFocusCommand=cmd(diffusealpha,0.5);
 return t;
\ No newline at end of file
diff --git a/Themes/themekit/Graphics/ScreenWithMenuElements footer.lua b/Themes/themekit/Graphics/ScreenWithMenuElements footer.lua
deleted file mode 100644
index a68467c3ba..0000000000
--- a/Themes/themekit/Graphics/ScreenWithMenuElements footer.lua	
+++ /dev/null
@@ -1,3 +0,0 @@
-return Def.Quad {
-	InitCommand=cmd(zoomto,SCREEN_WIDTH,32);
-};
\ No newline at end of file
diff --git a/Themes/themekit/Graphics/ScreenWithMenuElements header.lua b/Themes/themekit/Graphics/ScreenWithMenuElements header.lua
deleted file mode 100644
index 82ac56aec3..0000000000
--- a/Themes/themekit/Graphics/ScreenWithMenuElements header.lua	
+++ /dev/null
@@ -1,3 +0,0 @@
-return Def.Quad {
-	InitCommand=cmd(zoomto,SCREEN_WIDTH,48);
-};
\ No newline at end of file
diff --git a/Themes/themekit/metrics.ini b/Themes/themekit/metrics.ini
index 0606f0540b..ffd154d4d0 100644
--- a/Themes/themekit/metrics.ini
+++ b/Themes/themekit/metrics.ini
@@ -1,59 +1,37 @@
 [Global]
 FallbackTheme=_fallback
-
-[CustomScoring]
-ComboAboveThresholdAddsToScoreBonus=0
-ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
-ComboMultiplier=0.0
-
-DoubleNoteScoreMultiplier=2.0
-TripleNoteScoreMultiplier=3.0
-QuadOrHigherNoteScoreMultiplier=4.0
-
-PointsW1=+50
-PointsW2=+20
-PointsW3=+10
-PointsW4=+5
-PointsW5=0
-PointsMiss=-5
-PointsHitMine=-5
-PointsCheckpointHit=+5
-PointsCheckpointMiss=-5
-PointsNone=0
-PointsHoldHeld=+5
-PointsHoldLetGo=-5
-
 [ScreenWithMenuElements]
-WaitForChildrenBeforeTweeningOut=true
-
 ShowHeader=true
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP
-HeaderOnCommand=vertalign,top;diffuse,color("0.5,0.25,0.35,1");
+HeaderOnCommand=
 HeaderOffCommand=
-
+#
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
-FooterOnCommand=vertalign,bottom;diffuse,color("0.5,0.25,0.35,1");
+FooterOnCommand=
 FooterOffCommand=
+#
+TimerX=SCREEN_WIDTH-64
+TimerY=SCREEN_TOP+48-4.5
+TimerOnCommand=
+TimerOffCommand=
+[MenuTimer]
+# Text
+Text1OnCommand=stopeffect;stoptweening;vertalign,bottom;horizalign,right
+Text1FormatFunction=function(fSeconds) \
+	return string.format("%0.1f", fSeconds); \
+end
+FrameOnCommand=
+# Warning
+Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1");
 [ScreenTitleMenu]
-ScrollerY=SCREEN_CENTER_Y*1.5
-ScrollerOnCommand=
-# New: Load ScrollerItem SpacingX/Y
-ScrollerTransform=function(self,offset,itemIndex,numItems) \
-	local fSpaceX = THEME:GetMetric( Var "LoadingScreen","ScrollerItemSpacingX"); \
-	local fSpaceY = THEME:GetMetric( Var "LoadingScreen","ScrollerItemSpacingY"); \
-	self:x( (i-1) * fSpaceX ); \
-	self:y( (i-1) * fSpaceY ); \
-end;
-# New: Adjust menu items 
-ScrollerItemSpacingX=0
-ScrollerItemSpacingY=24
-ScrollerItemInitCommand=zoom,1;shadowlength,1
-ScrollerItemGainFocusCommand=finishtweening;linear,0.125;zoom,1.25
-ScrollerItemLoseFocusCommand=finishtweening;linear,0.125;zoom,1
+ShowHeader=true
+ShowFooter=true
 [ScreenSelectMusic]
-
+MusicWheelX=SCREEN_RIGHT-128-18
+MusicWheelOnCommand=draworder,-1
+[MusicWheel]
+ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*0 ); self:y( offsetFromCenter*48  ); end
+NumWheelItems=13
\ No newline at end of file