diff --git a/lua/base.lua b/lua/base.lua
index 58ee37c..d1797e0 100644
--- a/lua/base.lua
+++ b/lua/base.lua
@@ -126,7 +126,7 @@ opt.mouse = ""
 vim.cmd([[hi CursorLine cterm=NONE ctermbg=darkgray ctermfg=white]])
 vim.cmd([[au BufRead,BufNewFile .env.* set filetype=sh]])
 vim.cmd([[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]])
---vim.cmd([[au BufRead,BufNewFile *.html set filetype=html]])
+vim.cmd([[au BufRead,BufNewFile *.html set filetype=html]])
 
 -- redo folds on write
 vim.cmd([[au BufWrite * normal zx]])
diff --git a/lua/plugins/config.lua b/lua/plugins/config.lua
index a0da574..c18ab03 100644
--- a/lua/plugins/config.lua
+++ b/lua/plugins/config.lua
@@ -3,472 +3,497 @@ local map = helpers.map
 local lsp_config_defaults = helpers.lsp_config_defaults
 
 local function nmap(...)
-    map("n", ...)
+	map("n", ...)
 end
 
 local M = {}
 
 function M.hop()
-    require("hop").setup({ keys = "etovxqpdygfblzhckisuran" })
+	require("hop").setup({ keys = "etovxqpdygfblzhckisuran" })
 
-    local hop_opts = "{ create_hl_autocmd = true }"
-    local hopword = [[<cmd>lua require'hop'.hint_words(]] .. hop_opts .. [[)<cr>]]
-    local hopline = [[<cmd>lua require'hop'.hint_lines_skip_whitespace(]] .. hop_opts .. [[)<cr>]]
+	local hop_opts = "{ create_hl_autocmd = true }"
+	local hopword = [[<cmd>lua require'hop'.hint_words(]] .. hop_opts .. [[)<cr>]]
+	local hopline = [[<cmd>lua require'hop'.hint_lines_skip_whitespace(]] .. hop_opts .. [[)<cr>]]
 
-    map("n", "W", hopline, { silent = true })
-    map("v", "W", hopline, { silent = true })
-    map("n", "w", hopword, { silent = true })
-    map("v", "w", hopword, { silent = true })
+	map("n", "W", hopline, { silent = true })
+	map("v", "W", hopline, { silent = true })
+	map("n", "w", hopword, { silent = true })
+	map("v", "w", hopword, { silent = true })
 end
 
 function M.onedark()
-    require("onedark").setup({
-        style = "darker",
-        toggle_style_key = "<nop>",
-    })
-    require("onedark").load()
+	require("onedark").setup({
+		style = "darker",
+		toggle_style_key = "<nop>",
+	})
+	require("onedark").load()
 end
 
 function M.fzf()
-    map("n", "<Leader>o", ":Files<CR>")
-    map("n", "<Leader>O", ":Files ~/<CR>")
-    map("n", "<Leader>p", ":Buffers<CR>")
-    map("n", "<Leader>h", ":Helptags<CR>")
-    map("n", "<Leader>;", ":History:<CR>")
-    map("n", "<Leader>c", ":Commands<CR>")
-    map("n", "<Leader>r", ":Rg <C-R><C-W><CR>")
-    map("n", "<Leader>R", ":Rg<CR>")
-    map("n", "<Leader>s", ":BLines<CR>")
-    map("n", "<Leader>gl", ":GFiles<CR>")
-    map("n", "<Leader>gs", ":GFiles?<CR>")
-    map("n", "<Leader>gc", ":Commits<CR>")
-    map("n", "<Leader>l", ":lua require('fzf_funcs').cwd()<CR>")
+	map("n", "<Leader>o", ":Files<CR>")
+	map("n", "<Leader>O", ":Files ~/<CR>")
+	map("n", "<Leader>p", ":Buffers<CR>")
+	map("n", "<Leader>h", ":Helptags<CR>")
+	map("n", "<Leader>;", ":History:<CR>")
+	map("n", "<Leader>c", ":Commands<CR>")
+	map("n", "<Leader>r", ":Rg <C-R><C-W><CR>")
+	map("n", "<Leader>R", ":Rg<CR>")
+	map("n", "<Leader>s", ":BLines<CR>")
+	map("n", "<Leader>gl", ":GFiles<CR>")
+	map("n", "<Leader>gs", ":GFiles?<CR>")
+	map("n", "<Leader>gc", ":Commits<CR>")
+	map("n", "<Leader>l", ":lua require('fzf_funcs').cwd()<CR>")
 end
 
 function M.fzf_checkout()
-    map("n", "<Leader>gb", ":GBranches<CR>")
+	map("n", "<Leader>gb", ":GBranches<CR>")
 end
 
 function M.rnvimr()
