19 files changed, 139 insertions, 137 deletions

diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index 6e9ecb1eeb..d62a1c5765 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -40,15 +40,15 @@ visit\\
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
         & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
-    \ButtonLeft/\ButtonRight/\\
+    \ButtonLeft{} / \ButtonRight{} /\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}
-      {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+      {\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
       & Enter betting amount\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IRIVER_H10_PAD}{\ButtonPlay} 
+    \opt{IRIVER_H10_PAD}{\ButtonPlay}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonLeft}
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
@@ -56,7 +56,7 @@ visit\\
     & Hit (Draw new card)\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H10_PAD}{\ButtonFF} 
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonDisplay}
@@ -64,7 +64,7 @@ visit\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew} 
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{MR100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 7cb40766e6..bab297e72c 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -12,7 +12,7 @@ fired. Points are awarded depending on how quickly the level was completed.
     \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -27,48 +27,52 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
         & Resume saved game\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \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,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
+        ,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{ONDIO_PAD,SANSA_C200_PAD}{\ButtonLeft+\ButtonRight}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
         & Select starting level\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
-    \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{MROBE100_PAD}{\ButtonDisplay}
         & 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{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
         & Pause game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonLeft/\ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonLeft{} / \ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
         & Aim the bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
         & Fire bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec} 
-    \opt{RECORDER_PAD}{\ButtonFOne} 
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower} 
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,MROBE100_PAD}{\ButtonPower}
         & Exit to menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index f6e78f539d..301649b60b 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -11,8 +11,8 @@ Demystify is a screen saver like demo.\\
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
-    \opt{IPOD_4G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}
     & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
diff --git a/manual/plugins/disktidy.tex b/manual/plugins/disktidy.tex
index 86bea64cf2..928f01c516 100644
--- a/manual/plugins/disktidy.tex
+++ b/manual/plugins/disktidy.tex
@@ -1,9 +1,9 @@
 % $Id $ %
 \subsection{Disk Tidy}
-  Disk Tidy deletes junk files left behind by Windows, Linux or OS X after a USB connection.
-  Select the OS's files you want to delete in the 'Files to Clean'
+  Disk Tidy deletes junk files left behind by Windows, Linux or OS X after a USB
+  connection. Select the OS's files you want to delete in the 'Files to Clean'
   menu and select 'Start Cleaning' to begin to process. The settings
-  are stored in .rockbox/rocks/apps/disktidy.config, in a plain text
+  are stored in \fname{.rockbox/rocks/apps/disktidy.config}, in a plain text
   file that is user-modifiable to allow more entries to be added.
 
   \subsubsection{Available Options}
@@ -22,10 +22,7 @@
   
   \begin{table}
     \begin{btnmap}{}{}
-      \opt{PLAYER_PAD}{\ButtonStop}%
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}%
-      \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}%
-      & Exit\ /\ Abort\\
+      \ActionStdCancel
+      & Exit / Abort\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index cf2aaba80a..7479e4c2dc 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -53,7 +53,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 
   \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your hold switch a couple of times}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{pressing \ButtonPower}
 
   \emph{New Game. } Start a new game\\
@@ -108,7 +108,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
     & Open \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{Hold switch}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
       ,MROBE100_PAD}{\ButtonPower}
     & Escape \\
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 20538a8808..c0e50d88dd 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -7,7 +7,7 @@ a screen containing tokens of only one colour.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{PLAYER_PAD}{\ButtonOn/\ButtonMenu/\ButtonLeft/\ButtonRight}
+\opt{PLAYER_PAD}{\ButtonOn{} / \ButtonMenu{} / \ButtonLeft{} / \ButtonRight}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
     {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index e4d190479d..bfd1cdebf0 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -5,7 +5,7 @@ Demo showing the Rockbox logo bouncing around the screen.
     \begin{btnmap}{}{}
     \ButtonRight\ / \ButtonLeft
     & Increase / decrease speed on the x-axis\\
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight / \ButtonOn+\ButtonLeft}
+    \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight\ / \ButtonOn+\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 9b600c8457..3ebb36d4fb 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -9,8 +9,9 @@ playback while running. Plugins have the file extension \fname{.rock}. Most of
 them can be started from \setting{Browse Plugins} in the \setting{Main Menu}.
 
 Viewer plugins get started automatically by opening an associated file (i.e.
-text files, chip8 games), or from the \setting{Open with} option on the
-\setting{Context Menu}.
+text files%
+\opt{lcd_bitmap}{, chip8 games}%
+), or from the \setting{Open with} option on the \setting{Context Menu}.
 
 \section{Games}
 \opt{lcd_bitmap}
@@ -109,7 +110,7 @@ text files, chip8 games), or from the \setting{Open with} option on the
 Viewers are plugins which are associated with specific file extensions.
 They cannot be run directly but are started by ``playing''
 the associated file. Viewers are stored in the
-\textbf{/.rockbox/viewers/ }directory.
+\textbf{/.rockbox/rocks/viewers/ }directory.
 
 {\input{plugins/shortcuts.tex}}
 
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 23e6c81031..3bd496cd77 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -44,12 +44,12 @@ being played.
     \opt{MROBE100_PAD}{\ButtonDisplay}
     & 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,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-    \opt{SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonVolUp/\ButtonVolDown}
+        {\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+    \opt{SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonVolUp{} / \ButtonVolDown}
     & Increase / decrease volume\\
-    \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}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index 6b8956e782..f40b9b356e 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -44,24 +44,12 @@ block and crosses which allow you to choose a replacement block.
     \opt{SANSA_C200_PAD}{\ButtonSelect}

         & to select/save\\

 

-    \opt{RECORDER_PAD}{\ButtonOff} 

-    \opt{ONDIO_PAD}{\ButtonMenu + \ButtonOff} 

-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}

-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect + \ButtonPlay} 

-    \opt{IAUDIO_X5_PAD}{\ButtonPower}

-    \opt{IRIVER_H10_PAD}{\ButtonPower}

-    \opt{SANSA_E200_PAD}{\ButtonPower}

-    \opt{GIGABEAT_PAD}{\ButtonPower}

-    \opt{MROBE100_PAD}{\ButtonPower}

-    \opt{SANSA_C200_PAD}{\ButtonPower}

-        & to quit\\

-

     \opt{RECORDER_PAD}{\ButtonFTwo} 

     \opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight} 

     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}

     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect + \ButtonLeft} 

     \opt{IAUDIO_X5_PAD}{\ButtonRec}

-    \opt{IRIVER_H10_PAD}{long \ButtonFF}

+    \opt{IRIVER_H10_PAD}{Long \ButtonFF}

     \opt{SANSA_E200_PAD}{\ButtonRec}

     \opt{GIGABEAT_PAD}{\ButtonA}

     \opt{MROBE100_PAD}{\ButtonPlay}

@@ -80,17 +68,28 @@ block and crosses which allow you to choose a replacement block.
     \opt{SANSA_C200_PAD}{\ButtonVolUp}

         & to go up a level\\

 

-    \opt{RECORDER_PAD}{\ButtonFThree} 

-    \opt{ONDIO_PAD}{\ButtonMenu + \ButtonDown} 

-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}

-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{-} 

-    \opt{IAUDIO_X5_PAD}{-}

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

-    \opt{SANSA_E200_PAD}{\ButtonScrollFwd}

-    \opt{GIGABEAT_PAD}{\ButtonVolDown}

-    \opt{MROBE100_PAD}{\ButtonDisplay}

-    \opt{SANSA_C200_PAD}{\ButtonVolDown}

+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IAUDIO_X5_PAD}{

+        \opt{RECORDER_PAD}{\ButtonFThree}

+        \opt{ONDIO_PAD}{\ButtonMenu + \ButtonDown}

+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}

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

+        \opt{SANSA_E200_PAD}{\ButtonScrollFwd}

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

+        \opt{MROBE100_PAD}{\ButtonDisplay}

         & to go down a level\\

+    }

+

+    \opt{RECORDER_PAD}{\ButtonOff} 

+    \opt{ONDIO_PAD}{\ButtonMenu + \ButtonOff} 

+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}

+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect + \ButtonPlay} 

+    \opt{IAUDIO_X5_PAD}{\ButtonPower}

+    \opt{IRIVER_H10_PAD}{\ButtonPower}

+    \opt{SANSA_E200_PAD}{\ButtonPower}

+    \opt{GIGABEAT_PAD}{\ButtonPower}

+    \opt{MROBE100_PAD}{\ButtonPower}

+    \opt{SANSA_C200_PAD}{\ButtonPower}

+        & to quit\\

 

     \end{btnmap}

 \end{table}

diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index c8a8fd57d8..cdf7a895d7 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -43,7 +43,7 @@ pile of blocks reach the ceiling the game is over.
     \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{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack{} / \ButtonMenu}
     \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp/\ButtonUp}
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index b123c2eee1..cf3167300c 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -6,7 +6,7 @@ Rockblox1d is a game for people who find rockblox too hard. In this version the
 \begin{table}
     \begin{btnmap}{}{}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
         & Move down faster\\
 
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index dc8f0f1b53..7322e22266 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -13,10 +13,10 @@ the gnuboy emulator. To start a game open a ROM file saved as \fname{.gb} or
 \begin{table}
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown{} /}
-    \opt{IPOD_4G_PAD}{Tap \ButtonPlay{} / \ButtonMenu{} /}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{}/ \ButtonScrollDown{} /}
-    \ButtonLeft{} / \ButtonRight{} /
+        ,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD}{Tap \ButtonPlay{} / \ButtonMenu}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+    / \ButtonLeft{} / \ButtonRight
     & Direction keys\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 3cf333c17c..d586853893 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -10,8 +10,8 @@ Key controls:
   \begin{btnmap}{}{}
   \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
     {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
-  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonRight/\ButtonMenu/\ButtonPlay}
-  \opt{IRIVER_H10_PAD}{\ButtonLeft/\ButtonRight/\ButtonScrollUp/\ButtonScrollDown}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay}
+  \opt{IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
   & Move Tile \\
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index dccef0e7d7..6281b37693 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -11,12 +11,12 @@ into itself.
     \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
         & Set game speed\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight/\ButtonLeft}
+        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonRight}
         & Select starting maze\\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -36,9 +36,9 @@ into itself.
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/\ButtonLeft/\ButtonRight}
+        {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
         & Steer the snake\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 2f2b142b16..f6874a80f3 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -25,6 +25,38 @@ information about the level format, see
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
     & Menu \\
+\nopt{IAUDIO_X5_PAD}{
+    \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
+    \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolDown}
+    \opt{MROBE10_PAD}{\ButtonDisplay}
+    \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
+    & Back to previous level \\
+}
+\nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
+    \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonRight}
+    & Restart level \\
+}
+\nopt{IAUDIO_X5_PAD}{
+    \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFThree}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
+    \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp}
+    \opt{MROBE100_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonUp}
+    & Go to next level \\
+}
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
@@ -40,35 +72,6 @@ information about the level format, see
 \opt{MROBE100_PAD}{\ButtonDisplay}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     & Redo previously undone move \\
-\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFOne}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
-\opt{IAUDIO_X5_PAD}{n/a}
-\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
-\opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolDown}
-\opt{MROBE10_PAD}{\ButtonDisplay}
-\opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
-    & Back to previous level \\
-\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFTwo}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{n/a}
-\opt{IAUDIO_X5_PAD}{\ButtonRec}
-\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
-\opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
-\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonRight}
-    & Restart level \\
-\opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFThree}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
-\opt{IAUDIO_X5_PAD}{n/a}
-\opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
-\opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp}
-\opt{MROBE100_PAD}{\ButtonPlay}
-\opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonUp}
-    & Go to next level \\
 \hline
 \multicolumn{2}{c}{\textbf{Solution playback}} \\
 \hline
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index dbeda2e4da..d2544a68aa 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -15,11 +15,11 @@ visit\\
 
 \begin{table}
   \begin{btnmap}{}{}
-    \ButtonLeft/\ButtonRight/\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}
-      {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+      {\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+    / \ButtonLeft{} / \ButtonRight
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -41,13 +41,13 @@ visit\\
     %
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{Long \ButtonDown}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonLeft}
     \opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonLeft}
     \opt{SANSA_C200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD}{\ButtonA + \ButtonLeft}
-    \opt{MROBE100_PAD}{\ButtonDisplay + \ButtonLeft}
+    \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonLeft}
+    \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonLeft}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -56,21 +56,21 @@ visit\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonRight}
+    \opt{SANSA_E200_PAD}{\ButtonRec{} + \ButtonRight}
       & Put the card under the cursor on one of the 4 final colour stacks.\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{SANSA_E200_PAD}{\ButtonRight}
-    \opt{GIGABEAT_PAD}{\ButtonA + \ButtonRight}
-    \opt{MROBE100_PAD}{\ButtonDisplay + \ButtonRight}
+    \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonRight}
+    \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
       & Put the card on top of the remains stack on one of the final colour stacks.\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
       & Show menu\\
    \end{btnmap}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 77ca715de7..e33f9a636a 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -35,22 +35,22 @@ These are \emph{NOT} saved when saving the game.
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect/\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonSelect/\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect{} / \ButtonOn}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonSelect{} / \ButtonRight}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
-    \opt{SANSA_C200_PAD}{\ButtonSelect/\ButtonVolUp/\ButtonVolDown}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
+    \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
     & Change number under the cursor\\
     %
     \opt{RECORDER_PAD}{Long \ButtonPlay}
     \opt{ONDIO_PAD}{Long \ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonLeft/\ButtonSelect/\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonLeft{} / \ButtonSelect{} / \ButtonRight}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
-    \opt{SANSA_E200_PAD}{Long \ButtonScrollBack/\ButtonScrollFwd}
-    \opt{SANSA_C200_PAD}{Long \ButtonSelect/\ButtonVolUp/\ButtonVolDown}
+    \opt{SANSA_E200_PAD}{Long \ButtonScrollBack{} / \ButtonScrollFwd}
+    \opt{SANSA_C200_PAD}{Long \ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
     & Constantly changing the number under the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index 3913f23af3..b483d9ed49 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -73,15 +73,15 @@ including an additional but fixed menu button, are assigned as follows:
     \item[Volume.]Controls volume of sound output.
     \item[Predefined Keymap]
         Select one of the predefined keymaps. For example \setting{2w90z} means:
-       map ZXBox's \btnfnt{Up} to \setting{2}, \btnfnt{Down} to \setting{w},
-       \btnfnt{Left} to \setting{9}, \btnfnt{Right} to \setting{0} and
-       \btnfnt{Jump/Fire} to \setting{z}. This example keymap is used in the
-       ``Chuckie Egg'' game.
+        map ZXBox's \btnfnt{Up} to \setting{2}, \btnfnt{Down} to \setting{w},
+        \btnfnt{Left} to \setting{9}, \btnfnt{Right} to \setting{0} and
+        \btnfnt{Jump/Fire} to \setting{z}. This example keymap is used in the
+        ``Chuckie Egg'' game.
     \item[Custom Keymap]
         This menu allows you to map one of the Spectrum keys accessible through the 
         plugin's virtual keyboard to each one of the buttons.
+    \item[Quit.] Quits the emulator..
     \end{description}
-\item[Quit.] Quits the emulator..
 \end{description}
 
 \nopt{ipodvideo}{% no scaling for here, still include it?
@@ -91,5 +91,3 @@ columns some games can become unplayable. It is possible to hack graphics to
 make them better visible with the help of an utility such as the ``Spectrum
 Graphics Editor''. Useful tools can be found at the ``World of Spectrum'' site
 (\url{http://www.worldofspectrum.org/utilities.html}).}
-
-See also the plugin's wiki page \wikilink{PluginZXBox}.