diff --git a/wiki-rtd/docs/wiki_about/what-is-retrodeck.md b/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
index 0529172..7391ff7 100644
--- a/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
+++ b/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
@@ -94,9 +94,11 @@ Could answers several questions you might have about the project as well.
 
 [FAQ: Usage Questions](../wiki_faq/faq-rd-usage.md)
 
-[FAQ: ES-DE Questions](../wiki_faq/faq-esde.md)
+[FAQ: ES-DE Questions](../wiki_system_guides/es-de/esde-faq.md)
 
-[FAQ: Scraping Questions](../wiki_faq/faq-scraping.md)
+[FAQ: Steam Deck Questions](../wiki_devices/steamdeck/steamdeck-faq.md)
+
+[FAQ: Scraping Questions](../wiki_system_guides/es-de/esde-scraping.md)
 
 [FAQ: Feature Requests](../wiki_faq/faq-feature.md)
 
diff --git a/wiki-rtd/docs/wiki_faq/faq-rd-steamdeck.md b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-faq.md
similarity index 100%
rename from wiki-rtd/docs/wiki_faq/faq-rd-steamdeck.md
rename to wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-faq.md
diff --git a/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md b/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
index 412d4c7..f199383 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
+++ b/wiki-rtd/docs/wiki_emulator_guides/cemu/cemu-guide.md
@@ -115,4 +115,4 @@ Follow the [Cemu: Online Play Guide](https://cemu.cfw.guide/online-play.html) to
 
 Check the following link for `Certain UI elements of emulators GUI are cramped / outside of the screen on the Steam Deck`:
 
-[Steam Deck - FAQ](../../wiki_faq/faq-rd-steamdeck.md) 
+[Steam Deck - FAQ](../../wiki_devices/steamdeck/steamdeck-faq.md) 
diff --git a/wiki-rtd/docs/wiki_faq/faq-esde.md b/wiki-rtd/docs/wiki_system_guides/es-de/esde-faq.md
similarity index 100%
rename from wiki-rtd/docs/wiki_faq/faq-esde.md
rename to wiki-rtd/docs/wiki_system_guides/es-de/esde-faq.md
diff --git a/wiki-rtd/docs/wiki_faq/faq-scraping.md b/wiki-rtd/docs/wiki_system_guides/es-de/esde-scraping.md
similarity index 100%
rename from wiki-rtd/docs/wiki_faq/faq-scraping.md
rename to wiki-rtd/docs/wiki_system_guides/es-de/esde-scraping.md
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 5a79f03..2a17090 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -88,7 +88,6 @@ nav:
     - Feature Requests: wiki_faq/faq-feature.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
 
   - Guides - RetroDECK Controls & Hotkeys 🎮:
 
@@ -124,6 +123,7 @@ nav:
     - Recommended Software: wiki_devices/steamdeck/steamdeck-software.md
     - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
     - Steam Deck - Gyro: wiki_rd_controls/gyro-steamdeck-neptune.md
+    - Steam Deck FAQ: wiki_devices/steamdeck/steamdeck-faq.md
 
   - Guides - Linux Desktop 🐧:
 
@@ -213,8 +213,8 @@ nav:
     - 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
+      - ES-DE FAQ: wiki_system_guides/es-de/esde-faq.md
+      - ES-DE Scraping: wiki_system_guides/es-de/esde-scraping.md
 
     - PortMaster 🚢:
       - PortMaster - General Guide: wiki_system_guides/portmaster/portmaster-guide.md