diff --git a/modules/nvim/config/colors/winterly.lua b/modules/nvim/config/colors/winterly.lua
index 8fb749a..38d9aa9 100644
--- a/modules/nvim/config/colors/winterly.lua
+++ b/modules/nvim/config/colors/winterly.lua
@@ -72,8 +72,8 @@ hi("Todo", { fg = palette.bg, bg = palette.cyan_bright, ctermbg = "Cyan", ctermf
 
 hi("String", { link = "Constant" })
 hi("Character", { link = "Constant" })
-hi("Number", { link = "Constant" })
-hi("Boolean", { link = "Constant" })
+hi("Number", { link = "Boolean" })
+hi("Boolean", { fg = palette.magenta_bright, bold = true })
 hi("Float", { link = "Number" })
 hi("Function", { link = "Identifier" })
 hi("Conditional", { link = "Statement" })
@@ -96,15 +96,15 @@ hi("SpecialComment", { link = "Special" })
 hi("Debug", { link = "Special" })
 
 hi("DiagnosticError", { fg = palette.red_bright, ctermfg = 1 })
-hi("DiagnosticWarn", { fg = "Orange", ctermfg = 3 })
-hi("DiagnosticInfo", { fg = "LightBlue", ctermfg = 4 })
+hi("DiagnosticWarn", { fg = palette.yellow, ctermfg = 3 })
+hi("DiagnosticInfo", { fg = palette.cyan, ctermfg = 4 })
 hi("DiagnosticHint", { fg = palette.silver, ctermfg = 7 })
-hi("DiagnosticOk", { fg = "LightGreen", ctermfg = 10 })
+hi("DiagnosticOk", { fg = palette.green_bright, ctermfg = 10 })
 hi("DiagnosticUnderlineError", { fg = palette.red_bright, undercurl = true, cterm = { underline = true } })
-hi("DiagnosticUnderlineWarn", { sp = "Orange", undercurl = true, cterm = { underline = true } })
-hi("DiagnosticUnderlineInfo", { sp = "LightBlue", undercurl = true, cterm = { underline = true } })
-hi("DiagnosticUnderlineHint", { sp = "LightGrey", undercurl = true, cterm = { underline = true } })
-hi("DiagnosticUnderlineOk", { sp = "LightGreen", undercurl = true, cterm = { underline = true } })
+hi("DiagnosticUnderlineWarn", { fg = palette.yellow, undercurl = true, cterm = { underline = true } })
+hi("DiagnosticUnderlineInfo", { fg = palette.cyan, undercurl = true, cterm = { underline = true } })
+hi("DiagnosticUnderlineHint", { fg = palette.silver, undercurl = true, cterm = { underline = true } })
+hi("DiagnosticUnderlineOk", { fg = palette.green_bright, undercurl = true, cterm = { underline = true } })
 hi("DiagnosticVirtualTextError", { link = "DiagnosticError" })
 hi("DiagnosticVirtualTextWarn", { link = "DiagnosticWarn" })
 hi("DiagnosticVirtualTextInfo", { link = "DiagnosticInfo" })
@@ -120,7 +120,7 @@ hi("DiagnosticSignWarn", { link = "DiagnosticWarn" })
 hi("DiagnosticSignInfo", { link = "DiagnosticInfo" })
 hi("DiagnosticSignHint", { link = "DiagnosticHint" })
 hi("DiagnosticSignOk", { link = "DiagnosticOk" })
-hi("DiagnosticDeprecated", { sp = "Red", strikethrough = true, cterm = { strikethrough = true } })
+hi("DiagnosticDeprecated", { fg = palette.red, strikethrough = true, cterm = { strikethrough = true } })
 
 hi("DiagnosticUnnecessary", { link = "Unused" })
 hi("LspInlayHint", { link = "NonText" })
@@ -131,6 +131,7 @@ hi("SnippetTabstopActive", { link = "SnippetTabstop" })
 hi("@markup.raw", { link = "Comment" })
 hi("@markup.link", { link = "Identifier" })
 hi("@markup.heading", { link = "Title" })
+hi("@markup.heading.gitcommit", { bg = palette.bg, fg = palette.fg, bold = true })
 hi("@markup.link.url", { link = "Underlined" })
 hi("@markup.underline", { link = "Underlined" })
 hi("@comment.todo", { link = "Todo" })
@@ -302,4 +303,15 @@ else
   -- Neogit
   hi("NeogitDiffAdd", { link = "DiffAdd" })
   hi("NeogitDiffDelete", { link = "DiffDelete" })
+  hi("NeogitDiffContext", { bg = palette.bg_secondary, fg = palette.fg })
+  hi("NeogitDiffContextCursor", { bg = palette.grey_bright, fg = palette.bg_secondary })
+  hi("NeogitDiffAddCursor", { bg = palette.green_bright, fg = palette.green_subtle_bg })
+  hi("NeogitDiffDeleteCursor", { bg = palette.red_bright, fg = palette.red_subtle_bg })
+  hi("NeogitDiffContextHighlight", { link = "NeogitDiffContext" })
+  hi("NeogitDiffAddHighlight", { link = "DiffAdd" })
+  hi("NeogitDiffDeleteHighlight", { link = "DiffDelete" })
+  hi("NeogitHunkHeader", { bg = palette.bg_secondary, fg = palette.grey_bright })
+  hi("NeogitHunkMergeHeader", { link = "NeogitHunkHeader" })
+  hi("NeogitHunkHeaderHighlight", { bg = palette.magenta_subtle_bg, fg = palette.magenta_brighter })
+  hi("NeogitHunkHeaderCursor", { link = "NeogitHunkHeaderHighlight" })
 end