diff --git a/lua/catppuccin/core/integrations/native_lsp.lua b/lua/catppuccin/core/integrations/native_lsp.lua
index e1f0025..9ec2985 100644
--- a/lua/catppuccin/core/integrations/native_lsp.lua
+++ b/lua/catppuccin/core/integrations/native_lsp.lua
@@ -16,12 +16,18 @@ function M.get(cp)
 		DiagnosticError = { fg = cp.catppuccin5 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
 		DiagnosticWarn = { fg = cp.catppuccin8 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
 		DiagnosticInfo = { fg = cp.catppuccin9 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
-		DiagnosticHint = { fg = cp.catppuccin6 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+		DiagnosticHint = { fg = cp.catppuccin0 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default
+
+		-- for nvim nightly
+		DiagnosticUnderlineError = { style = underlines.errors, sp = cp.catppuccin5 },
+		DiagnosticUnderlineWarn = { style = underlines.warnings, sp = cp.catppuccin8 },
+		DiagnosticUnderlineInfo = { style = underlines.information, sp = cp.catppuccin9 },
+		DiagnosticUnderlineHint = { style = underlines.hints, sp = cp.catppuccin0 },
 
 		LspDiagnosticsDefaultError = { fg = cp.catppuccin5 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
 		LspDiagnosticsDefaultWarning = { fg = cp.catppuccin8 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
 		LspDiagnosticsDefaultInformation = { fg = cp.catppuccin9 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultHint = { fg = cp.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultHint = { fg = cp.catppuccin0 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
 		LspSignatureActiveParameter = { fg = cp.catppuccin6 },
 		-- LspDiagnosticsFloatingError         = { }, -- Used to color "Error" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingWarning       = { }, -- Used to color "Warning" diagnostic messages in diagnostics float
@@ -31,15 +37,15 @@ function M.get(cp)
 		LspDiagnosticsError = { fg = cp.catppuccin5 },
 		LspDiagnosticsWarning = { fg = cp.catppuccin8 },
 		LspDiagnosticsInformation = { fg = cp.catppuccin9 },
-		LspDiagnosticsHint = { fg = cp.hint },
+		LspDiagnosticsHint = { fg = cp.catppuccin0 },
 		LspDiagnosticsVirtualTextError = { fg = cp.catppuccin5, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text
 		LspDiagnosticsVirtualTextWarning = { fg = cp.catppuccin8, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text
 		LspDiagnosticsVirtualTextInformation = { fg = cp.catppuccin9, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text
-		LspDiagnosticsVirtualTextHint = { fg = cp.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text
+		LspDiagnosticsVirtualTextHint = { fg = cp.catppuccin0, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text
 		LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.catppuccin5 }, -- Used to underline "Error" diagnostics
 		LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.catppuccin8 }, -- Used to underline "Warning" diagnostics
 		LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.catppuccin9 }, -- Used to underline "Information" diagnostics
-		LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.hint }, -- Used to underline "Hint" diagnostics
+		LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.catppuccin0 }, -- Used to underline "Hint" diagnostics
 		LspCodeLens = { fg = cp.catppuccin11 }, -- virtual text of the codelens
 	}
 end