Manual Commit: Add H10 keymappings for Demos and Applications. Correct a few mistakes on e200 mappings. Add a few missing X5 keys. Add Disk Tidy for Player and remove the old keymaps. Rework stopwatch.tex.

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

20 files changed, 108 insertions, 92 deletions

diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index a1740e8080..8b32997079 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -7,20 +7,21 @@ scrolling from right to left.
 
 \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}
     {\ButtonUp\ /\ \ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
+\opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
 & Moves to next/previous option\\
 \ButtonLeft\ /\ \ButtonRight
 & 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{IAUDIO_X5_PAD}{\ButtonPlay}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
 & 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,SANSA_E200_PAD}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
 & Exits bounce demo\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 11f305bed1..27bf6717f6 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -12,27 +12,30 @@ available maths functions on the right hand side.
         {Direction keys}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
         \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollUp, \ButtonScrollDown}
     & Move around the keypad\\
     \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_H10_PAD}{\ButtonPlay}
     & Press a button on the keypad\\
     \opt{RECORDER_PAD}{\ButtonFOne & Delete last entered digit or clear after
         calculation\\}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec & Delete
         last entered digit or clear after calculation\\}
+    \opt{IRIVER_H10_PAD}{\ButtonRew & Delete last entered digit or clear after calculation\\}
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}
-    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
     & 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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 61e80c3ca7..c9ee1b29b4 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -7,12 +7,12 @@ used in any kind of game with up to ten players.
 \subsubsection{Setup}
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}
       {\ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
       & Increase / decrease displayed Value\\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \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}{\ButtonSelect}
@@ -21,7 +21,7 @@ used in any kind of game with up to ten players.
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{SANSA_E200_PAD}{\ButtonPower}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
       & Move to previous screen\\
   \end{btnmap}
 \end{table}
@@ -49,25 +49,26 @@ Keys are as follows:
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{SANSA_E200_PAD}{\ButtonPower}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
       & 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}{\ButtonPower}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonDown}
       & Restart round for the current player \\
-    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
       & Pause the time (press again to continue) \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}
       {\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_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,SANSA_E200_PAD}{\ButtonLeft}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
@@ -75,9 +76,10 @@ Keys are as follows:
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonUp}
       & Open menu
-      \opt{PLAYER_PAD,RECORDER_PAD}{(\ButtonPlay\ to select.)}
+      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}
       \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}{(\ButtonSelect\ to select.)}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index f21d219a28..5c98f3cb9a 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -39,7 +39,7 @@ The default keymappings are:
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-        \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
+        \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
         \end{sideways} 
         &
         % Key "0"
@@ -55,7 +55,7 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-        \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp}
         \end{sideways}
         &
         % Key "3"
@@ -64,8 +64,7 @@ The default keymappings are:
         \end{sideways}
         % Key "4"
         \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonLeft}
+        \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}{\ButtonLeft}
         \end{sideways}
         &
         % Key "5"
@@ -73,13 +72,12 @@ 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}{\ButtonSelect}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
+        \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,SANSA_E200_PAD}{\ButtonRight}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonRight}
+        \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}{\ButtonRight}
         \end{sideways}
         &
         % Key "7"
@@ -92,7 +90,7 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
         \opt{IAUDIO_X5_PAD}{\ButtonDown}
-        \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollDown}
         \end{sideways}
         &
         % Key "9"
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 06a40772e1..a2d29b9f20 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -8,19 +8,20 @@ This is a fully featured analogue and digital clock plugin.
 \begin{table}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonUp}
     & Start / Stop Counter \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonUp}
     (Hold) & Reset Counter \\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Main Menu \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 660c6a6460..705fc8be77 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -8,8 +8,9 @@ This is a rotating cube screen saver in 3D.
     \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{IRIVER_H10_PAD}{\ButtonFF}
         & Display at maximum frame rate\\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \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}
@@ -19,6 +20,7 @@ This is a rotating cube screen saver in 3D.
     \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}{Hold \ButtonSelect}
         & Cycle draw mode\\
     \ButtonRight/\ButtonLeft
@@ -27,7 +29,7 @@ This is a rotating cube screen saver in 3D.
     \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{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
         & Increase / decrease y axis\\
     \opt{PLAYER_PAD}{\ButtonMenu+ \ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonFOne}
@@ -35,12 +37,13 @@ This is a rotating cube screen saver in 3D.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+ \ButtonUp/\ButtonDown}
     \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}
         & 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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 036425f158..df80b40eaf 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -6,17 +6,17 @@ 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,SANSA_E200_PAD}{\ButtonRight\ / \ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonRight\ / \ButtonLeft}
         & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
     \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     \opt{IAUDIO_X5_PAD}{\ButtonUp\ / \ButtonDown}
         & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/disktidy.tex b/manual/plugins/disktidy.tex
