8 files changed, 226 insertions, 270 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 8147715ace..a429b63d21 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -1,9 +1,9 @@
 % $Id$ %
 \section{\label{ref:Bookmarkconfigactual}Bookmarking}
   Bookmarks allow you to save your current position within a track so that 
-  you can return to it at a later time. \opt{swcodec}{Bookmarks also store
-  rate, pitch and speed information from the \setting{Pitch Screen} (see
-  \reference{sec:pitchscreen}).} Bookmarks are saved on a per directory
+  you can return to it at a later time. Bookmarks also store rate, pitch
+  and speed information from the \setting{Pitch Screen} (see
+  \reference{sec:pitchscreen}). Bookmarks are saved on a per directory
   basis or for individual (saved) playlists. You can store multiple bookmarks,
   even for the same track. When there's already a bookmark for a directory or
   playlist, new bookmarks are added before existing ones.
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 33ddc3e18c..f00b0a2da9 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -173,11 +173,9 @@
     \item[Scroll Start Delay.]
       Controls how many milliseconds Rockbox should wait before a new
       text begins automatically scrolling.
-    \opt{lcd_bitmap}{
       \item[Scroll Step Size.]
         Defines the number of pixels the text should move for each step, as used
         by the Scroll Speed setting.
-    }
     \opt{remote}{
       \item[Remote Scrolling Options.]
         The options here have the same effect on the remote LCD as the options
@@ -191,22 +189,20 @@
       Rockbox chooses which method it should use depending of how much it has to
       scroll to the left. This setting lets you tell Rockbox where that limit
       is, expressed in percentage of the line length.
-    \opt{lcd_bitmap}{
-      \item[Screen Scrolls Out of View.]
-        Screens can be manually scrolled horizontally by pressing
-        \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}%
-        \opt{IRIVER_H10_PAD,XDUOO_X3_PAD}{Long \ButtonPrev/\ButtonNext}%
-        \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,XDUOO_X3_PAD%
-              ,touchscreen}{%
-            Long \ButtonRight/\ButtonLeft}.
-        Setting this option to \setting{Yes}
-        will keep the list entries at their fixed positions and allow them to be
-        scrolled out of view, whereas \setting{No} will only scroll those entries
-        which surpass the right margin.
-      \item[Screen Scroll Step Size.]
-        Defines the number of pixels the horizontal manual screen scroll should move
-        for each step.
-    }
+    \item[Screen Scrolls Out of View.]
+      Screens can be manually scrolled horizontally by pressing
+      \opt{IRIVER_H10_PAD}{Long \ButtonRew/\ButtonFF}%
+      \opt{IRIVER_H10_PAD,XDUOO_X3_PAD}{Long \ButtonPrev/\ButtonNext}%
+      \nopt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,XDUOO_X3_PAD%
+            ,touchscreen}{%
+          Long \ButtonRight/\ButtonLeft}.
+      Setting this option to \setting{Yes}
+      will keep the list entries at their fixed positions and allow them to be
+      scrolled out of view, whereas \setting{No} will only scroll those entries
+      which surpass the right margin.
+    \item[Screen Scroll Step Size.]
+      Defines the number of pixels the horizontal manual screen scroll should move
+      for each step.
     \item[Paged Scrolling.]
       When set to \setting{Yes} scrolling vertically on pages that surpass the
       screen size will page up/down instead of simply changing lines. This can be
@@ -227,50 +223,49 @@
     }
     \end{description}
 %
