Packard Bell Vibe: Manual - change the names of the buttons internally (ButtonPrev -> ButtonLeft, ButtonNext -> ButtonRight), remove unnecessary strings, join the target to the existing mappings, where it's needed.

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

35 files changed, 97 insertions, 141 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 6d32e44963..40f81b381b 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -167,9 +167,8 @@
         \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
         \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
-        ipodnano2g,ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2}
-        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}
-        \opt{vibe500}{Long \ButtonPrev/\ButtonNext}.
+        ipodnano2g,ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2,vibe500}
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
         scrolled out of view, whereas \setting{No} will only scroll those entries
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 21d65b35d8..a0b5e39768 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -346,19 +346,17 @@ change to customise your listening experience.
       & Lowers the highlighted parameter.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonLeft}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
       \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
       \opt{COWON_D2_PAD}{\ActionStdPrev}
-      \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
     \opt{HAVEREMOTEKEYMAP}{& }
       \opt{GIGABEAT_RC_PAD}{\ButtonRCVolUp}
       & Moves to the previous EQ band. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRight}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonRight}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
       \opt{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
       \opt{COWON_D2_PAD}{\ActionStdNext}
-      \opt{PBELL_VIBE500_PAD}{\ButtonNext}
     \opt{HAVEREMOTEKEYMAP}{& }
       \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown}
       & Moves to the next EQ band. \\
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 0cfe22c4f8..025496efd1 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -212,13 +212,13 @@ therefore result in better runtime.
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}%
             {\ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight}
-        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonPrev}
+        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonLeft}
     and
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec}%
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD,IRIVER_H10_PAD}%
             {Long \ButtonPower}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft}
-        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonNext}
+        \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonRight}
     keys, respectively.%
     }%
     \opt{HAVEREMOTEKEYMAP}{
@@ -299,9 +299,8 @@ therefore result in better runtime.
                 % Scan previous track
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,%
                     IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonLeft}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
                 \opt{GIGABEAT_RC_PAD}{\ButtonPrev; \ButtonLeft}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -313,9 +312,8 @@ therefore result in better runtime.
                 % Scan next track
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
                     ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{\ButtonNext}
                 \opt{GIGABEAT_RC_PAD}{\ButtonNext; \ButtonRight}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -362,10 +360,10 @@ therefore result in better runtime.
 
                 % Slide previous
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonLeft}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {\ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{\ButtonPrev; \ButtonLeft}
                 \opt{IRIVER_H10_PAD}{\ButtonRew}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                   \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCRew}%
@@ -375,10 +373,10 @@ therefore result in better runtime.
 
                 % Slide next
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonRight}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {\ButtonRight}
                 \opt{GIGABEAT_S_PAD}{\ButtonNext; \ButtonRight}
                 \opt{IRIVER_H10_PAD}{\ButtonFF}
-                \opt{PBELL_VIBE500_PAD}{\ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCFF}%
@@ -388,10 +386,10 @@ therefore result in better runtime.
 
                 % Slide first
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonLeft}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {Long \ButtonLeft}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonPrev; Long \ButtonLeft}
                 \opt{IRIVER_H10_PAD}{Long \ButtonRew}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonPrev}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew}%
@@ -401,10 +399,10 @@ therefore result in better runtime.
 
                 % Slide last
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
-                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonRight}
+                    ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+                    {Long \ButtonRight}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonNext; Long \ButtonRight}
                 \opt{IRIVER_H10_PAD}{Long \ButtonFF}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCFF}%
