diff --git a/modules/nvim/config/colors/winterly.lua b/modules/nvim/config/colors/winterly.lua
index 787694b..790f5c2 100644
--- a/modules/nvim/config/colors/winterly.lua
+++ b/modules/nvim/config/colors/winterly.lua
@@ -64,10 +64,11 @@ hi("FloatFooter", { link = "Title" })
 hi("FloatShadow", { bg = palette.bg, blend = 80 })
 hi("FloatShadowThrough", { bg = palette.bg, blend = 100 })
 hi("RedrawDebugNormal", { reverse = true, cterm = { reverse = true } })
-hi("RedrawDebugClear", { bg = "Yellow", ctermbg = "Yellow" })
-hi("RedrawDebugComposed", { bg = "Green", ctermbg = "Green" })
-hi("RedrawDebugRecompose", { bg = "Red", ctermbg = "Red" })
-hi("Error", { fg = "White", bg = "Red", ctermfg = "White", ctermbg = "Red" })
+hi("RedrawDebugClear", { bg = palette.yellow_subtle_bg, ctermbg = "DarkYellow" })
+hi("RedrawDebugComposed", { bg = palette.green_subtle_bg, ctermbg = "DarkGreen" })
+hi("RedrawDebugRecompose", { bg = palette.red_subtle_bg, ctermbg = "DarkRed" })
+hi("Error", { link = "ErrorMsg" })
+hi("NvimInternalError", { link = "ErrorMsg" })
 hi("Todo", { fg = palette.bg, bg = palette.cyan_bright, ctermbg = "Cyan", ctermfg = "Black" })
 
 hi("String", { link = "Constant" })
@@ -209,8 +210,8 @@ if vim.o.background == "light" then
   -- TODO: Define light scheme
 else
   -- Default colors only used with a dark background.