-  \opt{lcd_bitmap}{
-    \item[Peak Meter.]
-      The peak meter can be configured with a number of parameters.
-      \begin{description}
-      \item[Peak Release.]
-        This determines how fast the bar shrinks when the music becomes
-        softer. Lower values make the peak meter look smoother.
-        Expressed in scale units per 10~ms.
-      \item[Peak Hold Time.]
-        Specifies the time after which the peak indicator will reset.
-        For example, if you set this value to 5~s, the peak indicator displays
-        the loudest volume value that occurred within the last 5 seconds.
-        Larger values are useful if you want to find the peak level of a song,
-        which might be of interest when copying music from the \dap\ via the
-        analogue output to some other recording device.
-      \item[Clip Hold Time.]
-        The number of seconds that the clipping indicator will be visible
-        after clipping is detected.
-      \opt{recording}{
-        \item[Clip Counter.]
-          Show the number of times the clip indicator went active during
-          recording in front of the peak meters.
-      }
-      \item[\label{ref:Peakmetersetting}Scale.]
-        Select whether the peak meter displays linear or logarithmic values.
-        The human ear perceives loudness on a logarithmic scale. If the Scale
-        setting is set to \setting{Logarithmic} (dB) scale, the volume values
-        are scaled logarithmically. The volume meters of digital audio
-        devices usually are scaled this way. On the other hand, if you
-        are interested in the power level that is applied to your headphones
-        you should choose \setting{Linear} display. This setting cannot be
-        displayed in units like volts or watts because such units depend
-        on your headphones.
-      \item[Minimum and maximum range.]
-        These two options define the full value range that the peak meter
-        displays. Recommended values for the \setting{Logarithmic} (dB) setting
-        are {}-40~dB for minimum and 0~dB for maximum. Recommended values
-        for \setting{Linear} display are 0 and 100\%. Note that {}-40~dB is
-        approximately 1\% in linear value, but if you change the minimum
-        setting in linear mode slightly and then change to the dB scale,
-        there will be a large change. You can use these values for `zooming'
-        into the peak meter.
-      \end{description}
+  \item[Peak Meter.]
+    The peak meter can be configured with a number of parameters.
+    \begin{description}
+    \item[Peak Release.]
+      This determines how fast the bar shrinks when the music becomes
+      softer. Lower values make the peak meter look smoother.
+      Expressed in scale units per 10~ms.
+    \item[Peak Hold Time.]
+      Specifies the time after which the peak indicator will reset.
+      For example, if you set this value to 5~s, the peak indicator displays
+      the loudest volume value that occurred within the last 5 seconds.
+      Larger values are useful if you want to find the peak level of a song,
+      which might be of interest when copying music from the \dap\ via the
+      analogue output to some other recording device.
+    \item[Clip Hold Time.]
+      The number of seconds that the clipping indicator will be visible
+      after clipping is detected.
+    \opt{recording}{
+      \item[Clip Counter.]
+        Show the number of times the clip indicator went active during
+        recording in front of the peak meters.
     }
+    \item[\label{ref:Peakmetersetting}Scale.]
+      Select whether the peak meter displays linear or logarithmic values.
+      The human ear perceives loudness on a logarithmic scale. If the Scale
+      setting is set to \setting{Logarithmic} (dB) scale, the volume values
+      are scaled logarithmically. The volume meters of digital audio
+      devices usually are scaled this way. On the other hand, if you
+      are interested in the power level that is applied to your headphones
+      you should choose \setting{Linear} display. This setting cannot be
+      displayed in units like volts or watts because such units depend
+      on your headphones.
+    \item[Minimum and maximum range.]
+      These two options define the full value range that the peak meter
+      displays. Recommended values for the \setting{Logarithmic} (dB) setting
+      are {}-40~dB for minimum and 0~dB for maximum. Recommended values
+      for \setting{Linear} display are 0 and 100\%. Note that {}-40~dB is
+      approximately 1\% in linear value, but if you change the minimum
+      setting in linear mode slightly and then change to the dB scale,
+      there will be a large change. You can use these values for `zooming'
+      into the peak meter.
+    \end{description}
+
     \item[\label{ref:Defaultcodepage}Default Codepage.]
       A codepage describes the way extended characters that are not available
       within the ASCII character set are encoded. ID3v1 tags do not have a
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index 83089b6d4e..b0711e5b71 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -16,9 +16,9 @@
     \input{configure_rockbox/system_options.tex}
     \input{configure_rockbox/startup_shutdown_options.tex}
     \input{configure_rockbox/bookmarking.tex}
-\opt{tagcache}{\opt{swcodec}{
+\opt{tagcache}{
     \input{configure_rockbox/autoresume.tex}
-}}
+}
     \input{configure_rockbox/language.tex}
     \input{configure_rockbox/voice.tex}
     \input{configure_rockbox/wps_context_plugin.tex}
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index 87f974800d..7ddd3c6907 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -68,10 +68,8 @@ you to configure settings related to audio playback.
     This can happen if the \dap{} is knocked, shaken or jogged heavily while
     Rockbox is trying to read the hard drive.
 
-    \opt{swcodec}{
-      The anti-skip buffer can be set to various values between
-      5 seconds and 10 minutes.\\
-    }
+    The anti-skip buffer can be set to various values between
+    5 seconds and 10 minutes.\\
 
     \note{Having a large anti-skip buffer tends to use more power, and may
       reduce your battery life. It is recommended to always use the lowest
@@ -90,110 +88,108 @@ you to configure settings related to audio playback.
   instead of being played immediately. Pausing and stopping playback is
   disabled as well as skipping songs and launching plugins.
 
-\opt{swcodec}{
-  \opt{crossfade}{
-  \section{Crossfade}
-    This section controls the behavior of the crossfader.  The crossfader, when
-    enabled, smoothly fades one track into the next.  This can occur in two
-    situations: an automatic track change or a manual track skip.  An automatic
-    track change occurs at the end of the track, moving to the next track in the
-    playlist without user intervention.  A manual track skip goes to the next
-    track immediately when the appropriate button is pressed.\\
+\opt{crossfade}{
+\section{Crossfade}
+  This section controls the behavior of the crossfader.  The crossfader, when
+  enabled, smoothly fades one track into the next.  This can occur in two
+  situations: an automatic track change or a manual track skip.  An automatic
+  track change occurs at the end of the track, moving to the next track in the
+  playlist without user intervention.  A manual track skip goes to the next
+  track immediately when the appropriate button is pressed.\\
 
-    Options for crossfade settings are:
-    \begin{description}
-      \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled
-        and all track changes are gapless.  If set to
-        \setting{Automatic Track Change Only}, crossfade occurs for automatic
-        track changes, but not for manual track skips.  The next setting,
-        \setting{Manual Track Skip Only}, is the opposite: tracks will only
-        crossfade when manually skipped.  If set to \setting{Shuffle}, crossfade
-        is enabled for all track changes, automatic or manual, when the shuffle
-        feature is set to \setting{Yes}, but disabled otherwise.  If set to
-        \setting{Shuffle or Manual Track Skip} then crossfade will be active
-        either when shuffle is set to \setting{Yes} or the track is manually
-        skipped.  If set to \setting{Always}, tracks will always crossfade into
-        one another.
-        %
-      \item[Fade In Delay.] The ``fade in delay'' is the length of time between
-        when the crossfade process begins and when the new track begins to fade
-        in.
-        %
-      \item[Fade In Duration.] The length of time, in seconds, that it takes
-        your music to fade in once the \setting{Fade In Delay} has ended.
-        %
-      \item[Fade Out Delay.] The ``fade out delay'' is the length of time
-        between when the crossfade process begins and when the old track begins
-        to fade out.
-        %
-      \item[Fade Out Duration.] The length of time, in seconds, that it takes
-        your music to fade out once the \setting{Fade Out Delay} has ended.
-        %
-      \item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade
-        out and the next song will simultaneously fade in. If set to 
-        \setting{Mix}, the ending song will not fade out at all, and will
-        continue to play as normal until its end with the starting song fading
-        in from under it. \setting{Mix} mode is not used for manual track skips,
-        even if it is selected here.
-      \end{description}
+  Options for crossfade settings are:
+  \begin{description}
+    \item[Enable Crossfade.] If set to \setting{Off}, crossfade is disabled
+      and all track changes are gapless.  If set to
+      \setting{Automatic Track Change Only}, crossfade occurs for automatic
+      track changes, but not for manual track skips.  The next setting,
+      \setting{Manual Track Skip Only}, is the opposite: tracks will only
+      crossfade when manually skipped.  If set to \setting{Shuffle}, crossfade
+      is enabled for all track changes, automatic or manual, when the shuffle
+      feature is set to \setting{Yes}, but disabled otherwise.  If set to
+      \setting{Shuffle or Manual Track Skip} then crossfade will be active
+      either when shuffle is set to \setting{Yes} or the track is manually
+      skipped.  If set to \setting{Always}, tracks will always crossfade into
+      one another.
+      %
+    \item[Fade In Delay.] The ``fade in delay'' is the length of time between
+      when the crossfade process begins and when the new track begins to fade
+      in.
+      %
+    \item[Fade In Duration.] The length of time, in seconds, that it takes
+      your music to fade in once the \setting{Fade In Delay} has ended.
+      %
+    \item[Fade Out Delay.] The ``fade out delay'' is the length of time
+      between when the crossfade process begins and when the old track begins
+      to fade out.
+      %
+    \item[Fade Out Duration.] The length of time, in seconds, that it takes
+      your music to fade out once the \setting{Fade Out Delay} has ended.
+      %
+    \item[Fade Out Mode.] If set to \setting{Crossfade}, one song will fade
+      out and the next song will simultaneously fade in. If set to 
+      \setting{Mix}, the ending song will not fade out at all, and will
+      continue to play as normal until its end with the starting song fading
+      in from under it. \setting{Mix} mode is not used for manual track skips,
+      even if it is selected here.
+    \end{description}
       
-      \note{The rules above apply except in the instance where
-          \setting{Fade Out Delay} plus \setting{Fade Out Duration} is less then
-          \setting{Fade In Delay} (which would create a gap in the audio). In this case,
-          the \setting{Fade In Delay} is reduced to eliminate the gap.\\}
+    \note{The rules above apply except in the instance where
+        \setting{Fade Out Delay} plus \setting{Fade Out Duration} is less then
+        \setting{Fade In Delay} (which would create a gap in the audio). In this case,
+        the \setting{Fade In Delay} is reduced to eliminate the gap.\\}
 
-          The graphic below illustrates how the different settings work in practice.
+        The graphic below illustrates how the different settings work in practice.
 
-         \includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png}
-    }%\opt{crossfade}
+       \includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png}
+  }%\opt{crossfade}
     
-  \section{\label{ref:ReplayGain}Replaygain}
-    This allows you to control the replaygain function.
-    The purpose of replaygain is to adjust the volume of the music played
-    so that all songs (or albums, depending on your settings) have the
-    same apparent volume. This prevents sudden changes in volume when
-    changing between songs recorded at different volume levels.
-    For replaygain to work, the songs must have been processed by a program
-    that adds replaygain information to the ID3 tags (or Vorbis tags).\\
+\section{\label{ref:ReplayGain}Replaygain}
+  This allows you to control the replaygain function.
+  The purpose of replaygain is to adjust the volume of the music played
+  so that all songs (or albums, depending on your settings) have the
+  same apparent volume. This prevents sudden changes in volume when
+  changing between songs recorded at different volume levels.
+  For replaygain to work, the songs must have been processed by a program
+  that adds replaygain information to the ID3 tags (or Vorbis tags).\\
       
-    Options for replaygain are:
-    \begin{description}
-      \item[Replaygain Type.] Choose the type of replaygain to apply:
-        \begin{description}
-        \item[Album Gain.] Maintain a constant volume level between
-          albums, but keep any intentional volume variations between 
-          songs in an album. (If album gain value is not available,
-          uses track gain information).
-          %
-        \item[Track Gain.] Maintain a constant volume level between
-          tracks. If track gain value is not available, no replaygain 
-          is applied.
-          %
-        \item[Track Gain If Shuffling.] Maintains a constant volume
-          between tracks if \setting{Shuffle} is set to \setting{Yes}.
-          Reverts to album mode if \setting{Shuffle} is set to \setting{No}.
-          %
-        \item[Off.] Do not process replaygain information, i.e. turn off
-          the replaygain function.
-        \end{description}
+  Options for replaygain are:
+  \begin{description}
+    \item[Replaygain Type.] Choose the type of replaygain to apply:
+      \begin{description}
+      \item[Album Gain.] Maintain a constant volume level between
+        albums, but keep any intentional volume variations between 
+        songs in an album. (If album gain value is not available,
+        uses track gain information).
         %
-      \item[Prevent Clipping.] Avoid clipping of a song's waveform.
-        If a song would clip during playback, the volume is lowered for 
-        that song. Replaygain information is needed for this to work.
+      \item[Track Gain.] Maintain a constant volume level between
+        tracks. If track gain value is not available, no replaygain 
+        is applied.
         %
-      \item[Pre-amp.] This allows you to adjust the volume when replaygain
-        is applied. Replaygain often lowers the volume, sometimes quite
-        much, so here you can compensate for that. Please note that a
-        (large) positive pre-amp setting can cause clipping, unless
-        prevent clipping is enabled.  The pre-amp can be set to any
-        decibel (dB) value between -12~dB and +12~dB, in increments of 0.5~dB.
+      \item[Track Gain If Shuffling.] Maintains a constant volume
+        between tracks if \setting{Shuffle} is set to \setting{Yes}.
+        Reverts to album mode if \setting{Shuffle} is set to \setting{No}.
+        %
+      \item[Off.] Do not process replaygain information, i.e. turn off
+        the replaygain function.
       \end{description}
+      %
+    \item[Prevent Clipping.] Avoid clipping of a song's waveform.
+      If a song would clip during playback, the volume is lowered for 
+      that song. Replaygain information is needed for this to work.
+      %
+    \item[Pre-amp.] This allows you to adjust the volume when replaygain
+      is applied. Replaygain often lowers the volume, sometimes quite
+      much, so here you can compensate for that. Please note that a
+      (large) positive pre-amp setting can cause clipping, unless
+      prevent clipping is enabled.  The pre-amp can be set to any
+      decibel (dB) value between -12~dB and +12~dB, in increments of 0.5~dB.
+    \end{description}
 
-  \section{Track Skip Beep}
-    Controls the volume of the beep that is heard when
-    skipping forward or backward between tracks. The beep is disabled when
-    set to \setting{Off}.
-}%\opt{swcodec}
+\section{Track Skip Beep}
+  Controls the volume of the beep that is heard when
+  skipping forward or backward between tracks. The beep is disabled when
+  set to \setting{Off}.
 
 \opt{spdif_power}{
   \section{\label{ref:SPDIF_OnOff}Optical Output}
@@ -294,32 +290,28 @@ you to configure settings related to audio playback.
   if a track ends, which can be achieved by combining this option with
   \setting{Repeat} set to \setting{One}
 
-\opt{swcodec}{
-  \section{Rewind Before Resume}\index{Rewind Before Resume}
-    When restarting a track or a bookmark, a short rewind can be done before the
-    playback is started. This can be useful when listening to speech material,
-    to help remember what was being said just before playback was stopped.
-    The size of the rewind can be set to various values between 0 (off) and
-    60 seconds.
-    \note{This option does not apply to resuming a paused track.  Use
-      the next option for rewinding on pause.}
-    \note{The actual rewind distance may differ a little from the requested
-      value, depending on the file in question.}
-}%\opt{swcodec}
+\section{Rewind Before Resume}\index{Rewind Before Resume}
+  When restarting a track or a bookmark, a short rewind can be done before the
+  playback is started. This can be useful when listening to speech material,
+  to help remember what was being said just before playback was stopped.
+  The size of the rewind can be set to various values between 0 (off) and
+  60 seconds.
+  \note{This option does not apply to resuming a paused track.  Use
+    the next option for rewinding on pause.}
+  \note{The actual rewind distance may differ a little from the requested
+    value, depending on the file in question.}
 
 \section{Rewind on Pause}\index{Rewind on Pause}
   This option rewinds the current track by a small amount whenever it is
   paused (not stopped).  The amount to rewind can be set between 0 and
   15 seconds.
 
-\opt{swcodec}{
-  \opt{play_frequency}{
-    \section{Frequency}\index{Frequency}
-      This is the sampling frequency used for the rockbox playback engine.  Audio
-      at a different sampling rate will be converted to this sampling rate prior to
-      mixing using a cubic Hermite polynomial resampler.
-      \note{For best quality and battery life, select the sampling rate used by
-      your audio.  This is typically 44.1kHz.}
-      \note{Opus files are always 48kHz.}
-  }
-}%\opt{swcodec}
+\opt{play_frequency}{
+  \section{Frequency}\index{Frequency}
+    This is the sampling frequency used for the rockbox playback engine.  Audio
+    at a different sampling rate will be converted to this sampling rate prior to
+    mixing using a cubic Hermite polynomial resampler.
+    \note{For best quality and battery life, select the sampling rate used by
+    your audio.  This is typically 44.1kHz.}
+    \note{Opus files are always 48kHz.}
+}
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 9a5ddb30a6..1abd38c536 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -6,16 +6,14 @@
       where you want to store them in the \setting{File Browser} and select
       \setting{Set As Recording Directory}.}
 
