diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 1400eab0c5..7bd9a4174f 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -20,7 +20,7 @@
 class HiddenActor: public Actor
 {
 public:
-	HiddenActor() { SetHidden(true); }
+	HiddenActor() { SetVisible(false); }
 	virtual HiddenActor *Copy() const;
 };
 REGISTER_ACTOR_CLASS_WITH_NAME( HiddenActor, Actor )
@@ -1329,7 +1329,8 @@ public:
 	static int backfacecull( T* p, lua_State *L )		{ p->SetCullMode((BIArg(1)) ? CULL_BACK : CULL_NONE); return 0; }
 	static int cullmode( T* p, lua_State *L )		{ p->SetCullMode( Enum::Check<CullMode>(L, 1)); return 0; }
 	static int visible( T* p, lua_State *L )		{ p->SetVisible(BIArg(1)); return 0; }
-	static int hidden( T* p, lua_State *L )			{ p->SetHidden(BIArg(1)); return 0; }
+	// TODO: Remove hidden and leave visible
+	static int hidden( T* p, lua_State *L )			{ p->SetVisible(!BIArg(1)); return 0; }
 	static int hibernate( T* p, lua_State *L )		{ p->SetHibernate(FArg(1)); return 0; }
 	static int draworder( T* p, lua_State *L )		{ p->SetDrawOrder(IArg(1)); return 0; }
 	static int playcommand( T* p, lua_State *L )
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index 8490e02256..341ced45ff 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -318,9 +318,7 @@ public:
 	// other properties
 	//
 	bool GetVisible() const				{ return m_bVisible; }
-	bool GetHidden() const				{ return !m_bVisible; }
 	void SetVisible( bool b )			{ m_bVisible = b; }
-	void SetHidden( bool b )			{ m_bVisible = !b; }
 	void SetShadowLength( float fLength )		{ m_fShadowLength = fLength; }
 	// TODO: Implement hibernate as a tween type?
 	void SetHibernate( float fSecs )		{ m_fHibernateSecondsLeft = fSecs; }
diff --git a/stepmania/src/ActorProxy.cpp b/stepmania/src/ActorProxy.cpp
index ae9690fde4..4bfe23cfd8 100644
--- a/stepmania/src/ActorProxy.cpp
+++ b/stepmania/src/ActorProxy.cpp
@@ -18,10 +18,10 @@ void ActorProxy::DrawPrimitives()
 {
 	if( m_pActorTarget != NULL )
 	{
-		bool bHidden = m_pActorTarget->GetHidden();
-		m_pActorTarget->SetHidden( false );
+		bool bVisible = m_pActorTarget->GetVisible();
+		m_pActorTarget->SetVisible( true );
 		m_pActorTarget->Draw();
-		m_pActorTarget->SetHidden( bHidden );
+		m_pActorTarget->SetVisible( bVisible );
 	}
 }
 
diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index abeb62af81..cd85735a32 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -77,14 +77,14 @@ void ActorScroller::SetTransformFromHeight( float fItemHeight )
 
 void ActorScroller::EnableMask( float fWidth, float fHeight )
 {
-	m_quadMask.SetHidden( false );
+	m_quadMask.SetVisible( true );
 	m_quadMask.SetWidth( fWidth );
 	m_quadMask.SetHeight( fHeight );
 }
 
 void ActorScroller::DisableMask()
 {
-	m_quadMask.SetHidden( true );
+	m_quadMask.SetVisible( false );
 }
 
 void ActorScroller::ScrollThroughAllItems()
@@ -215,7 +215,7 @@ void ActorScroller::PositionItemsAndDrawPrimitives( bool bDrawPrimitives )
 		return;
 
 	float fNumItemsToDraw = m_fNumItemsToDraw;
