diff --git a/.DS_Store b/.DS_Store
index 55536b7..d15a4ca 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/EFI/.DS_Store b/EFI/.DS_Store
index 8cd333a..fb445f9 100644
Binary files a/EFI/.DS_Store and b/EFI/.DS_Store differ
diff --git a/EFI/OC/.DS_Store b/EFI/OC/.DS_Store
index d0397a5..8c277f6 100644
Binary files a/EFI/OC/.DS_Store and b/EFI/OC/.DS_Store differ
diff --git a/EFI/OC/Kexts/.DS_Store b/EFI/OC/Kexts/.DS_Store
new file mode 100644
index 0000000..537e767
Binary files /dev/null and b/EFI/OC/Kexts/.DS_Store differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
index d089956..8f17771 100755
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/Info.plist
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18E226</string>
+	<string>18A391</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Controller</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.4, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
+	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2003, David Elliot 2007, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>as.acidanthera.voodoo.driver.PS2Controller</string>
+	<string>org.rehabman.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>2.0.4</string>
+	<string>1.9.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.4</string>
+	<string>1.9.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18E219</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>1020</string>
+	<string>0941</string>
 	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ACPI PS/2 Nub</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>as.acidanthera.voodoo.driver.PS2Controller</string>
+			<string>org.rehabman.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>as.acidanthera.voodoo.driver.PS2Controller</string>
+			<string>org.rehabman.voodoo.driver.PS2Controller</string>
 			<key>IOClass</key>
 			<string>ApplePS2Controller</string>
 			<key>IONameMatch</key>
@@ -135,7 +135,7 @@
 		</dict>
 	</dict>
 	<key>OSBundleCompatibleVersion</key>
-	<string>2.0.4</string>
+	<string>1.9.2</string>
 	<key>OSBundleLibraries</key>
 	<dict>
 		<key>com.apple.iokit.IOACPIFamily</key>
@@ -153,5 +153,7 @@
 	</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/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller
index b8fbf34..073fb59 100755
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/MacOS/VoodooPS2Controller differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist
deleted file mode 100755
index 67698e1..0000000
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.0.4</string>
-		<key>CFBundleVersion</key>
-		<string>2.0.4</string>
-	</dict>
-</plist>
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard
deleted file mode 100755
index 911357d..0000000
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Keyboard and /dev/null differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
index 0727e73..0d5fede 100755
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
+++ b/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>18E226</string>
+	<string>18A391</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Keyboard</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.4, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
+	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>as.acidanthera.voodoo.driver.PS2Keyboard</string>
+	<string>org.rehabman.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>2.0.4</string>
+	<string>1.9.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.4</string>
+	<string>1.9.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18E219</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>1020</string>
+	<string>0941</string>
 	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ApplePS2Keyboard</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>as.acidanthera.voodoo.driver.PS2Keyboard</string>
+			<string>org.rehabman.voodoo.driver.PS2Keyboard</string>
 			<key>IOClass</key>
 			<string>ApplePS2Keyboard</string>
 			<key>IOProviderClass</key>
@@ -275,6 +275,14 @@
 				</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>
@@ -292,7 +300,7 @@
 					<key>HIDF12EjectDelay</key>
 					<integer>250</integer>
 					<key>LogScanCodes</key>
-					<integer>1</integer>
+					<integer>0</integer>
 					<key>Make Application key into Apple Fn key</key>
 					<false/>
 					<key>Make Application key into right windows</key>
@@ -595,10 +603,8 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.0.4</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
-		<string>1.0.0b1</string>
+		<string>1.1</string>
 		<key>com.apple.kpi.bsd</key>
 		<string>8.0.0</string>
 		<key>com.apple.kpi.iokit</key>
@@ -609,8 +615,12 @@
 		<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/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard
index b93d6ce..dd8ab99 100755
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/MacOS/VoodooPS2Keyboard differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist
deleted file mode 100755
index cad6e1a..0000000
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.0.4</string>
-		<key>CFBundleVersion</key>
-		<string>2.0.4</string>
-	</dict>
-</plist>
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse
deleted file mode 100755
index 4ecfe85..0000000
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Mouse and /dev/null differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
index e25421f..8f256b3 100755
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/Info.plist
+++ b/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>18E226</string>
+	<string>18A391</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Mouse</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.4, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
+	<string>1.9.2, Copyright Apple Computer, Inc. 2000-2004, Slice 2010, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>as.acidanthera.voodoo.driver.PS2Mouse</string>
+	<string>org.rehabman.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>2.0.4</string>
+	<string>1.9.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.4</string>
+	<string>1.9.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18E219</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>1020</string>
+	<string>0941</string>
 	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ApplePS2Mouse</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>as.acidanthera.voodoo.driver.PS2Mouse</string>
+			<string>org.rehabman.voodoo.driver.PS2Mouse</string>
 			<key>HIDPointerAccelerationType</key>
 			<string>HIDTrackpadAcceleration</string>
 			<key>HIDScrollAccelerationType</key>
@@ -177,8 +177,6 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.0.4</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
@@ -187,8 +185,12 @@
 		<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/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse
index 21e23d1..4c89bc0 100755
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext/Contents/MacOS/VoodooPS2Mouse differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist
deleted file mode 100755
index fec69ed..0000000
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.0.4</string>
-		<key>CFBundleVersion</key>
-		<string>2.0.4</string>
-	</dict>
-</plist>
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad
deleted file mode 100755
index 109a157..0000000
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext.dSYM/Contents/Resources/DWARF/VoodooPS2Trackpad and /dev/null differ
diff --git a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
index ff82625..2affabf 100755
--- a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
+++ b/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>18E226</string>
+	<string>18A391</string>
 	<key>CFBundleExecutable</key>
 	<string>VoodooPS2Trackpad</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.4, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
+	<string>1.9.2, Copyright Apple Computer, Inc. 2002-2003, mackerintel 2008, RehabMan 2012-2013</string>
 	<key>CFBundleIdentifier</key>
-	<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
+	<string>org.rehabman.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>2.0.4</string>
+	<string>1.9.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,27 +25,27 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.4</string>
+	<string>1.9.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18E219</string>
+	<string>12D75</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.8</string>
 	<key>DTXcode</key>
-	<string>1020</string>
+	<string>0941</string>
 	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
+	<string>9F2000</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>ALPS GlidePoint</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
+			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
 			<key>IOClass</key>
 			<string>ApplePS2ALPSGlidePoint</string>
 			<key>IOProbeScore</key>
@@ -105,21 +105,10 @@
 				</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>as.acidanthera.voodoo.driver.PS2Trackpad</string>
+			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
 			<key>IOClass</key>
 			<string>ApplePS2SentelicFSP</string>
 			<key>IOProbeScore</key>
@@ -182,7 +171,7 @@
 		<key>Synaptics TouchPad</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>as.acidanthera.voodoo.driver.PS2Trackpad</string>
+			<string>org.rehabman.voodoo.driver.PS2Trackpad</string>
 			<key>HIDPointerAccelerationTable</key>
 			<data>
 			AACAAFVTQioABwAAAAAAAgAEAAAABAAAABAAAAAQAAAAACAAAA0A
@@ -249,8 +238,20 @@
 			<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>
@@ -280,20 +281,82 @@
 					<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>ForceTouchMode</key>
-					<integer>1</integer>
-					<key>ForceTouchPressureThreshold</key>
-					<integer>100</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>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>
@@ -302,16 +365,64 @@
 					<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>
@@ -367,6 +478,14 @@
 					<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>
@@ -391,11 +510,27 @@
 						<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>
@@ -406,10 +541,28 @@
 						<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>
@@ -433,8 +586,6 @@
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>as.acidanthera.voodoo.driver.PS2Controller</key>
-		<string>2.0.4</string>
 		<key>com.apple.iokit.IOHIDFamily</key>
 		<string>1.0.0b1</string>
 		<key>com.apple.kpi.iokit</key>
@@ -443,8 +594,12 @@
 		<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/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad
index 44ac8bd..356c071 100755
Binary files a/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad and b/EFI/OC/Kexts/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/MacOS/VoodooPS2Trackpad differ