-\opt{swcodec}{
-  \section{Format}
-    Choose which format to save your recording in. The available choices are
-    the two uncompressed formats \setting{PCM Wave} and \setting{AIFF}, the
-    losslessly compressed \setting{WavPack} and the lossy
-    \setting{MPEG Layer~3}.
+\section{Format}
+  Choose which format to save your recording in. The available choices are
+  the two uncompressed formats \setting{PCM Wave} and \setting{AIFF}, the
+  losslessly compressed \setting{WavPack} and the lossy
+  \setting{MPEG Layer~3}.
 
-  \section{Encoder Settings (MP3 only)}
-    This sets the bitrate when using the \setting{MPEG Layer~3} format. 
-}
+\section{Encoder Settings (MP3 only)}
+  This sets the bitrate when using the \setting{MPEG Layer~3} format. 
 
   \section{Frequency}
    \nopt{ipodnano,ipodcolor,ipod4g}{
@@ -39,9 +37,8 @@
         22.05~kHz, 16~kHz, 12~kHz, 11.025~kHz and 8~kHz}
     are available. Higher sample rates use up more disk space, but give better
     sound quality.
-    \opt{swcodec}{\note{The 11.025~kHz setting is not available when using %
+    \note{The 11.025~kHz setting is not available when using %
       \setting{MPEG Layer~3} format.}
-    }
     \opt{recording_digital}
       {\note{You cannot change the sample rate for digital recordings.}
     }
@@ -80,11 +77,9 @@
   for mono recording, only the left channel is recorded. Mono recordings
   are usually somewhat smaller than stereo.
 
-\opt{swcodec}{
-  \section{Mono Mode}
-    When configured to record to mono and the source is a stereo signal, use this
-    setting to configure how the mono signal is created. Options are L, R and L+R.
-}
+\section{Mono Mode}
+  When configured to record to mono and the source is a stereo signal, use this
+  setting to configure how the mono signal is created. Options are L, R and L+R.
 
 \section{File Split Options}
   This sub menu contains options for file splitting, which can be used to split
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index c4ef325689..63a5770c41 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -197,7 +197,6 @@ change to customise your listening experience.
   }%
 }
 
