MPIO HD200: rename button defines to adhere how they are labeled on the device.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28443 a1c6a512-1295-4272-9138-f99709370657

51 files changed, 226 insertions, 226 deletions

diff --git a/apps/keymaps/keymap-mpio-hd200.c b/apps/keymaps/keymap-mpio-hd200.c
index 7286c3789c..908a0e8f74 100644
--- a/apps/keymaps/keymap-mpio-hd200.c
+++ b/apps/keymaps/keymap-mpio-hd200.c
@@ -35,13 +35,13 @@
  *****************************************************************************/
 
 static const struct button_mapping button_context_standard[]  = {
-    { ACTION_STD_PREV,           BUTTON_PREV,                   BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,     BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_NEXT,           BUTTON_NEXT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,     BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_OK,             BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_STD_PREV,           BUTTON_REW,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_FF,                     BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_OK,             BUTTON_FUNC|BUTTON_REL,        BUTTON_FUNC },
     { ACTION_STD_CANCEL,         BUTTON_REC|BUTTON_REL,         BUTTON_REC },
-    { ACTION_STD_CONTEXT,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+    { ACTION_STD_CONTEXT,        BUTTON_FUNC|BUTTON_REPEAT,     BUTTON_FUNC },
     { ACTION_STD_MENU,           BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
 /*  { ACTION_STD_QUICKSCREEN,    BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_STD_KEYLOCK,        BUTTON_,                       BUTTON_ }, */
@@ -64,14 +64,14 @@ static const struct button_mapping button_context_tree[]  = {
 }; /* button_context_tree */
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_BROWSE,         BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_WPS_BROWSE,         BUTTON_FUNC|BUTTON_REL,        BUTTON_FUNC },
     { ACTION_WPS_PLAY,           BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
-    { ACTION_WPS_SEEKBACK,       BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,        BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,       BUTTON_PREV|BUTTON_REL,        BUTTON_PREV|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,       BUTTON_NEXT|BUTTON_REL,        BUTTON_NEXT|BUTTON_REPEAT },
-    { ACTION_WPS_SKIPNEXT,       BUTTON_NEXT|BUTTON_REL,        BUTTON_NEXT },
-    { ACTION_WPS_SKIPPREV,       BUTTON_PREV|BUTTON_REL,        BUTTON_PREV },
+    { ACTION_WPS_SEEKBACK,       BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,        BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,       BUTTON_REW|BUTTON_REL,         BUTTON_REW|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,       BUTTON_FF|BUTTON_REL,          BUTTON_FF|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,       BUTTON_FF|BUTTON_REL,          BUTTON_FF },
+    { ACTION_WPS_SKIPPREV,       BUTTON_REW|BUTTON_REL,         BUTTON_REW },
     { ACTION_WPS_STOP,           BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
     { ACTION_WPS_VOLDOWN,        BUTTON_VOL_DOWN,               BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,        BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -79,7 +79,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,          BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
 /*  { ACTION_WPS_PITCHSCREEN,    BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_WPS_ID3SCREEN,      BUTTON_,                       BUTTON_ }, */ 
-    { ACTION_WPS_CONTEXT,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+    { ACTION_WPS_CONTEXT,        BUTTON_FUNC|BUTTON_REPEAT,     BUTTON_FUNC },
     { ACTION_WPS_QUICKSCREEN,    BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
     { ACTION_WPS_MENU,           BUTTON_REC|BUTTON_REL,         BUTTON_REC },
 /*  { ACTION_WPS_VIEW_PLAYLIST,  BUTTON_,                       BUTTON_ }, */
@@ -104,7 +104,7 @@ static const struct button_mapping button_context_settings[]  = {
 }; /* button_context_settings */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,       BUTTON_SELECT,                 BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT,       BUTTON_FUNC,                   BUTTON_NONE },
     { ACTION_YESNO_ACCEPT,       BUTTON_PLAY,                   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
@@ -121,10 +121,10 @@ static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_LEFT,            BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_QS_RIGHT,           BUTTON_VOL_UP,                 BUTTON_NONE },
     { ACTION_QS_RIGHT,           BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_QS_DOWN,            BUTTON_NEXT,                   BUTTON_NONE },
-    { ACTION_QS_DOWN,            BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_QS_TOP,             BUTTON_PREV,                   BUTTON_NONE },
-    { ACTION_QS_TOP,             BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_QS_DOWN,            BUTTON_FF,                     BUTTON_NONE },
+    { ACTION_QS_DOWN,            BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_QS_TOP,             BUTTON_REW,                    BUTTON_NONE },
+    { ACTION_QS_TOP,             BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_quickscreen */
@@ -134,26 +134,26 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_INC_BIG,         BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_PS_DEC_SMALL,       BUTTON_VOL_DOWN,               BUTTON_NONE },
     { ACTION_PS_DEC_BIG,         BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFT,      BUTTON_PREV,                   BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHT,     BUTTON_NEXT,                   BUTTON_NONE },
-    { ACTION_PS_NUDGE_LEFTOFF,   BUTTON_PREV|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_PS_NUDGE_RIGHTOFF,  BUTTON_NEXT|BUTTON_REL,        BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,      BUTTON_REW,                    BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,     BUTTON_FF,                     BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,   BUTTON_REW|BUTTON_REL,         BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF,  BUTTON_FF|BUTTON_REL,          BUTTON_NONE },
     { ACTION_PS_TOGGLE_MODE,     BUTTON_PLAY,                   BUTTON_NONE },
-    { ACTION_PS_RESET,           BUTTON_SELECT,                 BUTTON_NONE },
+    { ACTION_PS_RESET,           BUTTON_FUNC,                   BUTTON_NONE },
     { ACTION_PS_EXIT,            BUTTON_REC,                    BUTTON_NONE },
-    { ACTION_PS_SLOWER,          BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_PS_FASTER,          BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_PS_SLOWER,          BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_PS_FASTER,          BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_pitchscreen */
 
 static const struct button_mapping button_context_radio[]  = {
-    { ACTION_FM_MENU,            BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_FM_PRESET,          BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_FM_MENU,            BUTTON_FUNC|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_FM_PRESET,          BUTTON_FUNC|BUTTON_REL,        BUTTON_FUNC },
 /*  { ACTION_FM_RECORD,          BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_FM_FREEZE,          BUTTON_,                       BUTTON_ }, */
     { ACTION_FM_STOP,            BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
-    { ACTION_FM_MODE,            BUTTON_SELECT,                 BUTTON_NONE },
+    { ACTION_FM_MODE,            BUTTON_FUNC,                   BUTTON_NONE },
     { ACTION_FM_EXIT,            BUTTON_REC|BUTTON_REL,         BUTTON_REC },
     { ACTION_FM_PLAY,            BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
 /*  { ACTION_FM_RECORD_DBLPRE,   BUTTON_,                       BUTTON_ }, */
@@ -166,7 +166,7 @@ static const struct button_mapping button_context_radio[]  = {
 static const struct button_mapping button_context_recscreen[]  = {
 /*  { ACTION_REC_LCD,            BUTTON_,                       BUTTON_ }, */
     { ACTION_REC_PAUSE,          BUTTON_PLAY,                   BUTTON_NONE },
-    { ACTION_REC_NEWFILE,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
+    { ACTION_REC_NEWFILE,        BUTTON_FUNC|BUTTON_REPEAT,     BUTTON_FUNC },
 /*  { ACTION_REC_F2,             BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_REC_F3,             BUTTON_,                       BUTTON_ }, */
 
@@ -180,17 +180,17 @@ static const struct button_mapping button_context_keyboard[]  = {
     { ACTION_KBD_RIGHT,          BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
 /*  { ACTION_KBD_CURSOR_LEFT,    BUTTON_,                       BUTTON_ }, */
 /*  { ACTION_KBD_CURSOR_RIGHT,   BUTTON_,                       BUTTON_ }, */
-    { ACTION_KBD_SELECT,         BUTTON_SELECT,                 BUTTON_NONE },
+    { ACTION_KBD_SELECT,         BUTTON_FUNC,                   BUTTON_NONE },
     { ACTION_KBD_PAGE_FLIP,      BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
     { ACTION_KBD_DONE,           BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
     { ACTION_KBD_ABORT,          BUTTON_REC|BUTTON_REL,         BUTTON_REC },
 /*  { ACTION_KBD_BACKSPACE,      BUTTON_,                       BUTTON_ }, */
-    { ACTION_KBD_UP,             BUTTON_PREV,                   BUTTON_NONE },
-    { ACTION_KBD_UP,             BUTTON_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_KBD_DOWN,           BUTTON_NEXT,                   BUTTON_NONE },
-    { ACTION_KBD_DOWN,           BUTTON_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_KBD_UP,             BUTTON_REW,                    BUTTON_NONE },
+    { ACTION_KBD_UP,             BUTTON_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_DOWN,           BUTTON_FF,                     BUTTON_NONE },
+    { ACTION_KBD_DOWN,           BUTTON_FF|BUTTON_REPEAT,       BUTTON_NONE },
     { ACTION_KBD_MORSE_INPUT,    BUTTON_REC|BUTTON_REPEAT,      BUTTON_REC },
-    { ACTION_KBD_MORSE_SELECT,   BUTTON_SELECT|BUTTON_REL,      BUTTON_NONE },
+    { ACTION_KBD_MORSE_SELECT,   BUTTON_FUNC|BUTTON_REL,        BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
@@ -200,14 +200,14 @@ static const struct button_mapping button_context_keyboard[]  = {
  *****************************************************************************/
 
 static const struct button_mapping button_rc_context_standard[]  = {
-    { ACTION_STD_PREV,           BUTTON_RC_PREV,                   BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,     BUTTON_RC_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_NEXT,           BUTTON_RC_NEXT,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,     BUTTON_RC_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_OK,             BUTTON_RC_SELECT|BUTTON_REL,      BUTTON_RC_SELECT },
-    { ACTION_STD_CANCEL,         BUTTON_RC_PLAY|BUTTON_RC_SELECT,  BUTTON_RC_SELECT },
-    { ACTION_STD_CONTEXT,        BUTTON_RC_SELECT|BUTTON_REPEAT,   BUTTON_RC_SELECT },
-    { ACTION_STD_MENU,           BUTTON_RC_SELECT|BUTTON_RC_PLAY,  BUTTON_RC_SELECT },
+    { ACTION_STD_PREV,           BUTTON_RC_REW,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,     BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,           BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,     BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_OK,             BUTTON_RC_FUNC|BUTTON_REL,        BUTTON_RC_FUNC },
+    { ACTION_STD_CANCEL,         BUTTON_RC_PLAY|BUTTON_RC_FUNC,    BUTTON_RC_FUNC },
+    { ACTION_STD_CONTEXT,        BUTTON_RC_FUNC|BUTTON_REPEAT,     BUTTON_RC_FUNC },
+    { ACTION_STD_MENU,           BUTTON_RC_FUNC|BUTTON_RC_PLAY,    BUTTON_RC_FUNC },
 /*  { ACTION_STD_QUICKSCREEN,    BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_STD_KEYLOCK,        BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_STD_REC,            BUTTON_,                          BUTTON_ }, */
@@ -229,14 +229,14 @@ static const struct button_mapping button_rc_context_tree[]  = {
 }; /* button_context_tree */
 
 static const struct button_mapping button_rc_context_wps[]  = {
-    { ACTION_WPS_BROWSE,         BUTTON_RC_SELECT|BUTTON_REL,      BUTTON_RC_SELECT },
+    { ACTION_WPS_BROWSE,         BUTTON_RC_FUNC|BUTTON_REL,        BUTTON_RC_FUNC },
     { ACTION_WPS_PLAY,           BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_RC_PLAY },
-    { ACTION_WPS_SEEKBACK,       BUTTON_RC_PREV|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_SEEKFWD,        BUTTON_RC_NEXT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_STOPSEEK,       BUTTON_RC_PREV|BUTTON_REL,        BUTTON_RC_PREV|BUTTON_REPEAT },
-    { ACTION_WPS_STOPSEEK,       BUTTON_RC_NEXT|BUTTON_REL,        BUTTON_RC_NEXT|BUTTON_REPEAT },
-    { ACTION_WPS_SKIPNEXT,       BUTTON_RC_NEXT|BUTTON_REL,        BUTTON_RC_NEXT },
-    { ACTION_WPS_SKIPPREV,       BUTTON_RC_PREV|BUTTON_REL,        BUTTON_RC_PREV },
+    { ACTION_WPS_SEEKBACK,       BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,        BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,       BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,       BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,       BUTTON_RC_FF|BUTTON_REL,          BUTTON_RC_FF },
+    { ACTION_WPS_SKIPPREV,       BUTTON_RC_REW|BUTTON_REL,         BUTTON_RC_REW },
     { ACTION_WPS_STOP,           BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_RC_PLAY },
     { ACTION_WPS_VOLDOWN,        BUTTON_RC_VOL_DOWN,               BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,        BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -244,9 +244,9 @@ static const struct button_mapping button_rc_context_wps[]  = {
     { ACTION_WPS_VOLUP,          BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
 /*  { ACTION_WPS_PITCHSCREEN,    BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_WPS_ID3SCREEN,      BUTTON_,                          BUTTON_ }, */ 
-    { ACTION_WPS_CONTEXT,        BUTTON_RC_SELECT|BUTTON_REPEAT,   BUTTON_RC_SELECT },
+    { ACTION_WPS_CONTEXT,        BUTTON_RC_FUNC|BUTTON_REPEAT,     BUTTON_RC_FUNC },
 /*  { ACTION_WPS_QUICKSCREEN,    BUTTON_REC|BUTTON_REL,            BUTTON_REC }, */
-    { ACTION_WPS_MENU,           BUTTON_RC_SELECT|BUTTON_RC_PLAY,  BUTTON_RC_SELECT },
+    { ACTION_WPS_MENU,           BUTTON_RC_FUNC|BUTTON_RC_PLAY,    BUTTON_RC_FUNC },
 /*  { ACTION_WPS_VIEW_PLAYLIST,  BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_WPS_REC,            BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_WPS_ABSETA_PREVDIR, BUTTON_,                          BUTTON_ }, */
@@ -269,20 +269,20 @@ static const struct button_mapping button_rc_context_settings[]  = {
 }; /* button_context_settings */
 
 static const struct button_mapping button_rc_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,       BUTTON_RC_SELECT,                 BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT,       BUTTON_RC_FUNC,                   BUTTON_NONE },
     { ACTION_YESNO_ACCEPT,       BUTTON_RC_PLAY,                   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_yesno */
 
 static const struct button_mapping button_rc_context_radio[]  = {
-    { ACTION_FM_MENU,            BUTTON_RC_SELECT|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_FM_PRESET,          BUTTON_RC_SELECT|BUTTON_REL,      BUTTON_SELECT },
+    { ACTION_FM_MENU,            BUTTON_RC_FUNC|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_FM_PRESET,          BUTTON_RC_FUNC|BUTTON_REL,        BUTTON_FUNC },
 /*  { ACTION_FM_RECORD,          BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_FM_FREEZE,          BUTTON_,                          BUTTON_ }, */
     { ACTION_FM_STOP,            BUTTON_RC_PLAY|BUTTON_REPEAT,     BUTTON_PLAY },
-    { ACTION_FM_MODE,            BUTTON_RC_SELECT,                 BUTTON_NONE },
-    { ACTION_FM_EXIT,            BUTTON_RC_SELECT|BUTTON_RC_PLAY,  BUTTON_RC_SELECT },
+    { ACTION_FM_MODE,            BUTTON_RC_FUNC,                   BUTTON_NONE },
+    { ACTION_FM_EXIT,            BUTTON_RC_FUNC|BUTTON_RC_PLAY,    BUTTON_RC_FUNC },
     { ACTION_FM_PLAY,            BUTTON_RC_PLAY|BUTTON_REL,        BUTTON_PLAY },
 /*  { ACTION_FM_RECORD_DBLPRE,   BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_FM_NEXT_PRESET,     BUTTON_,                          BUTTON_ }, */
@@ -294,7 +294,7 @@ static const struct button_mapping button_rc_context_radio[]  = {
 static const struct button_mapping button_rc_context_recscreen[]  = {
 /*  { ACTION_REC_LCD,            BUTTON_,                          BUTTON_ }, */
     { ACTION_REC_PAUSE,          BUTTON_RC_PLAY,                   BUTTON_NONE },
-    { ACTION_REC_NEWFILE,        BUTTON_RC_SELECT|BUTTON_REPEAT,   BUTTON_RC_SELECT },
+    { ACTION_REC_NEWFILE,        BUTTON_RC_FUNC|BUTTON_REPEAT,     BUTTON_RC_FUNC },
 /*  { ACTION_REC_F2,             BUTTON_,                          BUTTON_ }, */
 /*  { ACTION_REC_F3,             BUTTON_,                          BUTTON_ }, */
 
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 42f73ff47c..1cd28bed8c 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -405,17 +405,17 @@ enum {
 #define BJACK_LEFT          BUTTON_PREV
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define BJACK_SELECT_NAME    "SELECT"
-#define BJACK_STAY_NAME     "RIGHT"
+#define BJACK_SELECT_NAME   "FUNC"
+#define BJACK_STAY_NAME     "VOL +"
 #define BJACK_RESUME_NAME   "PLAY"
 #define BJACK_QUIT_NAME     "REC+PLAY"
-#define BJACK_DOUBLE_NAME   "LEFT"
-#define BJACK_SELECT        BUTTON_SELECT
+#define BJACK_DOUBLE_NAME   "VOL -"
+#define BJACK_SELECT        BUTTON_FUNC
 #define BJACK_QUIT          (BUTTON_REC|BUTTON_PLAY)
 #define BJACK_STAY          BUTTON_VOL_UP
 #define BJACK_DOUBLEDOWN    BUTTON_VOL_DOWN
-#define BJACK_UP            BUTTON_PREV
-#define BJACK_DOWN          BUTTON_NEXT
+#define BJACK_UP            BUTTON_REW
+#define BJACK_DOWN          BUTTON_FF
 #define BJACK_RIGHT         BUTTON_VOL_UP
 #define BJACK_LEFT          BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 65d46b7522..4a803a3e7f 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -215,10 +215,10 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define BOUNCE_LEFT BUTTON_VOL_DOWN
 #define BOUNCE_RIGHT BUTTON_VOL_UP
-#define BOUNCE_UP   BUTTON_PREV
-#define BOUNCE_DOWN BUTTON_NEXT
+#define BOUNCE_UP   BUTTON_REW
+#define BOUNCE_DOWN BUTTON_FF
 #define BOUNCE_QUIT (BUTTON_REC | BUTTON_PLAY)
-#define BOUNCE_MODE BUTTON_SELECT
+#define BOUNCE_MODE BUTTON_FUNC
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 2a025d750b..292eba25c0 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -247,9 +247,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define QUIT (BUTTON_REC|BUTTON_PLAY)
 #define LEFT BUTTON_VOL_DOWN
 #define RIGHT BUTTON_VOL_UP
-#define SELECT BUTTON_SELECT
-#define UP BUTTON_PREV
-#define DOWN BUTTON_NEXT
+#define SELECT BUTTON_FUNC
+#define UP BUTTON_REW
+#define DOWN BUTTON_FF
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 749c4af698..0507ce81d6 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -392,10 +392,10 @@ F3: equal to "="
 #define CALCULATOR_CLEAR BUTTON_CANCEL
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define CALCULATOR_LEFT  BUTTON_PREV
-#define CALCULATOR_RIGHT BUTTON_NEXT
+#define CALCULATOR_LEFT  BUTTON_REW
+#define CALCULATOR_RIGHT BUTTON_FF
 #define CALCULATOR_QUIT  (BUTTON_REC|BUTTON_PLAY)
-#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_INPUT BUTTON_FUNC
 #define CALCULATOR_CALC  BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index adc73a3749..129b6780f8 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -270,9 +270,9 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define CALENDAR_QUIT       (BUTTON_REC|BUTTON_PLAY)
-#define CALENDAR_SELECT     BUTTON_SELECT
-#define CALENDAR_NEXT_WEEK  BUTTON_NEXT
-#define CALENDAR_PREV_WEEK  BUTTON_PREV
+#define CALENDAR_SELECT     BUTTON_FUNC
+#define CALENDAR_NEXT_WEEK  BUTTON_FF
+#define CALENDAR_PREV_WEEK  BUTTON_REW
 #define CALENDAR_NEXT_DAY   BUTTON_VOL_UP
 #define CALENDAR_PREV_DAY   BUTTON_VOL_DOWN
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index ee28a4fd55..2ae27e901f 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -367,14 +367,14 @@
 #define CB_MENU    BUTTON_MENU
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define CB_SELECT  BUTTON_SELECT
-#define CB_UP      BUTTON_PREV
-#define CB_DOWN    BUTTON_NEXT
+#define CB_SELECT  BUTTON_FUNC
+#define CB_UP      BUTTON_REW
+#define CB_DOWN    BUTTON_FF
 #define CB_LEFT    BUTTON_VOL_DOWN
 #define CB_RIGHT   BUTTON_VOL_UP
 #define CB_PLAY    BUTTON_PLAY
 #define CB_LEVEL   BUTTON_REC
-#define CB_MENU    (BUTTON_SELECT | BUTTON_REPEAT)
+#define CB_MENU    (BUTTON_FUNC | BUTTON_REPEAT)
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 4e6965072a..8711308fc1 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -289,11 +289,11 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define CHC_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define CHC_STARTSTOP BUTTON_PLAY
-#define CHC_RESET BUTTON_PREV
-#define CHC_MENU BUTTON_SELECT
+#define CHC_RESET BUTTON_REW
+#define CHC_MENU BUTTON_FUNC
 #define CHC_SETTINGS_INC BUTTON_VOL_UP
 #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN
-#define CHC_SETTINGS_OK BUTTON_SELECT
+#define CHC_SETTINGS_OK BUTTON_FUNC
 #define CHC_SETTINGS_CANCEL BUTTON_REC
 
 #else
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index cca6229a3f..b8f2ed469f 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1139,8 +1139,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 
 #define CHIP8_OFF  (BUTTON_REC|BUTTON_PLAY)
-#define CHIP8_KEY2 BUTTON_PREV
-#define CHIP8_KEY4 BUTTON_NEXT
+#define CHIP8_KEY2 BUTTON_REW
+#define CHIP8_KEY4 BUTTON_FF
 #define CHIP8_KEY5 BUTTON_PLAY
 #define CHIP8_KEY6 BUTTON_VOL_DOWN
 #define CHIP8_KEY8 BUTTON_VOL_UP
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 8712a58a4c..e0959c6672 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -165,8 +165,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define QUIT (BUTTON_REC|BUTTON_PLAY)
-#define ACTION BUTTON_SELECT
-#define ACTIONTEXT "SELECT"
+#define ACTION BUTTON_FUNC
+#define ACTIONTEXT "FUNC"
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 853286edb8..3fafab05b8 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -281,13 +281,13 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define CUBE_QUIT          (BUTTON_REC | BUTTON_PLAY)
-#define CUBE_NEXT          BUTTON_NEXT
-#define CUBE_PREV          BUTTON_PREV
+#define CUBE_NEXT          BUTTON_FF
+#define CUBE_PREV          BUTTON_REW
 #define CUBE_INC           BUTTON_VOL_UP
 #define CUBE_DEC           BUTTON_VOL_DOWN
 #define CUBE_MODE          BUTTON_REC
 #define CUBE_PAUSE         BUTTON_PLAY
-#define CUBE_HIGHSPEED     BUTTON_SELECT
+#define CUBE_HIGHSPEED     BUTTON_FUNC
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 7758ca3fea..63b4b18919 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -371,12 +371,12 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_POWER
 #define DOOMBUTTON_WEAPON  BUTTON_PLAY
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define DOOMBUTTON_UP      BUTTON_PREV
-#define DOOMBUTTON_DOWN    BUTTON_NEXT
+#define DOOMBUTTON_UP      BUTTON_REW
+#define DOOMBUTTON_DOWN    BUTTON_FF
 #define DOOMBUTTON_LEFT    BUTTON_VOL_DOWN
 #define DOOMBUTTON_RIGHT   BUTTON_VOL_UP
-#define DOOMBUTTON_SHOOT   BUTTON_SELECT
-#define DOOMBUTTON_OPEN    (BUTTON_SELECT|BUTTON_PLAY)
+#define DOOMBUTTON_SHOOT   BUTTON_FUNC
+#define DOOMBUTTON_OPEN    (BUTTON_FUNC|BUTTON_PLAY)
 #define DOOMBUTTON_ESC     BUTTON_REC
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 70bea5228c..b895a4f864 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -216,10 +216,10 @@ GREY_INFO_STRUCT
 #   define FFT_QUIT         BUTTON_REC
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#   define FFT_PREV_GRAPH   BUTTON_PREV
-#   define FFT_NEXT_GRAPH   BUTTON_NEXT
+#   define FFT_PREV_GRAPH   BUTTON_REW
+#   define FFT_NEXT_GRAPH   BUTTON_FF
 #   define FFT_ORIENTATION  BUTTON_REC
-#   define FFT_WINDOW       BUTTON_SELECT
+#   define FFT_WINDOW       BUTTON_FUNC
 #   define FFT_AMP_SCALE    BUTTON_PLAY
 #   define FFT_QUIT        (BUTTON_REC | BUTTON_PLAY)
 
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c
index 077bd67167..ea7fb11cfd 100644
--- a/apps/plugins/fireworks.c
+++ b/apps/plugins/fireworks.c
@@ -120,7 +120,7 @@
 
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)
 #define BTN_MENU BUTTON_REC
-#define BTN_FIRE BUTTON_SELECT
+#define BTN_FIRE BUTTON_PLAY
 
 #elif defined(HAVE_TOUCHSCREEN)
     /* This is a touchscreen target */
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 2bc4a1ff97..897f8bd061 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -324,13 +324,13 @@
 
 #define FLIPIT_LEFT         BUTTON_VOL_DOWN
 #define FLIPIT_RIGHT        BUTTON_VOL_UP
-#define FLIPIT_UP           BUTTON_PREV
-#define FLIPIT_DOWN         BUTTON_NEXT
+#define FLIPIT_UP           BUTTON_REW
+#define FLIPIT_DOWN         BUTTON_FF
 #define FLIPIT_QUIT         (BUTTON_REC|BUTTON_PLAY)
-#define FLIPIT_SHUFFLE      BUTTON_SELECT
+#define FLIPIT_SHUFFLE      BUTTON_FUNC
 #define FLIPIT_SOLVE        BUTTON_REC
-#define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_PREV)
-#define FLIPIT_TOGGLE       (BUTTON_PLAY|BUTTON_NEXT)
+#define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_REW)
+#define FLIPIT_TOGGLE       (BUTTON_PLAY|BUTTON_FF)
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index 557dde470a..df58bef8c1 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -320,12 +320,12 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define FRACTAL_QUIT            (BUTTON_REC | BUTTON_PLAY)
-#define FRACTAL_UP              BUTTON_PREV
-#define FRACTAL_DOWN            BUTTON_NEXT
+#define FRACTAL_UP              BUTTON_REW
+#define FRACTAL_DOWN            BUTTON_FF
 #define FRACTAL_LEFT            BUTTON_VOL_DOWN
 #define FRACTAL_RIGHT           BUTTON_VOL_UP
-#define FRACTAL_ZOOM_IN         (BUTTON_PLAY|BUTTON_NEXT)
-#define FRACTAL_ZOOM_OUT        (BUTTON_PLAY|BUTTON_PREV)
+#define FRACTAL_ZOOM_IN         (BUTTON_PLAY|BUTTON_FF)
+#define FRACTAL_ZOOM_OUT        (BUTTON_PLAY|BUTTON_REW)
 #define FRACTAL_PRECISION_INC   (BUTTON_PLAY | BUTTON_VOL_UP)
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_VOL_DOWN)
 #define FRACTAL_RESET           BUTTON_REC
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 978812ac65..fab4f1d766 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -310,14 +310,14 @@
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_CANCEL
 
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)
-#define  GBN_BUTTON_UP                 BUTTON_PREV
-#define  GBN_BUTTON_DOWN               BUTTON_NEXT
+#define  GBN_BUTTON_UP                 BUTTON_REW
+#define  GBN_BUTTON_DOWN               BUTTON_FF
 #define  GBN_BUTTON_LEFT               BUTTON_VOL_DOWN
 #define  GBN_BUTTON_RIGHT              BUTTON_VOL_UP
 #define  GBN_BUTTON_RETREAT            BUTTON_REC
 #define  GBN_BUTTON_ADVANCE            BUTTON_PLAY
-#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
-#define  GBN_BUTTON_MENU               BUTTON_SELECT | BUTTON_REPEAT
+#define  GBN_BUTTON_PLAY               BUTTON_FUNC | BUTTON_REL
+#define  GBN_BUTTON_MENU               BUTTON_FUNC | BUTTON_REPEAT
 
 #else
 #error Unsupported keypad
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h
index 6c137cc47f..3e4e16a9aa 100644
--- a/apps/plugins/imageviewer/imageviewer.h
+++ b/apps/plugins/imageviewer/imageviewer.h
@@ -319,13 +319,13 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define IMGVIEW_ZOOM_IN     (BUTTON_REC|BUTTON_VOL_UP)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_REC|BUTTON_VOL_DOWN)
-#define IMGVIEW_UP          BUTTON_PREV
-#define IMGVIEW_DOWN        BUTTON_NEXT
+#define IMGVIEW_UP          BUTTON_REW
+#define IMGVIEW_DOWN        BUTTON_FF
 #define IMGVIEW_LEFT        BUTTON_VOL_DOWN
 #define IMGVIEW_RIGHT       BUTTON_VOL_UP
-#define IMGVIEW_NEXT        (BUTTON_REC | BUTTON_NEXT)
-#define IMGVIEW_PREVIOUS    (BUTTON_REC | BUTTON_PREV)
-#define IMGVIEW_MENU        BUTTON_SELECT
+#define IMGVIEW_NEXT        (BUTTON_REC | BUTTON_FF)
+#define IMGVIEW_PREVIOUS    (BUTTON_REC | BUTTON_REW)
+#define IMGVIEW_MENU        BUTTON_FUNC
 #define IMGVIEW_QUIT        (BUTTON_REC | BUTTON_PLAY)
 
 #else
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index fc20c674aa..218395027e 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -276,11 +276,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define JEWELS_LEFT   BUTTON_VOL_DOWN
 #define JEWELS_RIGHT  BUTTON_VOL_UP
-#define JEWELS_UP     BUTTON_PREV
-#define JEWELS_DOWN   BUTTON_NEXT
-#define JEWELS_SELECT BUTTON_SELECT
+#define JEWELS_UP     BUTTON_REW
+#define JEWELS_DOWN   BUTTON_FF
+#define JEWELS_SELECT BUTTON_FUNC
 #define JEWELS_CANCEL BUTTON_REC
-#define HK_SELECT "SELECT"
+#define HK_SELECT "FUNC"
 #define HK_CANCEL "REC"
 
 #else
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 59756f530e..ee052c5060 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -191,12 +191,12 @@ const struct button_mapping pla_main_ctx[] =
     { PLA_LEFT_REPEAT,       BUTTON_PREV|BUTTON_REPEAT,         BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_NEXT|BUTTON_REPEAT,         BUTTON_NONE},
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)
-    { PLA_UP,                BUTTON_PREV,                       BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_NEXT,                       BUTTON_NONE},
+    { PLA_UP,                BUTTON_REW,                        BUTTON_NONE},
+    { PLA_DOWN,              BUTTON_FF,                         BUTTON_NONE},
     { PLA_LEFT,              BUTTON_VOL_DOWN,                   BUTTON_NONE},
     { PLA_RIGHT,             BUTTON_VOL_UP,                     BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_PREV|BUTTON_REPEAT,         BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_NEXT|BUTTON_REPEAT,         BUTTON_NONE},
+    { PLA_UP_REPEAT,         BUTTON_REW|BUTTON_REPEAT,          BUTTON_NONE},
+    { PLA_DOWN_REPEAT,       BUTTON_FF|BUTTON_REPEAT,           BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_VOL_DOWN|BUTTON_REPEAT,     BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_VOL_UP|BUTTON_REPEAT,       BUTTON_NONE},
 #else
@@ -361,9 +361,9 @@ const struct button_mapping pla_main_ctx[] =
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)                                      
     {PLA_CANCEL,            BUTTON_REC,                         BUTTON_NONE},
     {PLA_EXIT,              (BUTTON_REC|BUTTON_PLAY),           BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
-    {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_FUNC,                        BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_FUNC|BUTTON_REL,             BUTTON_FUNC},
+    {PLA_SELECT_REPEAT,     BUTTON_FUNC|BUTTON_REPEAT,          BUTTON_NONE},
 #else
 #   ifndef HAVE_TOUCHSCREEN
 #       error pluginlib_actions: No actions defined
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index 43a7c3fd46..aedf66dbf3 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -197,8 +197,8 @@ const unsigned char rockbox16x7[] = {
 #define LP_QUIT  (BUTTON_REC|BUTTON_PLAY)
 #define LP_DEC_X BUTTON_VOL_DOWN
 #define LP_INC_X BUTTON_VOL_UP
-#define LP_DEC_Y BUTTON_PREV
-#define LP_INC_Y BUTTON_NEXT
+#define LP_DEC_Y BUTTON_REW
+#define LP_INC_Y BUTTON_FF
 
 #else
 #define LP_QUIT BUTTON_OFF
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 5a3c461bdc..77743e44f4 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -197,8 +197,8 @@
 #define BTN_QUIT         (BUTTON_REC | BUTTON_PLAY)
 #define BTN_RIGHT        BUTTON_VOL_DOWN
 #define BTN_LEFT         BUTTON_VOL_UP
-#define BTN_UP           BUTTON_PREV
-#define BTN_DOWN         BUTTON_NEXT
+#define BTN_UP           BUTTON_REW
+#define BTN_DOWN         BUTTON_FF
 #define BTN_PLAY         BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 3925c2c7bc..1153972ccb 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -260,11 +260,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #   define MINESWP_LEFT     BUTTON_VOL_DOWN
 #   define MINESWP_RIGHT    BUTTON_VOL_UP
-#   define MINESWP_UP       BUTTON_PREV
-#   define MINESWP_DOWN     BUTTON_NEXT
+#   define MINESWP_UP       BUTTON_REW
+#   define MINESWP_DOWN     BUTTON_FF
 #   define MINESWP_QUIT     (BUTTON_REC|BUTTON_PLAY)
 #   define MINESWP_TOGGLE   BUTTON_PLAY
-#   define MINESWP_DISCOVER BUTTON_SELECT
+#   define MINESWP_DISCOVER BUTTON_FUNC
 #   define MINESWP_INFO     BUTTON_REC
 
 #else
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 42c9254259..ecdd09ac1d 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -170,7 +170,7 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define MOSAIQUE_QUIT (BUTTON_REC | BUTTON_PLAY)
-#define MOSAIQUE_SPEED BUTTON_SELECT
+#define MOSAIQUE_SPEED BUTTON_FUNC
 #define MOSAIQUE_RESTART BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 5088187b76..caf63432f8 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2463,10 +2463,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define MP3ENC_SELECT BUTTON_OK
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define MP3ENC_PREV BUTTON_PREV
-#define MP3ENC_NEXT BUTTON_NEXT
+#define MP3ENC_PREV BUTTON_REW
+#define MP3ENC_NEXT BUTTON_FF
 #define MP3ENC_DONE BUTTON_PLAY
-#define MP3ENC_SELECT BUTTON_SELECT
+#define MP3ENC_SELECT BUTTON_FUNC
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 1f321c1285..53cbab32c6 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -207,9 +207,9 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_EXIT        BUTTON_REC
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define MPEG_START_TIME_SELECT      BUTTON_SELECT
-#define MPEG_START_TIME_LEFT        BUTTON_PREV
-#define MPEG_START_TIME_RIGHT       BUTTON_NEXT
+#define MPEG_START_TIME_SELECT      BUTTON_FUNC
+#define MPEG_START_TIME_LEFT        BUTTON_REW
+#define MPEG_START_TIME_RIGHT       BUTTON_FF
 #define MPEG_START_TIME_UP          BUTTON_VOL_UP
 #define MPEG_START_TIME_DOWN        BUTTON_VOL_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_REC
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 5b333c33f7..512cc70cee 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -319,13 +319,13 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_FF         BUTTON_NEXT
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define MPEG_MENU       BUTTON_SELECT
+#define MPEG_MENU       BUTTON_FUNC
 #define MPEG_PAUSE      (BUTTON_PLAY | BUTTON_REL)
 #define MPEG_STOP       (BUTTON_PLAY | BUTTON_REPEAT)
 #define MPEG_VOLDOWN    BUTTON_VOL_DOWN
 #define MPEG_VOLUP      BUTTON_VOL_UP
-#define MPEG_RW         BUTTON_PREV
-#define MPEG_FF         BUTTON_NEXT
+#define MPEG_RW         BUTTON_REW
+#define MPEG_FF         BUTTON_FF
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 7c73ee6ce1..2d0d58eca5 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -300,12 +300,12 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define OSCILLOSCOPE_QUIT         (BUTTON_REC | BUTTON_PLAY)
-#define OSCILLOSCOPE_DRAWMODE     BUTTON_SELECT
+#define OSCILLOSCOPE_DRAWMODE     BUTTON_FUNC
 #define OSCILLOSCOPE_ADVMODE      BUTTON_REC
-#define OSCILLOSCOPE_ORIENTATION  (BUTTON_SELECT|BUTTON_REPEAT)
+#define OSCILLOSCOPE_ORIENTATION  (BUTTON_FUNC|BUTTON_REPEAT)
 #define OSCILLOSCOPE_PAUSE        BUTTON_PLAY
-#define OSCILLOSCOPE_SPEED_UP     BUTTON_NEXT
-#define OSCILLOSCOPE_SPEED_DOWN   BUTTON_PREV
+#define OSCILLOSCOPE_SPEED_UP     BUTTON_FF
+#define OSCILLOSCOPE_SPEED_DOWN   BUTTON_REW
 #define OSCILLOSCOPE_VOL_UP       BUTTON_VOL_UP
 #define OSCILLOSCOPE_VOL_DOWN     BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 1c4b2fcb6e..9fa35e3c29 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -419,23 +419,23 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SELECT_TEXT "PLAY"
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define PEGBOX_SAVE     (BUTTON_PLAY|BUTTON_SELECT)
+#define PEGBOX_SAVE     (BUTTON_PLAY|BUTTON_FUNC)
 #define PEGBOX_QUIT     (BUTTON_REC|BUTTON_PLAY)
 #define PEGBOX_RESTART  BUTTON_REC
-#define PEGBOX_LVL_UP   (BUTTON_PLAY|BUTTON_PREV)
-#define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_NEXT)
-#define PEGBOX_UP       BUTTON_PREV
-#define PEGBOX_DOWN     BUTTON_NEXT
+#define PEGBOX_LVL_UP   (BUTTON_PLAY|BUTTON_REW)
+#define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_FF)
+#define PEGBOX_UP       BUTTON_REW
+#define PEGBOX_DOWN     BUTTON_FF
 #define PEGBOX_RIGHT    BUTTON_VOL_UP
 #define PEGBOX_LEFT     BUTTON_VOL_DOWN
-#define PEGBOX_SELECT   BUTTON_SELECT
+#define PEGBOX_SELECT   BUTTON_FUNC
 
-#define SAVE_TEXT "PLAY + SELECT"
+#define SAVE_TEXT "PLAY + FUNC"
 #define QUIT_TEXT "REC + PLAY"
 #define RESTART_TEXT "REC"
-#define LVL_UP_TEXT "PREV"
-#define LVL_DOWN_TEXT "NEXT"
-#define SELECT_TEXT "SELECT"
+#define LVL_UP_TEXT "REW"
+#define LVL_DOWN_TEXT "FF"
+#define SELECT_TEXT "FUNC"
 
 #else
 #error Unsupported keymap!
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 83a8e48228..93b6e7c278 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -211,8 +211,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define PONG_QUIT (BUTTON_REC|BUTTON_PLAY)
-#define PONG_LEFT_UP BUTTON_PREV
-#define PONG_LEFT_DOWN BUTTON_NEXT
+#define PONG_LEFT_UP BUTTON_REW
+#define PONG_LEFT_DOWN BUTTON_FF
 #define PONG_RIGHT_UP BUTTON_VOL_UP
 #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 9b4c43ca21..46d80bc702 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -217,13 +217,13 @@
 #define REVERSI_BUTTON_MENU      BUTTON_MENU
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
-#define REVERSI_BUTTON_UP BUTTON_PREV
-#define REVERSI_BUTTON_DOWN BUTTON_NEXT
+#define REVERSI_BUTTON_UP BUTTON_REW
+#define REVERSI_BUTTON_DOWN BUTTON_FF
 #define REVERSI_BUTTON_LEFT BUTTON_VOL_DOWN
 #define REVERSI_BUTTON_RIGHT BUTTON_VOL_UP 
-#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
+#define REVERSI_BUTTON_MAKE_MOVE BUTTON_FUNC
 #define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
-#define REVERSI_BUTTON_MENU BUTTON_SELECT
+#define REVERSI_BUTTON_MENU BUTTON_FUNC
 #define REVERSI_BUTTON_MENU_LONGPRESS 
 
 #else
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 44d637d8fa..2bab546fa0 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -329,9 +329,9 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define ROCKBLOX_OFF           (BUTTON_REC|BUTTON_PLAY)
-#define ROCKBLOX_ROTATE_CCW    BUTTON_PREV
-#define ROCKBLOX_ROTATE_CW     BUTTON_NEXT
-#define ROCKBLOX_DOWN          BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW    BUTTON_REW
+#define ROCKBLOX_ROTATE_CW     BUTTON_FF
+#define ROCKBLOX_DOWN          BUTTON_FUNC
 #define ROCKBLOX_LEFT          BUTTON_VOL_DOWN
 #define ROCKBLOX_RIGHT         BUTTON_VOL_UP
 #define ROCKBLOX_DROP          BUTTON_PLAY
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c
index 96937bbae9..a39da86ec1 100644
--- a/apps/plugins/rockblox1d.c
+++ b/apps/plugins/rockblox1d.c
@@ -113,7 +113,7 @@
 #define ONEDROCKBLOX_QUIT              BUTTON_REC
 
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)
-#define ONEDROCKBLOX_DOWN              BUTTON_SELECT
+#define ONEDROCKBLOX_DOWN              BUTTON_FUNC
 #define ONEDROCKBLOX_QUIT              (BUTTON_REC | BUTTON_PLAY)
 
 #elif defined(HAVE_TOUCHSCREEN)
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 517a3a1690..0f51c4d849 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -222,8 +222,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_QUIT    (BUTTON_REC | BUTTON_PLAY)
 #define PUZZLE_LEFT BUTTON_VOL_DOWN
 #define PUZZLE_RIGHT BUTTON_VOL_UP
-#define PUZZLE_UP      BUTTON_PREV
-#define PUZZLE_DOWN    BUTTON_NEXT
+#define PUZZLE_UP      BUTTON_REW
+#define PUZZLE_DOWN    BUTTON_FF
 #define PUZZLE_SHUFFLE BUTTON_REC
 #define PUZZLE_PICTURE BUTTON_PLAY
 
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index eb2b311fc9..5ccbcd0b7e 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -212,8 +212,8 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define SNAKE_LEFT BUTTON_VOL_DOWN
 #define SNAKE_RIGHT BUTTON_VOL_UP
-#define SNAKE_UP   BUTTON_PREV
-#define SNAKE_DOWN BUTTON_NEXT
+#define SNAKE_UP   BUTTON_REW
+#define SNAKE_DOWN BUTTON_FF
 #define SNAKE_PLAYPAUSE BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index eb101cf1bd..99005efc0d 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -320,8 +320,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define SNAKE2_LEFT BUTTON_VOL_DOWN
 #define SNAKE2_RIGHT BUTTON_VOL_UP
-#define SNAKE2_UP   BUTTON_PREV
-#define SNAKE2_DOWN BUTTON_NEXT
+#define SNAKE2_UP   BUTTON_REW
+#define SNAKE2_DOWN BUTTON_FF
 #define SNAKE2_QUIT (BUTTON_REC | BUTTON_PLAY)
 #define SNAKE2_PLAYPAUSE BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT "Play"
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 1159402bac..a8f7e34fa7 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -449,17 +449,17 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define SOKOBAN_LEFT         BUTTON_VOL_DOWN
 #define SOKOBAN_RIGHT        BUTTON_VOL_UP
-#define SOKOBAN_UP           BUTTON_PREV
-#define SOKOBAN_DOWN         BUTTON_NEXT
-#define SOKOBAN_MENU         BUTTON_SELECT
-#define SOKOBAN_UNDO         (BUTTON_PLAY | BUTTON_PREV)
-#define SOKOBAN_REDO         (BUTTON_PLAY | BUTTON_NEXT)
+#define SOKOBAN_UP           BUTTON_REW
+#define SOKOBAN_DOWN         BUTTON_FF
+#define SOKOBAN_MENU         BUTTON_FUNC
+#define SOKOBAN_UNDO         (BUTTON_PLAY | BUTTON_REW)
+#define SOKOBAN_REDO         (BUTTON_PLAY | BUTTON_FF)
 #define SOKOBAN_LEVEL_DOWN   (BUTTON_PLAY | BUTTON_VOL_DOWN)
 #define SOKOBAN_LEVEL_REPEAT BUTTON_REC
 #define SOKOBAN_LEVEL_UP     (BUTTON_PLAY | BUTTON_VOL_UP)
 #define SOKOBAN_PAUSE        BUTTON_PLAY
-#define BUTTON_SAVE          (BUTTON_PLAY|BUTTON_SELECT)
-#define BUTTON_SAVE_NAME "PLAY+SELECT"
+#define BUTTON_SAVE          (BUTTON_PLAY|BUTTON_FUNC)
+#define BUTTON_SAVE_NAME "PLAY+FUNC"
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 9c80cff272..feafd42f76 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -473,17 +473,17 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #   define SOL_QUIT         (BUTTON_REC | BUTTON_PLAY)
-#   define SOL_UP           BUTTON_PREV
-#   define SOL_DOWN         BUTTON_NEXT
+#   define SOL_UP           BUTTON_REW
+#   define SOL_DOWN         BUTTON_FF
 #   define SOL_LEFT         BUTTON_VOL_DOWN
 #   define SOL_RIGHT        BUTTON_VOL_UP
-#   define SOL_MOVE_PRE      BUTTON_SELECT
-#   define SOL_MOVE         (BUTTON_SELECT | BUTTON_REL)
+#   define SOL_MOVE_PRE     BUTTON_FUNC
+#   define SOL_MOVE         (BUTTON_FUNC | BUTTON_REL)
 #   define SOL_DRAW         BUTTON_REC
 #   define SOL_REM2CUR      (BUTTON_REC | BUTTON_REPEAT)
 #   define SOL_CUR2STACK    BUTTON_PLAY
 #   define SOL_REM2STACK    (BUTTON_PLAY | BUTTON_REPEAT)
-#   define HK_MOVE         "SELECT"
+#   define HK_MOVE         "FUNC"
 #   define HK_DRAW         "REC"
 #   define HK_REM2CUR      "REC.."
 #   define HK_CUR2STACK    "PLAY"
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 206d52aed8..1fd407357e 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -231,13 +231,13 @@
 
 #elif (CONFIG_KEYPAD == MPIO_HD200_PAD)
 
-#define AST_PAUSE (BUTTON_PLAY|BUTTON_SELECT)
+#define AST_PAUSE (BUTTON_PLAY|BUTTON_FUNC)
 #define AST_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define AST_THRUST BUTTON_REC
 #define AST_HYPERSPACE BUTTON_PLAY
-#define AST_LEFT BUTTON_PREV
-#define AST_RIGHT BUTTON_NEXT
-#define AST_FIRE BUTTON_SELECT
+#define AST_LEFT BUTTON_REW
+#define AST_RIGHT BUTTON_FF
+#define AST_FIRE BUTTON_FUNC
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index a653bdb4a9..884c678920 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -398,18 +398,18 @@
 #define STAR_QUIT           (BUTTON_REC | BUTTON_PLAY)
 #define STAR_LEFT           BUTTON_VOL_DOWN
 #define STAR_RIGHT          BUTTON_VOL_UP
-#define STAR_UP             BUTTON_PREV
-#define STAR_DOWN           BUTTON_NEXT
-#define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT
-#define STAR_TOGGLE_CONTROL (BUTTON_SELECT | BUTTON_REL)
+#define STAR_UP             BUTTON_REW
+#define STAR_DOWN           BUTTON_FF
+#define STAR_TOGGLE_CONTROL_PRE BUTTON_FUNC
+#define STAR_TOGGLE_CONTROL (BUTTON_FUNC | BUTTON_REL)
 #define STAR_LEVEL_UP       BUTTON_PLAY
 #define STAR_LEVEL_DOWN     BUTTON_REC
-#define STAR_LEVEL_REPEAT   (BUTTON_SELECT | BUTTON_REPEAT)
-#define STAR_TOGGLE_CONTROL_NAME "SELECT"
+#define STAR_LEVEL_REPEAT   (BUTTON_FUNC | BUTTON_REPEAT)
+#define STAR_TOGGLE_CONTROL_NAME "FUNC"
 #define STAR_QUIT_NAME      "REC + PLAY"
 #define STAR_LEVEL_UP_NAME  "PLAY"
 #define STAR_LEVEL_DOWN_NAME "REC"
-#define STAR_LEVEL_REPEAT_NAME "SELECT LONG"
+#define STAR_LEVEL_REPEAT_NAME "FUNC LONG"
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c
index 6ddc268285..b8b7569205 100644
--- a/apps/plugins/starfield.c
+++ b/apps/plugins/starfield.c
@@ -159,8 +159,8 @@
 #define STARFIELD_QUIT               (BUTTON_REC|BUTTON_PLAY)
 #define STARFIELD_INCREASE_ZMOVE     BUTTON_VOL_UP
 #define STARFIELD_DECREASE_ZMOVE     BUTTON_VOL_DOWN
-#define STARFIELD_INCREASE_NB_STARS  BUTTON_NEXT
-#define STARFIELD_DECREASE_NB_STARS  BUTTON_PREV
+#define STARFIELD_INCREASE_NB_STARS  BUTTON_FF
+#define STARFIELD_DECREASE_NB_STARS  BUTTON_REW
 #define STARFIELD_TOGGLE_COLOR       BUTTON_PLAY
 
 #endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 6bac97ea2a..1a2965fa89 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -226,8 +226,8 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define STOPWATCH_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define STOPWATCH_START_STOP BUTTON_PLAY
-#define STOPWATCH_RESET_TIMER BUTTON_PREV
-#define STOPWATCH_LAP_TIMER BUTTON_NEXT
+#define STOPWATCH_RESET_TIMER BUTTON_REW
+#define STOPWATCH_LAP_TIMER BUTTON_FF
 #define STOPWATCH_SCROLL_UP BUTTON_VOL_UP
 #define STOPWATCH_SCROLL_DOWN BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index f943a9f5fc..c2ef1d6693 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -285,9 +285,9 @@
 #define SUDOKU_BUTTON_MENU       BUTTON_REC
 #define SUDOKU_BUTTON_LEFT       BUTTON_VOL_DOWN
 #define SUDOKU_BUTTON_RIGHT      BUTTON_VOL_UP
-#define SUDOKU_BUTTON_CHANGEDIR  BUTTON_SELECT
-#define SUDOKU_BUTTON_TOGGLE     BUTTON_NEXT
-#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_PREV
+#define SUDOKU_BUTTON_CHANGEDIR  BUTTON_FUNC
+#define SUDOKU_BUTTON_TOGGLE     BUTTON_FF
+#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_REW
 #define SUDOKU_BUTTON_POSSIBLE   BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/test_grey.c b/apps/plugins/test_grey.c
index 5931d96bd3..da199a6f14 100644
--- a/apps/plugins/test_grey.c
+++ b/apps/plugins/test_grey.c
@@ -86,8 +86,8 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define GREY_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define GREY_OK   BUTTON_PLAY
-#define GREY_PREV BUTTON_PREV
-#define GREY_NEXT BUTTON_NEXT
+#define GREY_PREV BUTTON_REW
+#define GREY_NEXT BUTTON_FF
 #define GREY_UP   BUTTON_VOL_UP
 #define GREY_DOWN BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c
index f22beb87ff..4d8d3c6241 100644
--- a/apps/plugins/test_scanrate.c
+++ b/apps/plugins/test_scanrate.c
@@ -69,8 +69,8 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define SCANRATE_DONE    BUTTON_PLAY
-#define SCANRATE_FASTINC BUTTON_NEXT
-#define SCANRATE_FASTDEC BUTTON_PREV
+#define SCANRATE_FASTINC BUTTON_FF
+#define SCANRATE_FASTDEC BUTTON_REW
 #define SCANRATE_INC     BUTTON_VOL_UP
 #define SCANRATE_DEC     BUTTON_VOL_DOWN
 
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 1ae92556b8..f0daa06d80 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -382,11 +382,11 @@
 /* MPIO HD200 keys */
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define TV_QUIT         (BUTTON_REC | BUTTON_PLAY)
-#define TV_SCROLL_UP    BUTTON_PREV
-#define TV_SCROLL_DOWN  BUTTON_NEXT
+#define TV_SCROLL_UP    BUTTON_REW
+#define TV_SCROLL_DOWN  BUTTON_FF
 #define TV_SCREEN_LEFT  BUTTON_VOL_DOWN
 #define TV_SCREEN_RIGHT BUTTON_VOL_UP
-#define TV_MENU         BUTTON_SELECT
+#define TV_MENU         BUTTON_FUNC
 #define TV_AUTOSCROLL   BUTTON_PLAY
 #define TV_BOOKMARK     BUTTON_REC
 
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index f9ecf8ef33..4da4011181 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -286,12 +286,12 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define VUMETER_QUIT (BUTTON_REC|BUTTON_PLAY)
 #define VUMETER_HELP BUTTON_PLAY
-#define VUMETER_MENU BUTTON_SELECT
+#define VUMETER_MENU BUTTON_FUNC
 #define VUMETER_UP BUTTON_VOL_UP
 #define VUMETER_DOWN BUTTON_VOL_DOWN
 #define LABEL_HELP "PLAY"
 #define LABEL_QUIT "MENU"
-#define LABEL_MENU "SELECT"
+#define LABEL_MENU "FUNC"
 #define LABEL_VOLUME "UP/DOWN"
 
 #else
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 0c4e6f9e7a..155567958d 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -284,11 +284,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #define BTN_DIR_UP BUTTON_REC
 #define BTN_DIR_DOWN BUTTON_PLAY
-#define BTN_DIR_LEFT BUTTON_PREV
-#define BTN_DIR_RIGHT BUTTON_NEXT
-#define BTN_STARTPAUSE BUTTON_SELECT
+#define BTN_DIR_LEFT BUTTON_REW
+#define BTN_DIR_RIGHT BUTTON_FF
+#define BTN_STARTPAUSE BUTTON_FUNC
 #define BTN_QUIT (BUTTON_REC|BUTTON_PLAY)
-#define BTN_STOPRESET (BUTTON_SELECT|BUTTON_REPEAT)
+#define BTN_STOPRESET (BUTTON_FUNC|BUTTON_REPEAT)
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 11b16d2755..d20a703601 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -246,8 +246,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define QUIT  (BUTTON_REC|BUTTON_PLAY)
 #define LEFT  BUTTON_VOL_DOWN
 #define RIGHT BUTTON_VOL_UP
-#define UP    BUTTON_PREV
-#define DOWN  BUTTON_NEXT
+#define UP    BUTTON_REW
+#define DOWN  BUTTON_FF
 #define PAUSE BUTTON_PLAY
 
 #else
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index ee2a8d5f4a..631350a9ae 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -192,9 +192,9 @@
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 
 #define ZX_MENU         (BUTTON_REC|BUTTON_PLAY)
-#define ZX_UP           BUTTON_PREV
-#define ZX_DOWN         BUTTON_NEXT
-#define ZX_SELECT       BUTTON_SELECT
+#define ZX_UP           BUTTON_REW
+#define ZX_DOWN         BUTTON_FF
+#define ZX_SELECT       BUTTON_FUNC
 #define ZX_LEFT         BUTTON_VOL_DOWN
 #define ZX_RIGHT        BUTTON_VOL_UP
 
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index bc7e3aca2c..3a0f71e836 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -186,12 +186,12 @@
 
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 
-#define KBD_SELECT BUTTON_SELECT
+#define KBD_SELECT BUTTON_FUNC
 #define KBD_ABORT  BUTTON_REC
 #define KBD_LEFT   BUTTON_VOL_DOWN
 #define KBD_RIGHT  BUTTON_VOL_UP
-#define KBD_UP     BUTTON_PREV
-#define KBD_DOWN   BUTTON_NEXT
+#define KBD_UP     BUTTON_REW
+#define KBD_DOWN   BUTTON_FF
 
 #endif