8 files changed, 89 insertions, 84 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 95e57d9bc3..8c61704e80 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -64,27 +64,27 @@
 \begin{table}
     \begin{btnmap}{}{}
       \ActionStdNext
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}
       & Selects the next bookmark.\\
       %
       \ActionStdPrev
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev}
       & Selects the previous bookmark.\\
       %
       \ActionStdOk
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk}
       & Resumes from the selected bookmark.\\
       %
       \ActionStdCancel
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
       & Exits Recent Bookmark menu\\
       %
       \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCBmDelete}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCBmDelete}
       & Deletes the currently selected bookmark\\}
       %
       \ActionStdContext
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdContext}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
       & Enters the context menu for the selected bookmark.\\
     \end{btnmap}
 \end{table}
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 1763e074c2..f2bdfbf10d 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -22,16 +22,20 @@
     \begin{table}
       \begin{btnmap}{}{}
           \ActionFMPrev, \ActionFMNext
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPrev, \ActionRCFMNext}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPrev, \ActionRCFMNext}
           & Change frequency in \setting{SCAN} mode or jump to next/previous
           station in \setting{PRESET} mode\\
           %
           Long \ActionFMPrev, \ActionFMNext
-          \opt{IRIVER_RC_H100_PAD}{& Long \ActionRCFMPrev, Long \ActionRCFMNext}
+          \opt{HAVEREMOTEKEYMAP}{& Long \ActionRCFMPrev, Long \ActionRCFMNext}
           & Seek to next station or preset in \setting{SCAN} mode.\\
           %
           \ActionFMSettingsInc, \ActionFMSettingsDec
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMVolUp, \ActionRCFMVolDown}
+          \opt{HAVEREMOTEKEYMAP}{
+              &
+              \opt{IRIVER_RC_H100_PAD}{\ActionRCFMVolUp, \ActionRCFMVolDown}%
+              \nopt{IRIVER_RC_H100_PAD}{\ActionRCFMSettingsInc, \ActionRCFMSettingsDec}%
+          }
           & Change volume.\\
           \opt{RECORDER_PAD}{
             \ButtonPlay
@@ -41,30 +45,30 @@
 
           %
           \ActionFMExit
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMExit}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMExit}
           & Leave the radio screen with the radio playing.\\
           %
           \ActionFMStop
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMStop}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMStop}
           & Stops the radio and returns to \setting{Main Menu}.\\%
           %
           \nopt{ONDIO_PAD}{%
             \nopt{RECORDER_PAD}{\ActionFMPlay
-              \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPlay}
+              \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPlay}
               & Mutes radio playback.\\}%
             %
             \ActionFMMode
-            \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMMode}
+            \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMode}
             & Switches between \setting{SCAN} and \setting{PRESET} mode.\\
             %
             \ActionFMPreset
-            \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPreset}
+            \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPreset}
             & Opens a list of radio presets. You can view all the presets that 
               you have, and switch to the station.\\
           }%
           %
           \ActionFMMenu
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMMenu}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMenu}
           & Displays the FM radio settings menu.\\
        \end{btnmap}
     \end{table}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index d199ebe928..cbdff0833e 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -19,24 +19,24 @@ safely (see \reference{ref:Safeshutdown}).
 \begin{table}
   \begin{btnmap}{}{}
     \ActionStdNext
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext}    
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}    
     & Selects the next option in the menu.\\
     
-    & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting,
+    & \opt{HAVEREMOTEKEYMAP}{&} Inside a setting,
       increases the value or chooses next option \\
     %
     \ActionStdPrev
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev}
     & Selects the previous option in the menu.\\
-    & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting,
+    & \opt{HAVEREMOTEKEYMAP}{&} Inside a setting,
       decreases the value or chooses previous option \\
     %
     \ActionStdOk
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk}
     & Selects option \\
     %
     \ActionStdCancel
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
     & Exits menu, setting or moves to parent menu\\
   \end{btnmap}
 \end{table}