@@ -565,9 +563,8 @@ therefore result in better runtime.
                 % Tab previous / next
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-                    ,IPOD_1G2G_PAD,MROBE100_PAD}
+                    ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonLeft / \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{\ButtonPrev / \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -595,9 +592,8 @@ therefore result in better runtime.
                 % History back / forward
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-                    ,IPOD_1G2G_PAD,MROBE100_PAD}
+                    ,IPOD_1G2G_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {Long \ButtonLeft / Long \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}{Long \ButtonPrev / Long \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew / Long \ButtonRCFF}%
@@ -631,14 +627,12 @@ therefore result in better runtime.
             \begin{btnmap}{}{}
                 % Cursor move up / down / left / right
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
-                    ,SANSA_CLIP_PAD,MROBE100_PAD}
+                    ,SANSA_CLIP_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
                     {\ButtonUp / \ButtonDown / \ButtonLeft / \ButtonRight}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown / 
                     \ButtonLeft / \ButtonRight}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonMenu / \ButtonPlay / \ButtonLeft / \ButtonRight}
-                \opt{PBELL_VIBE500_PAD}
-                    {\ButtonUp / \ButtonDown / \ButtonPrev / \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay / 
diff --git a/manual/platform/keymap-vibe500.tex b/manual/platform/keymap-vibe500.tex
index e8dc5e0c57..f41246ff54 100644
--- a/manual/platform/keymap-vibe500.tex
+++ b/manual/platform/keymap-vibe500.tex
@@ -3,8 +3,8 @@
 \newcommand{\ButtonPower}{\btnfnt{Power}}
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
-\newcommand{\ButtonPrev}{\btnfnt{Prev}}
-\newcommand{\ButtonNext}{\btnfnt{Next}}
+\newcommand{\ButtonLeft}{\btnfnt{Prev}}
+\newcommand{\ButtonRight}{\btnfnt{Next}}
 \newcommand{\ButtonUp}{\btnfnt{Scroll Up}}
 \newcommand{\ButtonDown}{\btnfnt{Scroll Down}}
 \newcommand{\ButtonOK}{\btnfnt{OK}}
@@ -13,8 +13,8 @@
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %temporary for the lack of plugin keymaps
-\newcommand{\ButtonLeft}{\btnfnt{WhatLeft}}
-\newcommand{\ButtonRight}{\btnfnt{WhatRight}}
+%\newcommand{\ButtonLeft}{\btnfnt{WhatLeft}}
+%\newcommand{\ButtonRight}{\btnfnt{WhatRight}}
 \newcommand{\ButtonSelect}{\btnfnt{WhatSelect}}
 
 %Button actions, standard context
@@ -22,8 +22,8 @@
 \newcommand{\ActionStdPrevRepeat}{\ButtonUp}
 \newcommand{\ActionStdNext}{\ButtonDown}
 \newcommand{\ActionStdNextRepeat}{\ButtonDown}
-\newcommand{\ActionStdCancel}{\ButtonPrev{} or \ButtonCancel}
-\newcommand{\ActionStdOk}{\ButtonNext{} or \ButtonOK}
+\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonCancel}
+\newcommand{\ActionStdOk}{\ButtonRight{} or \ButtonOK}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonOK}
 \newcommand{\ActionStdContext}{Long \ButtonMenu}
@@ -33,10 +33,10 @@
 %Button actions, wps context
 \newcommand{\ActionWpsPlay}{\ButtonPlay}
 \newcommand{\ActionWpsStop}{Long \ButtonPlay}
-\newcommand{\ActionWpsSkipPrev}{\ButtonPrev}
-\newcommand{\ActionWpsSeekBack}{Long \ButtonPrev}
-\newcommand{\ActionWpsSkipNext}{\ButtonNext}
-\newcommand{\ActionWpsSeekFwd}{Long \ButtonNext}
+\newcommand{\ActionWpsSkipPrev}{\ButtonLeft}
+\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft}
+\newcommand{\ActionWpsSkipNext}{\ButtonRight}
+\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight}
 \newcommand{\ActionWpsVolDown}{\ButtonDown}
 \newcommand{\ActionWpsVolUp}{\ButtonUp}
 \newcommand{\ActionWpsBrowse}{\ButtonOK}
@@ -49,8 +49,8 @@
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
-\newcommand{\ActionTreeEnter}{\ButtonNext}
-\newcommand{\ActionTreeParentDirectory}{\ButtonPrev}
+\newcommand{\ActionTreeEnter}{\ButtonRight}
+\newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
 \newcommand{\ActionTreeHotkey}{\ButtonRec}
 
 %Button actions, YesNo context
