45 files changed, 262 insertions, 181 deletions
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 3ac346d256..caebd3c37c 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -502,7 +502,7 @@ change to customise your listening experience.
      \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
      \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
      \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-      \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+      \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
      \opt{touchscreen}{\TouchTopLeft
          \opt{COWON_D2_PAD}{/ \ButtonPower}}
          &
diff --git a/manual/platform/keymap-yh820.tex b/manual/platform/keymap-yh820.tex
index 47f5acad04..9e775d7e2f 100644
--- a/manual/platform/keymap-yh820.tex
+++ b/manual/platform/keymap-yh820.tex
@@ -20,7 +20,7 @@
 \newcommand{\ActionStdMenu}{Long \ButtonLeft{}+Long \ButtonUp}
 \newcommand{\ActionStdContext}{Long \ButtonRight}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonFF}
+\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonRew}
 \newcommand{\ActionStdRec}{Long \ButtonRec}
 %a button without harmful side effects for USB charging
 \newcommand{\ActionStdUsbCharge}{\ButtonRew}
@@ -40,9 +40,9 @@
 \newcommand{\ActionWpsPlaylist}{Long \ButtonLeft}
 \newcommand{\ActionWpsMenu}{\ButtonLeft}
 \newcommand{\ActionWpsQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{} + \ButtonRight}
+\newcommand{\ActionWpsAbSetBNextDir}{\ButtonRec{}+\ButtonFF}
-\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{} + \ButtonLeft}
+\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonRec{}+\ButtonRew}
-\newcommand{\ActionWpsAbReset}{\ButtonPlay{} + \ButtonUp}
+\newcommand{\ActionWpsAbReset}{\ButtonRec{}+\ButtonPlay}
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
@@ -52,7 +52,7 @@
 \newcommand{\ActionTreeHotkey}{\ButtonRec}
 %Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\ButtonRight}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
 %Button actions, Setting context
 \newcommand{\ActionSettingInc}{\ButtonUp}
@@ -68,14 +68,14 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonPlay}
-\newcommand{\ActionKbdDone}{\ButtonFF}
+\newcommand{\ActionKbdDone}{Long \ButtonFF}
-\newcommand{\ActionKbdAbort}{\ButtonFF{}+\ButtonRew{} or \ButtonRec}
+\newcommand{\ActionKbdAbort}{Long \ButtonRew}
 \newcommand{\ActionKbdUp}{\ButtonUp}
 \newcommand{\ActionKbdDown}{\ButtonDown}
-\newcommand{\ActionKbdCursorLeft}{\ButtonFF{}+\ButtonLeft}
+\newcommand{\ActionKbdCursorLeft}{\ButtonRec{}+\ButtonLeft}
-\newcommand{\ActionKbdCursorRight}{\ButtonFF{}+\ButtonRight}
+\newcommand{\ActionKbdCursorRight}{\ButtonRec{}+\ButtonRight}
-\newcommand{\ActionKbdBackSpace}{\ButtonRew}
+\newcommand{\ActionKbdBackSpace}{\ButtonRew{} or \ButtonRec{}+\ButtonRew}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonFF}
+\newcommand{\ActionKbdMorseInput}{\ButtonRec{}+\ButtonFF}
 \newcommand{\ActionKbdMorseSelect}{\ButtonPlay}
 %Button actions, Pitch Screen context
@@ -91,9 +91,9 @@
 %Button actions, Recording screen context
 \newcommand{\ActionRecNewfile}{\ButtonFF}
-\newcommand{\ActionRecMenu}{\ButtonRew}
+\newcommand{\ActionRecMenu}{Long \ButtonRew}
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonRew{} or \ButtonRec}
+\newcommand{\ActionRecExit}{\ButtonRew{} or \ButtonRec}
 \newcommand{\ActionRecSettingsInc}{\ButtonRight}
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecPrev}{\ButtonUp}
diff --git a/manual/platform/keymap-yh92x.tex b/manual/platform/keymap-yh92x.tex
index 47f5acad04..f8a9aa310e 100644
--- a/manual/platform/keymap-yh92x.tex
+++ b/manual/platform/keymap-yh92x.tex
@@ -7,7 +7,10 @@
 \newcommand{\ButtonDown}{\btnfnt{Down}}
 \newcommand{\ButtonRew}{\btnfnt{Rewind}}
 \newcommand{\ButtonFF}{\btnfnt{Forward}}
+% this is still needed for the QuickStart/Player's Controls section
 \newcommand{\ButtonRec}{\btnfnt{Rec}}
+\newcommand{\ButtonRecOn}{\btnfnt{\btnfnt{Rec}$\rightarrow$on}}
+\newcommand{\ButtonRecOff}{\btnfnt{\btnfnt{Rec}$\rightarrow$off}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 %Button actions, standard context
@@ -20,8 +23,8 @@
 \newcommand{\ActionStdMenu}{Long \ButtonLeft{}+Long \ButtonUp}
 \newcommand{\ActionStdContext}{Long \ButtonRight}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonFF}
+\newcommand{\ActionQuickScreenExit}{\ButtonPlay{} or \ButtonRew}
-\newcommand{\ActionStdRec}{Long \ButtonRec}
+\newcommand{\ActionStdRec}{\ButtonRecOn}
 %a button without harmful side effects for USB charging
 \newcommand{\ActionStdUsbCharge}{\ButtonRew}
@@ -36,23 +39,23 @@
 \newcommand{\ActionWpsVolUp}{\ButtonUp}
 \newcommand{\ActionWpsBrowse}{\ButtonRight}
 \newcommand{\ActionWpsContext}{Long \ButtonRight}
