diff --git a/README.md b/README.md
index cd28941..963c0a9 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 ![alt text](https://i.imgur.com/CODzG0F.png?4)
 
 ### About:
+**This fork adds proper support for Joy-Con**.<br>
 This module aims to be an all-in-one module for controllers.
 It adds .kl files to fix keybindings on many game controllers.
 
@@ -17,6 +18,7 @@ It adds .kl files to fix keybindings on many game controllers.
  - Xbox One S
  - Xbox Series X|S
  - Switch Pro Controller ??? (not tested yet)
+ - SWITCH JOY-CON
  - Nacon REVOLUTION PRO CONTROLLER
  - Zeemote SteelSeries FREE
  
@@ -33,18 +35,20 @@ It adds .kl files to fix keybindings on many game controllers.
  - [Black-Seraph](https://github.com/Black-Seraph) for Pro Controller Keylayout from CleanRom (GPD XD+).
  - [MattMasc](https://github.com/MattMasc) for DualShock 2 Keylayout.
  - [RuiGuilherme](https://github.com/RuiGuilherme) for Xbox Series X|S.
+ - [s1w2a3](https://github.com/s1w2a3) for Joy-Con.
  
  
- ### Changelog:
- - **1.0:** Initial GitHub Release.
- - **1.1:** Added Dualshock 3 support.
- - **1.2:** Fixed some DS4 mappings.
- - **1.2.1:** Updated to Magisk v19 template.
- - **1.3.0:** Merged [djsmax](https://github.com/djsmax) changes.
- - **1.4:** Added Switch Pro Controller Support ???.
- - **1.4.1:** Added Xbox 360 Controller (vid_045e&pid_028e) support.
- - **1.4.2** Added Nacon REVOLUTION PRO CONTROLLER. ([Moe-Baker](https://github.com/Moe-Baker))
- - **1.4.3:** Updated to Magisk v20 template.
- - **1.5.0:** Added support for DualSense and Zeemote SteelSeries FREE controllers.
- - **1.5.1:** Added support for DualShock 2. ([MattMasc](https://github.com/MattMasc))
- - **1.5.2:** Added support for Xbox Series X|S. ([RuiGuilherme](https://github.com/RuiGuilherme))
\ No newline at end of file
+ ### Changelog ("-" means that it was done on the original repo OneController):
+ - **-1.0:** Initial GitHub Release.
+ - **-1.1:** Added Dualshock 3 support.
+ - **-1.2:** Fixed some DS4 mappings.
+ - **-1.2.1:** Updated to Magisk v19 template.
+ - **-1.3.0:** Merged [djsmax](https://github.com/djsmax) changes.
+ - **-1.4:** Added Switch Pro Controller Support ???.
+ - **-1.4.1:** Added Xbox 360 Controller (vid_045e&pid_028e) support.
+ - **-1.4.2** Added Nacon REVOLUTION PRO CONTROLLER. ([Moe-Baker](https://github.com/Moe-Baker))
+ - **-1.4.3:** Updated to Magisk v20 template.
+ - **-1.5.0:** Added support for DualSense and Zeemote SteelSeries FREE controllers.
+ - **-1.5.1:** Added support for DualShock 2. ([MattMasc](https://github.com/MattMasc))
+ - **-1.5.2:** Added support for Xbox Series X|S. ([RuiGuilherme](https://github.com/RuiGuilherme))
+ - **1.0.0:** Added support for Joy-Con ([s1w2a3](https://github.com/s1w2a3))
diff --git a/module.prop b/module.prop
index 66967f5..1668454 100644
--- a/module.prop
+++ b/module.prop
@@ -1,6 +1,6 @@
-id=OneController
-name=1Controller - 1 Module to support all Controllers.
-version=v1.5.2
-versionCode=152
-author=Electric1447
-description=This module adds .kl file (keylayout) for Dualshock 4/3, Xbox Series X|S, Xbox One/S, Xbox 360.
+id=OneControllerPlus
+name=OneControllerPlus - 1 Module to support all Controllers.
+version=v1.0.0
+versionCode=100
+author=Electric1447 and s1w2a3
+description=This module adds .kl file (keylayout) for Dualshock 4/3, Xbox Series X|S, Xbox One/S, Xbox 360, Switch Pro Controller and Joy-Con.
diff --git a/system/usr/keylayout/Vendor_057e_Product_2006.kl b/system/usr/keylayout/Vendor_057e_Product_2006.kl
new file mode 100644
index 0000000..feebd30
--- /dev/null
+++ b/system/usr/keylayout/Vendor_057e_Product_2006.kl
@@ -0,0 +1,12 @@
+key 309   BUTTON_MODE
+key 314   BUTTON_SELECT
+key 317   BUTTON_THUMBL
+key 310   BUTTON_L1
+key 312   BUTTON_L2
+key 544   DPAD_UP
+key 545   DPAD_DOWN
+key 546   DPAD_LEFT
+key 547   DPAD_RIGHT
+
+axis 0x00 X
+axis 0x01 Y
\ No newline at end of file
diff --git a/system/usr/keylayout/Vendor_057e_Product_2007.kl b/system/usr/keylayout/Vendor_057e_Product_2007.kl
new file mode 100644
index 0000000..a46f459
--- /dev/null
+++ b/system/usr/keylayout/Vendor_057e_Product_2007.kl
@@ -0,0 +1,24 @@
+# Device name: Nintendo Switch Right Joy-Con
+# Device id  : Vendor_057e_Product_2007
+
+# key <scancode> <action_button>
+# key 304 BUTTON_A
+key 304 BUTTON_B
+# key 305 BUTTON_B
+key 305 BUTTON_A
+# key 307 BUTTON_X
+key 307 BUTTON_X
+# key 308 BUTTON_Y
+key 308 BUTTON_Y
+key 311 BUTTON_R1
+key 313 BUTTON_R2
+key 318 BUTTON_THUMBR
+key 315 BUTTON_START
+key 316 HOME
+
+# axis <scancode> <axis_name>
+axis 0x03 Z
+axis 0x04 RZ
+
+# keyboard
+# key <scancode> <action_button>
\ No newline at end of file