diff --git a/dot_config/fish/conf.d/20-gpg.fish b/dot_config/fish/conf.d/20-gpg.fish
index 66731ab..870d96f 100644
--- a/dot_config/fish/conf.d/20-gpg.fish
+++ b/dot_config/fish/conf.d/20-gpg.fish
@@ -1,6 +1,6 @@
 #!/usr/bin/env fish
 
 if test "$(command -v gpgconf &>/dev/null)"
-    set -Ux GPG_TTY (tty)
+    set -gx GPG_TTY (tty)
     gpgconf --launch gpg-agent
 end
diff --git a/dot_config/fish/conf.d/30-glamour.fish.tmpl b/dot_config/fish/conf.d/30-glamour.fish.tmpl
index b577361..f8c0f45 100644
--- a/dot_config/fish/conf.d/30-glamour.fish.tmpl
+++ b/dot_config/fish/conf.d/30-glamour.fish.tmpl
@@ -1,5 +1,8 @@
 #!/usr/bin/env fish
 
-# hardcoded theme bc rose-pine doesn't have a glow theme
+{{ if eq .drapeau.colors.name "rose-pine" -}}
 # TODO: make a rose-pine glow theme
 set -gx GLAMOUR_STYLE "~/.config/glow/themes/catppuccin-macchiato.json"
+{{ else -}}
+set -gx GLAMOUR_STYLE "~/.config/glow/themes/{{ .drapeau.colorscheme }}.json"
+{{ end -}}
diff --git a/dot_config/fish/conf.d/30-gtk.fish.tmpl b/dot_config/fish/conf.d/30-gtk.fish.tmpl
index 01ecf7c..5e52446 100644
--- a/dot_config/fish/conf.d/30-gtk.fish.tmpl
+++ b/dot_config/fish/conf.d/30-gtk.fish.tmpl
@@ -2,8 +2,8 @@
 
 {{ if eq .drapeau.colors.name "catppuccin" -}}
 set -gx GTK_THEME {{ .drapeau.colorscheme | title }}-Standard-Pink-Dark
-{{ end -}}
-
-{{ if eq .drapeau.colors.name "rose-pine" -}}
+{{ else if eq .drapeau.colors.name "rose-pine" -}}
 set -gx GTK_THEME {{ .drapeau.colorscheme }}-gtk
+{{ else -}}
+set -gx GTK_THEME Catppuccin-Macchiato-Standard-Pink-Dark
 {{ end -}}
diff --git a/dot_config/fish/conf.d/30-less.fish b/dot_config/fish/conf.d/30-less.fish
index 4874f1a..79721a5 100644
--- a/dot_config/fish/conf.d/30-less.fish
+++ b/dot_config/fish/conf.d/30-less.fish
@@ -7,5 +7,13 @@ set -gx LESS -R
 abbr -a L --position anywhere --set-cursor "% | less"
 
 function lessv
-    /usr/share/nvim/runtime/macros/less.sh $argv
+    if ! command -v nvim &>/dev/null
+        return
+    end
+
+    if test -e "/usr/share/nvim/runtime/macros/less.sh"
+        /usr/share/nvim/runtime/macros/less.sh $argv
+    else if test -e "/usr/local/share/nvim/runtime/macros/less.sh"
+        /usr/local/share/nvim/runtime/macros/less.sh $argv
+    end
 end
diff --git a/dot_config/fish/conf.d/30-man.fish b/dot_config/fish/conf.d/30-man.fish
index bdf7a4a..ef4ba10 100644
--- a/dot_config/fish/conf.d/30-man.fish
+++ b/dot_config/fish/conf.d/30-man.fish
@@ -1,3 +1,5 @@
 #!/usr/bin/env fish
 
-set -gx MANPAGER "nvim +Man!"
+if command -v nvim &>/dev/null
+    set -gx MANPAGER "nvim +Man!"
+end
diff --git a/dot_config/fish/conf.d/30-polybar.fish b/dot_config/fish/conf.d/30-polybar.fish
index 929dca3..4d47e26 100644
--- a/dot_config/fish/conf.d/30-polybar.fish
+++ b/dot_config/fish/conf.d/30-polybar.fish
@@ -1,5 +1,5 @@
 #!/usr/bin/env fish
 
 function polybar-start
