14 files changed, 93 insertions, 64 deletions

diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 8b32997079..781666ca78 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -7,7 +7,7 @@ scrolling from right to left.
 
 \begin{table}
 \begin{btnmap}{}{}
-\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,SANSA_C200_PAD,GIGABEAT_PAD}
     {\ButtonUp\ /\ \ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
 \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
@@ -16,12 +16,14 @@ scrolling from right to left.
 & Increases/decreases option value\\
 \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,SANSA_C200_PAD}
+    {\ButtonSelect}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+\opt{GIGABEAT_PAD}{\ButtonA}
 & 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}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
 & Exits bounce demo\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index d346381bc2..fac96f5143 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -7,29 +7,31 @@ This is a rotating cube screen saver in 3D.
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{GIGABEAT_PAD}{\ButtonA}
         & Display at maximum frame rate\\
     \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{SANSA_E200_PAD}{\ButtonSelect}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonSelect}
         & Pause\\
-    \opt{PLAYER_PAD,ONDIO_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{Long \ButtonSelect}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
         & Cycle draw mode\\
     \ButtonRight/\ButtonLeft
         & Increase / decrease x axis\\
     \opt{PLAYER_PAD}{\ButtonOn+ \ButtonRight/\ButtonLeft}
-    \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}
+    \opt{SANSA_C200_PAD}{\ButtonVolDown\/\ButtonVolUp}
         & Increase / decrease y axis\\
     \opt{PLAYER_PAD}{\ButtonMenu+ \ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonFOne}
@@ -38,12 +40,13 @@ This is a rotating cube screen saver in 3D.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+ \ButtonRight/\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+ \ButtonUp/\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp/\ButtonScrollDown}
-    \opt{SANSA_E200_PAD}{\ButtonUp+\ButtonDown}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp\/\ButtonDown}
+    \opt{GIGABEAT_PAD}{\ButtonVolDown\/\ButtonVolUp}
         & Increase / decrease z axis\\
     \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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index f2e5cd06aa..c976862015 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -6,17 +6,19 @@ 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}{\ButtonRight\ / \ButtonLeft}
-        & Increase / decrease speed\\
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+        {\ButtonRight\ / \ButtonLeft}
+    & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
     \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-    \opt{IAUDIO_X5_PAD}{\ButtonUp\ / \ButtonDown}
-        & Add / remove polygon\\
+    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp\ / \ButtonDown}
+    & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
-        & Quit\\
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
+    \opt{GIGABEAT_PAD}{\ButtonA}
+    & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 3c29f5ad4f..24069851e4 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -4,7 +4,7 @@
 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_E200_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
@@ -13,15 +13,16 @@ 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}{\ButtonLeft}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_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}{\ButtonRight}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 15496bcc54..af676a62dc 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -6,7 +6,7 @@ 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}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
@@ -14,7 +14,7 @@ Demo showing the Rockbox logo bouncing around the screen.
     \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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index d3c84cba49..26a58d8b3f 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -7,9 +7,9 @@
 \subsection{Mosaique}
 \screenshot{plugins/images/ss-mosaic}{Mosaique}{img:mosaique}
 This simple graphics demo draws a mosaic picture on the screen of the \dap.
-Press 
+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}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
 to quit.
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index f91ee33849..0d3cbf900e 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -12,10 +12,11 @@ being played.
 \subsubsection{Keys}
 
 \begin{table}
-\begin{btnmap}{}{}
+  \begin{btnmap}{}{}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+        {\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Toggle filled / curve / plot \\
@@ -25,7 +26,7 @@ being played.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{SANSA_E200_PAD}{\ButtonDown}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonDown}
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -33,23 +34,26 @@ being played.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonUp}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp}
     & Toggle drawing orientation \\
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{SANSA_E200_PAD}{\ButtonRec}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Pause the demo \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonVolUp/\ButtonVolDown}
     & Increase / decrease volume\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRight/\ButtonLeft}
+    \ButtonRight/\ButtonLeft
     & Increase / decrease speed\\
     \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,SANSA_C200_PAD,GIGABEAT_PAD}
+        {\ButtonPower}
     & Exit demo \\
-\end{btnmap}
+  \end{btnmap}
 \end{table}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 033bfc8672..554f2275c3 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -10,13 +10,15 @@ 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{HAVE_LCD_COLOR}{
-        \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
+        \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+            {\ButtonSelect}
         \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
         & Change colours\\
     }
     \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,SANSA_C200_PAD,GIGABEAT_PAD}
+        {\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index f4da1ded0e..94c6d09ec8 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,GIGABEAT_PAD}
+  \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD,SANSA_C200_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}
@@ -17,22 +17,22 @@ Key controls:
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{Long \ButtonMenu}
   \opt{h1xx,h300,GIGABEAT_PAD}{\ButtonSelect} 
-  \opt{x5,SANSA_E200_PAD}{\ButtonRec}
-  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} 
+  \opt{x5,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   & Shuffle \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo}
   \opt{ONDIO_PAD}{\ButtonMenu}
-  \opt{h1xx,h300}{\ButtonOn} 
+  \opt{h1xx,h300}{\ButtonOn}
   \opt{x5,IRIVER_H10_PAD}{\ButtonPlay}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
-  \opt{SANSA_E200_PAD}{\ButtonSelect}
+  \opt{SANSA_E200_PAD,SANSA_C200_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,GIGABEAT_PAD}{\ButtonPower}
+  \opt{x5,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
   & Stop the game \\
   \end{btnmap}
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 466e515681..897c98963e 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -3,6 +3,8 @@
 This demo replicates snow falling on your screen. If you love winter,
 you will love this demo.  Or maybe not.
 %
-\opt{player}{Press \ButtonStop\ to quit.}
-\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{player}{Press \ButtonStop\ to quit.}%
+\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}%
+    {Press \ButtonPower\ to quit.}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 031a7c733e..968279179b 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -9,22 +9,23 @@ 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,GIGABEAT_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}
+        {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Shoot\\
     %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_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,GIGABEAT_PAD}
+    \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}
         {\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,GIGABEAT_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -32,7 +33,7 @@ UFO will appear -- shoot this for extra points.
     %
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{\ButtonRec}
+    \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{GIGABEAT_PAD}{\ButtonA}
@@ -40,7 +41,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}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 90aa2f4c41..a738ab195b 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -27,8 +27,8 @@ 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,GIGABEAT_PAD}
-    {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+        {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight}
     & Move the cursor\\
@@ -40,6 +40,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{SANSA_C200_PAD}{\ButtonSelect/\ButtonVolUp/\ButtonVolDown}
     & Change number under the cursor\\
     %
     \opt{RECORDER_PAD}{Long \ButtonPlay}
@@ -49,6 +50,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
     \opt{SANSA_E200_PAD}{Long \ButtonScrollUp/\ButtonScrollDown}
+    \opt{SANSA_C200_PAD}{Long \ButtonSelect/\ButtonVolUp/\ButtonVolDown}
     & Constantly changing the number under the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -57,11 +59,12 @@ These are \emph{NOT} saved when saving the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
+    \opt{SANSA_C200_PAD}{\ButtonPower}
     & Open Menu\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
+    \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{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -70,6 +73,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
+    \opt{SANSA_C200_PAD}{Long \ButtonPower}
     & Quit\\
     %
     \end{btnmap}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 98a06037c2..29ddcd2dd9 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -13,26 +13,33 @@ 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}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     & Save settings and quit\\
 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-\opt{SANSA_E200_PAD}{\ButtonRec}
+\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
+\opt{GIGABEAT_PAD}{\ButtonA}
     & 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}{\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}{\ButtonMenu}
     & Settings\\
-\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,GIGABEAT_PAD}
+    {\ButtonUp}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+\opt{SANSA_E200_PAD}{\ButtonScrollDown}
+\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,SANSA_E200_PAD}
-{\ButtonDown}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
+    {\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+\opt{SANSA_E200_PAD}{\ButtonScrollUp}
+\opt{SANSA_C200_PAD}{\ButtonVolDown}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     & Lower Volume\\
 \end{btnmap}
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index cde6bad478..4a65816ef6 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,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD}{\ButtonUp, \ButtonDown,}%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD}
+        {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
     & Move around the arena\\
@@ -18,12 +19,12 @@ To finish a level you have to section off more than 75\%.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{\ButtonRec}
+    \opt{SANSA_E200_PAD,SANSA_C200_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,GIGABEAT_PAD}{\ButtonPower}
+    \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}
     & Open menu\\
 \end{btnmap}
 \end{table}