-    map("n", "<Leader>f", [[:RnvimrToggle<CR>]])
+	map("n", "<Leader>f", [[:RnvimrToggle<CR>]])
 end
 
 function M.nvim_fzf()
-    require("fzf").default_options = {
-        fzf_cli_args = " --height 100% --preview='[[ -n \"$(command -v bat)\" ]] && bat --color=always --style=header,grid --line-range :300 {} || strings {+}' ",
-    }
+	require("fzf").default_options = {
+		fzf_cli_args = " --height 100% --preview='[[ -n \"$(command -v bat)\" ]] && bat --color=always --style=header,grid --line-range :300 {} || strings {+}' ",
+	}
 end
 
 function M.harpoon()
-    require("harpoon").setup({
-        global_settings = {
-            save_on_toggle = false,
-            save_on_change = true,
-            enter_on_sendcmd = false,
-            tmux_autoclose_windows = false,
-            excluded_filetypes = { "harpoon" },
-        },
-    })
-    nmap("<Leader>a", ":lua require('harpoon.mark').add_file()<CR>")
-    nmap("<Leader>m", ":lua require('harpoon.ui').toggle_quick_menu()<CR>")
+	require("harpoon").setup({
+		global_settings = {
+			save_on_toggle = false,
+			save_on_change = true,
+			enter_on_sendcmd = false,
+			tmux_autoclose_windows = false,
+			excluded_filetypes = { "harpoon" },
+		},
+	})
+	nmap("<Leader>a", ":lua require('harpoon.mark').add_file()<CR>")
+	nmap("<Leader>m", ":lua require('harpoon.ui').toggle_quick_menu()<CR>")
 end
 
 function M.auto_session()
-    require("auto-session").setup({
-        log_level = "info",
-        auto_session_suppress_dirs = { "~/", "~/Projects" },
-        auto_session_use_git_branch = true,
-    })
+	require("auto-session").setup({
+		log_level = "info",
+		auto_session_suppress_dirs = { "~/", "~/Projects" },
+		auto_session_use_git_branch = true,
+	})
 end
 
 function M.indent_blankline()
-    vim.opt.list = true
+	vim.opt.list = true
 
-    require("indent_blankline").setup({
-        space_char_blankline = " ",
-        show_current_context = true,
-        show_current_context_start = true,
-    })
+	require("indent_blankline").setup({
+		space_char_blankline = " ",
+		show_current_context = true,
+		show_current_context_start = true,
+	})
 end
 
 function M.lualine()
-    -- Out of 6 total columns
-    local function columns(num)
-        return vim.o.columns * num / 6
-    end
+	-- Out of 6 total columns
+	local function columns(num)
+		return vim.o.columns * num / 6
+	end
 
-    -- config options
-    local function buffer_window(type, cond)
-        return {
-            type,
-            cond = cond,
-            show_filename_only = true,
-            show_modified_status = true,
-            max_length = function()
-                return columns(5)
-            end,
-            filetype_names = {
-                TelescopePrompt = "Telescope",
-                dashboard = "Dashboard",
-                packer = "Packer",
-                fzf = "FZF",
-                alpha = "Alpha",
-                ["lsp-installer"] = "LSP Installer",
-            },
-        }
-    end
+	-- config options
+	local function buffer_window(type, cond)
+		return {
+			type,
+			cond = cond,
+			show_filename_only = true,
+			show_modified_status = true,
+			max_length = function()
+				return columns(5)
+			end,
+			filetype_names = {
+				TelescopePrompt = "Telescope",
+				dashboard = "Dashboard",
+				packer = "Packer",
+				fzf = "FZF",
+				alpha = "Alpha",
+				["lsp-installer"] = "LSP Installer",
+			},
+		}
+	end
 
