3 files changed, 187 insertions, 401 deletions

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}
-}