From f6a6d5164c54a4e45787984ff3dea65a74ca0070 Mon Sep 17 00:00:00 2001
From: laz <thelazorne@protonmail.com>
Date: Wed, 19 Feb 2025 06:19:31 +0100
Subject: [PATCH] external

---
 wiki-rtd/docs/index.md                        |   2 +-
 wiki-rtd/docs/wiki_about/what-is-included.md  |   6 +-
 .../linux_desktop/linux-install.md            |   4 +-
 .../wiki_devices/steamdeck/steamdeck-start.md |   6 +-
 .../wiki_general/supported-controllers.md     |  68 --------------
 .../steam/steam-controller-apply.png          | Bin 0 -> 3635 bytes
 ....mp3 => What will happen to RetroDECK.mp3} | Bin
 .../rd-what-will-happen/what-will-happen.md   |   2 +-
 .../wiki_rd_controls/hotkeys-retrodeck.md     |  83 +++++++++++++++---
 wiki-rtd/mkdocs.yml                           |   1 -
 10 files changed, 82 insertions(+), 90 deletions(-)
 delete mode 100644 wiki-rtd/docs/wiki_general/supported-controllers.md
 create mode 100644 wiki-rtd/docs/wiki_images/steam/steam-controller-apply.png
 rename wiki-rtd/docs/wiki_music/rd-what-will-happen/{What will happen to RetroDECK?!.mp3 => What will happen to RetroDECK.mp3} (100%)

diff --git a/wiki-rtd/docs/index.md b/wiki-rtd/docs/index.md
index 55ccf50..be58ef6 100644
--- a/wiki-rtd/docs/index.md
+++ b/wiki-rtd/docs/index.md
@@ -32,7 +32,7 @@ Those can either be:
 ## What devices and operating systems are supported?
 
 - [Supported Devices & OS](wiki_general/supported-devices.md)
-- [Supported Controllers](wiki_general/supported-controllers.md)
+- [Supported Controllers / Hotkeys](wiki_rd_controls/hotkeys-retrodeck.md)
 
 ---
 
diff --git a/wiki-rtd/docs/wiki_about/what-is-included.md b/wiki-rtd/docs/wiki_about/what-is-included.md
index fd6e3a4..18f8652 100644
--- a/wiki-rtd/docs/wiki_about/what-is-included.md
+++ b/wiki-rtd/docs/wiki_about/what-is-included.md
@@ -238,13 +238,13 @@ It adds separate games to Steam, adds artwork and configures the steam input pro
 
 [SRM - General Guide](../wiki_system_guides/srm/srm-guide.md)
 
-## Steam Input Controller layouts
+## Steam Input Controller Templates
 
-For all inputs layouts included in RetroDECK.
+For all Steam Inputs Templates included in RetroDECK.
 
 **Read more here:**
 
-[Supported Controllers](../wiki_general/supported-controllers.md).
+[Supported Controllers / Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md).
 
 
 ## Supported Devices
diff --git a/wiki-rtd/docs/wiki_devices/linux_desktop/linux-install.md b/wiki-rtd/docs/wiki_devices/linux_desktop/linux-install.md
index 3fbca28..458f926 100644
--- a/wiki-rtd/docs/wiki_devices/linux_desktop/linux-install.md
+++ b/wiki-rtd/docs/wiki_devices/linux_desktop/linux-install.md
@@ -23,7 +23,7 @@ Run the following command:
 
 `flatpak install Flathub net.retrodeck.retrodeck`
 
-## First Run - Quick Start
+## Quickstart Guide
 
 1. Start RetroDECK for the first time
 2. Choose where RetroDECK should create the main folder `retrodeck/`: `Internal Storage`,  `SD Card` or `Custom Location`.
@@ -31,7 +31,7 @@ Run the following command:
 4. Put the ROMs & game files inside `retrodeck/roms/`.
 5. Choose to install Steam Controller Templates for RetroDECK (this should be checked by default) during installation.
 5. Add RetroDECK to Steam: [How-to: Add RetroDECK to Steam](../../wiki_management/add-to-steam.md).
-6. Enable controller support in Steam: [How-to: Enable Controllers in Steam ](../../wiki_general/supported-controllers.md).
+6. Enable controller support in Steam: [Supported Controllers / Hotkeys](../../wiki_rd_controls/hotkeys-retrodeck.md).
 7. Connect your controller to your desktop.
 8. Navigate to RetroDECK in Steam
 9. Go to `🎮 Controller Settings` -> `Controller Layouts` -> `Templates` and enable the template for the controller you are using.
diff --git a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
index 2b2de9a..e3feaeb 100644
--- a/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
+++ b/wiki-rtd/docs/wiki_devices/steamdeck/steamdeck-start.md
@@ -6,7 +6,7 @@
 
 Depending on what language you have set in `Desktop Mode`, things might be named differently.
 