@@ -63,12 +63,12 @@
 %Button actions, Alarm screen
 \newcommand{\ActionAlarmSet}{\ButtonOK}
 \newcommand{\ActionAlarmCancel}{\ButtonCancel}
-\newcommand{\ActionAlarmHoursDec}{\ButtonPrev}
-\newcommand{\ActionAlarmHoursInc}{\ButtonNext}
+\newcommand{\ActionAlarmHoursDec}{\ButtonLeft}
+\newcommand{\ActionAlarmHoursInc}{\ButtonRight}
 
 %Button actions, Virtual Keyboard Context
-\newcommand{\ActionKbdLeft}{\ButtonPrev}
-\newcommand{\ActionKbdRight}{\ButtonNext}
+\newcommand{\ActionKbdLeft}{\ButtonLeft}
+\newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonPlay}
 \newcommand{\ActionKbdDone}{\ButtonOK}
 \newcommand{\ActionKbdAbort}{\ButtonCancel}
@@ -84,8 +84,8 @@
 \newcommand{\ActionPsIncBig}{\ButtonUp}
 \newcommand{\ActionPsDecSmall}{\ButtonDown}
 \newcommand{\ActionPsDecBig}{\ButtonDown}
-\newcommand{\ActionPsNudgeLeft}{\ButtonPrev}
-\newcommand{\ActionPsNudgeRight}{\ButtonNext}
+\newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
+\newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonOK}
 
@@ -95,8 +95,8 @@
 \newcommand{\ActionRecMenu}{Long \ButtonMenu}
 \newcommand{\ActionRecPause}{\ButtonPlay}
 \newcommand{\ActionRecExit}{\ButtonCancel}
-\newcommand{\ActionRecSettingsInc}{\ButtonNext}
-\newcommand{\ActionRecSettingsDec}{\ButtonPrev}
+\newcommand{\ActionRecSettingsInc}{\ButtonRight}
+\newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecPrev}{\ButtonUp}
 \newcommand{\ActionRecNext}{\ButtonDown}
 
diff --git a/manual/plugins/alarmclock.tex b/manual/plugins/alarmclock.tex
index b35495bffb..51dfeb699c 100644
--- a/manual/plugins/alarmclock.tex
+++ b/manual/plugins/alarmclock.tex
@@ -7,10 +7,9 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
 \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}
+        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft{} / \ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Switch between hours/minutes selection \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index fa2d2be651..de0ac90c21 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -15,14 +15,13 @@ visit\\
 \begin{table}
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
       {\ButtonLeft{} / \ButtonRight{} / \ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
       {\ButtonLeft{} / \ButtonRight{} / \ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}
       {\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext{} / \ButtonUp{} / \ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
       & Enter betting amount\\
     \opt{RECORDER_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
diff --git a/manual/plugins/bmpviewer.tex b/manual/plugins/bmpviewer.tex
index 875bc16e5a..5e36db1979 100755
--- a/manual/plugins/bmpviewer.tex
+++ b/manual/plugins/bmpviewer.tex
@@ -22,10 +22,9 @@ view a bigger file you may need to stop playback.}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-      ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}
+      ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
       {/ \ButtonLeft\ / \ButtonRight}
     \opt{COWON_D2_PAD}{}
-    \opt{PBELL_VIBE500_PAD}{/ \ButtonPrev\ / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move around in zoomed in image\\
     \opt{RECORDER_PAD}{\ButtonPlay}
@@ -61,7 +60,7 @@ view a bigger file you may need to stop playback.}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonNext}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonRight}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Next bmp in directory\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -75,7 +74,7 @@ view a bigger file you may need to stop playback.}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonPrev}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonLeft}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Previous bmp in directory\\
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index b9cd6afe58..94b28d3c21 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -18,10 +18,9 @@ scrolling from right to left.
 & Moves to next/previous option\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
     ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD%
