diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 5995326ebd..10afa7fd1c 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -724,9 +724,7 @@ UseSectionsWithPreferredGroup=false
 RouletteSwitchSeconds=0.05
 RouletteSlowDownSwitches=5
 LockedInitialVelocity=15
-#
-OnlyShowActiveSection=false
-#
+
 ScrollBarHeight=300
 ScrollBarOnCommand=visible,false
 #
@@ -1451,7 +1449,7 @@ SleepAfterTweenOffSeconds=0
 UpdateOnMessage=""
 #
 NumChoicesOnPage1=100
-ChoiceNames="1,4,7"
+ChoiceNames="1,4,5,7"
 #~ ChoiceNames="1,2,3,4,5,6,7"
 DefaultChoice="1"
 Choice1="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
@@ -1766,12 +1764,8 @@ PreviousSongButton="MenuLeft"
 NextSongButton="MenuRight"
 #
 ChangeStepsWithGameButtons=false
-;PreviousDifficultyButton="MenuUp"
-;NextDifficultyButton="MenuDown"
-#
-ChangeGroupsWithGameButtoms=false
-;PreviousGroupButton="MenuUp"
-;NextGroupButton="MenuDown"
+PreviousDifficultyButton="MenuUp"
+NextDifficultyButton="MenuDown"
 #
 TwoPartSelection=false
 TwoPartConfirmsOnly=false
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 1a9db6e328..7e967a8766 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -698,14 +698,14 @@ FooterOffCommand=
 
 ShowHelp=true
 HelpX=SCREEN_CENTER_X
-HelpY=IsArcade() and SCREEN_BOTTOM-16 or SCREEN_BOTTOM-16
-HelpOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;strokecolor,Color("Black");draworder,105;zoomy,0;linear,0.175;zoom,1*0.675;maxwidth,(640*0.75)/0.5;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1");
+HelpY=SCREEN_BOTTOM-16
+HelpOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;strokecolor,Color("Black");draworder,105;zoomy,0;linear,0.175;zoom,1*0.675;maxwidth,(640*0.75)/0.5;
 HelpOffCommand=linear,0.175;zoomy,0
 
 AlternateHelpDisplayX=SCREEN_CENTER_X
-AlternateHelpDisplayY=IsArcade() and SCREEN_BOTTOM-16 or SCREEN_BOTTOM-16
+AlternateHelpDisplayY=SCREEN_BOTTOM-16
 # AlternateHelpDisplayOnCommand=draworder,105;
-AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;strokecolor,Color("Black");draworder,105;zoomy,0;linear,0.175;zoom,1*0.675;maxwidth,(640*0.75)/0.5;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1");;diffusealpha,0
+AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;shadowlength,1;strokecolor,Color("Black");draworder,105;zoomy,0;linear,0.175;zoom,1*0.675;maxwidth,(640*0.75)/0.5;;diffusealpha,0
 AlternateHelpDisplayOffCommand=linear,0.175;zoomy,0
 
 TimerX=SCREEN_RIGHT-36-4