diff --git a/.chezmoidata/catppuccin-frappe.toml b/.chezmoidata/catppuccin-frappe.toml
new file mode 100644
index 0000000..3a9a6f3
--- /dev/null
+++ b/.chezmoidata/catppuccin-frappe.toml
@@ -0,0 +1,29 @@
+flavor = 'frappe'
+
+rosewater = '#f2d5cf'
+flamingo = '#eebebe'
+pink = '#f4b8e4'
+mauve = '#ca9ee6'
+red = '#e78284'
+maroon = '#ea999c'
+peach = '#ef9f76'
+yellow = '#e5c890'
+green = '#a6d189'
+teal = '#81c8be'
+sky = '#99d1db'
+sapphire = '#85c1dc'
+blue = '#8caaee'
+lavender = '#babbf1'
+
+text = '#c6d0f5'
+subtext1 = '#b5bfe2'
+subtext0 = '#a5adce'
+overlay2 = '#949cbb'
+overlay1 = '#838ba7'
+overlay0 = '#737994'
+surface2 = '#626880'
+surface1 = '#51576d'
+surface0 = '#414559'
+base = '#303446'
+mantle = '#292c3c'
+crust = '#232634'
diff --git a/.chezmoidata/catppuccin-latte.toml b/.chezmoidata/catppuccin-latte.toml
new file mode 100644
index 0000000..d1d0692
--- /dev/null
+++ b/.chezmoidata/catppuccin-latte.toml
@@ -0,0 +1,30 @@
+flavor = 'latte'
+
+rosewater = '#dc8a78'
+flamingo = '#dd7878'
+pink = '#ea76cb'
+mauve = '#8839ef'
+red = '#d20f39'
+maroon = '#e64553'
+peach = '#fe640b'
+yellow = '#df8e1d'
+green = '#40a02b'
+teal = '#179299'
+sky = '#04a5e5'
+sapphire = '#209fb5'
+blue = '#1e66f5'
+lavender = '#7287fd'
+
+text = '#4c4f69'
+subtext1 = '#5c5f77'
+subtext0 = '#6c6f85'
+overlay2 = '#7c7f93'
+overlay1 = '#8c8fa1'
+overlay0 = '#9ca0b0'
+surface2 = '#acb0be'
+surface1 = '#bcc0cc'
+surface0 = '#ccd0da'
+
+base = '#eff1f5'
+mantle = '#e6e9ef'
+crust = '#dce0e8'
diff --git a/.chezmoidata/catppuccin-macchato.toml b/.chezmoidata/catppuccin-macchato.toml
new file mode 100644
index 0000000..1a8c569
--- /dev/null
+++ b/.chezmoidata/catppuccin-macchato.toml
@@ -0,0 +1,29 @@
+flavor = 'macchiato'
+
+rosewater = '#f4dbd6'
+flamingo = '#f0c6c6'
+pink = '#f5bde6'
+mauve = '#c6a0f6'
+red = '#ed8796'
+maroon = '#ee99a0'
+peach = '#f5a97f'
+yellow = '#eed49f'
+green = '#a6da95'
+teal = '#8bd5ca'
+sky = '#91d7e3'
+sapphire = '#7dc4e4'
+blue = '#8aadf4'
+lavender = '#b7bdf8'
+
+text = '#cad3f5'
+subtext1 = '#b8c0e0'
+subtext0 = '#a5adcb'
+overlay2 = '#939ab7'
+overlay1 = '#8087a2'
+overlay0 = '#6e738d'
+surface2 = '#5b6078'
+surface1 = '#494d64'
+surface0 = '#363a4f'
+base = '#24273a'
+mantle = '#1e2030'
+crust = '#181926'
diff --git a/.chezmoidata/catppuccin-mocha.toml b/.chezmoidata/catppuccin-mocha.toml
new file mode 100644
index 0000000..ee607d3
--- /dev/null
+++ b/.chezmoidata/catppuccin-mocha.toml
@@ -0,0 +1,29 @@
+flavor = 'mocha'
+
+rosewater = '#f5e0dc'
+flamingo = '#f2cdcd'
+pink = '#f5c2e7'
+mauve = '#cba6f7'
+red = '#f38ba8'
+maroon = '#eba0ac'
+peach = '#fab387'
+yellow = '#f9e2af'
+green = '#a6e3a1'
+teal = '#94e2d5'
+sky = '#89dceb'
+sapphire = '#74c7ec'
+blue = '#89b4fa'
+lavender = '#b4befe'
+
+text = '#cdd6f4'
+subtext1 = '#bac2de'
+subtext0 = '#a6adc8'
+overlay2 = '#9399b2'
+overlay1 = '#7f849c'
+overlay0 = '#6c7086'
+surface2 = '#585b70'
+surface1 = '#45475a'
+surface0 = '#313244'
+base = '#1e1e2e'
+mantle = '#181825'
+crust = '#11111b'
diff --git a/dot_config/packages/archbaby b/dot_config/packages/archbaby
index cf30a8d..3a66986 100644
--- a/dot_config/packages/archbaby
+++ b/dot_config/packages/archbaby
@@ -12,13 +12,18 @@ bat
 bat-extras
 bcachefs-tools
 bind
