diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index d5e811d66d..8c2a6a512b 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -181,6 +181,7 @@ HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::
 Are you sure you want to delete the profile '%s'?=Are you sure you want to delete the profile '%s'?
 Enter a name for the profile.=Enter a name for the profile.
 Are you sure you want to clear all data in the profile '%s'?=Are you sure you want to clear all data in the profile '%s'?
+NewProfileDefaultName=New
 
 [ScreenOptionsMemoryCard]
 Error mounting card: %s=Error mounting card: %s
@@ -1274,3 +1275,9 @@ NumTh=
 NumNd=
 NumSt=
 NumRd=
+
+[PaneDisplay]
+EmptyMachineHighScoreName=Best
+
+[ScreenRanking]
+NoScoreName=STEP
diff --git a/stepmania/Themes/default/Scripts/Utilities.lua b/stepmania/Themes/default/Scripts/Utilities.lua
index fa09a6b16a..c6106b565a 100644
--- a/stepmania/Themes/default/Scripts/Utilities.lua
+++ b/stepmania/Themes/default/Scripts/Utilities.lua
@@ -21,11 +21,11 @@ function FindSelection( list )
 end
 
 -- Look up each value in a table, returning a table with the resulting strings.
-function TableMetricLookup( t, group )
+function TableStringLookup( t, group )
 	local ret = { }
 	for key, val in t do
 		Trace(val)
-		ret[key] = THEME:GetMetric(group,val)
+		ret[key] = THEME:GetString(group,val)
 	end
 	return ret
 end
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index ef85e67653..5568e1ba57 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -79,14 +79,14 @@ DefaultChoice=1
 NumChoicesOnPage1=100
 WrapCursor=1
 AllowRepeatingInput=1
-Choice1=@"ApplyDefaultOptions;screen,"..ScreenCautionBranch()
-Choice2=screen,ScreenSelectGame
-Choice3=screen,ScreenOptionsService
-Choice4=screen,ScreenEditMenu
-Choice5=screen,ScreenCourseManager
-Choice6=screen,ScreenJukeboxMenu
-Choice7=screen,ScreenExit
-Choice8=screen,ScreenTest
+Choice1=@"ApplyDefaultOptions;screen,"..ScreenCautionBranch()..";text,Game Start"
+Choice2=screen,ScreenSelectGame;text,Select Game
+Choice3=screen,ScreenOptionsService;text,Options
+Choice4=screen,ScreenEditMenu;text,Edit/Sync Songs
+Choice5=screen,ScreenCourseManager;text,Edit Courses
+Choice6=screen,ScreenJukeboxMenu;text,Jukebox
+Choice7=screen,ScreenExit;text,Exit
+Choice8=screen,ScreenTest;text,Sandbox
 ShowIcon=0
 ShowScroller=1
 ScrollerTransform=function(self,offset,itemIndex,numItems) self:x(offset*20 + itemIndex) self:y(20*offset) end
@@ -3361,7 +3361,6 @@ NumMostRecentScoresToShow=10
 DifficultiesToShow=easy,medium,hard,challenge
 SecondsPerPage=5
 PageFadeSeconds=1.0
-NoScoreName=STEP
 
 RowSpacingX=0
 RowSpacingY=60
@@ -4464,7 +4463,6 @@ NextScreen=ScreenOptionsEditProfile
 StyleIcon=0
 TimerSeconds=0
 ShowExplanations=0
-NewProfileDefaultName=New
 
 [ScreenOptionsEditProfile]
 Class=ScreenOptionsEditProfile