diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua
index 5b1cc34c6f..e025c18677 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua	
@@ -1,25 +1,31 @@
 local t = Def.ActorFrame {
-	LoadActor("mockup") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0.2;);
-	};
-	Def.ActorFrame {
-		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-200;);
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,-100;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,-50;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,0;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,50;);
-		};
-		LoadActor("difficulty pill") .. {
-			InitCommand=cmd(x,100;);
-		};
-	};
-}
+};
 
+t[#t+1] = Def.ActorFrame {
+};
+
+local NumColumns = THEME:GetMetric(Var "LoadingScreen", "NumColumns");
+
+
+
+
+for i=1,NumColumns do
+	t[#t+1] = LoadActor("difficulty pill") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X-60 + 80 * (i-1);y,SCREEN_CENTER_Y-154;);
+	};
+	
+	local d = THEHE:GetMetric(Var "LoadingScreen","ColumnDifficulty" .. i);
+	local st = THEHE:GetMetric(Var "LoadingScreen","ColumnStepsType" .. i);	
+	t[#t+1] = LoadFont("_venacti Bold 13px") .. {
+		InitCommand=cmd(settext,"EASY";diffuse,color("#FFFF00");x,SCREEN_CENTER_X-60 + 80 * (i-1);y,SCREEN_CENTER_Y-158;shadowlength,0;);
+	};
+end
+
+t[#t+1] = LoadFont("_terminator two 24px") .. {
+	InitCommand=cmd(settext,"SINGLE";diffuse,color("#a38b00");x,SCREEN_CENTER_X-220;y,SCREEN_CENTER_Y-160;shadowlength,0;strokecolor,color("#00000000"););
+};
+
+t[#t+1] = LoadFont("_terminator two 30px") .. {
+	InitCommand=cmd(settext,"Best Ranking";uppercase,true;diffuse,color("#FFFFFF");x,SCREEN_CENTER_X-130;y,SCREEN_CENTER_Y-206;shadowlength,0;strokecolor,color("#3b009c44"););
+};
 return t;
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua
index a0530a97b5..79052a96b2 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
@@ -29,7 +29,7 @@ local t = Def.ActorFrame {
 	LoadFont(Var "LoadingScreen","message") .. {
 		InitCommand=cmd(maxwidth,750;
 		horizalign,left;vertalign,top;
-		zoom,0.8;shadowlength,2;
+		shadowlength,2;shadowcolor,("#000000");
 		y,SCREEN_TOP+20;
 		diffusealpha,0
 		);
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px.ini b/stepmania/Themes/default/Fonts/_terminator two 30px.ini
index bc57c76e13..6c9e139850 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
@@ -1,8 +1,8 @@
-[common]
+[common]
 Baseline=27
 Top=2
 LineSpacing=29
-DrawExtraPixelsLeft=1
+DrawExtraPixelsLeft=3
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 
diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua
index 3470ebc29e..42a9809bde 100644
--- a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua	
@@ -2,8 +2,9 @@ local t = Def.ActorFrame {
 	InitCommand=cmd(runcommandsonleaves,cmd(ztest,true));
 };
 
---t[#t+1] = LoadActor("frame") .. {
---};
+t[#t+1] = LoadActor("frame") .. {
+	InitCommand=cmd(diffusealpha,0.1;);
+};
 
 
 t[#t+1] = Def.TextBanner {
@@ -11,8 +12,10 @@ t[#t+1] = Def.TextBanner {
 	SetCommand=function(self, params)
 		if params.Song then
 			self:SetFromSong( params.Song );
+			self:diffuse( SONGMAN:GetSongColor(params.Song) );
 		else
 			self:SetFromString( params.Course:GetTitle() );
+			self:diffuse( SONGMAN:GetCourseColor(params.Course) );
 		end
 	end;
 };
diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png
index ef8997c601..218b95708c 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png differ
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 45e4185415..7f1e52333c 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -12,18 +12,18 @@ end
 
 local DifficultyDisplayTypeColors = {
 	DifficultyDisplayType_Single_Beginner	= color("#ff32f8"),
-	DifficultyDisplayType_Single_Easy		= color("#2cff00"),
-	DifficultyDisplayType_Single_Medium		= color("#fee600"),
-	DifficultyDisplayType_Single_Hard		= color("#ff2f39"),
+	DifficultyDisplayType_Single_Easy	= color("#2cff00"),
+	DifficultyDisplayType_Single_Medium	= color("#fee600"),
+	DifficultyDisplayType_Single_Hard	= color("#ff2f39"),
 	DifficultyDisplayType_Single_Challenge	= color("#1cd8ff"),
 	DifficultyDisplayType_Double_Beginner	= color("0.0,0.9,1.0,1"),	-- light blue
-	DifficultyDisplayType_Double_Easy		= color("0.9,0.9,0.0,1"),	-- yellow
-	DifficultyDisplayType_Double_Medium		= color("1.0,0.1,0.1,1"),	-- light red
-	DifficultyDisplayType_Double_Hard		= color("0.2,1.0,0.2,1"),	-- light green
+	DifficultyDisplayType_Double_Easy	= color("0.9,0.9,0.0,1"),	-- yellow
+	DifficultyDisplayType_Double_Medium	= color("1.0,0.1,0.1,1"),	-- light red
+	DifficultyDisplayType_Double_Hard	= color("0.2,1.0,0.2,1"),	-- light green
 	DifficultyDisplayType_Double_Challenge	= color("0.2,0.6,1.0,1"),	-- blue
-	Difficulty_Edit							= color("0.8,0.8,0.8,1"),	-- gray
-	Difficulty_Couple						= color("#ff9a00"),	-- orange
-	Difficulty_Routine						= color("#ff9a00"),	-- orange
+	Difficulty_Edit				= color("0.8,0.8,0.8,1"),	-- gray
+	Difficulty_Couple			= color("#ff9a00"),	-- orange
+	Difficulty_Routine			= color("#ff9a00"),	-- orange
 };
 
 local CourseDifficultyColors = {
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4a62274f43..8c2ba91f57 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3186,11 +3186,11 @@ ColumnStepsType2=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame()
 ColumnStepsType3=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ColumnStepsType4=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ColumnStepsType5=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ScrollerItemsToDraw=9
+ScrollerItemsToDraw=7
 ScrollerSecondsPerItem=0.4
 ManualScrolling=false
-ScrollerOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+200;SetMask,608,40
-ScrollerItemTransformFunction=function(self,offset,itemIndex,numItems) self:y(44*offset) end
+ScrollerOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+36;SetMask,608,40
+ScrollerItemTransformFunction=function(self,offset,itemIndex,numItems) self:y(46.1*offset) end
 
 [ScreenRanking]
 Fallback="ScreenAttract"