14 files changed, 28 insertions, 95 deletions

diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c
index 4108980720..ceacf29b0a 100644
--- a/apps/keymaps/keymap-creativezv.c
+++ b/apps/keymaps/keymap-creativezv.c
@@ -92,14 +92,10 @@ static const struct button_mapping button_context_wps[]  = {
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_POWER,                   BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER,                   BUTTON_NONE },
-#endif
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -113,9 +109,8 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c
index 5d1b25aa8d..b1ddb6320a 100644
--- a/apps/keymaps/keymap-creativezvm.c
+++ b/apps/keymaps/keymap-creativezvm.c
@@ -91,14 +91,10 @@ static const struct button_mapping button_context_wps[]  = {
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_POWER,                   BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER,                   BUTTON_NONE },
-#endif
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_BACK },
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -112,9 +108,8 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL,         BUTTON_NONE },
+
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 343d6b4f9c..5f16d1b292 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -100,17 +100,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,          BUTTON_VOL_UP,                 BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,    BUTTON_BACK|BUTTON_UP,         BUTTON_BACK },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,         BUTTON_BACK|BUTTON_DOWN,       BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST,  BUTTON_BACK|BUTTON_DOWN,       BUTTON_NONE },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,    BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
     { ACTION_WPS_MENU,           BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
     { ACTION_WPS_CONTEXT,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,      BUTTON_BACK|BUTTON_MENU,       BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,         BUTTON_BACK|BUTTON_MENU,       BUTTON_NONE },
     { ACTION_WPS_BROWSE,         BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -138,9 +134,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,BUTTON_NONE,               BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,BUTTON_BACK|BUTTON_MENU,   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 61d0a593c8..b7d09eca7c 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_UP,             BUTTON_A },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_A|BUTTON_DOWN,           BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN,           BUTTON_NONE },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c
index b8de5eb84b..808b1cad72 100644
--- a/apps/keymaps/keymap-hdd1630.c
+++ b/apps/keymaps/keymap-hdd1630.c
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_VIEW|BUTTON_UP,            BUTTON_VIEW },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_VIEW|BUTTON_DOWN,          BUTTON_VIEW },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN,          BUTTON_VIEW },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_VIEW|BUTTON_MENU,          BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_VIEW|BUTTON_MENU,        BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_VIEW|BUTTON_MENU,        BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-hdd6330.c b/apps/keymaps/keymap-hdd6330.c
index b8de5eb84b..808b1cad72 100644
--- a/apps/keymaps/keymap-hdd6330.c
+++ b/apps/keymaps/keymap-hdd6330.c
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_VIEW|BUTTON_UP,            BUTTON_VIEW },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_VIEW|BUTTON_DOWN,          BUTTON_VIEW },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN,          BUTTON_VIEW },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_VIEW|BUTTON_MENU,          BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_VIEW|BUTTON_MENU,        BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_VIEW|BUTTON_MENU,        BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index 23e56e8b6e..c89b60e747 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -69,7 +69,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
     { ACTION_WPS_ABRESET,       BUTTON_PLAY|BUTTON_SELECT,      BUTTON_PLAY },
-    { ACTION_WPS_ID3SCREEN,     BUTTON_PLAY|BUTTON_MODE,        BUTTON_PLAY },
+    { ACTION_WPS_HOTKEY,        BUTTON_PLAY|BUTTON_MODE,        BUTTON_PLAY },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c
index d199b208bb..652b4d80a6 100644
--- a/apps/keymaps/keymap-m200.c
+++ b/apps/keymaps/keymap-m200.c
@@ -78,7 +78,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_MENU,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER  },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },    
     { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_UP,        BUTTON_SELECT },
-    { ACTION_WPS_ID3SCREEN,     BUTTON_SELECT|BUTTON_DOWN,      BUTTON_SELECT },
+    { ACTION_WPS_HOTKEY,        BUTTON_SELECT|BUTTON_DOWN,      BUTTON_SELECT },
     { ACTION_WPS_CONTEXT,       BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN   },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN   },
 /*    { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE   },
@@ -124,6 +124,7 @@ static const struct button_mapping button_context_list[]  = {
 static const struct button_mapping button_context_tree[]  = {
   //    { ACTION_TREE_WPS,          BUTTON_REC|BUTTON_VOLUP,               BUTTON_REC },
   //    { ACTION_TREE_STOP,         BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP },
+    { ACTION_TREE_HOTKEY,       BUTTON_SELECT|BUTTON_DOWN,             BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-meizu-m6sl.c b/apps/keymaps/keymap-meizu-m6sl.c
index c81b25729c..44a58e44d7 100644
--- a/apps/keymaps/keymap-meizu-m6sl.c
+++ b/apps/keymaps/keymap-meizu-m6sl.c
@@ -88,17 +88,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_PLAY|BUTTON_UP,          BUTTON_PLAY },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_PLAY|BUTTON_DOWN,        BUTTON_PLAY },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN,        BUTTON_PLAY },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_PLAY|BUTTON_MENU,          BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_PLAY|BUTTON_MENU,        BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -118,9 +114,7 @@ static const struct button_mapping button_context_list[]  = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
     { ACTION_TREE_STOP,   BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_NONE },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_PLAY|BUTTON_MENU,        BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-mini2440.c b/apps/keymaps/keymap-mini2440.c
index db145aa480..65f6e748a9 100644
--- a/apps/keymaps/keymap-mini2440.c
+++ b/apps/keymaps/keymap-mini2440.c
@@ -95,17 +95,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_UP,             BUTTON_A },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_A|BUTTON_DOWN,           BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN,           BUTTON_NONE },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -133,9 +129,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY, BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY, BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index 5a13f31402..ad0f6eaea6 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -94,12 +94,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT,     BUTTON_NONE },
     { ACTION_WPS_ABRESET,       BUTTON_DISPLAY|BUTTON_SELECT,   BUTTON_NONE },
     { ACTION_WPS_PITCHSCREEN,   BUTTON_DISPLAY|BUTTON_UP,       BUTTON_DISPLAY },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_DISPLAY|BUTTON_DOWN,     BUTTON_DISPLAY },
-#else
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN,     BUTTON_DISPLAY },
-#endif
-    { ACTION_WPS_ID3SCREEN,     BUTTON_DISPLAY|BUTTON_MENU,     BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,        BUTTON_DISPLAY|BUTTON_MENU,     BUTTON_NONE },
 
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
@@ -123,9 +119,7 @@ static const struct button_mapping button_context_tree[]  = {
     { 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 },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,       BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,       BUTTON_DISPLAY|BUTTON_MENU,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c
index 3c98484b26..adee30ec10 100644
--- a/apps/keymaps/keymap-sa9200.c
+++ b/apps/keymaps/keymap-sa9200.c
@@ -100,11 +100,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_CONTEXT,       BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_PITCHSCREEN,   BUTTON_NEXT|BUTTON_REPEAT,      BUTTON_NONE },
-#ifdef HAVE_HOTKEY
     { ACTION_WPS_HOTKEY,        BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT },
-#else
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT },
-#endif
     { ACTION_WPS_ID3SCREEN,     BUTTON_PREV|BUTTON_REPEAT,      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
@@ -128,9 +124,7 @@ static const struct button_mapping button_context_list[]  = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,          BUTTON_PREV|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_TREE_STOP,         BUTTON_NEXT|BUTTON_REPEAT,      BUTTON_NONE },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,       BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,       BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c
index ae0756d1d3..d43aaa6385 100644
--- a/apps/keymaps/keymap-vibe500.c
+++ b/apps/keymaps/keymap-vibe500.c
@@ -66,11 +66,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,     BUTTON_UP,                      BUTTON_NONE },
     { ACTION_WPS_BROWSE,    BUTTON_OK|BUTTON_REL,             BUTTON_OK },
     { ACTION_WPS_CONTEXT,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_CANCEL,              BUTTON_NONE },
-#else
+    { ACTION_WPS_HOTKEY,    BUTTON_REC|BUTTON_REL,          BUTTON_REC  },
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL,              BUTTON_NONE },
-#endif
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_OK|BUTTON_REPEAT,      BUTTON_OK },
 
@@ -80,9 +77,7 @@ static const struct button_mapping button_context_wps[]  = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,          BUTTON_PLAY|BUTTON_REL,      BUTTON_PLAY },
     { ACTION_TREE_STOP,         BUTTON_PLAY|BUTTON_REPEAT,   BUTTON_PLAY },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,       BUTTON_NONE,                 BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,       BUTTON_REC|BUTTON_REL,       BUTTON_REC },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_tree */
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c
index c64263d809..0bc197b9de 100644
--- a/apps/keymaps/keymap-yh8xx_yh9xx.c
+++ b/apps/keymaps/keymap-yh8xx_yh9xx.c
@@ -96,11 +96,8 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_QUICKSCREEN,   BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT,
                                         BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT },
 
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-#else
+    { ACTION_WPS_HOTKEY,        BUTTON_REC|BUTTON_REL,          BUTTON_REC },
     { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT },
-#endif
     { ACTION_WPS_REC,           BUTTON_REC|BUTTON_REPEAT,       BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
@@ -121,9 +118,7 @@ static const struct button_mapping button_context_list[]  = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
     { ACTION_TREE_STOP,         BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,       BUTTON_NONE,                    BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,       BUTTON_REC|BUTTON_REL,          BUTTON_REC },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */