diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/ae-lightgun.md b/wiki-rtd/docs/wiki_controllers/lightgun/ae-lightgun.md
new file mode 100644
index 0000000..cfb3c16
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/ae-lightgun.md
@@ -0,0 +1,22 @@
+# AE Lightgun
+
+
+
+[AE Lightgun Website](https://www.aelightgun.com/)
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration and Licence
+
+WIP
+
+## How to configure
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/aimtrak.md b/wiki-rtd/docs/wiki_controllers/lightgun/aimtrak.md
new file mode 100644
index 0000000..0e6ab36
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/aimtrak.md
@@ -0,0 +1,20 @@
+## AimTrak
+
+
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration and Licence
+
+WIP
+
+## How to configure
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun1.md b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun1.md
deleted file mode 100644
index 2f16dbb..0000000
--- a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun1.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Lightguns Controllers
-
-Lightguns are special type of controllers use to play lightgun games is a broad category that encompasses the vast majority of first / third party controllers, DIY and open source projects.
-
-## Sinden
-
-
-
-[Sinden Website](https://sindenlightgun.com/)
-
-### How to configure?
-
-WIP
-
-## GUN4IR
-
-
-
-The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system.
-
-- A configuration software with a valid license is required that be bought from the website (or come with a GUN4IR total system purchase)
-- The software is as of this date Windows only, you will need to connect the Windows device to the display you want to use.
- - The calibration and firmware updates can be done in Windows on the display you want to play on.
- - After the calibrtion you can unplug the device and use it in Linux (but not RetroDECK yet).
-
-[GUN4IR Website](https://www.gun4ir.com/)
-
-### How to configure?
-
-WIP
-
-## AE Light Gun
-
-
-
-[AE Light Gun Website](https://www.aelightgun.com/)
-
-### How to configure?
-
-WIP
-
-## AimTrak
-
-
-
-### How to configure?
-
-WIP
-
-## SAMCO - Arduino Powered IR Light Gun
-
-
-
-SAMCO is a way to rebuild old Namco GunCon's with Arduino to a IR Light Gun that works with modern displays.
-
-[The SAMCO Project Github](https://github.com/samuelballantyne/IR-Light-Gun)
-
-
-### How to configure?
-
-WIP
-
-## GunCon or G-Con
-
-
-
-The GunCon, known as the G-Con in Europe, is a family of gun peripherals designed by Namco for the PlayStation consoles.
-
-### ConCon 1 and 2
-
-
-
-
-
-The version one and two of the GunCon only works on CRT displays.
-
-#### How to configure?
-
-WIP
-
-### GunCon 3
-
-
-
-The version three for the Playstation 3 works with some modern displays.
-
-#### How to configure?
-
-WIP
-
-
-## Wii Remote Gun
-
-
-
-
-### How to configure?
-
-WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md
deleted file mode 100644
index 2f16dbb..0000000
--- a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Lightguns Controllers
-
-Lightguns are special type of controllers use to play lightgun games is a broad category that encompasses the vast majority of first / third party controllers, DIY and open source projects.
-
-## Sinden
-
-
-
-[Sinden Website](https://sindenlightgun.com/)
-
-### How to configure?
-
-WIP
-
-## GUN4IR
-
-
-
-The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system.
-
-- A configuration software with a valid license is required that be bought from the website (or come with a GUN4IR total system purchase)
-- The software is as of this date Windows only, you will need to connect the Windows device to the display you want to use.
- - The calibration and firmware updates can be done in Windows on the display you want to play on.
- - After the calibrtion you can unplug the device and use it in Linux (but not RetroDECK yet).
-
-[GUN4IR Website](https://www.gun4ir.com/)
-
-### How to configure?
-
-WIP
-
-## AE Light Gun
-
-
-
-[AE Light Gun Website](https://www.aelightgun.com/)
-
-### How to configure?
-
-WIP
-
-## AimTrak
-
-
-
-### How to configure?
-
-WIP
-
-## SAMCO - Arduino Powered IR Light Gun
-
-
-
-SAMCO is a way to rebuild old Namco GunCon's with Arduino to a IR Light Gun that works with modern displays.
-
-[The SAMCO Project Github](https://github.com/samuelballantyne/IR-Light-Gun)
-
-
-### How to configure?
-
-WIP
-
-## GunCon or G-Con
-
-
-
-The GunCon, known as the G-Con in Europe, is a family of gun peripherals designed by Namco for the PlayStation consoles.
-
-### ConCon 1 and 2
-
-
-
-
-
-The version one and two of the GunCon only works on CRT displays.
-
-#### How to configure?
-
-WIP
-
-### GunCon 3
-
-
-
-The version three for the Playstation 3 works with some modern displays.
-
-#### How to configure?
-
-WIP
-
-
-## Wii Remote Gun
-
-
-
-
-### How to configure?
-
-WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun4.md b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun4.md
deleted file mode 100644
index 2f16dbb..0000000
--- a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun4.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Lightguns Controllers
-
-Lightguns are special type of controllers use to play lightgun games is a broad category that encompasses the vast majority of first / third party controllers, DIY and open source projects.
-
-## Sinden
-
-
-
-[Sinden Website](https://sindenlightgun.com/)
-
-### How to configure?
-
-WIP
-
-## GUN4IR
-
-
-
-The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system.
-
-- A configuration software with a valid license is required that be bought from the website (or come with a GUN4IR total system purchase)
-- The software is as of this date Windows only, you will need to connect the Windows device to the display you want to use.
- - The calibration and firmware updates can be done in Windows on the display you want to play on.
- - After the calibrtion you can unplug the device and use it in Linux (but not RetroDECK yet).
-
-[GUN4IR Website](https://www.gun4ir.com/)
-
-### How to configure?
-
-WIP
-
-## AE Light Gun
-
-
-
-[AE Light Gun Website](https://www.aelightgun.com/)
-
-### How to configure?
-
-WIP
-
-## AimTrak
-
-
-
-### How to configure?
-
-WIP
-
-## SAMCO - Arduino Powered IR Light Gun
-
-
-
-SAMCO is a way to rebuild old Namco GunCon's with Arduino to a IR Light Gun that works with modern displays.
-
-[The SAMCO Project Github](https://github.com/samuelballantyne/IR-Light-Gun)
-
-
-### How to configure?
-
-WIP
-
-## GunCon or G-Con
-
-
-
-The GunCon, known as the G-Con in Europe, is a family of gun peripherals designed by Namco for the PlayStation consoles.
-
-### ConCon 1 and 2
-
-
-
-
-
-The version one and two of the GunCon only works on CRT displays.
-
-#### How to configure?
-
-WIP
-
-### GunCon 3
-
-
-
-The version three for the Playstation 3 works with some modern displays.
-
-#### How to configure?
-
-WIP
-
-
-## Wii Remote Gun
-
-
-
-
-### How to configure?
-
-WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/guncon-1-2.md b/wiki-rtd/docs/wiki_controllers/lightgun/guncon-1-2.md
new file mode 100644
index 0000000..d0bc1da
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/guncon-1-2.md
@@ -0,0 +1,31 @@
+# ConCon 1 and 2
+
+
+
+
+
+
+
+The GunCon, known as the G-Con in Europe, is a family of gun peripherals designed by Namco for the PlayStation consoles.
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+### MOD: SAMCO
+Can be rebuilt via the SAMCO project to work on modern displays.
+
+[The SAMCO Project Github](https://github.com/samuelballantyne/IR-Light-Gun)
+
+## Calibration and other requirements
+
+- Requires a CRT TV
+
+## How to configure
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/guncon-3.md b/wiki-rtd/docs/wiki_controllers/lightgun/guncon-3.md
new file mode 100644
index 0000000..9ed60c0
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/guncon-3.md
@@ -0,0 +1,23 @@
+# GunCon 3
+
+
+
+The GunCon 3 for the Playstation 3 works with some modern displays.
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration
+
+WIP
+
+## How to configure
+
+WIP
+
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/samco.md b/wiki-rtd/docs/wiki_controllers/lightgun/samco.md
new file mode 100644
index 0000000..ba4b842
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/samco.md
@@ -0,0 +1,24 @@
+# SAMCO - Arduino Powered IR Light Gun
+
+
+SAMCO is a way to rebuild old Namco GunCon's with Arduino to a IR Light Gun that works with modern displays.
+
+### The SAMCO Project
+[The SAMCO Project Github](https://github.com/samuelballantyne/IR-Light-Gun)
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration and Licence
+
+WIP
+
+## How to configure
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/wii-remote-gun.md b/wiki-rtd/docs/wiki_controllers/lightgun/wii-remote-gun.md
new file mode 100644
index 0000000..33139a1
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/wii-remote-gun.md
@@ -0,0 +1,23 @@
+# Wii Remote Gun
+
+
+
+Some emulators support usage of the Wii Remote as Lightgun emulation. This is not a standard configuration as supported by Dolphin.
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+Yes, since 3.1 - `hid-wiimote`
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration
+
+WIP
+
+## How to configure
+
+WIP
+
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index fa23385..8711f30 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -214,8 +214,14 @@ nav:
- Controllers - Lightguns (WIP) 🔫:
- About Lightguns: wiki_controllers/lightgun/about-lightguns.md
+ - AE Lightgun: wiki_controllers/lightgun/ae-lightgun.md
+ - Aimtrak: wiki_controllers/lightgun/aimtrak.md
- Gun4IR: wiki_controllers/lightgun/gun4ir.md
+ - GunCon 1/2: wiki_controllers/lightgun/guncon-1-2.md
+ - GunCon 3: wiki_controllers/lightgun/guncon-3.md
+ - SAMCO: wiki_controllers/lightgun/samco.md
- Sinden: wiki_controllers/lightgun/sinden.md
+ - Wii Remote Gun: wiki_controllers/lightgun/wii-remote-gun.md
- Controllers - (WIP):
- Music / Rhythm - Controllers (WIP): wiki_controllers/controllers-music.md