diff --git a/.config/kak/autoload/plugins.kak b/.config/kak/autoload/plugins.kak
index a3417cb3..d0c4992f 100644
--- a/.config/kak/autoload/plugins.kak
+++ b/.config/kak/autoload/plugins.kak
@@ -100,3 +100,5 @@ bundle pykak https://github.com/tomKPZ/pykak
 #         require-module peneira
 #     }
 # }
+
+bundle-theme one.kak https://github.com/raiguard/one.kak
diff --git a/.config/kak/colors/mocha.kak b/.config/kak/colors/mocha.kak
new file mode 100644
index 00000000..f45500dc
--- /dev/null
+++ b/.config/kak/colors/mocha.kak
@@ -0,0 +1,172 @@
+# Catppuccint Mocha theme for Kakoune
+#
+# Taken and adapted from
+# <https://github.com/catppuccin/kakoune/blob/7f187d9da2867a7fda568b2135d29b9c00cfbb94/colors/catppuccin_mocha.kak>
+
+# Catppuccin theme for Kakoune
+
+# Color palette (see https://catppuccin.com/palette)
+declare-option str rosewater "rgb:f5e0dc"
+declare-option str flamingo  "rgb:f2cdcd"
+declare-option str pink      "rgb:f5c2e7"
+declare-option str mauve     "rgb:cba6f7"
+declare-option str red       "rgb:f38ba8"
+declare-option str maroon    "rgb:eba0ac"
+declare-option str peach     "rgb:fab387"
+declare-option str yellow    "rgb:f9e2af"
+declare-option str green     "rgb:a6e3a1"
+declare-option str teal      "rgb:94e2d5"
+declare-option str sky       "rgb:89dceb"
+declare-option str sapphire  "rgb:74c7ec"
+declare-option str blue      "rgb:89b4fa"
+declare-option str lavender  "rgb:b4befe"
+declare-option str text      "rgb:cdd6f4"
+declare-option str subtext1  "rgb:bac2de"
+declare-option str subtext0  "rgb:a6adc8"
+declare-option str overlay2  "rgb:9399b2"
+declare-option str overlay1  "rgb:7f849c"
+declare-option str overlay0  "rgb:6c7086"
+declare-option str surface2  "rgb:585b70"
+declare-option str surface1  "rgb:45475a"
+declare-option str surface0  "rgb:313244"
+declare-option str base      "rgb:1e1e2e"
+declare-option str mantle    "rgb:181825"
+declare-option str crust     "rgb:11111b"
+
+# Markup
+set-face global title  "%opt{text}+b"
+set-face global header "%opt{subtext0}+b"
+set-face global bold   "%opt{maroon}+b"
+set-face global italic "%opt{maroon}+i"
+set-face global mono   "%opt{green}"
+set-face global block  "%opt{sapphire}"
+set-face global link   "%opt{blue}"
+set-face global bullet "%opt{peach}"
+set-face global list   "%opt{peach}"
+
+# Builtins
+set-face global Default            "%opt{text},%opt{base}"
+set-face global PrimarySelection   "%opt{text},%opt{surface2}"
+set-face global SecondarySelection "%opt{text},%opt{surface2}"
+set-face global PrimaryCursor      "%opt{crust},%opt{rosewater}"
+set-face global SecondaryCursor    "%opt{text},%opt{overlay0}"
+set-face global PrimaryCursorEol   "%opt{surface2},%opt{lavender}"
+set-face global SecondaryCursorEol "%opt{surface2},%opt{overlay1}"
+set-face global LineNumbers        "%opt{overlay1},%opt{base}"
+set-face global LineNumberCursor   "%opt{rosewater},%opt{surface2}+b"
+set-face global LineNumbersWrapped "%opt{rosewater},%opt{surface2}"
+set-face global MenuForeground     "%opt{text},%opt{surface1}+b"
+set-face global MenuBackground     "%opt{text},%opt{surface0}"
+set-face global MenuInfo           "%opt{crust},%opt{teal}"
+set-face global Information        "%opt{crust},%opt{teal}"
+set-face global Error              "%opt{crust},%opt{red}"
+set-face global DiagnosticError    "%opt{crust},%opt{red}"
+set-face global DiagnosticWarning  "%opt{yellow}"
+set-face global StatusLine         "%opt{text},%opt{mantle}"
+set-face global StatusLineMode     "%opt{crust},%opt{yellow}"
+set-face global StatusLineInfo     "%opt{crust},%opt{teal}"
+set-face global StatusLineValue    "%opt{crust},%opt{yellow}"
+set-face global StatusCursor       "%opt{crust},%opt{rosewater}"
+set-face global Prompt             "%opt{teal},%opt{base}+b"
+set-face global MatchingChar       "%opt{maroon},%opt{base}"
+set-face global Whitespace         "%opt{overlay1},%opt{base}+f"
+set-face global WrapMarker         "%opt{overlay1},%opt{base}+f"
+set-face global BufferPadding      "%opt{base},%opt{base}"
+
+# Code
+set-face global value         "%opt{peach}"
+set-face global type          "%opt{yellow}"
+set-face global variable      "%opt{text}"
+set-face global module        "%opt{maroon}"
+set-face global function      "%opt{blue}"
+set-face global string        "%opt{green}"
+set-face global keyword       "%opt{mauve}"
+set-face global operator      "%opt{sky}"
+set-face global attribute     "%opt{yellow}"
+set-face global comment       "%opt{overlay1}+i"
+set-face global documentation "%opt{overlay1}+i"
+set-face global meta          "%opt{yellow}"
+set-face global builtin       "%opt{red}"
+
+# Tree-sitter (<https://github.com/hadronized/kak-tree-sitter>)
+# Copied from catppuccin_macchiato.kak
+# Adjusted with https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md
+set-face global ts_attribute                    "%opt{yellow}"
+set-face global ts_comment                      "%opt{overlay0}+i"
+set-face global ts_comment_unused               "%opt{overlay0}+is"
+set-face global ts_conceal                      "%opt{mauve}+i"
+set-face global ts_constant                     "%opt{peach}"
+set-face global ts_constant_builtin_boolean     "%opt{sky}"
+set-face global ts_constant_character           "%opt{yellow}"
+set-face global ts_constant_macro               "%opt{mauve}"
+set-face global ts_constructor                  "%opt{sky}"
+set-face global ts_diff_plus                    "%opt{green}"
+set-face global ts_diff_minus                   "%opt{red}"
+set-face global ts_diff_delta                   "%opt{blue}"
+set-face global ts_diff_delta_moved             "%opt{mauve}"
+set-face global ts_error                        "%opt{red}+b"
+set-face global ts_function                     "%opt{blue}"
+set-face global ts_function_builtin             "%opt{blue}+i"
+set-face global ts_function_macro               "%opt{mauve}"
+set-face global ts_hint                         "%opt{blue}+b"
+set-face global ts_info                         "%opt{teal}+b"
+set-face global ts_keyword                      "%opt{mauve}"
+set-face global ts_keyword_conditional          "%opt{mauve}+i"
+set-face global ts_keyword_control_conditional  "%opt{mauve}+i"
+set-face global ts_keyword_control_directive    "%opt{mauve}+i"
+set-face global ts_keyword_control_import       "%opt{mauve}+i"
+set-face global ts_keyword_directive            "%opt{mauve}+i"
+set-face global ts_keyword_storage              "%opt{mauve}"
+set-face global ts_keyword_storage_modifier     "%opt{mauve}"
+set-face global ts_keyword_storage_modifier_mut "%opt{mauve}"
+set-face global ts_keyword_storage_modifier_ref "%opt{teal}"
+set-face global ts_label                        "%opt{sky}+i"
+set-face global ts_markup_bold                  "%opt{peach}+b"
+set-face global ts_markup_heading               "%opt{red}"
+set-face global ts_markup_heading_1             "%opt{red}"
+set-face global ts_markup_heading_2             "%opt{mauve}"
+set-face global ts_markup_heading_3             "%opt{green}"
+set-face global ts_markup_heading_4             "%opt{yellow}"
+set-face global ts_markup_heading_5             "%opt{pink}"
+set-face global ts_markup_heading_6             "%opt{teal}"
+set-face global ts_markup_heading_marker        "%opt{peach}+b"
+set-face global ts_markup_italic                "%opt{pink}+i"
+set-face global ts_markup_list_checked          "%opt{green}"
+set-face global ts_markup_list_numbered         "%opt{blue}+i"
+set-face global ts_markup_list_unchecked        "%opt{teal}"
+set-face global ts_markup_list_unnumbered       "%opt{mauve}"
+set-face global ts_markup_link_label            "%opt{blue}"
+set-face global ts_markup_link_url              "%opt{teal}+u"
+set-face global ts_markup_link_uri              "%opt{teal}+u"
+set-face global ts_markup_link_text             "%opt{blue}"
+set-face global ts_markup_quote                 "%opt{overlay1}"
+set-face global ts_markup_raw                   "%opt{green}"
+set-face global ts_markup_strikethrough         "%opt{overlay1}+s"
+set-face global ts_namespace                    "%opt{blue}+i"
+set-face global ts_operator                     "%opt{sky}"
+set-face global ts_property                     "%opt{sky}"
+set-face global ts_punctuation                  "%opt{overlay1}"
+set-face global ts_punctuation_special          "%opt{sky}"
+set-face global ts_special                      "%opt{blue}"
+set-face global ts_spell                        "%opt{mauve}"
+set-face global ts_string                       "%opt{green}"
+set-face global ts_string_regex                 "%opt{pink}"
+set-face global ts_string_regexp                "%opt{pink}"
+set-face global ts_string_escape                "%opt{flamingo}"
+set-face global ts_string_special               "%opt{blue}"
+set-face global ts_string_special_path          "%opt{green}"
+set-face global ts_string_special_symbol        "%opt{mauve}"
+set-face global ts_string_symbol                "%opt{red}"
+set-face global ts_tag                          "%opt{mauve}"
+set-face global ts_tag_error                    "%opt{red}"
+set-face global ts_text                         "%opt{text}"
+set-face global ts_text_title                   "%opt{mauve}"
+set-face global ts_type                         "%opt{green}"
+set-face global ts_type_enum_variant            "%opt{sky}"
+set-face global ts_type_enum_variant_builtin    "%opt{sky}+i"
+set-face global ts_variable                     "%opt{text}"
+set-face global ts_variable_builtin             "%opt{red}"
+set-face global ts_variable_other_member        "%opt{teal}"
+set-face global ts_variable_parameter           "%opt{maroon}+i"
+set-face global ts_warning                      "%opt{yellow}+b"
+
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index d3bf80f4..987e6a6c 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -1,6 +1,8 @@
 eval %sh{ kak-tree-sitter -vvvvv -dks --init $kak_session }
-evaluate-commands %sh{kak-popup init}
-colorscheme ashen
+# evaluate-commands %sh{kak-popup init}
+# colorscheme ashen
+# colorscheme one-dark
+colorscheme mocha
 require-module fishr
 require-module peneira
 
@@ -10,8 +12,10 @@ define-command fish-test %{
 	}
 }
 
-set-option global ashen_dynamic_cursor true
-set-option global ashen_eol_cursor true
+try %{
+    set-option global ashen_dynamic_cursor true
+    set-option global ashen_eol_cursor true
+}
 # disable clippy
 set-option global ui_options terminal_assistant=none