-    require("lualine").setup({
-        --options = { theme = "onedark", icons_enabled = true },
-        options = { theme = "tokyonight", icons_enabled = true },
-        sections = {
-            lualine_a = { "mode" },
-            lualine_b = {
-                "FugitiveHead",
-            },
-            lualine_c = { "filename" },
-            lualine_x = {
-                "encoding",
-                "fileformat",
-                "filetype",
-                [[string.format("%d Lines", vim.fn.line('$'))]],
-                {
-                    "diagnostics",
-                    sources = { "nvim_diagnostic", "ale" },
-                },
-            },
-            lualine_y = {
-                "progress",
-            },
-            lualine_z = { "location" },
-        },
-        inactive_sections = {
-            lualine_a = {},
-            lualine_b = {},
-            lualine_c = { "filename" },
-            lualine_x = { "location" },
-            lualine_y = {},
-            lualine_z = {},
-        },
-        tabline = {
-            lualine_a = {
-                {
-                    "tabs",
-                    max_length = function()
-                        return columns(1)
-                    end,
-                },
-            },
-            lualine_b = {
-                buffer_window("windows", function()
-                    return require("dynamic_tab").window_mode()
-                end),
-                buffer_window("buffers", function()
-                    return not require("dynamic_tab").window_mode()
-                end),
-            },
-            lualine_c = {},
-            lualine_x = {},
-            lualine_y = {},
-            lualine_z = {},
-        },
-        extensions = {},
-    })
+	require("lualine").setup({
+		--options = { theme = "onedark", icons_enabled = true },
+		options = { theme = "tokyonight", icons_enabled = true },
+		sections = {
+			lualine_a = { "mode" },
+			lualine_b = {
+				"FugitiveHead",
+			},
+			lualine_c = { "filename" },
+			lualine_x = {
+				"encoding",
+				"fileformat",
+				"filetype",
+				[[string.format("%d Lines", vim.fn.line('$'))]],
+				{
+					"diagnostics",
+					sources = { "nvim_diagnostic", "ale" },
+				},
+			},
+			lualine_y = {
+				"progress",
+			},
+			lualine_z = { "location" },
+		},
+		inactive_sections = {
+			lualine_a = {},
+			lualine_b = {},
+			lualine_c = { "filename" },
+			lualine_x = { "location" },
+			lualine_y = {},
+			lualine_z = {},
+		},
+		tabline = {
+			lualine_a = {
+				{
+					"tabs",
+					max_length = function()
+						return columns(1)
+					end,
+				},
+			},
+			lualine_b = {
+				buffer_window("windows", function()
+					return require("dynamic_tab").window_mode()
+				end),
+				buffer_window("buffers", function()
+					return not require("dynamic_tab").window_mode()
+				end),
+			},
+			lualine_c = {},
+			lualine_x = {},
+			lualine_y = {},
+			lualine_z = {},
+		},
+		extensions = {},
+	})
 end
 
 function M.nvim_treesitter()
-    local highlight_disable = {
-        --typescript = true,
-        --javascript = true,
-        tsx = true,
-        cpp = true,
-    }
-    local rainbow_disable = vim.tbl_extend("force", highlight_disable, {
-        svelte = true,
-        html = true,
-        query = true,
-    })
+	local highlight_disable = {
+		--typescript = true,
+		--javascript = true,
+		tsx = true,
+		cpp = true,
+	}
+	local rainbow_disable = vim.tbl_extend("force", highlight_disable, {
+		svelte = true,
+		html = true,
+		query = true,
+	})
 
-    local too_many_lines = function(bufnr)
-        return vim.api.nvim_buf_line_count(bufnr) > 5000
-    end
+	local too_many_lines = function(bufnr)
+		return vim.api.nvim_buf_line_count(bufnr) > 5000
+	end
 
-    require("nvim-treesitter.configs").setup({
-        ensure_installed = {
-            "python",
-            --"htmldjango",
-            "lua",
-            "javascript",
-            "typescript",
-            "tsx",
-            "json",
-            "svelte",
-            "zig",
-            "vim",
-            "css",
-            "scheme",
-        },
-        highlight = {
-            enable = true,
-            disable = function(lang, bufnr)
-                return highlight_disable[lang] or too_many_lines(bufnr)
-            end,
-            additional_vim_regex_highlighting = { "htmldjango" },
-        },
-        rainbow = {
-            enable = true,
-            disable = function(lang, bufnr)
-                return rainbow_disable[lang] or too_many_lines(bufnr)
-            end,
-            extended_mode = false,
-            max_file_lines = nil,
-        },
-        indent = {
-            enable = false,
-        },
-    })
+	require("nvim-treesitter.configs").setup({
+		ensure_installed = {
+			"python",
+			--"htmldjango",
+			"lua",
+			"javascript",
+			"typescript",
+			"tsx",
+			"json",
+			"svelte",
+			"zig",
+			"vim",
+			"css",
+			"scheme",
+		},
+		highlight = {
+			enable = true,
+			disable = function(lang, bufnr)
+				return highlight_disable[lang] or too_many_lines(bufnr)
+			end,
+			--additional_vim_regex_highlighting = { "htmldjango", "html" },
+		},
+		rainbow = {
+			enable = true,
+			disable = function(lang, bufnr)
+				return rainbow_disable[lang] or too_many_lines(bufnr)
+			end,
+			extended_mode = false,
+			max_file_lines = nil,
+		},
+		indent = {
+			enable = true,
+		},
+	})
 
-    local version = vim.version()
-    if version.api_level ~= 9 then
-        vim.opt.foldmethod = "expr"
-        vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-    end
+	local version = vim.version()
+	if version.api_level ~= 9 then
+		vim.opt.foldmethod = "expr"
+		vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+	end
 
