diff --git a/lazy-lock.json b/lazy-lock.json
index edd85b3..d2bbfbe 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,5 +1,6 @@
 {
   "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
+  "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
@@ -23,8 +24,8 @@
   "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" },
   "nvim-lint": { "branch": "master", "commit": "b3ab4ba88845893663d0b7122ee82921adf28358" },
   "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" },
+  "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-treesitter": { "branch": "master", "commit": "03452942dfbd998701d4123ccad2090e1bc7e9f1" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "oil.nvim": { "branch": "master", "commit": "39dbf875861449cf09e936fa80073f3413e9439c" },
diff --git a/lua/custom/plugins/barbecue.lua b/lua/custom/plugins/barbecue.lua
new file mode 100644
index 0000000..d3687c1
--- /dev/null
+++ b/lua/custom/plugins/barbecue.lua
@@ -0,0 +1,17 @@
+return {
+  'utilyre/barbecue.nvim',
+  name = 'barbecue',
+  version = '*',
+  dependencies = {
+    'SmiteshP/nvim-navic',
+    'nvim-tree/nvim-web-devicons',
+  },
+  opts = {
+    exclude_filetypes = {
+      'gitcommit',
+    },
+    modifiers = {
+      basename = ':e',
+    },
+  },
+}
diff --git a/lua/kickstart/plugins/lspconfig.lua b/lua/kickstart/plugins/lspconfig.lua
index dff0980..b29ffb0 100644
--- a/lua/kickstart/plugins/lspconfig.lua
+++ b/lua/kickstart/plugins/lspconfig.lua
@@ -32,6 +32,8 @@ return {
 
       -- Needed to explore Workspace in Java
       'stevearc/oil.nvim',
+      -- Code context using LSP info
+      'SmiteshP/nvim-navic',
     },
     config = function()
       -- Brief aside: **What is LSP?**
@@ -182,13 +184,19 @@ return {
       local servers = {
         powershell_es = {},
         rust_analyzer = {},
+        intelephense = {},
         tailwindcss = {},
         omnisharp = {},
         pyright = {},
         svelte = {},
         ts_ls = {},
         gopls = {},
-        intelephense = {},
+        html = {
+          filetypes = {
+            'html',
+            'ejs',
+          },
+        },
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
         --
         -- Some languages (like typescript) have entire language plugins that can be useful:
diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
index 73e88c0..9db60f6 100644
--- a/lua/kickstart/plugins/treesitter.lua
+++ b/lua/kickstart/plugins/treesitter.lua
@@ -2,7 +2,6 @@ return {
   { -- Highlight, edit, and navigate code
     'nvim-treesitter/nvim-treesitter',
     dependencies = {
-      'nvim-treesitter/nvim-treesitter-context',
       'nvim-treesitter/nvim-treesitter-textobjects',
     },
     build = ':TSUpdate',
diff --git a/lua/options.lua b/lua/options.lua
index a43fa62..cbf6702 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -96,6 +96,16 @@ vim.opt.guicursor = 'n-v-i-c:block-Cursor'
 vim.o.laststatus = 3
 vim.api.nvim_set_hl(0, 'WinSeparator', { bg = nil })
 
+-- Disable tabpages
+vim.api.nvim_create_autocmd('TabNew', {
+  group = vim.api.nvim_create_augroup('TabGroup', { clear = true }),
+  callback = function()
+    local buf = vim.api.nvim_get_current_buf()
+    vim.cmd 'tabclose'
+    vim.api.nvim_set_current_buf(buf)
+  end,
+})
+
 vim.api.nvim_create_autocmd('UIEnter', {
   group = vim.api.nvim_create_augroup('SetGUISettings', { clear = true }),
   callback = function()