diff --git a/lua/astrobox/highlights/modules/core.lua b/lua/astrobox/highlights/modules/core.lua
index f06a47f..d203196 100644
--- a/lua/astrobox/highlights/modules/core.lua
+++ b/lua/astrobox/highlights/modules/core.lua
@@ -12,7 +12,7 @@ return function(palette)
         Directory = { fg = palette.blue, bg = palette.none },
         QuickFixLine = palette.ui.selection,
         MatchParen = { fg = palette.none, bg = palette.none, bold = true, underline = true },
-        Underlined = { fg = palette.cyan, bg = palette.none, underline = true },
+        Underlined = { fg = palette.aqua, bg = palette.none, underline = true },
 
         -- Popup
 
diff --git a/lua/astrobox/highlights/modules/syntax.lua b/lua/astrobox/highlights/modules/syntax.lua
index 1a072aa..dacee2f 100644
--- a/lua/astrobox/highlights/modules/syntax.lua
+++ b/lua/astrobox/highlights/modules/syntax.lua
@@ -11,7 +11,7 @@ return function(palette)
         Error = { fg = palette.red, bg = palette.none },
         Exception = { link = "Keyword" },
         Float = { link = "Number" },
-        Function = { fg = palette.fg_gradiant[1], bg = palette.none },
+        Function = { fg = palette.blue, bg = palette.none },
         Identifier = { fg = palette.fg, bg = palette.none },
         Ignore = { fg = palette.none, bg = palette.none },
         Include = { link = "Keyword" },
@@ -58,16 +58,16 @@ return function(palette)
         ["@character.special"] = { link = "SpecialChar" },
         ["@class"] = { fg = palette.yellow },
         ["@comment"] = { link = "Comment" },
-        ["@comment.documentation"] = { fg = palette.gray, italic = false },
+        ["@comment.documentation"] = { fg = palette.gray, bg = palette.none, nocombine = true },
         ["@conditional"] = { link = "Conditional" },
         ["@constant"] = { link = "Constant" },
         ["@constant.builtin"] = { link = "@constant" },
         ["@constant.macro"] = { link = "@constant" },
-        ["@constructor"] = { fg = palette.fg_gradiant[1], bold = true },
+        ["@constructor"] = { fg = palette.green, bold = true },
         ["@debug"] = { link = "Debug" },
         ["@decorator"] = { fg = palette.orange },
         ["@define"] = { link = "Define" },
-        ["@enum"] = { fg = palette.cyan },
+        ["@enum"] = { fg = palette.aqua },
         ["@enumMember"] = { fg = palette.blue },
         ["@error"] = { link = "Error" },
         ["@event"] = { fg = palette.orange },
@@ -80,19 +80,19 @@ return function(palette)
         ["@interface"] = { fg = palette.orange },
         ["@keyword"] = { link = "Keyword" },
         ["@label"] = { link = "Label" },
-        ["@method"] = { fg = palette.fg_gradiant[1] },
+        ["@method"] = { link = "Function" },
         ["@modifier"] = { fg = palette.orange },
         ["@namespace"] = { fg = palette.fg_gradiant[2] },
         ["@none"] = { link = "Conceal" },
         ["@number"] = { link = "Number" },
         ["@operator"] = { link = "Operator" },
-        ["@parameter"] = { fg = palette.fg_gradiant[1] },
+        ["@parameter"] = { fg = palette.fg_gradiant[2] },
         ["@preproc"] = { link = "PreProc" },
         ["@property"] = { link = "@field" },
         ["@punctuation.bracket"] = { link = "Identifier" },
         ["@punctuation.delimiter"] = { fg = palette.orange },
         ["@punctuation.special"] = { link = "Special" },
-        ["@regexp"] = { fg = palette.cyan },
+        ["@regexp"] = { fg = palette.aqua },
         ["@repeat"] = { link = "Repeat" },
         ["@storageclass"] = { link = "StorageClass" },
         ["@storageclass.lifeTime"] = { fg = palette.purple },
@@ -153,17 +153,20 @@ return function(palette)
         ["@lsp.type.keyword"] = { link = "Keyword" },
         ["@lsp.type.lifeTime"] = { fg = palette.purple },
         ["@lsp.type.method"] = { link = "@method" },
-        ["@lsp.type.namespace"] = { fg = palette.fg_gradiant[1] },
+        ["@lsp.type.namespace"] = { fg = palette.fg_gradiant[2] },
         ["@lsp.type.operator"] = { link = "Operator" },
         ["@lsp.type.parameter"] = { link = "@parameter" },
         ["@lsp.type.property"] = { link = "@property" },
-        ["@lsp.type.selfTypeKeyword"] = { fg = palette.aqua, bold = true },
+        ["@lsp.type.selfTypeKeyword"] = { fg = palette.green, bold = true },
+        ["@lsp.type.string"] = { link = "@string" },
         ["@lsp.type.struct"] = { link = "@struct" },
         ["@lsp.type.typeParameter"] = { link = "@type" },
         ["@lsp.type.variable"] = { link = "@variable" },
         ["@lsp.typemod.class.constructorOrDestructor"] = { link = "@constructor" },
+        ["@lsp.typemod.comment.documentation"] = { link = "@comment.documentation" },
+        ["@lsp.typemod.derive.attribute"] = { fg = palette.blue },
         ["@lsp.typemod.method"] = { link = "@method" },
-        ["@lsp.typemod.selfKeyword"] = { fg = palette.fg_gradiant[1], bold = true },
+        ["@lsp.typemod.selfKeyword"] = { fg = palette.fg, bold = true },
         ["@lsp.typemod.string.attribute"] = { link = "String" }, -- Hmmmm
         ["@lsp.typemod.variable.readonly"] = { link = "Constant" },
     }
diff --git a/lua/astrobox/palette.lua b/lua/astrobox/palette.lua
index 6690120..5f90739 100644
--- a/lua/astrobox/palette.lua
+++ b/lua/astrobox/palette.lua
@@ -33,8 +33,8 @@ return function(config)
         float = {
             title = palette.green,
             title2 = palette.aqua,
-            border = palette.fg_gradiant[2],
-            text = palette.fg_gradiant[1],
+            border = palette.fg_gradiant[3],
+            text = palette.fg_gradiant[2],
             scroll = palette.blue,
         },
         winbar = {
@@ -55,7 +55,7 @@ return function(config)
     palette.other = {
         conceal = palette.bg_gradiant[3],
         hard_bg = palette.harder_bg,
-        bg_active = palette.bg_gradiant[1],
+        bg_active = palette.softer_bg,
 
         -- Special HL group to find what a group maps to
         error_hl = { fg = "#000000", bg = "#FF00FF" },