diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua
index e7ba79f..4e0cbd2 100644
--- a/lua/core/autocmd.lua
+++ b/lua/core/autocmd.lua
@@ -6,8 +6,3 @@ vim.api.nvim_create_autocmd("Filetype", {
 	pattern = "*",
 	command = "setlocal formatoptions-=c formatoptions-=r formatoptions-=o"
 })
-
-vim.api.nvim_create_autocmd("FocusLost", {
-	pattern = "*",
-	command = ":wa"
-})
diff --git a/lua/core/statusline.lua b/lua/core/statusline.lua
index 9672388..0912228 100644
--- a/lua/core/statusline.lua
+++ b/lua/core/statusline.lua
@@ -4,4 +4,4 @@ vim.api.nvim_set_option("statusline", " ")
 
 -- tabline
 -- always show tabline (0 = never, 1 = only with at least 2 tabs, 2 = always) and colors
-vim.api.nvim_set_option("showtabline", 2)
+vim.api.nvim_set_option("showtabline", 1)
diff --git a/lua/plugin/bufferline.lua b/lua/plugin/bufferline.lua
deleted file mode 100644
index b9b3934..0000000
--- a/lua/plugin/bufferline.lua
+++ /dev/null
@@ -1,26 +0,0 @@
-return {
-    {
-        "akinsho/bufferline.nvim",
-        config = function()
-            require("bufferline").setup({
-                options = {
-                    offsets = {
-                        {
-                            filetype = "netrw",
-                            text = "File Explorer",
-                            highlight = "Directory",
-                            text_align = 'center',
-                            separator = true
-                        }
-                    },
-                    show_buffer_close_icons = false,
-                },
-								highlights = {
-									buffer_selected = {
-										fg = "#dfa000",
-									},
-								},
-            })
-        end,
-    }
-}
diff --git a/lua/plugin/fugitive.lua b/lua/plugin/fugitive.lua
index cd5bdbb..5d9ada6 100644
--- a/lua/plugin/fugitive.lua
+++ b/lua/plugin/fugitive.lua
@@ -1,18 +1,19 @@
 return {
-    {
-        'tpope/vim-fugitive',
-        keys = {
-            { "<leader>GG", "<cmd>Git <cr>",                   desc = "git" },
-            { "<leader>Gs", "<cmd>Git status <cr>",            desc = "git status" },
-            { "<leader>Gd", "<cmd>Git diff <cr>",              desc = "git diff" },
-            { "<leader>GD", "<cmd>Git diff --staged <cr>",     desc = "git diff --staged" },
-            { "<leader>Gl", "<cmd>Git log --graph <cr>",       desc = "git log --graph" },
-            { "<leader>Ga", "<cmd>Git add --interactive <cr>", desc = "git add" },
-            { "<leader>GA", "<cmd>Git add -A <cr>",            desc = "git add -A " },
-            { "<leader>Gc", "<cmd>Git commit <cr>",            desc = "git commit" },
-            { "<leader>GC", "<cmd>Git commit --amend <cr>",    desc = "git commit --amend " },
-            { "<leader>Gp", "<cmd>Git push <cr>",              desc = "git push" },
-            { "<leader>GP", "<cmd>Git pull <cr>",              desc = "git pull" },
-        },
-    }
+  {
+    'tpope/vim-fugitive',
+    keys = {
+      { "<leader>gG",  "<cmd>Git <cr>",                          desc = "git" },
+      { "<leader>gs",  "<cmd>Git status <cr>",                   desc = "git status" },
+      { "<leader>gd",  "<cmd>Git diff <cr>",                     desc = "git diff" },
+      { "<leader>gD",  "<cmd>Git diff --staged <cr>",            desc = "git diff --staged" },
+      { "<leader>gl",  "<cmd>Git log --graph <cr>",              desc = "git log --graph" },
+      { "<leader>ga",  "<cmd>Git add --interactive <cr>",        desc = "git add" },
+      { "<leader>gA",  "<cmd>Git add -A <cr>",                   desc = "git add -A " },
+      { "<leader>gc",  "<cmd>Git commit <cr>",                   desc = "git commit" },
+      { "<leader>gC",  "<cmd>Git commit --amend <cr>",           desc = "git commit --amend " },
+      { "<leader>gCN", "<cmd>Git commit --amend --no-edit <cr>", desc = "git commit --amend " },
+      { "<leader>gp",  "<cmd>Git push <cr>",                     desc = "git push" },
+      { "<leader>gP",  "<cmd>Git pull <cr>",                     desc = "git pull" },
+    },
+  }
 }
diff --git a/lua/plugin/gitsigns.lua b/lua/plugin/gitsigns.lua
index 9b63384..60c83ab 100644
--- a/lua/plugin/gitsigns.lua
+++ b/lua/plugin/gitsigns.lua
@@ -30,20 +30,9 @@ return {
                     end, { expr = true })
 
                     -- Actions
