diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 704b387b3e..ea3c719b3a 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -332,31 +332,37 @@ change to customise your listening experience.
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{& \ButtonRCFF}
+    \opt{HAVEREMOTEKEYMAP}{& 
+      \opt{IRIVER_RC_H100_PAD}{\ButtonRCFF}
+        }
       & 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{SANSA_E200_PAD}{\ButtonScrollFwd}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{& \ButtonRCRew}
+    \opt{HAVEREMOTEKEYMAP}{& 
+      \opt{IRIVER_RC_H100_PAD}{\ButtonRCRew}
+        }
       & 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{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
-      \opt{IRIVER_RC_H100_PAD}{& }
+    \opt{HAVEREMOTEKEYMAP}{& }
       & 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{SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
-      \opt{IRIVER_RC_H100_PAD}{& }
+    \opt{HAVEREMOTEKEYMAP}{& }
       & 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{IRIVER_RC_H100_PAD}{& \ButtonRCSelect}
+    \opt{HAVEREMOTEKEYMAP}{&       
+      \opt{IRIVER_RC_H100_PAD}{\ButtonRCSelect}
+        }
       & Toggles the cursor among the three parameters (gain, center frequency,
       Q) for the selected EQ band.\\
       %
@@ -365,7 +371,9 @@ 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{IRIVER_RC_H100_PAD}{& \ButtonRCStop}
+    \opt{HAVEREMOTEKEYMAP}{& 
+      \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
+        }
       & Exits the graphic EQ screen.\\
     \end{btnmap}
   \end{table}
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index d391756ff2..17574f36ad 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -20,7 +20,7 @@ visit\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Start new game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
@@ -29,7 +29,7 @@ visit\\
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Resume saved game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
@@ -37,13 +37,13 @@ visit\\
     \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonLeft}
     \opt{SANSA_C200_PAD}{\ButtonRec}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Show high scores\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \ButtonLeft{} / \ButtonRight{} /\\
@@ -52,7 +52,7 @@ visit\\
       {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Enter betting amount\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -61,7 +61,7 @@ visit\\
     \opt{ONDIO_PAD}{\ButtonLeft}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MR100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Hit (Draw new card)\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
@@ -69,7 +69,7 @@ visit\\
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Stay (End hand)\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
@@ -78,7 +78,7 @@ visit\\
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{MR100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Double down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
@@ -87,13 +87,13 @@ visit\\
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Return to menu or cancel\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 960c7382fa..ef830221a4 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -12,10 +12,10 @@ scrolling from right to left.
     {\ButtonUp\ /\ \ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
 & Moves to next/previous option\\
 \ButtonLeft\ /\ \ButtonRight
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
 & Increases/decreases option value\\
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
@@ -25,13 +25,13 @@ scrolling from right to left.
 \opt{GIGABEAT_PAD}{\ButtonA}
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
 \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
 & Toggles Scroll mode\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
 \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
 & Exits bounce demo\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index a3b39907d8..5729e08e18 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -29,7 +29,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
         \ButtonVolDown\ / \ButtonVolUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\\
         \ButtonScrollBack\ / \ButtonScrollFwd}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp}
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonUp}
@@ -37,13 +37,13 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
       ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect\ / \ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay\ / \ButtonScrollUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Release the ball / Fire\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Open menu / Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index c9102433ac..85a1a41615 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -16,20 +16,20 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Pause game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Aim the bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Fire bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
@@ -38,14 +38,14 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Exit to menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 2119db68f1..bc8148f7b4 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -15,7 +15,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
     \opt{SANSA_E200_PAD}{/}
     \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move around the keypad\\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
@@ -24,7 +24,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Select a button\\
     %
     \nopt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
@@ -35,14 +35,14 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
         \opt{GIGABEAT_PAD}{\ButtonA}
         \opt{GIGABEAT_S_PAD}{\ButtonPlay}
         \opt{MROBE100_PAD}{\ButtonDisplay}
-           \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Delete last entered digit or clear after calculation\\
         %
     }
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
         \opt{RECORDER_PAD}{\ButtonFTwo}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-          \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Cycle through the 4 basic operators\\
         %
     }
@@ -53,7 +53,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
         {\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Calculate\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -61,7 +61,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index 6a93192f93..962d3df964 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -12,14 +12,14 @@ yearly, monthly, and weekly memos.
         ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the selector\\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Show memos for the selected day\\
     %
     \opt{RECORDER_PAD}{\ButtonOn{} + \ButtonUp{} / \ButtonDown}
@@ -31,14 +31,14 @@ yearly, monthly, and weekly memos.
     \opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev}
     \opt{SANSA_E200_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF{} / \ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Previous / Next month\\
     %
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 627b3b9717..06f68e0553 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -12,7 +12,7 @@ used in any kind of game with up to ten players.
     \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Increase / decrease displayed Value\\
     %
     \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
@@ -20,7 +20,7 @@ used in any kind of game with up to ten players.
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Move to next screen\\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -29,7 +29,7 @@ used in any kind of game with up to ten players.
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Move to previous screen\\
   \end{btnmap}
 \end{table}
@@ -59,7 +59,7 @@ Keys are as follows:
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Exit plugin \\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -71,7 +71,7 @@ Keys are as follows:
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Restart round for the current player \\
     %
     \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
@@ -79,21 +79,21 @@ Keys are as follows:
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Pause the time (press again to continue) \\
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Switch to next player \\
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Switch to previous player \\
     %
     \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
@@ -103,7 +103,7 @@ Keys are as follows:
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Open menu %
         \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}%
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}%
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index a3c26aa939..ab7593c893 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -32,7 +32,7 @@ the game.
     \begin{btnmap}{}{}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{Direction keys}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -40,7 +40,7 @@ the game.
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Pick up / Drop piece\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
@@ -50,7 +50,7 @@ the game.
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Change level\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
@@ -60,13 +60,13 @@ the game.
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Force play\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Show the menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chopper.tex b/manual/plugins/chopper.tex
index 2a1b6cf399..ca950472e4 100644
--- a/manual/plugins/chopper.tex
+++ b/manual/plugins/chopper.tex
@@ -13,14 +13,14 @@
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD,GIGABEAT_PAD}{\ButtonSelect}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect{} / \ButtonUp}
       \opt{GIGABEAT_S_PAD}{\ButtonSelect{} / \ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Make chopper fly\\
 
       \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonMenu}
       \opt{GIGABEAT_S_PAD}{\ButtonBack}%
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Enter menu\\
     \end{btnmap}
 \end{table}
