diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 02197e7..66f2d44 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -5,7 +5,7 @@ window:
   title: Alacritty
   dynamic_title: true
   gtk_theme_variant: dark
-  opacity: 0.45
+  opacity: 0.65
 
 scrolling:
   history: 10000
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index d278988..f000f4b 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 # Set super key as mod key
 set $mod Mod4
@@ -13,7 +13,11 @@ set $right Right
 set $term alacritty
 
 # Application launcher
-set $menu exec $term -o window.opacity=0.75 --class launcher -t "Application Launcher" -e env HIST_FILE="" /usr/bin/sway-launcher-desktop
+set $menu exec $term -o window.opacity=0.85 \
+    --class launcher \
+    -t "Application Launcher" \
+    -e env HIST_FILE="" \
+    /usr/bin/sway-launcher-desktop
 
 # Waybar as status bar
 bar {
diff --git a/sway/.config/sway/config.d/00_appearance b/sway/.config/sway/config.d/00_appearance
index 38ecda9..44fc0ee 100644
--- a/sway/.config/sway/config.d/00_appearance
+++ b/sway/.config/sway/config.d/00_appearance
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 # Borders
 default_border pixel 3
@@ -19,7 +19,7 @@ output * bg ~/Pictures/Wallpapers/wallpaper fill
 
 # Colors (border, bground and text only apply to window titlebars)
 # class                 border  bground text    indicator child_border
-client.focused          #6c71c4 #6c71c4 #eee8d5 #839496   #6c71c4
+client.focused          #6c71c4 #6c71c4 #eee8d5 #268bd2   #6c71c4
 client.focused_inactive #002b36 #002b36 #eee8d5 #002b36   #002b36
 client.unfocused        #002b36 #002b36 #eee8d5 #002b36   #002b36
 client.urgent           #dc322f #dc322f #eee8d5 #cb4b16   #dc322f
diff --git a/sway/.config/sway/config.d/01_keybinds b/sway/.config/sway/config.d/01_keybinds
index 79f8996..e74e626 100644
--- a/sway/.config/sway/config.d/01_keybinds
+++ b/sway/.config/sway/config.d/01_keybinds
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 ### GENERAL ###
 
diff --git a/sway/.config/sway/config.d/02_behavior b/sway/.config/sway/config.d/02_behavior
index 6233cba..57632a1 100644
--- a/sway/.config/sway/config.d/02_behavior
+++ b/sway/.config/sway/config.d/02_behavior
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 ### GENERAL ###
 
diff --git a/sway/.config/sway/config.d/03_input b/sway/.config/sway/config.d/03_input
index 7e45ed6..b5206ad 100644
--- a/sway/.config/sway/config.d/03_input
+++ b/sway/.config/sway/config.d/03_input
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 ### GENERAL ###
 
diff --git a/sway/.config/sway/config.d/04_output b/sway/.config/sway/config.d/04_output
index 6b8ace9..2b371f5 100644
--- a/sway/.config/sway/config.d/04_output
+++ b/sway/.config/sway/config.d/04_output
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 output DP-2 pos 0 0 res 1920x1200
 output eDP-1 pos 1920 0 res 1920x1080
diff --git a/sway/.config/sway/config.d/10_autoexec b/sway/.config/sway/config.d/10_autoexec
index b482689..87be6ad 100644
--- a/sway/.config/sway/config.d/10_autoexec
+++ b/sway/.config/sway/config.d/10_autoexec
@@ -1,4 +1,4 @@
-# vim: ft=swayconfig
+# vi: ft=swayconfig
 
 # Start background services
 exec doas ivpn-service
@@ -13,8 +13,10 @@ exec dbus-update-activation-environment WAYLAND_DISPLAY
 # Idle configuration
 exec swayidle -w \
     timeout 600 'swaylock' \
-    timeout 1200 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+    timeout 1200 'swaymsg "output * dpms off"' \
+    resume 'swaymsg "output * dpms on"' \
     before-sleep 'swaylock'
 
 # Custom script for VPN connection before XDG autostart applications
+# Also fixes tray icons not showing when app is started before Waybar is ready
 exec ~/.config/sway/autostart.sh
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 1df628c..4d2367e 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -37,7 +37,7 @@
 }
 
 window#waybar {
-    background-color: alpha(@base03, 0.45);
+    background-color: alpha(@base03, 0.65);
     transition-property: background-color;
     transition-duration: .5s;
 }