44 files changed, 108 insertions, 71 deletions

diff --git a/manual/plugins/2048.tex b/manual/plugins/2048.tex
index 8df101c968..b55757c0d1 100644
--- a/manual/plugins/2048.tex
+++ b/manual/plugins/2048.tex
@@ -14,7 +14,8 @@ which -- in computer talk -- means a multiple of 1024).}
   \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight}
   & Slide tiles\\
 
-  \PluginCancel
+  \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
   \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
   & Go to menu\\
 \end{btnmap}
diff --git a/manual/plugins/alarmclock.tex b/manual/plugins/alarmclock.tex
index 617a208fdb..3e4d99d120 100644
--- a/manual/plugins/alarmclock.tex
+++ b/manual/plugins/alarmclock.tex
@@ -9,7 +9,8 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
     & Switch between hours/minutes selection \\
 
     \opt{scrollwheel}{\PluginScrollBack{} / \PluginScrollFwd{} or}
-    \PluginUp{} / \PluginDown 
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginDown}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Increase/Decrease hours/minutes \\
 
@@ -17,7 +18,8 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Set the alarm \\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit \\
 \end{btnmap}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index fe26c67198..93fddd89bf 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -6,7 +6,8 @@ In \setting{Scroll mode} the bouncing text is replaced by a different one
 scrolling from right to left.
 
 \begin{btnmap}
-    \PluginUp / \PluginDown
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginLeft{} / \PluginRight}
         \opt{HAVEREMOTEKEYMAP}{& }
     & Moves to next/previous option\\
     \nopt{scrollwheel} {
@@ -20,7 +21,8 @@ scrolling from right to left.
     \PluginSelect
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggles Scroll mode\\
-    \PluginCancel{} or \PluginExit
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Exits bounce demo\\
 \end{btnmap}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 126a42c5f9..88fd4f997f 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -10,7 +10,8 @@ fired. Points are awarded depending on how quickly the level was completed.
 
     \begin{btnmap}
     \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
-    \nopt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
+    \nopt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Pause game\\
 
@@ -24,7 +25,8 @@ fired. Points are awarded depending on how quickly the level was completed.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Fire bubble\\
 
-    \PluginCancel{} or \PluginExit
+    \nopt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Exit to menu\\
     \end{btnmap}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index fb4291f250..b965f7b365 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -37,9 +37,9 @@ You can select what day is first day of week by the setting \setting{First Day o
     \opt{MPIO_HD300_PAD}{\ButtonRew / \ButtonFF
     & Previous / Next week\\}
     %
+\nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
     \opt{MROBE100_PAD}{\ButtonMenu{} + \ButtonUp{} / \ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} / \ButtonRec}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay{} / \ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec{} / \ButtonPlay}
     \opt{GIGABEAT_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp{} / \ButtonVolDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev}
@@ -52,10 +52,10 @@ You can select what day is first day of week by the setting \setting{First Day o
     \opt{MPIO_HD300_PAD}{\ButtonRec{} / \ButtonPlay}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack{} / \ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
-    & Previous / Next month\\
+    & Previous / Next month\\}
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index fd9391bce4..21d6733a52 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -74,7 +74,7 @@ the game.
        \opt{HAVEREMOTEKEYMAP}{& }
     & Force play\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index 4752bd1204..aa10f7508b 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -17,7 +17,7 @@ The more blocks you remove per turn, the more points you get.
       ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
       ,SAMSUNG_YH820_PAD}
       {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor around the blocks \\
@@ -32,6 +32,7 @@ The more blocks you remove per turn, the more points you get.
     }
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
       {\ButtonOff}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD%
       ,IAUDIO_X5_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{\ButtonHome}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 92873223d9..16220792df 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -10,11 +10,13 @@ This is a fully featured analogue and digital clock plugin.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Cycle through modes \\
 
-    \PluginUp{} / \PluginDown
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginDown}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Cycle through skins \\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Main Menu \\
 
diff --git a/manual/plugins/codebuster.tex b/manual/plugins/codebuster.tex
index a70edf57ba..380c5dc734 100644
--- a/manual/plugins/codebuster.tex
+++ b/manual/plugins/codebuster.tex
@@ -10,7 +10,8 @@ a correct peg in the correct position, and a white peg signifies a correct
 peg in the wrong position.
 
   \begin{btnmap}
