diff --git a/dots/.config/nvim/after/ftplugin/NeogitPopup.lua b/dots/.config/nvim/after/ftplugin/NeogitPopup.lua
new file mode 100644
index 00000000..109e3a4f
--- /dev/null
+++ b/dots/.config/nvim/after/ftplugin/NeogitPopup.lua
@@ -0,0 +1 @@
+vim.opt_local.list = false
diff --git a/dots/.config/nvim/lua/plugins/configs/indent-blankline.lua b/dots/.config/nvim/lua/plugins/configs/indent-blankline.lua
index feecff28..871eed52 100755
--- a/dots/.config/nvim/lua/plugins/configs/indent-blankline.lua
+++ b/dots/.config/nvim/lua/plugins/configs/indent-blankline.lua
@@ -19,6 +19,7 @@ g.indent_blankline_filetype_exclude = {
     "lazy",
     "NeogitStatus",
     "NeogitHelpPopup",
+    "NeogitPopup",
     "NeogitLogView",
 }
 
diff --git a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
index fded2378..3e206e37 100644
--- a/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
+++ b/dots/.config/nvim/lua/plugins/configs/kanagawa.lua
@@ -25,12 +25,36 @@ require("kanagawa").setup({
     overrides = function(palette)
         local colors = palette.palette
         local overrides = {
-            NeogitHunkHeader = { fg = colors.oniViolet, bg = colors.sumiInk1 },
-            NeogitHunkHeaderHighlight = { fg = colors.winterYellow, bg = colors.oldWhite },
-            NeogitDiffContextHighlight = { link = "CursorLine" },
-            NeogitDiffDelete = { bg = colors.winterRed, fg = colors.autumnRed },
-            NeogitDiffAdd = { bg = colors.winterGreen, fg = colors.autumnGreen },
-            NeogitCommitViewHeader = { fg = colors.autumnGreen, bg = colors.sumiInk0 },
+            DiffAdd = { bg = colors.winterGreen, fg = colors.autumnGreen },
+            DiffDelete = { bg = colors.winterREd, fg = colors.autumnRed },
+            NeogitPopupSectionTitle = { fg = colors.crystalBlue },
+            NeogitPopupConfigEnabled = { fg = colors.springBlue, italic = true },
+            NeogitPopupActionkey = { fg = colors.surimiOrange },
+            NeogitPopupConfigKey = { fg = colors.peachRed },
+            NeogitHunkHeader = { fg = colors.crystalBlue, bg = colors.sumiInk2 },
+            NeogitHunkHeaderHighlight = { fg = colors.roninYellow, bg = colors.sumiInk1 },
+            NeogitBranch = { fg = colors.autumnYellow, bold = true },
+            NeogitRemote = { fg = colors.carpYellow, bold = true },
+            NeogitDiffContext = { bg = colors.sumiInk3 },
+            NeogitDiffContextHighlight = { bg = colors.sumiInk4 },
+            NeogitCursorLine = { link = "CursorLine" },
+            NeogitDiffDelete = { link = "DiffDelete" },
+            NeogitDiffDeleteHighlight = { link = "DiffDelete" },
+            NeogitDiffHeader = { fg = colors.oniViolet, bg = colors.sumiInk0, bold = true },
+            NeogitDiffHeaderHighlight = { fg = colors.sakuraPink, bg = colors.sumiInk0, bold = true },
+            NeogitDiffAdd = { link = "DiffAdd" },
+            NeogitDiffAddHighlight = { link = "DiffAdd" },
+            NeogitStagedChanges = { fg = colors.surimiOrange, bold = true },
+            NeogitUnpulledChanges = { fg = colors.peachRed, bold = true },
+            NeogitUnmergedChanges = { fg = colors.springGreen, bold = true },
+            NeogitUnstagedChanges = { fg = colors.peachRed, bold = true },
+            NeogitUntrackedFiles = { fg = colors.peachRed, bold = true },
+            NeogitRecentCommits = { fg = colors.crystalBlue, bold = true },
+            NeogitCommitViewHeader = { fg = colors.crystalBlue, bold = true, italic = true },
+            NeogitFilePath = { fg = colors.autumnYellow, italic = true },
+            NeogitNotificationInfo = { fg = colors.springGreen, bold = true },
+            NeogitNotificationWarning = { fg = colors.roninYellow, bold = true },
+            NeogitNotificationError = { fg = colors.samuraiRed, bold = true },
             menuSel = { bg = colors.sumiInk0, fg = "NONE" },
             Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 },
             CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" },
diff --git a/dots/.config/nvim/lua/plugins/plugins.lua b/dots/.config/nvim/lua/plugins/plugins.lua
index a14e1cf8..93d1e2b2 100755
--- a/dots/.config/nvim/lua/plugins/plugins.lua
+++ b/dots/.config/nvim/lua/plugins/plugins.lua
@@ -461,6 +461,7 @@ lazy.setup({
     -- Better Git integration
     {
         "NeogitOrg/neogit",
+        dev = true,
         lazy = true,
         opts = {
             disable_insert_on_commit = "auto",