15 files changed, 40 insertions, 49 deletions

diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index df6a01c891..2d28c1d85a 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -368,14 +368,14 @@
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
       (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define CB_SELECT  (BUTTON_FFWD|BUTTON_RIGHT)
+#define CB_SELECT  BUTTON_FFWD
 #define CB_UP      BUTTON_UP
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
 #define CB_PLAY    BUTTON_PLAY
-#define CB_LEVEL   (BUTTON_FFWD|BUTTON_UP)
-#define CB_MENU    (BUTTON_FFWD|BUTTON_LEFT)
+#define CB_LEVEL   (BUTTON_REW|BUTTON_RIGHT)
+#define CB_MENU    (BUTTON_REW|BUTTON_LEFT)
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define CB_SELECT  BUTTON_OK
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 11aa712d33..7ec768f1d3 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -402,11 +402,10 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_LEFT    BUTTON_LEFT
 #define DOOMBUTTON_RIGHT   BUTTON_RIGHT
 #define DOOMBUTTON_SHOOT   BUTTON_PLAY
-#define DOOMBUTTON_OPEN    (BUTTON_PLAY|BUTTON_LEFT)
+#define DOOMBUTTON_OPEN    BUTTON_REW
 #define DOOMBUTTON_ESC     BUTTON_REC
-#define DOOMBUTTON_ENTER   (BUTTON_PLAY|BUTTON_RIGHT)
-#define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_UP)
-#define DOOMBUTTON_MAP     (BUTTON_PLAY|BUTTON_DOWN)
+#define DOOMBUTTON_ENTER   BUTTON_FFWD
+#define DOOMBUTTON_WEAPON  BUTTON_FFWD
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define DOOMBUTTON_UP      BUTTON_OK
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index d3dc98aa54..834dea3bf3 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -354,8 +354,8 @@
 #define FLIPIT_QUIT         BUTTON_REC
 #define FLIPIT_SHUFFLE      BUTTON_PLAY
 #define FLIPIT_SOLVE        BUTTON_FFWD
-#define FLIPIT_STEP_BY_STEP (BUTTON_PLAY|BUTTON_UP)
-#define FLIPIT_TOGGLE       (BUTTON_PLAY|BUTTON_DOWN)
+#define FLIPIT_STEP_BY_STEP (BUTTON_FFWD|BUTTON_UP)
+#define FLIPIT_TOGGLE       BUTTON_REW
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 531b137556..75196a5d15 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -327,12 +327,9 @@
 #define  GBN_BUTTON_RETREAT            BUTTON_REW
 #define  GBN_BUTTON_ADVANCE            BUTTON_FFWD
 #define  GBN_BUTTON_MENU               BUTTON_PLAY | BUTTON_LEFT
-#define  GBN_BUTTON_PLAY               BUTTON_PLAY | BUTTON_RIGHT
+#define  GBN_BUTTON_PLAY               BUTTON_PLAY
 #define  GBN_BUTTON_CONTEXT            BUTTON_PLAY | BUTTON_DOWN
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_PLAY | BUTTON_UP
-/* No context */
-/* No advance/retreat */
-/* no next var */
 
 #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 2f4a698fad..5d3c5f63e8 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -195,7 +195,7 @@
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
       (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
-#define BTN_QUIT         BUTTON_REW
+#define BTN_QUIT         BUTTON_REC
 #define BTN_RIGHT        BUTTON_RIGHT
 #define BTN_LEFT         BUTTON_LEFT
 #define BTN_UP           BUTTON_UP
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 5da7a8b099..34de08f86b 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -239,10 +239,10 @@
 #define PACMAN_DOWN     BUTTON_DOWN
 #define PACMAN_LEFT     BUTTON_LEFT
 #define PACMAN_RIGHT    BUTTON_RIGHT
-#define PACMAN_1UP      BUTTON_REC
+#define PACMAN_1UP      BUTTON_FFWD
 #define PACMAN_2UP      BUTTON_REW
-#define PACMAN_COIN     BUTTON_FFWD
-#define PACMAN_MENU     BUTTON_PLAY
+#define PACMAN_COIN     BUTTON_PLAY
+#define PACMAN_MENU     BUTTON_REC
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 1003b0c65c..53fede1c2c 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -154,7 +154,8 @@ const struct button_mapping pf_context_buttons[] =
 #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \
     CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD
     {PF_QUIT,         BUTTON_OFF,                 BUTTON_NONE},
-#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
+#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD || CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
+    CONFIG_KEYPAD == SAMSUNG_YH920_PAD
     {PF_QUIT,         BUTTON_REC,                 BUTTON_NONE},
 #endif
 #if CONFIG_KEYPAD == IAUDIO_M3_PAD
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 906fe357b8..268a386474 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -331,14 +331,14 @@
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) ||   \
     (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
 
-#define ROCKBLOX_OFF           (BUTTON_REC|BUTTON_PLAY)
+#define ROCKBLOX_OFF           BUTTON_REC
 #define ROCKBLOX_ROTATE_CCW    BUTTON_UP
 #define ROCKBLOX_ROTATE_CW     BUTTON_DOWN
 #define ROCKBLOX_DOWN          BUTTON_REW
 #define ROCKBLOX_LEFT          BUTTON_LEFT
 #define ROCKBLOX_RIGHT         BUTTON_RIGHT
-#define ROCKBLOX_DROP          BUTTON_FFWD
-#define ROCKBLOX_RESTART       (BUTTON_REC|BUTTON_REW)
+#define ROCKBLOX_DROP          BUTTON_PLAY
+#define ROCKBLOX_RESTART       BUTTON_FFWD
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 12feabb8e1..f5ea623d31 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -301,10 +301,10 @@ static void setoptions (void)
         options.DOWN    = BUTTON_DOWN;
 
         options.A       = BUTTON_PLAY;
-        options.B       = BUTTON_REW;
-        options.START   = BUTTON_REC;
-        options.SELECT  = BUTTON_FFWD;
-        options.MENU    = BUTTON_NONE;
+        options.B       = BUTTON_FFWD;
+        options.START   = BUTTON_REW;
+        options.SELECT  = BUTTON_NONE;
+        options.MENU    = BUTTON_REC;
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
         options.UP     = BUTTON_OK;
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index f3c4f9c8f6..70bc57e218 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -481,8 +481,8 @@
 #define SOKOBAN_UP           BUTTON_UP
 #define SOKOBAN_DOWN         BUTTON_DOWN
 #define SOKOBAN_MENU         BUTTON_REC
-#define SOKOBAN_UNDO_PRE     BUTTON_REW
-#define SOKOBAN_UNDO         (BUTTON_REW | BUTTON_LEFT)
+#define SOKOBAN_UNDO         BUTTON_REW
+#define SOKOBAN_UNDO_PRE     (BUTTON_REW | BUTTON_LEFT)
 #define SOKOBAN_REDO         BUTTON_FFWD
 #define SOKOBAN_LEVEL_DOWN   (BUTTON_PLAY | BUTTON_DOWN)
 #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT)
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 541b42de42..d71847120b 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -457,17 +457,13 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define SOL_QUIT          BUTTON_REC
 #   define SOL_UP            BUTTON_UP
 #   define SOL_DOWN          BUTTON_DOWN
-#   define SOL_LEFT_PRE      BUTTON_LEFT
-#   define SOL_LEFT          (BUTTON_LEFT | BUTTON_REW)
-#   define SOL_RIGHT_PRE     BUTTON_RIGHT
-#   define SOL_RIGHT         (BUTTON_RIGHT | BUTTON_REW)
+#   define SOL_LEFT          BUTTON_LEFT
+#   define SOL_RIGHT         BUTTON_RIGHT
 #   define SOL_MOVE          BUTTON_PLAY
-#   define SOL_DRAW_PRE      (BUTTON_PLAY | BUTTON_RIGHT)
-#   define SOL_DRAW          (BUTTON_PLAY | BUTTON_LEFT)
-#   define SOL_REM2CUR       BUTTON_FFWD
+#   define SOL_DRAW          BUTTON_FFWD
+#   define SOL_REM2CUR       (BUTTON_FFWD | BUTTON_LEFT)
 #   define SOL_CUR2STACK     BUTTON_REW
-#   define SOL_REM2STACK_PRE (BUTTON_FFWD | BUTTON_RIGHT)
-#   define SOL_REM2STACK     (BUTTON_FFWD | BUTTON_LEFT)
+#   define SOL_REM2STACK     (BUTTON_REW | BUTTON_LEFT)
 #   define HK_MOVE           "PLAY"
 #   define HK_DRAW           "REW.."
 #   define HK_REM2CUR        "FFWD"
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index a1367e9044..3cb27790c6 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -399,17 +399,15 @@
 #define STAR_RIGHT          BUTTON_RIGHT
 #define STAR_UP             BUTTON_UP
 #define STAR_DOWN           BUTTON_DOWN
-#define STAR_LEVEL_UP_PRE   (BUTTON_FFWD|BUTTON_UP)
-#define STAR_LEVEL_UP       (BUTTON_REW|BUTTON_UP)
-#define STAR_LEVEL_DOWN_PRE (BUTTON_FFWD|BUTTON_DOWN)
-#define STAR_LEVEL_DOWN     (BUTTON_REW|BUTTON_DOWN)
-#define STAR_TOGGLE_CONTROL (BUTTON_PLAY|BUTTON_UP)
-#define STAR_LEVEL_REPEAT   (BUTTON_PLAY|BUTTON_DOWN)
+#define STAR_LEVEL_UP       BUTTON_FFWD
+#define STAR_LEVEL_DOWN     BUTTON_REW
+#define STAR_TOGGLE_CONTROL BUTTON_PLAY
+#define STAR_LEVEL_REPEAT   (BUTTON_REW|BUTTON_FFWD)
 #define STAR_TOGGLE_CONTROL_NAME "PLAY"
 #define STAR_QUIT_NAME      "REC"
-#define STAR_LEVEL_UP_NAME  "UP"
-#define STAR_LEVEL_DOWN_NAME "DOWN"
-#define STAR_LEVEL_REPEAT_NAME "PLAY"
+#define STAR_LEVEL_UP_NAME  "FF"
+#define STAR_LEVEL_DOWN_NAME "REW"
+#define STAR_LEVEL_REPEAT_NAME "REW+FF"
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 43a7b917a9..8a9c35b1ff 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -287,7 +287,7 @@
       (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
 #define VUMETER_QUIT       BUTTON_REC
 #define VUMETER_HELP       BUTTON_PLAY
-#define VUMETER_MENU       BUTTON_LEFT
+#define VUMETER_MENU       BUTTON_REW
 #define VUMETER_UP         BUTTON_UP
 #define VUMETER_DOWN       BUTTON_DOWN
 #define LABEL_HELP "PLAY"
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 26b97c7748..6d5cf4b0df 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -279,7 +279,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_DIR_LEFT   BUTTON_LEFT
 #define BTN_DIR_RIGHT  BUTTON_RIGHT
 #define BTN_STARTPAUSE BUTTON_PLAY
-#define BTN_QUIT       BUTTON_FFWD
+#define BTN_QUIT       BUTTON_REC
 #define BTN_STOPRESET  BUTTON_REW
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index f3ed96f282..68c32726c0 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -235,12 +235,12 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
       CONFIG_KEYPAD == SAMSUNG_YH920_PAD
 
-#define QUIT  BUTTON_PLAY
+#define QUIT  BUTTON_REC
 #define LEFT  BUTTON_LEFT
 #define RIGHT BUTTON_RIGHT
 #define UP    BUTTON_UP
 #define DOWN  BUTTON_DOWN
-#define PAUSE BUTTON_FFWD
+#define PAUSE BUTTON_PLAY
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD