diff --git a/EFI-OpenCore/EFI/OC/Drivers/UsbKbDxe.efi b/EFI-OpenCore/EFI/OC/Drivers/UsbKbDxe.efi
deleted file mode 100755
index d9f75d8..0000000
Binary files a/EFI-OpenCore/EFI/OC/Drivers/UsbKbDxe.efi and /dev/null differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist
new file mode 100755
index 0000000..f37c188
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/Info.plist
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>19B88</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>VoodooInput</string>
+	<key>CFBundleIdentifier</key>
+	<string>me.kishorprins.VoodooInput</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>VoodooInput</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>11B500</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>19B89</string>
+	<key>DTSDKName</key>
+	<string>macosx10.15</string>
+	<key>DTXcode</key>
+	<string>1120</string>
+	<key>DTXcodeBuild</key>
+	<string>11B500</string>
+	<key>IOKitPersonalities</key>
+	<dict>
+		<key>Voodoo Input</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>me.kishorprins.VoodooInput</string>
+			<key>IOClass</key>
+			<string>VoodooInput</string>
+			<key>IOProbeScore</key>
+			<integer>200</integer>
+			<key>IOPropertyMatch</key>
+			<dict>
+				<key>VoodooInputSupported</key>
+				<true/>
+			</dict>
+			<key>IOProviderClass</key>
+			<string>IOService</string>
+		</dict>
+	</dict>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Kishor Prins. All rights reserved.</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.iokit.IOHIDFamily</key>
+		<string>2.0</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>14</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>14</string>
+		<key>com.apple.kpi.mach</key>
+		<string>13.0</string>
+	</dict>
+</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput b/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput
new file mode 100755
index 0000000..b6f032f
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Kexts/VoodooInput.kext/Contents/MacOS/VoodooInput differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
index 8f17771..5ab7a80 100755
--- a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18A391</string>
+	<string>18E226</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Controller</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
+	<string>2.1.0, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.rehabman.voodoo.driver.PS2Controller</string>
+	<string>as.acidanthera.voodoo.driver.PS2Controller</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>12D75</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
-	<string>macosx10.8</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0941</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ACPI PS/2 Nub</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Controller</string>
+			<string>as.acidanthera.voodoo.driver.PS2Controller</string>
 			<key>FindMouseDelay</key>
 			<integer>100</integer>
 			<key>IOClass</key>
@@ -69,7 +69,7 @@
 		<key>ApplePS2Controller</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Controller</string>
+			<string>as.acidanthera.voodoo.driver.PS2Controller</string>
 			<key>IOClass</key>
 			<string>ApplePS2Controller</string>
 			<key>IONameMatch</key>
@@ -135,7 +135,7 @@
 		</dict>
 	</dict>
 	<key>OSBundleCompatibleVersion</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>com.apple.iokit.IOACPIFamily</key>
@@ -153,7 +153,5 @@
 	</dict>
 	<key>OSBundleRequired</key>
 	<string>Console</string>
-	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
 </dict>
 </plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller
index 073fb59..a3c1e57 100755
Binary files a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist
new file mode 100755
index 0000000..ea2facb
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.as.acidanthera.voodoo.driver.PS2Keyboard</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>2.1.0</string>
+		<key>CFBundleVersion</key>
+		<string>2.1.0</string>
+	</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard
new file mode 100755
index 0000000..0501573
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
index 49a2d93..dad60e7 100755
--- a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18A391</string>
+	<string>18E226</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Keyboard</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
+	<string>2.1.0, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.rehabman.voodoo.driver.PS2Keyboard</string>
+	<string>as.acidanthera.voodoo.driver.PS2Keyboard</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>12D75</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
-	<string>macosx10.8</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0941</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ApplePS2Keyboard</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Keyboard</string>
+			<string>as.acidanthera.voodoo.driver.PS2Keyboard</string>
 			<key>IOClass</key>
 			<string>ApplePS2Keyboard</string>
 			<key>IOProviderClass</key>
@@ -275,14 +275,6 @@
 				</dict>
 				<key>Default</key>
 				<dict>
-					<key>ActionSwipeDown</key>
-					<string>3b d, 37 d, 7d d, 7d u, 37 u, 3b u</string>
-					<key>ActionSwipeLeft</key>
-					<string>3b d, 37 d, 7b d, 7b u, 37 u, 3b u</string>
-					<key>ActionSwipeRight</key>
-					<string>3b d, 37 d, 7c d, 7c u, 37 u, 3b u</string>
-					<key>ActionSwipeUp</key>
-					<string>3b d, 37 d, 7e d, 7e u, 37 u, 3b u</string>
 					<key>Breakless PS2</key>
 					<array>
 						<string>;Items must be strings in the form of breaklessscan (in hex)</string>
@@ -603,8 +595,10 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>com.apple.iokit.IOHIDSystem</key>
-		<string>1.1</string>
+		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
+		<string>2.1.0</string>
+		<key>com.apple.iokit.IOHIDFamily</key>
+		<string>1.0.0b1</string>
 		<key>com.apple.kpi.bsd</key>
 		<string>8.0.0</string>
 		<key>com.apple.kpi.iokit</key>
@@ -615,12 +609,8 @@
 		<string>8.0.0</string>
 		<key>com.apple.kpi.unsupported</key>
 		<string>8.0.0</string>
-		<key>org.rehabman.voodoo.driver.PS2Controller</key>
-		<string>1.9.2</string>
 	</dict>
 	<key>OSBundleRequired</key>
 	<string>Console</string>
-	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
 </dict>
 </plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard
index dd8ab99..7778a53 100755
Binary files a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist
new file mode 100755
index 0000000..0f1f323
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.as.acidanthera.voodoo.driver.PS2Mouse</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>2.1.0</string>
+		<key>CFBundleVersion</key>
+		<string>2.1.0</string>
+	</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse
new file mode 100755
index 0000000..bac13ba
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
index 8f256b3..cef6432 100755
--- a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18A391</string>
+	<string>18E226</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Mouse</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
+	<string>2.1.0, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.rehabman.voodoo.driver.PS2Mouse</string>
+	<string>as.acidanthera.voodoo.driver.PS2Mouse</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>12D75</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
-	<string>macosx10.8</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0941</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ApplePS2Mouse</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Mouse</string>
+			<string>as.acidanthera.voodoo.driver.PS2Mouse</string>
 			<key>HIDPointerAccelerationType</key>
 			<string>HIDTrackpadAcceleration</string>
 			<key>HIDScrollAccelerationType</key>
@@ -177,6 +177,8 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
+		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
+		<string>2.1.0</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
@@ -185,12 +187,8 @@
 		<string>9.0.0</string>
 		<key>com.apple.kpi.mach</key>
 		<string>9.0.0</string>
-		<key>org.rehabman.voodoo.driver.PS2Controller</key>
-		<string>1.9.2</string>
 	</dict>
 	<key>OSBundleRequired</key>
 	<string>Console</string>
-	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
 </dict>
 </plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse
index 4c89bc0..3422ded 100755
Binary files a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist
new file mode 100755
index 0000000..4cb9bc2
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.as.acidanthera.voodoo.driver.PS2Trackpad</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>2.1.0</string>
+		<key>CFBundleVersion</key>
+		<string>2.1.0</string>
+	</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad
new file mode 100755
index 0000000..e4d99f1
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
index 3fc65b1..f1e0e1a 100755
--- a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
+++ b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18A391</string>
+	<string>18E226</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Trackpad</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.9.2, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
+	<string>2.1.0, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
+	<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.9.2</string>
+	<string>2.1.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>12D75</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
-	<string>macosx10.8</string>
+	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>0941</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>9F2000</string>
+	<string>10E1001</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ALPS GlidePoint</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
+			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
 			<key>IOClass</key>
 			<string>ApplePS2ALPSGlidePoint</string>
 			<key>IOProbeScore</key>
@@ -105,10 +105,21 @@
 				</dict>
 			</dict>
 		</dict>
+		<key>Native Multitouch Engine</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
+			<key>IOClass</key>
+			<string>VoodooPS2NativeEngine</string>
+			<key>IOMatchCategory</key>
+			<string>VoodooPS2NativeEngine</string>
+			<key>IOProviderClass</key>
+			<string>VoodooPS2MultitouchInterface</string>
+		</dict>
 		<key>Sentelic FSP</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
+			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
 			<key>IOClass</key>
 			<string>ApplePS2SentelicFSP</string>
 			<key>IOProbeScore</key>
@@ -171,7 +182,7 @@
 		<key>Synaptics TouchPad</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
