diff --git a/wiki-rtd/docs/wiki_controllers/generic/controllers-generic.md b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md
similarity index 89%
rename from wiki-rtd/docs/wiki_controllers/generic/controllers-generic.md
rename to wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md
index 1ed88e3..5fc79bd 100644
--- a/wiki-rtd/docs/wiki_controllers/generic/controllers-generic.md
+++ b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard-hotkeys.md
@@ -1,36 +1,8 @@
-# Generic Controllers
+# Generic Standard: RetroDECK Hotkeys
-**Note these inputs are part of the upcoming 0.8b update.**
+## What are the Official profiles called?
-
-
-
-Generic Controllers is a broad category that encompasses the vast majority of third party controllers.
-
-## Generic - Standard
-
-The Standard type has the same layout and amount of inputs as all modern controllers aka the Standard Default.
-
-- A dpad.
-- Four top buttons: R1, R2, L1, L2
-- Four face buttons: A, B, X, Y
-- Start and Select
-- Two clickable joysticks: R3 and L3
-
-Bonus:
-
-- A home/xbox/playstation button
-
-#### Steam Input support
-Yes
-
-### What is the Official profile called?
-
-- Generic - Standard : `RetroDECK: Generic - Standard`
-
-#### What is the Current Version Number of the profile?
-
-WIP
+- Generic Standard : `RetroDECK: Generic - Standard`
## Global Hotkeys: Generic Button Combos
diff --git a/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md
new file mode 100644
index 0000000..bb995cd
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/generic/standard/generic-standard.md
@@ -0,0 +1,31 @@
+# Generic - Standard Type Controllers
+
+
+
+
+Two examples of Generic Standard type controllers. The 8BitDo Pro2 and the Xiaomi Controller.
+
+## What is a Generic - Standard Type Controller?
+
+The Standard type has the same layout and amount of inputs as all modern controllers aka the Standard Default.
+
+- A dpad.
+- Four top buttons: R1, R2, L1, L2
+- Four face buttons: A, B, X, Y
+- Start and Select
+- Two clickable joysticks: R3 and L3
+
+Bonus:
+
+- A home/xbox/playstation button
+
+#### Steam Input support
+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?
+
+- Generic Standard : `RetroDECK: Generic - Standard`
+
diff --git a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
index 54133ed..21b9619 100644
--- a/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
+++ b/wiki-rtd/docs/wiki_controllers/playstation/dualshock-3.md
@@ -10,7 +10,7 @@ Yes, 2.17 `hid-sony`
## What is the Official RetroDECK - Steam Input Profile called?
-- DualShock 3 / Sixaxis: `RetroDECK: Dualshock 3`
+- DualShock 3 / Sixaxis: `RetroDECK: DualShock 3`
### RetroDECK Hotkeys
diff --git a/wiki-rtd/docs/wiki_general/retrodeck-input-support.md b/wiki-rtd/docs/wiki_general/retrodeck-input-support.md
index ef8c849..0ca2bb2 100644
--- a/wiki-rtd/docs/wiki_general/retrodeck-input-support.md
+++ b/wiki-rtd/docs/wiki_general/retrodeck-input-support.md
@@ -6,28 +6,30 @@ NOTE: These are upcomming in the 0.8b update
## Nintendo Controllers
-| Controller | Profile Name | Version | Link | Original System | Comment |
-| :--- | :---: | :---: | :---: | :---: | :---: |
-| Switch Pro Controller | `RetroDECK: Switch Pro` | `v.1b` | [Nintedo Controllers](../wiki_controllers/controllers-nintendo.md) | `Nintendo Switch` | |
+| Controller | Profile 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/) | [Nintendo Hotkeys](../../wiki_controllers/nintendo/nintendo-hotkeys/) | |
## Sony Controllers
-| Controller | Profile Name | Version | Link | Original System | Comment |
-| :--- | :---: | :---: | :---: | :---: | :---: |
-| Xbox 360 Controller | `RetroDECK: Xbox 360` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox 360` | |
-| Xbox Wireless Controller | `RetroDECK: Xbox Wireless` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox One/S/X` | Also used for Elite Series 2 |
+| Controller | Profile 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/) | [Playstation Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys/)| |
+| DualShock 4 | `RetroDECK: DualShock 4` | `v.1b` | Playstation 3 | [DualShock 4](../../wiki_controllers/playstation/dualshock-4/) | [Playstation Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys/)| |
+| DualSense | `RetroDECK: DualSense` | `v.1b` | Playstation 3 | [DualSense](../../wiki_controllers/playstation/dualsense/) | [Playstation Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys/)| |
+| DualSense Edge | `RetroDECK: Dualshock 3` | `v.1b` | Playstation 3 | [DualSense Edge](../../wiki_controllers/playstation/dualsense-edge/) | [Playstation Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys/)| |
+
## Microsoft Controllers
-| Controller | Profile Name | Version | Link | Original System | Comment |
-| :--- | :---: | :---: | :---: | :---: | :---: |
-| Xbox 360 Controller | `RetroDECK: Xbox 360` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox 360` | |
-| Xbox Wireless Controller | `RetroDECK: Xbox Wireless` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox One/S/X` | Also used for Elite Series 2 |
-
+| Controller | Profile 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/) | [Xbox Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys/)| |
+| Xbox Wireless Controller| `RetroDECK: Xbox Wireless` | `v.1b` | Xbox One / S / X | [Xbox Wireless Controller](../../wiki_controllers/xbox/xbox-wireless/) | [Xbox Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys/)| |
+| Xbox Elite Wireless Controller Series 1 / 2| `RetroDECK: Xbox Wireless` | `v.1b` | Xbox One / S / X | [Xbox Elite Wireless Controller Series 1 / 2](../../wiki_controllers/xbox/xbox-wireless-elite/) | [Xbox Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys/)| Works as a normal Xbox Wireless in Steam Input|
## Generic Controllers
-| Controller Type | Profile Name | Version | Link | Original System | Comment |
-| :--- | :---: | :---: | :---: | :---: | :---: |
-| Xbox 360 Controller | `RetroDECK: Xbox 360` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox 360` | |
-| Xbox Wireless Controller | `RetroDECK: Xbox Wireless` | `v.1b` | [Xbox Controllers](../wiki_controllers/controllers-xbox.md) | `Xbox One/S/X` | Also used for Elite Series 2 |
+| Controller | Profile Name | Version | Original System | Controller Link | Hotkeys Link | Comment |
+| :--- | :---: | :---: | :---: | :---: | :---: | :---: |
+| Generic Standard | `RetroDECK: Switch Pro` | `v.1b` | Nintendo Switch | [Switch Pro](../../wiki_controllers/nintendo/switch-pro/) | [Nintendo Hotkeys](../../wiki_controllers/nintendo/nintendo-hotkeys/) |
diff --git a/wiki-rtd/docs/wiki_steam/enable-controllers-steam.md b/wiki-rtd/docs/wiki_steam/enable-controllers-steam.md
index 9f5d4ed..4524a05 100644
--- a/wiki-rtd/docs/wiki_steam/enable-controllers-steam.md
+++ b/wiki-rtd/docs/wiki_steam/enable-controllers-steam.md
@@ -34,7 +34,7 @@ Open up Steam
### Prerequisites
* You need to have enabled controller input in Steam (above).
-* You need to have added RetroDECK to Steam, more info here: [Add RetroDECK to Steam](../wiki_howto_faq/add-to-steam.md)
+* You need to have added RetroDECK to Steam, more info here: [Add RetroDECK to Steam](../wiki_howto_faq/add-to-steam/)
* You need to have the controller or controllers plugged in / connected for the `Controller Icon` to show up next to the Cog icon in each game and
### Controller Settings
@@ -43,4 +43,4 @@ Open up Steam
2. Make sure you have a controller plugged in / connected
3. Click on the new `Controller Icon 🎮` next to the ⚙️ icon on the right side of the Steam window.
4. By pressing on it you will open the `Steam Input` window wher you can customize the controllers inputs / download community templates / enable the RetroDECK templates for your controller.
-5. Read more information here: [RetroDECK with Steam Input](../wiki_controllers/about-steam-input.md) and the `Controllers and Input 🎮` section on this wiki.
+5. Read more information here: [RetroDECK with Steam Input](../wiki_controllers/about-steam-input/) and the `Controllers and Input 🎮` section on this wiki.
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index ce2334b..e1a5091 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -184,6 +184,10 @@ nav:
- Steam Deck - Controller: wiki_controllers/steam/controllers-steamdeck.md
- Steam - Steam Controller (WIP): wiki_controllers/steam/controllers-steam.md
+ - Controllers - Generic - Standard Type (WIP):
+ - Generic Standard - RetroDECK Hotkeys: wiki_controllers/generic/standard/generic-standard-hotkeys.md
+ - About Generic Standard: wiki_controllers/generic/standard/generic-standard.md
+
- Controllers - (WIP):
- Accessibility - Controllers (WIP): wiki_controllers/controllers-accessibility.md
- Arcade - Controllers (WIP): wiki_controllers/controllers-arcade.md