diff --git a/.config/sway/config.d/keyboard.conf##default b/.config/sway/config.d/keyboard.conf##default
index 382cb26..67f0a28 100644
--- a/.config/sway/config.d/keyboard.conf##default
+++ b/.config/sway/config.d/keyboard.conf##default
@@ -4,10 +4,3 @@ input * {
 	xkb_numlock enabled
 	xkb_options caps:escape_shifted_capslock
 }
-input "type:touchpad" {
-	tap enabled
-	natural_scroll disabled
-	accel_profile adaptive
-	dwt disabled
-	pointer_accel 0.4 # set mouse sensitivity (between -1 and 1)
-}
diff --git a/.config/sway/config.d/touchpad.conf b/.config/sway/config.d/touchpad.conf
index dec0199..eb112fc 100644
--- a/.config/sway/config.d/touchpad.conf
+++ b/.config/sway/config.d/touchpad.conf
@@ -1,11 +1,30 @@
 input type:touchpad {
     tap enabled
     natural_scroll disabled
+    events enabled
+    dwt enabled
+    # TODO disabled_on_external_mouse
+
+    accel_profile adaptive
+    pointer_accel 0.4 # set mouse sensitivity (between -1 and 1)
+}
+
+# FW16 Touchpad
+# Also 2362:628:PIXA3854:00_093A:0274_Mouse
+input 2362:628:PIXA3854:00_093A:0274_Touchpad {
+    pointer_accel 1
 }
 
 # TODO not working
-$bindsym $mod+Alt+t swaymsg input type:touchpad events toggle
+#$bindsym $mod+Alt+t swaymsg input type:touchpad events toggle
 
-#input "pointer:motion:MSFT0002:01.*" {
-#    xinput events disable type:touchpad
+#input type:mouse {
+#    accel_profile adaptive
+#    pointer_accel 1
+#}
+#
+## Ploopy
+#input 20547:23622:Ploopy_Corporation_Thumb_Trackball_Mouse {
+#    accel_profile adaptive
+#    pointer_accel 1
 #}