diff --git a/lua/lupancolors/lupan.lua b/lua/lupancolors/lupan.lua
index eede955..4647ac7 100644
--- a/lua/lupancolors/lupan.lua
+++ b/lua/lupancolors/lupan.lua
@@ -3,24 +3,25 @@ local hsl = lush.hsl -- We'll use hsl a lot so its nice to bind it separately
 
 ---@diagnostic disable: undefined-global
 local theme = lush(function()
-  local red = hsl(0, 50, 75)
-  local orange = hsl(30, 50, 75)
-  local yellow = hsl(60, 50, 75)
-  local yellow_green = hsl(90, 50, 75)
-  local green = hsl(120, 50, 75)
-  local aquamarine = hsl(150, 50, 75)
-  local cyan = hsl(180, 50, 75)
-  local blue = hsl(210, 50, 75)
-  local lavender = hsl(240, 50, 75)
-  local purple = hsl(270, 50, 75)
-  local fuchsia = hsl(300, 50, 75)
-  local hot_pink = hsl(330, 50, 75)
+  local base = hsl(210, 40, 75)
+  local red = base.hue(0)
+  local orange = base.hue(30)
+  local yellow = base.hue(60)
+  local yellow_green = base.hue(90)
+  local green = base.hue(120)
+  local aquamarine = base.hue(150)
+  local cyan = base.hue(180)
+  local blue = base.hue(210)
+  local lavender = base.hue(240)
+  local purple = base.hue(270)
+  local fuchsia = base.hue(300)
+  local hot_pink = base.hue(330)
   return {
     -- See: h highlight-groups
-    Normal { bg = hsl(blue.h, 15, 20), fg = hsl(blue.h, 20, 75) },
+    Normal { bg = hsl(base.h, 15, 20), fg = hsl(base.h, 30, 75) },
     CursorLine { bg = Normal.bg.li(10) },
-    Visual { bg = hsl(blue.h, 30, 30) },
-    Comment { fg = hsl(blue.h, 10, 60) },
+    Visual { bg = hsl(base.h, 30, 30) },
+    Comment { fg = hsl(base.h, 10, 60) },
     CursorColumn { CursorLine },
     LineNr { Comment, gui = "italic" },
     CursorLineNr { fg = blue, bg = CursorLine.bg, gui = "italic" },
@@ -46,7 +47,7 @@ local theme = lush(function()
     MoreMsg { fg = green, gui = "bold" },
     Question { fg = green, gui = "bold" },
     TelescopeSelection { CursorLine },
-    WhichKeyFloat { bg = hsl(blue.h, 15, 30) },
+    WhichKeyFloat { bg = hsl(base.h, 15, 30) },
     DiagnosticError { fg = red },
     DiagnosticWarn { fg = orange },
     DiagnosticInfo { fg = cyan },
diff --git a/lua/lupancolors/lupanlight.lua b/lua/lupancolors/lupanlight.lua
index 494f7b2..8c288dd 100644
--- a/lua/lupancolors/lupanlight.lua
+++ b/lua/lupancolors/lupanlight.lua
@@ -3,55 +3,71 @@ local hsl = lush.hsl -- We'll use hsl a lot so its nice to bind it separately
 
 ---@diagnostic disable: undefined-global
 local theme = lush(function()
+  local base = hsl(210, 50, 35)
+  local red = base.hue(0)
+  local orange = base.hue(30)
+  local yellow = base.hue(60)
+  local yellow_green = base.hue(90)
+  local green = base.hue(120)
+  local aquamarine = base.hue(150)
+  local cyan = base.hue(180)
+  local blue = base.hue(210)
+  local lavender = base.hue(240)
+  local purple = base.hue(270)
+  local fuchsia = base.hue(300)
+  local hot_pink = base.hue(330)
   return {
     -- See: h highlight-groups
-    Normal { bg = hsl(210, 25, 97), fg = hsl(210, 30, 20) },
+    Normal { bg = hsl(base.h, 25, 97), fg = hsl(blue.h, 30, 20) },
     CursorLine { bg = Normal.bg.da(4) },
-    Visual { bg = hsl(210, 30, 75) },
-    Comment { fg = hsl(210, 10, 50) },
+    Visual { bg = base.de(55).li(65) },
+    Comment { fg = base.de(60).li(20) },
     CursorColumn { CursorLine },
     LineNr { Comment, gui = "italic" },
-    CursorLineNr { fg = hsl(210, 50, 30), bg = CursorLine.bg, gui = "italic" },
-    Search { bg = hsl(50, 15, 60), fg = Normal.fg },
-    IncSearch { bg = hsl(130, 15, 60), fg = Normal.fg },
-    String { fg = hsl(210, 50, 35) },
-    PreProc { fg = hsl(300, 50, 35) },
-    Statement { fg = hsl(10, 50, 35) },
-    Type { fg = hsl(50, 50, 35) },
+    CursorLineNr { fg = blue, bg = CursorLine.bg, gui = "italic" },
+    Search { bg = yellow, fg = Normal.bg },
+    IncSearch { bg = yellow_green, fg = Normal.bg },
+    String { fg = blue },
+    PreProc { fg = lavender },
+    Statement { fg = orange },
+    Type { fg = yellow },
     Identifier { fg = Normal.fg },
-    Function { fg = hsl(130, 50, 35) },
-    Operator { fg = hsl(270, 50, 35) },
-    Special { fg = hsl(325, 50, 35) },
-    Constant { fg = hsl(195, 50, 35) },
+    Function { fg = green },
+    Operator { fg = aquamarine },
+    Special { fg = purple },
+    Constant { fg = cyan },
     NonText { fg = Normal.bg.li(10) },
-    DiffAdd { Function },
-    DiffDelete { Special },
-    DiffChange { String },
+    DiffAdd { fg = green },
+    DiffDelete { fg = red },
+    diffRemoved { fg = red },
+    DiffChange { fg = blue },
+    diffChanged { fg = blue },
     SignColumn { Normal },
     diffAdded { DiffAdd },
-    MoreMsg { Function, gui = "bold" },
-    Question { Function, gui = "bold" },
+    MoreMsg { fg = green, gui = "bold" },
+    Question { fg = green, gui = "bold" },
     TelescopeSelection { CursorLine },
     WhichKeyFloat { bg = Normal.bg.da(5) },
-    DiagnosticError { fg = hsl(0, 80, 35) },
-    DiagnosticWarn { fg = hsl(25, 80, 35) },
-    DiagnosticInfo { fg = hsl(195, 80, 35) },
+    DiagnosticError { fg = red },
+    DiagnosticWarn { fg = orange },
+    DiagnosticInfo { fg = cyan },
     Pmenu { bg = Normal.bg.da(5) },
-    PmenuSel { bg = Normal.bg.da(10) },
-    Error { bg = hsl(0, 50, 65), fg = Normal.fg },
+    PmenuSel { bg = Normal.bg.da(15) },
+    Error { bg = red.da(25), fg = Normal.bg },
     ErrorMsg { Error },
-    MatchParen { bg = hsl(195, 50, 65), fg = Normal.fg },
-    SpecialKey { fg = "red" },
-    Directory { Constant },
-    Title { Operator, gui = "bold" },
+    MatchParen { fg = hot_pink, gui = "bold" },
+    SpecialKey { fg = red },
+    Directory { fg = cyan },
+    Title { fg = fuchsia, gui = "bold" },
     Conceal { bg = Normal.bg.da(15).de(30) },
-    SpellBad { fg = Special.fg, gui = "underline" },
+    SpellBad { fg = red, gui = "underline" },
     SpellRare { fg = Type.fg, gui = "underline" },
-    SpellLocal { fg = Constant.fg, gui = "underline" },
+    SpellLocal { fg = DiagnosticInfo.fg, gui = "underline" },
     SpellCap { fg = String.fg, gui = "underline" },
   }
 end)
 
+
 return theme
 
 -- vi:nowrap:number