diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 99ca22b81f..f3b8101f35 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2262,26 +2262,23 @@ RandomPicksLockedSongs=1
 RouletteSwitchSeconds=0.05
 RouletteSlowDownSwitches=5
 LockedInitialVelocity=7
-ScrollBarX=148
 ScrollBarHeight=368
+ScrollBarOnCommand=x,148
 ItemCurveX=20
 ItemSpacingY=40
 NoCurving=0
 NumWheelItems=17
-MusicWheelItemStartOnCommand=addx,SCREEN_WIDTH/2
-MusicWheelItemFinishOnCommand=accelerate,0.2;addx,-SCREEN_WIDTH/2
-MusicWheelItemStartOffCommand=
-MusicWheelItemFinishOffCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
-HighlightOnCommand=glowshift;effectcolor1,#00C0FF00;effectcolor2,#00C0FF7F;effectclock,bgm;
-HighlightStartOnCommand=addx,SCREEN_WIDTH/2
-HighlightFinishOnCommand=sleep,0.05;accelerate,0.4;addx,-SCREEN_WIDTH/2
-HighlightFinishOnSortCommand=accelerate,0.2;addx,-SCREEN_WIDTH/2
-HighlightStartOffCommand=
-HighlightFinishOffCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
-HighlightFinishOffSortCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
-WheelItemOnDelayCenter=0
+MusicWheelOnCommand=
+MusicWheelOffCommand=
+MusicWheelSortOnCommand=
+MusicWheelSortOffCommand=
+MusicWheelItemSortOnCommand=addx,SCREEN_WIDTH/2;accelerate,0.2;addx,-SCREEN_WIDTH/2
+MusicWheelItemSortOffCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
+HighlightOnCommand=glowshift;effectcolor1,#00C0FF00;effectcolor2,#00C0FF7F;effectclock,bgm;addx,SCREEN_WIDTH/2;sleep,0.05;accelerate,0.4;addx,-SCREEN_WIDTH/2
+HighlightOffCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
+HighlightSortOnCommand=addx,SCREEN_WIDTH/2;accelerate,0.2;addx,-SCREEN_WIDTH/2
+HighlightSortOffCommand=decelerate,0.2;addx,SCREEN_WIDTH/2
 WheelItemOnDelayOffset=0.04
-WheelItemOffDelayCenter=0
 WheelItemOffDelayOffset=0.04
 WheelItemLockedColor=0,0,0,0.5
 NumSectionColors=7
@@ -2313,8 +2310,6 @@ ChoiceGenre=sort,Genre
 ChoiceEasyMeter=sort,EasyMeter
 ChoiceMediumMeter=sort,MediumMeter
 ChoiceHardMeter=sort,HardMeter
-MusicWheelSortOffCommand=
-
 
 [RoomWheel]
 Fallback=MusicWheel