43 files changed, 209 insertions, 668 deletions
diff --git a/manual/plugins/alpinecdc.tex b/manual/plugins/alpinecdc.tex
deleted file mode 100644
index 09e5a81b89..0000000000
--- a/manual/plugins/alpinecdc.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-\subsection{Alpine CD changer emulator}
-This plugin emulates an Alpine CD changer. It allows to plug the Archos to a
-compatible head unit and control the playback from there, too. Currently
-implemented is track change, shuffle, seek, but no disk change. The plugin is a
-TSR, meaning it silently operates in the background once started. It will keep
-doing so until a new plugin is started.
-Alpine also did M-Bus as OEM for other brands (Honda, Acura, Volvo, BMW, etc.)
-Nowadays Alpine uses a different protocol, called Ai-Net, not supported by this
-plugin. (As well as all other protocols, please do not ask for such!)
-\subsubsection{The cable}
-Hookup to Archos works by connecting the headphone output including the remote
-pin (you need a 4-ring 3.5 mm plug for that) to the changer jack of the radio.
-M-Bus radios have a DIN-style circular jack with 8 pins (7 in a $\sim$ 270 degree
-circle, one in the center). A standard 5-pin DIN plug is OK for this, since we
-do not use the other (power) pins.
-As OEM, they shuffled the pins around a bit, better check first if it is not
-genuine Alpine. The bus pin is pulled high to 12 volts with a $\sim$ 2kOhm resistor,
-pulses driven low. Because it is open collector, this is not harmful to the
-Archos.\\
-ASCII art of the 4-pin headphone plug:
-\begin{verbatim}
-/ \
-\_/ left    -> Alpine pin 5
-|_| right   -> Alpine pin 4
-|_| remote  -> Alpine pin 1
-|_| ground  -> Alpine pin 2 + 3
-\end{verbatim}
-The remote pin can be programmed bidirectional, that is the reason this works.
-Very luckily the M-Bus uses a single wire communication and the two radios I
-tried are happy with the 3.3 Volt level the Archos can deliver. So the
-connection is a simple cable! For all protocols requiring more lines, an
-external controller would be necessary.
-\note{Archos FMs do not have the remote pin internally connected, but
-  one unit that was opened was internally prepared for it, a matter of closing a
-  bridge.} 
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index f24c92ea00..03fad7b84f 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -13,7 +13,7 @@ visit\\
 \url{http://www.blackjackinfo.com/blackjack-rules.php}
    \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SANSA_CLIP_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonLeft{} / \ButtonRight{} / \ButtonUp{} / \ButtonDown}
@@ -26,22 +26,20 @@ visit\\
    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Enter betting amount\\
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,SAMSUNG_YH92X_PAD%
+    \opt{IRIVER_H10_PAD,GIGABEAT_S_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,MROBE100_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD%
        }{\ButtonSelect}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{COWON_D2_PAD}{\TouchTopRight}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Hit (Draw new card) / Select\\
-    \opt{RECORDER_PAD}{\ButtonFOne}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_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{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}
    \opt{COWON_D2_PAD}{\TouchBottomLeft}
@@ -50,12 +48,10 @@ visit\\
    \opt{MPIO_HD300_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Stay (End hand)\\
-    \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,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{ONDIO_PAD}{\ButtonUp}
    \opt{MROBE100_PAD}{\ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
    \opt{COWON_D2_PAD}{\ButtonMinus}
@@ -63,7 +59,7 @@ visit\\
    \opt{MPIO_HD300_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Double down\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 8065a5cbd4..b6195842a3 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -22,7 +22,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
 \end{table}
    \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    \opt{IAUDIO_X5_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD%
        ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -36,8 +36,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
    \opt{MPIO_HD300_PAD}{\ButtonRew{} / \ButtonFF{}}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Moves the paddle\\
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay\ / \ButtonUp}
+    \opt{IAUDIO_X5_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay\ / \ButtonUp}
-    \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
      ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect\ / \ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD%
@@ -48,7 +47,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
    \opt{MPIO_HD300_PAD}{\ButtonEnter{}}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Release the ball / Fire\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index c9722624d5..126a42c5f9 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -9,8 +9,8 @@ entire board is shifted down every time a certain number of shots have been
 fired. Points are awarded depending on how quickly the level was completed.
    \begin{btnmap}
-    \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \nopt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
        & Pause game\\
@@ -19,8 +19,8 @@ fired. Points are awarded depending on how quickly the level was completed.
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
        & Aim the bubble\\
-    \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
+    \nopt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
        & Fire bubble\\
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index c760ab1937..0daacc3158 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -7,12 +7,12 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
 other available math functions.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
+    \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,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD%
      ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonLeft{} / \ButtonRight{} /}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
      ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonUp{} / \ButtonDown}
@@ -25,8 +25,6 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move around the keypad\\
    %
-    \opt{RECORDER_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%
        ,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -39,8 +37,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
       \opt{HAVEREMOTEKEYMAP}{& }
    & Select a button\\
    %
-    \nopt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
-        \opt{RECORDER_PAD}{\ButtonFOne}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
            ,SANSA_C200_PAD,MPIO_HD200_PAD}{\ButtonRec}
        \opt{SANSA_CLIP_PAD,SANSA_FUZE_PAD}{\ButtonHome}
@@ -55,16 +52,13 @@ 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,SAMSUNG_YH820_PAD}{
+    \opt{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\\
        %
    }
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{Long \ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD
        ,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD}
@@ -76,7 +70,7 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
       \opt{HAVEREMOTEKEYMAP}{& }
    & Calculate\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index 7df655accb..fb4291f250 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -8,12 +8,12 @@ yearly, monthly, and weekly memos.
 You can select what day is first day of week by the setting \setting{First Day of Week} in the menu.
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,IPOD_4G_PAD%
        ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonLeft{} / \ButtonRight{} /}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonUp{} / \ButtonDown}
@@ -24,7 +24,6 @@ You can select what day is first day of week by the setting \setting{First Day o
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the selector\\
    %
-    \opt{RECORDER_PAD}{\ButtonPlay}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD%
        ,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -38,7 +37,6 @@ You can select what day is first day of week by the setting \setting{First Day o
    \opt{MPIO_HD300_PAD}{\ButtonRew / \ButtonFF
    & Previous / Next week\\}
    %
-    \opt{RECORDER_PAD}{\ButtonOn{} + \ButtonUp{} / \ButtonDown}
    \opt{MROBE100_PAD}{\ButtonMenu{} + \ButtonUp{} / \ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} / \ButtonRec}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay{} / \ButtonMenu}
@@ -56,7 +54,7 @@ You can select what day is first day of week by the setting \setting{First Day o
       \opt{HAVEREMOTEKEYMAP}{& }
    & Previous / Next month\\
    %
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 9b3f38502f..e6efef8cce 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -6,10 +6,10 @@ used in any kind of game with up to ten players.
 \subsubsection{Setup}
  \begin{btnmap}
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
        {\ButtonRight{} / \ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack{} / \ButtonScrollFwd}
@@ -18,9 +18,8 @@ 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}{\ButtonPlay}
+    \opt{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}
@@ -30,9 +29,8 @@ used in any kind of game with up to ten players.
       \opt{HAVEREMOTEKEYMAP}{& }
      & Move to next screen\\
    %
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IAUDIO_X5_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
@@ -60,8 +58,6 @@ time left if different).
 Keys are as follows:
  \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonOn}
-    \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,PBELL_VIBE500_PAD}{\ButtonRec}
@@ -74,8 +70,7 @@ Keys are as follows:
       \opt{HAVEREMOTEKEYMAP}{& }
      & Exit plugin \\
    %
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IAUDIO_X5_PAD}{\ButtonPower}
    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
@@ -87,9 +82,8 @@ Keys are as follows:
       \opt{HAVEREMOTEKEYMAP}{& }
      & Restart round for the current player \\
    %
-    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonRight}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,MROBE100_PAD,SANSA_FUZE_PAD}
        {\ButtonSelect}
@@ -98,18 +92,18 @@ Keys are as follows:
       \opt{HAVEREMOTEKEYMAP}{& }
      & Pause the time (press again to continue) \\
    %
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZE_PAD}{\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Switch to next player \\
    %
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
@@ -118,9 +112,8 @@ Keys are as follows:
       \opt{HAVEREMOTEKEYMAP}{& }
      & Switch to previous player \\
    %
-    \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{\ButtonMenu}
-    \opt{RECORDER_PAD}{\ButtonFOne}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
    \opt{IAUDIO_X5_PAD}{\ButtonSelect}
    \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
@@ -130,9 +123,9 @@ Keys are as follows:
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
      & Open menu %
-        \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}%
+        \opt{IRIVER_H10_PAD}{(\ButtonPlay\ to select.)}%
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}%
-        \opt{ONDIO_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{(\ButtonRight\ to select.)}%
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{(\ButtonRight\ to select.)}%
        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
            ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
            {(\ButtonSelect\ to select.)}%
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 696da720f5..bf90b9974f 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -23,10 +23,6 @@ you resume the game. The menu also allows the user to reload the last game
 saved, save the current position and start a new game without having to quit
 the game.
-\opt{archosrecorder,archosfmrecorder,ondio}{
-\note{This plugin will stop playback.}
-}
 \subsubsection{Keys}
    \begin{btnmap}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
@@ -34,8 +30,7 @@ the game.
    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,MPIO_HD300_PAD}{Direction keys}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the cursor\\
