diff --git a/.zshrc b/.zshrc
index ebbcbf5..68ceb98 100644
--- a/.zshrc
+++ b/.zshrc
@@ -129,8 +129,9 @@ source $HOME/.zshenv
 
 eval "$(direnv hook zsh)"
 
-# Load Angular CLI autocompletion.
-source <(ng completion script)
+if [ command -v ng >/dev/null ]; then
+  # Load Angular CLI autocompletion if ng command is available.
+  source <(ng completion script)
 
 # bun completions
 [ -s "$HOME/.bun/_bun" ] && source "$HOME/.bun/_bun"
diff --git a/install b/install
old mode 100644
new mode 100755
index 176df5e..3896679
--- a/install
+++ b/install
@@ -1,16 +1,23 @@
 #!/usr/bin/env bash
 
-apt update
+set -e
+
+echo "[+] Updating System Packages..."
+apt update -qq
+
+echo "[+] Upgrading System Packages..."
 apt upgrade -yqq
+
+echo "[+] Installing Dependencies..."
 apt install -yqq \
-    git \
     zsh \
     curl \
+    exa \
+    direnv \
     bat \
-    ripgrep
+    btop 
 
-curl https://sh.rustup.rs -sSf | sh
-curl -sfL https://direnv.net/install.sh | bash
+echo "[+] Installing Oh My Zsh..."
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
-cargo install exa
\ No newline at end of file
+cp .zshenv.template .zshenv
diff --git a/setup b/setup
index 08b9956..ebf5028 100755
--- a/setup
+++ b/setup
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#sed -i -e 's/\r$//' ~/dotfiles/*
+
 set -e
 
 echo "[+] Cloning submodules..."