diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix
index 7101a95..5f0f1d0 100644
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -42,7 +42,13 @@
         action = "<cmd>lua vim.lsp.buf.hover()<cr>";
         options.desc = "LSP Hover";
       }
+      {
+        key = "<C-tab>";
+        action = "<cmd>bnext<cr>";
+        options.desc = "Next Buffer";
+      }
 
+      # Tmux
       {
         key = "<C-h>";
         action = "<cmd>TmuxNavigateLeft<cr>";
diff --git a/home/programs/nvim/plugins/mini.nix b/home/programs/nvim/plugins/mini.nix
index 2a67834..9a4bb8b 100644
--- a/home/programs/nvim/plugins/mini.nix
+++ b/home/programs/nvim/plugins/mini.nix
@@ -7,13 +7,12 @@
         icons = { };
         # TODO: Learn how to use this
         bracketed = { };
-        tabline = { };
-        statusline = { };
+        git = { };
+        diff = { };
         starter = { };
         pairs = { };
         notify = { lsp_progress.enable = false; };
         indentscope = { };
-        git = { };
         cursorword = { };
         comment = { };
         starter = { };
diff --git a/home/programs/nvim/plugins/picker.nix b/home/programs/nvim/plugins/picker.nix
index 9651d66..c70e97f 100644
--- a/home/programs/nvim/plugins/picker.nix
+++ b/home/programs/nvim/plugins/picker.nix
@@ -1,5 +1,21 @@
-{
+{ config, ... }: {
   programs.nixvim = {
+    highlightOverride = {
+      SnacksPicker = {
+        bg = "none";
+        nocombine = true;
+      };
+      SnacksPickerBorder = {
+        bg = "none";
+        fg = "#${config.lib.stylix.colors.base0D}";
+      };
+      SnacksPickerTree = { bg = "#${config.lib.stylix.colors.base00}"; };
+      FloatBorder = {
+        bg = "#${config.lib.stylix.colors.base00}";
+        fg = "#${config.lib.stylix.colors.base0D}";
+      };
+      NormalFloat = { bg = "#${config.lib.stylix.colors.base00}"; };
+    };
     plugins = {
       snacks.settings = {
         picker.enable = true;
@@ -133,6 +149,11 @@
         action = "<cmd>lua Snacks.picker.lines()<cr>";
         options.desc = "Buffer Lines";
       }
+      {
+        key = "<leader>st";
+        action = "<cmd>TodoLocList<cr>";
+        options.desc = "Todos";
+      }
       {
         key = "<leader>sB";
         action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
diff --git a/home/programs/nvim/plugins/snacks.nix b/home/programs/nvim/plugins/snacks.nix
index 37a4791..e6ba710 100644
--- a/home/programs/nvim/plugins/snacks.nix
+++ b/home/programs/nvim/plugins/snacks.nix
@@ -10,6 +10,7 @@
         quickfile.enable = true;
         statuscolumn.enable = true;
         zen.enable = true;
+        bufdelete.enable = true;
       };
     };
 
@@ -29,6 +30,11 @@
         action = "<cmd>lua Snacks.dim.disable()<cr>";
         options.desc = "Undim";
       }
+      {
+        key = "<leader>wc";
+        action = "<cmd>lua Snacks.bufdelete.all()<cr>";
+        options.desc = "Close all buffers";
+      }
     ];
   };
 }
diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix
index 0966d69..8191093 100644
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@@ -2,13 +2,15 @@
   programs.nixvim = {
     nixpkgs.config.allowUnfree = true; # For copilot
     highlightOverride = {
-      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
+      WhichKeySeparator.bg = "#${config.lib.stylix.colors.base00}";
     };
     plugins = {
+      bufferline.enable = true;
       copilot-vim.enable = true;
       flash.enable = true;
       tmux-navigator.enable = true;
       todo-comments.enable = true;
+      lualine = { enable = true; };
       treesitter = {
         enable = true;
         nixGrammars = true;