Add plugin keys to the manual for the Gigabeat S, plus a couple of missing ones for the Gigabeat F. Also add missing equalizer keys for the S. Vast majority is from FS#10073 by Teruaki Kawashima.

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

52 files changed, 447 insertions, 250 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 158ade2f4a..63dbc47f5b 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -75,8 +75,8 @@
       \ActionStdCancel
       & Exits Recent Bookmark menu\\
       %
-      \nopt{GIGABEATS_PAD}{\ActionBmDelete}  
-      & Deletes the currently selected bookmark\\
+      \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
+      & Deletes the currently selected bookmark\\}
       %
       \ActionStdContext  
       & Enters the context menu for the selected bookmark.\\
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 60fc127e99..585e74187c 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -331,24 +331,26 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollFwd}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp} 
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
+      \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
       & Raises the highlighted parameter.\\
       %
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollBack}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} 
       \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
+      \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
       & Lowers the highlighted parameter.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonLeft} 
-      \opt{SANSA_E200_PAD}{\ButtonUp}
+      \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
       & Moves to the previous EQ band. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRight}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonRight} 
-      \opt{SANSA_E200_PAD}{\ButtonDown}
+      \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
       & Moves to the next EQ band. \\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
       \opt{IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD}{\ButtonSelect}
       & Toggles the cursor among the three parameters (gain, center frequency, 
       Q) for the selected EQ band.\\  
@@ -357,6 +359,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonMenu} 
       \opt{IAUDIO_X5_PAD}{\ButtonPower/\ButtonRec}
       \opt{SANSA_E200_PAD}{\ButtonPower/\ButtonRight}
+      \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonPower}
       & Exits the graphic EQ screen.\\  
     \end{btnmap}
   \end{table}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 6024f55ca2..f41a42248a 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -57,8 +57,8 @@ jump straight to that track.
     \ActionStdCancel
     & Exits Recent Bookmark menu\\
     %
-    \nopt{GIGABEATS_PAD}{\ActionBmDelete}  
-    & Deletes the currently selected bookmark\\
+    \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
+    & Deletes the currently selected bookmark\\}
     %
     \ActionStdContext  
     & Enters the context menu for the selected bookmark.\\
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index d62a1c5765..0c9b9bf312 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -16,7 +16,7 @@ visit\\
     \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} 
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay} 
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -26,11 +26,12 @@ visit\\
     \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonRight}
     \opt{SANSA_E200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonPlay}
         & Resume saved game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight}
+    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonRight}
     \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonLeft}
     \opt{SANSA_C200_PAD}{\ButtonRec}
@@ -38,10 +39,12 @@ visit\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \ButtonLeft{} / \ButtonRight{} /\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD}
       {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
@@ -51,18 +54,18 @@ visit\\
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonLeft}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MR100_PAD}{\ButtonMenu}
     & Hit (Draw new card)\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Stay (End hand)\\
     \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{ONDIO_PAD}{\ButtonUp}
@@ -74,12 +77,13 @@ visit\\
     \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonRight}
     \opt{SANSA_E200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonPlay}
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-        & Return to menu or cancel\\\hline
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
+        & Return to menu or cancel\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index ba79bf37f9..461f628dd2 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -7,7 +7,8 @@ scrolling from right to left.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonUp\ /\ \ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
@@ -20,11 +21,13 @@ scrolling from right to left.
     {\ButtonSelect}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
 \opt{GIGABEAT_PAD}{\ButtonA}
+\opt{GIGABEAT_S_PAD}{\ButtonMenu}
 \opt{MROBE100_PAD}{\ButtonDisplay}
 & Toggles Scroll mode\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
+\opt{GIGABEAT_S_PAD}{\ButtonBack}
 & Exits bounce demo\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 2c7a49211a..fd8225e840 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -32,14 +32,15 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
     & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp}
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonUp}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonSelect\ / \ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect\ / \ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay\ / \ButtonScrollUp}
     & Release the ball / Fire\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Open menu / Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index a1dae482ec..b19121975b 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -11,17 +11,19 @@ fired. Points are awarded depending on how quickly the level was completed.
 \begin{table}
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
+    \opt{GIGABEAT_PAD}{\ButtonA}
         & Pause game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonLeft{} / \ButtonRight}
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+        {\ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
         & Aim the bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -32,12 +34,13 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Exit to menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index e6980899da..91d5fc81d6 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -10,7 +10,8 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
 \begin{btnmap}{}{}
     \ButtonLeft{} / \ButtonRight{} /
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp{} / \ButtonDown}
     \opt{SANSA_E200_PAD}{/}
     \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
@@ -19,7 +20,8 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     & Select a button\\
     %
@@ -29,6 +31,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
             ,SANSA_C200_PAD}{\ButtonRec}
         \opt{IRIVER_H10_PAD}{\ButtonRew}
         \opt{GIGABEAT_PAD}{\ButtonA}
+        \opt{GIGABEAT_S_PAD}{\ButtonPlay}
         \opt{MROBE100_PAD}{\ButtonDisplay}
         & Delete last entered digit or clear after calculation\\
         %
@@ -42,14 +45,17 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}
+      {\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     & Calculate\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 49d0a24f0b..d96b16adbf 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -8,8 +8,9 @@ used in any kind of game with up to ten players.
 \begin{table}
   \begin{btnmap}{}{}
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp{} / \ButtonDown}
+        ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight{} / \ButtonLeft}
+    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+        {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
       & Increase / decrease displayed Value\\
     %
@@ -17,7 +18,7 @@ used in any kind of game with up to ten players.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
       & Move to next screen\\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -25,6 +26,7 @@ used in any kind of game with up to ten players.
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
       & Move to previous screen\\
   \end{btnmap}
 \end{table}
@@ -53,18 +55,21 @@ Keys are as follows:
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
       & Exit plugin \\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
+    \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay}
       & Restart round for the current player \\
     %
-    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
@@ -73,17 +78,18 @@ Keys are as follows:
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
+    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
       & Switch to next player \\
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
     %
-    \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+         ,MROBE100_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
@@ -94,7 +100,7 @@ Keys are as follows:
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}%
         \opt{ONDIO_PAD}{(\ButtonRight\ to select.)}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-            ,MROBE100_PAD}{(\ButtonSelect\ to select.)}%
+            ,GIGABEAT_S_PAD,MROBE100_PAD}{(\ButtonSelect\ to select.)}%
         \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index eec7e356d2..a20542ad8f 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -36,7 +36,8 @@ the game.
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
-            ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Pick up / Drop piece\\
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -45,13 +46,13 @@ the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Change level\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -60,7 +61,7 @@ the game.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower}
     & Show the menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index d598b3a972..79fb095e6d 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -40,6 +40,7 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
         \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+        \opt{GIGABEAT_S_PAD}{\ButtonBack}
         \end{sideways}
         &
         % Key "0"
@@ -48,14 +49,15 @@ The default keymappings are:
         \begin{sideways}
         \opt{RECORDER_PAD}{\ButtonFOne}
         \opt{ONDIO_PAD}{\ButtonUp}
-        \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
         \end{sideways}
         &
         % Key "2"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
+          ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
         \opt{SANSA_C200_PAD}{\ButtonVolUp}
         \end{sideways}
@@ -64,12 +66,14 @@ The default keymappings are:
         \begin{sideways}
         \opt{RECORDER_PAD}{\ButtonFThree}
         \opt{MROBE100_PAD}{\ButtonPlay}
-        \opt{GIGABEAT_PAD}{\ButtonVolDown}
+        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
         \end{sideways}
+        &
         % Key "4"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
-            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
+            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+            ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonLeft}
         \end{sideways}
         &
         % Key "5"
@@ -77,26 +81,28 @@ The default keymappings are:
         \opt{RECORDER_PAD}{\ButtonPlay}
         \opt{ONDIO_PAD}{\ButtonMenu}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-            ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonPlay}
         \end{sideways}
         &
         % Key "6"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
-            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight}
+            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+            ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonRight}
         \end{sideways}
         &
         % Key "7"
         \begin{sideways}
         \opt{RECORDER_PAD}{\ButtonFTwo}
         \opt{MROBE100_PAD}{\ButtonDisplay}
-        \opt{GIGABEAT_PAD}{\ButtonVolUp}
+        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
         \end{sideways}
         &
         % Key "8"
         \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
+        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+            ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{IAUDIO_X5_PAD}{\ButtonDown}
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -106,6 +112,8 @@ The default keymappings are:
         % Key "9"
         \begin{sideways}
         \opt{RECORDER_PAD}{\ButtonOn}
+        \opt{GIGABEAT_PAD}{\ButtonA}
+        \opt{GIGABEAT_S_PAD}{\ButtonPlay}
         \end{sideways}
         &
         % Key "A"
@@ -119,7 +127,6 @@ The default keymappings are:
         % Key "E"
         &
         % Key "F"
-        &
     \\\bottomrule
     \end{tabularx}
     \end{center}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 034004e947..6f089c4b4b 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -9,34 +9,37 @@ This is a fully featured analogue and digital clock plugin.
 \begin{btnmap}{}{}
     \ButtonLeft{} / \ButtonRight
     & Cycle through modes \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
+    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}
+      {\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     & Cycle through skins \\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonMenu}
     \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     & Main Menu \\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,MROBE100_PAD,GIGABEAT_PAD}{\ButtonSelect}
+      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     & Start / Stop Counter \\
     Long
     \opt{RECORDER_PAD_PAD}{\ButtonPlay}%
     \opt{IRIVER_H10_PAD}{\ButtonRew}%
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,MROBE100_PAD,GIGABEAT_PAD}{\ButtonSelect}
+      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     & Reset Counter \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 \end{table}
@@ -45,7 +48,8 @@ This is a fully featured analogue and digital clock plugin.
 \begin{description}
 \item[View Clock] Exits the menu and returns to the current clock mode display.
 \item[Mode Selector] Opens a menu from which you can select a clock mode to view.
-\item[Counter Settings] Opens a menu from which you can adjust settings pertaining to the counter.
+\item[Counter Settings] Opens a menu from which you can adjust settings
+    pertaining to the counter.
 \item[Mode Settings] Opens a menu from which you can adjust settings pertaining to
     the current clock mode (analog, digital, binary).
 \item[General Settings]
@@ -57,9 +61,11 @@ This is a fully featured analogue and digital clock plugin.
     \item[Show Counter]
     Toggle Counter display.
     \item[Save]
-    Choose whether to disable automatic saving, saving to disk on exit, or saving to disk every settings change.
+    Choose whether to disable automatic saving, saving to disk on exit, or 
+    saving to disk every settings change.
     \item[Backlight]
-    Choose whether to disable the backlight, use the user's timeout setting, or keep the backlight on.
+    Choose whether to disable the backlight, use the user's timeout setting,
+    or keep the backlight on.
     \item[Idle Poweroff]
     Toggle Idle Poweroff.
     \note{This setting is not saved to disk.}
@@ -71,35 +77,43 @@ This is a fully featured analogue and digital clock plugin.
 \subsubsection{Analog mode}
 Small, round, analog clock is displayed in the middle of the LCD.
 Time readout, if enabled, is displayed at the upper left.
-If Time readout is in 12-hour (``12h'') mode, AM or PM will be displayed at the upper right.
-The Date readout, if enabled, is displayed at the lower left.
+If Time readout is in 12-hour (``12h'') mode, AM or PM will be displayed at the
+upper right.  The Date readout, if enabled, is displayed at the lower left.
 The Counter, if enabled, is displayed at the lower right.
 The second hand, if enabled, is displayed along with the hour and minute hands.
