diff --git a/fish/config.fish b/fish/config.fish
index d9ac865..daa8628 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -66,35 +66,3 @@ if status --is-interactive
         bind \e\f 'clear; commandline -f repaint'
     end
 end
-
-if not set -q __universals_initialized
-    set -U __universals_initialized
-
-    # Colors
-    set -U fish_color_autosuggestion a5a5a9
-    set -U fish_color_cancel -r
-    set -U fish_color_command green
-    set -U fish_color_comment a5a5a9
-    set -U fish_color_cwd cyan
-    set -U fish_color_cwd_root red
-    set -U fish_color_end brblack
-    set -U fish_color_error red
-    set -U fish_color_escape yellow
-    set -U fish_color_history_current --bold
-    set -U fish_color_host normal
-    set -U fish_color_host_remote yellow
-    set -U fish_color_normal normal
-    set -U fish_color_operator blue
-    set -U fish_color_param white
-    set -U fish_color_quote yellow
-    set -U fish_color_redirection cyan
-    set -U fish_color_search_match bryellow --background=515151
-    set -U fish_color_selection white --bold --background=515151
-    set -U fish_color_status red
-    set -U fish_color_user brgreen
-    set -U fish_color_valid_path --underline
-    set -U fish_pager_color_completion normal
-    set -U fish_pager_color_description yellow --dim
-    set -U fish_pager_color_prefix white --bold
-    set -U fish_pager_color_progress black --background=cyan
-end
diff --git a/fish/themes/Catppuccin Frappe.theme b/fish/themes/Catppuccin Frappe.theme
new file mode 100644
index 0000000..004fcec
--- /dev/null
+++ b/fish/themes/Catppuccin Frappe.theme	
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Frappé'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 303446
+
+fish_color_normal c6d0f5
+fish_color_command 8caaee
+fish_color_param eebebe
+fish_color_keyword e78284
+fish_color_quote a6d189
+fish_color_redirection f4b8e4
+fish_color_end ef9f76
+fish_color_comment 838ba7
+fish_color_error e78284
+fish_color_gray 737994
+fish_color_selection --background=414559
+fish_color_search_match --background=414559
+fish_color_option a6d189
+fish_color_operator f4b8e4
+fish_color_escape ea999c
+fish_color_autosuggestion 737994
+fish_color_cancel e78284
+fish_color_cwd e5c890
+fish_color_user 81c8be
+fish_color_host 8caaee
+fish_color_host_remote a6d189
+fish_color_status e78284
+fish_pager_color_progress 737994
+fish_pager_color_prefix f4b8e4
+fish_pager_color_completion c6d0f5
+fish_pager_color_description 737994
diff --git a/fish/themes/Catppuccin Latte.theme b/fish/themes/Catppuccin Latte.theme
new file mode 100644
index 0000000..1c0ec74
--- /dev/null
+++ b/fish/themes/Catppuccin Latte.theme	
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Latte'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: eff1f5
+
+fish_color_normal 4c4f69
+fish_color_command 1e66f5
+fish_color_param dd7878
+fish_color_keyword d20f39
+fish_color_quote 40a02b
+fish_color_redirection ea76cb
+fish_color_end fe640b
+fish_color_comment 8c8fa1
+fish_color_error d20f39
+fish_color_gray 9ca0b0
+fish_color_selection --background=ccd0da
+fish_color_search_match --background=ccd0da
+fish_color_option 40a02b
+fish_color_operator ea76cb
+fish_color_escape e64553
+fish_color_autosuggestion 9ca0b0
+fish_color_cancel d20f39
+fish_color_cwd df8e1d
+fish_color_user 179299
+fish_color_host 1e66f5
+fish_color_host_remote 40a02b
+fish_color_status d20f39
+fish_pager_color_progress 9ca0b0
+fish_pager_color_prefix ea76cb
+fish_pager_color_completion 4c4f69
+fish_pager_color_description 9ca0b0