diff --git a/.chezmoiexternals/btop.toml b/.chezmoiexternals/btop.toml
index 74e2f11..655db87 100644
--- a/.chezmoiexternals/btop.toml
+++ b/.chezmoiexternals/btop.toml
@@ -17,3 +17,18 @@ refreshPeriod = "672h"
 type = "file"
 url = "https://github.com/catppuccin/btop/blob/main/themes/catppuccin_mocha.theme"
 refreshPeriod = "672h"
+
+[".config/btop/themes/rose-pine-dawn.theme"]
+type = "file"
+url = "https://raw.githubusercontent.com/rose-pine/btop/main/rose-pine-dawn.theme"
+refreshPeriod = "672h"
+
+[".config/btop/themes/rose-pine-moon.theme"]
+type = "file"
+url = "https://raw.githubusercontent.com/rose-pine/btop/main/rose-pine-moon.theme"
+refreshPeriod = "672h"
+
+[".config/btop/themes/rose-pine.theme"]
+type = "file"
+url = "https://raw.githubusercontent.com/rose-pine/btop/main/rose-pine.theme"
+refreshPeriod = "672h"
diff --git a/.chezmoiexternals/rofi.toml b/.chezmoiexternals/rofi.toml
deleted file mode 100644
index 5230a08..0000000
--- a/.chezmoiexternals/rofi.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if eq .osid "linux-arch" -}}
-[".local/share/rofi/themes/catppuccin-frappe.rasi"]
-type = "file"
-url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-frappe.rasi"
-refreshPeriod = "672h"
-
-[".local/share/rofi/themes/catppuccin-latte.rasi"]
-type = "file"
-url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-latte.rasi"
-refreshPeriod = "672h"
-
-[".local/share/rofi/themes/catppuccin-macchiato.rasi"]
-type = "file"
-url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-macchiato.rasi"
-refreshPeriod = "672h"
-
-[".local/share/rofi/themes/catppuccin-mocha.rasi"]
-type = "file"
-url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-mocha.rasi"
-refreshPeriod = "672h"
-{{- end -}}
diff --git a/.chezmoiexternals/zathura.toml b/.chezmoiexternals/zathura.toml
index 24a7848..6fed049 100644
--- a/.chezmoiexternals/zathura.toml
+++ b/.chezmoiexternals/zathura.toml
@@ -18,4 +18,19 @@ refreshPeriod = "672h"
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"
 refreshPeriod = "672h"
+
+[".config/zathura/rose-pine"]
+type = "file"
+url = "https://raw.githubusercontent.com/edunfelt/zathura/main/rose-pine"
+refreshPeriod = "672h"
+
+[".config/zathura/rose-pine-dawn"]
+type = "file"
+url = "https://raw.githubusercontent.com/edunfelt/zathura/main/rose-pine-dawn"
+refreshPeriod = "672h"
+
+[".config/zathura/rose-pine-moon"]
+type = "file"
+url = "https://raw.githubusercontent.com/edunfelt/zathura/main/rose-pine-moon"
+refreshPeriod = "672h"
 {{- end -}}
diff --git a/dot_config/drapeau/rose-pine-dawn.toml b/dot_config/drapeau/rose-pine-dawn.toml
index 29885ba..d392423 100644
--- a/dot_config/drapeau/rose-pine-dawn.toml
+++ b/dot_config/drapeau/rose-pine-dawn.toml
@@ -1,4 +1,4 @@
-name = "rosepine"
+name = "rose-pine"
 flavor = "dawn"
 
 base00 = "faf4ed" # base
diff --git a/dot_config/drapeau/rose-pine-moon.toml b/dot_config/drapeau/rose-pine-moon.toml
index ec366d2..2d3eb36 100644
--- a/dot_config/drapeau/rose-pine-moon.toml
+++ b/dot_config/drapeau/rose-pine-moon.toml
@@ -1,4 +1,4 @@
-name = "rosepine"
+name = "rose-pine"
 flavor = "moon"
 
 base00 = "232136" # base
diff --git a/dot_config/drapeau/rose-pine.toml b/dot_config/drapeau/rose-pine.toml
index 303e494..9edfd4b 100644
--- a/dot_config/drapeau/rose-pine.toml
+++ b/dot_config/drapeau/rose-pine.toml
@@ -1,4 +1,4 @@
-name = "rosepine"
+name = "rose-pine"
 flavor = "main"
 
 base00 = "191724" # base
diff --git a/dot_config/fish/conf.d/30-gtk.fish.tmpl b/dot_config/fish/conf.d/30-gtk.fish.tmpl
index f81e3c3..01ecf7c 100644
--- a/dot_config/fish/conf.d/30-gtk.fish.tmpl
+++ b/dot_config/fish/conf.d/30-gtk.fish.tmpl
@@ -1,3 +1,9 @@
 #!/usr/bin/env fish
 
+{{ if eq .drapeau.colors.name "catppuccin" -}}
 set -gx GTK_THEME {{ .drapeau.colorscheme | title }}-Standard-Pink-Dark
+{{ end -}}
+
+{{ if eq .drapeau.colors.name "rose-pine" -}}
+set -gx GTK_THEME {{ .drapeau.colorscheme }}-gtk
+{{ end -}}
diff --git a/dot_config/gtk-3.0/modify_settings.ini.tmpl b/dot_config/gtk-3.0/modify_settings.ini.tmpl
index ef80c8b..9806bba 100644
--- a/dot_config/gtk-3.0/modify_settings.ini.tmpl
+++ b/dot_config/gtk-3.0/modify_settings.ini.tmpl
@@ -3,4 +3,10 @@
 source auto
 
 ignore "Settings" "gtk-xft-dpi"
