diff --git a/docs/config.rst b/docs/config.rst
index ad1d8ba7..07ebffc2 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -38,6 +38,13 @@ below, together with their default values. In addition, all :ref:`extensions
 defaults are documented on the :ref:`extension pages <ext>`.
 
 
+Default core configuration
+==========================
+
+.. literalinclude:: ../mopidy/default.conf
+    :language: ini
+
+
 Core configuration values
 =========================
 
@@ -113,13 +120,6 @@ Core configuration values
     Password for the proxy server, if required.
 
 
-Default core configuration
-==========================
-
-.. literalinclude:: ../mopidy/default.conf
-    :language: ini
-
-
 Advanced configurations
 =======================
 
diff --git a/docs/ext/http.rst b/docs/ext/http.rst
index 5c7ba79b..0ca1046c 100644
--- a/docs/ext/http.rst
+++ b/docs/ext/http.rst
@@ -21,6 +21,13 @@ Dependencies
 .. literalinclude:: ../../requirements/http.txt
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/frontends/http/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -53,14 +60,7 @@ Configuration values
     "/mopidy" will continue to work as usual even if you change this setting.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/frontends/http/ext.conf
-    :language: ini
-
-
-Setup
+Usage
 =====
 
 The extension is enabled by default if all dependencies are available.
@@ -81,7 +81,7 @@ When it is enabled it starts a web server at the port specified by the
 
 
 Using a web based Mopidy client
-===============================
+-------------------------------
 
 The web server can also host any static files, for example the HTML, CSS,
 JavaScript, and images needed for a web based Mopidy client. To host static
diff --git a/docs/ext/local.rst b/docs/ext/local.rst
index a446ffc7..fc89e69a 100644
--- a/docs/ext/local.rst
+++ b/docs/ext/local.rst
@@ -21,6 +21,13 @@ Dependencies
 None. The extension just needs Mopidy.
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/backends/local/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -41,13 +48,6 @@ Configuration values
     Path to tag cache for local media.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/backends/local/ext.conf
-    :language: ini
-
-
 Usage
 =====
 
diff --git a/docs/ext/mpd.rst b/docs/ext/mpd.rst
index 0d669d79..b4d0e1c8 100644
--- a/docs/ext/mpd.rst
+++ b/docs/ext/mpd.rst
@@ -53,6 +53,13 @@ Dependencies
 None. The extension just needs Mopidy.
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/frontends/mpd/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -92,13 +99,6 @@ Configuration values
     closed by the server.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/frontends/mpd/ext.conf
-    :language: ini
-
-
 Usage
 =====
 
diff --git a/docs/ext/mpris.rst b/docs/ext/mpris.rst
index eb55ef54..125f8fec 100644
--- a/docs/ext/mpris.rst
+++ b/docs/ext/mpris.rst
@@ -25,6 +25,13 @@ Dependencies
   details.
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/frontends/mpris/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -37,13 +44,6 @@ Configuration values
     Location of the Mopidy ``.desktop`` file.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/frontends/mpris/ext.conf
-    :language: ini
-
-
 Usage
 =====
 
diff --git a/docs/ext/scrobbler.rst b/docs/ext/scrobbler.rst
index af9f9e5b..a0496b37 100644
--- a/docs/ext/scrobbler.rst
+++ b/docs/ext/scrobbler.rst
@@ -16,6 +16,13 @@ Dependencies
 .. literalinclude:: ../../requirements/scrobbler.txt
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/frontends/scrobbler/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -32,13 +39,6 @@ Configuration values
     Your Last.fm password.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/frontends/scrobbler/ext.conf
-    :language: ini
-
-
 Usage
 =====
 
diff --git a/docs/ext/spotify.rst b/docs/ext/spotify.rst
index 63ccefec..4bb5b7a3 100644
--- a/docs/ext/spotify.rst
+++ b/docs/ext/spotify.rst
@@ -31,6 +31,13 @@ Dependencies
 .. literalinclude:: ../../requirements/spotify.txt
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/backends/spotify/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -59,13 +66,6 @@ Configuration values
     Path to the Spotify data cache. Cannot be shared with other Spotify apps.
 
 
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/backends/spotify/ext.conf
-    :language: ini
-
-
 Usage
 =====
 
diff --git a/docs/ext/stream.rst b/docs/ext/stream.rst
index 3d7ea7d3..5669640c 100644
--- a/docs/ext/stream.rst
+++ b/docs/ext/stream.rst
@@ -23,6 +23,13 @@ Dependencies
 None. The extension just needs Mopidy.
 
 
+Default configuration
+=====================
+
+.. literalinclude:: ../../mopidy/backends/stream/ext.conf
+    :language: ini
+
+
 Configuration values
 ====================
 
@@ -33,10 +40,3 @@ Configuration values
 .. confval:: stream/protocols
 
     Whitelist of URI schemas to allow streaming from.
-
-
-Default configuration
-=====================
-
-.. literalinclude:: ../../mopidy/backends/stream/ext.conf
-    :language: ini