-    \PluginCancel
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Show menu \\
 
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 0366c788b7..75c16eaab9 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -4,7 +4,7 @@ This is a rotating cube screen saver in 3D.
 \begin{btnmap}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -30,7 +30,7 @@ This is a rotating cube screen saver in 3D.
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
         {\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
     \opt{IAUDIO_X5_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 3e0a5d0dc9..88d7677b08 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -9,11 +9,13 @@ Demystify is a screen saver like demo.\\
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Increase / decrease speed\\
 
-    \PluginUp{} / \PluginDown
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginLeft{} / \PluginRight}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Add / remove polygon\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp}
         \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index 44153e0a59..4756d612c7 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -8,7 +8,8 @@ numbers as well as the total of the rolled dice.
           \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Roll dice again\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 9ca3fd33bb..a66f9950ab 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -16,7 +16,8 @@ Fire is a demo displaying a fire effect.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
     & Toggle moving flames\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index cb9880a8c3..380bae2001 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -76,7 +76,7 @@ a screen containing tokens of only one colour.
        \opt{HAVEREMOTEKEYMAP}{& }
     & Solve step by step \\
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD%
     ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/fractals.tex b/manual/plugins/fractals.tex
index c12878cf3d..dc06ae9893 100644
--- a/manual/plugins/fractals.tex
+++ b/manual/plugins/fractals.tex
@@ -92,7 +92,7 @@ This demonstration draws fractal images from the Mandelbrot set%
     & Reset and return to the default image\\
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 637507456b..cc5b27eee4 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -113,7 +113,7 @@ view a bigger file you may need to stop playback.}
         & Toggle slide show mode\\
     }
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
@@ -128,7 +128,7 @@ view a bigger file you may need to stop playback.}
     & Show menu / Abort \\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
         ,SAMSUNG_YH820_PAD}{
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
         \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
         \opt{GIGABEAT_S_PAD}{\ButtonBack}
         \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index a7dd83f699..754d7a6ab7 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -9,7 +9,8 @@ have 20\$.  Payouts are given when three matching symbols come up.
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Play\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit the game \\
 \end{btnmap}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index 38ce4b1ac8..5a06beb6a5 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -46,8 +46,8 @@ skillfully swapping pairs of jewels.
       ,IAUDIO_X5_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IPOD_3G_PAD,MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+ \ButtonMenu}
+    \opt{MPIO_HD300_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
diff --git a/manual/plugins/lamp.tex b/manual/plugins/lamp.tex
index 643f1bb51f..23190e62f1 100644
--- a/manual/plugins/lamp.tex
+++ b/manual/plugins/lamp.tex
@@ -28,6 +28,7 @@ You get an empty screen with maximum brightness.
     Toggle the button light
         \\
   }
-    \PluginCancel{} or \PluginExit
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     & Exit to menu\\
 \end{btnmap}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 7239d42cca..b79747cd91 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -9,14 +9,16 @@ Demo showing the Rockbox logo bouncing around the screen.
     Increase / decrease speed on the x-axis
         \\
 
-        \PluginUp{} / \PluginDown
+        \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
         &
     \opt{HAVEREMOTEKEYMAP}{
         &}
     Increase / decrease speed on the y-axis
         \\
 
-    \PluginCancel{} or \PluginExit
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
         &
     \opt{HAVEREMOTEKEYMAP}{
         &}
diff --git a/manual/plugins/maze.tex b/manual/plugins/maze.tex
index 186a650b4d..0a581a7740 100644
--- a/manual/plugins/maze.tex
+++ b/manual/plugins/maze.tex
@@ -4,8 +4,8 @@ This is a simple maze generator that creates perfect mazes that have only
 one solution.
 
 \begin{btnmap}
