diff --git a/docs/docs/configuration.mdx b/docs/docs/configuration.mdx
index 55f555a..655d0c4 100644
--- a/docs/docs/configuration.mdx
+++ b/docs/docs/configuration.mdx
@@ -79,15 +79,15 @@ cors_origins: [localhost:3000, 192.0.2.1]
 
 From the top level, the following subsections may be defined and configured:
 
-| Section      | Description                                         |                    All Options                     |
-| :----------- | :-------------------------------------------------- | :------------------------------------------------: |
-| `cache`      | Redis server & cache timeout settings.              |      <PageLink to="/docs/cache">➡️</PageLink>      |
-| `docs`       | API documentation settings.                         |       <PageLink to="/docs/api">➡️</PageLink>       |
-| `logging`    | File, syslog, and webhook settings.                 |     <PageLink to="/docs/logging">➡️</PageLink>     |
-| `messages`   | Customize almost all user-facing UI & API messages. |    <PageLink to="/docs/messages">➡️</PageLink>     |
-| `queries`    | Enable, disable, or configure query types.          |     <PageLink to="/docs/queries">➡️</PageLink>     |
-| `structured` | Configure structured data features.                 | <PageLink to="/docs/structured-data">➡️</PageLink> |
-| `web`        | Web UI & branding settings.                         |       <PageLink to="/docs/ui">➡️</PageLink>        |
+| Section      | Description                                         |                  All Options                  |
+| :----------- | :-------------------------------------------------- | :-------------------------------------------: |
+| `cache`      | Redis server & cache timeout settings.              | <PageLink to="response-caching">➡️</PageLink> |
+| `docs`       | API documentation settings.                         |     <PageLink to="rest-api">➡️</PageLink>     |
+| `logging`    | File, syslog, and webhook settings.                 |     <PageLink to="logging">➡️</PageLink>      |
+| `messages`   | Customize almost all user-facing UI & API messages. |     <PageLink to="messages">➡️</PageLink>     |
+| `queries`    | Enable, disable, or configure query types.          |  <PageLink to="query-settings">➡️</PageLink>  |
+| `structured` | Configure structured data features.                 |   <PageLink to="table-output">➡️</PageLink>   |
+| `web`        | Web UI & branding settings.                         | <PageLink to="ui/configuration">➡️</PageLink> |
 
 ## Adding Devices
 
diff --git a/docs/docs/queries.mdx b/docs/docs/query-settings.mdx
similarity index 100%
rename from docs/docs/queries.mdx
rename to docs/docs/query-settings.mdx
diff --git a/docs/docs/cache.mdx b/docs/docs/response-caching.mdx
similarity index 100%
rename from docs/docs/cache.mdx
rename to docs/docs/response-caching.mdx
diff --git a/docs/docs/structured-data.mdx b/docs/docs/table-output.mdx
similarity index 100%
rename from docs/docs/structured-data.mdx
rename to docs/docs/table-output.mdx