diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index eec75fe0c4..c5cc8bbf6b 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -858,7 +858,6 @@ void ScreenEvaluation::Init()
 	this->SortByDrawOrder();
 
 
-	SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
 	m_timerSoundSequences.SetZero(); // zero the sound sequence timer
 	m_timerSoundSequences.Touch(); // set the timer going :]
 
@@ -1290,7 +1289,7 @@ void ScreenEvaluation::Update( float fDeltaTime )
 
 void ScreenEvaluation::DrawPrimitives()
 {
-	Screen::DrawPrimitives();
+	ScreenWithMenuElements::DrawPrimitives();
 }
 
 void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
@@ -1338,7 +1337,7 @@ void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType t
 		}
 	}
 
-	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
+	ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
 void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index b073bf55ad..d43f1b735b 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -419,8 +419,6 @@ void ScreenNameEntryTraditional::Init()
 	m_soundChange.Load( THEME->GetPathS(m_sName,"change",true) );
 	m_soundInvalid.Load( THEME->GetPathS(m_sName,"invalid",true) );
 
-	SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
-
 	this->SortByDrawOrder();
 }
 
@@ -481,7 +479,7 @@ void ScreenNameEntryTraditional::Update( float fDelta )
 	if( m_bFirstUpdate )
 		SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("name entry") );
 
-	Screen::Update(fDelta);
+	ScreenWithMenuElements::Update(fDelta);
 }
 
 void ScreenNameEntryTraditional::DrawPrimitives()
@@ -489,7 +487,7 @@ void ScreenNameEntryTraditional::DrawPrimitives()
 	DISPLAY->CameraPushMatrix();
 	DISPLAY->LoadMenuPerspective( FOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
 
-	Screen::DrawPrimitives();
+	ScreenWithMenuElements::DrawPrimitives();
 	
 	DISPLAY->CameraPopMatrix();
 }
@@ -499,7 +497,7 @@ void ScreenNameEntryTraditional::Input( const DeviceInput& DeviceI, const InputE
 	if( IsTransitioning() )
 		return;
 
-	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
+	ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
 void ScreenNameEntryTraditional::ChangeDisplayedFeat()