diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp
index ad874d1cb4..de9422906a 100644
--- a/stepmania/src/PercentageDisplay.cpp
+++ b/stepmania/src/PercentageDisplay.cpp
@@ -8,16 +8,22 @@
 #include "RageLog.h"
 #include "StageStats.h"
 
-#define DANCE_POINT_DIGITS			THEME->GetMetricI(m_sName,"DancePointsDigits")
-#define PERCENT_DECIMAL_PLACES		THEME->GetMetricI(m_sName,"PercentDecimalPlaces")
-#define PERCENT_TOTAL_SIZE			THEME->GetMetricI(m_sName,"PercentTotalSize")
-#define PERCENT_USE_REMAINDER		THEME->GetMetricB(m_sName,"PercentUseRemainder")
 
 PercentageDisplay::PercentageDisplay()
 {
 	m_pSource = NULL;
 }
 
+void PercentageDisplay::SetName( const CString &sName, const CString &sID )
+{
+	ActorFrame::SetName( sName, sID );
+
+	DANCE_POINT_DIGITS.Load( m_sName, "DancePointsDigits" );
+	PERCENT_DECIMAL_PLACES.Load( m_sName, "PercentDecimalPlaces" );
+	PERCENT_TOTAL_SIZE.Load( m_sName, "PercentTotalSize" );
+	PERCENT_USE_REMAINDER.Load( m_sName, "PercentUseRemainder" );
+}
+
 void PercentageDisplay::Load( PlayerNumber pn, PlayerStageStats* pSource, bool bAutoRefresh )
 {
 	ASSERT( m_sName != "" ); // set this!
@@ -73,7 +79,7 @@ void PercentageDisplay::Refresh()
 	CString sNumToDisplay;
 	if( PREFSMAN->m_bDancePointsForOni )
 	{
-		sNumToDisplay = ssprintf( "%*d", DANCE_POINT_DIGITS, max( 0, iActualDancePoints ) );
+		sNumToDisplay = ssprintf( "%*d", (int) DANCE_POINT_DIGITS, max( 0, iActualDancePoints ) );
 	}
 	else
 	{
@@ -96,7 +102,7 @@ void PercentageDisplay::Refresh()
 			float fTruncInterval = powf(0.1f, (float) PERCENT_TOTAL_SIZE);
 			fPercentDancePoints = ftruncf( fPercentDancePoints, fTruncInterval );
 			
-			sNumToDisplay = ssprintf( "%*.*f%%", PERCENT_TOTAL_SIZE, PERCENT_DECIMAL_PLACES, fPercentDancePoints*100 );
+			sNumToDisplay = ssprintf( "%*.*f%%", (int) PERCENT_TOTAL_SIZE, (int) PERCENT_DECIMAL_PLACES, fPercentDancePoints*100 );
 			
 			// HACK: Use the last frame in the numbers texture as '-'
 			sNumToDisplay.Replace('-','x');
diff --git a/stepmania/src/PercentageDisplay.h b/stepmania/src/PercentageDisplay.h
index c799245eb4..9357bca17c 100644
--- a/stepmania/src/PercentageDisplay.h
+++ b/stepmania/src/PercentageDisplay.h
@@ -5,6 +5,7 @@
 #include "PlayerNumber.h"
 #include "BitmapText.h"
 #include "StageStats.h"
+#include "ThemeMetric.h"
 
 class PercentageDisplay: public ActorFrame
 {
@@ -12,9 +13,15 @@ public:
 	PercentageDisplay();
 	void Load( PlayerNumber pn, PlayerStageStats *pSource, bool bAutoRefresh );
 	void Update( float fDeltaTime );
+	void SetName( const CString &sName, const CString &sID = "" );
 	void TweenOffScreen();
 
 private:
+	ThemeMetric<int> DANCE_POINT_DIGITS;
+	ThemeMetric<int> PERCENT_DECIMAL_PLACES;
+	ThemeMetric<int> PERCENT_TOTAL_SIZE;
+	ThemeMetric<bool> PERCENT_USE_REMAINDER;
+
 	void Refresh();
 	PlayerNumber m_PlayerNumber;
 	PlayerStageStats *m_pSource;