-	if( !m_quadMask.GetHidden() )
+	if( m_quadMask.GetVisible() )
 	{
 		// write to z buffer so that top and bottom are clipped
 		// Draw an extra item; this is the one that will be masked.
diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 437b964523..314c25fe33 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -159,7 +159,7 @@ void BGAnimation::LoadFromNode( const XNode* pNode )
 	{
 		Actor *pActor = new Actor;
 		pActor->SetName( "BGAnimation dummy" );
-		pActor->SetHidden( true );
+		pActor->SetVisible( false );
 		apActorCommands ap = ActorUtil::ParseActorCommands( ssprintf("sleep,%f",fLengthSeconds) );
 		pActor->AddCommand( "On", ap );
 		AddChild( pActor );
diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index 113accf8c1..5b2f4406c3 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -49,20 +49,20 @@ void Combo::Load( PlayerState *pPlayerState, PlayerStageStats *pPlayerStageStats
 	m_sprComboLabel->StopAnimating();
 	m_sprComboLabel->SetXY( LABEL_X, LABEL_Y );
 	m_sprComboLabel->RunCommands( LABEL_ON_COMMAND );
-	m_sprComboLabel->SetHidden( true );
+	m_sprComboLabel->SetVisible( false );
 	this->AddChild( m_sprComboLabel );
 
 	m_sprMissesLabel.Load( THEME->GetPathG(m_sName,"misses") );
 	m_sprMissesLabel->StopAnimating();
 	m_sprMissesLabel->SetXY( LABEL_X, LABEL_Y );
 	m_sprMissesLabel->RunCommands( LABEL_ON_COMMAND );
-	m_sprMissesLabel->SetHidden( true );
+	m_sprMissesLabel->SetVisible( false );
 	this->AddChild( m_sprMissesLabel );
 
 	m_textNumber.LoadFromFont( THEME->GetPathF(m_sName,"numbers") );
 	m_textNumber.SetXY( NUMBER_X, NUMBER_Y );
 	m_textNumber.RunCommands( NUMBER_ON_COMMAND );
-	m_textNumber.SetHidden( true );
+	m_textNumber.SetVisible( false );
 	this->AddChild( &m_textNumber );
 }
 
@@ -74,9 +74,9 @@ void Combo::SetCombo( int iCombo, int iMisses )
 
 	if( !bShowCombo )
 	{
-		m_sprComboLabel->SetHidden( true );
-		m_sprMissesLabel->SetHidden( true );
-		m_textNumber.SetHidden( true );
+		m_sprComboLabel->SetVisible( false );
+		m_sprMissesLabel->SetVisible( false );
+		m_textNumber.SetVisible( false );
 		return;
 	}
 
@@ -94,9 +94,9 @@ void Combo::SetCombo( int iCombo, int iMisses )
 	}
 	m_iLastSeenCombo = iCombo;
 
-	m_sprComboLabel->SetHidden( bComboOfMisses );
-	m_sprMissesLabel->SetHidden( !bComboOfMisses );
-	m_textNumber.SetHidden( false );
+	m_sprComboLabel->SetVisible( !bComboOfMisses );
+	m_sprMissesLabel->SetVisible( bComboOfMisses );
+	m_textNumber.SetVisible( true );
 
 	RString txt = ssprintf("%d", iNum);
 	
diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index 16d0ea1d32..cdfa7261b6 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -100,9 +100,9 @@ void ComboGraph::Load( const StageStats &s, const PlayerStageStats &pss )
 	}
 
 	/* Hide the templates. */
-	m_pNormalCombo->SetHidden( true );
-	m_pMaxCombo->SetHidden( true );
-	m_pMaxComboText->SetHidden( true );
+	m_pNormalCombo->SetVisible( false );
+	m_pMaxCombo->SetVisible( false );
+	m_pMaxComboText->SetVisible( false );
 }
 
 // lua start
diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp
index 1d4c95b669..2849e38116 100644
--- a/stepmania/src/DifficultyList.cpp
+++ b/stepmania/src/DifficultyList.cpp
@@ -195,7 +195,7 @@ void DifficultyList::PositionItems()
 	for( int i = 0; i < MAX_METERS; ++i )
 	{
 		bool bUnused = ( i >= (int)m_Rows.size() );
-		m_Lines[i].m_Meter.SetHidden( bUnused );
+		m_Lines[i].m_Meter.SetVisible( !bUnused );
 	}
 
 	for( int m = 0; m < (int)m_Rows.size(); ++m )
diff --git a/stepmania/src/DualScrollBar.cpp b/stepmania/src/DualScrollBar.cpp
index 0f68172ac7..2fb28c7f55 100644
--- a/stepmania/src/DualScrollBar.cpp
+++ b/stepmania/src/DualScrollBar.cpp
@@ -39,8 +39,8 @@ void DualScrollBar::Load( const RString &sType )
 
 void DualScrollBar::EnablePlayer( PlayerNumber pn, bool on )
 {
-	m_sprScrollThumbUnderHalf[pn]->SetHidden( !on );
-	m_sprScrollThumbOverHalf[pn]->SetHidden( !on );
+	m_sprScrollThumbUnderHalf[pn]->SetVisible( on );
+	m_sprScrollThumbOverHalf[pn]->SetVisible( on );
 }
 
 void DualScrollBar::SetPercentage( PlayerNumber pn, float fPercent )
diff --git a/stepmania/src/DynamicActorScroller.cpp b/stepmania/src/DynamicActorScroller.cpp
index 0b1e24504e..1ace808767 100644
--- a/stepmania/src/DynamicActorScroller.cpp
+++ b/stepmania/src/DynamicActorScroller.cpp
@@ -22,7 +22,7 @@ void DynamicActorScroller::LoadFromNode( const XNode *pNode )
 		RageException::Throw( "%s: DynamicActorScroller: loaded %i nodes; require exactly one", ActorUtil::GetWhere(pNode).c_str(), (int)m_SubActors.size() );
 
 	int iNumCopies = (int) m_fNumItemsToDraw;