+			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
 			<key>HIDPointerAccelerationTable</key>
 			<data>
 			AACAAFVTQioABwAAAAAAAgAEAAAABAAAABAAAAAQAAAAACAAAA0A
@@ -238,20 +249,8 @@
 			<dict>
 				<key>Default</key>
 				<dict>
-					<key>BogusDeltaThreshX</key>
-					<integer>0</integer>
-					<key>BogusDeltaThreshY</key>
-					<integer>0</integer>
 					<key>ButtonCount</key>
 					<integer>3</integer>
-					<key>CenterX</key>
-					<integer>3000</integer>
-					<key>CenterY</key>
-					<integer>3000</integer>
-					<key>CircularScrollDivisor</key>
-					<integer>0</integer>
-					<key>CircularScrollTrigger</key>
-					<integer>0</integer>
 					<key>ClickPadClickTime</key>
 					<integer>300000000</integer>
 					<key>ClickPadTrackBoth</key>
@@ -281,82 +280,20 @@
 					<false/>
 					<key>DisableLEDUpdating</key>
 					<false/>
-					<key>DisableZoneBottom</key>
-					<integer>4200</integer>
-					<key>DisableZoneControl</key>
-					<integer>0</integer>
-					<key>DisableZoneLeft</key>
-					<integer>0</integer>
-					<key>DisableZoneRight</key>
-					<integer>1700</integer>
-					<key>DisableZoneTop</key>
-					<integer>99999</integer>
-					<key>DivisorX</key>
-					<integer>5</integer>
-					<key>DivisorY</key>
-					<integer>5</integer>
-					<key>DoubleTapThresholdX</key>
-					<integer>150</integer>
-					<key>DoubleTapThresholdY</key>
-					<integer>150</integer>
-					<key>DragExitDelayTime</key>
-					<integer>1000000000</integer>
-					<key>DragLockTempMask</key>
-					<integer>1048592</integer>
 					<key>DynamicEWMode</key>
 					<false/>
-					<key>EdgeBottom</key>
-					<integer>1700</integer>
-					<key>EdgeLeft</key>
-					<integer>1700</integer>
-					<key>EdgeRight</key>
-					<integer>5200</integer>
-					<key>EdgeTop</key>
-					<integer>4200</integer>
 					<key>FakeMiddleButton</key>
 					<true/>
 					<key>FingerChangeIgnoreDeltas</key>
 					<integer>3</integer>
-					<key>FingerZ</key>
-					<integer>30</integer>
-					<key>HorizontalScrollDivisor</key>
-					<integer>0</integer>
-					<key>ImmediateClick</key>
-					<false/>
-					<key>MaxDragTime</key>
-					<integer>180000000</integer>
-					<key>MaxTapTime</key>
-					<integer>130000000</integer>
+					<key>ForceTouchMode</key>
+					<integer>1</integer>
+					<key>ForceTouchPressureThreshold</key>
+					<integer>100</integer>
 					<key>MiddleClickTime</key>
 					<integer>100000000</integer>
-					<key>MomentumScrollDivisor</key>
-					<integer>100</integer>
-					<key>MomentumScrollMultiplier</key>
-					<integer>98</integer>
-					<key>MomentumScrollSamplesMin</key>
-					<integer>3</integer>
-					<key>MomentumScrollThreshY</key>
-					<integer>18</integer>
-					<key>MomentumScrollTimer</key>
-					<integer>10000000</integer>
-					<key>MouseCount</key>
-					<integer>0</integer>
 					<key>MouseMiddleScroll</key>
 					<true/>
-					<key>MouseMultiplierX</key>
-					<integer>20</integer>
-					<key>MouseMultiplierY</key>
-					<integer>20</integer>
-					<key>MouseScrollMultiplierX</key>
-					<integer>20</integer>
-					<key>MouseScrollMultiplierY</key>
-					<integer>20</integer>
-					<key>MultiFingerHorizontalDivisor</key>
-					<integer>13</integer>
-					<key>MultiFingerVerticalDivisor</key>
-					<integer>13</integer>
-					<key>MultiFingerWLimit</key>
-					<integer>9</integer>
 					<key>ProcessBluetoothMouseStopsTrackpad</key>
 					<true/>
 					<key>ProcessUSBMouseStopsTrackpad</key>
@@ -365,64 +302,16 @@
 					<integer>500000000</integer>
 					<key>Resolution</key>
 					<integer>400</integer>
