diff --git a/tools/fish/.gitignore b/tools/fish/.gitignore
index 4ab7176..cafc8ed 100644
--- a/tools/fish/.gitignore
+++ b/tools/fish/.gitignore
@@ -1,4 +1,3 @@
 fish_variables
 completions
 functions/br.fish
-themes/
diff --git a/tools/fish/themes/Catppuccin Mocha.theme b/tools/fish/themes/Catppuccin Mocha.theme
new file mode 100644
index 0000000..892a000
--- /dev/null
+++ b/tools/fish/themes/Catppuccin Mocha.theme	
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Mocha'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 1e1e2e
+
+fish_color_normal cdd6f4
+fish_color_command 89b4fa
+fish_color_param f2cdcd
+fish_color_keyword f38ba8
+fish_color_quote a6e3a1
+fish_color_redirection f5c2e7
+fish_color_end fab387
+fish_color_comment 7f849c
+fish_color_error f38ba8
+fish_color_gray 6c7086
+fish_color_selection --background=313244
+fish_color_search_match --background=313244
+fish_color_option a6e3a1
+fish_color_operator f5c2e7
+fish_color_escape eba0ac
+fish_color_autosuggestion 6c7086
+fish_color_cancel f38ba8
+fish_color_cwd f9e2af
+fish_color_user 94e2d5
+fish_color_host 89b4fa
+fish_color_host_remote a6e3a1
+fish_color_status f38ba8
+fish_pager_color_progress 6c7086
+fish_pager_color_prefix f5c2e7
+fish_pager_color_completion cdd6f4
+fish_pager_color_description 6c7086
\ No newline at end of file
diff --git a/tools/fish/themes/Rosé Pine Dawn.theme b/tools/fish/themes/Rosé Pine Dawn.theme
new file mode 100644
index 0000000..48194f7
--- /dev/null
+++ b/tools/fish/themes/Rosé Pine Dawn.theme	
@@ -0,0 +1,41 @@
+# syntax highlighting variables
+# https://fishshell.com/docs/current/interactive.html#syntax-highlighting-variables
+fish_color_normal 575279
+fish_color_command 907aa9
+fish_color_keyword 56949f
+fish_color_quote ea9d34
+fish_color_redirection 286983
+fish_color_end 797593
+fish_color_error b4637a
+fish_color_param d7827e
+fish_color_comment 797593
+# fish_color_match --background=brblue
+fish_color_selection --reverse
+# fish_color_history_current --bold
+fish_color_operator 575279
+fish_color_escape 286983
+fish_color_autosuggestion 797593
+fish_color_cwd d7827e
+# fish_color_cwd_root red
+fish_color_user ea9d34
+fish_color_host 56949f
+fish_color_host_remote 907aa9
+fish_color_cancel 575279
+fish_color_search_match --background=faf4ed
+fish_color_valid_path
+
+# pager color variables
+# https://fishshell.com/docs/current/interactive.html#pager-color-variables
+fish_pager_color_progress d7827e
+fish_pager_color_background --background=fffaf3
+fish_pager_color_prefix 56949f
+fish_pager_color_completion 797593
+fish_pager_color_description 797593
+fish_pager_color_secondary_background
+fish_pager_color_secondary_prefix
+fish_pager_color_secondary_completion
+fish_pager_color_secondary_description
+fish_pager_color_selected_background --background=f2e9e1
+fish_pager_color_selected_prefix 56949f
+fish_pager_color_selected_completion 575279
+fish_pager_color_selected_description 575279
diff --git a/tools/kitty/current-theme.conf b/tools/kitty/current-theme.conf
deleted file mode 100644
index b77c3e2..0000000
--- a/tools/kitty/current-theme.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-# vim:ft=kitty
-
-# Customized
-
-background_opacity 0.75
-background_blur 1
-
-## name:     Catppuccin-Mocha
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
-
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color               #F5E0DC
-
-# Kitty window border colors
-active_border_color     #B4BEFE
-inactive_border_color   #6C7086
-bell_border_color       #F9E2AF
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111B
-active_tab_background   #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background      #11111B
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
-mark1_background #B4BEFE
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
-
-# The 16 terminal colors
-
-# black
-color0 #45475A
-color8 #585B70
-
-# red
-color1 #F38BA8
-color9 #F38BA8
-
-# green
-color2  #A6E3A1
-color10 #A6E3A1
-
-# yellow
-color3  #F9E2AF
-color11 #F9E2AF
-
-# blue
-color4  #89B4FA
-color12 #89B4FA
-
-# magenta
-color5  #F5C2E7
-color13 #F5C2E7
-
-# cyan
-color6  #94E2D5
-color14 #94E2D5
-
-# white
-color7  #BAC2DE
-color15 #A6ADC8
diff --git a/tools/kitty/kitty.conf b/tools/kitty/kitty.conf
index 7bd980a..4fdfc8e 100644
--- a/tools/kitty/kitty.conf
+++ b/tools/kitty/kitty.conf
@@ -32,7 +32,7 @@ active_tab_font_style   bold
 
 # Color Scheme {{{
 # BEGIN_KITTY_THEME