-## Quickstart guide
+## Quickstart Guide
 
 - Switch to `Desktop Mode`: Press the `Steam button` -> `Power` -> `Switch to Desktop`
 - Install RetroDECK: Open the Discover application and search for RetroDECK. Press the install button.
@@ -17,8 +17,8 @@ Depending on what language you have set in `Desktop Mode`, things might be named
 - **Optional** Get RetroDECK Steam Grid art and add it to your Steam library with BoilR, or add the art manually from [SteamgridDB](https://www.steamgriddb.com/search/grids?term=RetroDeck).
 - Add BIOS and ROMs: Put the BIOS files inside `retrodeck/bios/` and ROMs & game files inside `retrodeck/roms/`.
 - Switch back to `Game Mode`: Go to RetroDECK on the Steam Grid under `Library` -> `Non-Steam`.
-- Configure Controller Layouts: Add the RetroDECK: `Steam Deck - Neptune Official Template` under `🎮 Controller Settings` -> `Controller Layouts` -> `Templates`. Choose either the SIMPLE radial layout or FULL radial layout.
-- **Optional** If you have external controllers connected you can also apply those templates via `🎮 Controller Settings` -> `Controller Layouts` -> `Templates`.
+-  Configure Controller Layouts: Add the RetroDECK: `Steam Deck - Neptune Official Template` under `🎮 Controller Settings` -> `Controller Layouts` -> `Templates`. Choose either the SIMPLE radial layout or FULL radial layout.
+- **Optional** If you have external controllers connected you can also apply those templates via `🎮 Controller Settings` -> `Controller Layouts` -> `Templates`. 
 - Read up on the [RetroDECK: Controller Hotkeys](../../wiki_rd_controls/hotkeys-retrodeck.md)..
 - Launch RetroDECK and Enjoy!
 
diff --git a/wiki-rtd/docs/wiki_general/supported-controllers.md b/wiki-rtd/docs/wiki_general/supported-controllers.md
deleted file mode 100644
index 7520cf6..0000000
--- a/wiki-rtd/docs/wiki_general/supported-controllers.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# RetroDECK - Supported Controllers
-
-<img src="../../wiki_icons/pixelitos/game-input.png" width="75">
-
-## RetroDECK Controller Mapping
-
-RetroDECK uses Steam Input for advanced controller mapping. More controllers will be added as Steam Input supports them.
-
-### Customizing Controls
-
-- Rebind buttons in RetroDECK's Steam Input Templates and emulators.
-- Create your own profile, but updates to Steam or RetroDECK might break it.
-- If broken, revert to Official Controller Profiles or reinstall from the RetroDECK Configurator.
-
-## Prerequisites for Steam Input
-
-### Adding RetroDECK to Steam
-
-1. In Steam, go to the `Games` tab.
-2. Press `Add non-Steam game to My library`.
-3. Select RetroDECK. You can also add it manually or via software like `BoilR`.
-
-### Linux Desktop - steam-devices
-
-- The `steam-devices` package is usually part of the Steam installation for many distributions.
-- Required for Steam to recognize controllers.
-- Steam will warn you if `steam-devices` is missing.
-- Check your distribution's instructions to install it if needed.
-
-**Note:** Not needed for SteamOS-based devices like the Steam Deck or most gaming distributions like Bazzite, Chimera, Nobara, and more.
-
-### Enable All Steam Input in Steam
-
-1. In Steam, press the `Steam` top menu.
-2. Go to `Settings`.
-3. Press `🎮 Controller`.
-4. Enable all Steam Inputs for `Xbox`, `PlayStation`, `Switch Pro`, `Generic`.
-5. Close the `Settings`.
-
-### Finding the Templates
-
-1. Select RetroDECK in Steam.
-2. Go to `🎮 Controller Settings`.
-3. Select `Controller Layouts`.
-4. Choose `Templates`.
-
-**Note:** 
-
-On Linux Desktop, connect an external controller via cable, Bluetooth, or wireless for the `🎮 Controller Settings` icon to show up.
-
-## Steam Input Templates
-
-What follows is a list with links of the currently supported Steam Input Templates.
-
-
-| Controller         | Template Name |  Version      |   Original System   |   Controller Link |  Hotkeys Link   |  Comment  |
-| :---               | :---:       | :---:         |     :---:           |  :---:            |   :---:         |    :---:  |
-| Generic Standard   | `RetroDECK: Generic - Standard` | `v.1b` | Varies |[Generic Standard](../wiki_controllers/generic/generic-standard.md)|[RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md) |  Majority of 3rd Party Controllers with a Standard Layout |
-| Switch Pro         | `RetroDECK: Switch Pro`         | `v.1b` | Nintendo Switch | [Switch Pro](../wiki_controllers/nintendo/switch-pro.md)|[RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md) | |
-| Steam Deck: Neptune| `RetroDECK: Steam Deck - Neptune`| `v.1.1b` | Steam Deck LCD/OLED |[Steam Deck - Neptune](../wiki_controllers/steam/steamdeck-neptune.md)   | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.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)  | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| DualShock 3        | `RetroDECK: DualShock 3`        | `v.1b` | PlayStation 3 |[DualShock 3](../wiki_controllers/playstation/dualshock-3.md) | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| DualShock 4        | `RetroDECK: DualShock 4`        | `v.1b` | PlayStation 4 |[DualShock 4](../wiki_controllers/playstation/dualshock-4.md) | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| DualSense          | `RetroDECK: DualSense`          | `v.1b` | PlayStation 5 |[DualSense](../wiki_controllers/playstation/dualsense.md)| [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| DualSense Edge     | `RetroDECK: Dualshock 3`        | `v.1b` | PlayStation 5 | [DualSense Edge](../wiki_controllers/playstation/dualsense-edge.md) | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| Xbox 360           | `RetroDECK: Xbox 360`           | `v.1b` | Xbox 360 | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)|  |
-| Xbox Wireless      | `RetroDECK: Xbox Wireless`      | `v.1b` | Xbox One / S / X | [Xbox 360 Controller](../wiki_controllers/xbox/xbox-360.md) | [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.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)   |  [RetroDECK: Controller Hotkeys](../wiki_rd_controls/hotkeys-retrodeck.md)| Works as a normal Xbox Wireless in Steam Input |
diff --git a/wiki-rtd/docs/wiki_images/steam/steam-controller-apply.png b/wiki-rtd/docs/wiki_images/steam/steam-controller-apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..1005f8f728cdf72f5b72ce9643acc610880eb3b6
GIT binary patch
literal 3635
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
ZfhS%L&2F+Az&{P7qp7b^`@r`3e*pE*45I)5