+bitwarden-cli
 bluetuith
 bluez
 bluez-utils
 browsh-bin
 btop
 catppuccin-cursors-macchiato
+catppuccin-frappe-grub-theme-git
 catppuccin-gtk-theme-macchiato
+catppuccin-latte-grub-theme-git
+catppuccin-macchiato-grub-theme-git
+catppuccin-mocha-grub-theme-git
 cheat-bin
 chezmoi
 cmake
@@ -67,6 +72,7 @@ jello-bin
 jq
 lazygit
 less
+lesspipe
 lib32-gamemode
 lib32-vkd3d
 libheif
@@ -85,6 +91,7 @@ lutris
 mailhog-bin
 man-db
 man-pages
+mediainfo
 meilisearch
 mopidy
 mopidy-alsamixer
@@ -121,25 +128,31 @@ polkit-kde-agent
 postgresql
 protonup-qt
 python-catppuccin
+python-html2text
 python-pip
 python-pipenv
 python-pipx
 python-pynvim
+python-toml
 qt5-graphicaleffects
 qt5-quickcontrols2
 qt5-svg
 qt5ct
 qt6-wayland
 razercommander
+rbw
 re2c
 redis
 reflector
 ripgrep
 rofi
 rofi-calc
+rofi-rbw
 rsync
 rust
 sddm
+sddm-catppuccin-git
+sddm-theme-catppuccin-git
 shfmt
 smbclient
 starship
@@ -150,6 +163,7 @@ swaylock-effects-git
 swww-git
 termux-language-server
 texinfo
+thefuck
 thunar
 timeshift
 tmux
@@ -167,6 +181,7 @@ ttf-nerd-fonts-symbols
 ttfautohint
 udisks2
 ufw
+unrar
 unzip
 upd72020x-fw
 ventoy-bin
diff --git a/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl b/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl
index 6690486..0e48f2e 100644
--- a/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl
+++ b/dot_config/packages/run_onchange_after_arch-packages.fish.tmpl
@@ -19,9 +19,9 @@ sed -i '/{{ . }}/d' arch
 {{ end -}}
 
 if ! test "{{ .chezmoi.hostname }}" = "$file"
-    set_color yellow && echo "Package list has changed, please reinstall!"
-    copyq copy "yay -S --needed - < ~/.config/packages/arch" &>/dev/null \
-        && echo "(Command copied)"
-    set_color normal
+    set_color yellow && echo "Package list has changed, reinstalling..."
+    yay -S --needed - <~/.config/packages/arch
 end
+
+yay -Qeq >{{ joinPath .chezmoi.sourceDir "dot_config/packages" .chezmoi.hostname }}
 {{ end -}}