-	if( !m_quadMask.GetHidden() )
+	if( m_quadMask.GetVisible() )
 		iNumCopies += 1;
 	for( int i = 1; i < iNumCopies; ++i )
 	{
diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 27307e71b4..9df76a9b88 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -153,8 +153,8 @@ void EditMenu::Load( const RString &sType )
 		this->AddChild( &m_textValue[r] );
 	}
 
-	m_textLabel[ROW_GROUP].SetHidden( !SHOW_GROUPS.GetValue() );
-	m_textValue[ROW_GROUP].SetHidden( !SHOW_GROUPS.GetValue() );
+	m_textLabel[ROW_GROUP].SetVisible( SHOW_GROUPS.GetValue() );
+	m_textValue[ROW_GROUP].SetVisible( SHOW_GROUPS.GetValue() );
 
 
 	/* Load low-res banners, if needed. */
@@ -501,8 +501,8 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 			m_Meter.SetFromMeterAndDifficulty( 0, GetSelectedDifficulty() );
 		// fall through
 	case ROW_SOURCE_STEPS_TYPE:
-		m_textLabel[ROW_SOURCE_STEPS_TYPE].SetHidden( GetSelectedSteps() ? true : false );
-		m_textValue[ROW_SOURCE_STEPS_TYPE].SetHidden( GetSelectedSteps() ? true : false );
+		m_textLabel[ROW_SOURCE_STEPS_TYPE].SetVisible( GetSelectedSteps() ? false : true );
+		m_textValue[ROW_SOURCE_STEPS_TYPE].SetVisible( GetSelectedSteps() ? false : true );
 		m_textValue[ROW_SOURCE_STEPS_TYPE].SetText( GAMEMAN->StepsTypeToLocalizedString(GetSelectedSourceStepsType()) );
 
 		m_vpSourceSteps.clear();
@@ -530,8 +530,8 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 		// fall through
 	case ROW_SOURCE_STEPS:
 		{
-			m_textLabel[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false );
-			m_textValue[ROW_SOURCE_STEPS].SetHidden( GetSelectedSteps() ? true : false );
+			m_textLabel[ROW_SOURCE_STEPS].SetVisible( GetSelectedSteps() ? false : true );
+			m_textValue[ROW_SOURCE_STEPS].SetVisible( GetSelectedSteps() ? false : true );
 			{
 				RString s;
 				if( GetSelectedSourceDifficulty() == Difficulty_Invalid )
@@ -547,7 +547,7 @@ void EditMenu::OnRowValueChanged( EditMenuRow row )
 				m_SourceMeter.SetFromSteps( GetSelectedSourceSteps() );
 			else
 				m_SourceMeter.SetFromMeterAndDifficulty( 0, GetSelectedSourceDifficulty() );
-			m_SourceMeter.SetHidden( (bHideMeter || GetSelectedSteps()) );
+			m_SourceMeter.SetVisible( !(bHideMeter || GetSelectedSteps()) );
 
 			m_Actions.clear();
 			if( GetSelectedSteps() )
diff --git a/stepmania/src/Foreground.cpp b/stepmania/src/Foreground.cpp
index ca884892a3..47e56d3d17 100644
--- a/stepmania/src/Foreground.cpp
+++ b/stepmania/src/Foreground.cpp
@@ -45,7 +45,7 @@ void Foreground::LoadFromSong( const Song *pSong )
 		const float fStopSecond = fStartSecond + bga.m_bga->GetTweenTimeLeft();
 		bga.m_fStopBeat = pSong->m_Timing.GetBeatFromElapsedTime( fStopSecond );
 
-		bga.m_bga->SetHidden( true );
+		bga.m_bga->SetVisible( false );
 
 		this->AddChild( bga.m_bga );
 		m_BGAnimations.push_back( bga );
@@ -77,9 +77,9 @@ void Foreground::Update( float fDeltaTime )
 		/* Update the actor even if we're about to hide it, so queued commands
 		 * are always run. */
 		float fDeltaTime;
-		if( bga.m_bga->GetHidden() )
+		if( !bga.m_bga->GetVisible() )
 		{
-			bga.m_bga->SetHidden( false );
+			bga.m_bga->SetVisible( true );
 
 			const float fStartSecond = m_pSong->m_Timing.GetElapsedTimeFromBeat( bga.m_fStartBeat );
 			fDeltaTime = GAMESTATE->m_fMusicSeconds - fStartSecond;
@@ -97,7 +97,7 @@ void Foreground::Update( float fDeltaTime )
 		if( GAMESTATE->m_fSongBeat > bga.m_fStopBeat )
 		{
 			/* Finished. */
-			bga.m_bga->SetHidden( true );
+			bga.m_bga->SetVisible( false );
 			bga.m_bFinished = true;
 			continue;
 		}
diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp
index f3a18a63fd..381c82cc2b 100644
--- a/stepmania/src/GradeDisplay.cpp
+++ b/stepmania/src/GradeDisplay.cpp
@@ -117,12 +117,12 @@ void GradeDisplay::SetGrade( PlayerNumber pn, Grade g )
 	if(g != Grade_NoData)
 	{
 		SetState( GetFrameIndex(pn,g) );
-		SetHidden( false );
+		SetVisible( true );
 		SetDiffuseAlpha(1);
 	}
 	else
 	{
-		SetHidden( true );
+		SetVisible( false );
 		SetDiffuseAlpha(0);
 	}
 }
diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp
index 8b16b1f9b7..e7b7f16485 100644
--- a/stepmania/src/GraphDisplay.cpp
+++ b/stepmania/src/GraphDisplay.cpp
@@ -251,7 +251,7 @@ void GraphDisplay::LoadFromStageStats( const StageStats &ss, const PlayerStageSt
 		}
 		else
 		{
-			m_sprJustBarely->SetHidden( true );
+			m_sprJustBarely->SetVisible( false );
 		}
 		this->AddChild( m_sprJustBarely );
 	}
diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp
index 1048bfa4c1..688c989459 100644
--- a/stepmania/src/Judgment.cpp
+++ b/stepmania/src/Judgment.cpp
@@ -53,7 +53,7 @@ void Judgment::Reset()
 	m_sprJudgment.FinishTweening();
 	m_sprJudgment.SetXY( 0, 0 );
 	m_sprJudgment.StopEffect();
-	m_sprJudgment.SetHidden( true );
+	m_sprJudgment.SetVisible( false );
 }
 
 void Judgment::SetJudgment( TapNoteScore score, bool bEarly )