literal 0
HcmV?d00001

diff --git a/wiki-rtd/docs/wiki_music/rd-what-will-happen/What will happen to RetroDECK?!.mp3 b/wiki-rtd/docs/wiki_music/rd-what-will-happen/What will happen to RetroDECK.mp3
similarity index 100%
rename from wiki-rtd/docs/wiki_music/rd-what-will-happen/What will happen to RetroDECK?!.mp3
rename to wiki-rtd/docs/wiki_music/rd-what-will-happen/What will happen to RetroDECK.mp3
diff --git a/wiki-rtd/docs/wiki_music/rd-what-will-happen/what-will-happen.md b/wiki-rtd/docs/wiki_music/rd-what-will-happen/what-will-happen.md
index 456f2f1..231a3fe 100644
--- a/wiki-rtd/docs/wiki_music/rd-what-will-happen/what-will-happen.md
+++ b/wiki-rtd/docs/wiki_music/rd-what-will-happen/what-will-happen.md
@@ -3,7 +3,7 @@
 <img src="../thalin-the-troll.png"  width="300">
 
 
-![type:audio](What will happen to RetroDECK?!.mp3)
+![type:audio](What will happen to RetroDECK.mp3)
 
 
 ©️ Music Lyrics: Lazorne the Troll Hunter (┛ಠ_ಠ)┛彡┻━┻   ©️ Art: Thalin the Troll
diff --git a/wiki-rtd/docs/wiki_rd_controls/hotkeys-retrodeck.md b/wiki-rtd/docs/wiki_rd_controls/hotkeys-retrodeck.md
index 67eb3af..0adeb3c 100644
--- a/wiki-rtd/docs/wiki_rd_controls/hotkeys-retrodeck.md
+++ b/wiki-rtd/docs/wiki_rd_controls/hotkeys-retrodeck.md
@@ -1,20 +1,81 @@
 # RetroDECK Hotkeys
 
