diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 122067b8e2..373436092a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -41,6 +41,10 @@ UnlockNames=
 # to use to store the unlock.
 # Unlock2=song,ABC;code,59183751;roulette
 
+[ScreenSelect]
+Fallback=ScreenWithMenuElements
+UpdateOnMessage=
+
 [ScreenTitleMenu]
 # Note that we don't use the "name" parameter to Choices here.  Name1 is
 # the displayed text, which might be translated or otherwise changed.  The "name,foo"
@@ -49,7 +53,6 @@ Class=ScreenTitleMenu
 Fallback=ScreenSelectMasterBlank
 PrevScreen=ScreenCompany
 CoinModeChangeScreen=@ScreenTitleBranch()
-UpdateOnMessage=
 SharedPreviewAndCursor=1
 AllowDisabledPlayerInput=1
 OverrideLockInputSeconds=1
@@ -147,7 +150,7 @@ FoldOnJoin=1
 
 [ScreenSelectStyle]
 Class=ScreenSelectStyle
-Fallback=ScreenWithMenuElements
+Fallback=ScreenSelect
 ChoiceNames=1,2,3,4,5
 # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single".
 Choice1=Style,single;name,single
@@ -155,7 +158,6 @@ Choice2=Style,versus;name,versus
 Choice3=Style,couple;name,couple
 Choice4=Style,double;name,double
 Choice5=Style,solo;name,solo
-UpdateOnMessage=
 TimerSeconds=40
 StyleIcon=1
 MemoryCardIcons=1
@@ -269,7 +271,7 @@ TimerStealth=0
 
 [ScreenSelectDifficulty]
 Class=ScreenSelectDifficulty
-Fallback=ScreenWithMenuElements
+Fallback=ScreenSelect
 ChoiceNames=1,2,3,4,5,6,7,8
 Choice1=PlayMode,regular;Difficulty,beginner;name,beginner
 Choice2=PlayMode,regular;Difficulty,easy;name,easy
@@ -280,7 +282,6 @@ Choice6=PlayMode,oni;name,oni
 Choice7=PlayMode,endless;name,endless
 Choice8=PlayMode,rave;name,rave
 NumChoicesOnPage1=4
-UpdateOnMessage=
 TimerSeconds=40
 StyleIcon=1
 MemoryCardIcons=1
@@ -2180,6 +2181,12 @@ MeterX=SCREEN_CENTER_X+170
 MeterY=SCREEN_CENTER_Y-20
 SourceMeterX=SCREEN_CENTER_X+170
 SourceMeterY=SCREEN_CENTER_Y+60
+MeterNumberX=SCREEN_CENTER_X+100
+MeterNumberY=SCREEN_CENTER_Y-20
+MeterNumberOnCommand=zoom,0.7
+SourceMeterNumberX=SCREEN_CENTER_X+100
+SourceMeterNumberY=SCREEN_CENTER_Y+60
+SourceMeterNumberOnCommand=zoom,0.7
 RowLabelsX=SCREEN_LEFT+40
 RowLabelOnCommand=zoom,0.7
 RowValue1X=SCREEN_CENTER_X
@@ -2207,7 +2214,7 @@ ExplanationY=SCREEN_BOTTOM-70
 ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
 NumStepsLoadedFromProfileY=SCREEN_TOP+42
-NumStepsLoadedFromProfileOnCommand=zoom,0.7
+NumStepsLoadedFromProfileOnCommand=hidden,1
 StyleIcon=0
 MemoryCardIcons=1
 TimerSeconds=0
@@ -3191,8 +3198,12 @@ TimerY=
 TimerOnCommand=hidden,1
 TimerOffCommand=
 
-[ScreenSelectMasterBlank]
+[ScreenSelectBlank]
 Fallback=ScreenWithMenuElementsBlank
+UpdateOnMessage=
+
+[ScreenSelectMasterBlank]
+Fallback=ScreenSelectBlank
 Class=ScreenSelectMaster
 ChoiceNames=1
 Choice1=
@@ -3674,7 +3685,7 @@ ThreeLinesArtistCommand=zoom,0.6;maxwidth,266;y,10
 BarX=0
 BarY=0
 BarOnCommand=
-TextBannerName=TextBanner
+TextBannerType=TextBanner
 TextBannerX=0
 TextBannerY=0
 TextBannerOnCommand=shadowlength,0