3 files changed, 50 insertions, 15 deletions

diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 952300c251..1763e074c2 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -22,13 +22,16 @@
     \begin{table}
       \begin{btnmap}{}{}
           \ActionFMPrev, \ActionFMNext
+          \opt{IRIVER_RC_H100_PAD}{& \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}
           & Seek to next station or preset in \setting{SCAN} mode.\\
           %
           \ActionFMSettingsInc, \ActionFMSettingsDec
+          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMVolUp, \ActionRCFMVolDown}
           & Change volume.\\
           \opt{RECORDER_PAD}{
             \ButtonPlay
@@ -38,23 +41,30 @@
 
           %
           \ActionFMExit
+          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMExit}
           & Leave the radio screen with the radio playing.\\
           %
           \ActionFMStop
+          \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMStop}
           & Stops the radio and returns to \setting{Main Menu}.\\%
           %
           \nopt{ONDIO_PAD}{%
-            \nopt{RECORDER_PAD}{\ActionFMPlay & Mutes radio playback.\\}%
+            \nopt{RECORDER_PAD}{\ActionFMPlay
+              \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPlay}
+              & Mutes radio playback.\\}%
             %
             \ActionFMMode
+            \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMMode}
             & Switches between \setting{SCAN} and \setting{PRESET} mode.\\
             %
             \ActionFMPreset
+            \opt{IRIVER_RC_H100_PAD}{& \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}
           & 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 2257c14821..d199ebe928 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -19,19 +19,24 @@ safely (see \reference{ref:Safeshutdown}).
 \begin{table}
   \begin{btnmap}{}{}
     \ActionStdNext
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext}    
     & Selects the next option in the menu.\\
-    & Inside a setting, increases the value or
-      chooses next option \\
+    
+    & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting,
+      increases the value or chooses next option \\
     %
     \ActionStdPrev
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev}
     & Selects the previous option in the menu.\\
-    & Inside a setting, decreases the value or
-      chooses previous option \\
+    & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting,
+      decreases the value or chooses previous option \\
     %
     \ActionStdOk
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk}
     & Selects option \\
     %
     \ActionStdCancel
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel}
     & Exits menu, setting or moves to parent menu\\
   \end{btnmap}
 \end{table}
@@ -46,21 +51,27 @@ jump straight to that track.
 \begin{table}
   \begin{btnmap}{}{}
     \ActionStdNext
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext}
     & Selects the next bookmark.\\
     %
     \ActionStdPrev
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev}
     & Selects the previous bookmark.\\
     %
     \ActionStdOk
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk}
     & Resumes from the selected bookmark.\\
     %
     \ActionStdCancel
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel}
     & Exits Recent Bookmark menu\\
     %
     \nopt{GIGABEAT_S_PAD}{\ActionBmDelete
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCBmDelete}
     & Deletes the currently selected bookmark\\}
     %
-    \ActionStdContext  
+    \ActionStdContext
+    \opt{IRIVER_RC_H100_PAD}{& \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 53fb7e025c..7102d596ae 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -30,24 +30,38 @@ The controls for this screen are:
 \begin{table}
   \begin{btnmap}{}{}
     
-    \ActionRecPrev{} / \ActionRecNext & Select setting.\\
+    \ActionRecPrev{} / \ActionRecNext 
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPrev{} / \ActionRCRecNext}
+    & Select setting.\\
     %
-    \ActionRecSettingsDec{} / \ActionRecSettingsInc & Adjust selected setting.\\
+    \ActionRecSettingsDec{} / \ActionRecSettingsInc
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecSettingsDec{} / \ActionRecSettingsInc}
+    & Adjust selected setting.\\
     %
-    \ActionRecPause & Start recording.\\
-                    & While recording: pause recording (press again to
+    \ActionRecPause 
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPause}
+                    & Start recording.\\
+                    & \opt{IRIVER_RC_H100_PAD}{&}
+                      While recording: pause recording (press again to
                       continue).\\
     %
-    \ActionRecExit  & Exit \setting{Recording Screen}.\\
-                    & While recording: Stop recording.\\
+    \ActionRecExit  
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecExit}
+                    & Exit \setting{Recording Screen}.\\
+                    & \opt{IRIVER_RC_H100_PAD}{&}
+                      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 & While recording: close the current file and open
-                          a new one.\\
+      \ActionRecNewfile
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecNewfile} 
+                     & While recording: close the current file and open
+                     a new one.\\
     }
     %
-    \ActionRecMenu & Open \setting{Recording Settings} (see 
+    \ActionRecMenu
+    \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecMenu}
+                       & Open \setting{Recording Settings} (see 
                        \reference{ref:Recordingsettings}).\\
     %
     \opt{RECORDER_PAD}{