diff --git a/.config/sway/available/10-variables.conf b/.config/sway/available/10-variables.conf
index 12f2c85..712d84f 100644
--- a/.config/sway/available/10-variables.conf
+++ b/.config/sway/available/10-variables.conf
@@ -22,3 +22,6 @@ set $term alacritty
 # on the original workspace that the command was run on.
 #set $menu bemenu-run --no-exec --monitor=all | xargs swaymsg exec --
 set $menu bemenu-run --no-exec | xargs swaymsg exec --
+
+# Cursor hide delay (in ms)
+set $cursor-hide-delay "4000"
diff --git a/.config/sway/kd-laptop/30-input.conf b/.config/sway/kd-laptop/50-input-tweaks.conf
similarity index 74%
rename from .config/sway/kd-laptop/30-input.conf
rename to .config/sway/kd-laptop/50-input-tweaks.conf
index ffe2bae..4162700 100644
--- a/.config/sway/kd-laptop/30-input.conf
+++ b/.config/sway/kd-laptop/50-input-tweaks.conf
@@ -2,9 +2,6 @@
 #
 # Thurstylark
 
-# Cursor hide delay (in ms)
-set $cursor-delay "4000"
-
 set $touchpad "2:7:SynPS/2_Synaptics_Touchpad"
 set $trackpoint "2:10:TPPS/2_IBM_TrackPoint"
 set $trackpoint2 "1267:41:Elan_TrackPoint"
@@ -17,6 +14,3 @@ input $touchpad {
 # Disable Trackpoint
 input $trackpoint events disabled
 input $trackpoint2 events disabled
-
-# Hide cursor after delay
-seat * hide_cursor $cursor-delay
diff --git a/.config/sway/kdpi/30-input.conf b/.config/sway/kdpi/30-input.conf
deleted file mode 100644
index 06d94a7..0000000
--- a/.config/sway/kdpi/30-input.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sway Config: Input Config
-#
-# Thurstylark
-
-# Cursor hide delay (in ms)
-set $cursor-delay "100"
-
-# Hide cursor after delay
-seat * hide_cursor $cursor-delay
diff --git a/.config/sway/lark-desktop/30-input.conf b/.config/sway/lark-desktop/30-input.conf
deleted file mode 100644
index 55ffc16..0000000
--- a/.config/sway/lark-desktop/30-input.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Sway Config: Input Config
-#
-# Thurstylark
-
-# Set numlock on startup
-input * xkb_numlock enabled
-
-
diff --git a/.config/sway/larkbox/30-input.conf b/.config/sway/larkbox/30-input.conf
deleted file mode 100644
index 55ffc16..0000000
--- a/.config/sway/larkbox/30-input.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Sway Config: Input Config
-#
-# Thurstylark
-
-# Set numlock on startup
-input * xkb_numlock enabled
-
-