diff --git a/.vscode/settings.json b/.vscode/settings.json
index a4bf2fb..0a0040f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
     "java.project.referencedLibraries": [
-        "lib/jinput.jar"
+        "lib/jinput.jar",
+        "lib/bin/**/*.jar"
     ]
 }
\ No newline at end of file
diff --git a/lib/bin/META-INF/MANIFEST.MF b/lib/bin/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..18e53f7
--- /dev/null
+++ b/lib/bin/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.10.12
+Created-By: 11.0.13+8-LTS (Azul Systems, Inc.)
+Main-Class: net.java.games.input.Version
+Automatic-Module-Name: net.java.games.jinput
+
diff --git a/lib/bin/net/java/games/input/AWTEnvironmentPlugin.class b/lib/bin/net/java/games/input/AWTEnvironmentPlugin.class
index 162e626..0d68ba6 100644
Binary files a/lib/bin/net/java/games/input/AWTEnvironmentPlugin.class and b/lib/bin/net/java/games/input/AWTEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/AWTKeyMap.class b/lib/bin/net/java/games/input/AWTKeyMap.class
index a88e513..58f485d 100644
Binary files a/lib/bin/net/java/games/input/AWTKeyMap.class and b/lib/bin/net/java/games/input/AWTKeyMap.class differ
diff --git a/lib/bin/net/java/games/input/AWTKeyboard$Key.class b/lib/bin/net/java/games/input/AWTKeyboard$Key.class
index 9417bd1..9861ed6 100644
Binary files a/lib/bin/net/java/games/input/AWTKeyboard$Key.class and b/lib/bin/net/java/games/input/AWTKeyboard$Key.class differ
diff --git a/lib/bin/net/java/games/input/AWTKeyboard.class b/lib/bin/net/java/games/input/AWTKeyboard.class
index 019512c..c7a1ff7 100644
Binary files a/lib/bin/net/java/games/input/AWTKeyboard.class and b/lib/bin/net/java/games/input/AWTKeyboard.class differ
diff --git a/lib/bin/net/java/games/input/AWTMouse$Axis.class b/lib/bin/net/java/games/input/AWTMouse$Axis.class
index b6ae810..c6a7a44 100644
Binary files a/lib/bin/net/java/games/input/AWTMouse$Axis.class and b/lib/bin/net/java/games/input/AWTMouse$Axis.class differ
diff --git a/lib/bin/net/java/games/input/AWTMouse$Button.class b/lib/bin/net/java/games/input/AWTMouse$Button.class
index a5fa8f1..f627a09 100644
Binary files a/lib/bin/net/java/games/input/AWTMouse$Button.class and b/lib/bin/net/java/games/input/AWTMouse$Button.class differ
diff --git a/lib/bin/net/java/games/input/AWTMouse.class b/lib/bin/net/java/games/input/AWTMouse.class
index c82627b..713193b 100644
Binary files a/lib/bin/net/java/games/input/AWTMouse.class and b/lib/bin/net/java/games/input/AWTMouse.class differ
diff --git a/lib/bin/net/java/games/input/AbstractComponent.class b/lib/bin/net/java/games/input/AbstractComponent.class
index af3cd4c..5cbc4de 100644
Binary files a/lib/bin/net/java/games/input/AbstractComponent.class and b/lib/bin/net/java/games/input/AbstractComponent.class differ
diff --git a/lib/bin/net/java/games/input/AbstractController.class b/lib/bin/net/java/games/input/AbstractController.class
index 4824a46..58f1101 100644
Binary files a/lib/bin/net/java/games/input/AbstractController.class and b/lib/bin/net/java/games/input/AbstractController.class differ
diff --git a/lib/bin/net/java/games/input/ButtonUsage.class b/lib/bin/net/java/games/input/ButtonUsage.class
index 54f40d1..eeb3752 100644
Binary files a/lib/bin/net/java/games/input/ButtonUsage.class and b/lib/bin/net/java/games/input/ButtonUsage.class differ
diff --git a/lib/bin/net/java/games/input/Component$Identifier$Axis.class b/lib/bin/net/java/games/input/Component$Identifier$Axis.class
index 7d9e44d..d8c629a 100644
Binary files a/lib/bin/net/java/games/input/Component$Identifier$Axis.class and b/lib/bin/net/java/games/input/Component$Identifier$Axis.class differ
diff --git a/lib/bin/net/java/games/input/Component$Identifier$Button.class b/lib/bin/net/java/games/input/Component$Identifier$Button.class
index 40ce953..6a9a161 100644
Binary files a/lib/bin/net/java/games/input/Component$Identifier$Button.class and b/lib/bin/net/java/games/input/Component$Identifier$Button.class differ
diff --git a/lib/bin/net/java/games/input/Component$Identifier$Key.class b/lib/bin/net/java/games/input/Component$Identifier$Key.class
index c3965a3..00a003a 100644
Binary files a/lib/bin/net/java/games/input/Component$Identifier$Key.class and b/lib/bin/net/java/games/input/Component$Identifier$Key.class differ
diff --git a/lib/bin/net/java/games/input/Component$Identifier.class b/lib/bin/net/java/games/input/Component$Identifier.class
index 2eb9965..959e178 100644
Binary files a/lib/bin/net/java/games/input/Component$Identifier.class and b/lib/bin/net/java/games/input/Component$Identifier.class differ
diff --git a/lib/bin/net/java/games/input/Component$POV.class b/lib/bin/net/java/games/input/Component$POV.class
index ff2c90e..4d6d189 100644
Binary files a/lib/bin/net/java/games/input/Component$POV.class and b/lib/bin/net/java/games/input/Component$POV.class differ
diff --git a/lib/bin/net/java/games/input/Component.class b/lib/bin/net/java/games/input/Component.class
index b4dbc7c..35c50eb 100644
Binary files a/lib/bin/net/java/games/input/Component.class and b/lib/bin/net/java/games/input/Component.class differ
diff --git a/lib/bin/net/java/games/input/Controller$PortType.class b/lib/bin/net/java/games/input/Controller$PortType.class
index adc4fa5..4a3d419 100644
Binary files a/lib/bin/net/java/games/input/Controller$PortType.class and b/lib/bin/net/java/games/input/Controller$PortType.class differ
diff --git a/lib/bin/net/java/games/input/Controller$Type.class b/lib/bin/net/java/games/input/Controller$Type.class
index 5d8662e..4666dba 100644
Binary files a/lib/bin/net/java/games/input/Controller$Type.class and b/lib/bin/net/java/games/input/Controller$Type.class differ
diff --git a/lib/bin/net/java/games/input/Controller.class b/lib/bin/net/java/games/input/Controller.class
index 8683137..8c0a8c5 100644
Binary files a/lib/bin/net/java/games/input/Controller.class and b/lib/bin/net/java/games/input/Controller.class differ
diff --git a/lib/bin/net/java/games/input/ControllerEnvironment.class b/lib/bin/net/java/games/input/ControllerEnvironment.class
index e4354fd..7033c54 100644
Binary files a/lib/bin/net/java/games/input/ControllerEnvironment.class and b/lib/bin/net/java/games/input/ControllerEnvironment.class differ
diff --git a/lib/bin/net/java/games/input/ControllerEvent.class b/lib/bin/net/java/games/input/ControllerEvent.class
index c8d4a6b..68540da 100644
Binary files a/lib/bin/net/java/games/input/ControllerEvent.class and b/lib/bin/net/java/games/input/ControllerEvent.class differ
diff --git a/lib/bin/net/java/games/input/ControllerListener.class b/lib/bin/net/java/games/input/ControllerListener.class
index 4cc2b10..94a61c8 100644
Binary files a/lib/bin/net/java/games/input/ControllerListener.class and b/lib/bin/net/java/games/input/ControllerListener.class differ
diff --git a/lib/bin/net/java/games/input/DIAbstractController.class b/lib/bin/net/java/games/input/DIAbstractController.class
index ebbfc92..b0cd074 100644
Binary files a/lib/bin/net/java/games/input/DIAbstractController.class and b/lib/bin/net/java/games/input/DIAbstractController.class differ
diff --git a/lib/bin/net/java/games/input/DIComponent.class b/lib/bin/net/java/games/input/DIComponent.class
index 703e3dc..9d28cee 100644
Binary files a/lib/bin/net/java/games/input/DIComponent.class and b/lib/bin/net/java/games/input/DIComponent.class differ
diff --git a/lib/bin/net/java/games/input/DIControllers.class b/lib/bin/net/java/games/input/DIControllers.class
index 7a26993..3b048da 100644
Binary files a/lib/bin/net/java/games/input/DIControllers.class and b/lib/bin/net/java/games/input/DIControllers.class differ
diff --git a/lib/bin/net/java/games/input/DIDeviceObject.class b/lib/bin/net/java/games/input/DIDeviceObject.class
index 47fd0f2..6dc480d 100644
Binary files a/lib/bin/net/java/games/input/DIDeviceObject.class and b/lib/bin/net/java/games/input/DIDeviceObject.class differ
diff --git a/lib/bin/net/java/games/input/DIDeviceObjectData.class b/lib/bin/net/java/games/input/DIDeviceObjectData.class
index 57a13ed..40d737d 100644
Binary files a/lib/bin/net/java/games/input/DIDeviceObjectData.class and b/lib/bin/net/java/games/input/DIDeviceObjectData.class differ
diff --git a/lib/bin/net/java/games/input/DIEffectInfo.class b/lib/bin/net/java/games/input/DIEffectInfo.class
index fca8f73..bbef6ba 100644
Binary files a/lib/bin/net/java/games/input/DIEffectInfo.class and b/lib/bin/net/java/games/input/DIEffectInfo.class differ
diff --git a/lib/bin/net/java/games/input/DIIdentifierMap.class b/lib/bin/net/java/games/input/DIIdentifierMap.class
index 60c587e..f2cae08 100644
Binary files a/lib/bin/net/java/games/input/DIIdentifierMap.class and b/lib/bin/net/java/games/input/DIIdentifierMap.class differ
diff --git a/lib/bin/net/java/games/input/DIKeyboard.class b/lib/bin/net/java/games/input/DIKeyboard.class
index c47fd01..5370d85 100644
Binary files a/lib/bin/net/java/games/input/DIKeyboard.class and b/lib/bin/net/java/games/input/DIKeyboard.class differ
diff --git a/lib/bin/net/java/games/input/DIMouse.class b/lib/bin/net/java/games/input/DIMouse.class
index fc5067f..b8580e5 100644
Binary files a/lib/bin/net/java/games/input/DIMouse.class and b/lib/bin/net/java/games/input/DIMouse.class differ
diff --git a/lib/bin/net/java/games/input/DataQueue.class b/lib/bin/net/java/games/input/DataQueue.class
index 57168f8..6070d6b 100644
Binary files a/lib/bin/net/java/games/input/DataQueue.class and b/lib/bin/net/java/games/input/DataQueue.class differ
diff --git a/lib/bin/net/java/games/input/DefaultControllerEnvironment$1.class b/lib/bin/net/java/games/input/DefaultControllerEnvironment$1.class
new file mode 100644
index 0000000..206d39d
Binary files /dev/null and b/lib/bin/net/java/games/input/DefaultControllerEnvironment$1.class differ
diff --git a/lib/bin/net/java/games/input/DefaultControllerEnvironment$2.class b/lib/bin/net/java/games/input/DefaultControllerEnvironment$2.class
new file mode 100644
index 0000000..b120049
Binary files /dev/null and b/lib/bin/net/java/games/input/DefaultControllerEnvironment$2.class differ
diff --git a/lib/bin/net/java/games/input/DefaultControllerEnvironment$3.class b/lib/bin/net/java/games/input/DefaultControllerEnvironment$3.class
new file mode 100644
index 0000000..0739ec7
Binary files /dev/null and b/lib/bin/net/java/games/input/DefaultControllerEnvironment$3.class differ
diff --git a/lib/bin/net/java/games/input/DefaultControllerEnvironment$4.class b/lib/bin/net/java/games/input/DefaultControllerEnvironment$4.class
new file mode 100644
index 0000000..2a2ce15
Binary files /dev/null and b/lib/bin/net/java/games/input/DefaultControllerEnvironment$4.class differ
diff --git a/lib/bin/net/java/games/input/DefaultControllerEnvironment.class b/lib/bin/net/java/games/input/DefaultControllerEnvironment.class
index 297b0d1..2221516 100644
Binary files a/lib/bin/net/java/games/input/DefaultControllerEnvironment.class and b/lib/bin/net/java/games/input/DefaultControllerEnvironment.class differ
diff --git a/lib/bin/net/java/games/input/DirectAndRawInputEnvironmentPlugin.class b/lib/bin/net/java/games/input/DirectAndRawInputEnvironmentPlugin.class
index d06b71e..ee9b572 100644
Binary files a/lib/bin/net/java/games/input/DirectAndRawInputEnvironmentPlugin.class and b/lib/bin/net/java/games/input/DirectAndRawInputEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$1.class b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$1.class
index 31a2298..e87ce2c 100644
Binary files a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$1.class and b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$1.class differ
diff --git a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$ShutdownHook.class b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$ShutdownHook.class
index 41fbc93..dea7316 100644
Binary files a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$ShutdownHook.class and b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin$ShutdownHook.class differ
diff --git a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin.class b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin.class
index 7c24a33..47b7287 100644
Binary files a/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin.class and b/lib/bin/net/java/games/input/DirectInputEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/DummyWindow.class b/lib/bin/net/java/games/input/DummyWindow.class
index 8acbf8f..37280fe 100644
Binary files a/lib/bin/net/java/games/input/DummyWindow.class and b/lib/bin/net/java/games/input/DummyWindow.class differ
diff --git a/lib/bin/net/java/games/input/ElementType.class b/lib/bin/net/java/games/input/ElementType.class
index cdc47bf..15d09fb 100644
Binary files a/lib/bin/net/java/games/input/ElementType.class and b/lib/bin/net/java/games/input/ElementType.class differ
diff --git a/lib/bin/net/java/games/input/Event.class b/lib/bin/net/java/games/input/Event.class
index 315a60a..1bcd367 100644
Binary files a/lib/bin/net/java/games/input/Event.class and b/lib/bin/net/java/games/input/Event.class differ
diff --git a/lib/bin/net/java/games/input/EventQueue.class b/lib/bin/net/java/games/input/EventQueue.class
index 5055339..21781c6 100644
Binary files a/lib/bin/net/java/games/input/EventQueue.class and b/lib/bin/net/java/games/input/EventQueue.class differ
diff --git a/lib/bin/net/java/games/input/GenericDesktopUsage.class b/lib/bin/net/java/games/input/GenericDesktopUsage.class
index b084bde..9b55629 100644
Binary files a/lib/bin/net/java/games/input/GenericDesktopUsage.class and b/lib/bin/net/java/games/input/GenericDesktopUsage.class differ
diff --git a/lib/bin/net/java/games/input/IDirectInput.class b/lib/bin/net/java/games/input/IDirectInput.class
index ffabff1..d4a7a6d 100644
Binary files a/lib/bin/net/java/games/input/IDirectInput.class and b/lib/bin/net/java/games/input/IDirectInput.class differ
diff --git a/lib/bin/net/java/games/input/IDirectInputDevice.class b/lib/bin/net/java/games/input/IDirectInputDevice.class
index 71cd2f8..9d19a7b 100644
Binary files a/lib/bin/net/java/games/input/IDirectInputDevice.class and b/lib/bin/net/java/games/input/IDirectInputDevice.class differ
diff --git a/lib/bin/net/java/games/input/IDirectInputEffect.class b/lib/bin/net/java/games/input/IDirectInputEffect.class
index 850d133..64481ff 100644
Binary files a/lib/bin/net/java/games/input/IDirectInputEffect.class and b/lib/bin/net/java/games/input/IDirectInputEffect.class differ
diff --git a/lib/bin/net/java/games/input/Keyboard.class b/lib/bin/net/java/games/input/Keyboard.class
index 8e558df..dd6364a 100644
Binary files a/lib/bin/net/java/games/input/Keyboard.class and b/lib/bin/net/java/games/input/Keyboard.class differ
diff --git a/lib/bin/net/java/games/input/KeyboardUsage.class b/lib/bin/net/java/games/input/KeyboardUsage.class
index da862af..f3faa6d 100644
Binary files a/lib/bin/net/java/games/input/KeyboardUsage.class and b/lib/bin/net/java/games/input/KeyboardUsage.class differ
diff --git a/lib/bin/net/java/games/input/LinuxAbsInfo.class b/lib/bin/net/java/games/input/LinuxAbsInfo.class
index 1011006..5adb5bf 100644
Binary files a/lib/bin/net/java/games/input/LinuxAbsInfo.class and b/lib/bin/net/java/games/input/LinuxAbsInfo.class differ
diff --git a/lib/bin/net/java/games/input/LinuxAbstractController.class b/lib/bin/net/java/games/input/LinuxAbstractController.class
index 023d9ac..7a68998 100644
Binary files a/lib/bin/net/java/games/input/LinuxAbstractController.class and b/lib/bin/net/java/games/input/LinuxAbstractController.class differ
diff --git a/lib/bin/net/java/games/input/LinuxAxisDescriptor.class b/lib/bin/net/java/games/input/LinuxAxisDescriptor.class
index 0d92059..e9d4d35 100644
Binary files a/lib/bin/net/java/games/input/LinuxAxisDescriptor.class and b/lib/bin/net/java/games/input/LinuxAxisDescriptor.class differ
diff --git a/lib/bin/net/java/games/input/LinuxCombinedController.class b/lib/bin/net/java/games/input/LinuxCombinedController.class
index aa6894c..2b90fab 100644
Binary files a/lib/bin/net/java/games/input/LinuxCombinedController.class and b/lib/bin/net/java/games/input/LinuxCombinedController.class differ
diff --git a/lib/bin/net/java/games/input/LinuxComponent.class b/lib/bin/net/java/games/input/LinuxComponent.class
index b61adfd..68a7f57 100644
Binary files a/lib/bin/net/java/games/input/LinuxComponent.class and b/lib/bin/net/java/games/input/LinuxComponent.class differ
diff --git a/lib/bin/net/java/games/input/LinuxConstantFF.class b/lib/bin/net/java/games/input/LinuxConstantFF.class
index 1b6b370..2a8263f 100644
Binary files a/lib/bin/net/java/games/input/LinuxConstantFF.class and b/lib/bin/net/java/games/input/LinuxConstantFF.class differ
diff --git a/lib/bin/net/java/games/input/LinuxControllers.class b/lib/bin/net/java/games/input/LinuxControllers.class
index 958d992..0eef864 100644
Binary files a/lib/bin/net/java/games/input/LinuxControllers.class and b/lib/bin/net/java/games/input/LinuxControllers.class differ
diff --git a/lib/bin/net/java/games/input/LinuxDevice.class b/lib/bin/net/java/games/input/LinuxDevice.class
index 95400c2..d6c1357 100644
Binary files a/lib/bin/net/java/games/input/LinuxDevice.class and b/lib/bin/net/java/games/input/LinuxDevice.class differ
diff --git a/lib/bin/net/java/games/input/LinuxDeviceTask.class b/lib/bin/net/java/games/input/LinuxDeviceTask.class
index 0a8d934..5b44931 100644
Binary files a/lib/bin/net/java/games/input/LinuxDeviceTask.class and b/lib/bin/net/java/games/input/LinuxDeviceTask.class differ
diff --git a/lib/bin/net/java/games/input/LinuxDeviceThread.class b/lib/bin/net/java/games/input/LinuxDeviceThread.class
index ae0c60d..1690611 100644
Binary files a/lib/bin/net/java/games/input/LinuxDeviceThread.class and b/lib/bin/net/java/games/input/LinuxDeviceThread.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$1.class b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$1.class
index 8332b5b..1f5cb1b 100644
Binary files a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$1.class and b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$1.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$ShutdownHook.class b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$ShutdownHook.class
index 43be20e..f2fba2a 100644
Binary files a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$ShutdownHook.class and b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin$ShutdownHook.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin.class b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin.class
index 45e415e..851dffe 100644
Binary files a/lib/bin/net/java/games/input/LinuxEnvironmentPlugin.class and b/lib/bin/net/java/games/input/LinuxEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEvent.class b/lib/bin/net/java/games/input/LinuxEvent.class
index b746af4..d9f69ef 100644
Binary files a/lib/bin/net/java/games/input/LinuxEvent.class and b/lib/bin/net/java/games/input/LinuxEvent.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEventComponent.class b/lib/bin/net/java/games/input/LinuxEventComponent.class
index ad33742..05c1b7f 100644
Binary files a/lib/bin/net/java/games/input/LinuxEventComponent.class and b/lib/bin/net/java/games/input/LinuxEventComponent.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEventDevice$1.class b/lib/bin/net/java/games/input/LinuxEventDevice$1.class
index 7648c15..0f2fc4e 100644
Binary files a/lib/bin/net/java/games/input/LinuxEventDevice$1.class and b/lib/bin/net/java/games/input/LinuxEventDevice$1.class differ
diff --git a/lib/bin/net/java/games/input/LinuxEventDevice.class b/lib/bin/net/java/games/input/LinuxEventDevice.class
index 40ee41c..2071e51 100644
Binary files a/lib/bin/net/java/games/input/LinuxEventDevice.class and b/lib/bin/net/java/games/input/LinuxEventDevice.class differ
diff --git a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$1.class b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$1.class
index 16b8bfb..d91e0b2 100644
Binary files a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$1.class and b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$1.class differ
diff --git a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$UploadTask.class b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$UploadTask.class
index b8204d9..cf4461f 100644
Binary files a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$UploadTask.class and b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$UploadTask.class differ
diff --git a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$WriteTask.class b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$WriteTask.class
index a42b37e..505ee1a 100644
Binary files a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$WriteTask.class and b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect$WriteTask.class differ
diff --git a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect.class b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect.class
index ffb709b..2280002 100644
Binary files a/lib/bin/net/java/games/input/LinuxForceFeedbackEffect.class and b/lib/bin/net/java/games/input/LinuxForceFeedbackEffect.class differ
diff --git a/lib/bin/net/java/games/input/LinuxInputID.class b/lib/bin/net/java/games/input/LinuxInputID.class
index fadd255..f30ed4c 100644
Binary files a/lib/bin/net/java/games/input/LinuxInputID.class and b/lib/bin/net/java/games/input/LinuxInputID.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickAbstractController.class b/lib/bin/net/java/games/input/LinuxJoystickAbstractController.class
index ca9ad22..5b56ccd 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickAbstractController.class and b/lib/bin/net/java/games/input/LinuxJoystickAbstractController.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickAxis.class b/lib/bin/net/java/games/input/LinuxJoystickAxis.class
index 49075d0..b91bcb3 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickAxis.class and b/lib/bin/net/java/games/input/LinuxJoystickAxis.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickButton.class b/lib/bin/net/java/games/input/LinuxJoystickButton.class
index f6d1aaa..c699c4f 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickButton.class and b/lib/bin/net/java/games/input/LinuxJoystickButton.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickDevice.class b/lib/bin/net/java/games/input/LinuxJoystickDevice.class
index ac4f630..436f8c6 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickDevice.class and b/lib/bin/net/java/games/input/LinuxJoystickDevice.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickEvent.class b/lib/bin/net/java/games/input/LinuxJoystickEvent.class
index 6106ba2..697e003 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickEvent.class and b/lib/bin/net/java/games/input/LinuxJoystickEvent.class differ
diff --git a/lib/bin/net/java/games/input/LinuxJoystickPOV.class b/lib/bin/net/java/games/input/LinuxJoystickPOV.class
index bd84770..52bcf22 100644
Binary files a/lib/bin/net/java/games/input/LinuxJoystickPOV.class and b/lib/bin/net/java/games/input/LinuxJoystickPOV.class differ
diff --git a/lib/bin/net/java/games/input/LinuxKeyboard.class b/lib/bin/net/java/games/input/LinuxKeyboard.class
index f9c1780..36c7dce 100644
Binary files a/lib/bin/net/java/games/input/LinuxKeyboard.class and b/lib/bin/net/java/games/input/LinuxKeyboard.class differ
diff --git a/lib/bin/net/java/games/input/LinuxMouse.class b/lib/bin/net/java/games/input/LinuxMouse.class
index 7c0a579..d5a2598 100644
Binary files a/lib/bin/net/java/games/input/LinuxMouse.class and b/lib/bin/net/java/games/input/LinuxMouse.class differ
diff --git a/lib/bin/net/java/games/input/LinuxNativeTypesMap.class b/lib/bin/net/java/games/input/LinuxNativeTypesMap.class
index bd4ad8d..0c641bd 100644
Binary files a/lib/bin/net/java/games/input/LinuxNativeTypesMap.class and b/lib/bin/net/java/games/input/LinuxNativeTypesMap.class differ
diff --git a/lib/bin/net/java/games/input/LinuxPOV.class b/lib/bin/net/java/games/input/LinuxPOV.class
index b797932..749281e 100644
Binary files a/lib/bin/net/java/games/input/LinuxPOV.class and b/lib/bin/net/java/games/input/LinuxPOV.class differ
diff --git a/lib/bin/net/java/games/input/LinuxRumbleFF.class b/lib/bin/net/java/games/input/LinuxRumbleFF.class
index 7ffe270..d6d61d1 100644
Binary files a/lib/bin/net/java/games/input/LinuxRumbleFF.class and b/lib/bin/net/java/games/input/LinuxRumbleFF.class differ
diff --git a/lib/bin/net/java/games/input/Mouse.class b/lib/bin/net/java/games/input/Mouse.class
index f3e426f..19631fa 100644
Binary files a/lib/bin/net/java/games/input/Mouse.class and b/lib/bin/net/java/games/input/Mouse.class differ
diff --git a/lib/bin/net/java/games/input/NativeDefinitions.class b/lib/bin/net/java/games/input/NativeDefinitions.class
index a112c56..4ab395f 100644
Binary files a/lib/bin/net/java/games/input/NativeDefinitions.class and b/lib/bin/net/java/games/input/NativeDefinitions.class differ
diff --git a/lib/bin/net/java/games/input/OSXAbstractController.class b/lib/bin/net/java/games/input/OSXAbstractController.class
index a28f29a..b956d64 100644
Binary files a/lib/bin/net/java/games/input/OSXAbstractController.class and b/lib/bin/net/java/games/input/OSXAbstractController.class differ
diff --git a/lib/bin/net/java/games/input/OSXComponent.class b/lib/bin/net/java/games/input/OSXComponent.class
index bd5b371..6caab48 100644
Binary files a/lib/bin/net/java/games/input/OSXComponent.class and b/lib/bin/net/java/games/input/OSXComponent.class differ
diff --git a/lib/bin/net/java/games/input/OSXControllers.class b/lib/bin/net/java/games/input/OSXControllers.class
index 910a703..ceac361 100644
Binary files a/lib/bin/net/java/games/input/OSXControllers.class and b/lib/bin/net/java/games/input/OSXControllers.class differ
diff --git a/lib/bin/net/java/games/input/OSXEnvironmentPlugin.class b/lib/bin/net/java/games/input/OSXEnvironmentPlugin.class
index cb5ae57..512b5b5 100644
Binary files a/lib/bin/net/java/games/input/OSXEnvironmentPlugin.class and b/lib/bin/net/java/games/input/OSXEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/OSXEvent.class b/lib/bin/net/java/games/input/OSXEvent.class
index 8fa866c..0e1ccaf 100644
Binary files a/lib/bin/net/java/games/input/OSXEvent.class and b/lib/bin/net/java/games/input/OSXEvent.class differ
diff --git a/lib/bin/net/java/games/input/OSXHIDDevice.class b/lib/bin/net/java/games/input/OSXHIDDevice.class
index 5897245..63d95ed 100644
Binary files a/lib/bin/net/java/games/input/OSXHIDDevice.class and b/lib/bin/net/java/games/input/OSXHIDDevice.class differ
diff --git a/lib/bin/net/java/games/input/OSXHIDDeviceIterator.class b/lib/bin/net/java/games/input/OSXHIDDeviceIterator.class
index 7ea31a7..6987eb6 100644
Binary files a/lib/bin/net/java/games/input/OSXHIDDeviceIterator.class and b/lib/bin/net/java/games/input/OSXHIDDeviceIterator.class differ
diff --git a/lib/bin/net/java/games/input/OSXHIDElement.class b/lib/bin/net/java/games/input/OSXHIDElement.class
index 6d225f1..e5086a1 100644
Binary files a/lib/bin/net/java/games/input/OSXHIDElement.class and b/lib/bin/net/java/games/input/OSXHIDElement.class differ
diff --git a/lib/bin/net/java/games/input/OSXHIDQueue.class b/lib/bin/net/java/games/input/OSXHIDQueue.class
index 8a9a370..ce6d7c4 100644
Binary files a/lib/bin/net/java/games/input/OSXHIDQueue.class and b/lib/bin/net/java/games/input/OSXHIDQueue.class differ
diff --git a/lib/bin/net/java/games/input/OSXKeyboard.class b/lib/bin/net/java/games/input/OSXKeyboard.class
index d974705..f7ff3d7 100644
Binary files a/lib/bin/net/java/games/input/OSXKeyboard.class and b/lib/bin/net/java/games/input/OSXKeyboard.class differ
diff --git a/lib/bin/net/java/games/input/OSXMouse.class b/lib/bin/net/java/games/input/OSXMouse.class
index efd02e2..ede7125 100644
Binary files a/lib/bin/net/java/games/input/OSXMouse.class and b/lib/bin/net/java/games/input/OSXMouse.class differ
diff --git a/lib/bin/net/java/games/input/PluginClassLoader$1.class b/lib/bin/net/java/games/input/PluginClassLoader$1.class
index c4d2a7b..44fb571 100644
Binary files a/lib/bin/net/java/games/input/PluginClassLoader$1.class and b/lib/bin/net/java/games/input/PluginClassLoader$1.class differ
diff --git a/lib/bin/net/java/games/input/PluginClassLoader$JarFileFilter.class b/lib/bin/net/java/games/input/PluginClassLoader$JarFileFilter.class
index a1b5f14..f32633b 100644
Binary files a/lib/bin/net/java/games/input/PluginClassLoader$JarFileFilter.class and b/lib/bin/net/java/games/input/PluginClassLoader$JarFileFilter.class differ
diff --git a/lib/bin/net/java/games/input/PluginClassLoader.class b/lib/bin/net/java/games/input/PluginClassLoader.class
index 241fc11..09b3b18 100644
Binary files a/lib/bin/net/java/games/input/PluginClassLoader.class and b/lib/bin/net/java/games/input/PluginClassLoader.class differ
diff --git a/lib/bin/net/java/games/input/RawDevice.class b/lib/bin/net/java/games/input/RawDevice.class
index dc7fb45..3d20a2a 100644
Binary files a/lib/bin/net/java/games/input/RawDevice.class and b/lib/bin/net/java/games/input/RawDevice.class differ
diff --git a/lib/bin/net/java/games/input/RawDeviceInfo.class b/lib/bin/net/java/games/input/RawDeviceInfo.class
index 8081c4c..0d7d4af 100644
Binary files a/lib/bin/net/java/games/input/RawDeviceInfo.class and b/lib/bin/net/java/games/input/RawDeviceInfo.class differ
diff --git a/lib/bin/net/java/games/input/RawHIDInfo.class b/lib/bin/net/java/games/input/RawHIDInfo.class
index a352d40..f7fe997 100644
Binary files a/lib/bin/net/java/games/input/RawHIDInfo.class and b/lib/bin/net/java/games/input/RawHIDInfo.class differ
diff --git a/lib/bin/net/java/games/input/RawIdentifierMap.class b/lib/bin/net/java/games/input/RawIdentifierMap.class
index d249336..8965d98 100644
Binary files a/lib/bin/net/java/games/input/RawIdentifierMap.class and b/lib/bin/net/java/games/input/RawIdentifierMap.class differ
diff --git a/lib/bin/net/java/games/input/RawInputEnvironmentPlugin.class b/lib/bin/net/java/games/input/RawInputEnvironmentPlugin.class
index 492deeb..4461038 100644
Binary files a/lib/bin/net/java/games/input/RawInputEnvironmentPlugin.class and b/lib/bin/net/java/games/input/RawInputEnvironmentPlugin.class differ
diff --git a/lib/bin/net/java/games/input/RawInputEventQueue$QueueThread.class b/lib/bin/net/java/games/input/RawInputEventQueue$QueueThread.class
index b0e9634..493dbcb 100644
Binary files a/lib/bin/net/java/games/input/RawInputEventQueue$QueueThread.class and b/lib/bin/net/java/games/input/RawInputEventQueue$QueueThread.class differ
diff --git a/lib/bin/net/java/games/input/RawInputEventQueue.class b/lib/bin/net/java/games/input/RawInputEventQueue.class
index d006bd1..f8f856b 100644
Binary files a/lib/bin/net/java/games/input/RawInputEventQueue.class and b/lib/bin/net/java/games/input/RawInputEventQueue.class differ
diff --git a/lib/bin/net/java/games/input/RawKeyboard$Key.class b/lib/bin/net/java/games/input/RawKeyboard$Key.class
index 7e6b7a8..03e5eb1 100644
Binary files a/lib/bin/net/java/games/input/RawKeyboard$Key.class and b/lib/bin/net/java/games/input/RawKeyboard$Key.class differ
diff --git a/lib/bin/net/java/games/input/RawKeyboard.class b/lib/bin/net/java/games/input/RawKeyboard.class
index 03ff314..ea526a2 100644
Binary files a/lib/bin/net/java/games/input/RawKeyboard.class and b/lib/bin/net/java/games/input/RawKeyboard.class differ
diff --git a/lib/bin/net/java/games/input/RawKeyboardEvent.class b/lib/bin/net/java/games/input/RawKeyboardEvent.class
index 4962f5f..bf15867 100644
Binary files a/lib/bin/net/java/games/input/RawKeyboardEvent.class and b/lib/bin/net/java/games/input/RawKeyboardEvent.class differ
diff --git a/lib/bin/net/java/games/input/RawKeyboardInfo.class b/lib/bin/net/java/games/input/RawKeyboardInfo.class
index 255ba7e..1bf5227 100644
Binary files a/lib/bin/net/java/games/input/RawKeyboardInfo.class and b/lib/bin/net/java/games/input/RawKeyboardInfo.class differ
diff --git a/lib/bin/net/java/games/input/RawMouse$Axis.class b/lib/bin/net/java/games/input/RawMouse$Axis.class
index af9f271..9c75446 100644
Binary files a/lib/bin/net/java/games/input/RawMouse$Axis.class and b/lib/bin/net/java/games/input/RawMouse$Axis.class differ
diff --git a/lib/bin/net/java/games/input/RawMouse$Button.class b/lib/bin/net/java/games/input/RawMouse$Button.class
index 7201b62..6d18642 100644
Binary files a/lib/bin/net/java/games/input/RawMouse$Button.class and b/lib/bin/net/java/games/input/RawMouse$Button.class differ
diff --git a/lib/bin/net/java/games/input/RawMouse.class b/lib/bin/net/java/games/input/RawMouse.class
index 0388d1d..ee764ef 100644
Binary files a/lib/bin/net/java/games/input/RawMouse.class and b/lib/bin/net/java/games/input/RawMouse.class differ
diff --git a/lib/bin/net/java/games/input/RawMouseEvent.class b/lib/bin/net/java/games/input/RawMouseEvent.class
index d8d3d04..0e3aa84 100644
Binary files a/lib/bin/net/java/games/input/RawMouseEvent.class and b/lib/bin/net/java/games/input/RawMouseEvent.class differ
diff --git a/lib/bin/net/java/games/input/RawMouseInfo.class b/lib/bin/net/java/games/input/RawMouseInfo.class
index be40482..670296f 100644
Binary files a/lib/bin/net/java/games/input/RawMouseInfo.class and b/lib/bin/net/java/games/input/RawMouseInfo.class differ
diff --git a/lib/bin/net/java/games/input/Rumbler.class b/lib/bin/net/java/games/input/Rumbler.class
index c748212..3354557 100644
Binary files a/lib/bin/net/java/games/input/Rumbler.class and b/lib/bin/net/java/games/input/Rumbler.class differ
diff --git a/lib/bin/net/java/games/input/SetupAPIDevice.class b/lib/bin/net/java/games/input/SetupAPIDevice.class
index d3d96be..b938ed0 100644
Binary files a/lib/bin/net/java/games/input/SetupAPIDevice.class and b/lib/bin/net/java/games/input/SetupAPIDevice.class differ
diff --git a/lib/bin/net/java/games/input/Usage.class b/lib/bin/net/java/games/input/Usage.class
index 1a0f8c7..309e58e 100644
Binary files a/lib/bin/net/java/games/input/Usage.class and b/lib/bin/net/java/games/input/Usage.class differ
diff --git a/lib/bin/net/java/games/input/UsagePage.class b/lib/bin/net/java/games/input/UsagePage.class
index b22845b..696f243 100644
Binary files a/lib/bin/net/java/games/input/UsagePage.class and b/lib/bin/net/java/games/input/UsagePage.class differ
diff --git a/lib/bin/net/java/games/input/UsagePair.class b/lib/bin/net/java/games/input/UsagePair.class
index d918027..75343f5 100644
Binary files a/lib/bin/net/java/games/input/UsagePair.class and b/lib/bin/net/java/games/input/UsagePair.class differ
diff --git a/lib/bin/net/java/games/input/Version.class b/lib/bin/net/java/games/input/Version.class
index 64d6259..cdd6a0e 100644
Binary files a/lib/bin/net/java/games/input/Version.class and b/lib/bin/net/java/games/input/Version.class differ
diff --git a/lib/bin/net/java/games/util/Version.class b/lib/bin/net/java/games/util/Version.class
index ef9a40d..a9a4403 100644
Binary files a/lib/bin/net/java/games/util/Version.class and b/lib/bin/net/java/games/util/Version.class differ
diff --git a/lib/bin/net/java/games/util/plugins/Plugin.class b/lib/bin/net/java/games/util/plugins/Plugin.class
index a886d80..7b97f19 100644
Binary files a/lib/bin/net/java/games/util/plugins/Plugin.class and b/lib/bin/net/java/games/util/plugins/Plugin.class differ
diff --git a/lib/bin/net/java/games/util/plugins/PluginLoader.class b/lib/bin/net/java/games/util/plugins/PluginLoader.class
index ca1cca0..ea5fa04 100644
Binary files a/lib/bin/net/java/games/util/plugins/PluginLoader.class and b/lib/bin/net/java/games/util/plugins/PluginLoader.class differ
diff --git a/lib/bin/net/java/games/util/plugins/Plugins.class b/lib/bin/net/java/games/util/plugins/Plugins.class
index 31edea0..6cb64c0 100644
Binary files a/lib/bin/net/java/games/util/plugins/Plugins.class and b/lib/bin/net/java/games/util/plugins/Plugins.class differ
diff --git a/lib/jinput.jar b/lib/jinput.jar
index 9383049..a5d513b 100644
Binary files a/lib/jinput.jar and b/lib/jinput.jar differ
diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java
index c3d6a4f..5e1fdd0 100644
--- a/src/sig/RabiClone.java
+++ b/src/sig/RabiClone.java
@@ -5,7 +5,6 @@ import javax.swing.JFrame;
 import net.java.games.input.Component;
 import net.java.games.input.Controller;
 import net.java.games.input.ControllerEnvironment;