-Digit display, if enabled, places ``12'', ``3'', ``6'', and ``9'' around the face of the clock in their respective positions. 
+Digit display, if enabled, places ``12'', ``3'', ``6'', and ``9'' around the
+face of the clock in their respective positions. 
 
 \subsubsection{Digital mode}
 An imitation of an LCD, this mode shows a Clock comprised of digital ``segments''.
 The Date readout, if enabled, is displayed at the bottom, center.
-The Second readout, if in ``Text'' mode, is displayed at the top, center; if in ``Bar'' mode, is displayed as a progress bar at the top of the LCD; if in ``Invert'' mode, will invert the LCD left-to-right as the seconds pass (a fully-inverted LCD means the entire minute has passed).
+The Second readout, if in ``Text'' mode, is displayed at the top, center; if in
+``Bar'' mode, is displayed as a progress bar at the top of the LCD; if in
+``Invert'' mode, will invert the LCD left-to-right as the seconds pass (a
+fully-inverted LCD means the entire minute has passed).
 The Counter, if displayed, is shown at the upper left.
 The Blinking Colon, if enabled, blinks the colon once every second.
 12-hour mode, if enabled, will display the time in a 12-hour format.
 
 \subsubsection{LCD mode}
 Based on the Digital Mode, the LCD mode is another imitation of an LCD.
-The settings available in this mode are exactly the same as Digital Mode, but they are independent of Digital Mode.
-For example, you can have the Date Readout enabled in Digital Mode and disabled in LCD Mode.
+The settings available in this mode are exactly the same as Digital Mode, but
+they are independent of Digital Mode. For example, you can have the Date
+Readout enabled in Digital Mode and disabled in LCD Mode.
 
 \subsubsection{Fullscreen}
-A Fullscreen clock is displayed. Show Border, if enabled, will draw a small box at every hour position (1 through 12).
+A Fullscreen clock is displayed. Show Border, if enabled, will draw a small
+box at every hour position (1 to 12 inclusive).
 Invert Seconds, if enabled, will invert the LCD as the seconds pass.
 Second Hand, if enabled, will draw a second hand among the hour and minute hands.
 
 \subsubsection{Binary mode}
 This mode shows a Binary clock.
-The hour is displayed on the top line, the minute is displayed on the middle line, and the seconds are on the last line.
+The hour is displayed on the top line, the minute is displayed on the middle
+line, and the seconds are on the last line.
 Circle mode, if enabled, draws empty and full circles, instead of zeros and ones.
-For help on reading binary, please visit: \url{http://en.wikipedia.org/wiki/Binary_numeral_system}
+For help on reading binary, please visit:
+\url{http://en.wikipedia.org/wiki/Binary_numeral_system}
 
 \subsubsection{Plain mode}
-This mode shows a ``plain'' clock in large text that takes up nearly the whole LCD.
+This mode shows a ``plain'' clock in large text that takes up nearly the whole LCD.
\ No newline at end of file
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 3515d71dbf..a9464849c5 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -5,19 +5,20 @@ This is a rotating cube screen saver in 3D.
     \begin{btnmap}{}{}
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
         & Display at maximum frame rate\\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+      ,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
         & Pause\\
-    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
@@ -29,8 +30,8 @@ This is a rotating cube screen saver in 3D.
     \nopt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
         & Select axis to adjust\\
     \opt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonUp{} / \ButtonDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown{} / \ButtonVolUp}
@@ -38,7 +39,9 @@ This is a rotating cube screen saver in 3D.
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 301649b60b..d8bc390588 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -6,18 +6,21 @@ Demystify is a screen saver like demo.\\
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonRight\ / \ButtonLeft}
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}
+    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp\ / \ButtonDown}
     & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index f890ce1b2d..1710a1416f 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -8,7 +8,8 @@ numbers as well as the total of the rolled dice.
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,MROBE100_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
         & Roll dice again\\
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -16,6 +17,7 @@ numbers as well as the total of the rolled dice.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
         ,IRIVER_H10_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 05eced3b3f..1dbea14ef1 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -52,10 +52,10 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \emph{Statusbar Always Red.} Disable color response statusbar%\\
 
   \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}%
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}%
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD, SANSA_C200_PAD%
-         ,GIGABEAT_PAD}{pressing \ButtonPower}
+         ,GIGABEAT_PAD,GIGABEAT_S_PAD}{pressing \ButtonPower}%
 
   \emph{New Game. } Start a new game\\
   \emph{Options. } In game options\\
@@ -78,13 +78,13 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 \begin{table}
 \begin{btnmap}{}{}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-      ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
   \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & Move Forward \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-      ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown & Down\\}
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown & Down\\}
   \opt{IRIVER_H10_PAD}{\ButtonScrollDown & Down\\}
 %
   \ButtonLeft
@@ -94,7 +94,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
     & Turn Right \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
   \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{GIGABEAT_PAD}{\ButtonA}
@@ -105,17 +105,17 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
   \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
-  \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     & Open \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-      ,MROBE100_PAD}{\ButtonPower}
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower}
     & InGame Menu \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD%
-      ,GIGABEAT_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Enter \\
 %
@@ -125,7 +125,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IRIVER_H10_PAD}{\ButtonFF}
   \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
   \opt{SANSA_C200_PAD}{\ButtonVolUp}
-  \opt{GIGABEAT_PAD}{\ButtonVolDown}
+  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     & Change Weapon \\
 %
 \end{btnmap}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 62dfa65f9b..0c6aafdf93 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -4,7 +4,8 @@
 Fire is a demo displaying a fire effect.
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
@@ -13,16 +14,19 @@ Fire is a demo displaying a fire effect.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonLeft}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonLeft}
     & Toggle flame type\\
     \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
+        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     & Toggle moving flames\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index c0e50d88dd..624838e7a8 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -8,14 +8,16 @@ a screen containing tokens of only one colour.
 \begin{table}
 \begin{btnmap}{}{}
 \opt{PLAYER_PAD}{\ButtonOn{} / \ButtonMenu{} / \ButtonLeft{} / \ButtonRight}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
     & Move the cursor \\
 \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+    ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Flip \\
