diff --git a/home/shell/aria2.nix b/home/shell/aria2.nix
new file mode 100644
index 0000000..5eddee1
--- /dev/null
+++ b/home/shell/aria2.nix
@@ -0,0 +1,8 @@
+{...}: {
+  programs.aria2 = {
+    enable = true;
+    settings = {
+      max-upload-limit = "0M";
+    };
+  };
+}
diff --git a/home/shell/autojump.nix b/home/shell/autojump.nix
deleted file mode 100644
index 0c04908..0000000
--- a/home/shell/autojump.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  programs.autojump = {
-    enable = true;
-  };
-}
diff --git a/home/shell/btop.nix b/home/shell/bottom.nix
similarity index 61%
rename from home/shell/btop.nix
rename to home/shell/bottom.nix
index 4857256..d0e86af 100644
--- a/home/shell/btop.nix
+++ b/home/shell/bottom.nix
@@ -1,5 +1,5 @@
 {...}: {
-  programs.btop = {
+  programs.bottom = {
     enable = true;
   };
 }
diff --git a/home/shell/common.nix b/home/shell/common.nix
index a9e9733..1ddfa03 100644
--- a/home/shell/common.nix
+++ b/home/shell/common.nix
@@ -4,11 +4,29 @@
   };
 
   home.packages = with pkgs; [
-    # Development
-    just
-
-    # Tools
+    # AI Tools
     ollama
+
+    # Development
+    mprocs
+    tokei
+
+    # Diagnostics/Investigation/Recovery
+    hexyl
+    john
+    nmap
+    trippy
+
+    # Filesystem Tools
+    du-dust
+    dysk
+    fd
+    lemmeknow
+    ouch
+
+    # Utilities
+    procs
+    ripgrep
   ];
 
   programs.direnv = {
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 498382e..b3a4e79 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -1,9 +1,9 @@
 {...}: {
   imports = [
     ./atuin.nix
-    ./autojump.nix
+    ./aria2.nix
     ./bat.nix
-    ./btop.nix
+    ./bottom.nix
     ./common.nix
     ./direnv.nix
     ./eza.nix
@@ -11,7 +11,7 @@
     ./git.nix
     ./htop.nix
     ./nushell
-    ./rmtrash.nix
+    ./rip.nix
     ./starship.nix
     ./tldr.nix
     ./zoxide.nix
diff --git a/home/shell/rip.nix b/home/shell/rip.nix
new file mode 100644
index 0000000..d3182a4
--- /dev/null
+++ b/home/shell/rip.nix
@@ -0,0 +1,25 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    rm-improved
+  ];
+
+  # TODO: Replace this with confirm once packaged
+  home.shellAliases = {
+    confirm = ''
+      read -p "Are you sure? [y/N] " -n 1 -r
+      echo
+      if [[ $REPLY =~ ^[Yy]$ ]]
+      then
+        $argv
+      fi
+    '';
+
+    rm = ''
+      confirm rm $argv
+    '';
+
+    rmdir = ''
+      confirm rmdir $argv
+    '';
+  };
+}
diff --git a/home/shell/rmtrash.nix b/home/shell/rmtrash.nix
deleted file mode 100644
index fff8220..0000000
--- a/home/shell/rmtrash.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    rmtrash
-  ];
-
-  home.shellAliases = {
-    rm = "rmtrash";
-    rmdir = "rmdirtrash";
-  };
-}
diff --git a/home/shell/zoxide.nix b/home/shell/zoxide.nix
index 42118de..6ed2918 100644
--- a/home/shell/zoxide.nix
+++ b/home/shell/zoxide.nix
@@ -5,5 +5,6 @@
 
   home.shellAliases = {
     cd = "z";
+    j = "echo 'j is deprecated, use z' && z";
   };
 }