diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h
index b6505f6d8f..cd09fd5ada 100644
--- a/stepmania/src/RageDisplay.h
+++ b/stepmania/src/RageDisplay.h
@@ -178,10 +178,10 @@ public:
 	virtual void SetAlphaTest( bool b ) = 0;
 	
 	virtual void SetMaterial( 
-		float emissive[4],
-		float ambient[4],
-		float diffuse[4],
-		float specular[4],
+		const RageColor &emissive,
+		const RageColor &ambient,
+		const RageColor &diffuse,
+		const RageColor &specular,
 		float shininess
 		) = 0;
 
@@ -189,10 +189,10 @@ public:
 	virtual void SetLightOff( int index ) = 0;
 	virtual void SetLightDirectional( 
 		int index, 
-		RageColor ambient, 
-		RageColor diffuse, 
-		RageColor specular, 
-		RageVector3 dir ) = 0;
+		const RageColor &ambient, 
+		const RageColor &diffuse, 
+		const RageColor &specular, 
+		const RageVector3 &dir ) = 0;
 
 	virtual void SetSphereEnironmentMapping( bool b ) = 0;
 
diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 42693298df..4a74cce05a 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -972,10 +972,10 @@ void RageDisplay_D3D::SetTextureWrapping( bool b )
 }
 
 void RageDisplay_D3D::SetMaterial( 
-	float emissive[4],
-	float ambient[4],
-	float diffuse[4],
-	float specular[4],
+	const RageColor &emissive,
+	const RageColor &ambient,
+	const RageColor &diffuse,
+	const RageColor &specular,
 	float shininess
 	)
 {
@@ -1004,10 +1004,10 @@ void RageDisplay_D3D::SetLightOff( int index )
 }
 void RageDisplay_D3D::SetLightDirectional( 
 	int index, 
-	RageColor ambient, 
-	RageColor diffuse, 
-	RageColor specular, 
-	RageVector3 dir )
+	const RageColor &ambient, 
+	const RageColor &diffuse, 
+	const RageColor &specular, 
+	const RageVector3 &dir )
 {
 	g_pd3dDevice->LightEnable( index, true );
 
diff --git a/stepmania/src/RageDisplay_D3D.h b/stepmania/src/RageDisplay_D3D.h
index 3833a9e6cb..85a8803cd9 100644
--- a/stepmania/src/RageDisplay_D3D.h
+++ b/stepmania/src/RageDisplay_D3D.h
@@ -53,20 +53,20 @@ public:
 	void SetBackfaceCull( bool b );
 	void SetAlphaTest( bool b );
 	void SetMaterial( 
-		float emissive[4],
-		float ambient[4],
-		float diffuse[4],
-		float specular[4],
+		const RageColor &emissive,
+		const RageColor &ambient,
+		const RageColor &diffuse,
+		const RageColor &specular,
 		float shininess
 		);
 	void SetLighting( bool b );
 	void SetLightOff( int index );
 	void SetLightDirectional( 
 		int index, 
-		RageColor ambient, 
-		RageColor diffuse, 
-		RageColor specular, 
-		RageVector3 dir );
+		const RageColor &ambient, 
+		const RageColor &diffuse, 
+		const RageColor &specular, 
+		const RageVector3 &dir );
 
 	void SetSphereEnironmentMapping( bool b );
 
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index e23d6b4f63..de1912fc96 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -1124,10 +1124,10 @@ void RageDisplay_OGL::SetTextureWrapping( bool b )
 }
 
 void RageDisplay_OGL::SetMaterial( 
-	float emissive[4],
-	float ambient[4],
-	float diffuse[4],
-	float specular[4],
+	const RageColor &emissive,
+	const RageColor &ambient,
+	const RageColor &diffuse,
+	const RageColor &specular,
 	float shininess
 	)
 {
@@ -1150,10 +1150,10 @@ void RageDisplay_OGL::SetLightOff( int index )
 }
 void RageDisplay_OGL::SetLightDirectional( 
 	int index, 
-	RageColor ambient, 
-	RageColor diffuse, 
-	RageColor specular, 
-	RageVector3 dir )
+	const RageColor &ambient, 
+	const RageColor &diffuse, 
+	const RageColor &specular, 
+	const RageVector3 &dir )
 {
 	// Light coordinates are transformed by the modelview matrix, but
 	// we are being passed in world-space coords.
diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h
index c41ebb3171..5754cd1914 100644
--- a/stepmania/src/RageDisplay_OGL.h
+++ b/stepmania/src/RageDisplay_OGL.h
@@ -39,20 +39,20 @@ public:
 	void SetBackfaceCull( bool b );
 	void SetAlphaTest( bool b );
 	void SetMaterial( 
-		float emissive[4],
-		float ambient[4],
-		float diffuse[4],
-		float specular[4],
+		const RageColor &emissive,
+		const RageColor &ambient,
+		const RageColor &diffuse,
+		const RageColor &specular,
 		float shininess
 		);
 	void SetLighting( bool b );
 	void SetLightOff( int index );
 	void SetLightDirectional( 
 		int index, 
-		RageColor ambient, 
-		RageColor diffuse, 
-		RageColor specular, 
-		RageVector3 dir );
+		const RageColor &ambient, 
+		const RageColor &diffuse, 
+		const RageColor &specular, 
+		const RageVector3 &dir );
 
 	void SetSphereEnironmentMapping( bool b );