69 files changed, 458 insertions, 1691 deletions

diff --git a/manual/advanced_topics/archos-flashing.tex b/manual/advanced_topics/archos-flashing.tex
deleted file mode 100644
index e8fa7af88c..0000000000
--- a/manual/advanced_topics/archos-flashing.tex
+++ /dev/null
@@ -1,195 +0,0 @@
-\section{\label{ref:Rockboxinflash}Rockbox in Flash}
-
-\subsection{Introduction}
-
-When you bought your \playertype, it came with the \playerman\ firmware in
-flash ROM. When you power on your \dap, this \playerman\ firmware starts,
-and then loads an updated firmware from disk if present (\firmwarefilename).
-An ordinary Rockbox installation only replaces the on-disk firmware, leaving
-the flash ROM contents intact. That means the \playerman\ firmware still
-controls the boot process.
-
-The main reason to change this is to improve the startup time of your player.
-The \playerman\ bootloader is rather slow. With Rockbox in flash, your \dap\
-will boot much faster, typically in three to five seconds. Furthermore you
-might prefer a clean Rockbox environment, with as little remnants of the
-\playerman\ software as possible.
-\opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly
-  from flash ROM, increasing the amount of free RAM for buffering music. This
-  is called \emph{Rombox}.
-}
-
-\warn{Flashing your \dap\ is somewhat dangerous, like programming a mainboard
-  \emph{BIOS}, \emph{CD/DVD} drive firmware, mobile phone, etc. If the power
-  fails, the chip breaks while programming or most of all the programming
-  software malfunctions, you'll have a dead box. We take no responsibility of
-  any kind, you do that at your own risk. However, we tried as carefully as
-  possible to bulletproof this code. There are a lot of sanity checks. If any
-  of them fails, it will not program.
-}
-
-\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \playerman\
-    firmware
-    \opt{ondiofm}{versions 1.31f or 1.32b! These versions are flash updates
-      themselves. If they are}
-    \opt{ondiosp}{version 1.32b! This version is a flash update itself.
-      If it is}
-    applied when Rockbox is flashed, you'll end up with a garbled flash ROM
-    and hence a dead box.
-}}
-
-There's an ultimate safety net to bring back boxes with even completely
-garbled flash content: the \emph{UART} boot mod, which in turn requires the
-\emph{serial} mod. With that it's possible to reflash independently from the
-outside, even if the flash ROM is completely erased.
-\nopt{ondio}{This won't work if you have one of the rare ``ROMless'' boxes. These
-  have no boot ROM and boot directly from flash.
-}
-If the first $\approx$2~KB of the flash ROM are flashed OK, \emph{Minimon} can
-be used for the same purpose.
-
-\subsection{Terminology and Basic Operation}
-
-\begin{description}
-\item[Firmware:] The flash ROM contents as a whole.
-\item[Image:] One operating software started from there.
-\end{description}
-
-The replacement firmware contains a bootloader and two images. The first image
-is the \emph{permanent} rescue software, to be used in case something is wrong
-with the second (main) image. In current firmware files this first image
-contains \emph{Bootbox} (see wiki for details). The second image is what is
-booted by default. The current firmware files contain a copy of Rockbox 3.2
-in the main image. It can easily be updated/replaced later.
-
-The bootloader allows to select which image to run. Pressing
-\opt{RECORDER_PAD}{\ButtonFOne}\opt{PLAYER_PAD,ONDIO_PAD}{\ButtonLeft} at boot
-selects the first image.
-\opt{RECORDER_PAD}{\ButtonFTwo}\opt{PLAYER_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{\ButtonUp}
-selects the second image, which will also be booted if you don't press any
-button. The button mapping is only there for completeness.
-\opt{RECORDER_PAD}{\ButtonFThree}\opt{PLAYER_PAD,ONDIO_PAD}{\ButtonRight}
-selects the built-in serial monitor called \emph{Minimon}. You should know this
-in case you invoke it by accident. Minimon won't display anything on the
-screen. To get out of it, perform a hardware shutdown of your \dap.
-
-\subsection{Initial Flashing Procedure}
-
-You only need to perform this procedure the first time you flash your
-\playertype. You may also want to perform it in case the update procedure for
-the second image recommends it. In the latter case do not perform the steps
-listed under ``Preparation''.
-
-\subsubsection{Preparation}
-
-\nopt{ondio}{
-  First, check whether your \playertype\ is flashable at all. Select
-  \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW
-  Info}. 
-  \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight /
-    \ButtonLeft\ until ``Flash:'' is displayed. If it shows question marks,
-  }
-  \opt{lcd_bitmap}{Check the values in the line starting with ``Flash:''. If it
-    shows question marks after ``M='' and ``D='',
-  }
-  you're out of luck, your \dap\ is not flashable without modifying the
-  hardware. You can stop here. Sorry.
-}
-
-\nopt{ondio}{If your \dap\ is flashable, you}\opt{ondio}{You} should perform a
-backup of the current flash ROM contents, in case you want to restore it later.
-Select \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ Dump ROM
-contents}. You'll notice a few seconds of disk activity. When you connect your
-\dap\ to the PC afterwards, you'll find two files in the root of your \dap.
-Copy the 256~KB-sized file named \fname{internal\_rom\_2000000-203FFFF.bin} to
-a safe place.
-
-\subsubsection{Flashing}
-
-\begin{enumerate}
-\item Download the correct package for your \dap\ from
-  \url{http://download.rockbox.org/bootloader/archos/}. It is named
-  \fname{flash-{\textless}model{\textgreater}-{\textless}version{\textgreater}.zip}.
-  The current packages are v3.
-\item Unzip the flash package to the root of your \dap.
-  \nopt{ondio}{This will extract two files to the root,
-    \fname{firmware\_{\textless}model{\textgreater}.bin} and
-    \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}.
-    \opt{recorder,recorderv2fm}{(The {\textless}model{\textgreater} part is
-      slighty different from that in the .zip file name.)
-    }
-    The flash plugin will select the correct one for your \dap.
-  }
-  \opt{ondio}{This will extract one file to the root,
-    \fname{firmware\_{\textless}model{\textgreater}.bin}.
-  }
-  Now safely disconnect USB.
-\item
-  \nopt{ondio}{Make sure your batteries are in good shape and fully charged.}
-  \opt{ondio}{Make sure you use a set of fresh batteries.}
-  Flashing doesn't need more power than normal operation, but you don't want
-  your \dap\ to run out of power while flashing.
-\item Select \setting{Plugins $\rightarrow$ Applications}, and run the
-  \fname{firmware\_flash} plugin. It will tell you about your flash and
-  which file it is going to program. After pressing
-  \opt{RECORDER_PAD}{\ButtonFOne}\opt{PLAYER_PAD}{\ButtonMenu}\opt{ONDIO_PAD}{\ButtonLeft}
-  it will check the file. If the file is OK, pressing
-  \opt{RECORDER_PAD}{\ButtonFTwo}\opt{PLAYER_PAD}{\ButtonOn}\opt{ONDIO_PAD}{\ButtonUp}
-  will give you a big warning. If we still didn't manage to scare you off, you
-  need to press 
-  \opt{RECORDER_PAD}{\ButtonFThree}\opt{PLAYER_PAD,ONDIO_PAD}{\ButtonRight}
-  to actually program and verify. The programming takes just a few seconds.
-\item In the unlikely event that the programming or verify steps should give
-  you any error, \emph{do not switch off the box!} Otherwise you'll have seen
-  it working for the last time. While Rockbox is still in RAM and operational,
-  we could upgrade the plugin via USB and try again. If you switch it off,
-  it's gone.
-\end{enumerate}
-
-\note{After successful flashing you may delete the \fname{.bin} files from the
-  root of your \dap.
-}
-
-\note{There are no separate flash packages for {\dap}s modified to have 8~MB
-  of RAM. You need to use the corresponding package for non-modified
-  \playertype. You should then install a Rockbox image that makes use of all
-  available RAM as described in the following section.
-}
-
-\subsection{Updating the Rockbox Image in Flash}
-
-When Rockbox is booted from flash, it does not check for an updated firmware
-on disk. This is one of the reasons why it boots faster than the \playerman\
-firmware. It means that whenever you update Rockbox, you also need to update
-the image in the flash. This is a simple and safe procedure:
-
-\begin{enumerate}
-\item Download (or build) the Rockbox build you want to use, and unzip it to
-  the root of your \dap. Safely disconnect USB.
-\item ROLO into the new Rockbox version.
-\item Go to the file browser, and enter the \fname{.rockbox} directory (you
-  might need to set the \setting{File View} option to \setting{All}.)
-\item Play the file \fname{rockbox.ucl}\opt{rombox}{, or preferably
-  \fname{rombox.ucl}}, and follow the instructions. The plugin handling
-  this is \fname{rockbox\_flash}, a viewer plugin.
-\end{enumerate}
-
-\subsection{Restoring the Original Flash ROM Contents}
-
-In case you ever want to restore the original flash contents, you will need
-the backup file. The procedure is very similar to initial flashing, with the
-following differences:
-
-\begin{enumerate}
-\item Check that you do not have any \fname{firmware\_*.bin} files in your
-  \dap's root.
-\item Select \setting{Plugins $\rightarrow$ Applications}, and run the
-  \fname{firmware\_flash} plugin. Write down the filename it displays in the
-  first screen, then exit the plugin.
-\item Connect USB, and copy the flash ROM backup file to the root of your
-  \dap. \emph{Only use the backup file from that very box, otherwise you're
-  asking for trouble!} Rename the file so that it matches the name requested
-  by the \fname{firmware\_flash} plugin. Safely disconnect USB.
-\end{enumerate}
-
-Now follow the instructions given for initial flashing, starting with step 3.
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 273ed1c805..786c109772 100755
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -14,7 +14,7 @@ To accomplish this, load a \fname{.cfg} file (as described in
 words: \config{bookmarks}, \config{files}, \opt{tagcache}{\config{database}, }%
 \config{wps}, \config{settings}, \opt{recording}{\config{recording}, }%
 \opt{radio}{\config{radio}, }\config{playlists}, \config{plugins},
-\config{system\_menu}, \opt{PLAYER_PAD}{\config{shutdown}, }\config{shortcuts}.
+\config{system\_menu}, \config{shortcuts}.
 Each of the words, if it occurs in the list, activates the appropriate item
 in the main menu. The order of the items is given by the order of the words
 in the list. The items whose words do not occur in the list will be hidden,
@@ -490,10 +490,8 @@ displaying images:
   \item Load and always show the image, using the \config{\%x} tag
   \item Preload the image with \config{\%xl} and show it with \config{\%xd}.
     This way you can have your images displayed conditionally.
-    \nopt{archos}{%
-    \item Load an image and show as backdrop using the \config{\%X} tag. The
-      image must be of the same exact dimensions as your display.
-    }%
+  \item Load an image and show as backdrop using the \config{\%X} tag. The
+    image must be of the same exact dimensions as your display.
 \end{enumerate}
 
 \optv{swcodec}{% This doesn't depend on swcodec but we don't have a \noptv
@@ -663,21 +661,10 @@ Example of a configuration file:
 \end{description}
 
 \section{\label{ref:FirmwareLoading}Firmware Loading}
-\opt{player,recorder,recorderv2fm,ondio}{
-  When your \dap{} powers on, it loads the Archos firmware in ROM, which
-  automatically checks your \daps{} root directory for a file named
-  \firmwarefilename. Note that Archos firmware can only read the first
-  ten characters of each filename in this process, so do not rename your old
-  firmware files with names like \firmwarefilename.\fname{old} and so on,
-  because it is possible that the \dap{} will load a file other than the one
-  you intended.
-}
 
 \subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)}
 Rockbox is able to load and start another firmware file without rebooting.
 You just ``play'' a file with the extension %
-\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
-\opt{player}{\fname{.mod}.} %
 \opt{iriverh100,iriverh300}{\fname{.iriver}.} %
 \opt{ipod}{\fname{.ipod}.} %
 \opt{iaudio}{\fname{.iaudio}.} %
@@ -687,8 +674,6 @@ You just ``play'' a file with the extension %
 This can be used to test new firmware versions without deleting your
 current version.
 
-\opt{archos}{\input{advanced_topics/archos-flashing.tex}}
-
 \opt{multi_boot}{
 \subsection{\label{ref:using_multiboot}Using Multiboot}
   \newcommand{\redirectext}{<playername>}
@@ -732,14 +717,12 @@ current version.
 } The following provides a short overview of the most relevant settings and
   rules of thumb.
 
