diff --git a/config/default.nix b/config/default.nix
index 848ef95..7145931 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -1,54 +1,57 @@
 {...}: {
   imports = [
-    # General configuration.
+    # General Configuration
     ./keymaps.nix
     ./options.nix
 
-    # Themes
+    # Themes & Appearance
     ./plugins/themes/default.nix
 
-    # Completion
+    # Plugin Collections
+    ./plugins/collections/mini.nix
+    ./plugins/collections/snacks.nix
+
+    # Completion & AI Assistancee
     ./plugins/cmp/cmp.nix
     ./plugins/cmp/copilot.nix
+    ./plugins/cmp/copilot-chat.nix
 
-    # Debug Adapter Protocol
+    # Debugging (DAP)
     ./plugins/dap/dap.nix
     ./plugins/dap/dap-ui.nix
     ./plugins/dap/dap-virtual-text.nix
     ./plugins/dap/dap-python.nix
 
-    # Editor plugins and configurations
-    ./plugins/editor/buffers.nix
+    # Editor Enhancements
     ./plugins/editor/commentary.nix
     ./plugins/editor/harpoon.nix
-    ./plugins/editor/mini.nix
     ./plugins/editor/sessions.nix
     ./plugins/editor/smart-splits.nix
     ./plugins/editor/surround.nix
     ./plugins/editor/treesitter.nix
 
-    # UI plugins
+    # User Interface Plugins
     ./plugins/ui/lualine.nix
     ./plugins/ui/nvim-tree.nix
     ./plugins/ui/web-devicons.nix
     ./plugins/ui/whichkey.nix
 
-    # LSP and formatting
+    # LSP and Formatting
     ./plugins/lsp/conform.nix
     ./plugins/lsp/lsp.nix
 
-    # Git
+    # Git Integration
     ./plugins/git/fugitive.nix
     ./plugins/git/gitsigns.nix
 
-    # Utils
-    ./plugins/utils/copilot-chat.nix
-    ./plugins/utils/markdown-preview.nix
-    ./plugins/utils/render-markdown.nix
+    # Markdown, Notes & Productivity
+    ./plugins/notes/markdown-preview.nix
+    ./plugins/notes/render-markdown.nix
+    ./plugins/notes/todo-comments.nix
+
+    # Utilities
     ./plugins/utils/oil.nix
     ./plugins/utils/telescope.nix
-    ./plugins/utils/todo-comments.nix
     ./plugins/utils/vimtex.nix
-    ./plugins/utils/vimwiki.nix
   ];
 }
diff --git a/config/keymaps.nix b/config/keymaps.nix
index 0bbc0f0..b9256dd 100644
--- a/config/keymaps.nix
+++ b/config/keymaps.nix
@@ -11,7 +11,7 @@
       };
     }
 
-    { # prefix: find
+    {
       mode = ["n"];
       key = "<leader>f";
       action = "<NOP>";
@@ -19,5 +19,32 @@
         desc = "+find"; 
       };
     }
+
+    {
+      mode = ["n"];
+      key = "<PageUp>";
+      action = "<C-u>";
+      options = {
+        silent = true;
+      };
+    }
+
+    {
+      mode = ["n"];
+      key = "<PageDown>";
+      action = "<C-d>";
+      options = {
+        silent = true;
+      };
+    }
+
+    {
+      mode = ["n"];
+      key = "<Del>";
+      action = "zz";
+      options = {
+        silent = true;
+      };
+    }
   ];
 }
diff --git a/config/plugins/utils/copilot-chat.nix b/config/plugins/cmp/copilot-chat.nix
similarity index 100%
rename from config/plugins/utils/copilot-chat.nix
rename to config/plugins/cmp/copilot-chat.nix
diff --git a/config/plugins/collections/mini.nix b/config/plugins/collections/mini.nix
new file mode 100644
index 0000000..2691f24
--- /dev/null
+++ b/config/plugins/collections/mini.nix
@@ -0,0 +1,19 @@
+{...}:{
+  plugins.mini = {
+    enable = true;
+
+    # Extend and create a/i textobjects.
+    modules.ai = {
+      # Number of lines within which textobject is searched
+      n_lines = 50;
+
+      # How to search for object
+      search_method = "cover_or_next";
+    };
+
+    # Go forward/backward with square brackets.
+    modules.bracketed = { };
+
+    modules.align = { };
+  };
+}
diff --git a/config/plugins/collections/snacks.nix b/config/plugins/collections/snacks.nix
new file mode 100644
index 0000000..fa77338
--- /dev/null
+++ b/config/plugins/collections/snacks.nix
@@ -0,0 +1,41 @@
+{...}:{
+  plugins.snacks = {
+    enable = true;
+
+    settings = {
+      bufdelete = {
+        enabled = true;
+      };
+
+      scroll = {
+        enabled = true;
+      };
+    };
+  };
+
+  keymaps = [
+    {
+      mode = ["n"];
+      key = "<leader>q";
+      action = {
+        __raw = "function() require('snacks').bufdelete() end"; 
+      };
+      options = {
+        desc = "Close current buffer";
+        silent = true;
+      };
+    }
+    
+    {
+      mode = ["n"];
+      key = "<leader>Q";
+      action = {
+        __raw = "function() require('snacks').bufdelete.other() end";
+      };
+      options = {
+        desc = "Close other buffers";
+        silent = true;
+      };
+    }
+  ];
+}
diff --git a/config/plugins/editor/buffers.nix b/config/plugins/editor/buffers.nix
deleted file mode 100644
index ccff402..0000000
--- a/config/plugins/editor/buffers.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{...}: {
-  plugins.bufdelete = {
-    enable = true;
-  };
-
-  keymaps = [
-    {
-      # buffer prefix
-      mode = "n";
-      key = "<leader>b";
-      action = "<Nop>";
-      options = {
-        desc = "+buffer";
-      };
-    }
-
-    {
-      # goto next buffer
-      mode = ["n"];
-      key = "]b";
-      action = ":bnext<cr>";
-      options = {
-        silent = true;
-      };
-    }
-
-    {
-      # goto previous buffer
-      mode = ["n"];
-      key = "[b";
-      action = ":bprevious<cr>";
-      options = {
-        silent = true;
-      };
-    }
-
-    {
-      # delete buffer
-      mode = ["n"];
-      key = "<leader>bd";
-      action = ":Bdelete<cr>";
-      options = {
-        desc = "bdelete";
-        silent = true;
-      };
-    }
-
-    {
-      # wipeout buffer
-      mode = ["n"];
-      key = "<leader>bw";
-      action = ":Bwipeout<cr>";
-      options = {
-        desc = "bwipeout";
-        silent = true;
-      };
-    }
-  ];
-}
diff --git a/config/plugins/editor/mini.nix b/config/plugins/editor/mini.nix
deleted file mode 100644
index ebd2c40..0000000
--- a/config/plugins/editor/mini.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{...}:{
-  plugins.mini = {
-    enable = true;
-
-    # Extend and create a/i textobjects.
-    modules.ai = {
-      # Module mappings.
-      mappings = {
-        # Main textobject prefixes
-        around = "a";
-        inside = "i";
-
-        # Next/last variants
-        around_next = "an";
-        inside_next = "in";
-        around_last = "al";
-        inside_last = "il";
-
-        # Move cursor to corresponding edge of `a` textobject
-        goto_left = "g[";
-        goto_right = "g]";
-      };
-
-      # Number of lines within which textobject is searched
-      n_lines = 50;
-
-      # How to search for object
-      search_method = "cover_or_next";
-    };
-  };
-}
diff --git a/config/plugins/editor/treesitter.nix b/config/plugins/editor/treesitter.nix
index 67a5e4e..d9dba45 100644
--- a/config/plugins/editor/treesitter.nix
+++ b/config/plugins/editor/treesitter.nix
@@ -18,25 +18,4 @@
     # Install all grammar packages.
     grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
   };
-
-  # Refactor modules for nvim-treesitter
-  plugins.treesitter-refactor = {
-    enable = true;
-
-    # Highlights definitions and usages.
-    highlightDefinitions = {
-      enable = true;
-    };
-
-    # Provides "go to usage"
-    navigation = {
-      enable = true;
-
-      # Go to the next / previous usage.
-      keymaps = {
-        gotoNextUsage = "]u";
-        gotoPreviousUsage = "[u";
-      };
-    };
-  };
 }
diff --git a/config/plugins/lsp/lsp.nix b/config/plugins/lsp/lsp.nix
index 2a4c4f7..f7c02c8 100644
--- a/config/plugins/lsp/lsp.nix
+++ b/config/plugins/lsp/lsp.nix
@@ -49,8 +49,6 @@
       # Configure keymaps for our diagnostics.
       diagnostic = {
         "<C-W>d" = "open_float"; # Show diagnostics in floating window.
-        "[d" = "goto_prev"; # Jump to previous diagnostic.
-        "]d" = "goto_next"; # Jump to next diagnostic.
       };
       # Configure keymaps for our lspbuf.
       lspBuf = {
@@ -65,7 +63,7 @@
         # Renames all references to the symbol under the cursor. 
         "<leader>r" = {
           action = "rename";
-          desc = "Rename";
+          desc = "Rename reference";
         };
       };
 
diff --git a/config/plugins/utils/markdown-preview.nix b/config/plugins/notes/markdown-preview.nix
similarity index 100%
rename from config/plugins/utils/markdown-preview.nix
rename to config/plugins/notes/markdown-preview.nix
diff --git a/config/plugins/utils/render-markdown.nix b/config/plugins/notes/render-markdown.nix
similarity index 100%
rename from config/plugins/utils/render-markdown.nix
rename to config/plugins/notes/render-markdown.nix
diff --git a/config/plugins/utils/todo-comments.nix b/config/plugins/notes/todo-comments.nix
similarity index 100%
rename from config/plugins/utils/todo-comments.nix
rename to config/plugins/notes/todo-comments.nix
diff --git a/config/plugins/ui/nvim-tree.nix b/config/plugins/ui/nvim-tree.nix
index 49535b5..d290274 100644
--- a/config/plugins/ui/nvim-tree.nix
+++ b/config/plugins/ui/nvim-tree.nix
@@ -31,7 +31,7 @@
       key = "<leader>n";
       action = "<cmd>NvimTreeToggle<cr>";
       options = { 
-        desc = "Toggle NvimTree";
+        desc = "Toggle file explorer";
       };
     }
 
@@ -40,7 +40,7 @@
       key = "<leader>e";
       action = "<cmd>NvimTreeFocus<cr>";
       options = {
-        desc = "Focus NvimTree";
+        desc = "Focus file explorer";
       };
     }
   ];
diff --git a/config/plugins/ui/whichkey.nix b/config/plugins/ui/whichkey.nix
index 9558011..cc140b6 100644
--- a/config/plugins/ui/whichkey.nix
+++ b/config/plugins/ui/whichkey.nix
@@ -3,6 +3,9 @@
     enable = true;
     settings = {
       preset = "modern";
+      icons = {
+        mappings = false;
+      };
     };
   };
 
diff --git a/config/plugins/utils/vimwiki.nix b/config/plugins/utils/vimwiki.nix
deleted file mode 100644
index 8244b61..0000000
--- a/config/plugins/utils/vimwiki.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  plugins.vimwiki = {
-    enable = true;
-  };
-}