diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d9abf9..9cadb44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 -  Minimized colorscheme files in `colors/*.vim` and refactored-out duplicated logic
 -  Removed the long-since deprecated `github_dimmed` theme (use `github_dark_dimmed` instead)
+-  Improved `cmp` highlights (completion menu)
 
 ### Issues Fix
 
diff --git a/lua/github-theme/group/modules/cmp.lua b/lua/github-theme/group/modules/cmp.lua
index db6b58b..98c2706 100644
--- a/lua/github-theme/group/modules/cmp.lua
+++ b/lua/github-theme/group/modules/cmp.lua
@@ -24,7 +24,7 @@ function M.get(spec, config, _opts)
     CmpItemKindDefault       = { fg = spec.fg2, },
     CmpItemMenu              = { link = 'Comment' },
 
-    CmpItemKindKeyword       = { link = 'Identifier' },
+    CmpItemKindKeyword       = { link = 'Keyword' },
 
     CmpItemKindVariable      = { link = has_ts and '@variable' or  'Identifier' },
     CmpItemKindConstant      = { link = has_ts and '@constant' or 'Constant' },
@@ -33,7 +33,7 @@ function M.get(spec, config, _opts)
 
     CmpItemKindFunction      = { link = 'Function' },
     CmpItemKindMethod        = { link = 'Function' },
-    CmpItemKindConstructor   = { link = 'Function' },
+    CmpItemKindConstructor   = { link = has_ts and '@constructor' or 'Type' },
 
     CmpItemKindInterface     = { link = 'Constant' },
     CmpItemKindEvent         = { link = 'Constant' },