diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 20094f7..877ba5e 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -3,51 +3,84 @@
 #########################
 # vim:ft=kitty
 
-## name: Tokyo Night Storm
-## license: MIT
-## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+## name:     Catppuccin Kitty Macchiato
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/macchiato.conf
+## blurb:    Soothing pastel theme for the high-spirited!
 
 
-background #24283b
-foreground #c0caf5
-selection_background #2e3c64
-selection_foreground #c0caf5
-url_color #73daca
-cursor #c0caf5
-cursor_text_color #24283b
 
-# Tabs
-active_tab_background #7aa2f7
-active_tab_foreground #1f2335
-inactive_tab_background #292e42
-inactive_tab_foreground #545c7e
-#tab_bar_background #1d202f
+# The basic colors
+foreground              #CAD3F5
+background              #24273A
+selection_foreground    #24273A
+selection_background    #F4DBD6
 
-# Windows
-active_border_color #7aa2f7
-inactive_border_color #292e42
+# Cursor colors
+cursor                  #F4DBD6
+cursor_text_color       #24273A
 
-# normal
-color0 #1d202f
-color1 #f7768e
-color2 #9ece6a
-color3 #e0af68
-color4 #7aa2f7
-color5 #bb9af7
-color6 #7dcfff
-color7 #a9b1d6
+# URL underline color when hovering with mouse
+url_color               #F4DBD6
 
-# bright
-color8 #414868
-color9 #f7768e
-color10 #9ece6a
-color11 #e0af68
-color12 #7aa2f7
-color13 #bb9af7
-color14 #7dcfff
-color15 #c0caf5
+# Kitty window border colors
+active_border_color     #B7BDF8
+inactive_border_color   #6E738D
+bell_border_color       #EED49F
 
+# OS Window titlebar colors
+wayland_titlebar_color  #24273A
+macos_titlebar_color    #24273A
+
+# Tab bar colors
+active_tab_foreground   #181926
+active_tab_background   #C6A0F6
+inactive_tab_foreground #CAD3F5
+inactive_tab_background #1E2030
+tab_bar_background      #181926
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #24273A
+mark1_background #B7BDF8
+mark2_foreground #24273A
+mark2_background #C6A0F6
+mark3_foreground #24273A
+mark3_background #7DC4E4
+
+# The 16 terminal colors
+
+# black
+color0 #494D64
+color8 #5B6078
+
+# red
+color1 #ED8796
+color9 #ED8796
+
+# green
+color2  #A6DA95
+color10 #A6DA95
+
+# yellow
+color3  #EED49F
+color11 #EED49F
+
+# blue
+color4  #8AADF4
+color12 #8AADF4
+
+# magenta
+color5  #F5BDE6
+color13 #F5BDE6
+
+# cyan
+color6  #8BD5CA
+color14 #8BD5CA
+
+# white
+color7  #B8C0E0
+color15 #A5ADCB
 # extended colors
 color16 #ff9e64
 color17 #db4b4b
@@ -79,9 +112,9 @@ tab_bar_margin_height 0 0
 macos_quit_when_last_window_closed yes
 
 # font
-font_family JetBrains Mono
-font_size 13
-modify_font cell_height +4
+font_family JetBrainsMonoNL Nerd Font Mono
+font_size 12
+modify_font cell_height +2
 
 #########################
 ###  KEYMAPING START  ###