diff --git a/.gitignore b/.gitignore
index 7edef28..2aca0ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ luac.out
 plugin/packer_compiled.lua
 java-debug/
 vscode-java-test/
+.stversions
+.stfolder
+
diff --git a/after/plugin/ccc.lua b/after/plugin/ccc.lua
new file mode 100644
index 0000000..8499e0f
--- /dev/null
+++ b/after/plugin/ccc.lua
@@ -0,0 +1,131 @@
+local status_ok, ccc = pcall(require, "ccc")
+if not status_ok then
+	return
+end
+
+local ColorInput = require("ccc.input")
+local convert = require("ccc.utils.convert")
+
+local RgbHslInput = setmetatable({
+	name = "RGB/HSL",
+	max = { 1, 1, 1, 360, 1, 1, 1, 1, 1, 1 },
+	min = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+	delta = { 1 / 255, 1 / 255, 1 / 255, 1, 0.01, 0.01, 0.005, 0.005, 0.005, 0.005 },
+	bar_name = { "R", "G", "B", "H", "S", "L" },
+}, { __index = ColorInput })
+
+function RgbHslInput.format(n, i)
+	if i <= 3 then
+		-- RGB
+		n = n * 255
+	elseif i >= 5 then
+		-- S or L of HSL
+		n = n * 100
+	end
+	return ("%6d"):format(n)
+end
+
+function RgbHslInput.from_rgb(RGB)
+	local HSL = convert.rgb2hsl(RGB)
+	local R, G, B = unpack(RGB)
+	local H, S, L = unpack(HSL)
+	return { R, G, B, H, S, L }
+end
+
+function RgbHslInput.to_rgb(value)
+	return { value[1], value[2], value[3] }
+end
+
+function RgbHslInput:_set_rgb(RGB)
+	self.value[1] = RGB[1]
+	self.value[2] = RGB[2]
+	self.value[3] = RGB[3]
+end
+
+function RgbHslInput:_set_hsl(HSL)
+	self.value[4] = HSL[1]
+	self.value[5] = HSL[2]
+	self.value[6] = HSL[3]
+end
+
+function RgbHslInput:callback(index, new_value)
+	self.value[index] = new_value
+	local v = self.value
+	if index <= 3 then
+		local RGB = { v[1], v[2], v[3] }
+		local HSL = convert.rgb2hsl(RGB)
+		self:_set_hsl(HSL)
+	else
+		local HSL = { v[4], v[5], v[6] }
+		local RGB = convert.hsl2rgb(HSL)
+		self:_set_rgb(RGB)
+	end
+end
+
+ccc.setup({
+	pickers = {
+		ccc.picker.custom_entries({
+			bg = "#1a1b26",
+			bg_dark = "#16161e",
+			bg_float = "#16161e",
+			bg_highlight = "#292e42",
+			bg_popup = "#16161e",
+			bg_search = "#3d59a1",
+			bg_sidebar = "#16161e",
+			bg_statusline = "#16161e",
+			bg_visual = "#283457",
+			black = "#15161e",
+			blue = "#7aa2f7",
+			blue0 = "#3d59a1",
+			blue1 = "#2ac3de",
+			blue2 = "#0db9d7",
+			blue5 = "#89ddff",
+			blue6 = "#b4f9f8",
+			blue7 = "#394b70",
+			border = "#15161e",
+			border_highlight = "#27a1b9",
+			comment = "#565f89",
+			cyan = "#7dcfff",
+			dark3 = "#545c7e",
+			dark5 = "#737aa2",
+			delta_add = "#2c5a66",
+			delta_delete = "#713137",
+			diff_add = "#20303b",
+			diff_change = "#1f2231",
+			diff_delete = "#37222c",
+			diff_text = "#394b70",
+			error = "#db4b4b",
+			fg = "#c0caf5",
+			fg_dark = "#a9b1d6",
+			fg_float = "#c0caf5",
+			fg_gutter = "#3b4261",
+			fg_sidebar = "#a9b1d6",
+			git_add = "#449dab",
+			git_change = "#6183bb",
+			git_delete = "#914c54",
+			git_ignore = "#545c7e",
+			gitSigns_add = "#266d6a",
+			gitSigns_change = "#536c9e",
+			gitSigns_delete = "#b2555b",
+			green = "#9ece6a",
+			green1 = "#73daca",
+			green2 = "#41a6b5",
+			hint = "#1abc9c",
+			info = "#0db9d7",
+			magenta = "#bb9af7",
+			magenta2 = "#ff007c",
+			none = "NONE",
+			orange = "#ff9e64",
+			purple = "#9d7cd8",
+			red = "#f7768e",
+			red1 = "#db4b4b",
+			teal = "#1abc9c",
+			terminal_black = "#414868",
+			warning = "#e0af68",
+			yellow = "#e0af68",
+		}),
+	},
+	inputs = {
+		RgbHslInput,
+	},
+})
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
index ba6fdc4..fe9375a 100644
--- a/after/plugin/cmp.lua
+++ b/after/plugin/cmp.lua
@@ -9,30 +9,30 @@ if not luasnip_status_ok then
 end
 
 local kind_icons = {
-	Text = "",
-	Method = "",
-	Function = "",
-	Constructor = "",
-	Field = "",
-	Variable = "",
-	Class = "",
+	Text = "󰉿",
+	Method = "󰆧",
+	Function = "󰊕",
+	Constructor = "",
+	Field = "󰜢",
+	Variable = "󰀫",
+	Class = "󰠱",
 	Interface = "",
-	Module = "",
-	Property = "",
-	Unit = "",
-	Value = "",
+	Module = "",
+	Property = "󰜢",
+	Unit = "󰑭",
+	Value = "󰎠",
 	Enum = "",
-	Keyword = "",
-	Snippet = "",
-	Color = "",
-	File = "",
-	Reference = "",
-	Folder = "",
+	Keyword = "󰌋",
+	Snippet = "",
+	Color = "󰏘",
+	File = "󰈙",
+	Reference = "󰈇",
+	Folder = "󰉋",
 	EnumMember = "",
-	Constant = "",
-	Struct = "",
+	Constant = "󰏿",
+	Struct = "󰙅",
 	Event = "",
-	Operator = "",
+	Operator = "󰆕",
 	TypeParameter = "",
 }
 
