diff --git a/wiki-rtd/docs/wiki_controllers/steam/steam-controller-gordon.md b/wiki-rtd/docs/wiki_controllers/steam/steam-controller-gordon.md
index c1d3fb0..f680b06 100644
--- a/wiki-rtd/docs/wiki_controllers/steam/steam-controller-gordon.md
+++ b/wiki-rtd/docs/wiki_controllers/steam/steam-controller-gordon.md
@@ -25,95 +25,3 @@ KERNEL=="hidraw*", ATTRS{idVendor}=="28de", MODE="0666"
# Valve HID devices over bluetooth hidraw
KERNEL=="hidraw*", KERNELS=="*28DE:*", MODE="0666"
```
-
-## What is the Official - Steam Controller: Gordon RetroDECK profile called?
-
-- Steam Controller - Gordon: `RetroDECK: Steam Controller - Gordon`
-
-### The hotkey button
-The global hotkeys are activated by pressing and holding the `HKB` aka the `HotKey Button` and pressing the corresponing button togheter for the command you want to do.
-For the Steam Controller Gordon the `HotKey Button` is both `SELECT` and `L4`, you can press either depending on what you feel is more confortable.
-
-### Global Hotkeys: Steam Controller Gordon Button Combos
-
-`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 | `HKB + A` | `CTRL + P` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | |
-| Take Screenshot | `HKB + B` | `CTRL + X` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | |
-| Fullscreen Toggle | `HKB + X` | `CTRL + ENTER` | `Citra` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu` | |
-| Open Menu | `HKB + Y` | `CTRL + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu` |
-| Quit Emulator | `HKB + Start` | `CTRL + Q` |`RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu` | | |
-| Previous State Slot | `HKB + D-Pad Left` | `CTRL + J` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`| | |
-| Next State Slot | `HKB + D-Pad Right` | `CTRL + K` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2`|
-| Increase Emulation Speed | `HKB + D-Pad Up` | `CTRL + 1` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | |
-| Decrease Emulation Speed | `HKB + D-Pad Down` | `CTRL + 2` | `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2`| | |
-| Load State | `HKB + L1` | `CTRL + A` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | |
-| Save State | `HKB + R1` | `CTRL + S` | `RetroArch` `Citra` `Dolphin/Primehack` `Duckstation` `PCSX2` | |
-| Rewind | `HKB + L2` | `CTRL + -` | `RetroArch` `Duckstation` | |
-| Fast forward | `HKB + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | |
-| Simple Radial Menu | `HKB + 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 Touchpad as Temporary Mouse
-
-By holding `HKB` and moving the `Right Touchpad` you can use it as a mouse for various systems that uses mouse input.
-
-| Function | Button / Combination| Command | Comment |
-| :--- | :---: | :---: | :---: |
-| Touchpad as Mouse | `HKB + Right Touchpad` | | |
-| Right Click | `HKB + L3` | `Right Click` | |
-| Left Click | `HKB + R3` | `Left Click` | |
-
-
-### Right Touchpad: Joystick Mode / Mouse Mode Switch
-
-By pressing `R4` and you can switch the right between semi-permanent Joystick Mode or Mouse Mode.<br>
-This function is useful for games that the primary input is a mouse as you don't need to hold either of `SELECT` or `L4`.<br>
-
-**Example usecases:**
-
-- `ScummVM` for point and click games.
-- `Dolphin` for `Wiimote` movement.
-- Lightgun games.
-- `PC-Systems` type games.
-
-
-**NOTE:** That going into the global hotkeys mode above by pressing `SELECT` or `L4` will switch the Right Touchpad to Joystick Mode again.
-
-
-| Function | Button / Combination| Command | Comment |
-| :--- | :---: | :---: | :---: |
-| Touchpad as Mouse / Joystick Switch | `R4` | | |
-| Left Click - Mouse Mode | `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 | `HKB` | `RetroArch` `MAME` `FBNeo` | |
-
diff --git a/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-builtin.md b/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-builtin.md
deleted file mode 100644
index a482437..0000000
--- a/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-builtin.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Steam Deck - Input Guide
-
-<img src="../../../wiki_images/graphics/steamdeck/steam-deck-inputs.jpg" width="550">
-
-## Steam Deck - Built-in Desktop Mode Hotkeys and Navigation
-
-The Steam Deck comes with several built-in hotkeys that you can use in Desktop Mode.
-
-| Function | Button / Combination | Comment |
-| :--- | :---: | :---: |
-| Joystick Mouse | `Right Stick` | |
-| Touchpad as Mouse | `Right Touchpad` | |
-| Left Mouse Click | `R3` / `Right Touchpad Click` / `R2` | |
-| Middle Mouse Click | `Left Touchpad Click` | |
-| Right Mouse Click | `L2` | |
-| Horizontal and Vertical Scrolling | `Left Touchpad` | |
-| Left Ctrl | `L1` | |
-| Left Alt | `R1` | |
-| Space | `Y` | |
-| Show Keyboard | `X` | |
-| Escape | `B` / `Start` | |
-| Tab | `Select` | |
-| Enter | `A` | |
-| Left Shift | `L4` | |
-| Super Key | `L5` | |
-| Page Up | `R4` | |
-| Page Down | `R5` | |
-| Arrow Key - Up | `D-Pad Up` / `Left Stick Up` | |
-| Arrow Key - Down | `D-Pad Down` / `Left Stick Down` | |
-| Arrow Key - Left | `D-Pad Left` / `Left Stick Left` | |
-| Arrow Key - Right | `D-Pad Right` / `Left Stick Right` | |
diff --git a/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-controller.md b/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-controller.md
deleted file mode 100644
index 9c72a8b..0000000
--- a/wiki-rtd/docs/wiki_controllers/steam/steamdeck-neptune-controller.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Steam Deck - Controller
-
-<img src="../../../wiki_images/graphics/steamdeck/rd_sd_screen1.jpeg" width="350">
-
-
-## Steam Deck - Input Guide
-
-<img src="../../../wiki_images/graphics/steamdeck/steam-deck-inputs.jpg" width="550">
-
-
-## RetroDECK - Steam Deck Hotkey Layouts
-
-RetroDECK from the 0.8.0b ships with two different layouts for the Steam Deck: `RetroDECK: Steam Deck - Neptune <version number> SIMPLE` and `RetroDECK: Steam Deck - Neptune <version number> FULL` with the only difference being the complexity of the built in radial menus and the amount of options at your disposal on the left touchpad.
-
-Both layouts have the same button hotkeys seen on this page.
-
-### The hotkey button
-The global hotkeys are activated by pressing and holding the `HKB` aka the `HotKey Button` and pressing the corresponing button togheter for the command you want to do.
-On the Steam Deck can be either `L4`, `R4` and `Select` depending on what is closest for the button combo you are trying to press.
-
-**Example:**
-
-You want to do the command `Pause / Resume`. <br>
-You press and hold either `L4` or `R4` or `Select` and press `A` to trigger the command.
-
-### Global Hotkeys: Button Combos list
-The global hotkeys are activated by pressing the hotkey 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 | `HKB + A` | `CTRL + P` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | |
-| Take Screenshot | `HKB + B` | `CTRL + X` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` | |
-| Fullscreen Toggle | `HKB + X` | `CTRL + ENTER` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `MelonDS` `PCSX2` `Yuzu (Legacy)` | |
-| Open Menu | `HKB + Y` | `CTRL + M` | `RetroArch` `Duckstation` `PCSX2` `Yuzu (Legacy)` `PPSSPP` |
-| Quit Emulator | `HKB + Start` | `CTRL + Q` |`RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `Yuzu (Legacy)` `PPSSPP` | | |
-| Previous State Slot | `HKB + D-Pad Left` | `CTRL + J` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` | | |
-| Next State Slot | `HKB + D-Pad Right` | `CTRL + K` | `RetroArch` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` |
-| Increase Emulation Speed | `HKB + D-Pad Up` | `CTRL + 1` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2`| | |
-| Decrease Emulation Speed | `HKB + D-Pad Down` | `CTRL + 2` | `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2`| | |
-| Load State | `HKB + L1` | `CTRL + A` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` | |
-| Save State | `HKB + R1` | `CTRL + S` | `RetroArch` `Citra (Legacy)` `Dolphin/Primehack` `Duckstation` `PCSX2` `PPSSPP` | |
-| Rewind | `HKB + L2` | `CTRL + -` | `RetroArch` `Duckstation` | |
-| Fast forward | `HKB + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` `PPSSPP` | |
-| Swap Screens | `HKB + L3` | `CTRL + TAB` | `Citra (Legacy)` `MelonDS` `Cemu` | |
-| Escape | `HKB + R3` | `ESC` | `PC-Systems` `OpenBOR` `GZDoom` `Solarus` `IkemanGO` | |
-
-
-### 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` | |
-
-## Radial Menu System
-
-The radial menu system is located on the left touchpad on the Steam Deck with layout depending on what layout you choose.
-
-### The FULL Layout
-
-[RetroDECK: Steam Deck - Neptune FULL](../radial-menus/controller-steamdeck-full-radial.md)
-
-### The SIMPLE Layout
-
-The SIMPLE layout got the same menu as the external controllers.
-
-[RetroDECK: Steam Deck - Neptune SIMPLE](../radial-menus/controller-simple-radial.md)
-
-## Built-in Hotkeys and Navigation
-
-The Steam Deck also comes with several built-in global hotkeys that you can use:
-
-[Steam Deck: Built-in Hotkeys](steamdeck-neptune-builtin.md)
diff --git a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
index ff928f6..1e4aaac 100644
--- a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
+++ b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
@@ -19,7 +19,7 @@
## Other quick tips
-- Read up on the [Steam Deck - Controller](../../wiki_controllers/steam/steamdeck-neptune-controller.md) to ease your navigation (controller layout required).
+- Read up on the [Steam Deck - Controller](../../wiki_rd_controls/hotkeys-steamdeck-neptune.md) to ease your navigation (controller layout required).
- Read up on the [EmulationStation DE: User Guide](../../wiki_es_de/esde-guide.md).
- Check out our other software recommendations for the Steam Deck [Steam Deck - Software Recommendations](../../wiki_devices/steamdeck/steamdeck-software.md).
- Check various optional optimizations that can make some emulators run even better [Steam Deck - Optimizations](../../wiki_devices/steamdeck/steamdeck-optimize.md).
@@ -59,7 +59,7 @@ Then `Tools` - `Install: RetroDECK Controller Layouts`.
### Step 4 (Optional): Extras
- Get RetroDECK Steam Grid art with BoilR or add it manually from [SteamgridDB](https://www.steamgriddb.com/search/grids?term=RetroDeck) for the Steam Grid.
-- Read up on the [Steam Deck - Controller](../../wiki_controllers/steam/steamdeck-neptune-controller.md) to ease your navigation.
+- Read up on the [Steam Deck - Controller](../../wiki_rd_controls/hotkeys-steamdeck-neptune.md) to ease your navigation.
- Read up on the [ES DE: User Guide](../../wiki_es_de/esde-guide.md)
- Check out our other software recommendations for the Steam Deck [Steam Deck - Software Recommendations](../../wiki_devices/steamdeck/steamdeck-software.md).
- Check various optional optimizations that can make some emulators run even better [Steam Deck - Optimizations](../../wiki_devices/steamdeck/steamdeck-optimize.md).
diff --git a/wiki-rtd/docs/wiki_general/supported-controllers.md b/wiki-rtd/docs/wiki_general/supported-controllers.md
index b01bf13..8fc6bbc 100644
--- a/wiki-rtd/docs/wiki_general/supported-controllers.md
+++ b/wiki-rtd/docs/wiki_general/supported-controllers.md
@@ -69,7 +69,7 @@ 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: RetroDECK Hotkeys](../wiki_rd_controls/hotkeys-generic-standard.md)| Majority of 3rd Party Controllers with a Standard Layout |
+| Generic Standard | `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
@@ -78,17 +78,16 @@ 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_rd_controls/hotkeys-nintendo.md) | |
+| Switch Pro | `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
-Controllers made by Nintendo for the Nintendo systems.
+Controllers / Consoles made by Valve.
| Controller | Layout Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
-| Steam Deck - Controller | `RetroDECK: RetroDECK: Steam Deck - Neptune FULL`| `v.1.1b` | Steam Deck LCD/OLED | [Steam Deck - Controller](../wiki_controllers/steam/steamdeck-neptune-controller.md) | [Steam Deck Hotkeys](../wiki_controllers/steam/steamdeck-neptune-controller.md) | FULL Radial Menu System |
-| Steam Deck - Controller | `RetroDECK: RetroDECK: Steam Deck - Neptune SIMPLE`| `v.1b` | Steam Deck LCD/OLED | [Steam Deck - Controller](../wiki_controllers/steam/steamdeck-neptune-controller.md) | [Steam Deck Hotkeys](../wiki_controllers/steam/steamdeck-neptune-controller.md) | SIMPLE Radial Menu System |
-| Steam Controller - Gordon | `RetroDECK: Steam Controller - Gordon` | `v.1b` | Steam Devices | [Steam Controller - Gordon](../wiki_controllers/steam/s| Steam Deck - Controller | `RetroDECK: RetroDECK: Steam Deck - Neptune`| `v.1b` | Steam Deck LCD/OLED | [Steam Deck - Controller](../wiki_controllers/steam/steamdeck-neptune-controller.md) | [Steam Deck Hotkeys](../wiki_controllers/steam/steamdeck-neptune-controller.md) | |team-controller-gordon.md) | [Steam Controller - Gordon Hotkeys](../wiki_controllers/steam/steam-controller-gordon.md) | |
+| Steam Deck: Neptune | `RetroDECK: RetroDECK: Steam Deck - Neptune`| `v.1.1b` | Steam Deck LCD/OLED | [Steam Deck - Neptune](../wiki_controllers/steam/steamdeck-neptune.md) | [Steam Deck: Hotkeys](../wiki_rd_controls/hotkeys-steamdeck-neptune.md) | Has two radial menu systems |
+| Steam Controller: Gordon | `RetroDECK: Steam Controller - Gordon` | `v.1b` | Steam Devices | [Steam Controller - Gordon](../wiki_controllers/steam/steam-controller-gordon.md) | [Steam Controller: Hotkeys](../wiki_controllers/steam/steam-controller-gordon.md) | |
### Playstation Controllers
@@ -108,6 +107,6 @@ Controllers made by Microsoft for the Xbox systems.
| Controller | Layout Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
-| Xbox 360 Controller | `RetroDECK: Xbox 360` | `v.1b` | Xbox 360 | [Xbox 360 Controller](../wiki_controllers/xbox/xbox-360.md) | [Xbox Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| |
-| Xbox Wireless Controller| `RetroDECK: Xbox Wireless` | `v.1b` | Xbox One / S / X | [Xbox Wireless Controller](../wiki_controllers/xbox/xbox-wireless.md) | [Xbox Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| |
-| Xbox Elite Wireless Controller Series 1 / 2| `RetroDECK: Xbox Wireless` | `v.1b` | Xbox S / X | [Xbox Elite Wireless Controller Series 1 / 2](../wiki_controllers/xbox/xbox-wireless-elite.md) | [Xbox Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| Works as a normal Xbox Wireless in Steam Input|
+| Xbox 360 | `RetroDECK: Xbox 360` | `v.1b` | Xbox 360 | [Xbox 360 Controller](../wiki_controllers/xbox/xbox-360.md) | [Xbox: Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| |
+| Xbox Wireless | `RetroDECK: Xbox Wireless` | `v.1b` | Xbox One / S / X | [Xbox Wireless Controller](../wiki_controllers/xbox/xbox-wireless.md) | [Xbox: Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| |
+| Xbox Elite Wireless Series 1 / 2| `RetroDECK: Xbox Wireless` | `v.1b` | Xbox S / X | [Xbox Elite Wireless Controller Series 1 / 2](../wiki_controllers/xbox/xbox-wireless-elite.md) | [Xbox: Hotkeys](../wiki_controllers/xbox/xbox-hotkeys.md)| Works as a normal Xbox Wireless in Steam Input|
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-generic-standard.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-generic-standard.md
index 471c0fc..0b4bcc8 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-generic-standard.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-generic-standard.md
@@ -1,13 +1,21 @@
# Generic Standard: RetroDECK Hotkeys
-## What are the Official profiles called?
+## What is the RetroDECK Steam Input Template called?
- Generic Standard : `RetroDECK: Generic - Standard`
+## Simple Radial Menu
-## Global Hotkeys: Generic Button Combos
+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-simple.md) to see all the available commands.
+
+## Global Hotkeys: Generic
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>
@@ -33,14 +41,7 @@ What follows is a list of hotkeys:
| 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-simple.md) to see all the available commands.
-
+## Additional Hotkeys
### Right Joystick as Temporary Mouse
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
index b5ccf77..f41a5ca 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-nintendo.md
@@ -1,12 +1,21 @@
# Nintendo: RetroDECK Hotkeys
-## What are the Official profiles called?
+## What is the RetroDECK Steam Input Templates called?
- Switch Pro Controller: `RetroDECK: Switch Pro`
-## Global Hotkeys: Nintendo Button Combos
+## Simple Radial Menu
+
+The Simple Radial Menu is activated by holding `MINUS (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-simple.md) to see all the available commands.
+
+## Global Hotkeys: Nintendo
The global hotkeys are activated by pressing the `MINUS (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>
@@ -33,13 +42,8 @@ What follows is a list of hotkeys:
| Fast forward | `MINUS (SELECT) + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | |
| Simple Radial Menu | `MINUS (SELECT) + Left Joystick` | | | Opens the Radial Menu |
-### Simple Radial Menu
-The Simple Radial Menu is activated by holding `MINUS (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-simple.md) to see all the available commands.
+## Additional Hotkeys
### Right Joystick as Temporary Mouse
@@ -51,18 +55,18 @@ By holding `MINUS (SELECT) ` and moving the `Right Joystick` you can use it as a
| Right Click | `MINUS (SELECT) + L3` | `Right Click` | |
| Left Click | `MINUS (SELECT) + R3` | `Left Click` | |
-### RetroArch: Additional Hotkeys
+### RetroArch
-These hotkeys also work for RetroArch and are built in.
+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
+### Arcade Systems
-This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
+This hotkey work for `RetroArch`, `MAME`, `FBNEO` and other arcade systems.
| Function | Button / Combination | Emulator Support | Comment |
| :--- | :---: | :---: | :---: |
-| Insert Credit | `MINUS (SELECT) ` | `RetroArch` `MAME` `FBNeo` | |
+| Insert Credit | `MINUS (SELECT)` | `RetroArch` `MAME` `FBNeo` | |
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-playstation.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-playstation.md
index 1f02b1c..ab2c9e6 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-playstation.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-playstation.md
@@ -7,15 +7,24 @@
- DualSense
- DualSense Edge
-## What are the Official profiles called?
+## What are the RetroDECK Steam Input Templates called?
- DualShock 3 / Sixaxis: `RetroDECK: Dualshock 3`
- DualShock 4: `RetroDECK: Dualshock 4`
- DualSense / DualSense Edge: `RetroDECK: DualSense`
+## 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-simple.md) to see all the available commands.
+
## 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>
@@ -42,14 +51,18 @@ What follows is a list of hotkeys:
| 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.
+## Additional Hotkeys
-Read more at the:
+### PS4 Dualshock 4 and PS5 DualSense
-[Standard Controller: Simple Radial Menu](radial-simple.md) to see all the available commands.
+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` | | |
### Right Joystick as Temporary Mouse
@@ -61,28 +74,20 @@ By holding `SELECT` and moving the `Right Joystick` you can use it as a mouse fo
| Right Click | `SELECT + L3` | `Right Click` | |
| Left Click | `SELECT + R3` | `Left Click` | |
-### RetroArch: Additional Hotkeys
+### RetroArch
-These hotkeys also work for RetroArch and are built in.
+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
+### Arcade Systems
-This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
+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_rd_controls/hotkeys-steam-controller-gordon.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-steam-controller-gordon.md
index b8de5ea..6d54b86 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-steam-controller-gordon.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-steam-controller-gordon.md
@@ -4,14 +4,23 @@
- Steam Controller - Gordon: `RetroDECK: Steam Controller - Gordon`
-### The hotkey button (HKB)
+## 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-simple.md) to see all the available commands.
+
+## Global Hotkeys: Steam Controller Gordon
+
+
+**The hotkey button (HKB):**
The global hotkeys are activated by pressing and holding the `HKB` aka the `HotKey Button` and pressing the corresponing button togheter for the command you want to do.
For the Steam Controller - Gordon the `Hotkey Button` is both `SELECT` and `L4`, you can press either depending on what you feel is more confortable.
-### Global Hotkeys: Steam Controller Gordon Button Combos
-
`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>
@@ -36,14 +45,7 @@ For the Steam Controller - Gordon the `Hotkey Button` is both `SELECT` and `L4`,
| Fast forward | `HKB + R2` | `CTRL + +` | `RetroArch` `Duckstation` `MelonDS` `PCSX2` | |
| Simple Radial Menu | `HKB + 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-simple.md) to see all the available commands.
-
+## Additional Hotkeys
### Right Touchpad as Temporary Mouse
@@ -77,7 +79,7 @@ This function is useful for games that the primary input is a mouse as you don't
| Touchpad as Mouse / Joystick Switch | `R4` | | |
| Left Click - Mouse Mode | `R3` | `Left Click` | |
-### RetroArch: Additional Hotkeys
+### RetroArch
These hotkeys also work for RetroArch and are built in.
@@ -85,7 +87,7 @@ These hotkeys also work for RetroArch and are built in.
| :--- | :---: | :---: | :---: |
| Open Menu | `L3 + R3` | `RetroArch` | |
-### Arcade Systems: Additional Hotkeys
+### Arcade Systems
This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune-builtin.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune-builtin.md
deleted file mode 100644
index a482437..0000000
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune-builtin.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Steam Deck - Input Guide
-
-<img src="../../../wiki_images/graphics/steamdeck/steam-deck-inputs.jpg" width="550">
-
-## Steam Deck - Built-in Desktop Mode Hotkeys and Navigation
-
-The Steam Deck comes with several built-in hotkeys that you can use in Desktop Mode.
-
-| Function | Button / Combination | Comment |
-| :--- | :---: | :---: |
-| Joystick Mouse | `Right Stick` | |
-| Touchpad as Mouse | `Right Touchpad` | |
-| Left Mouse Click | `R3` / `Right Touchpad Click` / `R2` | |
-| Middle Mouse Click | `Left Touchpad Click` | |
-| Right Mouse Click | `L2` | |
-| Horizontal and Vertical Scrolling | `Left Touchpad` | |
-| Left Ctrl | `L1` | |
-| Left Alt | `R1` | |
-| Space | `Y` | |
-| Show Keyboard | `X` | |
-| Escape | `B` / `Start` | |
-| Tab | `Select` | |
-| Enter | `A` | |
-| Left Shift | `L4` | |
-| Super Key | `L5` | |
-| Page Up | `R4` | |
-| Page Down | `R5` | |
-| Arrow Key - Up | `D-Pad Up` / `Left Stick Up` | |
-| Arrow Key - Down | `D-Pad Down` / `Left Stick Down` | |
-| Arrow Key - Left | `D-Pad Left` / `Left Stick Left` | |
-| Arrow Key - Right | `D-Pad Right` / `Left Stick Right` | |
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune.md
index 9ac6e86..e996785 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-steamdeck-neptune.md
@@ -1,20 +1,36 @@
# Steam Deck: RetroDECK Hotkeys
-<img src="../../../wiki_images/graphics/steamdeck/rd_sd_screen1.jpeg" width="350">
-
-
-## Steam Deck - Input Guide
-
<img src="../../../wiki_images/graphics/steamdeck/steam-deck-inputs.jpg" width="550">
-## RetroDECK - Steam Deck Hotkey Layouts
+## RetroDECK - Steam Deck Hotkey Templates
-RetroDECK from the 0.8.0b ships with two different layouts for the Steam Deck: `RetroDECK: Steam Deck - Neptune SIMPLE` and `RetroDECK: Steam Deck - Neptune FULL` with the only difference being the complexity of the built in radial menus and the amount of options at your disposal on the left touchpad.
+RetroDECK ships with two different templates for the Steam Deck: `RetroDECK: Steam Deck - Neptune SIMPLE` and `RetroDECK: Steam Deck - Neptune FULL` with the only difference being the complexity of the built in radial menus and the amount of options at your disposal on the left touchpad.
Both layouts have the same button hotkeys seen on this page.
+## Radial Menu System
+
+The radial menu system is located on the left touchpad on the Steam Deck with layout depending on what layout you choose.
+
+### The FULL Layout
+
+[RetroDECK: Steam Deck - Neptune FULL](radial-steamdeck-full.md)
+
+### The SIMPLE Layout
+
+The SIMPLE layout got the same menu as the external controllers.
+
+[RetroDECK: Steam Deck - Neptune SIMPLE](radial-simple.md)
+
### The hotkey button
+
+
+### Global Hotkeys: Steam Deck
+
+
+**The hotkey button (HKB):**
+
The global hotkeys are activated by pressing and holding the `HKB` aka the `HotKey Button` and pressing the corresponing button togheter for the command you want to do.
On the Steam Deck can be either `L4`, `R4` and `Select` depending on what is closest for the button combo you are trying to press.
@@ -23,8 +39,10 @@ On the Steam Deck can be either `L4`, `R4` and `Select` depending on what is clo
You want to do the command `Pause / Resume`. <br>
You press and hold either `L4` or `R4` or `Select` and press `A` to trigger the command.
-### Global Hotkeys: Button Combos list
-The global hotkeys are activated by pressing the hotkey button and holding it while pressing the corresponding other button input.
+**How to active the hotkeys?**
+
+The global hotkeys are activated by pressing the `HKB` and holding it while pressing the corresponding other button input.
+
What follows is a list of hotkeys:
`Function` Shows what the hotkey does. <br>
@@ -52,8 +70,39 @@ What follows is a list of hotkeys:
| Swap Screens | `HKB + L3` | `CTRL + TAB` | `Citra (Legacy)` `MelonDS` `Cemu` | |
| Escape | `HKB + R3` | `ESC` | `PC-Systems` `OpenBOR` `GZDoom` `Solarus` `IkemanGO` `Ryujinx` | |
+## Additional Hotkeys
-### RetroArch: Additional Hotkeys
+### Steam Deck: Desktop Mode Hotkeys
+
+<img src="../../../wiki_images/graphics/steamdeck/steam-deck-inputs.jpg" width="550">
+
+The Steam Deck comes with several built-in hotkeys that you can use in Desktop Mode.
+
+| Function | Button / Combination | Comment |
+| :--- | :---: | :---: |
+| Joystick Mouse | `Right Stick` | |
+| Touchpad as Mouse | `Right Touchpad` | |
+| Left Mouse Click | `R3` / `Right Touchpad Click` / `R2` | |
+| Middle Mouse Click | `Left Touchpad Click` | |
+| Right Mouse Click | `L2` | |
+| Horizontal and Vertical Scrolling | `Left Touchpad` | |
+| Left Ctrl | `L1` | |
+| Left Alt | `R1` | |
+| Space | `Y` | |
+| Show Keyboard | `X` | |
+| Escape | `B` / `Start` | |
+| Tab | `Select` | |
+| Enter | `A` | |
+| Left Shift | `L4` | |
+| Super Key | `L5` | |
+| Page Up | `R4` | |
+| Page Down | `R5` | |
+| Arrow Key - Up | `D-Pad Up` / `Left Stick Up` | |
+| Arrow Key - Down | `D-Pad Down` / `Left Stick Down` | |
+| Arrow Key - Left | `D-Pad Left` / `Left Stick Left` | |
+| Arrow Key - Right | `D-Pad Right` / `Left Stick Right` | |
+
+### RetroArch
These hotkeys also work for RetroArch and are built in.
@@ -61,7 +110,7 @@ These hotkeys also work for RetroArch and are built in.
| :--- | :---: | :---: | :---: |
| Open Menu | `L3 + R3` | `RetroArch` | |
-### Arcade Systems: Additional Hotkeys
+### Arcade Systems
This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
@@ -69,22 +118,3 @@ This hotkey work for RetroArch, MAME, FBNEO and other arcade systems.
| :--- | :---: | :---: | :---: |
| Insert Credit | `Select` | `RetroArch` `MAME` `FBNeo` | |
-## Radial Menu System
-
-The radial menu system is located on the left touchpad on the Steam Deck with layout depending on what layout you choose.
-
-### The FULL Layout
-
-[RetroDECK: Steam Deck - Neptune FULL](radial-steamdeck-full.md)
-
-### The SIMPLE Layout
-
-The SIMPLE layout got the same menu as the external controllers.
-
-[RetroDECK: Steam Deck - Neptune SIMPLE](radial-simple.md)
-
-## Built-in Hotkeys and Navigation
-
-The Steam Deck also comes with several built-in global hotkeys that you can use:
-
-[Steam Deck: Built-in Hotkeys](hotkeys-steamdeck-neptune-builtin.md)
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 02b46f9..4381b1f 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -63,7 +63,6 @@ nav:
- What is the story and goals behind RetroDECK đŊī¸: wiki_about/story-goals.md
- What is included in RetroDECK đĻ: wiki_about/what-is-included.md
- Start using RetroDECK đī¸: wiki_general/retrodeck-start.md
- - RetroDECK Configurator đ§°: wiki_configurator/configurator.md
- Add RetroDECK to Steam â
: wiki_general/add-to-steam.md
- Supported Devices đē: wiki_general/supported-devices.md
- Supported Controllers đšī¸: wiki_general/supported-controllers.md
@@ -89,6 +88,8 @@ nav:
- 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
+ - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
+ - Steam Controller - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
- RetroDECK - Simple Radial Menu: wiki_rd_controls/radial-simple.md
- RetroDECK - Full Radial Menu: wiki_rd_controls/radial-steamdeck-full.md
@@ -111,8 +112,7 @@ nav:
- RetroDECK Installation and Updates: wiki_devices/steamdeck/steamdeck-start.md
- Optimizations: wiki_devices/steamdeck/steamdeck-optimize.md
- Recommended Software: wiki_devices/steamdeck/steamdeck-software.md
- - RetroDECK Controls: wiki_controllers/steam/steamdeck-neptune-controller.md
- - Built-in Controls: wiki_controllers/steam/steamdeck-neptune-builtin.md
+ - Steam Deck - Hotkeys & Layout: wiki_rd_controls/hotkeys-steamdeck-neptune.md
- Guides - Linux Desktop đ§:
@@ -266,8 +266,8 @@ nav:
- 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
+ - Steam Deck - Neptune: wiki_controllers/steam/steamdeck-neptune.md
+ - 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