-\nopt{ondio}{
 \subsection{Display backlight}
   The active backlight consumes a lot of power. Therefore choose a setting that
   disables the backlight after timeout (for setting \setting{Backlight} see
   \reference{ref:Displayoptions}). Avoid having the backlight enabled all the
   time (Activating \setting{selectivebacklight}
   \reference{ref:selectivebacklight} can further reduce power consumption).
-}
 
 \opt{lcd_sleep}{
 \subsection{Display power-off}
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 6f8a47fd6d..f1d6ccca16 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -58,41 +58,6 @@ This is a list of Feature Requests we get repeatedly that we simply
 cannot do. View it as the opposite of a TODO!
 
 \begin{itemize}
-\opt{archos}{
-\item Record to WAV (uncompressed) or MP3pro format.\\
-The recording hardware (the MAS) does not allow us to do this
-\item Crossfade between tracks.\\
-  Crossfading would require two mp3 decoders, and we only have one. 
-  This is not possible.
-\item Support MP3pro, WMA or other sound format playback.\\
-  The mp3{}-decoding hardware can only play MP3. We cannot make it play other 
-  sound formats.
-\item  Converting OGG $\rightarrow$ MP3.\\
-  The mp3{}-decoding hardware cannot decode OGG. It can be reprogrammed, but 
-  there is too little memory for OGG and we have no documentation on how to 
-  program the MAS' DSP. Doing the conversion with the CPU is impossible, since 
-  a 12~MHz SH1 is far too slow for this daunting task.
-\item Archos Multimedia support.\\
-  The Archos Multimedia is a completely different beast. It is an entirely 
-  different architecture, different CPU and upgrading the software is done 
-  a completely different way. We do not wish to venture into this.  Others 
-  may do so. We will not.
-\item Multi{}-band (or graphic) equaliser.\\
-  We cannot access information for that kind of visualisation from the MP3 
-  decoding hardware.
-\item CBR recording.\\
-  The MP3 encoding hardware does not allow this.
-\item Change tempo of a song without changing pitch.\\
-  The MP3 decoding hardware does not allow this.
-\item Graphic frequency (spectrum analyser).\\
-  We cannot access the audio waveform from the MP3 decoder so we cannot analyse 
-  it. Even if we had access to it, the CPU would probably be too slow to 
-  perform the analysis anyway.
-\item Cool sound effects.\\
-  Adding new sound effects requires reprogramming the MAS chip, and we cannot 
-  do that. The MAS chip is programmable, but we have no access to the chip 
-  documentation.
-}
 \nopt{iriverh300,iaudiox5}{
 \item Interfacing with other USB devices (like cameras) or 2 player games over USB.\\
   The USB system demands that there is a master that talks to a slave. The
@@ -104,10 +69,9 @@ The recording hardware (the MAS) does not allow us to do this
   to play with it the way we'd need for any good communication to work.
 }
 \item Support other file systems than FAT32 (like NTFS or ext2 etc.).\\
-  No.
-  \opt{archos}{Rockbox needs to support FAT32 since it can only start off a FAT32
-  partition (since that is the only way the ROM can load it), and adding}%
-  support for more file systems will just take away valuable ram for
+  No.  (Except perhaps for ExFAT)
+  Most \dap{}s can only start off FAT32 partitions, so adding support
+  for more file systems will just take away valuable ram for
   unnecessary features. You can partition your \dap{} fine, just make sure
   the first one is FAT32 and then make the other ones whatever file system
   you want. Just do not expect Rockbox to understand them.
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index ddd41e105d..e9604bdc33 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -380,12 +380,6 @@
       force fm mono
                 & off, on               & N/A\\
     }%
-    \opt{player}{
-      jump scroll
-                & 0 to 5                & N/A\\
-      jump scroll delay
-                & 0 to 250              & 0.01~s\\
-    }%
 
     \bottomrule
   \end{longtable}
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index c909dfe91c..42681828fe 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -6,10 +6,6 @@
   & \textbf{Action when selected}}{}{}
 \includegraphics[width=0.37cm]{appendix/images/icon-directory.png} 
   & Directory & \emph{none} & Enter the directory \tabularnewline
-\opt{recorder,recorderv2fm,ondiofm,ondiosp}{
-  \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
-  & Rockbox firmware & \fname{.ajz} & Load the new firmware with ROLO \tabularnewline
-}
 \opt{swcodec}{
   \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & \emph{various}\newline%
@@ -66,10 +62,6 @@
   \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & \fname{.mi4} & Load the new firmware with ROLO \tabularnewline
 }
-\opt{player}{
-  \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
-  & Rockbox firmware & \fname{.mod} & Load the new firmware with ROLO \tabularnewline
-}
 \opt{masd,masf}{
   \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & \fname{.mp2}, \fname{.mp3} & Start playing the file and show the WPS\tabularnewline
@@ -90,10 +82,6 @@
 }
 \includegraphics[width=0.37cm]{appendix/images/icon-text.png} 
   & Text File & \fname{.txt} & Display the text file using the text viewer plugin\tabularnewline
-\opt{archos}{
-  \includegraphics[width=0.37cm]{appendix/images/icon-ucl.png} 
-    & Flash Image & \fname{.ucl} & Flash the Rockbox image into the ROM \tabularnewline
-  }
   & Voice file & \fname{.voice} & Allow Rockbox to speak menus\tabularnewline
 \opt{masf}{
   \includegraphics[width=0.37cm]{appendix/images/icon-wav-file.png} 
diff --git a/manual/appendix/images/icon-ucl.png b/manual/appendix/images/icon-ucl.png
deleted file mode 100644
index e34920b010..0000000000
--- a/manual/appendix/images/icon-ucl.png
+++ /dev/null
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index f1f79b9351..1aec7bae99 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -47,7 +47,7 @@ Example:
     \config{\%iy} & Year\\
     \config{\%ik} & Disc Number\\
   \end{tagmap}
-Remember that this information is not always available, so use the 
+Remember that this information is not always available, so use the
 conditionals to show alternate information in preference to assuming.
 
 These tags, when written with a capital ``I'' (e.g. \config{\%Ia} or \config{\%Ic}),
@@ -112,7 +112,7 @@ show the information for the next song to be played.
 \section{Power Related Information}
   \begin{tagmap}
     \config{\%bl} & Numeric battery level in percents.
-                    Can also be used in a conditional: 
+                    Can also be used in a conditional:
                     \config{\%?bl<-1|0|1|2|\ldots|N>},
                     where the value $-1$ is used when the battery level isn't
                     known (it usually is). The value $N$ is only used when the
@@ -153,7 +153,7 @@ show the information for the next song to be played.
                        (N can be 1, 2, 3, \dots)\\
   \end{tagmap}
 Example for the \config{\%d(N)} commands: If the file is
-``\fname{/Rock/Kent/Isola/11 - 747.mp3}'', \config{\%d(1)} is ``\fname{Isola}'', 
+``\fname{/Rock/Kent/Isola/11 - 747.mp3}'', \config{\%d(1)} is ``\fname{Isola}'',
 \config{\%d(2)} is ``\fname{Kent}'' and \config{\%d(3)} is ``\fname{Rock}''.
 
 These tags, when written with the first letter capitalized (e.g. \config{\%Fn}
@@ -162,28 +162,20 @@ or \config{\%D(2)}), produce the information for the next file to be played.
 \section{Playlist/Song Info}
   \begin{tagmap}
     \config{\%pb} & Progress Bar.
-    \opt{player}{
-            This will display a one character ``cup''
-            that empties as the time progresses.}
     \opt{lcd_bitmap}{
            This will replace the entire line with a progress bar.
            You can set the position, width and height of the progressbar
            (in pixels) and load a custom image for it:
            \config{\%pb(x,y,[width],[height],image.bmp)}} \\
-    \opt{player}{%
-    \config{\%pf} & Full-line progress bar \& time display\\
-    }%
     \config{\%px} & Percentage played in song\\
     \config{\%pc} & Current time in song\\
     \config{\%pe} & Total number of playlist entries\\
-    \nopt{player}{%
     \config{\%pm} & Peak Meter. The entire line is used as %
                     volume peak meter.\\%
     \config{\%pL} & Peak meter for the left channel. Can be used as a value, %
             a conditional tag or a bar tag.\\
     \config{\%pR} & Peak meter for the right channel. Can be used as a value, %
             a conditional tag or a bar tag.\\
-    }%
     \config{\%pn} & Playlist name (without path or extension)\\
     \config{\%pp} & Playlist position\\
     \config{\%pr} & Remaining time in song\\
@@ -206,7 +198,7 @@ or \config{\%D(2)}), produce the information for the next file to be played.
            the rest of the track>}\\
     \config{\%Sp} & Current playback pitch\\
   \end{tagmap}
-  
+
 \section{Playlist Viewer}
   \begin{tagmap}
     \config{\%Vp(start,code to render)} & Display the playlist viewer in
@@ -274,7 +266,7 @@ Example: \config{\%?mm<Off|All|One|Shuffle|A-B>}
 
 \section{Playback Mode}
   \begin{tagmap}
-    \config{\%mp} & Play status, 0-4, in the order: Stop, Play, Pause, 
+    \config{\%mp} & Play status, 0-4, in the order: Stop, Play, Pause,
            Fast Forward, Rewind, Recording, Recording paused, FM Radio playing,
            FM Radio muted\\
   \end{tagmap}
@@ -303,7 +295,7 @@ Example: \config{\%?mp<Stop|Play|Pause|Ffwd|Rew|Rec|Rec pause|FM|FM pause>}
     13 & Playlist Catalogue Viewer \\
     14 & Plugin \\
     15 & Context menu \\
-    16 & System Info screen \\ 
+    16 & System Info screen \\
     17 & Time and Date Screen \\
     18 & Bookmark browser \\
     19 & Shortcuts menu \\