@@ -65,7 +65,7 @@ cmp.setup({
 		end,
 	},
 	formatting = {
-		fields = { "kind", "abbr", "menu" },
+		fields = { "abbr", "kind", "menu" },
 		format = function(entry, vim_item)
 			vim_item.kind = kind_icons[vim_item.kind]
 			vim_item.menu = ({
@@ -80,6 +80,7 @@ cmp.setup({
 			return vim_item
 		end,
 	},
+
 	experimental = {
 		ghost_text = true,
 	},
diff --git a/after/plugin/colorizer.lua b/after/plugin/colorizer.lua
index ab7266d..37dedd7 100644
--- a/after/plugin/colorizer.lua
+++ b/after/plugin/colorizer.lua
@@ -4,7 +4,7 @@ if not status_ok then
 end
 
 colorizer.setup({
-	filetypes = { "html", "css", "js", "lua", "yaml", "conf", "toml" },
+	filetypes = { "html", "css", "javascript", "lua", "yaml", "conf", "toml" },
 	user_default_options = {
 		RGB = true, -- #RGB hex codes
 		RRGGBB = true, -- #RRGGBB hex codes
diff --git a/after/plugin/dap.lua b/after/plugin/dap.lua
index 5abc613..9daae24 100644
--- a/after/plugin/dap.lua
+++ b/after/plugin/dap.lua
@@ -108,7 +108,7 @@ dap.configurations.python = {
 -- C/C++/Rust
 dap.adapters.lldb = {
 	type = "executable",
-	command = vim.fn.stdpath("data") .. "/mason/packages/codelldb/extension/adapter/codelldb", -- adjust as needed, must be absolute path
+	command = vim.fn.stdpath("data") .. "/mason/packages/codelldb/codelldb", -- adjust as needed, must be absolute path
 	name = "lldb",
 }
 dap.configurations.cpp = {
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
index fdc6070..b6638e0 100644
--- a/after/plugin/lualine.lua
+++ b/after/plugin/lualine.lua
@@ -17,7 +17,7 @@ lualine.setup({
 		lualine_a = { "mode" },
 		lualine_b = { "branch" },
 		lualine_c = { "diff" },
-		lualine_x = { "diagnostics" },
+		lualine_x = { "lsp_progress", "diagnostics" },
 		lualine_y = { "filename" },
 		lualine_z = { "location", "progress" },
 	},
diff --git a/after/plugin/markdown-preview.lua b/after/plugin/markdown-preview.lua
new file mode 100644
index 0000000..b53d68d
--- /dev/null
+++ b/after/plugin/markdown-preview.lua
@@ -0,0 +1,6 @@
+local status_ok, markdown_preview = pcall(require, "markdown-preview")
+if not status_ok then
+	return
+end
+
+markdown_preview.setup({})
diff --git a/lazy-lock.json b/lazy-lock.json
index eba28f9..8a39307 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,78 +1,88 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" },
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "DAPInstall.nvim": { "branch": "main", "commit": "8798b4c36d33723e7bba6ed6e2c202f84bb300de" },
-  "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" },
-  "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "6d0bf36870d15c0c2284f4b6693a66552a6bf127" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "77d4ad94381c41c91f91b165d213fc32f6bf6c62" },
+  "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
+  "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
+  "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "84ed5417b6119dca77c4f96da1fd73e316b85781" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "61f075968ea7e790a39a1ff00484a0befdbd0ac9" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "crates.nvim": { "branch": "main", "commit": "3648f8787656d7572740560331553abdaa8cb982" },
+  "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" },
   "darkplus.nvim": { "branch": "master", "commit": "7c236649f0617809db05cd30fb10fed7fb01b83b" },
-  "dracula.nvim": { "branch": "main", "commit": "5716b1395b32a5865476dd3314bd8888e5f91532" },
-  "friendly-snippets": { "branch": "main", "commit": "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b" },
-  "gitsigns.nvim": { "branch": "main", "commit": "30446e30d15dcfa48d74fcaf3787b7a5226c8079" },
+  "distant.nvim": { "branch": "master", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" },
+  "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" },
+  "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
+  "gitsigns.nvim": { "branch": "main", "commit": "287fffb410ce82d19da2d503a1f1570adf7b7874" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
   "hologram.nvim": { "branch": "main", "commit": "f5194f71ec1578d91b2e3119ff08e574e2eab542" },
   "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
-  "kanagawa.nvim": { "branch": "master", "commit": "14a7524a8b259296713d4d77ef3c7f4dec501269" },
-  "lazy.nvim": { "branch": "main", "commit": "10d4371745f88837c78c8daab00c5be6e48abea4" },
-  "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "54d702020bf94e4eefd357f0b738317af30217eb" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
+  "kanagawa.nvim": { "branch": "master", "commit": "1749cea392acb7d1548a946fcee1e6f1304cd3cb" },
+  "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
+  "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
-  "mason.nvim": { "branch": "main", "commit": "4be1226f48bc2011024110f37b17f5ee468df58f" },
-  "melange-nvim": { "branch": "master", "commit": "f15922543dd70b360335effb61411c05c710b99c" },
+  "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" },
+  "melange-nvim": { "branch": "master", "commit": "e4958aa60ec6e1c5ecb487b9028da3a33e753b34" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "nightfly": { "branch": "master", "commit": "182e2c225b73a391aa46a5b89ed3fc484621fb95" },
-  "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" },
-  "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
-  "nvim": { "branch": "main", "commit": "ad6305594737e16155c41c176c611e865c26bb6d" },
-  "nvim-autopairs": { "branch": "master", "commit": "41803bdbf75569571f93fd4571f6c654635b1b46" },
-  "nvim-cmp": { "branch": "main", "commit": "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65" },
+  "nightfly": { "branch": "master", "commit": "903da3ef1e41c6c763c9f98de6f2f9dc193ca5e7" },
+  "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
+  "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
+  "nvim": { "branch": "main", "commit": "371430f32f2637d2dd5796399b3982d4cada61d8" },
+  "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
+  "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
-  "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" },
-  "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "fefba589c56a5568a089299e36a4c8242502faaa" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f873625d0636889af4cd47a01e486beb865db205" },
-  "nvim-treesitter": { "branch": "master", "commit": "5822a8c6886f0238a315b57e5e96acdd74d04448" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
+  "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" },
+  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3fe1e8de80b98c7a6b16f730711b5eafe84212e1" },
+  "nvim-startup.lua": { "branch": "main", "commit": "305b34f05173b9793a0e64c88696f52a2ae0d83e" },
+  "nvim-tree.lua": { "branch": "master", "commit": "904f95cd9db31d1800998fa428e78e418a50181d" },
+  "nvim-treesitter": { "branch": "master", "commit": "ae88851cac32415c8239a04b7ee44d8f7625e186" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
-  "oil.nvim": { "branch": "master", "commit": "f322209a4a2b4685adeda5df00b29cdfd64db08e" },
-  "onedark.nvim": { "branch": "master", "commit": "462b45758ea94ff30ad48979268094590a6b7b7e" },
+  "nvim-ufo": { "branch": "main", "commit": "5be5b800b4f3512bca128f345e9c98574b5637c0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" },
+  "obsidian.nvim": { "branch": "main", "commit": "8f1c896c4f084facddb235696a0dcc940411f3d5" },
+  "oil.nvim": { "branch": "master", "commit": "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a" },
+  "onedark.nvim": { "branch": "master", "commit": "09b71d84bd2524438e48c0aa5b54d855cc72af32" },
   "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
   "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
-  "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
+  "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
+  "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },
   "rainbow_csv": { "branch": "master", "commit": "7453a3f9679f0c753ec9d77f9ea8588778f35aeb" },
-  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
-  "tabnine-nvim": { "branch": "master", "commit": "0acbdc535ca31f5065fd215e746b64ddb814db25" },
+  "rest.nvim": { "branch": "main", "commit": "22673c848768ff25517154a5aebfebc0c77d0b4f" },
+  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
+  "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" },
   "tagbar": { "branch": "master", "commit": "be563539754b7af22bbe842ef217d4463f73468c" },
   "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" },
   "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" },
-  "telescope-frecency.nvim": { "branch": "master", "commit": "3ddaaa0a6084592eed451ded5fcd279e4a60c122" },
+  "telescope-frecency.nvim": { "branch": "master", "commit": "54de6e45b958e37a2eca4dca22572b6c08866177" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
   "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "00cf15074a2997487813672a75f946d2ead95eb0" },
-  "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
-  "toggleterm.nvim": { "branch": "main", "commit": "cf146a267a6a7db62b1e2aff40414b20081048a1" },
-  "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" },
-  "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
+  "telescope.nvim": { "branch": "master", "commit": "dc192faceb2db64231ead71539761e055df66d73" },
+  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
+  "toggleterm.nvim": { "branch": "main", "commit": "12cba0a1967b4f3f31903484dec72a6100dcf515" },
+  "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" },
+  "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
+  "veil.nvim": { "branch": "main", "commit": "ec18376953b401d784756a47df38a75ece40f3e9" },
   "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
   "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
   "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" },
-  "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
+  "vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" },
   "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" },
-  "vimwiki": { "branch": "dev", "commit": "cd9cfd299ef148721eaef532021c53da3d595710" },
-  "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" },
+  "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" },
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
   "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" }
 }