-\newcommand{\ActionWpsHotkey}{\ButtonRec}
+\newcommand{\ActionWpsHotkey}{Long \ButtonRight{}+Long \ButtonDown}
 \newcommand{\ActionWpsPlaylist}{Long \ButtonLeft}
 \newcommand{\ActionWpsMenu}{\ButtonLeft}
 \newcommand{\ActionWpsQuickScreen}{Long \ButtonLeft{}+Long \ButtonDown}
-\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{} + \ButtonRight}
+\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPlay{}+\ButtonRight}
-\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{} + \ButtonLeft}
+\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPlay{}+\ButtonLeft}
-\newcommand{\ActionWpsAbReset}{\ButtonPlay{} + \ButtonUp}
+\newcommand{\ActionWpsAbReset}{\ButtonPlay{}+\ButtonUp{} or \ButtonPlay{}+\ButtonDown}
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlay}
 \newcommand{\ActionTreeStop}{Long \ButtonPlay}
 \newcommand{\ActionTreeEnter}{\ButtonRight}
 \newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
-\newcommand{\ActionTreeHotkey}{\ButtonRec}
+\newcommand{\ActionTreeHotkey}{Long \ButtonRight{}+Long \ButtonDown}
 %Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\ButtonRight}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
 %Button actions, Setting context
 \newcommand{\ActionSettingInc}{\ButtonUp}
@@ -60,7 +63,7 @@
 %Button actions, Alarm screen
 \newcommand{\ActionAlarmSet}{\ButtonPlay}
-\newcommand{\ActionAlarmCancel}{Long \Buttonplay}
+\newcommand{\ActionAlarmCancel}{\ButtonRew}
 \newcommand{\ActionAlarmHoursDec}{\ButtonDown}
 \newcommand{\ActionAlarmHoursInc}{\ButtonUp}
@@ -68,14 +71,12 @@
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
 \newcommand{\ActionKbdRight}{\ButtonRight}
 \newcommand{\ActionKbdSelect}{\ButtonPlay}
-\newcommand{\ActionKbdDone}{\ButtonFF}
+\newcommand{\ActionKbdDone}{Long \ButtonFF}
-\newcommand{\ActionKbdAbort}{\ButtonFF{}+\ButtonRew{} or \ButtonRec}
+\newcommand{\ActionKbdAbort}{Long \ButtonRew}
 \newcommand{\ActionKbdUp}{\ButtonUp}
 \newcommand{\ActionKbdDown}{\ButtonDown}
-\newcommand{\ActionKbdCursorLeft}{\ButtonFF{}+\ButtonLeft}
-\newcommand{\ActionKbdCursorRight}{\ButtonFF{}+\ButtonRight}
 \newcommand{\ActionKbdBackSpace}{\ButtonRew}
-\newcommand{\ActionKbdMorseInput}{Long \ButtonFF}
+\newcommand{\ActionKbdMorseInput}{\ButtonRecOn{} or \ButtonRecOff}
 \newcommand{\ActionKbdMorseSelect}{\ButtonPlay}
 %Button actions, Pitch Screen context
@@ -91,9 +92,9 @@
 %Button actions, Recording screen context
 \newcommand{\ActionRecNewfile}{\ButtonFF}
-\newcommand{\ActionRecMenu}{\ButtonRew}
+\newcommand{\ActionRecMenu}{Long \ButtonRew}
 \newcommand{\ActionRecPause}{\ButtonPlay}
-\newcommand{\ActionRecExit}{Long \ButtonRew{} or \ButtonRec}
+\newcommand{\ActionRecExit}{\ButtonRew{} or \ButtonRecOff}
 \newcommand{\ActionRecSettingsInc}{\ButtonRight}
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecPrev}{\ButtonUp}
@@ -124,6 +125,6 @@
 \newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
 \newcommand{\PluginRightRepeat}{Long \ButtonRight}
 \newcommand{\PluginCancel}{\ButtonRew}
-\newcommand{\PluginExit}{\ButtonFF}
+\newcommand{\PluginExit}{Long \ButtonRew}
 \newcommand{\PluginSelect}{\ButtonPlay}
 \newcommand{\PluginSelectRepeat}{Long \ButtonPlay}
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index a7ed48b96b..f24c92ea00 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -39,9 +39,8 @@ visit\\
       \opt{HAVEREMOTEKEYMAP}{& }
    & Hit (Draw new card) / Select\\
    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SAMSUNG_YH92X_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
-        ,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZE_PAD}{\ButtonRight}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
    \opt{MROBE100_PAD}{\ButtonDisplay}
@@ -54,7 +53,7 @@ visit\\
    \opt{RECORDER_PAD}{\ButtonFTwo}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
    \opt{IAUDIO_X5_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{ONDIO_PAD}{\ButtonUp}
    \opt{MROBE100_PAD}{\ButtonDown}
@@ -62,7 +61,6 @@ visit\\
    \opt{COWON_D2_PAD}{\ButtonMinus}
    \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
    \opt{MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Double down\\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -73,7 +71,7 @@ visit\\
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Pause game and go to menu / Cancel\\
    \end{btnmap}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 2f693eaf81..8065a5cbd4 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -56,7 +56,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
          }
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index dd011c0ddc..c760ab1937 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -55,9 +55,10 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
        & Delete last entered digit or clear after calculation\\
        %
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SAMSUNG_YH820_PAD}{
        \opt{RECORDER_PAD}{\ButtonFTwo}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Cycle through the 4 basic operators\\
        %
@@ -81,7 +82,8 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
        ,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBack}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index 96f91cfbc5..7df655accb 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -46,9 +46,11 @@ You can select what day is first day of week by the setting \setting{First Day o
    \opt{GIGABEAT_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp{} / \ButtonVolDown}
    \opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew{} / \ButtonFF}
