diff --git a/wiki-rtd/docs/wiki_emulator_guides/citra/citra-guide.md b/wiki-rtd/docs/wiki_archive/citra/citra-guide.md
similarity index 95%
rename from wiki-rtd/docs/wiki_emulator_guides/citra/citra-guide.md
rename to wiki-rtd/docs/wiki_archive/citra/citra-guide.md
index a702f74..cf8290d 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/citra/citra-guide.md
+++ b/wiki-rtd/docs/wiki_archive/citra/citra-guide.md
@@ -4,13 +4,11 @@
 
 Citra was a Nintendo 3DS Emulator.
 
-**Note:** 
+**Note: Archived Emulator**
 
-Citra Standalone was removed as part of the `0.8.0b` update.
+Citra was a Switch emulator and was removed as part of the `0.8.0b` update.
 
-It can still be temporarily installed via:
-
-[Ponzu](../../wiki_configurator/ponzu.md)
+The last version that shipped with Citra was `0.7.6b`.
 
 ## Where to put the games
 3DS games should be put under the `retrodeck/roms/3ds/` directory.
diff --git a/wiki-rtd/docs/wiki_configurator/ponzu.md b/wiki-rtd/docs/wiki_archive/ponzu.md
similarity index 91%
rename from wiki-rtd/docs/wiki_configurator/ponzu.md
rename to wiki-rtd/docs/wiki_archive/ponzu.md
index ea5a30a..fe98a4f 100644
--- a/wiki-rtd/docs/wiki_configurator/ponzu.md
+++ b/wiki-rtd/docs/wiki_archive/ponzu.md
@@ -2,7 +2,9 @@
 
 <img src="../../wiki_images/logos/ponzu-logo.png" width="150">
 
-Ponzu can be used an temporary as-is function that is searching for user provided Citra and Yuzu AppImages and make them available as emulators inside RetroDECK.
+Note this will not work in the future.
+
+Ponzu could be used an temporary as-is function that is searching for user provided Citra and Yuzu AppImages and make them available as emulators inside RetroDECK.
 
 ## Where to put the AppImages
 
diff --git a/wiki-rtd/docs/wiki_emulator_guides/ryujinx/ryujinx-guide.md b/wiki-rtd/docs/wiki_archive/ryujinx/ryujinx-guide.md
similarity index 93%
rename from wiki-rtd/docs/wiki_emulator_guides/ryujinx/ryujinx-guide.md
rename to wiki-rtd/docs/wiki_archive/ryujinx/ryujinx-guide.md
index 4bad9df..925abdf 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/ryujinx/ryujinx-guide.md
+++ b/wiki-rtd/docs/wiki_archive/ryujinx/ryujinx-guide.md
@@ -2,10 +2,11 @@
 
 <img src="../../../wiki_images/logos/ryujinx-logo.svg" width="150">
 
-**Note: Legacy Emulator**
+**Note: Archived Emulator**
 
-Ryujinx have stopped it's development and is marked as Legacy as of RetroDECK 0.9.0b. It will no longer receive any updates or support more and is working as-is. 
+Ryujinx was a Switch emulator and was removed as part of the `0.9.0b` update.
 
+The last version that shipped with Ryujinx was `0.8.4b`.
 
 ## Where to put the games?
 
diff --git a/wiki-rtd/docs/wiki_emulator_guides/yuzu/yuzu-guide.md b/wiki-rtd/docs/wiki_archive/yuzu/yuzu-guide.md
similarity index 97%
rename from wiki-rtd/docs/wiki_emulator_guides/yuzu/yuzu-guide.md
rename to wiki-rtd/docs/wiki_archive/yuzu/yuzu-guide.md
index 812a653..a7ef224 100644
--- a/wiki-rtd/docs/wiki_emulator_guides/yuzu/yuzu-guide.md
+++ b/wiki-rtd/docs/wiki_archive/yuzu/yuzu-guide.md
@@ -2,13 +2,11 @@
 
 <img src="../../../wiki_images/logos//yuzu-logo.svg" width="150">
 
-**Note:** 
+**Note: Archived Emulator**
 
 Yuzu was a Switch emulator and was removed as part of the `0.8.0b` update.
 
-It can still be temporarily installed via:
-
-[Ponzu](../../wiki_configurator/ponzu.md)
+The last version that shipped with Yuzu was `0.7.6b`.
 
 ## Where to put the games?
 
diff --git a/wiki-rtd/docs/wiki_emulator_guides/yuzu/yuzu-gyro.md b/wiki-rtd/docs/wiki_archive/yuzu/yuzu-gyro.md
similarity index 100%
rename from wiki-rtd/docs/wiki_emulator_guides/yuzu/yuzu-gyro.md
rename to wiki-rtd/docs/wiki_archive/yuzu/yuzu-gyro.md
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 7f02abe..2cae03b 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -105,7 +105,6 @@ nav:
   - Guides - RetroDECK Configurator 🧰:
 
     - Configurator Features: wiki_configurator/configurator.md
-    - Ponzu: wiki_configurator/ponzu.md
 
   - Guides - Files & Game Management 📂:
 
@@ -154,9 +153,6 @@ nav:
     - Cemu ⬜:
       - Cemu - General Guide: wiki_emulator_guides/cemu/cemu-guide.md
 
-    - Citra 🍋 (Archive):
-      - Citra - General Guide: wiki_emulator_guides/citra/citra-guide.md
-
     - Dolphin / Primehack 🐬:
       - Dolphin / Primehack - General Guide: wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md
 
@@ -186,19 +182,12 @@ nav:
     - Ruffle 🌩️:
       - Ruffle - General Guide: wiki_emulator_guides/ruffle/ruffle-guide.md
 
-    - Ryujinx 🔵 (Legacy):
-      - Ryujinx - General Guide: wiki_emulator_guides/ryujinx/ryujinx-guide.md
-
     - Vita3K 🤍:
       - Vita3K - General Guide: wiki_emulator_guides/vita3k/vita3k-guide.md
 
     - xemu ✖️:
       - xemu - General Guide: wiki_emulator_guides/xemu/xemu-guide.md
 
-    - Yuzu 🔴 (Archive):
-      - Yuzu - General Guide: wiki_emulator_guides/yuzu/yuzu-guide.md
-      - Yuzu - Gyro Guide: wiki_emulator_guides/yuzu/yuzu-gyro.md
-
   - Guides - ES-DE & Other Systems 🗃️:
 
     - ES-DE 📺:
@@ -340,3 +329,18 @@ nav:
       - Cooker Testing - FAQ: wiki_development/testing/faq-cooker.md
       - Cooker Testing - Guide: wiki_development/testing/cooker-testing.md
       - Expermental Features: wiki_development/testing/experimental-features.md
+
+
+  - Archive 📂:
+
+    - Citra 🍋 (Archive):
+      - Citra - General Guide: wiki_archive/citra/citra-guide.md
+
+    - Ryujinx 🔵 (Archive):
+      - Ryujinx - General Guide: wiki_archive/ryujinx/ryujinx-guide.md
+
+    - Yuzu 🔴 (Archive):
+      - Yuzu - General Guide: wiki_archive/yuzu/yuzu-guide.md
+      - Yuzu - Gyro Guide: wiki_archive/yuzu/yuzu-gyro.md
+
+    - Ponzu (Archive): wiki_archive/ponzu.md