diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 373436092a..6e749c765d 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2373,6 +2373,8 @@ FeetPerDifficulty=0
 
 [ScreenWithMenuElements]
 AllowDisabledPlayerInput=0
+StyleIcon=1
+MemoryCardIcons=1
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+22
 HeaderOnCommand=draworder,95;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH
@@ -3536,9 +3538,9 @@ NumPerfects=4
 NumMisses=6
 
 [ScreenDemonstration]
-SecondsToShow=30
-Class=ScreenDemonstration
 Fallback=ScreenGameplay
+Class=ScreenDemonstration
+SecondsToShow=30
 NextScreen=ScreenRanking
 DifficultiesToShow=easy,medium
 StartScreen=@ScreenTitleBranch()
@@ -4187,6 +4189,12 @@ Fallback=DifficultyMeter
 [ScreenGameplayExtra DifficultyMeterP2]
 Fallback=DifficultyMeter
 
+[ScreenDemonstration DifficultyMeterP1]
+Fallback=DifficultyMeter
+
+[ScreenDemonstration DifficultyMeterP2]
+Fallback=DifficultyMeter
+
 [ScreenEvaluation DifficultyMeterP1]
 Fallback=DifficultyMeter
 
@@ -4194,12 +4202,16 @@ Fallback=DifficultyMeter
 Fallback=DifficultyMeter
 
 [ScreenEdit]
+Fallback=ScreenWithMenuElementsBlank
 Class=ScreenEdit
 PrevScreen=ScreenEditMenu
 AllowOperatorMenuButton=0
 OverlayX=0
 OverlayY=0
 OverlayOnCommand=
+StyleIcon=0
+MemoryCardIcons=1
+TimerSeconds=-1
 
 [CatalogXml]
 ShowPlayModeRegular=1