+    \opt{IRIVER_H10_PAD}{\ButtonRew{} / \ButtonFF}
    \opt{COWON_D2_PAD}{\TouchBottomLeft{} / \TouchBottomRight}
    \opt{PBELL_VIBE500_PAD}{\ButtonMenu{} / \ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonUp{} / \ButtonDown}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp{} / \ButtonDown}
    \opt{MPIO_HD300_PAD}{\ButtonRec{} / \ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack{} / \ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
@@ -60,7 +62,8 @@ You can select what day is first day of week by the setting \setting{First Day o
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{COWON_D2_PAD}{\ButtonPower}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Quit\\
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 61badd88c6..9b3f38502f 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -18,11 +18,12 @@ used in any kind of game with up to ten players.
       \opt{HAVEREMOTEKEYMAP}{& }
      & Increase / decrease displayed Value\\
    %
-    \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{ONDIO_PAD}{\ButtonRight}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight{} or \ButtonPlay}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD200_PAD}{\ButtonFunc}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
@@ -37,7 +38,7 @@ used in any kind of game with up to ten players.
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonBack}
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft{} or \ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Move to previous screen\\
  \end{btnmap}
@@ -63,11 +64,11 @@ Keys are as follows:
    \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{\ButtonRec}
    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 5720faf96a..696da720f5 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -34,7 +34,7 @@ the game.
    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,MPIO_HD300_PAD}{Direction keys}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the cursor\\
-    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
@@ -44,7 +44,6 @@ the game.
    \opt{COWON_D2_PAD}{\TouchCenter}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pick up / Drop piece\\
    \opt{RECORDER_PAD}{\ButtonFOne}
@@ -61,19 +60,21 @@ the game.
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
    \opt{MPIO_HD300_PAD}{\ButtonRec}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew+\ButtonRight}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Change level\\
    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{ONDIO_PAD}{Long \ButtonMenu}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
-        ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+        ,MPIO_HD300_PAD}{\ButtonPlay}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect+\ButtonRight}
    \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp}
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{COWON_D2_PAD}{Long \TouchCenter}
    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRecOn{} or \ButtonRecOff}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Force play\\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -82,7 +83,7 @@ the game.
        ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{COWON_D2_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew+\ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Show the menu\\
    \end{btnmap}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 26fba78c39..7a0ce7e55b 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -43,7 +43,8 @@ The default keymappings are:
          ,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
            {\ButtonPower}
        \opt{GIGABEAT_S_PAD}{\ButtonBack}
-        \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+        \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
        \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
        \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
        \end{sideways}
@@ -51,6 +52,7 @@ The default keymappings are:
        % Key "0" 
        \begin{sideways}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
        \end{sideways}
        &
        % "Key "1"
diff --git a/manual/plugins/chopper.tex b/manual/plugins/chopper.tex
index 0dfdaa35d9..d0296cebcb 100644
--- a/manual/plugins/chopper.tex
+++ b/manual/plugins/chopper.tex
@@ -8,7 +8,7 @@
    \begin{btnmap}
      \opt{RECORDER_PAD}{\ButtonPlay}%
      \opt{ONDIO_PAD}{\ButtonUp{} / \ButtonMenu}
-      \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
+      \opt{IRIVER_H10_PAD}{\ButtonRight}
      \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,MROBE100_PAD%
        ,GIGABEAT_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
        {\ButtonSelect}
@@ -16,6 +16,7 @@
      \opt{GIGABEAT_S_PAD}{\ButtonSelect{} / \ButtonMenu}
      \opt{COWON_D2_PAD}{\ButtonPlus{} / \TouchBottomLeft}
      \opt{PBELL_VIBE500_PAD}{\ButtonPlay{} / \ButtonUp}
+      \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight{} / \ButtonUp}
      \opt{MPIO_HD300_PAD}{\ButtonEnter}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Make chopper fly\\
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index 86ae2da968..3e49ed5803 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -37,7 +37,8 @@ The more blocks you remove per turn, the more points you get.
      ,IAUDIO_X5_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{\ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Exit \\
  \end{btnmap}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 4435c81486..5791148cbc 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -7,7 +7,8 @@ This is a rotating cube screen saver in 3D.
    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{MROBE100_PAD}{\ButtonDisplay}
    \opt{COWON_D2_PAD}{\TouchBottomRight}
@@ -33,7 +34,8 @@ This is a rotating cube screen saver in 3D.
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown}
    \opt{COWON_D2_PAD}{\TouchTopRight}
    \opt{MPIO_HD200_PAD}{\ButtonRec}
@@ -69,7 +71,8 @@ This is a rotating cube screen saver in 3D.
        ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 865af457ea..be5ad23dbb 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -57,7 +57,8 @@ Rockdoom options, you will need to quit your current game and restart the plugin
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}%
    \opt{SANSA_FUZE_PAD}{pressing \ButtonHome}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{pressing \ButtonRec}
+    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{pressing \ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD}{flipping the \ButtonRec{} switch}
    \opt{SANSA_FUZEPLUS_PAD}{pressing \ButtonBack}
  \emph{New Game. } Start a new game\\
@@ -148,7 +149,8 @@ Rockdoom options, you will need to quit your current game and restart the plugin
      ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
  \opt{SANSA_FUZE_PAD}{\ButtonHome}
  \opt{COWON_D2_PAD}{\TouchTopLeft}
-  \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+  \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+  \opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch}
  \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
    & InGame Menu \\
@@ -160,7 +162,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
  \opt{COWON_D2_PAD}{\TouchCenter}
  \opt{PBELL_VIBE500_PAD}{\ButtonPower}
  \opt{MPIO_HD300_PAD}{Long \ButtonPlay}
-  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Enter \\
 %
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 4d6331750a..8aa8a293ba 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -17,13 +17,13 @@ a screen containing tokens of only one colour.
       \opt{HAVEREMOTEKEYMAP}{& }
 \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle{} / \TouchMidLeft{} / \TouchMidRight}
    & Move the cursor \\
-\opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
+\opt{PLAYER_PAD,RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
    ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
    ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}
    {\ButtonSelect}
-\opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
 \opt{COWON_D2_PAD}{\TouchCenter}
 \opt{PBELL_VIBE500_PAD}{\ButtonOK}
 \opt{MPIO_HD300_PAD}{\ButtonEnter}
@@ -41,8 +41,8 @@ a screen containing tokens of only one colour.
 \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
 \opt{COWON_D2_PAD}{\TouchTopRight}
-\opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
+\opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
-    {\ButtonPlay}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Shuffle \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
@@ -59,7 +59,7 @@ a screen containing tokens of only one colour.
 \opt{COWON_D2_PAD}{\TouchBottomLeft}
 \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD}{\ButtonMenu}
 \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Solve \\
 \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
@@ -78,7 +78,7 @@ a screen containing tokens of only one colour.
 \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
 \opt{MPIO_HD300_PAD}{\ButtonRec}
 \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
-\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF+\ButtonUp}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Solve step by step \\
 \opt{PLAYER_PAD}{\ButtonStop}
@@ -88,7 +88,8 @@ a screen containing tokens of only one colour.
    ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
 \opt{GIGABEAT_S_PAD}{\ButtonBack}
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/fractals.tex b/manual/plugins/fractals.tex
index 8c4b63b866..74a34fea68 100644
--- a/manual/plugins/fractals.tex
+++ b/manual/plugins/fractals.tex
@@ -52,7 +52,8 @@ This demonstration draws fractal images from the Mandelbrot set%
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
    \opt{MPIO_HD200_PAD}{\ButtonPlay + \ButtonVolDown}
    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonRew}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay + \ButtonDown}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonDown}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonDown}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Decrease iteration depth (less detail)\\
@@ -70,7 +71,8 @@ This demonstration draws fractal images from the Mandelbrot set%
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD200_PAD}{\ButtonPlay + \ButtonVolUp}
    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonFF}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay + \ButtonUp}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Increase iteration depth (more detail)\\
@@ -88,7 +90,8 @@ This demonstration draws fractal images from the Mandelbrot set%
    \opt{COWON_D2_PAD}{\TouchCenter}
    \opt{PBELL_VIBE500_PAD}{Long \ButtonCancel}
    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay + \ButtonRight}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonRight}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Reset and return to the default image\\
@@ -99,7 +102,8 @@ This demonstration draws fractal images from the Mandelbrot set%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 01d47f7111..2d17b14b66 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -53,9 +53,9 @@ view a bigger file you may need to stop playback.}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
    \opt{IRIVER_H10_PAD}{\ButtonPlay}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolUp}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonUp}
+    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonPlay}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonUp}
    \opt{touchscreen}{\TouchTopRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom in\\
@@ -67,9 +67,9 @@ view a bigger file you may need to stop playback.}
    \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
    \opt{MROBE100_PAD}{\ButtonPlay}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonDown}
+    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonDown}
    \opt{touchscreen}{\TouchTopLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom out\\
@@ -110,10 +110,13 @@ view a bigger file you may need to stop playback.}
    \opt{touchscreen}{\TouchBottomLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Previous image in directory\\
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{%currently only defined for the sansa pads
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD%
+      ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%currently only defined for the sansa pads and samsung yh*
       \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
       \opt{SANSA_CLIP_PAD}{\ButtonHome}
       \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlay}
+       \opt{SAMSUNG_YH92X_PAD}{\ButtonRec\ switch}
+       \opt{SAMSUNG_YH820_PAD}{Long \ButtonPlay}
         \opt{HAVEREMOTEKEYMAP}{& }
        & Toggle slide show mode\\
    }
@@ -140,7 +143,7 @@ view a bigger file you may need to stop playback.}
        \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
        \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonPlay}
            \opt{HAVEREMOTEKEYMAP}{& }
        & Quit the viewer \\
    }
diff --git a/manual/plugins/invadrox.tex b/manual/plugins/invadrox.tex
index 2f85ed5d92..275e13bb9f 100644
--- a/manual/plugins/invadrox.tex
+++ b/manual/plugins/invadrox.tex
@@ -30,7 +30,8 @@ increase speed, drop down and reverse direction after every pass!
    \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IAUDIO_X5_PAD%
        ,GIGABEAT_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_S_PAD%
        ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay{} or \ButtonUp}
    \opt{COWON_D2_PAD}{\TouchBottomMiddle, \TouchCenter{} or \ButtonMenu}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
@@ -43,7 +44,8 @@ increase speed, drop down and reverse direction after every pass!
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{COWON_D2_PAD}{\TouchTopLeft{} or \ButtonPower}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 760507e9b9..fca34eb91f 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -46,7 +46,7 @@ on the appropriate button.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
        & Adjust volume \\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SAMSUNG_YH820_PAD}{
      \ButtonRec
        \opt{HAVEREMOTEKEYMAP}{& }
        & Sync tap \\}
@@ -103,7 +103,7 @@ is different to enable navigation in the programmed track.
        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
        & Adjust volume \\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SAMSUNG_YH820_PAD}{
      \ButtonRec
        \opt{HAVEREMOTEKEYMAP}{& }
        & Sync tap \\}
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 6d28f71536..938762a88a 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -51,7 +51,8 @@ might experience ``Buffer miss!'' with many files, except simple ones.}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IAUDIO_X5_PAD%
        ,IRIVER_H10_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonPlay}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 5b1f75f060..307f4c8b85 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -51,7 +51,8 @@ the location of a mine, it can be tagged to avoid accidentally
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
      ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect}
-  \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+  \opt{IRIVER_H10_PAD}{\ButtonRew}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
  \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{Long \ButtonSelect{} / \ButtonVolUp}
  \opt{COWON_D2_PAD}{\TouchBottomLeft}
  \opt{PBELL_VIBE500_PAD}{\ButtonOK}
