Correct manual keymaps for plugins recently converted to PLA, and use manual PLA defines for them.

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

14 files changed, 159 insertions, 379 deletions

diff --git a/manual/plugins/alarmclock.tex b/manual/plugins/alarmclock.tex
index b7a04458d4..d427bd4532 100644
--- a/manual/plugins/alarmclock.tex
+++ b/manual/plugins/alarmclock.tex
@@ -4,41 +4,21 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
 
 \subsubsection{Key configuration}
 \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Switch between hours/minutes selection \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-      {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{scrollwheel}{\PluginScrollBack{} / \PluginScrollFwd{} or}
+    \PluginUp{} / \PluginDown 
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Increase/Decrease hours/minutes \\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,SANSA_FUZE_PAD}
-      {\ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK{}}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Set the alarm \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit \\
 \end{btnmap}
 
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 55d43239bc..987ae3e910 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -9,56 +9,22 @@ entire board is shifted down every time a certain number of shots have been
 fired. Points are awarded depending on how quickly the level was completed.
 
     \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-           }
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Pause game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-        {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus{} or \TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \nopt{scrollwheel}{\PluginLeft{} / \PluginRight}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & 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,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_FUZE_PAD}
-        {\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{}, \TouchCenter{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & 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{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{COWON_D2_PAD}{\TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
-        & 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{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-            }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Exit to menu\\
     \end{btnmap}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 076b0defd7..92873223d9 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -6,61 +6,25 @@ This is a fully featured analogue and digital clock plugin.
 \subsubsection{Key configuration}
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Cycle through modes \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-      {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginUp{} / \PluginDown
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Cycle through skins \\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-      {\ButtonMenu}
-    \opt{SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{COWON_D2_PAD}{\ButtonMenu{} or \TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Main Menu \\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,SANSA_FUZE_PAD}
-      {\ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Start / Stop Counter \\
-    \opt{RECORDER_PAD_PAD}{Long \ButtonPlay}%
-    \opt{IRIVER_H10_PAD}{Long \ButtonRew}%
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
-      {Long \ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or long \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelectRepeat
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelectRepeat}
     & Reset Counter \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
-    & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 
 \textbf{Clock Menu}
diff --git a/manual/plugins/codebuster.tex b/manual/plugins/codebuster.tex
index aef8d8e844..a70edf57ba 100644
--- a/manual/plugins/codebuster.tex
+++ b/manual/plugins/codebuster.tex
@@ -10,32 +10,20 @@ a correct peg in the correct position, and a white peg signifies a correct
 peg in the wrong position.
 
   \begin{btnmap}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H300_PAD}{\ButtonOff}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{}, \ButtonMenu{} or \TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonMenu{} or \ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Show menu \\
-    \opt{IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD}
-        {\ButtonSelect}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\ButtonMinus{}, \ButtonPlus{} or \TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK{} or \ButtonPlay}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Check suggestion and move to next line \\
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft\ / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Select a peg \\
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle}
-      \opt{HAVEREMOTEKEYMAP}{& }
+
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Change current peg \\
   \end{btnmap}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index b2379ad694..3e0a5d0dc9 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -2,34 +2,18 @@
 \subsection{Demystify}
 \screenshot{plugins/images/ss-demystify}{Demystify}{img:demystify}
 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%
-        ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD}
-        {\ButtonRight\ / \ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \nopt{scrollwheel}{\PluginLeft{} / \PluginRight}
+    \opt{scrollwheel}{\PluginScrollBack{} / \PluginScrollFwd}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Increase / decrease speed\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonRight\ / \ButtonLeft}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginUp{} / \PluginDown
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Add / remove polygon\\
-    \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{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index e06f837d86..44153e0a59 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -4,28 +4,11 @@ in a menu and start by choosing ``Roll Dice''. The result is shown as individual
 numbers as well as the total of the rolled dice.
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonUp}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} or \TouchCenter}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-        }
+    \PluginSelect
+          \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Roll dice again\\
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
-        ,IRIVER_H10_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-        }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 0a1dbc0968..9ca3fd33bb 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -3,41 +3,20 @@
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchTopMiddle{} / \ButtonMinus{} or \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & 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,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
     & 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,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
     & 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,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/frotz.tex b/manual/plugins/frotz.tex
index 33c3c3749d..4e7882d6be 100644
--- a/manual/plugins/frotz.tex
+++ b/manual/plugins/frotz.tex
@@ -34,37 +34,19 @@ classic commercial Infocom games:
 \end{itemize}
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-           }
+    \PluginUp
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Display keyboard to enter text\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_FUZE_PAD}
-        {\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{}, \TouchCenter{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Press enter\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-            }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Open Frotz menu (not available at MORE prompts)\\
+
+    \PluginExit
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index 05869afe9e..a7dd83f699 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -5,33 +5,11 @@ This is a jackpot slot machine game. At the beginning of the game you
 have 20\$.  Payouts are given when three matching symbols come up.
 
 \begin{btnmap}
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,%
-      MROBE100_PAD,SANSA_CLIP_PAD,M200,IPOD_3G_PAD,IPOD_4G_PAD,%
-      SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IAUDIO_M3_PAD}{}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchTopMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCSelect}
-          \opt{IAUDIO_RC_PAD}{\ButtonRCMode}
-        }
-    & Play \\
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{IRIVER_H100_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD,SANSA_C200_PAD,%
-      SANSA_CLIP_PAD,IRIVER_H10_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{SANSA_FUZE_PAD}{\ButtonHome}
-    \opt{IAUDIO_M3_PAD}{}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-          \opt{IAUDIO_RC_PAD}{\ButtonRCRec}
-        }
+    \PluginSelect
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
+    & Play\\
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit the game \\
 \end{btnmap}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index 32b23db851..ae22327c55 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -13,30 +13,13 @@ You start the game with three lives.
 Luckily, there are checkpoints at levels four and eight.
 
 \begin{btnmap}
-    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp, \ButtonDown,}%
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,ONDIO_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{}, \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft/\TouchMidRight/\TouchTopMiddle/\TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd, \ButtonLeft, \ButtonRight}
+    \nopt{IPOD_3G_PAD}{\PluginUp, \PluginDown, \PluginLeft, PluginRight}
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, PluginRCRight}
     & Move Character\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+
     \opt{IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD}
-        {\ButtonPower}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-        }
+    \nopt{IPOD_3G_PAD}{\PluginCancel}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Menu\\
 \end{btnmap}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index a1d8febca8..6b7fde92f0 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -4,48 +4,29 @@ practice. Adjust the tempo through the interface or by tapping it out
 on the appropriate button.
 
 \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{}, \ButtonMenu{} or \TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \PluginExit
        \opt{HAVEREMOTEKEYMAP}{& }
         & Exit plugin \\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
-        ,IAUDIO_X5_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (Long: Stop)}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{COWON_D2_PAD}{\TouchCenter}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Start / Stop \\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (repeatedly)}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\ButtonMinus{}, \ButtonPlus{} or \TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Tap tempo \\
-    \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
-        ,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Adjust tempo \\
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus{} or \TouchTopMiddle{} / \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Adjust volume \\
+
+    \opt{h100,h300,e200}{
+      \ButtonRec
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Sync tap \\}
 \end{btnmap}
diff --git a/manual/plugins/pitch_detector.tex b/manual/plugins/pitch_detector.tex
index 8174e57a4a..0b9363cf6c 100644
--- a/manual/plugins/pitch_detector.tex
+++ b/manual/plugins/pitch_detector.tex
@@ -6,3 +6,13 @@ With the Pitch Detector, you can play a note on a musical instrument,
 and the plugin will tell you what note it is (e.g. A, A\#, B, etc.) The
 frequency will also be displayed. This may be a great assistance when
 tuning a musical instrument.
+
+\begin{btnmap}
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
+    & Open menu\\
+
+    \PluginExit
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Exit\\
+\end{btnmap}
\ No newline at end of file
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 2ee2b5ecf1..3f5b22595c 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -7,31 +7,11 @@ Robot must touch items to determine if they are kitten or not. The game
 ends when robotfindskitten.
 
 \begin{btnmap}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
-        ,RECORDER_PAD,SANSA_FUZE_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp, \ButtonDown,}%
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H100_PAD%
-        ,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD%
-        ,SANSA_FUZE_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{}, \ButtonRight}
-    \opt{COWON_D2_PAD}
-        {\TouchTopMiddle, \TouchBottomMiddle, \TouchMidLeft, \TouchMidRight}
-      \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginUp, \PluginDown, \PluginLeft, \PluginRight
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight}
     & Move robot\\
-    \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,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/rocklife.tex b/manual/plugins/rocklife.tex
index 44e6424b56..846e0b224f 100644
--- a/manual/plugins/rocklife.tex
+++ b/manual/plugins/rocklife.tex
@@ -12,3 +12,25 @@ A \fname{.cells} file is a text file. A capital `O' marks a live cell, a dot
 marks a dead cell, all other characters are ignored. Everything on a line
 starting with an exclamation sign (and including it) is a comment and is
 ignored.
+
+\begin{btnmap}
+    \PluginSelect
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
+    & Play/pause\\
+
+    \PluginDown
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCDown}
+    & Change growth mode\\
+
+    \PluginRight
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
+    & Next generation\\
+
+    \PluginLeft
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
+    & Status (only when paused)\\
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
+    & Exit\\
+\end{btnmap}
\ No newline at end of file