-                    map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
-                    map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
-                    map('n', '<leader>hS', gs.stage_buffer)
-                    map('n', '<leader>hu', gs.undo_stage_hunk)
-                    map('n', '<leader>hR', gs.reset_buffer)
-                    map('n', '<leader>hp', gs.preview_hunk)
-                    map('n', '<leader>hb', function() gs.blame_line { full = true } end)
-                    map('n', '<leader>tb', gs.toggle_current_line_blame)
-                    map('n', '<leader>hd', gs.diffthis)
-                    map('n', '<leader>hD', function() gs.diffthis('~') end)
-                    map('n', '<leader>td', gs.toggle_deleted)
+                    map('n', '<leader>gB', function() gs.blame_line { full = true } end)
+                    map('n', '<leader>gb', gs.toggle_current_line_blame)
 
-                    -- Text object
-                    map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
                 end
             })
         end,
diff --git a/lua/plugin/surround.lua b/lua/plugin/surround.lua
deleted file mode 100644
index 6bf538e..0000000
--- a/lua/plugin/surround.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
-    {
-        "echasnovski/mini.surround",
-        event = "VeryLazy",
-        opts = {
-            mappings = {
-                add = "<leader>sa",
-                delete = "<leader>sd",
-                find = "<leader>sf",
-                find_left = "<leader>sF",
-                highlight = "<leader>sh",
-                replace = "<leader>sr",
-                update_n_lines = "<leader>sn",
-            },
-        },
-        config = function(_, opts)
-            require("mini.surround").setup(opts)
-        end,
-    }
-}
diff --git a/lua/plugin/telescope.lua b/lua/plugin/telescope.lua
index a698477..13f2b15 100644
--- a/lua/plugin/telescope.lua
+++ b/lua/plugin/telescope.lua
@@ -1,21 +1,21 @@
 return {
-    {
-        "nvim-telescope/telescope.nvim",
-        lazy = true,
-        cmd = "Telescope",
-        version = false,
-        keys = {
-            { "<leader>:",  "<cmd>Telescope command_history<cr>",               desc = "Command History" },
-            { "<leader>,",  "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
-            -- find
-            { "<leader>ff", "<cmd>Telescope find_files<cr>",                    desc = "Find Files" },
-            { "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>",     desc = "Find Strings in current Buffer" },
-            { "<leader>fg", "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
-            { "<leader>/",  "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
-            { "<leader>fl",  "<cmd>Telescope grep_string<cr>",                  desc = "Grep currently hovered String" },
-            { "<leader>fG", "<cmd>Telescope git_files<cr>",                     desc = "Find Git Files" },
-            { "<leader>fk", "<cmd>Telescope keymaps<cr>",                       desc = "List Keymaps" },
-            { "<leader>fr", "<cmd>Telescope oldfiles<cr>",                      desc = "Find Recent Files" },
-        },
+  {
+    "nvim-telescope/telescope.nvim",
+    lazy = true,
+    cmd = "Telescope",
+    version = false,
+    keys = {
+      { "<leader>:",  "<cmd>Telescope command_history<cr>",               desc = "Command History" },
+      { "<leader>,",  "<cmd>Telescope buffers show_all_buffers=true<cr>", desc = "Switch Buffer" },
+      -- find
+      { "<leader>ff", "<cmd>Telescope find_files<cr>",                    desc = "Find Files" },
+      { "<leader>fb", "<cmd>Telescope current_buffer_fuzzy_find<cr>",     desc = "Find Strings in current Buffer" },
+      { "<leader>fg", "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
+      { "<leader>/",  "<cmd>Telescope live_grep<cr>",                     desc = "Grep Content in Files" },
+      { "<leader>fh", "<cmd>Telescope grep_string<cr>",                   desc = "Grep currently hovered String" },
+      { "<leader>fG", "<cmd>Telescope git_files<cr>",                     desc = "Find Git Files" },
+      { "<leader>fk", "<cmd>Telescope keymaps<cr>",                       desc = "List Keymaps" },
+      { "<leader>fr", "<cmd>Telescope oldfiles<cr>",                      desc = "Find Recent Files" },
     },
+  },
 }
diff --git a/lua/plugin/todo-comments.lua b/lua/plugin/todo-comments.lua
deleted file mode 100644
index 7e9149a..0000000
--- a/lua/plugin/todo-comments.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	{
-		"folke/todo-comments.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		opts = {
-			-- your configuration comes here
-			-- or leave it empty to use the default settings
-			-- refer to the configuration section below
-		}
-	}
-}
diff --git a/lua/plugin/trouble.lua b/lua/plugin/trouble.lua
deleted file mode 100644
index 25ef1bd..0000000
--- a/lua/plugin/trouble.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-	"folke/trouble.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	opts = {},
-	config = function()
-		vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
-		vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
-		vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
-		vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
-		vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
-		vim.keymap.set("n", "gr", function() require("trouble").open("lsp_references") end)
-	end
-}