diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp
index c4cf5a3337..49850e03e5 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->GetPathToF("LifeMeterBattery lives") );
+	m_textNumLives.LoadFromFont( THEME->GetPathF("LifeMeterBattery", "lives") );
 	m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
 	m_textNumLives.SetShadowLength( 0 );
 	if( bPlayerEnabled )
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 0af11a9a00..5f592e7c7e 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->GetPathF("ScreenEvaluation","stage") );
+			m_textSurvivedNumber[p].LoadFromFont( THEME->GetPathF(m_sName, "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->GetPathF("ScreenEvaluation","judge") );
+				m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathF(m_sName, "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->GetPathF("ScreenEvaluation","score") );
+			m_textScore[p].LoadFromFont( THEME->GetPathF(m_sName, "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->GetPathF("ScreenEvaluation","totalscore") );
+			m_textTotalScore[p].LoadFromFont( THEME->GetPathF(m_sName, "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->GetPathF("ScreenEvaluation","time") );
+			m_textTime[p].LoadFromFont( THEME->GetPathF(m_sName, "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/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index f9f4e2cbd1..32dee42b23 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->GetPathF("ScreenSelectGroup","num songs") );
+	m_textNumber.LoadFromFont( THEME->GetPathF(m_sName, "num songs") );
 	this->AddChild( &m_textNumber );
 	
 	m_sprContents.SetName( "Contents" );