-    \opt{RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{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%
        ,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -46,8 +41,6 @@ the game.
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pick up / Drop piece\\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
@@ -63,8 +56,7 @@ the game.
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Change level\\
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{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}{\ButtonPlay}
@@ -77,7 +69,7 @@ the game.
    \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Force play\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
        ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 977db20b5a..acad55ef87 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -37,7 +37,7 @@ The default keymappings are:
        &
        % key "off"
        \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
        \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
          ,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -58,8 +58,7 @@ The default keymappings are:
        % "Key "1"
        \begin{sideways}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
-        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{SANSA_FUZEPLUS_PAD}{\ButtonUp}
-        \opt{ONDIO_PAD,SANSA_FUZEPLUS_PAD}{\ButtonUp}
        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
        \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRew}
        \end{sideways}
@@ -69,7 +68,7 @@ The default keymappings are:
        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
            {\ButtonScrollBack}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
-          ,RECORDER_PAD,ONDIO_PAD,SANSA_FUZEPLUS_PAD,GIGABEAT_S_PAD%
+          ,SANSA_FUZEPLUS_PAD,GIGABEAT_S_PAD%
          ,MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
        \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
        \opt{SANSA_C200_PAD}{\ButtonVolUp}
@@ -78,7 +77,6 @@ The default keymappings are:
        &
        % Key "3"
        \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonFThree}
        \opt{MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}
        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown}
        \opt{MPIO_HD200_PAD}{\ButtonFunc}
@@ -87,7 +85,7 @@ The default keymappings are:
        &
        % Key "4"
        \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
            ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -98,8 +96,6 @@ The default keymappings are:
        &
        % Key "5"
        \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonPlay}
-        \opt{ONDIO_PAD}{\ButtonMenu}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
            ,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -113,7 +109,7 @@ The default keymappings are:
        &
        % Key "6"
        \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
            ,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
            ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
            ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -124,7 +120,6 @@ The default keymappings are:
        &
        % Key "7"
        \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonFTwo}
        \opt{MROBE100_PAD}{\ButtonDisplay}
        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp}
        \opt{MPIO_HD200_PAD}{\ButtonVolUp}
@@ -134,7 +129,7 @@ The default keymappings are:
        &
        % Key "8"
        \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
            ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
            ,SAMSUNG_YH820_PAD}{\ButtonDown}
        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
@@ -146,7 +141,6 @@ The default keymappings are:
        &
        % Key "9"
        \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonOn}
        \opt{GIGABEAT_PAD}{\ButtonA}
        \opt{GIGABEAT_S_PAD}{\ButtonPlay}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
diff --git a/manual/plugins/chopper.tex b/manual/plugins/chopper.tex
index d0296cebcb..104b11f465 100644
--- a/manual/plugins/chopper.tex
+++ b/manual/plugins/chopper.tex
@@ -6,8 +6,6 @@
  ceiling, or the floor. How long can you fly your chopper?
    \begin{btnmap}
-      \opt{RECORDER_PAD}{\ButtonPlay}%
-      \opt{ONDIO_PAD}{\ButtonUp{} / \ButtonMenu}
      \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}
@@ -21,7 +19,7 @@
       \opt{HAVEREMOTEKEYMAP}{& }
      & Make chopper fly\\
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
      \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,MROBE100_PAD,SANSA_E200_PAD%
          ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
      \opt{SANSA_FUZE_PAD}{\ButtonHome}
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index 3e49ed5803..4752bd1204 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -7,12 +7,12 @@ The more blocks you remove per turn, the more points you get.
  \begin{btnmap}
    \nopt{touchscreen}{
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    \opt{IRIVER_H10_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
      ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
      ,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD%
      ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonLeft/\ButtonRight/}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
      ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD%
      ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
      ,SAMSUNG_YH820_PAD}
@@ -21,8 +21,7 @@ The more blocks you remove per turn, the more points you get.
    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the cursor around the blocks \\
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_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,SANSA_E200_PAD%
      ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD%
      ,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}
@@ -31,7 +30,7 @@ The more blocks you remove per turn, the more points you get.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Remove a block \\
    }
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
      {\ButtonOff}
    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD%
      ,IAUDIO_X5_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index 5791148cbc..206819be08 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -2,8 +2,6 @@
 \screenshot{plugins/images/ss-cube}{Cube}{img:cube}
 This is a rotating cube screen saver in 3D.
 \begin{btnmap}
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \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}
@@ -18,19 +16,17 @@ This is a rotating cube screen saver in 3D.
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Display at maximum frame rate\\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+    \opt{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,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{GIGABEAT_PAD}{\ButtonSelect}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{\ButtonUp}
    \opt{COWON_D2_PAD}{\TouchCenter}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Pause\\
-    \opt{PLAYER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
        {\ButtonMenu}
-    \opt{RECORDER_PAD}{\ButtonFThree}
    \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}
@@ -42,18 +38,16 @@ This is a rotating cube screen saver in 3D.
    \opt{MPIO_HD300_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Cycle draw mode\\
-    \opt{ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,RECORDER_PAD%
+    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,%
        ,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
        ,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonRight{} / \ButtonLeft}
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight{} / \ButtonOn+\ButtonLeft}
    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
    \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRew / \ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Select axis to adjust\\
-    \opt{PLAYER_PAD}{\ButtonRight{} / \ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
@@ -64,8 +58,7 @@ This is a rotating cube screen saver in 3D.
    \opt{MPIO_HD300_PAD}{\ButtonScrollDown / \ButtonScrollUp}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Change speed/angle (speed can not be changed while paused)\\
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 8aa8a293ba..70830c0b8f 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -6,8 +6,7 @@ above, below, left and right of the cursor.  The aim is to end up with
 a screen containing tokens of only one colour.
 \begin{btnmap}
-\opt{PLAYER_PAD}{\ButtonOn{} / \ButtonMenu{} / \ButtonLeft{} / \ButtonRight}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
    ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
    ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
    {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
@@ -17,8 +16,7 @@ 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,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+\opt{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}
@@ -30,9 +28,6 @@ a screen containing tokens of only one colour.
 \opt{SANSA_CLIP_PAD}{\ButtonHome}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Flip \\
-\opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft}
-\opt{RECORDER_PAD}{\ButtonFOne}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonLeft}
@@ -45,9 +40,6 @@ a screen containing tokens of only one colour.
 \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Shuffle \\
-\opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
-\opt{RECORDER_PAD}{\ButtonFTwo}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
@@ -62,9 +54,6 @@ a screen containing tokens of only one colour.
 \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Solve \\
-\opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
-\opt{RECORDER_PAD}{\ButtonFThree}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
@@ -81,8 +70,7 @@ a screen containing tokens of only one colour.
 \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Solve step by step \\
-\opt{PLAYER_PAD}{\ButtonStop}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD%
    ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/fractals.tex b/manual/plugins/fractals.tex
index 74a34fea68..e3181d9279 100644
--- a/manual/plugins/fractals.tex
+++ b/manual/plugins/fractals.tex
@@ -9,8 +9,7 @@ This demonstration draws fractal images from the Mandelbrot set%
    \opt{HAVEREMOTEKEYMAP}{&}
    & Move about the image\\
    %
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD
        ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
@@ -22,8 +21,6 @@ This demonstration draws fractal images from the Mandelbrot set%
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom in\\
    %
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack}
    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD}{Long \ButtonSelect}
@@ -38,8 +35,6 @@ This demonstration draws fractal images from the Mandelbrot set%
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom out\\
    %
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD
        ,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonLeft}
@@ -58,8 +53,6 @@ This demonstration draws fractal images from the Mandelbrot set%
       \opt{HAVEREMOTEKEYMAP}{& }
    & Decrease iteration depth (less detail)\\
    %
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
@@ -77,8 +70,6 @@ This demonstration draws fractal images from the Mandelbrot set%
       \opt{HAVEREMOTEKEYMAP}{& }
    & Increase iteration depth (more detail)\\
    %
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
    \opt{SANSA_FUZE_PAD}{Long \ButtonSelect}
@@ -96,7 +87,7 @@ This demonstration draws fractal images from the Mandelbrot set%
       \opt{HAVEREMOTEKEYMAP}{& }
    & Reset and return to the default image\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 228129c9b7..4c7ab26f61 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -28,7 +28,7 @@ permanently.  The \fname {/sgf/gbn\_def.sgf} file is also the file loaded if ano
 is not selected.\\
 The information panel which displays the current move number may also contain
-these markers: 
+these markers:
 \begin{table}
    \begin{rbtabular}{\textwidth}{lX}%
@@ -37,13 +37,12 @@ these markers:
      \emph{* } & There are sibling variations which can be navigated to using the %
      \emph{Next Variation} menu option of the \emph{Context Menu}%
      \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,%
-         RECORDER_PAD,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,%
+         MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,%
         IRIVER_H300_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD,SANSA_FUZEPLUS_PAD,%
         SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{ or the %
         \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}%
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}%
         \opt{SANSA_CLIP_PAD}{\ButtonHome}%
-         \opt{RECORDER_PAD}{\ButtonOn}%
         \opt{MROBE100_PAD}{\ButtonPower}%
         \opt{GIGABEAT_PAD}{\ButtonA}%
         \opt{GIGABEAT_S_PAD}{\ButtonPlay}%