@@ -62,7 +62,7 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly )
 
 	Reset();
 
-	m_sprJudgment.SetHidden( false );
+	m_sprJudgment.SetVisible( true );
 
 	int iStateMult = (m_sprJudgment.GetNumStates()==12) ? 2 : 1;
 	int iStateAdd = ( bEarly || ( iStateMult == 1 ) ) ? 0 : 1;
diff --git a/stepmania/src/MemoryCardDisplay.cpp b/stepmania/src/MemoryCardDisplay.cpp
index 43593bd683..134f99ac55 100644
--- a/stepmania/src/MemoryCardDisplay.cpp
+++ b/stepmania/src/MemoryCardDisplay.cpp
@@ -23,7 +23,7 @@ void MemoryCardDisplay::Load( PlayerNumber pn )
 		MemoryCardState mcs = (MemoryCardState)i;
 		RString sState = MemoryCardStateToString(mcs);
 		m_spr[i].Load( THEME->GetPathG("MemoryCardDisplay",ssprintf("%s p%d",sState.c_str(),pn+1)) );
-		m_spr[i].SetHidden( true );
+		m_spr[i].SetVisible( false );
 		this->AddChild( &m_spr[i] );
 	}
 }
@@ -47,9 +47,9 @@ void MemoryCardDisplay::Update( float fDelta )
 	if( m_LastSeenState != newMcs )
 	{
 		if( m_LastSeenState != MemoryCardState_Invalid )
-			m_spr[m_LastSeenState].SetHidden( true );
+			m_spr[m_LastSeenState].SetVisible( false );
 		m_LastSeenState = newMcs;
-		m_spr[m_LastSeenState].SetHidden( false );
+		m_spr[m_LastSeenState].SetVisible( true );
 	}
 
 	ActorFrame::Update( fDelta );
diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index a67167d6cd..bbe8d64e90 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -51,7 +51,7 @@ void MenuTimer::EnableStealth( bool bStealth )
 
 	for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
 	{
-		m_text[i].SetHidden( bStealth );
+		m_text[i].SetVisible( !bStealth );
 	}
 }
 
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 0c273ddc1c..914458fa65 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -156,19 +156,19 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
 
 
 	// hide all
-	m_WheelNotifyIcon.SetHidden( true );
-	m_TextBanner.SetHidden( true );
-	m_sprSongBar->SetHidden( true );
-	m_sprSectionBar->SetHidden( true );
-	m_sprExpandedBar->SetHidden( true );
-	m_sprModeBar->SetHidden( true );
-	m_sprSortBar->SetHidden( true );
-	m_textSection.SetHidden( true );
-	m_textRoulette.SetHidden( true );
+	m_WheelNotifyIcon.SetVisible( false );
+	m_TextBanner.SetVisible( false );
+	m_sprSongBar->SetVisible( false );
+	m_sprSectionBar->SetVisible( false );
+	m_sprExpandedBar->SetVisible( false );
+	m_sprModeBar->SetVisible( false );
+	m_sprSortBar->SetVisible( false );
+	m_textSection.SetVisible( false );
+	m_textRoulette.SetVisible( false );
 	FOREACH_PlayerNumber( p )
