diff --git a/bash/bash_login b/bash/bash_login
index de08f0045..c32f67bc8 100644
--- a/bash/bash_login
+++ b/bash/bash_login
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+
 # Load aliases
 source ${HOME}/.dotfiles/bash/bash_aliases
 
@@ -11,7 +13,7 @@ fi
 ssh-agent -a "$SSH_AUTH_SOCK" >/dev/null
 
 # Static/predictable Sway socket
-export SWAYSOCK="${HOME}/.spool/sway-ipc.sock"
+export SWAYSOCK=`sway --get-socketpath`
 
 # Standardize language on en_US because of the ubiquity
 export LANG="en_US.UTF-8"
diff --git a/bash/bashrc b/bash/bashrc
index 22bec62b5..79675b138 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -99,5 +99,5 @@ export XDG_SESSION_TYPE="wayland"
 export XDG_CURRENT_DESKTOP="sway"
 export XDG_CONFIG_HOME="${HOME}/.config"
 export XDG_DATA_DIRS="$XDG_DATA_DIRS:${HOME}/.config/flatpak/exports/share"
-export SWAYSOCK="${HOME}/.spool/sway-ipc.sock"
+export SWAYSOCK=`sway --get-socketpath`
 export CHROME_EXECUTABLE="/usr/bin/chromium"
diff --git a/sway/behaviours b/sway/behaviours
index d3fe3998a..0f090ae2a 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -8,7 +8,7 @@
 assign [class="XTerm"] 1
 assign [class="Mattermost"] 1
 assign [class="UXTerm"] grave
-assign [class="thunderbird"] 2
+assign [class="Thunderbird"] 2
 assign [class="Chromium"] 3
 assign [class="Linphone"] 5
 assign [class="firefox"] 7
diff --git a/waybar/config.template b/waybar/config.template
index dfe0d18d9..a9b23ce27 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -166,7 +166,7 @@
         "interval": 600,
 	"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
         "on-click": "${HOME}/scripts/waybar/waybar-weather.pl notify",
-        "exec": "${HOME}/scripts/waybar/waybar-weather.sh bar"
+        "exec": "${HOME}/scripts/waybar/waybar-weather.pl bar"
     },
     "network": {
         // "interface": "wlp58s0", // (Optional) To force the use of this interface