6 files changed, 53 insertions, 21 deletions

diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index b78a155b82..6d32e44963 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -168,7 +168,8 @@
         \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}.
+        {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}
+        \opt{vibe500}{Long \ButtonPrev/\ButtonNext}.
         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/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index d9e8e78426..da6f6efa9b 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -43,7 +43,7 @@ you to configure settings related to audio playback.
         Setting the End Point (B) is done accordingly using
         \ActionWpsAbSetBNextDir{}.  To reset the markers press \ActionWpsAbReset{}.
     }%
-    \opt{ipod,IAUDIO_X5_PAD,ONDIO_PAD,PLAYER_PAD}{%
+    \opt{ipod,IAUDIO_X5_PAD,ONDIO_PAD,PLAYER_PAD,PBELL_VIBE500_PAD}{%
         To set the Start Point (A) press \ActionWpsBrowse{}. The following
         press of \ActionWpsBrowse{} will set the End Point (B), and a third
         successive \ActionWpsBrowse{} will reset the markers.
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index aa469aca03..14a53e9b4a 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -46,7 +46,7 @@
     Choose the recording frequency (sample rate).
     \opt{masf}{48~kHz, 44.1~kHz, 32~kHz, 24~kHz, 22.05~kHz, 16~kHz}
     \opt{h100,h300}{44.1~kHz, 22.05~kHz and 11.025~kHz}
-    \opt{x5}{88.2~kHz, 44.1~kHz, 22.05~kHz and 11.025~kHz}
+    \opt{x5,vibe500}{88.2~kHz, 44.1~kHz, 22.05~kHz and 11.025~kHz}
     \opt{sansaAMS}{96~kHz, 88.2~kHz, 64~kHz, 48~kHz, 44.1~kHz, 32~kHz, 24~kHz, %
         22.05~kHz, 16~kHz, 12~kHz, 11.025~kHz and 8~kHz}
     \opt{gigabeats}{48~kHz, 44.1~kHz, 32~kHz, 24~kHz, 22.05~kHz, 16~kHz, 12~kHz, %
@@ -75,8 +75,8 @@
   Choose the source of the recording. The options are: 
   \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
   \nopt{ipodnano,ipodvideo}{\setting{Mic}\nopt{radio}
-    {\nopt{recorder,m5,ipod4g,ipodcolor}{,} and }}%
-  \nopt{sansa,sansaAMS}{\nopt{ipodnano,ipodvideo,recorder,m5,ipod4g,ipodcolor}%
+    {\nopt{recorder,m5,ipod4g,ipodcolor,vibe500}{,} and }}%
+  \nopt{sansa,sansaAMS}{\nopt{ipodnano,ipodvideo,recorder,m5,ipod4g,ipodcolor,vibe500}%
     {, }\setting{Line In}}%
   \nopt{radio}{.}
   \opt{radio}{and {\setting{FM Radio}}. For more information on recording from the radio
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 467a90c582..21d65b35d8 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -11,7 +11,7 @@ change to customise your listening experience.
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
   \opt{player,recorder,recorderv2fm,ondio,x5,m5,ipodnano,ipodnano2g,ipodvideo,
-       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf}{
+       ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS,gigabeats,gigabeatf,vibe500}{
   Values higher than 0~dB are available and can be used to raise the
   volume more than would otherwise be possible. These volume levels will
   ordinarily lead to distorted sound, but might work nicely for music that has
@@ -26,7 +26,7 @@ change to customise your listening experience.
   \opt{ipodnano2g,ipodcolor,ipod1g2g,h10,h10_5gb,sansa,sansaAMS}{minimum of 
   -74~dB to a maximum of +6~dB.}%
   \opt{gigabeats}{minimum of -90~dB to a maximum of +6~dB.}%
-  \opt{gigabeatf}{minimum of -74~dB to a maximum of +6~dB.}%
+  \opt{gigabeatf,vibe500}{minimum of -74~dB to a maximum of +6~dB.}%
   \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out 
   and the recording gain.}
   
@@ -40,7 +40,7 @@ change to customise your listening experience.
   \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 24~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6~dB and the maximum is 9~dB.}%
   \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24~dB and the maximum is 24~dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb,vibe500}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Bass Cutoff}
@@ -60,7 +60,7 @@ change to customise your listening experience.
   \opt{h100,h300}{The minimum setting is 0~dB and the maximum is 6~dB.}%
   \opt{ipodnano,ipodnano2g,ipodcolor}{The minimum setting is -6~dB and the maximum is 9~dB.}%
   \opt{ipodvideo}{The minimum setting is -12~dB and the maximum is 12~dB.}%
-  \opt{x5,sansa,sansaAMS,h10,h10_5gb}{The minimum setting is -24~dB and the maximum is 24~dB.}
+  \opt{x5,sansa,sansaAMS,h10,h10_5gb,vibe500}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
 \opt{ipodvideo}{
 \section{Treble Cutoff}
@@ -326,7 +326,7 @@ change to customise your listening experience.
   \begin{table}
     \begin{btnmap}{}{}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollFwd}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{\ButtonUp}
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
       \opt{COWON_D2_PAD}{\TouchMidRight}
@@ -336,7 +336,7 @@ change to customise your listening experience.
       & Raises the highlighted parameter.\\
       %
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollBack}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{\ButtonDown}
       \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
       \opt{touchscreen}{\TouchMidLeft}