@@ -63,7 +64,7 @@ the location of a mine, it can be tagged to avoid accidentally
  \opt{ONDIO_PAD}{Long \ButtonMenu+\ButtonOff}
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
-  \opt{IAUDIO_X5_PAD}{\ButtonRec}
+  \opt{IAUDIO_X5_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
  \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonUp}
  \opt{SANSA_E200_PAD}{Long \ButtonRec}
  \opt{SANSA_FUZE_PAD}{\ButtonScrollBack}
@@ -72,7 +73,7 @@ the location of a mine, it can be tagged to avoid accidentally
  \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
  \opt{COWON_D2_PAD}{\TouchBottomRight}
  \opt{MPIO_HD300_PAD}{\ButtonMenu}
-  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+  \opt{SAMSUNG_YH92X_PAD}{Long \ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
  & Display the current game status \\
  %
@@ -82,7 +83,8 @@ the location of a mine, it can be tagged to avoid accidentally
  \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
  \opt{GIGABEAT_S_PAD}{\ButtonBack}
-  \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+  \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
  \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index b364ace838..4c406a65ac 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -22,8 +22,10 @@ option and choose \setting{mpegplayer}.
        \ButtonRight{} or \ButtonVolUp}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Adjust volume up / down\\
-    \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsSkipPrev{} / \ActionWpsSkipNext}
+    \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
+          \ActionWpsSkipPrev{} / \ActionWpsSkipNext}
    \opt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft{} / \ButtonRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Rewind / Fast Forward\\
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -31,7 +33,7 @@ option and choose \setting{mpegplayer}.
        {\ButtonMenu}
    \opt{IAUDIO_X5_PAD}{\ButtonRec}
    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Open the MPEG Player menu\\
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index b9a109084a..554e51cf66 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -23,7 +23,7 @@ being played.
    \opt{COWON_D2_PAD}{\TouchTopMiddle}
    \opt{MPIO_HD200_PAD}{\ButtonFunc}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Toggle filled / curve / plot \\
    \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -39,7 +39,8 @@ being played.
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Toggle whether to scroll or not \\
    \opt{RECORDER_PAD}{\ButtonFThree}
@@ -56,12 +57,13 @@ being played.
    \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonUp}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Toggle drawing orientation \\
    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
        ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
-        ,SANSA_FUZEPLUS_PAD}%
+        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
        {\ButtonPlay}
    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -70,7 +72,6 @@ being played.
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{MROBE100_PAD}{\ButtonDisplay}
    \opt{COWON_D2_PAD}{\TouchCenter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pause the demo \\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD%
@@ -90,7 +91,7 @@ being played.
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonRight{} / \ButtonLeft}
    \opt{COWON_D2_PAD}{\TouchMidRight\ /\ \TouchMidLeft}
