diff --git a/.config/sway/config b/.config/sway/config
index 5e60407..7332b30 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -14,11 +14,11 @@ set {
     $menu wofi --show drun | xargs swaymsg exec --
     $runmenu wofi --show run | xargs swaymsg exec --
     $gnome-schema org.gnome.desktop.interface
-    $gtk_theme "Adapta-Nokto-Eta"
+    $gtk_theme "Matcha-dark-azul"
     $icon_theme "Papirus-Dark"
     $bg ~/Pictures/drain.jpg
-    #$lockscreen exec '~/.local/bin/lockscreen'
-    $lockscreen 'swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 10 --effect-blur 7x5 --effect-vignette 0.4:0.4 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2'
+    $lockscreen exec '~/.local/bin/lockscreen'
+    #$lockscreen 'swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 10 --effect-blur 7x5 --effect-vignette 0.4:0.4 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2'
     # Heads
     $primary eDP-1
 }
@@ -28,20 +28,27 @@ set {
 #
 exec_always --no-startup-id {
     pkill flashfocus
+    pkill autotiling
+    pkill play-with-mpv
+    eval $(/usr/bin/gnome-keyring-daemon --start --components=ssh)
+    /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
     gsettings set $gnome-schema gtk-theme $gtk_theme
     gsettings set $gnome-schema icon-theme $icon_theme
     gsettings set $gnome-schema font-name 'Cantarell 10'
     gsettings set $gnome-schema monospace-font-name 'Anka/Coder 11'
     mako --anchor top-right > /tmp/mako.log 2>&1
     flashfocus
+    autotiling
+    play-with-mpv
     evolution
-    telegram-desktop
+    Telegram
     swaymsg focus output $primary
     swaymsg input 2:7:SynPS/2_Synaptics_TouchPad events disabled
-    swayidle -w timeout 1200 exec $lockscreen\
-        timeout 1201 'swaymsg "output * dpms off"'\
-        resume 'swaymsg "output * dpms on"'\
-        before-sleep exec $lockscreen
+}
+
+exec_always {
+    swayidle -w timeout 1200 "$lockscreen"\
+        before-sleep "$lockscreen"
 }
 
 #
@@ -85,10 +92,10 @@ output * bg $bg fill
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+e exec wlogout #swaynag -t warning -m 'Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 
     #Lock the session
-    bindsym Control+Shift+l exec $lockscreen
+    bindsym Control+Alt+l $lockscreen
 
 #
 # Program shortcuts
@@ -141,7 +148,7 @@ bindsym {
     bindsym $mod+9 workspace 9
     bindsym $mod+0 workspace 10
 
-    bindsym $mod+t workspace comm
+    bindsym $mod+t workspace 11:comm
     bindsym $mod+m workspace M
 
     # Move focused container to workspace
@@ -175,8 +182,9 @@ bindsym {
 
 # Assign programs to workspaces
 
-assign [app_id="evolution"] comm
-assign [instance="telegram-desktop"] comm
+assign [app_id="evolution"] 11:comm
+assign [app_id="telegramdesktop"] 11:comm
+assign [instance="Telegram"] 11:comm
 assign [title="nmtui"] net
 
 #
@@ -204,6 +212,7 @@ assign [title="nmtui"] net
 
     # Move focus to the parent container
     bindsym $mod+a focus parent
+    bindsym $mod+Shift+a focus child
 
 #
 # Media keys and screenshots
@@ -306,6 +315,7 @@ bar {
 # Window settings
 #
 for_window [class="Brave-browser"] inhibit_idle focus; layout tabbed
+for_window [app_id="firefox"] inhibit_idle focus; layout tabbed
 #
 # Floating windows
 #
@@ -318,13 +328,13 @@ for_window [title="ImageMagick.*"] {
     border normal $border
     title_format " %title"
 }
-#for_window [title="nmtui"] {
-#    border normal $border
-#    resize set width 882
-#    resize set height 600
-#    floating enable
-#}
-for_window [class="TelegramDesktop"] {
+for_window [title="nmtui"] {
+    border normal $border
+    resize set width 882
+    resize set height 600
+    floating enable
+}
+for_window [app_id="telegramdesktop"] {
     resize set width 600px
 }
 for_window [app_id="nm-connection-editor"] {
@@ -337,7 +347,7 @@ for_window [app_id="pavucontrol"] {
     resize set width  882px
     resize set height 600px
 }
-for_window [title="Calculator"]     floating enable; border pixel 2
+for_window [title="Calculator"] floating enable; border pixel 2