diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
new file mode 100644
index 0000000000..82af6f2235
--- /dev/null
+++ b/stepmania/Themes/default/Scripts/Colors.lua
@@ -0,0 +1,5 @@
+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
+	return "1,1,1,1"
+end
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index bc5c9c7ac8..a2b136cf0f 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1,6 +1,6 @@
 [Common]
-ColorP1=0.4,1.0,0.8,1		// sea green
-ColorP2=1.0,0.5,0.2,1		// orange
+ColorP1=PlayerColor(PLAYER_1)
+ColorP2=PlayerColor(PLAYER_2)
 FirstRunInitialScreen=ScreenCompany
 InitialScreen=ScreenCompany
 WindowTitle=StepMania
@@ -2835,19 +2835,19 @@ WipeDimFactor=0.5,0.5,0.5,0.5
 [LifeMeterBattery Percent]
 PercentP1X=+20
 PercentP1Y=0
-PercentP1OnCommand=zoom,0.7;shadowlength,0;diffuse,0.4,1.0,0.8,1
+PercentP1OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
 PercentP1OffCommand=
 PercentP2X=-20
 PercentP2Y=0
-PercentP2OnCommand=zoom,0.7;shadowlength,0;diffuse,1.0,0.5,0.2,1
+PercentP2OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
 PercentP2OffCommand=
 DancePointsP1X=+20
 DancePointsP1Y=0
-DancePointsP1OnCommand=zoom,0.7;shadowlength,0;diffuse,0.4,1.0,0.8,1
+DancePointsP1OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
 DancePointsP1OffCommand=
 DancePointsP2X=-20
 DancePointsP2Y=0
-DancePointsP2OnCommand=zoom,0.7;shadowlength,0;diffuse,0.4,1.0,0.8,1
+DancePointsP2OnCommand=@"zoom,0.7;shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
 DancePointsP2OffCommand=
 DancePointsDigits=5
 PercentDecimalPlaces=1
@@ -2887,11 +2887,11 @@ PercentUseRemainder=1
 [ScoreDisplayPercentage Percent]
 PercentP1X=+20
 PercentP1Y=0
-PercentP1OnCommand=shadowlength,0;diffuse,0.4,1.0,0.8,1
+PercentP1OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
 PercentP1OffCommand=
 PercentP2X=-20
 PercentP2Y=0
-PercentP2OnCommand=shadowlength,0;diffuse,1.0,0.5,0.2,1
+PercentP2OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
 PercentP2OffCommand=
 DancePointsDigits=5
 PercentDecimalPlaces=3