-\opt{swcodec}{
 \section{Crossfeed}
   Crossfeed attempts to make the experience of listening to music on
   headphones more similar to listening to music with stereo speakers. When you
@@ -250,9 +249,7 @@ change to customise your listening experience.
   % http://www.ohl.to/interests-in-audio/crossfeed-and-eq-for-headphones/ 
   Beware that the crossfeed function is capable of making the audio distort
   if you choose settings which result in a too high output level.
-}
   
-\opt{swcodec}{
 \section{\label{ref:EQ}Equalizer}
   \screenshot{configure_rockbox/images/ss-equalizer}{The graphical equalizer}{}
   Rockbox features a parametric equalizer (EQ). In contrast to non-parametric
@@ -472,9 +469,7 @@ configure the EQ, or use the presets for designing their own custom EQ
 settings.
 
 \end{description}
-}
 
-\opt{swcodec}{
 \section{Dithering}
 This setting controls the dithering and noise shaping functionality of Rockbox.
 
@@ -500,9 +495,7 @@ and not easily noticable.
 
 Rockbox uses highpass triangular distribution noise as the dithering noise
 source, and a third order noise shaper.
-}
 
-\opt{swcodec}{%
 \opt{pitchscreen}{%
 \section{Timestretch}
 Enabling \setting{Timestretch} allows you to change the playback speed without
@@ -512,9 +505,7 @@ intended for speech playback and may significantly dilute your listening
 experience with more complex audio. See \reference{sec:pitchscreen} for more
 details about how to use the feature.
 }
-}
 
-\opt{swcodec}{
 \section{Haas Surround}
 This setting implements the Haas effect with adjustable delay time to enhance 
 the stereo effect of the sound. A full range Haas effect creates the impression
@@ -526,25 +517,19 @@ and \setting{f(x2)} to set frequencies which are not affected. The \setting{SIDE
 setting uses mid-side processing to determine and apply effect to the side channel only. 
 Finally, the \setting{Dry/Wet Mix} setting adjusts the proportion mixed from the 
 original (dry) and 'effected' (wet) signals.
-}
 
-\opt{swcodec}{
 \section{Perceptual Bass Enhancement}
 This setting implements a group delay correction and an additional biophonic EQ to
 emphasize to boost bass perception. The \setting{precut} setting provides
 negative overall gain to prevent possible audio distortion due to the EQ
 gain.  The defult precut value is set to -2.5 dB and can be adjust from 0 dB to -4.5 dB.
 Note that this effect will stack with any other EQ applied.  
-}
 
-\opt{swcodec}{
 \section{Auditory Fatigue Reduction}
 Human hearing is more senstive to some frequency bands. This setting applies additional 
 equalization and bi-shelf filtering to reduce signals in these bands to minimize
 the chance that temporary threshold shift (auditory fatigue) occurs.
-}
 
-\opt{swcodec}{
 \section{Compressor}
 The \setting{Compressor} reduces, or compresses, the dynamic range of the audio
 signal.  This makes the quieter and louder sections closer to the same volume
@@ -592,4 +577,3 @@ the input signal is reduced appropriately, but the gain isn't allowed to
 immediately return to normal levels.  This is necessary to reduce artifacts
 such as ``pumping.''  Instead, the gain is allowed to return to normal at the
 chosen rate.  Release Time is the time for the gain to recover by 10~dB.
-}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index f9e09a91b1..bf82b8c074 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -203,27 +203,25 @@ therefore result in better runtime.
   }
 }
 
