diff --git a/setup.sh b/setup.sh
index c5af018..6819ce4 100644
--- a/setup.sh
+++ b/setup.sh
@@ -29,8 +29,8 @@ if [ -d "$DOTFILES_DIR/scripts" ]; then
         if [ -f "$script" ]; then
             script_name=$(basename "$script")
             log_info "Running $script_name..."
-            # Source the script to run in the current shell and receive $DOTFILES_DIR as $1
-            if source "$script" "$DOTFILES_DIR"; then
+            # Execute each script in a separate shell for modularity
+            if bash "$script" "$DOTFILES_DIR"; then
                 log_success "✓ $script_name completed"
             else
                 log_error "✗ $script_name failed"