@@ -349,6 +349,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_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. \\
@@ -357,12 +358,14 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_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. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
       \opt{IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD}{\ButtonSelect}
+      \opt{PBELL_VIBE500_PAD}{\ButtonOK}
       \opt{touchscreen}{\ButtonMenu{} or \TouchCenter}
     \opt{HAVEREMOTEKEYMAP}{&       
       \opt{IRIVER_RC_H100_PAD}{\ButtonRCSelect}
@@ -376,6 +379,7 @@ change to customise your listening experience.
       \opt{IAUDIO_X5_PAD}{\ButtonPower/\ButtonRec}
       \opt{SANSA_E200_PAD}{\ButtonPower/\ButtonRight}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonPower}
+      \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
       \opt{touchscreen}{\ButtonPower{} or \TouchTopLeft}
     \opt{HAVEREMOTEKEYMAP}{& 
       \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 18209a87a2..0cfe22c4f8 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -17,7 +17,7 @@
       capacity (in mAh) the battery being used has. The default is
       \opt{player,recorder}{1500mAh}%
       \opt{recorderv2fm}{2200mAh}%
-      \opt{ondiosp,ondiofm}{1000mAh}%
+      \opt{ondiosp,ondiofm,vibe500}{1000mAh}%
       \opt{h100,h300}{1300mAh}%
       \opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
       \opt{ipodcolor}{700mAh}%
@@ -205,17 +205,20 @@ therefore result in better runtime.
     keypad mode.  There are different modes which provide different
     functionality.
     \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}{%
+        ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD%
+        ,PBELL_VIBE500_PAD}{%
     Switching modes back and forth is done by pressing the
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}%
         \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}
     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}
     keys, respectively.%
     }%
     \opt{HAVEREMOTEKEYMAP}{
@@ -240,7 +243,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
                     {\ButtonVolUp / \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown}
-                \opt{MROBE100_PAD}{\ButtonUp / \ButtonDown}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -254,6 +257,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{\ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack}
                 \opt{IRIVER_H10_PAD}{\ButtonFF}
+                \opt{IRIVER_VIBE500_PAD}{\ButtonMenu}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF}%
@@ -265,7 +269,7 @@ therefore result in better runtime.
                 % Playback play / pause
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
                 \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}{\ButtonPlay}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -282,6 +286,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{\ButtonRew; Long \ButtonPlay}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonMenu; Long \ButtonPlay}
+                \opt{PBELL_VIBE500_PAD}{\ButtonCancel; Long \ButtonPlay}
                 \opt{MROBE100_PAD}{\ButtonDisplay; Long {\ButtonPlay}}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -296,6 +301,7 @@ therefore result in better runtime.
                     IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
                     ,MROBE100_PAD}
                     {\ButtonLeft}
+                \opt{PBELL_VIBE500_PAD}{\ButtonPrev}
                 \opt{GIGABEAT_RC_PAD}{\ButtonPrev; \ButtonLeft}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -309,6 +315,7 @@ therefore result in better runtime.
                     ,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
                     ,MROBE100_PAD}
                     {\ButtonRight}
+                \opt{PBELL_VIBE500_PAD}{\ButtonNext}
                 \opt{GIGABEAT_RC_PAD}{\ButtonNext; \ButtonRight}%
                     &
                 \opt{HAVEREMOTEKEYMAP}{
@@ -331,7 +338,7 @@ therefore result in better runtime.
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
                 \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
-                    ,MROBE100_PAD}{\ButtonPlay}
+                    ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}{\ButtonRCPlay}%
@@ -343,7 +350,7 @@ therefore result in better runtime.
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonPlay; Long \ButtonUp}
                 \opt{SANSA_CLIP_PAD}{\ButtonHome}
-                \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
+                \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{Long \ButtonPlay}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{Long \ButtonPlay}
                 \opt{MROBE100_PAD}{\ButtonDisplay; Long \ButtonPlay}
                     &
@@ -358,6 +365,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_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}%
@@ -370,6 +378,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_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}%
@@ -382,6 +391,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_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}%
@@ -394,6 +404,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_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}%
@@ -407,6 +418,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{\ButtonLeft}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {\ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCDisplay}%
@@ -420,6 +432,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{Long \ButtonLeft}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {Long \ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCDisplay}%
@@ -433,7 +446,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
                     {\ButtonVolUp / \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown}