\ No newline at end of file
diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua
index dd08ecf..a429a73 100644
--- a/lua/plugins/dap.lua
+++ b/lua/plugins/dap.lua
@@ -1,6 +1,12 @@
 return {
-	{ "mfussenegger/nvim-dap", lazy = true },
-	{ "rcarriga/nvim-dap-ui", lazy = true },
-	{ "jayp0521/mason-nvim-dap.nvim", lazy = true },
+	{ "rcarriga/nvim-dap-ui", event = "VeryLazy", dependencies = "jayp0521/mason-nvim-dap.nvim" },
+	{
+		"jayp0521/mason-nvim-dap.nvim",
+		event = "VeryLazy",
+		dependencies = {
+			"williamboman/mason.nvim",
+			"mfussenegger/nvim-dap",
+		},
+	},
 	{ "ravenxrz/DAPInstall.nvim", lazy = true },
 }
diff --git a/lua/plugins/general.lua b/lua/plugins/general.lua
index 50d2c80..03c6cb8 100644
--- a/lua/plugins/general.lua
+++ b/lua/plugins/general.lua
@@ -7,14 +7,24 @@ return {
 	{ "nvim-tree/nvim-web-devicons", lazy = true },
 	{ "nvim-tree/nvim-tree.lua" },
 	{ "moll/vim-bbye" },
+
 	{ "nvim-lualine/lualine.nvim" },
+	{ "arkav/lualine-lsp-progress" },
+
 	{ "akinsho/toggleterm.nvim" },
 	{ "ahmedkhalf/project.nvim" },
 	{ "lewis6991/impatient.nvim" },
 	{ "lukas-reineke/indent-blankline.nvim" },
+
 	{ "goolord/alpha-nvim", lazy = true },
+	{ "willothy/veil.nvim", lazy = true },
+	{ "henriquehbr/nvim-startup.lua", lazy = true },
+
 	{ "andweeb/presence.nvim" },
+
 	{ "NvChad/nvim-colorizer.lua" },
+	{ "uga-rosa/ccc.nvim", lazy = true },
+
 	{ "alvan/vim-closetag" },
 	{ "tpope/vim-surround" },
 	{ "mbbill/undotree", lazy = true },
@@ -38,19 +48,27 @@ return {
 
 	-- Vimwiki
 	{ "vimwiki/vimwiki" },
+	{ "epwalsh/obsidian.nvim", lazy = true },
 
 	{ "stevearc/oil.nvim" },
 
-	-- C++
-	{ "p00f/clangd_extensions.nvim", lazy = true },
-	{ "Civitasv/cmake-tools.nvim", lazy = true },
-
-	-- Rust
-	{ "Saecki/crates.nvim", lazy = true },
-	{ "simrat39/rust-tools.nvim", lazy = true },
-
 	-- Git
 	{ "lewis6991/gitsigns.nvim" },
 
-	{ "codota/tabnine-nvim", build = "./dl_binaries.sh" },
+	{ "rest-nvim/rest.nvim", lazy = true },
+
+	{ "chipsenkbeil/distant.nvim", lazy = true },
+	{
+		"iamcco/markdown-preview.nvim",
+		build = function()
+			vim.fn["mkdp#util#install"]()
+		end,
+	},
+
+	{
+		"kevinhwang91/nvim-ufo",
+		dependencies = {
+			"kevinhwang91/promise-async",
+		},
+	},
 }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 7480754..9619fec 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -2,7 +2,18 @@ return {
 	"williamboman/mason.nvim",
 	"williamboman/mason-lspconfig.nvim",
 	"neovim/nvim-lspconfig", -- enable LSP
-	"jose-elias-alvarez/null-ls.nvim", -- for formatters and linters
+	{ "jose-elias-alvarez/null-ls.nvim", event = "VeryLazy" }, -- for formatters and linters
 	"jayp0521/mason-null-ls.nvim",
 	"RRethy/vim-illuminate",
+	{ "nanotee/sqls.nvim", lazy = true },
+
+	-- C++
+	{ "p00f/clangd_extensions.nvim", lazy = true },
+	{ "Civitasv/cmake-tools.nvim", lazy = true },
+
+	-- Rust
+	{ "Saecki/crates.nvim", lazy = true },
+	{ "simrat39/rust-tools.nvim", lazy = true },
+
+	-- { "codota/tabnine-nvim", event = "VeryLazy", build = "./dl_binaries.sh" },
 }
diff --git a/lua/plugins/snip.lua b/lua/plugins/snip.lua
index d745cb1..79e8bf2 100644
--- a/lua/plugins/snip.lua
+++ b/lua/plugins/snip.lua
@@ -6,4 +6,5 @@ return {
 			"rafamadriz/friendly-snippets", -- a bunch of snippets to use
 		},
 	}, --snippet engine
