3 files changed, 35 insertions, 30 deletions

diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index e748b12d0e..ebd398323a 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -1,19 +1,21 @@
+% $Id$ %
 \subsection{Plasma}
 \screenshot{plugins/images/ss-plasma}{Plasma}{img:plasma}
 Plasma is a demo displaying a 80's style retro plasma effect.
 
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
-    & Increase frequency\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
-    & Decrease frequency\\
-    \opt{ipodcolor,ipodnano,ipodvideo}{Select & Change colours\\}
-    \opt{h300}{Navi & Change colours\\}
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}
-%
-    \opt{ipodcolor,ipodnano,ipodvideo}{Menu} & Quit\\
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \nopt{IPOD_4G_PAD}{\ButtonUp\ / \ButtonDown}
+    & Adjust frequency\\
+    \opt{HAVE_LCD_COLOR}{
+        \opt{IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+        \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+        & Change colours\\
+    }
+    \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/starfield.tex b/manual/plugins/starfield.tex
index 883566c685..200d339d9a 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -1,20 +1,17 @@
+% $Id$ %
 \subsection{Starfield}
-\screenshot{plugins/images/ss-starfield}{Starfield}{fig:starfield}
+\screenshot{plugins/images/ss-starfield}{Starfield}{img:starfield}
 Starfield simulation (like the classic screensaver).
 
 \begin{table}
     \begin{btnmap}{}{}
-    Right & Increase number of stars\\
-    Left & Decrease number of stars\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
-    & Increase speed\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
-    & Decrease speed\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
-    \opt{ondio}{Off}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    \ButtonRight\ / \ButtonLeft & Increase / decrease number of stars\\
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \nopt{IPOD_4G_PAD}{\ButtonUp\ / \ButtonDown}
+    & Increase / decrease speed\\
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+    \nopt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonOff}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index a82744da32..0a88c13118 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -1,5 +1,6 @@
+% $Id$ %
 \subsection{Xobox}
-\screenshot{plugins/images/ss-xobox}{Xobox}{}
+\screenshot{plugins/images/ss-xobox}{Xobox}{img:xobox}
 Xobox is a simple clone of the well known arcade game Qix.
 The aim of the game is to section off parts of the arena with your trail in
 order to remove that section from the game. Be careful not to get in the way of
@@ -7,13 +8,18 @@ enemy balls because, if they hit you or your trail, you lose a life.
 To finish a level you have to section off more than 75\%.
 
 \begin{table}
-\begin{btnmap}{The Xobox plugin}{tab:xobox}
-    \opt{h1xx,h300}{A-B}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Select} 
+\begin{btnmap}{}{}
+    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
+    \nopt{IPOD_4G_PAD}{\ButtonUp, \ButtonDown,}
+    \ButtonLeft, \ButtonRight
+    & Move around the arena\\
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Pause\\
-    \opt{h1xx,h300}{Stop}
-    \opt{ipodcolor,ipodnano,ipodvideo}{Menu+Select} 
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
 \end{table}
-