diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 5100c66ec4..bd69b2b89e 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -618,7 +618,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
 
 	if( m_pStyle != NULL )
 	{
-		GAMESTATE->m_pCurStyle.Set( m_pStyle );
+		GAMESTATE->SetCurrentStyle( m_pStyle );
 
 		// It's possible to choose a style that didn't have enough 
 		// players joined.  If enough players aren't joined, then 
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index a587a04eb6..46cdf5e200 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -87,7 +87,7 @@ GameState::GameState() :
 	m_iEditCourseEntryIndex(	Message_EditCourseEntryIndexChanged ),
 	m_sEditLocalProfileID(		Message_EditLocalProfileIDChanged )
 {
-	m_pCurStyle.Set( NULL );
+	SetCurrentStyle( NULL );
 
 	m_pCurGame.Set( NULL );
 	m_iCoins = 0;
@@ -184,7 +184,7 @@ void GameState::Reset()
 	ASSERT( THEME );
 
 	m_timeGameStarted.SetZero();
-	m_pCurStyle.Set( NULL );
+	SetCurrentStyle( NULL );
 	FOREACH_PlayerNumber( p )
 		m_bSideIsJoined[p] = false;
 	FOREACH_MultiPlayer( p )
@@ -827,7 +827,7 @@ RString GameState::GetPlayerDisplayName( PlayerNumber pn ) const
 
 bool GameState::PlayersCanJoin() const
 {
-	return GetNumSidesJoined() == 0 || m_pCurStyle == NULL;	// selecting a style finalizes the players
+	return GetNumSidesJoined() == 0 || GetCurrentStyle() == NULL;	// selecting a style finalizes the players
 }
 
 int GameState::GetNumSidesJoined() const
diff --git a/stepmania/src/ModeSwitcher.cpp b/stepmania/src/ModeSwitcher.cpp
index ef6e0ab788..9bd1fbc00c 100644
--- a/stepmania/src/ModeSwitcher.cpp
+++ b/stepmania/src/ModeSwitcher.cpp
@@ -309,7 +309,7 @@ void ModeSwitcher::ChangeMode(PlayerNumber pn, int dir)
 			wrap( index, vPossibleStyles.size() );
 		}
 
-		GAMESTATE->m_pCurStyle.Set( vPossibleStyles[index] );
+		GAMESTATE->SetCurrentStyle( vPossibleStyles[index] );
 	}
 	m_Stylename.SetText(GetStyleName());
 	m_Nextmode.SetText(GetNextStyleName());
diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index 8e6ba67d1b..1b303adfb7 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -729,7 +729,7 @@ void NetworkSyncManager::ProcessInput()
 				StyleName = m_packet.ReadNT();
 
 				GAMESTATE->SetCurGame( GAMEMAN->StringToGameType(GameName) );
-				GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,StyleName) );
+				GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,StyleName) );
 
 				SCREENMAN->SetNewScreen( "ScreenNetSelectMusic" ); //Should this be metric'd out?
 			}
diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 4151e2e4ef..f7baa3adc9 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -49,7 +49,7 @@ void ScreenDemonstration::Init()
 
 		ASSERT( vStylePossible.size() > 0 );
 		const Style* pStyle = vStylePossible[ RandomInt(vStylePossible.size()) ];
-		GAMESTATE->m_pCurStyle.Set( pStyle );
+		GAMESTATE->SetCurrentStyle( pStyle );
 	}
 
 	GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 859d1c00cd..51219092b2 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -184,7 +184,7 @@ void ScreenEditMenu::MenuStart( const InputEventPlus &input )
 
 	GAMESTATE->m_pCurSong.Set( pSong );
 	GAMESTATE->m_pCurCourse.Set( NULL );
-	GAMESTATE->m_pCurStyle.Set( GAMEMAN->GetEditorStyleForStepsType(st) );
+	GAMESTATE->SetCurrentStyle( GAMEMAN->GetEditorStyleForStepsType(st) );
 	GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps );
 
 	//
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 6d83f8fb07..6255b24ddd 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -30,7 +30,7 @@ ScreenEnding::ScreenEnding() : ScreenAttract( false/*dont reset GAMESTATE*/ )
 		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2);
 
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
-		GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") );
+		GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(),"versus") );
 		GAMESTATE->JoinPlayer( PLAYER_1 );
 		GAMESTATE->JoinPlayer( PLAYER_2 );
 		GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() );
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index ba1ddbacd3..32e9e7df96 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -91,9 +91,9 @@ ScreenEvaluation::ScreenEvaluation()
 		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2);
 
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
-		GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
+		GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
 		STATSMAN->m_CurStageStats.playMode = GAMESTATE->m_PlayMode;