-    local htmldjango_path = "/home/guy/code/treesitter/tree-sitter-htmldjango-myown"
+	local htmldjango_path = "/home/guy/code/treesitter/tree-sitter-htmldjango-myown"
 
-    if vim.fn.filereadable(htmldjango_path .. "/src/parser.c") then
-        local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-        parser_config.htmldjango = {
-            install_info = {
-                url = htmldjango_path, -- local path or git repo
-                files = { "src/parser.c" },
-                -- optional entries:
-                --branch = "paired-tags", -- default branch in case of git repo if different from master
-                --generate_requires_npm = false, -- if stand-alone parser without npm dependencies
-                requires_generate_from_grammar = true, -- if folder contains pre-generated src/parser.c
-            },
-            filetype = "html", -- if filetype does not match the parser name
-        }
-    end
+	if vim.fn.filereadable(htmldjango_path .. "/src/parser.c") then
+		local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+		parser_config.htmldjango = {
+			install_info = {
+				url = htmldjango_path,
+				files = { "src/parser.c" },
+				requires_generate_from_grammar = true,
+			},
+			filetype = "html",
+		}
+
+		local ft_to_parser = require("nvim-treesitter.parsers").filetype_to_parsername
+		ft_to_parser.html = "htmldjango"
+	end
 end
 
 function M.nvim_lspconfig()
-    vim.diagnostic.config({
-        virtual_text = true,
-        signs = true,
-        update_in_insert = false,
-    })
+	vim.diagnostic.config({
+		virtual_text = true,
+		signs = true,
+		update_in_insert = false,
+	})
+	local lspconfig = require("lspconfig")
+
+	lspconfig.tailwindcss.setup({
+		init_options = {
+			userLanguages = {
+				htmldjango = "html",
+			},
+		},
+	})
 end
 
 function M.nvim_lsp_installer()
-    local config = lsp_config_defaults()
-    local on_attach_tsserver = function(client, bufnr)
-        local ts_utils = require("nvim-lsp-ts-utils")
-        ts_utils.setup({
-            eslint_bin = "eslint_d",
-            eslint_enable_diagnostics = true,
-            eslint_enable_code_actions = true,
-            enable_import_on_completion = true,
-            filter_out_diagnostics_by_severity = {
-                "information",
-                "hint",
-                --"warning",
-                --"error",
-            },
-        })
-        ts_utils.setup_client(client)
+	local config = lsp_config_defaults()
+	local on_attach_tsserver = function(client, bufnr)
+		local ts_utils = require("nvim-lsp-ts-utils")
+		ts_utils.setup({
+			eslint_bin = "eslint_d",
+			eslint_enable_diagnostics = true,
+			eslint_enable_code_actions = true,
+			enable_import_on_completion = true,
+			filter_out_diagnostics_by_severity = {
+				"information",
+				"hint",
+				--"warning",
+				--"error",
+			},
+		})
+		ts_utils.setup_client(client)
 
-        -- no default maps, so you may want to define some here
-        local o = { silent = true }
-        vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", o)
-        vim.api.nvim_buf_set_keymap(bufnr, "n", "rN", ":TSLspRenameFile<CR>", o)
-        vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", ":TSLspImportAll<CR>", o)
-    end
+		-- no default maps, so you may want to define some here
+		local o = { silent = true }
+		vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", o)
+		vim.api.nvim_buf_set_keymap(bufnr, "n", "rN", ":TSLspRenameFile<CR>", o)
+		vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", ":TSLspImportAll<CR>", o)
+	end
 
