diff --git a/arch/sway b/arch/sway
index c0ab58d..a376d3b 100644
--- a/arch/sway
+++ b/arch/sway
@@ -1,6 +1,6 @@
 sway
 swayidle
-swaylock
+swaylock-effects
 swaybg
 waybar
 feh
diff --git a/gui/sway/base b/gui/sway/base
index 458f30a..67ce3fd 100644
--- a/gui/sway/base
+++ b/gui/sway/base
@@ -10,17 +10,12 @@ default_border none
 gaps inner 10
 smart_gaps on
 
-# exec --no-startup-id waybar;
-bar {
-    swaybar_command waybar;
-}
-# setup screens
-exec_always "killall kanshi; kanshi"
 # background
 exec_always wallpaper.sh
-# waybar
-# Restarts waybar if running, starts otherwise
-exec_always pgrep waybar && (killall -SIGUSR2 waybar) || (waybar)
+
+bar {
+    swaybar_command waybar
+}
 
 # loading layout
 assign [class="st-256color"] 1
@@ -37,13 +32,16 @@ floating_modifier $mod
 bindsym $mod+Return exec st
 
 # setup idling
-# exec swayidle -w \
-#          timeout 600 'swaylock-blur' \
-#          timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-#          lock 'swaylock-blur'
+exec swayidle -w \
+         timeout 600 'swaylock -f --screenshots --effect-blur 10x3 --clock' \
+         timeout 900 'swaymsg "output * dpms off"' \
+         resume 'swaymsg "output * dpms on"' \
+         timeout 10 'if pgrep -x swaylock; then swaymsg "output * power off"; fi' \
+         resume 'swaymsg "output * power on"'
+         # lock 'swaylock -f --screenshots --effect-blur 10x3 --clock' 
 
 # lock the screen
-bindsym $mod+q exec swaylock-blur
+bindsym $mod+q exec "swaylock -f --screenshots --effect-blur 10x3 --clock"
 # bindsym $mod+q exec sleep 1 && killall -SIGUSR1 swayidle
 
 # kill focused window
diff --git a/gui/sway/desktop b/gui/sway/desktop
index 1e88c67..8a74869 100644
--- a/gui/sway/desktop
+++ b/gui/sway/desktop
@@ -1,4 +1,7 @@
 include base
 
+output DP-2 enable scale 1 mode 3840x2160 position 2560,0
+output DP-3 enable scale 1 mode 2560x1440 position 0,380
+
 workspace 1 output DP-2
 workspace 2 output DP-3
diff --git a/gui/sway/thinkpad b/gui/sway/thinkpad
index 2cb21bf..433e775 100644
--- a/gui/sway/thinkpad
+++ b/gui/sway/thinkpad
@@ -1 +1,3 @@
 include base
+
+output LVDS-1 enable scale 1 mode 1366x768
diff --git a/gui/waybar/config b/gui/waybar/config
new file mode 120000
index 0000000..bdc1ac0
--- /dev/null
+++ b/gui/waybar/config
@@ -0,0 +1 @@
+/home/spinach/.dotfiles/gui/waybar/desktop
\ No newline at end of file
diff --git a/gui/waybar/style.css b/gui/waybar/style.css
new file mode 120000
index 0000000..18295f0
--- /dev/null
+++ b/gui/waybar/style.css
@@ -0,0 +1 @@
+/home/spinach/.dotfiles/gui/waybar/desktop-style.css
\ No newline at end of file
diff --git a/meta/configs/sway.desktop.yaml b/meta/configs/sway.desktop.yaml
index 490ffa5..d99334b 100644
--- a/meta/configs/sway.desktop.yaml
+++ b/meta/configs/sway.desktop.yaml
@@ -1,4 +1,4 @@
 - link:
     ~/.config/sway/config: gui/sway/desktop
+    ~/.config/sway/base: gui/sway/base
     ~/.config/sway/lock.png: gui/sway/lock.png
-    ~/.local/bin/swaylock-blur: bin/swaylock-blur
diff --git a/meta/configs/waybar.desktop.yaml b/meta/configs/waybar.desktop.yaml
index 8a119df..51a8bf1 100644
--- a/meta/configs/waybar.desktop.yaml
+++ b/meta/configs/waybar.desktop.yaml
@@ -1,4 +1,3 @@
 - link:
     ~/.config/waybar/config: gui/waybar/desktop
     ~/.config/waybar/style.css: gui/waybar/desktop-style.css
-