diff --git a/.zsh_aliases b/.zsh_aliases
index 39ba1b9..30151c1 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -1,5 +1,7 @@
 # .zsh_aliases
 
+alias mpset="make -C ~/Config/Dot-Zsh"
+
 # Aliases
 alias c="clear"
 
diff --git a/Makefile b/Makefile
index 23dcbf3..024cdc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,11 @@
 # Makefile for Dotfiles
 
-# Tells Make that these targets are not actual files
-.PHONY: all setup stow clean update docker-test test-ubuntu test-arch storagebox
-
-# Default target (runs when you just type 'make')
+# Default target
 all: stow
 
 # Full Setup
 setup:
-	bash ./scripts/setup.sh 
+	bash ./scripts/base.sh 
 	bash ./scripts/node.sh
 	bash ./scripts/go.sh
 	bash ./scripts/rust.sh
@@ -30,6 +27,9 @@ update:
 	git pull origin main
 	make setup
 
+base:
+	bash ./scripts/base.sh
+
 # Language Setups
 node:
 	bash ./scripts/node.sh
@@ -43,7 +43,6 @@ rust:
 python:
 	bash ./scripts/python.sh
 
-# Setup StorageBox
 storagebox:
 	bash ./scripts/storagebox.sh
 
diff --git a/bin/nvim b/bin/nvim
new file mode 100644
index 0000000..2887bbc
Binary files /dev/null and b/bin/nvim differ
diff --git a/scripts/setup.sh b/scripts/base.sh
similarity index 76%
rename from scripts/setup.sh
rename to scripts/base.sh
index 93089ca..995dca6 100755
--- a/scripts/setup.sh
+++ b/scripts/base.sh
@@ -8,6 +8,9 @@ GREEN='\033[1;32m'
 RED='\033[1;31m'
 NC='\033[0m'
 
+DOTFILES_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_ROOT="$(dirname "$DOTFILES_DIR")"
+
 echo -e "${BLUE}    LOG:${YELLOW} Initializing Base System Layer...${NC}"
 
 # OS Detection
@@ -36,32 +39,17 @@ PACKAGES=(
 
 if [ "$OS" == "arch" ] || [ "$OS" == "manjaro" ]; then
     # Arch has eza in the community repo
-    sudo pacman -Sy --noconfirm --needed "${PACKAGES[@]}" eza base-devel
+    sudo pacman -Sy --noconfirm --needed "${PACKAGES[@]}" base-devel
 elif [ "$OS" == "ubuntu" ] || [ "$OS" == "debian" ]; then
     sudo DEBIAN_FRONTEND=noninteractive apt-get update
     sudo DEBIAN_FRONTEND=noninteractive apt-get install -y "${PACKAGES[@]}" bsdmainutils pkg-config cmake
-    
-    # -----------------------------------------------------------------
-    # EZA BINARY INSTALL (Ubuntu/Debian)
-    # -----------------------------------------------------------------
-    if ! command -v eza &> /dev/null; then
-        echo -e "${BLUE}    LOG:${YELLOW} Fetching eza binary (skipping compilation)...${NC}"
-        
-        # 1. Define Version (Check releases page for latest)
-        EZA_VER="v0.18.11"
-        EZA_URL="https://github.com/eza-community/eza/releases/download/${EZA_VER}/eza_x86_64-unknown-linux-gnu.tar.gz"
-        
-        # 2. Download and Extract directly to a temp location
-        wget -qO- "$EZA_URL" | tar xz -C /tmp
-        
-        # 3. Move to local bin (No sudo needed if ~/.local/bin is in PATH)
-        mkdir -p "$HOME/.local/bin"
-        mv /tmp/eza "$HOME/.local/bin/"
-        chmod +x "$HOME/.local/bin/eza"
-        
-        echo -e "${GREEN}    LOG: eza installed to ~/.local/bin${NC}"
-    fi
 fi
+
+# Moving Pre-Built bin to /usr/local/bin
+mkdir -p "$HOME/.local/bin"
+cp -f "$REPO_ROOT/bin/"* "$HOME/.local/bin/"
+chmod +x "$HOME/.local/bin/"*
+
 # 3. Docker Installation
 if command -v docker &> /dev/null; then
     echo -e "${GREEN}    LOG: Docker is already installed.${NC}"