-    require("nvim-lsp-installer").on_server_ready(function(server)
-        --Enable (broadcasting) snippet capability for completion
-        local capabilities = vim.lsp.protocol.make_client_capabilities()
-        capabilities.textDocument.completion.completionItem.snippetSupport = true
+	require("nvim-lsp-installer").on_server_ready(function(server)
+		--Enable (broadcasting) snippet capability for completion
+		local capabilities = vim.lsp.protocol.make_client_capabilities()
+		capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-        local disable_diag = {
-            ["textDocument/publishDiagnostics"] = function() end,
-        }
+		local disable_diag = {
+			["textDocument/publishDiagnostics"] = function() end,
+		}
 
-        local on_attach_generic = function(client, bufnr)
-            -- Disables document formatting by lsp
-            client.server_capabilities.document_formatting = false
-            client.server_capabilities.document_range_formatting = false
+		local on_attach_generic = function(client, bufnr)
+			-- Disables document formatting by lsp
+			client.server_capabilities.document_formatting = false
+			client.server_capabilities.document_range_formatting = false
 
-            config.on_attach(client, bufnr)
-        end
+			config.on_attach(client, bufnr)
+		end
 
-        local opts = {
-            on_attach = on_attach_generic,
-            capabilities = capabilities,
-            flags = {
-                debounce_text_changes = 150,
-            },
-            settings = {
-                format = { enable = true },
-            },
-            root_dir = config.root_dir,
-        }
+		local opts = {
+			on_attach = on_attach_generic,
+			capabilities = capabilities,
+			flags = {
+				debounce_text_changes = 150,
+			},
+			settings = {
+				format = { enable = true },
+			},
+			root_dir = config.root_dir,
+		}
 
-        if server.name == "tsserver" then
-            opts.on_attach = function(...)
-                on_attach_tsserver(...)
-                on_attach_generic(...)
-            end
-        elseif server.name == "sumneko_lua" then
-            opts.settings.Lua = {
-                diagnostics = {
-                    globals = {
-                        "vim",
-                        "awesome",
-                        "client",
-                    },
-                },
-            }
-        elseif server.name == "html" then
-            opts.filetypes = { "html", "htmldjango" }
-        elseif server.name == "tailwindcss" then
-            opts.init_options = {
-                userLanguages = {
-                    htmldjango = "html",
-                },
-            }
-        elseif server.name == "ccls" then
-            opts.capabilities.offsetEncoding = { "utf-32" }
-        end
+		if server.name == "tsserver" then
+			opts.on_attach = function(...)
+				on_attach_tsserver(...)
+				on_attach_generic(...)
+			end
+		elseif server.name == "sumneko_lua" then
+			opts.settings.Lua = {
+				diagnostics = {
+					globals = {
+						"vim",
+						"awesome",
+						"client",
+					},
+				},
+			}
+		elseif server.name == "html" then
+			opts.filetypes = { "html", "htmldjango" }
+		elseif server.name == "tailwindcss" then
+			opts.init_options = {
+				userLanguages = {
+					htmldjango = "html",
+				},
+			}
+		elseif server.name == "ccls" then
+			opts.capabilities.offsetEncoding = { "utf-32" }
+		end
 
-        server:setup(opts)
-        vim.cmd([[do User LspAttachBuffers]])
-    end)
+		server:setup(opts)
+		vim.cmd([[do User LspAttachBuffers]])
+	end)
 
-    local lsp_installer_servers = require("nvim-lsp-installer.servers")
-    local auto_servers = {
-        "sumneko_lua",
-        "tsserver",
-        "bashls",
-        "vimls",
-        "rust_analyzer",
-        "html",
-        "cssls",
-        "jsonls",
-        "jedi_language_server",
-        --"pylsp",
-        "svelte",
-        "tailwindcss",
-        "zls",
-        "emmet_ls",
-    }
+	local lsp_installer_servers = require("nvim-lsp-installer.servers")
+	local auto_servers = {
+		"sumneko_lua",
+		"tsserver",
+		"bashls",
+		"vimls",
+		"rust_analyzer",
+		"html",
+		"cssls",
+		"jsonls",
+		"jedi_language_server",
+		--"pylsp",
+		"svelte",
+		"tailwindcss",
+		"zls",
+		"emmet_ls",
+	}
 
-    for _, s in ipairs(auto_servers) do
-        local ok, server = lsp_installer_servers.get_server(s)
-        if ok and not server:is_installed() then
-            server:install()
-        end
-    end
+	for _, s in ipairs(auto_servers) do
+		local ok, server = lsp_installer_servers.get_server(s)
+		if ok and not server:is_installed() then
+			server:install()
+		end
+	end
 end
 
 function M.null_ls()
-    local null_ls = require("null-ls")
-    local config = lsp_config_defaults()
+	local null_ls = require("null-ls")
+	local config = lsp_config_defaults()
 