-import net.java.games.input.ControllerListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -88,33 +87,26 @@ public class RabiClone{
 
 
 			//System.out.println(CONTROLLERS.length);
+			CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers();
 			if (System.currentTimeMillis()-lastControllerScan>=5000) {
-				if (CONTROLLERS.length==0) {
-					CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers();
-					lastControllerScan=System.currentTimeMillis();
-				} else {
-					for (int i=0;i<CONTROLLERS.length;i++) {
-						if (CONTROLLERS[i].poll()) {
-							//System.out.println(CONTROLLERS[i].getPortType()+" // "+CONTROLLERS[i].getType());
-							Component[] components = CONTROLLERS[i].getComponents();
-							for (int j=0;j<components.length;j++) {
-								//Component c = components[j];
-								//System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
-							}
-							//System.out.println("--------");
-						} else {
-							CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().getControllers();
-							lastControllerScan=System.currentTimeMillis();
-							break;
-						}
-						/*EventQueue queue = controller_list[i].getEventQueue();
-
-						while (queue.getNextEvent(event)) {
-							Component c = event.getComponent();
-							System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
-						}*/
+				CONTROLLERS = ControllerEnvironment.getDefaultEnvironment().rescanControllers();
+			}
+			for (int i=0;i<CONTROLLERS.length;i++) {
+				if (CONTROLLERS[i].poll()) {
+					//System.out.println(CONTROLLERS[i].getPortType()+" // "+CONTROLLERS[i].getType());
+					Component[] components = CONTROLLERS[i].getComponents();
+					for (int j=0;j<components.length;j++) {
+						//Component c = components[j];
+						//System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
 					}
+					//System.out.println("--------");
 				}
+				/*EventQueue queue = controller_list[i].getEventQueue();
+
+				while (queue.getNextEvent(event)) {
+					Component c = event.getComponent();
+					System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
+				}*/
 			}
 
 			KeyBind.poll();
diff --git a/src/sig/objects/ConfigureControls.java b/src/sig/objects/ConfigureControls.java
index e143bd8..07633f7 100644
--- a/src/sig/objects/ConfigureControls.java
+++ b/src/sig/objects/ConfigureControls.java
@@ -31,31 +31,23 @@ public class ConfigureControls extends Object{
     public void update(double updateMult) {
         Event e = new Event();
         for (int i=0;i<RabiClone.CONTROLLERS.length;i++) {
-            if (RabiClone.CONTROLLERS[i].poll()) {
-                Component[] components = RabiClone.CONTROLLERS[i].getComponents();
-                for (int j=0;j<components.length;j++) {
-                    //Component c = components[j];
-                    //System.out.println(c.getName()+","+c.getIdentifier()+": "+c.getPollData());
-                }
-                //System.out.println("--------");
-                while (RabiClone.CONTROLLERS[i].getEventQueue().getNextEvent(e)) {
-                    if (assigningKey) {
-                        List<KeyBind> clist = KeyBind.KEYBINDS.get(selectedAction);
-                        Identifier id = e.getComponent().getIdentifier();
-                        if (id==Identifier.Axis.POV) {
-                            if (e.getValue()!=POV.DOWN&&
-                                e.getValue()!=POV.RIGHT&&
-                                e.getValue()!=POV.LEFT&&
-                                e.getValue()!=POV.UP) {
-                                continue; //Can't add ordinal directions, only cardinal.
-                            }
+            while (RabiClone.CONTROLLERS[i].getEventQueue().getNextEvent(e)) {
+                if (assigningKey) {
+                    List<KeyBind> clist = KeyBind.KEYBINDS.get(selectedAction);
+                    Identifier id = e.getComponent().getIdentifier();
+                    if (id==Identifier.Axis.POV) {
+                        if (e.getValue()!=POV.DOWN&&
+                            e.getValue()!=POV.RIGHT&&
+                            e.getValue()!=POV.LEFT&&
+                            e.getValue()!=POV.UP) {
+                            continue; //Can't add ordinal directions, only cardinal.
                         }
-                        clist.add(new KeyBind((byte)i,id,e.getValue()));
-                        KeyBind.KEYBINDS.put(selectedAction,clist);
-                        assigningKey=false;
                     }
-                    //System.out.println(e.getComponent().getName()+" value: "+e.getValue());
+                    clist.add(new KeyBind((byte)i,id,e.getValue()));
+                    KeyBind.KEYBINDS.put(selectedAction,clist);
+                    assigningKey=false;
                 }
+                //System.out.println(e.getComponent().getName()+" value: "+e.getValue());
             }
         }
     }