diff --git a/lua/base16.lua b/lua/base16.lua
index 9a789fb..b0631fc 100644
--- a/lua/base16.lua
+++ b/lua/base16.lua
@@ -169,6 +169,44 @@ local function apply_base16_theme(theme)
    highlight("SpellCap", nil, nil, "undercurl", theme.base0D)
    highlight("SpellRare", nil, nil, "undercurl", theme.base0E)
 
+   -- treesitter
+   highlight("TSAnnotation", theme.base0F, nil, "none", nil)
+   highlight("TSAttribute", theme.base0A, nil, "none", nil)
+   highlight("TSCharacter", theme.base08, nil, "none", nil)
+   highlight("TSConstBuiltin", theme.base09, nil, "none", nil)
+   highlight("TSConstMacro", theme.base08, nil, "none", nil)
+   highlight("TSError", theme.base08, nil, "none", nil)
+   highlight("TSException", theme.base08, nil, "none", nil)
+   highlight("TSFloat", theme.base09, nil, "none", nil)
+   highlight("TSFuncBuiltin", theme.base0D, nil, "none", nil)
+   highlight("TSFuncMacro", theme.base08, nil, "none", nil)
+   highlight("TSKeywordFunction", theme.base0E, nil, "none", nil)
+   highlight("TSKeywordOperator", theme.base0E, nil, "none", nil)
+   highlight("TSMethod", theme.base0D, nil, "none", nil)
+   highlight("TSNamespace", theme.base08, nil, "none", nil)
+   highlight("TSNone", theme.base05, nil, "none", nil)
+   highlight("TSParameter", theme.base05, nil, "none", nil)
+   highlight("TSParameterReference", theme.base05, nil, "none", nil)
+   highlight("TSPunctDelimiter", theme.base0F, nil, "none", nil)
+   highlight("TSPunctBracket", theme.base05, nil, "none", nil)
+   highlight("TSPunctSpecial", theme.base05, nil, "none", nil)
+   highlight("TSStringRegex", theme.base0C, nil, "none", nil)
+   highlight("TSStringEscape", theme.base0C, nil, "none", nil)
+   highlight("TSSymbol", theme.base0B, nil, "none", nil)
+   highlight("TSTagDelimiter", theme.base0F, nil, "none", nil)
+   highlight("TSText", theme.base05, nil, "none", nil)
+   highlight("TSStrong", nil, nil, "bold", nil)
+   highlight("TSEmphasis", theme.base09, nil, "none", nil)
+   highlight("TSStrike", theme.base00, nil, "strikethrough", nil)
+   highlight("TSLiteral", theme.base09, nil, "none", nil)
+   highlight("TSURI", theme.base09, nil, "underline", nil)
+   highlight("TSTypeBuiltin", theme.base0A, nil, "none", nil)
+   highlight("TSVariable", theme.base08, nil, "none", nil)
+   highlight("TSVariableBuiltin", theme.base08, nil, "none", nil)
+   highlight("TSDefinition", nil, nil, "underline", theme.base04)
+   highlight("TSDefinitionUsage", nil, nil, "underline", theme.base04)
+   highlight("TSCurrentScope", nil, nil, "bold", nil)
+
    -- TODO
    -- nvim.command 'syntax on'
 end
diff --git a/lua/hl_themes/catppuccin.lua b/lua/hl_themes/catppuccin.lua
new file mode 100644
index 0000000..ec2490d
--- /dev/null
+++ b/lua/hl_themes/catppuccin.lua
@@ -0,0 +1,35 @@
+local colors = {
+   white = "#D9E0EE",
+   darker_black = "#191828",
+   black = "#1E1D2D", --  nvim bg
+   black2 = "#252434",
+   one_bg = "#282737", -- real bg of onedark
+   one_bg2 = "#313040",
+   one_bg3 = "#393848",
+   grey = "#424151",
+   grey_fg = "#494858",
+   grey_fg2 = "#504f5f",
+   light_grey = "#585767",
+   red = "#F28FAD",
+   baby_pink = "#ffa5c3",
+   pink = "#F5C2E7",
+   line = "#2a2e36", -- for lines like vertsplit
+   green = "#ABE9B3",
+   vibrant_green = "#b6f4be",
+   nord_blue = "#8bc2f0",
+   blue = "#96CDFB",
+   yellow = "#FAE3B0",
+   sun = "#ffe9b6",
+   purple = "#DDB6F2",
+   dark_purple = "#d5aeea",
+   teal = "#B5E8E0",
+   orange = "#F8BD96",
+   cyan = "#89DCEB",
+   statusline_bg = "#232232",
+   lightbg = "#2f2e3e",
+   lightbg2 = "#282737",
+   pmenu_bg = "#ABE9B3",
+   folder_bg = "#96CDFB",
+}
+
+return colors
diff --git a/lua/themes/catppuccin-base16.lua b/lua/themes/catppuccin-base16.lua
new file mode 100644
index 0000000..b962f55
--- /dev/null
+++ b/lua/themes/catppuccin-base16.lua
@@ -0,0 +1,18 @@
+return {
+   base00 ="1E1D2D",
+   base01 ="282737",
+   base02 ="2f2e3e",
+   base03 ="383747",
+   base04 ="414050",
+   base05 ="bfc6d4",
+   base06 ="ccd3e1",
+   base07 ="D9E0EE",
+   base08 ="DDB6F2",
+   base09 ="89DCEB",
+   base0A ="F8BD96",
+   base0B ="ABE9B3",
+   base0C ="D9E0EE",
+   base0D ="96CDFB",
+   base0E ="F28FAD",
+   base0F ="E8A2AF",
+}