diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index 6fd7a2690a..ffbac9fdb6 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -9,7 +9,7 @@
 
 const int MinComboSizeToShow = 5;
 
-void ComboGraph::Load( CString Path, const StageStats &s, PlayerNumber pn )
+void ComboGraph::Load( const CString& sScreen, const CString& sElement, const StageStats &s, PlayerNumber pn )
 {
 	ASSERT( m_SubActors.size() == 0 );
 
@@ -30,7 +30,7 @@ void ComboGraph::Load( CString Path, const StageStats &s, PlayerNumber pn )
 		LOG->Trace("combo %i is %f+%f", i, combo.fStartSecond, combo.fSizeSeconds);
 		Sprite *sprite = new Sprite;
 		sprite->SetName( "ComboBar" );
-		sprite->Load( THEME->GetPathG( Path, IsMax? "max":"normal" ) );
+		sprite->Load( THEME->GetPathG( sScreen, sElement + (IsMax? " max":" normal") ) );
 
 		const float start = SCALE( combo.fStartSecond, s.m_player[pn].fFirstSecond, s.m_player[pn].fLastSecond, 0.0f, 1.0f );
 		const float size = SCALE( combo.fSizeSeconds, 0, s.m_player[pn].fLastSecond-s.m_player[pn].fFirstSecond, 0.0f, 1.0f );
@@ -63,7 +63,7 @@ void ComboGraph::Load( CString Path, const StageStats &s, PlayerNumber pn )
 
 		BitmapText *text = new BitmapText;
 		text->SetName( "ComboMaxNumber" );
-		text->LoadFromFont( THEME->GetPathToF(Path) );
+		text->LoadFromFont( THEME->GetPathF(sScreen,sElement) );
 
 		const float start = SCALE( combo.fStartSecond, s.m_player[pn].fFirstSecond, s.m_player[pn].fLastSecond, 0.0f, 1.0f );
 		const float size = SCALE( combo.fSizeSeconds, 0, s.m_player[pn].fLastSecond-s.m_player[pn].fFirstSecond, 0.0f, 1.0f );
diff --git a/stepmania/src/ComboGraph.h b/stepmania/src/ComboGraph.h
index 9e68b81155..41ae3911ec 100644
--- a/stepmania/src/ComboGraph.h
+++ b/stepmania/src/ComboGraph.h
@@ -9,7 +9,7 @@ class ComboGraph: public ActorFrame
 {
 public:
 	~ComboGraph() { Unload(); }
-	void Load( CString Path, const StageStats &s, PlayerNumber pn );
+	void Load( const CString& sScreen, const CString& sElement, const StageStats &s, PlayerNumber pn );
 	void Unload();
 	void TweenOffScreen();
 
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index cdc944dc6f..bed475c8ae 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -451,7 +451,7 @@ void ScreenEvaluation::Init()
 		FOREACH_EnabledPlayer( p )
 		{
 			m_Combo[p].SetName( m_sName, ssprintf("ComboP%i",p+1) );
-			m_Combo[p].Load( ssprintf(m_sName+" combo p%i", p+1), stageStats, p );
+			m_Combo[p].Load( m_sName, ssprintf("combo p%i",p+1), stageStats, p );
 			SET_XY_AND_ON_COMMAND( m_Combo[p] );
 
 			this->AddChild( &m_Combo[p] );