2 files changed, 18 insertions, 20 deletions

diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 8db4a3497f..6676ace8b1 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -360,8 +360,7 @@
 #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_OFF           BUTTON_POWER
 #define ROCKBLOX_ROTATE_CW     BUTTON_BOTTOMRIGHT
 #define ROCKBLOX_ROTATE_CCW    BUTTON_BOTTOMLEFT
 #define ROCKBLOX_DOWN          BUTTON_SELECT
@@ -369,7 +368,6 @@
 #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
 
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 87df038e45..7ae3d66fca 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -8,23 +8,23 @@ gain points. For every ten lines completed, the game level increases, making
 the blocks fall faster. If the pile of blocks reaches the ceiling, the game is over.
 
 \begin{btnmap}
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{PLAYER_PAD}{\ButtonStop+\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
-    \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
-    \opt{COWON_D2_PAD}{\ButtonMenu}
-    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBack}
-    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
-    \opt{MPIO_HD300_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
-        & Restart game\\
-
+    \nopt{SANSA_FUZEPLUS_PAD}{
+        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{PLAYER_PAD}{\ButtonStop+\ButtonMenu}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+        \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
+        \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
+        \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}
+        \opt{GIGABEAT_PAD}{\ButtonA}
+        \opt{MROBE100_PAD}{\ButtonDisplay}
+        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
+        \opt{COWON_D2_PAD}{\ButtonMenu}
+        \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
+        \opt{MPIO_HD300_PAD}{\ButtonRec}
+           \opt{HAVEREMOTEKEYMAP}{& }
+            & Restart game\\
+    }
     \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD%