11 files changed, 143 insertions, 125 deletions

diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index bc623279fc..06f1fd2d4d 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -8,7 +8,8 @@ available maths functions on the right hand side.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Direction keys}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+        {Direction keys}
     \opt{IPOD_4G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
         \ButtonScrollBack}
     & Move around the keypad\\
@@ -21,7 +22,7 @@ available maths functions on the right hand side.
         calculation\\}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec & 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}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 5c2b446688..d6b3bee6aa 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -1,28 +1,27 @@
+% $Id$ %
 \subsection{Chess Clock}
-\screenshot{plugins/images/ss-chess_clock}{Chess Clock}%
-{img:chessclock}
-
-The chess clock plugin is designed  to
-simulate a chess clock, but it can be used
-in any kind of game with up to ten players.
+\screenshot{plugins/images/ss-chess_clock}{Chess Clock}{img:chessclock}
+The chess clock plugin is designed  to simulate a chess clock, but it can be
+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}{\ButtonRight/\ButtonLeft}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+      {\ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
-      & Increase / Decrease displayed Value\\
+      & Increase / decrease displayed Value\\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
       & Move to next screen\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-      & Move to next screen\\
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+      & Move to previous screen\\
   \end{btnmap}
 \end{table}
 
@@ -48,38 +47,41 @@ Keys are as follows:
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
       & Exit plugin \\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
       & Restart round for the current player \\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD}{\ButtonSelect}
       & Pause the time (press again to continue) \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRight}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+      {\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD}{\ButtonScrollBack}
       & Switch to next player \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
     \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-      & Delete current player %
-      \opt{PLAYER_PAD,RECORDER_PAD}{(\ButtonPlay\ to confirm.)}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to confirm.)}
-      \opt{ONDIO_PAD}{(\ButtonRight\ to confirm.)}
-      \opt{IPOD_4G_PAD}{(\ButtonSelect\ to confirm.)}\\
+    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
+      & Open menu
+      \opt{PLAYER_PAD,RECORDER_PAD}{(\ButtonPlay\ to select.)}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}
+      \opt{ONDIO_PAD}{(\ButtonRight\ to select.)}
+      \opt{IPOD_4G_PAD}{(\ButtonSelect\ to select.)}
+      \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \end{btnmap}
 \end{table}
 From the menu it is possible to delete a player, modify the round time
-for the current player or set the total time for the game. 
-
-When the round time is up for a player the message ``ROUND UP!'' is shown (press  NEXT to continue). 
-
-When the total time is up for a player the message ``TIME UP!''is shown. Then player will  then be removed from the timer. 
-
+for the current player or set the total time for the game. When the round time
+is up for a player the message ``ROUND UP!'' is shown (press  NEXT to
+continue). When the total time is up for a player the message ``TIME UP!''is
+shown. Then player will  then be removed from the timer.
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index bd40a7f647..50c69dee24 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \subsection{Chessbox}
 \screenshot{plugins/images/ss-chessbox}{Chessbox}{img:chessbox}
 Chessbox is a chess game with computer AI. The chess engine is a port of 
@@ -8,30 +9,34 @@ you resume the game.
 \subsubsection{Keys}
 \begin{table}
     \begin{btnmap}{}{}
-    Direction keys 
+    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
+    \nopt{IPOD_4G_PAD}{Direction keys} 
     & Move the cursor\\
-    \opt{recorder,recorderv2fm}{\ButtonPlay}
-    \opt{ondio}{short press on \ButtonMenu}
-    \opt{h1xx,h300,ipodcolor,ipodnano}{\ButtonSelect}
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+        {\ButtonSelect}
     & Select / Move piece\\
-    \opt{recorder,recorderv2fm}{\ButtonFOne}
-    \opt{ondio}{\ButtonMenu+\ButtonOff}
-    \opt{h1xx,h300}{\ButtonMode}
-    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonRight}
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Change level\\
-    \opt{recorder,recorderv2fm}{\ButtonOn}
-    \opt{ondio}{long press on \ButtonMenu}
-    \opt{h1xx,h300}{\ButtonOn}
-    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonPlay}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Force play\\
-    \opt{recorder,recorder2fm}{n/a}
-    \opt{ondio}{n/a}
-    \opt{h1xx,h300}{\ButtonRec}
-    \opt{x5}{\ButtonSelect}
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IAUDIO_X5_PAD}{\ButtonSelect+\ButtonPlay}
     & Restart Game\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOff}
-    \opt{ondio}{\ButtonOff}
-    \opt{ipodcolor,ipodnano}{\ButtonSelect+\ButtonMenu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/credits.tex b/manual/plugins/credits.tex
index 0534687428..395bb23910 100755
--- a/manual/plugins/credits.tex
+++ b/manual/plugins/credits.tex
@@ -1,5 +1,6 @@
+% $Id$ %
 \subsection{Credits}
 The credits plugin scrolls the entire list of the names of all the Rockbox
 contributors after displaying the Rockbox logo and version. This plugin is
-called when selecting Rockbox Info from the Info section of the Rockbox main
-menu.
+called when selecting \setting{Rockbox Info} from the \setting{Info} section of
+the Rockbox main menu.
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 2b42da8b7e..7856b96698 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -1,23 +1,21 @@
+% $Id$ %
 \subsection{Demystify}
-\screenshot{plugins/images/ss-demystify}{Demystify}%
-{img:demystify}
+\screenshot{plugins/images/ss-demystify}{Demystify}{img:demystify}
 Demystify is a screen saver like demo.\\
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Right}
-        & Add polygon\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Left}
-        & Remove polygon\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Right}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
-        & Increase speed\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Left}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
-        & Decrease speed\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
-    \opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+        {\ButtonUp\ / \ButtonDown}
+    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonRight\ / \ButtonLeft}
+        & Add / remove polygon\\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+        {\ButtonRight\ / \ButtonLeft}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \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}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/favorites.tex b/manual/plugins/favorites.tex
index ae58e1a707..570134a48e 100644
--- a/manual/plugins/favorites.tex
+++ b/manual/plugins/favorites.tex
@@ -1,13 +1,6 @@
+% $Id$ %
 \subsection{Favorites}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.667cm,height=1.998cm]{images/rockbox-manual-img65.png}
- \newline
-Favorites
-\par}
-
+\screenshot{plugins/images/ss-favorites}{Favorites}{img:favorites}
 When listening to any song you can open it with this plugin and it will
 add the current song to a special playlist of all songs you selected in
-\textbf{/favorites.m3u}.
-
-
+\fname{/favorites.m3u}.
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index c3649df137..f15833560d 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -1,23 +1,26 @@
+% $Id$ %
 \subsection{Fire}
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
-
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
-    & Increase number of flames\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
-    & Decrease number of flames\\
-    \opt{recorder,recorderv2fm}{Menu}\opt{ondio}{Mode}
-    \opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano,ipodvideo}{Select}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+        {\ButtonUp\ / \ButtonDown}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    & 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}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD}{\ButtonLeft}
     & Toggle flame type\\
-    \opt{recorder,recorderv2fm}{Play}
-    \opt{ondio,ipodcolor,ipodnano,ipodvideo}{Right}\opt{h1xx,h300}{Record}
+    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     & Toggle moving flames\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
-    \opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index a6df770083..a938ec93c4 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -1,14 +1,19 @@
+% $Id$ %
 \subsection{Logo}
 Demo showing the Rockbox logo bouncing around the screen.
