diff --git a/nvim/lua/custom_commands.lua b/nvim/lua/custom_commands.lua
index edf22f4..862bf73 100644
--- a/nvim/lua/custom_commands.lua
+++ b/nvim/lua/custom_commands.lua
@@ -1,6 +1,7 @@
 vim.api.nvim_create_user_command('FindAndReplace', function(opts)
-    vim.api.nvim_command(string.format('cdo s/%s/%s', opts.fargs[1], opts.fargs[2]))
-    vim.api.nvim_command('cfdo update')
+    -- Update each quickfix location using substitute, update the files to save changes, close the opened buffers and close the quickfix window
+    -- TODO: Does not close the buffers opened through changes
+    vim.api.nvim_command(string.format('cdo s/%s/%s/', opts.fargs[1], opts.fargs[2]) .. '| update | cclose')
 end, { nargs = '*' })
 
 vim.api.nvim_set_keymap(
diff --git a/nvim/lua/keymappings.lua b/nvim/lua/keymappings.lua
index e61cbd1..85854e1 100644
--- a/nvim/lua/keymappings.lua
+++ b/nvim/lua/keymappings.lua
@@ -34,8 +34,7 @@ vim.keymap.set('n', 'J', 'mzJ`z')
 -- Switch or close buffers in the window
 vim.keymap.set('n', '<leader>n', ':bn<CR>', options)
 vim.keymap.set('n', '<leader>p', ':bp<CR>', options)
-vim.keymap.set('n', '<leader>x', ':bp<bar>sp<bar>bn<bar>bd<CR>', options)
--- vim.keymap.set('n', '<leader>x', ':bp|bd #<CR>', options)
+vim.keymap.set('n', '<leader>x', ':bp<bar>vs<bar>bn<bar>bd<CR>', options) -- Previous buffer, split, next buffer, delete buffer
 
 -- Toggle spellcheck
 vim.keymap.set('n', '<leader>s', ':set spell!<CR>', options)
@@ -57,6 +56,4 @@ vim.keymap.set('n', '<leader>em', function() cf.execute('benchmark') end)
 
 vim.keymap.set('n', '<leader>eo', ':Lexplore<CR>', options)
 
--- vim.keymap.set('n', '<leader>rn', ':%s/<C-r><C-w>//g<Left><Left>', options)
-
 vim.keymap.set('n', '<leader>l', ':Lazy<CR>', options)
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 23bc997..01ca3ab 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -20,7 +20,6 @@ require('lazy').setup({
     require('plugins/comment'),
     require('plugins/dap'),
     require('plugins/dap-python'),
-    -- require('plugins/inc-rename'),
     require('plugins/treesitter'),
     require('plugins/gitsigns'),
     require('plugins/luasnip'),
diff --git a/nvim/lua/plugins/inc-rename.lua b/nvim/lua/plugins/inc-rename.lua
deleted file mode 100644
index 49198cd..0000000
--- a/nvim/lua/plugins/inc-rename.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-    'smjonas/inc-rename.nvim',
-    config = function()
-        require('inc_rename').setup()
-    end,
-    keys = {
-        {
-            '<leader>rn',
-            function()
-                return ':IncRename ' .. vim.fn.expand('<cword>')
-            end,
-        },
-    },
-}
diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index baed217..8438886 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -43,17 +43,19 @@ return {
             ensure_installed = {
                 'ansiblels',
                 'arduino_language_server',
+                'bashls',
                 'clangd',
+                -- 'hadolint', -- Dockerfile linting
                 'intelephense',
-                'jdtls',
+                -- 'jdtls', -- java
                 'lua_ls',
-                'marksman',
+                'marksman', -- markdown
                 'pylsp',
                 'rust_analyzer',
-                -- 'r_language_server',
-                'ts_ls',
+                -- 'snyk',
+                'ts_ls', -- Typscript
+                -- 'volar', -- Vue
                 'yamlls',
-                'volar',
             }
         }
 
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 9c714e6..0b7746a 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -156,12 +156,6 @@ return {
                 require('telescope.builtin').lsp_dynamic_workspace_symbols()
             end
         },
-        {
-            ';g',
-            function()
-                require('telescope.builtin').grep_string({ search = vim.fn.input('Grep For > ')})
-            end
-        },
         {
             '<leader>rn',
             function()