diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index c450226d7f..37b9211a37 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -14,24 +14,9 @@
 #include "Foreach.h"
 #include "RageSoundManager.h"
 
-#define NUM_ICON_PARTS							THEME->GetMetricI(m_sName,"NumIconParts")
-#define NUM_PREVIEW_PARTS						THEME->GetMetricI(m_sName,"NumPreviewParts")
-#define NUM_CURSOR_PARTS						THEME->GetMetricI(m_sName,"NumCursorParts")
-#define SHARED_PREVIEW_AND_CURSOR				THEME->GetMetricB(m_sName,"SharedPreviewAndCursor")
-#define NUM_CHOICES_ON_PAGE_1					THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
 #define CURSOR_OFFSET_X_FROM_ICON( p, part )	THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1))
 #define CURSOR_OFFSET_Y_FROM_ICON( p, part )	THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1))
-#define PRE_SWITCH_PAGE_SECONDS					THEME->GetMetricF(m_sName,"PreSwitchPageSeconds")
-#define POST_SWITCH_PAGE_SECONDS				THEME->GetMetricF(m_sName,"PostSwitchPageSeconds")
-#define EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS		THEME->GetMetricF(m_sName,"ExtraSleepAfterTweenOffSeconds")
 #define OPTION_ORDER( dir )						THEME->GetMetric (m_sName,"OptionOrder"+CString(dir))
-#define WRAP_CURSOR								THEME->GetMetricB(m_sName,"WrapCursor")
-#define SHOW_SCROLLER							THEME->GetMetricB(m_sName,"ShowScroller")
-#define SCROLLER_SECONDS_PER_ITEM				THEME->GetMetricF(m_sName,"ScrollerSecondsPerItem")
-#define SCROLLER_NUM_ITEMS_TO_DRAW				THEME->GetMetricF(m_sName,"ScrollerNumItemsToDraw")
-#define SCROLLER_SPACING_X						THEME->GetMetricF(m_sName,"ScrollerSpacingX")
-#define SCROLLER_SPACING_Y						THEME->GetMetricF(m_sName,"ScrollerSpacingY")
-#define DEFAULT_CHOICE							THEME->GetMetric (m_sName,"DefaultChoice")
 
 /* OptionOrderLeft=0:1,1:2,2:3,3:4 */
 const char *ScreenSelectMaster::dirs[NUM_DIRS] =
@@ -42,7 +27,22 @@ const char *ScreenSelectMaster::dirs[NUM_DIRS] =
 const ScreenMessage SM_PlayPostSwitchPage = (ScreenMessage)(SM_User+1);
 
 REGISTER_SCREEN_CLASS( ScreenSelectMaster );
-ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName )
+ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ),
+	NUM_ICON_PARTS(m_sName,"NumIconParts"),
+	NUM_PREVIEW_PARTS(m_sName,"NumPreviewParts"),
+	NUM_CURSOR_PARTS(m_sName,"NumCursorParts"),
+	SHARED_PREVIEW_AND_CURSOR(m_sName,"SharedPreviewAndCursor"),
+	NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"),
+	PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
+	POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
+	EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"ExtraSleepAfterTweenOffSeconds"),
+	WRAP_CURSOR(m_sName,"WrapCursor"),
+	SHOW_SCROLLER(m_sName,"ShowScroller"),
+	SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
+	SCROLLER_NUM_ITEMS_TO_DRAW(m_sName,"ScrollerNumItemsToDraw"),
+	SCROLLER_SPACING_X(m_sName,"ScrollerSpacingX"),
+	SCROLLER_SPACING_Y(m_sName,"ScrollerSpacingY"),
+	DEFAULT_CHOICE(m_sName,"DefaultChoice")
 {
 
 	// TODO: Move default choice to ScreenSelect
@@ -50,7 +50,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
 	for( unsigned c=0; c<m_aGameCommands.size(); c++ )
 	{
 		const GameCommand& mc = m_aGameCommands[c];
-		if( mc.m_sName == DEFAULT_CHOICE )
+		if( mc.m_sName == (CString) DEFAULT_CHOICE )
 		{
 			iDefaultChoice = c;
 			break;
diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h
index fb5a7b092f..7a35805069 100644
--- a/stepmania/src/ScreenSelectMaster.h
+++ b/stepmania/src/ScreenSelectMaster.h
@@ -33,6 +33,25 @@ protected:
 	Page GetPage( int iChoiceIndex ) const;
 	Page GetCurrentPage() const;
 
+	ThemeMetric<int> NUM_ICON_PARTS;
+	ThemeMetric<int> NUM_PREVIEW_PARTS;
+	ThemeMetric<int> NUM_CURSOR_PARTS;
+	ThemeMetric<bool> SHARED_PREVIEW_AND_CURSOR;
+	ThemeMetric<int> NUM_CHOICES_ON_PAGE_1;
+	//ThemeMetric<float> CURSOR_OFFSET_X_FROM_ICON( p, part )    THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1))
+	//ThemeMetric<float> CURSOR_OFFSET_Y_FROM_ICON( p, part )    THEME->GetMetricF(m_sName,ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1))
+	ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS;
+	ThemeMetric<float> POST_SWITCH_PAGE_SECONDS;
+	ThemeMetric<float> EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS;
+	//OPTION_ORDER( dir )                                             THEME->GetMetric (m_sName,"OptionOrder"+CString(dir))
+	ThemeMetric<bool> WRAP_CURSOR;
+	ThemeMetric<bool> SHOW_SCROLLER;
+	ThemeMetric<float> SCROLLER_SECONDS_PER_ITEM;
+	ThemeMetric<float> SCROLLER_NUM_ITEMS_TO_DRAW;
+	ThemeMetric<float> SCROLLER_SPACING_X;
+	ThemeMetric<float> SCROLLER_SPACING_Y;
+	ThemeMetric<CString> DEFAULT_CHOICE;
+
 	enum Dirs
 	{
 		DIR_UP,