index 929628f0f4..67c4082309 100644
--- a/manual/plugins/disktidy.tex
+++ b/manual/plugins/disktidy.tex
@@ -1,7 +1,7 @@
 % $Id $ %
 \subsection{Disk Tidy}
   Disk Tidy deletes junk files left behind by Windows or OS X after a USB connection.
-  Select the OS's files you want to delete and press the "Clean up" button.
+  Select the OS's files you want to delete in the 'Files to Clean' menu and select 'Start Cleaning' to begin to process.
 
   \subsubsection{Available Options}
   \begin{description}
@@ -14,15 +14,8 @@
   
   \begin{table}
     \begin{btnmap}{}{}
-      \ButtonLeft\ / \ButtonRight & Select option\\
-      \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{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}%
-      & Clean Up\\
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonOff}%
+      \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}%
       & Exit\ /\ Abort\\
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index f9e67579a5..3c29f5ad4f 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -7,20 +7,21 @@ Fire is a demo displaying a fire effect.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease number of flames\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonLeft}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonLeft}
     & Toggle flame type\\
     \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRight}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 92e370486c..15496bcc54 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -9,11 +9,12 @@ Demo showing the Rockbox logo bouncing around the screen.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease speed on the y-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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 2d10ffe81b..ab2430bd0c 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -135,7 +135,7 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/dice.tex}}
 
-\opt{HAVE_LCD_BITMAP}{\input{plugins/disktidy.tex}}
+{\input{plugins/disktidy.tex}}
 
 \opt{player}{\input{plugins/euro_converter.tex}}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index c6f847e560..1335ff6d6a 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -4,8 +4,8 @@ This demonstration draws fractal images from the Mandelbrot set
 \opt{archos,h1xx}{using the greyscale engine}.
 \begin{table}
 \begin{btnmap}{}{}
-Arrow keys & Move about the image\\
-\opt{RECORDER_PAD}{\ButtonPlay}
+Direction keys & Move about the image\\
+\opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
@@ -16,6 +16,7 @@ Arrow keys & Move about the image\\
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
 \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
+\opt{IRIVER_H10_PAD}{Hold \ButtonPlay}
 \opt{SANSA_E200_PAD}{\ButtonScrollUp}
 & Zoom out\\
 \opt{RECORDER_PAD}{\ButtonFOne}
@@ -23,21 +24,24 @@ Arrow keys & Move about the image\\
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonLeft}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
 & Decrease iteration depth (less detail)\\
 \opt{RECORDER_PAD}{\ButtonFTwo}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonRight}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
+\opt{IRIVER_H10_PAD}{\ButtonFF}
 & Increase iteration depth (more detail)\\
 \opt{RECORDER_PAD}{\ButtonFThree}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+\opt{IRIVER_H10_PAD}{\ButtonPlay + \ButtonRew}
 & 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,SANSA_E200_PAD}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
 & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 70df1242e4..d3c84cba49 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -11,5 +11,5 @@ 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}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
 to quit.
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index bc0e12b516..1c079ccf42 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -17,12 +17,14 @@ being played.
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
     & Toggle filled / curve / plot \\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonDown}
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -30,9 +32,10 @@ being played.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
+    \opt{IRIVER_H10_PAD}{Hold \ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonUp}
     & Toggle drawing orientation \\
-    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \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}
@@ -40,14 +43,14 @@ being played.
     \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{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     & 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}
     & 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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Exit demo \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 97fadcc1f8..033bfc8672 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -6,16 +6,17 @@ Plasma is a demo displaying a 80's style retro plasma effect.
 \begin{table}
     \begin{btnmap}{}{}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \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{IAUDIO_X5_PAD}{\ButtonPlay}
+        \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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 1ee7952bcb..f77780c620 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -8,9 +8,10 @@ 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,SANSA_E200_PAD,IAUDIO_X5_PAD}{\ButtonUp\ / \ButtonDown}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease speed\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{IRIVER_H100_PAD, IRIVER_H300_PAD, RECORDER_PAD, ONDIO_PAD, GIGABEAT_PAD, SANSA_E200_PAD, IAUDIO_X5_PAD}{\ButtonOff}
     & Quit\\
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 0e3f0623ba..0057797020 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -5,34 +5,32 @@ A simple stopwatch program with support for saving times.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{player}{\ButtonMenu}
-\opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOff}
-\opt{ondio}{\ButtonOff}
-\opt{ipodcolor,ipodnano}{\ButtonMenu}
-\opt{SANSA_E200_PAD}{\ButtonPower}
+\opt{PLAYER_PAD}{\ButtonMenu}
+\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}
 & Quit Plugin \\
