diff --git a/.config/sway/config b/.config/sway/config
index 4c27de5..f08a046 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -4,17 +4,6 @@ set $left h
 set $down j
 set $up k
 set $right l
-# workspaces
-set $ws1 1:www
-set $ws2 2:txt
-set $ws3 3:doc
-set $ws4 4:pdf
-set $ws5 5:cmd
-set $ws6 6:cmd
-set $ws7 7:cmd
-set $ws8 8:cmd
-set $ws9 9:cmd
-set $ws0 10:rdp
 # colors
 set $bg #000000
 set $dimmed #856cff
@@ -24,21 +13,18 @@ set $error #fa3500
 # key bindings #################################################################
 bindsym $mod+return exec footclient
 bindsym $mod+shift+return exec foot
-bindsym $mod+w exec firefox
-bindsym $mod+shift+w exec thunderbird
 # fuzzel
 bindsym $mod+space exec fuzzel
-bindsym $mod+shift+space exec fuzzel_open.sh\
-	-e $HOME/.cache\
-	-e $HOME/.mozilla\
-	-e $HOME/.thunderbird\
+bindsym $mod+shift+space exec fuzzel_open.sh \
+	-e $HOME/.cache \
+	-e $HOME/.mozilla \
+	-e $HOME/.thunderbird \
 	-e *.git*
 bindsym $mod+home exec fuzzel_nmcli.sh
 bindsym $mod+end exec fuzzel_udisksctl.sh
 # makoctl
 bindsym $mod+x exec makoctl dismiss
-bindsym $mod+shift+x exec makoctl dismiss -a
-bindsym --to-code $mod+z exec makoctl restore
+bindsym $mod+shift+x exec makoctl restore
 # screenshot
 bindsym print exec grim - | wl-copy
 
@@ -59,34 +45,45 @@ bindsym $mod+shift+$up move up
 bindsym $mod+shift+$down move down
 bindsym $mod+shift+$left move left
 bindsym $mod+shift+$right move right
+# workspaces
+#set $wsq 0:q:cmd
+set $wsw 1:w:www
+set $wse 2:e:txt
+set $wsr 3:r:doc
+set $wst 4:t:cmd
+set $wsy 5:y:cmd
+set $wsu 6:u:cmd
+set $wsi 7:i:cmd
+set $wso 8:o:cmd
+set $wsp 9:p:rdp
 # move focus workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws0
+bindsym --to-code $mod+tab workspace back_and_forth
+#bindsym --to-code $mod+q workspace $wsq
+bindsym --to-code $mod+w workspace $wsw
+bindsym --to-code $mod+e workspace $wse
+bindsym --to-code $mod+r workspace $wsr
+bindsym --to-code $mod+t workspace $wst
+bindsym --to-code $mod+y workspace $wsy
+bindsym --to-code $mod+u workspace $wsu
+bindsym --to-code $mod+i workspace $wsi
+bindsym --to-code $mod+o workspace $wso
+bindsym --to-code $mod+p workspace $wsp
 bindsym --to-code $mod+bracketleft workspace prev
 bindsym --to-code $mod+bracketright workspace next
-bindsym $mod+tab workspace back_and_forth
 # move container workspace
-bindsym $mod+shift+1 move container to workspace $ws1, workspace $ws1
-bindsym $mod+shift+2 move container to workspace $ws2, workspace $ws2
-bindsym $mod+shift+3 move container to workspace $ws3, workspace $ws3
-bindsym $mod+shift+4 move container to workspace $ws4, workspace $ws4
-bindsym $mod+shift+5 move container to workspace $ws5, workspace $ws5
-bindsym $mod+shift+6 move container to workspace $ws6, workspace $ws6
-bindsym $mod+shift+7 move container to workspace $ws7, workspace $ws7
-bindsym $mod+shift+8 move container to workspace $ws8, workspace $ws8
-bindsym $mod+shift+9 move container to workspace $ws9, workspace $ws9
-bindsym $mod+shift+0 move container to workspace $ws0, workspace $ws0
+bindsym --to-code $mod+shift+tab move container to workspace back_and_forth, workspace back_and_forth
+#bindsym --to-code $mod+shift+q move container to workspace $wsq, workspace $wsq
+bindsym --to-code $mod+shift+w move container to workspace $wsw, workspace $wsw
+bindsym --to-code $mod+shift+e move container to workspace $wse, workspace $wse
+bindsym --to-code $mod+shift+r move container to workspace $wsr, workspace $wsr
+bindsym --to-code $mod+shift+t move container to workspace $wst, workspace $wst
+bindsym --to-code $mod+shift+y move container to workspace $wsy, workspace $wsy
+bindsym --to-code $mod+shift+u move container to workspace $wsu, workspace $wsu
+bindsym --to-code $mod+shift+i move container to workspace $wsi, workspace $wsi
+bindsym --to-code $mod+shift+o move container to workspace $wso, workspace $wso
+bindsym --to-code $mod+shift+p move container to workspace $wsp, workspace $wsp
 bindsym --to-code $mod+shift+bracketleft move container to workspace prev, workspace prev
 bindsym --to-code $mod+shift+bracketright move container to workspace next, workspace next
-bindsym $mod+shift+tab move container to workspace back_and_forth, workspace back_and_forth
 # resize
 bindsym $mod+control+$left resize shrink width
 bindsym $mod+control+$down resize grow height
@@ -127,7 +124,7 @@ bindsym shift+XF86MonBrightnessDown exec brightnessctl set "10%-";\
 set $session_mode "session: (r)eload (l)ock (q)uit (s)uspend re(b)oot (p)oweroff"
 mode $session_mode {
 	bindsym r reload, mode default
-	bindsym l exec swaylock, mode default
+	bindsym l exec swaylock -fu -c$bg, mode default
 	bindsym q exit, mode default
 	bindsym s exec systemctl suspend, mode default
 	bindsym b exec systemctl reboot, mode default
@@ -154,6 +151,7 @@ client.urgent           $error  $error     $bg  $error    $bg
 bar {
 	status_command status.sh
 	separator_symbol " | "
+	strip_workspace_numbers yes
 	colors {
 		background $bg
 		statusline $dimmed
@@ -170,11 +168,15 @@ bar {
 xwayland disable
 
 # autostart ####################################################################
-exec swayidle
 exec mako
 exec wlsunset -l 45 -L 15
-workspace $ws1, exec thunderbird, exec firefox
-workspace $ws2, exec foot --server
+exec swayidle -w \
+	timeout 300 'swaylock -fu -c$bg' \
+	timeout 1800 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+	before-sleep 'swaylock -fu -c$bg'
+
+workspace $wsw, exec thunderbird, exec firefox
+workspace $wse, exec foot --server
 
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK