diff --git a/README.md b/README.md
index c94e172..ba6050f 100644
--- a/README.md
+++ b/README.md
@@ -234,16 +234,6 @@ Download
 | ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------- |
 | [All Architectures](../../releases/download/all/reddit-revanced-extended.apk)  | [All Architectures](../../releases/download/all/reddit-beta-revanced-extended.apk) |
 
-### Revanced Extended forked by anddea:
-
-| Stable version                                                            | Beta version                                                              |
-| ------------------------------------------------------------------------- | ------------------------------------------------------------------------- |
-| [All Architectures](../../releases/download/all/reddit-stable-anddea.apk) | [All Architectures](../../releases/download/all/reddit-beta-anddea.apk)   |
-
-### ReX:
-
-[All Architectures](../../releases/download/all/reddit-ReX.apk)
-
 ---
 
 [![Lightroom](https://img.shields.io/badge/Adobe%20Lightroom-31A8FF.svg?style=for-the-badge&logo=Adobe%20Lightroom&logoColor=white)](https://play.google.com/store/apps/details?id=com.adobe.lrmobile)
diff --git a/src/build/Anddea-Revanced-Extended.sh b/src/build/Anddea-Revanced-Extended.sh
index f655f84..6b9e58b 100644
--- a/src/build/Anddea-Revanced-Extended.sh
+++ b/src/build/Anddea-Revanced-Extended.sh
@@ -13,27 +13,19 @@ patch_rve_anddea () {
 	fi
 	dl_gh " revanced-patches revanced-integrations" "anddea" "$v"
 	get_patches_key "youtube-rve-anddea"
-	get_ver "Video playback" "com.google.android.youtube"
-	get_apk "youtube-$apk_name" "youtube" "google-inc/youtube/youtube"
+	get_apk "com.google.android.youtube" "youtube-$apk_name" "youtube" "google-inc/youtube/youtube"
 	patch "youtube-$apk_name" "anddea"
 	# Patch Youtube Music:
 	# Arm64-v8a
 	get_patches_key "youtube-music-rve-anddea"
-	get_ver "Video playback" "com.google.android.apps.youtube.music"
-	get_apk "youtube-music-$apk_name-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+	get_apk "com.google.android.apps.youtube.music" "youtube-music-$apk_name-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 	patch "youtube-music-$apk_name-arm64-v8a" "anddea"
 	# Armeabi-v7a
 	get_patches_key "youtube-music-rve-anddea"
-	get_ver "Video playback" "com.google.android.apps.youtube.music"
-	get_apk "youtube-music-$apk_name-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+	get_apk "com.google.android.apps.youtube.music" "youtube-music-$apk_name-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 	patch "youtube-music-$apk_name-armeabi-v7a" "anddea"
-	# Patch Reddit:
-	get_patches_key "reddit"
-	version="2024.17.0"
-	get_apk "reddit-$apk_name" "reddit" "redditinc/reddit/reddit"
-	patch "reddit-$apk_name" "anddea"
 	# Split architecture:
-	rm -f revanced-cli* revanced-patches*.jar patches.json 
+	rm -f revanced-cli* revanced-patches*.jar *.json
 	dl_gh "revanced-cli" "inotia00" "latest"
 	dl_gh "revanced-patches" "inotia00" "latest"
 	# Split architecture Youtube:
diff --git a/src/build/Piko.sh b/src/build/Piko.sh
index 0e43219..7472b74 100644
--- a/src/build/Piko.sh
+++ b/src/build/Piko.sh
@@ -13,7 +13,7 @@ patch_piko () {
 		v="prerelease" apk_name="beta"
 	fi
 	dl_gh "piko revanced-integrations" "crimera" "$v"
-	get_apk "twitter-$apk_name" "twitter" "x-corp/twitter/twitter"
+	get_apk "com.twitter.android" "twitter-$apk_name" "twitter" "x-corp/twitter/twitter"
 	patch "twitter-$apk_name" "piko"
 }
 patch_piko $1
\ No newline at end of file
diff --git a/src/build/ReX.sh b/src/build/ReX.sh
index 099a8ce..db36ec6 100644
--- a/src/build/ReX.sh
+++ b/src/build/ReX.sh
@@ -12,8 +12,7 @@ dl_gh "revanced-cli" "revanced" "latest"
 
 # Patch YouTube ReX:
 get_patches_key "youtube-ReX"
-get_ver "Hide general ads" "com.google.android.youtube"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "ReX"
 
 #################################################
@@ -21,26 +20,17 @@ patch "youtube" "ReX"
 # Patch YouTube Music ReX:
 # Arm64-v8a
 get_patches_key "youtube-music-ReX"
-get_ver "Enable color match player" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 patch "youtube-music-arm64-v8a" "ReX"
 # Armeabi-v7a
 get_patches_key "youtube-music-ReX"
-get_ver "Enable color match player" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-armeabi-v7a" "ReX"
 
 #################################################
 
-# Patch Reddit:
-get_patches_key "reddit"
-get_apk "reddit" "reddit" "redditinc/reddit/reddit"
-patch "reddit" "ReX"
-
-#################################################
-
 # Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json 
+rm -f revanced-cli* revanced-patches*.jar *.json
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
@@ -49,4 +39,4 @@ for i in {0..3}; do
     split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})"
 done
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-1.sh b/src/build/Revanced-1.sh
index f7e1f73..07bca40 100644
--- a/src/build/Revanced-1.sh
+++ b/src/build/Revanced-1.sh
@@ -11,8 +11,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 
 # Patch YouTube:
 get_patches_key "youtube-revanced"
-get_ver "Video ads" "com.google.android.youtube"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "revanced"
 
 #################################################
@@ -20,19 +19,17 @@ patch "youtube" "revanced"
 # Patch YouTube Music:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced"
-version="6.45.54"
-get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 patch "youtube-music-arm64-v8a" "revanced"
 # Armeabi-v7a
 get_patches_key "youtube-music-revanced"
-version="6.45.54"
-get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-armeabi-v7a" "revanced"
 
 #################################################
 
 # Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json 
+rm -f revanced-cli* revanced-patches*.jar *.json 
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
@@ -40,4 +37,4 @@ for i in {0..3}; do
     split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
 done
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-2.sh b/src/build/Revanced-2.sh
index 065d577..920080e 100644
--- a/src/build/Revanced-2.sh
+++ b/src/build/Revanced-2.sh
@@ -12,8 +12,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 # Patch Instagram:
 # Arm64-v8a
 get_patches_key "instagram"
-get_ver "Hide timeline ads" "com.instagram.android"
-get_apk "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
+get_apk "com.instagram.android" "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
 patch "instagram-arm64-v8a" "revanced"
 
 #################################################
@@ -21,22 +20,21 @@ patch "instagram-arm64-v8a" "revanced"
 # Patch Messenger:
 # Arm64-v8a
 get_patches_key "messenger"
-get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" "nodpi"
+get_apk "com.facebook.orca" "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" "nodpi"
 patch "messenger-arm64-v8a" "revanced"
 
 #################################################
 
 # Patch Twitter:
 get_patches_key "twitter"
-get_apk "twitter" "twitter" "x-corp/twitter/twitter"
+get_apk "com.twitter.android" "twitter" "twitter" "x-corp/twitter/twitter"
 patch "twitter" "revanced"
 
 #################################################
 
 # Patch Twitch:
 get_patches_key "twitch"
-get_ver "Block audio ads" "tv.twitch.android.app"
-get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
+get_apk "tv.twitch.android.app" "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
 patch "twitch" "revanced"
 
 #################################################
@@ -44,15 +42,14 @@ patch "twitch" "revanced"
 # Patch Reddit:
 get_patches_key "reddit"
 version="2024.17.0"
-get_apk "reddit" "reddit" "redditinc/reddit/reddit"
+get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit"
 patch "reddit" "revanced"
 
 #################################################
 
 # Patch Tiktok:
 get_patches_key "tiktok"
-get_ver "Feed filter" "com.ss.android.ugc.trill"
-get_apk "tiktok" "tik-tok" "tiktok-pte-ltd/tik-tok/tik-tok"
+get_apk "com.ss.android.ugc.trill" "tiktok" "tik-tok" "tiktok-pte-ltd/tik-tok/tik-tok"
 patch "tiktok" "revanced"
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh
index 8bcba97..1061ad8 100644
--- a/src/build/Revanced-3.sh
+++ b/src/build/Revanced-3.sh
@@ -13,21 +13,21 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 # Arm64-v8a
 get_patches_key "facebook"
 version="449.0.0.44.115"
-get_apk "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
+get_apk "com.facebook.katana" "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
 patch "facebook-arm64-v8a" "revanced"
 
 #################################################
 
 # Patch Pixiv:
 get_patches_key "pixiv"
-get_apk "pixiv" "pixiv" "pixiv-inc/pixiv/pixiv"
+get_apk "jp.pxv.android" "pixiv" "pixiv" "pixiv-inc/pixiv/pixiv"
 patch "pixiv" "revanced"
 
 #################################################
 
 # Patch Lightroom:
 get_patches_key "lightroom"
-get_apk "lightroom" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a"
+get_apk "com.adobe.lrmobile" "lightroom" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a"
 patch "lightroom" "revanced"
 
 #################################################
@@ -35,14 +35,14 @@ patch "lightroom" "revanced"
 # Patch Windy:
 get_patches_key "windy"
 version="34.0.2"
-get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
+get_apk "co.windyapp.android" "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
 patch "windy" "revanced"
 
 #################################################
 
 # Patch Tumblr:
 get_patches_key "tumblr"
-get_apk "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr"
+get_apk "com.tumblr" "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr" "revanced"
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Beta-1.sh b/src/build/Revanced-Beta-1.sh
index b42834d..5069eac 100644
--- a/src/build/Revanced-Beta-1.sh
+++ b/src/build/Revanced-Beta-1.sh
@@ -12,8 +12,8 @@ dl_gh "revanced-cli" "revanced" "latest"
 
 # Patch YouTube:
 get_patches_key "youtube-revanced"
-get_ver "Video ads" "com.google.android.youtube"
-get_apk "youtube-beta" "youtube" "google-inc/youtube/youtube"
+get_ver "com.google.android.youtube"
+get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube"
 patch "youtube-beta" "revanced"
 
 #################################################
@@ -21,19 +21,17 @@ patch "youtube-beta" "revanced"
 # Patch YouTube Music:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced"
-version="6.45.54"
-get_apk "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 patch "youtube-music-beta-arm64-v8a" "revanced"
 # Armeabi-v7a
 get_patches_key "youtube-music-revanced"
-version="6.45.54"
-get_apk "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-beta-armeabi-v7a" "revanced"
 
 #################################################
 
 # Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json
+rm -f revanced-cli* revanced-patches*.jar *.json
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
diff --git a/src/build/Revanced-Beta-2.sh b/src/build/Revanced-Beta-2.sh
index 7803c4e..a6e975d 100644
--- a/src/build/Revanced-Beta-2.sh
+++ b/src/build/Revanced-Beta-2.sh
@@ -13,8 +13,7 @@ dl_gh "revanced-cli" "revanced" "latest"
 # Patch Instagram:
 # Arm64-v8a
 get_patches_key "instagram"
-#get_ver "Hide timeline ads" "com.instagram.android"
-get_apk "instagram-arm64-v8a-beta" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
+get_apk "com.instagram.android" "instagram-arm64-v8a-beta" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi"
 patch "instagram-arm64-v8a-beta" "revanced"
 
 #################################################
@@ -22,22 +21,21 @@ patch "instagram-arm64-v8a-beta" "revanced"
 # Patch Messenger:
 # Arm64-v8a
 get_patches_key "messenger"
-get_apk "messenger-arm64-v8a-beta" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" "nodpi"
+get_apk "com.facebook.orca" "messenger-arm64-v8a-beta" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" "nodpi"
 patch "messenger-arm64-v8a-beta" "revanced"
 
 #################################################
 
 # Patch Twitter:
 get_patches_key "twitter"
-get_apk "twitter-beta" "twitter" "x-corp/twitter/twitter"
+get_apk "com.twitter.android" "twitter-beta" "twitter" "x-corp/twitter/twitter"
 patch "twitter-beta" "revanced"
 
 #################################################
 
 # Patch Twitch:
 get_patches_key "twitch"
-get_ver "Block audio ads" "tv.twitch.android.app"
-get_apk "twitch-beta" "twitch" "twitch-interactive-inc/twitch/twitch"
+get_apk "tv.twitch.android.app" "twitch-beta" "twitch" "twitch-interactive-inc/twitch/twitch"
 patch "twitch-beta" "revanced"
 
 #################################################
@@ -45,15 +43,14 @@ patch "twitch-beta" "revanced"
 # Patch Reddit:
 get_patches_key "reddit"
 version="2024.17.0"
-get_apk "reddit-beta" "reddit" "redditinc/reddit/reddit"
+get_apk "com.reddit.frontpage" "reddit-beta" "reddit" "redditinc/reddit/reddit"
 patch "reddit-beta" "revanced"
 
 #################################################
 
 # Patch Tiktok:
 get_patches_key "tiktok"
-get_ver "Feed filter" "com.ss.android.ugc.trill"
-get_apk "tiktok-beta" "tik-tok" "tiktok-pte-ltd/tik-tok/tik-tok"
+get_apk "com.ss.android.ugc.trill" "tiktok-beta" "tik-tok" "tiktok-pte-ltd/tik-tok/tik-tok"
 patch "tiktok-beta" "revanced"
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Beta-3.sh b/src/build/Revanced-Beta-3.sh
index b27babb..6a98ccd 100644
--- a/src/build/Revanced-Beta-3.sh
+++ b/src/build/Revanced-Beta-3.sh
@@ -14,21 +14,21 @@ dl_gh "revanced-cli" "revanced" "latest"
 # Arm64-v8a
 get_patches_key "facebook"
 version="449.0.0.44.115"
-get_apk "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
+get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
 patch "facebook-arm64-v8a-beta" "revanced"
 
 #################################################
 
 # Patch Pixiv:
 get_patches_key "pixiv"
-get_apk "pixiv-beta" "pixiv" "pixiv-inc/pixiv/pixiv"
+get_apk "jp.pxv.android" "pixiv-beta" "pixiv" "pixiv-inc/pixiv/pixiv"
 patch "pixiv-beta" "revanced"
 
 #################################################
 
 # Patch Lightroom:
 get_patches_key "lightroom"
-get_apk "lightroom-beta" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a"
+get_apk "com.adobe.lrmobile" "lightroom-beta" "lightroom" "adobe/lightroom/lightroom" "arm64-v8a"
 patch "lightroom-beta" "revanced"
 
 #################################################
@@ -36,14 +36,14 @@ patch "lightroom-beta" "revanced"
 # Patch Windy:
 get_patches_key "windy"
 version="34.0.2"
-get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
+get_apk "co.windyapp.android" "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
 patch "windy" "revanced"
 
 #################################################
 
 # Patch Tumblr:
 get_patches_key "tumblr"
-get_apk "tumblr-beta" "tumblr" "tumblr-inc/tumblr/tumblr"
+get_apk "com.tumblr" "tumblr-beta" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr-beta" "revanced"
 
-#################################################
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Extended-Android-5.sh b/src/build/Revanced-Extended-Android-5.sh
index f387784..c371c7a 100644
--- a/src/build/Revanced-Extended-Android-5.sh
+++ b/src/build/Revanced-Extended-Android-5.sh
@@ -13,13 +13,13 @@ dl_gh "revanced-cli" "revanced" "v3.1.1"
 # Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended-5"
 version="16.40.36"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "revanced-extended-android-5"
 
 #################################################
 
 # Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json 
+rm -f revanced-cli* revanced-patches*.jar *.json 
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh
index ad97883..b4cef69 100644
--- a/src/build/Revanced-Extended-Android-6-7.sh
+++ b/src/build/Revanced-Extended-Android-6-7.sh
@@ -13,13 +13,13 @@ dl_gh "revanced-cli" "revanced" "v3.1.1"
 # Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended-6-7"
 version="17.34.36"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "revanced-extended-android-6-7"
 
 #################################################
 
 # Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json 
+rm -f revanced-cli* revanced-patches*.jar *.json
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
diff --git a/src/build/Revanced-Extended-Beta.sh b/src/build/Revanced-Extended-Beta.sh
index 895bc27..fa3cdd4 100644
--- a/src/build/Revanced-Extended-Beta.sh
+++ b/src/build/Revanced-Extended-Beta.sh
@@ -12,8 +12,7 @@ dl_gh "revanced-cli" "inotia00" "latest"
 
 # Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended"
-get_ver "Video playback" "com.google.android.youtube"
-get_apk "youtube-beta" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube"
 patch "youtube-beta" "revanced-extended" "inotia"
 
 #################################################
@@ -21,13 +20,11 @@ patch "youtube-beta" "revanced-extended" "inotia"
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced-extended"
-get_ver "Video playback" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 patch "youtube-music-beta-arm64-v8a" "revanced-extended" "inotia"
 # Armeabi-v7a
 get_patches_key "youtube-music-revanced-extended"
-get_ver "Video playback" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-beta-armeabi-v7a" "revanced-extended" "inotia"
 
 #################################################
@@ -39,11 +36,11 @@ done
 
 #################################################
 # Patch Reddit:
-rm -f revanced-cli* revanced-patches*
+rm -f revanced-cli* revanced-patches* *.json
 dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib"
 dl_gh "revanced-patches" "inotia00" "v2.174.0-arsclib"
 get_patches_key "reddit-rve"
-get_apk "reddit-beta" "reddit" "redditinc/reddit/reddit"
+get_apk "com.reddit.frontpage" "reddit-beta" "reddit" "redditinc/reddit/reddit"
 patch "reddit-beta" "revanced-extended"
 mv ./release/reddit-beta-revanced-extended.apk/base.apk ./reddit-beta-revanced-extended.apk
 rm -f -d ./release/reddit-beta-revanced-extended.apk
diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh
index dbca19d..8611731 100644
--- a/src/build/Revanced-Extended.sh
+++ b/src/build/Revanced-Extended.sh
@@ -11,8 +11,7 @@ dl_gh "revanced-patches revanced-integrations revanced-cli" "inotia00" "latest"
 
 # Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended"
-get_ver "Video playback" "com.google.android.youtube"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "revanced-extended" "inotia"
 
 #################################################
@@ -20,13 +19,11 @@ patch "youtube" "revanced-extended" "inotia"
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced-extended"
-get_ver "Video playback" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
 patch "youtube-music-arm64-v8a" "revanced-extended" "inotia"
 # Armeabi-v7a
 get_patches_key "youtube-music-revanced-extended"
-get_ver "Video playback" "com.google.android.apps.youtube.music"
-get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-armeabi-v7a" "revanced-extended" "inotia"
 
 #################################################
@@ -38,11 +35,11 @@ done
 
 #################################################
 # Patch Reddit:
-rm -f revanced-cli* revanced-patches*
+rm -f revanced-cli* revanced-patches* *.json
 dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib"
 dl_gh "revanced-patches" "inotia00" "v2.174.0-arsclib"
 get_patches_key "reddit-rve"
-get_apk "reddit" "reddit" "redditinc/reddit/reddit"
+get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit"
 patch "reddit" "revanced-extended"
 mv ./release/reddit-revanced-extended.apk/base.apk ./reddit-revanced-extended.apk
 rm -f -d ./release/reddit-revanced-extended.apk
diff --git a/src/build/Rufusin-Revanced-Extended.sh b/src/build/Rufusin-Revanced-Extended.sh
index 88993db..ca81a2c 100644
--- a/src/build/Rufusin-Revanced-Extended.sh
+++ b/src/build/Rufusin-Revanced-Extended.sh
@@ -12,13 +12,12 @@ dl_gh "revanced-cli" "revanced" "latest"
 
 # Patch YouTube Rufusin:
 get_patches_key "youtube-rve-rufusin"
-get_ver "Hide general ads" "com.google.android.youtube"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "rufusin"
 
 #################################################
 
-rm -f revanced-cli* revanced-patches*.jar patches.json 
+rm -f revanced-cli* revanced-patches*.jar *.json
 dl_gh "revanced-cli" "inotia00" "latest"
 dl_gh "revanced-patches" "inotia00" "latest"
 # Split architecture Youtube:
diff --git a/src/build/utils.sh b/src/build/utils.sh
index be4872b..bbe869e 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -96,20 +96,6 @@ get_patches_key() {
 
 #################################################
 
-# Find version supported:
-get_ver() {
-	version=$(jq -r --arg patch_name "$1" --arg pkg_name "$2" '
-	.[]
-	| select(.name == $patch_name)
-	| .compatiblePackages[]
-	| select(.name == $pkg_name)
-	| .versions[-1]
-	' *.json)
- 	[ "$version" == "null" ] && version=""
-}
-
-#################################################
-
 # Download apks files from APKMirror:
 _req() {
     if [ "$2" = "-" ]; then
@@ -133,23 +119,26 @@ dl_apk() {
 	req "$url" "$output"
 }
 get_apk() {
-	if [[ -z $4 ]]; then
+	if [[ -z $5 ]]; then
 		url_regexp='APK</span>[^@]*@\([^#]*\)'
 	else
-		case $4 in
-			arm64-v8a) url_regexp='arm64-v8a'"[^@]*$6"''"[^@]*$5"'</div>[^@]*@\([^"]*\)' ;;
-			armeabi-v7a) url_regexp='armeabi-v7a'"[^@]*$6"''"[^@]*$5"'</div>[^@]*@\([^"]*\)' ;;
-			x86) url_regexp='x86'"[^@]*$6"''"[^@]*$5"'</div>[^@]*@\([^"]*\)' ;;
-			x86_64) url_regexp='x86_64'"[^@]*$6"''"[^@]*$5"'</div>[^@]*@\([^"]*\)' ;;
-			*) url_regexp='$4'"[^@]*$6"''"[^@]*$5"'</div>[^@]*@\([^"]*\)' ;;
+		case $5 in
+			arm64-v8a) url_regexp='arm64-v8a'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
+			armeabi-v7a) url_regexp='armeabi-v7a'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
+			x86) url_regexp='x86'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
+			x86_64) url_regexp='x86_64'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
+			*) url_regexp='$5'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
 		esac 
 	fi
+	if [ -z "$version" ]; then
+		version=$(jq -r '[.. | objects | select(.name == "'$1'" and .versions != null) | .versions[]] | reverse | .[0] // ""' *.json | uniq)
+	fi
 	export version="$version"
 	local attempt=0
 	while [ $attempt -lt 10 ]; do
 		if [[ -z $version ]] || [ $attempt -ne 0 ]; then
 			local list_vers v _versions=() IFS=$'\n'
-			list_vers=$(req "https://www.apkmirror.com/uploads/?appcategory=$2" -)
+			list_vers=$(req "https://www.apkmirror.com/uploads/?appcategory=$3" -)
 			version=$(sed -n 's;.*Version:</span><span class="infoSlide-value">\(.*\) </span>.*;\1;p' <<<"$list_vers")
 			version=$(grep -iv "\(beta\|alpha\)" <<<"$version")
 			for v in $version; do
@@ -157,17 +146,17 @@ get_apk() {
 			done
 			version=$(echo -e "${_versions[*]}" | sed -n "$((attempt + 1))p")
 		fi
-		green_log "[+] Downloading $2 version: $version $4 $5 $6"
-		local base_apk="$1.apk"
-		local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \
+		green_log "[+] Downloading $3 version: $version $5 $6 $7"
+		local base_apk="$2.apk"
+		local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$4-${version//./-}-release/" \
 							  "$url_regexp" \
 							  "$base_apk")
-		if [[ -f "./download/$1.apk" ]]; then
-			green_log "[+] Successfully downloaded $1"
+		if [[ -f "./download/$2.apk" ]]; then
+			green_log "[+] Successfully downloaded $2"
 			break
 		else
 			((attempt++))
-			red_log "[-] Failed to download $1, trying another version"
+			red_log "[-] Failed to download $2, trying another version"
 			unset version list_vers v versions
 		fi
 	done