-                \opt{MROBE100_PAD}{\ButtonUp / \ButtonDown}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -448,6 +461,7 @@ therefore result in better runtime.
                     {\ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack}
                 \opt{IRIVER_H10_PAD}{\ButtonRight}
+                \opt{PBELL_VIBE500_PAD}{\ButtonOK}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF}%
@@ -461,6 +475,7 @@ therefore result in better runtime.
                     ,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{Long \ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{Long \ButtonSelect; Long \ButtonBack}
                 \opt{IRIVER_H10_PAD}{Long \ButtonRight}
+                \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCRew}%
@@ -485,7 +500,7 @@ therefore result in better runtime.
                 \opt{GIGABEAT_S_PAD}
                     {\ButtonPrev; \ButtonVolUp / \ButtonNext; \ButtonVolDown}
                 \opt{IRIVER_H10_PAD}{\ButtonScrollUp / \ButtonScrollDown}
-                \opt{MROBE100_PAD}{\ButtonUp / \ButtonDown}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp / \ButtonDown}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -501,6 +516,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{\ButtonRew / \ButtonFF}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {\ButtonPlay / \ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{\ButtonOK / \ButtonCancel}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCPlay / \ButtonRCDisplay}%
@@ -515,6 +531,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{Long \ButtonRew / Long \ButtonFF}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
                     {Long \ButtonPlay / Long \ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{\ButtonPlay / \ButtonMenu}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF / Long \ButtonRCRew}%
@@ -536,6 +553,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{Long \ButtonRew+\ButtonFF}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonPlay+\ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{Long \ButtonPlay}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCFF+\ButtonRCRew}%
@@ -549,6 +567,7 @@ therefore result in better runtime.
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
                     ,IPOD_1G2G_PAD,MROBE100_PAD}
                     {\ButtonLeft / \ButtonRight}
+                \opt{PBELL_VIBE500_PAD}{\ButtonPrev / \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD,MROBE100_RC_PAD}
@@ -565,6 +584,7 @@ therefore result in better runtime.
                 \opt{MROBE100_PAD}{Long \ButtonDisplay}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonSelect+\ButtonMenu}
+                \opt{PBELL_VIBE500_PAD}{Long \ButtonCancel}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{Long \ButtonRCPlay}%
@@ -577,6 +597,7 @@ therefore result in better runtime.
                     ,SANSA_CLIP_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
                     ,IPOD_1G2G_PAD,MROBE100_PAD}
                     {Long \ButtonLeft / Long \ButtonRight}
+                \opt{PBELL_VIBE500_PAD}{Long \ButtonPrev / Long \ButtonNext}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{Long \ButtonRCRew / Long \ButtonRCFF}%
@@ -591,6 +612,7 @@ therefore result in better runtime.
                 \opt{IRIVER_H10_PAD}{\ButtonPlay}
                 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {Long \ButtonSelect+\ButtonPlay}
+                \opt{PBELL_VIBE500_PAD}{Long \ButtonRec}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{GIGABEAT_RC_PAD}{\ButtonRCPlay}%
@@ -615,6 +637,8 @@ therefore result in better runtime.
                     \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 / 
@@ -629,7 +653,7 @@ therefore result in better runtime.
                     {\ButtonSelect}
                 \opt{GIGABEAT_S_PAD}{\ButtonSelect; \ButtonBack}
                 \opt{IRIVER_H10_PAD}{\ButtonPlay}
-                \opt{MROBE100_PAD}{\ButtonMenu}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
                     &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCHeart}%
@@ -642,7 +666,7 @@ therefore result in better runtime.
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
                 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
                 \opt{SANSA_CLIP_PAD}{\ButtonHome}
-                \opt{MROBE100_PAD}{\ButtonPlay}
+                \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
                 &
                 \opt{HAVEREMOTEKEYMAP}{
                     &}
@@ -658,6 +682,8 @@ therefore result in better runtime.
                     {\ButtonVolUp; \ButtonPrev / \ButtonVolDown; \ButtonNext}
                 \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,MROBE100_PAD}
                     {\ButtonVolUp / \ButtonVolDown}
+                \opt{PBELL_VIBE500_PAD}
+                    {\ButtonOK / \ButtonCancel}
                 &
                 \opt{HAVEREMOTEKEYMAP}{
                     \opt{MROBE100_RC_PAD}{\ButtonRCVolUp / \ButtonRCVolDown}%
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index fde223453e..35cf716828 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -40,6 +40,7 @@ customize the visual apperance of Rockbox.
   \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
   \opt{mrobe100}{\url{http://themes.rockbox.org/index.php?target=mrobe100}}%
+  \opt{vibe500}{\url{http://themes.rockbox.org/index.php?target=vibe500}}%
   .
 
   \note{Themes do not have to be purely visual. It is quite possible to create