diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index 7bc8e44066..a0541e7079 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -171,7 +171,7 @@ static void Language( int &sel, bool ToSel, const ConfOption *pConfOption )
 		const CString sNewLanguage = choices[sel];
 		
 		if( THEME->GetCurLanguage() != sNewLanguage )
-			THEME->SwitchThemeAndLanguage( THEME->GetCurThemeName(), sNewLanguage );
+			THEME->SwitchThemeAndLanguage( THEME->GetCurThemeName(), sNewLanguage, PREFSMAN->m_bPseudoLocalize );
 	}
 }
 
@@ -206,7 +206,7 @@ static void Theme( int &sel, bool ToSel, const ConfOption *pConfOption )
 	} else {
 		const CString sNewTheme = choices[sel];
 		if( THEME->GetCurThemeName() != sNewTheme )
-			THEME->SwitchThemeAndLanguage( sNewTheme, THEME->GetCurLanguage() );
+			THEME->SwitchThemeAndLanguage( sNewTheme, THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
 	}
 }
 
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 037b139c4e..4dcf59d315 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -291,7 +291,7 @@ void StepMania::ResetGame()
 		CString sGameName = GAMESTATE->GetCurrentGame()->m_szName;
 		if( !THEME->DoesThemeExist(sGameName) )
 			sGameName = "default";
-		THEME->SwitchThemeAndLanguage( sGameName, THEME->GetCurLanguage() );
+		THEME->SwitchThemeAndLanguage( sGameName, THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
 		TEXTUREMAN->DoDelayedDelete();
 	}
 
@@ -793,8 +793,7 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame )
 
 	// it's OK to call these functions with names that don't exist.
 	ANNOUNCER->SwitchAnnouncer( sAnnouncer );
-	THEME->SwitchThemeAndLanguage( sTheme, PREFSMAN->m_sLanguage );
-	THEME->SetPseudoLocalilze( PREFSMAN->m_bPseudoLocalize );
+	THEME->SwitchThemeAndLanguage( sTheme, PREFSMAN->m_sLanguage, PREFSMAN->m_bPseudoLocalize );
 }
 
 
@@ -878,11 +877,6 @@ static void ApplyLogPreferences()
 	Checkpoints::LogCheckpoints( PREFSMAN->m_bLogCheckpoints );
 }
 
-static CString LocalizeString( const CString &sSection, const CString &s )
-{
-	return THEME->GetString( sSection, s );
-}
-
 static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." );
 
 #ifdef _XBOX
@@ -1024,9 +1018,6 @@ int main(int argc, char* argv[])
 		delete pIcon;
 	}
 
-	LocalizedString::RegisterLocalizer( LocalizeString );
-	LocalizedString::RefreshLocalizedStrings();
-
 
 	if( PREFSMAN->m_iSoundWriteAhead )
 		LOG->Info( "Sound writeahead has been overridden to %i", PREFSMAN->m_iSoundWriteAhead.Get() );