diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua
index 36bec0f2..44a578c5 100644
--- a/after/plugin/defaults.lua
+++ b/after/plugin/defaults.lua
@@ -7,4 +7,6 @@ vim.opt.incsearch = true
 
 vim.opt.scrolloff = 8
 
-vim.opt.colorcolumn = "80"
\ No newline at end of file
+vim.opt.colorcolumn = "80"
+
+vim.opt.swapfile = false
diff --git a/after/plugin/keymaps.lua b/after/plugin/keymaps.lua
index 55d258c3..a73d29a4 100644
--- a/after/plugin/keymaps.lua
+++ b/after/plugin/keymaps.lua
@@ -22,14 +22,14 @@ keymap("n", "<C-k>", "<C-w>k", opts)
 keymap("n", "<C-l>", "<C-w>l", opts)
 
 -- Nvimtree
-keymap('n', '<leader>n', ":NvimTreeToggle<cr>", {silent = true, noremap = true, desc = "Toggle [N]vimtree"})
+keymap('n', '<leader>n', ":NvimTreeToggle<cr>", { silent = true, noremap = true, desc = "Toggle [N]vimtree" })
 
 -- UndoTree
 keymap('n', '<leader>u', ":UndotreeToggle<cr>", { desc = "Toggle [U]ndo tree" })
 
 -- Move line
-keymap('v', 'J', ":m '>+1<CR>gv=gv", {noremap = true})
-keymap('v', 'K', ":m '<-2<CR>gv=gv", {noremap = true})
+keymap('v', 'J', ":m '>+1<CR>gv=gv", { noremap = true })
+keymap('v', 'K', ":m '<-2<CR>gv=gv", { noremap = true })
 
 -- Search cursor in the middle
 keymap('n', 'n', "nzzzv")
@@ -49,6 +49,9 @@ keymap('n', "<C-j>", "<cmd>cprev<CR>zz")
 keymap('n', "<leader>k", "<cmd>lnext<CR>zz")
 keymap('n', "<leader>j", "<cmd>lprev<CR>zz")
 
+-- Open folder in workspace in tmux session
+keymap("n", "<leader>op", "<cmd>silent !tmux neww tmux-sessionizer<CR>", { desc = "[O]pen [P]roject" })
+
 -- replace selected word in the file
 keymap("n", "<leader>R", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], { desc = "[R]eplace words in the file" })
 
@@ -56,4 +59,8 @@ keymap("n", "<leader>R", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
 keymap("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Make [X]ecutable file" })
 
 -- Do nothing
-keymap("n", "Q", "<nop>")
\ No newline at end of file
+keymap("n", "Q", "<nop>")
+
+-- Bufdelete.vim
+keymap("n", "<leader>bd", ":Bdelete<CR>", {desc = "[B]uffer [D]elete"})
+keymap("n", "<leader>bw", ":Bwipeout<CR>", {desc = "[B]uffer [W]ipeout"})
\ No newline at end of file
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
deleted file mode 100644
index e98b3416..00000000
--- a/after/plugin/treesitter.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-require('nvim-treesitter.configs').setup {
-    -- Add languages to be installed here that you want installed for treesitter
-    ensure_installed = {'terraform'},
-    auto_install = true
-}
diff --git a/init.lua b/init.lua
index c3ce5ee2..877cda0c 100644
--- a/init.lua
+++ b/init.lua
@@ -180,7 +180,7 @@ require('lazy').setup({
   --       These are some example plugins that I've included in the kickstart repository.
   --       Uncomment any of the lines below to enable them.
   require 'kickstart.plugins.autoformat',
-  require 'kickstart.plugins.debug',
+  -- require 'kickstart.plugins.debug',
 
   -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
   --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
@@ -295,7 +295,7 @@ require('nvim-treesitter.configs').setup {
   ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'help', 'vim' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-  auto_install = false,
+  auto_install = true,
 
   highlight = { enable = true },
   indent = { enable = true, disable = { 'python' } },
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 2a533afb..b2818a3d 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -4,5 +4,6 @@
 -- See the kickstart.nvim README for more information
 return {
   'fatih/vim-go',
-  'mbbill/undotree'
+  'mbbill/undotree',
+  'famiu/bufdelete.nvim',
 }