@@ -51,27 +51,27 @@ jump straight to that track.
 \begin{table}
   \begin{btnmap}{}{}
     \ActionStdNext
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}
     & Selects the next bookmark.\\
     %
     \ActionStdPrev
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev}
     & Selects the previous bookmark.\\
     %
     \ActionStdOk
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk}
     & Resumes from the selected bookmark.\\
     %
     \ActionStdCancel
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
     & Exits Recent Bookmark menu\\
     %
     \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCBmDelete}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCBmDelete}
     & Deletes the currently selected bookmark\\}
     %
     \ActionStdContext
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdContext}  
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}  
     & Enters the context menu for the selected bookmark.\\
   \end{btnmap}
 \end{table}
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index 7102d596ae..30f86afd39 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -31,36 +31,36 @@ The controls for this screen are:
   \begin{btnmap}{}{}
     
     \ActionRecPrev{} / \ActionRecNext 
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPrev{} / \ActionRCRecNext}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPrev{} / \ActionRCRecNext}
     & Select setting.\\
     %
     \ActionRecSettingsDec{} / \ActionRecSettingsInc
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecSettingsDec{} / \ActionRecSettingsInc}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecSettingsDec{} / \ActionRecSettingsInc}
     & Adjust selected setting.\\
     %
     \ActionRecPause 
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPause}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause}
                     & Start recording.\\
-                    & \opt{IRIVER_RC_H100_PAD}{&}
+                    & \opt{HAVEREMOTEKEYMAP}{&}
                       While recording: pause recording (press again to
                       continue).\\
     %
     \ActionRecExit  
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecExit}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecExit}
                     & Exit \setting{Recording Screen}.\\
-                    & \opt{IRIVER_RC_H100_PAD}{&}
+                    & \opt{HAVEREMOTEKEYMAP}{&}
                       While recording: Stop recording.\\
     %
     \opt{IRIVER_H10_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,%
          SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{
       \ActionRecNewfile
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecNewfile} 
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecNewfile} 
                      & While recording: close the current file and open
                      a new one.\\
     }
     %
     \ActionRecMenu
-    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecMenu}
+    \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecMenu}
                        & Open \setting{Recording Settings} (see 
                        \reference{ref:Recordingsettings}).\\
     %
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index 94d64231b7..332af0cc8a 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 \opt{IRIVER_RC_H100_PAD}{&} & Decrease the number of matches \\
-\ButtonRight \opt{IRIVER_RC_H100_PAD}{&} & Increase the number of matches \\
-\ButtonPlay \opt{IRIVER_RC_H100_PAD}{&} & Remove the number of matches you have selected \\
-\ButtonStop \opt{IRIVER_RC_H100_PAD}{&} & Exit the game \\
+\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 \\
 \end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
index 8d3218e4fd..6ad7a0518e 100644
--- a/manual/plugins/split_editor.tex
+++ b/manual/plugins/split_editor.tex
@@ -116,9 +116,9 @@ The whole process of splitting an mp3 file consists of three steps:
     \begin{btnmap}{Controls in the split editor}{}
       \ButtonOff \opt{IRIVER_RC_H100_PAD}{&} & Quit plugin \\
       %
-      \ButtonLeft\ / \ButtonRight \opt{IRIVER_RC_H100_PAD}{&} &  Move the split point indicator \\
+      \ButtonLeft\ / \ButtonRight &  Move the split point indicator \\
       %
-      \ButtonUp\ / \ButtonDown \opt{IRIVER_RC_H100_PAD}{&} & Zoom in / out \\
+      \ButtonUp\ / \ButtonDown & Zoom in / out \\
       %
       \opt{RECORDER_PAD}{\ButtonPlay}
       \opt{ONDIO_PAD}{\ButtonMenu}
@@ -138,15 +138,12 @@ The whole process of splitting an mp3 file consists of three steps:
       \opt{RECORDER_PAD}{
       %
       \ButtonOn\ + \ButtonLeft
-      \opt{IRIVER_RC_H100_PAD}{&} 
       & Play half speed \\
       %
       \ButtonOn\ + \ButtonRight
-      \opt{IRIVER_RC_H100_PAD}{&} 
       & Play 150\% speed \\
       %
       \ButtonOn\ + \ButtonPlay
-      \opt{IRIVER_RC_H100_PAD}{&} 
       & Play normal speed \\
     }
     \end{btnmap}
@@ -167,13 +164,13 @@ Save Dialogue}{}
 
 \begin{table}
   \begin{btnmap}{Controls in the save dialogue}{}
-    \ButtonUp\ / \ButtonDown \opt{IRIVER_RC_H100_PAD}{&} & Select item \\
+    \ButtonUp\ / \ButtonDown & Select item \\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonRight}
     & Toggle / edit item \\
     %
-    \ButtonOff \opt{IRIVER_RC_H100_PAD}{&} & Cancel \\
+    \ButtonOff & Cancel \\
   \end{btnmap}
 \end{table}
 
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 65059dacd7..d7a614bb76 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -46,7 +46,7 @@ the \setting{Show Files} setting to all.
 \begin{table}
     \begin{btnmap}{}{}
       \ActionStdPrev{}/\ActionStdNext{}
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev{}/\ActionRCStdNext{}}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}}
          & Go to previous/next item in list. If you are on the first/last 
            entry, the cursor will wrap to the last/first entry.\\
       %
@@ -63,37 +63,37 @@ the \setting{Show Files} setting to all.
         }
       %
       \ActionTreeParentDirectory
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeParentDirectory}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeParentDirectory}
       & Go to the parent directory.\\
       %
       \ActionTreeEnter
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeEnter}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeEnter}
       & Executes the default action on the selected file or enters a
         directory.\\
       %
       \ActionTreeWps 
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeWps}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeWps}
          & If there is an audio file playing, returns to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
       \nopt{player,c200}%
         {%
           \ActionTreeStop 
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeStop}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
           & Stops audio playback.\\%
         }%
       %
       \ActionStdContext{}
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdContext}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
       & Enter the \setting{Context Menu}\\
       %
       \ActionStdMenu{}
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdMenu}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu}
       & Enter the \setting{Main Menu}\\
       %
       \opt{quickscreen}{
         \ActionStdQuickScreen
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdQuickScreen}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdQuickScreen}
         & Switches to the \setting{Quick Screen}
         (see \reference{ref:QuickScreen}) \\
       }
@@ -199,24 +199,24 @@ can be easily changed by making a text file with the required layout.  More
   \begin{table}
     \begin{btnmap}{}{}
       \ActionKbdLeft~/ \ActionKbdRight~/ \ActionKbdUp~/ \ActionKbdDown
-      \opt{IRIVER_RC_H100_PAD}{
+      \opt{HAVEREMOTEKEYMAP}{
       &  \ActionRCKbdLeft~/ \ActionRCKbdRight~/ \ActionRCKbdUp~/ \ActionRCKbdDown}
       & Move about the virtual keyboard (moves the solid cursor) \\
       %
       \ActionKbdPageFlip
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdPageFlip}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdPageFlip}
       & Flip to the next page of characters (if there is more than one) \\
       %
       \ActionKbdCursorLeft{} / \ActionKbdCursorRight
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight}
       & Move the line cursor within the text line \\
       %
       \ActionKbdSelect
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdSelect}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdSelect}
       & Inserts the selected keyboard letter at the current cursor position \\
       %
       \ActionKbdAbort
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdAbort}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdAbort}
       & Exits the virtual keyboard without saving any changes \\
       %
       \opt{RECORDER_PAD}{
@@ -225,19 +225,19 @@ can be easily changed by making a text file with the required layout.  More
       }
       %
       \ActionKbdDone
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdDone}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdDone}
       & Exits the virtual keyboard and saves any changes \\
       %
       \ActionKbdBackSpace
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdBackSpace}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdBackSpace}
       & Deletes the character before the line cursor \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD}{
         \ActionKbdMorseInput
-         \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdMorseInput}
+         \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseInput}
         & Enters Morse input mode \\
         \ActionKbdMorseSelect
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdMorseSelect}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseSelect}
         & Tap to select a character in Morse input mode \\
       }
     \end{btnmap}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 62d51b7424..2d637d6830 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -58,40 +58,40 @@ your WPS (While Playing Screen).
 \begin{table}
   \begin{btnmap}{}{}
       \ActionWpsVolUp{} / \ActionWpsVolDown
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
       & Volume up/down.\\
       %
       \ActionWpsSkipPrev
