diff --git a/.bashrc b/.bashrc
index 54cc098..226599c 100755
--- a/.bashrc
+++ b/.bashrc
@@ -55,7 +55,7 @@ export LESS_TERMCAP_us=$'\E[01;32m'
 #######################################################
 
 # Ensure gopass autocompletion is sourced
-source <(gopass completion bash)
+#source <(gopass completion bash)
 
 # Gopass aliases
 alias gpi='gopass insert --multiline'
@@ -107,8 +107,8 @@ alias .....='cd ../../../..'
 # cd into the old directory
 alias bd='cd "$OLDPWD"'
 
-# ls -> exa
-alias ls='exa'
+# ls -> eza
+alias ls='eza'
 
 # Search command line history
 alias h="history | grep "
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index 255c484..c792072 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,7 +1,7 @@
 import = ["/home/opal/.config/alacritty/gruvbox-light.toml"]
 
 [env]
-TERM = "alacritty"
+TERM = "xterm-256color"
 
 [font]
 size = 22
diff --git a/.config/sway/config b/.config/sway/config
index 8ef3962..6046c00 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -192,7 +192,7 @@ exec /usr/bin/syncthing
 exec_always dunst
 
 # Wlsunset (Night Light)
-exec_always wlsunset -l 47.6 -L -122.3 -t 2000 -T 3000
+exec_always pkill wlsunset && wlsunset -l 47.6 -L -122.3 -t 2000 -T 3000
 
 # udiskie - auto usb mounting
 exec /usr/bin/udiskie &
@@ -222,11 +222,11 @@ exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activati
 #######################
 
 # SwayFX specific directions
-corner_radius 3
-shadows enable
+#corner_radius 3
+#shadows enable
 #default_dim_inactive 0.1
-blur enable
-blur_xray disable
+#blur enable
+#blur_xray disable
 
 # Gaps
 smart_gaps off
diff --git a/.config/waybar/config b/.config/waybar/config
index 8649654..fcc48f8 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -40,12 +40,12 @@
             "warning": 30,
             "critical": 15
         },
-        "full-at":  "99",
+        "full-at":  "100",
         "format": "{icon} {capacity}%",
-        "format-icons": [" ","", "","", ""],
-        "format-good": " %", // An empty format will hide the module
-        "format-full": "",
-        "format-charging": " {capacity}% "
+        "format-icons": ["󰁺","󰁻", "󰁼","󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
+        "format-good": "󰁹 %", // An empty format will hide the module
+        "format-full": "󱈑",
+        "format-charging": "󰂄 {capacity}% "
     },
     "custom/wlsunset": {
         "format": "{icon}",