diff --git a/lazy-lock.json b/lazy-lock.json
index c80bd91..c76f52b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -56,7 +56,6 @@
   "schemastore.nvim": { "branch": "main", "commit": "ff73799fc8df725d51eada87a113581ba4d3717b" },
   "solarized.nvim": { "branch": "master", "commit": "fe02ed49cc017cc93657bd6306a2624394611c69" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
-  "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
   "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua
index 5c3543e..9995386 100755
--- a/lua/custom/plugins/oil.lua
+++ b/lua/custom/plugins/oil.lua
@@ -39,12 +39,30 @@ return {
       },
     })
 
-    -- Monokai-like highlights
-    vim.api.nvim_set_hl(0, 'OilDir', { fg = '#A6E22E' })
-    vim.api.nvim_set_hl(0, 'OilFile', { fg = '#D3D0C8' })
-    vim.api.nvim_set_hl(0, 'OilHiddenFile', { fg = '#75715E' })
-    vim.api.nvim_set_hl(0, 'OilProgress', { fg = '#66D9EF' })
-    vim.api.nvim_set_hl(0, 'OilSymlink', { fg = '#F92672' })
+    -- Theme-aware highlights for oil
+    local function set_oil_highlights()
+      if vim.o.background == 'dark' then
+        -- Monokai colors
+        vim.api.nvim_set_hl(0, 'OilDir', { fg = '#A6E22E' })
+        vim.api.nvim_set_hl(0, 'OilFile', { fg = '#D3D0C8' })
+        vim.api.nvim_set_hl(0, 'OilHiddenFile', { fg = '#75715E' })
+        vim.api.nvim_set_hl(0, 'OilProgress', { fg = '#66D9EF' })
+        vim.api.nvim_set_hl(0, 'OilSymlink', { fg = '#F92672' })
+      else
+        -- Solarized light colors
+        vim.api.nvim_set_hl(0, 'OilDir', { fg = '#859900' })
+        vim.api.nvim_set_hl(0, 'OilFile', { fg = '#657B83' })
+        vim.api.nvim_set_hl(0, 'OilHiddenFile', { fg = '#93A1A1' })
+        vim.api.nvim_set_hl(0, 'OilProgress', { fg = '#268BD2' })
+        vim.api.nvim_set_hl(0, 'OilSymlink', { fg = '#D30102' })
+      end
+    end
+
+    set_oil_highlights()
+    vim.api.nvim_create_autocmd('OptionSet', {
+      pattern = 'background',
+      callback = set_oil_highlights,
+    })
 
     -- Add selected file in oil.nvim to Harpoon (only when in oil buffer)
     vim.keymap.set('n', '<leader>a', function()