@@ -374,7 +366,6 @@ Examples:
 \opt{lcd_bitmap}{
 \section{\label{ref:wps_images}Images}
   \begin{tagmap}
-    \nopt{archos}{%
     \config{\%X(filename.bmp)}
         & Load and set a backdrop image for the WPS.
           This image must be exactly the same size as your LCD.\\
@@ -396,12 +387,12 @@ Examples:
           contained in the bitmap. Default is 1.\\
     \config{\%xd(n[i] [,tag] [,offset])} & Display a preloaded image.
           \config{n}: image ID  as it was specified in \config{\%x} or \config{\%xl}\newline
-          \config{i}: (optional) number of the sub-image to display (a-z for 1-26 and A-Z for 27-52). 
+          \config{i}: (optional) number of the sub-image to display (a-z for 1-26 and A-Z for 27-52).
           (ignored when \config{tag} is used). Only useable if the ID is a single letter.
           By default the first (i.e. top most) sub-image will be used.\newline
           \config{tag}: (optional) Another tag to calculate the subimage from e.g \config{\%xd(A, \%mh)} would
           use the first subimage when \config{\%mh} is on and the second when it is off\newline
-          \config{offset}: (optional) Add this number to the value from the \config{tag} when 
+          \config{offset}: (optional) Add this number to the value from the \config{tag} when
           chosing the subimage (may be negative)\\
     \config{\%x9(n)}
         & Display an image as a 9-patch bitmap covering the entire viewport.\newline
@@ -409,7 +400,7 @@ Examples:
           are unscaled, the four middle sections are scaled along one axis and the middle
           section is scaled on both axis.\newline
           \config{n}: image ID\\
-          
+
   \end{tagmap}
 
 Examples:
@@ -429,12 +420,11 @@ with image ID ``M'', and then reference the individual sub-images in a condition
   \item The images must be in BMP format
   \item The image tag must be on its own line
   \item The ID is case sensitive
-  \item The size of the LCD screen for each \dap{} varies. See table below 
-        for appropriate sizes of each device. The x and y coordinates must 
+  \item The size of the LCD screen for each \dap{} varies. See table below
+        for appropriate sizes of each device. The x and y coordinates must
         respect each of the \daps{} limits.
   \end{itemize}
 }
-}
 
 \opt{albumart}{
 \subsection{How to display the album art}
@@ -519,8 +509,8 @@ and tuned to a preset (and not recording) in order for them to be shown.
     \config{\%Sr} & Use as a conditional to define options for left to right, or
                     right to left languages. \%?Sr<RTL|LTR>\\
   \end{tagmap}
-  
-All alignment tags may be present in one line, but they need to be in the 
+
+All alignment tags may be present in one line, but they need to be in the
 order left -- centre -- right. If the aligned texts overlap, they are merged.
 
 Example: \config{\%ax\%V(\dots)}
@@ -569,7 +559,7 @@ Examples of the \%if tag:\\
 
 Allows grouping of several items (sublines) onto one line, with the
 display cycling round the defined sublines. See
-\reference{ref:AlternatingSublines} for details. 
+\reference{ref:AlternatingSublines} for details.
 
 \opt{rtc}{
 \section{Time and Date}
@@ -601,7 +591,7 @@ display cycling round the defined sublines. See
     \config{\%Sx(English)}
     & Display the translation of ``English'' in the current language\\
   \end{tagmap}
-  
+
   \begin{itemize}
     \item ``English'' must be a phrase used in the language file.
     \item It should match the \config{Source:} line in the language file.
@@ -685,7 +675,7 @@ display cycling round the defined sublines. See
   Some tags can be used to display a bar which draws according to the value of
   the tag. To use these tags like a bar you need to use the following parameters
   (\%XX should be replaced with the actual tag).
-  
+
 \opt{touchscreen}{
     Volume and progress bars automatically create touch regions the same size
     as the bar (slightly larger actually). This can be disabled with the
@@ -716,13 +706,13 @@ display cycling round the defined sublines. See
     the centre of the image matches the current position. This must be
     followed by the label of the desired image.
   \item[backdrop] -- draw a preloaded image under the bar. The full
-    image will be displayed and must be the same size as the bar. 
+    image will be displayed and must be the same size as the bar.
     This must be followed by the label of the desired image.
   \item[nofill] -- don't draw the bar, only its frame (for use with the
      ``slider'' option).
   \item[noborder] -- don't draw the border for image-less bars, instead maximise
     the filling over the specified area. This doesn't work for bars which
-    specify an image. 
+    specify an image.
   \item[nobar] -- don't draw the bar or its frame (for use with the
     ``slider'' option).
     \opt{touchscreen}{
@@ -755,7 +745,7 @@ a horizontal progressbar which doesn't fill and draws the image
             substring is a number so it can be used with conditionals. (i.e \config{\%cM}).
             0 is the first conditional option
 \end{description}
-    
+
 \begin{tagmap}
   \config{\%(}           & The character `('\\
   \config{\%)}           & The character `)'\\
@@ -766,10 +756,10 @@ a horizontal progressbar which doesn't fill and draws the image
   \config{\%>}           & The character `>'\\
   \config{\%;}           & The character `;'\\
   \config{\%\#}          & The character `\#'\\
-  \config{\%s}           & Indicate that the line should scroll. Can occur 
-                           anywhere in a line (given that the text is 
-                           displayed; see conditionals above). You can specify 
-                           up to ten scrolling lines. Scrolling lines can not 
-                           contain dynamic content such as timers, peak meters 
+  \config{\%s}           & Indicate that the line should scroll. Can occur
+                           anywhere in a line (given that the text is
+                           displayed; see conditionals above). You can specify
+                           up to ten scrolling lines. Scrolling lines can not
+                           contain dynamic content such as timers, peak meters
                            or progress bars.\\
 \end{tagmap}
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index e482417f0b..4978753444 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -194,10 +194,8 @@
     \opt{lcd_bitmap}{
       \item[Screen Scrolls Out of View.]
         Screens can be manually scrolled horizontally by pressing
-        \opt{RECORDER_PAD}{\ButtonOn+\ButtonRight/\ButtonLeft}%
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight/\ButtonLeft}%
         \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}%
-        \nopt{RECORDER_PAD,ONDIO_PAD,IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
+        \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD%
               ,touchscreen}{%
             Long \ButtonRight/\ButtonLeft}.
         Setting this option to \setting{Yes}
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 53ca4a1658..8554abdcfa 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -42,7 +42,7 @@ you to configure settings related to audio playback.
         Setting the End Point (B) is done accordingly using
         \ActionWpsAbSetBNextDir{}.  To reset the markers press \ActionWpsAbReset{}.
     }%
-    \opt{ipod,IAUDIO_X5_PAD,ONDIO_PAD,PLAYER_PAD,PBELL_VIBE500_PAD}{%
+    \opt{ipod,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}{%
         To set the Start Point (A) press \ActionWpsBrowse{}. The following
         press of \ActionWpsBrowse{} will set the End Point (B), and a third
         successive \ActionWpsBrowse{} will reset the markers.
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 0175631cf7..5fc8f16840 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -165,12 +165,11 @@
     Resets the location where the recorded files are saved to the root of your
     \daps{} drive.
 
-\nopt{ondio}{
-  \section{Clipping Light}
+\section{Clipping Light}
     Causes the backlight to flash on when clipping has been detected.\\
     Options: \setting{Off}, \setting{Main unit only},
     \setting{Main and remote unit}, \setting{Remote unit only}.
-}
+
 \section{Trigger}
   When you record a source you often are only interested in the sound and not
   the silence in between. The recording trigger provides you with a
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index f9f0a747dd..fd5efa189b 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -17,8 +17,6 @@ change to customise your listening experience.
       an otherwise low volume level.
   }
   The volume can be adjusted from a
-  \opt{player}{minimum of -78~dB to a maximum of +18~dB.}%
-  \opt{recorder,recorderv2fm,ondio}{minimum of -100~dB to a maximum of +12~dB.}%
   \opt{iriverh100,iriverh300}{minimum of -84~dB to a maximum of 0~dB.}%
   \opt{iaudiom3,iaudiom5,iaudiox5,ipod3g,ipod4g,gigabeatf,mrobe100,mpiohd200}{%
       minimum of -73~dB to a maximum of +6~dB.}%
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 7c3300b875..28d1c1a577 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -4,14 +4,12 @@
 \nopt{sansa,fuzeplus}%will probably be there on Sansas one day -  exclude it the simple way without specific option
 {\nopt{sansaAMS}{
   \subsection{Battery}
-  Options relating to the \opt{archos}{batteries}\nopt{archos}{battery}
+  Options relating to the battery
   in the \dap.
   \begin{description}
     \item [Battery Capacity.] This setting can be used to tell Rockbox what
       capacity (in mAh) the battery being used has. The default is
-      \opt{player,recorder}{1500~mAh}%
-      \opt{recorderv2fm}{2200~mAh}%
-      \opt{ondiosp,ondiofm,vibe500}{1000~mAh}%
+      \opt{vibe500}{1000~mAh}%
       \opt{iriverh100,iriverh300}{1300~mAh}%
       \opt{mpiohd200}{850~mAh}%
       \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
@@ -28,8 +26,7 @@
       \opt{mrobe100}{720~mAh}%
       \opt{samsungyh920,samsungyh925}{900~mAh}%
       \opt{samsungyh820}{650~mAh}%
-      , which is the capacity value for the standard
-      \opt{archos}{batteries}\nopt{archos}{battery} shipped with the \dap.
+      , which is the capacity value for the standard battery shipped with the \dap.
         Rockbox uses this value for runtime estimation, not battery percentage
         calculation. Changing this setting has no effect whatsoever on
         actual battery life. This setting only affects the accuracy of the
@@ -118,7 +115,6 @@ This sub menu relates to limits in the Rockbox operating system.
     Entries in File Browser} or \setting{Max Playlist Size} to take effect
     while \setting{Glyphs To Cache} will affect the next font load.}
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-\opt{player}{
   \subsection{Line In} This option activates the line-in port on \dap, which is
     off by default. This is useful for such applications as:
     \begin{itemize}
@@ -126,7 +122,6 @@ This sub menu relates to limits in the Rockbox operating system.
     \item laptop $\rightarrow$ \dap $\rightarrow$ human
     \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
     \end{itemize}
-}
 \opt{quickscreen}{
   \subsection{Use Shortcuts Menu Instead of Quick Screen} This option
   activates the shortcuts menu instead of opening the quick screen when enabled.
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 9677e663ae..2cbe57b014 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -14,11 +14,6 @@ customize the visual appearance of Rockbox.
 
   There are a number of themes that ship with Rockbox. If none of
   these suit your needs, many more can be downloaded from 
-  \opt{player}{\url{http://themes.rockbox.org/index.php?target=player}}%
-  \opt{recorder}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{recorderv2fm}{\url{http://themes.rockbox.org/index.php?target=fmrecorder}}%
-  \opt{ondiofm}{\url{http://themes.rockbox.org/index.php?target=ondiofm}}%
-  \opt{ondiosp}{\url{http://themes.rockbox.org/index.php?target=ondiosp}}%
   \opt{iaudiom5}{\url{http://themes.rockbox.org/index.php?target=m5}}%
   \opt{iaudiox5}{\url{http://themes.rockbox.org/index.php?target=x5}}%
   \opt{iaudiom3}{\url{http://themes.rockbox.org/index.php?target=m3}}%
@@ -56,7 +51,7 @@ customize the visual appearance of Rockbox.
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-} % \nopt{player}
+}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
@@ -106,10 +101,6 @@ customize the visual appearance of Rockbox.
         \item[Remote Status Bar.] Allows you to choose where to display the 
         statusbar on the remote display.
       }
-      \opt{RECORDER_PAD}{
-       \item[Button Bar.] Enables or disables the button bar prompts for the
-         ``F''-keys at the bottom of the screen.
-      }
       \item[Volume Display.] Controls whether the volume is displayed as a
         graphic or a numeric value on the Status Bar. If you select a numeric
         display, volume is displayed in decibels.  See \reference{ref:volume}
diff --git a/manual/getting_started/archos_choice.tex b/manual/getting_started/archos_choice.tex
deleted file mode 100644
index 690b25a14d..0000000000
--- a/manual/getting_started/archos_choice.tex
+++ /dev/null
@@ -1,53 +0,0 @@
-\section{Before installation}
-
-Before you install Rockbox, you will need to know what model you own.  Rockbox 
-comes in different versions depending on the model of your \dap{}.  There are 
-six different versions of the software.  The table below will help you to 
-identify which version of the software you need.
-
-The model name is printed on the case.  The hard drive size is listed on the
-serial number sticker on the back of the unit.
-
-\begin{rbtabular}{\textwidth}{llXl}%
-    {\textbf{Picture} & \textbf{Disk size} & \textbf{Model Name} & \textbf{Version Name}}%
-    {}{ref:Jukeboxtypetable}
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-studio-small.png}
-    \end{minipage} 
-    & 5~GB, 6~GB, 10~GB, 20~GB & 
-                             \begin{minipage}{8cm}
-                             Jukebox 5000 \newline
-                             Jukebox 6000 \newline
-                             Jukebox Studio 10 \newline
-                             Jukebox Studio 20
-                             \end{minipage}
-                               & player \\\midrule
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-recorder-small.png}
-    \end{minipage}
-    & 6~GB, 10~GB, 15~GB, 20~GB & \begin{minipage}{8cm}
-                              Jukebox Recorder 6 \newline
-                              Jukebox Recorder 10 \newline
-                              Jukebox Recorder 15 \newline
-                              Jukebox Recorder 20 
-                              \end{minipage}
-                               & recorder\\\midrule
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-recorderv2-small.png}
-    \end{minipage}
-                     & 20~GB & Jukebox Recorder v2 & recorderv2\\\midrule
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-recorderfm-small.png}
-    \end{minipage}
-                     & 20~GB & Jukebox Recorder FM & fmrecorder \\\midrule
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-ondiosp-small.png}
-    \end{minipage}
-                     & 128~MB (flash) & Ondio 128 SP & ondiosp \\\midrule
-    \begin{minipage}{2.2cm}
-      \includegraphics[width=2cm]{getting_started/images/archos-ondiofm-small.png}
-    \end{minipage}
-                     & 128~MB (flash) & Ondio 128 FM & ondiofm \\
-\end{rbtabular}
-\note{Rockbox does not run on the Archos Jukebox Multimedia or any
-Archos products other than those mentioned here.}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 5766c222eb..0b3b25a4e8 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -286,20 +286,18 @@ still available to you.\\
 \end{description}
 }
 
-\nopt{player} {
-    Apart from the required parts there are some addons you might be interested
-    in installing.
-    \begin{description}
-    \item[Fonts.] Rockbox can load custom fonts. The fonts are
-        distributed as a separate package and thus need to be installed
-        separately. They are not required to run Rockbox itself but
-        a lot of themes require the fonts package to be installed.
-
-    \item[Themes.] The appearance of Rockbox can be customised by themes. Depending
-        on your taste you might want to install additional themes to change
-        the look of Rockbox.
-    \end{description}
-}
+Apart from the required parts there are some addons you might be interested
+in installing.
+\begin{description}
+\item[Fonts.] Rockbox can load custom fonts. The fonts are
+    distributed as a separate package and thus need to be installed
+    separately. They are not required to run Rockbox itself but
+    a lot of themes require the fonts package to be installed.
+
+\item[Themes.] The appearance of Rockbox can be customised by themes. Depending
+    on your taste you might want to install additional themes to change
+    the look of Rockbox.
+\end{description}
 
 \subsection{Automated Installation}
 
@@ -310,7 +308,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
         (``Minimal Installation'').
 \item Automatically install all suggested components (``Complete Installation'').
 \item Selectively install optional components.
-\nopt{player}{\item Install additional fonts and themes.}
+\item Install additional fonts and themes.
 \item Install voice files and generate talk clips.
 \item Uninstall all components you installed using Rockbox Utility.
 \end{itemize}
@@ -492,13 +490,6 @@ create a separate directory on your \dap{} for the Rockbox
 files! The \fname{.zip} file already contains the internal
 structure that Rockbox needs.\\}
 
-\opt{archos}{
- If the contents of the \fname{.zip} file are extracted correctly, you will
- have a file called \fname{\firmwarefilename} in the main directory of your
- \daps{} drive, and also a directory called \fname{.rockbox}, which contains a
- number of other directories and system files needed by Rockbox.
-}
-
 % This has nothing to do with swcodec, just that these players need our own
 % bootloader so we can decide where we want the main binary.
 \opt{swcodec}{
@@ -559,7 +550,7 @@ structure that Rockbox needs.\\}
   \end{itemize}
 }
 
-\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos,cowond2,vibe500,ondavx777,samsungyh}{
+\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,cowond2,vibe500,ondavx777,samsungyh}{
   Safely eject / unmount the USB drive, unplug the cable and restart.
 }
 
@@ -709,7 +700,7 @@ The new build will be installed over your current build.\\
 
 \section{Uninstalling Rockbox}\index{Installation!uninstall}
 
-\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos,mrobe100,gigabeats,fuzeplus}{
+\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,mrobe100,gigabeats,fuzeplus}{
   \note{The Rockbox bootloader allows you to choose between Rockbox and 
   the original firmware. (See \reference{ref:Dualboot} for more information.)}
 }
@@ -727,12 +718,6 @@ completely follow the manual uninstallation instructions below.}}
 
 \subsection{Manual Uninstallation}
 
-\opt{archos}{
-  If you would like to go back to using the original \playerman{} software,
-  connect the \dap{} to your computer, and delete the
-  \fname{\firmwarefilename} file.
-}
-
 \opt{iriverh10,iriverh10_5gb,mrobe100,vibe500,samsungyh}{
   If you would like to go back to using the original \playerman{} software,
   connect the \dap{} to your computer, and delete the
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index b8c76291db..3d226245e3 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -1,10 +1,5 @@
 % $Id$ %
-\section{\label{ref:FMradio}FM Radio}  
-\opt{RECORDER_PAD}{
-  \note{The early V2 models were in fact FM Recorders in disguise,
-  so they had the FM radio still mounted. Rockbox enables it if present -
-  in case this menu does not show on your unit you can skip this chapter.\\}
-}
+\section{\label{ref:FMradio}FM Radio}
 \opt{sansa}{
   \note{Not all Sansas have a radio receiver. Generally all American models do,
   but European models might not. Rockbox will display the radio menu only if it
@@ -23,7 +18,7 @@
   it from the file browser. Rockbox will ``remember'' and use it in
   \setting{PRESET} mode until another file has been selected. Some preset
   files are available here: \wikilink{FmPresets}.
-  
+
   \opt{recording}{
       \opt{swcodec}{
          It is also possible to record the FM radio while listening.
@@ -61,11 +56,6 @@
               \nopt{IRIVER_RC_H100_PAD}{\ActionRCFMSettingsInc, \ActionRCFMSettingsDec}%
           }
           & Change volume.\\
-          \opt{RECORDER_PAD}{
-            \ButtonPlay
-            & Freeze all screen updates. May enhance radio reception in some
-              cases.\\
-          }
 
           %
           \ActionFMExit
@@ -76,10 +66,9 @@
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMStop}
           & Stop the radio and return to \setting{Main Menu}.\\%
           %
-          \nopt{ONDIO_PAD}{%
-            \nopt{RECORDER_PAD}{\ActionFMPlay
+            \ActionFMPlay
               \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPlay}
-              & Mute radio playback.\\}%
+              & Mute radio playback.\\%
             %
             \ActionFMMode
             \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMode}
@@ -87,9 +76,9 @@
             %
             \ActionFMPreset
             \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPreset}
-            & Open a list of radio presets. You can view all the presets that 
+            & Open a list of radio presets. You can view all the presets that
               you have, and switch to the station.\\
-          }%
+          %
           %
           \ActionFMMenu
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMenu}
@@ -99,7 +88,6 @@
           \nopt{hold_button}{%
             \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
             \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower}
-            \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
             & Key lock (software hold switch) on/off.\\
           }%
        \end{btnmap}
