diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index 071c55377f..c764f51ba7 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -1096,14 +1096,14 @@ GameDef g_GameDefs[NUM_GAMES] =
 		},
 		{	// m_iDefaultKeyboardKey
 			{	// PLAYER_1
-				SDLK_LEFT,				// LIGHTS_BUTTON_MARQUEE_UP_LEFT,
-				SDLK_RIGHT,				// LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
-				SDLK_UP,				// LIGHTS_BUTTON_MARQUEE_LR_LEFT,
-				SDLK_DOWN,				// LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
-				-1, //no default key 	// LIGHTS_BUTTON_BUTTONS_LEFT,
-				-1, //no default key	// LIGHTS_BUTTON_BUTTONS_RIGHT,
-				-1, //no default key 	// LIGHTS_BUTTON_BASS_LEFT,
-				-1, //no default key	// LIGHTS_BUTTON_BASS_RIGHT,
+				SDLK_q,				// LIGHTS_BUTTON_MARQUEE_UP_LEFT,
+				SDLK_w,				// LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
+				SDLK_e,				// LIGHTS_BUTTON_MARQUEE_LR_LEFT,
+				SDLK_r,				// LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
+				SDLK_t,			 	// LIGHTS_BUTTON_BUTTONS_LEFT,
+				SDLK_y,					// LIGHTS_BUTTON_BUTTONS_RIGHT,
+				SDLK_u,					// LIGHTS_BUTTON_BASS_LEFT,
+				SDLK_i,					// LIGHTS_BUTTON_BASS_RIGHT,
 				SDLK_RETURN,			// LIGHTS_BUTTON_START,
 				SDLK_ESCAPE,			// LIGHTS_BUTTON_BACK
 				SDLK_DELETE,			// LIGHTS_BUTTON_MENULEFT
@@ -1114,22 +1114,22 @@ GameDef g_GameDefs[NUM_GAMES] =
 				SDLK_SCROLLOCK			// LIGHTS_BUTTON_OPERATOR
 			},
 			{	// PLAYER_2
-				SDLK_KP4,				// LIGHTS_BUTTON_MARQUEE_UP_LEFT,
-				SDLK_KP6,				// LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
-				SDLK_KP8,				// LIGHTS_BUTTON_MARQUEE_LR_LEFT,
-				SDLK_KP2,				// LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
-				SDLK_KP7,				// LIGHTS_BUTTON_BUTTONS_LEFT,
-				SDLK_KP9,				// LIGHTS_BUTTON_BUTTONS_RIGHT,
-				-1, //no default key 	// LIGHTS_BUTTON_BASS_LEFT,
-				-1, //no default key	// LIGHTS_BUTTON_BASS_RIGHT,
-				SDLK_KP_ENTER,			// LIGHTS_BUTTON_START,
-				SDLK_KP0,				// LIGHTS_BUTTON_BACK
-				SDLK_KP_DIVIDE,			// LIGHTS_BUTTON_MENULEFT
-				SDLK_KP_MULTIPLY,		// LIGHTS_BUTTON_MENURIGHT
-				SDLK_KP_MINUS,			// LIGHTS_BUTTON_MENUUP
-				SDLK_KP_PLUS,			// LIGHTS_BUTTON_MENUDOWN
-				-1,						// LIGHTS_BUTTON_COIN
-				-1						// LIGHTS_BUTTON_OPERATOR
+				-1,	//no default key		// LIGHTS_BUTTON_MARQUEE_UP_LEFT,
+				-1,	//no default key		// LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
+				-1,	//no default key		// LIGHTS_BUTTON_MARQUEE_LR_LEFT,
+				-1,	//no default key		// LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
+				-1,	//no default key		// LIGHTS_BUTTON_BUTTONS_LEFT,
+				-1,	//no default key		// LIGHTS_BUTTON_BUTTONS_RIGHT,
+				-1, //no default key		// LIGHTS_BUTTON_BASS_LEFT,
+				-1, //no default key		// LIGHTS_BUTTON_BASS_RIGHT,
+				-1, //no default key		// LIGHTS_BUTTON_START,
+				-1, //no default key		// LIGHTS_BUTTON_BACK
+				-1, //no default key		// LIGHTS_BUTTON_MENULEFT
+				-1, //no default key		// LIGHTS_BUTTON_MENURIGHT
+				-1, //no default key		// LIGHTS_BUTTON_MENUUP
+				-1, //no default key		// LIGHTS_BUTTON_MENUDOWN
+				-1, //no default key		// LIGHTS_BUTTON_COIN
+				-1, //no default key		// LIGHTS_BUTTON_OPERATOR
 			},
 		}
 	},
@@ -2302,16 +2302,16 @@ StyleDef g_StyleDefs[NUM_STYLES] =
 				{ TRACK_2,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_UP_RIGHT,	-DANCE_COL_SPACING*2.5f },
 				{ TRACK_3,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_LR_LEFT,	-DANCE_COL_SPACING*1.5f },
 				{ TRACK_4,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_LR_RIGHT,	-DANCE_COL_SPACING*0.5f },
-				{ TRACK_5,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BUTTONS_LEFT,		+DANCE_COL_SPACING*0.5f },
-				{ TRACK_6,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BUTTONS_RIGHT,	+DANCE_COL_SPACING*1.5f },
-				{ TRACK_7,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BASS_LEFT,		+DANCE_COL_SPACING*2.5f },
-				{ TRACK_8,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BASS_RIGHT,		+DANCE_COL_SPACING*3.5f },
+				{ TRACK_5,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_BUTTONS_LEFT,		+DANCE_COL_SPACING*0.5f },
+				{ TRACK_6,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_BUTTONS_RIGHT,	+DANCE_COL_SPACING*1.5f },
+				{ TRACK_7,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_BASS_LEFT,		+DANCE_COL_SPACING*2.5f },
+				{ TRACK_8,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_BASS_RIGHT,		+DANCE_COL_SPACING*3.5f },
 			},
 			{	// PLAYER_2
-				{ TRACK_1,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_UP_LEFT,	-DANCE_COL_SPACING*3.5f },
-				{ TRACK_2,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_UP_RIGHT,	-DANCE_COL_SPACING*2.5f },
-				{ TRACK_3,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_LR_LEFT,	-DANCE_COL_SPACING*1.5f },
-				{ TRACK_4,	GAME_CONTROLLER_1,	LIGHTS_BUTTON_MARQUEE_LR_RIGHT,	-DANCE_COL_SPACING*0.5f },
+				{ TRACK_1,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_MARQUEE_UP_LEFT,	-DANCE_COL_SPACING*3.5f },
+				{ TRACK_2,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_MARQUEE_UP_RIGHT,	-DANCE_COL_SPACING*2.5f },
+				{ TRACK_3,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_MARQUEE_LR_LEFT,	-DANCE_COL_SPACING*1.5f },
+				{ TRACK_4,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_MARQUEE_LR_RIGHT,	-DANCE_COL_SPACING*0.5f },
 				{ TRACK_5,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BUTTONS_LEFT,		+DANCE_COL_SPACING*0.5f },
 				{ TRACK_6,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BUTTONS_RIGHT,	+DANCE_COL_SPACING*1.5f },
 				{ TRACK_7,	GAME_CONTROLLER_2,	LIGHTS_BUTTON_BASS_LEFT,		+DANCE_COL_SPACING*2.5f },