20 files changed, 103 insertions, 60 deletions

diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index ba8409d7fd..2c5c36cffd 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -27,12 +27,12 @@ must catch it with the paddle. Look out for the bad ones.\\
     \ButtonLeft\ / \ButtonRight & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \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}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     & 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Open menu / Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 1b1321af2b..5bd50f9d43 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -15,6 +15,7 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} 
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{SANSA_E200_PAD}{\ButtonUp}
+    \opt{GIGABEAT_PAD}{\ButtonPower}
     & Start new game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
@@ -23,13 +24,14 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{ONDIO_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonDown}
+    \opt{GIGABEAT_PAD}{\ButtonMenu}
         & Resume saved game\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
         & Show high scores\\
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp/\ButtonDown}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{ONDIO_PAD}{\ButtonLeft+\ButtonRight}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
@@ -37,18 +39,19 @@ fired. Points are awarded depending on how quickly the level was completed.
     \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}{\ButtonPower}
+    \opt{GIGABEAT_PAD}{\ButtonA}
         & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonPlay} 
     \opt{ONDIO_PAD}{\ButtonMenu} 
-    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD}{\ButtonUp}
         & Pause game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonLeft/\ButtonRight}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -59,10 +62,12 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{RECORDER_PAD}{\ButtonFOne} 
     \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{GIGABEAT_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}{\ButtonPower} 
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
+    \opt{GIGABEAT_PAD}{\ButtonA} 
         & Exit to menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index d4116221d7..903a7cbc64 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -29,7 +29,7 @@ the game.
     & Move the cursor\\
     \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}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}
         {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Select / Move piece\\
@@ -39,16 +39,19 @@ the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{GIGABEAT_PAD}{\ButtonMenu}
     & Change level\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{GIGABEAT_PAD}{\ButtonPower}
     & Force play\\
     \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}{\ButtonPower}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Show the menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 076e46cb4f..fec5cf171e 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -8,14 +8,14 @@ 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}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Flip \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft}
@@ -25,6 +25,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}{\ButtonRec+\ButtonLeft}
+\opt{GIGABEAT_PAD}{\ButtonMenu}
     & Shuffle \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
 \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -33,6 +34,7 @@ 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}{\ButtonRec+\ButtonRight}
+\opt{GIGABEAT_PAD}{\ButtonVolUp}
     & Solve \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
 \opt{RECORDER_PAD}{\ButtonFThree}
@@ -42,11 +44,12 @@ a screen containing tokens of only one colour.
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
 \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
 \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonSelect}
+\opt{GIGABEAT_PAD}{\ButtonVolDown}
     & 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}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Quit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/images/ss-pacbox-240x320x16.png b/manual/plugins/images/ss-pacbox-240x320x16.png
new file mode 100644
index 0000000000..e97f8f3d96
--- /dev/null
+++ b/manual/plugins/images/ss-pacbox-240x320x16.png
diff --git a/manual/plugins/images/ss-rockboy-240x320x16.png b/manual/plugins/images/ss-rockboy-240x320x16.png
new file mode 100644
index 0000000000..cbf5d80ad5
--- /dev/null
+++ b/manual/plugins/images/ss-rockboy-240x320x16.png
diff --git a/manual/plugins/images/ss-sudoku-240x320x16.png b/manual/plugins/images/ss-sudoku-240x320x16.png
new file mode 100644
index 0000000000..5bb904c7de
--- /dev/null
+++ b/manual/plugins/images/ss-sudoku-240x320x16.png
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index fa1dc17ddb..b224b4bc54 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -13,7 +13,7 @@ after every one hundred points and randomly clears several jewels.
 \opt{RECORDER_PAD}{
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      \ButtonLeft, \ButtonRight, \ButtonUp{} and \ButtonDown 
       & Move the cursor around the jewels \\
       \ButtonPlay 
       & Select a jewel \\
@@ -27,7 +27,7 @@ after every one hundred points and randomly clears several jewels.
 \opt{ONDIO_PAD}{
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      \ButtonLeft, \ButtonRight, \ButtonUp{} and \ButtonDown 
       & Move the cursor around the jewels \\
       \ButtonMenu 
       & Select a jewel \\
@@ -41,7 +41,7 @@ after every one hundred points and randomly clears several jewels.
 \opt{h1xx,h300}{
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown 
+      \ButtonLeft, \ButtonRight, \ButtonUp{} and \ButtonDown 
       & Move the cursor around the jewels \\
       \ButtonSelect 
       & Select a jewel \\
@@ -55,7 +55,7 @@ after every one hundred points and randomly clears several jewels.
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft, \ButtonRight, \ButtonMenu\ and \ButtonPlay
+      \ButtonLeft, \ButtonRight, \ButtonMenu{} and \ButtonPlay
       & Move the cursor around the jewels \\
       \ButtonSelect 
       & Select a jewel \\
@@ -68,7 +68,7 @@ after every one hundred points and randomly clears several jewels.
 \opt{SANSA_E200_PAD}{
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown
+      \ButtonLeft, \ButtonRight, \ButtonUp{} and \ButtonDown
       & Move the cursor around the jewels \\
       \ButtonSelect 
       & Select a jewel \\
@@ -79,4 +79,17 @@ after every one hundred points and randomly clears several jewels.
     \end{btnmap}
   \end{table}
 }
+\opt{GIGABEAT_PAD}{
+  \begin{table}
+    \begin{btnmap}{}{}
+      \ButtonLeft, \ButtonRight, \ButtonUp{} and \ButtonDown
+      & Move the cursor around the jewels \\
+      \ButtonSelect 
+      & Select a jewel \\
+      \ButtonPower 
+      & Show the in-game menu\\
+    \end{btnmap}
+  \end{table}
+  To exit the game, bring up the in-game menu and select \setting{Quit}\\
+}
 
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index ac48110c4b..92b71f8b78 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -30,38 +30,42 @@ 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}{\ButtonRight}
+    \opt{GIGABEAT_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}{\ButtonLeft}
     \opt{h10_5gb}{\ButtonScrollDown}
+    \opt{GIGABEAT_PAD}{\ButtonDown}
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{h10}{\ButtonScrollUp}
-    \opt{h10_5gb}{\ButtonLeft}
+    \opt{h10_5gb,GIGABEAT_PAD}{\ButtonLeft}
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{h10}{\ButtonScrollDown}
-    \opt{h10_5gb}{\ButtonRight}
+    \opt{h10_5gb,GIGABEAT_PAD}{\ButtonRight}
     & Move Right\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Insert Coin\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD}{\ButtonRec}
     & 2-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonPower}
+    \opt{GIGABEAT_PAD}{\ButtonMenu}
     & Menu\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index 451fe5e2b4..d28fcdd1db 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -6,13 +6,13 @@ 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}{\ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} 
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & 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}{\ButtonDown} 
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonDown} 
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     & Left player down\\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -21,16 +21,18 @@ 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}
     & Right player up\\
     \opt{RECORDER_PAD,SANSA_E200_PAD}{\ButtonRight}
     \opt{ONDIO_PAD}{\ButtonDown}
     \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}
     & 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 6d2c95c60d..9d874fe942 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -14,10 +14,11 @@ pile of blocks reach the ceiling the game is over.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay & Restart game\\}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay & Restart game\\}
     \opt{SANSA_E200_PAD}{\ButtonRec & Restart game\\}
+    \opt{GIGABEAT_PAD}{\ButtonA & Restart game\\}
     \ButtonLeft & Move left\\
     \ButtonRight & Move right\\
     \opt{PLAYER_PAD}{\ButtonMenu}
-    \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}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -30,24 +31,26 @@ pile of blocks reach the ceiling the game is over.
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+    \opt{GIGABEAT_PAD}{\ButtonVolUp}
         & Rotate left\\
     \opt{PLAYER_PAD}{\ButtonPlay}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonMenu}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp}
+    \opt{GIGABEAT_PAD}{\ButtonVolDown}
         & 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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
         & Drop\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index e202c8bbd1..a9a85e1e60 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -8,7 +8,7 @@ Key controls:
 
 \begin{table}
   \begin{btnmap}{}{}
-  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD}
+  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD,GIGABEAT_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}
@@ -16,7 +16,7 @@ Key controls:
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{Hold \ButtonMenu}
-  \opt{h1xx,h300}{\ButtonSelect} 
+  \opt{h1xx,h300,GIGABEAT_PAD}{\ButtonSelect} 
   \opt{x5,SANSA_E200_PAD}{\ButtonRec}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} 
   \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -28,10 +28,11 @@ Key controls:
   \opt{x5,IRIVER_H10_PAD}{\ButtonPlay}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
   \opt{SANSA_E200_PAD}{\ButtonSelect}
+  \opt{GIGABEAT_PAD}{\ButtonA}
   & 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}{\ButtonPower}
+  \opt{x5,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
   & Stop the game \\
   \end{btnmap}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 25f918d748..1789bc3fb8 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -7,13 +7,13 @@ 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}{\ButtonUp/\ButtonDown}
+     \opt{RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,GIGABEAT_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 97f5210cf0..4165ce9175 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -10,12 +10,12 @@ into itself.
 \begin{table}
     \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}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}
         {\ButtonRight/\ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonRight}
         & Select starting maze\\
@@ -24,15 +24,16 @@ 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}{\ButtonRec}
+    \opt{GIGABEAT_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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}
         {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight}
@@ -40,12 +41,12 @@ into itself.
     \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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index d5ab4ea9b7..bb44806505 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -16,7 +16,7 @@ visit\\
 \begin{table}
   \begin{btnmap}{}{}
     \ButtonLeft/\ButtonRight/\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
       {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
@@ -24,14 +24,14 @@ 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}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
       & Select cards, move cards, reveal hidden cards...\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{Hold \ButtonLeft}
     \opt{SANSA_E200_PAD}{\ButtonRec}
@@ -44,11 +44,12 @@ visit\\
     \opt{IAUDIO_X5_PAD}{Hold \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonLeft}
+    \opt{GIGABEAT_PAD}{\ButtonA + \ButtonLeft}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{Hold \ButtonUp}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD}{Hold \ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonMenu}
     \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -60,11 +61,12 @@ visit\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{SANSA_E200_PAD}{\ButtonRight}
+    \opt{GIGABEAT_PAD}{\ButtonA + \ButtonRight}
       & 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
       & Show menu\\
    \end{btnmap}
   \end{table}
\ No newline at end of file
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 2eb8870574..031a7c733e 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -9,22 +9,22 @@ 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}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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_E200_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}
         {\ButtonLeft / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
     & Turn left/right\\
     %
-    \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}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -35,11 +35,12 @@ UFO will appear -- shoot this for extra points.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Pause 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 532504df76..4dcdd0d398 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -16,18 +16,18 @@ 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}{\ButtonUp}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_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}{\ButtonDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
         & Move Down\\ 
     \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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
         & Switch between circle and square\\
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -36,6 +36,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
+    \opt{GIGABEAT_PAD}{\ButtonVolDown}
         & Previous level\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
@@ -43,6 +44,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
+    \opt{GIGABEAT_PAD}{\ButtonA}
         & Reset level \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
@@ -50,10 +52,11 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
+    \opt{GIGABEAT_PAD}{\ButtonVolUp}
         & 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
         & Exit the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 0d74dc5162..de20ee1a8d 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -27,7 +27,7 @@ These are \emph{NOT} saved when saving the game.
 
 \begin{table}
     \begin{btnmap}{}{}
-    \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}
     {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight}
@@ -37,7 +37,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect/\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonSelect/\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     & Change number under the cursor\\
@@ -46,7 +46,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{ONDIO_PAD}{Hold \ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonLeft/\ButtonSelect/\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
+    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{Hold \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Hold \ButtonRew}
     \opt{SANSA_E200_PAD}{Hold \ButtonScrollUp/\ButtonScrollDown}
     & Constantly changing the number under the cursor\\
@@ -54,7 +54,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
     & Open Menu\\
@@ -64,10 +64,11 @@ These are \emph{NOT} saved when saving the game.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & 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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
     & Quit\\
     %
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 75d5089771..cde6bad478 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -10,7 +10,7 @@ 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,RECORDER_PAD,ONDIO_PAD}{\ButtonUp, \ButtonDown,}%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD}{\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
     & Move around the arena\\
@@ -19,10 +19,11 @@ To finish a level you have to section off more than 75\%.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonRec}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Pause\\
     \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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Open menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 3ec214a170..7d6fa45b7a 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -202,7 +202,7 @@ paragraph.
   of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
   Above and to the left of this, on the outside of the turning wheel are four 
   buttons.  These are the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{} and 
-  \ButtonRight{} buttons.  Inside the wheel is thr \ButtonSelect{} button.  Turning
+  \ButtonRight{} buttons.  Inside the wheel is the \ButtonSelect{} button.  Turning
   the wheel to the right activates the \ButtonScrollDown{} function, and to the
   left, the \ButtonScrollUp{} function.