diff --git a/stepmania/Themes/default/Graphics/DifficultyMeter frame.redir b/stepmania/Themes/default/Graphics/DifficultyMeter frame.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/DifficultyMeter frame.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/WheelItemBase bar.redir b/stepmania/Themes/default/Graphics/WheelItemBase bar.redir
index 87601ef742..8ff1043bb2 100644
--- a/stepmania/Themes/default/Graphics/WheelItemBase bar.redir	
+++ b/stepmania/Themes/default/Graphics/WheelItemBase bar.redir	
@@ -1 +1 @@
-MusicWheelItem song.png
\ No newline at end of file
+MusicWheelItem song
\ No newline at end of file
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index ac8fad038c..1c738189f0 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2089,34 +2089,23 @@ LifePercentChangeLetGo=-0.080
 Fallback="LifeMeterBar"
 
 [DifficultyMeter]
+FrameX=0
+FrameY=0
+FrameOnCommand=
 NumTicks=10
 MaxTicks=14
-AutoColorTicks=true
 TicksX=0
 TicksY=0
 TicksOnCommand=shadowlength,0
-TicksDifficultyChangedCommand=%function(self) self:diffuse(DifficultyColor(self.Difficulty)) if self.Meter > 9 then self:glowshift() else self:stopeffect() end end
+TicksSetCommand=%function(self,param) self:diffuse(DifficultyColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end
 ShowTicks=false
-ShowDifficulty=false
 ShowMeter=true
 ShowEditDescription=false
 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")
-MeterSetMediumCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
-MeterSetHardCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
-MeterSetChallengeCourseCommand=diffuse,DifficultyColor("Difficulty_Challenge")
-MeterSetEditCourseCommand=diffuse,DifficultyColor("Difficulty_Edit")
+MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyColor(param.Difficulty)) end end
 
 [DifficultyMeterEdit]
 Fallback="DifficultyMeter"
@@ -2125,19 +2114,6 @@ MeterX=-70
 MeterY=0
 MeterOnCommand=ShadowLength,2;zoom,0.7
 MeterOffCommand=
-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")
-MeterSetMediumCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
-MeterSetHardCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
-MeterSetChallengeCourseCommand=diffuse,DifficultyColor("Difficulty_Challenge")
-MeterSetEditCourseCommand=diffuse,DifficultyColor("Difficulty_Edit")
 ZeroMeterString= 
 
 [ScreenWithMenuElements]