diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index 3a8acfe1fd..e2432f10db 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -41,8 +41,6 @@
 #define STAGES_Y			THEME->GetMetricF("ScreenSelectCourse","StagesY")
 #define TIME_X				THEME->GetMetricF("ScreenSelectCourse","TimeX")
 #define TIME_Y				THEME->GetMetricF("ScreenSelectCourse","TimeY")
-#define CONTENTS_X			THEME->GetMetricF("ScreenSelectCourse","ContentsX")
-#define CONTENTS_Y			THEME->GetMetricF("ScreenSelectCourse","ContentsY")
 #define WHEEL_X				THEME->GetMetricF("ScreenSelectCourse","WheelX")
 #define WHEEL_Y				THEME->GetMetricF("ScreenSelectCourse","WheelY")
 #define SCORE_X( p )		THEME->GetMetricF("ScreenSelectCourse",ssprintf("ScoreP%dX",p+1))
@@ -96,7 +94,8 @@ ScreenSelectCourse::ScreenSelectCourse( CString sClassName ) : Screen( sClassNam
 	m_textTime.SetXY( TIME_X, TIME_Y );
 	this->AddChild( &m_textTime );
 
-	m_CourseContentsFrame.SetXY( CONTENTS_X, CONTENTS_Y );
+	m_CourseContentsFrame.SetName( "Contents" );
+	SET_XY( m_CourseContentsFrame );
 	this->AddChild( &m_CourseContentsFrame );
 
 	m_MusicWheel.SetXY( WHEEL_X, WHEEL_Y );
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 3104e1aade..08546cb52b 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -52,8 +52,6 @@ const int NUM_SCORE_DIGITS	=	9;
 #define PREV_SCREEN( play_mode )			THEME->GetMetric ("ScreenSelectMusic","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
 #define NEXT_SCREEN( play_mode )			THEME->GetMetric ("ScreenSelectMusic","NextScreen"+Capitalize(PlayModeToString(play_mode)))
 #define NEXT_OPTIONS_SCREEN( play_mode )	THEME->GetMetric ("ScreenSelectMusic","NextOptionsScreen"+Capitalize(PlayModeToString(play_mode)))
-#define COURSE_CONTENTS_X					THEME->GetMetricF("ScreenSelectMusic","CourseContentsX")
-#define COURSE_CONTENTS_Y					THEME->GetMetricF("ScreenSelectMusic","CourseContentsY")
 #define SCORE_SORT_CHANGE_COMMAND(i) 		THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreP%iSortChangeCommand", i+1))
 #define SCORE_FRAME_SORT_CHANGE_COMMAND(i)	THEME->GetMetric ("ScreenSelectMusic",ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
 
@@ -182,7 +180,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
 	SET_XY( m_textSongOptions );
 	this->AddChild( &m_textSongOptions );
 
-	m_CourseContentsFrame.SetXY( COURSE_CONTENTS_X, COURSE_CONTENTS_Y );
+	m_CourseContentsFrame.SetName( "CourseContents" );
+	SET_XY( m_CourseContentsFrame );
 	this->AddChild( &m_CourseContentsFrame );
 
 	for( p=0; p<NUM_PLAYERS; p++ )