diff --git a/stepmania/Utils/LineCounter.exe b/stepmania/Utils/LineCounter.exe
new file mode 100755
index 0000000000..f25ebae178
Binary files /dev/null and b/stepmania/Utils/LineCounter.exe differ
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 0c398bff20..b55985850e 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -356,14 +356,14 @@ ScreenGameplay::ScreenGameplay()
 
 	if( GAMESTATE->m_bDemonstration )
 	{
-		m_quadDemonstrationBox.SetDiffuse( D3DXCOLOR(0,0,0,0.7f) );
-		m_quadDemonstrationBox.StretchTo( CRect(SCREEN_LEFT, int(CENTER_Y-60), SCREEN_RIGHT, int(CENTER_Y+60)) );
-		this->AddChild( &m_quadDemonstrationBox );
+		m_sprDemonstrationOverlay.Load( THEME->GetPathTo("Graphics","gameplay demonstration overlay") );
+		m_sprDemonstrationOverlay.SetXY( CENTER_X, CENTER_Y );
+		this->AddChild( &m_sprDemonstrationOverlay );
 
-		m_sprDemonstration.Load( THEME->GetPathTo("Graphics","gameplay demonstration") );
-		m_sprDemonstration.SetXY( CENTER_X, CENTER_Y );
-		m_sprDemonstration.SetEffectBlinking();
-		this->AddChild( &m_sprDemonstration );
+		m_sprDemonstrationBlink.Load( THEME->GetPathTo("Graphics","gameplay demonstration blink") );
+		m_sprDemonstrationBlink.SetXY( CENTER_X, CENTER_Y );
+		m_sprDemonstrationBlink.SetEffectBlinking();
+		this->AddChild( &m_sprDemonstrationBlink );
 
 		m_Fade.OpenWipingRight();
 	}
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index 31f7506793..8dfb62894f 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -120,8 +120,8 @@ private:
 
 	Sprite				m_sprToasty;	// easter egg
 
-	Quad				m_quadDemonstrationBox;
-	Sprite				m_sprDemonstration;
+	Sprite				m_sprDemonstrationOverlay;
+	Sprite				m_sprDemonstrationBlink;
 
 	RandomSample	m_soundFail;
 	RandomSample	m_soundOniDie;