-  hi("ColorColumn", { bg = "DarkRed", ctermbg = "DarkRed" })
-  hi("CursorColumn", { bg = "Grey40", ctermbg = "DarkGrey" })
+  hi("ColorColumn", { bg = palette.red_subtle_bg, ctermbg = "DarkRed" })
+  hi("CursorColumn", { bg = palette.grey, ctermbg = "DarkGrey" })
   hi("CursorLine", { bg = palette.magenta_subtle_bg_darker, cterm = { underline = true } })
   hi("CursorLineNr", {
     fg = palette.fg,
@@ -222,12 +223,12 @@ else
   hi("DiffAdd", { fg = palette.green_bright, bg = palette.green_subtle_bg, ctermbg = "DarkGreen" })
   hi("DiffChange", { fg = palette.yellow_brighter, bg = palette.yellow_subtle_bg, ctermbg = "DarkYellow" })
   hi("DiffDelete", { fg = palette.red_bright, bg = palette.red_subtle_bg, ctermbg = "DarkRed" })
-  hi("Directory", { fg = "Cyan", ctermfg = "LightCyan" })
-  hi("FoldColumn", { fg = "Cyan", bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
-  hi("Folded", { fg = "Cyan", bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
+  hi("Directory", { fg = palette.magenta, bold = true, ctermfg = "Magenta" })
+  hi("FoldColumn", { fg = palette.cyan_bright, bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
+  hi("Folded", { fg = palette.cyan_bright, bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
   hi("LineNr", { fg = palette.grey_bright, ctermfg = "Grey" })
   hi("MatchParen", { fg = palette.fg_alt, bg = palette.magenta_subtle_bg, ctermbg = "DarkMagenta", ctermfg = "Black" })
-  hi("MoreMsg", { fg = "SeaGreen", bold = true, ctermfg = "LightGreen" })
+  hi("MoreMsg", { fg = palette.grey, ctermfg = "DarkGrey" })
   hi("Pmenu", { bg = palette.bg_secondary, ctermfg = "White", ctermbg = "Black" })
   hi("PmenuSel", {
     bg = palette.magenta_subtle_bg,
@@ -236,8 +237,8 @@ else
     ctermfg = "LightMagenta",
     ctermbg = "DarkMagenta",
   })
-  hi("PmenuThumb", { bg = "White", ctermbg = "White" })
-  hi("Question", { fg = "Green", bold = true, ctermfg = "LightGreen" })
+  hi("PmenuThumb", { bg = palette.fg, ctermbg = "White" })
+  hi("Question", { fg = palette.green_bright, bold = true, ctermfg = "LightGreen" })
   hi("Search", { link = "IncSearch" })
   hi("Substitute", {
     fg = palette.green_bright,
@@ -247,16 +248,20 @@ else
     ctermbg = "LightBlue",
   })
   hi("SignColumn", { fg = palette.grey_bright, bg = palette.bg, ctermfg = "Cyan", ctermbg = "DarkGrey" })
-  hi("SpecialKey", { fg = "Cyan", ctermfg = "LightBlue" })
-  hi("SpellBad", { sp = "Red", undercurl = true, ctermbg = "Red" })
-  hi("SpellCap", { sp = "Blue", undercurl = true, ctermbg = "Blue" })
-  hi("SpellLocal", { sp = "Cyan", undercurl = true, ctermbg = "Cyan" })
-  hi("SpellRare", { sp = "Magenta", undercurl = true, ctermbg = "Magenta" })
-  hi(
-    "StatusLineTerm",
-    { fg = "Black", bg = "LightGreen", bold = true, ctermfg = "Black", ctermbg = "LightGreen", cterm = { bold = true } }
-  )
-  hi("StatusLineTermNC", { fg = "Black", bg = "LightGreen", ctermfg = "Black", ctermbg = "LightGreen" })
+  hi("SpecialKey", { fg = palette.cyan_bright, ctermfg = "LightBlue" })
+  hi("SpellBad", { fg = palette.red, undercurl = true, ctermbg = "Red" })
+  hi("SpellCap", { fg = palette.blue, undercurl = true, ctermbg = "Blue" })
+  hi("SpellLocal", { fg = palette.cyan, undercurl = true, ctermbg = "Cyan" })
+  hi("SpellRare", { fg = palette.magenta, undercurl = true, ctermbg = "Magenta" })
+  hi("StatusLineTerm", {
+    fg = palette.bg,
+    bg = palette.green_bright,
+    bold = true,
+    ctermfg = "Black",
+    ctermbg = "LightGreen",
+    cterm = { bold = true },
+  })
+  hi("StatusLineTermNC", { fg = palette.bg, bg = palette.green_bright, ctermfg = "Black", ctermbg = "LightGreen" })
   hi(
     "TabLine",
     { bg = palette.grey, underline = true, ctermfg = "White", ctermbg = "DarkGrey", cterm = { underline = true } }
@@ -266,20 +271,23 @@ else
     "Visual",
     { fg = palette.magenta_brighter, bg = palette.magenta_subtle_bg, ctermfg = "LightMagenta", ctermbg = "DarkMagenta" }
   )
-  hi("WarningMsg", { fg = "Red", ctermfg = "LightRed" })
+  hi("WarningMsg", { fg = palette.red_bright, ctermfg = "LightRed" })
   hi("Comment", { fg = palette.grey, ctermfg = "Cyan" })
   hi("Unused", { fg = palette.grey_bright, undercurl = true, ctermfg = "LightGrey" })
   hi("Constant", { fg = palette.yellow_brighter, ctermfg = "LightYellow" })
   hi("Special", { fg = palette.silver, ctermfg = "LightGrey" })
   hi("Identifier", { fg = palette.fg, bold = true, ctermfg = "White", cterm = { bold = true } })
   hi("Statement", { fg = palette.fg_alt, italic = true, ctermfg = "White" })
-  hi("PreProc", { fg = "#ff80ff", ctermfg = "LightBlue" })
+  hi("PreProc", { fg = palette.magenta, ctermfg = "LightMagenta" })
   hi("Type", { fg = palette.silver, bold = true, ctermfg = "LightCyan" })
-  hi("Underlined", { fg = "#80a0ff", underline = true, ctermfg = "LightBlue", cterm = { underline = true } })
-  hi("Ignore", { ctermfg = "Black" })
-  hi("Added", { fg = "LimeGreen", ctermfg = "Green" })
-  hi("Changed", { fg = "DodgerBlue", ctermfg = "Blue" })
-  hi("Removed", { fg = "Red", ctermfg = "Red" })
+  hi("Underlined", { fg = palette.silver, underline = true, ctermfg = "LightGrey", cterm = { underline = true } })
+  hi("Ignore", { fg = palette.bg, ctermfg = "Black" })
+  hi(
+    "Added",
+    { fg = palette.green_bright, bg = palette.green_subtle_bg, ctermfg = "LightGreen", ctermbg = "DarkGreen" }
+  )
+  hi("Changed", { fg = palette.blue_bright, bg = palette.blue_subtle_bg, ctermfg = "LightBlue", ctermbg = "DarkBlue" })
+  hi("Removed", { fg = palette.red_bright, bg = palette.red_subtle_bg, ctermfg = "LightRed", ctermbg = "DarkRed" })
 
   -- Snacks
   hi("SnacksIndentScope", { fg = palette.magenta, ctermfg = "LightGrey" })