-    "$HOME/.config/polybar/colorblocks/launch.sh"
+    "$HOME/.config/polybar/launch.sh" --colorblocks &
 end
diff --git a/dot_config/fish/conf.d/30-python.fish b/dot_config/fish/conf.d/30-python.fish
index 4dade3f..4bed36e 100644
--- a/dot_config/fish/conf.d/30-python.fish
+++ b/dot_config/fish/conf.d/30-python.fish
@@ -1,3 +1,5 @@
 #!/usr/bin/env fish
 
-fish_add_path "$(brew --prefix)/opt/python@3.12/libexec/bin"
+if command -v brew &>/dev/null
+    fish_add_path "$(brew --prefix)/opt/python@3.12/libexec/bin"
+end
diff --git a/dot_config/fish/conf.d/30-yay.fish b/dot_config/fish/conf.d/30-yay.fish
index c598236..1ac4b1f 100644
--- a/dot_config/fish/conf.d/30-yay.fish
+++ b/dot_config/fish/conf.d/30-yay.fish
@@ -5,6 +5,8 @@ abbr -a yi --position command "yay -S"
 abbr -a yr --position command "yay -R"
 abbr -a yc --position command "yay -Sc"
 abbr -a yu --position command "yay -Syu"
+abbr -a ys --position command "yay -Ss"
+abbr -a ysi --position command "yay -Qs"
 
 function yay-group-missing --argument-names group
     comm -23 <(yay -Sg $group | awk '{print $2}' | sort) <(yay -Qq | sort)
diff --git a/dot_config/fish/conf.d/encrypted_30-bitwarden.fish.asc b/dot_config/fish/conf.d/encrypted_30-bitwarden.fish.asc
index 54afa08..2caf665 100644
--- a/dot_config/fish/conf.d/encrypted_30-bitwarden.fish.asc
+++ b/dot_config/fish/conf.d/encrypted_30-bitwarden.fish.asc
@@ -1,9 +1,10 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIdsxpV3RgEez/0sACAQX5egk2iKp7y4BmuAi0gDVyTNipyq3MctTkA9mP
-qeOKO2hwd0c1PltgSTazC4H99UUk/RiUTxQHxSoSL045344x5oMy9BUWABJrWd6x
-npRgCXPDYQHe6UaJYoVA91QRC2RDlrs06/ZhTvA/ftG1jedT1l8NfGtbjPAAb0wI
-nH6x4v9bHcBjlkh/0zuyMTH4nBHekuQVIo34Y/gOL9URcDj0bjINWbziJFb6cLM0
-uS+Wm+7u8xhvGJaWC2VdhNPPwwQ=
-=Boie
+jA0ECQMIvR4z836ZO3//0sApAakbVKnuKb9TrQatlObf0ORC/qcp6yLIL7vTuRLH
+kCtX75AFRrcGlTDEPjpO261FNeoRLEZJZJ911UJgobJOOwr/yAgy4Blcf8m7NC9q
+PyaJfS37+5TURWjpTmeNBCg/vyzF5IQX5lxurM524VVdl1NN0hFn1NlIrJ2OvNy+
+OnUrjtM+CWQuDvuK1RIt73A6SjXsuSIbKxSZji5HZRN9qv7Tdbmv8pKoDwtmU1ZH
+8juNFv6IA6mA0UDgScUBY6u5lOTzbcnE/UV/tjuxeUjalzuGTB5xXnH5ggw50LcG
+yKSpNivjBe8nmgY=
+=yQ/O
 -----END PGP MESSAGE-----
diff --git a/dot_config/i3/executable_launch.sh b/dot_config/i3/executable_launch.sh
index f76f230..4d03b23 100644
--- a/dot_config/i3/executable_launch.sh
+++ b/dot_config/i3/executable_launch.sh
@@ -4,4 +4,6 @@
 picom --config "$HOME/.config/picom/i3" &
 
 "$HOME/.config/polybar/colorblocks/scripts/pywal.sh" "$HOME/data/photos/wallpaper/girl.jpg"
+
+sleep 10
 "$HOME/.config/polybar/launch.sh" --colorblocks &