diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index da4be3c455..4a962f25a7 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2489,11 +2489,10 @@ MoreExitSelectedP1Command=
 MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
-OptionRowType=OptionRow
 ShowExplanations=1
-ThemeOptionTitles=1
+ThemeTitles=1
+ThemeItems=1
 
-[OptionRow]
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 ArrowsX=SCREEN_CENTER_X-232
@@ -2513,10 +2512,6 @@ CapitalizeAllOptionNames=0
 ShowUnderlines=1
 TweenSeconds=0.3
 
-[OptionRowNoUnderline]
-Fallback=OptionRow
-ShowUnderlines=1
-
 [ScreenMapControllers]
 Class=ScreenMapControllers
 Fallback=ScreenOperatorMenu
@@ -3048,6 +3043,8 @@ MemoryCardIcons=0
 TimerSeconds=0
 PrevScreen=ScreenOptionsMenu
 NextScreen=ScreenOptionsMenu
+ThemeTitles=0
+ThemeItems=0
 
 [ScreenInputOptions]
 Fallback=ScreenOptionsSubmenu
@@ -3657,7 +3654,8 @@ Line13=list,Other Options
 Line14=list,Network Options
 Line15=list,Reload Songs/Courses
 Line16=list,Test Input
-OptionRowType=OptionRowNoUnderline
+
+ShowUnderlines=1
 
 [ScreenOptionsTestMenu]
 Fallback=ScreenOptionsSubmenu
@@ -4294,11 +4292,10 @@ StepsTypesToHide=
 Fallback=ScreenOptions
 TimerSeconds=-1
 ShowExplanations=0
-ThemeOptionTitles=0
+ThemeTitles=0
 ShowExitRow=0
 FrameOnCommand=
 FrameOffCommand=
-OptionRowType=OptionRowMiniMenu
 NumRowsShown=30
 Row1Y=SCREEN_CENTER_Y-152+20*0
 Row2Y=SCREEN_CENTER_Y-152+20*1
@@ -4335,8 +4332,6 @@ HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+40
 HeaderOnCommand=
 
-[OptionRowMiniMenu]
-Fallback=OptionRow
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 ArrowsX=SCREEN_CENTER_X-232
@@ -4355,25 +4350,29 @@ ColorDisabled=0.5,0.5,0.5,1
 CapitalizeAllOptionNames=0
 ShowUnderlines=0
 TweenSeconds=0
-
-[OptionRowMiniMenuCentered]
-Fallback=OptionRowMiniMenu
-LabelsX=SCREEN_CENTER_X-80
+ThemeItems=0
 
 [ScreenMiniMenuKeyboardShortcuts]
 Fallback=ScreenMiniMenu
 
 [ScreenMiniMenuMainMenu]
 Fallback=ScreenMiniMenu
-OptionRowType=OptionRowMiniMenuCentered
+ThemeTitles=1
+
+LabelsX=SCREEN_CENTER_X-80
+ThemeItems=1
 
 [ScreenMiniMenuAreaMenu]
 Fallback=ScreenMiniMenu
+ThemeTitles=1
 
-[ScreenMiniMenuStatistics]
+ThemeItems=1
+
+[ScreenMiniMenuStepsInformation]
 Fallback=ScreenMiniMenu
+ThemeTitles=1
 
-[ScreenMiniMenuEditSongInfo]
+[ScreenMiniMenuSongInformation]
 Fallback=ScreenMiniMenu
 
 [ScreenMiniMenuBackgroundChange]