diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index d18c4cd..45cedfb 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -99,8 +99,8 @@ vim.keymap.set('n', '<c-k>', ':lua vim.lsp.buf.hover()<CR>')
 
 
 -- tab navigation using <TAB>
-vim.keymap.set('n', '<Tab>', ':tabnext<CR>')
-vim.keymap.set('n', '<S-Tab>', ':tabprevious<CR>')
+vim.keymap.set('n', '<Tab>', ':BufferLineCycleNext<CR>')
+vim.keymap.set('n', '<S-Tab>', ':BufferLineCyclePrev<CR>')
 -- quick close tab USE <leader>ZQ
 --vim.keymap.set('n', '<C-w>', ':tabclose<CR>')
 
diff --git a/lua/config/plugin/treesitter.lua b/lua/config/plugin/treesitter.lua
index 2da59fe..6dd7b18 100644
--- a/lua/config/plugin/treesitter.lua
+++ b/lua/config/plugin/treesitter.lua
@@ -7,4 +7,16 @@ require 'nvim-treesitter.configs'.setup {
     highlight = {
         enable = false,
     },
+    indent = {
+        enable = true,
+    },
+    incremental_selection = {
+        enable = true,
+        keymaps = {
+            init_selection = "gnn",
+            node_incremental = "grn",
+            scope_incremental = "grc",
+            node_decremental = "grm",
+        },
+    },
 }
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index fb95437..7291cfe 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -7,6 +7,19 @@ return {
         tag = '0.1.8',
         dependencies = { 'nvim-lua/plenary.nvim' }
     },
+    {
+        "nvim-telescope/telescope-fzf-native.nvim",
+        build = "make",
+        config = function()
+            require("telescope").load_extension("fzf")
+        end,
+    },
+    {
+        "nvim-telescope/telescope-ui-select.nvim",
+        config = function()
+            require("telescope").load_extension("ui-select")
+        end,
+    },
     --# treesitter, uses language parsers for highlighting
     'nvim-treesitter/nvim-treesitter',
     --# lualine, creates nice looking status bar
@@ -211,6 +224,19 @@ return {
             require("config.plugin.cmp")
         end,
     },
+    -- Improves tabs
+    {
+        "akinsho/bufferline.nvim",
+        dependencies = { "nvim-tree/nvim-web-devicons" },
+        config = function()
+            require("bufferline").setup({
+                options = {
+                    mode = "buffers",
+                    separator_style = "slant",
+                }
+            })
+        end,
+    },
     -- AI
 --    {
 --        "supermaven-inc/supermaven-nvim",