+	-- { "codota/tabnine-nvim", build = "./dl_binaries.sh" },
 }
diff --git a/lua/solo/autocommands.lua b/lua/solo/autocommands.lua
index b09eb13..683239a 100644
--- a/lua/solo/autocommands.lua
+++ b/lua/solo/autocommands.lua
@@ -68,7 +68,7 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
 
 -- Set tab size for the following file types to 2
 vim.api.nvim_create_autocmd({ "FileType" }, {
-	pattern = { "vimwiki", "java", "sql" },
+	pattern = { "vimwiki", "sql" },
 	callback = function()
 		vim.opt_local.ts = 2
 		vim.opt_local.sw = 2
@@ -103,19 +103,3 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
 		require("lazy").sync()
 	end,
 })
-
--- vim.api.nvim_create_autocmd({ "BufWinLeave" }, {
--- 	group = vim.api.nvim_create_augroup("AutoSaveFold", { clear = true }),
--- 	pattern = { "*.*" },
--- 	callback = function()
--- 		vim.cmd.mkview()
--- 	end,
--- })
---
--- vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
--- 	group = vim.api.nvim_create_augroup("LoadFold", { clear = true }),
--- 	pattern = { "*.*" },
--- 	callback = function()
--- 		vim.cmd.loadview()
--- 	end,
--- })
diff --git a/lua/solo/mason/mason-installer.lua b/lua/solo/mason/mason-installer.lua
index a374e31..f57dd42 100644
--- a/lua/solo/mason/mason-installer.lua
+++ b/lua/solo/mason/mason-installer.lua
@@ -29,6 +29,7 @@ local servers = {
 	"taplo",
 	"texlab",
 	"tsserver",
+	"tailwindcss",
 }
 
 mason.setup()
