diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 4df5d689c1..7daeb6c58c 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -221,7 +221,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( CString sPath )
 			Sprite* pSprite = new Sprite;
 			m_SubActors.push_back( pSprite );
 			pSprite->Load( sPath );
-			pSprite->SetXY( CENTER_X, CENTER_Y );
+			pSprite->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 		}
 		break;
 	case EFFECT_STRETCH_STILL:
@@ -572,7 +572,7 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer )
 				if( Stretch )
 					pActor->StretchTo( FullScreenRectF );
 				else
-					pActor->SetXY( CENTER_X, CENTER_Y );
+					pActor->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 			}
 		}
 		break;
@@ -691,8 +691,8 @@ void BGAnimationLayer::Update( float fDeltaTime )
 			float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM);
 			fRadius *= fRadius;
 			fRadius *= 200;
-			m_SubActors[i].SetX( CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
-			m_SubActors[i].SetY( CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
+			m_SubActors[i].SetX( SCREEN_CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
+			m_SubActors[i].SetY( SCREEN_CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
 		}
 		break;
 	case EFFECT_PARTICLES_SPIRAL_IN:
@@ -707,8 +707,8 @@ void BGAnimationLayer::Update( float fDeltaTime )
 			float fRadius = (m_SubActors[i].GetZoom()-SPIRAL_MIN_ZOOM);
 			fRadius *= fRadius;
 			fRadius *= 200;
-			m_SubActors[i].SetX( CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
-			m_SubActors[i].SetY( CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
+			m_SubActors[i].SetX( SCREEN_CENTER_X + cosf(m_SubActors[i].GetRotationZ())*fRadius );
+			m_SubActors[i].SetY( SCREEN_CENTER_Y + sinf(m_SubActors[i].GetRotationZ())*fRadius );
 		}
 		break;
 */
@@ -947,7 +947,7 @@ void BGAnimationLayer::DrawPrimitives()
 	if( m_fFOV != -1 )
 	{
 		DISPLAY->CameraPushMatrix();
-		DISPLAY->LoadMenuPerspective( m_fFOV, CENTER_X, CENTER_Y );
+		DISPLAY->LoadMenuPerspective( m_fFOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	}
 
 	if( m_bLighting )
diff --git a/stepmania/src/BeginnerHelper.cpp b/stepmania/src/BeginnerHelper.cpp
index 4623f2d7e3..8516355f12 100644
--- a/stepmania/src/BeginnerHelper.cpp
+++ b/stepmania/src/BeginnerHelper.cpp
@@ -140,9 +140,9 @@ bool BeginnerHelper::Initialize( int iDancePadType )
 	{
 		m_sBackground.Load( THEME->GetPathToG("BeginnerHelper background") );
 		this->AddChild(&m_sBackground);
-		m_sBackground.SetXY(CENTER_X, CENTER_Y);
+		m_sBackground.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
 		m_sFlash.Load(THEME->GetPathToG("BeginnerHelper flash"));
-		m_sFlash.SetXY(CENTER_X, CENTER_Y);
+		m_sFlash.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
 		m_sFlash.SetDiffuseAlpha(0);
 	}
 	
diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaHelpers.cpp
index 35a8150be8..772548252f 100644
--- a/stepmania/src/LuaHelpers.cpp
+++ b/stepmania/src/LuaHelpers.cpp
@@ -178,9 +178,9 @@ void Lua::UpdateGlobals()
 	lua_setglobal( L, "SCREEN_TOP" );
 	lua_pushnumber( L, SCREEN_BOTTOM );
 	lua_setglobal( L, "SCREEN_BOTTOM" );
-	lua_pushnumber( L, CENTER_X );
+	lua_pushnumber( L, SCREEN_CENTER_X );
 	lua_setglobal( L, "SCREEN_CENTER_X" );
-	lua_pushnumber( L, CENTER_Y );
+	lua_pushnumber( L, SCREEN_CENTER_Y );
 	lua_setglobal( L, "SCREEN_CENTER_Y" );
 }
 
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 63e1f13e6a..261b11528b 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -828,8 +828,8 @@ void MusicWheel::DrawPrimitives()
 
 		// construct view and project matrix
 //		RageVector3 Up( 0.0f, 1.0f, 0.0f );
-//		RageVector3 Eye( CENTER_X, CENTER_Y, 550 );
-//		RageVector3 At( CENTER_X, CENTER_Y, 0 );
+//		RageVector3 Eye( SCREEN_CENTER_X, SCREEN_CENTER_Y, 550 );
+//		RageVector3 At( SCREEN_CENTER_X, SCREEN_CENTER_Y, 0 );
 
 //		DISPLAY->LookAt(Eye, At, Up);
 	}
diff --git a/stepmania/src/NoteFieldPositioning.cpp b/stepmania/src/NoteFieldPositioning.cpp
index 8c59601620..54e7b3c14d 100644
--- a/stepmania/src/NoteFieldPositioning.cpp
+++ b/stepmania/src/NoteFieldPositioning.cpp
@@ -31,7 +31,7 @@ void NoteFieldMode::BeginDrawTrack(int tn)
 	 * for a transformation.  However, this is a big waste of matrix
 	 * stack space, as each of these will push.  Profile this. XXX */
 	if(m_fFov) 
-		DISPLAY->LoadMenuPerspective(m_fFov, CENTER_X, CENTER_Y);
+		DISPLAY->LoadMenuPerspective(m_fFov, SCREEN_CENTER_X, SCREEN_CENTER_Y);
 	
 	if(tn != -1)
 	{
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index c2f5b3eb12..d33b4a138c 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -540,7 +540,7 @@ void PlayerMinus::DrawPrimitives()
 	float fCenterY = (GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2;
 //	float fHeight = GRAY_ARROWS_Y_REVERSE-GRAY_ARROWS_Y_STANDARD;
 
-	DISPLAY->LoadMenuPerspective( 45, SCALE(fSkew,0.f,1.f,this->GetX(),CENTER_X), fCenterY );
+	DISPLAY->LoadMenuPerspective( 45, SCALE(fSkew,0.f,1.f,this->GetX(),SCREEN_CENTER_X), fCenterY );
 
 	float fOriginalY = 	m_pNoteField->GetY();
 
diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index 2abd3a1ba7..156ce400d8 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -188,7 +188,7 @@ void RageDisplay::SetDefaultRenderStates()
 	SetAlphaTest( true );
 	SetBlendMode( BLEND_NORMAL );
 	SetTextureFiltering( true );
-	LoadMenuPerspective(0, CENTER_X, CENTER_Y);	// 0 FOV = ortho
+	LoadMenuPerspective(0, SCREEN_CENTER_X, SCREEN_CENTER_Y);	// 0 FOV = ortho
 	ChangeCentering(0,0,0,0);
 }
 
@@ -454,8 +454,8 @@ void RageDisplay::LoadMenuPerspective( float fovDegrees, float fVanishPointX, fl
 		fVanishPointX = SCALE( fVanishPointX, SCREEN_LEFT, SCREEN_RIGHT, SCREEN_RIGHT, SCREEN_LEFT );
 		fVanishPointY = SCALE( fVanishPointY, SCREEN_TOP, SCREEN_BOTTOM, SCREEN_BOTTOM, SCREEN_TOP );
 
-		fVanishPointX -= CENTER_X;
-		fVanishPointY -= CENTER_Y;
+		fVanishPointX -= SCREEN_CENTER_X;
+		fVanishPointY -= SCREEN_CENTER_Y;
 
 
 		/* It's the caller's responsibility to push first. */
@@ -470,8 +470,8 @@ void RageDisplay::LoadMenuPerspective( float fovDegrees, float fVanishPointX, fl
 
 		g_ViewStack.LoadMatrix( 
 			RageLookAt(
-				-fVanishPointX+CENTER_X, -fVanishPointY+CENTER_Y, fDistCameraFromImage,
-				-fVanishPointX+CENTER_X, -fVanishPointY+CENTER_Y, 0,
+				-fVanishPointX+SCREEN_CENTER_X, -fVanishPointY+SCREEN_CENTER_Y, fDistCameraFromImage,
+				-fVanishPointX+SCREEN_CENTER_X, -fVanishPointY+SCREEN_CENTER_Y, 0,
 				0.0f, 1.0f, 0.0f) );
 	}
 }
diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp
index 8f31751d12..05f927e882 100644
--- a/stepmania/src/ScreenBookkeeping.cpp
+++ b/stepmania/src/ScreenBookkeeping.cpp
@@ -21,7 +21,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme
 	
 	m_textTitle.LoadFromFont( THEME->GetPathToF("Common title") );
 	m_textTitle.SetText( "header" );
-	m_textTitle.SetXY( CENTER_X, 60 );
+	m_textTitle.SetXY( SCREEN_CENTER_X, 60 );
 	m_textTitle.SetDiffuse( RageColor(1,1,1,1) );
 	m_textTitle.SetZoom( 0.8f );
 	this->AddChild( &m_textTitle );
@@ -29,7 +29,7 @@ ScreenBookkeeping::ScreenBookkeeping( CString sClassName ) : ScreenWithMenuEleme
 	for( int i=0; i<NUM_BOOKKEEPING_COLS; i++ )
 	{
 		float fX = SCALE( i, 0.f, NUM_BOOKKEEPING_COLS-1, SCREEN_LEFT+50, SCREEN_RIGHT-160 );
-		float fY = CENTER_Y+16;
+		float fY = SCREEN_CENTER_Y+16;
 		m_textCols[i].LoadFromFont( THEME->GetPathToF("Common normal") );
 		m_textCols[i].SetText( ssprintf("%d",i) );
 		m_textCols[i].SetXY( fX, fY );
diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp
index 3d8e1e1710..48d20dca39 100644
--- a/stepmania/src/ScreenCenterImage.cpp
+++ b/stepmania/src/ScreenCenterImage.cpp
@@ -25,7 +25,7 @@ ScreenCenterImage::ScreenCenterImage( CString sClassName ) : ScreenWithMenuEleme
 	
 	m_textInstructions.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textInstructions.SetText( "" );
-	m_textInstructions.SetXY( CENTER_X, CENTER_Y );
+	m_textInstructions.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	m_textInstructions.SetDiffuse( RageColor(0,1,0,0) );
 	m_textInstructions.SetZoom( 0.8f );
 	this->AddChild( &m_textInstructions );
diff --git a/stepmania/src/ScreenDimensions.h b/stepmania/src/ScreenDimensions.h
index 9b28719851..90a7d4eb73 100644
--- a/stepmania/src/ScreenDimensions.h
+++ b/stepmania/src/ScreenDimensions.h
@@ -13,8 +13,8 @@ extern ThemeMetric<float> SCREEN_HEIGHT;
 #define		SCREEN_TOP		(0)
 #define		SCREEN_BOTTOM	(SCREEN_HEIGHT)
 
-#define		CENTER_X		(SCREEN_LEFT + (SCREEN_RIGHT - SCREEN_LEFT)/2.0f)
-#define		CENTER_Y		(SCREEN_TOP + (SCREEN_BOTTOM - SCREEN_TOP)/2.0f)
+#define		SCREEN_CENTER_X		(SCREEN_LEFT + (SCREEN_RIGHT - SCREEN_LEFT)/2.0f)
+#define		SCREEN_CENTER_Y		(SCREEN_TOP + (SCREEN_BOTTOM - SCREEN_TOP)/2.0f)
 
 #define	SCREEN_NEAR		(-1000)
 #define	SCREEN_FAR		(1000)
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 5c9d671aa8..2d8b1b7cb6 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -34,40 +34,40 @@ const float RECORD_HOLD_SECONDS = 0.3f;
 //
 
 #define DEBUG_X			(SCREEN_LEFT + 10)
-#define DEBUG_Y			(CENTER_Y-100)
+#define DEBUG_Y			(SCREEN_CENTER_Y-100)
 
-#define SHORTCUTS_X		(CENTER_X - 150)
-#define SHORTCUTS_Y		(CENTER_Y)
+#define SHORTCUTS_X		(SCREEN_CENTER_X - 150)
+#define SHORTCUTS_Y		(SCREEN_CENTER_Y)
 
 #define HELP_X			(SCREEN_LEFT)
-#define HELP_Y			(CENTER_Y)
+#define HELP_Y			(SCREEN_CENTER_Y)
 
 #define HELP_TEXT_X		(SCREEN_LEFT + 4)
 #define HELP_TEXT_Y		(40)
 
 #define INFO_X			(SCREEN_RIGHT)
-#define INFO_Y			(CENTER_Y)
+#define INFO_Y			(SCREEN_CENTER_Y)
 
 #define INFO_TEXT_X		(SCREEN_RIGHT - 114)
 #define INFO_TEXT_Y		(40)
 
 #define MENU_WIDTH		(110)
-#define EDIT_X			(CENTER_X)
+#define EDIT_X			(SCREEN_CENTER_X)
 #define EDIT_GRAY_Y_STANDARD	(SCREEN_TOP+60)
 #define EDIT_GRAY_Y_REVERSE		(SCREEN_BOTTOM-60)
 
-#define PLAYER_X			(CENTER_X)
-#define PLAYER_Y			(CENTER_Y)
+#define PLAYER_X			(SCREEN_CENTER_X)
+#define PLAYER_Y			(SCREEN_CENTER_Y)
 #define PLAYER_HEIGHT		(360)
 #define PLAYER_Y_STANDARD	(PLAYER_Y-PLAYER_HEIGHT/2)
 #define PLAYER_Y_REVERSE	(PLAYER_Y+PLAYER_HEIGHT/2)
 
 
-#define ACTION_MENU_ITEM_X			(CENTER_X-200)
+#define ACTION_MENU_ITEM_X			(SCREEN_CENTER_X-200)
 #define ACTION_MENU_ITEM_START_Y	(SCREEN_TOP + 24)
 #define ACTION_MENU_ITEM_SPACING_Y	(18)
 
-#define NAMING_MENU_ITEM_X			(CENTER_X-200)
+#define NAMING_MENU_ITEM_X			(SCREEN_CENTER_X-200)
 #define NAMING_MENU_ITEM_START_Y	(SCREEN_TOP + 24)
 #define NAMING_MENU_ITEM_SPACING_Y	(18)
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 3fc98742bc..246973e6be 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -113,7 +113,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem
 
 		#ifdef DEBUG
 		m_debugtext.LoadFromFont( THEME->GetPathToF("small titles") );
-		m_debugtext.SetXY( CENTER_X, CENTER_Y );
+		m_debugtext.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 		this->AddChild(&m_debugtext);
 		#endif
 
@@ -199,14 +199,14 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElem
 
 		m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenEz2SelectMusic options message") );
 		m_sprOptionsMessage.StopAnimating();
-		m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
+		m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 		m_sprOptionsMessage.SetZoom( 1 );
 		m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
 		this->AddChild( &m_sprOptionsMessage );
 
 		if(USE_MODE_SWITCHER == 1)
 		{
-			m_ModeSwitcher.SetXY(CENTER_X,CENTER_Y);
+			m_ModeSwitcher.SetXY(SCREEN_CENTER_X,SCREEN_CENTER_Y);
 			this->AddChild( &m_ModeSwitcher );
 		}
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 6614b4c012..15038c3414 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1059,8 +1059,8 @@ void ScreenGameplay::LoadNextSong()
 	{
 		m_Background.Unload();	// BeginnerHelper has its own BG control.
 		m_Background.StopAnimating();
-		m_BeginnerHelper.SetX( CENTER_X );
-		m_BeginnerHelper.SetY( CENTER_Y );
+		m_BeginnerHelper.SetX( SCREEN_CENTER_X );
+		m_BeginnerHelper.SetY( SCREEN_CENTER_Y );
 	}
 	else
 	{
@@ -2485,7 +2485,7 @@ void ScreenGameplay::ShowOniGameOver( PlayerNumber pn )
 {
 	m_sprOniGameOver[pn].SetDiffuse( RageColor(1,1,1,1) );
 	m_sprOniGameOver[pn].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
-	m_sprOniGameOver[pn].SetY( CENTER_Y );
+	m_sprOniGameOver[pn].SetY( SCREEN_CENTER_Y );
 	m_sprOniGameOver[pn].SetEffectBob( 4, RageVector3(0,6,0) );
 }
 
diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp
index 1adfb8a2f2..3ea7a68b63 100644
--- a/stepmania/src/ScreenInstructions.cpp
+++ b/stepmania/src/ScreenInstructions.cpp
@@ -40,13 +40,13 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements
 		RageException::Throw( "The PlayMode has not been set.  A theme must set the PlayMode before showing ScreenInstructions." );
 
 	m_sprHowToPlay.Load( THEME->GetPathG(m_sName,PlayModeToString(GAMESTATE->m_PlayMode)) );
-	m_sprHowToPlay.SetXY( CENTER_X, CENTER_Y );
+	m_sprHowToPlay.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	this->AddChild( &m_sprHowToPlay );
 
 	m_sprHowToPlay.SetX( SCREEN_LEFT-SCREEN_WIDTH );
 	m_sprHowToPlay.BeginTweening( 0.4f );		// sleep
 	m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_DECELERATE );
-	m_sprHowToPlay.SetX( CENTER_X );
+	m_sprHowToPlay.SetX( SCREEN_CENTER_X );
 
 	this->SortByDrawOrder();
 
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index c872be595c..eb2c68465a 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -51,14 +51,14 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
 		CString sSecondary = GAMESTATE->GetCurrentGame()->m_szSecondaryFunction[b];
 
 		m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") );
-		m_textName[b].SetXY( CENTER_X, -6 );
+		m_textName[b].SetXY( SCREEN_CENTER_X, -6 );
 		m_textName[b].SetText( sName );
 		m_textName[b].SetZoom( 0.7f );
 		m_textName[b].SetShadowLength( 2 );
 		m_Line[b].AddChild( &m_textName[b] );
 
 		m_textName2[b].LoadFromFont( THEME->GetPathToF("Common title") );
-		m_textName2[b].SetXY( CENTER_X, +6 );
+		m_textName2[b].SetXY( SCREEN_CENTER_X, +6 );
 		m_textName2[b].SetText( sSecondary );
 		m_textName2[b].SetZoom( 0.5f );
 		m_textName2[b].SetShadowLength( 2 );
@@ -83,7 +83,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
 
 	m_textError.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textError.SetText( "" );
-	m_textError.SetXY( CENTER_X, CENTER_Y );
+	m_textError.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	m_textError.SetDiffuse( RageColor(0,1,0,0) );
 	m_textError.SetZoom( 0.8f );
 	this->AddChild( &m_textError );
diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp
index 844fb9c329..92ea9d0ac3 100644
--- a/stepmania/src/ScreenMiniMenu.cpp
+++ b/stepmania/src/ScreenMiniMenu.cpp
@@ -46,7 +46,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
 
 	m_textTitle.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textTitle.SetText( m_Def.title );
-	m_textTitle.SetXY( CENTER_X, CENTER_Y - fHeightOfAll/2 - 30 );
+	m_textTitle.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y - fHeightOfAll/2 - 30 );
 	m_textTitle.SetZoom( 0.8f );
 	this->AddChild( &m_textTitle );
 
@@ -62,9 +62,9 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
 
 		float fY;
 		if( m_Def.rows.size() > 1 )
-			fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, CENTER_Y-fHeightOfAll/2, CENTER_Y+fHeightOfAll/2 );
+			fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, SCREEN_CENTER_Y-fHeightOfAll/2, SCREEN_CENTER_Y+fHeightOfAll/2 );
 		else
-			fY = CENTER_Y;
+			fY = SCREEN_CENTER_Y;
 
 		m_textLabel[i].LoadFromFont( THEME->GetPathToF("Common normal") );
 		m_textLabel[i].SetText( line.name );
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index a1486c5290..9fd30644d6 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -52,10 +52,10 @@ ScreenMusicScroll::ScreenMusicScroll( CString sClassName ) : ScreenAttract( sCla
 
 	for( unsigned i=0; i<m_textLines.size(); i++ )
 	{
-		m_textLines[i]->SetXY( CENTER_X, SCREEN_BOTTOM + 40 );
+		m_textLines[i]->SetXY( SCREEN_CENTER_X, SCREEN_BOTTOM + 40 );
 		m_textLines[i]->BeginTweening( SCROLL_DELAY * i );
 		m_textLines[i]->BeginTweening( 2.0f*SCROLL_SPEED );
-		m_textLines[i]->SetXY( CENTER_X, SCREEN_TOP - 40 );	
+		m_textLines[i]->SetXY( SCREEN_CENTER_X, SCREEN_TOP - 40 );	
 	}
 	
 	this->MoveToTail( &m_In );		// put it in the back so it covers up the stuff we just added
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 9f5110f670..7d939f0227 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -479,7 +479,7 @@ void ScreenNameEntryTraditional::Update( float fDelta )
 void ScreenNameEntryTraditional::DrawPrimitives()
 {
 	DISPLAY->CameraPushMatrix();
-	DISPLAY->LoadMenuPerspective( FOV, CENTER_X, CENTER_Y );
+	DISPLAY->LoadMenuPerspective( FOV, SCREEN_CENTER_X, SCREEN_CENTER_Y );
 
 	Screen::DrawPrimitives();
 	
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index d3d8850add..4d9e594fa3 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -210,7 +210,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 
 		m_sprLineHighlight[p].Load( THEME->GetPathToG("ScreenOptions line highlight") );
 		m_sprLineHighlight[p].SetName( "LineHighlight" );
-		m_sprLineHighlight[p].SetX( CENTER_X );
+		m_sprLineHighlight[p].SetX( SCREEN_CENTER_X );
 		m_framePage.AddChild( &m_sprLineHighlight[p] );
 		UtilOnCommand( m_sprLineHighlight[p], "ScreenOptions" );
 	}
@@ -367,7 +367,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 	bt->SetText( THEME->GetMetric("OptionNames","Exit") );
 	bt->SetZoom( ITEMS_ZOOM );
 	bt->SetShadowLength( 0 );
-	bt->SetX( CENTER_X );
+	bt->SetX( SCREEN_CENTER_X );
 
 	m_framePage.AddChild( bt );
 
@@ -441,7 +441,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 	}
 
 	m_sprFrame.Load( THEME->GetPathToG( "ScreenOptions frame") );
-	m_sprFrame->SetXY( CENTER_X, CENTER_Y );
+	m_sprFrame->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	m_framePage.AddChild( m_sprFrame );
 
 	// poke once at all the explanation metrics so that we catch missing ones early
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index d79120fe94..457f7e330c 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -33,7 +33,7 @@ ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
 
 		m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenPlayerOptions options") );
 		m_sprOptionsMessage.StopAnimating();
-		m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
+		m_sprOptionsMessage.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 		m_sprOptionsMessage.SetZoom( 1 );
 		m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
 		//this->AddChild( &m_sprOptionsMessage );       // we have to draw this manually over the top of transitions
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index 0ba463947f..203845c803 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -8,11 +8,11 @@
 #include "ThemeManager.h"
 #include "ScreenDimensions.h"
 
-#define QUESTION_X	(CENTER_X)
-#define QUESTION_Y	(CENTER_Y - 60)
+#define QUESTION_X	(SCREEN_CENTER_X)
+#define QUESTION_Y	(SCREEN_CENTER_Y - 60)
 
-#define PROMPT_X	(CENTER_X)
-#define PROMPT_Y	(CENTER_Y + 120)
+#define PROMPT_X	(SCREEN_CENTER_X)
+#define PROMPT_Y	(SCREEN_CENTER_Y + 120)
 
 bool ScreenPrompt::s_bLastAnswer = false;
 
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 4c458c84b4..7421f08d1c 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -212,7 +212,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 
 		m_ListScoreRowItems.SetName( "ListScoreRowItems" );
 		this->AddChild( &m_ListScoreRowItems );
-		m_ListScoreRowItems.SetXY( CENTER_X, CENTER_Y );
+		m_ListScoreRowItems.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	}
 
 	{
@@ -260,7 +260,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 
 		m_ListCourseRowItems.SetName( "ListCourseRowItems" );
 		this->AddChild( &m_ListCourseRowItems );
-		m_ListCourseRowItems.SetXY( CENTER_X, CENTER_Y );
+		m_ListCourseRowItems.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	}
 
 	// calculate which StepsTypes to show
diff --git a/stepmania/src/ScreenReloadSongs.cpp b/stepmania/src/ScreenReloadSongs.cpp
index 3f73b6c26b..f09b7ab34e 100644
--- a/stepmania/src/ScreenReloadSongs.cpp
+++ b/stepmania/src/ScreenReloadSongs.cpp
@@ -49,7 +49,7 @@ ScreenReloadSongs::ScreenReloadSongs( CString sClassName ): Screen(sClassName)
 	m_iUpdates = 0;
 
 	m_Loading.LoadFromFont( THEME->GetPathF("Common", "normal") );
-	m_Loading.SetXY( CENTER_X, CENTER_Y );
+	m_Loading.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	this->AddChild( &m_Loading );
 
 	m_LoadingWindow = new ScreenReloadSongsLoadingWindow( m_Loading );
diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index 9393722648..413e0d06e7 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -27,22 +27,22 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
 
 ScreenTestFonts::ScreenTestFonts( CString sClassName ) : Screen( sClassName )
 {
-	Hline.SetXY(CENTER_X, CENTER_Y);
+	Hline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
 	Hline.SetZoomX(LineWidth);
 	Hline.SetDiffuse( RageColor(1, 1, 1, 1) );
 	this->AddChild(&Hline);
 
-	Vline.SetXY(CENTER_X, CENTER_Y);
+	Vline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y);
 	Vline.SetZoomY(LineHeight);
 	Vline.SetDiffuse( RageColor(0, 1, 0, .8f) );
 	this->AddChild(&Vline);
 	
-	font.SetXY( CENTER_X, CENTER_Y+100 );
+	font.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+100 );
 	font.LoadFromFont( "Themes/default/Fonts/Common Normal" );
 	font.SetZoom(.5);
 	this->AddChild(&font);
 
