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,