1 files changed, 46 insertions, 43 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index a567e82926..4cea04eb46 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -15,9 +15,9 @@ in the font package at \url{http://www.rockbox.org/daily.shtml}.}
   be loaded automatically every time you start up, it must be located in the
   \fname{/.rockbox/fonts} directory and the filename must be at most 24 characters
   long. You can browse the fonts in \fname{/.rockbox/fonts} under
-  \setting{Settings $\rightarrow$ General Settings $\rightarrow$ Display
-  $\rightarrow$ Browse Fonts} in the \setting{Main Menu}.
-  \warn{Advanced Users Only: Any BDF font file up to 16 pixels high should
+  \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Browse Fonts}
+  in the \setting{Main Menu}.
+  \note{Advanced Users Only: Any BDF font file up to 16 pixels high should
     be usable with Rockbox. To convert from \fname{.bdf} to \fname{.fnt}, use
     the \fname{convbdf} tool. This tool can be found in the \fname{tools}
     directory of the Rockbox source code.}
@@ -28,7 +28,7 @@ in the font package at \url{http://www.rockbox.org/daily.shtml}.}
 Rockbox can load language files at runtime. Simply copy the \fname{.lng} file 
 \emph{(do not use the .lang file)} to the \dap\ and ``play'' it in the 
 Rockbox directory browser or select \setting{Settings $\rightarrow$
-General Settings $\rightarrow$ Languages }from the \setting{Main Menu}.
+General Settings $\rightarrow$ Language }from the \setting{Main Menu}.
 
 \note{If you want a language to be loaded automatically every time you start 
 up, it must be located in the \fname{/.rockbox/langs} directory and the filename
@@ -41,15 +41,15 @@ file find the instructions on the Rockbox website:
 \opt{lcd_color}{
   \subsection{Changing Colours}
   The colours used in the Rockbox interface can be changed to any combination
-  of background and foreground colour you like. To do this go to the
-  \setting{Settings $\rightarrow$ General Settings $\rightarrow$ Display}
-  and select \setting{Background Colour} or \setting{Foreground Colour}.
+  you like. To do this, go to
+  \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Colours}.
   The colours set here are used in all menus, browsers and in the
   \setting{While Playing Screen}.
       \subsection{Changing Filetype Colours}
-        Rockbox has the capability to modify the File Browser to show different
-        filetypes in different colours depending upon the file extension.
-        See the \wikilink{CustomFiletypeColours} Wiki page for details.
+        Rockbox has the capability to modify the \setting{File Browser}
+        to show different filetypes in different colours depending upon
+        the file extension. See the \wikilink{CustomFiletypeColours} Wiki
+        page for details.
 }
 
 \opt{lcd_non-mono}{%
@@ -70,19 +70,18 @@ file find the instructions on the Rockbox website:
 \subsection{WPS -- General Info}
 
 \begin{description}
-\item[Description: ] The WPS or While Playing Screen is the name used to 
-  describe the information displayed on the \daps\ screen whilst an audio track
-  is being played. The default WPS is a relatively simple screen displaying
-  Track name, Artist, Album etc. in the default font as a purely text based
-  layout. There are a number of WPS files included in Rockbox, and you can 
-  load one of these at anytime by selecting it in
-  \setting{General Settings $\rightarrow$ Display $\rightarrow$ Browse .wps files}.
+\item[Description: ] The WPS or \setting{While Playing Screen} is the name used
+  to describe the information displayed on the \daps{} screen whilst an audio
+  track is being played. The default WPS is a relatively simple screen
+  displaying Track name, Artist, Album etc. in the default font as a purely
+  text based layout. There are a number of WPS files included in Rockbox, and
+  you can load one of these at any time by selecting it in
+  \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Browse .wps files}.
   \opt{HAVE_REMOTE_LCD}{There is a related option to browse \fname{.rwps} 
     files for \daps{} with LCD remote controls installed. This will load a 
-    similar WPS screen for the remote but with usually a simpler and more 
-    concise layout.}
+    similar WPS screen for the remote.}
 
-\note{``Playing'' a \fname{.wps} from the file browser has the same effect.}
+\note{``Playing'' a \fname{.wps} from the \setting{File Browser} has the same effect.}
 
 \item [File Location: ]Custom WPS files may be located anywhere on the drive. 
   The only restriction is that they must end in \fname{.wps}. When you ``play''
@@ -116,7 +115,7 @@ all the tags that are available.
   the last number giving the colour depth in bits) when
   designing your own WPS, or if you use a WPS designed for another target.
   \opt{HAVE_REMOTE_LCD}{The resolution of the remote is
-  \opt{h100,h300}{128x64x1}\opt{x5}{128x96x2} pixels.}}
+  \opt{h100,h300}{128x64x1}\opt{x5,m5}{128x96x2} pixels.}}
 
 \subsubsection{Conditional Tags}
 
@@ -284,7 +283,7 @@ A configuration file may reside anywhere on the disk. Multiple
 configuration files are permitted. So, for example, you could have
 a \fname{car.cfg} file for the settings that you use while playing your
 jukebox in your car, and a \fname{headphones.cfg} file to store the
