diff --git a/colors/highlite.lua b/colors/highlite.lua
index 36314d5..3c99860 100644
--- a/colors/highlite.lua
+++ b/colors/highlite.lua
@@ -873,15 +873,15 @@ local highlight_groups = {
 	TodoFgHACK = function(self) return {fg=self.Todo.fg} end,
 	TodoFgNOTE = 'HintMsg',
 	TodoFgPERF = 'InfoMsg',
-	TodoFgTODO = function(self) return {fg=cyan, style={'italic', 'nocombine'}} end,
+	TodoFgTODO = function(self) return {fg=cyan, style='italic'} end,
 	TodoFgWARN = function(self) return {fg=self.WarningMsg.fg} end,
 
-	TodoBgFIX  = 'Error',
-	TodoBgHACK = function(self) return {fg=black, bg=self.Todo.fg, style={'bold', 'italic'}} end,
-	TodoBgNOTE = 'Hint',
-	TodoBgPERF = 'Info',
+	TodoBgFIX = function(self) return {fg=black, bg=self.ErrorMsg.fg, style={'bold', 'italic', 'nocombine'}} end,
+	TodoBgHACK = function(self) return {fg=black, bg=self.Todo.fg, style={'bold', 'italic', 'nocombine'}} end,
+	TodoBgNOTE = function(self) return {fg=black, bg=self.Hint.bg, style={'bold', 'italic', 'nocombine'}} end,
+	TodoBgPERF = function(self) return {fg=black, bg=self.Info.bg, style={'bold', 'italic', 'nocombine'}} end,
 	TodoBgTODO = function(self) return {fg=black, bg=cyan, style={'bold', 'italic', 'nocombine'}} end,
-	TodoBgWARN = 'Warning',
+	TodoBgWARN = function(self) return {fg=black, bg=self.Warning.bg, style={'bold', 'italic', 'nocombine'}} end,
 
 	TodoSignFIX  = 'TodoFgFIX',
 	TodoSignHACK = 'TodoFgHACK',