diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 6f6c80f3f9..481963f1f0 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -32,7 +32,11 @@ PrefsManager::PrefsManager()
 	m_iRefreshRate = 0;
 	m_bIgnoreJoyAxes = false;
 	m_bOnlyDedicatedMenuButtons = false;
+#ifdef _DEBUG
+	m_bShowStats = true;
+#else
 	m_bShowStats = false;
+#endif
 	m_BackgroundMode = BGMODE_ANIMATIONS;
 	m_bShowDanger = true;
 	m_fBGBrightness = 0.8f;
@@ -130,16 +134,16 @@ void PrefsManager::ReadGamePrefsFromDisk()
 	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
 	IniFile ini;
 	ini.SetPath( sGameName + "Prefs.ini" );
-	if( !ini.ReadFile() )
-		return;		// could not read config file, load nothing
+	ini.ReadFile();	// it's OK if this fails
 
-	CString sAnnouncer, sTheme, sNoteSkin;
-
-	ini.GetValue( "Options", "Announcer",			sAnnouncer );
-	ini.GetValue( "Options", "Theme",				sTheme );
-	ini.GetValue( "Options", "NoteSkin",			sNoteSkin );
+	CString sAnnouncer = sGameName, sTheme = sGameName, sNoteSkin = sGameName;
 
+	// if these calls fail, the three strings will keep the initial values set above.
+	ini.GetValue( "Options", "Announcer",		sAnnouncer );
+	ini.GetValue( "Options", "Theme",			sTheme );
+	ini.GetValue( "Options", "NoteSkin",		sNoteSkin );
 
+	// it's OK to call these functions with names that don't exist.
 	ANNOUNCER->SwitchAnnouncer( sAnnouncer );
 	THEME->SwitchTheme( sTheme );
 	GAMEMAN->SwitchNoteSkin( sNoteSkin );
@@ -154,9 +158,9 @@ void PrefsManager::SaveGamePrefsToDisk()
 	IniFile ini;
 	ini.SetPath( sGameName + "Prefs.ini" );
 
-	ini.SetValue( "Options", "Announcer",			ANNOUNCER->GetCurAnnouncerName() );
-	ini.SetValue( "Options", "Theme",				THEME->GetCurThemeName() );
-	ini.SetValue( "Options", "NoteSkin",			GAMEMAN->GetCurNoteSkin() );
+	ini.SetValue( "Options", "Announcer",		ANNOUNCER->GetCurAnnouncerName() );
+	ini.SetValue( "Options", "Theme",			THEME->GetCurThemeName() );
+	ini.SetValue( "Options", "NoteSkin",		GAMEMAN->GetCurNoteSkin() );
 
 	ini.WriteFile();
 }
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 30e85c9d76..d92d0061bf 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -60,7 +60,7 @@ ScreenSelectStyle::ScreenSelectStyle()
 	for( int i=0; i<m_aPossibleStyles.GetSize(); i++ )
 	{
 		Style style = m_aPossibleStyles[i];
-		m_sprIcon[i].Load( THEME->GetPathTo("Graphics","select style icons") );
+		m_sprIcon[i].Load( THEME->GetPathTo("Graphics",ssprintf("select style icons game %d",GAMESTATE->m_CurGame) ) );
 		m_sprIcon[i].StopAnimating();
 		m_sprIcon[i].SetState( i );
 		m_sprIcon[i].SetXY( ICONS_START_X + i*ICONS_SPACING_X, ICONS_START_Y + i*ICONS_SPACING_Y );