+## RetroDECK Controller Mapping
+
+RetroDECK uses Steam Input for advanced controller mapping. More controllers will be added as Steam Input supports them.
+
+### Customizing Controls
+
+- Rebind buttons in RetroDECK's Steam Input Templates and emulators.
+- Create your own profile, but updates to Steam or RetroDECK might break it.
+- If broken, revert to Official Controller Profiles or reinstall from the RetroDECK Configurator.
+
+---
+
+## Prerequisites for Steam Input
+
+### Add RetroDECK to Steam
+
+Read more here: [How-to: Add RetroDECK to Steam](../wiki_management/add-to-steam.md)
+
+### Linux Desktop - steam-devices
+
+- The `steam-devices` package is usually part of the Steam installation for many distributions.
+- Required for Steam to recognize controllers.
+- Steam will warn you if `steam-devices` is missing.
+- Check your distribution's instructions to install it if needed.
+
+**Note:** Not needed for SteamOS-based devices like the Steam Deck or most gaming distributions like Bazzite, Chimera, Nobara, and more.
+
+### Linux Desktop - Enable All Steam Input in Steam
+
+1. In Steam, press the `Steam` top menu.
+2. Go to `Settings`.
+3. Press `🎮 Controller`.
+4. Enable all Steam Inputs for `Xbox`, `PlayStation`, `Switch Pro`, `Generic`.
+5. Close the `Settings`.
+
+## Applying the Templates
+
+1. Select RetroDECK in Steam.
+2. Press `🎮` -> `🎮 Controller Settings` -> `Controller Layouts` -> `Templates`. 
+
+**Steam Deck:** 
+
+<img src="../../../wiki_images/steam/steam-controller-icon.png" width="50">
+
+**Linux Desktop:** 
+
+<img src="../../../wiki_images/steam/steam-controller-icon-bar.png" width="200">
+
+On Linux Desktop, connect an external controller via cable, Bluetooth, or wireless for the `🎮 Controller Settings` icon to show up.
+
+
+<img src="../../../wiki_images/steam/steam-templates.png" width="600">
+
+---
+
+
 ## RetroDECK: Steam Input Templates
 
-RetroDECK ships with the following Steam Input Templates:
+What follows is a list with links of the currently supported Steam Input Templates.
 
-- **Generic "Standard" Controllers:** `RetroDECK: Generic - Standard`
-- **Switch Pro Controller:** `RetroDECK: Switch Pro`
-- **DualShock 3 / Sixaxis:** `RetroDECK: Dualshock 3`
-- **DualShock 4:** `RetroDECK: Dualshock 4`
-- **DualSense / DualSense Edge:** `RetroDECK: DualSense`
-- **Steam Controller (Gordon):** `RetroDECK: Steam Controller - Gordon`
-- **Steam Deck (Neptune):** `RetroDECK: Steam Deck - Neptune FULL` (default) & `RetroDECK: Steam Deck - Neptune SIMPLE`
-- **Xbox 360 Controller:** `RetroDECK: Xbox 360`
-- **Xbox Wireless Controller/Elite Series:** `RetroDECK: Xbox Wireless`
 
-In Steam go to `🎮 Controller Settings` -> `Controller Layouts` -> `Templates` and enable the template for the controller you are using.
+| Controller         | Template Name |  Version      |   Original System   |   Controller Link |  Comment  |
+| :---               | :---:       | :---:         |     :---:           |  :---:            |    :---:  |
+| Generic Standard   | `RetroDECK: Generic - Standard` | `v.1b` | Varies |[Generic Standard](../wiki_controllers/generic/generic-standard.md)|  Majority of 3rd Party Controllers with a Standard Layout |
+| Switch Pro         | `RetroDECK: Switch Pro`         | `v.1b` | Nintendo Switch | [Switch Pro](../wiki_controllers/nintendo/switch-pro.md)| |
+| Steam Deck: Neptune| `RetroDECK: Steam Deck - Neptune`| `v.1.1b` | Steam Deck LCD/OLED |[Steam Deck - Neptune](../wiki_controllers/steam/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)|  |
+| DualShock 3        | `RetroDECK: DualShock 3`        | `v.1b` | PlayStation 3 |[DualShock 3](../wiki_controllers/playstation/dualshock-3.md) |  |
+| DualShock 4        | `RetroDECK: DualShock 4`        | `v.1b` | PlayStation 4 |[DualShock 4](../wiki_controllers/playstation/dualshock-4.md)|  |
+| DualSense          | `RetroDECK: DualSense`          | `v.1b` | PlayStation 5 |[DualSense](../wiki_controllers/playstation/dualsense.md)|  |
+| DualSense Edge     | `RetroDECK: DualSense Edge`        | `v.1b` | PlayStation 5 | [DualSense Edge](../wiki_controllers/playstation/dualsense-edge.md)|  |
+| Xbox 360           | `RetroDECK: Xbox 360`           | `v.1b` | Xbox 360 | [Xbox 360 Controller](../wiki_controllers/xbox/xbox-360.md)|  |
+| Xbox Wireless      | `RetroDECK: Xbox Wireless`      | `v.1b` | Xbox One / S / X | [Xbox Wireless Controller](../wiki_controllers/xbox/xbox-wireless.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) |  |
+
+---
 
 ## The HotKey Button
 
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 8af55ff..b963718 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -77,7 +77,6 @@ nav:
     - What is systems are included in RetroDECK?: wiki_about/what-is-included.md
     - What is the Story Behind RetroDECK?: wiki_about/story-goals.md
     - Supported Devices & OS: wiki_general/supported-devices.md
-    - Supported Controllers: wiki_general/supported-controllers.md
     - Version History: wiki_rd_versions/version-history.md
     - Report a Problem & Known Issues: wiki_general/known-issues.md
     - How to Contribute?: wiki_about/contibute-retrodeck.md