-\opt{swcodec}{
-  \subsection{Keyclick}
-    This menu controls key clicks on button presses.
-    \begin{description}
-    \opt{hardware_click}{
-      \item [Headphone Keyclick. ]This setting controls how strong the keyclicks
-        played through the headphones are. If set to \setting{Off}, the keyclicks
-        will be disabled.
-      \item [Speaker Keyclick. ]This setting turns playing of keyclicks through
-        the built in speaker \setting{On} or \setting{Off}.
-    }
-    \nopt{hardware_click}{
-      \item [Keyclick. ]This setting controls how strong the keyclicks are.
-        If set to \setting{Off}, the keyclicks will be disabled.
-    }
-    \item [Keyclick repeats.] This setting turns keyclick repeats \setting{On}
-      and \setting{Off}. If set to \setting{On}, the keyclicks will be
-      repeated when you hold down a button. If set to \setting{Off}, you will
-      hear only one click.
-    \end{description}
-}
+\subsection{Keyclick}
+  This menu controls key clicks on button presses.
+  \begin{description}
+  \opt{hardware_click}{
+    \item [Headphone Keyclick. ]This setting controls how strong the keyclicks
+      played through the headphones are. If set to \setting{Off}, the keyclicks
+      will be disabled.
+    \item [Speaker Keyclick. ]This setting turns playing of keyclicks through
+      the built in speaker \setting{On} or \setting{Off}.
+  }
+  \nopt{hardware_click}{
+    \item [Keyclick. ]This setting controls how strong the keyclicks are.
+      If set to \setting{Off}, the keyclicks will be disabled.
+  }
+  \item [Keyclick repeats.] This setting turns keyclick repeats \setting{On}
+    and \setting{Off}. If set to \setting{On}, the keyclicks will be
+    repeated when you hold down a button. If set to \setting{Off}, you will
+    hear only one click.
+  \end{description}
 
 \opt{touchpad}{
   \subsection{Touchpad}
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index 2cbe57b014..a04646f479 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -47,11 +47,9 @@ customize the visual appearance of Rockbox.
     headphones and when connected to an external amplifier. See
     \reference{ref:CreateYourOwnWPS} for more details.}
 
