diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp
index 445fbec6c0..f349e58d1c 100644
--- a/stepmania/src/CommonMetrics.cpp
+++ b/stepmania/src/CommonMetrics.cpp
@@ -7,13 +7,13 @@
 #include "GameState.h"
 
 
-CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%d",int(p+1)); }
+static CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
 
 ThemeMetric<CString>	INITIAL_SCREEN						("Common","InitialScreen", true); // always reevaluate metric
 ThemeMetric<CString>	FIRST_ATTRACT_SCREEN				("Common","FirstAttractScreen");
 ThemeMetric<CString>	DEFAULT_MODIFIERS					("Common","DefaultModifiers" );
 ThemeMetric<CString>	DEFAULT_CPU_MODIFIERS				("Common","DefaultCpuModifiers" );
-ThemeMetric1D<RageColor> PLAYER_COLOR						("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
+ThemeMetric1D<apActorCommands> PLAYER_COLOR						("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
 ThemeMetric<CString>	WINDOW_TITLE						("Common","WindowTitle");
 ThemeMetric<int>		MAX_COURSE_ENTRIES_BEFORE_VARIOUS	("Common","MaxCourseEntriesBeforeShowVarious");
 ThemeMetric<float>		TICK_EARLY_SECONDS					("ScreenGameplay","TickEarlySeconds");
diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h
index 97a889069e..0e4b20dc3d 100644
--- a/stepmania/src/CommonMetrics.h
+++ b/stepmania/src/CommonMetrics.h
@@ -48,7 +48,7 @@ extern ThemeMetric<CString>		INITIAL_SCREEN;
 extern ThemeMetric<CString>		FIRST_ATTRACT_SCREEN;
 extern ThemeMetric<CString>		DEFAULT_MODIFIERS;
 extern ThemeMetric<CString>		DEFAULT_CPU_MODIFIERS;
-extern ThemeMetric1D<RageColor> PLAYER_COLOR;
+extern ThemeMetric1D<apActorCommands> PLAYER_COLOR;
 extern ThemeMetric<CString>		WINDOW_TITLE;
 extern ThemeMetric<int>			MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
 extern ThemeMetric<float>		TICK_EARLY_SECONDS;
diff --git a/stepmania/src/ScoreDisplayLifeTime.cpp b/stepmania/src/ScoreDisplayLifeTime.cpp
index b283dd72ef..d2daf90265 100644
--- a/stepmania/src/ScoreDisplayLifeTime.cpp
+++ b/stepmania/src/ScoreDisplayLifeTime.cpp
@@ -33,10 +33,10 @@ void ScoreDisplayLifeTime::Init( const PlayerState* pPlayerState, const PlayerSt
 	ActorUtil::OnCommand( m_sprFrame, sType );
 
 	m_textTimeRemaining.LoadFromFont( THEME->GetPathF(sType, "TimeRemaining") );
-	m_textTimeRemaining.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
 	m_textTimeRemaining.SetName( "TimeRemaining" );
 	this->AddChild( &m_textTimeRemaining );
 	ActorUtil::OnCommand( m_textTimeRemaining, sType );
+	m_textTimeRemaining.RunCommands( PLAYER_COLOR.GetValue(pn) );
 	
 	m_textDeltaSeconds.LoadFromFont( THEME->GetPathF(sType,"DeltaSeconds") );
 	m_textDeltaSeconds.SetName( "DeltaSeconds" );
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index 1210595a77..4336a4d321 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -31,7 +31,7 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag
 	// TODO: Remove use of PlayerNumber.
 	PlayerNumber pn = pPlayerState->m_PlayerNumber;
 	
-	m_text.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
+	m_text.RunCommands( PLAYER_COLOR.GetValue(pn) );
 }
 
 void ScoreDisplayNormal::SetScore( int iNewScore ) 
diff --git a/stepmania/src/ScoreDisplayOni.cpp b/stepmania/src/ScoreDisplayOni.cpp
index 7627f121b1..3975fffee5 100644
--- a/stepmania/src/ScoreDisplayOni.cpp
+++ b/stepmania/src/ScoreDisplayOni.cpp
@@ -31,7 +31,7 @@ void ScoreDisplayOni::Init( const PlayerState* pPlayerState, const PlayerStageSt
 	// TODO: Remove use of PlayerNumber.
 	PlayerNumber pn = pPlayerState->m_PlayerNumber;
 
-	m_text.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
+	m_text.RunCommands( PLAYER_COLOR.GetValue(pn) );
 }
 
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 19aa0f7b95..5d2953637a 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -259,7 +259,7 @@ void ScreenSelectMusic::Init()
 		m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) );
 		m_textHighScore[p].LoadFromFont( THEME->GetPathF(m_sName,"score") );
 		m_textHighScore[p].SetShadowLength( 0 );
-		m_textHighScore[p].SetDiffuse( PLAYER_COLOR.GetValue(p) );
+		m_textHighScore[p].RunCommands( PLAYER_COLOR.GetValue(p) );
 		SET_XY( m_textHighScore[p] );
 		this->AddChild( &m_textHighScore[p] );
 	}