-    ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
+    ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
     {\ButtonRight{} / \ButtonLeft}
 \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-\opt{PBELL_VIBE500_PAD}{\ButtonNext{} / \ButtonPrev}
        \opt{HAVEREMOTEKEYMAP}{& }
 & Increases/decreases option value\\
 \opt{RECORDER_PAD}{\ButtonOn}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index bbc9cdfcd2..56e4c78c3b 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -32,7 +32,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{
         \ButtonScrollBack\ / \ButtonScrollFwd}
     \opt{COWON_D2_PAD}{\ButtonMinus{} or \TouchBottomLeft{} / \ButtonPlus{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} or \ButtonMenu{} / \ButtonNext{} or \ButtonPlay}
+    \opt{PBELL_VIBE500_PAD}{\ButtonLeft{} or \ButtonMenu{} / \ButtonRight{} or \ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index cb0606a40c..5e9e46bb73 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -21,12 +21,12 @@ fired. Points are awarded depending on how quickly the level was completed.
            }
         & 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}
+        ,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{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Aim the bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index ec0932d83e..941d055639 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -10,17 +10,16 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
       ,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-      ,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
+      ,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
       {\ButtonLeft{} / \ButtonRight{} /}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      SANSA_FUZE_PAD}
+      SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
       {\ButtonUp{} / \ButtonDown}
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{/}
     \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight / \TouchTopMiddle / \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext{} / \ButtonUp{} / \ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move around the keypad\\
     %
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index aa07fe5d33..a8402bd430 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -11,15 +11,15 @@ You can select what day is first day of week by the setting \setting{First Day o
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,IPOD_4G_PAD%
-        ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
+        ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft{} / \ButtonRight{} /}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD}{\ButtonUp{} / \ButtonDown}
+        ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_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}{\TouchMidLeft{} / \TouchMidRight{} / \TouchTopMiddle{} / \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext{} / \ButtonUp{} / \ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move the selector\\
     %
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index dd8b752315..b9126b7378 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -69,7 +69,7 @@ Keys are as follows:
       & Exit plugin \\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
+    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
@@ -77,7 +77,6 @@ Keys are as follows:
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
        \opt{HAVEREMOTEKEYMAP}{& }
       & Restart round for the current player \\
     %
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 9d8c4f2542..c410396039 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -78,9 +78,8 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
             ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
             ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-            ,SANSA_FUZE_PAD}
+            ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
             {\ButtonLeft}
-        \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
         \end{sideways}
         &
         % Key "5"
@@ -100,9 +99,8 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
             ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
             ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-            ,SANSA_FUZE_PAD}
+            ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
             {\ButtonRight}
-        \opt{PBELL_VIBE500_PAD}{\ButtonNext}
         \end{sideways}
         &
         % Key "7"
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index db27938255..1cfb735a46 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -10,15 +10,14 @@ The more blocks you remove per turn, the more points you get.
     \nopt{touchscreen}{
     \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
       ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-      ,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD,SANSA_FUZE_PAD}
+      ,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft/\ButtonRight/}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
       ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD%
-      ,SANSA_FUZE_PAD}
+      ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
       {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext{} / \ButtonUp{} / \ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor around the blocks \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 6b9dc80d72..1ccc3f0e79 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -9,10 +9,9 @@ This is a fully featured analogue and digital clock plugin.
 \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}
+        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft{} / \ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Cycle through modes \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
@@ -27,12 +26,11 @@ This is a fully featured analogue and digital clock plugin.
     \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}
+    \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{PBELL_VIBE500_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Main Menu \\
     \opt{RECORDER_PAD}{\ButtonPlay}
diff --git a/manual/plugins/codebuster.tex b/manual/plugins/codebuster.tex
index daead01dda..635c668c69 100644
--- a/manual/plugins/codebuster.tex
+++ b/manual/plugins/codebuster.tex
@@ -28,10 +28,9 @@ peg in the wrong position.
        \opt{HAVEREMOTEKEYMAP}{& }
         & 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}