-		m_pGradeDisplay[p]->SetHidden( true );
-	m_textCourse.SetHidden( true );
-	m_textSort.SetHidden( true );
+		m_pGradeDisplay[p]->SetVisible( false );
+	m_textCourse.SetVisible( false );
+	m_textSort.SetVisible( false );
 
 
 	// init and unhide type specific stuff
@@ -191,7 +191,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
 			sTranslitName = data->m_pCourse->GetTranslitFullTitle();
 			bt = &m_textCourse;
 			m_WheelNotifyIcon.SetFlags( data->m_Flags );
-			m_WheelNotifyIcon.SetHidden( false );
+			m_WheelNotifyIcon.SetVisible( true );
 			break;
 		case TYPE_SORT:
 			sDisplayName = data->m_sLabel;
@@ -203,31 +203,31 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
 		bt->SetText( sDisplayName, sTranslitName );
 		bt->SetDiffuse( data->m_color );
 		bt->SetRainbow( false );
-		bt->SetHidden( false );
+		bt->SetVisible( true );
 		break;
 	}
 	case TYPE_SONG:
 		m_TextBanner.LoadFromSong( data->m_pSong );
 		m_TextBanner.SetDiffuse( data->m_color );
-		m_TextBanner.SetHidden( false );
+		m_TextBanner.SetVisible( true );
 
 		m_WheelNotifyIcon.SetFlags( data->m_Flags );
-		m_WheelNotifyIcon.SetHidden( false );
+		m_WheelNotifyIcon.SetVisible( true );
 		RefreshGrades();
 		break;
 	case TYPE_ROULETTE:
 		m_textRoulette.SetText( THEME->GetString("MusicWheel","Roulette") );
-		m_textRoulette.SetHidden( false );
+		m_textRoulette.SetVisible( true );
 		break;
 
 	case TYPE_RANDOM:
 		m_textRoulette.SetText( THEME->GetString("MusicWheel","Random") );
-		m_textRoulette.SetHidden( false );
+		m_textRoulette.SetVisible( true );
 		break;
 
 	case TYPE_PORTAL:
 		m_textRoulette.SetText( THEME->GetString("MusicWheel","Portal") );
-		m_textRoulette.SetHidden( false );
+		m_textRoulette.SetVisible( true );
 		break;
 
 	DEFAULT_FAIL( pWID->m_Type );	// invalid type
@@ -244,19 +244,19 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
 	case TYPE_RANDOM:
 	case TYPE_PORTAL:
 		if( m_bExpanded )
-			m_sprExpandedBar->SetHidden( false );
+			m_sprExpandedBar->SetVisible( true );
 		else
-			m_sprSectionBar->SetHidden( false );
+			m_sprSectionBar->SetVisible( true );
 		break;
 	case TYPE_SORT:
 		if( pWID->m_pAction->m_pm != PlayMode_Invalid )
-			m_sprModeBar->SetHidden( false );
+			m_sprModeBar->SetVisible( true );
 		else
-			m_sprSortBar->SetHidden( false );
+			m_sprSortBar->SetVisible( true );
 		break;
 	case TYPE_SONG:		
 	case TYPE_COURSE:
-		m_sprSongBar->SetHidden( false );
+		m_sprSongBar->SetVisible( true );
 		break;
 	DEFAULT_FAIL( data->m_Type );
 	}
diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 6160b61716..e624ff7788 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -401,7 +401,7 @@ void OptionRow::InitText()
 		m_sprBullet->RunCommands( m_pParentType->BULLET_ON_COMMAND );
 		break;
 	case OptionRow::RowType_Exit:
-		m_sprBullet->SetHidden( true );
+		m_sprBullet->SetVisible( false );
 		break;
 	}
 
@@ -417,12 +417,12 @@ void OptionRow::AfterImportOptions( PlayerNumber pn )
 	 * players. */
 	if( m_pHand->m_Def.m_layoutType == LAYOUT_SHOW_ONE_IN_ROW &&
 		!m_pHand->m_Def.m_bOneChoiceForAllPlayers )
-		m_textItems[pn]->SetHidden( !GAMESTATE->IsHumanPlayer(pn) );
+		m_textItems[pn]->SetVisible( GAMESTATE->IsHumanPlayer(pn) );
 
 	// Hide underlines for disabled players.
 	if( !GAMESTATE->IsHumanPlayer(pn) )
 		for( unsigned c=0; c<m_Underline[pn].size(); c++ )
-			m_Underline[pn][c]->SetHidden( true );
+			m_Underline[pn][c]->SetVisible( false );
 
 	// Make all selections the same if bOneChoiceForAllPlayers
 	// Hack: we only import active players, so if only player 2 is imported,
