diff --git a/dotfiles/.config/fish/config.fish b/dotfiles/.config/fish/config.fish
new file mode 100644
index 0000000..f8d43b1
--- /dev/null
+++ b/dotfiles/.config/fish/config.fish
@@ -0,0 +1 @@
+neofetch
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index dfe1362..9e81e09 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -17,14 +17,11 @@ set $right l
 set $term foot
 
 # Lockscreen
-#set $lock swaylock -c 550000
-set $lock swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2
-exec swayidle -w \
-    timeout 600 $lock \
-    timeout 570 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    before-sleep $lock
+set $lock swaylock -f --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2
 
+exec swayidle timeout 570 'swaylock -f --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2'
+
+#exec swayidle -w  timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000'
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -288,7 +285,7 @@ input * xkb_layout "se"
 	exec keepassxc
 	for_window [class="KeePassXC"] move to workspace 4:
 	exec thunderbird
-	for_window [class="Thunderbird"] move to workspace 5:
+	for_window [title="Mozilla Thunderbird"] move to workspace 5:
 
 	# Autostart stuff here
 	exec ~/.config/sway/bin/refresh_autostart.sh