@@ -71,7 +70,7 @@ these markers:
            &}
        Move cursor up
        \\
-        
        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,%
            MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonDown}%
        \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}%
@@ -83,7 +82,7 @@ these markers:
            &}
        Move cursor down
        \\
-            
        \nopt{MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonLeft}
        \opt{MPIO_HD200_PAD}{\ButtonVolDown}
        \opt{MPIO_HD300_PAD}{\ButtonRew}
@@ -92,10 +91,8 @@ these markers:
        \opt{HAVEREMOTEKEYMAP}{
            &}
        Move cursor left
-        \opt{ONDIO_PAD}{if in \emph{board} navigation mode, or retreat one
-            node in the game tree if in \emph{tree} navigation mode}
        \\
-             
        \nopt{MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonRight}
        \opt{MPIO_HD200_PAD}{\ButtonVolUp}
        \opt{MPIO_HD300_PAD}{\ButtonFF}
@@ -104,23 +101,13 @@ these markers:
        \opt{HAVEREMOTEKEYMAP}{
            &}
        Move cursor right
-        \opt{ONDIO_PAD}{if in \emph{board} navigation mode, or advance one
-            node in the game tree if in \emph{tree} navigation mode}
        \\
-            
-        \opt{ONDIO_PAD}{
+        \nopt{IRIVER_H10_PAD,IAUDIO_M3_PAD,PBELL_VIBE500_PAD%
-            \ButtonOff
-                &
-            Toggle between \emph{board} and \emph{tree} navigation modes
-            \\
-        }
-        
-        \nopt{IRIVER_H10_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD,PBELL_VIBE500_PAD%
            ,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD%
            ,touchscreen}{\ButtonSelect}%
-        \opt{IRIVER_H10_PAD,RECORDER_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
+        \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
            ,SAMSUNG_YH820_PAD}{\ButtonPlay}%
-        \opt{ONDIO_PAD}{\ButtonMenu}
        \opt{MPIO_HD200_PAD}{\ButtonFunc}
        \opt{MPIO_HD300_PAD}{\ButtonEnter}
        \opt{touchscreen}{\TouchCenter}
@@ -129,8 +116,7 @@ these markers:
            &}
        Play a move (or use a tool if play-mode has been changed).
        \\
-            
-        \nopt{ONDIO_PAD}{
            \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_1G2G_PAD,IPOD_3G_PAD%
                ,IPOD_4G_PAD}{\ButtonScrollBack}%
            \opt{SANSA_CLIP_PAD,SANSA_M200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
@@ -140,7 +126,6 @@ these markers:
            \opt{MROBE100_PAD}{\ButtonMenu}%
            \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}%
            \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
-            \opt{RECORDER_PAD}{\ButtonFOne}
            \opt{touchscreen}{\TouchBottomLeft}
            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
            \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonRew}
@@ -151,7 +136,7 @@ these markers:
                &}
            Retreat one node in the game tree
            \\
-            
            \opt{scrollwheel}{\ButtonScrollFwd}%
            \opt{SANSA_CLIP_PAD,SANSA_M200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
                ,GIGABEAT_S_PAD}{\ButtonVolUp}%
@@ -159,7 +144,6 @@ these markers:
            \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
            \opt{MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPlay}%
            \opt{IAUDIO_X5_PAD}{\ButtonRec}%
-            \opt{RECORDER_PAD}{\ButtonFThree}
            \opt{touchscreen}{\TouchBottomRight}
            \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
            \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonFF}
@@ -170,8 +154,7 @@ these markers:
                &}
            Advance one node in the game tree
            \\
-        }
-        
        \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD%
            ,SANSA_C200_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_FUZEPLUS_PAD%
            }{\ButtonPower}%
@@ -180,8 +163,6 @@ these markers:
        \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}%
            {\ButtonMenu}%
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}%
-        \opt{RECORDER_PAD}{\ButtonFTwo}%
-        \opt{ONDIO_PAD}{Long \ButtonMenu}
        \opt{MPIO_HD200_PAD}{Long \ButtonPlay}
        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
        \opt{touchscreen}{\TouchTopLeft}
@@ -191,11 +172,10 @@ these markers:
        Main Menu
        \\
-%        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,ONDIO_PAD,RECORDER_PAD}{%
        \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
            ,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
            ,MPIO_HD200_PAD,PBELL_VIBE500_PAD,touchscreen,SANSA_FUZEPLUS_PAD%
-            ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{% 
+            ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
            \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,%
                MPIO_HD200_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH820_PAD}%
                {Long \ButtonSelect}%
@@ -212,15 +192,14 @@ these markers:
            Context Menu
            \\
        }
-        
-        \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,MROBE100_PAD%
+        \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,MROBE100_PAD%
            ,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_CLIP_PAD%
            ,PBELL_VIBE500_PAD,MPIO_HD200_PAD,touchscreen,SANSA_FUZEPLUS_PAD,
            ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
            \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
                ,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}%
            \opt{SANSA_FUZE_PAD,SANSA_CLIP_PAD}{\ButtonHome}%
-            \opt{RECORDER_PAD}{\ButtonOn}%
            \opt{MROBE100_PAD}{\ButtonPower}%
            \opt{GIGABEAT_PAD}{\ButtonA}%
            \opt{GIGABEAT_S_PAD}{\ButtonPlay}%
@@ -297,7 +276,7 @@ these markers:
 \item [Options. ]
    Customize the behavior of the plugin in certain ways.
    \begin{description}
-        \item[Show Child Variations?] Enable this to mark child variations on 
+        \item[Show Child Variations?] Enable this to mark child variations on
            he board if there are more than one.  Note: variations which don't
            start with a move are not visible in this way.
        \item[Disable Idle Poweroff?] Enable this if you do not want the \dap{}
@@ -352,4 +331,3 @@ these markers:
        \item[Done.] Go back to the previous screen.
    \end{description}
 \end{description}
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 9f646dc8fb..637507456b 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -28,13 +28,13 @@ view a bigger file you may need to stop playback.}
 }%
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
      ,SAMSUNG_YH820_PAD}{\ButtonUp\ / \ButtonDown}%
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
      ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -46,8 +46,6 @@ view a bigger file you may need to stop playback.}
    \opt{touchscreen}{\TouchTopMiddle{} / \TouchBottomMiddle{}/ \TouchMidLeft{} / \TouchMidRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move around in zoomed in image\\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
        ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{\ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
@@ -59,8 +57,6 @@ view a bigger file you may need to stop playback.}
    \opt{touchscreen}{\TouchTopRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom in\\
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{Long \ButtonSelect}
@@ -73,8 +69,6 @@ view a bigger file you may need to stop playback.}
    \opt{touchscreen}{\TouchTopLeft}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Zoom out\\
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \opt{IRIVER_H100_PAD}{\ButtonOn}
    \opt{IRIVER_H300_PAD}{\ButtonRec}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
@@ -92,8 +86,6 @@ view a bigger file you may need to stop playback.}
    \opt{touchscreen}{\TouchBottomRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Next image in directory\\
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonRec}
    \opt{IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
@@ -120,7 +112,7 @@ view a bigger file you may need to stop playback.}
         \opt{HAVEREMOTEKEYMAP}{& }
        & Toggle slide show mode\\
    }
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index 1458d64f46..51ad6967c4 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -14,12 +14,12 @@ In puzzle mode the aim of the game is to connect the puzzles, by
 skillfully swapping pairs of jewels.
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    \opt{IRIVER_H10_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
        ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
    {\ButtonLeft/\ButtonRight/}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
      ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD%
      ,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonUp/\ButtonDown}
@@ -30,8 +30,7 @@ skillfully swapping pairs of jewels.
    \opt{MPIO_HD300_PAD}{\ButtonRew / \ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the cursor around the jewels \\
-    \opt{RECORDER_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_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,SANSA_E200_PAD%
      ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD%
      ,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}
@@ -47,7 +46,7 @@ skillfully swapping pairs of jewels.
    \opt{GIGABEAT_S_PAD}{\ButtonBack}
    \opt{IPOD_3G_PAD,MPIO_HD300_PAD}{\ButtonMenu}
    \opt{IPOD_4G_PAD}{\ButtonSelect+ \ButtonMenu}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/lrcplayer.tex b/manual/plugins/lrcplayer.tex
index 3b419780b2..2f72cc359f 100644
--- a/manual/plugins/lrcplayer.tex
+++ b/manual/plugins/lrcplayer.tex
@@ -96,7 +96,7 @@ same order as in that list.
    \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPlay}
    & Toggle play/pause.\\
    %
-    \ActionWpsStop{}\nopt{ONDIO_PAD}{ or \ActionWpsBrowse}
+    \ActionWpsStop{} or \ActionWpsBrowse
    \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsStop{} or \ActionRCWpsBrowse}
    & Exit the plugin.\\
    %
@@ -104,8 +104,7 @@ same order as in that list.
    \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsContext}
    & Enter timetag editor.\\
    %
-    \opt{ONDIO_PAD}{\ActionWpsBrowse}%
+    \ActionWpsMenu%
-    \nopt{ONDIO_PAD}{\ActionWpsMenu}%
    \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsMenu}
    & Enter \setting{Lrcplayer Menu}.\\
    %
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 96326cbffe..5621e260b8 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -21,7 +21,7 @@ text files%
 \opt{lcd_bitmap}
    {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator},
    Frotz in \reference{ref:Frotz},
