diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua
index fbe123ef2e..e66cd12a55 100644
--- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
@@ -85,6 +85,28 @@ if ShowStandardDecoration("StepsDisplay") then
 	end
 end
 
+for pn in ivalues(PlayerNumber) do
+	local MetricsName = "MachineRecord" .. PlayerNumberToString(pn);
+	t[#t+1] = LoadActor( THEME:GetPathG(Var "LoadingScreen", "MachineRecord"), pn ) .. {
+		InitCommand=function(self) 
+			self:player(pn); 
+			self:name(MetricsName); 
+			ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); 
+		end;
+	};
+end
+
+for pn in ivalues(PlayerNumber) do
+	local MetricsName = "PersonalRecord" .. PlayerNumberToString(pn);
+	t[#t+1] = LoadActor( THEME:GetPathG(Var "LoadingScreen", "PersonalRecord"), pn ) .. {
+		InitCommand=function(self) 
+			self:player(pn); 
+			self:name(MetricsName); 
+			ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); 
+		end;
+	};
+end
+
 for pn in ivalues(PlayerNumber) do
 	local MetricsName = "StageAward" .. PlayerNumberToString(pn);
 	t[#t+1] = LoadActor( THEME:GetPathG(Var "LoadingScreen", "StageAward"), pn ) .. {
@@ -131,4 +153,5 @@ t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty");
 t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficulty");
 t[#t+1] = StandardDecorationFromFileOptional("GameType","GameType");
 
+
 return t
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua b/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua
new file mode 100644
index 0000000000..58dada9d49
--- /dev/null
+++ b/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua	
@@ -0,0 +1,11 @@
+local Player = ...
+assert(Player,"MachineRecord needs Player")
+local stats = STATSMAN:GetCurStageStats():GetPlayerStageStats(Player);
+local record = stats:GetMachineHighScoreIndex()
+local hasMachineRecord = record ~= -1
+
+return LoadFont("Common normal")..{
+	Text=string.format("Machine Record #%i!", record+1);
+	InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25"));
+	BeginCommand=cmd(visible,hasMachineRecord;);
+};
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua b/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua
new file mode 100644
index 0000000000..01ecde54dd
--- /dev/null
+++ b/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua	
@@ -0,0 +1,11 @@
+local Player = ...
+assert(Player,"PersonalRecord needs Player")
+local stats = STATSMAN:GetCurStageStats():GetPlayerStageStats(Player);
+local record = stats:GetPersonalHighScoreIndex()
+local hasPersonalRecord = record ~= -1
+
+return LoadFont("Common normal")..{
+	Text=string.format("Personal Record #%i!", record+1);
+	InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25"));
+	BeginCommand=cmd(visible,hasPersonalRecord;);
+};
\ No newline at end of file
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index a63eebd3ce..81b4cd8365 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -1604,12 +1604,12 @@ ScoreLabelOnCommand=
 ScoreLabelOffCommand=
 #
 ScoreNumberP1X=SCREEN_CENTER_X-160
-ScoreNumberP1Y=SCREEN_TOP+330
-ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1
+ScoreNumberP1Y=SCREEN_TOP+320
+ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
 ScoreNumberP1OffCommand=
 ScoreNumberP2X=SCREEN_CENTER_X+160
-ScoreNumberP2Y=SCREEN_TOP+330
-ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1
+ScoreNumberP2Y=SCREEN_TOP+320
+ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
 ScoreNumberP2OffCommand=
 #
 LargeBannerX=SCREEN_CENTER_X
@@ -1640,12 +1640,12 @@ GradeP2OnCommand=
 GradeP2OffCommand=
 #
 PlayerOptionsP1X=SCREEN_CENTER_X-160
-PlayerOptionsP1Y=SCREEN_TOP+350
+PlayerOptionsP1Y=SCREEN_TOP+352
 PlayerOptionsP1OnCommand=zoom,0.5
 PlayerOptionsP1OffCommand=
 ##
 PlayerOptionsP2X=SCREEN_CENTER_X+160
-PlayerOptionsP2Y=SCREEN_TOP+350
+PlayerOptionsP2Y=SCREEN_TOP+352
 PlayerOptionsP2OnCommand=zoom,0.5
 PlayerOptionsP2OffCommand=
 #
@@ -1681,6 +1681,28 @@ ComboGraphP2Y=SCREEN_BOTTOM-100+32-7
 ComboGraphP2OnCommand=
 ComboGraphP2OffCommand=
 #
+MachineRecordP1X=SCREEN_CENTER_X-220
+#MachineRecordP1Y=SCREEN_BOTTOM-156
+MachineRecordP1Y=SCREEN_TOP+146
+MachineRecordP1OnCommand=
+MachineRecordP1OffCommand=
+#
+MachineRecordP2X=SCREEN_CENTER_X+220
+#MachineRecordP2Y=SCREEN_BOTTOM-156
+MachineRecordP2Y=SCREEN_TOP+146
+MachineRecordP2OnCommand=
+MachineRecordP2OffCommand=
+#
+PersonalRecordP1X=SCREEN_CENTER_X-160
+PersonalRecordP1Y=SCREEN_BOTTOM-144
+PersonalRecordP1OnCommand=
+PersonalRecordP1OffCommand=
+#
+PersonalRecordP2X=SCREEN_CENTER_X+160
+PersonalRecordP2Y=SCREEN_BOTTOM-144
+PersonalRecordP2OnCommand=
+PersonalRecordP2OffCommand=
+#
 StageAwardP1X=SCREEN_CENTER_X-220
 StageAwardP1Y=SCREEN_TOP+130
 StageAwardP1OnCommand=draworder,105;zoom,0.75;diffuse,Color("Yellow");diffusebottomedge,Color("Orange");strokecolor,ColorDarkTone( Color("Orange") );glowshift;textglowmode,'TextGlowMode_Inner'