diff --git a/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir
new file mode 100644
index 0000000000..353539dbf7
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow description.redir	
@@ -0,0 +1 @@
+_venacti bold 26
\ No newline at end of file
diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4 (stroke).png b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4 (stroke).png
new file mode 100644
index 0000000000..9d0b26d9dd
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4 (stroke).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png
index 23b4f22eb1..409e6e2226 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png and b/stepmania/Themes/default/Fonts/_terminator two 54 score [numbers] 4x4.png differ
diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay ScoreFrame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenGameplay ScoreFrame (doubleres).png
index 8ba7e713c0..a9c87d79f5 100644
Binary files a/stepmania/Themes/default/Graphics/ScreenGameplay ScoreFrame (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenGameplay ScoreFrame (doubleres).png differ
diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua
index 3c14b23387..5580aa72aa 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 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
+	if pn == PLAYER_1 then return color("1.0,0.5,0.2,1") end	-- orange
+	if pn == PLAYER_2 then return color("0.4,1.0,0.8,1") end	-- sea green
 	return color("1,1,1,1")
 end
 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1e0ee49a4a..2c38f89711 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -966,12 +966,12 @@ ScoreFrameX=SCREEN_CENTER_X
 ScoreFrameY=SCREEN_BOTTOM
 ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100
 ScoreFrameOffCommand=linear,0.5;addy,100
-ScoreP1X=SCREEN_CENTER_X-208
-ScoreP1Y=SCREEN_CENTER_Y+202
+ScoreP1X=SCREEN_CENTER_X-220
+ScoreP1Y=SCREEN_CENTER_Y+210
 ScoreP1OnCommand=addy,100;linear,1;addy,-100;draworder,109;
 ScoreP1OffCommand=linear,1;addy,100;
-ScoreP2X=SCREEN_CENTER_X+210
-ScoreP2Y=SCREEN_CENTER_Y+202
+ScoreP2X=SCREEN_CENTER_X+220
+ScoreP2Y=SCREEN_CENTER_Y+210
 ScoreP2OnCommand=addy,100;linear,1;addy,-100;draworder,109;
 ScoreP2OffCommand=linear,1;addy,100;
 SecondaryScoreP1X=SCREEN_CENTER_X-20
@@ -4416,6 +4416,7 @@ Fallback="StreamDisplay"
 [ScoreDisplayNormal]
 FrameX=0
 FrameY=0
-TextX=
-TextY=
-TextOnCommand=zoom,0.5
+TextX=0
+TextY=0
+TextOnCommand=zoom,0.5;shadowlength,0;
+TextInitCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end
\ No newline at end of file
diff --git a/stepmania/src/PlayerState.cpp b/stepmania/src/PlayerState.cpp
index 0bfed01485..0cdeb2f171 100644
--- a/stepmania/src/PlayerState.cpp
+++ b/stepmania/src/PlayerState.cpp
@@ -220,6 +220,7 @@ int PlayerState::GetSumOfActiveAttackLevels() const
 class LunaPlayerState: public Luna<PlayerState>
 {
 public:
+	DEFINE_METHOD( GetPlayerNumber, m_PlayerNumber );
 	static int SetPlayerOptions( T* p, lua_State *L )
 	{
 		ModsLevel m = Enum::Check<ModsLevel>( L, 1 );
@@ -238,6 +239,7 @@ public:
 
 	LunaPlayerState()
 	{
+		ADD_METHOD( GetPlayerNumber );
 		ADD_METHOD( SetPlayerOptions );
 		ADD_METHOD( GetPlayerOptions );
 	}
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index 9fd419aead..254e29b376 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -25,7 +25,6 @@ ScoreDisplayNormal::ScoreDisplayNormal()
 	// init the text
 	m_text.LoadFromFont( THEME->GetPathF("ScoreDisplayNormal","Text") );
 	m_text.SetName( "Text" );
-	m_text.SetShadowLength( 0 );
 	m_text.UpdateText();
 	ActorUtil::LoadAllCommandsAndSetXY( m_text, sType );
 	this->AddChild( &m_text );
@@ -35,10 +34,13 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag
 {
 	ScoreDisplay::Init( pPlayerState, pPlayerStageStats );
 
-	// TODO: Remove use of PlayerNumber.
-	//PlayerNumber pn = pPlayerState->m_PlayerNumber;
-	
-	//m_text.RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(pn) );
+	PlayerState* pPlayerState_ = const_cast<PlayerState*>(pPlayerState);
+	PlayerStageStats* pPlayerStageStats_ = const_cast<PlayerStageStats*>(pPlayerStageStats);
+
+	Message msg("Init");
+	msg.SetParam( "PlayerState", LuaReference::CreateFromPush(*pPlayerState_) );
+	msg.SetParam( "PlayerStageStats", LuaReference::CreateFromPush(*pPlayerStageStats_) );
+	this->HandleMessage( msg );
 }
 
 void ScoreDisplayNormal::SetScore( int iNewScore ) 
diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index 6db6f88a14..c9d76d7c0e 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -47,7 +47,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 &quot;$(intdir)\verstub.obj&quot;"
 				AdditionalDependencies="libjpeg/jpeg.lib libpng/lib/libpng.lib"
-				OutputFile="../../../cvs/piu/Program/StepMania-debug.exe"
+				OutputFile="../Program/StepMania-debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""