-    \opt{archosrecorder,archosfmrecorder,iriverh100,iaudiom5,lcd_color}
+    \opt{iriverh100,iaudiom5,lcd_color}
    {Rockboy in \reference{ref:Rockboy}}
    and ZXBox in \reference{ref:ZXBox}.}
@@ -66,8 +66,6 @@ text files%
 \opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
-\opt{archosplayer}{\input{plugins/nim.tex}}
 \opt{iriverh100,iaudiom5,lcd_color}{\nopt{c200,c200v2}{\input{plugins/pacbox.tex}}}
 \opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
@@ -183,9 +181,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
        }
    }
    \opt{lcd_bitmap}{
-        \nopt{ondio}{% not enough buttons
+        Rockboy       & \fname{.gb, .gbc}                &   \\
-            Rockboy       & \fname{.gb, .gbc}                &   \\
-        }
    }
    Search                & \fname{.m3u, .m3u8}              & x \\
    Shopping list         & \fname{.shopper}                 &   \\
@@ -213,8 +209,6 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 \opt{swcodec}{\nopt{lowmem}{\input{plugins/midiplay.tex}}}
-\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/movieplayer.tex}}
 \opt{lcd_bitmap}{\opt{swcodec}{\nopt{lowmem}{\input{plugins/mpegplayer.tex}}}}
 \opt{swcodec}{\input{plugins/mp3_encoder.tex}}
@@ -223,11 +217,8 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
    ,IPOD_1G2G_PAD,SAMSUNG_YPR0_PAD}{
  \input{plugins/pdbox.tex}}
-\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/rockbox_flash.tex}}
 \opt{lcd_bitmap}{\nopt{%
-  ONDIO_PAD%,m200, % not enough buttons for keymap
+  ipod1g2g,ipod3g,ipod4g,ipodmini% horizontal pixelformat not implemented
-  ,ipod1g2g,ipod3g,ipod4g,ipodmini% horizontal pixelformat not implemented
  ,iaudiom3,mpiohd200, % vertical interleaved pixelformat not implemented
  ,mrobe100% lcd size/depth not implemented
  }{
@@ -247,16 +238,12 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 {\input{plugins/vbrfix.tex}}
-\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/wavplay.tex}}
 \opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
 \section{Applications}
 \opt{rtc}{\input{plugins/alarmclock.tex}}
-\opt{archosplayer,archosrecorder,archosfmrecorder}{\input{plugins/alpinecdc.tex}}
 {\input{plugins/batterybenchmark.tex}}
 \opt{lcd_bitmap}{\input{plugins/calculator.tex}}
@@ -271,10 +258,6 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 {\input{plugins/disktidy.tex}}
-\opt{archosplayer}{\input{plugins/euro_converter.tex}}
-\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/firmware_flash.tex}}
 {\input{plugins/keybox.tex}}
 \opt{HAVE_BACKLIGHT}{\input{plugins/lamp.tex}}
@@ -299,8 +282,6 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 \opt{lcd_color}{\input{plugins/rockpaint.tex}}
-\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/split_editor.tex}}
 {\input{plugins/stats.tex}}
 {\input{plugins/stopwatch.tex}}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 307f4c8b85..7b86fc48dc 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -12,7 +12,7 @@ the location of a mine, it can be tagged to avoid accidentally
 \begin{btnmap}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
-  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
@@ -30,8 +30,6 @@ the location of a mine, it can be tagged to avoid accidentally
       \opt{HAVEREMOTEKEYMAP}{& }
  & Scroll through the entire minefield \\}%
  %
-  \opt{RECORDER_PAD}{\ButtonFOne/\ButtonOn}
-  \opt{ONDIO_PAD}{\ButtonMenu}
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} / \ButtonRec}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
@@ -46,8 +44,6 @@ the location of a mine, it can be tagged to avoid accidentally
       \opt{HAVEREMOTEKEYMAP}{& }
  & Toggle flag on / off \\
  %
-  \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonPlay}
-  \opt{ONDIO_PAD}{Long \ButtonMenu}
  \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}
@@ -60,8 +56,6 @@ the location of a mine, it can be tagged to avoid accidentally
       \opt{HAVEREMOTEKEYMAP}{& }
  & Reveal the contents of the current square \\
  %
-  \opt{RECORDER_PAD}{\ButtonFThree}
-  \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,SAMSUNG_YH820_PAD}{\ButtonRec}
@@ -77,7 +71,7 @@ the location of a mine, it can be tagged to avoid accidentally
       \opt{HAVEREMOTEKEYMAP}{& }
  & Display the current game status \\
  %
-  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
      ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
  \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 554e51cf66..fddccb5850 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -12,8 +12,7 @@ being played.
 \subsubsection{Keys}
 \begin{btnmap}
-    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{ONDIO_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
      ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD%
      ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
@@ -26,8 +25,6 @@ being played.
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Toggle filled / curve / plot \\
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonRec}
@@ -43,8 +40,6 @@ being played.
    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonRight}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Toggle whether to scroll or not \\
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
    \opt{IAUDIO_X5_PAD,SANSA_CLIP_PAD}{Long \ButtonSelect}
@@ -61,11 +56,10 @@ being played.
    \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%
+    \opt{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,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
        {\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
    \opt{SANSA_FUZE_PAD,SANSA_CLIP_PAD}{\ButtonUp}
@@ -74,7 +68,7 @@ being played.
    \opt{COWON_D2_PAD}{\TouchCenter}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pause the demo \\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
        {\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
@@ -85,7 +79,7 @@ being played.
    \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Increase / decrease volume\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -94,7 +88,7 @@ being played.
    \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}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index f82d0644c8..3bb0d4830d 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -24,11 +24,9 @@ block and crosses which allow you to choose a replacement block.
    to move around
        \\
-    \nopt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
        ,PBELL_VIBE500_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
        ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonRight}
    \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{MPIO_HD200_PAD}{\ButtonFunc}
@@ -40,8 +38,6 @@ block and crosses which allow you to choose a replacement block.
    to choose peg
        \\
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu{} + \ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_FUZE_PAD}
        {\ButtonSelect{} + \ButtonLeft}
@@ -62,8 +58,6 @@ block and crosses which allow you to choose a replacement block.
    to restart level
        \\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonMenu{} + \ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonMenu}
    \opt{IAUDIO_X5_PAD,MPIO_HD300_PAD}{\ButtonPlay}
@@ -83,8 +77,6 @@ block and crosses which allow you to choose a replacement block.
        \\
    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{
-        \opt{RECORDER_PAD}{\ButtonFThree}
-        \opt{ONDIO_PAD}{\ButtonMenu{} + \ButtonDown}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,MPIO_HD300_PAD}{\ButtonRec}
        \opt{IRIVER_H10_PAD}{\ButtonFF{} + \ButtonScrollDown}
        \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
@@ -103,8 +95,7 @@ block and crosses which allow you to choose a replacement block.
            \\
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{ONDIO_PAD}{\ButtonMenu{} + \ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonPlay}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index 64b777739d..017c42d9b7 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -63,14 +63,12 @@ aware:
        }
        \nopt{IAUDIO_M3_PAD}{%
-            \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD,touchscreen,PBELL_VIBE500_PAD%
+            \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD%
                 ,SANSA_FUZE_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
                 ,SAMSUNG_YH820_PAD}
                 {\ButtonSelect}
-            \opt{ONDIO_PAD}{\ButtonUp} 
            \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}
            \opt{MPIO_HD200_PAD}{\ButtonFunc}
@@ -82,12 +80,11 @@ aware:
            \opt{GIGABEAT_RC_PAD}{\ButtonRCFF}
            &}
        Enter track list
-            \nopt{ONDIO_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
+            \nopt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
            / Play album from selected track}
            \\
        % Ondio & Samsung YH use a different button in album list and track list
-        \opt{ONDIO_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
-            \opt{ONDIO_PAD}{\ButtonMenu}
            \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
                &
            Play album from selected track in track list
@@ -120,7 +117,7 @@ aware:
            \\
        \nopt{IAUDIO_M3_PAD}{%
-            \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
+            \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
            \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD%
                ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
            \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index f8ea79f9d5..d9cd6010a6 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -9,8 +9,7 @@ so for a single player game, just press the appropriate buttons to control the s
 a two player game, both players should just press the appropriate buttons for their side.
 \begin{btnmap}
-    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
-    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
      ,GIGABEAT_S_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
@@ -22,8 +21,7 @@ a two player game, both players should just press the appropriate buttons for th
    \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Left player up\\
-    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
      ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
    \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
@@ -34,8 +32,7 @@ a two player game, both players should just press the appropriate buttons for th
    \opt{MPIO_HD300_PAD}{\ButtonRec}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Left player down\\
-    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
-    \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,SAMSUNG_YH820_PAD}{\ButtonRec}
@@ -46,8 +43,8 @@ a two player game, both players should just press the appropriate buttons for th
    \opt{MPIO_HD300_PAD,SAMSUNG_YH92X_PAD}{\ButtonFF}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Right player up\\
-    \opt{RECORDER_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonRight}
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonRight}
-    \opt{ONDIO_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown}
+    \opt{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,SAMSUNG_YH820_PAD}{\ButtonFF}
@@ -59,7 +56,7 @@ a two player game, both players should just press the appropriate buttons for th
    \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
      \opt{HAVEREMOTEKEYMAP}{& }
    & Right player down\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
      ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 56afa5258a..1b28c039a8 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -9,8 +9,6 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
 \begin{btnmap}
    \nopt{SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD}{
-        \opt{RECORDER_PAD}{\ButtonFOne}
-        \opt{PLAYER_PAD}{\ButtonStop+\ButtonMenu}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
        \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
@@ -19,7 +17,6 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
        \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}
        \opt{GIGABEAT_PAD}{\ButtonA}
        \opt{MROBE100_PAD}{\ButtonDisplay}
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
        \opt{COWON_D2_PAD}{\ButtonMenu}
        \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
        \opt{MPIO_HD300_PAD}{\ButtonRec}
