fuzeplus: update plugins keymaps (FS#12405)

Signed-off-by: Amaury Pouly <amaury.pouly@gmail.com>

Change-Id: Ib94cec07c80892eb50471c87b83e2701911ea0d7

19 files changed, 56 insertions, 99 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index bbadb76159..ab4da37b0a 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -459,10 +459,8 @@ enum {
 #define BJACK_DOUBLE_NAME   "BACK"
 #define BJACK_SELECT        BUTTON_SELECT
 #define BJACK_QUIT          BUTTON_POWER
-#define BJACK_MAX           BUTTON_BOTTOMRIGHT
-#define BJACK_MIN           BUTTON_BOTTOMLEFT
-#define BJACK_STAY          BUTTON_BACK
-#define BJACK_DOUBLEDOWN    BUTTON_PLAYPAUSE
+#define BJACK_STAY          BUTTON_PLAYPAUSE
+#define BJACK_DOUBLEDOWN    BUTTON_BACK
 #define BJACK_UP            BUTTON_UP
 #define BJACK_DOWN          BUTTON_DOWN
 #define BJACK_RIGHT         BUTTON_RIGHT
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 077b3091d8..765e52ec8c 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -402,10 +402,9 @@
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    (BUTTON_PLAYPAUSE | BUTTON_REPEAT)
-#define CB_LEVEL   BUTTON_BOTTOMRIGHT
-#define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT)
-#define CB_MENU    BUTTON_POWER
+#define CB_PLAY    BUTTON_PLAYPAUSE
+#define CB_LEVEL   BUTTON_BACK
+#define CB_MENU    (BUTTON_PLAYPAUSE | BUTTON_REPEAT)
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define CB_SELECT  BUTTON_SELECT
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 88b6d44fa9..06fe0d84e0 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -190,10 +190,10 @@
 #define CLIX_BUTTON_QUIT        BUTTON_POWER
 #define CLIX_BUTTON_UP          BUTTON_UP
 #define CLIX_BUTTON_DOWN        BUTTON_DOWN
+#define CLIX_BUTTON_SCROLL_FWD  BUTTON_BACK
+#define CLIX_BUTTON_SCROLL_BACK BUTTON_PLAYPAUSE
 #define CLIX_BUTTON_LEFT        BUTTON_LEFT
 #define CLIX_BUTTON_RIGHT       BUTTON_RIGHT
-#define CLIX_BUTTON_SCROLL_FWD  BUTTON_BOTTOMRIGHT
-#define CLIX_BUTTON_SCROLL_BACK BUTTON_BOTTOMLEFT
 #define CLIX_BUTTON_CLICK       BUTTON_SELECT
 
 #else
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 1216061477..9009acc67f 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -168,7 +168,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_SHOOT      BUTTON_PLAY
 #define DOOMBUTTON_ENTER      BUTTON_SELECT
 #define DOOMBUTTON_OPEN       BUTTON_MENU
-
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -179,7 +178,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_REC
-
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define DOOMBUTTON_UP      BUTTON_SCROLL_UP
 #define DOOMBUTTON_DOWN    BUTTON_SCROLL_DOWN
@@ -190,7 +188,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_REW
 #define DOOMBUTTON_WEAPON  BUTTON_FF
-
 #elif CONFIG_KEYPAD == SANSA_E200_PAD
 #define DOOMBUTTON_SCROLLWHEEL
 #define DOOMBUTTON_SCROLLWHEEL_CC   BUTTON_SCROLL_BACK
@@ -204,7 +201,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  DOOMBUTTON_SCROLLWHEEL_CW
-
 #elif CONFIG_KEYPAD == SANSA_FUZE_PAD
 #define DOOMBUTTON_SCROLLWHEEL
 #define DOOMBUTTON_SCROLLWHEEL_CC   BUTTON_SCROLL_BACK
@@ -218,7 +214,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_HOME
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  DOOMBUTTON_SCROLLWHEEL_CW
-
 #elif CONFIG_KEYPAD == SANSA_C200_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -229,7 +224,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == SANSA_CLIP_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -240,7 +234,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -252,7 +245,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -264,7 +256,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define DOOMBUTTON_ESC        BUTTON_POWER
 #define DOOMBUTTON_UP         BUTTON_RC_PLAY
@@ -275,7 +266,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_SHOOT      BUTTON_RC_VOL_UP
 #define DOOMBUTTON_ENTER      BUTTON_RC_MODE
 #define DOOMBUTTON_WEAPON     BUTTON_RC_HEART
-
 #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \
       CONFIG_KEYPAD == IRIVER_H300_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
@@ -287,7 +277,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_OFF
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_ON
-
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 #define DOOMBUTTON_ESC        BUTTON_RC_REC
 #define DOOMBUTTON_UP         BUTTON_RC_VOL_UP
@@ -298,13 +287,11 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_SHOOT      BUTTON_RC_MODE
 #define DOOMBUTTON_ENTER      BUTTON_RC_PLAY
 #define DOOMBUTTON_WEAPON     BUTTON_RC_MENU
-
 #elif CONFIG_KEYPAD == COWON_D2_PAD
 #define DOOMBUTTON_ESC        BUTTON_POWER
 #define DOOMBUTTON_SHOOT      BUTTON_PLUS
 #define DOOMBUTTON_WEAPON     BUTTON_MINUS
 #define DOOMBUTTON_MAP        BUTTON_MENU
-
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -315,7 +302,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_MENU
 #define DOOMBUTTON_WEAPON  BUTTON_DISPLAY
-
 #elif CONFIG_KEYPAD == IAUDIO67_PAD
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_UP      BUTTON_STOP
@@ -325,7 +311,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_SHOOT   BUTTON_VOLUP
 #define DOOMBUTTON_OPEN    BUTTON_VOLDOWN
 #define DOOMBUTTON_ENTER   BUTTON_MENU
-
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -337,7 +322,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  BUTTON_MENU
 #define DOOMBUTTON_MAP     BUTTON_CUSTOM
-
 #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -349,7 +333,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_VIEW
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -361,7 +344,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -373,16 +355,13 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_LEFT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_VOL_UP
-
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_SHOOT   BUTTON_VOL_UP
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_DOWN
 #define DOOMBUTTON_MAP     BUTTON_MENU
-
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 #define DOOMBUTTON_ESC     BUTTON_POWER
-
 #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -394,7 +373,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   (BUTTON_PLAY|BUTTON_RIGHT)
 #define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_UP)
 #define DOOMBUTTON_MAP     (BUTTON_PLAY|BUTTON_DOWN)
-
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define DOOMBUTTON_UP      BUTTON_OK
 #define DOOMBUTTON_DOWN    BUTTON_CANCEL
@@ -405,7 +383,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_REC
 #define DOOMBUTTON_ENTER   BUTTON_POWER
 #define DOOMBUTTON_WEAPON  BUTTON_PLAY
-
 #elif CONFIG_KEYPAD == MPIO_HD200_PAD
 #define DOOMBUTTON_UP      BUTTON_REW
 #define DOOMBUTTON_DOWN    BUTTON_FF
@@ -416,7 +393,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_REC
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
-
 #elif CONFIG_KEYPAD == MPIO_HD300_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -427,20 +403,16 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_REC
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
-
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
 #define DOOMBUTTON_LEFT    BUTTON_LEFT
 #define DOOMBUTTON_RIGHT   BUTTON_RIGHT
+#define DOOMBUTTON_SHOOT   BUTTON_SELECT
 #define DOOMBUTTON_OPEN    BUTTON_PLAYPAUSE
-#define DOOMBUTTON_QUIT    BUTTON_POWER
 #define DOOMBUTTON_ESC     BUTTON_BACK
-#define DOOMBUTTON_ENTER   BUTTON_SELECT
-#define DOOMBUTTON_SHOOT   BUTTON_SELECT
-#define DOOMBUTTON_WEAPON  BUTTON_BOTTOMLEFT
-#define DOOMBUTTON_MAP     BUTTON_BOTTOMRIGHT
-
+#define DOOMBUTTON_ENTER   (BUTTON_PLAYPAUSE|BUTTON_REPEAT)
+#define DOOMBUTTON_WEAPON  (BUTTON_SELECT|BUTTON_REPEAT)
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 126748dca9..da5a9e8c6b 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -365,7 +365,7 @@
 #define FLIPIT_QUIT         BUTTON_POWER
 #define FLIPIT_SHUFFLE      BUTTON_PLAYPAUSE
 #define FLIPIT_SOLVE        BUTTON_BACK
-#define FLIPIT_STEP_BY_STEP BUTTON_BOTTOMLEFT
+#define FLIPIT_STEP_BY_STEP (BUTTON_BACK|BUTTON_PLAYPAUSE)
 #define FLIPIT_TOGGLE       BUTTON_SELECT
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index e305c58dc3..20940d74f0 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -359,12 +359,10 @@
 #define  GBN_BUTTON_DOWN               BUTTON_DOWN
 #define  GBN_BUTTON_LEFT               BUTTON_LEFT
 #define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
-#define  GBN_BUTTON_MENU               BUTTON_POWER
-#define  GBN_BUTTON_PLAY               BUTTON_SELECT
 #define  GBN_BUTTON_RETREAT            BUTTON_BACK
 #define  GBN_BUTTON_ADVANCE            BUTTON_PLAYPAUSE
-#define  GBN_BUTTON_CONTEXT            BUTTON_BOTTOMLEFT
-#define  GBN_BUTTON_NEXT_VAR           BUTTON_BOTTOMRIGHT
+#define  GBN_BUTTON_PLAY               BUTTON_SELECT
+#define  GBN_BUTTON_MENU               BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 6d03c9c654..7d80a536dd 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -311,9 +311,9 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define JEWELS_UP     BUTTON_UP
 #define JEWELS_DOWN   BUTTON_DOWN
 #define JEWELS_SELECT BUTTON_SELECT
-#define JEWELS_CANCEL BUTTON_POWER
+#define JEWELS_CANCEL BUTTON_BACK
 #define HK_SELECT "SELECT"
-#define HK_CANCEL "POWER"
+#define HK_CANCEL "BACK"
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index a05fc5e6bc..44a2cd8c03 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -403,7 +403,7 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
 #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)                                      
     {PLA_CANCEL,            BUTTON_BACK,                        BUTTON_NONE},
-    {PLA_EXIT,              BUTTON_POWER,                       BUTTON_NONE},
+    {PLA_EXIT,              BUTTON_BACK|BUTTON_REPEAT,          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},
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 16114417a8..e0da928b02 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -295,12 +295,10 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_QUIT     BUTTON_POWER
 #   define MINESWP_TOGGLE   BUTTON_SELECT
 #   define MINESWP_DISCOVER BUTTON_PLAYPAUSE
-#   define MINESWP_NEXT     BUTTON_BOTTOMRIGHT
-#   define MINESWP_PREV     BUTTON_BOTTOMLEFT
 #   define MINESWP_INFO     BUTTON_BACK
 
-
 #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD)
+
 #   define MINESWP_SCROLLWHEEL
 #   define MINESWP_LEFT     BUTTON_LEFT
 #   define MINESWP_RIGHT    BUTTON_RIGHT
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index a3de867c2f..0183b0c3f6 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -250,7 +250,7 @@
 #define PACMAN_LEFT     BUTTON_LEFT
 #define PACMAN_RIGHT    BUTTON_RIGHT
 #define PACMAN_1UP      BUTTON_SELECT
-#define PACMAN_2UP      BUTTON_BOTTOMRIGHT
+#define PACMAN_2UP      BUTTON_BACK
 #define PACMAN_COIN     BUTTON_PLAYPAUSE
 #define PACMAN_MENU     BUTTON_POWER
 
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 46af8d8009..430b688f1f 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -238,12 +238,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_DOWN BUTTON_DOWN
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
-#define PONG_QUIT         BUTTON_POWER
-#define PONG_LEFT_UP      BUTTON_BACK
-#define PONG_LEFT_DOWN    BUTTON_BOTTOMLEFT
-#define PONG_RIGHT_UP     BUTTON_PLAYPAUSE
-#define PONG_RIGHT_DOWN   BUTTON_BOTTOMRIGHT
-#define PONG_PAUSE        BUTTON_SELECT
+#define PONG_QUIT BUTTON_POWER
+#define PONG_LEFT_UP BUTTON_LEFT
+#define PONG_LEFT_DOWN BUTTON_DOWN
+#define PONG_RIGHT_UP BUTTON_UP
+#define PONG_RIGHT_DOWN BUTTON_RIGHT
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD)
 #define PONG_QUIT BUTTON_BACK
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 4c67306543..c23c6b11cb 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -360,18 +360,14 @@
 #define ROCKBLOX_RESTART       BUTTON_REC
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
-#define ROCKBLOX_OFF_PRE       BUTTON_POWER
-#define ROCKBLOX_OFF           BUTTON_POWER|BUTTON_REL
-#define ROCKBLOX_ROTATE_CW     BUTTON_BOTTOMRIGHT
-#define ROCKBLOX_ROTATE_CCW    BUTTON_BOTTOMLEFT
-#define ROCKBLOX_DOWN          BUTTON_SELECT
+#define ROCKBLOX_OFF           BUTTON_POWER
+#define ROCKBLOX_ROTATE_CW     BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW    BUTTON_UP
+#define ROCKBLOX_DOWN          BUTTON_DOWN
 #define ROCKBLOX_LEFT          BUTTON_LEFT
 #define ROCKBLOX_RIGHT         BUTTON_RIGHT
-#define ROCKBLOX_DROP_PRE      BUTTON_DOWN
-#define ROCKBLOX_DROP          BUTTON_DOWN|BUTTON_REL
-#define ROCKBLOX_RESTART       BUTTON_BACK|BUTTON_REPEAT
-#define ROCKBLOX_ROTATE_CCW2   BUTTON_VOL_UP
-#define ROCKBLOX_ROTATE_CW2    BUTTON_VOL_DOWN
+#define ROCKBLOX_DROP          BUTTON_PLAYPAUSE
+#define ROCKBLOX_RESTART       BUTTON_BACK
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define ROCKBLOX_OFF           BUTTON_POWER
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 806294b21a..a176f75c91 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -252,8 +252,8 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_RIGHT   BUTTON_RIGHT
 #define PUZZLE_UP      BUTTON_UP
 #define PUZZLE_DOWN    BUTTON_DOWN
-#define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE|BUTTON_REPEAT
-#define PUZZLE_PICTURE BUTTON_SELECT|BUTTON_REPEAT
+#define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE
+#define PUZZLE_PICTURE BUTTON_SELECT
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define PUZZLE_QUIT    BUTTON_POWER
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index e4d84b2028..bd0257d2be 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -345,7 +345,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_DOWN BUTTON_DOWN
 #define SNAKE2_QUIT BUTTON_POWER
 #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE
-#define SNAKE2_PLAYPAUSE_TEXT "Play-Pause"
+#define SNAKE2_PLAYPAUSE_TEXT "Play/Pause"
 
 #else
 #error No keymap defined!
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 848f8a76dc..942b101d4c 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -501,17 +501,15 @@
 #define SOKOBAN_RIGHT        BUTTON_RIGHT
 #define SOKOBAN_UP           BUTTON_UP
 #define SOKOBAN_DOWN         BUTTON_DOWN
-#define SOKOBAN_MENU         BUTTON_POWER
-#define SOKOBAN_UNDO_PRE     BUTTON_BOTTOMLEFT
-#define SOKOBAN_UNDO         (BUTTON_BOTTOMLEFT|BUTTON_REL)
-#define SOKOBAN_REDO_PRE     BUTTON_BOTTOMRIGHT
-#define SOKOBAN_REDO         (BUTTON_BOTTOMRIGHT|BUTTON_REL)
-#define SOKOBAN_LEVEL_REPEAT BUTTON_BACK
+#define SOKOBAN_MENU         BUTTON_SELECT
+#define SOKOBAN_UNDO         (BUTTON_BACK|BUTTON_SELECT)
+#define SOKOBAN_REDO         (BUTTON_PLAYPAUSE|BUTTON_SELECT)
 #define SOKOBAN_LEVEL_DOWN   BUTTON_VOL_DOWN
+#define SOKOBAN_LEVEL_REPEAT BUTTON_BACK
 #define SOKOBAN_LEVEL_UP     BUTTON_VOL_UP
 #define SOKOBAN_PAUSE        BUTTON_PLAYPAUSE
 #define BUTTON_SAVE          (BUTTON_SELECT|BUTTON_REPEAT)
-#define BUTTON_SAVE_NAME     "SELECT LONG"
+#define BUTTON_SAVE_NAME "SELECT LONG"
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define SOKOBAN_LEFT         BUTTON_LEFT
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index b4c720065e..a1e8b7694b 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -511,18 +511,20 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define SOL_QUIT          BUTTON_POWER
 #   define SOL_UP            BUTTON_UP
 #   define SOL_DOWN          BUTTON_DOWN
-#   define SOL_LEFT          BUTTON_LEFT
-#   define SOL_RIGHT         BUTTON_RIGHT
-#   define SOL_MOVE          BUTTON_SELECT
-#   define SOL_DRAW          BUTTON_BACK
-#   define SOL_REM2CUR       BUTTON_BOTTOMLEFT
-#   define SOL_CUR2STACK     BUTTON_PLAYPAUSE|BUTTON_REL
-#   define SOL_REM2STACK     BUTTON_PLAYPAUSE|BUTTON_REPEAT
-#   define HK_MOVE           "SELECT"
-#   define HK_DRAW           "BACK"
-#   define HK_REM2CUR        "BOTTOM-LEFT"
-#   define HK_CUR2STACK      "PLAY-PAUSE"
-#   define HK_REM2STACK      "BOTTOM-RIGHT"
+#   define SOL_LEFT          BUTTON_VOL_UP
+#   define SOL_RIGHT         BUTTON_VOL_DOWN
+#   define SOL_MOVE          (BUTTON_SELECT|BUTTON_REL)
+#   define SOL_DRAW          (BUTTON_PLAYPAUSE|BUTTON_REL)
+#   define SOL_REM2CUR       BUTTON_LEFT
+#   define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT)
+#   define SOL_CUR2STACK     BUTTON_RIGHT
+#   define SOL_REM2STACK     (BUTTON_LEFT|BUTTON_REPEAT)
+#   define SOL_REM2STACK_PRE BUTTON_LEFT
+#   define HK_MOVE           "SHORT SELECT"
+#   define HK_DRAW           "SHORT PLAYPAUSE"
+#   define HK_REM2CUR        "LEFT"
+#   define HK_CUR2STACK      "DOUBLE SELECT"
+#   define HK_REM2STACK      "LEFT"
 
 #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD)
 #   define SOL_QUIT          BUTTON_POWER
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 0ab5741b06..946d97d075 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -263,7 +263,7 @@
 #define AST_PAUSE BUTTON_PLAYPAUSE
 #define AST_QUIT BUTTON_POWER
 #define AST_THRUST BUTTON_UP
-#define AST_HYPERSPACE BUTTON_BACK
+#define AST_HYPERSPACE BUTTON_DOWN
 #define AST_LEFT BUTTON_LEFT
 #define AST_RIGHT BUTTON_RIGHT
 #define AST_FIRE BUTTON_SELECT
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 4b3bcef98f..cf04e02edc 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -453,7 +453,7 @@
 #define STAR_RIGHT          BUTTON_RIGHT
 #define STAR_UP             BUTTON_UP
 #define STAR_DOWN           BUTTON_DOWN
-#define STAR_TOGGLE_CONTROL BUTTON_PLAYPAUSE
+#define STAR_TOGGLE_CONTROL BUTTON_SELECT
 #define STAR_LEVEL_UP       BUTTON_VOL_UP
 #define STAR_LEVEL_DOWN     BUTTON_VOL_DOWN
 #define STAR_LEVEL_REPEAT   (BUTTON_BACK | BUTTON_REPEAT)
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index adf06c7ded..07147185ae 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -310,16 +310,13 @@
 #define SUDOKU_BUTTON_POSSIBLE   BUTTON_PLAY
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
-#define SUDOKU_BUTTON_QUIT       BUTTON_POWER
 #define SUDOKU_BUTTON_MENU       BUTTON_BACK
 #define SUDOKU_BUTTON_LEFT       BUTTON_LEFT
 #define SUDOKU_BUTTON_RIGHT      BUTTON_RIGHT
-#define SUDOKU_BUTTON_UP         BUTTON_UP
-#define SUDOKU_BUTTON_DOWN       BUTTON_DOWN
-#define SUDOKU_BUTTON_TOGGLE     BUTTON_SELECT
-#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_BOTTOMLEFT
+#define SUDOKU_BUTTON_CHANGEDIR  BUTTON_SELECT
+#define SUDOKU_BUTTON_TOGGLE     BUTTON_UP
+#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN
 #define SUDOKU_BUTTON_POSSIBLE   BUTTON_PLAYPAUSE
-#define SUDOKU_BUTTON_ALTTOGGLE  BUTTON_BOTTOMRIGHT
 
 #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD)
 #define SUDOKU_BUTTON_QUIT BUTTON_POWER