diff --git a/init.lua b/init.lua
index 5cb75020..014d3aba 100644
--- a/init.lua
+++ b/init.lua
@@ -668,6 +668,7 @@ require('lazy').setup({
           },
         },
 
+        -- python -> LSP: basedpyright, Formatter & linter
         -- https://github.com/astral-sh/ruff/blob/main/crates/ruff_server/docs/setup/NEOVIM.md
         ruff = {
           -- Disable hover in favor of Pyright
@@ -729,8 +730,11 @@ require('lazy').setup({
         html = {},
         jsonls = {},
         tailwindcss = {},
+        -- js -> LSP: tsserver, Formatter & linter: biome
         -- npm install -g @biomejs/biome
         biome = {},
+        -- npm install -g typescript typescript-language-server
+        tsserver = {},
         ltex = {
           ltex = {
             additionalRules = {
diff --git a/lua/custom/plugins/html.lua b/lua/custom/plugins/html.lua
new file mode 100644
index 00000000..e57a357c
--- /dev/null
+++ b/lua/custom/plugins/html.lua
@@ -0,0 +1,20 @@
+return {
+  {
+    'windwp/nvim-ts-autotag',
+    -- ft = {
+    --   'html',
+    --   'javascript',
+    --   'typescript',
+    --   'svelte',
+    -- },
+    config = function()
+      require('nvim-ts-autotag').setup {
+        -- opts = {
+        --   enable_close = true,
+        --   enable_rename = true,
+        --   enable_close_on_slash = false,
+        -- },
+      }
+    end,
+  },
+}
diff --git a/lua/custom/plugins/neogit.lua b/lua/custom/plugins/neogit.lua
index 052f8d28..8ed612ad 100644
--- a/lua/custom/plugins/neogit.lua
+++ b/lua/custom/plugins/neogit.lua
@@ -9,7 +9,7 @@ return {
         -- brew install font-hack-nerd-font
         -- 'nvim-tree/nvim-web-devicons',
         -- },
-        config = {
+        opts = {
           use_icons = false,
         },
       },
@@ -18,16 +18,4 @@ return {
     config = true,
     vim.keymap.set({ 'n' }, '<leader>n', '<cmd>Neogit kind=replace<CR>', {}),
   },
-
-  --{
-  --	"simrat39/rust-tools.nvim",
-  --	ft = "rust",
-  --	dependencies = "neovim/nvim-lspconfig",
-  --	opts = function()
-  --		return require "custom.configs.rust-tools"
-  --	end,
-  --	config = function(_, opts)
-  --		require("rust-tools").setup(opts)
-  --	end,
-  --},
 }