-    \opt{IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd/\ButtonLeft/\ButtonRight}
-    \nopt{IPOD_3G_PAD}{\PluginUp/\PluginDown/\PluginLeft/\PluginRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd/\ButtonLeft/\ButtonRight}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp/\PluginDown/\PluginLeft/\PluginRight}
         &
     \opt{HAVEREMOTEKEYMAP}{
         \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight
@@ -13,24 +13,24 @@ one solution.
     Navigate maze
     \\
 
-    \opt{IPOD_3G_PAD}{\ButtonMenu}
-    \nopt{IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
         &
     \opt{HAVEREMOTEKEYMAP}{\PluginRCCancel
         &}
     Exit plugin
     \\
 
-    \opt{IPOD_3G_PAD}{Long \ButtonSelect}
-    \nopt{IPOD_3G_PAD}{\PluginSelectRepeat}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginSelectRepeat}
         &
     \opt{HAVEREMOTEKEYMAP}{\PluginRCSelectRepeat
         &}
     New Maze
     \\
 
-    \opt{IPOD_3G_PAD}{\ButtonSelect}
-    \nopt{IPOD_3G_PAD}{\PluginSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginSelect}
         &
     \opt{HAVEREMOTEKEYMAP}{\PluginRCSelect
         &}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index 26b18a2375..daf0a5c6ef 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -13,8 +13,8 @@ You start the game with three lives.
 Luckily, there are checkpoints at levels four and eight.
 
 \begin{btnmap}
-    \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd, \ButtonLeft, \ButtonRight}
-    \nopt{IPOD_3G_PAD}{\PluginUp, \PluginDown, \PluginLeft, \PluginRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd, \ButtonLeft, \ButtonRight}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp, \PluginDown, \PluginLeft, \PluginRight}
         &
     \opt{HAVEREMOTEKEYMAP}{
         \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight
@@ -22,8 +22,8 @@ Luckily, there are checkpoints at levels four and eight.
     Move Character
     \\
 
-    \opt{IPOD_3G_PAD}{\ButtonMenu}
-    \nopt{IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
         &
     \opt{HAVEREMOTEKEYMAP}{\PluginRCCancel
         &}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index fca34eb91f..b534ba630d 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -21,7 +21,8 @@ You can adjust the tempo through the interface or by tapping it out
 on the appropriate button.
 
 \begin{btnmap}
-    \PluginExit
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginExit}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Exit plugin \\
 
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index d5fdfefe64..42d915aedd 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -6,10 +6,11 @@
 This simple graphics demo draws a mosaic picture on the screen of the \dap.
 
 \begin{btnmap}
-    \PluginUp
-    & Change the gap between the drawing lines.\\
+    \PluginRight
+    & Adjust the speed.\\
     \PluginSelect
     & Restart the drawing process.\\
-    \PluginCancel{} or \PluginExit
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     & Exits Mosaique demo\\
 \end{btnmap}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 27fe8e7ac9..9a6dfe19c9 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -14,7 +14,7 @@ to user input and music may start to skip.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD%
       ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{COWON_D2_PAD}{\TouchTopMiddle}
@@ -92,7 +92,7 @@ to user input and music may start to skip.
        \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD}
         {\ButtonPower}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index 59e6fef73f..91a3bc79ff 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -101,7 +101,7 @@ block and crosses which allow you to choose a replacement block.
     }
 
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD%
         ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/periodic_table.tex b/manual/plugins/periodic_table.tex
index 08e6bf9253..1a8e4b0327 100644
--- a/manual/plugins/periodic_table.tex
+++ b/manual/plugins/periodic_table.tex
@@ -7,7 +7,8 @@ The periodic table plugin allows easy browsing and viewing of details of element
   \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight}
   & Move cursor\\
 
-  \PluginCancel
+  \PluginCancel{}
+  or \PluginSelect
   \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
   & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index fc4a35274f..0d249299d5 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -157,8 +157,10 @@ reduces the time it takes for cover art to be displayed.}}
         Enter context menu
             \\
 
-        \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,FIIO_M3K_PAD}{\ActionStdMenu}
+        \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,FIIO_M3K_PAD%
+              ,IPOD_4G_PAD,IPOD_3G_PAD}{\ActionStdMenu}
         \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{or \ButtonRew}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
         \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
         \opt{FIIO_M3K_PAD}{\ButtonPower}
             &
@@ -173,7 +175,7 @@ reduces the time it takes for cover art to be displayed.}}
             \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD%
                 ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
             \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
-            \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
+            \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ActionStdMenu}
             \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
             \opt{PBELL_VIBE500_PAD}{\ButtonRec}
             \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{long \ButtonRew}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 8b2cf8b88b..b93ebe095c 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -4,7 +4,7 @@
 Plasma is a demo displaying a 80's style retro plasma effect.
 
       \begin{btnmap}
-          \PluginUp{} / \PluginDown
+          \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
           \opt{scrollwheel}{/ \PluginScrollFwd{} / \PluginScrollBack}
               &
           \opt{HAVEREMOTEKEYMAP}{\PluginRCUp{} / \PluginRCDown
@@ -21,7 +21,8 @@ Plasma is a demo displaying a 80's style retro plasma effect.
                   \\
           }%
        