-
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{player}{\ButtonRight / \ButtonLeft, \ButtonOn+\ButtonRight / \ButtonOn+\ButtonLeft}
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano,ipodvideo}{Direction Keys}
-    & Increase / decrease speed in either direction.\\
-    \opt{player}{\ButtonStop}
-    \opt{recorder,ondio,recorderv2fm,h1xx,h300}{\ButtonOff}
+    \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}
+        {\ButtonUp\ / \ButtonDown}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    & 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}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 2bb9419ae4..fcd880150a 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -1,9 +1,10 @@
+% $Id$ %
 \subsection{Mosaic}
 \screenshot{plugins/images/ss-mosaic}{Mosaic}{img:mosaic}
-
-This simple graphics demo draws a mosaic picture on the screen of the
-Jukebox. %
-\opt{player}{Press \ButtonStop\ to quit.}
-\opt{IPOD_4G_PAD}{Press \ButtonMenu\ to quit.}
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Press \ButtonOff\ to quit.}
-
+This simple graphics demo draws a mosaic picture on the screen of the \dap.
+Press 
+\opt{PLAYER_PAD}{\ButtonStop}
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IPOD_4G_PAD}{\ButtonMenu}
+\opt{IAUDIO_X5_PAD}{\ButtonPower}
+to quit.
diff --git a/manual/plugins/movieplayer.tex b/manual/plugins/movieplayer.tex
index c17e86cc69..e70657d990 100644
--- a/manual/plugins/movieplayer.tex
+++ b/manual/plugins/movieplayer.tex
@@ -1,6 +1,6 @@
+% $Id$ %
 \subsection{Movie Player}
-Play movies on your Jukebox!  In order to do
-this, movies must be in AVI format, and then converted to .RVF,
-Rockbox's own video format.  For more details on how to use this plugin, please see \url{http://www.rockbox.org/twiki/bin/view/Main/VideoTutorial}.
-
-
+Play movies on your \dap!  In order to do this, movies must be in AVI format,
+and then converted to \fname{.RVF}, Rockbox's own video format. For more
+details on how to use this plugin, please see
+\url{http://www.rockbox.org/twiki/bin/view/Main/VideoTutorial}.
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 166bd84fc5..e202faf384 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -1,10 +1,11 @@
+% $Id$ %
 \subsection{Oscilloscope}
 \screenshot{plugins/images/ss-oscilloscope}{Oscilloscope}{img:oscilloscope}
 
 This demo shows the shape of the sound samples that make up the music
 being played.
 \opt{SWCODEC}{
-  At faster speed rates, the Jukebox is less responsive
+  At faster speed rates, the \dap\ is less responsive
   to user input and music may start to skip.
 }
 
@@ -12,29 +13,37 @@ being played.
 
 \begin{table}
 \begin{btnmap}{}{}
-\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode}\opt{h1xx}{Select}
-\opt{h300}{Navi}\opt{ipodcolor,ipodnano}{Select+Play}
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
     & Toggle filled / curve / plot \\
-\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode+Right}\opt{h1xx,h300}{A-B}
-\opt{ipodcolor,ipodnano}{Select+Right}
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Toggle whether to scroll or not \\
-\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode+Left}\opt{h1xx,h300}{Record}
-\opt{ipodcolor,ipodnano}{Select+Left}
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
     & Toggle drawing orientation \\
-Left & Slow down scrolling \\
-Right & Speed up scrolling \\
-\opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}
-\opt{ondio}{Mode+Off}
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     & Pause the demo \\
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
-\opt{ipodcolor,ipodnano}{Scroll forward}
-    & Increase volume\\
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
-\opt{ipodcolor,ipodnano}{Scroll backward}
-    & Decrease volume\\
-\opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}
-\opt{ipodcolor,ipodnano}{Select+Menu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+        {\ButtonUp\/\ButtonDown}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\/\ButtonScrollBack}
+    & Increase / decrease volume\\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,
+        IAUDIO_X5_PAD}{\ButtonRight\/\ButtonLeft}
+    & Increase / decrease speed\\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Exit demo \\
 \end{btnmap}
 \end{table}
-