diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir
index ba41a9d72b..8696c8d713 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir	
@@ -1 +1 @@
-_shared2
+blaster
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem section.redir b/stepmania/Themes/default/Fonts/MusicWheelItem section.redir
index 7cd3c022f4..8696c8d713 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem section.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem section.redir	
@@ -1 +1 @@
-_shared1
\ No newline at end of file
+blaster
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir
index ba41a9d72b..8696c8d713 100644
--- a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir	
+++ b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir	
@@ -1 +1 @@
-_shared2
+blaster
\ No newline at end of file
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5568e1ba57..2fe8ec9c14 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -553,32 +553,32 @@ MachineRankOnCommand=hidden,1
 MachineRankOffCommand=
 MeterFrameP1X=SCREEN_CENTER_X-238
 MeterFrameP1Y=SCREEN_CENTER_Y+192
-MeterFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
-MeterFrameP1OffCommand=linear,0.5;diffusealpha,0
+MeterFrameP1OnCommand=hidden,1;
+MeterFrameP1OffCommand=
 MeterFrameP2X=SCREEN_CENTER_X-82
 MeterFrameP2Y=SCREEN_CENTER_Y+192
-MeterFrameP2OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
-MeterFrameP2OffCommand=linear,0.5;diffusealpha,0
+MeterFrameP2OnCommand=hidden,1;
+MeterFrameP2OffCommand=
 MeterType=DifficultyMeter
-MeterP1X=SCREEN_CENTER_X-232
-MeterP1Y=SCREEN_CENTER_Y+192
+MeterP1X=SCREEN_CENTER_X-254
+MeterP1Y=SCREEN_CENTER_Y-20
 MeterP1OnCommand=zoomy,0;linear,0.5;zoomy,1
 MeterP1OffCommand=linear,0.5;zoomy,0
-MeterP2X=SCREEN_CENTER_X-92
-MeterP2Y=SCREEN_CENTER_Y+192
+MeterP2X=SCREEN_CENTER_X-121
+MeterP2Y=SCREEN_CENTER_Y-20
 MeterP2OnCommand=zoomy,0;linear,0.5;zoomy,1
 MeterP2OffCommand=linear,0.5;zoomy,0
 NumSongsX=
 NumSongsY=
 NumSongsOnCommand=hidden,1
 NumSongsOffCommand=
-TotalTimeX=
-TotalTimeY=
-TotalTimeOnCommand=hidden,1
-TotalTimeOffCommand=
+TotalTimeX=SCREEN_CENTER_X-156
+TotalTimeY=SCREEN_CENTER_Y+190
+TotalTimeOnCommand=shadowlength,0;diffusealpha,0;linear,0.5;diffusealpha,1;
+TotalTimeOffCommand=linear,0.5;diffusealpha,0;
 MusicWheelX=SCREEN_CENTER_X+160
 MusicWheelY=SCREEN_CENTER_Y+4
-MusicWheelOnCommand=
+MusicWheelOnCommand=rotationy,5;rotationz,2;
 MusicWheelOffCommand=
 WheelUnderX=
 WheelUnderY=
@@ -2217,7 +2217,7 @@ SectionY=0
 SectionOnCommand=zoom,1.0;maxwidth,200
 RouletteX=-30
 RouletteY=0
-RouletteOnCommand=Zoom,1.3
+RouletteOnCommand=Zoom,1.0
 CourseNameX=-130
 CourseNameY=0
 CourseNameOnCommand=shadowlength,0;zoom,1.3;horizAlign,left;maxwidth,200
@@ -2241,15 +2241,15 @@ RouletteSlowDownSwitches=5
 LockedInitialVelocity=7
 ScrollBarX=148
 ScrollBarHeight=368
-ItemCurveX=85
-ItemSpacingY=46
+ItemCurveX=20
+ItemSpacingY=40
 NoCurving=0
-NumWheelItems=13
+NumWheelItems=16
 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,#FFFFFF66;effectcolor2,#FFFFFFFF
+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
@@ -2272,10 +2272,10 @@ SongRealExtraColor=0.9,0.9,0,1		// yellow
 SortMenuColor=1,1,0,1
 ShowRoulette=1
 ShowRandom=1
-ShowPortal=0
-Use3D=0
+ShowPortal=1
+Use3D=1
 Wheel3DRadius=200 # Possibly safe defaults?
-CirclePercent=0.5
+CirclePercent=0.45
 MostPlayedSongsToShow=30
 ModeMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter
 ChoicePreferred=sort,Preferred
@@ -2334,11 +2334,27 @@ FeetX=0
 FeetY=0
 FeetOnCommand=shadowlength,0
 FeetDifficultyChangedCommand=%function(self) self:diffuse(DifficultyColor(self.Difficulty)) if self.Meter > 9 then self:glowshift() else self:stopeffect() end end
-ShowFeet=1
+ShowFeet=0
 ShowDifficulty=0
-ShowMeter=0
+ShowMeter=1
 ShowEditDescription=0
 ZeroMeterString=?
+MeterX=10
+MeterY=0
+MeterOnCommand=shadowlength,0
+MeterSetNoneCommand=
+MeterSetBeginnerCommand=diffuse,DifficultyColor(DIFFICULTY_BEGINNER)
+MeterSetEasyCommand=diffuse,DifficultyColor(DIFFICULTY_EASY)
+MeterSetMediumCommand=diffuse,DifficultyColor(DIFFICULTY_MEDIUM)
+MeterSetHardCommand=diffuse,DifficultyColor(DIFFICULTY_HARD)
+MeterSetChallengeCommand=diffuse,DifficultyColor(DIFFICULTY_CHALLENGE)
+MeterSetEditCommand=diffuse,DifficultyColor(DIFFICULTY_EDIT)
+MeterSetBeginnerCourseCommand=diffuse,DifficultyColor(DIFFICULTY_BEGINNER)
+MeterSetEasyCourseCommand=diffuse,DifficultyColor(DIFFICULTY_EASY)
+MeterSetRegularCourseCommand=diffuse,DifficultyColor(DIFFICULTY_MEDIUM)
+MeterSetDifficultCourseCommand=diffuse,DifficultyColor(DIFFICULTY_HARD)
+MeterSetChallengeCourseCommand=diffuse,DifficultyColor(DIFFICULTY_CHALLENGE)
+MeterSetEditCourseCommand=diffuse,DifficultyColor(DIFFICULTY_EDIT)
 
 [DifficultyMeterEdit]
 Fallback=DifficultyMeter