diff --git a/lazy-lock.json b/lazy-lock.json
index ff419fc..4899936 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,17 +9,17 @@
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "kanagawa": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" },
+  "kanagawa": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
-  "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" },
+  "mini.nvim": { "branch": "main", "commit": "ddb70da6ec6aa896cfde87350d1e8dffb57ddef0" },
   "newpaper.nvim": { "branch": "main", "commit": "d8f2a29001f795a59e4f28713427c200c15449ea" },
   "nvim-lint": { "branch": "master", "commit": "f126af5345c7472e9a0cdbe1d1a29209be72c4c4" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "66a9b5fa9e806918b5fe3dba00c6cce7e230abd2" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
   "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "pomo.nvim": { "branch": "main", "commit": "7e06e5221d8d1e596a0ab29dd4d7fcee5f3cd05a" },
diff --git a/lua/weeheavy/plugins/aerial.lua b/lua/weeheavy/plugins/aerial.lua
index 061d962..2bc57e4 100644
--- a/lua/weeheavy/plugins/aerial.lua
+++ b/lua/weeheavy/plugins/aerial.lua
@@ -3,12 +3,14 @@ return {
     opts = {},
     config = function()
         require("aerial").setup({
+            -- optionally use on_attach to set keymaps when aerial has attached to a buffer
             on_attach = function(bufnr)
                 -- Jump forwards/backwards with '{' and '}'
                 vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
                 vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
             end,
         })
+        -- You probably also want to set a keymap to toggle aerial
         vim.keymap.set("n", "<leader>a", "<cmd>AerialToggle!<CR>")
     end,
 }
diff --git a/lua/weeheavy/plugins/oil.lua b/lua/weeheavy/plugins/oil.lua
index 057ea33..5d279b4 100644
--- a/lua/weeheavy/plugins/oil.lua
+++ b/lua/weeheavy/plugins/oil.lua
@@ -26,9 +26,10 @@ return {
             },
 
             float = {
-                -- padding = 4,
-                max_width = 0.65,
-                max_height = 0.4,
+                -- Padding around the floating window
+                padding = 4,
+                max_width = 80,
+                max_height = 25,
                 border = "rounded",
                 win_options = {
                     winblend = 0,
diff --git a/lua/weeheavy/plugins/trouble.lua b/lua/weeheavy/plugins/trouble.lua
index 9f34071..beb946c 100644
--- a/lua/weeheavy/plugins/trouble.lua
+++ b/lua/weeheavy/plugins/trouble.lua
@@ -2,24 +2,19 @@
 -- list to help you solve all the trouble your code is causing.
 -- https://github.com/folke/trouble.nvim
 return {
-    "folke/trouble.nvim",
-    lazy = false,
-    opts = {
-        open_no_results = true,
-        auto_close = true,
-        indent_guides = false,
-    },
-    keys = {
-        -- TODO: add more keymaps
-        {
-            "<leader>q",
-            "<cmd>Trouble diagnostics toggle filter.buf=0 focus=false<cr>",
-            desc = "Diagnostics (Trouble)",
-        },
-        -- {
-        --     "<leader>z",
-        --     "<cmd>Trouble lsp_document_symbols toggle filter.buf=0 focus=false win.position=right<cr>",
-        --     desc = "Symbols (Trouble)",
-        -- },
-    },
+	"folke/trouble.nvim",
+	lazy = false,
+	keys = {
+		-- TODO: add more keymaps
+		{
+			"<leader>q",
+			"<cmd>Trouble diagnostics toggle filter.buf=0 focus=true<cr>",
+			desc = "Diagnostics (Trouble)",
+		},
+	},
+	opts = {
+		open_no_results = true,
+		auto_close = true,
+		indent_guides = false,
+	},
 }
diff --git a/lua/weeheavy/prefs.lua b/lua/weeheavy/prefs.lua
index cc5dc3e..dcb5caa 100644
--- a/lua/weeheavy/prefs.lua
+++ b/lua/weeheavy/prefs.lua
@@ -76,8 +76,7 @@ vim.opt.timeoutlen = 300
 
 -- Set completeopt to have a better completion experience
 -- https://neovim.io/doc/user/options.html
--- vim.opt.completeopt = "menuone,noselect"
-vim.opt.completeopt = "menuone,noselect,fuzzy,nosort"
+vim.opt.completeopt = "menuone,noselect"
 
 -- Split windows appear below, not above
 vim.opt.splitbelow = true
diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua
index 01a516c..c922287 100644
--- a/lua/weeheavy/remap.lua
+++ b/lua/weeheavy/remap.lua
@@ -69,14 +69,14 @@ vim.keymap.set("n", "J", "mzJ`z")            -- when merging lines, keep cursor
 -- )
 
 -- Apply conform.nvim formatting on keypress (same as on save)
--- vim.keymap.set({ "n", "v" }, "<leader>o", function()
---     local conform = require("conform")
---     conform.format({
---         lsp_fallback = true,
---         async = false,
---         timeout_ms = 500,
---     })
--- end, { desc = "Format file or range (in visual mode)" })
+vim.keymap.set({ "n", "v" }, "<leader>o", function()
+    local conform = require("conform")
+    conform.format({
+        lsp_fallback = true,
+        async = false,
+        timeout_ms = 500,
+    })
+end, { desc = "Format file or range (in visual mode)" })
 
 -- Go to next diagnostic item (any severity)
 vim.keymap.set("n", "<leader>da", function()