diff --git a/.config/sway/common/10-variables.conf b/.config/sway/common/10-variables.conf
index f309476..7e13b8f 100644
--- a/.config/sway/common/10-variables.conf
+++ b/.config/sway/common/10-variables.conf
@@ -20,4 +20,4 @@ set $term alacritty
 # Preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu bemenu-run --no-exec | xargs swaymsg exec --
+set $menu bemenu-run --no-exec --monitor=all | xargs swaymsg exec --
diff --git a/.config/sway/common/20-keybindings.conf b/.config/sway/common/20-keybindings.conf
index 00b15a1..1005ab2 100644
--- a/.config/sway/common/20-keybindings.conf
+++ b/.config/sway/common/20-keybindings.conf
@@ -31,6 +31,9 @@ bindsym $mod+Shift+e exit
 # See 11-idle_lock.conf for locker definition
 bindsym $mod+Mod1+l exec "$locker"
 
+# Suspend the whole system
+bindsym $mod+Mod1+s exec "systemctl suspend"
+
 # Passmenu 
 #  (using aur/bemenu-dmenu to use dmenu without patching passmenu)
 bindsym $mod+p exec passmenu
diff --git a/.config/sway/common/21-layout.conf b/.config/sway/common/21-layout.conf
index 56e7411..4b70729 100644
--- a/.config/sway/common/21-layout.conf
+++ b/.config/sway/common/21-layout.conf
@@ -6,7 +6,7 @@
 workspace_layout default
 
 # Set default layout for containers
-default_orientation vertical
+default_orientation horizontal
 
 # Set default border style
 default_border pixel
diff --git a/.config/sway/common/11-idle_lock.conf b/.config/sway/kd-laptop/11-idle_lock.conf
similarity index 57%
rename from .config/sway/common/11-idle_lock.conf
rename to .config/sway/kd-laptop/11-idle_lock.conf
index 81a5a3c..cbd67df 100644
--- a/.config/sway/common/11-idle_lock.conf
+++ b/.config/sway/kd-laptop/11-idle_lock.conf
@@ -2,18 +2,20 @@
 #
 # Thurstylark
 
-set $lock-time 600
-set $dispsleep-time 900
+set $lock-time 900
+set $dispsleep-time 600
 
 set $dispsleep 'swaymsg "output * dpms off"'
 set $dispwake 'swaymsg "output * dpms on"'
 
-set $locker "swaylock -f -F -l -c 000000"
+set $locker "swaylock -e -f -F -l -c 000000"
+set $unlocker "killall swaylock"
 
 exec swayidle -w \
 	timeout $lock-time $locker \
-#	timeout $dispsleep-time $dispsleep \
+	timeout $dispsleep-time $dispsleep \
 	resume $dispwake \
 	after-resume $dispwake \
 	before-sleep $locker \
-	lock $locker
+	lock $locker \
+	unlock $unlocker
diff --git a/.config/sway/kd-laptop/40-output.conf b/.config/sway/kd-laptop/40-output.conf
index d7814e2..135c78e 100644
--- a/.config/sway/kd-laptop/40-output.conf
+++ b/.config/sway/kd-laptop/40-output.conf
@@ -30,7 +30,8 @@ set $o-puwide-pos-y "0"
 # Sane default of 1080p60
 output * mode 1920x1080@60Hz
 
-output * bg ~/.config/sway/$hostname/bg center #000000
+# Desktop wallpaper
+output * bg ~/.config/sway/$hostname/bg fill #000000
 
 # Set minimum brightness
 exec "light -N 6"
diff --git a/.config/sway/kd-laptop/bg b/.config/sway/kd-laptop/bg
index d7e610a..945a275 100644
Binary files a/.config/sway/kd-laptop/bg and b/.config/sway/kd-laptop/bg differ
diff --git a/.config/sway/lark-desktop/40-output.conf b/.config/sway/lark-desktop/40-output.conf
index d13eee5..4233282 100644
--- a/.config/sway/lark-desktop/40-output.conf
+++ b/.config/sway/lark-desktop/40-output.conf
@@ -8,12 +8,8 @@ set $omimon "Dell Inc. Dell AW3420DW 20X9D9990E2L"
 # Sane default of 1080p60
 output * mode 1920x1080@60Hz
 
-<<<<<<< HEAD
 output DP-1 mode 3440x1440@59Hz
 
 output $omimon mode 3440x1440@60Hz
 
-output * bg ~/.config/sway/lark-desktop/bg center #000000
-=======
 output * bg ~/.config/sway/$hostname/bg center #000000
->>>>>>> efbd9091616831d94e7a13aac756823de0baf49c
diff --git a/.config/sway/larkbox/20-bar.conf b/.config/sway/larkbox/20-bar.conf
new file mode 100644
index 0000000..cb8ed01
--- /dev/null
+++ b/.config/sway/larkbox/20-bar.conf
@@ -0,0 +1,14 @@
+# 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/larkbox/30-input.conf b/.config/sway/larkbox/30-input.conf
new file mode 100644
index 0000000..55ffc16
--- /dev/null
+++ b/.config/sway/larkbox/30-input.conf
@@ -0,0 +1,8 @@
+# Sway Config: Input Config
+#
+# Thurstylark
+
+# Set numlock on startup
+input * xkb_numlock enabled
+
+
diff --git a/.config/sway/larkbox/40-output.conf b/.config/sway/larkbox/40-output.conf
new file mode 100644
index 0000000..4233282
--- /dev/null
+++ b/.config/sway/larkbox/40-output.conf
@@ -0,0 +1,15 @@
+# Sway config: Output
+#
+# Thurstylark
+
+set $omimon "Dell Inc. Dell AW3420DW 20X9D9990E2L"
+
+
+# Sane default of 1080p60
+output * mode 1920x1080@60Hz
+
+output DP-1 mode 3440x1440@59Hz
+
+output $omimon mode 3440x1440@60Hz
+
+output * bg ~/.config/sway/$hostname/bg center #000000
diff --git a/.config/sway/larkbox/bg b/.config/sway/larkbox/bg
new file mode 100644
index 0000000..d7e610a
Binary files /dev/null and b/.config/sway/larkbox/bg differ