+        ,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft\ / \ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Select a peg \\
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index aa674ff078..c8e6a1ff10 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -24,7 +24,8 @@ This is a rotating cube screen saver in 3D.
     \opt{COWON_D2_PAD}{\TouchCenter}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Pause\\
-    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+        {\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
@@ -36,11 +37,10 @@ This is a rotating cube screen saver in 3D.
         & Cycle draw mode\\
     \opt{ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,RECORDER_PAD%
         ,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
-        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}
+        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
         {\ButtonRight{} / \ButtonLeft}
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight{} / \ButtonOn+\ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Select axis to adjust\\
     \opt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index f66ba18877..9ff2565595 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -7,10 +7,10 @@ Demystify is a screen saver like demo.\\
     \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}
+        ,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{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index ae89e34075..d96c89de49 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -100,17 +100,15 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD}{\ButtonLeft}
+      ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
   \opt{COWON_D2_PAD}{\TouchMidLeft}
-  \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn Left \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD}{\ButtonRight}
+      ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
   \opt{COWON_D2_PAD}{\TouchMidRight}
-  \opt{PBELL_VIBE500_PAD}{\ButtonNext}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn Right \\
 %
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 5808dcca89..b12918cb29 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -17,19 +17,17 @@ Fire is a demo displaying a fire effect.
     \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}{\ButtonLeft}
+        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
        \opt{HAVEREMOTEKEYMAP}{& }
     & 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}
+        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
         {\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{COWON_D2_PAD}{\TouchMidRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle moving flames\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index bff6692e63..cc7ab31168 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -10,13 +10,12 @@ a screen containing tokens of only one colour.
 \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_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-    ,MROBE100_PAD}
+    ,MROBE100_PAD,PBELL_VIBE500_PAD}
     {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
        \opt{HAVEREMOTEKEYMAP}{& }
 \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle{} / \TouchMidLeft{} / \TouchMidRight}
-\opt{PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown{} / \ButtonPrev{} / \ButtonNext}
     & Move the cursor \\
 \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
diff --git a/manual/plugins/fractals.tex b/manual/plugins/fractals.tex
index 0cce90a861..cb7f599dbc 100644
--- a/manual/plugins/fractals.tex
+++ b/manual/plugins/fractals.tex
@@ -8,13 +8,12 @@ This demonstration draws fractal images from the Mandelbrot set%
     \opt{HAVEREMOTEKEYMAP}{&}
     & Move about the image\\
     %
-    \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
     \opt{SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{COWON_D2_PAD}{\TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Zoom in\\
     %
diff --git a/manual/plugins/frotz.tex b/manual/plugins/frotz.tex
index ac35c2d603..da817d0624 100644
--- a/manual/plugins/frotz.tex
+++ b/manual/plugins/frotz.tex
@@ -57,14 +57,13 @@ classic commercial Infocom games:
        \opt{HAVEREMOTEKEYMAP}{& }
         & Press enter\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \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{PBELL_VIBE500_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& 
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
             }
diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 598c203115..ccab590470 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -77,8 +77,7 @@ these markers:
         Move cursor down
         \\
             
-        \nopt{COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
-        \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
+        \nopt{COWON_D2_PAD}{\ButtonLeft}
         \opt{COWON_D2_PAD}{\TouchMidLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
@@ -88,8 +87,7 @@ these markers:
             node in the game tree if in \emph{tree} navigation mode}
         \\
              
-        \nopt{COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
-        \opt{PBELL_VIBE500_PAD}{\ButtonNext}
+        \nopt{COWON_D2_PAD}{\ButtonRight}
         \opt{COWON_D2_PAD}{\TouchMidRight}
             &
         \opt{HAVEREMOTEKEYMAP}{
@@ -129,7 +127,7 @@ these markers:
             \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
             \opt{RECORDER_PAD}{\ButtonFOne}
             \opt{COWON_D2_PAD}{\TouchBottomLeft}
-            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonPrev}
+            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
@@ -145,7 +143,7 @@ these markers:
             \opt{IAUDIO_X5_PAD}{\ButtonRec}%
             \opt{RECORDER_PAD}{\ButtonFThree}
             \opt{COWON_D2_PAD}{\TouchBottomRight}
-            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonNext}
+            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 &}
@@ -157,12 +155,11 @@ these markers:
             ,SANSA_C200_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD}{\ButtonPower}%
         \opt{MROBE100_PAD}{\ButtonDisplay}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{Long \ButtonSelect}%
-        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}%
+        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}%
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}%
         \opt{RECORDER_PAD}{\ButtonFTwo}%
         \opt{ONDIO_PAD}{Long \ButtonMenu}
         \opt{COWON_D2_PAD}{\TouchTopLeft}
