diff --git a/wiki-rtd/docs/wiki_bugs/report-bugs.md b/wiki-rtd/docs/wiki_bugs/report-bugs.md
index 807954e6..31220502 100644
--- a/wiki-rtd/docs/wiki_bugs/report-bugs.md
+++ b/wiki-rtd/docs/wiki_bugs/report-bugs.md
@@ -2,7 +2,7 @@
 
 ## Before you report:
 - Check [Github issues](https://github.com/XargonWan/RetroDECK/issues/) on reported issues.
-- Check the [Known Issues](../wiki_bugs/known-issues/).
+- Check the [Known Issues](../wiki_bugs/known-issues.md).
 
 ## How to Report?
 
diff --git a/wiki-rtd/docs/wiki_controllers/controllers-nintendo.md b/wiki-rtd/docs/wiki_controllers/controllers-nintendo.md
new file mode 100644
index 00000000..989b0c24
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/controllers-nintendo.md
@@ -0,0 +1,72 @@
+# Nintendo Controllers
+
+**Note these inputs are part of the upcomming 0.8b update.**
+
+Steam Input and RetroDECK have support for the following controllers:
+
+## Switch
+- Switch Pro
+
+
+### What are the Official profiles called?
+
+- Switch Pro: `RetroDECK: Official Layout - Switch Pro`
+
+## Global Hotkeys: Playstation Button Combos
+
+The global hotkeys are activated by pressing the `SELECT`  button and holding it while pressing the corresponding other button input.
+What follows is a list of hotkeys:
+
+`Function` Shows what the hotkey does. <br>
+`Button / Combination` Shows the input you need to make to trigger the command. <br>
+`Command` Shows what is being sent to the emulator. <br>
+`Emulator Support` Shows what emulators support the command. <br>
+`Comment` Just extra comments. <br>
+
+
+| Function                 | Button / Combination|  Command      | Emulator Support     |    Comment |
+| :---                    | :---:               | :---:                 |       :---:          |  :---:     |
+| Pause / Resume          |   `SELECT + B`          |   `CTRL + P`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2`  `Yuzu`             |            |
+| Take Screenshot         |   `SELECT + A`          |   `CTRL + X`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`   `Yuzu`           |            |
+| Fullscreen Toggle      |   `SELECT + Y`          |   `CTRL + ENTER`      | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2`  `Yuzu`             |            |
+| Open Menu               |  `SELECT + X`         |   `CTRL + M`          | `RetroArch` `Duckstation` `PCSX2`  `Yuzu`                        |
+| Quit Emulator           |  `SELECT + Start`       |   `CTRL + Q`          |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`   `Yuzu`                                   |            | |
+| Previous State Slot     |  `SELECT + D-Pad Left`  |   `CTRL + J`          | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`|                    |            |
+| Next State Slot         |  `SELECT + D-Pad Right` |   `CTRL + K`          | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`|
+| Increase Emulation Speed     |  `SELECT + D-Pad Up`  |   `CTRL + 1`          | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`|                    |            |
+| Decrease Emulation Speed         |  `SELECT + D-Pad Down` |   `CTRL + 2`          | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`|                       |            |
+| Load State              |  `SELECT + L1`          |   `CTRL + A`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`                          |            |
+| Save State              |  `SELECT + R1`          |   `CTRL + S`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`                        |            |
+| Rewind                  |  `SELECT + L2`          |   `CTRL + -`          | `RetroArch` `Duckstation`                     |            |
+| Fast forward            |  `SELECT + R2`          |   `CTRL + +`          |  `RetroArch` `Duckstation` `MelonDS` `PCSX2`                                  |            |
+| Swap Screens    |  `SELECT + Left Joystick - Up`     |   `CTRL + TAB`        |     `Citra` `MelonDS`  `Cemu`           |
+| Escape                  |  `SELECT + Left Joystick - Down`          |   `ESC`               |     `PPSSPP` `Computer emulators` `Solarus` `IkemenGO` |
+| Enter                  |  `SELECT + Left Joystick - Right`          |   `Enter`               |     `Computer emulators` `OpenBOR` |
+
+
+### Right Joystick as Mouse
+
+By holding `SELECT` and moving the right joystick you can use it as a mouse for various systems that uses mouse input.
+
+| Function                 | Button / Combination| Command      | Comment     |
+| :---                    | :---:               | :---:                 |       :---:          |
+| Joystick as Mouse        |  `SELECT + Right Stick`           |            |   Movement  |
+| Right Click        |  `SELECT + L3`          |   `Right Click`               |     |
+| Left Click        |  `SELECT + R3`           |   `Left Click`            |     |
+
+### RetroArch: Additional Hotkeys
+
+These hotkeys also work for RetroArch and are built in.
+
+| Function                 | Button / Combination     | Emulator Support     |    Comment |
+| :---                    | :---:                    |       :---:          |  :---:     |
+| Open Menu               |  `L3 + R3`               |      `RetroArch`     |            |
+
+### Arcade Systems: Additional Hotkeys
+
+This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
+
+| Function                 | Button / Combination     | Emulator Support     |    Comment |
+| :---                    | :---:                    |       :---:          |  :---:     |
+| Insert Credit           |  `SELECT`                |     `RetroArch`  `MAME` `FBNeo`     |            |
+
diff --git a/wiki-rtd/docs/wiki_controllers/controllers-playstation.md b/wiki-rtd/docs/wiki_controllers/controllers-playstation.md
index 6363ac21..c547eaca 100644
--- a/wiki-rtd/docs/wiki_controllers/controllers-playstation.md
+++ b/wiki-rtd/docs/wiki_controllers/controllers-playstation.md
@@ -1,5 +1,7 @@
 # Playstation Controllers
 
+**Note these inputs are part of the upcomming 0.8b update.**
+
 Steam Input have support for the following controllers:
 
 ## Playstation 3
diff --git a/wiki-rtd/docs/wiki_controllers/controllers-xbox.md b/wiki-rtd/docs/wiki_controllers/controllers-xbox.md
new file mode 100644
index 00000000..a40811d1
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/controllers-xbox.md
@@ -0,0 +1,80 @@
+# Xbox Controllers
+
+**Note these inputs are part of the upcomming 0.8b update.**
+
+Steam Input have support for the following controllers:
+
+## Xbox 360
+- Xbox 360 Controller
+
+
+## Xbox One / S / X
+- Xbox One
+- Xbox Series S and X
+
+The One / S / X controller registers as the same in Steam Input.
+Only a few minor changes where made between the generations.
+
+### What are the Official profiles called?
+
+- Xbox 360: `RetroDECK: Official Layout - Xbox 360`
+- Xbox One / S / X: `RetroDECK: Official Layout -  Xbox One/S/X`
+
+## Global Hotkeys: Playstation Button Combos
+
+The global hotkeys are activated by pressing the `SELECT`  button and holding it while pressing the corresponding other button input.
+What follows is a list of hotkeys:
+
+`Function` Shows what the hotkey does. <br>
+`Button / Combination` Shows the input you need to make to trigger the command. <br>
+`Command` Shows what is being sent to the emulator. <br>
+`Emulator Support` Shows what emulators support the command. <br>
+`Comment` Just extra comments. <br>
+
+
+| Function                 | Button / Combination|  Command      | Emulator Support     |    Comment |
+| :---                    | :---:               | :---:                 |       :---:          |  :---:     |
+| Pause / Resume          |   `SELECT + A`          |   `CTRL + P`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2`  `Yuzu`             |            |
+| Take Screenshot         |   `SELECT + B`          |   `CTRL + X`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`   `Yuzu`           |            |
+| Fullscreen Toggle      |   `SELECT + X`          |   `CTRL + ENTER`      | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2`  `Yuzu`             |            |
+| Open Menu               |  `SELECT + Y`         |   `CTRL + M`          | `RetroArch` `Duckstation` `PCSX2`  `Yuzu`                        |
+| Quit Emulator           |  `SELECT + Start`       |   `CTRL + Q`          |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`   `Yuzu`                                   |            | |
+| Previous State Slot     |  `SELECT + D-Pad Left`  |   `CTRL + J`          | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`|                    |            |
+| Next State Slot         |  `SELECT + D-Pad Right` |   `CTRL + K`          | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`|
+| Increase Emulation Speed     |  `SELECT + D-Pad Up`  |   `CTRL + 1`          | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`|                    |            |
+| Decrease Emulation Speed         |  `SELECT + D-Pad Down` |   `CTRL + 2`          | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`|                       |            |
+| Load State              |  `SELECT + L1`          |   `CTRL + A`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`                          |            |
+| Save State              |  `SELECT + R1`          |   `CTRL + S`          | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`                        |            |
+| Rewind                  |  `SELECT + L2`          |   `CTRL + -`          | `RetroArch` `Duckstation`                     |            |
+| Fast forward            |  `SELECT + R2`          |   `CTRL + +`          |  `RetroArch` `Duckstation` `MelonDS` `PCSX2`                                  |            |
+| Swap Screens    |  `SELECT + Left Joystick - Up`     |   `CTRL + TAB`        |     `Citra` `MelonDS`  `Cemu`           |
+| Escape                  |  `SELECT + Left Joystick - Down`          |   `ESC`               |     `PPSSPP` `Computer emulators` `Solarus` `IkemenGO` |
+| Enter                  |  `SELECT + Left Joystick - Right`          |   `Enter`               |     `Computer emulators` `OpenBOR` |
+
+
+### Right Joystick as Mouse
+
+By holding `SELECT` and moving the right joystick you can use it as a mouse for various systems that uses mouse input.
+
+| Function                 | Button / Combination| Command      | Comment     |
+| :---                    | :---:               | :---:                 |       :---:          |
+| Joystick as Mouse        |  `SELECT + Right Stick`           |            |   Movement  |
+| Right Click        |  `SELECT + L3`          |   `Right Click`               |     |
+| Left Click        |  `SELECT + R3`           |   `Left Click`            |     |
+
+### RetroArch: Additional Hotkeys
+
+These hotkeys also work for RetroArch and are built in.
+
+| Function                 | Button / Combination     | Emulator Support     |    Comment |
+| :---                    | :---:                    |       :---:          |  :---:     |
+| Open Menu               |  `L3 + R3`               |      `RetroArch`     |            |
+
+### Arcade Systems: Additional Hotkeys
+
+This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
+
+| Function                 | Button / Combination     | Emulator Support     |    Comment |
+| :---                    | :---:                    |       :---:          |  :---:     |
+| Insert Credit           |  `SELECT`                |     `RetroArch`  `MAME` `FBNeo`     |            |
+
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 221ee830..c1d75894 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -91,6 +91,8 @@ nav:
     - Button Prompts in Games: wiki_controllers/diffrent-game-inputs.md
     - Steam Deck - Controls: wiki_controllers/controls-steamdeck.md
     - Playstation - Controllers (WIP): wiki_controllers/controllers-playstation.md
+    - Xbox - Controllers (WIP): wiki_controllers/controllers-xbox.md
+    - Nintendo - Controllers (WIP): wiki_controllers/controllers-nintendo.md
 
   - Community & Helping Out ❤️:
     - Discord: wiki_community/discord.md