@@ -27,7 +24,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
           \opt{HAVEREMOTEKEYMAP}{& }
            & Restart game\\
    }
-    \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
        ,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -37,7 +34,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{MPIO_HD300_PAD}{\ButtonRew}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Move left\\
-    \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
        ,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -47,8 +44,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{MPIO_HD300_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Move right\\
-    \opt{PLAYER_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
        {\ButtonDown}
@@ -61,9 +57,6 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{SAMSUNG_YH820_PAD}{\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Move down\\
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonPlay}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
    \opt{scrollwheel}{\ButtonScrollBack}
    \opt{IAUDIO_X5_PAD}{\ButtonPower}
@@ -77,8 +70,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Rotate anticlockwise\\
-    \opt{PLAYER_PAD}{\ButtonPlay}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
        {\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonMenu}
    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
@@ -92,8 +84,6 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
       \opt{HAVEREMOTEKEYMAP}{& }
        & Rotate clockwise\\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
@@ -110,8 +100,7 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
       \opt{HAVEREMOTEKEYMAP}{& }
        & Pause\\
    }
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index abb455c08b..a0485e9ce4 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -11,14 +11,14 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
 \subsubsection{Default keys}
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD}{Tap \ButtonPlay{} / \ButtonMenu}
    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK{} / \ButtonCancel}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
        ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -29,7 +29,6 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
       \opt{HAVEREMOTEKEYMAP}{& }
    & Direction keys\\
    %
-    \opt{RECORDER_PAD}{\ButtonFOne}
    \opt{IRIVER_H100_PAD}{\ButtonOn}
    \opt{IRIVER_H300_PAD}{\ButtonRec}
    \opt{IPOD_4G_PAD}{Tap \btnfnt{Top-Right}}
@@ -42,7 +41,6 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
       \opt{HAVEREMOTEKEYMAP}{& }
    & A button\\
    %
-    \opt{RECORDER_PAD}{\ButtonFTwo}
    \opt{IRIVER_H100_PAD}{\ButtonOff}
    \opt{IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD}{Tap \btnfnt{Top-Left}}
@@ -56,7 +54,6 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
       \opt{HAVEREMOTEKEYMAP}{& }
    & B button\\
    %
-    \opt{RECORDER_PAD}{\ButtonFThree}
    \opt{IRIVER_H100_PAD}{\ButtonRec}
    \opt{IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD}{Tap \btnfnt{Bottom-Right} /~Press \ButtonSelect}
@@ -73,7 +70,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
    & Start\\
    %
    \nopt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
-        \opt{RECORDER_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+        \opt{SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
        \opt{IPOD_4G_PAD}{Tap \btnfnt{Bottom-Left}}
        \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
@@ -86,14 +83,13 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
        & Select\\
        %
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5,MPIO_HD300_PAD}{
+    \opt{IRIVER_H100_PAD,iaudiom5,MPIO_HD300_PAD}{
-        \opt{RECORDER_PAD}{\ButtonOn}
        \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD,MPIO_HD300_PAD}{\ButtonHold{} switch}
              \opt{HAVEREMOTEKEYMAP}{& }
        & Cycle display scaling modes\\
    %  defined for the Recorders and targets with 160x128x2 displays (H100, M5)
    }
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H300_PAD}{\ButtonOff}
    \opt{IRIVER_H100_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD}{\ButtonHold{} switch}
    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index b0021383f3..8b0a9774e0 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -12,7 +12,7 @@ to turn your own pictures into a puzzle.
 Key controls:
 \begin{btnmap}
-  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
      ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
    {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
@@ -26,8 +26,6 @@ Key controls:
       \opt{HAVEREMOTEKEYMAP}{& }
  & Move Tile \\
  %
-  \opt{RECORDER_PAD}{\ButtonFOne}
-  \opt{ONDIO_PAD}{Long \ButtonMenu}
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
      {\ButtonSelect}
  \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
@@ -43,8 +41,6 @@ Key controls:
       \opt{HAVEREMOTEKEYMAP}{& }
  & Shuffle \\
  %
-  \opt{RECORDER_PAD}{\ButtonFTwo}
-  \opt{ONDIO_PAD}{\ButtonMenu}
  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
@@ -59,7 +55,7 @@ Key controls:
  & Switch between pictures (default puzzle\opt{albumart}{, album art}, and your own image if
 launched via Open With), and numbered tiles \\
  %
-  \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
      ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
  \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index 6e969fc5a7..2218418c99 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -6,7 +6,7 @@ as possible by eating the dots that appear on the screen. The game will
 end when the snake touches either the borders of the screen or itself.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
        ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
@@ -17,12 +17,11 @@ end when the snake touches either the borders of the screen or itself.
  \opt{HAVEREMOTEKEYMAP}{& }
        & Move snake\\
    %
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
      ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
      {\ButtonSelect}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{COWON_D2_PAD}{\TouchCenter}
    \opt{MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 9801e2dc53..f772bf4a67 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -8,7 +8,7 @@ snake gets longer. The game ends when the snake hits a wall, or runs
 into itself.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
        ,SANSA_FUZE_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonUp{} / \ButtonDown{} / \ButtonLeft{} / \ButtonRight}
@@ -18,9 +18,8 @@ into itself.
    \opt{MPIO_HD300_PAD}{\ButtonRew / \ButtonFF / \ButtonScrollUp / \ButtonScrollDown}
  \opt{HAVEREMOTEKEYMAP}{& }
        & Steer the snake\\
-    \opt{RECORDER_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
+    \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
@@ -29,7 +28,7 @@ into itself.
    \opt{COWON_D2_PAD}{\TouchCenter}
  \opt{HAVEREMOTEKEYMAP}{& }
        & Pause and resume the game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,GIGABEAT_PAD%
        ,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index c4438424d1..5fd5cbbaa2 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -14,14 +14,14 @@ information about the level format, see
 \begin{btnmap}
 \multicolumn{2}{c}{\textbf{In game}} \\
 \hline
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
    ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD%
    ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
    ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
    {\ButtonUp, \ButtonDown, }%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, }%
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown, }%
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
    ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD%
    ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
    ,IRIVER_H10_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -32,7 +32,7 @@ information about the level format, see
 \opt{MPIO_HD300_PAD}{\ButtonScrollUp, \ButtonScrollDown, \ButtonRew, \ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Move the ``sokoban'' up, down, left, or right\\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
     ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
@@ -46,8 +46,6 @@ information about the level format, see
         }
    & Menu \\
 \nopt{IAUDIO_X5_PAD}{
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
    \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollDown}
@@ -64,8 +62,6 @@ information about the level format, see
    & Back to previous level \\
 }
 \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \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}{\ButtonPlay+\ButtonRight}
@@ -81,8 +77,6 @@ information about the level format, see
    & Restart level \\
 }
 \nopt{IAUDIO_X5_PAD}{
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
    \opt{IRIVER_H10_PAD}{\ButtonPlay+\ButtonScrollUp}
@@ -98,8 +92,6 @@ information about the level format, see
       \opt{HAVEREMOTEKEYMAP}{& }
    & Go to next level \\
 }
-\opt{RECORDER_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,MROBE100_PAD%
     ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
@@ -112,8 +104,7 @@ information about the level format, see
       \opt{HAVEREMOTEKEYMAP}{& }
    & Undo last movement \\
-\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay}
-\opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF}
@@ -132,17 +123,16 @@ information about the level format, see
 \hline
 \multicolumn{2}{c}{\textbf{Solution playback}} \\
 \hline
-\opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD%
    ,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
    ,SAMSUNG_YH820_PAD}{\ButtonPlay}
