diff --git a/wiki-rtd/docs/wiki_controllers/gimmick/udraw-tablet.md b/wiki-rtd/docs/wiki_controllers/gimmick/udraw-tablet.md
index b0b53ae..2b927f1 100644
--- a/wiki-rtd/docs/wiki_controllers/gimmick/udraw-tablet.md
+++ b/wiki-rtd/docs/wiki_controllers/gimmick/udraw-tablet.md
@@ -1,4 +1,4 @@
-## UDraw Tablet
+# UDraw Tablet
 
 <img src="../../../wiki_images/controllers/udraw-tablet.png" width="250">
 
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/about-lightguns.md b/wiki-rtd/docs/wiki_controllers/lightgun/about-lightguns.md
new file mode 100644
index 0000000..ca531cf
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/about-lightguns.md
@@ -0,0 +1,3 @@
+# 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.
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightguns.md b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun1.md
similarity index 100%
rename from wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightguns.md
rename to wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun1.md
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md
new file mode 100644
index 0000000..2f16dbb
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun3.md
@@ -0,0 +1,99 @@
+# 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
+
+<img src="../../wiki_images/controllers/lightgun-sinden.png" width="250">
+
+[Sinden Website](https://sindenlightgun.com/)
+
+### How to configure?
+
+WIP
+
+## GUN4IR
+
+<img src="../../wiki_images/controllers/lightgun-gun4ir.png" width="200">
+
+The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system. <br>
+
+- 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
+
+<img src="../../wiki_images/controllers/lightgun-aelightgun.png" width="250">
+
+[AE Light Gun Website](https://www.aelightgun.com/)
+
+### How to configure?
+
+WIP
+
+## AimTrak
+
+<img src="../../wiki_images/controllers/lightgun-aimtrak.png" width="250">
+
+### How to configure?
+
+WIP
+
+## SAMCO - Arduino Powered IR Light Gun
+
+<img src="../../wiki_images/controllers/lightgun-guncon1.png" width="250">
+
+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
+
+<img src="../../wiki_images/logos/guncon-logo.png" width="250">
+
+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
+
+<img src="../../wiki_images/controllers/lightgun-guncon1.png" width="250">
+
+<img src="../../wiki_images/controllers/lightgun-guncon2.png" width="250">
+
+The version one and two of the GunCon only works on CRT displays.
+
+#### How to configure?
+
+WIP
+
+### GunCon 3
+
+<img src="../../wiki_images/controllers/lightgun-guncon3.png" width="250">
+
+The version three for the Playstation 3 works with some modern displays.
+
+#### How to configure?
+
+WIP
+
+
+## Wii Remote Gun
+
+<img src="../../wiki_images/controllers/lightgun-wiigun.png" width="250">
+
+
+### 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
new file mode 100644
index 0000000..2f16dbb
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/controllers-lightgun4.md
@@ -0,0 +1,99 @@
+# 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
+
+<img src="../../wiki_images/controllers/lightgun-sinden.png" width="250">
+
+[Sinden Website](https://sindenlightgun.com/)
+
+### How to configure?
+
+WIP
+
+## GUN4IR
+
+<img src="../../wiki_images/controllers/lightgun-gun4ir.png" width="200">
+
+The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system. <br>
+
+- 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
+
+<img src="../../wiki_images/controllers/lightgun-aelightgun.png" width="250">
+
+[AE Light Gun Website](https://www.aelightgun.com/)
+
+### How to configure?
+
+WIP
+
+## AimTrak
+
+<img src="../../wiki_images/controllers/lightgun-aimtrak.png" width="250">
+
+### How to configure?
+
+WIP
+
+## SAMCO - Arduino Powered IR Light Gun
+
+<img src="../../wiki_images/controllers/lightgun-guncon1.png" width="250">
+
+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
+
+<img src="../../wiki_images/logos/guncon-logo.png" width="250">
+
+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
+
+<img src="../../wiki_images/controllers/lightgun-guncon1.png" width="250">
+
+<img src="../../wiki_images/controllers/lightgun-guncon2.png" width="250">
+
+The version one and two of the GunCon only works on CRT displays.
+
+#### How to configure?
+
+WIP
+
+### GunCon 3
+
+<img src="../../wiki_images/controllers/lightgun-guncon3.png" width="250">
+
+The version three for the Playstation 3 works with some modern displays.
+
+#### How to configure?
+
+WIP
+
+
+## Wii Remote Gun
+
+<img src="../../wiki_images/controllers/lightgun-wiigun.png" width="250">
+
+
+### How to configure?
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/gun4ir.md b/wiki-rtd/docs/wiki_controllers/lightgun/gun4ir.md
new file mode 100644
index 0000000..81c0b72
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/gun4ir.md
@@ -0,0 +1,27 @@
+# GUN4IR
+
+<img src="../../../wiki_images/controllers/lightgun-gun4ir.png" width="200">
+
+The GUN4IR uses LED point strips around your display and allows you to rebuild existing lightguns or toyguns into the GUN4IR system.
+
+[GUN4IR Website](https://www.gun4ir.com/)
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration and Licence
+
+- The Gun4IR configuration software with a valid license is required that be bought from the website.
+- 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 calibration you can unplug the device and use it in Linux.
+
+## How to configure
+
+WIP
diff --git a/wiki-rtd/docs/wiki_controllers/lightgun/sinden.md b/wiki-rtd/docs/wiki_controllers/lightgun/sinden.md
new file mode 100644
index 0000000..cfc9337
--- /dev/null
+++ b/wiki-rtd/docs/wiki_controllers/lightgun/sinden.md
@@ -0,0 +1,23 @@
+# Sinden
+
+<img src="../../../wiki_images/controllers/lightgun-sinden.png" width="250">
+
+[Sinden Website](https://sindenlightgun.com/)
+
+### Steam Input support
+No
+
+### Linux Kernel Support
+No
+
+### Emulator usecase
+`MAME` `Dolphin` `RetroArch` `Duckstation` `PSCX2` `RPCS3` `PC-Systems`
+
+## Calibration and Licence
+
+The Sinden calibration software works with Linux and licence comes with purchase of a lightgun.
+
+## How to configure
+
+WIP
+
diff --git a/wiki-rtd/mkdocs.yml b/wiki-rtd/mkdocs.yml
index 500fbb4..f7a5877 100644
--- a/wiki-rtd/mkdocs.yml
+++ b/wiki-rtd/mkdocs.yml
@@ -154,7 +154,7 @@ nav:
     - RetroDECK and Udev Rules: wiki_controllers/about/about-udev.md
     - RetroDECK and Steam Input: wiki_steam/steam-input.md
 
-  - Controllers - Nintendo (WIP):
+  - Controllers - Nintendo (WIP) 🎮:
     - Nintendo - RetroDECK Hotkeys: wiki_controllers/nintendo/nintendo-hotkeys.md
     - Switch - Pro Controller: wiki_controllers/nintendo/switch-pro.md
     - Switch - Joy-Cons: wiki_controllers/nintendo/joycon.md
@@ -164,7 +164,7 @@ nav:
     - Wii - Wii Balance Board: wiki_controllers/nintendo/wii-balance-board.md
     - Gamecube - PC / WiiU Adapter: wiki_controllers/nintendo/gamecube-adapter.md
 
-  - Controllers - Playstation (WIP):
+  - Controllers - Playstation (WIP) 🎮:
     - 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
@@ -173,7 +173,7 @@ nav:
     - Playstation 5 - DualSense: wiki_controllers/playstation/dualsense.md
     - Playstation 5 - DualSense Edge: wiki_controllers/playstation/dualsense-edge.md
 
-  - Controllers - Xbox (WIP):
+  - Controllers - Xbox (WIP) 🎮:
     - 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
@@ -182,25 +182,25 @@ nav:
     - Xbox S/X - Xbox Elite Series 2: wiki_controllers/xbox/xbox-wireless-elite.md
     - Xbox Adaptive Controller: wiki_controllers/accessibility/xac.md
 
-  - Controllers - Steam/Valve (WIP):
+  - Controllers - Steam/Valve (WIP) 🎮:
     - Steam Deck - Controller: wiki_controllers/steam/controllers-steamdeck.md
     - Steam - Steam Controller: wiki_controllers/steam/controllers-steam.md
 
-  - Controllers - Generic - Standard Type (WIP):
+  - 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 - Accessibility (WIP):
+  - Controllers - Accessibility (WIP) ♿:
     - About Accessibility Controllers: wiki_controllers/accessibility/about-accessibility.md
     - Xbox Adaptive Controller: wiki_controllers/accessibility/xac.md
 
-  - Controllers - Arcade (WIP):
+  - Controllers - Arcade (WIP) 🕹️:
     - About Arcade Controllers: wiki_controllers/arcade/about-arcade.md
 
-  - Controllers - Flight (WIP):
+  - Controllers - Flight (WIP) ✈️:
     - About Flight Controllers: wiki_controllers/flight/about-flight.md
 
-  - Controllers - Gimmick (WIP):
+  - Controllers - Gimmick (WIP) 🤡:
     - About Gimmick Controllers: wiki_controllers/gimmick/about-gimmick.md
     - Buzz - Buzzers: wiki_controllers/gimmick/buzz-buzzers.md
     - Cycling Sports - Cyberbike: wiki_controllers/gimmick/cyberbike.md
@@ -212,6 +212,11 @@ nav:
     - Steel Battalion  - Cockpit: wiki_controllers/gimmick/steel-battalion-cockpit.md
     - Udraw - Tablet: wiki_controllers/gimmick/udraw-tablet.md
 
+  - Controllers - Lightguns (WIP) 🔫:
+    - About Lightguns: wiki_controllers/lightgun/about-lightguns.md
+    - Gun4IR: wiki_controllers/lightgun/gun4ir.md
+    - Sinden: wiki_controllers/lightgun/sinden.md
+
   - Controllers - (WIP):
     - Lightguns - Controllers (WIP): wiki_controllers/controllers-lightguns.md
     - Music / Rhythm - Controllers (WIP): wiki_controllers/controllers-music.md