diff --git a/wiki-rtd/docs/wiki_development/general/debug-mode.md b/wiki-rtd/docs/wiki_development/general/debug-mode.md
new file mode 100644
index 0000000..77a5179
--- /dev/null
+++ b/wiki-rtd/docs/wiki_development/general/debug-mode.md
@@ -0,0 +1,51 @@
+# RetroDECK Debug Mode
+
+It's possible to enter a debug mode via the flatpak shell.
+
+```
+flatpak run --command=bash net.retrodeck.retrodeck
+```
+
+NOTE: on wayland in some cases it's needed to enter with the command above otherwise some emulators will not run:
+```
+flatpak run --command=sh --nosocket=fallback-x11 --socket=x11 net.retrodeck.retrodeck
+```
+
+### Launch ES-DE in Debug Mode:
+
+```
+es-de --debug --home /var/config/emulationstation
+
+or
+
+es-de --debug --home /var/config/ES-DE
+
+```
+
+### List runnable components in Debug Mode
+
+You cam list all the available components via the command:
+
+```
+ls /app/bin
+```
+
+### How to run a component?
+
+Just type the compoants name directly into the flatpak shell CLI.
+
+Example:
+
+- `retrodeck` launches full RetroDECK.
+
+You can also launch specific components by running them, example:
+
+- `retroarch` launches RetroArch.
+
+This is useful when for example a game is not starting and you want the output printed in the terminal.
+
+### Run a component with a specific game or content
+
+The easiest way is to run the `retrodeck` command. Launch RetroDECK and go into the ES-DE interface and try to launch the game from there.
+In the terminal ES-DE will spit out the total runnable path to that game or content.
+
diff --git a/wiki-rtd/docs/wiki_development/testing/general-testing.md b/wiki-rtd/docs/wiki_development/testing/general-testing.md
index 35a79ee..c90c505 100644
--- a/wiki-rtd/docs/wiki_development/testing/general-testing.md
+++ b/wiki-rtd/docs/wiki_development/testing/general-testing.md
@@ -77,7 +77,7 @@ From CLI run:
 The `Developer Options Menu` should show up inside the Configurator.
 
 ## Debug Mode
-It's possible to enter in a sort of debug mode, it's actually the flatpak shell.
+It's possible to enter in a sort of debug mode via the flatpak shell.
 
 Enter in the flatpak shell:
 
@@ -90,13 +90,18 @@ NOTE: on wayland in some cases it's needed to enter with the command above other
 flatpak run --command=sh --nosocket=fallback-x11 --socket=x11 net.retrodeck.retrodeck
 ```
 
-Launch ES-DE in Debug Mode:
+### Launch ES-DE in Debug Mode:
 
 ```
-emulationstation --debug --home /var/config/emulationstation
+es-de --debug --home /var/config/emulationstation
+
+or
+
+es-de --debug --home /var/config/ES-DE
+
 ```
 
-Launch a component in Debug Mode:
+### Launch a component in Debug Mode:
 
 To get the list of the available binaries to launch, then just write the command:
 
@@ -107,5 +112,3 @@ ls /app/bin
 
 `retrodeck` for the whole application or certain components like `ryujinx` or `retroarch`.
 This is useful when for example a game is not starting and you want the output printed in the terminal.
-
-