diff --git a/catppuccin-flavours/catppuccin-frappe.zsh b/catppuccin-flavours/catppuccin-frappe.zsh
new file mode 100644
index 0000000..7e5a98e
--- /dev/null
+++ b/catppuccin-flavours/catppuccin-frappe.zsh
@@ -0,0 +1,26 @@
+catppuccin_rosewater="#f2d5cf"
+catppuccin_flamingo="#eebebe"
+catppuccin_pink="#f4b8e4"
+catppuccin_mauve="#ca9ee6"
+catppuccin_red="#e78284"
+catppuccin_maroon="#ea999c"
+catppuccin_peach="#ef9f76"
+catppuccin_yellow="#e5c890"
+catppuccin_green="#a6d189"
+catppuccin_teal="#81c8be"
+catppuccin_sky="#99d1db"
+catppuccin_sapphire="#85c1dc"
+catppuccin_blue="#8caaee"
+catppuccin_lavender="#babbf1"
+catppuccin_text="#c6d0f5"
+catppuccin_subtext1="#b5bfe2"
+catppuccin_subtext0="#a5adce"
+catppuccin_overlay2="#949cbb"
+catppuccin_overlay1="#838ba7"
+catppuccin_overlay0="#737994"
+catppuccin_surface2="#626880"
+catppuccin_surface1="#51576d"
+catppuccin_surface0="#414559"
+catppuccin_base="#303446"
+catppuccin_mantle="#292c3c"
+catppuccin_crust="#232634"
diff --git a/catppuccin-flavours/catppuccin-latte.zsh b/catppuccin-flavours/catppuccin-latte.zsh
new file mode 100644
index 0000000..6eab2bf
--- /dev/null
+++ b/catppuccin-flavours/catppuccin-latte.zsh
@@ -0,0 +1,26 @@
+catppuccin_rosewater="#dc8a78"
+catppuccin_flamingo="#dd7878"
+catppuccin_pink="#ea76cb"
+catppuccin_mauve="#8839ef"
+catppuccin_red="#d20f39"
+catppuccin_maroon="#e64553"
+catppuccin_peach="#fe640b"
+catppuccin_yellow="#df8e1d"
+catppuccin_green="#40a02b"
+catppuccin_teal="#179299"
+catppuccin_sky="#04a5e5"
+catppuccin_sapphire="#209fb5"
+catppuccin_blue="#1e66f5"
+catppuccin_lavender="#7287fd"
+catppuccin_text="#4c4f69"
+catppuccin_subtext1="#5c5f77"
+catppuccin_subtext0="#6c6f85"
+catppuccin_overlay2="#7c7f93"
+catppuccin_overlay1="#8c8fa1"
+catppuccin_overlay0="#9ca0b0"
+catppuccin_surface2="#acb0be"
+catppuccin_surface1="#bcc0cc"
+catppuccin_surface0="#ccd0da"
+catppuccin_base="#eff1f5"
+catppuccin_mantle="#e6e9ef"
+catppuccin_crust="#dce0e8"
diff --git a/catppuccin-flavours/catppuccin-macchiato.zsh b/catppuccin-flavours/catppuccin-macchiato.zsh
new file mode 100644
index 0000000..69e87bb
--- /dev/null
+++ b/catppuccin-flavours/catppuccin-macchiato.zsh
@@ -0,0 +1,26 @@
+catppuccin_rosewater="#f4dbd6"
+catppuccin_flamingo="#f0c6c6"
+catppuccin_pink="#f5bde6"
+catppuccin_mauve="#c6a0f6"
+catppuccin_red="#ed8796"
+catppuccin_maroon="#ee99a0"
+catppuccin_peach="#f5a97f"
+catppuccin_yellow="#eed49f"
+catppuccin_green="#a6da95"
+catppuccin_teal="#8bd5ca"
+catppuccin_sky="#91d7e3"
+catppuccin_sapphire="#7dc4e4"
+catppuccin_blue="#8aadf4"
+catppuccin_lavender="#b7bdf8"
+catppuccin_text="#cad3f5"
+catppuccin_subtext1="#b8c0e0"
+catppuccin_subtext0="#a5adcb"
+catppuccin_overlay2="#939ab7"
+catppuccin_overlay1="#8087a2"
+catppuccin_overlay0="#6e738d"
+catppuccin_surface2="#5b6078"
+catppuccin_surface1="#494d64"
+catppuccin_surface0="#363a4f"
+catppuccin_base="#24273a"
+catppuccin_mantle="#1e2030"
+catppuccin_crust="#181926"
diff --git a/catppuccin-mocha.zsh-theme b/catppuccin-flavours/catppuccin-mocha.zsh
similarity index 56%
rename from catppuccin-mocha.zsh-theme
rename to catppuccin-flavours/catppuccin-mocha.zsh
index 74d0d48..a0953f0 100644
--- a/catppuccin-mocha.zsh-theme
+++ b/catppuccin-flavours/catppuccin-mocha.zsh
@@ -24,18 +24,3 @@ catppuccin_surface0="#313244"
 catppuccin_base="#1e1e2e"
 catppuccin_mantle="#181825"
 catppuccin_crust="#11111b"
-
-PROMPT="%(?:%F{${catppuccin_green}}%1{➜%} :%F{${catppuccin_red}}%1{➜%} )"
-if [ "$CATPPUCCIN_SHOW_TIME" = true ];
-then
-  PROMPT+="%F{${catppuccin_mauve}}%T%  "
-fi
-
-PROMPT+="%F{${catppuccin_pink}}%n%  "
-PROMPT+="%F{${catppuccin_blue}}%c%{$reset_color%}"
-PROMPT+=' $(git_prompt_info)'
-
-ZSH_THEME_GIT_PROMPT_PREFIX="%F{${catppuccin_teal}}("
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%F{${catppuccin_teal}}) %F{${catppuccin_yellow}}%1{✗%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%F{${catppuccin_teal}}) %F{${catppuccin_green}}%1{✔%}"
diff --git a/catppuccin.zsh-theme b/catppuccin.zsh-theme
new file mode 100644
index 0000000..ade1d56
--- /dev/null
+++ b/catppuccin.zsh-theme
@@ -0,0 +1,25 @@
+if [ "$CATPPUCCIN_FLAVOR" = "frappe" ]; then
+    source ${0:A:h}/catppuccin-flavors/catppuccin-frappe.zsh
+elif [ "$CATPPUCCIN_FLAVOR" = "latte" ]; then
+    source ${0:A:h}/catppuccin-flavors/catppuccin-latte.zsh
+elif [ "$CATPPUCCIN_FLAVOR" = "macchiato" ]; then
+    source ${0:A:h}/catppuccin-flavors/catppuccin-macchiato.zsh
+else
+    source ${0:A:h}/catppuccin-flavors/catppuccin-mocha.zsh
+fi
+
+
+PROMPT="%(?:%F{${catppuccin_green}}%1{➜%} :%F{${catppuccin_red}}%1{➜%} )"
+if [ "$CATPPUCCIN_SHOW_TIME" = true ];
+then
+  PROMPT+="%F{${catppuccin_mauve}}%T%  "
+fi
+
+PROMPT+="%F{${catppuccin_pink}}%n%  "
+PROMPT+="%F{${catppuccin_blue}}%c%{$reset_color%}"
+PROMPT+=' $(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{${catppuccin_teal}}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{${catppuccin_teal}}) %F{${catppuccin_yellow}}%1{✗%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%F{${catppuccin_teal}}) %F{${catppuccin_green}}%1{✔%}"