-        \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
diff --git a/manual/plugins/invadrox.tex b/manual/plugins/invadrox.tex
index 908805b0dc..bfa703a94c 100644
--- a/manual/plugins/invadrox.tex
+++ b/manual/plugins/invadrox.tex
@@ -9,19 +9,17 @@ increase speed, drop down and reverse direction after every pass!
   \begin{btnmap}{}{}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
           ,IPOD_1G2G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD%
-          ,SANSA_FUZE_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD}
+          ,SANSA_FUZE_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
           {\ButtonLeft}
       \opt{COWON_D2_PAD}{\TouchMidLeft{}, \TouchBottomLeft{} or \ButtonMinus}
-      \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move left \\
     %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
           ,IPOD_1G2G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD%
-          ,SANSA_FUZE_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD}
+          ,SANSA_FUZE_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
           {\ButtonRight}
       \opt{COWON_D2_PAD}{\TouchMidRight{}, \TouchBottomRight{} or \ButtonPlus}
-      \opt{PBELL_VIBE500_PAD}{\ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move right \\
     %
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index b21e86e576..bb66e5f3db 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -16,17 +16,16 @@ In puzzle mode the aim of the game is to connect the puzzles, by skilful swappin
   \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
+        ,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}
     {\ButtonLeft/\ButtonRight/}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
       ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD%
-      ,GIGABEAT_S_PAD}
+      ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}
       {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     \opt{COWON_D2_PAD}{\TouchMidLeft/\TouchMidRight/\TouchTopMiddle/\TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{}/\ButtonNext{}/\ButtonUp{}/\ButtonDown}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor around the jewels \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 6c9b2b0300..57d50f9c81 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -16,16 +16,15 @@ view a bigger file you may need to stop playback.}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-      ,MROBE100_PAD}
+      ,MROBE100_PAD,PBELL_VIBE500_PAD}
       {\ButtonUp\ / \ButtonDown}%
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-      ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}
+      ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
       {/ \ButtonLeft\ / \ButtonRight}
     \opt{COWON_D2_PAD}{}
-    \opt{PBELL_VIBE500_PAD}{\ButtonUp\ / \ButtonDown\ / \ButtonPrev\ / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move around in zoomed in image\\
     \opt{RECORDER_PAD}{\ButtonPlay}
@@ -61,7 +60,7 @@ view a bigger file you may need to stop playback.}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonNext}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonRight}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Next jpeg in directory\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -75,7 +74,7 @@ view a bigger file you may need to stop playback.}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonPrev}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonLeft}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Previous jpeg in directory\\
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads
diff --git a/manual/plugins/lamp.tex b/manual/plugins/lamp.tex
index 6c3c7e9717..7fd875671e 100644
--- a/manual/plugins/lamp.tex
+++ b/manual/plugins/lamp.tex
@@ -7,10 +7,9 @@ You get an empty screen with maximum brightness.
     \opt{lcd_color}{
     \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
+        ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft/\ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Toggle between colours\\
     }
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 0ba0a32b1f..73adf3976c 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -6,10 +6,9 @@ Demo showing the Rockbox logo bouncing around the screen.
     \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,IRIVER_H10_PAD}
