diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index 6807526c40..7386743071 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -32,6 +32,18 @@ static const CString CabinetLightNames[NUM_CABINET_LIGHTS] = {
 };
 XToString( CabinetLight );
 
+static const CString LightsModeNames[NUM_LIGHTS_MODES] = {
+	"Attract",
+	"Joining",
+	"Menu",
+	"Demonstration",
+	"Gameplay",
+	"Stage",
+	"Cleared",
+	"Test",
+};
+XToString( LightsMode );
+
 
 LightsManager*	LIGHTSMAN = NULL;	// global and accessable from anywhere in our program
 
@@ -124,12 +136,11 @@ void LightsManager::Update( float fDeltaTime )
 		}
 		break;
 	case LIGHTSMODE_DEMONSTRATION:
-	case LIGHTSMODE_GAMEPLAY_READY:
-	case LIGHTSMODE_GAMEPLAY_GO:
+	case LIGHTSMODE_GAMEPLAY:
 		{
 			int i;
 
-			bool bMarqueeLightsOn = m_LightsMode == LIGHTSMODE_GAMEPLAY_READY;
+			bool bMarqueeLightsOn = GAMESTATE->m_bPastHereWeGo;
 
 			for( i=0; i<4; i++ )
 				m_LightsState.m_bCabinetLights[i] = bMarqueeLightsOn;
@@ -193,8 +204,7 @@ void LightsManager::Update( float fDeltaTime )
 			}
 		}
 		break;
-	case LIGHTSMODE_GAMEPLAY_READY:
-	case LIGHTSMODE_GAMEPLAY_GO:
+	case LIGHTSMODE_GAMEPLAY:
 		{
 			FOREACH_GameController( gc )
 			{
@@ -232,3 +242,8 @@ void LightsManager::SetLightsMode( LightsMode lm )
 {
 	m_LightsMode = lm;
 }
+
+LightsMode LightsManager::GetLightsMode()
+{
+	return m_LightsMode;
+}
diff --git a/stepmania/src/LightsManager.h b/stepmania/src/LightsManager.h
index 848dfeff77..40452e7462 100644
--- a/stepmania/src/LightsManager.h
+++ b/stepmania/src/LightsManager.h
@@ -36,12 +36,13 @@ enum LightsMode
 	LIGHTSMODE_JOINING,
 	LIGHTSMODE_MENU,
 	LIGHTSMODE_DEMONSTRATION,
-	LIGHTSMODE_GAMEPLAY_READY,
-	LIGHTSMODE_GAMEPLAY_GO,
+	LIGHTSMODE_GAMEPLAY,
 	LIGHTSMODE_STAGE,
 	LIGHTSMODE_ALL_CLEARED,
 	LIGHTSMODE_TEST,
+	NUM_LIGHTS_MODES
 };
+const CString& LightsModeToString( LightsMode lm );
 
 struct LightsState
 {
@@ -60,6 +61,7 @@ public:
 	void Update( float fDeltaTime );
 
 	void SetLightsMode( LightsMode lm );
+	LightsMode GetLightsMode();
 
 private:
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 952a1e0f6f..0494f285ab 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -101,7 +101,7 @@ void ScreenGameplay::Init()
 	if( m_bDemonstration )
 		LIGHTSMAN->SetLightsMode( LIGHTSMODE_DEMONSTRATION );
 	else
-		LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY_READY );
+		LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY );
 
 	m_soundMusic = NULL;
 
@@ -1392,10 +1392,6 @@ void ScreenGameplay::Update( float fDeltaTime )
 		if( s_fSecsLeftOnUpperLights < 0 )
 			s_fSecsLeftOnUpperLights = 0;
 	}
-	if( s_fSecsLeftOnUpperLights>0 )
-		LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY_READY );
-	else
-		LIGHTSMAN->SetLightsMode( LIGHTSMODE_GAMEPLAY_GO );
 
 	//
 	// update song position meter
diff --git a/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp b/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
index f3b7e3cabc..da72b64013 100644
--- a/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
+++ b/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
@@ -28,6 +28,8 @@ void LightsDriver_SystemMessage::Set( const LightsState *ls )
 {
 	CString s;
 	
+	s += LightsModeToString(LIGHTSMAN->GetLightsMode()) + "\n";
+
 	s += "Cabinet: ";
 	FOREACH_CabinetLight( cl )
 	{