-					<key>RightClickZoneBottom</key>
-					<integer>0</integer>
-					<key>RightClickZoneLeft</key>
-					<integer>3800</integer>
-					<key>RightClickZoneRight</key>
-					<integer>99999</integer>
-					<key>RightClickZoneTop</key>
-					<integer>2000</integer>
-					<key>ScrollDeltaThreshX</key>
-					<integer>0</integer>
-					<key>ScrollDeltaThreshY</key>
-					<integer>0</integer>
 					<key>ScrollResolution</key>
 					<integer>400</integer>
 					<key>SkipPassThrough</key>
 					<false/>
-					<key>SmoothInput</key>
-					<true/>
-					<key>StickyHorizontalScrolling</key>
-					<false/>
-					<key>StickyMultiFingerScrolling</key>
-					<false/>
-					<key>StickyVerticalScrolling</key>
-					<false/>
-					<key>SwapDoubleTriple</key>
-					<false/>
-					<key>SwipeDeltaX</key>
-					<integer>800</integer>
-					<key>SwipeDeltaY</key>
-					<integer>800</integer>
-					<key>TapThresholdX</key>
-					<integer>75</integer>
-					<key>TapThresholdY</key>
-					<integer>75</integer>
 					<key>USBMouseStopsTrackpad</key>
 					<integer>0</integer>
-					<key>UnitsPerMMX</key>
-					<integer>50</integer>
-					<key>UnitsPerMMY</key>
-					<integer>50</integer>
-					<key>UnsmoothInput</key>
-					<true/>
 					<key>UseHighRate</key>
 					<true/>
-					<key>VerticalScrollDivisor</key>
-					<integer>0</integer>
 					<key>WakeDelay</key>
 					<integer>1000</integer>
-					<key>ZLimit</key>
-					<integer>115</integer>
-					<key>ZoneBottom</key>
-					<integer>0</integer>
-					<key>ZoneLeft</key>
-					<integer>1700</integer>
-					<key>ZoneRight</key>
-					<integer>5200</integer>
-					<key>ZoneTop</key>
-					<integer>99999</integer>
 				</dict>
 				<key>HPQOEM</key>
 				<dict>
@@ -478,14 +367,6 @@
 					<string>Thinkpad_ClickPad</string>
 					<key>Thinkpad_ClickPad</key>
 					<dict>
-						<key>BogusDeltaThreshX</key>
-						<integer>100</integer>
-						<key>BogusDeltaThreshY</key>
-						<integer>100</integer>
-						<key>Clicking</key>
-						<true/>
-						<key>DragLockTempMask</key>
-						<integer>262148</integer>
 						<key>DynamicEWMode</key>
 						<false/>
 						<key>EdgeBottom</key>
@@ -510,27 +391,11 @@
 						<true/>
 						<key>ScrollResolution</key>
 						<integer>800</integer>
-						<key>SmoothInput</key>
-						<true/>
 						<key>Thinkpad</key>
 						<true/>
-						<key>UnsmoothInput</key>
-						<true/>
 					</dict>
 					<key>Thinkpad_TrackPad</key>
 					<dict>
-						<key>BogusDeltaThreshX</key>
-						<integer>800</integer>
-						<key>BogusDeltaThreshY</key>
-						<integer>800</integer>
-						<key>Clicking</key>
-						<true/>
-						<key>DivisorX</key>
-						<integer>1</integer>
-						<key>DivisorY</key>
-						<integer>1</integer>
-						<key>DragLockTempMask</key>
-						<integer>262148</integer>
 						<key>DynamicEWMode</key>
 						<false/>
 						<key>FakeMiddleButton</key>
@@ -541,28 +406,10 @@
 						<true/>
 						<key>MaxTapTime</key>
 						<integer>100000000</integer>
-						<key>MomentumScrollThreshY</key>
-						<integer>16</integer>
-						<key>MouseMultiplierX</key>
-						<integer>8</integer>
-						<key>MouseMultiplierY</key>
-						<integer>8</integer>
-						<key>MouseScrollMultiplierX</key>
-						<integer>2</integer>
-						<key>MouseScrollMultiplierY</key>
-						<integer>2</integer>
-						<key>MultiFingerHorizontalDivisor</key>
-						<integer>4</integer>
-						<key>MultiFingerVerticalDivisor</key>
-						<integer>4</integer>
 						<key>PalmNoAction When Typing</key>
 						<true/>
 						<key>Resolution</key>
 						<integer>3200</integer>
