diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 67a9b070bb..53ac9bd137 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -39,7 +39,6 @@ enum Code {
 	CODE_NEXT_APPEARANCE,
 	CODE_NEXT_TURN,
 	CODE_REVERSE,
-	CODE_NEXT_COLOR,
 	CODE_HOLDS,
 	CODE_DARK,
 	CODE_CANCEL_ALL,
@@ -66,7 +65,6 @@ const CString g_sCodeNames[NUM_CODES] = {
 	"NextAppearance",
 	"NextTurn",
 	"Reverse",
-	"NextColor",
 	"HoldNotes",
 	"Dark",
 	"CancelAll"
@@ -182,7 +180,6 @@ bool CodeDetector::DetectAndAdjustOptions( GameController controller )
 			case CODE_NEXT_APPEARANCE:	GAMESTATE->m_PlayerOptions[pn].NextAppearance();;				break;
 			case CODE_NEXT_TURN:		GAMESTATE->m_PlayerOptions[pn].NextTurn();						break;
 			case CODE_REVERSE:			TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bReverseScroll, true, false );			break;
-			case CODE_NEXT_COLOR:		GAMESTATE->m_PlayerOptions[pn].NextColor();		break;
 			case CODE_HOLDS:			TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bHoldNotes, true, false );				break;
 			case CODE_DARK:				TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bDark, true, false );					break;
 			case CODE_CANCEL_ALL:		GAMESTATE->m_PlayerOptions[pn] = PlayerOptions();								break;
diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp
index 984e6988a5..b30ae93787 100644
--- a/stepmania/src/NoteSkinManager.cpp
+++ b/stepmania/src/NoteSkinManager.cpp
@@ -166,8 +166,6 @@ CString NoteSkinManager::GetPathTo( PlayerNumber pn, int col, CString sFileName
 	CString sButtonName = ColToButtonName(col);
 
 	CString sCurNoteSkinName = m_sCurNoteSkinName[pn];
-	if( GAMESTATE->m_bEditing )
-		sCurNoteSkinName = "note";
 
 	CString ret = GetPathTo( sCurNoteSkinName, sButtonName, sFileName );
 	if( !ret.empty() )	// we found something
diff --git a/stepmania/src/NoteSkinManager.h b/stepmania/src/NoteSkinManager.h
index 221da86f8a..b2be9169cf 100644
--- a/stepmania/src/NoteSkinManager.h
+++ b/stepmania/src/NoteSkinManager.h
@@ -31,6 +31,7 @@ public:
 	CString GetCurNoteSkinName( PlayerNumber pn ) const { return m_sCurNoteSkinName[pn]; };
 
 	CString GetPathTo( PlayerNumber pn, int col, CString sFileName );
+	CString GetPathTo( CString sSkinName, CString sButtonName, CString sFileName );
 
 	CString		GetMetric( PlayerNumber pn, CString sButtonName, CString sValueName );
 	int			GetMetricI( PlayerNumber pn, CString sButtonName, CString sValueName );
@@ -41,7 +42,6 @@ public:
 	static CString NoteSkinManager::ColToButtonName(int col);
 
 protected:
-	CString GetPathTo( CString sSkinName, CString sButtonName, CString sFileName );
 	CString GetNoteSkinDir( CString sSkinName );
 
 	CString m_sCurNoteSkinName[NUM_PLAYERS];	
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index f5dfa7e4df..8f80438050 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -23,7 +23,6 @@ void PlayerOptions::Init()
 	m_TurnType = TURN_NONE;
 	m_Transform = TRANSFORM_NONE;
 	m_bReverseScroll = false;
-	m_ColorType = COLOR_VIVID;
 	m_bHoldNotes = true;
 	m_bDark = false;
 }
@@ -98,14 +97,6 @@ CString PlayerOptions::GetString()
 	if( m_bReverseScroll )
 		sReturn += "Reverse, ";
 
-	switch( m_ColorType )
-	{
-	case COLOR_VIVID:							break;
-	case COLOR_NOTE:	sReturn += "Note, ";	break;
-	case COLOR_FLAT:	sReturn += "Flat, ";	break;
-	default:	ASSERT(0);	// invalid COLOR
-	};
-
 	if( !m_bHoldNotes )
 		sReturn += "NoHolds, ";
 
@@ -162,8 +153,6 @@ void PlayerOptions::FromString( CString sOptions )
 		else if( sBit == "little" )		m_Transform = TRANSFORM_LITTLE;
 		else if( sBit == "big" )		m_Transform = TRANSFORM_BIG;
 		else if( sBit == "reverse" )	m_bReverseScroll = true;
-		else if( sBit == "note" )		m_ColorType = COLOR_NOTE;
-		else if( sBit == "flat" )		m_ColorType = COLOR_FLAT;
 		else if( sBit == "noholds" )	m_bHoldNotes = false;
 		else if( sBit == "nofreeze" )	m_bHoldNotes = false;
 		else if( sBit == "dark" )		m_bDark = true;
@@ -198,11 +187,6 @@ void PlayerOptions::NextEffect()
 	m_bEffects[0] = true;
 }
 
-void PlayerOptions::NextColor()
-{
-	m_ColorType = (ColorType) ((m_ColorType+1)%NUM_COLOR_TYPES);
-}
-
 void PlayerOptions::NextAppearance()
 {
 	m_AppearanceType = (AppearanceType) ((m_AppearanceType+1)%NUM_APPEARANCE_TYPES);
diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h
index 5ed6062165..aafb204743 100644
--- a/stepmania/src/PlayerOptions.h
+++ b/stepmania/src/PlayerOptions.h
@@ -62,13 +62,6 @@ struct PlayerOptions
 	} m_Transform;
 	void NextTransform();
 	bool m_bReverseScroll;
-	enum ColorType {
-		COLOR_VIVID=0,
-		COLOR_NOTE,
-		COLOR_FLAT,
-		NUM_COLOR_TYPES
-	} m_ColorType;
-	void NextColor();
 	bool m_bHoldNotes;
 	bool m_bDark;
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 90e03c0003..dd495b68a5 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -235,7 +235,6 @@ ScreenEdit::ScreenEdit()
 	GAMESTATE->m_SongOptions.m_fMusicRate = 1;
 	
 	GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed = 1;
-	GAMESTATE->m_PlayerOptions[PLAYER_1].m_ColorType = PlayerOptions::COLOR_NOTE;
 
 	m_BGAnimation.LoadFromAniDir( THEME->GetPathTo("BGAnimations","edit") );