diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 6e6b537f3d..1eef69de2c 100755
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -741,7 +741,7 @@ current version.
   disables the backlight after timeout (for setting \setting{Backlight} see
   \reference{ref:Displayoptions}). Avoid having the backlight enabled all the
   time (Activating \setting{selectivebacklight}
-  \reference{ref:selectivebacklight} can further reduce power consumption).
+  \reference{ref:Displayoptions} can further reduce power consumption).
 
 \opt{lcd_sleep}{
 \subsection{Display power-off}
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 0d42115efe..10789ebc63 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -57,7 +57,7 @@
       off will only turn the backlight on without having any other effect. When
       disabled the first keypress will \emph{also} perform its appropriate action.
 
-      \item[\label{ref:selectivebacklight}Backlight Exemptions]
+      \item[Backlight Exemptions]
        This option allows some selected actions in While Playing Screen and
        FM screen to \emph{not} turn on the backlight in order to save power.
       \begin{description}
@@ -257,7 +257,7 @@
         Show the number of times the clip indicator went active during
         recording in front of the peak meters.
     }
-    \item[\label{ref:Peakmetersetting}Scale.]
+    \item[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
@@ -278,7 +278,7 @@
       into the peak meter.
     \end{description}
 
-    \item[\label{ref:Defaultcodepage}Default Codepage.]
+    \item[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
       codepage encoding contained so Rockbox needs to know what encoding has
diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index 112aa4c06f..6dcabc9153 100644
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -42,7 +42,7 @@ displays files.
   \end{table}
 
   
-\item[\label{ref:ShowFiles}Show Files.]
+\item[Show Files.]
   This option controls which files are displayed in the File Browser.
   %
   \begin{description}
@@ -60,7 +60,7 @@ displays files.
     for simplified navigation.
   \end{description}
 
-\item[\label{ref:ShowExtensions}Show Filename Extensions.]
+\item[Show Filename Extensions.]
   This option controls how file extensions are shown in the File Browser.
   %
   \begin{description}
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index b606e3f950..ebe64dde68 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -227,7 +227,7 @@ you to configure settings related to audio playback.
   If enabled and you have set \setting{Start Directory} to a directory
   other than root, \setting{Auto-Change Directory} will be constrained to the
   directory you have chosen and those below it.
-  See \reference{ref:StartDirectory}.
+  See \reference{ref:SetAs}.
   %
 
 \opt{headphone_detection}{
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index a832640772..f9675c47e2 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -319,12 +319,12 @@ therefore result in better runtime.
                 Suppresses the notification 'Buttons Locked'
                     (still will if power button is pressed).
                 \note{This is a pre-requisite for \setting{selectivebacklight}
-                \reference{ref:selectivebacklight} to work also during key lock.}
+                \reference{ref:Displayoptions} to work also during key lock.}
                 \item[Disable All Lock Notifications]
                 Disable all softlock notifications, including when power button
                 is pressed.
                 \note{When this is enabled, Disable Locked Reminders is still required to
-                be enabled for \setting{selectivebacklight} \reference{ref:selectivebacklight}
+                be enabled for \setting{selectivebacklight} \reference{ref:Displayoptions}
                 to work during key lock.}
 
                 \end{itemize}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index a0485e9ce4..103359350f 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -1,4 +1,5 @@
-\subsection{\label{ref:Rockboy}Rockboy}
+\subsection{Rockboy}
+\label{ref:Rockboy}
 \screenshot{plugins/images/ss-rockboy}{Rockboy}{img:rockboy}
 Rockboy is a Nintendo Game Boy and Game Boy Color emulator for Rockbox based on
 the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index b32c99c338..bd24450d0c 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -1,4 +1,5 @@
-\subsection{\label{ref:Sudoku}Sudoku}
+\subsection{Sudoku}
+\label{ref:Sudoku}
 \screenshot{plugins/images/ss-sudoku}{Sudoku}{fig:sudoku}
 Sudoku in Rockbox can act as both a plugin and a viewer.
 When starting Sudoku from the \setting{Browse Plugins} menu, a 
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 307ee3edc5..f5d9478c2a 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -212,7 +212,7 @@ by using \emph{Open with} from the \emph{Context Menu}
     \setting{BIG5} (Traditional Chinese),
     \setting{UTF-8} (Unicode),
     This setting only applies to the plugin and is independent from the
-    \setting{Default Codepage} setting (see \reference{ref:Defaultcodepage}).
+    \setting{Default Codepage} setting (see \reference{ref:Displayoptions}).
     \item[Word Wrap] Toggle word wrap mode.
         \begin{description}
             \item[On] Break lines at the maximum column limit.
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index 8044b0d77e..91fb498376 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -1,4 +1,5 @@
-\subsection{\label{ref:ZXBox}ZXBox}
+\subsection{ZXBox}
+\label{ref:ZXBox}
 \screenshot{plugins/images/ss-zxbox}{ZXBox}{img:zxbox}
 ZXBox is a port of the ``Spectemu'' ZX Spectrum 48k emulator for Rockbox
 (\url{https://sourceforge.net/projects/spectemu/}).
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index b16f03002e..45a145ad3a 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -16,7 +16,7 @@ You can select whether to browse using the \setting{File Browser} or the
 \setting{Database} in the \setting{Main Menu}.
 If you choose the \setting{File Browser}, the \setting{Show Files} setting
 lets you select what types of files you wish to view. See
-\reference{ref:ShowFiles} for more information on the \setting{Show Files}
+\reference{ref:FileView} for more information on the \setting{Show Files}
 setting.
 
 \note{The \setting{File Browser} allows you to manipulate your files in ways
@@ -177,7 +177,7 @@ each option pertains both to files and directories):
   selecting, but simply bring you to its location in the \setting{File Browser}.
 \end{description}
 
-\subsubsection{Set As...}
+\subsubsection{\label{ref:SetAs}Set As...}
 \begin{description}
   \item [Playlist Directory.]
      Set as default playlist directory. Playlists from this directory will appear
@@ -194,7 +194,7 @@ each option pertains both to files and directories):
     \item [Recording Directory.]
      Save recordings in the selected directory.
   }
-  \item [\label{ref:StartDirectory}Start Directory.]
+  \item [Start Directory.]
    Set as default start directory for the File Browser.
    \note{If you have \setting{Auto-Change Directory} and
    \setting{Constrain Auto-Change} enabled, the directories returned will