diff --git a/common/.config/kitty/current-theme.conf b/common/.config/kitty/current-theme.conf
index dbd1987..2533db7 100644
--- a/common/.config/kitty/current-theme.conf
+++ b/common/.config/kitty/current-theme.conf
@@ -1,61 +1,80 @@
 # vim:ft=kitty
 
-## name: GitHub Dark Dimmed
-## author: GitHub
-## license: MIT
-
-#: The basic colors
-
-foreground #adbac7
-background #22272e
-selection_foreground #22272e
-selection_background #539bf5
+## 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!
 
 
-#: Cursor colors
 
-cursor #539bf5
+# The basic colors
+foreground              #CDD6F4
+background              #1E1E2E
+selection_foreground    #1E1E2E
+selection_background    #F5E0DC
 
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
 
-#: Tab bar colors
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
 
-tab_bar_background #1c2128
-active_tab_foreground #adbac7
-active_tab_background #22272e
-inactive_tab_foreground #768390
-inactive_tab_background #1c2128
+# 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
 
-#: The basic 16 colors
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
 
-#: black
-color0 #545d68
-color8 #636e7b
+# 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
 
-#: red
-color1 #f47067
-color9 #ff938a
+# The 16 terminal colors
 
-#: green
-color2 #57ab5a
-color10 #6bc46d
+# black
+color0 #45475A
+color8 #585B70
 
-#: yellow
-color3 #c69026
-color11 #daaa3f
+# red
+color1 #F38BA8
+color9 #F38BA8
 
-#: blue
-color4 #539bf5
-color12 #6cb6ff
+# green
+color2  #A6E3A1
+color10 #A6E3A1
 
-#: magenta
-color5 #b083f0
-color13 #dcbdfb
+# yellow
+color3  #F9E2AF
+color11 #F9E2AF
 
-#: cyan
-color6 #39c5cf
-color14 #56d4dd
+# blue
+color4  #89B4FA
+color12 #89B4FA
 
-#: white
-color7 #909dab
-color15 #cdd9e5
+# magenta
+color5  #F5C2E7
+color13 #F5C2E7
+
+# cyan
+color6  #94E2D5
+color14 #94E2D5
+
+# white
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/common/.config/kitty/kitty.conf b/common/.config/kitty/kitty.conf
index 55264e6..0071702 100644
--- a/common/.config/kitty/kitty.conf
+++ b/common/.config/kitty/kitty.conf
@@ -1,9 +1,7 @@
 # vim:fileencoding=utf-8:foldmethod=marker
 
-# TODO:
-# - Display current directory on OS title: even when nvim or any other forground app is running
+# TODO: Display current directory on OS title: even when nvim or any other forground app is running
 # - <Ctrl+shift> [/] to decrease/increase split size
-# - Use Konsole shortcuts for creating splits and moving between them as well
 
 #: Fonts {{{
 
@@ -2565,8 +2563,11 @@ map kitty_mod+n nth_window +1
 
 #: }}}
 
+# These are needed for NeoVim
+map ctrl+shift+f send_text all \x1b[70;5u
+map ctrl+shift+p send_text all \x1b[80;5u
 
 # BEGIN_KITTY_THEME
-# GitHub Dark Dimmed
+# Catppuccin-Mocha
 include current-theme.conf
 # END_KITTY_THEME