diff --git a/.config/sway/config b/.config/sway/config
index 5bc35ce..b1939fc 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -32,8 +32,12 @@ input 9456:311:Metadot_-_Das_Keyboard_Das_Keyboard_Model_S xkb_model "pc105"
 # ------------------------------------------------------------------------------
 output eDP-1 pos 0 0 res 3840x2400 scale 2
 output DP-3 pos 1920 0 res 1920x120
+
 output * bg /usr/share/backgrounds/custom/mountain.jpg fill
 
+bindswitch --reload --locked lid:on output eDP-1 disable
+bindswitch --reload --locked lid:off output eDP-1 enable
+
 # ------------------------------------------------------------------------------
 # Font
 # ------------------------------------------------------------------------------
@@ -173,9 +177,6 @@ bindsym $mod+Mod1+Left move workspace to output left
 # reload the configuration file
 bindsym $mod+Shift+c reload
 
-# restart sway inplace (preserves your layout/session, can be used to upgrade sway)
-bindsym $mod+Shift+r restart
-
 # exit sway (logs you out of your Wayland session)
 bindsym $mod+Shift+e exec "swaynag -f 'pango:$font' -t warning -m 'sway beenden?' -b 'Ja' 'swaymsg exit'"
 
@@ -208,15 +209,14 @@ bindsym XF86Display exec --no-startup-id /usr/local/bin/monitor
 # ------------------------------------------------------------------------------
 # Assignment of progrmans to workspaces
 # ------------------------------------------------------------------------------
-assign [class="^Termite$"] $workspace1
-assign [class="^Subl3$"] $workspace2
-assign [class="^Code$"] $workspace2
-assign [class="^Chromium$"] $workspace3
-assign [class="^Nightly$"] $workspace3
-assign [class="^Firefox$"] $workspace3
+assign [app_id="^termite$"] $workspace1
+assign [class="^code-oss$"] $workspace2
+assign [class="^jetbrains-idea$"] $workspace2
+assign [class="^firefox$"] $workspace3
 assign [class="^Thunderbird$"] $workspace4
-assign [class="^Thunar$"] $workspace5
-assign [class="^plexmediaplayer$"] $workspace6
+assign [app_id="^thunar$"] $workspace5
+assign [class="^Slack$"] 8
+assign [class="^Microsoft Teams - Preview$"] 9
 
 # ------------------------------------------------------------------------------
 # Screenshot shortcuts
@@ -237,33 +237,14 @@ bindsym XF86WLAN exec --no-startup-id pkill -SIGRTMIN+12 i3blocks
 # ------------------------------------------------------------------------------
 # Lockscreen
 # ------------------------------------------------------------------------------
-exec --no-startup-id xss-lock -- i3lock \
---insidevercolor=282c34ff \
---ringvercolor=61afefff \
-\
---insidewrongcolor=282c34ff \
---ringwrongcolor=e06c75ff \
-\
---insidecolor=282c34ff \
---ringcolor=61afefff \
---linecolor=00000000 \
---separatorcolor=61afefff \
-\
---verifcolor=abb2bfff \
---wrongcolor=e06c75ff \
---timecolor=abb2bfff \
---datecolor=abb2bfff \
---layoutcolor=abb2bfff \
---keyhlcolor=98c379ff \
---bshlcolor=e06c75ff \
--n \
---screen 1 \
---blur 10 \
---clock \
---indicator \
---datestr="%d.%m.%Y" \
---wrongtext="Nope!"
-bindsym control+Mod1+l exec --no-startup-id xset s activate
+exec --no-startup-id swayidle -w \
+    timeout 300 'swaylock -f' \
+    timeout 600 'swaymsg "output * dpms off"' \
+    resume 'swaymsg "output * dpms on"' \
+    before-sleep 'swaylock -f'
+
+bindsym control+Mod1+l exec --no-startup-id swaylock
+
 
 # ------------------------------------------------------------------------------
 # Window theming
@@ -303,5 +284,7 @@ bar {
         inactive_workspace $color_bg_focused $color_bg_focused $color_fg_unfocused
         urgent_workspace   $color_bg_focused $color_bg_focused $color_red
     }
+
+    #swaybar_command waybar
     status_command i3blocks -c ~/.i3blocks.conf
 }
diff --git a/.config/swaylock/config b/.config/swaylock/config
new file mode 100644
index 0000000..9022265
--- /dev/null
+++ b/.config/swaylock/config
@@ -0,0 +1,28 @@
+fade-in=0.2
+grace=2
+clock
+datestr=%d.%m.%Y
+screenshots
+hide-keyboard-layout
+bs-hl-color=e06c75ff
+font=Roboto=Regular
+indicator-idle-visible
+indicator-radius=100
+indicator-thickness=10
+inside-color=282c34ff
+inside-clear-color=282c34ff
+inside-ver-color=282c34ff
+inside-wrong-color=282c34ff
+key-hl-color=98c379ff
+line-uses-inside
+ring-color=61afefff
+ring-clear-color=61afefff
+ring-ver-color=61afefff
+ring-wrong-color=e06c75ff
+separator-color=61afefff
+text-color=ffffffff
+text-clear-color=ffffffff
+text-ver-color=ffffffff
+text-wrong-color=e06c75ff
+effect-blur=7x7
+effect-vignette=0.5:0.5