diff --git a/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md
deleted file mode 100644
index 57a4a20..0000000
--- a/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Generic Standard: RetroDECK Hotkeys
-
-## What are the Official profiles called?
-
-- Generic Standard : `RetroDECK: Generic - Standard v.1b`
-
-
-## Global Hotkeys: Generic 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` | |
-| 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` | | |
-| Simple Radial Menu | `SELECT + Left Joystick` | | | Opens the Radial Menu |
-
-### Simple Radial Menu
-
-The Simple Radial Menu is activated by holding `SELECT` and by moving the `Left Joystick`, then by pressing `L3` allows you press the selected radial button.
-
-Read more at the:
-
-[Standard Controller: Simple Radial Menu](../../radial-menus/controller-simple-radial.md) to see all the available commands.
-
-
-### Right Joystick as Temporary 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/generic/standard/generic-standard.md b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md
index bb995cd..00351b0 100644
--- a/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md
+++ b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md
@@ -25,7 +25,14 @@ Yes, in most cases depending on controller age.
### Linux Kernel Support
Yes, in most cases depending on controller age.
-### What is the Official profile called?
+## What is the Official profile called?
- Generic Standard : `RetroDECK: Generic - Standard`
+
+### RetroDECK Hotkeys
+
+Read more here:
+
+
+[Generic Standard: RetroDECK Hotkeys](../../../wiki_rd_controls/hotkeys-generic-standard.md)
diff --git a/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md b/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md
index 5a65710..56f8b19 100644
--- a/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md
+++ b/wiki-rtd/docs/wiki_controllers/nintendo/switch-pro.md
@@ -27,3 +27,9 @@ SUBSYSTEM=="usb", ATTR{idProduct}=="2009", ATTR{idVendor}=="057e", ENV{ID_INPUT_
## What is the Official RetroDECK - Steam Input Profile called?
- Switch Pro Controller: `RetroDECK: Switch Pro`
+
+### RetroDECK Hotkeys
+
+Read more here:
+
+[Nintendo: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-nintendo.md)
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md b/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md
index eb26b54..286e820 100644
--- a/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md
+++ b/wiki-rtd/docs/wiki_controllers/playstation/dualsense-edge.md
@@ -30,4 +30,4 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0df2", MODE="0660
The same hotkeys are used for PS3, PS4, PS5 controllers. Read more here:
-[Playstation: RetroDECK Hotkeys](playstation-hotkeys.md)
+[Playstation: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md b/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md
index efb2177..96fa9eb 100644
--- a/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md
+++ b/wiki-rtd/docs/wiki_controllers/playstation/dualsense.md
@@ -30,4 +30,5 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0660
The same hotkeys are used for PS3, PS4, PS5 controllers. Read more here:
-[Playstation: RetroDECK Hotkeys](playstation-hotkeys.md)
+
+[Playstation: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
index b5bd023..385163a 100644
--- a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
+++ b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
@@ -27,4 +27,5 @@ SUBSYSTEM=="input", KERNEL=="event*|input*", KERNELS=="*054C:0268*", TAG+="uacce
The same hotkeys are used for PS3, PS4, PS5 controllers. Read more here:
-[Playstation: RetroDECK Hotkeys](playstation-hotkeys.md)
+
+[Playstation: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md
index 756df14..3f6afad 100644
--- a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md
+++ b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-4.md
@@ -31,4 +31,5 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0660
The same hotkeys are used for PS3, PS4, PS5 controllers. Read more here:
-[Playstation: RetroDECK Hotkeys](playstation-hotkeys.md)
+
+[Playstation: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/playstation-hotkeys.md b/wiki-rtd/docs/wiki_controllers/playstation/playstation-hotkeys.md
deleted file mode 100644
index 888b7a7..0000000
--- a/wiki-rtd/docs/wiki_controllers/playstation/playstation-hotkeys.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# PlayStation: RetroDECK Hotkeys
-
-## What Controllers are supported?
-
-- Dualshock 3 / Sixaxis
-- DualShock 4 V1/V2
-- DualSense
-- DualSense Edge
-
-## What are the Official profiles called?
-
-- DualShock 3 / Sixaxis: `RetroDECK: Dualshock 3`
-- DualShock 4: `RetroDECK: Dualshock 4`
-- DualSense / DualSense Edge: `RetroDECK: DualSense`
-
-## 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 + Cross` | `CTRL + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | |
-| Take Screenshot | `SELECT + Circle` | `CTRL + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | |
-| Fullscreen Toggle | `SELECT + Square` | `CTRL + ENTER` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | |
-| Open Menu | `SELECT + Triangle` | `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` | |
-| Simple Radial Menu | `SELECT + Left Joystick` | | | Opens the Radial Menu |
-
-### Simple Radial Menu
-
-The Simple Radial Menu is activated by holding `SELECT` and by moving the `Left Joystick`, then by pressing `L3` allows you press the selected radial button.
-
-Read more at the:
-
-[Standard Controller: Simple Radial Menu](../radial-menus/controller-simple-radial.md) to see all the available commands.
-
-
-### Right Joystick as Temporary 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` | |
-
-### PS4 Dualshock 4 and PS5 DualSense: Additional Hotkeys
-
-The touchpads acts as a mouse and can be used to navigate mouse based inputs.
-
-| Function | Button / Combination | Emulator Support | Comment |
-| :--- | :---: | :---: | :---: |
-| Full Touchpad | | | The entire touchpad acts a mouse |
-| Right Touchpad Click | `Left Mouse Click` | | |
-| Left Touchpad Click | `Right Mouse Click` | | |
diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md
index f742afc..902f033 100644
--- a/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md
+++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-360.md
@@ -30,3 +30,9 @@ This should not needed for the Steam Deck, SteamOS and most gaming focus Linux d
## What is the Official RetroDECK - Steam Input Profile called?
- Xbox 360 Controller: `RetroDECK: Xbox 360`
+
+### RetroDECK Hotkeys
+
+The same hotkeys are used for Xbox controllers. Read more here:
+
+[Xbox: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-xbox.md)
diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md
index 9c0dade..713a48b 100644
--- a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md
+++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless-elite.md
@@ -34,3 +34,9 @@ This should not needed for the Steam Deck, SteamOS and most gaming focus Linux d
## What is the Official RetroDECK - Steam Input Profile called?
- Xbox Wireless Controller/Elite Series: `RetroDECK: Xbox Wireless`
+
+### RetroDECK Hotkeys
+
+The same hotkeys are used for Xbox controllers. Read more here:
+
+[Xbox: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-xbox.md)
diff --git a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md
index 46ce928..7705cb9 100644
--- a/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md
+++ b/wiki-rtd/docs/wiki_controllers/xbox/xbox-wireless.md
@@ -33,3 +33,10 @@ This should not needed for the Steam Deck, SteamOS and most gaming focus Linux d
## What is the Official RetroDECK - Steam Input Profile called?
- Xbox Wireless Controller/Elite Series: `RetroDECK: Xbox Wireless`
+
+
+### RetroDECK Hotkeys
+
+The same hotkeys are used for Xbox controllers. Read more here:
+
+[Xbox: RetroDECK Hotkeys](../../wiki_rd_controls/hotkeys-xbox.md)
diff --git a/wiki-rtd/docs/wiki_general/retrodeck-input-support.md b/wiki-rtd/docs/wiki_general/supported-controllers.md
similarity index 83%
rename from wiki-rtd/docs/wiki_general/retrodeck-input-support.md
rename to wiki-rtd/docs/wiki_general/supported-controllers.md
index 21814ec..c8aceb4 100644
--- a/wiki-rtd/docs/wiki_general/retrodeck-input-support.md
+++ b/wiki-rtd/docs/wiki_general/supported-controllers.md
@@ -8,7 +8,8 @@ Generic Controllers encompasses the vast majority of 3rd party controllers.
| Controller | Layout Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
-| Generic Standard Type | `RetroDECK: Generic - Standard` | `v.1b` | Varies | [Generic Standard](../wiki_controllers/generic/standard/generic-standard.md) | [Generic Standard - Hotkeys](../wiki_controllers/generic/standard/generic-standard-hotkeys.md)| Majority of 3rd Party Controllers with a Standard Layout |
+| Generic Standard Type | `RetroDECK: Generic - Standard` | `v.1b` | Varies | [Generic Standard](../wiki_controllers/generic/standard/generic-standard.md) |
+[Generic Standard: RetroDECK Hotkeys](../wiki_rd_controls/hotkeys-generic-standard.md)| Majority of 3rd Party Controllers with a Standard Layout |
## Nintendo Controllers
@@ -17,7 +18,7 @@ Controllers made by Nintendo for the Nintendo systems.
| Controller | Layout Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
-| Switch Pro Controller | `RetroDECK: Switch Pro` | `v.1b` | Nintendo Switch | [Switch Pro](../wiki_controllers/nintendo/switch-pro.md) | [Nintendo Hotkeys](../wiki_controllers/nintendo/nintendo-hotkeys.md) | |
+| Switch Pro Controller | `RetroDECK: Switch Pro` | `v.1b` | Nintendo Switch | [Switch Pro](../wiki_controllers/nintendo/switch-pro.md) | [Nintendo: Hotkeys](../wiki_rd_controls/hotkeys-nintendo.md) | |
## Valve/Steam Controllers
@@ -34,10 +35,10 @@ Controllers made by Sony for the PlayStation systems.
| Controller | Layout Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
-| DualShock 3 | `RetroDECK: DualShock 3` | `v.1b` | PlayStation 3 | [DualShock 3](../wiki_controllers/playstation/dualshock-3.md) | [PlayStation Hotkeys](../wiki_controllers/playstation/playstation-hotkeys.md)| |
-| DualShock 4 | `RetroDECK: DualShock 4` | `v.1b` | PlayStation 4 | [DualShock 4](../wiki_controllers/playstation/dualshock-4.md) | [PlayStation Hotkeys](../wiki_controllers/playstation/playstation-hotkeys.md)| |
-| DualSense | `RetroDECK: DualSense` | `v.1b` | PlayStation 5 | [DualSense](../wiki_controllers/playstation/dualsense.md) | [PlayStation Hotkeys](../wiki_controllers/playstation/playstation-hotkeys.md)| |
-| DualSense Edge | `RetroDECK: Dualshock 3` | `v.1b` | PlayStation 5 | [DualSense Edge](../wiki_controllers/playstation/dualsense-edge.md) | [PlayStation Hotkeys](../wiki_controllers/playstation/playstation-hotkeys.md)| |
+| DualShock 3 | `RetroDECK: DualShock 3` | `v.1b` | PlayStation 3 | [DualShock 3](../wiki_controllers/playstation/dualshock-3.md) | [Playstation: Hotkeys](../wiki_rd_controls/hotkeys-playstation.md) | |
+| DualShock 4 | `RetroDECK: DualShock 4` | `v.1b` | PlayStation 4 | [DualShock 4](../wiki_controllers/playstation/dualshock-4.md) | [Playstation: Hotkeys](../wiki_rd_controls/hotkeys-playstation.md) | |
+| DualSense | `RetroDECK: DualSense` | `v.1b` | PlayStation 5 | [DualSense](../wiki_controllers/playstation/dualsense.md) | [Playstation: Hotkeys](../wiki_rd_controls/hotkeys-playstation.md) | |
+| DualSense Edge | `RetroDECK: Dualshock 3` | `v.1b` | PlayStation 5 | [DualSense Edge](../wiki_controllers/playstation/dualsense-edge.md) | [Playstation: Hotkeys](../wiki_rd_controls/hotkeys-playstation.md) | |
## Xbox Controllers
diff --git a/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
similarity index 97%
rename from wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md
rename to wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
index d3c62b9..4bcfe2e 100644
--- a/wiki-rtd/docs/wiki_controllers/nintendo/nintendo-hotkeys.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
@@ -39,7 +39,7 @@ The Simple Radial Menu is activated by holding `SELECT` and by moving the `Left
Read more at the:
-[Standard Controller: Simple Radial Menu](../radial-menus/controller-simple-radial.md) to see all the available commands.
+[Standard Controller: Simple Radial Menu](radial-simple.md) to see all the available commands.
### Right Joystick as Temporary Mouse
diff --git a/wiki-rtd/docs/wiki_rd_versions/version_0.8.0b/0.8.0b.md b/wiki-rtd/docs/wiki_rd_versions/version_0.8.0b/0.8.0b.md
index e77e83a..2632231 100644
--- a/wiki-rtd/docs/wiki_rd_versions/version_0.8.0b/0.8.0b.md
+++ b/wiki-rtd/docs/wiki_rd_versions/version_0.8.0b/0.8.0b.md
@@ -424,7 +424,7 @@ This layout encompasses the vast majority of third party controllers that have a
**Information:** [The Generic - Standard](../../wiki_controllers/generic/standard/generic-standard.md)
-**Hotkeys:** [Generic - Standard Hotkeys](../../wiki_controllers/generic/standard/generic-standard-hotkeys.md)
+**Hotkeys:** [Generic Standard - Hotkeys](../../wiki_rd_controls/hotkeys-generic-standard.md)
@@ -436,7 +436,7 @@ This layout encompasses the vast majority of third party controllers that have a
**Information:** [Switch Pro - Hotkeys](../../wiki_controllers/nintendo/switch-pro.md)
-**Hotkeys:** [Switch Pro - Hotkeys](../../wiki_controllers/nintendo/nintendo-hotkeys.md)
+**Hotkeys:** [Nintendo - Hotkeys](../../wiki_rd_controls/hotkeys-nintendo.md)
### Steam Controller
@@ -466,7 +466,7 @@ It switches the Right Touchpad between Permanent Mouse or Right Joystick with th
**Information:** [DualShock 3](../../wiki_controllers/playstation/dualshock-3.md)
-**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
+**Hotkeys:** [Playstation - Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
Extra features in the layout:
@@ -478,8 +478,7 @@ Extra features in the layout:
**Information:** [DualShock 4](../../wiki_controllers/playstation/dualshock-4.md)
-**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
-
+**Hotkeys:** [Playstation - Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
**Extra features for the DualShock 4:**
@@ -500,7 +499,7 @@ Feature: Right click on the left side of the touchpad.
**Information:** [DualSense](../../wiki_controllers/playstation/dualsense.md)
-**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
+**Hotkeys:** [Playstation - Hotkeys](../../wiki_rd_controls/hotkeys-playstation.md)
**Extra features for the DualSense:**
@@ -519,7 +518,7 @@ Feature: Right click on the left side of the touchpad.
**Information:** [Xbox 360](../../wiki_controllers/xbox/xbox-360.md)
-**Hotkeys:** [Xbox - Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys.md)
+**Hotkeys:** [Xbox - Hotkeys](../../wiki_rd_controls/hotkeys-xbox.md)
### Xbox Wireless Controller
@@ -530,7 +529,7 @@ Feature: Right click on the left side of the touchpad.
**Information:** [Xbox Wireless](../../wiki_controllers/xbox/xbox-wireless.md)
-**Hotkeys:** [Xbox - Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys.md)
+**Hotkeys:** [Xbox - Hotkeys](../../wiki_rd_controls/hotkeys-xbox.md)
## Framework / Configurator
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 812cc2e..cb3096b 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -51,7 +51,7 @@ nav:
- What is RetroDECK?: wiki_general/what-is-retrodeck.md
- What is included in RetroDECK?: wiki_general/what-is-included.md
- Supported Devices: wiki_general/supported-devices.md
- - RetroDECK - Controller Profiles (WIP): wiki_general/retrodeck-input-support.md
+ - Supported Controllers: wiki_general/supported-controllers.md
- The RetroDECK Beta: wiki_general/beta-period.md
- Version History (Patchnotes): wiki_rd_versions/version-history.md
- What are you working on?: wiki_development/general/what-are-you-working.on.md
@@ -83,50 +83,24 @@ nav:
- Configurator Features: wiki_configurator/configurator.md
- Ponzu: wiki_configurator/ponzu.md
+ - RetroDECK Controls & Hotkeys 🎮:
+
+ - About ℹ️:
+ - Different Button Prompts in Games: wiki_controllers/about/diffrent-game-inputs.md
+ - RetroDECK and Udev Rules: wiki_controllers/about/about-udev.md
+ - RetroDECK and Steam Input: wiki_steam/steam-input.md
+
+ - Hotkeys & Layouts 🔥:
+ - Generic Standard - Hotkeys & Layout: wiki_rd_controls/hotkeys-generic-standard.md
+ - Nintendo Hotkeys & Layout: wiki_rd_controls/hotkeys-nintendo.md
+ - Playstation Hotkeys & Layout: wiki_rd_controls/hotkeys-playstation.md
+ - Xbox Hotkeys & Layout: wiki_rd_controls/hotkeys-xbox.md
+
+ - Radial Menus ⭕:
+ - RetroDECK - Simple Radial Menu: wiki_rd_controls/radial-simple.md
+ - Steam Deck - Full Radial Menu: wiki_rd_controls/radial-steamdeck-full.md
+
- Controllers 🎮:
- - About 🎮:
- - Different Button Prompts in Games: wiki_controllers/about/diffrent-game-inputs.md
- - RetroDECK and Udev Rules: wiki_controllers/about/about-udev.md
- - RetroDECK and Steam Input: wiki_steam/steam-input.md
- - RetroDECK - Controller Layouts: wiki_general/retrodeck-input-support.md
- - RetroDECK - Controllers - Simple Radial Menu: wiki_controllers/radial-menus/controller-simple-radial.md
- - RetroDECK - Steam Deck - Full Radial Menu: wiki_controllers/radial-menus/controller-steamdeck-full-radial.md
-
- - Nintendo 🎮:
- - Nintendo - RetroDECK Hotkeys: wiki_controllers/nintendo/nintendo-hotkeys.md
- - Switch - Pro Controller: wiki_controllers/nintendo/switch-pro.md
- - Switch - Joy-Cons (WIP): wiki_controllers/nintendo/joycon.md
- - Switch - Ring Fit (WIP): wiki_controllers/nintendo/ring-fit.md
- - Wii U - Gamepad: wiki_controllers/nintendo/wiiu-gamepad.md
- - Wii - Wii Remote (Wiimote): wiki_controllers/nintendo/wii-remote.md
- - Wii - Wii Balance Board (WIP): wiki_controllers/nintendo/wii-balance-board.md
- - Gamecube - PC / WiiU Adapter: wiki_controllers/nintendo/gamecube-adapter.md
-
- - Playstation 🎮:
- - Playstation - RetroDECK Hotkeys: wiki_controllers/playstation/playstation-hotkeys.md
- - Playstation 2 - EyeToy: wiki_controllers/playstation/eyetoy.md
- - Playstation 3 - DualShock 3: wiki_controllers/playstation/dualshock-3.md
- - Playstation 3 - Eye & Move: wiki_controllers/playstation/playstation-move.md
- - Playstation 4 - DualShock 4: wiki_controllers/playstation/dualshock-4.md
- - Playstation 5 - DualSense: wiki_controllers/playstation/dualsense.md
- - Playstation 5 - DualSense Edge: wiki_controllers/playstation/dualsense-edge.md
-
- - Xbox 🎮:
- - Xbox - RetroDECK Hotkeys: wiki_controllers/xbox/xbox-hotkeys.md
- - Xbox 360 - Controller: wiki_controllers/xbox/xbox-360.md
- - Xbox 360 - Kinect V1: wiki_controllers/xbox/xbox-360-kinect.md
- - Xbox One - Kinect V2: wiki_controllers/xbox/xbox-one-kinect.md
- - Xbox One/S/X - Xbox Wireless Controller: wiki_controllers/xbox/xbox-wireless.md
- - Xbox S/X - Xbox Elite Series 2: wiki_controllers/xbox/xbox-wireless-elite.md
- - Xbox Adaptive Controller (WIP): wiki_controllers/accessibility/xac.md
-
- - Steam/Valve 🎮:
- - Steam Deck - Controller: wiki_controllers/steam/steamdeck-neptune-controller.md
- - Steam - Steam Controller - Gordon: wiki_controllers/steam/steam-controller-gordon.md
-
- - Generic - Standard Type 🎮:
- - Generic Standard - RetroDECK Hotkeys: wiki_controllers/generic/standard/generic-standard-hotkeys.md
- - About Generic Standard: wiki_controllers/generic/standard/generic-standard.md
- Accessibility ♿:
- About Accessibility Controllers: wiki_controllers/accessibility/about-accessibility.md
@@ -138,6 +112,9 @@ nav:
- Flight ✈️:
- About Flight Controllers: wiki_controllers/flight/about-flight.md
+ - Generic 🎮:
+ - Generic Standard: wiki_controllers/generic/standard/generic-standard.md
+
- Gimmick 🤡:
- About Gimmick Controllers: wiki_controllers/gimmick/about-gimmick.md
- Buzz - Buzzers (WIP): wiki_controllers/gimmick/buzz-buzzers.md
@@ -174,9 +151,29 @@ nav:
- Singstar - Microphone (WIP): wiki_controllers/music/singstar-microphone.md
- Taiko Drum & Bachi (WIP): wiki_controllers/music/taiko-drum-bachi.md
+ - Nintendo 🎮:
+ - Switch - Joy-Cons (WIP): wiki_controllers/nintendo/joycon.md
+ - Switch - Ring Fit (WIP): wiki_controllers/nintendo/ring-fit.md
+ - Wii U - Gamepad: wiki_controllers/nintendo/wiiu-gamepad.md
+ - Wii - Wii Remote (Wiimote): wiki_controllers/nintendo/wii-remote.md
+ - Wii - Wii Balance Board (WIP): wiki_controllers/nintendo/wii-balance-board.md
+ - Gamecube - PC / WiiU Adapter: wiki_controllers/nintendo/gamecube-adapter.md
+
+ - Playstation 🎮:
+ - Playstation 2 - EyeToy: wiki_controllers/playstation/eyetoy.md
+ - Playstation 3 - DualShock 3: wiki_controllers/playstation/dualshock-3.md
+ - Playstation 3 - Eye & Move: wiki_controllers/playstation/playstation-move.md
+ - Playstation 4 - DualShock 4: wiki_controllers/playstation/dualshock-4.md
+ - Playstation 5 - DualSense: wiki_controllers/playstation/dualsense.md
+ - Playstation 5 - DualSense Edge: wiki_controllers/playstation/dualsense-edge.md
+
- Racing 🏎️:
- About Racing Controllers: wiki_controllers/racing/about-racing.md
+ - Steam/Valve 🎮:
+ - Steam Deck - Controller: wiki_controllers/steam/steamdeck-neptune-controller.md
+ - Steam - Steam Controller - Gordon: wiki_controllers/steam/steam-controller-gordon.md
+
- Toys-to-life 🧸:
- About Toys-to-life Controllers: wiki_controllers/toystolife/about-toys-to-life.md
- Disney Infinity - Infinity Base (WIP): wiki_controllers/toystolife/disney-infinity-base.md
@@ -185,6 +182,14 @@ nav:
- Skylanders - Portal of Power (WIP): wiki_controllers/toystolife/skylanders-portal-of-power.md
- Skylanders - Traptanium Portal (WIP): wiki_controllers/toystolife/skylanders-traptanium-portal.md
+ - Xbox 🎮:
+ - Xbox 360 - Controller: wiki_controllers/xbox/xbox-360.md
+ - Xbox 360 - Kinect V1: wiki_controllers/xbox/xbox-360-kinect.md
+ - Xbox One - Kinect V2: wiki_controllers/xbox/xbox-one-kinect.md
+ - Xbox One/S/X - Xbox Wireless Controller: wiki_controllers/xbox/xbox-wireless.md
+ - Xbox S/X - Xbox Elite Series 2: wiki_controllers/xbox/xbox-wireless-elite.md
+ - Xbox Adaptive Controller (WIP): wiki_controllers/accessibility/xac.md
+
- Community & Helping Out ❤️:
- Discord: wiki_community/discord.md
- Lemmy/Reddit: wiki_community/lemmy-reddit.md