@@ -108,45 +96,21 @@
 
   \item[Saving a preset:]
     Up to 64 of your favourite stations can be saved as presets.
-    \opt{RECORDER_PAD}{Press \ButtonFTwo{} to go to the presets list, press
-    \ButtonFOne{} to add a preset.}%
-    \nopt{RECORDER_PAD}{%
       \ActionFMMenu{} to go to the menu, then select \setting{Add preset}.%
-    }
     Enter the name (maximum number of characters is 32).
     Press \ActionKbdDone{} to save.
 
   \item[Selecting a preset:]
-        \opt{ONDIO_PAD}{\ActionFMMenu{} to open the menu, select
-          \setting{Preset}}%
-        \nopt{ONDIO_PAD}{\ActionFMPreset} to go to the presets list.
+        \ActionFMPreset to go to the presets list.
         Use \ActionFMSettingsInc{} and \ActionFMSettingsDec{}
         to move the cursor and then press \ActionStdOk{}
         to select. Use \ActionStdCancel{} to leave the preset list without selecting
         anything.
 
   \item[Removing a preset:]
-        \opt{ONDIO_PAD}{\ActionFMMenu{} to open the menu, select
-          \setting{Preset}}%
-        \nopt{ONDIO_PAD}{\ActionFMPreset} to go to the presets list.
+        \ActionFMPreset to go to the presets list.
         Use \ActionFMSettingsInc{} and \ActionFMSettingsDec{}
         to move the cursor and then press \ActionStdContext{}
         on the preset that you wish to remove, then select \setting{Remove Preset}.
-
-      \opt{RECORDER_PAD,ONDIO_PAD}{
-          \item[Recording:]
-            \opt{RECORDER_PAD}{Press \ButtonFThree}%
-            \opt{ONDIO_PAD}{Double press \ButtonMenu}
-            to start recording the currently playing station. Press \ButtonOff{} to
-              stop recording.%
-            \opt{RECORDER_PAD}{ Press \ButtonPlay{} again to seamlessly start recording
-              to a new file.}
-            The settings for the recording can be changed in the
-            \opt{RECORDER_PAD}{\ButtonFOne{} menu}%
-            \opt{ONDIO_PAD}{respective menu reached through the FM radio settings menu
-              (Long \ButtonMenu)}
-            before starting the recording. See \reference{ref:Recordingsettings}
-            for details of recording settings.
-          }
   \end{description}
   \note{The radio will turn off when starting playback of an audio file.}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index dd03c2b298..9ddd4bbe93 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -4,9 +4,7 @@
 \screenshot{main_menu/images/ss-main-menu}{The main menu}{}
 The \setting{Main Menu} is the screen from which all of the Rockbox functions
 can be accessed. This is the first screen you will see when starting Rockbox.
-To return to the \setting{Main Menu}, 
-  \nopt{ONDIO_PAD}{press the \ActionStdMenu{} button.}%
-  \opt{ONDIO_PAD}{hold the \ButtonMenu{} button.}%
+To return to the \setting{Main Menu}, press the \ActionStdMenu{} button.
 
 All settings are stored on the unit. However, Rockbox does not access 
 the \disk{} solely for the purpose of saving settings. Instead, Rockbox will
@@ -191,8 +189,6 @@ utilities. A detailed description of the different plugins is to be found in
 \reference{ref:plugins}.
 
 \section{\label{ref:Info}System}
-\opt{player}{Use the MINUS and PLUS keys to step through several 
-pages of information.}
 
 \begin{description}
 \item[Rockbox Info:]
@@ -203,7 +199,6 @@ pages of information.}
   Memory size and amount of free space on the two data volumes, this info is
   given separately for internal memory (\emph{Int}) and for a plugged in
   memory card
-  \opt{ondio}{(\emph{MMC})}
   \opt{sansa,e200v2,fuze,fuzev2,clipplus,clipzip}{(\emph{MSD})}.
 }%
 \nopt{multivolume}{Hard disk size and the amount of free space on the disk.}
@@ -234,15 +229,6 @@ pages of information.}
   settings before asking for help.}
 \end{description}
 
