diff --git a/wiki-rtd/docs/index.md b/wiki-rtd/docs/index.md
index e539fd7..13eeb0b 100644
--- a/wiki-rtd/docs/index.md
+++ b/wiki-rtd/docs/index.md
@@ -55,7 +55,9 @@ Those can either be:
 
 ---
 
-## Service Status Links
+## Services Links
 
 - [Github: Service Status](https://www.githubstatus.com/)
 - [Flathub: Service Status](https://status.flathub.org/)
+- [Flathub: Buildbot](https://buildbot.flathub.org/#/)
+
diff --git a/wiki-rtd/docs/wiki_rd_controls/retrodeck-hotkeys.md b/wiki-rtd/docs/wiki_rd_controls/retrodeck-hotkeys.md
index 363078b..ca7f43d 100644
--- a/wiki-rtd/docs/wiki_rd_controls/retrodeck-hotkeys.md
+++ b/wiki-rtd/docs/wiki_rd_controls/retrodeck-hotkeys.md
@@ -5,27 +5,34 @@ The global hotkeys are activated by pressing the `SELECT`  button and holding it
 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>
+`System` Shows the Button / Combination the input you need to make to trigger the command. <br>
 `Command` Shows what is being sent to the emulator. <br>
 `System Support` Shows what emulators support the command. <br>
-`Comment` Just extra comments. <br>
+`Comment` Extra comments. <br>
 
 
-| Function                 | Button / Combination|  Command      | System Support     |    Comment |
-| :---                    | :---:               | :---:                 |       :---:          |  :---:     |
-| Pause / Resume      |   `SELECT + A`          |   `CTRL + P`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`   `Yuzu (Legacy)`    |            |
-| Fullscreen Toggle      |   `SELECT + X`          |   `CTRL + ENTER`      | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`   `Yuzu (Legacy)` `RPCS3`            |            |   |
-| Open Menu               |  `SELECT + Y`         |   `CTRL + M`          | `RetroArch` `Duckstation (Standalone)`  `PCSX2 (Standalone)`   `Yuzu (Legacy)`           `RPCS3`                             |            |   |
-| Quit Emulator           |  `SELECT + Start`       |   `CTRL + Q`          |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`    `Yuzu (Legacy)`          |            |   |
-| Previous State Slot     |  `SELECT + D-Pad Left`  |   `CTRL + J`          | `RetroArch` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                           |            |   |
-| Next State Slot         |  `SELECT + D-Pad Right` |   `CTRL + K`          | `RetroArch` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                           |            |   |
-| Increase Emulation Speed     |  `SELECT + D-Pad Up`  |   `CTRL + 1`          | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                            |            |   |
-| Decrease Emulation Speed         |  `SELECT + D-Pad Down` |   `CTRL + 2`          | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                       |            |   |
-| Load State              |  `SELECT + L1`          |   `CTRL + A`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                   |            |   |
-| Save State              |  `SELECT + R1`          |   `CTRL + S`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                   |            |   |
-| Rewind                  |  `SELECT + L2`          |   `CTRL + -`          | `RetroArch` `Duckstation (Standalone)`                                                      |            |   |
-| Fast forward            |  `SELECT + R2`          |   `CTRL + +`          |  `RetroArch` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`                                    |            |   |
-| Simple Radial Menu      |  `SELECT + Left Joystick`    |                                                                                                   |            |       Opens the Radial Menu  |
+| Function                 | Xbox| Nintendo  | Playstation  |Command      | System Support     |    Comment |
+| :---                    | :---:               |    |:---:                 |   :---:   |   :---:          |  :---:     |
+| Pause / Resume      |   `SELECT + A`          |     `MINUS + B`  |  `SELECT + Cross`               |  `CTRL + P`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`   `Yuzu (Legacy)`    |            |
+| Take Screenshot         |   `SELECT + B`          |  `MINUS + A`  | `SELECT + Circle`  | `CTRL + X`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)` `PCSX2 (Standalone)`   `Yuzu (Legacy)`           |            |
+| Fullscreen Toggle      |   `SELECT + X`          |     `MINUS + Y`  |   `SELECT + Square`             | `CTRL + ENTER`      | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`   `Yuzu (Legacy)` `RPCS3`            |            |   |
+| Open Menu               |  `SELECT + Y`         |   `MINUS + X` |   `SELECT + Triangle`       | `CTRL + M`          | `RetroArch` `Duckstation (Standalone)`  `PCSX2 (Standalone)`   `Yuzu (Legacy)`           `RPCS3`                             |            |   |
+| Quit Emulator           |  `SELECT + Start`       |   `MINUS + PLUS`|  `SELECT + Start`    | `CTRL + Q`          |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`    `Yuzu (Legacy)`          |            |   |
+| Previous State Slot     |  `SELECT + D-Pad Left`  |  `MINUS + D-Pad Left` | `SELECT + D-Pad Left`   | `CTRL + J`          | `RetroArch` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                           |            |   |
+| Next State Slot         |  `SELECT + D-Pad Right` |   `MINUS + D-Pad Right` | `SELECT + D-Pad Right`  |  `CTRL + K`          | `RetroArch` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                           |            |   |
+| Increase Emulation Speed     |  `SELECT + D-Pad Up`  |   `MINUS + D-Pad Up`  | `SELECT + D-Pad Up`     | `CTRL + 1`          | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                            |            |   |
+| Decrease Emulation Speed         |  `SELECT + D-Pad Down` |   `MINUS + D-Pad Down` | `SELECT + D-Pad Down`    | `CTRL + 2`          | `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                       |            |   |
+| Load State              |  `SELECT + L1`          |    `MINUS + L1` | `SELECT + L1`      | `CTRL + A`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                   |           |   |
+| Save State              |  `SELECT + R1`          |    `MINUS + R1` | `SELECT + R1`       | `CTRL + S`          | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack (Standalone)` `Duckstation (Standalone)`  `PCSX2 (Standalone)`                   |            |   |
+| Rewind                  |  `SELECT + L2`          |  `MINUS + L2` |  `SELECT + L2`      |  `CTRL + -`          | `RetroArch` `Duckstation (Standalone)`                                                      |            |   |
+| Fast forward            |  `SELECT + R2`          |   `MINUS + R2`|  `SELECT + R2`     | `CTRL + +`          |  `RetroArch` `Duckstation (Standalone)` `MelonDS (Standalone)`   `PCSX2 (Standalone)`                                    |            |   |
+
+## Simple Radial Menu on Controllers
+
+| Function                 | Xbox| Nintendo  | Playstation  |Command      | System Support     |    Comment |
+| :---                    | :---:               |    |:---:                 |  :---:  |     :---:          |  :---:     |
+| Simple Radial Menu      |  `SELECT + Left Joystick`    |      `MINUS + Left Joystick`      |   `SELECT + Left Joystick`         |     |  Opens the Radial Menu on Controllers |
+
 
 ## Additional Hotkeys
 
@@ -53,8 +60,17 @@ This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
 
 | Function                 | Button / Combination     | System Support     |    Comment |
 | :---                    | :---:                    |       :---:          |  :---:     |
-| Insert Credit           |  `SELECT`                |     `RetroArch`  `MAME (Standalone)` `FBNeo`     |            |
+| Insert Credit           |  `SELECT`               |     `RetroArch`  `MAME (Standalone)` `FBNeo`     |            |
 
+### PS4 Dualshock 4 and PS5 DualSense
+
+The touchpads acts as a mouse and can be used to navigate mouse based inputs.
+
+| Function                 | Button / Combination     | System Support     |    Comment |
+| :---                    | :---:                    |       :---:          |  :---:     |
+| Full Touchpad          |             |      |         The entire touchpad acts a mouse   |
+| Right Touchpad Click         |  `Left Mouse Click`                |      |         |
+| Left Touchpad Click         |  `Right Mouse Click`                |      |         |
 
 ## Radial Menu System