diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua
index 6dd142a..4cb6c5c 100644
--- a/.config/nvim/lua/blake/lsp.lua
+++ b/.config/nvim/lua/blake/lsp.lua
@@ -134,15 +134,15 @@ M.cmp = function()
             select = false,
          },
          ['<Tab>'] = function(fallback)
-            if vim.fn.pumvisible() == 1 then
-               vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-n>', true, true, true), 'n')
+            if cmp.visible() then
+               cmp.select_next_item()
             else
                fallback()
             end
          end,
          ['<S-Tab>'] = function(fallback)
-            if vim.fn.pumvisible() == 1 then
-               vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<C-p>', true, true, true), 'n')
+            if cmp.visible() then
+               cmp.select_prev_item()
             else
                fallback()
             end
@@ -164,13 +164,13 @@ M.cmp = function()
             vim_item.kind = require("lspkind").presets.default[vim_item.kind] .. " " .. vim_item.kind
             -- set a name for each source
             vim_item.menu = ({
-               path           = "(Path)",
-               buffer         = "(Buffer)",
-               calc           = "(Calc)",
-               nvim_lsp       = "(LSP)",
-               nvim_lua       = "(Lua)",
-               spell          = "(Spell)",
-               treesitter     = "(TS)",
+               path           = "[Path]",
+               buffer         = "[Buffer]",
+               calc           = "[Calc]",
+               nvim_lsp       = "[LSP]",
+               nvim_lua       = "[Lua]",
+               spell          = "[Spell]",
+               treesitter     = "[TS]",
             })[entry.source.name]
             return vim_item
          end,