-\opt{player,recorder,recorderv2fm}{\ButtonPlay}
-\opt{ondio}{\ButtonRight}
-\opt{h1xx,h300}{\ButtonSelect}
-\opt{ipodcolor,ipodnano}{\ButtonPlay}
+\opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+\opt{ONDIO_PAD}{\ButtonRight}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
 \opt{SANSA_E200_PAD}{\ButtonLeft}
 & Start / stop \\
-\opt{player}{\ButtonStop}
-\opt{recorder,recorderv2fm,ondio}{\ButtonLeft}
-\opt{h1xx,h300}{\ButtonDown}
-\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
-\opt{SANSA_E200_PAD}{\ButtonRec}
+\opt{PLAYER_PAD}{\ButtonStop}
+\opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
 & Reset timer (only when timer is stopped)\\
-\opt{player,recorder,recorderv2fm}{\ButtonOn}
-\opt{ondio}{\ButtonMenu}
-\opt{h1xx,h300}{\ButtonOn}
-\opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
-\opt{SANSA_E200_PAD}{\ButtonSelect}
+\opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+\opt{ONDIO_PAD}{\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight} 
+\opt{IRIVER_H10_PAD}{\ButtonFF}
+\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
 & Take lap time \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano}{\ButtonLeft/\ButtonRight}
-\opt{recorder,recorderv2fm}{\ButtonDown/\ButtonUp}
-\opt{ondio}{\ButtonUp/\ButtonDown}
-\opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+\opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft/\ButtonRight}
+\opt{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonUp/\ButtonDown}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+\opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
 & Scroll through lap times \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 057ce6c706..0d74dc5162 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -37,8 +37,9 @@ 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,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     & Change number under the cursor\\
     %
     \opt{RECORDER_PAD}{Hold \ButtonPlay}
@@ -47,7 +48,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonLeft/\ButtonSelect/\ButtonRight}
     \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Hold \ButtonRew}
-    \opt{SANSA_E200_PAD}{n/a}
+    \opt{SANSA_E200_PAD}{Hold \ButtonScrollUp/\ButtonScrollDown}
     & Constantly changing the number under the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -55,7 +56,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{Hold \ButtonSelect}
+    \opt{SANSA_E200_PAD}{\ButtonSelect}
     & Open Menu\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index e8f16fca65..0019cd32ec 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -27,7 +27,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
         \item[Narrow] sets maximum column to the screen width.
         \item[Wide] sets maximum column to 114. Useful for navigating large files. (Currently, Wide and Join cannot be selected together.)
     \end{description}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{
 \item[Page mode] toggles between Normal and Overlap.
     \begin{description}
         \item[Normal] sets page{}-down/page{}-up to one full screen.
@@ -41,7 +41,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
 }
 \end{description}
 Settings are not remembered after the viewer has been exited.
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,ANSA_E200_PAD}{
 If file fits on one screen, there is no scrollbar and toggling Scrollbar mode has no effect.}
 
 \begin{table}
@@ -49,19 +49,21 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{PLAYER_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} 
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
         & Page{}-up (one screen up)\\
         
     \opt{PLAYER_PAD}{\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} 
+    \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     & Page{}-down (one screen down)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonLeft} 
+    \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}{\ButtonLeft} 
     & Top of file (Narrow mode) One screen left (Wide mode)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
+    \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}
         {\ButtonRight} 
     & Bottom of file (Narrow mode) One screen right (Wide mode)\\
         
@@ -82,8 +84,8 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
-    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{n/a}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
         & Toggles Word mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}
@@ -92,7 +94,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{Long press on \ButtonPlay}
-    \opt{SANSA_E200_PAD}{n/a}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{n/a}
         & Cycles line mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
@@ -100,7 +102,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
-    \opt{SANSA_E200_PAD}{n/a}
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{n/a}
         & Toggles view mode\\
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFOne & Toggles page mode\\}
@@ -120,7 +122,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \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,SANSA_E200_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}
         & Exit text viewer\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 8a3fad54b5..4745ed7ade 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -13,24 +13,27 @@ 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,SANSA_E200_PAD}{\ButtonPower}
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_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}{\ButtonPlay}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
 \opt{SANSA_E200_PAD}{\ButtonRec}
     & Help\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{Hold \ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
     & Settings\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
 {\ButtonUp}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+\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{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+\opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     & Lower Volume\\
 \end{btnmap}
 \end{table}