@@ -492,10 +492,10 @@ void OptionRow::PositionUnderlines( PlayerNumber pn )
 		ASSERT( m_vbSelected[pnTakeSelectedFrom].size() == m_pHand->m_Def.m_vsChoices.size() );
 
 		bool bSelected = (iChoiceWithFocus==-1) ? false : m_vbSelected[pnTakeSelectedFrom][ iChoiceWithFocus ];
-		bool bHidden = !bSelected || !GAMESTATE->IsHumanPlayer(pn);
+		bool bVisible = bSelected && GAMESTATE->IsHumanPlayer(pn);
 
 		ul.BeginTweening( m_pParentType->TWEEN_SECONDS );
-		ul.SetHidden( bHidden );
+		ul.SetVisible( bVisible );
 		ul.SetBarWidth( iWidth );
 	}
 }
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index a7adcce36b..2745def71c 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -2235,22 +2235,22 @@ void ScreenEdit::TransitionEditState( EditState em )
 	m_sprOverlay->PlayCommand( EditStateToString(em) );
 	m_sprUnderlay->PlayCommand( EditStateToString(em) );
 
-	m_Background.SetHidden( !g_bEditorShowBGChangesPlay || em == STATE_EDITING );
-	m_autoHeader->SetHidden( em != STATE_EDITING );
-	m_textInputTips.SetHidden( em != STATE_EDITING );
-	m_textInfo.SetHidden( em != STATE_EDITING );
+	m_Background.SetVisible( g_bEditorShowBGChangesPlay  &&  em != STATE_EDITING );
+	m_autoHeader->SetVisible( em == STATE_EDITING );
+	m_textInputTips.SetVisible( em == STATE_EDITING );
+	m_textInfo.SetVisible( em == STATE_EDITING );
 	// Play the OnCommands again so that these will be re-hidden if the OnCommand hides them.
 	if( em == STATE_EDITING )
 	{
 		m_textInputTips.PlayCommand( "On" );
 		m_textInfo.PlayCommand( "On" );
 	}
-	m_textPlayRecordHelp.SetHidden( em == STATE_EDITING );
-	m_SnapDisplay.SetHidden( em != STATE_EDITING );
-	m_NoteFieldEdit.SetHidden( em != STATE_EDITING );
-	m_NoteFieldRecord.SetHidden( em != STATE_RECORDING && em != STATE_RECORDING_PAUSED );
-	m_Player->SetHidden( em != STATE_PLAYING );
-	m_Foreground.SetHidden( !g_bEditorShowBGChangesPlay || em == STATE_EDITING );
+	m_textPlayRecordHelp.SetVisible( em != STATE_EDITING );
+	m_SnapDisplay.SetVisible( em == STATE_EDITING );
+	m_NoteFieldEdit.SetVisible( em == STATE_EDITING );
+	m_NoteFieldRecord.SetVisible( em == STATE_RECORDING  ||  em == STATE_RECORDING_PAUSED );
+	m_Player->SetVisible( em == STATE_PLAYING );
+	m_Foreground.SetVisible( g_bEditorShowBGChangesPlay  &&  em != STATE_EDITING );
 
 	switch( em )
 	{
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 15c361a23f..cfbb8fb95a 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -99,7 +99,7 @@ void ScreenEnding::Init()
 		{
 		case MemoryCardState_Removed:
 		case MemoryCardState_NoCard:
-			m_sprRemoveMemoryCard[p].SetHidden( true );
+			m_sprRemoveMemoryCard[p].SetVisible( false );
 			break;
 		}
 		ActorUtil::LoadAllCommands( m_sprRemoveMemoryCard[p], m_sName );
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 550aca55ec..c989e1570f 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1198,7 +1198,7 @@ void ScreenGameplay::LoadNextSong()
 
 	if( !PREFSMAN->m_bShowBeginnerHelper || !m_BeginnerHelper.Initialize(2) )
 	{
-		m_BeginnerHelper.SetHidden( true );
+		m_BeginnerHelper.SetVisible( false );
 
 		/* BeginnerHelper disabled, or failed to load. */
 		if( m_pSongBackground )
@@ -1220,7 +1220,7 @@ void ScreenGameplay::LoadNextSong()
 	}
 	else
 	{
-		m_BeginnerHelper.SetHidden( false );
+		m_BeginnerHelper.SetVisible( true );
 	}
 
 	FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
@@ -1536,7 +1536,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 	if( m_bPaused )
 		return;
 
-	if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID && !m_MaxCombo.GetHidden() )
+	if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID && m_MaxCombo.GetVisible() )
 		m_MaxCombo.SetText( ssprintf("%d", STATSMAN->m_CurStageStats.m_player[GAMESTATE->m_MasterPlayerNumber].m_iMaxCombo) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
 	
 	//LOG->Trace( "m_fOffsetInBeats = %f, m_fBeatsPerSecond = %f, m_Music.GetPositionSeconds = %f", m_fOffsetInBeats, m_fBeatsPerSecond, m_Music.GetPositionSeconds() );
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index f4f221583c..e92867fc27 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -85,7 +85,7 @@ void ScreenMusicScroll::Update( float fDeltaTime )
 	{
 		const bool shown = ( m_textLines[i]->GetY() > SCREEN_TOP-20  &&
 					   m_textLines[i]->GetY() < SCREEN_BOTTOM+20 );
-		m_textLines[i]->SetHidden( !shown );
+		m_textLines[i]->SetVisible( shown );
 	}
 }	
 
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1bc7d3f64d..6ac1db961e 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -276,7 +276,7 @@ void ScreenOptions::RestartOptions()
 		}
 
 		// Hide the highlight if no rows are enabled.
