6 files changed, 28 insertions, 26 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 1e07d23a2e..ddc1609fba 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -414,10 +414,10 @@ F3: equal to "="
 #define CALCULATOR_RIGHT BUTTON_RIGHT
 #define CALCULATOR_UP    BUTTON_UP
 #define CALCULATOR_DOWN  BUTTON_DOWN
-#define CALCULATOR_QUIT  BUTTON_POWER
+#define CALCULATOR_QUIT  (BUTTON_BACK|BUTTON_REPEAT)
 #define CALCULATOR_INPUT BUTTON_SELECT
 #define CALCULATOR_CALC  BUTTON_PLAYPAUSE
-#define CALCULATOR_CLEAR BUTTON_BACK
+#define CALCULATOR_CLEAR  (BUTTON_BACK|BUTTON_REL)
 
 #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD)
 #define CALCULATOR_LEFT      BUTTON_LEFT
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 0e18ccfcd6..be4d90e81a 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -310,7 +310,7 @@
 #define CHC_QUIT BUTTON_POWER
 #define CHC_STARTSTOP BUTTON_PLAYPAUSE
 #define CHC_RESET BUTTON_BACK
-#define CHC_MENU BUTTON_SELECT
+#define CHC_MENU (BUTTON_SELECT|BUTTON_REPEAT)
 #define CHC_SETTINGS_INC BUTTON_UP
 #define CHC_SETTINGS_DEC BUTTON_DOWN
 #define CHC_SETTINGS_OK BUTTON_SELECT
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 2585c49ff2..e7f874db3b 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1175,15 +1175,17 @@ CONFIG_KEYPAD == MROBE500_PAD
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 
 #define CHIP8_OFF  BUTTON_POWER
-#define CHIP8_KEY1 BUTTON_LEFT
+#define CHIP8_KEY0 BUTTON_VOL_DOWN
+#define CHIP8_KEY1 BUTTON_BACK
 #define CHIP8_KEY2 BUTTON_UP
-#define CHIP8_KEY3 BUTTON_RIGHT
-#define CHIP8_KEY4 BUTTON_DOWN
-#define CHIP8_KEY5 BUTTON_PLAYPAUSE
-#define CHIP8_KEY6 BUTTON_BACK
-#define CHIP8_KEY7 BUTTON_SELECT
-#define CHIP8_KEY8 BUTTON_VOL_DOWN
-#define CHIP8_KEY9 BUTTON_VOL_UP
+#define CHIP8_KEY3 BUTTON_PLAYPAUSE
+#define CHIP8_KEY4 BUTTON_LEFT
+#define CHIP8_KEY5 BUTTON_SELECT
+#define CHIP8_KEY6 BUTTON_RIGHT
+#define CHIP8_KEY7 BUTTON_BOTTOMLEFT
+#define CHIP8_KEY8 BUTTON_DOWN
+#define CHIP8_KEY9 BUTTON_BOTTOMRIGHT
+#define CHIP8_KEYA BUTTON_VOL_UP
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 78239c0a34..a3e429bffa 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -324,11 +324,11 @@ static void setoptions (void)
         options.LEFT   = BUTTON_LEFT;
         options.RIGHT  = BUTTON_RIGHT;
 
-        options.A      = BUTTON_BACK;
-        options.B      = BUTTON_PLAYPAUSE;
+        options.A      = BUTTON_VOL_UP;
+        options.B      = BUTTON_VOL_DOWN;
         options.START  = BUTTON_SELECT;
-        options.SELECT = (BUTTON_PLAYPAUSE | BUTTON_REPEAT);
-        options.MENU   = (BUTTON_SELECT | BUTTON_REPEAT);
+        options.SELECT = BUTTON_PLAYPAUSE;
+        options.MENU   = BUTTON_BACK;
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
         options.UP     = BUTTON_UP;
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 37f9ee9429..297ee89f9e 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -212,10 +212,10 @@
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
 #define ROCKPAINT_QUIT      BUTTON_POWER
-#define ROCKPAINT_DRAW      BUTTON_SELECT
-#define ROCKPAINT_MENU      BUTTON_PLAYPAUSE
-#define ROCKPAINT_TOOLBAR   BUTTON_BACK
-#define ROCKPAINT_TOOLBAR2  (BUTTON_BACK|BUTTON_PLAYPAUSE)
+#define ROCKPAINT_DRAW      BUTTON_VOL_UP
+#define ROCKPAINT_MENU      BUTTON_VOL_DOWN
+#define ROCKPAINT_TOOLBAR   BUTTON_BOTTOMRIGHT
+#define ROCKPAINT_TOOLBAR2  BUTTON_BOTTOMLEFT
 #define ROCKPAINT_UP        BUTTON_UP
 #define ROCKPAINT_DOWN      BUTTON_DOWN
 #define ROCKPAINT_LEFT      BUTTON_LEFT
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 107d46bd67..6f1c9e933a 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -317,15 +317,15 @@
 #define LABEL_VOLUME "UP/DOWN"
 
 #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
-#define VUMETER_QUIT BUTTON_POWER
+#define VUMETER_QUIT BUTTON_BACK
 #define VUMETER_HELP BUTTON_PLAYPAUSE
-#define VUMETER_MENU BUTTON_BACK
-#define VUMETER_UP BUTTON_UP
-#define VUMETER_DOWN BUTTON_DOWN
+#define VUMETER_MENU (BUTTON_SELECT|BUTTON_REPEAT)
+#define VUMETER_UP BUTTON_VOL_UP
+#define VUMETER_DOWN BUTTON_VOL_DOWN
 #define LABEL_HELP "PLAY"
-#define LABEL_QUIT "POWER"
-#define LABEL_MENU "BACK"
-#define LABEL_VOLUME "UP/DOWN"
+#define LABEL_QUIT "BACK"
+#define LABEL_MENU "Long SELECT"
+#define LABEL_VOLUME "Vol+/Vol-"
 
 #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define VUMETER_QUIT BUTTON_POWER