diff --git a/build.sh b/build.sh
index 1dd6e1ec..01a45ec1 100755
--- a/build.sh
+++ b/build.sh
@@ -26,6 +26,15 @@ case $1 in
 	--help) displayHelp; exit 0;;
 esac
 
+# chromium/src dir env variable
+if [ -z "${CR_DIR}" ]; then 
+    CR_SRC_DIR="$HOME/chromium/src"
+    export CR_SRC_DIR
+else 
+    CR_SRC_DIR="${CR_DIR}"
+    export CR_SRC_DIR
+fi
+
 printf "\n" &&
 printf "${YEL}Building Thorium for Linux...\n" &&
 printf "${CYA}\n" &&
@@ -34,7 +43,7 @@ printf "${CYA}\n" &&
 export NINJA_SUMMARIZE_BUILD=1 &&
 export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
 
-./depot_tools/autoninja -C ${CR_SRC_DIR}/out/thorium chrome chrome_sandbox chromedriver clear_key_cdm thorium_shell -j$@ &&
+autoninja -C ${CR_SRC_DIR}/out/thorium chrome chrome_sandbox chromedriver clear_key_cdm thorium_shell -j$@ &&
 
 cat logos/thorium_logo_ascii_art.txt &&
 
diff --git a/build_android.sh b/build_android.sh
index d0923493..09e85e0d 100644
--- a/build_android.sh
+++ b/build_android.sh
@@ -43,11 +43,10 @@ printf "${YEL}Note: You may want ADB installed.${c0}\n" &&
 printf "${CYA}\n" &&
 
 buildARM32 () {
-# Build Thorium for ARM32
+# Build Thorium for ARM32 and System WebView
 export NINJA_SUMMARIZE_BUILD=1 &&
 
-./depot_tools/autoninja -C ${CR_SRC_DIR}/out/thorium chrome_public_apk content_shell_apk system_webview_apk -j$@ &&
-# ADD # thorium_shell_apk
+autoninja -C ${CR_SRC_DIR}/out/thorium chrome_public_apk content_shell_apk system_webview_apk -j$@ &&
 mv ${CR_SRC_DIR}/out/thorium/apks/ChromePublic.apk ${CR_SRC_DIR}/out/thorium/apks/Thorium_Public_arm32.apk &&
 
 cat logos/thorium_logo_ascii_art.txt &&
@@ -63,8 +62,7 @@ esac
 # Build Thorium for ARM64
 export NINJA_SUMMARIZE_BUILD=1 &&
 export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
-# ADD # thorium_shell_apk
-./depot_tools/autoninja -C ${CR_SRC_DIR}/out/thorium content_shell_apk chrome_public_apk -j$@ &&
+autoninja -C ${CR_SRC_DIR}/out/thorium content_shell_apk chrome_public_apk -j$@ &&
 
 mv ${CR_SRC_DIR}/out/thorium/apks/ChromePublic.apk ${CR_SRC_DIR}/out/thorium/apks/Thorium_Public_arm64.apk &&
 
diff --git a/build_mac.sh b/build_mac.sh
index c85cfd09..0619ab71 100755
--- a/build_mac.sh
+++ b/build_mac.sh
@@ -36,7 +36,7 @@ buildShell () {
 	# Build Thorium
 	export NINJA_SUMMARIZE_BUILD=1 &&
 	
-	./depot_tools/autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver thorium_shell -j$@ &&
+	autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver thorium_shell -j$@ &&
 	
 	cat logos/thorium_logo_ascii_art.txt &&
 	
@@ -64,7 +64,7 @@ printf "${CYA}\n" &&
 export NINJA_SUMMARIZE_BUILD=1 &&
 export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
 
-./depot_tools/autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver -j$@ &&
+autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver -j$@ &&
 
 cat logos/thorium_logo_ascii_art.txt &&
 
diff --git a/build_win.sh b/build_win.sh
index 0e3c0360..07fb394a 100755
--- a/build_win.sh
+++ b/build_win.sh
@@ -26,6 +26,15 @@ case $1 in
 	--help) displayHelp; exit 0;;
 esac
 
+# chromium/src dir env variable
+if [ -z "${CR_DIR}" ]; then 
+    CR_SRC_DIR="$HOME/chromium/src"
+    export CR_SRC_DIR
+else 
+    CR_SRC_DIR="${CR_DIR}"
+    export CR_SRC_DIR
+fi
+
 printf "\n" &&
 printf "${YEL}Building Thorium for Windows...\n" &&
 printf "${GRE}\n" &&
@@ -34,9 +43,9 @@ printf "${GRE}\n" &&
 export NINJA_SUMMARIZE_BUILD=1 &&
 export NINJA_STATUS="[%r processes, %f/%t @ %o/s | %e sec. ] " &&
 
-./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome chromedriver clear_key_cdm thorium_shell setup mini_installer -j$@ &&
+autoninja -C ${CR_SRC_DIR}/out/thorium chrome chromedriver clear_key_cdm thorium_shell setup mini_installer -j$@ &&
 
-mv -v -f ~/chromium/src/out/thorium/mini_installer.exe ~/chromium/src/out/thorium/thorium_mini_installer.exe &&
+mv -v -f ${CR_SRC_DIR}/out/thorium/mini_installer.exe ${CR_SRC_DIR}/out/thorium/thorium_mini_installer.exe &&
 
 cat logos/thorium_logo_ascii_art.txt &&