\ No newline at end of file
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index 33b535a9b7..9497877b31 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -13,17 +13,21 @@ The more blocks you remove per turn, the more points you get.
       {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor around the blocks \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{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}
       {\ButtonSelect}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Remove a block \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-      {\ButtonOff & Exit \\}%
+      {\ButtonOff}
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
-      ,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}%
-    \opt{GIGABEAT_S_PAD}{\ButtonBack & Exit \\}%
+      ,IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{GIGABEAT_S_PAD}{\ButtonBack}
+       \opt{HAVEREMOTEKEYMAP}{& }
+     & Exit \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 6f089c4b4b..8ce26b860a 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -8,6 +8,7 @@ This is a fully featured analogue and digital clock plugin.
 \begin{table}
 \begin{btnmap}{}{}
     \ButtonLeft{} / \ButtonRight
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Cycle through modes \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
@@ -15,6 +16,7 @@ This is a fully featured analogue and digital clock plugin.
       {\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Cycle through skins \\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
@@ -23,23 +25,27 @@ This is a fully featured analogue and digital clock plugin.
       {\ButtonMenu}
     \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Main Menu \\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
       ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Start / Stop Counter \\
     Long
     \opt{RECORDER_PAD_PAD}{\ButtonPlay}%
     \opt{IRIVER_H10_PAD}{\ButtonRew}%
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
       ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Reset Counter \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index f05c1ada49..748b48f64a 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -11,14 +11,14 @@ This is a rotating cube screen saver in 3D.
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Display at maximum frame rate\\
     \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
         ,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Pause\\
     \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -27,11 +27,11 @@ This is a rotating cube screen saver in 3D.
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Cycle draw mode\\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight{} / \ButtonOn+\ButtonLeft}
     \nopt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Select axis to adjust\\
     \opt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -39,7 +39,7 @@ This is a rotating cube screen saver in 3D.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown{} / \ButtonVolUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Change speed/angle (speed can not be changed while paused)\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -47,7 +47,7 @@ This is a rotating cube screen saver in 3D.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index b7587c5c3d..b58d8aac40 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -9,7 +9,7 @@ Demystify is a screen saver like demo.\\
     \opt{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}
         {\ButtonRight\ / \ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
@@ -17,13 +17,13 @@ Demystify is a screen saver like demo.\\
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp\ / \ButtonDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index ad6e56911d..217b2f6ec2 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -11,7 +11,7 @@ numbers as well as the total of the rolled dice.
     \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Roll dice again\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -19,7 +19,7 @@ numbers as well as the total of the rolled dice.
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
         ,IRIVER_H10_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 31c044a999..2bddc99a1d 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -81,23 +81,23 @@ Rockdoom options, you will need to quit your current game and restart the plugin
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
   \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Forward \\
 %
   \nopt{IPOD_3G_PAD,IPOD_4G_PAD}{
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-        \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Down\\
   }
 %
   \ButtonLeft
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn Left \\
 %
   \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn Right \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
@@ -106,7 +106,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Shoot \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -114,20 +114,20 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
   \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
   \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Open \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
       ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & InGame Menu \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD%
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Enter \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -137,7 +137,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
   \opt{SANSA_C200_PAD}{\ButtonVolUp}
   \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Change Weapon \\
 %
 \end{btnmap}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 6e42ebf391..e2c91d5cd9 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -9,7 +9,7 @@ Fire is a demo displaying a fire effect.
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease number of flames\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -17,20 +17,20 @@ Fire is a demo displaying a fire effect.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \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_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle moving flames\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 251be268ce..9191cb6a5e 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -13,7 +13,7 @@ a screen containing tokens of only one colour.
     {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor \\
 \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
@@ -21,7 +21,7 @@ a screen containing tokens of only one colour.
     ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Flip \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft}
 \opt{RECORDER_PAD}{\ButtonFOne}
@@ -31,7 +31,7 @@ a screen containing tokens of only one colour.
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonLeft}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Shuffle \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
 \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -42,7 +42,7 @@ a screen containing tokens of only one colour.
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonRight}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
 \opt{MROBE100_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Solve \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
 \opt{RECORDER_PAD}{\ButtonFThree}
@@ -54,14 +54,14 @@ a screen containing tokens of only one colour.
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec+\ButtonSelect}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
 \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Solve step by step \\
 \opt{PLAYER_PAD}{\ButtonStop}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}{\ButtonPower}
 \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 55133f115d..dc68f1f55a 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -60,20 +60,20 @@ these markers: \\
          IAUDIO_X5_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonUp}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-          \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move cursor up \\
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,SANSA_C200_PAD,%
          GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,%
          IAUDIO_X5_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonDown}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-           \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move cursor down \\
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,IPOD_1G2G_PAD,%
          IPOD_3G_PAD,IPOD_4G_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD,%
          IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,RECORDER_PAD,%
          ONDIO_PAD}{\ButtonLeft}
-           \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move cursor left %
             \opt{ONDIO_PAD}{if in \emph{board} navigation mode, or %
                             retreat one node in the game tree if in %
@@ -82,7 +82,7 @@ these markers: \\
          IPOD_3G_PAD,IPOD_4G_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD,%
          IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,RECORDER_PAD,%
          ONDIO_PAD}{\ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move cursor right
             \opt{ONDIO_PAD}{if in \emph{board} navigation mode, or advance one node in
                             the game tree if in \emph{tree} navigation mode} \\
@@ -93,7 +93,7 @@ these markers: \\
          MROBE100_PAD,IAUDIO_X5_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD}{\ButtonSelect}%
         \opt{IRIVER_H10_PAD,RECORDER_PAD}{\ButtonPlay}%
         \opt{ONDIO_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Play a move (or use a tool if play-mode has been changed). \\
     \nopt{ONDIO_PAD}{
         \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_1G2G_PAD,IPOD_3G_PAD,%
@@ -105,7 +105,7 @@ these markers: \\
             \opt{MROBE100_PAD}{\ButtonMenu}%
             \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
             \opt{RECORDER_PAD}{\ButtonFOne}
-                \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Retreat one node in the game tree \\
         \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,%
              IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonScrollFwd}%
@@ -116,7 +116,7 @@ these markers: \\
             \opt{MROBE100_PAD}{\ButtonPlay}%
             \opt{IAUDIO_X5_PAD}{\ButtonRec}%
             \opt{RECORDER_PAD}{\ButtonFThree}
-               \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Advance one node in the game tree \\
     }
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,SANSA_C200_PAD,%
@@ -127,7 +127,7 @@ these markers: \\
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}%
         \opt{RECORDER_PAD}{\ButtonFTwo}%
         \opt{ONDIO_PAD}{Long \ButtonMenu}
-            \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Main Menu \\
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,%
          IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,%
