diff --git a/stepmania/Themes/default/BGAnimations/ScreenDemonstration out.redir b/stepmania/Themes/default/BGAnimations/ScreenDemonstration out.redir
new file mode 100644
index 0000000000..30cdcd3856
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenDemonstration out.redir	
@@ -0,0 +1 @@
+_fade out normal
\ No newline at end of file
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 9215b86b00..aed23ad6c6 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -35,13 +35,13 @@ function CustomDifficultyToColor( sCustomDifficulty )
 	return color("#000000");
 end
 
-function DifficultyDisplayTypeToDarkColor( ddt ) 
-	local c = DifficultyDisplayTypeToColor(ddt);
+function CustomDifficultyToDarkColor( sCustomDifficulty ) 
+	local c = CustomDifficultyToColor(sCustomDifficulty);
 	return { c[1]/2, c[2]/2, c[3]/2, c[4] };
 end
 
-function DifficultyDisplayTypeToLightColor( ddt ) 
-	local c = DifficultyDisplayTypeToColor(ddt);
+function CustomDifficultyToLightColor( sCustomDifficulty ) 
+	local c = CustomDifficultyToColor(sCustomDifficulty);
 	return { scale(c[1],0,1,0.5,1), scale(c[2],0,1,0.5,1), scale(c[3],0,1,0.5,1), c[4] };
 end
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1a92755441..db053065b2 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -981,8 +981,8 @@ StepsDisplayP2X=SCREEN_CENTER_X+250
 StepsDisplayP2Y=
 StepsDisplayP2OnCommand=
 StepsDisplayP2OffCommand=linear,0.5;addx,200
-StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200
-StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addx,-200;linear,0.5;addx,200
+StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,200;linear,0.5;addx,-200
+StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addx,200;linear,0.5;addx,-200
 LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160
 LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140
 # This is used if one player is in reverse and the other isn't.
@@ -2030,17 +2030,17 @@ ZeroMeterString="?"
 MeterX=30
 MeterY=0
 MeterOnCommand=shadowlength,0
-MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
+MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowDescription=true
 DescriptionX=-10
 DescriptionY=0
 DescriptionOnCommand=shadowlength,0;uppercase,true;
-DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
+DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowAutogen=true
 AutogenX=40
 AutogenY=0
 AutogenOnCommand=
-AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
+AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowStepsType=false
 StepsTypeX=0
 StepsTypeY=0