diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index 5892841..320f974 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -40,32 +40,21 @@ colorscheme = 'catppuccin-macchiato'
 # Defaults for when config is regenerated.
 [data.drapeau.colors]
 name = 'catppuccin'
-flavor = 'macchiato'
+flavor = 'frappe'
 
-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'
+base00 = '#303446' # base
+base01 = '#292c3c' # mantle
+base02 = '#414559' # surface0
+base03 = '#51576d' # surface1
+base04 = '#626880' # surface2
+base05 = '#c6d0f5' # text
+base06 = '#f2d5cf' # rosewater
+base07 = '#babbf1' # lavender
+base08 = '#e78284' # red
+base09 = '#ef9f76' # peach
+base0A = '#e5c890' # yellow
+base0B = '#a6d189' # green
+base0C = '#81c8be' # teal
+base0D = '#8caaee' # blue
+base0E = '#ca9ee6' # mauve
+base0F = '#eebebe' # flamingo
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index bb9606d..df14cad 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -1,37 +1,37 @@
-*background: {{ .drapeau.colors.base }}
-*foreground: {{ .drapeau.colors.text }}
+*background: {{ .drapeau.colors.base00 }}
+*foreground: {{ .drapeau.colors.base05 }}
 
 ! black
-*color0: {{ .drapeau.colors.surface1 }}
-*color8: {{ .drapeau.colors.surface2 }}
+*color0: {{ .drapeau.colors.base03 }}
+*color8: {{ .drapeau.colors.base04 }}
 
 ! red
-*color1: {{ .drapeau.colors.red }}
-*color9: {{ .drapeau.colors.red }}
+*color1: {{ .drapeau.colors.base08 }}
+*color9: {{ .drapeau.colors.base08 }}
 
 ! green
-*color2: {{ .drapeau.colors.green }}
-*color10: {{ .drapeau.colors.green }}
+*color2: {{ .drapeau.colors.base0B }}
+*color10: {{ .drapeau.colors.base0B }}
 
 ! yellow
-*color3: {{ .drapeau.colors.yellow }}
-*color11: {{ .drapeau.colors.yellow }}
+*color3: {{ .drapeau.colors.base0A }}
+*color11: {{ .drapeau.colors.base0A }}
 
 ! blue
-*color4: {{ .drapeau.colors.blue }}
-*color12: {{ .drapeau.colors.blue }}
+*color4: {{ .drapeau.colors.base0D }}
+*color12: {{ .drapeau.colors.base0D }}
 
 ! magenta
-*color5: {{ .drapeau.colors.pink }}
-*color13: {{ .drapeau.colors.pink }}
+*color5: {{ .drapeau.colors.base0F }}
+*color13: {{ .drapeau.colors.base0F }}
 
 ! cyan
-*color6: {{ .drapeau.colors.teal }}
-*color14: {{ .drapeau.colors.teal }}
+*color6: {{ .drapeau.colors.base0C }}
+*color14: {{ .drapeau.colors.base0C }}
 
 ! white
-*color7: {{ .drapeau.colors.subtext1 }}
-*color15: {{ .drapeau.colors.subtext0 }}
+*color7: {{ .drapeau.colors.base05 }}
+*color15: {{ .drapeau.colors.base05 }}
 
 {{ if lookPath "rofi" -}}
 ! Make Rofi use fish shell
diff --git a/dot_config/drapeau/catppuccin-frappe.toml b/dot_config/drapeau/catppuccin-frappe.toml
index 0efff68..5b0b2b4 100644
--- a/dot_config/drapeau/catppuccin-frappe.toml
+++ b/dot_config/drapeau/catppuccin-frappe.toml
@@ -1,30 +1,30 @@
 name = 'catppuccin'
 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'
+base00 = '#303446' # base
+base01 = '#292c3c' # mantle
+base02 = '#414559' # surface0
+base03 = '#51576d' # surface1
+base04 = '#626880' # surface2
+base05 = '#c6d0f5' # text
+base06 = '#f2d5cf' # rosewater
+base07 = '#babbf1' # lavender
+base08 = '#e78284' # red
+base09 = '#ef9f76' # peach
+base0A = '#e5c890' # yellow
+base0B = '#a6d189' # green
+base0C = '#81c8be' # teal
+base0D = '#8caaee' # blue
+base0E = '#ca9ee6' # mauve
+base0F = '#eebebe' # flamingo
 
