diff --git a/lazy-lock.json b/lazy-lock.json
index d241f3d..0ea22d5 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -18,6 +18,7 @@
   "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" },
   "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
   "mini.statusline": { "branch": "main", "commit": "3e96596ebe51b899874d8174409cdc4f3c749d9a" },
+  "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-dbee": { "branch": "master", "commit": "dda517694889a5d238d7aa407403984da9f80cc0" },
diff --git a/lua/plugins/colors.lua b/lua/plugins/colors.lua
index 5f4f9e2..333b90d 100644
--- a/lua/plugins/colors.lua
+++ b/lua/plugins/colors.lua
@@ -1,7 +1,7 @@
 local M = {
   {
     "EdenEast/nightfox.nvim",
-    enabled = false,
+    enabled = true,
     priority = 1000,
     config = function()
       vim.cmd("colorscheme nightfox")
@@ -12,7 +12,7 @@ local M = {
   {
     "rose-pine/neovim",
     name = "rose-pine",
-    enabled = true,
+    enabled = false,
     priority = 1000,
     opts = {
       variant = "auto",
diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua
index 8ca6d68..a5f68f6 100644
--- a/lua/plugins/completion.lua
+++ b/lua/plugins/completion.lua
@@ -1,99 +1,88 @@
-local M = {
-  "saghen/blink.cmp",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    { "L3MON4D3/LuaSnip", version = "v2.*" },
-    "folke/lazydev.nvim",
-  },
-  build = "nix run .#build-plugin",
-  version = "*",
-}
-
-M.config = function()
-  require("blink.cmp").setup({
-    keymap = {
-      ["<C-space>"] = {
-        "show",
-        "show_documentation",
-        "hide_documentation",
-      },
-      ["<C-d>"] = { "hide", "fallback" },
-      ["<C-c>"] = { "hide", "fallback" },
-      ["<CR>"] = { "accept", "fallback" },
-
-      ["<C-k>"] = { "select_prev", "fallback" },
-      ["<C-j>"] = { "select_next", "fallback" },
+return {
+  {
+    "saghen/blink.cmp",
+    dependencies = {
+      "L3MON4D3/LuaSnip",
+      "rafamadriz/friendly-snippets",
     },
-
-    appearance = {
-      use_nvim_cmp_as_default = true,
-      nerd_font_variant = "mono",
-    },
-
-    snippets = {
-      preset = "luasnip",
-    },
-
-    sources = {
-      default = { "lsp", "path", "snippets", "buffer", "lazydev" },
-      providers = {
-        lazydev = { module = "lazydev.integrations.blink", score_offset = 100 },
-      },
-    },
-
-    signature = {
-      enabled = true,
-      window = {
-        border = "rounded",
-      },
-    },
-
-    completion = {
-      list = {
-        selection = {
-          auto_insert = true,
-          preselect = false,
+    version = "*",
+    config = function()
+      require("blink.cmp").setup({
+        snippets = { preset = "luasnip" },
+        signature = { enabled = true },
+        appearance = {
+          use_nvim_cmp_as_default = false,
+          nerd_font_variant = "normal",
         },
-      },
-      menu = {
-        border = "rounded",
-        draw = {
-          components = {
-            kind_icon = {
-              ellipsis = false,
-              text = function(ctx)
-                local kind_icon, _, _ = require("mini.icons").get("lsp", ctx.kind)
-                return kind_icon
-              end,
-              highlight = function(ctx)
-                local _, hl, _ = require("mini.icons").get("lsp", ctx.kind)
-                return hl
-              end,
+        sources = {
+          default = { "lsp", "path", "snippets", "buffer" },
+          providers = {
+            cmdline = {
+              min_keyword_length = 2,
             },
           },
         },
-        auto_show = function(ctx)
-          return ctx.mode ~= "default"
-        end,
-      },
-      documentation = {
-        auto_show = true,
-        auto_show_delay_ms = 200,
-      },
-    },
+        keymap = {
+          ["<C-space>"] = {
+            "show",
+            "show_documentation",
+            "hide_documentation",
+          },
+          ["<C-d>"] = { "hide", "fallback" },
+          ["<C-c>"] = { "hide", "fallback" },
+          ["<CR>"] = { "accept", "fallback" },
+          ["<C-k>"] = { "select_prev", "fallback" },
+          ["<C-j>"] = { "select_next", "fallback" },
+        },
 
-    fuzzy = {
-      -- Frecency tracks the most recently/frequently used items and boosts the score of the item
-      use_frecency = true,
+        cmdline = {
+          enabled = true,
+          completion = { menu = { auto_show = true } },
+          keymap = {
+            ["<CR>"] = { "accept_and_enter", "fallback" },
+          },
+        },
 
-      -- Proximity bonus boosts the score of items matching nearby words
-      use_proximity = true,
+        completion = {
+          list = {
+            selection = {
+              auto_insert = true,
+              preselect = false,
+            },
+          },
+          menu = {
+            border = "rounded",
+            scrolloff = 1,
+            scrollbar = true,
+            draw = {
+              columns = {
+                { "kind_icon" },
+                { "label", "label_description", gap = 1 },
+                { "kind" },
+                { "source_name" },
+              },
+            },
+          },
+          documentation = {
+            auto_show = true,
+            auto_show_delay_ms = 200,
+          },
+        },
 
-      -- Controls which sorts to use and in which order, falling back to the next sort if the first one returns nil
-      -- You may pass a function instead of a string to customize the sorting
-      sorts = { "score", "sort_text" },
-    },
-  })
-end
+        fuzzy = {
+          -- Frecency tracks the most recently/frequently used items and boosts the score of the item
+          use_frecency = true,
 
-return M
+          -- Proximity bonus boosts the score of items matching nearby words
+          use_proximity = true,
+
+          -- Controls which sorts to use and in which order, falling back to the next sort if the first one returns nil
+          -- You may pass a function instead of a string to customize the sorting
+          sorts = { "score", "sort_text" },
+        },
+      })
+
+      require("luasnip.loaders.from_vscode").lazy_load()
+    end,
+  },
+}