Index: keymap-gigabeat-s.c
===================================================================
--- apps/keymaps/keymap-gigabeat-s.c	(revision 18459)
+++ apps/keymaps/keymap-gigabeat-s.c	(working copy)
@@ -54,12 +54,11 @@
 
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_BACK,                BUTTON_NONE },
 
     { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
 
     { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
-    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_STD_MENU,          BUTTON_BACK|BUTTON_REL,     BUTTON_BACK },
 
     { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
     { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
@@ -70,6 +69,7 @@
 
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_PLAY,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
@@ -99,16 +99,14 @@
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
 
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_UP,          BUTTON_BACK },
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_DOWN,        BUTTON_BACK },
-
-    { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-    { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_BACK|BUTTON_REPEAT,      BUTTON_BACK },
+    { ACTION_WPS_MENU,          BUTTON_BACK|BUTTON_REL,         BUTTON_BACK },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
-
-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_MENU,        BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_BACK|BUTTON_UP,          BUTTON_BACK },
+    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_DOWN,        BUTTON_BACK },
+
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
@@ -131,6 +129,7 @@
 
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_TREE_WPS,    BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
     { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
@@ -174,7 +173,7 @@
     { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                      BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,        BUTTON_BACK,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings */
@@ -210,7 +209,7 @@
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_BACK, BUTTON_NONE },
+    { ACTION_BMS_DELETE,       BUTTON_MENU, BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
@@ -230,7 +229,7 @@
     { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_CANCEL,    BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_STD_CANCEL,    BUTTON_BACK,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_quickscreen */