diff --git a/lazy-lock.json b/lazy-lock.json
index 5219f49..8d1b674 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,24 +1,24 @@
 {
-  "canola.nvim": { "branch": "main", "commit": "e90508c459e7f6689c10c12958ce4e8869af0f08" },
-  "cp.nvim": { "branch": "main", "commit": "48c08825b24e1da650d8ad321a0e3318c16175b7" },
-  "diffs.nvim": { "branch": "main", "commit": "749a21ae3c5c1f419120765357fdcce29374f24a" },
+  "cp.nvim": { "branch": "main", "commit": "031d5314365a1a7175f51a659102e05549583bbc" },
+  "diffs.nvim": { "branch": "main", "commit": "97919cf25406b4fe4cbc2b667c19bff13e84746b" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "fzf-lua": { "branch": "main", "commit": "cfc085749d9232373fc6d8cf3a964c5601a7816e" },
-  "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
+  "fzf-lua": { "branch": "main", "commit": "d32b062b073583f99c42d272ecaf043fb0694d37" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
   "gruvbox.nvim": { "branch": "main", "commit": "561126520034a1dac2f78ab063db025d12555998" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "nonicons.nvim": { "branch": "main", "commit": "91609349d2bda36338eb730c9c9383d313317b0a" },
+  "nonicons.nvim": { "branch": "main", "commit": "ec719318373914e5f5f060c545b06cc3fa4a8e95" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" },
-  "nvim-surround": { "branch": "main", "commit": "5553dd1fbb3559abb176a8227a12e8f1cab07e93" },
+  "nvim-lspconfig": { "branch": "master", "commit": "2163c54bb6cfec53e3e555665ada945b8c8331b9" },
+  "nvim-surround": { "branch": "main", "commit": "61319d4bd1c5e336e197defa15bd104c51f0fb29" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "0bc4ef0a34d80fd6e67b59bd71fcbb0ef9ef4756" },
   "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "16d919d768b5bc2921bd7d5a4ee76f158f7ea1c0" },
-  "oil-git.nvim": { "branch": "fix/signcolumn-utf8-and-callback", "commit": "4ece09abfd7dafb8b803873ba7f11b13d6c7325c" },
-  "preview.nvim": { "branch": "main", "commit": "7895b67c21d9cabcf9a3ff3bfb107754027127fa" },
+  "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" },
+  "oil-git.nvim": { "branch": "main", "commit": "6c92acdbae04dce8a4a2302c3a5dd264bd337456" },
+  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
+  "preview.nvim": { "branch": "main", "commit": "39406c559cf90255bc3046df0dbad48b7c1e8319" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
-  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
+  "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }
 }
diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua
index 54dad5a..982fcb2 100644
--- a/lua/plugins/git.lua
+++ b/lua/plugins/git.lua
@@ -69,6 +69,7 @@ return {
     },
     {
         'barrettruth/diffs.nvim',
+        enabled = true,
         init = function()
             vim.g.diffs = {
                 fugitive = {
@@ -79,7 +80,7 @@ return {
                 hide_prefix = true,
                 highlights = {
                     gutter = true,
-                    blend_alpha = 0.4,
+                    blend_alpha = 0.2,
                     intra = { enabled = true },
                 },
             }
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index a7adede..61d22cf 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -1,10 +1,9 @@
 return {
-    'barrettruth/canola.nvim',
+    'stevearc/oil.nvim',
     dependencies = {
         'nvim-tree/nvim-web-devicons',
         {
-            'barrettruth/oil-git.nvim',
-            branch = 'fix/signcolumn-utf8-and-callback',
+            'malewicz1337/oil-git.nvim',
             opts = {
                 show_ignored_files = false,
                 show_ignored_directories = false,
@@ -12,22 +11,22 @@ return {
             },
         },
     },
+    opts = {
+        default_file_explorer = true,
+        columns = { 'icon' },
+        view_options = { show_hidden = true },
+        keymaps = {
+            ['g?'] = 'actions.show_help',
+            ['<CR>'] = 'actions.select',
+            ['<C-v>'] = 'actions.select_vsplit',
+            ['<C-x>'] = 'actions.select_split',
+            ['<C-p>'] = 'actions.preview',
+            ['<C-c>'] = 'actions.close',
+            ['-'] = 'actions.parent',
+            ['g.'] = 'actions.toggle_hidden',
+        },
+    },
     init = function()
-        vim.g.oil = {
-            default_file_explorer = true,
-            columns = { 'icon' },
-            view_options = { show_hidden = true },
-            keymaps = {
-                ['g?'] = 'actions.show_help',
-                ['<CR>'] = 'actions.select',
-                ['<C-v>'] = 'actions.select_vsplit',
-                ['<C-x>'] = 'actions.select_split',
-                ['<C-p>'] = 'actions.preview',
-                ['<C-c>'] = 'actions.close',
-                ['-'] = 'actions.parent',
-                ['g.'] = 'actions.toggle_hidden',
-            },
-        }
         map('n', '-', '<cmd>Oil<cr>')
         map('n', '<leader>e', '<cmd>Oil<cr>')
     end,