diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index 303527eb20..895b1f1d13 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -28,7 +28,7 @@ BPMDisplay::BPMDisplay()
 void BPMDisplay::Load()
 {
 	m_textBPM.SetName( "Text" );
-	m_textBPM.LoadFromFont( THEME->GetPathToN(m_sName) );
+	m_textBPM.LoadFromFont( THEME->GetPathToF(m_sName) );
 	SET_XY_AND_ON_COMMAND( m_textBPM );
 	m_textBPM.SetDiffuse( NORMAL_COLOR );
 	this->AddChild( &m_textBPM );
diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index cf1635ac8c..34e014aff7 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -56,7 +56,7 @@ Combo::Combo()
 	m_sprCombo.SetDiffuse( RageColor(1,1,1,0) );	// invisible
 	this->AddChild( &m_sprCombo );
 
-	m_textComboNumber.LoadFromFont( THEME->GetPathToN("Combo") );
+	m_textComboNumber.LoadFromFont( THEME->GetPathToF("Combo") );
 	m_textComboNumber.SetShadowLength( 4 );
 	m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y );
 	m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp
index 3f4463e803..bfbde68a47 100644
--- a/stepmania/src/DifficultyMeter.cpp
+++ b/stepmania/src/DifficultyMeter.cpp
@@ -79,7 +79,7 @@ void DifficultyMeter::Load()
 	if( SHOW_METER )
 	{
 		m_textMeter.SetName( "Meter" );
-		m_textMeter.LoadFromFont( THEME->GetPathN(m_sName,"meter") );
+		m_textMeter.LoadFromFont( THEME->GetPathF(m_sName,"meter") );
 		SET_XY_AND_ON_COMMAND( m_textMeter );
 		this->AddChild( &m_textMeter );
 	}
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 48a46c28e0..4c30d3dee8 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -320,7 +320,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
 		{
 			const AutoJoyMapping& mapping = g_AutoJoyMappings[j];
 
-			if( pGameDef != GAMESTATE->GetGameDefFromString(mapping.szGame) )
+			if( pGameDef != GAMEMAN->StringToGameType(mapping.szGame) )
 				continue;	// games don't match
 
 			CString sDriverRegex = mapping.szDriverRegex;
diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp
index 3c2b606eb0..c4cf5a3337 100644
--- a/stepmania/src/LifeMeterBattery.cpp
+++ b/stepmania/src/LifeMeterBattery.cpp
@@ -40,7 +40,7 @@ void LifeMeterBattery::Load( PlayerNumber pn )
 	if( bPlayerEnabled )
 		this->AddChild( &m_sprBattery );
 
-	m_textNumLives.LoadFromFont( THEME->GetPathToN("LifeMeterBattery lives") );
+	m_textNumLives.LoadFromFont( THEME->GetPathToF("LifeMeterBattery lives") );
 	m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
 	m_textNumLives.SetShadowLength( 0 );
 	if( bPlayerEnabled )
diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index 9bb7ba7c0b..b3237cfc05 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -23,8 +23,8 @@ MenuTimer::MenuTimer()
 	m_fStallSecondsLeft = MAX_STALL_SECONDS;
 	m_bPaused = false;
 
-	m_textDigit1.LoadFromFont( THEME->GetPathToN("MenuTimer") );
-	m_textDigit2.LoadFromFont( THEME->GetPathToN("MenuTimer") );
+	m_textDigit1.LoadFromFont( THEME->GetPathToF("MenuTimer") );
+	m_textDigit2.LoadFromFont( THEME->GetPathToF("MenuTimer") );
 
 	const float fCharWidth = (float) m_textDigit1.m_pFont->GetLineWidthInSourcePixels(L"0");
 	m_textDigit1.SetX( -fCharWidth/2 );
diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index 8174906385..0b24117962 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -31,14 +31,14 @@ void PercentageDisplay::Load( PlayerNumber pn, StageStats* pSource, bool bAutoRe
 	else
 		m_textPercent.SetName( ssprintf("PercentP%i", pn+1) );
 
-	m_textPercent.LoadFromFont( THEME->GetPathN(m_sName,"text") );
+	m_textPercent.LoadFromFont( THEME->GetPathF(m_sName,"text") );
 	SET_XY_AND_ON_COMMAND( m_textPercent );
 	this->AddChild( &m_textPercent );
 
 	if( !PREFSMAN->m_bDancePointsForOni && PERCENT_USE_REMAINDER )
 	{
 		m_textPercentRemainder.SetName( ssprintf("PercentRemainderP%d",pn+1) );
-		m_textPercentRemainder.LoadFromFont( THEME->GetPathToN(m_sName + " remainder") );
+		m_textPercentRemainder.LoadFromFont( THEME->GetPathF(m_sName,"remainder") );
 		SET_XY_AND_ON_COMMAND( m_textPercentRemainder );
 		m_textPercentRemainder.SetText( "456" );
 		this->AddChild( &m_textPercentRemainder );
diff --git a/stepmania/src/ProTimingDisplay.cpp b/stepmania/src/ProTimingDisplay.cpp
index bb3fc51663..c1efd8d5f5 100644
--- a/stepmania/src/ProTimingDisplay.cpp
+++ b/stepmania/src/ProTimingDisplay.cpp
@@ -14,7 +14,7 @@ static CachedThemeMetric	HIT_MINE_COMMAND	("ProTimingDisplay","HitMineCommand");
 
 ProTimingDisplay::ProTimingDisplay()
 {
-	m_Judgment.LoadFromFont( THEME->GetPathToN("ProTimingDisplay Judgment") );
+	m_Judgment.LoadFromFont( THEME->GetPathF("ProTimingDisplay","Judgment") );
 	m_Judgment.SetName( "Judgment" );
 	this->AddChild( &m_Judgment );
 
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index 199bcc3b63..818cec4ea1 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -19,7 +19,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
 	this->AddChild( &m_sprFrame );
 
 	// init the text
-	m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayNormal") );
+	m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayNormal") );
 	m_text.SetShadowLength( 0 );
 
 	m_iScore = 0;
diff --git a/stepmania/src/ScoreDisplayOni.cpp b/stepmania/src/ScoreDisplayOni.cpp
index bd24eec58e..b3b43862de 100644
--- a/stepmania/src/ScoreDisplayOni.cpp
+++ b/stepmania/src/ScoreDisplayOni.cpp
@@ -17,7 +17,7 @@ ScoreDisplayOni::ScoreDisplayOni()
 	this->AddChild( &m_sprFrame );
 
 	// init the text
-	m_text.LoadFromFont( THEME->GetPathToN("ScoreDisplayOni") );
+	m_text.LoadFromFont( THEME->GetPathToF("ScoreDisplayOni") );
 	m_text.SetShadowLength( 0 );
 	this->AddChild( &m_text );
 }
diff --git a/stepmania/src/ScoreDisplayRave.cpp b/stepmania/src/ScoreDisplayRave.cpp
index d68546acb1..0ba63400a0 100644
--- a/stepmania/src/ScoreDisplayRave.cpp
+++ b/stepmania/src/ScoreDisplayRave.cpp
@@ -28,7 +28,7 @@ ScoreDisplayRave::ScoreDisplayRave()
 
 	this->AddChild( &m_sprFrameOverlay );
 
-	m_textLevel.LoadFromFont( THEME->GetPathToN("ScoreDisplayRave level") );
+	m_textLevel.LoadFromFont( THEME->GetPathF("ScoreDisplayRave","level") );
 	m_textLevel.SetText( "1" );
 	m_textLevel.SetShadowLength( 0 );
 	this->AddChild( &m_textLevel );
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 39f9e98a08..0af11a9a00 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -568,7 +568,7 @@ void ScreenEvaluation::Init()
 			SET_XY_AND_ON_COMMAND( m_sprSurvivedFrame[p] );
 			this->AddChild( m_sprSurvivedFrame[p] );
 
-			m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation stage") );
+			m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","stage") );
 			m_textSurvivedNumber[p].SetShadowLength( 0 );
 			// curewater: edited the "# stages cleared" text so it deducts one if you failed.
 			// Should be accurate, but I'm not sure if its "standard" that (bool)true = 1.  (assumption)
@@ -621,7 +621,7 @@ void ScreenEvaluation::Init()
 
 			FOREACH_EnabledPlayer( p )
 			{
-				m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation judge") );
+				m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","judge") );
 				m_textJudgeNumbers[l][p].SetShadowLength( 0 );
 				m_textJudgeNumbers[l][p].SetDiffuse( PlayerToColor(p) );
 				m_textJudgeNumbers[l][p].SetName( ssprintf("%sNumberP%d",JUDGE_STRING[l],p+1) );
@@ -693,7 +693,7 @@ void ScreenEvaluation::Init()
 
 		FOREACH_EnabledPlayer( p )
 		{
-			m_textScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation score") );
+			m_textScore[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","score") );
 			m_textScore[p].SetShadowLength( 0 );
 			m_textScore[p].SetDiffuse( PlayerToColor(p) );
 			m_textScore[p].SetName( ssprintf("ScoreNumberP%d",p+1) );
@@ -718,7 +718,7 @@ void ScreenEvaluation::Init()
 
 			//iTotalScore += stageStats.iScore[p];
 
-			m_textTotalScore[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation totalscore") );
+			m_textTotalScore[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","totalscore") );
 			m_textTotalScore[p].SetShadowLength( 0 );
 			m_textTotalScore[p].SetDiffuse( PlayerToColor(p) );
 			m_textTotalScore[p].SetName( ssprintf("TotalScoreNumberP%d",p+1) );
@@ -741,7 +741,7 @@ void ScreenEvaluation::Init()
 
 		FOREACH_EnabledPlayer( p )
 		{
-			m_textTime[p].LoadFromFont( THEME->GetPathToN("ScreenEvaluation time") );
+			m_textTime[p].LoadFromFont( THEME->GetPathF("ScreenEvaluation","time") );
 			m_textTime[p].SetShadowLength( 0 );
 			m_textTime[p].SetDiffuse( PlayerToColor(p) );
 			m_textTime[p].SetName( ssprintf("TimeNumberP%d",p+1) );
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 9365a479a2..3b63e558a8 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -439,7 +439,7 @@ void ScreenGameplay::Init()
 	this->AddChild( &m_meterSongPosition );
 
 
-	m_MaxCombo.LoadFromFont( THEME->GetPathN(m_sName,"max combo") );
+	m_MaxCombo.LoadFromFont( THEME->GetPathF(m_sName,"max combo") );
 	m_MaxCombo.SetName( "MaxCombo" );
 	SET_XY( m_MaxCombo );
 	m_MaxCombo.SetText( ssprintf("%d", g_CurStageStats.iMaxCombo[GAMESTATE->m_MasterPlayerNumber]) ); // TODO: Make this work for both players
@@ -506,7 +506,7 @@ void ScreenGameplay::Init()
 	
 	FOREACH_EnabledPlayer(p)
 	{
-		m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathN(m_sName,"song num") );
+		m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathF(m_sName,"song num") );
 		m_textCourseSongNumber[p].SetShadowLength( 0 );
 		m_textCourseSongNumber[p].SetName( ssprintf("SongNumberP%d",p+1) );
 		SET_XY( m_textCourseSongNumber[p] );
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 53530c3c9b..f9f4e2cbd1 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -106,7 +106,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuEleme
 	this->AddChild( &m_sprFrame );
 
 	m_textNumber.SetName( "Number" );
-	m_textNumber.LoadFromFont( THEME->GetPathToN("ScreenSelectGroup num songs") );
+	m_textNumber.LoadFromFont( THEME->GetPathF("ScreenSelectGroup","num songs") );
 	this->AddChild( &m_textNumber );
 	
 	m_sprContents.SetName( "Contents" );
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index ae627259ea..10c81c49dd 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -178,12 +178,12 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
 	this->AddChild( &m_textSongOptions );
 
 	m_textNumSongs.SetName( "NumSongs" );
-	m_textNumSongs.LoadFromFont( THEME->GetPathN(m_sName,"num songs") );
+	m_textNumSongs.LoadFromFont( THEME->GetPathF(m_sName,"num songs") );
 	SET_XY( m_textNumSongs );
 	this->AddChild( &m_textNumSongs );
 
 	m_textTotalTime.SetName( "TotalTime" );
-	m_textTotalTime.LoadFromFont( THEME->GetPathN(m_sName,"total time") );
+	m_textTotalTime.LoadFromFont( THEME->GetPathF(m_sName,"total time") );
 	SET_XY( m_textTotalTime );
 	this->AddChild( &m_textTotalTime );
 
@@ -259,7 +259,7 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme
 		this->AddChild( &m_sprHighScoreFrame[p] );
 
 		m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) );
-		m_textHighScore[p].LoadFromFont( THEME->GetPathN(m_sName,"score") );
+		m_textHighScore[p].LoadFromFont( THEME->GetPathF(m_sName,"score") );
 		m_textHighScore[p].SetShadowLength( 0 );
 		m_textHighScore[p].SetDiffuse( PlayerToColor(p) );
 		SET_XY( m_textHighScore[p] );