-          \PluginCancel{} / \PluginExit
+          \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} / \PluginExit}
+          \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
               &
           \opt{HAVEREMOTEKEYMAP}{\PluginRCCancel
               \opt{IAUDIO_RC_PAD}{ / \PluginRCExit}
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 3f5b22595c..86be5bd600 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -11,7 +11,8 @@ ends when robotfindskitten.
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight}
     & Move robot\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 1b28c039a8..1d6bc7b1f6 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -101,7 +101,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
         & Pause\\
     }
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index a8d27411b7..df0f6480a2 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -10,7 +10,8 @@ horizontal moving anymore and no need to rotate the brick!
       \opt{HAVEREMOTEKEYMAP}{& }
         & Move down faster\\
 
-      \PluginCancel{} or \PluginExit
+      \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/rocklife.tex b/manual/plugins/rocklife.tex
index e031e4a115..14687049d9 100644
--- a/manual/plugins/rocklife.tex
+++ b/manual/plugins/rocklife.tex
@@ -30,7 +30,8 @@ ignored.
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
     & Status (only when paused)\\
 
-    \PluginCancel
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit\\
 \end{btnmap}
\ No newline at end of file
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 8b0a9774e0..777788f6f9 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -59,7 +59,7 @@ launched via Open With), and numbered tiles \\
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
       ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
   \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
   \opt{GIGABEAT_S_PAD}{\ButtonBack}
   \opt{PBELL_VIBE500_PAD}{\ButtonRec}
   \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 7505e27cb1..2c557b7e75 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -29,6 +29,7 @@ end when the snake touches either the borders of the screen or itself.
      & Toggle Play/Pause\\
     %
     \opt{SANSA_FUZEPLUS_PAD.XDUOO_X3_PAD}{\ButtonPower}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Go to the plugin's menu\\
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index bae9b7134e..d37db0fb49 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -31,7 +31,7 @@ into itself.
   \opt{HAVEREMOTEKEYMAP}{& }
         & Pause and resume the game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 13edf8af39..71430198d4 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -2,5 +2,8 @@
 \screenshot{plugins/images/ss-snow}{Have you ever seen snow falling?}{img:snow}
 This demo replicates snow falling on your screen. If you love winter,
 you will love this demo.  Or maybe not.
-Press \PluginCancel{} or \PluginExit{} to quit.
+Press
+\nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit{}}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+to quit.
 
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 5fd5cbbaa2..3f13eea6d4 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -33,7 +33,7 @@ information about the level format, see
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move the ``sokoban'' up, down, left, or right\\
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
      ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index a6c60b3417..72c7d9db5a 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -111,7 +111,7 @@ visit
       & Put the card on top of the remains stack on one of the final colour stacks.\\
     %
     \opt{IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index f9e207b70f..7c3ae105eb 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -107,7 +107,7 @@ could not otherwise reach. The block cannot take ``o''s.
       \opt{HAVEREMOTEKEYMAP}{& }
         & Next level \\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 3169cd863a..2d68a0d5ac 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -8,7 +8,8 @@ Starfield simulation (like the classic screensaver).
   \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease number of stars\\
     
-    \PluginUp{} / \PluginDown
+  \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginUp{} / \PluginDown}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{lcd_color}{%
@@ -16,7 +17,8 @@ Starfield simulation (like the classic screensaver).
        \opt{HAVEREMOTEKEYMAP}{& }
         & Change colours\\%
     }%
-    \PluginCancel{} or \PluginExit
+  \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index 0dac854d68..eddad8e652 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -5,6 +5,9 @@ The stats plugin counts the directories and files
 (the total number as well as the number
 of audio, playlist, image and video files)
 on your \dap{}.
-Press \PluginCancel{} or \PluginExit{} to abort counting and
+Press 
+\nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\PluginCancel{} or \PluginExit{}}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+to abort counting and
 exit the plugin. Press it again to quit after counting has
 finished.
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index cf81f58cb1..89724d5641 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -152,7 +152,7 @@ There are two ways to stop a running game.
 \begin{itemize}
 \item If you want to quit Wormlet entirely simply hit
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,XDUOO_X3_PAD}{\ButtonPower}%
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}%
 \opt{PBELL_VIBE500_PAD}{\ButtonRec}%
@@ -188,7 +188,7 @@ This freezes the game. If you hit
 button again a new game starts with the same configuration. To return to the
 games menu you can hit
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,XDUOO_X3_PAD}{\ButtonPower}%
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
 \opt{PBELL_VIBE500_PAD}{\ButtonRec}%
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 8633916660..c3f8377da7 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -36,7 +36,7 @@ To finish a level you have to section off more than 75\%.
   \opt{HAVEREMOTEKEYMAP}{& }
     & Pause\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}