@@ -26,7 +28,7 @@ a screen containing tokens of only one colour.
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonLeft}
-\opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+\opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     & Shuffle \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
 \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -35,8 +37,8 @@ a screen containing tokens of only one colour.
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonRight}
-\opt{GIGABEAT_PAD}{\ButtonVolUp}
-\opt{MROBE100_PAD}{\ButtonMenu}
+\opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
+\opt{MROBE100_PAD}{\ButtonPlay}
     & Solve \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
 \opt{RECORDER_PAD}{\ButtonFThree}
@@ -46,13 +48,14 @@ a screen containing tokens of only one colour.
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
 \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonSelect}
-\opt{GIGABEAT_PAD}{\ButtonVolDown}
+\opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
 \opt{MROBE100_PAD}{\ButtonDisplay}
     & Solve step by step \\
 \opt{PLAYER_PAD}{\ButtonStop}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}{\ButtonPower}
+\opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index bd9aa6addf..a1340c0d72 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -13,25 +13,30 @@ after every one hundred points and randomly clears several jewels.
 \begin{table}
   \begin{btnmap}{}{}
     \ButtonLeft/\ButtonRight/\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
-        {\ButtonUp/\ButtonDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
+      {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     & Move the cursor around the jewels \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
-        {\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
+      {\ButtonSelect}
     & Select a jewel \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}%
     \opt{ONDIO_PAD}{Long \ButtonMenu}%
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} or Long \ButtonSelect}
     \opt{GIGABEAT_S_PAD}{\ButtonMenu{} or Long \ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}%
-        {Long \ButtonSelect}%
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,MROBE100_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect}%
     & Show the in-game menu \\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff & Exit \\}%
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}%
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+      {\ButtonOff & Exit \\}%
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
+      ,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}%
+    \opt{GIGABEAT_S_PAD}{\ButtonBack & Exit \\}%
     
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 26b825ada1..d4f9e23a1e 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -15,7 +15,8 @@ greyscale library}.
 \begin{table}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}%
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp\ / \ButtonDown}%
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
         / \ButtonLeft\ / \ButtonRight
@@ -26,7 +27,7 @@ greyscale library}.
         ,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     & Zoom in\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
@@ -34,7 +35,7 @@ greyscale library}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonPlay}
     & Zoom out\\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -47,6 +48,7 @@ greyscale library}.
     \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
+    \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonRight}
     & Next jpeg in directory\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -58,6 +60,7 @@ greyscale library}.
     \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
     & Previous jpeg in directory\\
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads
@@ -67,7 +70,7 @@ greyscale library}.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     & Show menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index bfd1cdebf0..a1dff99fa3 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -6,7 +6,8 @@ Demo showing the Rockbox logo bouncing around the screen.
     \ButtonRight\ / \ButtonLeft
     & Increase / decrease speed on the x-axis\\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight\ / \ButtonOn+\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
@@ -15,6 +16,7 @@ Demo showing the Rockbox logo bouncing around the screen.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 18daea2ea9..3ecb8cd562 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -11,7 +11,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp}
+    \opt{SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     & Zoom in\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -20,7 +20,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-    \opt{SANSA_C200_PAD}{\ButtonVolDown}
+    \opt{SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     & Zoom out\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -30,7 +30,8 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
-    \opt{MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_S_PAD}{\ButtonNext}
+    \opt{MROBE100_PAD}{\ButtonPlay}
     & Decrease iteration depth (less detail)\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -40,7 +41,8 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
-    \opt{MROBE100_PAD}{\ButtonPlay}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
+    \opt{MROBE100_PAD}{\ButtonMenu}
     & Increase iteration depth (more detail)\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -49,12 +51,14 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonPlay + \ButtonRew}
     \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Reset and return to the default image\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index 2e37a0d9ee..7cadcaf948 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -16,7 +16,8 @@ Luckily, there are checkpoints at levels four and eight.
 \begin{btnmap}{}{}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
     \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD%
+        ,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
@@ -24,6 +25,7 @@ Luckily, there are checkpoints at levels four and eight.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index b46c7d2f90..399e69cf77 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -9,24 +9,26 @@ on the appropriate button.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Exit plugin \\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,MROBE100_PAD}{
-      \ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
+      ,IAUDIO_X5_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu\ (Long: Stop)}
     \opt{GIGABEAT_PAD}{\ButtonA}
         & Start / Stop \\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu\ (repeatedly)}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
         & Tap tempo \\
     \ButtonLeft\ / \ButtonRight
         & Adjust tempo \\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{
-      \ButtonUp\ / \ButtonDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
         & Adjust volume \\
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 7e95a6db38..426537414a 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -2,7 +2,8 @@
 \subsection{Minesweeper}
 \screenshot{plugins/images/ss-minesweeper}{Minesweeper plugin}{img:minesweeper}
 The classic game of minesweeper. Use 
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+     ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}
     {the \ButtonUp\ and \ButtonDown\ keys}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack }
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
@@ -10,7 +11,8 @@ to select the required percentage of mines to set the difficulty
 then press the 
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
+     ,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
 \opt{IAUDIO_X5_PAD}{\ButtonRec}
 \opt{IRIVER_H10_PAD}{\ButtonFF}key to begin.
 
@@ -26,7 +28,8 @@ the location of a mine, it can be tagged to avoid accidentally
  \begin{btnmap}{}{}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-      ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
+      ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
   \opt{IRIVER_H10_PAD}
       {\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
   & Move the cursor across the minefield \\
@@ -38,7 +41,7 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{ONDIO_PAD}{\ButtonMenu}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} / \ButtonRec}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
   \opt{SANSA_E200_PAD}{\ButtonRec}
   \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolDown}
   \opt{GIGABEAT_PAD}{\ButtonA}
@@ -47,7 +50,8 @@ the location of a mine, it can be tagged to avoid accidentally
   %
   \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonPlay}
   \opt{ONDIO_PAD}{Long \ButtonMenu}
-  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{SANSA_C200_PAD}{Long \ButtonSelect{} / \ButtonVolUp}
@@ -60,12 +64,13 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonRec}
   \opt{SANSA_E200_PAD}{Long \ButtonRec}
   \opt{IRIVER_H10_PAD}{\ButtonRew+\ButtonPlay}
-  \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
   & Display the current game status \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+  \opt{GIGABEAT_S_PAD}{\ButtonBack}
   & Exit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 977c2fb750..6d6e47e65d 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -8,8 +8,10 @@
 \screenshot{plugins/images/ss-mosaic}{Mosaique}{img:mosaique}
 This simple graphics demo draws a mosaic picture on the screen of the \dap.
 Press
-\opt{PLAYER_PAD}{\ButtonStop}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+\opt{PLAYER_PAD}{\ButtonStop}%
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}%
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+  ,MROBE100_PAD}{\ButtonPower}%
+\opt{GIGABEAT_S_PAD}{\ButtonBack} %
 to quit.
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 73a19f6616..640e634440 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -10,11 +10,20 @@ option and choose \setting{mpegplayer}.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \ActionWpsPlay & Pause/Resume\\
+    \opt{GIGABEAT_S_PAD}{\ButtonSelect{} or \ButtonPlay}
+    \opt{GIGABEAT_PAD}{\ButtonSelect{} or \ButtonA}
+    \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsPlay}
+    & Pause / Resume\\
     \ActionWpsStop & Stop\\
-    \ActionWpsVolUp{} / \ActionWpsVolDown & Adjust volume up / down\\
+    \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsVolUp{} / \ActionWpsVolDown}
+    \opt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ButtonLeft{} or  \ButtonVolDown{} / 
+        \ButtonRight{} or \ButtonVolUp}
+    & Adjust volume up / down\\
+    \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsSkipPrev{} / \ActionWpsSkipNext}
+    \opt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown}
+    & Rewind / Fast Forward\\ 
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 3bd496cd77..9494d60246 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -15,10 +15,11 @@ being played.
   \begin{btnmap}{}{}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     & Toggle filled / curve / plot \\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
@@ -27,6 +28,7 @@ being played.
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
+    \opt{GIGABEAT_S_PAD}{\ButtonNext}
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -35,8 +37,10 @@ being played.
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
+    \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     & Toggle drawing orientation \\
-    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+      ,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
@@ -47,7 +51,8 @@ being played.
         {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonVolUp{} / \ButtonVolDown}
+    \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonVolUp{} / \ButtonVolDown}
     & Increase / decrease volume\\
     \ButtonRight{} / \ButtonLeft
     & Increase / decrease speed\\
@@ -55,6 +60,7 @@ being played.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
         {\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Exit demo \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 8c29036feb..d1db0fb412 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -30,22 +30,22 @@ found at \url{http://www.mame.net}.
 \begin{table}
   \begin{btnmap}{}{}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight}
-    \opt{GIGABEAT_PAD}{\ButtonUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
     \opt{h10_5gb}{\ButtonScrollUp}
     & Move Up\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft}
     \opt{h10_5gb}{\ButtonScrollDown}
-    \opt{GIGABEAT_PAD}{\ButtonDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{h10}{\ButtonScrollUp}
-    \opt{h10_5gb,GIGABEAT_PAD}{\ButtonLeft}
+    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{h10}{\ButtonScrollDown}
-    \opt{h10_5gb,GIGABEAT_PAD}{\ButtonRight}
+    \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
     & Move Right\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
@@ -53,13 +53,15 @@ found at \url{http://www.mame.net}.
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
     & Insert Coin\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
+        ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew} 
     & 1-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{n/a}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{MROBE100_PAD}{\ButtonMenu}
     & 2-Player Start\\
@@ -67,7 +69,7 @@ found at \url{http://www.mame.net}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonPower}
-    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     & Menu\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index f40b9b356e..98adcab836 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -17,6 +17,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown, }

     \opt{SANSA_E200_PAD}{\ButtonUp, \ButtonDown, }

     \opt{GIGABEAT_PAD}{\ButtonUp, \ButtonDown, }

+    \opt{GIGABEAT_S_PAD}{\ButtonUp, \ButtonDown, }

     \opt{MROBE100_PAD}{\ButtonUp, \ButtonDown, }

     \opt{SANSA_C200_PAD}{\ButtonUp, \ButtonDown, }

 

@@ -28,6 +29,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{\ButtonLeft, \ButtonRight}

     \opt{SANSA_E200_PAD}{\ButtonLeft, \ButtonRight}

     \opt{GIGABEAT_PAD}{\ButtonLeft, \ButtonRight}

+    \opt{GIGABEAT_S_PAD}{\ButtonLeft, \ButtonRight}

     \opt{MROBE100_PAD}{\ButtonLeft, \ButtonRight}

     \opt{SANSA_C200_PAD}{\ButtonLeft, \ButtonRight}

         & to move around\\

@@ -40,6 +42,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{\ButtonPlay}

     \opt{SANSA_E200_PAD}{\ButtonSelect}

     \opt{GIGABEAT_PAD}{\ButtonSelect}

+    \opt{GIGABEAT_S_PAD}{\ButtonSelect}

     \opt{MROBE100_PAD}{\ButtonSelect}

     \opt{SANSA_C200_PAD}{\ButtonSelect}

         & to select/save\\

@@ -52,6 +55,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{Long \ButtonFF}

     \opt{SANSA_E200_PAD}{\ButtonRec}

     \opt{GIGABEAT_PAD}{\ButtonA}

+    \opt{GIGABEAT_S_PAD}{\ButtonMenu}

     \opt{MROBE100_PAD}{\ButtonPlay}

     \opt{SANSA_C200_PAD}{\ButtonRec}

         & to restart level\\

@@ -64,6 +68,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{\ButtonFF + \ButtonScrollUp}

     \opt{SANSA_E200_PAD}{\ButtonScrollBack}

     \opt{GIGABEAT_PAD}{\ButtonVolUp}

+    \opt{GIGABEAT_S_PAD}{\ButtonVolUp}

     \opt{MROBE100_PAD}{\ButtonMenu}

     \opt{SANSA_C200_PAD}{\ButtonVolUp}

         & to go up a level\\

@@ -74,7 +79,7 @@ block and crosses which allow you to choose a replacement block.
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}

         \opt{IRIVER_H10_PAD}{\ButtonFF + \ButtonScrollDown}

         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}

