diff --git a/src/build/Revanced-Extended-Android-5.sh b/src/build/Revanced-Extended-Android-5.sh
index 4189006..146a6f1 100644
--- a/src/build/Revanced-Extended-Android-5.sh
+++ b/src/build/Revanced-Extended-Android-5.sh
@@ -20,12 +20,11 @@ patch "youtube" "revanced-extended-android-5"
 
 # Split architecture:
 rm -f revanced-cli* revanced-patches*.jar patches.json 
-dl_gh "revanced-cli" "FiorenMas" "latest"
+dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
-get_patches_key "youtube-revanced-extended-5"
 for i in {0..3}; do
-    split_arch "youtube" "youtube-${archs[i]}-revanced-extended-android-5" "$(gen_rip_libs ${libs[i]})"
+    _split_arch "youtube-revanced-extended-android-5" "youtube-${archs[i]}-revanced-extended-android-5" "$(gen_rip_libs ${libs[i]})"
 done
 
 #################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh
index d2b8d31..c757844 100644
--- a/src/build/Revanced-Extended-Android-6-7.sh
+++ b/src/build/Revanced-Extended-Android-6-7.sh
@@ -20,12 +20,11 @@ patch "youtube" "revanced-extended-android-6-7"
 
 # Split architecture:
 rm -f revanced-cli* revanced-patches*.jar patches.json 
-dl_gh "revanced-cli" "FiorenMas" "latest"
+dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
-get_patches_key "youtube-revanced-extended-6-7"
 for i in {0..3}; do
-    split_arch "youtube" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})"
+    _split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})"
 done
 
 #################################################
\ No newline at end of file
diff --git a/src/build/utils.sh b/src/build/utils.sh
index e1ca847..02e9211 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -194,5 +194,18 @@ split_arch() {
 		exit 1
 	fi
 }
-
+_split_arch() {
+	green_log "[+] Splitting $1 to ${archs[i]}:"
+	if [ -f "./release/$1.apk" ]; then
+		eval java -jar revanced-cli*.jar patch \
+		--patch-bundle revanced-patches*.jar \
+		$3 \
+		--keystore=./src/_ks.keystore \
+		--out=./release/$2.apk\
+		./release/$1.apk
+	else
+		red_log "[-] Not found $1.apk"
+		exit 1
+	fi
+}
 #################################################