diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index 33afe90468..9d859d1a97 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -120,21 +120,21 @@ static Game g_Games[NUM_GAMES] =
 			"dance",				// m_szName
 			NUM_DANCE_BUTTONS,			// m_iButtonsPerController
 			{	// m_szButtonNames
-				{ "MenuLeft",	GameButtonType_INVALID,	KEY_DEL,	KEY_KP_SLASH },
-				{ "MenuRight",	GameButtonType_INVALID,	KEY_PGDN,	KEY_KP_ASTERISK },
-				{ "MenuUp",	GameButtonType_INVALID,	KEY_HOME,	KEY_KP_HYPHEN },
-				{ "MenuDown",	GameButtonType_INVALID,	KEY_END,	KEY_KP_PLUS },
-				{ "Start",	GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
-				{ "Select",	GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
-				{ "Back",	GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
-				{ "Coin",	GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
-				{ "Operator",	GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
-				{ "Left",	GameButtonType_Step,	KEY_LEFT,	KEY_KP_C4 },
-				{ "Right",	GameButtonType_Step,	KEY_RIGHT,	KEY_KP_C6 },
-				{ "Up",		GameButtonType_Step,	KEY_UP,		KEY_KP_C8 },
-				{ "Down",	GameButtonType_Step,	KEY_DOWN,	KEY_KP_C2 },
-				{ "UpLeft",	GameButtonType_Step,	NO_DEFAULT_KEY,	KEY_KP_C7 },
-				{ "UpRight",	GameButtonType_Step,	NO_DEFAULT_KEY,	KEY_KP_C9 },
+				{ "MenuLeft",		GameButtonType_INVALID,	KEY_DEL,	KEY_KP_SLASH },
+				{ "MenuRight",		GameButtonType_INVALID,	KEY_PGDN,	KEY_KP_ASTERISK },
+				{ "MenuUp",		GameButtonType_INVALID,	KEY_HOME,	KEY_KP_HYPHEN },
+				{ "MenuDown",		GameButtonType_INVALID,	KEY_END,	KEY_KP_PLUS },
+				{ "Start",		GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
+				{ "Select",		GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
+				{ "Back",		GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
+				{ "Coin",		GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
+				{ "Operator",		GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
+				{ "Left",		GameButtonType_Step,	KEY_LEFT,	KEY_KP_C4 },
+				{ "Right",		GameButtonType_Step,	KEY_RIGHT,	KEY_KP_C6 },
+				{ "Up",			GameButtonType_Step,	KEY_UP,		KEY_KP_C8 },
+				{ "Down",		GameButtonType_Step,	KEY_DOWN,	KEY_KP_C2 },
+				{ "UpLeft",		GameButtonType_Step,	NO_DEFAULT_KEY,	KEY_KP_C7 },
+				{ "UpRight",		GameButtonType_Step,	NO_DEFAULT_KEY,	KEY_KP_C9 },
 			},
 			{	// m_DedicatedMenuButton
 				GAME_BUTTON_MENULEFT,		// MENU_BUTTON_LEFT
@@ -173,20 +173,20 @@ static Game g_Games[NUM_GAMES] =
 			"pump",					// m_szName
 			NUM_PUMP_BUTTONS,			// m_iButtonsPerController
 			{	// m_szButtonNames
-				{ "MenuLeft",	GameButtonType_INVALID,	KEY_LEFT,	NO_DEFAULT_KEY },
-				{ "MenuRight",	GameButtonType_INVALID,	KEY_RIGHT,	NO_DEFAULT_KEY },
-				{ "MenuUp",	GameButtonType_INVALID,	KEY_UP,		NO_DEFAULT_KEY },
-				{ "MenuDown",	GameButtonType_INVALID,	KEY_DOWN,	NO_DEFAULT_KEY },
-				{ "Start",	GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
-				{ "Select",	GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
-				{ "Back",	GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
-				{ "Coin",	GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
-				{ "Operator",	GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
-				{ "UpLeft",	GameButtonType_Step,	KEY_Cq,		KEY_KP_C7 },
-				{ "UpRight",	GameButtonType_Step,	KEY_Ce,		KEY_KP_C9 },
-				{ "Center",	GameButtonType_Step,	KEY_Cs,		KEY_KP_C5 },
-				{ "DownLeft",	GameButtonType_Step,	KEY_Cz,		KEY_KP_C1 },
-				{ "DownRight",	GameButtonType_Step,	KEY_Cc,		KEY_KP_C3 },
+				{ "MenuLeft",		GameButtonType_INVALID,	KEY_LEFT,	NO_DEFAULT_KEY },
+				{ "MenuRight",		GameButtonType_INVALID,	KEY_RIGHT,	NO_DEFAULT_KEY },
+				{ "MenuUp",		GameButtonType_INVALID,	KEY_UP,		NO_DEFAULT_KEY },
+				{ "MenuDown",		GameButtonType_INVALID,	KEY_DOWN,	NO_DEFAULT_KEY },
+				{ "Start",		GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
+				{ "Select",		GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
+				{ "Back",		GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
+				{ "Coin",		GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
+				{ "Operator",		GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
+				{ "UpLeft",		GameButtonType_Step,	KEY_Cq,		KEY_KP_C7 },
+				{ "UpRight",		GameButtonType_Step,	KEY_Ce,		KEY_KP_C9 },
+				{ "Center",		GameButtonType_Step,	KEY_Cs,		KEY_KP_C5 },
+				{ "DownLeft",		GameButtonType_Step,	KEY_Cz,		KEY_KP_C1 },
+				{ "DownRight",		GameButtonType_Step,	KEY_Cc,		KEY_KP_C3 },
 			},
 			{	// m_DedicatedMenuButton
 				GAME_BUTTON_MENULEFT,		// MENU_BUTTON_LEFT
@@ -279,20 +279,20 @@ static Game g_Games[NUM_GAMES] =
 			"para",					// m_szName
 			NUM_PARA_BUTTONS,			// m_iButtonsPerController
 			{	// m_szButtonNames
-				{ "MenuLeft",	GameButtonType_INVALID,	KEY_LEFT,	NO_DEFAULT_KEY },
-				{ "MenuRight",	GameButtonType_INVALID,	KEY_RIGHT,	NO_DEFAULT_KEY },
-				{ "MenuUp",	GameButtonType_INVALID,	KEY_UP,		NO_DEFAULT_KEY },
-				{ "MenuDown",	GameButtonType_INVALID,	KEY_DOWN,	NO_DEFAULT_KEY },
-				{ "Start",	GameButtonType_INVALID,	KEY_ENTER,	NO_DEFAULT_KEY },
-				{ "Select",	GameButtonType_INVALID,	KEY_BACKSLASH,	NO_DEFAULT_KEY },
-				{ "Back",	GameButtonType_INVALID,	KEY_ESC,	NO_DEFAULT_KEY },
-				{ "Coin",	GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
-				{ "Operator",	GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
-				{ "Left",	GameButtonType_Step,	KEY_Cz,		NO_DEFAULT_KEY },
-				{ "UpLeft",	GameButtonType_Step,	KEY_Cx,		NO_DEFAULT_KEY },
-				{ "Up",		GameButtonType_Step,	KEY_Cc,		NO_DEFAULT_KEY },
-				{ "UpRight",	GameButtonType_Step,	KEY_Cv,		NO_DEFAULT_KEY },
-				{ "Right",	GameButtonType_Step,	KEY_Cb,		NO_DEFAULT_KEY },
+				{ "MenuLeft",		GameButtonType_INVALID,	KEY_LEFT,	NO_DEFAULT_KEY },
+				{ "MenuRight",		GameButtonType_INVALID,	KEY_RIGHT,	NO_DEFAULT_KEY },
+				{ "MenuUp",		GameButtonType_INVALID,	KEY_UP,		NO_DEFAULT_KEY },
+				{ "MenuDown",		GameButtonType_INVALID,	KEY_DOWN,	NO_DEFAULT_KEY },
+				{ "Start",		GameButtonType_INVALID,	KEY_ENTER,	NO_DEFAULT_KEY },
+				{ "Select",		GameButtonType_INVALID,	KEY_BACKSLASH,	NO_DEFAULT_KEY },
+				{ "Back",		GameButtonType_INVALID,	KEY_ESC,	NO_DEFAULT_KEY },
+				{ "Coin",		GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
+				{ "Operator",		GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
+				{ "Left",		GameButtonType_Step,	KEY_Cz,		NO_DEFAULT_KEY },
+				{ "UpLeft",		GameButtonType_Step,	KEY_Cx,		NO_DEFAULT_KEY },
+				{ "Up",			GameButtonType_Step,	KEY_Cc,		NO_DEFAULT_KEY },
+				{ "UpRight",		GameButtonType_Step,	KEY_Cv,		NO_DEFAULT_KEY },
+				{ "Right",		GameButtonType_Step,	KEY_Cb,		NO_DEFAULT_KEY },
 			},
 			{	// m_DedicatedMenuButton
 				GAME_BUTTON_MENULEFT,		// MENU_BUTTON_LEFT
@@ -493,24 +493,24 @@ static Game g_Games[NUM_GAMES] =
 			"techno",				// m_szName
 			NUM_TECHNO_BUTTONS,			// m_iButtonsPerController
 			{	// m_szButtonNames
-				{ "MenuLeft",	GameButtonType_INVALID,	KEY_LEFT,	KEY_KP_SLASH },
-				{ "MenuRight",	GameButtonType_INVALID,	KEY_RIGHT,	KEY_KP_ASTERISK },
-				{ "MenuUp",	GameButtonType_INVALID,	KEY_UP,		KEY_KP_HYPHEN },
-				{ "MenuDown",	GameButtonType_INVALID,	KEY_DOWN,	KEY_KP_PLUS },
-				{ "Start",	GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
-				{ "Select",	GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
-				{ "Back",	GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
-				{ "Coin",	GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
-				{ "Operator",	GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
-				{ "Left",	GameButtonType_Step,	KEY_Ca,		KEY_KP_C4 },
-				{ "Right",	GameButtonType_Step,	KEY_Cd,		KEY_KP_C6 },
-				{ "Up",		GameButtonType_Step,	KEY_Cw,		KEY_KP_C8 },
-				{ "Down",	GameButtonType_Step,	KEY_Cx,		KEY_KP_C2 },
-				{ "UpLeft",	GameButtonType_Step,	KEY_Cq,		KEY_KP_C7 },
-				{ "UpRight",	GameButtonType_Step,	KEY_Ce,		KEY_KP_C9 },
-				{ "Center",	GameButtonType_Step,	KEY_Cs,		KEY_KP_C5 },
-				{ "DownLeft",	GameButtonType_Step,	KEY_Cz,		KEY_KP_C1 },
-				{ "DownRight",	GameButtonType_Step,	KEY_Cc,		KEY_KP_C3 },
+				{ "MenuLeft",		GameButtonType_INVALID,	KEY_LEFT,	KEY_KP_SLASH },
+				{ "MenuRight",		GameButtonType_INVALID,	KEY_RIGHT,	KEY_KP_ASTERISK },
+				{ "MenuUp",		GameButtonType_INVALID,	KEY_UP,		KEY_KP_HYPHEN },
+				{ "MenuDown",		GameButtonType_INVALID,	KEY_DOWN,	KEY_KP_PLUS },
+				{ "Start",		GameButtonType_INVALID,	KEY_ENTER,	KEY_KP_ENTER },
+				{ "Select",		GameButtonType_INVALID,	KEY_BACKSLASH,	KEY_KP_C0 },
+				{ "Back",		GameButtonType_INVALID,	KEY_ESC,	KEY_NUMLOCK },
+				{ "Coin",		GameButtonType_INVALID,	KEY_F1,		NO_DEFAULT_KEY },
+				{ "Operator",		GameButtonType_INVALID,	KEY_SCRLLOCK,	NO_DEFAULT_KEY },
+				{ "Left",		GameButtonType_Step,	KEY_Ca,		KEY_KP_C4 },
+				{ "Right",		GameButtonType_Step,	KEY_Cd,		KEY_KP_C6 },
+				{ "Up",			GameButtonType_Step,	KEY_Cw,		KEY_KP_C8 },
+				{ "Down",		GameButtonType_Step,	KEY_Cx,		KEY_KP_C2 },
+				{ "UpLeft",		GameButtonType_Step,	KEY_Cq,		KEY_KP_C7 },
+				{ "UpRight",		GameButtonType_Step,	KEY_Ce,		KEY_KP_C9 },
+				{ "Center",		GameButtonType_Step,	KEY_Cs,		KEY_KP_C5 },
+				{ "DownLeft",		GameButtonType_Step,	KEY_Cz,		KEY_KP_C1 },
+				{ "DownRight",		GameButtonType_Step,	KEY_Cc,		KEY_KP_C3 },
 			},
 			{	// m_DedicatedMenuButton
 				GAME_BUTTON_MENULEFT,		// MENU_BUTTON_LEFT