diff --git a/lua/paper-tonic-modern/colors.lua b/lua/paper-tonic-modern/colors.lua
index a0a9cf7..546180b 100644
--- a/lua/paper-tonic-modern/colors.lua
+++ b/lua/paper-tonic-modern/colors.lua
@@ -104,6 +104,7 @@ M.diag_error = {'#ff0066', 197, 'red'}        -- Hot pink-red (screams "error!")
 M.diag_warn = {'#ff6600', 202, 'red'}         -- Fluorescent orange (warnings)
 M.diag_info = {'#00ccff', 45, 'cyan'}         -- Bright fluorescent cyan (info - more prominent)
 M.diag_hint = {'#66e0ff', 81, 'cyan'}         -- Softer fluorescent cyan (hint - less prominent)
+M.diag_hint_dark = {'#0099cc', 38, 'cyan'}    -- Darker cyan for UI elements (readable on white)
 
 -- LSP Diagnostic backgrounds - Light tinted versions for highlighting code
 M.bg_diag_error = {'#ffe6f0', 224, 'white'}   -- Very light pink (for error backgrounds)
diff --git a/lua/paper-tonic-modern/groups/editor.lua b/lua/paper-tonic-modern/groups/editor.lua
index 06e6ae8..8c4dfce 100644
--- a/lua/paper-tonic-modern/groups/editor.lua
+++ b/lua/paper-tonic-modern/groups/editor.lua
@@ -10,7 +10,7 @@ return {
   
   Normal = { fg = c.fg, bg = c.bg },
   NormalFloat = { fg = c.fg, bg = c.bg },
-  FloatBorder = { fg = c.diag_hint, bg = c.bg },
+  FloatBorder = { fg = c.diag_hint_dark, bg = c.bg },
   
   -- ============================================================================
   -- Cursor & Line Highlighting
@@ -66,11 +66,12 @@ return {
   -- Popup Menu (Completion)
   -- ============================================================================
   
-  Pmenu = { fg = c.fg, bg = c.bg_ui },
-  PmenuSel = { fg = c.fg_strong, bg = c.bg_ui, bold = true },
-  PmenuSbar = 'Pmenu',
-  PmenuThumb = 'Pmenu',
-  WildMenu = { fg = c.fg_strong, bg = c.bg_ui, bold = true },
+  Pmenu = { fg = c.diag_hint_dark, bg = c.bg },
+  PmenuSel = { fg = c.fg_strong, bg = c.bg_hl, bold = true },
+  PmenuSbar = { fg = c.NONE, bg = c.bg_hl },
+  PmenuThumb = { fg = c.NONE, bg = c.fg_weaker },
+  PmenuBorder = { fg = c.diag_hint_dark, bg = c.bg },
+  WildMenu = { fg = c.fg_strong, bg = c.bg_hl, bold = true },
   
   -- ============================================================================
   -- Folds
diff --git a/lua/paper-tonic-modern/groups/plugins.lua b/lua/paper-tonic-modern/groups/plugins.lua
index 87e4a0e..25711f9 100644
--- a/lua/paper-tonic-modern/groups/plugins.lua
+++ b/lua/paper-tonic-modern/groups/plugins.lua
@@ -63,10 +63,11 @@ return {
   -- ============================================================================
   
   -- Menu
-  CmpItemMenu = { fg = c.fg_weak, italic = true },
+  CmpItemAbbr = { fg = c.fg },
   CmpItemAbbrMatch = { fg = c.primary, bold = true },
   CmpItemAbbrMatchFuzzy = { fg = c.primary_weak },
   CmpItemAbbrDeprecated = { fg = c.fg_weak, strikethrough = true },
+  CmpItemMenu = { fg = c.fg_weak, italic = true },
   
   -- Kind icons/labels
   CmpItemKindDefault = { fg = c.fg },
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index a738fea..03702bd 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -45,7 +45,7 @@ return {
 						{ "🭼", "FloatBorder" },
 						{ "▏", "FloatBorder" },
 					},
-					winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder",
+					winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel",
 				}),
 				documentation = cmp.config.window.bordered({
 					border = {
@@ -58,7 +58,7 @@ return {
 						{ "🭼", "FloatBorder" },
 						{ "▏", "FloatBorder" },
 					},
-					winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder",
+					winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
 				}),
 			},
 		}
diff --git a/lua/settings.lua b/lua/settings.lua
index 8c27bfb..66ba0b8 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -40,6 +40,12 @@ vim.opt.showtabline = 1 -- Show tabline only when there are 2+ tabs
 -- Completion UI for nvim-cmp
 vim.opt.completeopt = { "menu", "menuone", "noselect" }
 
+-- Built-in completion popup style (for Ctrl-X Ctrl-N/F completions)
+-- Use floating window with border for native completion
+vim.opt.pumblend = 0 -- No transparency
+-- Note: Native completion (pumvisible) doesn't support custom borders like LSP floats
+-- The Pmenu* highlight groups control its appearance
+
 -- Spelling
 vim.opt.spelllang = { "en_gb" }