diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index a4c028c..c247920 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -52,6 +52,8 @@
 CONFIG_FUSE_FS=y
 CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HID_GENERIC=y
+CONFIG_HID_SONY=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -67,6 +69,9 @@
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INOTIFY_USER=y
+CONFIG_INPUT=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_JOYSTICK=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
@@ -98,6 +103,7 @@
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_JOYSTICK_XPAD=y
 CONFIG_L2TP=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MD=y
@@ -218,6 +224,7 @@
 CONFIG_TIMERFD=y
 CONFIG_TTY=y
 CONFIG_TUN=y
+CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
 CONFIG_USB=y
diff --git a/android-4.14/android-recommended.config b/android-4.14/android-recommended.config
index 58f3cb6..234f942 100644
--- a/android-4.14/android-recommended.config
+++ b/android-4.14/android-recommended.config
@@ -43,7 +43,6 @@
 CONFIG_HID_ELECOM=y
 CONFIG_HID_EMS_FF=y
 CONFIG_HID_EZKEY=y
-CONFIG_HID_GENERIC=y
 CONFIG_HID_GREENASIA=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_HOLTEK=y
@@ -68,8 +67,8 @@
 CONFIG_HID_SAITEK=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=y
 CONFIG_HID_SPEEDLINK=y
+CONFIG_HID_STEAM=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_TIVO=y
@@ -81,16 +80,12 @@
 CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_GPIO=y
-CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_KEYRESET=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD=y
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_KALLSYMS=y
@@ -132,7 +127,6 @@
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UHID=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
index 4959290..6f77572 100644
--- a/android-4.19/android-base.config
+++ b/android-4.19/android-base.config
@@ -52,6 +52,8 @@
 CONFIG_FUSE_FS=y
 CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HID_GENERIC=y
+CONFIG_HID_SONY=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -67,6 +69,9 @@
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INOTIFY_USER=y
+CONFIG_INPUT=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_JOYSTICK=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
@@ -98,6 +103,7 @@
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_JOYSTICK_XPAD=y
 CONFIG_L2TP=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MD=y
@@ -218,6 +224,7 @@
 CONFIG_TIMERFD=y
 CONFIG_TTY=y
 CONFIG_TUN=y
+CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
 CONFIG_USB=y
diff --git a/android-4.19/android-recommended.config b/android-4.19/android-recommended.config
index 3d7f9c3..8544dd7 100644
--- a/android-4.19/android-recommended.config
+++ b/android-4.19/android-recommended.config
@@ -43,7 +43,6 @@
 CONFIG_HID_ELECOM=y
 CONFIG_HID_EMS_FF=y
 CONFIG_HID_EZKEY=y
-CONFIG_HID_GENERIC=y
 CONFIG_HID_GREENASIA=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_HOLTEK=y
@@ -68,8 +67,8 @@
 CONFIG_HID_SAITEK=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=y
 CONFIG_HID_SPEEDLINK=y
+CONFIG_HID_STEAM=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_TIVO=y
@@ -81,14 +80,10 @@
 CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD=y
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_KALLSYMS=y
@@ -130,7 +125,6 @@
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UHID=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/android-5.4/android-base.config b/android-5.4/android-base.config
index 62d32df..2968011 100644
--- a/android-5.4/android-base.config
+++ b/android-5.4/android-base.config
@@ -52,6 +52,8 @@
 CONFIG_FUSE_FS=y
 CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
+CONFIG_HID_GENERIC=y
+CONFIG_HID_SONY=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -63,6 +65,9 @@
 CONFIG_INET_ESP=y
 CONFIG_INET_UDP_DIAG=y
 CONFIG_INOTIFY_USER=y
+CONFIG_INPUT=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_JOYSTICK=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
@@ -94,6 +99,7 @@
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_JOYSTICK_XPAD=y
 CONFIG_L2TP=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MD=y
@@ -214,6 +220,7 @@
 CONFIG_TIMERFD=y
 CONFIG_TTY=y
 CONFIG_TUN=y
+CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
 CONFIG_USB=y
diff --git a/android-5.4/android-recommended.config b/android-5.4/android-recommended.config
index a735fbb..dc66956 100644
--- a/android-5.4/android-recommended.config
+++ b/android-5.4/android-recommended.config
@@ -42,7 +42,6 @@
 CONFIG_HID_ELECOM=y
 CONFIG_HID_EMS_FF=y
 CONFIG_HID_EZKEY=y
-CONFIG_HID_GENERIC=y
 CONFIG_HID_GREENASIA=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_HOLTEK=y
@@ -67,8 +66,8 @@
 CONFIG_HID_SAITEK=y
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SONY=y
 CONFIG_HID_SPEEDLINK=y
+CONFIG_HID_STEAM=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_TIVO=y
@@ -80,14 +79,10 @@
 CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD=y
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_KALLSYMS=y
@@ -129,7 +124,6 @@
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UHID=y
 CONFIG_UPROBE_EVENTS=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y