diff --git a/lua/data/deps.lua b/lua/data/deps.lua
index 33d6115..87fbccd 100644
--- a/lua/data/deps.lua
+++ b/lua/data/deps.lua
@@ -44,6 +44,10 @@ M.cmp = {
   "onsails/lspkind.nvim",
   "hrsh7th/cmp-emoji",
   "hrsh7th/cmp-cmdline",
+  "dmitmel/cmp-cmdline-history",
+  "teramako/cmp-cmdline-prompt.nvim",
+  "mtoohey31/cmp-fish",
+  "vim-dadbod-completion",
   {
     "chrisgrieser/cmp_yanky",
     option = {
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index ff8521b..b0a3c0e 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -28,7 +28,6 @@ return {
 
       local border_opts = {
         border = "rounded",
-        winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
       }
       local window_opts = {
         completion = cmp.config.window.bordered(border_opts),
@@ -77,8 +76,8 @@ return {
           { name = "dotenv" },
           { name = "calc" },
           { name = "conventionalcommits" },
-          { name = "gitmoji" },
-          { name = "emoji" },
+          { name = "gitmoji", priority = 9998 },
+          { name = "emoji", priority = 9999 },
         },
         formatting = {
           fields = { "abbr", "kind", "menu" },
@@ -112,6 +111,8 @@ return {
               ignore_cmds = { "Man", "!" },
             },
           },
+        }, { name = "cmp-cmdline-history" }, {
+          name = "cmp-cmdline-prompt",
         }),
       })
 
@@ -119,6 +120,9 @@ return {
       cmp.setup.filetype("cmdline", {
         sources = {
           { name = "cmdline" }, -- Ensure 'cmdline' source is available
+          { name = "path" },
+          { name = "cmp-cmdline-history" },
+          { name = "cmp-cmdline-prompt" },
         },
       })