diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 4ae2dfb859..6330a64a1b 100644
--- a/stepmania/Themes/default/Scripts/Colors.lua
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -1,6 +1,6 @@
 function PlayerColor( pn )
-	if pn == PLAYER_1 then return "0.4,1.0,0.8,1" end	-- sea green
-	if pn == PLAYER_2 then return "1.0,0.5,0.2,1" end	-- orange
+	if pn == PLAYER_1 then return color("0.4,1.0,0.8,1") end	-- sea green
+	if pn == PLAYER_2 then return color("1.0,0.5,0.2,1") end	-- orange
 	return "1,1,1,1"
 end
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 309e838a86..74eafadf4a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1,6 +1,6 @@
 [Common]
-ColorP1Command=diffuse,color(PlayerColor(PLAYER_1))
-ColorP2Command=diffuse,color(PlayerColor(PLAYER_2))
+ColorP1Command=diffuse,PlayerColor(PLAYER_1)
+ColorP2Command=diffuse,PlayerColor(PLAYER_2)
 InitialScreen=ScreenCompany
 FirstAttractScreen=ScreenCompany
 WindowTitle=StepMania
@@ -2818,19 +2818,19 @@ WipeDimFactor=0.5,0.5,0.5,0.5
 [LifeMeterBattery Percent]
 PercentP1X=+20
 PercentP1Y=0
-PercentP1OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP1OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP1OffCommand=
 PercentP2X=-20
 PercentP2Y=0
-PercentP2OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+PercentP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP2OffCommand=
 DancePointsP1X=+20
 DancePointsP1Y=0
-DancePointsP1OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+DancePointsP1OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 DancePointsP1OffCommand=
 DancePointsP2X=-20
 DancePointsP2Y=0
-DancePointsP2OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+DancePointsP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 DancePointsP2OffCommand=
 DancePointsDigits=5
 PercentUseRemainder=0
@@ -2872,11 +2872,11 @@ PercentTotalSize=4
 [ScoreDisplayPercentage Percent]
 PercentP1X=+20
 PercentP1Y=0
-PercentP1OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP1OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP1OffCommand=
 PercentP2X=-20
 PercentP2Y=0
-PercentP2OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+PercentP2OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP2OffCommand=
 DancePointsDigits=5
 PercentUseRemainder=0
@@ -2884,27 +2884,27 @@ ApplyScoreDisplayOptions=1
 
 PercentP3X=+20
 PercentP3Y=0
-PercentP3OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP3OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP3OffCommand=
 PercentP4X=-20
 PercentP4Y=0
-PercentP4OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+PercentP4OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP4OffCommand=
 PercentP5X=+20
 PercentP5Y=0
-PercentP5OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP5OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP5OffCommand=
 PercentP6X=-20
 PercentP6Y=0
-PercentP6OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+PercentP6OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP6OffCommand=
 PercentP7X=+20
 PercentP7Y=0
-PercentP7OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP7OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP7OffCommand=
 PercentP8X=-20
 PercentP8Y=0
-PercentP8OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
+PercentP8OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP8OffCommand=
 
 [ScoreKeeperRave]
@@ -4548,14 +4548,14 @@ PlayerScoreListOffCommand=accelerate,0.5;addy,150
 Fallback=ScoreDisplayPercentage Percent
 PercentP1X=0
 PercentP1Y=2
-PercentP1OnCommand=@"x,3;zoomx,0.42;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP1OnCommand=x,3;zoomx,0.42;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP1OffCommand=
 DancePointsDigits=5
 PercentUseRemainder=0
 
 [MultiplayerEvalScoreRow Percent]
 Fallback=PlayerScoreItem Percent
-PercentP1OnCommand=@"x,3;zoomx,0.6;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
+PercentP1OnCommand=x,3;zoomx,0.6;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 
 [PlayerScoreList]
 ItemPositionCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(indexOffset*72) end