-text = '#c6d0f5'
-subtext1 = '#b5bfe2'
-subtext0 = '#a5adce'
-overlay2 = '#949cbb'
-overlay1 = '#838ba7'
-overlay0 = '#737994'
-surface2 = '#626880'
-surface1 = '#51576d'
-surface0 = '#414559'
-base = '#303446'
-mantle = '#292c3c'
-crust = '#232634'
+# pink = '#f4b8e4'
+# maroon = '#ea999c'
+# sky = '#99d1db'
+# sapphire = '#85c1dc'
+# subtext1 = '#b5bfe2'
+# subtext0 = '#a5adce'
+# overlay2 = '#949cbb'
+# overlay1 = '#838ba7'
+# overlay0 = '#737994'
+# crust = '#232634'
diff --git a/dot_config/drapeau/catppuccin-latte.toml b/dot_config/drapeau/catppuccin-latte.toml
index ce8a0a5..5fb6426 100644
--- a/dot_config/drapeau/catppuccin-latte.toml
+++ b/dot_config/drapeau/catppuccin-latte.toml
@@ -1,31 +1,30 @@
 name = 'catppuccin'
 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'
+base00 = '#eff1f5' # base
+base01 = '#e6e9ef' # mantle
+base02 = '#ccd0da' # surface0
+base03 = '#bcc0cc' # surface1
+base04 = '#acb0be' # surface2
+base05 = '#4c4f69' # text
+base08 = '#d20f39' # red
+base06 = '#dc8a78' # rosewater
+base07 = '#7287fd' # lavender
+base09 = '#fe640b' # peach
+base0A = '#df8e1d' # yellow
+base0B = '#40a02b' # green
+base0C = '#179299' # teal
+base0D = '#1e66f5' # blue
+base0E = '#8839ef' # mauve
+base0F = '#dd7878' # flamingo
 
-text = '#4c4f69'
-subtext1 = '#5c5f77'
-subtext0 = '#6c6f85'
-overlay2 = '#7c7f93'
-overlay1 = '#8c8fa1'
-overlay0 = '#9ca0b0'
-surface2 = '#acb0be'
-surface1 = '#bcc0cc'
-surface0 = '#ccd0da'
-
-base = '#eff1f5'
-mantle = '#e6e9ef'
-crust = '#dce0e8'
+# pink = '#ea76cb'
+# maroon = '#e64553'
+# sky = '#04a5e5'
+# sapphire = '#209fb5'
+# subtext1 = '#5c5f77'
+# subtext0 = '#6c6f85'
+# overlay2 = '#7c7f93'
+# overlay1 = '#8c8fa1'
+# overlay0 = '#9ca0b0'
+# crust = '#dce0e8'
diff --git a/dot_config/drapeau/catppuccin-macchiato.toml b/dot_config/drapeau/catppuccin-macchiato.toml
index 09ccd63..8d499bb 100644
--- a/dot_config/drapeau/catppuccin-macchiato.toml
+++ b/dot_config/drapeau/catppuccin-macchiato.toml
@@ -1,30 +1,30 @@
 name = 'catppuccin'
 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'
+base00 = '#24273a' # base
+base01 = '#1e2030' # mantle
+base02 = '#363a4f' # surface0
+base03 = '#494d64' # surface1
+base04 = '#5b6078' # surface2
+base05 = '#cad3f5' # text
+base08 = '#ed8796' # red
+base09 = '#f5a97f' # peach
+base06 = '#f4dbd6' # rosewater
+base07 = '#b7bdf8' # lavender
+base0A = '#eed49f' # yellow
+base0B = '#a6da95' # green
+base0C = '#8bd5ca' # teal
+base0D = '#8aadf4' # blue
+base0E = '#c6a0f6' # mauve
+base0F = '#f0c6c6' # flamingo
 
