diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua
index 44a578c5..cfc512f3 100644
--- a/after/plugin/defaults.lua
+++ b/after/plugin/defaults.lua
@@ -2,6 +2,8 @@ vim.opt.relativenumber = true
 
 vim.opt.expandtab = true
 vim.opt.smarttab = true
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
 
 vim.opt.incsearch = true
 
diff --git a/after/plugin/keymaps.lua b/after/plugin/keymaps.lua
index 9b1902ff..bc7a0751 100644
--- a/after/plugin/keymaps.lua
+++ b/after/plugin/keymaps.lua
@@ -66,8 +66,8 @@ keymap("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Make [
 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" })
+keymap("n", "<leader>bd", ":Bdelete!<CR>", { desc = "[B]uffer [D]elete" })
+keymap("n", "<leader>bw", ":Bwipeout!<CR>", { desc = "[B]uffer [W]ipeout" })
 
 -- Delete buffer except current
 -- keymap("n", "<leader>be", ":%bd|e#|bd#<CR>", { silent = true, desc = "[B]uffer Delete [E]xcept" })
@@ -76,5 +76,4 @@ keymap("n", "<leader>be", ":ClearBufferExceptCurrent<CR>", { silent = true, desc
 -- Vim Be Good
 keymap("n", "<leader>vbg", ":VimBeGood<CR>", { desc = "[V]im [B]e [G]ood" })
 
--- Update source
-keymap("n", "<leader><leader>", ":so<CR>")
+keymap("n", "<leader>gs", ":Telescope git_status<CR>", { desc = "[G]it [S]tatus" })
diff --git a/init.lua b/init.lua
index b6c145d6..dde8d417 100644
--- a/init.lua
+++ b/init.lua
@@ -199,9 +199,8 @@ require('lazy').setup({
     config = function()
       require("lspsaga").setup {
         lightbulb = {
-          enable = false
+          enable = true
         },
-        request_timeout = 5000
       }
     end,
   },
@@ -243,7 +242,8 @@ vim.o.clipboard = 'unnamedplus'
 vim.o.breakindent = true
 
 -- Save undo history
-vim.o.undofile = true
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+vim.opt.undofile = true
 
 -- Case insensitive searching UNLESS /C or capital in search
 vim.o.ignorecase = true
@@ -444,7 +444,6 @@ local on_attach = function(_, bufnr)
   nmap("<leader>o", ":Lspsaga outline<CR>", '[O]utline')
 
   -- Show cursor diagnostic
-  -- nmap("<S-f>", ":Lspsaga show_cursor_diagnostics<CR>", 'Show cursor diagnostics')
   nmap("<S-f>", ":Lspsaga show_line_diagnostics<CR>", 'Show cursor diagnostics')
 
 
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 0878fc36..eb1c829d 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -4,11 +4,10 @@
 -- See the kickstart.nvim README for more information
 return {
   'fatih/vim-go',
-  'mbbill/undotree',
   'famiu/bufdelete.nvim',
   'ThePrimeagen/harpoon',
   'ThePrimeagen/vim-be-good',
   'stevearc/dressing.nvim',
-  "onsails/lspkind.nvim",
-  "rafamadriz/friendly-snippets"
+  "onsails/lspkind.nvim"
+  -- "rafamadriz/friendly-snippets"
 }
diff --git a/lua/custom/plugins/todo.lua b/lua/custom/plugins/todo.lua
index 94d7c148..d6102910 100644
--- a/lua/custom/plugins/todo.lua
+++ b/lua/custom/plugins/todo.lua
@@ -1,6 +1,6 @@
 return {
   "folke/todo-comments.nvim",
-  requires = "nvim-lua/plenary.nvim",
+  dependencies = { "nvim-lua/plenary.nvim" },
   config = function()
     require("todo-comments").setup()
   end
diff --git a/lua/custom/plugins/undotree.lua b/lua/custom/plugins/undotree.lua
new file mode 100644
index 00000000..554a8085
--- /dev/null
+++ b/lua/custom/plugins/undotree.lua
@@ -0,0 +1,6 @@
+return {
+  'mbbill/undotree',
+  config = function()
+    vim.g.undotree_WindowLayout = 4
+  end
+}