-\opt{lcd_bitmap}{
   \item[Font.]
     Browse the installed fonts on your \dap{}. Selecting one will activate it.
     See \reference{ref:Loadingfonts} for further details about fonts.
-}
 
 \item[While Playing Screen.]
   Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and
@@ -75,10 +73,8 @@ customize the visual appearance of Rockbox.
   Rockbox has the ability to display an icon to the left of the file
   in the \setting{File Browser}. For details of these icons, see
   \reference{ref:Supportedfileformats}.
-  \opt{lcd_bitmap}{
-    These icons can also be customised. See the \wikilink{IconSets}
-    and \wikilink{CustomIcons} Wiki pages for details.
-  }
+  These icons can also be customised. See the \wikilink{IconSets}
+  and \wikilink{CustomIcons} Wiki pages for details.
 
 \opt{lcd_non-mono}{%
   \item[Clear Backdrop.]
@@ -87,30 +83,27 @@ customize the visual appearance of Rockbox.
     This option allows you to clear the backdrops that you set.
 }
 %
-  \opt{lcd_bitmap}{
-    \item[Status/Scrollbar.]
-      Settings related to on screen status display and the scrollbar.
-      \begin{description}
-      \item[Scroll Bar.] Allows you to choose where the vertical scroll bar
-        should appear.
-      \item[Scroll Bar Width.] Allows you to choose the width of the
-        scroll bar (in pixels).  Default value is 6.
-      \item[Status Bar.] Allows you to choose where to display the 
-        statusbar\opt{remote}{ on the main display}. 
-      \opt{remote}{
-        \item[Remote Status Bar.] Allows you to choose where to display the 
-        statusbar on the remote display.
-      }
-      \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}
-        for more on the volume setting.
-      \item[Battery Display.] Controls whether the battery charge status is
-        displayed as a graphic or numerical percentage value on the Status Bar.
-      \end{description}
-    }
+\item[Status/Scrollbar.]
+  Settings related to on screen status display and the scrollbar.
+  \begin{description}
+  \item[Scroll Bar.] Allows you to choose where the vertical scroll bar
+    should appear.
+  \item[Scroll Bar Width.] Allows you to choose the width of the
+    scroll bar (in pixels).  Default value is 6.
+  \item[Status Bar.] Allows you to choose where to display the 
+    statusbar\opt{remote}{ on the main display}. 
+  \opt{remote}{
+    \item[Remote Status Bar.] Allows you to choose where to display the 
+    statusbar on the remote display.
+  }
+  \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}
+    for more on the volume setting.
+  \item[Battery Display.] Controls whether the battery charge status is
+    displayed as a graphic or numerical percentage value on the Status Bar.
+  \end{description}
 %
-\opt{lcd_bitmap}{
 \item[Line Selector Type.]
   This option allows you to select which type of line selector to use.
   \begin{description}
@@ -127,7 +120,6 @@ customize the visual appearance of Rockbox.
       submenu.
 }
   \end{description}
-}
 
 \opt{lcd_color}{
   \item[Colours.]