-\opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
      ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
 \opt{COWON_D2_PAD}{\TouchCenter}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pause/resume \\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD%
    ,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD%
    ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD%
    ,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -152,7 +142,7 @@ information about the level format, see
 \opt{COWON_D2_PAD}{\TouchTopMiddle/\TouchBottomMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Increase/decrease playback speed \\
-\opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,ONDIO_PAD%
+\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD%
    ,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
    ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
    ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
@@ -162,7 +152,7 @@ information about the level format, see
 \opt{MPIO_HD300_PAD}{\ButtonRew/\ButtonFF}
       \opt{HAVEREMOTEKEYMAP}{& }
    & Go backward/forward (while paused) \\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
    ,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 4444762bc2..c98b59873b 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -14,13 +14,13 @@ visit
 \url{http://www.solitairecentral.com/rules/Klondike.html}
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
      {\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,IPOD_4G_PAD%
        ,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -30,8 +30,6 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Move Cursor around.\\
    %
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \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,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}
@@ -43,8 +41,6 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Select cards, move cards, reveal hidden cards...\\
    %
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{Long \ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
      {\ButtonMenu}
@@ -62,8 +58,7 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Draw 3 new cards from the remains stack\\
    %
-    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{Long \ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonLeft}
    \opt{IAUDIO_X5_PAD}{Long \ButtonPlay}
    \opt{IRIVER_H10_PAD}{\ButtonFF}
@@ -82,8 +77,6 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card from the top of the remains stack on top of the cursor\\
    %
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{Long \ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{Long \ButtonSelect}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
@@ -99,8 +92,7 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card under the cursor on one of the 4 final colour stacks.\\
    %
-    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight}
-    \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn{} + \ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonRec}
    \opt{SANSA_E200_PAD}{\ButtonRight}
@@ -116,7 +108,7 @@ visit
       \opt{HAVEREMOTEKEYMAP}{& }
      & Put the card on top of the remains stack on one of the final colour stacks.\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
+    \opt{IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} + \ButtonSelect}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index aeb53420fe..bba380a7ff 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -6,8 +6,7 @@ UFO will appear -- shoot this for extra points.
 \begin{btnmap}
    %
-    \opt{RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
+    \opt{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,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}
@@ -19,7 +18,7 @@ UFO will appear -- shoot this for extra points.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Shoot\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -31,7 +30,7 @@ UFO will appear -- shoot this for extra points.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Thrust\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,IRIVER_H10_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonLeft / \ButtonRight}
@@ -41,7 +40,7 @@ UFO will appear -- shoot this for extra points.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Turn left/right\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}
@@ -54,8 +53,6 @@ UFO will appear -- shoot this for extra points.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Teleport\\
    %
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
    \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}
@@ -69,7 +66,7 @@ UFO will appear -- shoot this for extra points.
       \opt{HAVEREMOTEKEYMAP}{& }
    & Pause game\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
deleted file mode 100644
index d571286006..0000000000
--- a/manual/plugins/split_editor.tex
+++ /dev/null
@@ -1,193 +0,0 @@
-\subsection{Split Editor}
-When recording an mp3 file, it is common practice to start the recording
-a little bit early and stop it a little bit late to ensure all the
-desired sound is recorded. This results in recordings that contain
-extra snippets of sound in the beginning and the end. Unfortunately these
-snippets can not be deleted easily because they are stored in the same
-file as the desired recording. The purpose of the split editor is to
-split an mp3 file (the input file) at a point in time (split point). Two
-new files can be generated from the input file. The first file contains
-the part before the split point and the second file contains the part
-after the split point. Once this process has been successful the
-original file can be deleted or kept as a backup. %
-%
-The whole process of splitting an mp3 file consists of three steps:
-%
-\begin{itemize}
-  \item Defining the split point
-  \item Generating the result files
-  \item If desired deleting the input file (with the browser, not the split editor)
-\end{itemize}
-\subsubsection{How To Use The Split Editor}
-  When the device plays the song just hit the \ActionWpsPlay{} button
-  to pause, when playback has roughly reached the split point. This need
-  not be very precise as the split point can be fine tuned later. A screen
-  similar to the one below will appear.
-  \begin{figure}[H]
-    \begin{center}
-      \includegraphics[width=8.0cm]{plugins/images/ss-splitedit-main-112x64x1}
-      \caption{The Split Editor's Main Screen}
-    \end{center}
-  \end{figure}
-\subsubsection{The Split Editor's Main Screen}
-  \begin{description}
-    \item[The waveform]
-      displays the volume of the song over time. It will appear as the song
-      plays and help to visually identify the point in time where the split is
-      desired
-      %
-    \item[The split point indicator]
-      is a vertical line with a small triangle at the top end. It is the most
-      important control element of the split editor. It can be moved with the
-      \ButtonLeft\ and \ButtonRight\ buttons. Later, when you have fine tuned
-      the split point, the song will be split at this position.
-      %
-    \item[The split time]
-      At the top of the window a time value is displayed. This is the point in
-      time within the song at which the split point indicator is positioned.
-      %
-    \item[The locator]
-      Another vertical bar represents the position locator. It moves along as
-      the song plays. In contrast to the split point indicator it has no
-      triangles at the ends.
-      %
-    \item[The time bar]
-      displays the current position within the song relative to the whole song.
-      The entire length of the time bar represents the song length. The length
-      of the solid part of the time bar represents the position and length of
-      the displayed part of the song.
-      %
-    \item[The scale mode]
-      On the right side of the bottom line the scale mode is displayed. The
-      waveform can be scaled either logarithmically or linearly. In logarithmic
-      scale mode the letters ``dB'' are displayed, in linear mode ``\%''. Use
-      \opt{RECORDER_PAD}{\ButtonFThree}
-      \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonRight}
-      to switch between these modes. Linear mode usually gives better optical
-      hints with commercially recorded music. For quiet recordings,
-      especially of human speech, the logarithmic scale often is preferable.
-      More information in the Scale \reference{ref:Scalemode} below.
-      %
-    \item[The loop mode]
-      In the middle of the bottom line the loop mode icon is displayed.
-      There are 4 different loop modes. Pressing
-      \opt{RECORDER_PAD}{\ButtonFTwo}
-      \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonUp}
-      changes to the next loop mode.
-      %
-      \begin{description}
-        \item
-        \includegraphics[width=0.53cm]{plugins/images/icon-splitedit-loop-1}
-          Playback loops around the split point indicator. This mode is best
-          used when searching and zooming for the desired point at which to split
-          the recording.
-        \item
-        \includegraphics[width=0.53cm]{plugins/images/icon-splitedit-loop-2}
-          Playback loops from the split point indicator to the end of the
-          visible area. This mode is best used when fine tuning the split
-          indicator position at the beginning of a recording.
-        \item
-        \includegraphics[width=0.53cm]{plugins/images/icon-splitedit-loop-3}
-          Playback loops from the beginning of the
-          visible area to the split point. This mode is best used when fine
-          tuning the split indicator position at the end of a recording.
-        \item
-        \includegraphics[width=0.53cm]{plugins/images/icon-splitedit-loop-4}
-          Playback does not loop, the borders of the visible
-          area as well as the split point indicator are ignored. This mode is
-          best used when playing the song outside of the borders of the displayed
-          region.
-      \end{description}
-    \item[Perform the split (8)]
-          The icon above the
-          \opt{RECORDER_PAD}{\ButtonFOne}
-          \opt{ONDIO_PAD}{\ButtonLeft}
-          button indicates its function to execute the split. When split
-          positioning is complete open the save dialogue with
-          \opt{RECORDER_PAD}{\ButtonFOne}
-          \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonLeft}.
-  \end{description}
-  \begin{table}
-    \begin{btnmap}
-      \ButtonOff & Quit plugin \\
-      %
-      \ButtonLeft\ / \ButtonRight &  Move the split point indicator \\
-      %
-      \ButtonUp\ / \ButtonDown & Zoom in / out \\
-      %
-      \opt{RECORDER_PAD}{\ButtonPlay}
-      \opt{ONDIO_PAD}{\ButtonMenu}
-      & Play from the split position \\
-      %
-      \opt{RECORDER_PAD}{\ButtonFOne}
-      \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonLeft}
-      & Enter the save dialogue \\
-      %
-      \opt{RECORDER_PAD}{\ButtonFTwo}
-      \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonUp}
-      & Toggle loop modes \\
-      %
-      \opt{RECORDER_PAD}{\ButtonFThree}
-      \opt{ONDIO_PAD}{\ButtonMenu\ + \ButtonRight}
-      & Toggle logarithmic / linear scaling \\
-      \opt{RECORDER_PAD}{
-      %
-      \ButtonOn\ + \ButtonLeft
-      & Play half speed \\
-      %
-      \ButtonOn\ + \ButtonRight
-      & Play 150\% speed \\
-      %
-      \ButtonOn\ + \ButtonPlay
-      & Play normal speed \\
-    }
-    \end{btnmap}
-        \caption{Controls in the split editor}
-  \end{table}
-\subsubsection{Save dialogue}
-In the save dialogue it is possible to specify which of the files you
-want to save and their names.  When finished, select
-``Save'' and the files will be written to
-disk. Note that files can not be overwritten, so filenames that
-do not exist yet must be chosen. If unsure whether the
-file already exists simply try to save it. If another file with this
-name exists the dialogue will return and you can choose another
-filename
-\screenshot{plugins/images/ss-splitedit-save}{The Split Editor's
-Save Dialogue}{}
-\begin{table}
-  \begin{btnmap}
-    \ButtonUp\ / \ButtonDown & Select item \\
-    %
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonRight}
-    & Toggle / edit item \\
-    %
-    \ButtonOff & Cancel \\
-  \end{btnmap}
-  \caption{Controls in the save dialogue}
-\end{table}
-\subsubsection{\label{ref:Scalemode}Scale}
-The values in the waveform are scaled according to the settings of the
-peak meter. These can be altered in the peak meter settings,
-see \reference{ref:Peakmetersetting}. If extreme minimum or
-maximum values are set the waveform might be cut off.  A minimum
-setting of {}-60~dB and a maximum setting of 0~dB are recommended.
-These settings should be capable of producing useful waveforms for very
-soft sounds in logarithmic mode (dB). When the editor is used on loud
-sounds (such as commercial rock or pop music) switching to the linear
-scale may prove more effective since the logarithmic scale compresses
-loud noises and makes it more difficult to identify characteristic
-shapes. Note that it is always possible to toggle between the two scale
-modes.
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 3cb7f078cc..0d6a95e713 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -11,7 +11,7 @@ wall to allow your filled circle to get to places on the screen it
 could not otherwise reach. The block cannot take ``o''s.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -20,7 +20,7 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{MPIO_HD300_PAD}{\ButtonRew}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Move Left\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -29,7 +29,7 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{COWON_D2_PAD}{\TouchMidRight}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Move Right\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -40,7 +40,7 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{MPIO_HD300_PAD}{\ButtonScrollUp}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Move Up\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -51,8 +51,6 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{MPIO_HD300_PAD}{\ButtonScrollDown}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Move Down\\
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect}
@@ -62,8 +60,6 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{MPIO_HD300_PAD}{\ButtonEnter}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Switch between circle and square\\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonLeft}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonLeft}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
@@ -77,8 +73,6 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonDown}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Previous level\\
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay+\ButtonRight}
@@ -92,8 +86,6 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonFF}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Reset level \\
-    \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonRight}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect+\ButtonRight}
    \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
@@ -107,7 +99,7 @@ could not otherwise reach. The block cannot take ``o''s.
    \opt{SAMSUNG_YH820_PAD}{\ButtonRec+\ButtonUp}
      \opt{HAVEREMOTEKEYMAP}{& }
        & Next level \\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index b4fa59bf99..0dac854d68 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -1,9 +1,9 @@
 \subsection{Stats}
 \screenshot{plugins/images/ss-stats}{The stats-plugin}{}
-The stats plugin counts the directories and files%
+The stats plugin counts the directories and files
-\nopt{archosplayer}{ (the total number as well as the number
+(the total number as well as the number
-of audio, playlist, image and video files) }%
+of audio, playlist, image and video files)
 on your \dap{}.
 Press \PluginCancel{} or \PluginExit{} to abort counting and
 exit the plugin. Press it again to quit after counting has
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 68521118f8..3a7785be64 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -4,8 +4,7 @@
 A simple stopwatch program with support for saving times.
 \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
        ,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
@@ -20,18 +19,17 @@ A simple stopwatch program with support for saving times.
        }
    & Quit Plugin \\
    %
-    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD%
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD%
        ,PBELL_VIBE500_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
        ,SANSA_CLIP_PAD}{\ButtonRight}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD,IPOD_4G_PAD%
        ,IPOD_3G_PAD}{\ButtonSelect}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Start / stop \\
    %
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
-    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
        ,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
@@ -44,8 +42,8 @@ A simple stopwatch program with support for saving times.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Reset timer (only when timer is stopped)\\
    %
-    \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
    \opt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF}
    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_S_PAD%
@@ -53,8 +51,8 @@ A simple stopwatch program with support for saving times.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Take lap time \\
    %
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_CLIP_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp{} / \ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index ecb73b1520..94fa2cb545 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -28,7 +28,7 @@ settings.
 \note{The scratchpad is \emph{not} saved when saving the game.}
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -43,8 +43,6 @@ settings.
    %
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect & Change cursor move direction\\}
    %
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect{} / \ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight}
    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
@@ -61,8 +59,6 @@ settings.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Change number under the cursor\\
    %
-    \opt{RECORDER_PAD}{Long \ButtonPlay}
-    \opt{ONDIO_PAD}{Long \ButtonMenu+\ButtonDown}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOn}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonLeft{} / \ButtonRight}
    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
@@ -79,8 +75,6 @@ settings.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Constantly changing the number under the cursor\\
    %
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{Long \ButtonMenu}
    \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}
@@ -94,8 +88,6 @@ settings.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Open Menu\\
    %
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
    \opt{SANSA_FUZE_PAD}{\ButtonSelect}
@@ -108,7 +100,7 @@ settings.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Add/Remove number to scratchpad\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
      ,MROBE100_PAD}{\ButtonPower}
    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 7379176aaf..60b38e7a7e 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -9,8 +9,7 @@ by using \emph{Open with} from the \emph{Context Menu}
 \subsubsection{Default keys}
 \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
@@ -26,8 +25,7 @@ by using \emph{Open with} from the \emph{Context Menu}
    }
        & Scroll{}-up\\
-    \opt{PLAYER_PAD}{\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
@@ -43,12 +41,11 @@ by using \emph{Open with} from the \emph{Context Menu}
    }
        & Scroll{}-down\\
-    \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
    \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonLeft}
    \opt{MPIO_HD200_PAD}{\ButtonVolDown}
    \opt{MPIO_HD300_PAD}{\ButtonRew}
    \opt{touchscreen}{\TouchMidLeft}
-    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
+    \nopt{GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
         ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCLeft}
@@ -56,12 +53,11 @@ by using \emph{Open with} from the \emph{Context Menu}
        & Top of file (Narrow mode) /
        One screen left (Wide mode)\\
-    \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
    \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonRight}
    \opt{MPIO_HD200_PAD}{\ButtonVolUp}
    \opt{MPIO_HD300_PAD}{\ButtonFF}
    \opt{touchscreen}{\TouchMidRight}
-    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
+    \nopt{GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD,MPIO_HD200_PAD%
         ,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight}
    \opt{HAVEREMOTEKEYMAP}{&
        \opt{IAUDIO_M3_PAD}{\ButtonRCRight}
@@ -69,11 +65,11 @@ by using \emph{Open with} from the \emph{Context Menu}
        & Bottom of file (Narrow mode) /
        One screen right (Wide mode)\\
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+    \opt{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,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{%
-        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp}
+        \opt{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}
@@ -84,11 +80,11 @@ by using \emph{Open with} from the \emph{Context Menu}
        & One line up\\
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD%
+    \opt{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,SAMSUNG_YH92X_PAD%
        ,SAMSUNG_YH820_PAD}{%
-        \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown}
+        \opt{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}
@@ -99,9 +95,9 @@ by using \emph{Open with} from the \emph{Context Menu}
        & One line down\\
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_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{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
        \opt{GIGABEAT_S_PAD}{\ButtonLeft}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
@@ -111,9 +107,9 @@ by using \emph{Open with} from the \emph{Context Menu}
        & One column left\\
    }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_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{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
        \opt{GIGABEAT_S_PAD}{\ButtonRight}
        \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
        \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
@@ -123,11 +119,10 @@ by using \emph{Open with} from the \emph{Context Menu}
        & One column right\\
    }
-    \opt{RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+    \opt{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}{\ButtonPlay}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{GIGABEAT_PAD}{\ButtonA}
    \opt{SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonRec}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
@@ -142,9 +137,6 @@ by using \emph{Open with} from the \emph{Context Menu}
    }
        & Toggle autoscroll\\
-    \opt{PLAYER_PAD}{\ButtonOn}
-    \opt{RECORDER_PAD}{\ButtonFTwo}
-    \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}{\ButtonFF}
@@ -162,9 +154,7 @@ by using \emph{Open with} from the \emph{Context Menu}
    }
        & Set/Reset bookmarks\\
-    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-    \opt{ONDIO_PAD}{Long \ButtonMenu}
-    \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
        ,MROBE100_PAD,PBELL_VIBE500_PAD,MPIO_HD300_PAD}{\ButtonMenu}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD}{\ButtonSelect}
@@ -179,8 +169,7 @@ by using \emph{Open with} from the \emph{Context Menu}
    }
        & Enter menu\\
-    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
@@ -359,8 +348,6 @@ stores its settings, the current position and bookmarks in
 \subsubsection{Bookmarks}
    To add a bookmark, press 
-    \opt{PLAYER_PAD}{\ButtonOn}\opt{RECORDER_PAD}{\ButtonFTwo}%
-    \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}{\ButtonFF}\opt{IAUDIO_X5_PAD}{\ButtonRec}%
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 22d5bcc2d5..76a79401b0 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -10,7 +10,7 @@ settings menu the decay time for the meter (its memory), the meter type
 and the meter scale can be changed.
 \begin{btnmap}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
     ,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower}
@@ -24,8 +24,7 @@ and the meter scale can be changed.
          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
  }
    & Save settings and quit\\
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
    ,MPIO_HD200_PAD,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
    ,SAMSUNG_YH820_PAD}{\ButtonPlay}
@@ -38,8 +37,6 @@ and the meter scale can be changed.
 \opt{COWON_D2_PAD}{\TouchCenter}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Help\\
-\opt{RECORDER_PAD}{\ButtonFOne}
-\opt{ONDIO_PAD}{Long \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,SANSA_CLIP_PAD}{\ButtonSelect}
 \opt{SANSA_FUZEPLUS_PAD}{Long \ButtonSelect}
@@ -50,7 +47,7 @@ and the meter scale can be changed.
 \opt{MPIO_HD200_PAD}{\ButtonFunc}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Settings\\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
     ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
     ,SAMSUNG_YH820_PAD}{\ButtonUp}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
@@ -59,7 +56,7 @@ and the meter scale can be changed.
 \opt{COWON_D2_PAD}{\TouchTopMiddle}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Raise Volume\\
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
     ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD%
     ,SAMSUNG_YH820_PAD}{\ButtonDown}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index fd02fa8110..0205605816 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -1,11 +1,11 @@
 \subsection{Wormlet}
 \screenshot{plugins/images/ss-wormlet}{Wormlet game}{img:wormlet}
-Wormlet is a \opt{RECORDER_PAD}{multi{}-user }multi{}-worm game on a multi{}-threaded
+Wormlet is a \opt{MULTIPLAYER_PAD}{multi{}-user }multi{}-worm game on a multi{}-threaded
 multi{}-functional Rockbox console. You navigate a hungry little worm.
 Help your worm to find food and to avoid poisoned argh{}-tiles. The
 goal is to turn your tiny worm into a big worm for as long as possible.
-\opt{RECORDER_PAD}{
+\opt{MULTIPLAYER_PAD}{
 For 2{}-player games a remote control is not necessary but recommended.
 If you try to hold the \dap\ in the four hands of two players
 you'll find out why. Games with three players are only
@@ -20,7 +20,7 @@ possible using a remote control.\\}
 {\bfseries
 Game controls:}
-\opt{RECORDER_PAD}{
+\opt{MULTIPLAYER_PAD}{
 \renewcommand{\arraystretch}{1.8}
 \begin{rbtabular}{\textwidth}{c X p{3cm} p{3cm} p{3cm}}%
 {\textbf{Players} & \textbf{Modes} & \textbf{Player 1} & \textbf{Player 2}
@@ -51,7 +51,7 @@ Game controls:}
 \renewcommand{\arraystretch}{1.0}
 }
-\nopt{RECORDER_PAD}{
+\nopt{MULTIPLAYER_PAD}{
    \begin{btnmap}
        \nopt{MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonLeft}
        \opt{MPIO_HD200_PAD}{\ButtonVolDown}
@@ -62,7 +62,7 @@ Game controls:}
            &}
        Turn left
        \\
-        
        \nopt{MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonRight}
        \opt{MPIO_HD200_PAD}{\ButtonVolUp}
        \opt{MPIO_HD300_PAD}{\ButtonFF}
@@ -72,7 +72,7 @@ Game controls:}
            &}
        Turn right
        \\
-        
        \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,MPIO_HD200_PAD%
            ,MPIO_HD300_PAD,touchscreen}{\ButtonUp}
        \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
@@ -85,7 +85,7 @@ Game controls:}
            &}
        Turn Up
        \\
-        
        \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,MPIO_HD200_PAD%
            ,MPIO_HD300_PAD,touchscreen}{\ButtonDown}
        \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
@@ -119,25 +119,24 @@ An ``argh'' is a black square poisoned piece {}- slightly bigger than
 food {}- that makes a worm say ``Argh!'' when
 run into.  A worm that eats an ``argh'' is dead. Thus eating an
 ``argh'' must be avoided under any circumstances. ``Arghs'' have the
-annoying tendency to accumulate. 
+annoying tendency to accumulate.
 \item[Worms.]
 Thou shall not eat worms. Neither other worms nor thyself. Eating worms
 is blasphemous cannibalism, not healthy and causes instant
 death. And it doesn't help anyway: the other worm
 isn't hurt by the bite. It will go on creeping happily
-and eat all the food you left on the table. 
+and eat all the food you left on the table.
 \item[Walls.]
 Don't crash into the walls. Walls are not edible.
 Crashing a worm against a wall causes it a headache it
-doesn't survive. 
+doesn't survive.
 \item[Game over.]
 The game is over when all worms are dead. The longest worm wins the
-game. 
+game.
 \item [Pause the game.]
 Press
-\opt{RECORDER_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD%
+\opt{IAUDIO_X5_PAD,PBELL_VIBE500_PAD,MPIO_HD200_PAD%
    ,MPIO_HD300_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,SANSA_E200_PAD,SANSA_FUZE_PAD%
  ,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonSelect}
 \opt{COWON_D2_PAD}{\TouchCenter}
@@ -148,7 +147,7 @@ There are two ways to stop a running game.
 \begin{itemize}
 \item If you want to quit Wormlet entirely simply hit
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
 \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}%
@@ -157,10 +156,9 @@ There are two ways to stop a running game.
 \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}%
 \opt{MPIO_HD300_PAD}{Long \ButtonMenu}%
 \opt{GIGABEAT_S_PAD}{\ButtonBack}.
-The game will stop immediately and you will return to the game menu. 
+The game will stop immediately and you will return to the game menu.
-\item If you want to stop the game and still see the screen hit 
+\item If you want to stop the game and still see the screen hit
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
-\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}%
 \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}%
@@ -171,8 +169,7 @@ The game will stop immediately and you will return to the game menu.
 \opt{MPIO_HD300_PAD}{Long \ButtonPlay}%
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}.
 This freezes the game. If you hit
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
-\opt{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}%
 \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}%
 \opt{SANSA_FUZE_PAD}{\ButtonSelect+\ButtonUp}%
@@ -184,7 +181,7 @@ This freezes the game. If you hit
 \opt{GIGABEAT_S_PAD}{\ButtonMenu}
 button again a new game starts with the same configuration. To return to the
 games menu you can hit
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
 \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}
@@ -192,7 +189,7 @@ games menu you can hit
 \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. 
+\opt{GIGABEAT_S_PAD}{\ButtonBack}. A stopped game can not be resumed.
 \end{itemize}
 \end{description}
@@ -205,20 +202,20 @@ dies its entry on the score board turns black.
 \begin{description}
 \item[Len:]
 Here the current length of the worm is displayed. When a worm is eating
-food it grows by one pixel for each step it moves. 
+food it grows by one pixel for each step it moves.
 \item[Hungry:]
 That's the normal state of a worm. Worms are always
 hungry and want to eat. It is good to have a hungry
 worm since it means that your worm is alive. But it is
-better to get your worm growing. 
+better to get your worm growing.
 \item[Growing:]
 When a worm has eaten a piece of food it starts growing. For each step
 it moves over food it can grow by one pixel. One piece of food lasts
 for 7 steps. After your worm has moved 7 steps the food is used up. If
 another piece of food is eaten while growing it will increase the size
-of the worm for another 7 steps. 
+of the worm for another 7 steps.
 \item[Crashed:]
 This indicates that a worm has crashed against a wall.
@@ -241,7 +238,7 @@ is a good way to get them out of the game.
 \item Initially you will be busy with controlling your worm. Try to
 avoid other worms and crawl far away from them. Wait until they curl up
 themselves and collect the food afterwards. Don't worry if the other
-worms grow longer than yours {}- you can catch up after they've died. 
+worms grow longer than yours {}- you can catch up after they've died.
 \item When you are more experienced watch the tactics of other worms.
 Those worms controlled by artificial stupidity head straight for the
@@ -251,9 +248,9 @@ between the opponent and that food. From now on you can `control' the
 other worm by blocking it. You could trap it by making a 1 pixel wide
 U{}-turn. You also could move from food to food and make sure you keep
 between your opponent and the food. So you can always reach it before
-your opponent. 
+your opponent.
-\opt{RECORDER_PAD}{
+\opt{MULTIPLAYER_PAD}{
 \item While playing the game the \dap\ can still play music. For
 single player game use any music you like. For berserk games with 2 players use
 hard rock and for 3 player games use heavy metal or X{}-Phobie
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 1be543ccdf..03c36bac81 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -10,12 +10,12 @@ To finish a level you have to section off more than 75\%.
 \begin{btnmap}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
-        ,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
+        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
        {\ButtonUp, \ButtonDown,}%
    \opt{IRIVER_H10_PAD,MPIO_HD300_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD%
        ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
        {\ButtonLeft, \ButtonRight}
@@ -24,9 +24,8 @@ To finish a level you have to section off more than 75\%.
  \opt{HAVEREMOTEKEYMAP}{& }
    & Move around the arena\\
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,RECORDER_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD%
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD%
        ,MPIO_HD300_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
    \opt{SANSA_CLIP_PAD}{\ButtonHome}
@@ -35,7 +34,7 @@ To finish a level you have to section off more than 75\%.
    \opt{COWON_D2_PAD}{\TouchCenter}
  \opt{HAVEREMOTEKEYMAP}{& }
    & Pause\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect{} + \ButtonMenu}
    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
        ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
diff --git a/manual/plugins/xworld.tex b/manual/plugins/xworld.tex
index 57d42bde0f..07c7d8d670 100644
--- a/manual/plugins/xworld.tex
+++ b/manual/plugins/xworld.tex
@@ -10,7 +10,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
 \begin{btnmap}
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -22,7 +22,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
       \opt{HAVEREMOTEKEYMAP}{& }
    & Up and Jump \\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
@@ -34,7 +34,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
       \opt{HAVEREMOTEKEYMAP}{& }
    & Down and Crouch\\
    %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,GIGABEAT_PAD%
        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
        ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD%
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index 55f75eb963..8044b0d77e 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -14,12 +14,12 @@ including an additional but fixed menu button, are assigned as follows:
 \begin{btnmap}
    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
        ,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD%
        ,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
        {\ButtonUp/\ButtonDown/}
    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown/}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD%
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H100_PAD%
        ,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD%
        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
@@ -33,10 +33,8 @@ including an additional but fixed menu button, are assigned as follows:
    \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
        ,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD
        ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay{} or \ButtonFF}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
    \opt{IRIVER_H10_PAD}{\ButtonRew}
    \opt{COWON_D2_PAD}{\TouchCenter}
    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
@@ -45,8 +43,6 @@ including an additional but fixed menu button, are assigned as follows:
  \opt{HAVEREMOTEKEYMAP}{& }
    & Jump/Fire\\
    %
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD}{\ButtonOff}
    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch}
    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{\ButtonMenu}