diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1e36863462..4b2e2c4ac1 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -747,38 +747,10 @@ TitleBGY=SCREEN_CENTER_Y+180
 TitleBGX=SCREEN_CENTER_X-200
 TitleBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0
 TitleBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
-RoomsBGWidth=270
-RoomsBGHeight=390
-RoomsBGY=SCREEN_CENTER_Y+8
-RoomsBGX=SCREEN_CENTER_X+180
-RoomsBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;linear,1;diffusealpha,0.8
-RoomsBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
-SelectionY=SCREEN_CENTER_Y+10
-SelectionX=SCREEN_CENTER_X+180
-SelectionWidth=250
-SelectionHeight=30
-SelectionTo1Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y+10
-SelectionTo2Command=linear,0.3;zoomy,1.7;zoomx,0.4;x,SCREEN_CENTER_X-70;y,SCREEN_CENTER_Y+180
-SelectionOnCommand=diffusealpha,0.7;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0;glowshift;effectperiod,0.5
-SelectionOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
 TitleY=SCREEN_CENTER_Y+180
 TitleX=SCREEN_CENTER_X-200
 TitleOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0
 TitleOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
-RoomsSpacingY=20
-RoomsSpacingX=0
-RoomsUpperBound=100
-RoomsLowerBound=420
-RoomsY=SCREEN_CENTER_Y+10
-RoomsX=SCREEN_CENTER_X+180
-RoomListElimentShiftDownCommand=linear,0.08;addx,0;addy,20
-RoomListElimentShiftUpCommand=linear,0.08;addx,0;addy,-20
-RoomListElimentRoomsOffCommand=linear,0.08;diffusealpha,0.0
-RoomListElimentRoomsOnCommand=linear,0.08;diffusealpha,1.0
-RoomsOnCommand=diffusealpha,1.0
-RoomsOffCommand=diffusealpha,0.0
-SelectionRoomsDownCommand=linear,0.08;addx,0;addy,20
-SelectionRoomsUpCommand=linear,0.08;addx,0;addy,-20
 CreateRoomY=SCREEN_CENTER_Y+180
 CreateRoomX=SCREEN_CENTER_X-70
 CreateRoomOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;zoom,0.5
@@ -790,6 +762,10 @@ Class=ScreenNetRoom
 OpenRoomColor=1.0,1.0,1.0,1.0
 PasswdRoomColor=1.0,0.5,0.5,1.0
 InGameRoomColor=1.0,0.1,0.1,1.0
+RoomWheelX=SCREEN_CENTER_X+160
+RoomWheelY=SCREEN_CENTER_Y+4
+RoomWheelOnCommand=
+
 
 [ScreenSMOnlineSelectMusic]
 PrevScreen=ScreenNetRoom
@@ -2358,10 +2334,20 @@ ChoiceEasyMeter=name,EASY METER;sort,EasyMeter
 ChoiceMediumMeter=name,MEDIUM METER;sort,MediumMeter
 ChoiceHardMeter=name,HARD METER;sort,HardMeter
 
-[WheelItemBase]
+[RoomWheel]
+Fallback=MusicWheel
+RoomWheelItemStartOnCommand=
+RoomWheelItemFinishOnCommand=
+
+[RoomWheelItem]
 TextOnCommand=
-TextX=
-TextY=
+TextX=-140
+TextY=-5
+TextWidth=200
+DescX=-120
+DescY=10
+DescOnCommand=zoom,0.5
+DescWidth=400
 
 [LifeMeterBar]
 MeterWidth=260