-        \opt{SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonVolDown}

+        \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}

         \opt{MROBE100_PAD}{\ButtonDisplay}

         & to go down a level\\

     }

@@ -87,6 +92,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{IRIVER_H10_PAD}{\ButtonPower}

     \opt{SANSA_E200_PAD}{\ButtonPower}

     \opt{GIGABEAT_PAD}{\ButtonPower}

+    \opt{GIGABEAT_S_PAD}{\ButtonBack}

     \opt{MROBE100_PAD}{\ButtonPower}

     \opt{SANSA_C200_PAD}{\ButtonPower}

         & to quit\\

diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 8475459ff1..2def0a6f54 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -10,7 +10,8 @@ Plasma is a demo displaying a 80's style retro plasma effect.
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonUp\ / \ButtonDown}
     & Adjust frequency\\
     \opt{lcd_color}{
-        \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+        \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+            ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
             {\ButtonSelect}
         \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
         & Change colours\\
@@ -19,6 +20,7 @@ Plasma is a demo displaying a 80's style retro plasma effect.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
         {\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index fecfc341e1..b9a00e3af5 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -6,7 +6,8 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonLeft}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} 
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
@@ -14,7 +15,8 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     & Left player up\\
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonDown}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+      ,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonLeft}
@@ -25,7 +27,7 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonPlay}    
     & Right player up\\
     \opt{RECORDER_PAD,SANSA_E200_PAD}{\ButtonRight}
@@ -33,12 +35,14 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonRight}    
     & Right player down\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+      ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 7454359fa4..a80975c00a 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -10,7 +10,8 @@ ends when robotfindskitten.
 \begin{btnmap}{}{}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
     \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD%
+        ,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
@@ -18,6 +19,7 @@ ends when robotfindskitten.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index df6a7894a1..3edec0efe2 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -12,7 +12,7 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
     \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}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
@@ -23,7 +23,8 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
     \ButtonRight
         & Move right\\
     \opt{PLAYER_PAD}{\ButtonMenu}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -36,7 +37,7 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonMenu}
         & Rotate left\\
     \opt{PLAYER_PAD}{\ButtonPlay}
@@ -46,13 +47,14 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
     \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp/\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonPlay}
         & Rotate right\\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
         & Drop\\
@@ -64,6 +66,7 @@ making the blocks fall faster. If the pile of blocks reaches the ceiling, the ga
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index cf3167300c..c28d2767ed 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -13,7 +13,7 @@ Rockblox1d is a game for people who find rockblox too hard. In this version the
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{GIGABEAT__S_PAD}{\ButtonBack}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index bdce573309..c01bb5f6ee 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -13,7 +13,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
 \begin{table}
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown}
+        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD}{Tap \ButtonPlay{} / \ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     / \ButtonLeft{} / \ButtonRight
@@ -25,7 +25,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IPOD_4G_PAD}{Tap \btnfnt{Top-Right}}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     & A button\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -34,7 +34,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IPOD_4G_PAD}{Tap \btnfnt{Top-Left}}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     & B button\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -46,6 +46,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
     & Start\\
     %
     \nopt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{
@@ -54,7 +55,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         \opt{IPOD_4G_PAD}{Tap \btnfnt{Bottom-Left}}
         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{SANSA_C200_PAD}{\ButtonVolUp}
-        \opt{GIGABEAT_PAD}{\ButtonSelect}
+        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
         & Select\\
         %
     }
@@ -68,7 +69,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IRIVER_H100_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD}{\ButtonHold{} switch}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonPower}
-    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     & Open Rockboy menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 9e4ecf4358..f255d8828c 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -8,15 +8,18 @@ Key controls:
 
 \begin{table}
   \begin{btnmap}{}{}
-  \opt{RECORDER_PAD,ONDIO_PAD,h100,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+  \opt{RECORDER_PAD,ONDIO_PAD,h100,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD%
+       ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
-  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay}
-  \opt{IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}
+    {\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay}
+  \opt{IRIVER_H10_PAD}
+    {\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
   & Move Tile \\
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{Long \ButtonMenu}
-  \opt{h100,h300,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect} 
+  \opt{h100,h300,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect} 
   \opt{x5,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -30,11 +33,14 @@ Key controls:
   \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
+  \opt{GIGABEAT_S_PAD}{\ButtonMenu}
   & Change between picture and numbered tiles \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-  \opt{x5,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+  \opt{x5,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    {\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+  \opt{GIGABEAT_S_PAD}{\ButtonBack}
   & Stop the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index efafe23e02..42cf552e8e 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -8,13 +8,15 @@ end when the snake touches either the borders of the screen or itself.
 \begin{table}
     \begin{btnmap}{}{}
      \opt{RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
-         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown}
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp/\ButtonDown}
      \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay}
      \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
      & Change levels (1 is slowest, 9 is fastest)\\
     %
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     & Toggle Play/Pause\\
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 6281b37693..18d82d893a 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -11,12 +11,14 @@ into itself.
     \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
         & Set game speed\\
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD%
+      ,IPOD_3G_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonRight}
         & Select starting maze\\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -24,18 +26,18 @@ into itself.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
         & Select game type (A or B)\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
         & Start the game\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
@@ -44,13 +46,14 @@ into itself.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
         & Pause and resume the game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index d66c802646..ea914295ae 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -7,4 +7,5 @@ you will love this demo.  Or maybe not.
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}%
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}%
-    {Press \ButtonPower\ to quit.}
+    {Press \ButtonPower\ to quit.}%
+\opt{GIGABEAT_S_PAD}{Press \ButtonBack\ to quit.}
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index f6874a80f3..91da56980c 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -15,7 +15,8 @@ information about the level format, see
 \begin{btnmap}{}{}
 \multicolumn{2}{c}{\textbf{In game}} \\
 \hline
-\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
     {\ButtonUp, \ButtonDown, }%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, }%
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown, }%
@@ -24,6 +25,7 @@ information about the level format, see
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
+\opt{GIGABEAT_S_PAD}{\ButtonMenu}
     & Menu \\
 \nopt{IAUDIO_X5_PAD}{
     \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFOne}
