diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 20f6c6cc..31ba65f8 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" },
   "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "be4d1084397c9b9d3d5a41bda871e6b20415bf48" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "17de2914bad410d391f184bb14f2a7327777ca38" },
   "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" },
   "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
   "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
@@ -18,16 +18,16 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "fd440cd718742daab162241c5bd5857cd92f5f72" },
   "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
-  "compiler.nvim": { "branch": "main", "commit": "2b67223cfa557438b5620637c21036bf735db91e" },
+  "compiler.nvim": { "branch": "main", "commit": "90b635d5fd7a84683c9f340ce0d09f4386dfe8c3" },
   "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" },
-  "crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" },
+  "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" },
   "dashboard-nvim": { "branch": "master", "commit": "c045eb24334324fb39ad5ede0b5d15a74a5d229e" },
   "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" },
   "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
   "dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" },
   "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
-  "dropbar.nvim": { "branch": "master", "commit": "f6b7d63e6ee0e4ea614ad2097420b7224016714d" },
+  "dropbar.nvim": { "branch": "master", "commit": "4855b9b74133b138aa09827b41597f17aca3c207" },
   "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" },
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
   "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
@@ -97,7 +97,7 @@
   "nvim-puppeteer": { "branch": "main", "commit": "c9e7a941ac389a5e25f713ad0fe8b9371f0572ce" },
   "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" },
   "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" },
-  "nvim-scissors": { "branch": "main", "commit": "8320e30db180c175586d293b53a4bed9d74f4d49" },
+  "nvim-scissors": { "branch": "main", "commit": "e993f4fa482aa1589cab5bc725e3c7d7ba7442eb" },
   "nvim-spectre": { "branch": "master", "commit": "d1ce28b6dc287a6f673461218f3326f0266d75f7" },
   "nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
   "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" },
@@ -143,7 +143,7 @@
   "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
   "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
-  "telescope.nvim": { "branch": "master", "commit": "7b5c5f56a21e82fdcfe5b250278b8dfc4b1cbab4" },
+  "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" },
   "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" },
   "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" },
   "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
diff --git a/config/nvim/lua/plugins/extras/coding/snippets.lua b/config/nvim/lua/plugins/extras/coding/snippets.lua
index 89ac83c5..7a085bbc 100644
--- a/config/nvim/lua/plugins/extras/coding/snippets.lua
+++ b/config/nvim/lua/plugins/extras/coding/snippets.lua
@@ -10,7 +10,7 @@ return {
     -- stylua: ignore
     keys = {
       { "<leader>aS", function() require("scissors").editSnippet() end, desc = "Edit Snippets" },
-      { "<leader>as", function() require("scissors").addNewSnippet() end, desc = "Add Snippets" },
+      { "<leader>as", mode = { "n", "v" }, function() require("scissors").addNewSnippet() end, desc = "Add Snippets" },
     },
   },
   {
diff --git a/config/nvim/lua/plugins/extras/editor/package-info.lua b/config/nvim/lua/plugins/extras/editor/package-info.lua
index 81761608..5ace0941 100644
--- a/config/nvim/lua/plugins/extras/editor/package-info.lua
+++ b/config/nvim/lua/plugins/extras/editor/package-info.lua
@@ -8,11 +8,11 @@ return {
     opts = {},
     -- stylua: ignore
     keys = {
-      { "<leader>ps", "<cmd>lua require('package-info').show({ force = true })<cr>", desc = "Show Package Versions" },
-      { "<leader>pu", "<cmd>lua require('package-info').update()<cr>", desc = "Update Package" },
-      { "<leader>pr", "<cmd>lua require('package-info').delete()<cr>", desc = "Remove Package" },
-      { "<leader>pv", "<cmd>lua require('package-info').change_version()<cr>", desc = "Change Package Version" },
-      { "<leader>pn", "<cmd>lua require('package-info').install()<cr>", desc = "Install New Dependency" },
+      { "<leader>pwv", function() require('package-info').show({ force = true }) end, desc = "Show Package Versions" },
+      { "<leader>pwu", function() require('package-info').update() end, desc = "Update Package" },
+      { "<leader>pwr", function() require('package-info').delete() end, desc = "Remove Package" },
+      { "<leader>pwc", function() require('package-info').change_version() end, desc = "Change Package Version" },
+      { "<leader>pwi", function() require('package-info').install() end, desc = "Install New Dependency" },
     },
   },
   {
@@ -27,7 +27,8 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>p"] = { name = " packages" },
+        ["<leader>p"] = { name = " packages/dependencies" },
+        ["<leader>pw"] = { name = "web" },
       },
     },
   },