+        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
         {\ButtonRight\ / \ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight{}\ /\ \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{}\ /\ \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed on the x-axis\\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight\ / \ButtonOn+\ButtonLeft}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index 628eb5f38e..f40d179ffd 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -23,9 +23,8 @@ Luckily, there are checkpoints at levels four and eight.
     \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}
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft{}, \ButtonRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{}, \ButtonNext}
     \opt{COWON_D2_PAD}{\TouchMidLeft/\TouchMidRight/\TouchTopMiddle/\TouchBottomMiddle}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Move Character\\
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 237462a581..440c25bdd7 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -36,10 +36,9 @@ on the appropriate button.
         & 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}
+        ,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}
         {\ButtonLeft{} / \ButtonRight}
     \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Adjust tempo \\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 4a55beee3d..f103ca6bd6 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -27,20 +27,19 @@ might experience ``Buffer miss!'' with many files, except simple ones.}
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,IAUDIO_X5_PAD,MROBE100_PAD,IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD%
-        ,SANSA_FUZE_PAD,IRIVER_H10_PAD,SANSA_C200_PAD}
+        ,SANSA_FUZE_PAD,IRIVER_H10_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
         {\ButtonRight/ \ButtonLeft}
     \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-    \opt{PBELL_VIBE500_PAD}{\ButtonNext/ \ButtonPrev}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Skip 3 seconds forward/ backward\\
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
+        {\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     \opt{COWON_D2_PAD}{\TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Pause/Resume playback\\
     %
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index dfccafa0e5..988edebffe 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -15,14 +15,12 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-      ,MROBE100_PAD}
+      ,MROBE100_PAD,PBELL_VIBE500_PAD}
       {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
   \opt{IRIVER_H10_PAD}
       {\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
   \opt{COWON_D2_PAD}
       {\TouchTopMiddle{} / \TouchBottomMiddle{} / \TouchMidLeft{} / \TouchMidRight}
-  \opt{PBELL_VIBE500_PAD}
-      {\ButtonUp{} / \ButtonDown{} / \ButtonPrev{} / \ButtonNext}
        \opt{HAVEREMOTEKEYMAP}{& }
   & Move the cursor across the minefield \\
   %
@@ -34,14 +32,13 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{ONDIO_PAD}{\ButtonMenu}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} / \ButtonRec}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
+  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
   \opt{SANSA_E200_PAD}{\ButtonRec}
   \opt{SANSA_FUZE_PAD}{\ButtonScrollFwd}
   \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolDown}
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
   \opt{COWON_D2_PAD}{\TouchCenter}
-  \opt{PBELL_VIBE500_PAD}{\ButtonPlay}
        \opt{HAVEREMOTEKEYMAP}{& }
   & Toggle flag on / off \\
   %
@@ -65,9 +62,8 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{SANSA_E200_PAD}{Long \ButtonRec}
   \opt{SANSA_FUZE_PAD}{\ButtonScrollBack}
   \opt{IRIVER_H10_PAD}{\ButtonRew+\ButtonPlay}
-  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
+  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
   \opt{COWON_D2_PAD}{\TouchBottomRight}
-  \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& }
   & Display the current game status \\
   %
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index bd1d2b5f91..0acb5ad253 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -408,7 +408,7 @@ detail in the following paragraph.
   \opt{vibe500}{
   Hold or lay the \dap{} so that the side with the controls and
   LCD is facing towards you. Below the LCD is the touch sensitive pad with the \ButtonMenu{}, 
-  \ButtonPlay{}, \ButtonPrev{}, \ButtonNext{} controls and the scroll pad in the centre. The 
+  \ButtonPlay{}, \ButtonLeft{}, \ButtonRight{} controls and the scroll pad in the centre. The 
   scroll pad is oriented vertically and it is between the \ButtonOK{} and \ButtonCancel{} buttons.
   Sliding the finger between these buttons down or up acts as \ButtonDown{} or \ButtonUp{}
   action respectively. Note that the scroll pad is sensitive, so you will need to move