diff --git a/dotfiles/sway/daemons b/dotfiles/sway/daemons
index c095c3c..50cc204 100644
--- a/dotfiles/sway/daemons
+++ b/dotfiles/sway/daemons
@@ -34,6 +34,9 @@ exec_always pidof pipewire || pipewire
 exec_always pidof pipewire-media-session || pipewire-media-session
 exec_always pidof xdg-desktop-portal || /usr/lib/xdg-desktop-portal
 
+# Wake up pulseaudio
+exec_always pactl set-sink-volume @DEFAULT_SINK@ +0%
+
 #Notification Daemon
 exec_always pidof mako || mako
 
diff --git a/dotfiles/sway/visual b/dotfiles/sway/visual
index dfd1721..6b3b60c 100644
--- a/dotfiles/sway/visual
+++ b/dotfiles/sway/visual
@@ -17,7 +17,7 @@ set $bg_color   {{@@ color.bg_dark @@}}
 set $alert      #000000
 
 font {{@@ font.interface @@}}  {{@@ font.size.medium @@}}px
-output * bg "{{@@ background @@}}" fill
+output * bg "{{@@ background @@}}" fill "{{@@ color.bg @@}}"
 
 set $laptop eDP-1
 bindswitch --reload --locked lid:on output $laptop disable
@@ -43,9 +43,6 @@ client.urgent           $alert      $alert      $fg_color   $alert      $alert
 ###############################################################
 
 {%@@ if bar == "waybar" @@%}
-    # Wake up pulseaudio
-    exec pactl set-sink-volume @DEFAULT_SINK@ +0%
-
     bar swaybar_command waybar
 {%@@ else @@%}
     # I rarely use this
diff --git a/root/greetd/sway-config b/root/greetd/sway-config
index a1a3ee6..b179db7 100644
--- a/root/greetd/sway-config
+++ b/root/greetd/sway-config
@@ -1,13 +1,14 @@
 # {{@@ header() @@}}
 
-exec "env GTK_THEME='{{@@ gtk_theme @@}}' CURSOR_THEME='{{@@ cursor_theme @@}}' gtkgreet -l --command fish; swaymsg exit"
+exec "gtkgreet -l --command fish; swaymsg exit"
 
 bindsym Mod4+control+z exec systemctl suspend || loginctl suspend
 bindsym Mod4+control+e exec systemctl poweroff || loginctl poweroff
 
-{%@@ include _dotdrop_dotpath + '/sway/visual' @@%}
-
 {%@@ include _dotdrop_dotpath + '/sway/input' @@%}
+{%@@ include _dotdrop_dotpath + '/sway/visual' @@%}
+bar swaybar_command true
+output * bg "{{@@ color.bg @@}}" solid_color
 
 include /etc/sway/config.d/*