diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 003914f..c7c232c 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -67,55 +67,18 @@ plugins:
 nav:
 
   - What is RetroDECK? ❔: wiki_about/what-is-retrodeck.md
-
-  - What is included in RetroDECK? 📦: wiki_about/what-is-included.md
-
+  - What is the story & goals behind RetroDECK?: wiki_about/story-goals.md
+  - Systems included in RetroDECK 📦: wiki_about/what-is-included.md
   - Start using RetroDECK 🏎️: wiki_general/retrodeck-start.md
-
-  - Supported Devices 📺: wiki_general/supported-devices.md
-
-  - Supported Controllers 🕹️: wiki_general/supported-controllers.md
-
   - Add RetroDECK to Steam: wiki_general/add-to-steam.md
-
-  - Change Controller Order in Steam: wiki_rd_controls/change-controller-order-steam.md
-
-  - What is the story and goals? 📖: wiki_about/story-goals.md
-
+  - Supported Devices 📺: wiki_general/supported-devices.md
+  - Supported Controllers 🕹️: wiki_general/supported-controllers.md
+  - Change Controller Order: wiki_rd_controls/change-controller-order-steam.md
+  - Different Button Prompts in Games ❓: wiki_rd_controls/diffrent-game-inputs.md
   - Version History 📁: wiki_rd_versions/version-history.md
-
   - How to Contribute? ❤️: wiki_community/contibute-rd.md
-
   - Bugs & Known Issues 🐜: wiki_bugs/known-issues.md
 
-  - Configurator & Tools 🧰:
-    - Configurator Features: wiki_configurator/configurator.md
-    - Ponzu: wiki_configurator/ponzu.md
-
-  - Controls & Hotkeys for RetroDECK 🎮:
-
-    - About ℹ️:
-        - Different Button Prompts in Games: wiki_controllers/about/diffrent-game-inputs.md
-        - RetroDECK and Udev Rules: wiki_controllers/about/about-udev.md
-
-    - Hotkeys & Layouts 🔥:
-        - Generic Standard - Hotkeys & Layout: wiki_rd_controls/hotkeys-generic-standard.md
-        - Nintendo - Hotkeys & Layout: wiki_rd_controls/hotkeys-nintendo.md
-        - Playstation - Hotkeys & Layout: wiki_rd_controls/hotkeys-playstation.md
-        - Xbox - Hotkeys & Layout: wiki_rd_controls/hotkeys-xbox.md
-
-    - Radial Menus ⭕:
-        - RetroDECK - Simple Radial Menu: wiki_rd_controls/radial-simple.md
-        - Steam Deck - Full Radial Menu: wiki_rd_controls/radial-steamdeck-full.md
-
-
-  - Files & Game Management 📂:
-    - Game Compability Lists: wiki_management/compatibility-lists.md
-    - Manage your BIOS/Firmware: wiki_management/bios-firmware.md
-    - Manage your Multidisk/file games: wiki_management/multi-disk.md
-    - Move RetroDECK to a new device: wiki_management/retrodeck-move.md
-    - Scraping Game Media: wiki_management/about-scraping.md
-    - Spreading Files over Multiple Drives: wiki_management/spread-files.md
 
   - FAQ ❔:
     - Documentation & Wiki: wiki_faq/faq-documentation.md
@@ -126,22 +89,46 @@ nav:
     - RetroDECK Usage: wiki_faq/faq-rd-usage.md
     - Steam Deck: wiki_faq/faq-rd-steamdeck.md
 
+  - Guides - RetroDECK Controls & Hotkeys 🎮:
+    - RetroDECK & Udev Rules: wiki_rd_controls/about-udev.md
+    - Generic Standard - Hotkeys & Layout: wiki_rd_controls/hotkeys-generic-standard.md
+    - Nintendo - Hotkeys & Layout: wiki_rd_controls/hotkeys-nintendo.md
+    - Playstation - Hotkeys & Layout: wiki_rd_controls/hotkeys-playstation.md
+    - Xbox - Hotkeys & Layout: wiki_rd_controls/hotkeys-xbox.md
+    - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
+    - Steam Controller - Hotkeys & Layout: wiki_rd_controls/hotkeys-steam-controller-gordon.md
+    - RetroDECK - Simple Radial Menu: wiki_rd_controls/radial-simple.md
+    - RetroDECK - Full Radial Menu: wiki_rd_controls/radial-steamdeck-full.md
+
+  - Guides - RetroDECK Configurator 🧰:
+    - Configurator Features: wiki_configurator/configurator.md
+    - Ponzu: wiki_configurator/ponzu.md
+
+  - Guides - Files & Game Management 📂:
+    - Game Compability Lists: wiki_management/compatibility-lists.md
+    - Manage your BIOS/Firmware: wiki_management/bios-firmware.md
+    - Manage your Multidisk/file games: wiki_management/multi-disk.md
+    - Move RetroDECK to a new device: wiki_management/retrodeck-move.md
+    - Scraping Game Media: wiki_management/about-scraping.md
+    - Spreading Files over Multiple Drives: wiki_management/spread-files.md
+
   - Guides - Steam Deck 🕹️:
     - RetroDECK Installation and Updates: wiki_devices/steamdeck/steamdeck-start.md
     - Optimizations: wiki_devices/steamdeck/steamdeck-optimize.md
     - Recommended Software: wiki_devices/steamdeck/steamdeck-software.md
-    - RetroDECK Controls: wiki_controllers/steam/steamdeck-neptune-controller.md
-    - Built-in Controls: wiki_controllers/steam/steamdeck-neptune-builtin.md
+    - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
 
   - Guides - Linux Desktop 🐧:
     - Installation and Updates: wiki_devices/linux_desktop/linux-install.md
     - Recommended Software: wiki_devices/linux_desktop/linux-software.md
 
   - Guides - ES-DE Frontend 🤖:
+
     - ES-DE - User Guide: wiki_es_de/esde-guide.md
     - Themes: wiki_es_de/esde-themes.md
 
   - Guides - Engines  🛠️:
+
     - GZDoom 👹:
       - GZDoom - General Guide: wiki_engine_guides/gzdoom/gzdoom-guide.md
       - GZDoom - Controls Guide: wiki_engine_guides/gzdoom/gzdoom-controls.md
@@ -281,7 +268,7 @@ nav:
       - About Racing Controllers: wiki_controllers/racing/about-racing.md
 
     - Steam/Valve 🎮:
-      - Steam Deck - Controller: wiki_controllers/steam/steamdeck-neptune-controller.md
+      - Steam Deck - Controller: wiki_controllers/steam/steamdeck-neptune.md
       - Steam - Steam Controller - Gordon: wiki_controllers/steam/steam-controller-gordon.md
 
     - Toys-to-life 🧸: