diff --git a/lazy-lock.json b/lazy-lock.json
index 4f4f43e..fd7225c 100755
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -10,10 +10,10 @@
   "catppuccin": { "branch": "main", "commit": "c4d475e4b5684747cde9b3f849186af7837d4397" },
   "chezmoi.nvim": { "branch": "main", "commit": "ad26a6c4f5be0c348612518fcb1b7116649e026f" },
   "chezmoi.vim": { "branch": "main", "commit": "73b30df35c6b645ebd2e6a440eea8463ef3c3f47" },
+  "codediff.nvim": { "branch": "main", "commit": "d21a9a3ec5b46c92b38f4ad2e950b76b152151d5" },
   "conform.nvim": { "branch": "master", "commit": "40dcec5555f960b0a04340d76eabdf4efe78599d" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "edgy.nvim": { "branch": "main", "commit": "8bfd2808994a988c975694122f68624b8a219f5f" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
diff --git a/lua/plugins/codediff.lua b/lua/plugins/codediff.lua
new file mode 100644
index 0000000..23e5251
--- /dev/null
+++ b/lua/plugins/codediff.lua
@@ -0,0 +1,17 @@
+-- Codediff configuration
+-- VSCode-style diff rendering with two-tier highlighting
+return {
+  "esmuellert/codediff.nvim",
+  cmd = "CodeDiff",
+  opts = {
+    diff = {
+      layout = "side-by-side",
+      disable_inlay_hints = true,
+      ignore_trim_whitespace = false,
+      hide_merge_artifacts = false,
+      cycle_next_hunk = true,
+      cycle_next_file = true,
+      jump_to_first_change = true,
+    },
+  },
+}
diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua
deleted file mode 100644
index 530a5f8..0000000
--- a/lua/plugins/diffview.lua
+++ /dev/null
@@ -1,26 +0,0 @@
--- Diffview configuration
--- A single tabpage interface for easily cycling through diffs
-return {
-  "sindrets/diffview.nvim",
-  -- Load only when these commands are used
-  cmd = {
-    "DiffviewOpen",      -- Open diff view
-    "DiffviewClose",     -- Close diff view
-    "DiffviewToggleFiles", -- Toggle file panel
-    "DiffviewFocusFiles", -- Focus file panel
-    "DiffviewFileHistory", -- Show file history
-    "DiffviewRefresh",   -- Refresh diff view
-  },
-  opts = {
-    -- Enable enhanced diff highlighting
-    enhanced_diff_hl = true,
-    view = {
-      merge_tool = {
-        -- Use 4-way diff layout for merge conflicts
-        layout = "diff4_mixed",
-        -- Disable LSP diagnostics in diff view
-        disable_diagnostics = true,
-      },
-    },
-  },
-}