@@ -136,7 +136,7 @@ these markers: \\
              GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,%
              IAUDIO_X5_PAD}{Long \ButtonSelect}%
             \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-                  \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Context Menu \\ }
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,MROBE100_PAD,%
          GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_CLIP_PAD}{%
@@ -148,7 +148,7 @@ these markers: \\
         \opt{GIGABEAT_PAD}{\ButtonA}%
         \opt{GIGABEAT_S_PAD}{\ButtonPlay}%
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-            \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Go to the next variation when at the first node in a branch \\ }
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/invadrox.tex b/manual/plugins/invadrox.tex
index 6e5ac052d6..cba81cda62 100644
--- a/manual/plugins/invadrox.tex
+++ b/manual/plugins/invadrox.tex
@@ -8,21 +8,21 @@ increase speed, drop down and reverse direction after every pass!
 \begin{table}
   \begin{btnmap}{}{}
     Left and Right
-      \opt{IRIVER_RC_H100_PAD}{&} 
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move left and right \\
     %
     \opt{IRIVER_H100_PAD}{\ButtonOn}
     \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IAUDIO_X5_PAD%
         ,GIGABEAT_PAD,SANSA_E200_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Fire \\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,%
         SANSA_E200_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
   \end{btnmap}
 \end{table}
\ No newline at end of file
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index e7291d5199..e7dd6f0338 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -8,10 +8,10 @@ have 20\$.  Payouts are given when three matching symbols come up.
 \begin{table}
 \begin{btnmap}{}{}
     \opt{PLAYER_PAD}{\ButtonPlay}
-          \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Play \\
     \opt{PLAYER_PAD}{\ButtonStop}
-          \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Exit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index a5600e08ed..ff56b9a558 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -21,14 +21,14 @@ In the mode puzzle the aim of the game is to connect the puzzles, by skilful swa
     \opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor around the jewels \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{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}
       {\ButtonSelect}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Select a jewel \\
     \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
       ,IAUDIO_X5_PAD}{\ButtonPower}
@@ -36,7 +36,7 @@ In the mode puzzle the aim of the game is to connect the puzzles, by skilful swa
     \opt{IPOD_3G_PAD}{\ButtonMenu}
     \opt{IPOD_4G_PAD}{\ButtonSelect+ \ButtonMenu}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
      & Menu \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index ff5b8bc37f..0f2f630623 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -20,7 +20,7 @@ greyscale library}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
         / \ButtonLeft\ / \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move around in zoomed in image\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -29,7 +29,7 @@ greyscale library}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Zoom in\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
@@ -39,7 +39,7 @@ greyscale library}.
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Zoom out\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
@@ -53,7 +53,7 @@ greyscale library}.
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonRight}
-       \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Next jpeg in directory\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -66,17 +66,18 @@ greyscale library}.
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Previous jpeg in directory\\
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads
         \ButtonRec
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Toggle slide show mode\\
     }
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Show menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/lamp.tex b/manual/plugins/lamp.tex
index a4b615a5de..af58e7ef26 100644
--- a/manual/plugins/lamp.tex
+++ b/manual/plugins/lamp.tex
@@ -5,13 +5,14 @@ You get an empty screen with maximum brightness.
 \begin{table}
     \begin{btnmap}{}{}
     \opt{lcd_color}{\ButtonLeft/\ButtonRight
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Toggle between colours\\
     }
     \opt{PLAYER_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}
     \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index ec8060c328..a9e36b0a23 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -4,7 +4,7 @@ Demo showing the Rockbox logo bouncing around the screen.
 \begin{table}
     \begin{btnmap}{}{}
     \ButtonRight\ / \ButtonLeft
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed on the x-axis\\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight\ / \ButtonOn+\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -12,14 +12,14 @@ Demo showing the Rockbox logo bouncing around the screen.
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed on the y-axis\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 5c723218a9..6fa6e860e5 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -13,7 +13,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \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}{\ButtonScrollFwd}
     \opt{SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Zoom in\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -23,7 +23,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
     \opt{SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Zoom out\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -35,7 +35,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Decrease iteration depth (less detail)\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -47,7 +47,7 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
     \opt{MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase iteration depth (more detail)\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -58,14 +58,14 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Reset and return to the default image\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index 3508732f2d..f559d0b9b9 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -21,14 +21,14 @@ Luckily, there are checkpoints at levels four and eight.
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&} 
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move Character\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index a18df09869..fd22b14b18 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -10,14 +10,14 @@ on the appropriate button.
     \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Exit plugin \\
     \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
         ,IAUDIO_X5_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu\ (Long: Stop)}
     \opt{GIGABEAT_PAD}{\ButtonA}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Start / Stop \\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu\ (repeatedly)}
@@ -25,17 +25,17 @@ on the appropriate button.
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Tap tempo \\
     \ButtonLeft\ / \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Adjust tempo \\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Adjust volume \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index eb35e8028f..95f4a197cb 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -21,11 +21,11 @@ might experience ``Buffer miss!'' with many files, except simple ones.}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/ \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/ \ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolUp/ \ButtonVolDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Volume up/ Volume down\\
     %
     \ButtonRight/ \ButtonLeft
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Skip 3 seconds forward/ backward\\
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -33,14 +33,14 @@ might experience ``Buffer miss!'' with many files, except simple ones.}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Pause/Resume playback\\
     %
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD%
         ,IRIVER_H10_PAD,MROBE100_PAD}{\ButtonPower}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Stop playback and quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index e007f34b25..7b7b2634c6 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -32,10 +32,11 @@ the location of a mine, it can be tagged to avoid accidentally
       {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
   \opt{IRIVER_H10_PAD}
       {\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Move the cursor across the minefield \\
   %
   \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Scroll through the entire minefield \\}%
   %
   \opt{RECORDER_PAD}{\ButtonFOne/\ButtonOn}
@@ -47,7 +48,7 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolDown}
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Toggle flag on / off \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonPlay}
@@ -57,7 +58,7 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
   \opt{SANSA_C200_PAD}{Long \ButtonSelect{} / \ButtonVolUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Reveal the contents of the current square \\
   %
   \opt{RECORDER_PAD}{\ButtonFThree}
@@ -68,14 +69,14 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{SANSA_E200_PAD}{Long \ButtonRec}
   \opt{IRIVER_H10_PAD}{\ButtonRew+\ButtonPlay}
   \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Display the current game status \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
   \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Exit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 45bbd54511..af3895ed09 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -13,26 +13,26 @@ option and choose \setting{mpegplayer}.
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} or \ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonSelect{} or \ButtonA}
     \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsPlay}
-      \opt{IRIVER_RC_H100_PAD}{&} 
+       \opt{HAVEREMOTEKEYMAP}{& } 
     & Pause / Resume\\
     \ActionWpsStop
-      \opt{HAVEREMOTEKEYPAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Stop\\
     \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsVolUp{} / \ActionWpsVolDown}
     \opt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ButtonLeft{} or  \ButtonVolDown{} /
-      \opt{HAVEREMOTEKEYPAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         \ButtonRight{} or \ButtonVolUp}
     & Adjust volume up / down\\
     \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsSkipPrev{} / \ActionWpsSkipNext}
     \opt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown}
-      \opt{HAVEREMOTEKEYPAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Rewind / Fast Forward\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Open the MPEG Player menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index 332af0cc8a..439bfa9118 100644
--- a/manual/plugins/nim.tex
+++ b/manual/plugins/nim.tex
@@ -8,10 +8,10 @@ last match loses.  You can take up to twice as many matches as the
 
 \begin{table}
 \begin{btnmap}{}{}
-\ButtonLeft & Decrease the number of matches \\
-\ButtonRight & Increase the number of matches \\
-\ButtonPlay & Remove the number of matches you have selected \\
-\ButtonStop & Exit the game \\
+\ButtonLeft \opt{HAVEREMOTEKEYMAP}{& } & Decrease the number of matches \\
+\ButtonRight \opt{HAVEREMOTEKEYMAP}{& } & Increase the number of matches \\
+\ButtonPlay \opt{HAVEREMOTEKEYMAP}{& } & Remove the number of matches you have selected \\
+\ButtonStop \opt{HAVEREMOTEKEYMAP}{& } & Exit the game \\
 \end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 0a524700a5..789243c236 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -20,7 +20,7 @@ being played.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle filled / curve / plot \\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
@@ -30,7 +30,7 @@ being played.
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -40,7 +40,7 @@ being played.
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{GIGABEAT_S_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggle drawing orientation \\
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
       ,GIGABEAT_S_PAD}{\ButtonPlay}
@@ -49,7 +49,7 @@ being played.
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Pause the demo \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp{} / \ButtonDown}
@@ -57,17 +57,17 @@ being played.
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonVolUp{} / \ButtonVolDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease volume\\
     \ButtonRight{} / \ButtonLeft
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
         {\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Exit demo \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index b9fcf968e9..29d524197b 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -33,25 +33,25 @@ found at \url{http://www.mame.net}.
         IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp}
     \opt{h10_5gb}{\ButtonScrollUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Move Up\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
     IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft}
     \opt{h10_5gb}{\ButtonScrollDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{h10}{\ButtonScrollUp}
     \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{h10}{\ButtonScrollDown}
     \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Move Right\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
@@ -60,26 +60,26 @@ found at \url{http://www.mame.net}.
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Insert Coin\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
         ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & 1-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{n/a}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonPower}
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & 2-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Menu\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index 689e8b02ea..93e9b4d132 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -33,7 +33,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{MROBE100_PAD}{\ButtonLeft, \ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonLeft, \ButtonRight}
 
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to move around\\
 
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -47,7 +47,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{GIGABEAT_S_PAD}{\ButtonSelect}
     \opt{MROBE100_PAD}{\ButtonSelect}
     \opt{SANSA_C200_PAD}{\ButtonSelect}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to select/save\\
 
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -61,7 +61,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_C200_PAD}{\ButtonRec}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to restart level\\
 
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -75,7 +75,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonMenu}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to go up a level\\
 
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IAUDIO_X5_PAD}{
@@ -86,7 +86,7 @@ block and crosses which allow you to choose a replacement block.
         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
         \opt{MROBE100_PAD}{\ButtonDisplay}
-            \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to go down a level\\
     }
 
@@ -101,7 +101,7 @@ block and crosses which allow you to choose a replacement block.
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_C200_PAD}{\ButtonPower}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & to quit\\
 
     \end{btnmap}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 89e2d747c6..de7a02cd34 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -27,27 +27,28 @@ aware:
         \opt{scrollwheel,IRIVER_H10_PAD}{
           \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
           \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+             \opt{HAVEREMOTEKEYMAP}{& }
           & Scroll through albums / track list\\}
 
         \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight
 
-            \opt{IRIVER_RC_H100_PAD}{&}
+               \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll through albums\\}
 
         \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown
-           \opt{IRIVER_RC_H100_PAD}{&}
+             \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll through track list\\}
 
         \opt{IRIVER_H10_PAD}{\ButtonRight}
         \opt{ONDIO_PAD}{\ButtonUp}
         \opt{RECORDER_PAD}{\ButtonOn}
         \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonSelect}
-          \opt{IRIVER_RC_H100_PAD}{&}
+             \opt{HAVEREMOTEKEYMAP}{& }
         & Enter track list \opt{swcodec}{/ Play album from selected
           track}\\
 
         \ButtonLeft
-            \opt{IRIVER_RC_H100_PAD}{&}
+               \opt{HAVEREMOTEKEYMAP}{& }
         & Exit track list\\
 
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -58,7 +59,7 @@ aware:
         \opt{IRIVER_H10_PAD,SANSA_C200_PAD}{\ButtonPower}
         \opt{RECORDER_PAD}{\ButtonFOne}
         \opt{ONDIO_PAD}{Long \ButtonMenu}
-           \opt{IRIVER_RC_H100_PAD}{&}
+            \opt{HAVEREMOTEKEYMAP}{& }
         & Enter menu\\
 
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
@@ -66,7 +67,7 @@ aware:
              MROBE100_PAD}{\ButtonPower}
         \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{Long \ButtonMenu}
-           \opt{IRIVER_RC_H100_PAD}{&}
+           \opt{HAVEREMOTEKEYMAP}{& }
         & Exit PictureFlow\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 13a2a66ed3..a6920e8e0d 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -8,13 +8,14 @@ Plasma is a demo displaying a 80's style retro plasma effect.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{\ButtonUp\ / \ButtonDown}
-      \opt{IRIVER_RC_H100_PAD}{&} 
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Adjust frequency\\
     \opt{lcd_color}{
         \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
             ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
             {\ButtonSelect}
         \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+           \opt{HAVEREMOTEKEYMAP}{& }
         & Change colours\\
     }
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -22,7 +23,7 @@ Plasma is a demo displaying a 80's style retro plasma effect.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
         {\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index a5df71958f..3832140e99 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -12,7 +12,7 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Left player up\\
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -21,7 +21,7 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonLeft}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Left player down\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp}
@@ -31,7 +31,7 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonPlay}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Right player up\\
     \opt{RECORDER_PAD,SANSA_E200_PAD}{\ButtonRight}
     \opt{ONDIO_PAD,SANSA_C200_PAD}{\ButtonDown}
@@ -40,14 +40,14 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonRight}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Right player down\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
       ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 96daac63ea..bcea117cf1 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -15,13 +15,13 @@ ends when robotfindskitten.
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Move robot\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 101c69b64b..0e892bdfd2 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -18,13 +18,13 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Restart game\\
     \ButtonLeft
-        \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Move left\\
     \ButtonRight
-        \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Move right\\
     \opt{PLAYER_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -32,7 +32,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Move down\\
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
     \opt{RECORDER_PAD}{\ButtonPlay}
@@ -44,7 +44,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Rotate left\\
     \opt{PLAYER_PAD}{\ButtonPlay}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
@@ -55,7 +55,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
     \opt{SANSA_C200_PAD}{\ButtonVolUp/\ButtonUp}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Rotate right\\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -64,11 +64,11 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Drop\\
     \opt{hold_button}{
         \ButtonHold{} switch
-            \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Pause\\
     }
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -76,7 +76,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index 371314daea..5dd652c078 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -12,14 +12,14 @@ horizontal moving anymore and no need to rotate the brick!
          ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
          {\ButtonSelect}
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Move down faster\\
 
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index fd07ff848a..c273f719fd 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -17,7 +17,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IPOD_4G_PAD}{Tap \ButtonPlay{} / \ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     / \ButtonLeft{} / \ButtonRight
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Direction keys\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -27,7 +27,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & A button\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -37,7 +37,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & B button\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -50,7 +50,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Start\\
     %
     \nopt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{
@@ -60,14 +60,14 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{SANSA_C200_PAD}{\ButtonVolUp}
         \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
-            \opt{IRIVER_RC_H100_PAD}{&}
+               \opt{HAVEREMOTEKEYMAP}{& }
         & Select\\
         %
     }
     \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{
         \opt{RECORDER_PAD}{\ButtonOn}
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
-            \opt{IRIVER_RC_H100_PAD}{&}
+              \opt{HAVEREMOTEKEYMAP}{& }
         & Cycle display scaling modes\\
     %
     }
@@ -76,7 +76,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{IPOD_4G_PAD}{\ButtonHold{} switch}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H10_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Open Rockboy menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index c9dfc5fc54..bae223ab06 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -2,144 +2,152 @@
 \subsection{Rockpaint}
 \screenshot{plugins/images/ss-rockpaint}{Rockpaint}%
 {img:Rockpaint}
-Rockpaint is a bitmap (\fname{.bmp}) editor for Rockbox. It can open any \fname{.bmp} file
-whose dimensions are the same size as your device's screen or smaller; it can
+Rockpaint is a bitmap (\fname{.bmp}) editor for Rockbox. It can open any \fname{.bmp} file
+whose dimensions are the same size as your device's screen or smaller; it can
 also create empty bitmaps for you to work with.\\
 
 \subsubsection{Opening A File}
-To open a file, you may use either the context menu option "Open With" in the
-File Browser, or you may enter Rockpaint first using the Plugins menu and open
-a file from there. To perform the latter, simply press Rockpaint's Menu button
-or move the cursor beyond the bottom of the screen; then move the cursor onto
-"Menu" and select it. Finally, select "Load" and navigate to the image you
+To open a file, you may use either the context menu option "Open With" in the
+File Browser, or you may enter Rockpaint first using the Plugins menu and open
+a file from there. To perform the latter, simply press Rockpaint's Menu button
+or move the cursor beyond the bottom of the screen; then move the cursor onto
+"Menu" and select it. Finally, select "Load" and navigate to the image you
 wish to open.\\
 
 \subsubsection{Tools}
-Rockpaint offers several tools to aid you in editing; you can view them by
-either pressing Rockpaint's "Menu" key or by attempting to move the cursor
-beyond the bottom of the screen. From top to bottom and left to right, and
-by section, they are as follows:
-\begin{description}
-    \item[Colour Picker]
-        The top left tool shows your colours that are at the ready. To
-        swap them, "click" on the background colour. To edit the foreground colour,
-        click on it.
-    \item[Preset Pallete]
-        Several preset colours are availible. Clicking on one changes
+Rockpaint offers several tools to aid you in editing; you can view them by
+either pressing Rockpaint's "Menu" key or by attempting to move the cursor
+beyond the bottom of the screen. From top to bottom and left to right, and
+by section, they are as follows:
+\begin{description}
+    \item[Colour Picker]
+        The top left tool shows your colours that are at the ready. To
+        swap them, "click" on the background colour. To edit the foreground colour,
+        click on it.
+    \item[Preset Pallete]
+        Several preset colours are availible. Clicking on one changes
         the foreground of the Colour Picker to the selected colour.
-    \item[Pencil]
-        Draws as you move the cursor. You can change the brush size with the
-        Menu option "Brush Size". Use the Select key to toggle the tool while editing
+    \item[Pencil]
+        Draws as you move the cursor. You can change the brush size with the
+        Menu option "Brush Size". Use the Select key to toggle the tool while editing
         the image.
-    \item[Selection tool]
-        Allows you to select a rectangular region; once you do, you
+    \item[Selection tool]
+        Allows you to select a rectangular region; once you do, you
         will be shown a menu of options (including "cancel" if you make a mistake).
-    \item[Line tool]
+    \item[Line tool]
         Draws a straight line.
-    \item[Curve tool]
+    \item[Curve tool]
         Allows you to draw a line and curve it.
-    \item[Rectangle tool]
+    \item[Rectangle tool]
         Draws an unfilled rectangle.
-    \item[Circle tool]
+    \item[Circle tool]
         Draws an unfilled circle.
-    \item[Gradient fill]
-        To use this tool, click at the starting and ending points.
-        Starting with the background and going to the foreground colour, Rockpaint
+    \item[Gradient fill]
+        To use this tool, click at the starting and ending points.
+        Starting with the background and going to the foreground colour, Rockpaint
         will fill the region with a gradual colour change.
-    \item[Bucket fill]
+    \item[Bucket fill]
         Fills an same-colour or empty region with a colour.
-    \item[Dropper]
+    \item[Dropper]
         Click on a colour in the image to change the foreground colour to it.
-    \item[Eraser]
+    \item[Eraser]
         The opposite of the pencil; it changes painted pixels to white.
-    \item[Text tool]
+    \item[Text tool]
         "Draws" text on the image.
-    \item[Filled rectangle]
+    \item[Filled rectangle]
         Same as the Rectangle tool, but fills it with colour.
-    \item[Filled circle]
+    \item[Filled circle]
         Same as the Circle tool, but fills it with colour.
-    \item[Curved Gradient Fill]
-        Same as Gradient fill, but you must draw two lines.
+    \item[Curved Gradient Fill]
+        Same as Gradient fill, but you must draw two lines.
         Rockpaint will draw a curved, gradual change of colour in the region.
-    \item[Menu]
-        This opens the Main Menu. You can also press the Menu key to open it.
+    \item[Menu]
+        This opens the Main Menu. You can also press the Menu key to open it.
 \end{description}
 
 \subsubsection{Main Menu}
-The main menu consists of the following:
-\begin{description}
-    \item[Resume]
+The main menu consists of the following:
+\begin{description}
+    \item[Resume]
         Closes the Main Menu.
-    \item[New]
-        Creates a new canvas and discards the current file. BE CAREFUL.
+    \item[New]
+        Creates a new canvas and discards the current file. BE CAREFUL.
         You will lose any unsaved changes in the file that is currently open.
-    \item[Load]
-        Loads a bitmap file. Simply navigate to the file as you
+    \item[Load]
+        Loads a bitmap file. Simply navigate to the file as you
         would in the file browser.
-    \item[Save]
-        Saves the current file. If it has not been saved before,
+    \item[Save]
+        Saves the current file. If it has not been saved before,
         you will be given a chance to name it and choose the saving location.
-    \item[Brush speed]
-        Changes the speed at which the selection cursor
+    \item[Brush speed]
+        Changes the speed at which the selection cursor
         moves when you hold down a movement button.
-    \item[Brush size]
+    \item[Brush size]
         Allows you to adjust the drawing size of the pencil tool.
-    \item[Choose colour]
-        Allows you to manually edit the foreground colour.
+    \item[Choose colour]
+        Allows you to manually edit the foreground colour.
         You can edit the RBG and/or the HSV values.
-    \item[Grid size]
-        Allows you to show or hide a grid over the canvas,
+    \item[Grid size]
+        Allows you to show or hide a grid over the canvas,
         and to specify its size.
-    \item[Exit]
-        Exits Rockpaint.
-\end{description}
-
-\warn{BE CAREFUL. Rockpaint will NOT prompt you to save
+    \item[Exit]
+        Exits Rockpaint.
+\end{description}
+
+\warn{BE CAREFUL. Rockpaint will NOT prompt you to save
 if you select Exit, so any unsaved changes will be lost.}
-
-\begin{table}
-\begin{btnmap}{}{}
-    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{
-        \nopt{IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonPower}
-        \opt{IRIVER_H300_PAD}{\ButtonOff}
-        \opt{GIGABEAT_S_PAD}{\ButtonBack}
-        & Quits Rockpaint immediately.\\
-    }
-
-    \ButtonLeft
-    & Moves the cursor to the left.\\
-
-    \ButtonRight
-    & Moves the cursor to the right.\\
-
-    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-    & Moves the cursor up.\\
-
-    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-    & Moves the cursor down.\\
-
-    \opt{IRIVER_H300_PAD}{\ButtonOn}%
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonMenu}%
-    \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonPower}%
-    \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
-    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}%
-    \opt{IRIVER_H10_PAD}{\ButtonPlay}%
-    & Displays the Main Menu.\\
-
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu+\ButtonLeft}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
-    & Displays the toolbar.\\
-
-    \nopt{IRIVER_H10_PAD}{\ButtonSelect}%
-    \opt{IRIVER_H10_PAD}{\ButtonFF}%
-    & Toggles the brush and selects objects.\\
-
-    \end{btnmap}
-\end{table}
+
+\begin{table}
+\begin{btnmap}{}{}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{
+        \nopt{IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonPower}
+        \opt{IRIVER_H300_PAD}{\ButtonOff}
+        \opt{GIGABEAT_S_PAD}{\ButtonBack}
+          \opt{HAVEREMOTEKEYMAP}{& }
+        & Quits Rockpaint immediately.\\
+    }
+
+    \ButtonLeft
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Moves the cursor to the left.\\
+
+    \ButtonRight
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Moves the cursor to the right.\\
+
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{\ButtonUp}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Moves the cursor up.\\
+
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{\ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Moves the cursor down.\\
+
+    \opt{IRIVER_H300_PAD}{\ButtonOn}%
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonMenu}%
+    \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonSelect+\ButtonPower}%
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}%
+    \opt{IRIVER_H10_PAD}{\ButtonPlay}%
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Displays the Main Menu.\\
+
+    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonRec}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Displays the toolbar.\\
+
+    \nopt{IRIVER_H10_PAD}{\ButtonSelect}%
+    \opt{IRIVER_H10_PAD}{\ButtonFF}%
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Toggles the brush and selects objects.\\
+
+    \end{btnmap}
+\end{table}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 8d469e3806..4b0c4f27a8 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -15,7 +15,7 @@ Key controls:
     {\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay}
   \opt{IRIVER_H10_PAD}
     {\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
-  \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Move Tile \\
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
@@ -25,7 +25,7 @@ Key controls:
   \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Shuffle \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -37,7 +37,7 @@ Key controls:
   \opt{GIGABEAT_PAD}{\ButtonA}
   \opt{MROBE100_PAD}{\ButtonDisplay}
   \opt{GIGABEAT_S_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Change between picture and numbered tiles \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -45,7 +45,7 @@ Key controls:
       ,MROBE100_PAD}{\ButtonPower}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
   \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
   & Stop the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 8ade31e0a1..47438e8f61 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -12,7 +12,7 @@ end when the snake touches either the borders of the screen or itself.
       {\ButtonUp/\ButtonDown}
      \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay}
      \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-       \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
      & Change levels (1 is slowest, 9 is fastest)\\
     %
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
@@ -20,7 +20,7 @@ end when the snake touches either the borders of the screen or itself.
       ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
      & Toggle Play/Pause\\
     %
     \end{btnmap}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 65326feaae..e8f2811d33 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -15,13 +15,13 @@ into itself.
         {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Set game speed\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD%
         ,IPOD_3G_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonRight{} / \ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Select starting maze\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonLeft}
@@ -29,7 +29,7 @@ into itself.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Select game type (A or B)\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -37,7 +37,7 @@ into itself.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Start the game\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -45,7 +45,7 @@ into itself.
         {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Steer the snake\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -53,14 +53,14 @@ into itself.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Pause and resume the game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index e1fad1876b..a7db02e263 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -21,13 +21,13 @@ information about the level format, see
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, }%
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown, }%
     \ButtonLeft, \ButtonRight
-       \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Move the ``sokoban'' up, down, left, or right\\
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Menu \\
 \nopt{IAUDIO_X5_PAD}{
     \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonFOne}
@@ -39,7 +39,7 @@ information about the level format, see
     \opt{MROBE10_PAD}{\ButtonDisplay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonDown}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Back to previous level \\
 }
 \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
@@ -51,7 +51,7 @@ information about the level format, see
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Restart level \\
 }
 \nopt{IAUDIO_X5_PAD}{
@@ -64,7 +64,7 @@ information about the level format, see
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
     \opt{MROBE100_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Go to next level \\
 }
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD}{\ButtonOn}
@@ -73,8 +73,9 @@ information about the level format, see
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
 \opt{GIGABEAT_S_PAD}{\ButtonVolUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Undo last movement \\
+
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -84,7 +85,7 @@ information about the level format, see
 \opt{GIGABEAT_S_PAD}{\ButtonVolDown}
 \opt{MROBE100_PAD}{\ButtonDisplay}
 \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Redo previously undone move \\
 \hline
 \multicolumn{2}{c}{\textbf{Solution playback}} \\
@@ -94,23 +95,23 @@ information about the level format, see
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
       ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Pause/resume \\
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
     ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}
     {\ButtonUp/\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Increase/decrease playback speed \\
     \ButtonLeft/\ButtonRight
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Go backward/forward (while paused) \\
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}%
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index d41bfbcf21..25988fd2fa 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -21,7 +21,7 @@ visit
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     / \ButtonLeft{} / \ButtonRight
-       \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -30,7 +30,7 @@ visit
       ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
       {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Select cards, move cards, reveal hidden cards...\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -42,9 +42,9 @@ visit
     \opt{IRIVER_H10_PAD}{Long \ButtonLeft}
     \opt{SANSA_E200_PAD}{\ButtonRec}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & If a card was selected -- unselect it, else\\
-      \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Draw 3 new cards from the remains stack\\
     %
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
@@ -57,7 +57,7 @@ visit
     \opt{GIGABEAT_PAD}{\ButtonA{} + \ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonLeft}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonLeft}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -68,7 +68,7 @@ visit
     \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonRec{} + \ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Put the card under the cursor on one of the 4 final colour stacks.\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -80,14 +80,14 @@ visit
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} + \ButtonRight}
     \opt{MROBE100_PAD}{\ButtonDisplay{} + \ButtonRight}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Put the card on top of the remains stack on one of the final colour stacks.\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
       & Show menu\\
    \end{btnmap}
   \end{table}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index e1f238704e..6bb606022d 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -13,7 +13,7 @@ UFO will appear -- shoot this for extra points.
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Shoot\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -21,14 +21,14 @@ UFO will appear -- shoot this for extra points.
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Thrust\\
     %
     \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}
         {\ButtonLeft / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Turn left/right\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
@@ -36,7 +36,7 @@ UFO will appear -- shoot this for extra points.
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Teleport\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
@@ -46,14 +46,14 @@ UFO will appear -- shoot this for extra points.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Pause game\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_C200_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 1a6416d2b2..1ee5ff4ca5 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -13,24 +13,24 @@ could not otherwise reach. The block cannot take ``o''s.
 \begin{table}
   \begin{btnmap}{}{}
     \ButtonLeft
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Move Left\\
     \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Move Right\\
     \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}
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Move Up\\
     \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}
         {\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Move Down\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -38,7 +38,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Switch between circle and square\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -48,7 +48,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Previous level\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
@@ -59,7 +59,7 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Reset level \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
@@ -69,13 +69,13 @@ could not otherwise reach. The block cannot take ``o''s.
     \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
     \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Next level \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+      \opt{HAVEREMOTEKEYMAP}{& }
         & Exit the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 2b5f8c3ca7..2ed004713c 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -6,26 +6,27 @@ Starfield simulation (like the classic screensaver).
 \begin{table}
     \begin{btnmap}{}{}
     \ButtonRight\ / \ButtonLeft
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease number of stars\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Increase / decrease speed\\
     \opt{lcd_color}{%
         \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}%
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}%
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Change colours\\%
     }%
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 87fcd51695..1c13c6defb 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -11,14 +11,14 @@ A simple stopwatch program with support for saving times.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Quit Plugin \\
     %
     \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD,IPOD_4G_PAD%
         ,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Start / stop \\
     %
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -30,7 +30,7 @@ A simple stopwatch program with support for saving times.
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{GIGABEAT_S_PAD}{\ButtonMenu}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Reset timer (only when timer is stopped)\\
     %
     \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -38,7 +38,7 @@ A simple stopwatch program with support for saving times.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Take lap time \\
     %
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
@@ -46,7 +46,7 @@ A simple stopwatch program with support for saving times.
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Scroll through lap times \\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index ff04536596..b16ebbabbc 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -34,7 +34,7 @@ settings.
         {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown{} / \ButtonLeft{} / \ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Move the cursor\\
     %
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect & Change cursor move direction\\}
@@ -47,7 +47,7 @@ settings.
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{\ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Change number under the cursor\\
     %
     \opt{RECORDER_PAD}{Long \ButtonPlay}
@@ -58,7 +58,7 @@ settings.
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
     \opt{SANSA_E200_PAD}{Long \ButtonScrollBack{} / \ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{Long \ButtonSelect{} / \ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Constantly changing the number under the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -68,7 +68,7 @@ settings.
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
     \opt{SANSA_C200_PAD}{\ButtonPower}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Open Menu\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -78,7 +78,7 @@ settings.
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Add/Remove number to scratchpad\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -86,7 +86,7 @@ settings.
       ,MROBE100_PAD}{\ButtonPower}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
     \opt{SANSA_C200_PAD}{Long \ButtonPower}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     %
     \end{btnmap}
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 39057dfdc7..839f51793a 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -15,7 +15,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll{}-up\\
 
     \opt{PLAYER_PAD}{\ButtonRight}
@@ -25,20 +25,20 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll{}-down\\
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonLeft}
     \nopt{PLAYER_PAD,GIGABEAT_S_PAD}{\ButtonLeft}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Top of file (Narrow mode) /
         One screen left (Wide mode)\\
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonRight}
     \nopt{PLAYER_PAD,GIGABEAT_S_PAD}{\ButtonRight}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Bottom of file (Narrow mode) /
         One screen right (Wide mode)\\
 
