diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp
index 89832d0802..8723b09a07 100644
--- a/stepmania/src/ScreenOptionsMenu.cpp
+++ b/stepmania/src/ScreenOptionsMenu.cpp
@@ -27,23 +27,23 @@
 
 
 enum {
-	OM_INPUT = 0,
-	OM_MAPKEYS,
-	OM_MACHINE,
-	OM_GRAPHIC,
+	OM_APPEARANCE = 0,
+	OM_INPUT,
+	OM_CONFIG_KEY_JOY,
 	OM_GAMEPLAY,
-	OM_APPEARANCE,
+	OM_GRAPHIC,
+	OM_MACHINE,
 	OM_SOUND,
 	NUM_OPTIONS_MENU_LINES
 };
 
 OptionRowData g_OptionsMenuLines[NUM_OPTIONS_MENU_LINES] = {
-	{ "",	1, {"Input Options"} },
-	{ "",	1, {"Config Key/Joy"} },
-	{ "",	1, {"Machine Options"} },
-	{ "",	1, {"Graphic Options"} },
-	{ "",	1, {"Gameplay Options"} },
 	{ "",	1, {"Appearance Options"} },
+	{ "",	1, {"Config Key/Joy"} },
+	{ "",	1, {"Input Options"} },
+	{ "",	1, {"Gameplay Options"} },
+	{ "",	1, {"Graphic Options"} },
+	{ "",	1, {"Machine Options"} },
 	{ "",	1, {"Sound Options"} },
 };
 
@@ -100,19 +100,14 @@ void ScreenOptionsMenu::GoToNextState()
 {
 	switch( this->m_iCurrentRow[0] )
 	{
-	case OM_INPUT:		SCREENMAN->SetNewScreen("ScreenInputOptions");		break;
-	case OM_MAPKEYS:	SCREENMAN->SetNewScreen("ScreenMapControllers");	break;
-	case OM_MACHINE:	SCREENMAN->SetNewScreen("ScreenMachineOptions");	break;
-	case OM_GRAPHIC:	SCREENMAN->SetNewScreen("ScreenGraphicOptions");	break;
-	case OM_GAMEPLAY:	SCREENMAN->SetNewScreen("ScreenGameplayOptions");	break;
-	case OM_APPEARANCE:	SCREENMAN->SetNewScreen("ScreenAppearanceOptions");	break;
-	case OM_SOUND:		SCREENMAN->SetNewScreen("ScreenSoundOptions");		break;
-	default:	// Exit
-		SCREENMAN->SetNewScreen("ScreenTitleMenu");
+		case OM_APPEARANCE:		SCREENMAN->SetNewScreen("ScreenAppearanceOptions");	break;
+		case OM_CONFIG_KEY_JOY:	SCREENMAN->SetNewScreen("ScreenMapControllers");	break;
+		case OM_GAMEPLAY:		SCREENMAN->SetNewScreen("ScreenGameplayOptions");	break;
+		case OM_GRAPHIC:		SCREENMAN->SetNewScreen("ScreenGraphicOptions");	break;
+		case OM_INPUT:			SCREENMAN->SetNewScreen("ScreenInputOptions");		break;
+		case OM_MACHINE:		SCREENMAN->SetNewScreen("ScreenMachineOptions");	break;
+		case OM_SOUND:			SCREENMAN->SetNewScreen("ScreenSoundOptions");		break;
+		default:	// Exit
+			SCREENMAN->SetNewScreen("ScreenTitleMenu");
 	}
-}
-
-
-
-
-
+}
\ No newline at end of file