-	txt.SetXY( CENTER_X, CENTER_Y );
+	txt.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	SetFont( "Themes/default/Fonts/Common Normal" );
 	SetText( "Foo" );
 }
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index f5b3608589..db6e46cfda 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -17,7 +17,7 @@ ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements(
 
 	m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textInputs.SetText( "" );
-	m_textInputs.SetXY( CENTER_X, CENTER_Y );
+	m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	m_textInputs.SetDiffuse( RageColor(1,1,1,1) );
 	m_textInputs.SetZoom( 0.8f );
 	this->AddChild( &m_textInputs );
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index b37644a0a5..5d5ea30208 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -18,7 +18,7 @@ ScreenTestLights::ScreenTestLights( CString sClassName ) : ScreenWithMenuElement
 
 	m_textInputs.LoadFromFont( THEME->GetPathToF("Common normal") );
 	m_textInputs.SetText( "" );
-	m_textInputs.SetXY( CENTER_X, CENTER_Y );
+	m_textInputs.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
 	m_textInputs.SetDiffuse( RageColor(1,1,1,1) );
 	m_textInputs.SetZoom( 0.8f );
 	this->AddChild( &m_textInputs );
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 0521f2d0ee..37f93bf553 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -14,11 +14,11 @@
 #include "archutils/Xbox/VirtualKeyboard.h"
 #endif
 
-#define QUESTION_X		(CENTER_X)
-#define QUESTION_Y		(CENTER_Y - 60)
+#define QUESTION_X		(SCREEN_CENTER_X)
+#define QUESTION_Y		(SCREEN_CENTER_Y - 60)
 
-#define ANSWER_X		(CENTER_X)
-#define ANSWER_Y		(CENTER_Y + 120)
+#define ANSWER_X		(SCREEN_CENTER_X)
+#define ANSWER_Y		(SCREEN_CENTER_Y + 120)
 #define ANSWER_WIDTH	(440)
 #define ANSWER_HEIGHT	(30)