@@ -48,7 +48,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
         \opt{SANSA_E200_PAD}{\ButtonScrollBack}
         \opt{SANSA_C200_PAD}{\ButtonUp}
         \opt{GIGABEAT_S_PAD}{\ButtonUp}
-           \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & One line up\\
     }
 
@@ -58,21 +58,21 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
         \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{SANSA_C200_PAD}{\ButtonDown}
         \opt{GIGABEAT_S_PAD}{\ButtonDown}
-        \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & One line down\\
     }
 
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
         \opt{GIGABEAT_S_PAD}{\ButtonLeft}
-            \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & One column left\\
     }
 
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{
         \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
         \opt{GIGABEAT_S_PAD}{\ButtonRight}
-          \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & One column right\\
     }
 
@@ -83,7 +83,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonRec}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Toggle autoscroll\\
 
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -93,7 +93,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Enter menu\\
 
     \opt{PLAYER_PAD}{\ButtonStop}
@@ -102,7 +102,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
         & Exit text viewer\\
 
     \end{btnmap}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index d97db0e10d..50c7156e38 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -16,7 +16,7 @@ and the meter scale can be changed.
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
      ,MROBE100_PAD}{\ButtonPower}
 \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Save settings and quit\\
 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
@@ -25,7 +25,7 @@ and the meter scale can be changed.
 \opt{GIGABEAT_PAD}{\ButtonA}
 \opt{MROBE100_PAD}{\ButtonDisplay}
 \opt{GIGABEAT_S_PAD}{\ButtonNext}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Help\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{Long \ButtonMenu}
@@ -33,21 +33,21 @@ and the meter scale can be changed.
      ,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
 \opt{IRIVER_H10_PAD}{\ButtonRew}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Settings\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
 \opt{SANSA_C200_PAD}{\ButtonVolUp}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Raise Volume\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
 \opt{SANSA_C200_PAD}{\ButtonVolDown}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Lower Volume\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 10cd38f8bd..f8596090fa 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -18,13 +18,13 @@ Menu controls:}
 \begin{table}
     \begin{btnmap}{}{}
     \ButtonLeft\ / \ButtonRight 
-        \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Controls number of worms in the game\\
     \opt{RECORDER_PAD}{
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
             {\ButtonUp\ / \ButtonDown}
-              \opt{IRIVER_RC_H100_PAD}{&}
-            \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay} & Selects number of players\\
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay} 
+        & Selects number of players\\
         \ButtonFOne & Selects game mode.\\}
     \end{btnmap}
 \end{table}
@@ -73,22 +73,22 @@ Game controls:}
 \begin{table}
     \begin{btnmap}{}{}
         \ButtonLeft
-          \opt{IRIVER_RC_H100_PAD}{&}
+       \opt{HAVEREMOTEKEYMAP}{& }
         & Turn left\\
         \ButtonRight
-          \opt{IRIVER_RC_H100_PAD}{&}
+             \opt{HAVEREMOTEKEYMAP}{& }
         & Turn right\\
         \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
             ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
-          \opt{IRIVER_RC_H100_PAD}{&}
         \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
+            \opt{HAVEREMOTEKEYMAP}{& }
         & Turn Up\\
         \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
             ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown}
-          \opt{IRIVER_RC_H100_PAD}{&}
         \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
+           \opt{HAVEREMOTEKEYMAP}{& }
         & Turn Down\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 888cdce818..4669ce7949 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -15,7 +15,7 @@ To finish a level you have to section off more than 75\%.
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Move around the arena\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -24,13 +24,13 @@ To finish a level you have to section off more than 75\%.
     \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Pause\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Open menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index f9731c8d03..9f574ff46c 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -19,7 +19,7 @@ including an additional but fixed menu button, are assigned as follows:
         ,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown/}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/}
     \ButtonLeft/\ButtonRight
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Directional movement\\
     %
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
@@ -28,7 +28,7 @@ including an additional but fixed menu button, are assigned as follows:
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Jump/Fire\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
@@ -39,7 +39,7 @@ including an additional but fixed menu button, are assigned as follows:
     \opt{SANSA_C200_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IRIVER_RC_H100_PAD}{&}
+  \opt{HAVEREMOTEKEYMAP}{& }
     & Open ZXBox menu\\
     \end{btnmap}
 \end{table}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index d7a614bb76..7658c8f524 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -53,7 +53,9 @@ the \setting{Show Files} setting to all.
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
         {
           \ButtonOn+\ButtonUp{}/ \ButtonDown
-          \opt{IRIVER_RC_H100_PAD}{& \ButtonRCSource{}/ \ButtonRCBitrate}
+           \opt{HAVEREMOTEKEYMAP}{&           
+          \opt{IRIVER_RC_H100_PAD}{\ButtonRCSource{}/ \ButtonRCBitrate}
+          }
           & Move one page up/down in the list.\\
         }
       \opt{IRIVER_H10_PAD}
@@ -248,20 +250,29 @@ can be easily changed by making a text file with the required layout.  More
   \textbf{Picker area}
   \begin{table}
     \begin{btnmap}{}{}
-      \ActionKbdUp/\ActionKbdDown & Move about the virtual keyboard.
+      \ActionKbdUp/\ActionKbdDown 
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Move about the virtual keyboard.
       If you move out of the picker area, you get to the \emph{Line edit mode}. \\
-      \ActionKbdLeft/\ActionKbdRight & (moves the solid cursor). \\
+      \ActionKbdLeft/\ActionKbdRight 
+        \opt{HAVEREMOTEKEYMAP}{& }
+         & (moves the solid cursor). \\
       \ActionKbdSelect
+        \opt{HAVEREMOTEKEYMAP}{& }
       & Inserts the currently selected keyboard letter at the current
       filename cursor position \\
       \ActionKbdDone
+        \opt{HAVEREMOTEKEYMAP}{& }
       & Exits the virtual keyboard and saves any changes \\
       \ActionKbdAbort
+        \opt{HAVEREMOTEKEYMAP}{& }
       & Exits the virtual keyboard without saving any changes\\
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{
           \ActionKbdMorseInput
+             \opt{HAVEREMOTEKEYMAP}{& }
           & Enters Morse input mode \\
           \ActionKbdMorseSelect
+              \opt{HAVEREMOTEKEYMAP}{& }
           & Tap to select a character in Morse input mode \\
       }
     \end{btnmap}
@@ -269,9 +280,15 @@ can be easily changed by making a text file with the required layout.  More
   \textbf{Line edit mode}
   \begin{table}
     \begin{btnmap}{}{}
-      \ActionKbdLeft/\ActionKbdRight & Move left and right\\
-      \ActionKbdSelect & Deletes the letter to the left of the cursor\\
-      \ActionKbdUp/\ActionKbdDown & Returns to the picker area\\
+      \ActionKbdLeft/\ActionKbdRight
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Move left and right\\
+      \ActionKbdSelect
+        \opt{HAVEREMOTEKEYMAP}{& }
+         & Deletes the letter to the left of the cursor\\
+      \ActionKbdUp/\ActionKbdDown 
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Returns to the picker area\\
     \end{btnmap}
   \end{table}
 }
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index d0ab1ded01..f8768c3ceb 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -435,7 +435,9 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           {Long \ButtonOn}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}
           {\ButtonPower}%
-      \opt{IRIVER_RC_H100_PAD}{& \ButtonRCOn}%
+    \opt{HAVEREMOTEKEYMAP}{&
+      \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}%
+          }
       & Start Rockbox\\
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
@@ -444,7 +446,9 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}%
           {Long \ButtonPower}%
-      \opt{IRIVER_RC_H100_PAD}{& Long \ButtonRCStop}%
+    \opt{HAVEREMOTEKEYMAP}{& 
+      \opt{IRIVER_RC_H100_PAD}{Long \ButtonRCStop}%
+          }
       & Shutdown Rockbox\\
     \end{btnmap}
   \end{table}