diff --git a/init.lua b/init.lua
index 43b1405..0d61e3c 100644
--- a/init.lua
+++ b/init.lua
@@ -16,6 +16,7 @@ vim.opt.rtp:prepend(lazypath)
 -- Set up plugins
 require('lazy').setup({
   'tpope/vim-sleuth',
+  'tpope/vim-surround',
 
   -- Highlight todo, notes, etc in comments
   { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
diff --git a/lazy-lock.json b/lazy-lock.json
index a51fc99..5e84069 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -29,5 +29,6 @@
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }
 }
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
index 70a0ab6..8689eb7 100644
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -21,6 +21,10 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win
 vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
 vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
+-- Keybinds for using the quickfix list
+vim.keymap.set('n', '<C-]>', '<cmd>cnext<CR>', { desc = 'Go to the next item in quickfix' })
+vim.keymap.set('n', '<C-[>', '<cmd>cprev<CR>', { desc = 'Go to the previous item in quickfix' })
+
 -- TELESCOPE
 --
 -- See `:help telescope.builtin`
diff --git a/lua/core/options.lua b/lua/core/options.lua
index db7ea3b..226db77 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -4,6 +4,8 @@ vim.g.have_nerd_font = true
 
 vim.opt.number = true
 vim.opt.relativenumber = true
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
 
 -- Enable mouse mode, can be useful for resizing splits for example!
 -- vim.opt.mouse = 'a'
diff --git a/lua/core/plugins/lsp.lua b/lua/core/plugins/lsp.lua
index 740f3a1..b3b2e2c 100644
--- a/lua/core/plugins/lsp.lua
+++ b/lua/core/plugins/lsp.lua
@@ -152,7 +152,8 @@ return {
       local servers = {
         emmet_language_server = {},
         -- clangd = {},
-        -- gopls = {},
+        gopls = {},
+        intelephense = {},
         -- pyright = {},
         -- rust_analyzer = {},
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs