diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4d0f64cbc5..6bc75bc444 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2462,7 +2462,7 @@ ScrollBarHeight=0
 ScrollBarTime=0
 LineHighlightX=SCREEN_CENTER_X
 ShowBpmInSpeedTitle=0
-FrameOnCommand=addx,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
+FrameOnCommand=x,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
 FrameOffCommand=accelerate,0.3;addx,SCREEN_WIDTH
 ShowExitRow=1
 SeparateExitRow=0
@@ -4208,7 +4208,30 @@ PlayRecordHelpY=SCREEN_BOTTOM-20
 PlayRecordHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
 
 [ScreenPlayerOptionsEdit]
-Fallback=ScreenPlayerOptions
+Fallback=ScreenOptions
+Class=ScreenPlayerOptions
+NextScreen=none
+PrevScreen=none
+PlayMusic=0
+TimerSeconds=0
+StyleIcon=0
+LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
+OptionMenuFlags=
+Line1=list,Speed
+Line2=list,Accel
+Line3=list,Effect
+Line4=list,Appearance
+Line5=list,Turn
+Line6=list,Insert
+Line7=list,Scroll
+Line8=list,NoteSkins
+Line9=list,Holds
+Line10=list,Mines
+Line11=list,Hide
+Line12=list,Persp
+Line13=list,AssistTick
+Line14=list,Rate
+Line15=list,AutoAdjust
 
 [ScreenSongOptionsEdit]
 Fallback=ScreenSongOptions