-\opt{player}{
-  \section{Shutdown}
-  This menu option saves the Rockbox configuration and turns off the hard
-  drive before shutting down the machine. For maximum safety this procedure
-  is recommended when turning off the \dap. (There is a very small risk
-  of hard disk corruption otherwise.) See \reference{ref:Safeshutdown}
-  for more details.
-}
-
 \opt{quickscreen}
 {
 \section{\label{ref:QuickScreen}Quick Screen}
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index cbd2b3b956..a3c8ca006c 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -72,15 +72,4 @@ The controls for this screen are:
                        & Open \setting{Recording Settings} (see 
                        \reference{ref:Recordingsettings}).\\
     %
-    \opt{RECORDER_PAD}{
-      \ActionRecFTwo & Quick menu for recording settings. A quick press will
-      leave the screen up (press \ActionRecFTwo{} again to exit), while holding
-      it will close the screen when you release it.\\
-    }
-    %
-    \opt{RECORDER_PAD}{
-      \ActionRecFThree & Quick menu for source setting.\\
-      & Quick/hold works as for \ActionRecFTwo.\\
-      & While recording: Start a new recording file.\\
-    }
   \end{btnmap}
diff --git a/manual/platform/archosfmrecorder.tex b/manual/platform/archosfmrecorder.tex
deleted file mode 100644
index bd7319313d..0000000000
--- a/manual/platform/archosfmrecorder.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-% $Id$ %
-\def\UseOption{recorderv2fm}
-\edef\UseOption{\UseOption,RECORDER_PAD}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
-\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
-\edef\UseOption{\UseOption,archos}
-
-\newcommand{\playerman}{Archos}
-\newcommand{\playertype}{Recorder V2/FM}
-\newcommand{\playerlongtype}{Recorder V2 and FM}
-\newcommand{\dapdisplaywidth}{112}
-\newcommand{\dapdisplayheight}{64}
-\newcommand{\dapdisplaydepth}{1}
-\newcommand{\specimg}{archosfmrecorder}
-%Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{player}
-%For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{player's}
-\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
-\newcommand{\firmwareextension}{\fname{ajz}}
-\newcommand{\screenshotsize}{4cm}
-\newcommand{\disk}{hard disk}
-
-% link external keymap file
-\input{platform/keymap-archosrecorder.tex}
diff --git a/manual/platform/archosondiofm.tex b/manual/platform/archosondiofm.tex
deleted file mode 100644
index b0cc232f16..0000000000
--- a/manual/platform/archosondiofm.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-% $Id$ %
-%platform file for the Ondio FM
-\def\UseOption{ondiofm}
-% To not break the current manual
-\edef\UseOption{\UseOption,ondio}
-\edef\UseOption{\UseOption,ONDIO_PAD}
-\edef\UseOption{\UseOption,archos}
-
-\newcommand{\playerman}{Archos}
-\newcommand{\playertype}{Ondio}
-\newcommand{\playerlongtype}{Ondio 128 FM}
-\newcommand{\dapdisplaywidth}{112}
-\newcommand{\dapdisplayheight}{64}
-\newcommand{\dapdisplaydepth}{1}
-\newcommand{\specimg}{archosondiofm}
-%used for specifying screenshot names common to a target "family"
-\newcommand{\seriesimg}{ondio}
-%Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{player}
-%For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{player's}
-\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
-\newcommand{\firmwareextension}{\fname{ajz}}
-\newcommand{\screenshotsize}{4cm}
-\newcommand{\disk}{flash storage}
-
-% link external keymap file
-\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/archosondiosp.tex b/manual/platform/archosondiosp.tex
deleted file mode 100644
index 7a90ca1456..0000000000
--- a/manual/platform/archosondiosp.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-% $Id$ %
-%platform file for the Ondio SP
-\def\UseOption{ondiosp}
-\edef\UseOption{\UseOption,ondio}
-\edef\UseOption{\UseOption,ONDIO_PAD}
-\edef\UseOption{\UseOption,archos}
-\edef\UseOption{\UseOption,rombox}
-
-\newcommand{\playerman}{Archos}
-\newcommand{\playertype}{Ondio}
-\newcommand{\playerlongtype}{Ondio 128 SP}
-\newcommand{\dapdisplaywidth}{112}
-\newcommand{\dapdisplayheight}{64}
-\newcommand{\dapdisplaydepth}{1}
-\newcommand{\specimg}{archosondiosp}
-%used for specifying screenshot names common to a target "family"
-\newcommand{\seriesimg}{ondio}
-%Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{player}
-%For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{player's}
-\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
-\newcommand{\firmwareextension}{\fname{ajz}}
-\newcommand{\screenshotsize}{4cm}
-\newcommand{\disk}{flash storage}
-
-% link external keymap file
-\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/archosplayer.tex b/manual/platform/archosplayer.tex
deleted file mode 100644
index 89beb82655..0000000000
--- a/manual/platform/archosplayer.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-% $Id$ %
-\def\UseOption{player}
-\edef\UseOption{\UseOption,PLAYER_PAD}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
-\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
-\edef\UseOption{\UseOption,archos}
-\edef\UseOption{\UseOption,rombox}
-
-\newcommand{\playerman}{Archos}
-\newcommand{\playertype}{Studio/Player}
-\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20}
-\newcommand{\dapdisplaywidth}{char}
-\newcommand{\dapdisplayheight}{11}
-\newcommand{\dapdisplaydepth}{1}
-\newcommand{\specimg}{archosplayer}
-%Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{player}
-%For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{player's}
-\newcommand{\firmwarefilename}{\fname{archos.mod}}
-\newcommand{\firmwareextension}{\fname{mod}}
-\newcommand{\screenshotsize}{4cm}
-\newcommand{\disk}{hard disk}
-
-% link external keymap file
-\input{platform/keymap-archosplayer.tex}
diff --git a/manual/platform/archosrecorder.tex b/manual/platform/archosrecorder.tex
deleted file mode 100644
index 2c0677f31d..0000000000
--- a/manual/platform/archosrecorder.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-% $Id$ %
-\def\UseOption{recorder}
-\edef\UseOption{\UseOption,RECORDER_PAD}
-\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
-\edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
-\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
-\edef\UseOption{\UseOption,archos}
-
-\newcommand{\playerman}{Archos}
-\newcommand{\playertype}{Recorder}
-\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
-\newcommand{\dapdisplaywidth}{112}
-\newcommand{\dapdisplayheight}{64}
-\newcommand{\dapdisplaydepth}{1}
-
-\newcommand{\specimg}{archosrecorder}
-%Used to name the player, e.g. ...to the \dap
-\newcommand{\dap}{player}
-%For use when referring to the player. E.g. the \daps\ capacity ...
-\newcommand{\daps}{player's}
-\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}}
-\newcommand{\firmwareextension}{\fname{ajz}}
-\newcommand{\screenshotsize}{4cm}
-\newcommand{\disk}{hard disk}
-
-% link external keymap file
-\input{platform/keymap-archosrecorder.tex}
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{ONDIO_PAD}{\ButtonMenu\ / \ButtonUp}
+    \opt{IAUDIO_X5_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay\ / \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}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
+    \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}
-    \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
+    \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}{
-        \opt{RECORDER_PAD}{\ButtonFOne}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{
         \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{RECORDER_PAD}{\ButtonFTwo}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,SAMSUNG_YH820_PAD}{
         \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{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{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{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
+    \opt{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{ONDIO_PAD}{\ButtonMenu}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_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,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{ONDIO_PAD}{Long \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,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{ONDIO_PAD,SANSA_FUZEPLUS_PAD}{\ButtonUp}
+        \opt{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{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
     \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{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%
         ,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{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/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{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}
@@ -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{ONDIO_PAD}{\ButtonMenu}
+\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
 \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{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/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{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
+    \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
     \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}{
-            \ButtonOff
-                &
-            Toggle between \emph{board} and \emph{tree} navigation modes
-            \\
-        }
-        
-        \nopt{IRIVER_H10_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD,PBELL_VIBE500_PAD%
+
+        \nopt{IRIVER_H10_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{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
     \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}%
-    \nopt{ONDIO_PAD}{\ActionWpsMenu}%
+    \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{ONDIO_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
+    \opt{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{ONDIO_PAD}{\ButtonMenu{} + \ButtonOff}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\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{ONDIO_PAD}{\ButtonMenu}
+        \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{%
             \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{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
+    \opt{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{ONDIO_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \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{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
+    \opt{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{ONDIO_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonDown}
+    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonRight}
+    \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{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}
         {\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{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{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{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,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{RECORDER_PAD}{\ButtonOn}
+    \opt{IRIVER_H100_PAD,iaudiom5,MPIO_HD300_PAD}{
         \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{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
+\opt{IAUDIO_X5_PAD}{\ButtonPlay}
 \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{ONDIO_PAD}{Long \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \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,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight}
+    \opt{IRIVER_H10_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{ONDIO_PAD}{\ButtonMenu}
+    \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
     \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%
-\nopt{archosplayer}{ (the total number as well as the number
-of audio, playlist, image and video files) }%
+The stats plugin counts the directories and files
+(the total number as well as the number
+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{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_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{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
+    \opt{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{ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \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{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
+    \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{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,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{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,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{ONDIO_PAD}{Long \ButtonMenu}
-    \opt{PLAYER_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{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{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,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{ONDIO_PAD}{\ButtonMenu}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \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. 
-\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{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
+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
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
 \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{ONDIO_PAD}{\ButtonOff+\ButtonMenu}%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
 \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}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9bb8fe9b77..0f382fabf8 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -24,17 +24,6 @@ that are not available within the \setting{Database Browser}. Read more about
 \setting{Database} in \reference{ref:database}. The remainder of this section
 deals with the \setting{File Browser}.}
 
-\opt{ondio}{
-Unlike the Archos Firmware, Rockbox provides multivolume support for the
-MultiMediaCard, this means the \dap{} can access both data volumes (internal
-memory and the MMC), thus being able to for instance, build playlists with
-files from both volumes.
-In the \setting{File Browser} a new directory will appear as soon as the device
-has read the content after inserting the card. This new directory's name is
-generated as \fname{<MMC1>}, and will behave exactly as any other directory
-on the \dap{}.
-}
-
 \opt{iriverh10,iriverh10_5gb}{\note{
 If your \dap{} is a MTP model, the Music directory where all your music is stored
 may be hidden in the \setting{File Browser}. This may be fixed by either
@@ -49,7 +38,7 @@ the \setting{Show Files} setting to all.
          & Go to previous/next item in list. If you are on the first/last 
            entry, the cursor will wrap to the last/first entry.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
         {
           \ButtonOn+\ButtonUp{}/ \ButtonDown
           \opt{HAVEREMOTEKEYMAP}{&
@@ -98,10 +87,6 @@ the \setting{Show Files} setting to all.
         & Switch to the \setting{Quick Screen}
         (see \reference{ref:QuickScreen}). \\
       }
-      \opt{RECORDER_PAD}{
-        \ButtonFThree & Switch to the \setting{Quick Screen}.\\ 
-        %
-      }
       %
       \opt{SANSA_E200_PAD}{
         \ActionStdRec & Switch to the \setting{Recording Screen}.\\
@@ -118,11 +103,6 @@ the \setting{Show Files} setting to all.
       }}
 \end{btnmap}
 
-\opt{RECORDER_PAD}{
-  The functions of the F keys are also summarised on the button bar at the
-  bottom of the screen.
-}
-
 \subsection{\label{ref:Contextmenu}\label{ref:PartIISectionFM}Context Menu}
 \screenshot{rockbox_interface/images/ss-context-menu}{The Context Menu}{}
 
@@ -206,9 +186,9 @@ each option pertains both to files and directories):
 \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{}
 This is the virtual keyboard that is used when entering text in Rockbox, for 
 example when renaming a file or creating a new directory.
-\nopt{player}{The virtual keyboard can be easily changed by making a text file
- with the required layout. More information on how to achieve this can be found
- on the Rockbox website at \wikilink{LoadableKeyboardLayouts}.}
+The virtual keyboard can be easily changed by making a text file
+with the required layout. More information on how to achieve this can be found
+on the Rockbox website at \wikilink{LoadableKeyboardLayouts}.
 
 \opt{morse_input}{
   Also you can switch to Morse code input mode by changing the
@@ -219,12 +199,12 @@ example when renaming a file or creating a new directory.
     { or by pressing \ActionKbdMorseInput{} in the virtual keyboard}%
   .}
 
-\nopt{player}{% no "Actions" yet in the Player's virtual keyboard
+% no "Actions" yet in the Player's virtual keyboard
 
 \note{When the cursor is on the input line, \ActionKbdSelect{} deletes the preceding character}
 
 \begin{btnmap}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD%
         ,SAMSUNG_YH820_PAD}{
         \ActionKbdCursorLeft{} / \ActionKbdCursorRight
@@ -258,7 +238,7 @@ example when renaming a file or creating a new directory.
     If you move out of the picker area you get to the line edit mode.
         \\
     %
-    \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,ONDIO_PAD,PBELL_VIBE500_PAD%
+    \nopt{IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
          ,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
         \ActionKbdPageFlip
             &
@@ -302,23 +282,6 @@ example when renaming a file or creating a new directory.
         & Tap to select a character in Morse code input mode. \\
       } 
 \end{btnmap}
-}% end of non-Player section
-
-\opt{player}{
-  The current text line to be entered or edited is always listed on the first
-  line of the display. The second line of the display can contain the character
-  selection bar, as in the screenshot above.
-    \begin{btnmap}
-      \ButtonOn & Toggle picker- and line edit mode. \\
-      \ButtonLeft{} / \ButtonRight
-        & Move back and forth in the selected line (picker of input line). \\
-      \ButtonPlay
-        & Pick character in character bar, or act as backspace in the text line. \\
-      Long \ButtonPlay & Accept \\
-      \ButtonStop & Cancel \\
-      \ButtonMenu & Flip picker lines. \\
-    \end{btnmap}
-}
 
 \input{rockbox_interface/tagcache.tex}
 \input{rockbox_interface/wps.tex}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index f11246f162..f1935b36f3 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -43,9 +43,9 @@ The areas of the touchscreen in the 3$\times$3 grid mode are in turn referred as
     \begin{tabular}{|c|c|c|}
         \hline
         \TouchTopLeft & \TouchTopMiddle & \TouchTopRight \\ [5ex]
-        \hline        
+        \hline
         \TouchMidLeft & \TouchCenter & \TouchMidRight \\ [5ex]
-        \hline        
+        \hline
         \TouchBottomLeft & \TouchBottomMiddle & \TouchBottomRight \\ [5ex]
         \hline
     \end{tabular}
@@ -55,22 +55,22 @@ Whenever a button name is prefixed by ``Long'', a long press of approximately
 one second should be performed on that button. The buttons are described in
 detail in the following paragraph.
 \blind{%
-  Additional information for blind users is available on the Rockbox website at 
+  Additional information for blind users is available on the Rockbox website at
   \wikilink{BlindFAQ}.
-  
+
   %
   \opt{iriverh100}{
   Hold or lay the \dap{} so that the side with the joystick and LCD is facing
   towards you, and the curved side is at the top. The joystick functions as
   the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when
   pressed in the appropriate direction. Pressing the joystick down functions as
-  \ButtonSelect{}. 
-  On the right side of the \dap{} are the \ButtonOn{}, \ButtonOff{}, 
+  \ButtonSelect{}.
+  On the right side of the \dap{} are the \ButtonOn{}, \ButtonOff{},
   \ButtonMode{} buttons, and the \ButtonHold{} switch. When this switch is
   switched towards the bottom of the \dap{}, hold is on, and none of the other
   buttons have any effect.
 
-  On the left side is the \ButtonRec{} button. Above that is the internal microphone. 
+  On the left side is the \ButtonRec{} button. Above that is the internal microphone.
 
   On the top panel of the \dap{}, from left to right, you can find the
   following: headphone mini jack plug, remote port, Optical line-in, Optical line-out.
@@ -79,16 +79,16 @@ detail in the following paragraph.
   following: power jack, reset switch, and USB port. In the event that your
   \dap{} hard locks, you can reset it by inserting a paper clip into the hole
   where the reset switch is.}
-  % 
+  %
   \opt{iriverh300}{
   Hold or lay the \dap{} so that the side with the button pad and
-  LCD is facing towards you.  The buttons on the button pad are as follows:  top 
-  left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: 
-  \ButtonRec, bottom right corner: \ButtonMode{}.  In the center of the button pad 
+  LCD is facing towards you.  The buttons on the button pad are as follows:  top
+  left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner:
+  \ButtonRec, bottom right corner: \ButtonMode{}.  In the center of the button pad
   is a button labelled \ButtonSelect{}.  Surrounding the \ButtonSelect{} button are
   the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{}, and \ButtonRight{} buttons.
-  
-  On the top panel of the \dap{}, from left to right, you can find the 
+
+  On the top panel of the \dap{}, from left to right, you can find the
   following: headphone mini jack plug, remote port, line-in, line-out.
 
   On the left hand side of the \dap{} is the internal microphone. Just underneath
@@ -96,51 +96,51 @@ detail in the following paragraph.
   you can reset it by inserting a paper clip into the hole where the reset switch
   is.
 
-  On the right hand side of the \dap{} is the \ButtonHold{} switch. When this is 
-  switched towards the bottom of the \dap{}, hold is on, and none of the other 
+  On the right hand side of the \dap{} is the \ButtonHold{} switch. When this is
+  switched towards the bottom of the \dap{}, hold is on, and none of the other
   buttons have any effect.
-  
-  On the bottom panel of the \dap{}, from left to right, you can find the 
-  following:  power jack and two USB ports.  The USB port on the right is used 
-  to connect your \dap{} to your computer.  The USB port on the left is not 
-  used in Rockbox. 
+
+  On the bottom panel of the \dap{}, from left to right, you can find the
+  following:  power jack and two USB ports.  The USB port on the right is used
+  to connect your \dap{} to your computer.  The USB port on the left is not
+  used in Rockbox.
   }
   %
   \opt{mpiohd200}{
   Hold or lay the \dap{} so that the side with the LCD is facing towards you.
   On the right hand side there is a rocker switch at the top which serves as
   \ButtonRew{} and \ButtonFF{} when rocked up or down, respectively.
-  Pressing the rocker in functions as the \ButtonFunc{} button. Below the rocker 
-  there are the \ButtonRec{} and \ButtonPlay{} buttons. At the bottom of the 
+  Pressing the rocker in functions as the \ButtonFunc{} button. Below the rocker
+  there are the \ButtonRec{} and \ButtonPlay{} buttons. At the bottom of the
   right panel there is the \ButtonHold{} switch. When this is switched towards the
   bottom of the \dap{}. hold is on, and none of the other buttons have any effect.
 
-  On the top panel of the \dap{} there is another rocker which serves as the 
+  On the top panel of the \dap{} there is another rocker which serves as the
   \ButtonVolDown{} and \ButtonVolUp{} buttons when pressed to the left or right,
   respectively.
 
   On the left hand side of the \dap{} there is a headphone mini jack plug at the top
   and a small hole at the bottom, the reset switch. In the event that your \dap{}
-  hard locks, you can reset it by inserting a paper clip into the hole where the 
+  hard locks, you can reset it by inserting a paper clip into the hole where the
   reset switch is.
 
   On the bottom panel of the \dap{}, from left to right, you can find the
   following: power jack, line-in jack and USB port (under rubber cover).
   }
   %
-  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{ 
-  The main controls on the \dap{} are a slightly indented scroll wheel 
-  with a flat round button in the center. Hold the \dap{} with these controls 
-  facing you. 
+  \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{
+  The main controls on the \dap{} are a slightly indented scroll wheel
+  with a flat round button in the center. Hold the \dap{} with these controls
+  facing you.
 
-  The top of the player will have the following, from left to 
+  The top of the player will have the following, from left to
   right:
-  \opt{ipod4g,ipodcolor}{remote connector, headphone socket, \ButtonHold{} 
+  \opt{ipod4g,ipodcolor}{remote connector, headphone socket, \ButtonHold{}
     switch.}
   \opt{ipodvideo}{\ButtonHold{} switch, headphone socket.}
-  \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone socket.}     
+  \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone socket.}
 
-  The dock connector that is used to connect your \dap{} to your computer is on 
+  The dock connector that is used to connect your \dap{} to your computer is on
   the bottom panel of the \dap{}.
 
   The button in the middle of the wheel is called \ButtonSelect{}. You can
@@ -151,22 +151,22 @@ detail in the following paragraph.
   clockwise around the wheel. \ButtonScrollBack{} means to slide your finger
   counterclockwise. Note that the wheel is sensitive, so you will need to move
   slowly at first and get a feel for how it works.
-  
-  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{}, 
+
+  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{},
   hold is on, and none of the other controls do anything.  Be sure
-  \ButtonHold{} is off before trying to use your player. 
+  \ButtonHold{} is off before trying to use your player.
   }
   %
-  \opt{ipod3g}{ 
-  The main controls on the \dap{} are a slightly indented touch wheel 
+  \opt{ipod3g}{
+  The main controls on the \dap{} are a slightly indented touch wheel
   with a flat round button in the center, and four buttons in a row above the
-  touch wheel. Hold the \dap{} with these controls 
-  facing you. 
+  touch wheel. Hold the \dap{} with these controls
+  facing you.
 
-  The top of the player will have the following, from left to 
+  The top of the player will have the following, from left to
   right: remote connector, headphone socket, \ButtonHold{} switch.
-        
-  The dock connector that is used to connect your \dap{} to your computer is on 
+
+  The dock connector that is used to connect your \dap{} to your computer is on
   the bottom panel of the \dap{}.
 
   The button in the middle of the wheel is called \ButtonSelect{}. You can
@@ -177,25 +177,25 @@ detail in the following paragraph.
   clockwise around the wheel. \ButtonScrollBack{} means to slide your finger
   counterclockwise. Note that the wheel is sensitive, so you will need to move
   slowly at first and get a feel for how it works.
-  
-  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{}, 
+
+  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{},
   hold is on, and none of the other controls do anything.  Be sure
-  \ButtonHold{} is off before trying to use your player. 
+  \ButtonHold{} is off before trying to use your player.
   }
   %
-  \opt{ipod1g2g}{ 
-  The main controls on the \dap{} are a slightly indented wheel 
+  \opt{ipod1g2g}{
+  The main controls on the \dap{} are a slightly indented wheel
   with a flat round button in the center, and four buttons surrounding
   it. On the 1st generation iPod, this wheel physically turns. On the
-  2nd generation iPod, this wheel is touch-sensitive. Hold the \dap{} with these controls 
-  facing you. 
+  2nd generation iPod, this wheel is touch-sensitive. Hold the \dap{} with these controls
+  facing you.
 
-  The top of the player will have the following, from left to 
+  The top of the player will have the following, from left to
   right: FireWire port, headphone socket, \ButtonHold{} switch.
 
   The FireWire port is used to connect your \dap{} to the computer and
   to charge its battery via a wall charger.
-        
+
   The button in the middle of the wheel is called \ButtonSelect{}. You can
   operate the wheel by turning it, or sliding your finger around
   it. The top is \ButtonMenu{}, the bottom is \ButtonPlay{}, the left
@@ -204,10 +204,10 @@ detail in the following paragraph.
   clockwise around the wheel. \ButtonScrollBack{} means to slide your finger
   counterclockwise. Note that the wheel is sensitive, so you will need to move
   slowly at first and get a feel for how it works.
-  
-  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{}, 
+
+  Note that when the \ButtonHold{} switch is pushed toward the center of the \dap{},
   hold is on, and none of the other controls do anything.  Be sure
-  \ButtonHold{} is off before trying to use your player. 
+  \ButtonHold{} is off before trying to use your player.
   }
   %
   \opt{ipodnano,ipodnano2g}{
@@ -231,39 +231,22 @@ detail in the following paragraph.
   off before trying to use your player.
   }
   %
-  \opt{ondio}{
-  The main characteristic of the Ondio case is the indent on its lower right side, 
-  which is the MMC slot. Holding the \dap{} with this slot in the described position
-  you'll find the following:
-
-  On the curved top, from left to right, are the headphone socket,
-  the \ButtonOff{} button,%
-  \opt{recording}{ and the line-in jack}.
-  Apart from the already mentioned MMC slot, you will find the USB connector on
-  the \daps{} right side. Below the LCD, at approximately the center of the \dap{},
-  there is the main button pad of the \dap{}. The centre of the button pad dips inward
-  and helps to operate the directional keys from there. Located on a two-way button
-  strip are the \ButtonLeft{} and \ButtonRight{} keys, with \ButtonUp{} above it
-  and \ButtonDown{} below it. The raised button positioned in the lower left of this 
-  round crosspad is labelled \ButtonMenu{}.
-  }
-  %
   \opt{iriverh10,iriverh10_5gb}{
   Hold or lay the \dap{} so that the side with the scroll pad and
   LCD is facing towards you. In the centre below the lcd is the scroll pad. It
-  is oriented vertically. Touching the top and bottom half of it acts as the 
+  is oriented vertically. Touching the top and bottom half of it acts as the
   \ButtonScrollUp{}  and \ButtonScrollDown{} buttons respectively. On the left
   of the scroll pad is the \ButtonLeft{} button and on the right is the
   \ButtonRight{} button.
-  
-  There are three buttons on the right hand side of the \dap{}. From top to 
-  bottom, they are: \ButtonRew{}, \ButtonPlay{} and \ButtonFF{}. On the left 
+
+  There are three buttons on the right hand side of the \dap{}. From top to
+  bottom, they are: \ButtonRew{}, \ButtonPlay{} and \ButtonFF{}. On the left
   hand side is the \ButtonPower{} button.
 
-  On the top panel of the \dap{}, from left to right, you can find the 
+  On the top panel of the \dap{}, from left to right, you can find the
   following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port
-  and headphone mini jack plug. 
-  
+  and headphone mini jack plug.
+
   On the bottom panel of the \dap{} is the data cable port.}
   %
   \opt{gigabeatf}{
@@ -271,27 +254,27 @@ detail in the following paragraph.
   Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the
   Gigabeat X is smaller and has a slightly tapered back.}
 
-  Hold the \dap{} with the screen on top and the controls on the right hand side.  
-  Below the screen is a cross-shaped touch sensitive pad which contains the 
+  Hold the \dap{} with the screen on top and the controls on the right hand side.
+  Below the screen is a cross-shaped touch sensitive pad which contains the
   \ButtonUp{}, \ButtonDown{}, \ButtonLeft{} and \ButtonRight{} controls.  On the
   Gigabeat X, this pad will feel slightly raised up, while it will feel slightly
-  sunken in on the Gigabeat F. On the top of the unit, from left to right, are the 
-  power socket, the \ButtonHold{} switch, and the headphone socket.  The 
-  \ButtonHold{} switch puts the \dap{} into hold mode when it is switched to the 
-  right of the unit. The buttons will have no effect when this is the case.  
-  
+  sunken in on the Gigabeat F. On the top of the unit, from left to right, are the
+  power socket, the \ButtonHold{} switch, and the headphone socket.  The
+  \ButtonHold{} switch puts the \dap{} into hold mode when it is switched to the
+  right of the unit. The buttons will have no effect when this is the case.
+
   Starting from the left hand side on the bottom of the unit, nearer to the front
-  than the back, is a recessed switch which 
+  than the back, is a recessed switch which
   controls whether the battery is on or off.  When this switch is to the left,
   the battery is disconnected.  This can be used for a hard reset of the unit,
   or if the \dap{} is being placed in storage.  Next to that is a connector for
   the docking station and finally on the right hand side of the bottom of the
   unit is a mini USB socket for connecting directly to USB.
-  
+
   Finally on the right hand side of the unit are some control buttons.  Going from
   the bottom of the unit to the top there is a small round \ButtonA{} buttton then a
   rocker volume switch with of the \ButtonVolDown{} button below the \ButtonVolUp{}
-  button.  Above that is are two more small round buttons, the \ButtonMenu{} 
+  button.  Above that is are two more small round buttons, the \ButtonMenu{}
   button and nearest to the top of the unit the \ButtonPower{} button, which is held
   down to turn the \dap{} on or off. If you have a Gigabeat X, these buttons are small
   metallic buttons that are place further up on the right hand side, and closer
@@ -312,12 +295,12 @@ detail in the following paragraph.
   than the front, is a recessed switch which controls whether the battery is on
   or off.  When this switch is to the left, the battery is disconnected.
   This can be used for a hard reset of the unit, or if the \dap{} is being placed
-  in storage.  Next to that is a mini USB socket for connecting directly to USB, 
-  and finally a custom connector, presumably for planned accessories which were 
+  in storage.  Next to that is a mini USB socket for connecting directly to USB,
+  and finally a custom connector, presumably for planned accessories which were
   never released.
 
-  Finally on the right hand side of the unit are some control buttons and the power 
-  connector.  Going from the bottom of the unit to the top, there is the power 
+  Finally on the right hand side of the unit are some control buttons and the power
+  connector.  Going from the bottom of the unit to the top, there is the power
   connector socket, followed by three small round buttons, the
   \ButtonNext{} buttton, \ButtonPlay{} button, and \ButtonPrev{} button (from bottom
   to top) then a rocker volume switch with of the \ButtonVolDown{} button below the
@@ -325,58 +308,58 @@ detail in the following paragraph.
   button, which is held down to turn the \dap{} on or off.}
   %
   \opt{mrobe100}{
-  Hold the \dap{} with the black front facing you such that the m:robe writing 
-  is readable. Below the writing is the touch sensitive pad with the 
-  \ButtonMenu{}, \ButtonPlay{}, \ButtonLeft{}, \ButtonRight{} and \ButtonDisplay 
-  controls indicated by their symbols. The dotted center strip is devided in 
-  three parts: \ButtonUp{}, \ButtonSelect{} and \ButtonDown. On the top of the 
-  unit, on the right, is the \ButtonPower{} switch, which is held down to turn 
+  Hold the \dap{} with the black front facing you such that the m:robe writing
+  is readable. Below the writing is the touch sensitive pad with the
+  \ButtonMenu{}, \ButtonPlay{}, \ButtonLeft{}, \ButtonRight{} and \ButtonDisplay
+  controls indicated by their symbols. The dotted center strip is devided in
+  three parts: \ButtonUp{}, \ButtonSelect{} and \ButtonDown. On the top of the
+  unit, on the right, is the \ButtonPower{} switch, which is held down to turn
   the \dap{} on or off.
-  
-  The \ButtonHold{} switch is located on the left of the \dap{}, below the 
-  headphone socket. It puts the \dap{} into hold mode when it is switched to the 
-  top of the unit. The buttons will have no effect when this is the case. On the 
-  bottom of the unit, there is a connector for the docking station or the 
+
+  The \ButtonHold{} switch is located on the left of the \dap{}, below the
+  headphone socket. It puts the \dap{} into hold mode when it is switched to the
+  top of the unit. The buttons will have no effect when this is the case. On the
+  bottom of the unit, there is a connector for the docking station or the
   proprietary USB connector for connecting directly to USB.}
   %
   \opt{iaudiom5,iaudiox5}{
-  The \dap{} is curved so that the end with the screen on it is thicker than the 
+  The \dap{} is curved so that the end with the screen on it is thicker than the
   other end.  Hold the \dap{} wih the thick end towards the top and the screen
   facing towards you.  Half way up the front of the unit on the right hand side
-  is a four way joystick which is the \ButtonUp{}, \ButtonDown{}, 
+  is a four way joystick which is the \ButtonUp{}, \ButtonDown{},
   \ButtonLeft{}, and \ButtonRight{} buttons. When pressed it serves as \ButtonSelect{}.
-  
-  On the right hand side of the \dap{} from top to bottom, first there is a two 
+
+  On the right hand side of the \dap{} from top to bottom, first there is a two
   way switch.  the \ButtonPower{} button is activated by pushing this switch up,
-  and pushing this switch down until it clicks slightly will activate the 
+  and pushing this switch down until it clicks slightly will activate the
   \ButtonHold{} button.  When the switch is in this position, none of the other
   keys will have an effect.
-  
-  Below the switch is a lozenge shaped button which is the \ButtonRec{} 
-  button, and below that the final button on this side of the unit, the 
+
+  Below the switch is a lozenge shaped button which is the \ButtonRec{}
+  button, and below that the final button on this side of the unit, the
   \ButtonPlay{} button.  Just below this is a small hole which is difficult to
-  locate by touch which is the internal microphone.  At the very bottom of 
+  locate by touch which is the internal microphone.  At the very bottom of
   this side of the unit is the reset hole, which can be used to perform a hard
   reset by inserting a paper clip.
-  
-  On the bottom of the unit is the connector for the 
-  \playerman{} subpack or dock.  On the top of the unit is a charge 
+
+  On the bottom of the unit is the connector for the
+  \playerman{} subpack or dock.  On the top of the unit is a charge
   indicator light, which may feel a bit like a button, but is not.
-  
-  From the top of the \dap{} on the left hand side is the headphone socket, then the 
+
+  From the top of the \dap{} on the left hand side is the headphone socket, then the
   remote connector.  Below this is a cover which protects the \opt{iaudiox5}{USB
   host connector.}\opt{iaudiom5}{USB and charging connector}.}
   %
   \opt{e200,e200v2}{
   Hold the \dap{} with the turning wheel at the front and bottom.  On the bottom left
   of the front of the \dap{} is a raised round button, the \ButtonPower{} button.
-  Above and to the left of this, on the outside of the turning wheel are four 
-  buttons.  These are the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{} and 
+  Above and to the left of this, on the outside of the turning wheel are four
+  buttons.  These are the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{} and
   \ButtonRight{} buttons.  Inside the wheel is the \ButtonSelect{} button.  Turning
   the wheel to the right activates the \ButtonScrollFwd{} function, and to the
-  left, the \ButtonScrollBack{} function.  
-  
-  On the right of the unit is a slot for inserting flash cards.  On the bottom is 
+  left, the \ButtonScrollBack{} function.
+
+  On the right of the unit is a slot for inserting flash cards.  On the bottom is
   the connector for the USB cable.  On the left is the \ButtonRec{} button, and
   on the top, there is the headphone socket to the right, and the \ButtonHold{}
   switch.  Moving this switch to the right activates hold mode in which none of the
@@ -458,120 +441,67 @@ detail in the following paragraph.
   %
   \opt{vibe500}{
   Hold or lay the \dap{} so that the side with the controls and
-  LCD is facing towards you. Below the LCD is the touch sensitive pad with the \ButtonMenu{}, 
-  \ButtonPlay{}, \ButtonLeft{}, \ButtonRight{} controls and the scroll pad in the centre. The 
+  LCD is facing towards you. Below the LCD is the touch sensitive pad with the \ButtonMenu{},
+  \ButtonPlay{}, \ButtonLeft{}, \ButtonRight{} controls and the scroll pad in the centre. The
   scroll pad is oriented vertically between the \ButtonOK{} and \ButtonCancel{} buttons.
-  Sliding a finger up or down the scroll pad acts as \ButtonUp{} and \ButtonDown{} respectively. 
-  Note that the scroll pad is sensitive, so you will need to move 
-  slowly at first and get a feel for how it works. 
+  Sliding a finger up or down the scroll pad acts as \ButtonUp{} and \ButtonDown{} respectively.
+  Note that the scroll pad is sensitive, so you will need to move
+  slowly at first and get a feel for how it works.
 
-  There are two buttons on the right hand side of the \dap{}: \ButtonPower{} on the top and 
-  \ButtonRec{} underneath. Under these buttons, from top to bottom you can find: USB connector, 
-  power connector and the reset hole if you need to perform a hardware reset. 
+  There are two buttons on the right hand side of the \dap{}: \ButtonPower{} on the top and
+  \ButtonRec{} underneath. Under these buttons, from top to bottom you can find: USB connector,
+  power connector and the reset hole if you need to perform a hardware reset.
 
-  The \ButtonHold{} switch is located on the left hand side of the \dap{}. Note that when the 
-  \ButtonHold{} switch is moved towards the top of the \dap{}, hold is turned on and all the 
-  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player. 
+  The \ButtonHold{} switch is located on the left hand side of the \dap{}. Note that when the
+  \ButtonHold{} switch is moved towards the top of the \dap{}, hold is turned on and all the
+  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player.
 
-  On the top on the \dap{} is the internal microphone on the left and the line-in socket on the 
+  On the top on the \dap{} is the internal microphone on the left and the line-in socket on the
   right, near the headphone socket.}
   %
   \opt{samsungyh820}{
   Hold or lay the \dap{} so that the side with the controls and
   LCD is facing towards you. Directly below the bottom edge of the screen are three buttons:
   \ButtonRew{} on the left, \ButtonPlay{} in the middle and \ButtonFF{} on the right. Below them
-  is a four-way pad which contains the \ButtonDown{}, \ButtonUp{}, \ButtonLeft{} and 
+  is a four-way pad which contains the \ButtonDown{}, \ButtonUp{}, \ButtonLeft{} and
   \ButtonRight{} controls.
 
   At the top of the right hand side of the \dap{} is the \ButtonRec{} button.
 
-  On the top panel of the \dap{}, from left to right, you can find the following: headphone 
-  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the 
-  \ButtonHold{} switch is moved towards the center of the \dap{}, hold is turned on and all the 
-  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player. 
+  On the top panel of the \dap{}, from left to right, you can find the following: headphone
+  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the
+  \ButtonHold{} switch is moved towards the center of the \dap{}, hold is turned on and all the
+  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player.
 
-  At the top of the back side of the player, just under the \ButtonHold{} button is the reset 
-  hole, if you need to perform a hardware reset. 
+  At the top of the back side of the player, just under the \ButtonHold{} button is the reset
+  hole, if you need to perform a hardware reset.
 
-  The USB/dock connector that is used to connect your \dap{} to your computer is on 
+  The USB/dock connector that is used to connect your \dap{} to your computer is on
   the bottom panel of the \dap{}.
   }
   %
   \opt{samsungyh920,samsungyh925}{
   Hold or lay the \dap{} so that the side with the controls and
-  LCD is facing towards you. Below the LCD is a four-way pad with the \ButtonDown{}, 
+  LCD is facing towards you. Below the LCD is a four-way pad with the \ButtonDown{},
   \ButtonUp{}, \ButtonLeft{} and \ButtonRight{} buttons.
 
-  There are three buttons at the top of the right hand side of the \dap{}: \ButtonFF{} on the top, 
+  There are three buttons at the top of the right hand side of the \dap{}: \ButtonFF{} on the top,
   \ButtonPlay{} in the middle and \ButtonRew{} underneath. Below these buttons is the \ButtonRec{}
-  switch. Rockbox doesn't take note of the actual \emph{position} of the switch, but reacts to a 
+  switch. Rockbox doesn't take note of the actual \emph{position} of the switch, but reacts to a
   \emph{switching movement} like pressing a regular button.
 
-  On the top panel of the \dap{}, from left to right, you can find the following: headphone/remote 
-  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the 
-  \ButtonHold{} switch is moved towards the center of the \dap{}, hold is turned on and all the 
-  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player. 
+  On the top panel of the \dap{}, from left to right, you can find the following: headphone/remote
+  socket, line-in socket, internal microphone, and the \ButtonHold{} switch. Note that when the
+  \ButtonHold{} switch is moved towards the center of the \dap{}, hold is turned on and all the
+  other controls are disabled. Be sure \ButtonHold{} is off before trying to use your player.
 
   At the top of the back side of the player, just under the \ButtonHold{} button is the reset hole,
-  if you need to perform a hardware reset. 
+  if you need to perform a hardware reset.
 
-  The USB/dock connector that is used to connect your \dap{} to your computer is on 
+  The USB/dock connector that is used to connect your \dap{} to your computer is on
   the bottom panel of the \dap{}.
   }
   %
-  \opt{player}{
-  The main controls of this player are a four-way button on the right below
-  the screen, and two round buttons to the left of it. Hold the \dap{} with
-  these controls on the bottom and facing you.
-
-  On the left hand side, the higher of the two small buttons is the \ButtonOn{},
-  the lower of the two buttons is the \ButtonMenu{} button. The large circular
-  button on the right contains, clockwise from the top, the \ButtonPlay{},
-  the \ButtonRight{}, the \ButtonStop{}, and the \ButtonLeft{} buttons.
-
-  On the top on the \dap{} is the headphone socket on the left and the line-out
-  jack on the right. On the bottom of the \dap{} is the line-in jack on the left,
-  the DC-In jack on the right, and the USB connector in the centre.
-  }
-  %
-  \opt{recorder}{
-  Holding the Jukebox in front of you, there should be three rectangular buttons
-  in a horizontal line towards the middle of the unit, and below this to the left
-  there is a circular four button array with the circular \ButtonPlay{} button
-  as a fifth button in the centre. These are the navigation controls. Below the
-  rectangular buttons and to the right of the circular buttons are two small round
-  buttons one above the other.
-
-  The \ButtonOn{} button is the topmost of the two buttons located below and to the
-  left of the navigation controls whereas the lower of these two is called \ButtonOff.
-  The small round button in the middle of the large circular button array is called
-  \ButtonPlay{} button. To the right of the \ButtonPlay{} button there is the
-  \ButtonRight{} button, left of it is the \ButtonLeft{}, above it \ButtonUp, and
-  below the \ButtonPlay{} button there is the \ButtonDown{} button placed. In the row
-  of three rectangular buttons the following buttons can be found (from left to right):
-  \ButtonFOne{}, \ButtonFTwo{} and \ButtonFThree{}.
-
-  On the top of the \dap{} is the headphone socket on the left and the line-out jack on
-  the right. On the bottom of the \dap{} is the line-in jack on the left, the
-  DC-In jack on the right, and the USB connector in the centre.
-  }
-  \opt{recorderv2fm}{
-  Holding the Jukebox in front of you, there should be three rectangular buttons
-  in a horizontal line towards the middle of the unit, and below this centred on the
-  middle button there are four radial arc shaped buttons placed in a cross formation
-  with the circular play button as the centre of the cross. These are the navigation
-  controls. Below the cross and to the left are two other buttons.
-
-  The \ButtonOn{} button is the leftmost of the two buttons located below and to the
-  left of the navigation controls whereas the rightmost and little lower one of
-  these two is called \ButtonOff{}. The round button raised slightly higher than the
-  others in the centre of the navigation controls is the \ButtonPlay{} button.  To
-  the right of the \ButtonPlay{} button  there is the \ButtonRight{} button, left of
-  it is the \ButtonLeft{}, above it \ButtonUp{}, and below the \ButtonPlay{} button
-  there is the \ButtonDown{} button  placed. In the row of three rectangular buttons
-  the following buttons can be found (from left to right): \ButtonFOne{}, \ButtonFTwo{}
-  and \ButtonFThree{}.
-  }
 }
 
 \subsection{Turning the \dap{} on and off}
@@ -584,8 +514,6 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           {Long \ButtonPlay}%
       \opt{IPOD_4G_PAD}{\ButtonMenu{} / \ButtonSelect}%
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
-      \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}%
-          {Long \ButtonOn}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,ONDA_VX777_PAD%
           ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,PBELL_VIBE500_PAD%
           ,SANSA_FUZEPLUS_PAD%
@@ -604,15 +532,12 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       \opt{MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
           {Long \ButtonPlay}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
-      \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
-      \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
-      \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,COWON_D2_PAD%
           ,PBELL_VIBE500_PAD,ONDA_VX777_PAD,SANSA_FUZEPLUS_PAD%
           }{Long \ButtonPower}%
           &
-      \opt{HAVEREMOTEKEYMAP}{ 
+      \opt{HAVEREMOTEKEYMAP}{
           \opt{IRIVER_RC_H100_PAD}{Long \ButtonRCStop}%
           \opt{IAUDIO_RC_PAD}{Long \ButtonRCPlay}
           &}
@@ -629,11 +554,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   the Reset Settings in \reference{ref:manage_settings_menu} for details.
 }%
 
-\opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,IPOD_4G_PAD,SANSA_E200_PAD%
+\opt{GIGABEAT_PAD,IPOD_4G_PAD,SANSA_E200_PAD%
 ,SANSA_C200_PAD,IAUDIO_X5_PAD,IAUDIO_M5_PAD,IPOD_3G_PAD}{%
   In the unlikely event of a software failure, hardware poweroff or reset can be
-  performed by holding down \opt{PLAYER_PAD}{\ButtonStop}\opt{RECORDER_PAD,ONDIO_PAD}
-  {\ButtonOff}\opt{GIGABEAT_PAD}{the battery switch}\opt{IPOD_4G_PAD}
+  performed by holding down
+  \opt{GIGABEAT_PAD}{the battery switch}\opt{IPOD_4G_PAD}
   {\ButtonMenu{} and \ButtonSelect{} simultaneously}%
   \opt{IPOD_3G_PAD}{\ButtonMenu{} and \ButtonPlay{} simultaneously}%
   \opt{SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD,IAUDIO_M5_PAD}
@@ -646,7 +571,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   performed by inserting a paperclip gently into the Reset hole.
 }%
 
-\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5,archos}
+\nopt{gigabeatf,iaudiom3,iaudiom5,iaudiox5}
   {
   \subsection{Starting the original firmware}
   \label{ref:Dualboot}
@@ -656,11 +581,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     down the device as described above. Turn on the \ButtonHold{} switch
     immediately after turning the player on. The Apple logo will
     display for a few seconds as Rockbox loads the original firmware.
-    
+
     You can also load the original firmware by shutting down the device,
     then clicking the \ButtonHold{} switch on and connecting the iPod
     to your computer.
- 
+
     Regardless of which method you use to boot to the original firmware, you can
     return to Rockbox by pressing and holding \ButtonMenu{} and \ButtonSelect{}
     simultaneously until the player hard resets.
@@ -672,11 +597,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     down the device as described above. Turn on the \ButtonHold{} switch
     immediately after turning the player on. The Apple logo will
     display for a few seconds as Rockbox loads the original firmware.
-    
+
     You can also load the original firmware by shutting down the device,
     then clicking the \ButtonHold{} switch on and connecting the iPod
     to your computer.
- 
+
     Regardless of which method you use to boot to the original firmware, you can
     return to Rockbox by pressing and holding \ButtonMenu{} and \ButtonPlay{}
     simultaneously until the player hard resets.
@@ -722,7 +647,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     inserting a pin in the reset hole}\opt{iriverh10_5gb}{removing and
     reinserting the battery}.}
     }
-    
+
   \opt{sansa,sansaAMS}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
@@ -741,9 +666,9 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
     the file \fname{/System/OF.mi4}. To boot into the original firmware,
-    when the \dap{} is turned off, press the \ButtonPower{} button once and then 
+    when the \dap{} is turned off, press the \ButtonPower{} button once and then
     a second time when the m:robe bootlogo (the headphone) appears. Hold the
-    \ButtonPower{} button until you see the ``Loading original firmware...'' 
+    \ButtonPower{} button until you see the ``Loading original firmware...''
     message on the screen.
     }
 
@@ -771,8 +696,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   \opt{samsungyh}
     {
     Rockbox has a dual-boot feature. It loads the original firmware from
-    the file \fname{/System/OF.mi4}. To boot into the original firmware, press and hold 
-    for awhile the \ButtonPlay{} button and then immediately after the Samsung logo appears, 
+    the file \fname{/System/OF.mi4}. To boot into the original firmware, press and hold
+    for awhile the \ButtonPlay{} button and then immediately after the Samsung logo appears,
     press the \ButtonLeft{} button and keep it pressed until the original firmware starts.
     }
 
@@ -797,7 +722,7 @@ With the \dap{} connected to the computer as an MSC/UMS device (like a
 USB Drive), music files can be put on the player via any standard file
 transfer method that you would use to copy files between drives (e.g. Drag-and-Drop).
 Files may be placed wherever you like on the \dap{}, but it is strongly
-suggested \emph{NOT} to put them in the \fname{/.rockbox} folder and instead 
+suggested \emph{NOT} to put them in the \fname{/.rockbox} folder and instead
 put them in any other folder, e.g. \fname{/}, \fname{/music} or \fname{/audio}.
 The default directory structure that is assumed by some parts of Rockbox
 \opt{albumart}{%
@@ -807,7 +732,7 @@ The default directory structure that is assumed by some parts of Rockbox
     your files are not properly tagged, and you have your music organized in a
     way different than they assume when attempting to guess the Artist and Album
     names from your filetree. See \reference{ref:album_art} for the requirements
-    for Album Art to work properly. 
+    for Album Art to work properly.
 }%
 \nopt{albumart}{%
     (missing-tag fallback in some WPSes) uses the parent directory of a song
@@ -839,11 +764,11 @@ pretty intuitive.
 In the tree view use \ActionStdNext{} and \ActionStdPrev{} to move around
 the selection. Use \ActionStdOk{} to select an item. \opt{wheel_acceleration}{
 Note that the scroll speed is accelerating the faster you rotate the wheel.}
-When browsing the file system selecting an audio file plays it. The view 
-switches to the ``While playing screen'', usually abbreviated as ``WPS'' (see 
-\reference{ref:WPS}. The dynamic playlist gets replaced with the contents of 
-the current directory. This way you can easily treat directories as playlists. 
-The created dynamic playlist can be extended or modified while playing. This is 
+When browsing the file system selecting an audio file plays it. The view
+switches to the ``While playing screen'', usually abbreviated as ``WPS'' (see
+\reference{ref:WPS}. The dynamic playlist gets replaced with the contents of
+the current directory. This way you can easily treat directories as playlists.
+The created dynamic playlist can be extended or modified while playing. This is
 also known as ``on-the-fly playlist''.
 To go back to the \setting{File Browser} stop the playback with the
 \ActionWpsStop{} button or return to the file browser while keeping playback
@@ -893,7 +818,6 @@ have the needed fonts installed as otherwise the theme may not display
 properly.}
 }
 
-\nopt{ondio}{
   \opt{usb_power}{
     \section{USB Charging}
     To charge your \dap{} over USB, hold any button while plugging it
@@ -906,15 +830,5 @@ properly.}
     \ActionStdUsbCharge{}.}
     }
   }
-}
-
-\opt{ondio}{
-  \section{USB Power}
-
-    To power your \dap{} over USB, hold \ActionStdUsbCharge{} while plugging it
-    in. This will prevent it from connecting to your computer and let you
-    continue to use it normally. Your \dap{} must already be in Rockbox for this
-    to function.
-}
 
 \input{rockbox_interface/browsing_and_playing.tex}
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index c82a9cb9f4..1f62dc17a4 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -9,17 +9,10 @@ currently playing audio file.
   or off independently. Refer to \reference{ref:wps_tags} for details on how
   to change the display of the WPS.
   \begin{itemize}
-    \nopt{ondio}{
-    \item Status bar: The Status bar shows Battery level, charger status, 
-      volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
-      In contrast to all other items, the status bar is always at the top of
-      the screen.
-    }
-    \opt{ondio}{
-    \item Status bar: The Status bar shows Battery level, USB power mode, key
-      lock status, memory access indicator. In contrast to all other items, the
-      status bar is always at the top of the screen.
-    }
+  \item Status bar: The Status bar shows Battery level, charger status,
+    volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
+    In contrast to all other items, the status bar is always at the top of
+    the screen.
   \item (Scrolling) path and filename of the current song.
   \item The ID3 track name.
   \item The ID3 album name.
@@ -30,24 +23,7 @@ currently playing audio file.
   \item Peak meter.
   \end{itemize}
 }
-\opt{recorder,recorderv2fm,ondio}{
-  \note{
-  \begin{itemize}
-  \item The number of lines shown depends on the size of the font used.
-  \item The peak meter is only visible if you turn off the status bar or if
-    using a small font that gives 8 or more display lines.
-  \end{itemize}
-  }
-}
 %
-\opt{player}{
-  \note{
-  \begin{itemize}
-  \item Playlist index/Playlist size: Artist {}- Title.
-  \item Current{}-time Progress{}-indicator Left.
-  \end{itemize}
-  }
-}
 
 See \reference{ref:ConfiguringtheWPS} for details of customising
 your WPS (While Playing Screen).
@@ -81,7 +57,7 @@ your WPS (While Playing Screen).
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPlay}
       & Toggle play/pause.\\
       %
-      \ActionWpsStop 
+      \ActionWpsStop
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsStop}
       & Stop playback.\\
       %
@@ -93,11 +69,10 @@ your WPS (While Playing Screen).
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsContext}
       & Enter \setting{WPS Context Menu}.\\
       %
-      \opt{ONDIO_PAD}{\ActionWpsContext{} twice}%
-      \nopt{ONDIO_PAD}{\ActionWpsMenu}%
+      \ActionWpsMenu
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsMenu}
       & Enter \setting{Main Menu}%
-      \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
+      .\\%
       %
       \opt{quickscreen}{%
         \ActionWpsQuickScreen
@@ -107,25 +82,14 @@ your WPS (While Playing Screen).
       %
       % software hold targets
       \nopt{hold_button}{%
-          \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown}
-          \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop}
-          \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
           \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
           \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower}
           & Key lock (software hold switch) on/off.\\
       }%
-      %These actions need definitions for the other targets
-      \opt{RECORDER_PAD}{%
-        \ButtonFThree & Toggles Display quick screen.\\%
-        \ButtonFOne+\ButtonPlay & Mute on/off.\\%
-      }%
-      \opt{PLAYER_PAD}{%
-        \ButtonMenu+\ButtonPlay & Mute on/off.\\%
-      }%
       % We explicitly list all the appropriate targets here and do no condition
       % on the 'pitchscreen' feature since some players have the feature but do
       % not have the button to go from the WPS to the pitch screen.
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%
         \ActionWpsPitchScreen
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPitchScreen}
@@ -137,9 +101,9 @@ your WPS (While Playing Screen).
         \opt{HAVEREMOTEKEYMAP}{&}
           & Show current \setting{Playlist}.\\%
       }%
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
           ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%
-        \ActionWpsIdThreeScreen 
+        \ActionWpsIdThreeScreen
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsIdThreeScreen}
           & Enter \setting{ID3 Viewer}.\\%
       }%
@@ -168,7 +132,7 @@ your WPS (While Playing Screen).
       %
       \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
         \ActionStdRec
-          \opt{HAVEREMOTEKEYMAP}{&} 
+          \opt{HAVEREMOTEKEYMAP}{&}
           & Switch to the \setting{Recording Screen}.\\
       }%
   \end{btnmap}
@@ -177,7 +141,7 @@ your WPS (While Playing Screen).
 \opt{lcd_bitmap}{
   \subsection{\label{ref:peak_meter}Peak Meter}
   The peak meter can be displayed on the While Playing Screen and consists of
-  several indicators. 
+  several indicators.
   \opt{recording}{
     For a picture of the peak meter, please see the While
     Recording Screen in \reference{ref:while_recording_screen}.
@@ -187,12 +151,12 @@ your WPS (While Playing Screen).
      suffers when this feature is enabled. For this \dap{} it is highly recommended
      to not use peak meter.}
   }
-  
+
   \begin{description}
   \item [The bar:]
     This is the wide horizontal bar. It represents the current volume value.
   \item [The peak indicator:]
-    This is a little vertical line at the right end of the bar. It indicates 
+    This is a little vertical line at the right end of the bar. It indicates
     the peak volume value that occurred recently.
   \item [The clip indicator:]
     This is a little black block that is displayed at the very right of the
@@ -234,7 +198,7 @@ menu, you can find the \setting{Playlist Viewer Settings}.
        for playlist entries
   \end{description}
 
-    
+
 \subsubsection{Playlist catalogue}
   \begin{description}
     \item [View catalogue.] This lists all playlists that are part of the
@@ -249,12 +213,12 @@ menu, you can find the \setting{Playlist Viewer Settings}.
 
 \subsubsection{Sound Settings}
 This is a shortcut to the \setting{Sound Settings Menu}, where you can configure volume,
-bass, treble, and other settings affecting the sound of your music.  
+bass, treble, and other settings affecting the sound of your music.
 See \reference{ref:configure_rockbox_sound} for more information.
 
 \subsubsection{Playback Settings}
 This is a shortcut to the \setting{Playback Settings Menu}, where you can configure shuffle,
-repeat, party mode, skip length and other settings affecting the playback of your music.  
+repeat, party mode, skip length and other settings affecting the playback of your music.
 
 \subsubsection{Rating}
 The menu entry is only shown if \setting{Gather Runtime Information} is
@@ -271,19 +235,17 @@ This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,
 album etc. To access this screen, %
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
       SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}{
   press \ActionWpsIdThreeScreen. }%
-\opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
       GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD,%
       MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
-      {press \ActionWpsContext{} to access the 
+      {press \ActionWpsContext{} to access the
       \setting{WPS Context Menu} and select \setting{Show Track Info}. }
-\opt{RECORDER_PAD,PLAYER_PAD,ONDIO_PAD}{Use \ButtonLeft\ and \ButtonRight\
-  to move through the information.}%
 
 \subsubsection{Open With...}
-This \setting{Open With} function is the same as the \setting{Open With} 
+This \setting{Open With} function is the same as the \setting{Open With}
 function in the file browser's \setting{Context Menu}.
 
 \subsubsection{Delete}
@@ -294,7 +256,7 @@ This may even be the whole track.
 
 \opt{pitchscreen}{
   \subsubsection{\label{sec:pitchscreen}Pitch}
-  
+
   The \setting{Pitch Screen} allows you to change the rate of playback
   (i.e. the playback speed and at the same time the pitch) of your
   \dap.  The rate value can be adjusted
@@ -304,20 +266,20 @@ This may even be the whole track.
 
   The rate can be changed in two modes: procentual and semitone.
   Initially, procentual mode is active.
-  
+
   \opt{swcodec}{
     If you've enabled the \setting{Timestretch} option in
     \setting{Sound Settings} and have since rebooted, you can also use
     timestretch mode. This allows you to change the playback speed
     without affecting the pitch, and vice versa.
-    
+
     In timestretch mode there are separate displays for pitch and
     speed, and each can be altered independently.  Due to the
     limitations of the algorithm, speed is limited to be between 35\%
     and 250\% of the current pitch value.  Pitch must maintain the
     same ratio as well as remain between 50\% and 200\%.
   }
-  
+
   The value of the \opt{swcodec}{rate, pitch and speed}\nopt{swcodec}{rate}
   is not persistent, i.e. after the \dap\ is turned on it will
   always be set to 100\%.  \opt{swcodec}{ However, the rate, pitch and speed
@@ -386,56 +348,3 @@ This may even be the whole track.
   }
 
 }
-
-%********************QUICKSCREENS***********************************************
-\opt{RECORDER_PAD}{
-  \section{\label{ref:QuickScreens}Quick Screens}
-  \screenshot{rockbox_interface/images/ss-quick-screen-112x64x1.png}{The F2 quick screen}{}
-  \screenshot{rockbox_interface/images/ss-quick-screen2-112x64x1.png}{The F3 quick screen}{}
-  Rockbox handles function buttons in a different way to the Archos software.
-  \ButtonFOne\ is always bound to the menu function, while \ButtonFTwo\ and
-  \ButtonFThree\ enable two quick screens.
-  
-  \ButtonFTwo\ displays some browse and play settings which are likely to be
-  changed frequently. This settings are Shuffle mode, Repeat mode and the Show
-  files options
-  
-  Shuffle mode plays each track in the currently playing list in a random order
-  rather than in the order shown in the browser.
-
-  Repeat mode repeats either a single track (One) or the entire playlist (All).
-
-  Show files determines what type files can be seen in the browser.  This can be
-  just MP3 files and directories (Music), Playlists, MP3 files and directories
-  (Playlists), any files that Rockbox supports (Supported) or all files on the
-  disk (All).
-
-  See \reference{ref:PlaybackOptions} for more information about these
-  settings.
-
-  \begin{btnmap}
-      \ButtonLeft & Control Shuffle mode setting. \\
-      \ButtonRight & Control Repeat mode setting. \\
-      \ButtonDown & Control Show file setting. \\
-  \end{btnmap}
-  
-  \ButtonFThree\ controls frequently used display options.
-  
-  Scroll bar turns the display of the Scroll bar on the left of the screen on
-  or off.
-  
-  Status bar turns the status display at the top of the screen on or off. 
-  Upside down inverts the screen so that the top of the display appears nearest
-  to the buttons. This is sometimes useful when storing the \dap\ in a pocket.
-  Key assignments swap over with the display orientation where it is logical 
-  for them to do so.
-
-  See \reference{ref:Displayoptions} for more information about these
-  settings.
-  
-  \begin{btnmap}
-      \ButtonLeft & Control scroll bar display. \\
-      \ButtonRight & Control status bar display. \\
-      \ButtonDown & Control upside down screen setting. \\
-  \end{btnmap}
-}