-text = '#cad3f5'
-subtext1 = '#b8c0e0'
-subtext0 = '#a5adcb'
-overlay2 = '#939ab7'
-overlay1 = '#8087a2'
-overlay0 = '#6e738d'
-surface2 = '#5b6078'
-surface1 = '#494d64'
-surface0 = '#363a4f'
-base = '#24273a'
-mantle = '#1e2030'
-crust = '#181926'
+# pink = '#f5bde6'
+# maroon = '#ee99a0'
+# sky = '#91d7e3'
+# sapphire = '#7dc4e4'
+# subtext1 = '#b8c0e0'
+# subtext0 = '#a5adcb'
+# overlay2 = '#939ab7'
+# overlay1 = '#8087a2'
+# overlay0 = '#6e738d'
+# crust = '#181926'
diff --git a/dot_config/drapeau/catppuccin-mocha.toml b/dot_config/drapeau/catppuccin-mocha.toml
index fe642bf..b1843a0 100644
--- a/dot_config/drapeau/catppuccin-mocha.toml
+++ b/dot_config/drapeau/catppuccin-mocha.toml
@@ -1,30 +1,30 @@
 name = 'catppuccin'
 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'
+base00 = '#1e1e2e' # base
+base01 = '#181825' # mantle
+base02 = '#313244' # surface0
+base03 = '#45475a' # surface1
+base04 = '#585b70' # surface2
+base05 = '#cdd6f4' # text
+base06 = '#f5e0dc' # rosewater
+base07 = '#b4befe' # lavender
+base08 = '#f38ba8' # red
+base09 = '#fab387' # peach
+base0A = '#f9e2af' # yellow
+base0B = '#a6e3a1' # green
+base0C = '#94e2d5' # teal
+base0D = '#89b4fa' # blue
+base0E = '#cba6f7' # mauve
+base0F = '#f2cdcd' # flamingo
 
-text = '#cdd6f4'
-subtext1 = '#bac2de'
-subtext0 = '#a6adc8'
-overlay2 = '#9399b2'
-overlay1 = '#7f849c'
-overlay0 = '#6c7086'
-surface2 = '#585b70'
-surface1 = '#45475a'
-surface0 = '#313244'
-base = '#1e1e2e'
-mantle = '#181825'
-crust = '#11111b'
+# pink = '#f5c2e7'
+# maroon = '#eba0ac'
+# sky = '#89dceb'
+# sapphire = '#74c7ec'
+# subtext1 = '#bac2de'
+# subtext0 = '#a6adc8'
+# overlay2 = '#9399b2'
+# overlay1 = '#7f849c'
+# overlay0 = '#6c7086'
+# crust = '#11111b'
diff --git a/dot_config/fish/conf.d/30-fzf.fish.tmpl b/dot_config/fish/conf.d/30-fzf.fish.tmpl
index 8d43ac1..5198ded 100644
--- a/dot_config/fish/conf.d/30-fzf.fish.tmpl
+++ b/dot_config/fish/conf.d/30-fzf.fish.tmpl
@@ -10,9 +10,9 @@ set -gx FZF_DEFAULT_OPTS "\
 --prompt=' ' \
 --preview-label-pos='bottom' \
 --preview-window='border-sharp' \
---color=bg+:{{ .drapeau.colors.surface0 }},bg:{{ .drapeau.colors.base }},spinner:{{ .drapeau.colors.rosewater }},hl:{{ .drapeau.colors.red }} \
---color=fg:{{ .drapeau.colors.text }},header:{{ .drapeau.colors.red }},info:{{ .drapeau.colors.mauve }},pointer:{{ .drapeau.colors.rosewater }} \
---color=marker:{{ .drapeau.colors.rosewater }},fg+:{{ .drapeau.colors.text }},prompt:{{ .drapeau.colors.mauve }},hl+:{{ .drapeau.colors.red }}"
+--color=bg+:{{ .drapeau.colors.base02 }},bg:{{ .drapeau.colors.base00 }},spinner:{{ .drapeau.colors.base06 }},hl:{{ .drapeau.colors.base08 }} \
+--color=fg:{{ .drapeau.colors.base05 }},header:{{ .drapeau.colors.base08 }},info:{{ .drapeau.colors.base0E }},pointer:{{ .drapeau.colors.base06 }} \
+--color=marker:{{ .drapeau.colors.base06 }},fg+:{{ .drapeau.colors.base05 }},prompt:{{ .drapeau.colors.base0E }},hl+:{{ .drapeau.colors.base08 }}"
 
 # fzf.fish
 set -g fzf_preview_dir_cmd eza --all --color=always --sort=name --group-directories-first
