Sansa, hotkey-bookmark, Clip+&Zip

diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 3a9dbad..8a96956 100644
--- apps/keymaps/keymap-clip.c
+++ apps/keymaps/keymap-clip.c
@@ -83,11 +83,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PITCHSCREEN,   BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_WPS_ID3SCREEN,     BUTTON_SELECT|BUTTON_DOWN,      BUTTON_SELECT },

-#ifdef HAVE_HOTKEY /* down|repeat doesn't work in the file browser */
-    { ACTION_WPS_HOTKEY,        BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-#else
-    { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
-#endif
+    { ACTION_WPS_HOTKEY,        BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN },

 #ifndef HAS_BUTTON_HOLD /* Clip+ */
     { ACTION_STD_KEYLOCK,       BUTTON_HOME|BUTTON_SELECT,      BUTTON_NONE },
@@ -136,9 +132,9 @@ static const struct button_mapping button_context_list[]  = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,    BUTTON_HOME|BUTTON_SELECT,    BUTTON_HOME },
     { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
-#ifdef HAVE_HOTKEY
+//#ifdef HAVE_HOTKEY
 //    { ACTION_TREE_HOTKEY, BUTTON_NONE,                  BUTTON_NONE },
-#endif
+//#endif

     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_tree */
diff --git a/apps/onplay.c b/apps/onplay.c
index 143745d..1e78313 100644
--- apps/onplay.c
+++ apps/onplay.c
@@ -1297,6 +1297,9 @@ static struct hotkey_assignment hotkey_items[] = {
             HOTKEY_FUNC(NULL, NULL),
             ONPLAY_PICTUREFLOW },
 #endif
+    { HOTKEY_BOOKMARK,   LANG_BOOKMARK_MENU_CREATE,
+            HOTKEY_FUNC(bookmark_create_menu, NULL),
+            ONPLAY_OK },
 };

 /* Return the language ID for this action */
diff --git a/apps/onplay.h b/apps/onplay.h
index d24bf56..24637ac 100644
--- apps/onplay.h
+++ apps/onplay.h
@@ -45,6 +45,7 @@ enum hotkey_action {
     HOTKEY_INSERT,
     HOTKEY_INSERT_SHUFFLED,
     HOTKEY_PICTUREFLOW,
+    HOTKEY_BOOKMARK,
 };
 #endif

diff --git a/apps/settings_list.c b/apps/settings_list.c
index 44295ac..57219a4 100644
--- apps/settings_list.c
+++ apps/settings_list.c
@@ -1892,7 +1892,7 @@ const struct settings_list settings[] = {
 #ifdef HAVE_HOTKEY
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps,
         LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps",
-        "off,view playlist,show track info,pitchscreen,open with,delete"
+        "off,view playlist,show track info,pitchscreen,open with,delete,bookmark"
 #ifdef HAVE_PICTUREFLOW_INTEGRATION
         ",pictureflow"
 #endif
@@ -1904,7 +1904,7 @@ const struct settings_list settings[] = {
 #endif
         HOTKEY_OFF,
         HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE
+        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK
 #ifdef HAVE_PICTUREFLOW_INTEGRATION
         , HOTKEY_PICTUREFLOW
 #endif
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 0725431..a59a5f0 100644
--- firmware/export/config/sansaclipplus.h
+++ firmware/export/config/sansaclipplus.h
@@ -221,4 +221,4 @@
 #define DEFAULT_REC_RIGHT_GAIN  23

 /* Define this if a programmable hotkey is mapped */
-//#define HAVE_HOTKEY
+#define HAVE_HOTKEY
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
--- firmware/export/config/sansaclipzip.h
+++ firmware/export/config/sansaclipzip.h
@@ -220,4 +220,4 @@
 #define DEFAULT_REC_RIGHT_GAIN  23

 /* Define this if a programmable hotkey is mapped */
-//#define HAVE_HOTKEY
+#define HAVE_HOTKEY