-settings that you use while listening to your \dap\ through headphones.
+settings that you use while listening to your \dap{} through headphones.
 
 See \reference{ref:cfg_specs} below for an explanation of the format 
 for configuration files. See \reference{ref:manage_settings_menu} for an
@@ -333,64 +332,68 @@ Example of a configuration file:
   each file a different name (such as \fname{car.cfg}, 
   \fname{headphones.cfg}, etc.), and you can then use the \setting{Browse .cfg 
     files} option to quickly change settings.} 
-        
-        A special case configuration file can be used to force a particular setting or settings every time Rockbox starts up (e.g. to set the volume to a safe level).
-Format a new configuration file as above with the required setting(s) and save it into the \fname{/.rockbox} directory with the filename \fname{fixed.cfg}.
+
+  A special case configuration file can be used to force a particular setting
+  or settings every time Rockbox starts up (e.g. to set the volume to a safe
+  level). Format a new configuration file as above with the required setting(s)
+  and save it into the \fname{/.rockbox} directory with the filename
+  \fname{fixed.cfg}.
 
 \subsection{\label{ref:manage_settings_menu}The \setting{Manage Settings} 
   menu} The \setting{Manage Settings} menu can be found in the \setting{Main 
   Menu}. The \setting{Manage Settings} menu allows you to save and load 
-\fname{.cfg} files. \opt{MASCODEC}{The \setting{Manage Settings} menu also 
-  allows you to load or save different firmware versions.} 
+  \fname{.cfg} files.
+  \opt{MASCODEC}{The \setting{Manage Settings} menu also 
+    allows you to load or save different firmware versions.} 
 
 \begin{description}
   
-\item [Browse .cfg Files]Opens the file browser in the \fname{/.rockbox} 
-  directory and displays all \fname{.cfg} (configuration) files. Selecting a 
-  \fname{.cfg} file will cause Rockbox to load the settings contained in that 
-  file. Pressing \ButtonLeft\ will exit back to the \setting{Manage Settings}
-  menu. See the \setting{Write .cfg files} option on the 
-  \setting{Manage Settings} menu for details of how to save and edit a 
+\item [Browse .cfg Files]Opens the \setting{File Browser} in the
+  \fname{/.rockbox} directory and displays all \fname{.cfg} (configuration)
+  files. Selecting a \fname{.cfg} file will cause Rockbox to load the settings
+  contained in that file. Pressing \ButtonLeft{} will exit back to the
+  \setting{Manage Settings} menu. See the \setting{Write .cfg files} option on
+  the \setting{Manage Settings} menu for details of how to save and edit a 
   configuration file.
   
 \item [Reset Settings]This wipes the saved settings
-  in the \dap\ and resets all settings to their default values. 
+  in the \dap{} and resets all settings to their default values. 
   
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{
       \note{You can also reset all settings to their default 
       values by turning off the \dap, turning it back on, and holding the
-      \ButtonRec\ button immediately after the \dap\ turns on.}
+      \ButtonRec{} button immediately after the \dap{} turns on.}
   } 
   \opt{IRIVER_H10_PAD}{\note{You can also reset all settings to
       their default values by turning off the \dap, and turning it back on
-      with the \ButtonHold\ button on.}
+      with the \ButtonHold{} button on.}
   }
   \opt{IPOD_4G_PAD}{\note{You can also reset all settings to their default 
       values by turning off the \dap, turning it back on, and activating the
-      \ButtonHold\ button immediately after the backlight comes on.}
+      \ButtonHold{} button immediately after the backlight comes on.}
   }
   \opt{GIGABEAT_PAD}{\note{You can also reset all settings to their default
       values by turning off the \dap, turning it back on and pressing the
-      \ButtonA\ button immediately after the \dap\ turns on.}
+      \ButtonA{} button immediately after the \dap{} turns on.}
   }
 
 \item [Save .cfg File]This option writes a \fname{.cfg} file to 
-  your \daps{} disk.  The configuration file has the \fname{.cfg} 
+  your \daps{} disk. The configuration file has the \fname{.cfg} 
   extension and is used to store all of the user settings that are described 
   throughout this manual.
-    
+
   Hint: Use the \setting{Save .cfg File} feature (\setting{Main Menu 
-    $\rightarrow$ General Settings}) to save the current settings, then 
+    $\rightarrow$ Manage Settings}) to save the current settings, then 
   use a text editor to customize the settings file. See Appendix 
   \reference{ref:config_file_options} for the full reference of available 
   options.
   
 \item [Save Sound Settings]This option writes a \fname{.cfg} file to 
-  your \daps\ disk.  The configuration file has the \fname{.cfg} 
+  your \daps{} disk. The configuration file has the \fname{.cfg} 
   extension and is used to store all of the sound related settings.
     
 \item [Save Theme Settings]This option writes a \fname{.cfg} file to 
-  your \daps\ disk.  The configuration file has the \fname{.cfg} 
+  your \daps{} disk. The configuration file has the \fname{.cfg} 
   extension and is used to store all of the theme related settings.
 
 \end{description}