diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 7c2829fbd7..4e2c800f5e 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -79,6 +79,7 @@ SecondsBeforeAttract=30
 
 [ScreenCaution]
 Class=ScreenSelectMaster
+Fallback=ScreenWithMenuElements
 ChoiceNames=1
 Choice1=screen,ScreenSelectStyle
 NumCodes=0
@@ -158,7 +159,6 @@ Choice4=Style,double;name,double
 Choice5=Style,solo;name,solo
 NumCodes=0
 TimerSeconds=40
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 NextScreen1=ScreenSelectDifficulty
@@ -280,7 +280,6 @@ Choice8=PlayMode,rave;name,rave
 NumCodes=0
 NumChoicesOnPage1=4
 TimerSeconds=40
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 NextScreen1=ScreenSelectGroup
@@ -429,7 +428,6 @@ MusicListOnCommand=
 MusicListOffCommand=
 SleepAfterTweenOffSeconds=0.8
 TimerSeconds=40
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 
@@ -462,7 +460,6 @@ Fallback=ScreenWithMenuElements
 NextScreen=ScreenSelectCharacter
 PrevScreen=ScreenTitleMenu
 TimerSeconds=15
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 
@@ -659,7 +656,6 @@ CourseContentsOffCommand=zoomy,1;bouncebegin,0.3;zoomy,0
 CourseContentsShowCommand=bouncebegin,0.3;zoomy,1
 CourseContentsHideCommand=linear,0.3;zoomy,0
 TimerSeconds=60
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 SampleMusicDelay=0.25
@@ -895,7 +891,6 @@ NumGroupsShow=3
 StyleIcon=
 MemoryCardIcons=
 TimerSeconds=
-TimerStealth=0
 HelpText=
 PrevScreen=ScreenTitleMenu
 NextScreen=ScreenStage
@@ -1536,7 +1531,6 @@ ShowMaxCombo=1
 ShowScoreArea=1
 ShowTimeArea=0
 TimerSeconds=15
-TimerStealth=0
 PlayerNameP1X=
 PlayerNameP1Y=
 PlayerNameP1OnCommand=hidden,1
@@ -1713,7 +1707,6 @@ ShowMaxCombo=1
 ShowScoreArea=1
 ShowTimeArea=0
 TimerSeconds=30
-TimerStealth=0
 SmallBanner1X=SCREEN_CENTER_X-60
 SmallBanner1Y=SCREEN_CENTER_Y-160
 SmallBanner1OnCommand=zoom,0.5;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1886,7 +1879,6 @@ ShowMaxCombo=0
 ShowScoreArea=1
 ShowTimeArea=0
 TimerSeconds=30
-TimerStealth=0
 LargeBannerX=SCREEN_CENTER_X+0
 LargeBannerY=SCREEN_CENTER_Y-140
 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1966,7 +1958,6 @@ ShowMaxCombo=0
 ShowScoreArea=0
 ShowTimeArea=1
 TimerSeconds=30
-TimerStealth=0
 LargeBannerX=SCREEN_CENTER_X+0
 LargeBannerY=SCREEN_CENTER_Y-140
 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -2045,7 +2036,6 @@ ShowMaxCombo=0
 ShowScoreArea=0
 ShowTimeArea=1
 TimerSeconds=30
-TimerStealth=0
 LargeBannerX=SCREEN_CENTER_X+0
 LargeBannerY=SCREEN_CENTER_Y-140
 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -2136,7 +2126,6 @@ ShowMaxCombo=0
 ShowScoreArea=1
 ShowTimeArea=0
 TimerSeconds=15
-TimerStealth=0
 FailedSoundTime=0
 PassedSoundTime=0
 NumSequenceSounds=0
@@ -2238,9 +2227,9 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 StyleIcon=0
 MemoryCardIcons=0
 TimerSeconds=0
-TimerStealth=0
 
 [ScreenJukeboxMenu]
+Fallback=ScreenWithMenuElements
 NextScreen=ScreenJukebox
 PrevScreen=ScreenTitleMenu
 ExplanationX=SCREEN_CENTER_X+0
@@ -2249,8 +2238,6 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 StyleIcon=0
 MemoryCardIcons=0
 TimerSeconds=0
-TimerStealth=0
-Fallback=ScreenWithMenuElements
 
 [ScreenEditCoursesMenu]
 Fallback=ScreenWithMenuElements
@@ -2260,7 +2247,6 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 StyleIcon=0
 MemoryCardIcons=0
 TimerSeconds=0
-TimerStealth=0
 
 [ScreenSystemLayer]
 StatsX=SCREEN_RIGHT-8
@@ -2408,6 +2394,7 @@ TimerX=SCREEN_CENTER_X+270
 TimerY=SCREEN_TOP+22
 TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH
 TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH;
+TimerStealth=0
 
 [MenuTimer]
 WarningStart=6
@@ -2423,7 +2410,6 @@ WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1
 
 [ScreenOptions]
 Fallback=ScreenWithMenuElements
-TimerStealth=0
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 ArrowsX=SCREEN_CENTER_X-232
@@ -2556,7 +2542,6 @@ CanDL=1
 StyleIcon=
 MemoryCardIcons=
 TimerSeconds=
-TimerStealth=0
 HelpText=
 PrevScreen=ScreenTitleMenu
 NextScreen=ScreenStage
@@ -2886,7 +2871,6 @@ AttackDurationSeconds=10
 
 [ScreenSelectMaster]
 TimerSeconds=20
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 
@@ -3661,7 +3645,6 @@ IconsP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 IconsP2OffCommand=sleep,0.2;bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
 SleepAfterTweenOffSeconds=0.8
 TimerSeconds=40
-TimerStealth=0
 StyleIcon=1
 MemoryCardIcons=1
 PrevScreen=ScreenTitleMenu