-		m_sprLineHighlight[p]->SetHidden( m_iCurrentRow[p] == -1 || !GAMESTATE->IsHumanPlayer(p) );
+		m_sprLineHighlight[p]->SetVisible( m_iCurrentRow[p] != -1 && GAMESTATE->IsHumanPlayer(p) );
 	}
 
 
@@ -308,7 +308,7 @@ void ScreenOptions::BeginScreen()
 	ON_COMMAND( m_framePage );
 
 	FOREACH_PlayerNumber( p )
-		m_Cursor[p].SetHidden( !GAMESTATE->IsHumanPlayer(p) );
+		m_Cursor[p].SetVisible( GAMESTATE->IsHumanPlayer(p) );
 }
 
 void ScreenOptions::TweenOnScreen()
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index c158a4f955..3ef64c6219 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -25,7 +25,7 @@ void ScreenPlayerOptions::Init()
 		m_sprDisqualify[p].Load( THEME->GetPathG(m_sName,"disqualify") );
 		m_sprDisqualify[p]->SetName( ssprintf("DisqualifyP%i",p+1) );
 		SET_XY( m_sprDisqualify[p] );
-		m_sprDisqualify[p]->SetHidden( true );	// unhide later if handicapping options are discovered
+		m_sprDisqualify[p]->SetVisible( false );	// unhide later if handicapping options are discovered
 		m_sprDisqualify[p]->SetDrawOrder( 2 );
 		m_framePage.AddChild( m_sprDisqualify[p] );
 	}
@@ -171,7 +171,7 @@ void ScreenPlayerOptions::UpdateDisqualified( int row, PlayerNumber pn )
 			break;
 		}
 	}
-	m_sprDisqualify[pn]->SetHidden( !bDisqualified );
+	m_sprDisqualify[pn]->SetVisible( bDisqualified );
 
 	// restore previous player options in case the user escapes back after this
 	GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.Assign( ModsLevel_Preferred, poOrig );
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 04ff1b283b..3ad1a61c54 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -281,7 +281,7 @@ void ScoreScroller::ConfigureActor( Actor *pActor, int iItem )
 			if( pSteps  &&  UNLOCKMAN->StepsIsLocked(pSong, pSteps) )
 				pSteps = NULL;
 			BitmapText* pTextStepsScore = &item.m_textScore[*iter];
-			pTextStepsScore->SetHidden( pSteps == NULL );
+			pTextStepsScore->SetVisible( pSteps != NULL );
 			if( pSteps == NULL )
 				continue;
 
@@ -304,7 +304,7 @@ void ScoreScroller::ConfigureActor( Actor *pActor, int iItem )
 			const Trail *pTrail = pCourse->GetTrail( m_StepsType, *cd );
 			if( UNLOCKMAN->CourseIsLocked(pCourse) )
 				pTrail = NULL;
-			pTextStepsScore->SetHidden( pTrail==NULL );
+			pTextStepsScore->SetVisible( pTrail != NULL );
 			if( pTrail == NULL )
 				continue;
 
@@ -610,14 +610,14 @@ void ScreenRankingLines::Init()
 
 		m_textPoints[l].SetName( ssprintf("Points%d",l+1) );
 		m_textPoints[l].LoadFromFont( THEME->GetPathF(m_sName,"points") );
-		m_textPoints[l].SetHidden( true );
+		m_textPoints[l].SetVisible( false );
 		m_textPoints[l].SetXY( POINTS_X(l), POINTS_Y(l) );
 		ActorUtil::LoadAllCommands( m_textPoints[l], m_sName );
 		this->AddChild( &m_textPoints[l] );
 		
 		m_textTime[l].SetName( ssprintf("Time%d",l+1) );
 		m_textTime[l].LoadFromFont( THEME->GetPathF(m_sName,"time") );
