diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 86d719987e..cf581e530e 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -238,21 +238,20 @@ static const DefMappingStruct defaultOuyaMap[] = {
 	{CTRL_CIRCLE         , NKCODE_BUTTON_B},
 	{CTRL_SQUARE         , NKCODE_BUTTON_X},
 	{CTRL_TRIANGLE       , NKCODE_BUTTON_Y},
-	{CTRL_UP             , NKCODE_DPAD_UP}, 
+	{CTRL_UP             , NKCODE_DPAD_UP},
 	{CTRL_RIGHT          , NKCODE_DPAD_RIGHT},
-	{CTRL_DOWN           , NKCODE_DPAD_DOWN}, 
-	{CTRL_LEFT           , NKCODE_DPAD_LEFT}, 
-	{CTRL_START          , NKCODE_BUTTON_START}, 
-	{CTRL_SELECT         , NKCODE_BUTTON_SELECT},
-	{CTRL_LTRIGGER       , NKCODE_BUTTON_L1}, 
-	{CTRL_RTRIGGER       , NKCODE_BUTTON_R1}, 
-	{VIRTKEY_UNTHROTTLE  , NKCODE_BUTTON_R2}, 
+	{CTRL_DOWN           , NKCODE_DPAD_DOWN},
+	{CTRL_LEFT           , NKCODE_DPAD_LEFT},
+	{CTRL_START          , NKCODE_BUTTON_R2},
+	{CTRL_SELECT         , NKCODE_BUTTON_L2},
+	{CTRL_LTRIGGER       , NKCODE_BUTTON_L1},
+	{CTRL_RTRIGGER       , NKCODE_BUTTON_R1},
+	{VIRTKEY_UNTHROTTLE  , NKCODE_BUTTON_THUMBL},
 	{VIRTKEY_PAUSE       , NKCODE_BUTTON_THUMBR},
-	{VIRTKEY_SPEED_TOGGLE, NKCODE_BUTTON_L2}, 
-	{VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1}, 
-	{VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1}, 
-	{VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, -1}, 
-	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, +1}, 
+	{VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1},
+	{VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1},
+	{VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, -1},
+	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, +1},
 };
 
 static const DefMappingStruct defaultXperiaPlay[] = {