diff --git a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
index 6abd32d..b588889 100644
--- a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
+++ b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
@@ -20,7 +20,7 @@
 ## Other quick tips
 
 - Read up on the [Steam Deck - Controller](../../wiki_rd_controls/hotkeys-steamdeck-neptune.md) to ease your navigation (controller layout required).
-- Read up on the [EmulationStation DE: User Guide](../../wiki_es_de/esde-guide.md).
+- Read up on the [EmulationStation DE: User Guide](../../wiki_system_guides/es-de/esde-guide.md).
 - Check out our other software recommendations for the Steam Deck [Steam Deck - Software Recommendations](../../wiki_devices/steamdeck/steamdeck-software.md).
 - Check various optional optimizations that can make some emulators run even better [Steam Deck - Optimizations](../../wiki_devices/steamdeck/steamdeck-optimize.md).
 
@@ -60,7 +60,7 @@ Then `Tools` - `Install: RetroDECK Controller Layouts`.
 
 - Get RetroDECK Steam Grid art with BoilR or add it manually from [SteamgridDB](https://www.steamgriddb.com/search/grids?term=RetroDeck) for the Steam Grid.
 - Read up on the [Steam Deck - Controller](../../wiki_rd_controls/hotkeys-steamdeck-neptune.md) to ease your navigation.
-- Read up on the [ES DE: User Guide](../../wiki_es_de/esde-guide.md)
+- Read up on the [ES DE: User Guide](../../wiki_system_guides/es-de/esde-guide.md)
 - Check out our other software recommendations for the Steam Deck [Steam Deck - Software Recommendations](../../wiki_devices/steamdeck/steamdeck-software.md).
 - Check various optional optimizations that can make some emulators run even better [Steam Deck - Optimizations](../../wiki_devices/steamdeck/steamdeck-optimize.md).
 
diff --git a/wiki-rtd/docs/wiki_general/retrodeck-start.md b/wiki-rtd/docs/wiki_general/retrodeck-start.md
index dcf991b..b18ef36 100644
--- a/wiki-rtd/docs/wiki_general/retrodeck-start.md
+++ b/wiki-rtd/docs/wiki_general/retrodeck-start.md
@@ -108,7 +108,7 @@ The NES column should now be shown with our `ExampleNESGame.nes` from `Step 3`
 Do the following:
 
 1. Make an account on [Screenscraper](https://www.screenscraper.fr/)
-2. Read up on scraping and the various settings that exist for it in the [ES-DE User Guide](../wiki_es_de/esde-guide.md)
+2. Read up on scraping and the various settings that exist for it in the [ES-DE User Guide](../wiki_system_guides/es-de/esde-guide.md)
 3. Login to your screenscraper account inside RetroDECK.
 4. Setup the scraping how you want it.
 5. Start scraping.
diff --git a/wiki-rtd/docs/wiki_es_de/esde-guide.md b/wiki-rtd/docs/wiki_system_guides/es-de/esde-guide.md
similarity index 98%
rename from wiki-rtd/docs/wiki_es_de/esde-guide.md
rename to wiki-rtd/docs/wiki_system_guides/es-de/esde-guide.md
index 4237783..d3ca8bf 100644
--- a/wiki-rtd/docs/wiki_es_de/esde-guide.md
+++ b/wiki-rtd/docs/wiki_system_guides/es-de/esde-guide.md
@@ -1,6 +1,6 @@
 # EmulationStation Desktop Edition: User Guide
 
-<img src="../../wiki_images/logos/es-de-logo.png" width="150">
+<img src="../../../wiki_images/logos/es-de-logo.png" width="150">
 
 RetroDECK uses EmulationStation Desktop Edition (ES-DE) as frontend.
 
diff --git a/wiki-rtd/docs/wiki_es_de/esde-themes.md b/wiki-rtd/docs/wiki_system_guides/es-de/esde-themes.md
similarity index 100%
rename from wiki-rtd/docs/wiki_es_de/esde-themes.md
rename to wiki-rtd/docs/wiki_system_guides/es-de/esde-themes.md
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index eaa0ce2..5a79f03 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -86,8 +86,6 @@ nav:
 
     - Documentation & Wiki: wiki_faq/faq-documentation.md
     - Feature Requests: wiki_faq/faq-feature.md
-    - ES-DE Frontend: wiki_faq/faq-esde.md
-    - ES-DE Scraping: wiki_faq/faq-scraping.md
     - RetroDECK General: wiki_faq/faq-rd-general.md
     - RetroDECK Usage: wiki_faq/faq-rd-usage.md
     - Steam Deck: wiki_faq/faq-rd-steamdeck.md
@@ -132,11 +130,6 @@ nav:
     - 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 👹:
@@ -215,7 +208,13 @@ nav:
       - Yuzu - General Guide: wiki_emulator_guides/yuzu/yuzu-guide.md
       - Yuzu - Gyro Guide: wiki_emulator_guides/yuzu/yuzu-gyro.md
 
-  - Guides - Systems 🗃️:
+  - Guides - ES-DE & Other Systems 🗃️:
+
+    - ES-DE 📺:
+      - ES-DE User Guide: wiki_system_guides/es-de/esde-guide.md
+      - ES-DE Themes: wiki_system_guides/es-de/esde-themes.md
+      - ES-DE FAQ: wiki_faq/faq-esde.md
+      - ES-DE Scraping FAQ: wiki_faq/faq-scraping.md
 
     - PortMaster 🚢:
       - PortMaster - General Guide: wiki_system_guides/portmaster/portmaster-guide.md