+
+{{ if eq .drapeau.colors.name "catppuccin" -}}
 set "Settings" "gtk-theme-name" "{{ .drapeau.colorscheme }}-pink-standard+default"
+{{ end -}}
+{{ if eq .drapeau.colors.name "rose-pine" -}}
+set "Settings" "gtk-theme-name" "{{ .drapeau.colorscheme }}-gtk"
+{{ end -}}
diff --git a/dot_config/gtk-4.0/modify_settings.ini.tmpl b/dot_config/gtk-4.0/modify_settings.ini.tmpl
index ef80c8b..9806bba 100644
--- a/dot_config/gtk-4.0/modify_settings.ini.tmpl
+++ b/dot_config/gtk-4.0/modify_settings.ini.tmpl
@@ -3,4 +3,10 @@
 source auto
 
 ignore "Settings" "gtk-xft-dpi"
+
+{{ if eq .drapeau.colors.name "catppuccin" -}}
 set "Settings" "gtk-theme-name" "{{ .drapeau.colorscheme }}-pink-standard+default"
+{{ end -}}
+{{ if eq .drapeau.colors.name "rose-pine" -}}
+set "Settings" "gtk-theme-name" "{{ .drapeau.colorscheme }}-gtk"
+{{ end -}}
diff --git a/dot_config/nvim/lua/config/lazy.lua.tmpl b/dot_config/nvim/lua/config/lazy.lua.tmpl
index eda8185..82e7c9f 100644
--- a/dot_config/nvim/lua/config/lazy.lua.tmpl
+++ b/dot_config/nvim/lua/config/lazy.lua.tmpl
@@ -14,6 +14,8 @@ require("lazy").setup({
     -- import any extras modules here
 
     -- coding
+    { import = "lazyvim.plugins.extras.coding.luasnip" },
+    { import = "lazyvim.plugins.extras.coding.mini-comment" },
     { import = "lazyvim.plugins.extras.coding.mini-surround" },
     { import = "lazyvim.plugins.extras.coding.yanky" },
 
@@ -69,6 +71,7 @@ require("lazy").setup({
     {{ end -}}
 
     -- util
+    { import = "lazyvim.plugins.extras.util.chezmoi" },
     { import = "lazyvim.plugins.extras.util.dot" },
     { import = "lazyvim.plugins.extras.util.mini-hipatterns" },
     {{ if not .isServer -}}
diff --git a/dot_config/nvim/lua/plugins/bufferline.lua.tmpl b/dot_config/nvim/lua/plugins/bufferline.lua.tmpl
new file mode 100644
index 0000000..b4031a2
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/bufferline.lua.tmpl
@@ -0,0 +1,12 @@
+{{ if eq .drapeau.colors.name "rose-pine" -}}
+local highlights = require("rose-pine.plugins.bufferline")
+
+return {
+  {
+    "akinsho/bufferline.nvim",
+    opts = {
+      highlights = highlights,
+    },
+  },
+}
+{{ end -}}
diff --git a/dot_config/nvim/lua/plugins/lualine.lua.tmpl b/dot_config/nvim/lua/plugins/lualine.lua.tmpl
new file mode 100644
index 0000000..23bf1a4
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/lualine.lua.tmpl
@@ -0,0 +1,10 @@
+{{ if eq .drapeau.colors.name "rose-pine" -}}
+return {
+  {
+    "nvim-lualine/lualine.nvim",
+    opts = function(_, opts)
+      table.insert(opts.options, { theme = {{ .drapeau.colors.name}} })
+    end
+  },
+}
+{{ end -}}
diff --git a/dot_config/nvim/lua/plugins/rose-pine.lua.tmpl b/dot_config/nvim/lua/plugins/rose-pine.lua.tmpl
new file mode 100644
index 0000000..e512cf0
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/rose-pine.lua.tmpl
@@ -0,0 +1,8 @@
+return {
+  {
+    "rose-pine/neovim",
+    opts = {
+      variant = {{ .drapeau.colors.flavor | quote }},
+    },
+  },
+}
diff --git a/dot_config/packages/archgirlie b/dot_config/packages/archgirlie
index 8958581..0e2ead5 100644
--- a/dot_config/packages/archgirlie
+++ b/dot_config/packages/archgirlie
@@ -1,3 +1,4 @@
+ -> Avoid running yay as root/sudo.
 aic94xx-firmware
 alsa-utils
 arandr
@@ -162,6 +163,7 @@ repoctl
 ripgrep
 rofi
 rofi-calc
+rose-pine-gtk-theme
 rsync
 rust
 sddm
diff --git a/dot_config/wezterm/wezterm.lua.tmpl b/dot_config/wezterm/wezterm.lua.tmpl
index f3df8cb..91bcdd4 100644
--- a/dot_config/wezterm/wezterm.lua.tmpl
+++ b/dot_config/wezterm/wezterm.lua.tmpl
@@ -3,7 +3,7 @@ local wezterm = require("wezterm")
 
 local config = wezterm.config_builder()
 
-config.color_scheme = {{ .drapeau.colorscheme | replace "-" " " | title | quote }}
+config.color_scheme = {{ .drapeau.colorscheme |  quote }}
 config.enable_tab_bar = false
 
 -- config.default_prog = { "/usr/bin/fish" }