diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 649d27c7c2..fc1dcd86b3 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2628,27 +2628,42 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.AfterInit()
 PrevScreen=Branch.AfterInit()
 
-LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
-# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
-LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
-LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
+LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits"
+LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
-Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
+LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input"
+LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options"
 LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
-LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
 LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+
+# Old
+#LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
+# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
 
 # for ScreenOptionsExtended:
-Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
-LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
-Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
-Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
-Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
-Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
-Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
-LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
+#Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
+#Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+#Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+#Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
+#Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+#Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+#Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+#Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
+#Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+#LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+#LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
 
 [ScreenOptionsExtended]
 Fallback="ScreenOptionsService"
@@ -2794,8 +2809,8 @@ ShowExitRow=true
 [ScreenTestInput]
 Class="ScreenTestInput"
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 
 [ScreenOptionsSystemDirection]
 Fallback="ScreenOptionsServiceChild"
@@ -2828,8 +2843,8 @@ Line22="conf,EventMode"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -2854,8 +2869,8 @@ Line20="conf,VisualDelaySeconds"
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
@@ -2881,8 +2896,8 @@ Line30="conf,FastLoad"
 
 [ScreenAppearanceOptions]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,14,15,17,18,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
@@ -2899,8 +2914,8 @@ Line19="conf,NumBackgrounds"
 # user interface options that aren't related to themes, etc.
 # (some don't get used/modified too often)
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,3,4,6,7,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
@@ -2920,8 +2935,8 @@ Line14="conf,ShowSongOptions"
 
 [ScreenOptionsInput]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5"
 Line1="conf,AutoMapOnJoyChange"
 Line2="conf,OnlyDedicatedMenuButtons"
@@ -2931,8 +2946,8 @@ Line5="conf,MusicWheelSwitchSpeed"
 
 [ScreenOptionsArcade]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 # stuff tied to arcade features
 LineNames="1,2,3,4,5,6"
 Line1="conf,GetRankingName"
@@ -4043,8 +4058,8 @@ OptionRowNormalMetricsGroup="OptionRowCourseOverview"
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
 Fallback="ScreenGameplay"
-PrevScreen="ScreenOptionsExtended"
-NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsService"
 PlayerType="PlayerSyncMachine"
 
 #AllowCenter1Player=false
diff --git a/Themes/test/metrics.ini b/Themes/test/metrics.ini
index f8ca408206..c114dabdfa 100644
--- a/Themes/test/metrics.ini
+++ b/Themes/test/metrics.ini
@@ -1,6 +1,17 @@
 [Global]
 FallbackTheme=default
 [ScreenTitleMenu]
+# new scroll for wrapping
+ScrollerTransform=function(self,offset,itemIndex,numItems) \
+	self:y((28)*(itemIndex-(numItems-1)/2)); \
+	self:x(math.floor(itemIndex/5) * 128); \
+end;
+# more choices for debug stuff
+DefaultChoice="GameStart"
+# new stuff
+ChoiceNames="GameStart,Options,Edit,Jukebox,TestClearChildren,Exit"
+# new tests
+ChoiceTestClearChildren="screen,ScreenTestClearChildren;text,Test: Clear Children"
 [ScreenGameplay]
 # LifeP1OnCommand=visible,false
 # LifeP2OnCommand=visible,false