-    -- ORDER IN TABLE DETERMINES EXECUTION ORDER
-    local sources = {
-        -- python
-        --null_ls.builtins.diagnostics.flake8,
-        null_ls.builtins.diagnostics.mypy,
-        null_ls.builtins.diagnostics.ruff,
-        null_ls.builtins.formatting.black,
-        null_ls.builtins.formatting.ruff,
-        --null_ls.builtins.formatting.isort,
-        --null_ls.builtins.diagnostics.djlint,
+	-- ORDER IN TABLE DETERMINES EXECUTION ORDER
+	local sources = {
+		-- python
+		null_ls.builtins.diagnostics.mypy,
+		null_ls.builtins.diagnostics.ruff,
+		null_ls.builtins.formatting.black,
+		null_ls.builtins.formatting.ruff.with({
+			extra_args = { "--extend-select", "I001", "--unfixable", "F841,F842,F401" },
+		}),
+		--null_ls.builtins.formatting.isort,
+		--null_ls.builtins.diagnostics.flake8,
+		--null_ls.builtins.diagnostics.djlint,
 
-        -- js
-        null_ls.builtins.diagnostics.eslint,
-        null_ls.builtins.code_actions.eslint,
-        null_ls.builtins.formatting.prettier.with({
-            extra_filetypes = { "svelte" },
-        }),
-        -- lua
-        null_ls.builtins.formatting.stylua,
-        -- bash
-        null_ls.builtins.formatting.shfmt,
-        null_ls.builtins.diagnostics.shellcheck,
-        null_ls.builtins.code_actions.shellcheck,
-        -- cpp
-        null_ls.builtins.formatting.clang_format,
-    }
-    null_ls.setup({
-        sources = sources,
-        on_attach = config.on_attach,
-        root_dir = config.root_dir,
-        -- removed error "warning: multiple different client offset_encodings detected for buffer, this is not supported yet"
-        --on_init = function(client, _)
-        --    client.offset_encoding = "utf-32"
-        --end,
-    })
+		-- js
+		null_ls.builtins.diagnostics.eslint,
+		null_ls.builtins.code_actions.eslint,
+		null_ls.builtins.formatting.prettier.with({
+			extra_filetypes = { "svelte" },
+		}),
+
+		-- lua
+		null_ls.builtins.formatting.stylua,
+
+		-- bash
+		null_ls.builtins.formatting.shfmt,
+		null_ls.builtins.diagnostics.shellcheck,
+		null_ls.builtins.code_actions.shellcheck,
+
+		-- cpp
+		null_ls.builtins.formatting.clang_format,
+	}
+	null_ls.setup({
+		sources = sources,
+		on_attach = config.on_attach,
+		root_dir = config.root_dir,
+	})
 end
 
 function M.nvim_autopairs()
-    require("nvim-autopairs").setup({ check_ts = true })
+	require("nvim-autopairs").setup({ check_ts = false, enable_moveright = false })
 end
 
 function M.nvim_cmp()
-    vim.opt.completeopt = "menuone,noselect"
+	vim.opt.completeopt = "menuone,noselect"
 
-    local cmp_autopairs = require("nvim-autopairs.completion.cmp")
-    local cmp = require("cmp")
+	local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+	local cmp = require("cmp")
 
-    -- CMP NVIM ULTISNIP
-    local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
-    local ultisnip = {
-        expand = function(args)
-            vim.fn["UltiSnips#Anon"](args.body)
-        end,
-        tab = cmp.mapping(function(fallback)
-            cmp_ultisnips_mappings.compose({ "select_next_item" })(fallback)
-        end, { "i", "s" }),
-        shift_tab = cmp.mapping(function(fallback)
-            cmp_ultisnips_mappings.compose({ "select_prev_item" })(fallback)
-        end, { "i", "s" }),
-    }
+	-- CMP NVIM ULTISNIP
+	local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
+	local ultisnip = {
+		expand = function(args)
+			vim.fn["UltiSnips#Anon"](args.body)
+		end,
+		tab = cmp.mapping(function(fallback)
+			cmp_ultisnips_mappings.compose({ "select_next_item" })(fallback)
+		end, { "i", "s" }),
+		shift_tab = cmp.mapping(function(fallback)
+			cmp_ultisnips_mappings.compose({ "select_prev_item" })(fallback)
+		end, { "i", "s" }),
+	}
 
-    cmp.setup({
-        snippet = {
-            expand = ultisnip.expand,
-        },
-        mapping = {
-            ["<C-p>"] = cmp.mapping.select_prev_item(),
-            ["<C-n>"] = cmp.mapping.select_next_item(),
-            ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-            ["<C-f>"] = cmp.mapping.scroll_docs(4),
-            ["<C-Space>"] = cmp.mapping.complete(),
-            ["<C-e>"] = cmp.mapping.close(),
-            ["<CR>"] = cmp.mapping.confirm({
-                select = true,
-            }),
-            ["<Tab>"] = ultisnip.tab,
-            ["<S-Tab>"] = ultisnip.shift_tab,
-        },
-        sources = {
-            { name = "nvim_lsp" },
-            { name = "ultisnips" },
-        },
-    })
+	cmp.setup({
+		snippet = {
+			expand = ultisnip.expand,
+		},
+		mapping = {
+			["<C-p>"] = cmp.mapping.select_prev_item(),
+			["<C-n>"] = cmp.mapping.select_next_item(),
+			["<C-d>"] = cmp.mapping.scroll_docs(-4),
+			["<C-f>"] = cmp.mapping.scroll_docs(4),
+			["<C-Space>"] = cmp.mapping.complete(),
+			["<C-e>"] = cmp.mapping.close(),
+			["<CR>"] = cmp.mapping.confirm({
+				select = true,
+			}),
+			["<Tab>"] = ultisnip.tab,
+			["<S-Tab>"] = ultisnip.shift_tab,
+		},
+		sources = {
+			{ name = "nvim_lsp" },
+			{ name = "ultisnips" },
+		},
+	})
 
-    cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
+	cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
 end
 
 function M.tokyonight()
-    require("tokyonight").setup()
-    vim.cmd([[colorscheme tokyonight-night]])
+	require("tokyonight").setup()
+	vim.cmd([[colorscheme tokyonight-night]])
 end
 
 function M.gitsigns()
-    require("gitsigns").setup()
+	require("gitsigns").setup()
+end
+
+function M.lsp_zero()
+	--
+	-- https://github.com/VonHeikemen/lsp-zero.nvim
+	--
+	-- Learn the keybindings, see :help lsp-zero-keybindings
+	-- Learn to configure LSP servers, see :help lsp-zero-api-showcase
+	local lsp = require("lsp-zero")
+	lsp.preset("recommended")
+
+	-- (Optional) Configure lua language server for neovim
+	lsp.nvim_workspace()
+
+	lsp.setup()
 end
 
 return M
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index fc37488..4f986dc 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -10,14 +10,15 @@ config.harpoon()
 config.hop()
 config.indent_blankline()
 config.lualine()
-config.null_ls()
 config.nvim_autopairs()
-config.nvim_cmp()
+--config.nvim_cmp()
 config.nvim_fzf()
-config.nvim_lsp_installer()
-config.nvim_lspconfig()
+--config.nvim_lsp_installer()
 config.nvim_treesitter()
 --config.onedark()
 config.rnvimr()
 config.tokyonight()
 config.gitsigns()
+--config.nvim_lspconfig()
+config.lsp_zero()
+config.null_ls()
diff --git a/lua/plugins/startup.lua b/lua/plugins/startup.lua
index a1c724a..924d163 100644
--- a/lua/plugins/startup.lua
+++ b/lua/plugins/startup.lua
@@ -17,6 +17,7 @@ require("packer").startup(function(use)
 
     -- SESSION
     use("ThePrimeagen/harpoon")
+    use("nvim-lua/plenary.nvim")
     use("rmagatti/auto-session")
     use("mbbill/undotree")
 
@@ -33,8 +34,8 @@ require("packer").startup(function(use)
     })
 
     -- SNIPPETS
-    use("SirVer/ultisnips")
-    use("honza/vim-snippets")
+    --use("SirVer/ultisnips")
+    --use("honza/vim-snippets")
     --use("L3MON4D3/LuaSnip") -- Snippets plugin
 
     -- LSP
@@ -45,17 +46,40 @@ require("packer").startup(function(use)
     })
     use("nvim-treesitter/nvim-treesitter-context")
     use("nvim-treesitter/playground")
-    use("neovim/nvim-lspconfig")
-    use("williamboman/nvim-lsp-installer")
-    use("nvim-lua/plenary.nvim")
-    use("jose-elias-alvarez/nvim-lsp-ts-utils")
     use("jose-elias-alvarez/null-ls.nvim")
     use("windwp/nvim-autopairs")
+
+    --use("neovim/nvim-lspconfig")
+    --use("williamboman/nvim-lsp-installer")
+    --use("jose-elias-alvarez/nvim-lsp-ts-utils")
+    --use({
+    --    "hrsh7th/cmp-nvim-lsp",
+    --    requires = "quangnguyen30192/cmp-nvim-ultisnips",
+    --})
+    --use("hrsh7th/nvim-cmp")
+
     use({
-        "hrsh7th/cmp-nvim-lsp",
-        requires = "quangnguyen30192/cmp-nvim-ultisnips",
+        "VonHeikemen/lsp-zero.nvim",
+        branch = "v1.x",
+        requires = {
+            -- LSP Support
+            { "neovim/nvim-lspconfig" }, -- Required
+            { "williamboman/mason.nvim" }, -- Optional
+            { "williamboman/mason-lspconfig.nvim" }, -- Optional
+
+            -- Autocompletion
+            { "hrsh7th/nvim-cmp" }, -- Required
+            { "hrsh7th/cmp-nvim-lsp" }, -- Required
+            { "hrsh7th/cmp-buffer" }, -- Optional
+            { "hrsh7th/cmp-path" }, -- Optional
+            { "saadparwaiz1/cmp_luasnip" }, -- Optional
+            { "hrsh7th/cmp-nvim-lua" }, -- Optional
+
+            -- Snippets
+            { "L3MON4D3/LuaSnip" }, -- Required
+            { "rafamadriz/friendly-snippets" }, -- Optional
+        },
     })
