diff --git a/lua/neogit/lib/hl.lua b/lua/neogit/lib/hl.lua
index 6b5ce7ab9..5df42b432 100644
--- a/lua/neogit/lib/hl.lua
+++ b/lua/neogit/lib/hl.lua
@@ -118,13 +118,13 @@ function M.setup()
     NeogitGraphBoldPurple = { fg = palette.purple, bold = true },
     NeogitGraphBoldGray = { fg = palette.grey, bold = true },
     NeogitHunkHeader = { fg = palette.bg0, bg = palette.grey, bold = true },
-    NeogitHunkHeaderHighlight = { fg = palette.bg0, bg = palette.md_purple, bold = true },
-    NeogitDiffContext = { bg = palette.bg1 },
-    NeogitDiffContextHighlight = { bg = palette.bg2 },
+    NeogitHunkHeaderHighlight = { fg = palette.bg0, bg = palette.md_purple, bold = true, nocombine = false },
+    NeogitDiffContext = { bg = palette.bg1, nocombine = false },
+    NeogitDiffContextHighlight = { bg = palette.bg2, nocombine = false },
     NeogitDiffAdd = { bg = palette.line_green, fg = palette.bg_green },
-    NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green },
+    NeogitDiffAddHighlight = { bg = palette.line_green, fg = palette.green, nocombine = false },
     NeogitDiffDelete = { bg = palette.line_red, fg = palette.bg_red },
-    NeogitDiffDeleteHighlight = { bg = palette.line_red, fg = palette.red },
+    NeogitDiffDeleteHighlight = { bg = palette.line_red, fg = palette.red, nocombine = false },
     NeogitPopupSectionTitle = { link = "Function" },
     NeogitPopupBranchName = { link = "String" },
     NeogitPopupBold = { bold = true },
@@ -142,7 +142,7 @@ function M.setup()
     NeogitFilePath = { fg = palette.blue, italic = true },
     NeogitCommitViewHeader = { bg = palette.bg_cyan, fg = palette.bg0 },
     NeogitDiffHeader = { bg = palette.bg3, fg = palette.blue, bold = true },
-    NeogitDiffHeaderHighlight = { bg = palette.bg3, fg = palette.orange, bold = true },
+    NeogitDiffHeaderHighlight = { bg = palette.bg3, fg = palette.orange, bold = true, nocombine = false },
     NeogitNotificationInfo = { link = "DiagnosticInfo" },
     NeogitNotificationWarning = { link = "DiagnosticWarn" },
     NeogitNotificationError = { link = "DiagnosticError" },
@@ -158,7 +158,7 @@ function M.setup()
     NeogitStash = { link = "Comment" },
     NeogitRebaseDone = { link = "Comment" },
     NeogitCursorLine = { bg = palette.bg1 },
-    NeogitFold = { fg = "None", bg = "None" },
+    NeogitFold = { fg = "NONE", bg = "NONE" },
     NeogitChangeModified = { fg = palette.bg_blue, bold = true, italic = true },
     NeogitChangeAdded = { fg = palette.bg_green, bold = true, italic = true },
     NeogitChangeDeleted = { fg = palette.bg_red, bold = true, italic = true },