diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh
index f431286..a9f7e83 100644
--- a/src/build/build-rv.sh
+++ b/src/build/build-rv.sh
@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/revanced/revanced-patches/re
 ls revanced-patches*.jar >> new.txt
 curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
 if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f revanced-patches*.jar *.txt
+rm -f ./revanced-patches*.jar ./*.txt
 echo "Old patch!!! Not build"
 exit 0
 else
@@ -60,7 +60,7 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
 patch "youtube-music" "youtube-music-revanced"
 
 # Patch Twitter
-rm -f revanced-integrations*.apk
+rm -f ./revanced-integrations*.apk
 dl_gh "revanced-integrations" "revanced" "tags/v0.103.0"
 get_patches_key "twitter"
 version="9.86.0-release.0"
@@ -68,10 +68,10 @@ get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
 patch "twitter" "twitter-revanced"
 
 # Change architecture
-rm -f revanced-cli*
+rm -f ./revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-    change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced" "youtube-revanced-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
 done
 
 ls revanced-patches*.jar >> revanced-version.txt
diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh
index f33fe5c..1a1b26e 100644
--- a/src/build/build-rve-android-6-7.sh
+++ b/src/build/build-rve-android-6-7.sh
@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-a
 ls revanced-patches*.jar >> new.txt
 curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
 if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f revanced-patches*.jar *.txt
+rm -f ./revanced-patches*.jar ./*.txt
 echo "Old patch!!! Not build"
 exit 0
 else
@@ -22,10 +22,10 @@ get_apk "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "youtube-revanced-extended-android-6-7"
 
 # Change architecture
-rm -f revanced-cli*
+rm -f ./revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-    change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
 done
 
 ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
diff --git a/src/build/build-rve.sh b/src/build/build-rve.sh
index a6c4936..973c20f 100644
--- a/src/build/build-rve.sh
+++ b/src/build/build-rve.sh
@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/inotia00/revanced-patches/re
 ls revanced-patches*.jar >> new.txt
 curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
 if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f revanced-patches*.jar *.txt
+rm -f ./revanced-patches*.jar ./*.txt
 echo "Old patch!!! Not build"
 exit 0
 else
@@ -27,10 +27,10 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
 patch "youtube-music" "youtube-music-revanced-extended"
 
 # Change architecture
-rm -f revanced-cli*
+rm -f ./revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-    change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced-extended" "youtube-revanced-extended-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
 done
 
 ls revanced-patches*.jar >> revanced-extended-version.txt
diff --git a/src/build/tools.sh b/src/build/tools.sh
index 972c186..c3f22f7 100644
--- a/src/build/tools.sh
+++ b/src/build/tools.sh
@@ -1,21 +1,22 @@
+#!/bin/bash
 dl_gh() {
-    for repo in $1 ; do
-    wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \
+    for repo in "$1" ; do
+    wget -qO- "https://api.github.com/repos/"$2"/$repo/releases/"$3"" \
     | jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \
     | while read -r url names; do
-        echo "Downloading $names from $url"
-        wget -q -O "$names" $url
+        echo "Downloading "$names" from "$url""
+        wget -q -O "$names" "$url"
     done
     done
 echo "All assets downloaded"
 }
 get_patches_key() {
     EXCLUDE_PATCHES=()
-        for word in $(cat src/patches/$1/exclude-patches) ; do
+        for word in $(cat src/patches/"$1"/exclude-patches) ; do
             EXCLUDE_PATCHES+=("-e $word")
         done
     INCLUDE_PATCHES=()
-        for word in $(cat src/patches/$1/include-patches) ; do
+        for word in $(cat src/patches/"$1"/include-patches) ; do
             INCLUDE_PATCHES+=("-i $word")
         done
 }
@@ -28,13 +29,13 @@ get_apk_vers() {
 get_largest_ver() {
   local max=0
   while read -r v || [ -n "$v" ]; do   		
-	if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi
+	if [[ $"{v//[!0-9]/}" -gt $"{max//[!0-9]/}" ]]; then max=$v; fi
 	  done
-      	if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi
+      	if [[ "$max" = 0 ]]; then echo ""; else echo "$max"; fi
 }
 
 dl_apk() {
-  local url=$1 regexp=$2 output=$3
+  local url="$1" regexp="$2" output="$3"
   url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
   echo "$url"
   url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
@@ -42,31 +43,31 @@ dl_apk() {
   req "$url" "$output"
 }
 get_apk() {
-  echo "Downloading $1"
+  echo "Downloading "$1""
   local last_ver
   last_ver="$version"
-  last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}"
-  echo "Choosing version '${last_ver}'"
+  last_ver="$"{last_ver:-$"(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory="$2"" | get_largest_ver)"}""
+  echo "Choosing version '$"{last_ver}"'"
   local base_apk="$1.apk"
-  dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \
+  dl_url=$"(dl_apk "https://www.apkmirror.com/apk/"$3"-$"{last_ver//./-}"-release/" \
 			"APK</span>[^@]*@\([^#]*\)" \
-			"$base_apk")
-  echo "$1 version: ${last_ver}"
-  echo "downloaded from: [APKMirror - $1]($dl_url)"
+			"$base_apk")"
+  echo ""$1" version: $"{last_ver}""
+  echo "downloaded from: [APKMirror - "$1"]($"dl_url")"
 }
 get_apk_arch() {
-  echo "Downloading $1 (${arm64-v8a})"
+  echo "Downloading "$1" ($"{arm64-v8a}")"
   local last_ver
   last_ver="$version"
   last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}"
   echo "Choosing version '${last_ver}'"
-  local base_apk="$1.apk"
+  local base_apk=""$1".apk"
   local regexp_arch='arm64-v8a</div>[^@]*@\([^"]*\)'
   dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \
 			"$regexp_arch" \
 			"$base_apk")
-  echo "$1 (${arm64-v8a}) version: ${last_ver}"
-  echo "downloaded from: [APKMirror - $1 ${arm64-v8a}]($dl_url)"
+  echo ""$1" (${arm64-v8a}) version: $"{last_ver}""
+  echo "downloaded from: [APKMirror - "$1" $"{arm64-v8a}"]($dl_url)"
 }
 
 get_ver() {
@@ -80,15 +81,15 @@ get_ver() {
 }
 
 patch() {
-    if [ -f "$1.apk" ]; then
+    if [ -f ""$1".apk" ]; then
     java -jar revanced-cli*.jar \
     -m revanced-integrations*.apk \
     -b revanced-patches*.jar \
-    -a $1.apk \
+    -a "$1".apk \
     ${EXCLUDE_PATCHES[@]} \
     ${INCLUDE_PATCHES[@]} \
     --keystore=./src/ks.keystore \
-    -o ./build/$2.apk
+    -o ./build/"$2".apk
     unset version
     unset EXCLUDE_PATCHES
     unset INCLUDE_PATCHES
@@ -100,18 +101,18 @@ patch() {
 archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
 libs=("x86_64 x86 armeabi-v7a" "x86_64 x86 arm64-v8a" "x86 armeabi-v7a arm64-v8a" "x86_64 armeabi-v7a arm64-v8a")
 gen_rip_libs() {
-    for lib in $@; do
+    for lib in "$@"; do
         echo -n "--rip-lib $lib "
     done
 }
 change_arch() {
-    if [ -f "./build/$1.apk" ]; then
+    if [ -f "./build/"$1".apk" ]; then
     java -jar revanced-cli*.jar \
     	-b revanced-patches*.jar \
-      -a ./build/$1.apk \
-      --keystore=./src/ks.keystore \
-    	$3 \
-      -o ./build/$2.apk
+		-a ./build/"$1".apk \
+		--keystore=./src/ks.keystore \
+    	"$3" \
+		-o ./build/"$2".apk
     else 
         exit 1
     fi