diff --git a/kakoune/.config/kak/colors/five-colors-dark.kak b/kakoune/.config/kak/colors/five-colors-dark.kak
index 21e7f28..7a081b7 100644
--- a/kakoune/.config/kak/colors/five-colors-dark.kak
+++ b/kakoune/.config/kak/colors/five-colors-dark.kak
@@ -121,5 +121,55 @@ evaluate-commands %sh{
 
         set-face global SnippetsNextPlaceholders $bg,$green2
         set-face global SnippetsOtherPlaceholders $bg,$yellow2
+
+        # kak-tree-sitter
+
+        set-face global ts_attribute $green3
+        set-face global ts_comment $gray
+        set-face global ts_constant $violet2
+        set-face global ts_conceal $red1
+        set-face global ts_constructor $red1
+        set-face global ts_diff_plus $green2
+        set-face global ts_diff_minus $red2
+        set-face global ts_diff_delta $blue2
+        set-face global ts_error $red2
+        set-face global ts_function $blue2
+        set-face global ts_hint $green2
+        set-face global ts_info $blue2
+        set-face global ts_keyword $violet3
+        set-face global ts_label $red1
+        set-face global ts_bold $green2+b
+        set-face global ts_markup_heading $red3
+        set-face global ts_markup_italic $green2+i
+        set-face global ts_markup_list_checked $red2
+        set-face global ts_markup_list_numbered $red2
+        set-face global ts_markup_list_unchecked $red2
+        set-face global ts_markup_list_unnumbered $red2
+        set-face global ts_markup_link_label $green2
+        set-face global ts_markup_link_url $blue2
+        set-face global ts_markup_link_uri $blue2
+        set-face global ts_markup_link_text $red1
+        set-face global ts_markup_quote $blue3
+        set-face global ts_markup_raw $yellow2
+        set-face global ts_markup_strikethrough $red2+s
+        set-face global ts_namespace $green3
+        set-face global ts_operator $red2
+        set-face global ts_property $green3
+        set-face global ts_punctuation $red3
+        set-face global ts_special $red3
+        set-face global ts_spell $red1+c
+        set-face global ts_string $yellow2
+        set-face global ts_string_regex $yellow1+b
+        set-face global ts_string_regexp $yellow1+b
+        set-face global ts_string_escape $yellow1+b
+        set-face global ts_string_special $yellow1+b
+        set-face global ts_string_symbol $yellow1+b
+        set-face global ts_tag $green2
+        set-face global ts_tag_error $red2+c
+        set-face global ts_text $red1
+        set-face global ts_text_title $red3
+        set-face global ts_type $green2
+        set-face global ts_variable $blue3
+        set-face global ts_warning $yellow2+c
     "
 }
diff --git a/kakoune/.config/kak/colors/five-colors-light.kak b/kakoune/.config/kak/colors/five-colors-light.kak
index 2c8a9ee..b35d257 100644
--- a/kakoune/.config/kak/colors/five-colors-light.kak
+++ b/kakoune/.config/kak/colors/five-colors-light.kak
@@ -121,5 +121,55 @@ evaluate-commands %sh{
 
         set-face global SnippetsNextPlaceholders $bg,$green2
         set-face global SnippetsOtherPlaceholders $bg,$yellow2
+
+        # kak-tree-sitter
+
+        set-face global ts_attribute $green3
+        set-face global ts_comment $gray
+        set-face global ts_constant $violet2
+        set-face global ts_conceal $red1
+        set-face global ts_constructor $red1
+        set-face global ts_diff_plus $green2
+        set-face global ts_diff_minus $red2
+        set-face global ts_diff_delta $blue2
+        set-face global ts_error $red2
+        set-face global ts_function $blue2
+        set-face global ts_hint $green2
+        set-face global ts_info $blue2
+        set-face global ts_keyword $violet3
+        set-face global ts_label $red1
+        set-face global ts_bold $green2+b
+        set-face global ts_markup_heading $red3
+        set-face global ts_markup_italic $green2+i
+        set-face global ts_markup_list_checked $red2
+        set-face global ts_markup_list_numbered $red2
+        set-face global ts_markup_list_unchecked $red2
+        set-face global ts_markup_list_unnumbered $red2
+        set-face global ts_markup_link_label $green2
+        set-face global ts_markup_link_url $blue2
+        set-face global ts_markup_link_uri $blue2
+        set-face global ts_markup_link_text $red1
+        set-face global ts_markup_quote $blue3
+        set-face global ts_markup_raw $yellow2
+        set-face global ts_markup_strikethrough $red2+s
+        set-face global ts_namespace $green3
+        set-face global ts_operator $red2
+        set-face global ts_property $green3
+        set-face global ts_punctuation $red3
+        set-face global ts_special $red3
+        set-face global ts_spell $red1+c
+        set-face global ts_string $yellow2
+        set-face global ts_string_regex $yellow1+b
+        set-face global ts_string_regexp $yellow1+b
+        set-face global ts_string_escape $yellow1+b
+        set-face global ts_string_special $yellow1+b
+        set-face global ts_string_symbol $yellow1+b
+        set-face global ts_tag $green2
+        set-face global ts_tag_error $red2+c
+        set-face global ts_text $red1
+        set-face global ts_text_title $red3
+        set-face global ts_type $green2
+        set-face global ts_variable $blue3
+        set-face global ts_warning $yellow2+c
     "
 }
diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc
index c4cc099..fcaa2cb 100644
--- a/kakoune/.config/kak/kakrc
+++ b/kakoune/.config/kak/kakrc
@@ -6,7 +6,6 @@ set-option global ui_options terminal_assistant=none
 hook global WinCreate .* %{
     add-highlighter window/number-lines number-lines -relative -hlcursor
 }
-add-highlighter global/ show-matching
 
 # LOCAL
 
@@ -240,6 +239,14 @@ bundle kak-harpoon 'https://codeberg.org/raiguard/kak-harpoon' %{
     harpoon-add-bindings
 }
 
+# TREE SITTER
+
+eval %sh{ kak-tree-sitter -dks --init $kak_session }
+
+define-command -override tree-sitter-user-after-highlighter %{
+    add-highlighter -override buffer/show-matching show-matching
+}
+
 # LOCAL
 
 define-command set-dark-or-light-colorscheme %{