diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 68d13b9700..4ffa398efa 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -20,15 +20,16 @@
 #define UPDATE_ON_MESSAGE		THEME->GetMetric (m_sName,"UpdateOnMessage")
 
 ScreenSelect::ScreenSelect( CString sClassName ) : 
-	ScreenWithMenuElements(sClassName),
-	IDLE_COMMENT_SECONDS(m_sName,"IdleCommentSeconds"),
-	IDLE_TIMEOUT_SECONDS(m_sName,"IdleTimeoutSeconds"),
-	ALLOW_DISABLED_PLAYER_INPUT(m_sName,"AllowDisabledPlayerInput")
+	ScreenWithMenuElements(sClassName)
 {
 }
 
 void ScreenSelect::Init()
 {
+	IDLE_COMMENT_SECONDS.Load( m_sName, "IdleCommentSeconds" );
+	IDLE_TIMEOUT_SECONDS.Load( m_sName, "IdleTimeoutSeconds" );
+	ALLOW_DISABLED_PLAYER_INPUT.Load( m_sName, "AllowDisabledPlayerInput" );
+
 	ScreenWithMenuElements::Init();
 
 	//
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index c83e4f50a4..9cb1985398 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -29,11 +29,12 @@
 REGISTER_SCREEN_CLASS( ScreenSelectDifficulty );
 ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSelect( sClassName )
 {
-	m_CurrentPage = PAGE_1;
 }
 
 void ScreenSelectDifficulty::Init()
 {
+	m_CurrentPage = PAGE_1;
+
 	ScreenSelect::Init();
 
 	FOREACH_PlayerNumber( p )
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 77e6dcaacf..715e2b3296 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -22,33 +22,34 @@ CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dO
 CString OPTION_ORDER_NAME( size_t dir )							{ return "OptionOrder"+MenuDirToString((MenuDir)dir); }
 
 REGISTER_SCREEN_CLASS( ScreenSelectMaster );
-ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ),
-	SHOW_ICON(m_sName,"ShowIcon"),
-	SHOW_SCROLLER(m_sName,"ShowScroller"),
-	SHOW_CURSOR(m_sName,"ShowCursor"),
-	SHARED_SELECTION(m_sName,"SharedSelection"),
-	NUM_CHOICES_ON_PAGE_1(m_sName,"NumChoicesOnPage1"),
-	CURSOR_OFFSET_X_FROM_ICON(m_sName,CURSOR_OFFSET_X_FROM_ICON_NAME,NUM_PLAYERS),
-	CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS),
-	OVERRIDE_LOCK_INPUT_SECONDS(m_sName,"OverrideLockInputSeconds"),
-	LOCK_INPUT_SECONDS(m_sName,"LockInputSeconds"),
-	PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
-	POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
-	OPTION_ORDER(m_sName,OPTION_ORDER_NAME,NUM_MENU_DIRS),
-	WRAP_CURSOR(m_sName,"WrapCursor"),
-	WRAP_SCROLLER(m_sName,"WrapScroller"),
-	LOOP_SCROLLER(m_sName,"LoopScroller"),
-	ALLOW_REPEATING_INPUT(m_sName,"AllowRepeatingInput"),
-	SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
-	SCROLLER_NUM_ITEMS_TO_DRAW(m_sName,"ScrollerNumItemsToDraw"),
-	SCROLLER_TRANSFORM(m_sName,"ScrollerTransform"),
-	SCROLLER_SUBDIVISIONS(m_sName,"ScrollerSubdivisions"),
-	DEFAULT_CHOICE(m_sName,"DefaultChoice")
+ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName )
 {
 }
 
 void ScreenSelectMaster::Init()
 {
+	SHOW_ICON.Load( m_sName, "ShowIcon" );
+	SHOW_SCROLLER.Load( m_sName, "ShowScroller" );
+	SHOW_CURSOR.Load( m_sName, "ShowCursor" );
+	SHARED_SELECTION.Load( m_sName, "SharedSelection" );
+	NUM_CHOICES_ON_PAGE_1.Load( m_sName, "NumChoicesOnPage1" );
+	CURSOR_OFFSET_X_FROM_ICON.Load( m_sName, CURSOR_OFFSET_X_FROM_ICON_NAME, NUM_PLAYERS );
+	CURSOR_OFFSET_Y_FROM_ICON.Load( m_sName, CURSOR_OFFSET_Y_FROM_ICON_NAME, NUM_PLAYERS );
+	OVERRIDE_LOCK_INPUT_SECONDS.Load( m_sName, "OverrideLockInputSeconds" );
+	LOCK_INPUT_SECONDS.Load( m_sName, "LockInputSeconds" );
+	PRE_SWITCH_PAGE_SECONDS.Load( m_sName, "PreSwitchPageSeconds" );
+	POST_SWITCH_PAGE_SECONDS.Load( m_sName, "PostSwitchPageSeconds" );
+	OPTION_ORDER.Load( m_sName, OPTION_ORDER_NAME, NUM_MENU_DIRS );
+	WRAP_CURSOR.Load( m_sName, "WrapCursor" );
+	WRAP_SCROLLER.Load( m_sName, "WrapScroller" );
+	LOOP_SCROLLER.Load( m_sName, "LoopScroller" );
+	ALLOW_REPEATING_INPUT.Load( m_sName, "AllowRepeatingInput" );
+	SCROLLER_SECONDS_PER_ITEM.Load( m_sName, "ScrollerSecondsPerItem" );
+	SCROLLER_NUM_ITEMS_TO_DRAW.Load( m_sName, "ScrollerNumItemsToDraw" );
+	SCROLLER_TRANSFORM.Load( m_sName, "ScrollerTransform" );
+	SCROLLER_SUBDIVISIONS.Load( m_sName, "ScrollerSubdivisions" );
+	DEFAULT_CHOICE.Load( m_sName, "DefaultChoice" );
+
 	ScreenSelect::Init();
 
 	m_TrackingRepeatingInput.MakeInvalid();
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 80791a2b29..cd41907393 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -22,11 +22,12 @@
 REGISTER_SCREEN_CLASS( ScreenSelectStyle );
 ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClassName )
 {
-	LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
 }
 
 void ScreenSelectStyle::Init()
 {
+	LIGHTSMAN->SetLightsMode( LIGHTSMODE_MENU );
+
 	ScreenSelect::Init();
 
 	m_iSelection = 0;