@@ -34,6 +36,7 @@ information about the level format, see
     \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolDown}
     \opt{MROBE10_PAD}{\ButtonDisplay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     & Back to previous level \\
 }
 \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
@@ -44,6 +47,7 @@ information about the level format, see
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
     & Restart level \\
 }
 \nopt{IAUDIO_X5_PAD}{
@@ -53,6 +57,7 @@ information about the level format, see
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
     \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonUp}
     & Go to next level \\
@@ -62,6 +67,7 @@ information about the level format, see
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
+\opt{GIGABEAT_S_PAD}{\ButtonVolUp}
     & Undo last movement \\
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
@@ -69,6 +75,7 @@ information about the level format, see
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IRIVER_H10_PAD}{\ButtonFF}
 \opt{GIGABEAT_PAD}{\ButtonA}
+\opt{GIGABEAT_S_PAD}{\ButtonVolDown}
 \opt{MROBE100_PAD}{\ButtonDisplay}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     & Redo previously undone move \\
@@ -78,9 +85,11 @@ information about the level format, see
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
+      ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     & Pause/resume \\
-\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
+\opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
     {\ButtonUp/\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
@@ -90,6 +99,7 @@ information about the level format, see
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
+\opt{GIGABEAT_S_PAD}{\ButtonMenu}
     & Quit \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 18bfe024e1..3cd91f531b 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -15,7 +15,8 @@ visit
 
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD}
       {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
@@ -24,14 +25,17 @@ visit
     %
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+      ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
       & Select cards, move cards, reveal hidden cards...\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
+      {\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{Long \ButtonLeft}
     \opt{SANSA_E200_PAD}{\ButtonRec}
@@ -47,12 +51,14 @@ visit
     \opt{SANSA_E200_PAD}{\ButtonLeft}
     \opt{SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonLeft}
+    \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonLeft}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonLeft}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{Long \ButtonUp}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+      ,MROBE100_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -65,13 +71,15 @@ visit
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{SANSA_E200_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonRight}
+    \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonRight}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
       & Put the card on top of the remains stack on one of the final colour stacks.\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
       & Show menu\\
    \end{btnmap}
   \end{table}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 1ea546a6d6..a94cd83d1d 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -9,23 +9,27 @@ UFO will appear -- shoot this for extra points.
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Shoot\\
     %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & Thrust\\
     %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonLeft / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
     & Turn left/right\\
     %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -35,7 +39,7 @@ UFO will appear -- shoot this for extra points.
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Pause game\\
@@ -43,6 +47,7 @@ UFO will appear -- shoot this for extra points.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 15e9793f4f..4d1984f603 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -16,12 +16,14 @@ could not otherwise reach. The block cannot take ``o''s.
         & Move Left\\
     \ButtonRight
         & Move Right\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
         & Move Up\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -29,7 +31,8 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
         & Switch between circle and square\\
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -38,7 +41,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
-    \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonMenu}
         & Previous level\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -48,6 +51,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonDown}
     \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
         & Reset level \\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -56,12 +60,13 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
-    \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonPlay}
         & Next level \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Exit the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 88f29d3dd8..5628a9cf6b 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -8,17 +8,20 @@ Starfield simulation (like the classic screensaver).
     \ButtonRight\ / \ButtonLeft
     & Increase / decrease number of stars\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD%
+        ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease speed\\
     \opt{lcd_color}{%
-        \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}%
+        \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}%
         & Change colours\\%
     }%
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index 829975714c..300eb4da7c 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -9,6 +9,7 @@ Press %
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}%
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-    ,MROBE100_PAD}{\ButtonPower} %
+    ,MROBE100_PAD}{\ButtonPower}%
+\opt{GIGABEAT_S_PAD}{\ButtonBack} %
 to abort counting and exit the plugin. Press it again to quit after counting
 has finished.
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index b2afe9d5ff..e31f728294 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -10,9 +10,10 @@ A simple stopwatch program with support for saving times.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Quit Plugin \\
     %
-    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD,IPOD_4G_PAD%
         ,IPOD_3G_PAD}{\ButtonSelect}
@@ -25,6 +26,7 @@ A simple stopwatch program with support for saving times.
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Reset timer (only when timer is stopped)\\
     %