diff --git a/dot_config/starship.toml.tmpl b/dot_config/starship.toml.tmpl
index 867ffa1..05fc4f2 100644
--- a/dot_config/starship.toml.tmpl
+++ b/dot_config/starship.toml.tmpl
@@ -2,41 +2,30 @@
 
 palette = "default"
 
-[character]
-success_symbol = "[[](pink) ](green)"
-error_symbol = "[](red)"
-vimcmd_symbol = "[](green)"
-vimcmd_replace_one_symbol = "[](green)"
-vimcmd_replace_symbol = "[](green)"
-vimcmd_visual_symbol = "[](peach)"
-
 [palettes.default]
-rosewater = {{ .drapeau.colors.rosewater | quote }}
-flamingo = {{ .drapeau.colors.flamingo | quote }}
-pink = {{ .drapeau.colors.pink | quote }}
-mauve = {{ .drapeau.colors.mauve | quote }}
-red = {{ .drapeau.colors.red | quote }}
-maroon = {{ .drapeau.colors.maroon | quote }}
-peach = {{ .drapeau.colors.peach | quote }}
-yellow = {{ .drapeau.colors.yellow | quote }}
-green = {{ .drapeau.colors.green | quote }}
-teal = {{ .drapeau.colors.teal | quote }}
-sky = {{ .drapeau.colors.sky | quote }}
-sapphire = {{ .drapeau.colors.sapphire | quote }}
-blue = {{ .drapeau.colors.blue | quote }}
-lavender = {{ .drapeau.colors.lavender | quote }}
-text = {{ .drapeau.colors.text | quote }}
-subtext1 = {{ .drapeau.colors.subtext1 | quote }}
-subtext0 = {{ .drapeau.colors.subtext0 | quote }}
-overlay2 = {{ .drapeau.colors.overlay2 | quote }}
-overlay1 = {{ .drapeau.colors.overlay1 | quote }}
-overlay0 = {{ .drapeau.colors.overlay0 | quote }}
-surface2 = {{ .drapeau.colors.surface2 | quote }}
-surface1 = {{ .drapeau.colors.surface1 | quote }}
-surface0 = {{ .drapeau.colors.surface0 | quote }}
-base = {{ .drapeau.colors.base | quote }}
-mantle = {{ .drapeau.colors.mantle | quote }}
-crust = {{ .drapeau.colors.crust | quote }}
+base00 = {{ .drapeau.colors.base00 | quote }}
+base01 = {{ .drapeau.colors.base01 | quote }}
+base02 = {{ .drapeau.colors.base02 | quote }}
+base03 = {{ .drapeau.colors.base03 | quote }}
+base04 = {{ .drapeau.colors.base04 | quote }}
+base05 = {{ .drapeau.colors.base06 | quote }}
+base06 = {{ .drapeau.colors.base06 | quote }}
+base07 = {{ .drapeau.colors.base07 | quote }}
+base08 = {{ .drapeau.colors.base08 | quote }}
+base09 = {{ .drapeau.colors.base09 | quote }}
+base0A = {{ .drapeau.colors.base0A | quote }}
+base0B = {{ .drapeau.colors.base0B | quote }}
+base0C = {{ .drapeau.colors.base0C | quote }}
+base0D = {{ .drapeau.colors.base0E | quote }}
+base0F = {{ .drapeau.colors.base0F | quote }}
+
+[character]
+success_symbol = "[[](base0F) ](base0B)"
+error_symbol = "[](base08)"
+vimcmd_symbol = "[](base0B)"
+vimcmd_replace_one_symbol = "[](base0B)"
+vimcmd_replace_symbol = "[](base0B)"
+vimcmd_visual_symbol = "[](base09)"
 
 [aws]
 symbol = "  "
@@ -94,7 +83,7 @@ symbol = " "
 
 [hostname]
 ssh_symbol = " "
-style = 'bold lavender'
+style = 'bold base07'
 
 [java]
 symbol = " "
@@ -196,7 +185,7 @@ symbol = " "
 
 [status]
 disabled = false
-style = 'red'
+style = 'base08'
 symbol = '✗'
 not_executable_symbol = ''
 not_found_symbol = ''
@@ -205,7 +194,7 @@ signal_symbol = '󱐋'
 
 [sudo]
 disabled = false
-style = 'blue'
+style = 'base0D'
 symbol = '󰌋 '
 
 [swift]