diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index f139c46e8f..668f4c8a59 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -122,6 +122,7 @@ PrevScreen=@ScreenTitleBranch()
 Choice1=screen,ScreenSelectStyle
 
 [ScreenEz2SelectPlayer]
+Fallback=ScreenWithMenuElements
 JoinFrameP1X=SCREEN_CENTER_X-200
 JoinFrameP1Y=SCREEN_CENTER_Y+110
 JoinFrameP2X=SCREEN_CENTER_X+200
@@ -133,7 +134,6 @@ JoinMessageP2Y=SCREEN_CENTER_Y+96
 TimerSeconds=40
 TimerStealth=0
 StyleIcon=1
-MemoryCardIcons=1
 NextScreen=ScreenSelectGroup
 PrevScreen=@ScreenTitleBranch()
 SilentWait=1
@@ -152,7 +152,6 @@ Choice4=Style,double;name,double
 Choice5=Style,solo;name,solo
 TimerSeconds=40
 StyleIcon=1
-MemoryCardIcons=1
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
 NextScreen1=ScreenSelectDifficulty
@@ -218,6 +217,7 @@ PictureOnCommand=diffusealpha,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;
 PictureOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0
 
 [ScreenSelectMode]
+Fallback=ScreenSelect
 JoinFrameP1X=SCREEN_CENTER_X-200
 JoinFrameP1Y=SCREEN_CENTER_Y+110
 JoinFrameP2X=SCREEN_CENTER_X+200
@@ -231,7 +231,6 @@ GuideY=SCREEN_CENTER_Y+134
 TimerSeconds=30
 TimerStealth=0
 StyleIcon=1
-MemoryCardIcons=1
 NextScreen=ScreenSelectGroup
 ScrollingListX=SCREEN_CENTER_X+0
 ScrollingListY=SCREEN_CENTER_Y+10
@@ -268,7 +267,6 @@ Choice8=PlayMode,rave;name,rave
 NumChoicesOnPage1=4
 TimerSeconds=40
 StyleIcon=1
-MemoryCardIcons=1
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
 NextScreen1=ScreenSelectGroup
@@ -419,7 +417,6 @@ MusicListOffCommand=
 SleepAfterTweenOffSeconds=0.8
 TimerSeconds=40
 StyleIcon=1
-MemoryCardIcons=1
 
 [GroupList]
 StartX=0
@@ -452,7 +449,6 @@ NextScreen=ScreenSelectCharacter
 PrevScreen=@ScreenTitleBranch()
 TimerSeconds=15
 StyleIcon=1
-MemoryCardIcons=1
 
 [ScreenSelectMusic]
 Class=ScreenSelectMusic
@@ -638,7 +634,6 @@ CourseContentsShowCommand=bouncebegin,0.3;zoomy,1
 CourseContentsHideCommand=linear,0.3;zoomy,0
 TimerSeconds=60
 StyleIcon=1
-MemoryCardIcons=1
 SampleMusicDelay=0.25
 PrevScreen=@ScreenTitleBranch()
 NextScreen=ScreenStage
@@ -830,7 +825,6 @@ NumStylesShow=1
 NumSongsShow=4
 NumGroupsShow=3
 StyleIcon=
-MemoryCardIcons=1
 TimerSeconds=
 HelpText=Ctrl + Enter to enter room/select song
 PrevScreen=@ScreenTitleBranch()
@@ -1257,7 +1251,6 @@ DifficultyMeterP2OffCommand=
 PlayerOptionsSeparator=,
 MaxComboNumDigits=4
 StyleIcon=1
-MemoryCardIcons=1
 ShowBannerArea=1
 ShowMarvelous=1
 ShowPerfect=1
@@ -2165,7 +2158,6 @@ NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
 NumStepsLoadedFromProfileY=SCREEN_TOP+42
 NumStepsLoadedFromProfileOnCommand=hidden,1
 StyleIcon=0
-MemoryCardIcons=1
 TimerSeconds=-1
 
 [ScreenJukeboxMenu]
@@ -2174,7 +2166,6 @@ Fallback=ScreenOptions
 NextScreen=ScreenJukebox
 PrevScreen=@ScreenTitleBranch()
 StyleIcon=0
-MemoryCardIcons=1
 TimerSeconds=0
 OptionMenuFlags=together;forceallplayers;explanations
 LineNames=1,2,3,4
@@ -2634,7 +2625,6 @@ DownloadStatusOnCommand=diffusealpha,0.0;linear,1.0;diffusealpha,1.0
 DownloadStatusOffCommand=diffusealpha,1.0;linear,0.6;diffusealpha,0.0
 CanDL=1
 StyleIcon=
-MemoryCardIcons=1
 TimerSeconds=
 HelpText=
 PrevScreen=@ScreenTitleBranch()
@@ -3227,7 +3217,6 @@ FooterY=
 FooterOnCommand=hidden,1
 FooterOffCommand=
 StyleIcon=0
-MemoryCardIcons=1
 TimerSeconds=6
 TimerStealth=1
 ForceTimer=1
@@ -3256,7 +3245,6 @@ ScrollerSecondsPerItem=0
 ScrollerNumItemsToDraw=0
 ScrollerTransform=function(self,offset,itemIndex,numItems) end
 StyleIcon=1
-MemoryCardIcons=1
 OverrideSleepAfterTweenOffSeconds=0
 SleepAfterTweenOffSeconds=0
 NumCodes=0
@@ -3611,7 +3599,6 @@ FakeBeatsPerSec=2.5
 TimerSeconds=24
 MaxRankingNameLength=4
 StyleIcon=1
-MemoryCardIcons=1
 NextScreen=@SelectEndingScreen()
 PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X-160
 PlayerP2OnePlayerOneSideX=SCREEN_CENTER_X+160
@@ -3896,7 +3883,6 @@ IconsP2OffCommand=sleep,0.2;bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
 SleepAfterTweenOffSeconds=0.8
 TimerSeconds=40
 StyleIcon=1
-MemoryCardIcons=1
 PrevScreen=@ScreenTitleBranch()
 NextScreen=@SongSelectionScreen()
 
@@ -4261,7 +4247,6 @@ Class=ScreenEdit
 PrevScreen=ScreenEditMenu
 AllowOperatorMenuButton=0
 StyleIcon=0
-MemoryCardIcons=1
 TimerSeconds=-1
 InputTipsX=SCREEN_LEFT+4
 InputTipsY=SCREEN_TOP+40