-						<key>ScrollDeltaThreshX</key>
-						<integer>10</integer>
-						<key>ScrollDeltaThreshY</key>
-						<integer>10</integer>
 						<key>ScrollResolution</key>
 						<integer>800</integer>
 						<key>SmoothInput</key>
@@ -586,7 +433,9 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>com.apple.iokit.IOHIDSystem</key>
+		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
+		<string>2.1.0</string>
+		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
 		<string>9.0.0</string>
@@ -594,12 +443,8 @@
 		<string>9.0.0</string>
 		<key>com.apple.kpi.mach</key>
 		<string>9.0.0</string>
-		<key>org.rehabman.voodoo.driver.PS2Controller</key>
-		<string>1.9.2</string>
 	</dict>
 	<key>OSBundleRequired</key>
 	<string>Console</string>
-	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
 </dict>
 </plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad
index 356c071..990455c 100755
Binary files a/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad and b/EFI-OpenCore/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad differ
diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist
index e41fd57..91d95a6 100755
--- a/EFI-OpenCore/EFI/OC/config.plist
+++ b/EFI-OpenCore/EFI/OC/config.plist
@@ -1210,6 +1210,22 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>BundlePath</key>
+				<string>VoodooInput.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<true/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/VoodooInput</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>BundlePath</key>
 				<string>VoodooPS2Controller.kext/Contents/Plugins/VoodooPS2Mouse.kext</string>
@@ -1351,7 +1367,7 @@
 			<key>Resolution</key>
 			<string></string>
 			<key>ShowPicker</key>
-			<true/>
+			<false/>
 			<key>Timeout</key>
 			<integer>3</integer>
 			<key>UsePicker</key>
@@ -1434,7 +1450,7 @@
 			<dict>
 				<key>UIScale</key>
 				<data>
-				AQ==
+				Ag==
 				</data>
 			</dict>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
@@ -1524,7 +1540,6 @@
 			<string>ApfsDriverLoader.efi</string>
 			<string>FwRuntimeServices.efi</string>
 			<string>VirtualSmc.efi</string>
-			<string>UsbKbDxe.efi</string>
 		</array>
 		<key>Input</key>
 		<dict>
@@ -1533,7 +1548,7 @@
 			<key>KeyMergeThreshold</key>
 			<integer>2</integer>
 			<key>KeySupport</key>
-			<false/>
+			<true/>
 			<key>KeySupportMode</key>
 			<string>Auto</string>
 			<key>KeySwap</key>
@@ -1564,7 +1579,7 @@
 			<key>DeviceProperties</key>
 			<false/>
 			<key>FirmwareVolume</key>
-			<false/>
+			<true/>
 			<key>HashServices</key>
 			<false/>
 			<key>UnicodeCollation</key>
diff --git a/README.md b/README.md
index dcae973..a0a7970 100644
--- a/README.md
+++ b/README.md
@@ -39,14 +39,13 @@ Xcode works fine, but I prefer  [PlistEdit Pro](https://www.fatcatsoftware.com/p
 > ## WHERE TO START:
 Explore links included this README, especially those in references and other x1c6-hackintosh repos.  
 
-Once you are ready, follow the series of README files included in the repository.  
+Once you are ready, follow the series of README files included `docs/`.  
 **1_README-HARDWAREandBIOS**: Requirements before starting.   
 **2_README-installMEDIA**: Creating the macOS install drive.  
-**3_README-POSTinstallation**: Settings and tweaks post installation. 
+**3_README-POSTinstallation**: Settings and tweaks post installation.   
 **4_README-ACPIpatching**: The hardest and most time consuming part, patching the system ACPI table for battery status, brightness, sleep, thunderbolt, thunderbolt hotplugging, etc...  
 
-*You can use my patched ACPI files on your machine ONLY when it has the exact same specifications as mine! 
-Please dump and patch your own otherwise, for safety and stability purposes.  
+* While you can plug-and-play most of my hotpatches if you have an x1c6, I still suggest that you dump and disassemble your own DSDT. This is imprortant as your DSDT maybe different from mine. And furthermore, you get to learn more about what's actually going on.
 
 > ## MY SPECIFICATIONS:
 Refer to [x1c6-Platform_Specifications](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/references/x1c6-Platform_Specifications.pdf) for possible stock ThinkPad X1 6th Gen configurations.