diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 8dc0fd9fbf..ba5dd5f92c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -290,7 +290,7 @@ void ScreenGameplay::SaveSummary()
 		}
 
 		m_pCurSong = NULL;
-		for( int p=0; p<NUM_PLAYERS; p++ )
+		for( p=0; p<NUM_PLAYERS; p++ )
 			m_pCurNotes[p] = NULL;
 	}
 }
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 4211e24a77..1c6c913f62 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -128,8 +128,22 @@ ScreenTitleMenu::ScreenTitleMenu()
 	
 	m_Fade.SetClosed();
 	m_Fade.OpenWipingRight( SM_DoneOpening );
+
 	this->AddActor( &m_Fade );
 
+
+	// LEAVE THIS HERE! ITS ESSENTIAL
+	// I know you're a fan of removing my code, but if this isn't here
+	// the Ez2dancer announcer will be the default (as it loads in alphabetical order, and ez2dancer
+	// is the last announcer (E follows D))
+	// so just leave it yeah?
+	// I don't wanna fix this a 3rd TIME!!
+	// - Andy.
+	if (GAMEMAN->m_CurGame != GAME_EZ2)
+	{
+		ANNOUNCER->SwitchAnnouncer( "default" );
+	}
+
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_TITLE_MENU_GAME_NAME) );
 
 	m_soundChange.Load( THEME->GetPathTo(SOUND_TITLE_MENU_CHANGE) );	
@@ -142,8 +156,7 @@ ScreenTitleMenu::ScreenTitleMenu()
 
 	m_TitleMenuChoice = CHOICE_GAME_START;
 	GainFocus( m_TitleMenuChoice );
-
-
+	
 	MUSIC->Stop();
 
 	//this->SendScreenMessage( SM_TimeToFadeOut, 30.0 );
@@ -269,9 +282,9 @@ void ScreenTitleMenu::MenuStart( const PlayerNumber p )
 		}
 		return;
 	case CHOICE_SELECT_GAME:
-		m_soundInvalid.PlayRandom();
-	//	m_soundSelect.PlayRandom();
-	//	m_Fade.CloseWipingRight( SM_GoToSelectGame );
+	//	m_soundInvalid.PlayRandom();
+		m_soundSelect.PlayRandom();
+		m_Fade.CloseWipingRight( SM_GoToSelectGame );
 		return;
 	case CHOICE_MAP_INSTRUMENTS:
 		m_soundSelect.PlayRandom();
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 2b26ec78c4..1e398ebb8d 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -263,6 +263,13 @@ CString ThemeManager::GetPathTo( ThemeElement te )
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.jpg", asPossibleElementFilePaths, false, true );
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.bmp", asPossibleElementFilePaths, false, true );
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + "*.gif", asPossibleElementFilePaths, false, true );
+
+		// WHY Get rid of this when it's used?
+		// Just commment out if you REALLY don't want it?
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.sprite", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.png", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.jpg", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + "*.bmp", asPossibleElementFilePaths, false, true );
 	}
 	else if( -1 != sAssetPrefix.Find("Sounds\\") )
 	{
@@ -270,10 +277,17 @@ CString ThemeManager::GetPathTo( ThemeElement te )
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + ".mp3", asPossibleElementFilePaths, false, true );
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + ".ogg", asPossibleElementFilePaths, false, true );
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + ".wav", asPossibleElementFilePaths, false, true );
+
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + ".set", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + ".mp3", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + ".ogg", asPossibleElementFilePaths, false, true );
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + ".wav", asPossibleElementFilePaths, false, true );
 	}
 	else if( -1 != sAssetPrefix.Find("Fonts\\") )
 	{
 		GetDirListing( sCurrentThemeDir + sAssetPrefix + ".font", asPossibleElementFilePaths, false, true );
+
+		GetDirListing( sDefaultThemeDir + sAssetPrefix + ".font", asPossibleElementFilePaths, false, true );
 	}
 	else
 	{