diff --git a/.config/sway/thurstybook/10-variables.conf b/.config/sway/thurstybook/10-variables.conf
new file mode 120000
index 0000000..9d726aa
--- /dev/null
+++ b/.config/sway/thurstybook/10-variables.conf
@@ -0,0 +1 @@
+../available/general/variables.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/11-base.conf b/.config/sway/thurstybook/11-base.conf
new file mode 120000
index 0000000..1803477
--- /dev/null
+++ b/.config/sway/thurstybook/11-base.conf
@@ -0,0 +1 @@
+../available/general/base.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/11-idle_lock.conf b/.config/sway/thurstybook/11-idle_lock.conf
deleted file mode 100644
index cbd67df..0000000
--- a/.config/sway/thurstybook/11-idle_lock.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Sway Config: Idle and Lockscreen
-#
-# Thurstylark
-
-set $lock-time 900
-set $dispsleep-time 600
-
-set $dispsleep 'swaymsg "output * dpms off"'
-set $dispwake 'swaymsg "output * dpms on"'
-
-set $locker "swaylock -e -f -F -l -c 000000"
-set $unlocker "killall swaylock"
-
-exec swayidle -w \
-	timeout $lock-time $locker \
-	timeout $dispsleep-time $dispsleep \
-	resume $dispwake \
-	after-resume $dispwake \
-	before-sleep $locker \
-	lock $locker \
-	unlock $unlocker
diff --git a/.config/sway/thurstybook/12-keybinds-base.conf b/.config/sway/thurstybook/12-keybinds-base.conf
new file mode 120000
index 0000000..24fd810
--- /dev/null
+++ b/.config/sway/thurstybook/12-keybinds-base.conf
@@ -0,0 +1 @@
+../available/keybinds/base.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/13-output-sane-default.conf b/.config/sway/thurstybook/13-output-sane-default.conf
new file mode 120000
index 0000000..e27dad6
--- /dev/null
+++ b/.config/sway/thurstybook/13-output-sane-default.conf
@@ -0,0 +1 @@
+../available/output/sane-default.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/14-output-configure.conf b/.config/sway/thurstybook/14-output-configure.conf
new file mode 120000
index 0000000..cb40163
--- /dev/null
+++ b/.config/sway/thurstybook/14-output-configure.conf
@@ -0,0 +1 @@
+../available/output/configure.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/15-input.conf b/.config/sway/thurstybook/15-input.conf
new file mode 120000
index 0000000..f5b9e26
--- /dev/null
+++ b/.config/sway/thurstybook/15-input.conf
@@ -0,0 +1 @@
+../available/input/input.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/20-bar.conf b/.config/sway/thurstybook/20-bar.conf
deleted file mode 100644
index cb8ed01..0000000
--- a/.config/sway/thurstybook/20-bar.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Sway config: Bar
-#
-# Reference: `man 5 sway-bar`
-bar {
-    position bottom
-
-    status_command py3status -c ~/.config/sway/$hostname/py3status.py
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
diff --git a/.config/sway/thurstybook/20-input-tweaks.conf b/.config/sway/thurstybook/20-input-tweaks.conf
new file mode 100644
index 0000000..7df36f3
--- /dev/null
+++ b/.config/sway/thurstybook/20-input-tweaks.conf
@@ -0,0 +1,15 @@
+# Sway Config: Common Input Configuration
+#
+# Thurstylark
+
+
+# Set common touchpad options
+input type:touchpad {
+	tap disabled
+	click_method clickfinger
+}
+
+
+# Touchscreen and Pen Mapping
+input type:touch map_to_output $o-id
+input type:tablet_tool map_to_output $o-id
diff --git a/.config/sway/thurstybook/30-input.conf b/.config/sway/thurstybook/30-input.conf
deleted file mode 100644
index fd73a3a..0000000
--- a/.config/sway/thurstybook/30-input.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Sway Config: Input Config
-#
-# Thurstylark
-
-# Cursor hide delay (in ms)
-set $cursor-delay "4000"
-
-set $touchpad "1739:10548:Synaptics_s3203_ver5"
-set $trackpoint "2:10:TPPS/2_IBM_TrackPoint"
-set $trackpoint2 "1267:41:Elan_TrackPoint"
-
-# Touchpad options
-input $touchpad {
-	#pointer_accel 0.5
-	click_method clickfinger
-	middle_emulation enabled
-}
-
-# Disable Trackpoint
-input $trackpoint events disabled
-input $trackpoint2 events disabled
-
-# Hide cursor after delay
-seat * hide_cursor $cursor-delay
diff --git a/.config/sway/thurstybook/40-output.conf b/.config/sway/thurstybook/40-output.conf
deleted file mode 100644
index 135c78e..0000000
--- a/.config/sway/thurstybook/40-output.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Sway config: Output
-#
-# Thurstylark
-
-# Setup for built-in monitor
-set $o-internal-id "eDP-1"
-set $o-internal-mode "1920x1080@60Hz"
-set $o-internal-pos-x "0"
-set $o-internal-pos-y "0"
-
-# Setup for 4k monitor attached to work dock
-set $o-dock4k-id "Ancor Communications Inc ASUS PB287Q 0x00005B34"
-set $o-dock4k-mode "2560x1440@59Hz"
-set $o-dock4k-pos-x "1920"
-set $o-dock4k-pos-y "0"
-
-# Setup for 1080 monitor attached to work dock
-set $o-docklg-id "Goldstar Company Ltd LG FULL HD 503NDWEH8441"
-set $o-docklg-mode "1920x1080@60Hz"
-set $o-docklg-pos-x "4480"
-set $o-docklg-pos-y "0"
-
-# Setup for personal ultrawide monitor
-set $o-puwide-id "Unknown ASUS VP348 0x0000CA5D"
-set $o-puwide-mode "3440x1440@59Hz"
-set $o-puwide-pos-x "1920"
-set $o-puwide-pos-y "0"
-
-
-# Sane default of 1080p60
-output * mode 1920x1080@60Hz
-
-# Desktop wallpaper
-output * bg ~/.config/sway/$hostname/bg fill #000000
-
-# Set minimum brightness
-exec "light -N 6"
-
-# Set monitors for work dock
-output $o-internal-id pos $o-internal-pos-x $o-internal-pos-y mode $o-internal-mode
-output $o-dock4k-id pos $o-dock4k-pos-x $o-dock4k-pos-y mode $o-dock4k-mode
-output $o-docklg-id pos $o-docklg-pos-x $o-docklg-pos-y mode $o-docklg-mode
-output $o-puwide-id pos $o-puwide-pos-x $o-puwide-pos-y mode $o-puwide-mode
diff --git a/.config/sway/thurstybook/90-workspaces.conf b/.config/sway/thurstybook/90-workspaces.conf
new file mode 120000
index 0000000..ec08a9f
--- /dev/null
+++ b/.config/sway/thurstybook/90-workspaces.conf
@@ -0,0 +1 @@
+../available/keybinds/workspaces.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/backlight-keys.conf b/.config/sway/thurstybook/backlight-keys.conf
new file mode 120000
index 0000000..883159d
--- /dev/null
+++ b/.config/sway/thurstybook/backlight-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/backlight-keys.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/backlight-min.conf b/.config/sway/thurstybook/backlight-min.conf
new file mode 120000
index 0000000..3ead22d
--- /dev/null
+++ b/.config/sway/thurstybook/backlight-min.conf
@@ -0,0 +1 @@
+../available/output/backlight-min.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/py3status.py b/.config/sway/thurstybook/bar/py3status.py
similarity index 69%
rename from .config/sway/thurstybook/py3status.py
rename to .config/sway/thurstybook/bar/py3status.py
index 5b2969d..a4959d5 100644
--- a/.config/sway/thurstybook/py3status.py
+++ b/.config/sway/thurstybook/bar/py3status.py
@@ -1,14 +1,19 @@
-order += "dropboxd_status"
+#order += "dropboxd_status"
 order += "arch_updates"
 order += "volume_status"
 order += "sysdata"
 order += "keyboard_locks"
 order += "battery_level"
-order += "clock"
+order += "group time"
 
-
-clock {
-        format_time = "%F %H:%M"
+group time {
+    clock "local" {
+            format_time = "%F %H:%M"
+    }
+    clock "zulu" {
+            format = "{UTC}"
+            format_time = "%Y%m%d %H%Mz"
+    }
 }
 
 arch_updates {
@@ -34,3 +39,8 @@ sysdata {
         format = "[\?color=cpu CPU: {cpu_used_percent}%], [\?color=mem Mem: {mem_used_percent}%], [\?color=load L1: {load1}], [\?color=load L5: {load5}], [\?color=load L15: {load15}]"
 }
 
+dropboxd_status {
+        format = "KD_DB: {status}"
+        status_on = "✓"
+        status_off = "DOWN"
+}
diff --git a/.config/sway/thurstybook/bg b/.config/sway/thurstybook/bg
deleted file mode 100644
index 945a275..0000000
Binary files a/.config/sway/thurstybook/bg and /dev/null differ
diff --git a/.config/sway/thurstybook/cursor-hide.conf b/.config/sway/thurstybook/cursor-hide.conf
new file mode 120000
index 0000000..a4eefa4
--- /dev/null
+++ b/.config/sway/thurstybook/cursor-hide.conf
@@ -0,0 +1 @@
+../available/input/cursor-hide.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/focus.conf b/.config/sway/thurstybook/focus.conf
new file mode 120000
index 0000000..9485d0c
--- /dev/null
+++ b/.config/sway/thurstybook/focus.conf
@@ -0,0 +1 @@
+../available/keybinds/focus.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/media-workspace.conf b/.config/sway/thurstybook/media-workspace.conf
new file mode 120000
index 0000000..f3f2e65
--- /dev/null
+++ b/.config/sway/thurstybook/media-workspace.conf
@@ -0,0 +1 @@
+../available/extras/media-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/monitor-workspace.conf b/.config/sway/thurstybook/monitor-workspace.conf
new file mode 120000
index 0000000..3e7ad3a
--- /dev/null
+++ b/.config/sway/thurstybook/monitor-workspace.conf
@@ -0,0 +1 @@
+../available/extras/monitor-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/movement.conf b/.config/sway/thurstybook/movement.conf
new file mode 120000
index 0000000..78906b7
--- /dev/null
+++ b/.config/sway/thurstybook/movement.conf
@@ -0,0 +1 @@
+../available/keybinds/movement.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/outputs/laptop.conf b/.config/sway/thurstybook/outputs/laptop.conf
new file mode 100644
index 0000000..c65ce31
--- /dev/null
+++ b/.config/sway/thurstybook/outputs/laptop.conf
@@ -0,0 +1,25 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+# Display ID is required
+set $o-id "eDP-1"
+
+# Mode
+set $o-mode "1366x768@60Hz"
+
+# Position
+set $o-pos-x "0"
+set $o-pos-y "0"
+
+# Scale Factor
+set $o-scalefactor "1"
+
+
+# Do the thing
+#  (comment or remove direcives that are unnecessary to avoid errors)
+output $o-id {
+	mode $o-mode
+	position $o-pos-x $o-pos-y
+	scale $o-scalefactor
+}
diff --git a/.config/sway/thurstybook/passmenu.conf b/.config/sway/thurstybook/passmenu.conf
new file mode 120000
index 0000000..2121a4e
--- /dev/null
+++ b/.config/sway/thurstybook/passmenu.conf
@@ -0,0 +1 @@
+../available/keybinds/passmenu.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/playerctl-media-keys.conf b/.config/sway/thurstybook/playerctl-media-keys.conf
new file mode 120000
index 0000000..758b097
--- /dev/null
+++ b/.config/sway/thurstybook/playerctl-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/playerctl-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/pulse-media-keys.conf b/.config/sway/thurstybook/pulse-media-keys.conf
new file mode 120000
index 0000000..64916fb
--- /dev/null
+++ b/.config/sway/thurstybook/pulse-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/pulse-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/py3status.conf b/.config/sway/thurstybook/py3status.conf
new file mode 120000
index 0000000..de93c74
--- /dev/null
+++ b/.config/sway/thurstybook/py3status.conf
@@ -0,0 +1 @@
+../available/bar/py3status.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/random-bg.conf b/.config/sway/thurstybook/random-bg.conf
new file mode 120000
index 0000000..dd8180f
--- /dev/null
+++ b/.config/sway/thurstybook/random-bg.conf
@@ -0,0 +1 @@
+../available/output/random-bg.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/resize.conf b/.config/sway/thurstybook/resize.conf
new file mode 120000
index 0000000..5b7c0ab
--- /dev/null
+++ b/.config/sway/thurstybook/resize.conf
@@ -0,0 +1 @@
+../available/mode/resize.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/rotation.conf b/.config/sway/thurstybook/rotation.conf
new file mode 100644
index 0000000..8df4ba0
--- /dev/null
+++ b/.config/sway/thurstybook/rotation.conf
@@ -0,0 +1,18 @@
+# Sway config: Display rotation
+#
+# Thurstylark
+
+
+set $rotate-display eDP-1
+
+bindsym $mod+Backslash mode "Rotate"
+
+#input $i-wacom-pen map_to_output $o-internal-id
+#input $i-wacom-touch map_to_output $o-internal-id
+
+mode "Rotate" {
+	bindsym Down output $rotate-display transform normal; mode "default"
+	bindsym Left output $rotate-display transform 90 clockwise; mode "default"
+	bindsym Right output $rotate-display transform 90 anticlockwise; mode "default"
+	bindsym Up output $rotate-display transform 180 clockwise; mode "default"
+}
diff --git a/.config/sway/thurstybook/scratchpad.conf b/.config/sway/thurstybook/scratchpad.conf
new file mode 120000
index 0000000..dfbc371
--- /dev/null
+++ b/.config/sway/thurstybook/scratchpad.conf
@@ -0,0 +1 @@
+../available/keybinds/scratchpad.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/screen-lock.conf b/.config/sway/thurstybook/screen-lock.conf
new file mode 120000
index 0000000..d61f075
--- /dev/null
+++ b/.config/sway/thurstybook/screen-lock.conf
@@ -0,0 +1 @@
+../available/keybinds/screen-lock.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/suspend.conf b/.config/sway/thurstybook/suspend.conf
new file mode 120000
index 0000000..5dc5ee2
--- /dev/null
+++ b/.config/sway/thurstybook/suspend.conf
@@ -0,0 +1 @@
+../available/keybinds/suspend.conf
\ No newline at end of file
diff --git a/.config/sway/thurstybook/terminal-workspace.conf b/.config/sway/thurstybook/terminal-workspace.conf
new file mode 120000
index 0000000..9321017
--- /dev/null
+++ b/.config/sway/thurstybook/terminal-workspace.conf
@@ -0,0 +1 @@
+../available/extras/terminal-workspace.conf
\ No newline at end of file