diff --git a/colors/rose-pine.lua b/colors/rose-pine.lua
new file mode 100644
index 0000000..fd735a8
--- /dev/null
+++ b/colors/rose-pine.lua
@@ -0,0 +1,3 @@
+package.loaded['rose-pine.palette'] = nil
+
+require('rose-pine').colorscheme()
diff --git a/colors/rose-pine.vim b/colors/rose-pine.vim
deleted file mode 100644
index 0df6221..0000000
--- a/colors/rose-pine.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-lua package.loaded['rose-pine.palette'] = nil
-
-lua require('rose-pine').colorscheme()
diff --git a/lua/rose-pine/plugins/bufferline.lua b/lua/rose-pine/plugins/bufferline.lua
index 631b8b6..db722cf 100644
--- a/lua/rose-pine/plugins/bufferline.lua
+++ b/lua/rose-pine/plugins/bufferline.lua
@@ -4,202 +4,220 @@
 --- @usage
 --- local highlights = require('rose-pine.plugins.bufferline')
 --- require('bufferline').setup({ highlights = highlights })
+
 local p = require('rose-pine.palette')
 
 return {
-  -- fill = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- background = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- tab = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- tab_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- tab_close = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- close_button = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- close_button_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- close_button_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  buffer_visible = {guifg = p.subtle, guibg = p.base},
-  buffer_selected = {guifg = p.text, guibg = p.surface, gui = 'bold,italic'}
-  -- diagnostic = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- diagnostic_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- diagnostic_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- },
-  -- info = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- info_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- info_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- info_diagnostic = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- info_diagnostic_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- info_diagnostic_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- warning = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- warning_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- warning_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- warning_diagnostic = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- warning_diagnostic_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- warning_diagnostic_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = warning_diagnostic_fg,
-  -- },
-  -- error = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- error_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- error_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- error_diagnostic = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- error_diagnostic_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- error_diagnostic_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- 	guisp = '<color-value-here>',
-  -- },
-  -- modified = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- modified_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- modified_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- duplicate_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	gui = 'italic',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- duplicate_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	gui = 'italic',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- duplicate = {
-  -- 	guifg = '<color-value-here>',
-  -- 	gui = 'italic',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- separator_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- separator_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- separator = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- indicator_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- },
-  -- pick_selected = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- },
-  -- pick_visible = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- },
-  -- pick = {
-  -- 	guifg = '<color-value-here>',
-  -- 	guibg = '<color-value-here>',
-  -- 	gui = 'bold,italic',
-  -- },
+	-- fill = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- background = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- tab = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- tab_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- tab_close = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- close_button = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- close_button_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- close_button_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	buffer_visible = {
+		fg = p.subtle,
+		bg = p.base,
+	},
+	buffer_selected = {
+		fg = p.text,
+		bg = p.surface,
+		bold = true,
+		italic = true,
+	},
+	-- diagnostic = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- diagnostic_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- diagnostic_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- },
+	-- info = {
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- info_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- info_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- info_diagnostic = {
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- info_diagnostic_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- info_diagnostic_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- warning = {
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- warning_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- warning_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- warning_diagnostic = {
+	-- 	fg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- warning_diagnostic_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- warning_diagnostic_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = warning_diagnostic_fg,
+	-- },
+	-- error = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- error_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- error_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- error_diagnostic = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- error_diagnostic_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- error_diagnostic_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- 	sp = '<color-value-here>',
+	-- },
+	-- modified = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- modified_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- modified_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- duplicate_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- duplicate_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- duplicate = {
+	-- 	fg = '<color-value-here>',
+	-- 	italic = true,
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- separator_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- separator_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- separator = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- indicator_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- },
+	-- pick_selected = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	italic = true,
+	-- },
+	-- pick_visible = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- },
+	-- pick = {
+	-- 	fg = '<color-value-here>',
+	-- 	bg = '<color-value-here>',
+	-- 	bold = true,
+	-- 	italic = true,
+	-- },
 }
diff --git a/lua/rose-pine/theme.lua b/lua/rose-pine/theme.lua
index 4aa6032..b87b3ae 100644
--- a/lua/rose-pine/theme.lua
+++ b/lua/rose-pine/theme.lua
@@ -281,6 +281,56 @@ function M.get()
     TSVariable = {fg = p.text, style = styles.italic},
     TSVariableBuiltin = {fg = p.love},
 
+		-- Treesitter
+		['@annotation'] = { link = 'PreProc' },
+		['@attribute'] = { link = 'PreProc' },
+		['@boolean'] = { link = 'Boolean' },
+		['@character'] = { link = 'Character' },
+		['@comment'] = { link = 'Comment' },
+		['@conditional'] = { link = 'Conditional' },
+		['@constant'] = { fg = p.foam },
+		['@constant.builtin'] = { fg = p.love },
+		['@constructor'] = { fg = p.foam },
+		['@field'] = { fg = p.foam },
+		['@function'] = { fg = p.rose },
+		['@function.builtin'] = { fg = p.love },
+		['@include'] = { fg = p.pine },
+		['@keyword'] = { fg = p.pine },
+		['@keyword.operator'] = { fg = p.subtle },
+		['@label'] = { fg = p.foam },
+		['@namespace'] = { link = 'Include' },
+		['@number'] = { link = 'Number' },
+		['@operator'] = { fg = p.subtle },
+		['@parameter'] = { fg = p.iris, style = styles.italic },
+		['@property'] = { fg = p.iris, style = styles.italic },
+		['@punctuation.bracket'] = { fg = groups.punctuation },
+		['@punctuation.delimiter'] = { fg = groups.punctuation },
+		['@punctuation.special'] = { fg = groups.punctuation },
+		['@string'] = { link = 'String' },
+		['@string.escape'] = { fg = p.pine },
+		['@string.special'] = { link = '@string' },
+		['@symbol'] = { link = 'Identifier' },
+		['@tag'] = { fg = p.foam },
+		['@tag.attribute'] = { link = '@property' },
+		['@tag.delimiter'] = { fg = p.subtle },
+		['@text'] = { fg = p.text },
+		['@text.strong'] = { bold = true },
+		['@text.emphasis'] = { italic = true },
+		['@text.underline'] = { underline = true },
+		['@text.strike'] = { strikethrough = true },
+		['@text.math'] = { link = 'Special' },
+		['@text.environment'] = { link = 'Macro' },
+		['@text.environment.name'] = { link = 'Type' },
+		['@text.title'] = { fg = groups.headings.h1, style = 'bold' },
+		['@text.uri'] = { fg = groups.link },
+		['@text.note'] = { link = 'SpecialComment' },
+		['@text.warning'] = { link = 'Todo' },
+		['@text.danger'] = { link = 'WarningMsg' },
+		['@todo'] = { link = 'Todo' },
+		['@type'] = { link = 'Type' },
+		['@variable'] = { fg = p.text, style = styles.italic },
+		['@variable.builtin'] = { fg = p.love },
+
     -- vim.lsp.buf.document_highlight()
     LspReferenceText = {bg = p.highlight_med},
     LspReferenceRead = {bg = p.highlight_med},