diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
index 88bc66f83f..33f95b346a 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua	
@@ -19,4 +19,26 @@ t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. {
 	InitCommand=function(self) self:name("TimingDifficulty"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
 };
 
+t[#t+1] = Def.OptionIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowEvaluation",PLAYER_1,player,PLAYER_1);
+		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+		OffCommand=cmd(linear,0.5;zoomy,0);
+	};
+t[#t+1] = Def.OptionIconRow {
+		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowEvaluation",PLAYER_2;player,PLAYER_2);
+		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+		OffCommand=cmd(linear,0.5;zoomy,0);
+	};
+
+t[#t+1] = Def.DifficultyDisplay {
+		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"DifficultyDisplayEvaluation",PLAYER_1;player,PLAYER_1;);
+		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+		OffCommand=cmd(linear,0.5;zoomy,0);
+	};
+t[#t+1] = Def.DifficultyDisplay {
+		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"DifficultyDisplayEvaluation",PLAYER_2;player,PLAYER_2;);
+		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
+		OffCommand=cmd(linear,0.5;zoomy,0);
+	};
+
 return t;
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/detail frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/detail frame (doubleres).png
deleted file mode 100644
index 351bd5dc78..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/detail frame (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/judge row frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/judge row frame (doubleres).png
deleted file mode 100644
index 7e14926307..0000000000
Binary files a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/judge row frame (doubleres).png and /dev/null differ
diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua
index a889aab24e..4580dbedaa 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua	
@@ -20,13 +20,13 @@ t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightF
 
 t[#t+1] = Def.OptionIconRow {
 		Condition=GAMESTATE:IsHumanPlayer(PLAYER_1);
-		InitCommand=cmd(z,SCREEN_CENTER_X-200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1);
+		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
 t[#t+1] = Def.OptionIconRow {
 		Condition=GAMESTATE:IsHumanPlayer(PLAYER_2);
-		InitCommand=cmd(z,SCREEN_CENTER_X+200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;);
+		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir
new file mode 100644
index 0000000000..66fb5b1677
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir	
@@ -0,0 +1 @@
+_venacti bold fixed-width 24
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir
new file mode 100644
index 0000000000..edae5c4c51
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenEvaluation JudgmentLineNumber.redir	
@@ -0,0 +1 @@
+_terminator two 40
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation judge.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation judge.redir
deleted file mode 100644
index 159640f767..0000000000
--- a/stepmania/Themes/default/Fonts/ScreenEvaluation judge.redir	
+++ /dev/null
@@ -1 +0,0 @@
-BPMDisplay bpm
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/_sf square head 32 [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_sf square head 32 [numbers] 4x4.png
deleted file mode 100755
index f85f127523..0000000000
Binary files a/stepmania/Themes/default/Fonts/_sf square head 32 [numbers] 4x4.png and /dev/null differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 36.ini b/stepmania/Themes/default/Fonts/_terminator two 36.ini
index 760f028d6e..6afcb00269 100755
--- a/stepmania/Themes/default/Fonts/_terminator two 36.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 36.ini	
@@ -5,6 +5,8 @@ LineSpacing=36
 DrawExtraPixelsLeft=1
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
+FontBaseZoom=0.5
+DefaultStrokeColor=#FFFFFF00
 0=15
 1=15
 2=15
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png
new file mode 100644
index 0000000000..f39a50bb25
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers-stroke] 4x4.png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png
new file mode 100644
index 0000000000..f7b73bda95
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40.ini b/stepmania/Themes/default/Fonts/_terminator two 40.ini
new file mode 100644
index 0000000000..9c86762528
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_terminator two 40.ini	
@@ -0,0 +1,25 @@
+[main]
+Baseline=34
+Top=0
+LineSpacing=40
+DrawExtraPixelsLeft=0
+DrawExtraPixelsRight=0
+AdvanceExtraPixels=0
+FontBaseZoom=0.5
+DefaultStrokeColor=#FFFFFF
+[numbers]
+0=26
+1=26
+2=26
+3=26
+4=25
+5=26
+6=26
+7=26
+8=24
+9=26
+10=34
+11=8
+12=27
+13=8
+14=32
diff --git a/stepmania/Themes/default/Fonts/_venacti bold 24.ini b/stepmania/Themes/default/Fonts/_venacti bold 24.ini
index 9d95844ab8..c76afaa1ce 100755
--- a/stepmania/Themes/default/Fonts/_venacti bold 24.ini	
+++ b/stepmania/Themes/default/Fonts/_venacti bold 24.ini	
@@ -6,6 +6,7 @@ DrawExtraPixelsLeft=2
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
+FontBaseZoom=0.5
 0=0
 1=0
 2=0
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 50fb2ac4e4..b62632dcb1 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -1139,6 +1139,10 @@ Blank=Blank
 [ScreenEditOptions]
 HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options   START to accept changes
 
+[ScreenEvaluation]
+HeaderText=Your Results
+HeaderSubText=Your dance was so great!
+
 [ScreenEvaluationBattle]
 HelpText=Press START to continue
 
@@ -1588,7 +1592,7 @@ CheckpointMiss=Missed Hold Checkpoint
 CheckpointHit=Hit Hold Checkpoint
 None=None
 W1=Fantastic
-W2=Excellent
+W2=Perfect
 W3=Great
 W4=Decent
 W5=Barely
@@ -1867,3 +1871,13 @@ Oni=Oni
 Endless=Endless
 Event=Event
 Demo=Demo
+
+[JudgmentLine]
+W1=Fantastic
+W2=Perfect
+W3=Great
+W4=Decent
+W5=Barely
+Miss=Miss
+Held=Held
+MaxCombo=MaxCombo
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 5e711cd79f..7c60294bd9 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -28,25 +28,6 @@ local CourseDifficultyColors = {
 	Difficulty_Challenge	= color("0.2,0.6,1.0,1"),	-- blue
 };
 
-local StageColors = {
-	Stage_1st	= color("#00ffc7"),
-	Stage_2nd	= color("#58ff00"),
-	Stage_3rd	= color("#f400ff"),
-	Stage_4th	= color("#00ffda"),
-	Stage_5th	= color("#ed00ff"),
-	Stage_6th	= color("#73ff00"),
-	Stage_Next	= color("#73ff00"),
-	Stage_Final	= color("#ff0707"),
-	Stage_Extra1	= color("#fafa00"),
-	Stage_Extra2	= color("#ff0707"),
-	Stage_Nonstop	= color("#FFFFFF"),
-	Stage_Oni	= color("#FFFFFF"),
-	Stage_Endless	= color("#FFFFFF"),
-	Stage_Event	= color("#FFFFFF"),
-	Stage_Demo	= color("#FFFFFF"),
-};
-
-
 function DifficultyDisplayTypeToColor( ddt ) 
 	local c = DifficultyDisplayTypeColors[ddt]
 	if c then return c end
@@ -69,6 +50,25 @@ function CourseDifficutlyToColor( cd )
 	return color("#000000");
 end
 
+
+local StageColors = {
+	Stage_1st	= color("#00ffc7"),
+	Stage_2nd	= color("#58ff00"),
+	Stage_3rd	= color("#f400ff"),
+	Stage_4th	= color("#00ffda"),
+	Stage_5th	= color("#ed00ff"),
+	Stage_6th	= color("#73ff00"),
+	Stage_Next	= color("#73ff00"),
+	Stage_Final	= color("#ff0707"),
+	Stage_Extra1	= color("#fafa00"),
+	Stage_Extra2	= color("#ff0707"),
+	Stage_Nonstop	= color("#FFFFFF"),
+	Stage_Oni	= color("#FFFFFF"),
+	Stage_Endless	= color("#FFFFFF"),
+	Stage_Event	= color("#FFFFFF"),
+	Stage_Demo	= color("#FFFFFF"),
+};
+
 function StageToColor( stage )
 	local c = StageColors[stage];
 	if c then return c end
@@ -81,6 +81,30 @@ function StageToStrokeColor( stage )
 end
 
 
+local JudgmentLineColors = {
+	JudgmentLine_W1		= color("#00ffc7"),
+	JudgmentLine_W2		= color("#f6ff00"),
+	JudgmentLine_W3		= color("#00ff78"),
+	JudgmentLine_W4		= color("#34bfff"),
+	JudgmentLine_W5		= color("#e44dff"),
+	JudgmentLine_Held	= color("#FFFFFF"),
+	JudgmentLine_Miss	= color("#ff3c3c"),
+	JudgmentLine_MaxCombo	= color("#ffc600"),
+};
+
+function JudgmentLineToColor( i )
+	local c = JudgmentLineColors[i];
+	if c then return c end
+	return color("#000000");
+end
+
+function JudgmentLineToStrokeColor( i )
+	local c = JudgmentLineToColor(i);
+	return { c[1]/2, c[2]/2, c[3]/2, c[4] };
+end
+
+
+
 
 
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index c93db3c6c6..875b9e169f 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -5,7 +5,7 @@ IsBaseTheme=1
 AutoSetStyle=false
 ColorP1Command=diffuse,PlayerColor(PLAYER_1)
 ColorP2Command=diffuse,PlayerColor(PLAYER_2)
-InitialScreen="ScreenCompany"
+InitialScreen="ScreenEvaluationStage"
 FirstAttractScreen="ScreenCompany"
 DefaultModifiers="default;1.5x"
 DefaultCpuModifiers=""
@@ -1171,24 +1171,18 @@ PlayerOptionsSeparator=","
 MaxComboNumDigits=4
 ShowStyleIcon=true
 ShowBannerArea=true
-ShowJudgmentLabels=true
-ShowW1=true
-ShowW2=true
-ShowW3=true
-ShowW4=true
-ShowW5=true
-ShowMiss=true
-ShowStatsLabels=true
-ShowHeld=true
-ShowJumps=false
-ShowHolds=false
-ShowMines=false
-ShowHands=false
-ShowRolls=false
+ShowSharedJudgmentLineLabels=true
+ShowJudgmentLineW1=true
+ShowJudgmentLineW2=true
+ShowJudgmentLineW3=true
+ShowJudgmentLineW4=true
+ShowJudgmentLineW5=true
+ShowJudgmentLineHeld=false
+ShowJudgmentLineMiss=true
+ShowJudgmentLineMaxCombo=true
 ShowPerDifficultyAward=false
 ShowPeakComboAward=false
 ShowTotalScoreArea=false
-ShowRecordsArea=true
 
 BannerWidth=256
 BannerHeight=80
@@ -1211,117 +1205,117 @@ GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_
 GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 W1LabelX=SCREEN_CENTER_X+0
-W1LabelY=SCREEN_CENTER_Y-80
-W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1;decelerate,0.3;addy,-SCREEN_HEIGHT
-W1LabelOffCommand=sleep,0.7;accelerate,0.3;addy,SCREEN_HEIGHT
+W1LabelY=SCREEN_CENTER_Y-80+30*0
+W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*0;decelerate,0.3;addy,-SCREEN_HEIGHT
+W1LabelOffCommand=sleep,0.7-0.1*0;accelerate,0.3;addy,SCREEN_HEIGHT
 
 W1NumberP1X=SCREEN_CENTER_X-100
-W1NumberP1Y=SCREEN_CENTER_Y-78
-W1NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,SCREEN_WIDTH/2
+W1NumberP1Y=SCREEN_CENTER_Y-80+30*0
+W1NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
 W1NumberP1OffCommand=sleep,0.7;accelerate,0.3;addx,-SCREEN_WIDTH/2
 W1NumberP2X=SCREEN_CENTER_X+100
-W1NumberP2Y=SCREEN_CENTER_Y-78
-W1NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,-SCREEN_WIDTH/2
-W1NumberP2OffCommand=sleep,0.7;accelerate,0.3;addx,SCREEN_WIDTH/2
+W1NumberP2Y=SCREEN_CENTER_Y-80+30*0
+W1NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
+W1NumberP2OffCommand=sleep,0.7-0.1*0;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 W2LabelX=SCREEN_CENTER_X+0
-W2LabelY=SCREEN_CENTER_Y-50
-W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.2;decelerate,0.3;addy,-SCREEN_HEIGHT
-W2LabelOffCommand=sleep,0.6;accelerate,0.3;addy,SCREEN_HEIGHT
+W2LabelY=SCREEN_CENTER_Y-80+30*1
+W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*1;decelerate,0.3;addy,-SCREEN_HEIGHT
+W2LabelOffCommand=sleep,0.7-0.1*1;accelerate,0.3;addy,SCREEN_HEIGHT
 
 W2NumberP1X=SCREEN_CENTER_X-100
-W2NumberP1Y=SCREEN_CENTER_Y-48
-W2NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,SCREEN_WIDTH/2
-W2NumberP1OffCommand=sleep,0.6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+W2NumberP1Y=SCREEN_CENTER_Y-80+30*1
+W2NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
+W2NumberP1OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,-SCREEN_WIDTH/2
 W2NumberP2X=SCREEN_CENTER_X+100
-W2NumberP2Y=SCREEN_CENTER_Y-48
-W2NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,-SCREEN_WIDTH/2
-W2NumberP2OffCommand=sleep,0.6;accelerate,0.3;addx,SCREEN_WIDTH/2
+W2NumberP2Y=SCREEN_CENTER_Y-80+30*1
+W2NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
+W2NumberP2OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 W3LabelX=SCREEN_CENTER_X+0
-W3LabelY=SCREEN_CENTER_Y-20
-W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.3;decelerate,0.3;addy,-SCREEN_HEIGHT
-W3LabelOffCommand=sleep,0.5;accelerate,0.3;addy,SCREEN_HEIGHT
+W3LabelY=SCREEN_CENTER_Y-80+30*2
+W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*2;decelerate,0.3;addy,-SCREEN_HEIGHT
+W3LabelOffCommand=sleep,0.7-0.1*2;accelerate,0.3;addy,SCREEN_HEIGHT
 
 W3NumberP1X=SCREEN_CENTER_X-100
-W3NumberP1Y=SCREEN_CENTER_Y-18
-W3NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,SCREEN_WIDTH/2
-W3NumberP1OffCommand=sleep,0.5;accelerate,0.3;addx,-SCREEN_WIDTH/2
+W3NumberP1Y=SCREEN_CENTER_Y-80+30*2
+W3NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
+W3NumberP1OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,-SCREEN_WIDTH/2
 W3NumberP2X=SCREEN_CENTER_X+100
-W3NumberP2Y=SCREEN_CENTER_Y-18
-W3NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,-SCREEN_WIDTH/2
-W3NumberP2OffCommand=sleep,0.5;accelerate,0.3;addx,SCREEN_WIDTH/2
+W3NumberP2Y=SCREEN_CENTER_Y-80+30*2
+W3NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
+W3NumberP2OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 W4LabelX=SCREEN_CENTER_X+0
-W4LabelY=SCREEN_CENTER_Y+10
-W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.4;decelerate,0.3;addy,-SCREEN_HEIGHT
-W4LabelOffCommand=sleep,0.4;accelerate,0.3;addy,SCREEN_HEIGHT
+W4LabelY=SCREEN_CENTER_Y-80+30*3
+W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*3;decelerate,0.3;addy,-SCREEN_HEIGHT
+W4LabelOffCommand=sleep,0.7-0.1*3;accelerate,0.3;addy,SCREEN_HEIGHT
 
 W4NumberP1X=SCREEN_CENTER_X-100
-W4NumberP1Y=SCREEN_CENTER_Y+12
-W4NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,SCREEN_WIDTH/2
-W4NumberP1OffCommand=sleep,0.4;accelerate,0.3;addx,-SCREEN_WIDTH/2
+W4NumberP1Y=SCREEN_CENTER_Y-80+30*3
+W4NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
+W4NumberP1OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,-SCREEN_WIDTH/2
 W4NumberP2X=SCREEN_CENTER_X+100
-W4NumberP2Y=SCREEN_CENTER_Y+12
-W4NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,-SCREEN_WIDTH/2
-W4NumberP2OffCommand=sleep,0.4;accelerate,0.3;addx,SCREEN_WIDTH/2
+W4NumberP2Y=SCREEN_CENTER_Y-80+30*3
+W4NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
+W4NumberP2OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 W5LabelX=SCREEN_CENTER_X
-W5LabelY=SCREEN_CENTER_Y+40
-W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.5;decelerate,0.3;addy,-SCREEN_HEIGHT
-W5LabelOffCommand=sleep,0.3;accelerate,0.3;addy,SCREEN_HEIGHT
+W5LabelY=SCREEN_CENTER_Y-80+30*4
+W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*4;decelerate,0.3;addy,-SCREEN_HEIGHT
+W5LabelOffCommand=sleep,0.7-0.1*4;accelerate,0.3;addy,SCREEN_HEIGHT
 
 W5NumberP1X=SCREEN_CENTER_X-100
-W5NumberP1Y=SCREEN_CENTER_Y+40
-W5NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,SCREEN_WIDTH/2
-W5NumberP1OffCommand=sleep,0.3;accelerate,0.3;addx,-SCREEN_WIDTH/2
+W5NumberP1Y=SCREEN_CENTER_Y-80+30*4
+W5NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2
+W5NumberP1OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,-SCREEN_WIDTH/2
 W5NumberP2X=SCREEN_CENTER_X+100
-W5NumberP2Y=SCREEN_CENTER_Y+40
-W5NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,-SCREEN_WIDTH/2
-W5NumberP2OffCommand=sleep,0.3;accelerate,0.3;addx,SCREEN_WIDTH/2
+W5NumberP2Y=SCREEN_CENTER_Y-80+30*4
+W5NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2
+W5NumberP2OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,SCREEN_WIDTH/2
+
+HeldLabelX=
+HeldLabelY=
+HeldLabelOnCommand=
+HeldLabelOffCommand=
+
+HeldNumberP1X=
+HeldNumberP1Y=
+HeldNumberP1OnCommand=
+HeldNumberP1OffCommand=
+HeldNumberP2X=
+HeldNumberP2Y=
+HeldNumberP2OnCommand=
+HeldNumberP2OffCommand=
 
 MissLabelX=SCREEN_CENTER_X+0
-MissLabelY=SCREEN_CENTER_Y+70
-MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.6;decelerate,0.3;addy,-SCREEN_HEIGHT
-MissLabelOffCommand=sleep,0.2;accelerate,0.3;addy,SCREEN_HEIGHT
+MissLabelY=SCREEN_CENTER_Y-80+30*5
+MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*5;decelerate,0.3;addy,-SCREEN_HEIGHT
+MissLabelOffCommand=sleep,0.7-0.1*5;accelerate,0.3;addy,SCREEN_HEIGHT
 
 MissNumberP1X=SCREEN_CENTER_X-100
-MissNumberP1Y=SCREEN_CENTER_Y+72
-MissNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,SCREEN_WIDTH/2
-MissNumberP1OffCommand=sleep,0.2;accelerate,0.3;addx,-SCREEN_WIDTH/2
+MissNumberP1Y=SCREEN_CENTER_Y-80+30*5
+MissNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,SCREEN_WIDTH/2
+MissNumberP1OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,-SCREEN_WIDTH/2
 MissNumberP2X=SCREEN_CENTER_X+100
-MissNumberP2Y=SCREEN_CENTER_Y+72
-MissNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,-SCREEN_WIDTH/2
-MissNumberP2OffCommand=sleep,0.2;accelerate,0.3;addx,SCREEN_WIDTH/2
-
-HeldLabelX=SCREEN_CENTER_X+0
-HeldLabelY=SCREEN_CENTER_Y+100
-HeldLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT
-HeldLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT
-
-HeldNumberP1X=SCREEN_CENTER_X-100
-HeldNumberP1Y=SCREEN_CENTER_Y+104
-HeldNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2
-HeldNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2
-HeldNumberP2X=SCREEN_CENTER_X+100
-HeldNumberP2Y=SCREEN_CENTER_Y+104
-HeldNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2
-HeldNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2
+MissNumberP2Y=SCREEN_CENTER_Y-80+30*5
+MissNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,-SCREEN_WIDTH/2
+MissNumberP2OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 MaxComboMaxDigits=5
-MaxComboLabelX=
-MaxComboLabelY=
-MaxComboLabelOnCommand=visible,false
-MaxComboLabelOffCommand=
+MaxComboLabelX=SCREEN_CENTER_X+0
+MaxComboLabelY=SCREEN_CENTER_Y-80+30*6
+MaxComboLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*6;decelerate,0.3;addy,-SCREEN_HEIGHT
+MaxComboLabelOffCommand=sleep,0.7-0.1*6;accelerate,0.3;addy,SCREEN_HEIGHT
 
-MaxComboNumberP1X=SCREEN_CENTER_X-186
-MaxComboNumberP1Y=SCREEN_CENTER_Y+62
-MaxComboNumberP1OnCommand=diffusealpha,0;linear,0.7;diffuse,1,1,0,1
-MaxComboNumberP1OffCommand=linear,0.7;diffusealpha,0
-MaxComboNumberP2X=SCREEN_CENTER_X+260
-MaxComboNumberP2Y=SCREEN_CENTER_Y+62
-MaxComboNumberP2OnCommand=diffusealpha,0;linear,0.7;diffuse,1,1,0,1
-MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0
+MaxComboNumberP1X=SCREEN_CENTER_X-100
+MaxComboNumberP1Y=SCREEN_CENTER_Y-80+30*6
+MaxComboNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,SCREEN_WIDTH/2
+MaxComboNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+MaxComboNumberP2X=SCREEN_CENTER_X+100
+MaxComboNumberP2Y=SCREEN_CENTER_Y-80+30*6
+MaxComboNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,-SCREEN_WIDTH/2
+MaxComboNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 LargeBannerX=SCREEN_CENTER_X+0
 LargeBannerY=SCREEN_CENTER_Y-140
@@ -1353,14 +1347,14 @@ MachineRecordP2X=SCREEN_CENTER_X+250
 MachineRecordP2Y=SCREEN_CENTER_Y+160
 MachineRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
 MachineRecordP2OffCommand=linear,0.7;diffusealpha,0
-PersonalRecordP1X=SCREEN_CENTER_X-250
-PersonalRecordP1Y=SCREEN_CENTER_Y+190
-PersonalRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
-PersonalRecordP1OffCommand=linear,0.7;diffusealpha,0
-PersonalRecordP2X=SCREEN_CENTER_X+250
-PersonalRecordP2Y=SCREEN_CENTER_Y+190
-PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
-PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0
+ProfileRecordP1X=SCREEN_CENTER_X-250
+ProfileRecordP1Y=SCREEN_CENTER_Y+190
+ProfileRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
+ProfileRecordP1OffCommand=linear,0.7;diffusealpha,0
+ProfileRecordP2X=SCREEN_CENTER_X+250
+ProfileRecordP2Y=SCREEN_CENTER_Y+190
+ProfileRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
+ProfileRecordP2OffCommand=linear,0.7;diffusealpha,0
 
 PlayerOptionsP1X=SCREEN_CENTER_X-70
 PlayerOptionsP1Y=SCREEN_CENTER_Y-182
@@ -1397,58 +1391,73 @@ TimingDifficultyFrameY=SCREEN_CENTER_Y-200
 TimingDifficultyFrameOnCommand=draworder,2
 TimingDifficultyFrameOffCommand=
 
-CheerDelaySeconds=2.5
+JumpsNumberP1X=SCREEN_CENTER_X-200
+JumpsNumberP1Y=SCREEN_CENTER_Y-80+20*0
+JumpsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
+JumpsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+JumpsNumberP2X=SCREEN_CENTER_X+200
+JumpsNumberP2Y=SCREEN_CENTER_Y-80+20*0
+JumpsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
+JumpsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
-[ScreenNetEvaluation]
-Class="ScreenNetEvaluation"
-Fallback="ScreenEvaluationStage"
-NextScreen=ScreenBranchNetAfterEval()
-UsersBG1Y=SCREEN_CENTER_Y+0
-UsersBG1X=SCREEN_CENTER_X-180
-UsersBG2Y=SCREEN_CENTER_Y+0
-UsersBG2X=SCREEN_CENTER_X+180
-UsersBGWidth=260
-UsersBGHeight=400
-UsersBGCommand=diffuse,0.4,0.1,0.4,0.5
-UsersBGOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,1.0;zoomy,1.0
-UsersBGOffCommand=zoomx,1.0;zoomy,1.0;linear,0.5;zoomx,0.0;zoomy,0.0
-User1Y=SCREEN_CENTER_Y-160
-User1X=SCREEN_CENTER_X-180
-User2Y=SCREEN_CENTER_Y-160
-User2X=SCREEN_CENTER_X+180
-UserDX=0
-UserDY=SCREEN_CENTER_Y-208
-UserOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,1.0;zoomy,1.0
-UserOffCommand=zoomx,1.0;zoomy,1.0;linear,0.5;zoomx,0.0;zoomy,0.0
-UserDeSelCommand=zoomx,1.4;zoomy,1.4;linear,0.1;zoomx,1.0;zoomy,1.0
-UserSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,1.4;zoomy,1.4
+HoldsNumberP1X=SCREEN_CENTER_X-200
+HoldsNumberP1Y=SCREEN_CENTER_Y-80+20*1
+HoldsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
+HoldsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+HoldsNumberP2X=SCREEN_CENTER_X+200
+HoldsNumberP2Y=SCREEN_CENTER_Y-80+20*1
+HoldsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
+HoldsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
-[ScreenEvaluationStage]
-Fallback="ScreenEvaluation"
-NextScreen=GetEvaluationNextScreen()
-ShowGradeArea=true
-ShowPointsArea=false
-ShowBonusArea=true
-ShowSurvivedArea=false
-ShowWinArea=false
-ShowMaxCombo=true
-ShowScoreArea=true
-ShowTimeArea=false
-ShowStageDisplay=true
+MinesNumberP1X=SCREEN_CENTER_X-200
+MinesNumberP1Y=SCREEN_CENTER_Y-80+20*2
+MinesNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
+MinesNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+MinesNumberP2X=SCREEN_CENTER_X+200
+MinesNumberP2Y=SCREEN_CENTER_Y-80+20*2
+MinesNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
+MinesNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
+
+HandsNumberP1X=SCREEN_CENTER_X-200
+HandsNumberP1Y=SCREEN_CENTER_Y-80+20*3
+HandsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
+HandsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+HandsNumberP2X=SCREEN_CENTER_X+200
+HandsNumberP2Y=SCREEN_CENTER_Y-80+20*3
+HandsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
+HandsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
+
+RollsNumberP1X=SCREEN_CENTER_X-200
+RollsNumberP1Y=SCREEN_CENTER_Y-80+20*4
+RollsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2
+RollsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+RollsNumberP2X=SCREEN_CENTER_X+200
+RollsNumberP2Y=SCREEN_CENTER_Y-80+20*4
+RollsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2
+RollsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 StageDisplayX=SCREEN_CENTER_X+0
 StageDisplayY=SCREEN_CENTER_Y-168
 StageDisplayOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 StageDisplayOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 
-DifficultyIconP1X=SCREEN_CENTER_X-154
-DifficultyIconP1Y=SCREEN_CENTER_Y-110
-DifficultyIconP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
-DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
-DifficultyIconP2X=SCREEN_CENTER_X+154
-DifficultyIconP2Y=SCREEN_CENTER_Y-110
-DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
-DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+DifficultyDisplayP1X=SCREEN_CENTER_X-154
+DifficultyDisplayP1Y=SCREEN_CENTER_Y-110
+DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
+DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+DifficultyDisplayP2X=SCREEN_CENTER_X+154
+DifficultyDisplayP2Y=SCREEN_CENTER_Y-110
+DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
+DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+
+DetailFrameP1X=SCREEN_CENTER_X-224
+DetailFrameP1Y=SCREEN_CENTER_Y+16
+DetailFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
+DetailFrameP1OffCommand=linear,0.7;diffusealpha,0
+DetailFrameP2X=SCREEN_CENTER_X+224
+DetailFrameP2Y=SCREEN_CENTER_Y+16
+DetailFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
+DetailFrameP2OffCommand=linear,0.7;diffusealpha,0
 
 BonusFrameP1X=SCREEN_CENTER_X-224
 BonusFrameP1Y=SCREEN_CENTER_Y+16
@@ -1556,6 +1565,45 @@ ScoreNumberP1Y=SCREEN_CENTER_Y+140
 ScoreNumberP2X=SCREEN_CENTER_X+129
 ScoreNumberP2Y=SCREEN_CENTER_Y+140
 
+CheerDelaySeconds=2.5
+
+[ScreenNetEvaluation]
+Class="ScreenNetEvaluation"
+Fallback="ScreenEvaluationStage"
+NextScreen=ScreenBranchNetAfterEval()
+UsersBG1Y=SCREEN_CENTER_Y+0
+UsersBG1X=SCREEN_CENTER_X-180
+UsersBG2Y=SCREEN_CENTER_Y+0
+UsersBG2X=SCREEN_CENTER_X+180
+UsersBGWidth=260
+UsersBGHeight=400
+UsersBGCommand=diffuse,0.4,0.1,0.4,0.5
+UsersBGOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,1.0;zoomy,1.0
+UsersBGOffCommand=zoomx,1.0;zoomy,1.0;linear,0.5;zoomx,0.0;zoomy,0.0
+User1Y=SCREEN_CENTER_Y-160
+User1X=SCREEN_CENTER_X-180
+User2Y=SCREEN_CENTER_Y-160
+User2X=SCREEN_CENTER_X+180
+UserDX=0
+UserDY=SCREEN_CENTER_Y-208
+UserOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,1.0;zoomy,1.0
+UserOffCommand=zoomx,1.0;zoomy,1.0;linear,0.5;zoomx,0.0;zoomy,0.0
+UserDeSelCommand=zoomx,1.4;zoomy,1.4;linear,0.1;zoomx,1.0;zoomy,1.0
+UserSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,1.4;zoomy,1.4
+
+[ScreenEvaluationStage]
+Fallback="ScreenEvaluation"
+NextScreen=GetEvaluationNextScreen()
+ShowGradeArea=true
+ShowPointsArea=false
+ShowDetailArea=true
+ShowBonusArea=false
+ShowSurvivedArea=false
+ShowWinArea=false
+ShowScoreArea=true
+ShowTimeArea=false
+ShowStageDisplay=true
+
 TryExtraStageX=SCREEN_CENTER_X+0
 TryExtraStageY=SCREEN_CENTER_Y+188
 TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
@@ -1602,9 +1650,9 @@ NextScreen=GetEvaluationNextScreen()
 ShowGradeArea=true
 ShowPointsArea=false
 ShowBonusArea=false
+ShowDetailArea=false
 ShowSurvivedArea=true
 ShowWinArea=false
-ShowMaxCombo=false
 ShowScoreArea=true
 ShowTimeArea=false
 ShowStageDisplay=false
@@ -1615,9 +1663,9 @@ NextScreen=GetEvaluationNextScreen()
 ShowGradeArea=false
 ShowPointsArea=true
 ShowBonusArea=false
+ShowDetailArea=false
 ShowSurvivedArea=true
 ShowWinArea=false
-ShowMaxCombo=false
 ShowScoreArea=false
 ShowTimeArea=true
 ShowStageDisplay=false
@@ -1660,9 +1708,9 @@ NextScreen=GetEvaluationNextScreen()
 ShowGradeArea=true
 ShowPointsArea=false
 ShowBonusArea=false
+ShowDetailArea=false
 ShowSurvivedArea=false
 ShowWinArea=true
-ShowMaxCombo=false
 ShowScoreArea=true
 ShowTimeArea=false
 FailedSoundTime=0
@@ -2050,6 +2098,9 @@ FrameOnCommand=
 ShowAutogen=false
 ShowStepsType=false
 
+[DifficultyDisplayEvaluation]
+Fallback="DifficultyDisplayGameplay"
+
 [ScreenWithMenuElements]
 Fallback="Screen"
 AllowDisabledPlayerInput=false
@@ -4085,7 +4136,7 @@ AreStageSongModsForced=AreStageSongModsForced
 GradeTierForExtra1="Grade_Tier03"
 GradeTierForExtra2="Grade_Tier03"
 AllowLateJoin=false
-PersonalRecordFeats=true
+ProfileRecordFeats=true
 CategoryRecordFeats=true
 
 [ScreenMiniMenuContext]