diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index a1a76d9..56a575a 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -9,3 +9,4 @@ require("lsp")
 require("snippets")
 
 require("remaps")
+require("theme")
diff --git a/config/nvim/lua/general.lua b/config/nvim/lua/general.lua
index 69e162b..1aff96b 100644
--- a/config/nvim/lua/general.lua
+++ b/config/nvim/lua/general.lua
@@ -23,18 +23,6 @@ vim.o.signcolumn = "yes"
 
 vim.g.mapleader = " "
 
-vim.cmd([[
-  let ayucolor = "mirage"
-  colorscheme ayu
-]])
-
--- Remove highlighting in signcolumn
-vim.cmd("highlight clear SignColumn")
-
-vim.cmd([[
-  highlight DiagnosticVirtualTextError guifg=DarkRed
-]])
-
 -- Highlight on yank
 vim.api.nvim_exec([[
   augroup YankHighlight
diff --git a/config/nvim/lua/theme.lua b/config/nvim/lua/theme.lua
new file mode 100644
index 0000000..0b1a49d
--- /dev/null
+++ b/config/nvim/lua/theme.lua
@@ -0,0 +1,27 @@
+local function set_highlight(group, options)
+  local bg = options.bg == nil and '' or 'guibg=' .. options.bg
+  local fg = options.fg == nil and '' or 'guifg=' .. options.fg
+  local gui = options.gui == nil and '' or 'gui=' .. options.gui
+  local ctermbg = options.bg == nil and '' or 'guibg=' .. options.bg
+  local ctermfg = options.fg == nil and '' or 'guifg=' .. options.fg
+
+  vim.cmd(string.format('hi %s %s %s %s %s %s', group, bg, fg, gui, ctermbg, ctermfg))
+end
+
+vim.cmd([[
+  let ayucolor = "mirage"
+  colorscheme ayu
+]])
+
+-- Remove highlighting in signcolumn
+vim.cmd("highlight clear SignColumn")
+
+-- Autocompletion menu
+set_highlight("CmpItemMenu", { fg = "DarkGrey" })
+set_highlight("Pmenu", { bg = "#191e2a", fg = "#cbccc6" })
+set_highlight("PmenuSel", { bg = "#cbccc6", fg = "#ffa754" })
+set_highlight("PmenuThumb", { bg = "#ffa754" })
+set_highlight("Comment", { gui = "italic" })
+
+-- Diagnostics
+set_highlight("DiagnosticVirtualTextError", { fg = "DarkRed" })