diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1 (doubleres).png
new file mode 100644
index 0000000000..cd85356ec8
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1 (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p2.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p2.redir
new file mode 100644
index 0000000000..16def82653
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p2.redir	
@@ -0,0 +1 @@
+ScreenEvaluation DetailFrame p1
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Held.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Held.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Held.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel MaxCombo.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel MaxCombo.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel MaxCombo.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Miss.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Miss.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel Miss.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W1.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W1.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W1.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W2.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W2.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W2.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W3.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W3.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W3.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W4.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W4.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W4.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W5.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W5.redir
deleted file mode 100644
index 3847cef966..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgeLabel W5.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_JudgeLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Held.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Held.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Held.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel MaxCombo.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel MaxCombo.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel MaxCombo.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Miss.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Miss.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel Miss.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W1.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W1.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W1.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W2.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W2.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W2.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W3.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W3.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W3.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W4.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W4.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W4.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W5.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W5.redir
new file mode 100644
index 0000000000..beb864b4a5
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation JudgmentLabel W5.redir	
@@ -0,0 +1 @@
+_JudgmentLineLabel
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua
rename to stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.png b/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.png
deleted file mode 100644
index 74fb1c0cc8..0000000000
Binary files a/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.png and /dev/null differ
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation ScoreLabel.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TotalScoreLabel.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation TotalScoreLabel.redir
index 577b44ab78..2d13cd09af 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenEvaluation TotalScoreLabel.redir and b/stepmania/Themes/default/Graphics/ScreenEvaluation TotalScoreLabel.redir differ
diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation footer.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation footer.redir
new file mode 100644
index 0000000000..f4b815b926
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenEvaluation footer.redir	
@@ -0,0 +1 @@
+_footer large
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectMusic footer.redir b/stepmania/Themes/default/Graphics/ScreenSelectMusic footer.redir
new file mode 100644
index 0000000000..f4b815b926
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenSelectMusic footer.redir	
@@ -0,0 +1 @@
+_footer large
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua
index 86dc4a3dd9..cdc39c19cb 100644
--- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua	
@@ -8,10 +8,10 @@ return Def.ActorFrame {
 			InitCommand=cmd(horizalign,left;y,4);
 		};
 		LoadFont( "_sf sports night ns upright 52" ) .. {
-			InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,"Select Style";skewx,-0.15);
+			InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderText");skewx,-0.15);
 		};
 		LoadFont( "_venacti 24" ) .. {
-			InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,"I can't wait to see your next moves!");
+			InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderSubText"););
 		};
 		LoadActor( "arrow" ) .. {
 		};
diff --git a/stepmania/Themes/default/Graphics/_JudgeLabel.lua b/stepmania/Themes/default/Graphics/_JudgeLabel.lua
deleted file mode 100644
index c4133ec4e2..0000000000
--- a/stepmania/Themes/default/Graphics/_JudgeLabel.lua
+++ /dev/null
@@ -1 +0,0 @@
-return LoadFont("common normal") .. { InitCommand=cmd(settext,"Judgeline";); }
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua
new file mode 100644
index 0000000000..a0d8eee816
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua
@@ -0,0 +1,10 @@
+local jl = Var "JudgmentLine";
+
+return Def.ActorFrame {
+	LoadActor("frame") .. {
+		InitCommand=cmd(y,4;);
+	};
+	LoadFont("_sf square head 32") .. {
+		InitCommand=cmd(settext,string.upper(JudgmentLineToLocalizedString(jl));diffuse,JudgmentLineToColor(jl);strokecolor,JudgmentLineToStrokeColor(jl);shadowlength,0;);
+	};
+};
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/frame (doubleres).png b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/frame (doubleres).png
new file mode 100644
index 0000000000..6f41a8e1dd
Binary files /dev/null and b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/frame (doubleres).png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenSelectMusic footer (doubleres).png b/stepmania/Themes/default/Graphics/_footer large (doubleres).png
old mode 100755
new mode 100644
similarity index 100%
rename from stepmania/Themes/default/Graphics/ScreenSelectMusic footer (doubleres).png
rename to stepmania/Themes/default/Graphics/_footer large (doubleres).png