-		m_textTime[l].SetHidden( true );
+		m_textTime[l].SetVisible( false );
 		m_textTime[l].SetXY( TIME_X(l), TIME_Y(l) );
 		ActorUtil::LoadAllCommands( m_textTime[l], m_sName );
 		this->AddChild( &m_textTime[l] );
@@ -647,13 +647,13 @@ float ScreenRankingLines::SetPage( const PageToShow &pts )
 	{
 		m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 
-		m_textScores[l].SetHidden( !bShowScores );
+		m_textScores[l].SetVisible( bShowScores );
 		m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 		
-		m_textPoints[l].SetHidden( !bShowPoints );
+		m_textPoints[l].SetVisible( bShowPoints );
 		m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 		
-		m_textTime[l].SetHidden( !bShowTime );
+		m_textTime[l].SetVisible( bShowTime );
 		m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 	}
 
diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp
index c460c63ab2..7af236611b 100644
--- a/stepmania/src/ScreenSystemLayer.cpp
+++ b/stepmania/src/ScreenSystemLayer.cpp
@@ -60,12 +60,12 @@ void ScreenSystemLayer::ReloadCreditsText()
 	this->AddChild( m_sprMessageFrame );
 	m_sprMessageFrame->SetName( "MessageFrame" );
 	SET_XY_AND_ON_COMMAND( m_sprMessageFrame );
-	m_sprMessageFrame->SetHidden( true );
+	m_sprMessageFrame->SetVisible( false );
 
 	m_textMessage.LoadFromFont( THEME->GetPathF(m_sName,"message") );
 	m_textMessage.SetName( "Message" );
 	SET_XY_AND_ON_COMMAND( m_textMessage );
-	m_textMessage.SetHidden( true );
+	m_textMessage.SetVisible( false );
 
 
 	FOREACH_PlayerNumber( p )
@@ -190,23 +190,23 @@ void ScreenSystemLayer::HandleMessage( const Message &msg )
 	}
 	else if( msg == "SystemMessage" )
 	{
-		m_sprMessageFrame->SetHidden( false );
+		m_sprMessageFrame->SetVisible( true );
 		m_sprMessageFrame->PlayCommand( "On" );
 		m_sprMessageFrame->PlayCommand( "Off" );
 
-		m_textMessage.SetHidden( false );
+		m_textMessage.SetVisible( true );
 		m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
 		m_textMessage.PlayCommand( "On" );
 		m_textMessage.PlayCommand( "Off" );
 	}
 	else if( msg == "SystemMessageNoAnimate" )
 	{
-		m_sprMessageFrame->SetHidden( false );
+		m_sprMessageFrame->SetVisible( true );
 		m_sprMessageFrame->PlayCommand( "On" );
 		m_sprMessageFrame->FinishTweening();
 		m_sprMessageFrame->PlayCommand( "Off" );
 
-		m_textMessage.SetHidden( false );
+		m_textMessage.SetVisible( true );
 		m_textMessage.SetText( SCREENMAN->GetCurrentSystemMessage() );
 		m_textMessage.PlayCommand( "On" );
 		m_textMessage.FinishTweening();
@@ -214,9 +214,9 @@ void ScreenSystemLayer::HandleMessage( const Message &msg )
 	}
 	else if( msg == "HideSystemMessage" )
 	{
-		m_sprMessageFrame->SetHidden( true );
+		m_sprMessageFrame->SetVisible( false );
 
-		m_textMessage.SetHidden( true );
+		m_textMessage.SetVisible( false );
 	}
 	Screen::HandleMessage( msg );
 }
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index b441698348..5a48b70d89 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -269,7 +269,7 @@ void Sprite::LoadFromTexture( RageTextureID ID )
 	/* Hack: if we load "_blank", mark the actor hidden, so we can short-circuit
 	 * rendering later on.  (This helps NoteField rendering.) */
 	if( !SetExtension(Basename(ID.filename), "").CompareNoCase("_blank") )
-		this->SetHidden( true );
+		this->SetVisible( false );
 	
 	// the size of the sprite is the size of the image before it was scaled
 	Sprite::m_size.x = (float)m_pTexture->GetSourceFrameWidth();
diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp
index 8072bb21a8..0eefe2fabc 100644
--- a/stepmania/src/WheelBase.cpp
+++ b/stepmania/src/WheelBase.cpp
@@ -175,9 +175,9 @@ void WheelBase::SetPositions()
 		WheelItemBase *pDisplay = m_WheelBaseItems[i];
 		const float fOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection;
 		if( fabsf(fOffsetFromSelection) > NUM_WHEEL_ITEMS_TO_DRAW/2 )
-			pDisplay->SetHidden( true );
+			pDisplay->SetVisible( false );
 		else
-			pDisplay->SetHidden( false );
+			pDisplay->SetVisible( true );
 
 		SetItemPosition( *pDisplay, fOffsetFromSelection );
 	}