Index: rockbox-devel/apps/keymaps/keymap-x5.c
===================================================================
--- rockbox-devel.orig/apps/keymaps/keymap-x5.c
+++ rockbox-devel/apps/keymaps/keymap-x5.c
@@ -77,7 +77,10 @@ const struct button_mapping remote_butto
 const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_BMS_SELECT,       BUTTON_SELECT,            BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_PLAY,              BUTTON_NONE },
+    { ACTION_BMS_SELECT,       BUTTON_RIGHT,             BUTTON_NONE },
     { ACTION_BMS_EXIT,         BUTTON_REC|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_BMS_EXIT,         BUTTON_LEFT,              BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
@@ -333,6 +336,7 @@ const struct button_mapping remote_butto
 /** Yes/No Screen **/
 const struct button_mapping button_context_yesnoscreen[]  = {
     { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,              BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT,          BUTTON_PLAY,                BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesnoscreen */