3 files changed, 33 insertions, 29 deletions

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}).\\
     %