-# Catppuccin-Mocha
+# Rosé Pine Dawn
 include current-theme.conf
 # END_KITTY_THEME
 # }}}
diff --git a/tools/kitty/light-theme.auto.conf b/tools/kitty/light-theme.auto.conf
index e3fb955..74773ad 100644
--- a/tools/kitty/light-theme.auto.conf
+++ b/tools/kitty/light-theme.auto.conf
@@ -1,80 +1,53 @@
-# vim:ft=kitty
+## name: Rosé Pine Dawn
+## author: mvllow
+## license: MIT
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-dawn.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
 
-## name:     Catppuccin-Latte
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
-## blurb:    Soothing pastel theme for the high-spirited!
+foreground               #575279
+background               #faf4ed
+selection_foreground     #575279
+selection_background     #dfdad9
 
+cursor                   #cecacd
+cursor_text_color        #575279
 
+url_color                #907aa9
 
-# The basic colors
-foreground              #4C4F69
-background              #EFF1F5
-selection_foreground    #EFF1F5
-selection_background    #DC8A78
-
-# Cursor colors
-cursor                  #DC8A78
-cursor_text_color       #EFF1F5
-
-# URL underline color when hovering with mouse
-url_color               #DC8A78
-
-# Kitty window border colors
-active_border_color     #7287FD
-inactive_border_color   #9CA0B0
-bell_border_color       #DF8E1D
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #EFF1F5
-active_tab_background   #8839EF
-inactive_tab_foreground #4C4F69
-inactive_tab_background #9CA0B0
-tab_bar_background      #BCC0CC
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #EFF1F5
-mark1_background #7287fD
-mark2_foreground #EFF1F5
-mark2_background #8839EF
-mark3_foreground #EFF1F5
-mark3_background #209FB5
-
-# The 16 terminal colors
+active_tab_foreground    #575279
+active_tab_background    #f2e9e1
+inactive_tab_foreground  #9893a5
+inactive_tab_background  #faf4ed
 
 # black
-color0 #5C5F77
-color8 #6C6F85
+color0   #f2e9e1
+color8   #9893a5
 
 # red
-color1 #D20F39
-color9 #D20F39
+color1   #b4637a
+color9   #b4637a
 
 # green
-color2  #40A02B
-color10 #40A02B
+color2   #286983
+color10  #286983
 
 # yellow
-color3  #DF8E1D
-color11 #DF8E1D
+color3   #ea9d34
+color11  #ea9d34
 
 # blue
-color4  #1E66F5
-color12 #1E66F5
+color4   #56949f
+color12  #56949f
 
 # magenta
-color5  #EA76CB
-color13 #EA76CB
+color5   #907aa9
+color13  #907aa9
 
 # cyan
-color6  #179299
-color14 #179299
+color6   #d7827e
+color14  #d7827e
 
 # white
-color7  #ACB0BE
-color15 #BCC0CC
+color7   #575279
+color15  #575279
+
diff --git a/tools/wezterm/appearance.lua b/tools/wezterm/appearance.lua
index 87d43fa..9c70be8 100644
--- a/tools/wezterm/appearance.lua
+++ b/tools/wezterm/appearance.lua
@@ -18,7 +18,7 @@ local function scheme_for_appearance(appearance)
     return "Catppuccin Mocha"
   else
     print("Light")
-    return "Catppuccin Latte"
+    return "rose-pine-dawn"
   end
 end