@@ -32,12 +34,12 @@ A simple stopwatch program with support for saving times.
     \opt{ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     & Take lap time \\
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     & Scroll through lap times \\
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 0170fc778e..9b3426a88d 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -29,7 +29,8 @@ settings.
 
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
@@ -41,7 +42,7 @@ settings.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect{} / \ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
@@ -51,7 +52,7 @@ settings.
     \opt{ONDIO_PAD}{Long \ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonLeft{} / \ButtonRight}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{Long \ButtonSelect}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
     \opt{SANSA_E200_PAD}{Long \ButtonScrollBack{} / \ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{Long \ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
@@ -60,7 +61,7 @@ settings.
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
     \opt{SANSA_C200_PAD}{\ButtonPower}
@@ -69,14 +70,15 @@ settings.
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & Add/Remove number to scratchpad\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+      ,MROBE100_PAD}{\ButtonPower}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
     \opt{SANSA_C200_PAD}{Long \ButtonPower}
     & Quit\\
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 2bffae0ad7..a477d00af3 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -14,6 +14,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
+    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
         & Scroll{}-up\\
 
     \opt{PLAYER_PAD}{\ButtonRight}
@@ -22,43 +23,53 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
+    \opt{GIGABEAT_S_PAD}{\ButtonNext}
         & Scroll{}-down\\
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
-    \nopt{PLAYER_PAD}{\ButtonLeft}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonLeft}
+    \nopt{PLAYER_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
         & Top of file (Narrow mode) /
         One screen left (Wide mode)\\
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
-    \nopt{PLAYER_PAD}{\ButtonRight}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonRight}
+    \nopt{PLAYER_PAD,GIGABEAT_S_PAD}{\ButtonRight}
         & Bottom of file (Narrow mode) /
         One screen right (Wide mode)\\
 
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_S_PAD}{%
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
         \opt{SANSA_E200_PAD}{\ButtonScrollBack}
         \opt{SANSA_C200_PAD}{\ButtonUp}
+        \opt{GIGABEAT_S_PAD}{\ButtonUp}
         & One line up\\
     }
 
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+      ,SANSA_C200_PAD,GIGABEAT_S_PAD}{%
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{SANSA_C200_PAD}{\ButtonDown}
+        \opt{GIGABEAT_S_PAD}{\ButtonDown}
         & One line down\\
     }
 
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
-        \ButtonOn+\ButtonLeft
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{
+        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
+        \opt{GIGABEAT_S_PAD}{\ButtonLeft}
         & One column left\\
     }
 
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
-        \ButtonOn+\ButtonRight
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{
+        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
+        \opt{GIGABEAT_S_PAD}{\ButtonRight}
         & One column right\\
     }
 
-    \opt{RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+        ,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -68,7 +79,8 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
 
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
-    \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+      ,MROBE100_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -79,6 +91,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
         & Exit text viewer\\
 
     \end{btnmap}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index bd40cbc6b3..50e734c845 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -13,7 +13,9 @@ and the meter scale can be changed.
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+     ,MROBE100_PAD}{\ButtonPower}
+\opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Save settings and quit\\
 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
@@ -21,22 +23,23 @@ and the meter scale can be changed.
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
 \opt{GIGABEAT_PAD}{\ButtonA}
 \opt{MROBE100_PAD}{\ButtonDisplay}
+\opt{GIGABEAT_S_PAD}{\ButtonNext}
     & Help\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{Long \ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
-    {\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+     ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
-\opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+\opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     & Settings\\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}
-    {\ButtonUp}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+     ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
 \opt{SANSA_C200_PAD}{\ButtonVolUp}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & Raise Volume\\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}
-    {\ButtonDown}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+     ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
 \opt{SANSA_C200_PAD}{\ButtonVolDown}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 3d548e038e..d8de4abe5c 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -74,12 +74,12 @@ Game controls:}
         \ButtonRight
         & Turn right\\
         \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-            ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
+            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
         \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
         & Turn Up\\
         \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-            ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
+            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
         \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
         & Turn Down\\
@@ -121,13 +121,15 @@ The game is over when all worms are dead. The longest worm wins the
 game. 
 \item [Pause the game.]
 Press
-\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
-\opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}%
+\opt{ONDIO_PAD}{\ButtonMenu}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,SANSA_E200_PAD,GIGABEAT_PAD%
+  ,GIGABEAT_S_PAD}{\ButtonSelect}
 to pause the game. Press
-\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
-\opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}%
+\opt{ONDIO_PAD}{\ButtonMenu}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,SANSA_E200_PAD,GIGABEAT_PAD%
+  ,GIGABEAT_S_PAD}{\ButtonSelect}
 again to resume the game.
 
 \item[Stop the game.]
@@ -135,25 +137,31 @@ There are two ways to stop a running game.
 
 \begin{itemize}
 \item If you want to quit Wormlet entirely simply hit
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonMenu+\ButtonSelect}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}.
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IPOD_4G_PAD}{\ButtonMenu+\ButtonSelect}%
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}%
+\opt{GIGABEAT_S_PAD}{\ButtonBack}.
 The game will stop immediately and you will return to the game menu. 
 \item If you want to stop the game and still see the screen hit 
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}
-\opt{IPOD_4G_PAD}{\ButtonSelect+ButtonPlay}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}.
+\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
+\opt{IPOD_4G_PAD}{\ButtonSelect+ButtonPlay}%
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}%
+\opt{GIGABEAT_PAD}{\ButtonA}%
+\opt{GIGABEAT_S_PAD}{\ButtonMenu}.
 This freezes the game. If you hit
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
+\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
+\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}%
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}%
+\opt{GIGABEAT_PAD}{\ButtonA}%
+\opt{GIGABEAT_S_PAD}{\ButtonMenu}
 button again a new game starts with the same configuration. To return to the
 games menu you can hit
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonMenu+\ButtonSelect}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}. A stopped game can not be resumed. 
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IPOD_4G_PAD}{\ButtonMenu+\ButtonSelect}%
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}%
+\opt{GIGABEAT_S_PAD}{\ButtonBack}. A stopped game can not be resumed. 
 \end{itemize}
 \end{description}
 
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 02a40514a6..5adb5e04e7 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -10,7 +10,8 @@ To finish a level you have to section off more than 75\%.
 \begin{table}
 \begin{btnmap}{}{}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+        ,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
@@ -18,7 +19,7 @@ To finish a level you have to section off more than 75\%.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,RECORDER_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
@@ -26,6 +27,7 @@ To finish a level you have to section off more than 75\%.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
     & Open menu\\
 \end{btnmap}
 \end{table}