-       \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsSkipPrev}
+       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsSkipPrev}
       & Go to beginning of track, or if pressed while in the
         first seconds of a track, go to previous track.\\
       %
       \ActionWpsSeekBack
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsSeekBack}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsSeekBack}
       & Rewind in track.\\
       %
       \ActionWpsSkipNext
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsSkipNext}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsSkipNext}
       & Go to next track.\\
       %
       \ActionWpsSeekFwd
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsSeekFwd}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsSeekFwd}
       & Fast forward in track.\\
       %
       \ActionWpsPlay
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsPlay}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPlay}
       & Toggle play/pause.\\
       %
       \ActionWpsStop 
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsStop}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsStop}
       & Stop playback.\\
       %
       \ActionWpsBrowse
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsBrowse}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsBrowse}
       & Return to the \setting{File Browser}.\\
       %
       \ActionWpsContext
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsContext}
+      \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsContext}
       & Enter \setting{WPS Context Menu}.\\
       %
       \opt{ONDIO_PAD}{\ActionWpsContext{} twice}%
@@ -101,7 +101,7 @@ your WPS (While Playing Screen).
       %
       \opt{quickscreen}{%
         \ActionWpsQuickScreen
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsQuickScreen}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsQuickScreen}
           & Switches to the \setting{Quick Screen}.
           (see \reference{ref:QuickScreen}) \\}%
       %
@@ -123,14 +123,14 @@ your WPS (While Playing Screen).
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
         \ActionWpsPitchScreen
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsPitchScreen}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPitchScreen}
          & Show \setting{Pitch Screen}
          (see \reference{sec:pitchscreen}).\\}%
       %
       \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
           ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
         \ActionWpsIdThreeScreen 
-          \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsIdThreeScreen}
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsIdThreeScreen}
           & Enter \setting{ID3 Viewer}.\\%
       }%
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
@@ -138,7 +138,9 @@ your WPS (While Playing Screen).
          \ActionWpsAbSetBNextDir{} or }%
          % not all targets have the above action defined but the one below works on all
       Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsAbSetBNextDir{} or
+      \opt{HAVEREMOTEKEYMAP}{
+        &
+          \opt{IRIVER_RC_H100_PAD}{\ActionRCWpsAbSetBNextDir{} or}
         Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
       & Skip to the next directory.\\
       %
@@ -146,13 +148,15 @@ your WPS (While Playing Screen).
          ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
          \ActionWpsAbSetAPrevDir{} or }%
       Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev
-      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsAbSetAPrevDir{} or
+      \opt{HAVEREMOTEKEYMAP}{
+        &
+          \opt{IRIVER_RC_H100_PAD}{\ActionRCWpsAbSetAPrevDir{} or}
         Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
       & Skip to the previous directory.\\
       %
       \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
         \ActionStdRec
-          \opt{IRIVER_RC_H100_PAD}{&} 
+          \opt{HAVEREMOTEKEYMAP}{&} 
           & Switches to the Recording screen \\
       }%
     \end{btnmap}
@@ -318,29 +322,29 @@ Delete the currently playing file.
     \begin{table}
       \begin{btnmap}{}{}
         \ActionPsToggleMode
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsToggleMode}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsToggleMode}
         & Toggle pitch changing mode \\
         %
         \ActionPsIncSmall{} / \ActionPsDecSmall
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsIncSmall{} / \ActionRCPsDecSmall}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsIncSmall{} / \ActionRCPsDecSmall}
         & Increase / Decrease pitch by 0.1\% (in procentual mode) or a semitone
           (in semitone mode)\\
         %
         \ActionPsIncBig{} / \ActionPsDecBig
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsIncBig{} / \ActionRCPsDecBig}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsIncBig{} / \ActionRCPsDecBig}
         & Increase / Decrease pitch by 1\% (in procentual mode) or a semitone
           (in semitone mode)\\
         %
         \ActionPsNudgeLeft{} / \ActionPsNudgeRight
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsNudgeLeft{} / \ActionPsNudgeRight}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsNudgeLeft{} / \ActionPsNudgeRight}
         & Temporarily change pitch by 2.0\% (beatmatch), or modify speed (in timestretch mode) \\
         %
         \ActionPsReset
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsReset}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsReset}
         & Reset pitch and speed to 100\% \\
         %
         \ActionPsExit
-        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsExit}
+        \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsExit}
         & Leave the Pitch Screen \\
         %
       \end{btnmap}