various default theme changes

Themes/default/BGAnimations/ScreenEvaluation background/default.lua

@@ -25,6 +25,7 @@ t[#t+1] = Def.ActorFrame {
 	LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. {
 		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
 	};
+
 };
 
 return t

Themes/default/BGAnimations/ScreenPlayerOptions background.lua

@@ -1 +1,30 @@
-return GAMESTATE:IsCourseMode() and LoadActor( THEME:GetPathB( Var "LoadingScreen", "background" ) ) or LoadActor( THEME:GetPathB("ScreenEvaluation","background") );
+local t = Def.ActorFrame {};
+
+t[#t+1] = Def.ActorFrame {
+  InitCommand=cmd(Center);
+	Def.Sprite {
+		Condition=not GAMESTATE:IsCourseMode();
+		OnCommand=function(self)
+			if GAMESTATE:GetCurrentSong() then
+				self:LoadBackground( GAMESTATE:GetCurrentSong():GetBackgroundPath() );
+				self:scaletoclipped( SCREEN_WIDTH+1,SCREEN_HEIGHT );
+				(cmd(fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480))(self);
+			else
+				self:visible(false);
+			end
+		end;
+	};
+	Def.Quad {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00");diffusealpha,0.45);
+	};
+	LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_grid")).. {
+		InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true);
+		OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*4,0,(7/8)*4,0;effectclock,'beatnooffset';
+		effectcolor2,Color("Black");effectcolor1,Colors.Alpha(Color("Black"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;diffusealpha,0.345);
+	};
+	LoadActor(THEME:GetPathB("ScreenWithMenuElements","background/_bg top")) .. {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
+	};
+};
+return t

Themes/default/metrics.ini

@@ -428,7 +428,7 @@ FrameOnCommand=
 FrameOffCommand=
 FrameSetCommand=%function(self,param) \
 	if param.CustomDifficulty then \
-		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
+		self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \
 	else \
 		self:diffuse(color('1,1,1,1')); \
 	end; \