-    use("hrsh7th/nvim-cmp")
 
     -- JS
     use("HerringtonDarkholme/yats.vim")
diff --git a/queries/html/highlights.scm b/queries/html/highlights.scm
index fa66c22..f2038ca 100644
--- a/queries/html/highlights.scm
+++ b/queries/html/highlights.scm
@@ -3,77 +3,16 @@
 
 ;[
 ; "<"
+; "/>"
 ; ">"
 ; "</"
-; "/>"
 ;] @punctuation.bracket
+;] @constant
 
 (doctype) @comment
 
-((tag_name) @type (#match? @type "^(head|body)$"))
-
-((tag_name) @comment (#eq? @comment "html"))
-
-;(element (start_tag ((tag_name) @function) (#eq? @function "template")))
-;(element (end_tag ((tag_name) @function) (#eq? @function "template")))
-
-;(attribute_name) @constant
-
-;(element
-;  (start_tag
-;    ((tag_name) @function)
-;    (attribute (attribute_name) @_alpine))
-;  (#lua-match? @_alpine "^[@:]%l+.-$"))
-;
-;(element
-;  (start_tag
-;    (attribute (attribute_name) @_alpine))
-;  (end_tag ((tag_name) @function))
-;  (#lua-match? @_alpine "^[@:]%l+.-$"))
-;
-;(element
-;  (start_tag
-;    ((tag_name) @function)
-;    (attribute (attribute_name) @_alpine))
-;  (#lua-match? @_alpine "^x[-]%l+$"))
-;
-;(element
-;  (start_tag
-;    (attribute (attribute_name) @_alpine))
-;  (end_tag ((tag_name) @function))
-;  (#lua-match? @_alpine "^x[-]%l+$"))
-;
-;(element
-;  (self_closing_tag
-;    ((tag_name) @function)
-;    (attribute (attribute_name) @_alpine))
-;  (#lua-match? @_alpine "^[@:]%l+.-$"))
-;
-;(element
-;  (self_closing_tag
-;    ((tag_name) @function)
-;    (attribute (attribute_name) @_alpine))
-;  (#lua-match? @_alpine "^x[-]%l+$"))
-;
-;(element
-;  (start_tag
-;    (attribute (attribute_name) @parameter))
-;  (#lua-match? @parameter "^[@:]%l+.-$"))
-;
-;(element
-;  (start_tag
-;    (attribute (attribute_name) @parameter))
-;  (#lua-match? @parameter "^x[-]%l+$"))
-;
-;(element
-;  (self_closing_tag
-;    (attribute (attribute_name) @parameter))
-;  (#lua-match? @parameter "^[@:]%l+.-$"))
-;
-;(element
-;  (self_closing_tag
-;    (attribute (attribute_name) @parameter))
-;  (#lua-match? @parameter "^x[-]%l+$"))
+((attribute_name) @parameter
+  (#lua-match? @parameter "^up[-]%l+$"))
 
 ((attribute_name) @parameter
   (#lua-match? @parameter "^x[-]%l+$"))
@@ -81,6 +20,7 @@
 ((attribute_name) @parameter
   (#lua-match? @parameter "^[@:]%l+.-$"))
 
+; colors regular variables in strings with tokyonight theme
 ((attribute
    (attribute_name) @_alpine
    (quoted_attribute_value (attribute_value) @operator))
@@ -90,8 +30,3 @@
    (attribute_name) @_alpine
    (quoted_attribute_value (attribute_value) @operator))
  (#lua-match? @_alpine "^x[-]%l+$"))
-
-[
- "endfor"
- "endif"
-] @keyword
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index c7819ae..47fd6df 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -11,11 +11,11 @@
 (script_element
   (raw_text) @javascript)
 
-((text) @htmldjango (#lua-match? @htmldjango "^{%p%s+%l+.-%s+%p}$"))
-
-((text) @htmldjango (#lua-match? @htmldjango "^{{%s+.-%s+}}$"))
-
-((attribute
-   (quoted_attribute_value (attribute_value) @htmldjango))
- (#lua-match? @htmldjango "^{{%s+.-%s+}}$"))
+;((text) @htmldjango (#lua-match? @htmldjango "^{%p%s+%l+.-%s+%p}$"))
+;
+;((text) @htmldjango (#lua-match? @htmldjango "^{{%s+.-%s+}}$"))
+;
+;((attribute
+;   (quoted_attribute_value (attribute_value) @htmldjango))
+; (#lua-match? @htmldjango "^{{%s+.-%s+}}$"))
 
diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 17718b1..4deb05a 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -40,3 +40,5 @@
  "is"
  "as"
 ] @keyword
+
+(content) @html