diff --git a/lazy-lock.json b/lazy-lock.json
index 0206dc5..290f6e9 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,22 +1,22 @@
 {
-  "cp.nvim": { "branch": "main", "commit": "3a5917711b2f23e39aa5f11fcea3bdef0094b240" },
-  "diffs.nvim": { "branch": "main", "commit": "dfebc68a1fc3e93dae5b6d49133243ec1886cb19" },
+  "canola.nvim": { "branch": "main", "commit": "e90508c459e7f6689c10c12958ce4e8869af0f08" },
+  "cp.nvim": { "branch": "main", "commit": "48c08825b24e1da650d8ad321a0e3318c16175b7" },
+  "diffs.nvim": { "branch": "main", "commit": "749a21ae3c5c1f419120765357fdcce29374f24a" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
-  "fzf-lua": { "branch": "main", "commit": "9004cbb4c065a32b690e909c49903967b45301eb" },
+  "fzf-lua": { "branch": "main", "commit": "cfc085749d9232373fc6d8cf3a964c5601a7816e" },
   "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
   "gruvbox.nvim": { "branch": "main", "commit": "561126520034a1dac2f78ab063db025d12555998" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "nonicons.nvim": { "branch": "main", "commit": "5426ec037f2a295ae687fa9d4def290fb044e3e8" },
+  "nonicons.nvim": { "branch": "main", "commit": "91609349d2bda36338eb730c9c9383d313317b0a" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" },
-  "nvim-surround": { "branch": "main", "commit": "2800277e75eda268df2bfab6ebc53e2635455318" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" },
+  "nvim-surround": { "branch": "main", "commit": "5553dd1fbb3559abb176a8227a12e8f1cab07e93" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
   "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
-  "oil-git.nvim": { "branch": "main", "commit": "c99db7b1dd8dd500c3ec530dc07000dfbeb6e080" },
-  "oil.nvim": { "branch": "master", "commit": "48fc83a9978c5f25833634700c08be583ee78eb7" },
+  "nvim-web-devicons": { "branch": "master", "commit": "16d919d768b5bc2921bd7d5a4ee76f158f7ea1c0" },
+  "oil-git.nvim": { "branch": "fix/signcolumn-utf8-and-callback", "commit": "4ece09abfd7dafb8b803873ba7f11b13d6c7325c" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
index 6fac969..a7adede 100644
--- a/lua/plugins/oil.lua
+++ b/lua/plugins/oil.lua
@@ -1,40 +1,34 @@
 return {
-    'stevearc/oil.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons', 'malewicz1337/oil-git.nvim' },
-    config = function(_, opts)
-        require('oil').setup(opts)
-        require('oil-git').setup({
-            show_ignored_files = false,
-            show_ignored_directories = false,
-            debounce_ms = 300,
-        })
-        vim.api.nvim_create_autocmd('BufEnter', {
-            callback = function()
-                if vim.bo.filetype == '' then
-                    local path = vim.fn.expand('%:p')
-                    if vim.fn.isdirectory(path) == 1 then
-                        vim.cmd('Oil ' .. path)
-                    end
-                end
-            end,
-            group = vim.api.nvim_create_augroup('AOil', { clear = true }),
-        })
+    'barrettruth/canola.nvim',
+    dependencies = {
+        'nvim-tree/nvim-web-devicons',
+        {
+            'barrettruth/oil-git.nvim',
+            branch = 'fix/signcolumn-utf8-and-callback',
+            opts = {
+                show_ignored_files = false,
+                show_ignored_directories = false,
+                debounce_ms = 300,
+            },
+        },
+    },
+    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,
-    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',
-        },
-    },
 }
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index 6289716..1705f4c 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -23,15 +23,15 @@ return {
                 theme = 'gruvbox',
                 icons_enabled = false,
                 component_separators = '',
-                section_separators = '',
+                section_separators = { left = '', right = '' },
             },
             sections = {
                 lualine_a = { 'mode' },
-                lualine_b = { 'branch', 'diff' },
+                lualine_b = { 'FugitiveHead', 'diff' },
                 lualine_c = { { 'filename', path = 1 } },
                 lualine_x = { 'diagnostics' },
                 lualine_y = { 'filetype' },
-                lualine_z = { 'location' },
+                lualine_z = { 'progress' },
             },
         },
     },