-		STATSMAN->m_CurStageStats.pStyle = GAMESTATE->m_pCurStyle;
+		STATSMAN->m_CurStageStats.pStyle = GAMESTATE->GetCurrentStyle();
 		STATSMAN->m_CurStageStats.StageType = StageStats::STAGE_NORMAL;
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 		GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() );
diff --git a/stepmania/src/ScreenGameplaySyncMachine.cpp b/stepmania/src/ScreenGameplaySyncMachine.cpp
index f5f4cf4f6d..2808f5ef2c 100644
--- a/stepmania/src/ScreenGameplaySyncMachine.cpp
+++ b/stepmania/src/ScreenGameplaySyncMachine.cpp
@@ -14,7 +14,7 @@ REGISTER_SCREEN_CLASS( ScreenGameplaySyncMachine );
 void ScreenGameplaySyncMachine::Init()
 {
 	GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
-	GAMESTATE->m_pCurStyle.Set( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) );
+	GAMESTATE->SetCurrentStyle( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) );
 	AdjustSync::ResetOriginalSyncData();
 	
 	SMLoader ld;
@@ -82,7 +82,7 @@ void ScreenGameplaySyncMachine::HandleScreenMessage( const ScreenMessage SM )
 	if( SM == SM_GoToPrevScreen || SM == SM_GoToNextScreen )
 	{
 		GAMESTATE->m_PlayMode.Set( PlayMode_Invalid );
-		GAMESTATE->m_pCurStyle.Set( NULL );
+		GAMESTATE->SetCurrentStyle( NULL );
 		GAMESTATE->m_pCurSong.Set( NULL );
 	}
 }
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index 8559ab2d1d..189ced6040 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -132,7 +132,7 @@ void ScreenHowToPlay::Init()
 		m_pLifeMeterBar->FillForHowToPlay( NUM_W2S, NUM_MISSES );
 	}
 
-	GAMESTATE->m_pCurStyle.Set( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) );
+	GAMESTATE->SetCurrentStyle( GAMEMAN->GetHowToPlayStyleForGame(GAMESTATE->m_pCurGame) );
 
 	if( USEPLAYER )
 	{
diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
index f61e5decee..72f490819a 100644
--- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp
+++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
@@ -285,7 +285,7 @@ void ScreenOptionsEditCourseEntry::HandleScreenMessage( const ScreenMessage SM )
 				
 				// Set up for ScreenEdit
 				const Style *pStyle = GAMEMAN->GetEditorStyleForStepsType(pSteps->m_StepsType);
-				GAMESTATE->m_pCurStyle.Set( pStyle );
+				GAMESTATE->SetCurrentStyle( pStyle );
 				GAMESTATE->m_pCurSong.Set( pSong );
 				GAMESTATE->m_pCurSteps[PLAYER_1].Set( pSteps );
 				break;
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 5119ca61c9..98c3eed9b5 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -139,7 +139,7 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM )
 			Steps *pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
 			ASSERT( pSteps );
 			const Style *pStyle = GAMEMAN->GetEditorStyleForStepsType( pSteps->m_StepsType );
-			GAMESTATE->m_pCurStyle.Set( pStyle );
+			GAMESTATE->SetCurrentStyle( pStyle );
 			// do base behavior
 		}
 	}
diff --git a/stepmania/src/ScreenOptionsReviewWorkout.cpp b/stepmania/src/ScreenOptionsReviewWorkout.cpp
index 7349e205ba..8fe127ccbb 100644
--- a/stepmania/src/ScreenOptionsReviewWorkout.cpp
+++ b/stepmania/src/ScreenOptionsReviewWorkout.cpp
@@ -113,7 +113,7 @@ void ScreenOptionsReviewWorkout::HandleScreenMessage( const ScreenMessage SM )
 
 				GAMESTATE->m_PlayMode.Set( PLAY_MODE_ENDLESS );
 				GAMESTATE->m_bSideIsJoined[0] = true;
-				GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,"single") );
+				GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,"single") );
 
 				PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_GoalType = GoalType_Time;
 				PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_iGoalSeconds = pWorkout->m_iMinutes * 60;
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index a57eaca16e..7be3c91dec 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -52,7 +52,7 @@ ScreenSelectMusic::ScreenSelectMusic()
 	if( PREFSMAN->m_bScreenTestMode )
 	{
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
-		GAMESTATE->m_pCurStyle.Set( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
+		GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
 		GAMESTATE->JoinPlayer( PLAYER_1 );
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 	}