diff --git a/core/options.lua b/core/options.lua
index cd98665..221de7a 100644
--- a/core/options.lua
+++ b/core/options.lua
@@ -15,6 +15,10 @@ vim.o.updatetime = 250
 vim.o.timeoutlen = 300
 vim.o.splitright = true
 vim.o.splitbelow = true
+vim.o.tabstop = 4
+vim.o.shiftwidth = 4
+vim.o.softtabstop = 4
+vim.o.expandtab = true
 
 vim.o.list = true
 vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
diff --git a/lazy-lock.json b/lazy-lock.json
index 89905b8..75b04ee 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -5,7 +5,9 @@
   "fidget.nvim": { "branch": "main", "commit": "889e2e96edef4e144965571d46f7a77bcc4d0ddf" },
   "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
+  "kanagawa.nvim": { "branch": "master", "commit": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "loc.nvim": { "branch": "main", "commit": "7aff77294ea3c52f7cfb89c9f1703b9a75b25683" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
   "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" },
diff --git a/plugins/blink.lua b/plugins/blink.lua
index 757061a..fb322c9 100644
--- a/plugins/blink.lua
+++ b/plugins/blink.lua
@@ -27,7 +27,7 @@ return {
   ---@type blink.cmp.Config
   opts = {
     keymap = {
-      preset = 'default',
+      preset = 'super-tab',
     },
     appearance = {
       nerd_font_variant = 'mono',
diff --git a/plugins/fugitive.lua b/plugins/fugitive.lua
index f14359d..ac736fd 100644
--- a/plugins/fugitive.lua
+++ b/plugins/fugitive.lua
@@ -2,6 +2,7 @@
 ---@type LazySpec
 return {
   'tpope/vim-fugitive',
+  lazy = false,
   keys = {
     { '<leader>gd', '<cmd>Gvdiffsplit<CR>', desc = 'Git vertical diff' },
     { '<leader>gc', '<cmd>Git<CR>', desc = 'Git status' },
diff --git a/plugins/init.lua b/plugins/init.lua
index 1e069f3..be31be1 100644
--- a/plugins/init.lua
+++ b/plugins/init.lua
@@ -8,8 +8,10 @@ return {
   require 'plugins.lsp',
   require 'plugins.conform',
   require 'plugins.blink',
+  require 'plugins.kanagawa',
   require 'plugins.tokyonight',
   require 'plugins.todo-comments',
+  require 'plugins.loc',
   require 'plugins.mini',
   require 'plugins.treesitter',
   require 'plugins.autopairs',
diff --git a/plugins/kanagawa.lua b/plugins/kanagawa.lua
new file mode 100644
index 0000000..eda19ce
--- /dev/null
+++ b/plugins/kanagawa.lua
@@ -0,0 +1,9 @@
+---@module 'lazy'
+---@type LazySpec
+return {
+  'rebelot/kanagawa.nvim',
+  priority = 1000,
+  config = function()
+    vim.cmd.colorscheme 'kanagawa-dragon'
+  end,
+}
diff --git a/plugins/loc.lua b/plugins/loc.lua
new file mode 100644
index 0000000..2056093
--- /dev/null
+++ b/plugins/loc.lua
@@ -0,0 +1,7 @@
+---@module 'lazy'
+---@type LazySpec
+return {
+  'ruinivist/loc.nvim',
+  lazy = false,
+  config = function() require('loc').setup() end,
+}
diff --git a/plugins/lsp.lua b/plugins/lsp.lua
index 31f30d1..0c08eca 100644
--- a/plugins/lsp.lua
+++ b/plugins/lsp.lua
@@ -59,8 +59,8 @@ return {
 
     ---@type table<string, vim.lsp.Config>
     local servers = {
-      -- clangd = {},
-      -- gopls = {},
+      clangd = {},
+      gopls = {},
       -- pyright = {},
       -- rust_analyzer = {},
       -- ts_ls = {},
diff --git a/plugins/mini.lua b/plugins/mini.lua
index 53ac29f..f1ba09d 100644
--- a/plugins/mini.lua
+++ b/plugins/mini.lua
@@ -17,6 +17,11 @@ return {
     statusline.setup { use_icons = vim.g.have_nerd_font }
 
     ---@diagnostic disable-next-line: duplicate-set-field
-    statusline.section_location = function() return '%2l:%-2v' end
+    statusline.section_location = function()
+      local ok, loc = pcall(require, 'loc')
+      if not ok then return '%2l:%-2v' end
+
+      return loc.statusline() .. ' ' .. '%2l:%-2v'
+    end
   end,
 }
diff --git a/plugins/neo-tree.lua b/plugins/neo-tree.lua
index 568809a..2fef7cb 100644
--- a/plugins/neo-tree.lua
+++ b/plugins/neo-tree.lua
@@ -8,9 +8,9 @@ return {
     'MunifTanjim/nui.nvim',
     'nvim-tree/nvim-web-devicons',
   },
-  lazy = false,
+  cmd = 'Neotree',
   keys = {
-    { '<C-n>', '<cmd>Neotree toggle<CR>', desc = 'Toggle Neo-tree' },
+    { '<C-b>', '<cmd>Neotree toggle<CR>', desc = 'Toggle Neo-tree' },
   },
   ---@module 'neo-tree'
   ---@type neotree.Config
@@ -18,6 +18,7 @@ return {
     window = {
       mappings = {
         ['<space>'] = 'none',
+        ['<C-b>'] = 'close_window',
       },
     },
   },
diff --git a/plugins/telescope.lua b/plugins/telescope.lua
index 6ac00f0..391bb6b 100644
--- a/plugins/telescope.lua
+++ b/plugins/telescope.lua
@@ -35,6 +35,7 @@ return {
     vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
     vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
     vim.keymap.set('n', '<leader>sc', builtin.commands, { desc = '[S]earch [C]ommands' })
+    vim.keymap.set('n', '<leader>st', function() builtin.colorscheme { enable_preview = true } end, { desc = '[S]earch [T]hemes' })
     vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
 
     vim.api.nvim_create_autocmd('LspAttach', {
diff --git a/plugins/tokyonight.lua b/plugins/tokyonight.lua
index 07b7632..9428e54 100644
--- a/plugins/tokyonight.lua
+++ b/plugins/tokyonight.lua
@@ -2,7 +2,6 @@
 ---@type LazySpec
 return {
   'folke/tokyonight.nvim',
-  priority = 1000,
   config = function()
     ---@diagnostic disable-next-line: missing-fields
     require('tokyonight').setup {
@@ -10,7 +9,5 @@ return {
         comments = { italic = false },
       },
     }
-
-    vim.cmd.colorscheme 'tokyonight-night'
   end,
 }