diff --git a/config/nvim/lua/plugins/extras/lang/python-extended.lua b/config/nvim/lua/plugins/extras/lang/python-extended.lua
index d3cb7268..0b5d670f 100644
--- a/config/nvim/lua/plugins/extras/lang/python-extended.lua
+++ b/config/nvim/lua/plugins/extras/lang/python-extended.lua
@@ -34,16 +34,17 @@ return {
     opts = {},
     -- stylua: ignore
     keys = {
-      { "<leader>pU", function() require("py-requirements").upgrade() end, desc = "Update Package (Python)" },
-      { "<leader>pi", function() require("py-requirements").show_description() end, desc = "Package Info (Python)" },
-      { "<leader>pa", function() require("py-requirements").upgrade_all() end, desc = "Update All Packages (Python)" },
+      { "<leader>ppu", function() require("py-requirements").upgrade() end, desc = "Update Package" },
+      { "<leader>ppi", function() require("py-requirements").show_description() end, desc = "Package Info" },
+      { "<leader>ppa", function() require("py-requirements").upgrade_all() end, desc = "Update All Packages" },
     },
   },
   {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>p"] = { name = " packages" },
+        ["<leader>p"] = { name = " packages/dependencies" },
+        ["<leader>pp"] = { name = "python" },
       },
     },
   },
diff --git a/config/nvim/lua/plugins/extras/lang/rust-extended.lua b/config/nvim/lua/plugins/extras/lang/rust-extended.lua
index b50a6e4e..4a6673a3 100644
--- a/config/nvim/lua/plugins/extras/lang/rust-extended.lua
+++ b/config/nvim/lua/plugins/extras/lang/rust-extended.lua
@@ -4,18 +4,6 @@ return {
     "simrat39/rust-tools.nvim",
     enabled = false,
   },
-  -- TODO: Look at crates lsp
-  -- {
-  --   "Saecki/crates.nvim",
-  --   opts = {
-  --     lsp = {
-  --       enabled = true,
-  --       on_attach = function(client, bufnr) end,
-  --       actions = true,
-  --       completion = true,
-  --     },
-  --   },
-  -- },
   {
     "mrcjkb/rustaceanvim",
     version = "^3", -- Recommended
@@ -85,6 +73,38 @@ return {
       return opts
     end,
   },
+  {
+    "Saecki/crates.nvim",
+    -- stylua: ignore
+    keys = {
+       { "<leader>prR", function() require("crates").reload() end, desc = "Reload" },
+
+       { "<leader>pru", function() require("crates").update_crate() end, desc = "Update Crate" },
+       { "<leader>pru", mode = "v", function() require("crates").update_crates() end, desc = "Update Crates" },
+       { "<leader>pra", function() require("crates").update_all_crates() end, desc = "Update All Crates" },
+
+       { "<leader>prU", function() require("crates").upgrade_crate() end, desc = "Upgrade Crate" },
+       { "<leader>prU", mode = "v", function() require("crates").upgrade_crates() end, desc = "Upgrade Crates" },
+       { "<leader>prA", function() require("crates").upgrade_all_crates() end, desc = "Upgrade All Crates" },
+
+       { "<leader>prt", function() require("crates").expand_plain_crate_to_inline_table() end, desc = "Extract into Inline Table" },
+       { "<leader>prT", function() require("crates").extract_crate_into_table() end, desc = "Extract into Table" },
+
+       { "<leader>prh", function() require("crates").open_homepage() end, desc = "Homepage" },
+       { "<leader>prr", function() require("crates").open_repository() end, desc = "Repo" },
+       { "<leader>prd", function() require("crates").open_documentation() end, desc = "Documentation" },
+       { "<leader>prc", function() require("crates").open_crates_io() end, desc = "Crates.io" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>p"] = { name = " packages/dependencies" },
+        ["<leader>pr"] = { name = "rust" },
+      },
+    },
+  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,