diff --git a/wiki-rtd/docs/wiki_about/what-is-included.md b/wiki-rtd/docs/wiki_about/what-is-included.md
index 2419485..16dd80a 100644
--- a/wiki-rtd/docs/wiki_about/what-is-included.md
+++ b/wiki-rtd/docs/wiki_about/what-is-included.md
@@ -12,15 +12,13 @@ What follows is a list of features and software currently included in RetroDECK.
## RetroDECK Features
-### RetroDECK Configurator & RetroDECK Framework
+### RetroDECK Framework
-
-
-**The RetroDECK Framework**
+
RetroDECK comes with the `RetroDECK Framework` that allows deeper integrations between the built-in software and easier exposure to a variety of features that you otherwise need to set for example per system basis to create a uniformity between them.
-**RetroDECK Configurator**
+### RetroDECK Configurator
The RetroDECK Configurator is a powerful `Utility` that exposes some parts of the `RetroDECK Framework` to the RetroDECK users.
@@ -85,6 +83,8 @@ For a full list of supported systems in RetroArch, follow the link and check the
The full version of the multi-arcade emulator MAME.
+[MAME - General Guide](../wiki_emulator_guides/mame/mame-guide.md)
+
## Standalone Emulators
### CEMU
@@ -93,17 +93,17 @@ The full version of the multi-arcade emulator MAME.
The WiiU Emulator CEMU.
-### Dolphin
+[Cemu - General Guide](../wiki_emulator_guides/cemu/cemu-guide.md)
-
-The Wii and GameCube Emulator Dolphin.
+### Dolphin & Primehack
-### Primehack
+
-
+The Wii and GameCube Emulator Dolphin and The Metroid Prime fork of Dolphin.
+
+[Dolphin / Primehack - General Guide](../wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide.md)
-The Metroid Prime fork of Dolphin.
### melonDS
@@ -111,61 +111,76 @@ The Metroid Prime fork of Dolphin.
The Nintendo DS emulator melonDS.
+[melonDS - General Guide](../wiki_emulator_guides/melonds/melonds-guide.md)
+
+
### PCSX2
The Playstation 2 emulator PCSX2.
+[PCSX2 - General Guide](../wiki_emulator_guides/pcsx2/pcsx2-guide.md)
+
### PPSSPP
The PSP emulator PPSSPP.
+[PPSSPP - General Guide](../wiki_emulator_guides/ppsspp/ppsspp-guide.md)
+
### RPCS3
The PS3 emulator RPCS3.
+[RPCS3 - General Guide](../wiki_emulator_guides/rpcs3/rpcs3-guide.md)
+
### Ruffle
The flash emulator Ruffle.
+[Ruffle - General Guide](../wiki_emulator_guides/ruffle/ruffle-guide.md)
+
### Vita3k
The PSVita emulator Vita3k.
+[Vita3k - General Guide](../wiki_emulator_guides/vita3k/vita3k-guide.md)
+
### XEMU
The Xbox emulator XEMU.
+[XEMU - General Guide](../wiki_emulator_guides/xemu/xemu-guide.md)
+
## Included: Legacy Emulators
Legacy Emulators are emulators that are included but no longer supported because of ceased development on the Emulators part or other things.
-### Ryujinx
+### Ryujinx (Legacy)
-The Switch emulator Ryujinx.
+The Switch emulator Ryujinx, (has stopped development).
-Has stopped development.
+[Ryujinx - General Guide](../wiki_emulator_guides/ryujinx/ryujinx-guide.md)
-### Duckstation
+### Duckstation (Legacy)
-Playstation 1 (PSX) emulator Duckstation.
+Playstation 1 (PSX) emulator Duckstation (has made licensing changes).
-Has made licensing changes.
+[Duckstation - General Guide](../wiki_emulator_guides/duckstation/duckstation-guide.md)
## Standalone Engines
@@ -175,24 +190,32 @@ Has made licensing changes.
Solarus is a free and open-source 2D game engine written in C++, that can run games scripted in Lua. It has been designed with 16-bit classic Action-RPGs in mind, and is available on a wide range of platforms.
+[Solarus - General Guide](../wiki_engine_guides/solarus/solarus-guide.md)
+
### GZDoom
GZDoom is a feature centric port for all Doom engine games, based on ZDoom, adding an OpenGL renderer and powerful scripting capabilities.
+[GZDoom - General Guide](../wiki_engine_guides/gzdoom/gzdoom-guide.md)
+
### IKEMEN Go (M.U.G.E.N)
IKEMEN Go is a remake of the IKEMEN (open source fighting games engine that supports M.U.G.E.N resources) in Google’s Programming Language “Go”.
+[IKEMEN Go - General Guide](../wiki_engine_guides/ikemengo/ikemengo-guide.md)
+
### Pico-8
The fantasy console Pico-8.
+[Pico-8 - General Guide](../wiki_engine_guides/pico8/pico8-guide.md)
+
## Systems
### PortMaster
@@ -201,14 +224,18 @@ The fantasy console Pico-8.
PortMaster is a simple GUI tool designed to facilitate the downloading and installation of game ports for Linux devices and is self contained.
-### Steam Rom Manger
+[PortMaster - General Guide](../wiki_engine_guides/portmaster/portmaster-guide.md)
+
+### Steam Rom Manger
-Steam ROM Manager a bulk game importer and artwork manager for Steam.
+Steam ROM Manager (SRM) a bulk game importer and artwork manager for Steam.
It adds separate games to Steam, adds artwork and configures the steam input profiles.
+[SRM - General Guide](../wiki_engine_guides/srm/srm-guide.md)
+
## Steam Input Controller layouts
For all inputs layouts included in RetroDECK.
diff --git a/wiki-rtd/docs/wiki_about/what-is-retrodeck.md b/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
index 242bca7..6e4f034 100644
--- a/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
+++ b/wiki-rtd/docs/wiki_about/what-is-retrodeck.md
@@ -72,13 +72,13 @@ To get the latest updates first:
- Follow [The RetroDECK Blog](../blog/index.md).
- Look at [Github issues](https://github.com/XargonWan/RetroDECK/issues/) for clues.
-## Wiki Links for more information
+## Patch Notes and Known Issues
[Version History](../wiki_rd_versions/version-history.md)
-[Known Issues](../wiki_general/known-issues.md)
+[Known Issues & Reporting a Problem](../wiki_general/known-issues.md)
-### The FAQ & Guides ❔
+### The FAQs❔
Could answers several questions you might have about the project as well.
@@ -86,8 +86,6 @@ Could answers several questions you might have about the project as well.
[FAQ: Usage Questions](../wiki_faq/faq-rd-usage.md)
-[Guide: ES-DE](../wiki_system_guides/es-de/esde-guide.md)
-
[FAQ: Feature Requests](../wiki_faq/faq-feature.md)
[FAQ: Documentation Questions](../wiki_faq/faq-documentation.md)