Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 13316)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -51,7 +51,7 @@
     { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_A,                   BUTTON_NONE },
 
     { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
 
@@ -66,8 +66,8 @@
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
-    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_WPS_PLAY,          BUTTON_POWER|BUTTON_REL,           BUTTON_POWER },
+    { ACTION_WPS_STOP,          BUTTON_A|BUTTON_REL,               BUTTON_A },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
     { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
@@ -98,7 +98,7 @@
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
     { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,          BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_A|BUTTON_REL,       BUTTON_A },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -121,10 +121,10 @@
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_A|BUTTON_REL,         BUTTON_A },
-    { 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 },
+    { ACTION_TREE_WPS,    BUTTON_POWER|BUTTON_REL,         BUTTON_POWER },
+    { ACTION_TREE_STOP,   BUTTON_A,                   BUTTON_NONE },
+    { ACTION_TREE_STOP,   BUTTON_A|BUTTON_REL,        BUTTON_A },
+    { ACTION_TREE_STOP,   BUTTON_A|BUTTON_REPEAT,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
Index: firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
===================================================================
--- firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c	(revision 13316)
+++ firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c	(working copy)
@@ -34,7 +34,7 @@
 static int const remote_buttons[] =
 {
     BUTTON_NONE,    /* Headphones connected - remote disconnected */
-    BUTTON_SELECT,
+    BUTTON_POWER,
     BUTTON_MENU,    /* could be changed to BUTTON_A */
     BUTTON_LEFT,
     BUTTON_RIGHT,