-    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF / \ButtonRew}
+    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF{} / \ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Increase / decrease speed\\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -100,8 +101,9 @@ being played.
        {\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{MPIO_HD200_PAD}{\ButtonRec+\ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{&
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 01fa63de28..6c4cd4e8dc 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -97,7 +97,8 @@ found at \url{http://www.mame.net}.
    \opt{SANSA_E200_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{\ButtonHome}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Menu\\
 \end{btnmap}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index cee50dd202..f82d0644c8 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -54,7 +54,7 @@ block and crosses which allow you to choose a replacement block.
    \opt{MPIO_HD200_PAD}{\ButtonRec}
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
    \opt{touchscreen}{\TouchTopRight}
        &
    \opt{HAVEREMOTEKEYMAP}{
@@ -74,7 +74,8 @@ block and crosses which allow you to choose a replacement block.
    \opt{COWON_D2_PAD}{\TouchBottomLeft}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD200_PAD}{\ButtonPlay + \ButtonFF}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
        &
    \opt{HAVEREMOTEKEYMAP}{
        &}
@@ -92,8 +93,9 @@ block and crosses which allow you to choose a replacement block.
        \opt{MROBE100_PAD}{\ButtonDisplay}
        \opt{touchscreen}{\TouchBottomRight}
        \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
-        \opt{MPIO_HD200_PAD}{\ButtonPlay + \ButtonRew}
+        \opt{MPIO_HD200_PAD}{\ButtonPlay{} + \ButtonRew}
-        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonRew}
+        \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonDown}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
            &
        \opt{HAVEREMOTEKEYMAP}{
            &}
@@ -108,7 +110,8 @@ block and crosses which allow you to choose a replacement block.
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
        &
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 1a32a08ea4..5e8d6c0b36 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -24,8 +24,7 @@ aware:
 \subsubsection{Keys}
    \begin{btnmap}
-        \opt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
+        \opt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{%
-            ,SAMSUNG_YH820_PAD}{
            \ActionStdPrev{} / \ActionStdNext
                &
            \opt{HAVEREMOTEKEYMAP}{
@@ -35,8 +34,7 @@ aware:
        }
        
        % only scroll wheel and `strip' targets use the same action in album and track list
-        \nopt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
+        \nopt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{%
-             ,SAMSUNG_YH820_PAD}{%
            % currently the M3 does not use buttons of the main unit which has no display
            \nopt{IAUDIO_M3_PAD,MPIO_HD200_PAD,touchscreen}{\ButtonLeft{} / \ButtonRight}
            \opt{MPIO_HD200_PAD}{FIXME}
@@ -65,7 +63,8 @@ aware:
                 ,SAMSUNG_YH820_PAD}
                 {\ButtonSelect}
            \opt{ONDIO_PAD}{\ButtonUp} 
-            \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight} 
+            \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
            \opt{RECORDER_PAD}{\ButtonOn} 
            \opt{touchscreen}{\TouchCenter}
            \opt{SANSA_FUZE_PAD}{\ButtonRight}
@@ -78,12 +77,13 @@ aware:
            \opt{GIGABEAT_RC_PAD}{\ButtonRCFF}
            &}
        Enter track list
-            \nopt{ONDIO_PAD}{/ Play album from selected track}
+            \nopt{ONDIO_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
+            / Play album from selected track}
            \\
-            
+        % Ondio & Samsung YH use a different button in album list and track list
-        % Ondio uses a different button in album list and track list
+        \opt{ONDIO_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
-        \opt{ONDIO_PAD}{
+            \opt{ONDIO_PAD}{\ButtonMenu}
-            \ButtonMenu
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
                &
            Play album from selected track in track list
                \\
@@ -104,7 +104,9 @@ aware:
            \\
        \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD}{\ActionStdMenu}
+        \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu}
            \opt{SANSA_FUZEPLUS_PAD}{long \ButtonSelect}
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
            &
        \opt{HAVEREMOTEKEYMAP}{
            \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu}
@@ -119,7 +121,8 @@ aware:
            \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
            \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
            \opt{SANSA_FUZE_PAD}{Long \ButtonHome} 
-            \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+            \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{long \ButtonRew}
            \opt{MPIO_HD200_PAD}{FIXME}
            \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
            \opt{touchscreen}{
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index 53dbc61a51..f8ea79f9d5 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -38,25 +38,25 @@ a two player game, both players should just press the appropriate buttons for th
    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{IAUDIO_X5_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
    \opt{IRIVER_H10_PAD}{\ButtonRew}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
    \opt{MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
    \opt{COWON_D2_PAD}{\TouchTopRight}
-    \opt{MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}{\ButtonFF}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Right player up\\
    \opt{RECORDER_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonRight}
    \opt{ONDIO_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
    \opt{MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
    \opt{COWON_D2_PAD}{\TouchBottomRight}
    \opt{MPIO_HD300_PAD}{\ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Right player down\\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -65,7 +65,9 @@ a two player game, both players should just press the appropriate buttons for th
      ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{\ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD}{Long \ButtonPlay}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Quit\\
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 1a17f22466..56afa5258a 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -8,7 +8,7 @@ gain points. For every ten lines completed, the game level increases, making
 the blocks fall faster. If the pile of blocks reaches the ceiling, the game is over.
 \begin{btnmap}
-    \nopt{SANSA_FUZEPLUS_PAD}{
+    \nopt{SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}{
        \opt{RECORDER_PAD}{\ButtonFOne}
        \opt{PLAYER_PAD}{\ButtonStop+\ButtonMenu}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -23,7 +23,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
        \opt{COWON_D2_PAD}{\ButtonMenu}
        \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
        \opt{MPIO_HD300_PAD}{\ButtonRec}
-        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
           \opt{HAVEREMOTEKEYMAP}{& }
            & Restart game\\
    }
@@ -57,7 +57,8 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
    \opt{COWON_D2_PAD}{\TouchBottomMiddle}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Move down\\
    \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
@@ -116,7 +117,9 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 6eafbcb234..abb455c08b 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -101,7 +101,8 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD%
        ,MPIO_HD300_PAD}{\ButtonMenu}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRecOn}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Open Rockboy menu\\
 \end{btnmap}
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index 8ecbce431d..0f38edca6e 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -111,7 +111,8 @@ if you select Exit, so any unsaved changes will be lost.}
        \opt{IRIVER_H300_PAD}{\ButtonOff}
        \opt{GIGABEAT_S_PAD}{\ButtonBack}
        \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-        \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+        \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
          \opt{HAVEREMOTEKEYMAP}{& }
        & Quits Rockpaint immediately.\\
    }
@@ -134,7 +135,7 @@ if you select Exit, so any unsaved changes will be lost.}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}%
    \opt{IRIVER_H10_PAD}{\ButtonPlay}%
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}%
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
      \opt{HAVEREMOTEKEYMAP}{& }
    & Displays the Main Menu.\\
@@ -143,11 +144,13 @@ if you select Exit, so any unsaved changes will be lost.}
    \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonLeft}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft{} or \ButtonBottomRight}
    \opt{touchscreen}{\TouchBottomLeft}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonRec}%
+    \opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}%
      \opt{HAVEREMOTEKEYMAP}{& }
    & Displays the toolbar.\\
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 5e15160eab..b0021383f3 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -34,7 +34,8 @@ Key controls:
  \opt{SANSA_CLIP_PAD}{\ButtonHome}
  \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonDown}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
-  \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+  \opt{IRIVER_H10_PAD}{\ButtonRew}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
  \opt{COWON_D2_PAD}{\TouchBottomLeft}
  \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
  \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
@@ -45,7 +46,7 @@ Key controls:
  \opt{RECORDER_PAD}{\ButtonFTwo}
  \opt{ONDIO_PAD}{\ButtonMenu}
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
  \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
  \opt{GIGABEAT_PAD}{\ButtonA}
@@ -53,7 +54,7 @@ Key controls:
  \opt{GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
  \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
  \opt{COWON_D2_PAD}{\TouchCenter}
-  \opt{MPIO_HD300_PAD}{\ButtonPlay}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,MPIO_HD300_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
  & Switch between pictures (default puzzle\opt{albumart}{, album art}, and your own image if
 launched via Open With), and numbered tiles \\
@@ -64,7 +65,8 @@ launched via Open With), and numbered tiles \\
  \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
  \opt{GIGABEAT_S_PAD}{\ButtonBack}
-  \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+  \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+  \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
  \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 80db0a65b3..6e969fc5a7 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -29,7 +29,7 @@ end when the snake touches either the borders of the screen or itself.
     & Toggle Play/Pause\\
    %
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Go to the plugin's menu\\
 \end{btnmap}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index f017bd4103..9801e2dc53 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -35,7 +35,8 @@ into itself.
        ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
  \opt{HAVEREMOTEKEYMAP}{& }
        & Quit\\
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 8b0f5c27ee..0d65a1cc0e 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -39,7 +39,8 @@ information about the level format, see
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
 \opt{GIGABEAT_S_PAD,COWON_D2_PAD}{\ButtonMenu}
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{&
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
@@ -56,8 +57,9 @@ information about the level format, see
    \opt{GIGABEAT_S_PAD}{\ButtonPrev}
    \opt{COWON_D2_PAD}{\ButtonMinus}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonLeft}
-    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonRew}
+    \opt{MPIO_HD300_PAD}{\ButtonPlay+\ButtonRew}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay + \ButtonDown}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonDown}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Back to previous level \\
 }
@@ -66,13 +68,14 @@ information about the level format, see
    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonRight}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRight}
    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonRight}
    \opt{GIGABEAT_S_PAD}{\ButtonPlay}
    \opt{COWON_D2_PAD}{\TouchTopRight}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonCancel}
-    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonEnter}
+    \opt{MPIO_HD300_PAD}{\ButtonPlay+\ButtonEnter}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Restart level \\
@@ -89,8 +92,9 @@ information about the level format, see
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}
    \opt{COWON_D2_PAD}{\ButtonPlus}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK+\ButtonRight}
-    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonFF}
+    \opt{MPIO_HD300_PAD}{\ButtonPlay+\ButtonFF}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay + \ButtonUp}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay+\ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Go to next level \\
 }
@@ -165,7 +169,8 @@ information about the level format, see
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
 \opt{GIGABEAT_S_PAD,COWON_D2_PAD}{\ButtonMenu}
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Quit \\
 \end{btnmap}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index cf3084838d..e23e92fbc7 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -77,7 +77,8 @@ visit
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
    \opt{MPIO_HD300_PAD}{\ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF + \ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonDown}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonDown}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card from the top of the remains stack on top of the cursor\\
    %
@@ -93,7 +94,8 @@ visit
    \opt{COWON_D2_PAD}{\TouchBottomLeft}
    \opt{PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
    \opt{MPIO_HD300_PAD}{\ButtonRec}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card under the cursor on one of the 4 final colour stacks.\\
    %
@@ -109,7 +111,8 @@ visit
    \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp}
    \opt{COWON_D2_PAD}{\TouchBottomRight}
    \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD}{Long \ButtonPlay}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew + \ButtonLeft}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonPlay{} + \ButtonRight}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonRight}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card on top of the remains stack on one of the final colour stacks.\\
    %
@@ -119,7 +122,8 @@ visit
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 94324e1388..aeb53420fe 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -75,7 +75,8 @@ UFO will appear -- shoot this for extra points.
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 511def3b1b..3cb7f078cc 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -73,7 +73,8 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{COWON_D2_PAD}{\TouchBottomLeft}
    \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonRew}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonDown}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Previous level\\
    \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -88,7 +89,7 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{COWON_D2_PAD}{\TouchBottomRight}
    \opt{MPIO_HD300_PAD}{Long \ButtonPlay}
    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonBack}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew + \ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Reset level \\
    \opt{RECORDER_PAD}{\ButtonFThree}
@@ -102,7 +103,8 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{COWON_D2_PAD}{\TouchTopLeft}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD300_PAD}{\ButtonPlay + \ButtonFF}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonUp}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Next level \\
    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
@@ -111,7 +113,8 @@ could not otherwise reach. The block cannot take ``o''s.
        ,GIGABEAT_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
      \opt{HAVEREMOTEKEYMAP}{& 
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 0903ea7e31..68521118f8 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -11,7 +11,8 @@ A simple stopwatch program with support for saving times.
        ,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& 
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index 98f241b8f3..ecb73b1520 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -57,7 +57,7 @@ settings.
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD200_PAD}{\ButtonFunc}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF{} / \ButtonRew}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Change number under the cursor\\
    %
@@ -75,7 +75,7 @@ settings.
    \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
    \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
    \opt{MPIO_HD300_PAD}{Long \ButtonEnter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF{} / Long \ButtonRew}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Constantly changing the number under the cursor\\
    %
@@ -84,12 +84,13 @@ settings.
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
      ,COWON_D2_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
    \opt{SANSA_E200_PAD}{\ButtonSelect}
    \opt{SANSA_FUZE_PAD}{\ButtonHome}
    \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonPower}
-    \opt{MPIO_HD200_PAD}{\ButtonRec}
+    \opt{MPIO_HD200_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
+    \opt{SAMSUNG_YH92X_PAD}{Long \ButtonPlay}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Open Menu\\
    %
@@ -99,12 +100,11 @@ settings.
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
    \opt{SANSA_FUZE_PAD}{\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD%
-        ,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
+        ,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{IRIVER_H10_PAD}{\ButtonFF}
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{MROBE100_PAD}{\ButtonDisplay}
    \opt{COWON_D2_PAD}{Long \TouchBottomLeft}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Add/Remove number to scratchpad\\
    %
@@ -112,10 +112,10 @@ settings.
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Menu $\rightarrow$ Quit}
    \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD}{Long \ButtonPower}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
+    \opt{MPIO_HD200_PAD}{\ButtonRec+\ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Quit\\
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index d940756df3..7379176aaf 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -49,7 +49,7 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{MPIO_HD300_PAD}{\ButtonRew}
    \opt{touchscreen}{\TouchMidLeft}
    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
-         ,MPIO_HD300_PAD}{\ButtonLeft}
+         ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCLeft}
    }
@@ -62,7 +62,7 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{MPIO_HD300_PAD}{\ButtonFF}
    \opt{touchscreen}{\TouchMidRight}
    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
-         ,MPIO_HD300_PAD}{\ButtonRight}
+         ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCRight}
    }
@@ -71,44 +71,54 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
        ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD%
-        ,GIGABEAT_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{%
+        ,GIGABEAT_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+        ,SAMSUNG_YH820_PAD}{%
        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
        \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack}
        \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonUp}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonUp}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolUp}
+        \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonUp}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
    \opt{HAVEREMOTEKEYMAP}{& }
        & One line up\\
    }
    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
        ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD%
-        ,GIGABEAT_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}{%
+        ,GIGABEAT_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+        ,SAMSUNG_YH820_PAD}{%
        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
        \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
        \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonDown}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonDown}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
+        \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonDown}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
    \opt{HAVEREMOTEKEYMAP}{& }
        & One line down\\
    }
    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,%
-        GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{
+        GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
        \opt{GIGABEAT_S_PAD}{\ButtonLeft}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
+        \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonLeft}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonLeft}
    \opt{HAVEREMOTEKEYMAP}{& }
        & One column left\\
    }
    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,%
-        GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{
+        GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
        \opt{GIGABEAT_S_PAD}{\ButtonRight}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
+        \opt{SAMSUNG_YH92X_PAD}{\ButtonFF+\ButtonRight}
+        \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRight}
    \opt{HAVEREMOTEKEYMAP}{& }
        & One column right\\
    }
@@ -123,9 +133,10 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
    \opt{SANSA_FUZE_PAD}{\ButtonDown+\ButtonSelect}
    \opt{MROBE100_PAD}{\ButtonDisplay}
+    \opt{SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{SAMSUNG_YH92X_PAD}{\ButtonRecOn{} or \ButtonRecOff}
    \opt{MPIO_HD200_PAD}{FIXME}
    \opt{touchscreen}{\TouchCenter}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCMode}
    }
@@ -136,12 +147,13 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
    \opt{IAUDIO_X5_PAD}{\ButtonRec}
    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown+\ButtonSelect}
    \opt{COWON_D2_PAD}{\ButtonMenu+\ButtonPlus}
    \opt{SANSA_FUZE_PAD}{\ButtonUp+\ButtonSelect}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{PBELL_VIBE500_PAD}{\ButtonPower}
    \opt{MPIO_HD200_PAD}{\ButtonRec}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
@@ -158,10 +170,9 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD}{\ButtonSelect}
    \opt{SANSA_FUZE_PAD}{Long \ButtonSelect}
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{COWON_D2_PAD}{\ButtonMenu{} / }%
    \opt{MPIO_HD200_PAD}{\ButtonFunc}
-    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{touchscreen}{\TouchTopRight}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCPlay}
@@ -177,7 +188,8 @@ by using \emph{Open with} from the \emph{Context Menu}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{COWON_D2_PAD}{\ButtonPower{} / }%
    \opt{touchscreen}{\TouchTopLeft}
-    \opt{IAUDIO_M3_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{IAUDIO_M3_PAD,PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
    \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
    \opt{HAVEREMOTEKEYMAP}{&
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 2d986824a7..22d5bcc2d5 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -16,7 +16,8 @@ and the meter scale can be changed.
     ,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower}
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
 \opt{GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonBack}
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
 \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
  \opt{HAVEREMOTEKEYMAP}{&
@@ -42,7 +43,8 @@ and the meter scale can be changed.
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
     ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
 \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
-\opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
+\opt{IRIVER_H10_PAD}{\ButtonRew}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
 \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD%
    ,MPIO_HD300_PAD}{\ButtonMenu}
 \opt{MPIO_HD200_PAD}{\ButtonFunc}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 9ccc49f319..fd02fa8110 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -152,7 +152,8 @@ There are two ways to stop a running game.
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}%
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}%
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}%
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}%
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
 \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}%
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}%
 \opt{GIGABEAT_S_PAD}{\ButtonBack}.
@@ -165,7 +166,7 @@ The game will stop immediately and you will return to the game menu.
 \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}%
 \opt{GIGABEAT_PAD}{\ButtonA}%
 \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
-\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}%
 \opt{MPIO_HD200_PAD}{Long \ButtonFunc}%
 \opt{MPIO_HD300_PAD}{Long \ButtonPlay}%
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}.
@@ -177,7 +178,7 @@ This freezes the game. If you hit
 \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}%
 \opt{GIGABEAT_PAD}{\ButtonA}%
 \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
-\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}%
 \opt{MPIO_HD200_PAD}{Long \ButtonFunc}%
 \opt{MPIO_HD300_PAD}{Long \ButtonPlay}%
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
@@ -187,7 +188,8 @@ games menu you can hit
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonPower}%
 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-\opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}%
+\opt{PBELL_VIBE500_PAD}{\ButtonRec}%
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
 \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}%
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}%
 \opt{GIGABEAT_S_PAD}{\ButtonBack}. A stopped game can not be resumed. 
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index a678565395..1be543ccdf 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -41,7 +41,8 @@ To finish a level you have to section off more than 75\%.
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
+    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Open menu\\
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index b5d151f474..9bb8fe9b77 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -226,7 +226,7 @@ example when renaming a file or creating a new directory.
 \begin{btnmap}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
        ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD%
-        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
+        ,SAMSUNG_YH820_PAD}{
        \ActionKbdCursorLeft{} / \ActionKbdCursorRight
            &
        \opt{HAVEREMOTEKEYMAP}{\ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index edd0a776db..f11246f162 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -504,9 +504,8 @@ detail in the following paragraph.
  There are three buttons at the top of the right hand side of the \dap{}: \ButtonFF{} on the top, 
  \ButtonPlay{} in the middle and \ButtonRew{} underneath. Below these buttons is the \ButtonRec{}
-  switch. When the \ButtonRec{} switch is moved towards the top of the \dap{}, it acts like
+  switch. Rockbox doesn't take note of the actual \emph{position} of the switch, but reacts to a 
-  a pressing regular button, but it blocks other actions in this position, so it have to be set 
+  \emph{switching movement} like pressing a regular button.
-  back by the user.
  On the top panel of the \dap{}, from left to right, you can find the following: headphone/remote 
  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the