diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 51385f0..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,8 +0,0 @@
-- Nix Builder
-
-  - Keys
-  - User
-  - Etc
-
-- SSH
-  - Known Hosts
diff --git a/bootstrap.sh b/bootstrap.sh
index 95b020f..1043c20 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,7 +3,7 @@
 export NIX_CONFIG="experimental-features = nix-command flakes"
 
 function cmd_image() {
-    local usage="Usage: $0 image --name <image-name>"
+    local usage="Usage: $0 image --name <image-name> [--remote]"
     local name=""
     local remote=false
 
diff --git a/systems/x86_64-linux/lin-va-nix-builder/default.nix b/systems/x86_64-linux/lin-va-nix-builder/default.nix
index c5a4260..f77406a 100755
--- a/systems/x86_64-linux/lin-va-nix-builder/default.nix
+++ b/systems/x86_64-linux/lin-va-nix-builder/default.nix
@@ -1,5 +1,7 @@
-{ namespace, config, pkgs, ... }:
+{ namespace, lib, config, pkgs, ... }:
 let
+  inherit (lib.${namespace}) enabled;
+
   cfg = config.${namespace}.user;
 in
 {
@@ -25,6 +27,10 @@ in
           nameservers = [ "10.0.50.254" ];
         };
       };
+
+      terminal = {
+        btop = enabled;
+      };
     };
 
     services = {
@@ -53,7 +59,6 @@ in
 
   # System Packages
   environment.systemPackages = with pkgs; [
-    htop
     tmux
     vim
   ];