diff --git a/nvim/.config/nvim/colors/yolokai.vim b/nvim/.config/nvim/colors/yolokai.vim
index dc8829a..9b10e63 100644
--- a/nvim/.config/nvim/colors/yolokai.vim
+++ b/nvim/.config/nvim/colors/yolokai.vim
@@ -112,8 +112,8 @@ local highlight_groups = {
 	helpHyperTextJump = 'Underlined',
 	helpSpecial       = 'Function'  ,
 	Hint              = {bg=lightblack3,    fg=white,     style='bold'               },
-	Info              = {bg=pink,           fg=black,     style='bold'               },
-	Warning           = {bg=orange,         fg=black,     style='bold'               },
+	Info              = {bg=orange,         fg=black,     style='bold'               },
+	Warning           = {bg=pink,           fg=black,     style='bold'               },
 
 	--[[ 4.2... Editor UI  ]]
 	--[[ 4.2.1. Status Line]]
@@ -175,37 +175,36 @@ local highlight_groups = {
 	--[[ 4.2.10. Messages]]
 	ErrorMsg   = {bg=black,  fg=red,          style=NONE       },
 	HintMsg    = {bg=black,  fg=purple,       style='bold'     },
-	InfoMsg    = {bg=black,  fg=pink,         style='bold'     },
+	InfoMsg    = {bg=black,  fg=orange,       style='bold'     },
 	ModeMsg    = {bg=black,  fg=yellow,       style=NONE       },
-	WarningMsg = {bg=black,  fg=red,          style='bold'     },
+	WarningMsg = {bg=black,  fg=pink,         style='bold'     },
 	Question   = {bg=black,  fg=yellow,       style='underline'},
 
 	--[[ 4.2.11. LSP ]]
-	LspDiagnosticsDefaultError  = 'Error'   ,
-	LspDiagnosticsFloatingError = 'ErrorMsg',
-	LspDiagnosticsSignError     = 'ErrorMsg',
+	LspDiagnosticsDefaultError           = 'ErrorMsg'         ,
+	LspDiagnosticsDefaultWarning         = 'WarningMsg'       ,
+	LspDiagnosticsDefaultInformation     = 'InfoMsg'          ,
+	LspDiagnosticsDefaultHint            = 'HintMsg'          ,
 
-	LspDiagnosticsDefaultWarning  = 'Warning'   ,
-	LspDiagnosticsFloatingWarning = 'WarningMsg',
-	LspDiagnosticsSignWarning     = 'WarningMsg',
+	LspDiagnosticsFloatingError          = 'ErrorMsg'         ,
+	LspDiagnosticsFloatingWarning        = 'WarningMsg'       ,
+	LspDiagnosticsFloatingInformation    = 'InfoMsg'          ,
+	LspDiagnosticsFloatingHint           = 'HintMsg'          ,
 
-	LspDiagnosticsDefaultHint  = 'Hint'   ,
-	LspDiagnosticsFloatingHint = 'HintMsg',
-	LspDiagnosticsSignHint     = 'HintMsg',
+	LspDiagnosticsSignError              = 'ErrorMsg'         ,
+	LspDiagnosticsSignWarning            = 'WarningMsg'       ,
+	LspDiagnosticsSignInformation        = 'InfoMsg'          ,
+	LspDiagnosticsSignHint               = 'HintMsg'          ,
 
-	LspDiagnosticsDefaultInformation  = 'Info'   ,
-	LspDiagnosticsFloatingInformation = 'InfoMsg',
-	LspDiagnosticsSignInformation     = 'InfoMsg',
+	LspDiagnosticsUnderlineError         = {style={'undercurl', color=red    }},
+	LspDiagnosticsUnderlineWarning       = {style={'undercurl', color=pink   }},
+	LspDiagnosticsUnderlineInformation   = {style={'undercurl', color=orange }},
+	LspDiagnosticsUnderlineHint          = {style={'undercurl', color=purple }},
 
-	LspDiagnosticsUnderlineError       = {style={'undercurl', color=red}},
-	LspDiagnosticsUnderlineHint        = {style={'undercurl', color=purple}},
-	LspDiagnosticsUnderlineInformation = {style={'undercurl', color=pink}},
-	LspDiagnosticsUnderlineWarning     = {style={'undercurl', color=red}},
-
-	LspDiagnosticsVirtualTextError       = {color=red},
-	LspDiagnosticsVirtualTextHint        = {color=purple},
-	LspDiagnosticsVirtualTextInformation = {color=pink},
-	LspDiagnosticsVirtualTextWarning     = {color=red},
+	LspDiagnosticsVirtualTextError       = 'ErrorMsg'         ,
+	LspDiagnosticsVirtualTextWarning     = 'WarningMsg'       ,
+	LspDiagnosticsVirtualTextInformation = 'InfoMsg'          ,
+	LspDiagnosticsVirtualTextHint        = 'HintMsg'          ,
 
 	--[[ 4.2.12. Cursor ]]
 	Cursor   = {bg=white,          fg=black, style='inverse'},