diff --git a/lua/solo/mason/null-ls.lua b/lua/solo/mason/null-ls.lua
index d4895f0..8046ced 100644
--- a/lua/solo/mason/null-ls.lua
+++ b/lua/solo/mason/null-ls.lua
@@ -9,28 +9,7 @@ if not mason_null_ls_status_ok then
 end
 
 mason_null_ls.setup({
-	ensure_installed = {
-		"autopep8",
-		"beautysh",
-		"clang_format",
-		"codespell",
-		"cpplint",
-		"djlint",
-		"gitlint",
-		"html_lint",
-		"isort",
-		"luacheck",
-		"misspell",
-		"mypy",
-		"phpcbf",
-		"phpcs",
-		"prettier",
-		"rustfmt",
-		"sql-formatter",
-		"shfmt",
-		"yamlfmt",
-		"cmakelang",
-	},
+	ensure_installed = {},
 	automatic_installation = true,
 	automatic_setup = true,
 })
@@ -43,24 +22,20 @@ local diagnostics = null_ls.builtins.diagnostics
 null_ls.setup({
 	debug = false,
 	sources = {
+		diagnostics.cmake_lint,
 		diagnostics.codespell,
 		diagnostics.cpplint,
-		diagnostics.luacheck.with({
-			extra_args = {
-				"--globals",
-				"vim",
-			},
-		}),
+		diagnostics.luacheck.with({ extra_args = { "--globals", "vim" } }),
 		diagnostics.misspell,
 		diagnostics.mypy,
-		diagnostics.cmake_lint,
-		formatting.cmake_format,
-		formatting.autopep8,
 		formatting.beautysh,
+		formatting.black,
+		formatting.cbfmt.with({ extra_filetypes = { "vimwiki" } }),
 		formatting.clang_format,
+		formatting.cmake_format,
 		formatting.djlint,
 		formatting.google_java_format,
-		formatting.isort,
+		formatting.phpcbf,
 		formatting.prettier.with({
 			extra_filetypes = { "toml" },
 			extra_args = {
@@ -74,25 +49,12 @@ null_ls.setup({
 				"strict",
 			},
 		}),
-		formatting.phpcbf,
-		formatting.rustfmt,
-		formatting.shfmt.with({
-			extra_filetypes = {
-				"bash",
-				"csh",
-				"ksh",
-				"sh",
-				"zsh",
-			},
-		}),
-		-- formatting.sql_formatter.with({
-		-- 	extra_args = {
-		-- 		"-c",
-		-- 		"/home/kristofers/.config/sql/sql-formatter.json",
-		-- 	},
-		-- }),
+		formatting.remark.with({ extra_filetypes = { "vimwiki" } }),
+		formatting.markdown_toc.with({ extra_filetypes = { "vimwiki" } }),
+		formatting.shellharden.with({ extra_filetypes = { "bash", "csh", "ksh", "zsh" } }),
+		formatting.shfmt.with({ extra_filetypes = { "bash", "csh", "ksh", "zsh" } }),
 		formatting.stylua,
+		formatting.usort,
 		formatting.yamlfmt,
-		formatting.black,
 	},
 })