diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8b2472db..362ad066b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -238,10 +238,10 @@ apply from: "$rootDir/common.gradle"
 | `pkgNameSuffix` | A unique suffix added to `eu.kanade.tachiyomi.animeextension`. The language and the site name should be enough. Remember your extension code implementation must be placed in this package. |
 | `extClass` | Points to the class that implements `AnimeSource`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). |
 | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. |
-| `libVersion` | (Optional, defaults to `13`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. |
+| `libVersion` | (Optional, defaults to `14`) The version of the [extensions library](https://github.com/aniyomiorg/extensions-lib) used. |
 | `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. |
 
-The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `13`.
+The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `14`.
 
 ### Core dependencies
 
@@ -680,7 +680,7 @@ class AnimeSource : AnimeTheme(
         return this
     }
 
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client: OkHttpClient = network.client.newBuilder()
         .ignoreAllSSLErrors()
         .proxy(Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8080)))
         .build()
diff --git a/build.gradle.kts b/build.gradle.kts
index c4abc2659..939c49821 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false 
-    alias(libs.plugins.kotlin.serialization) apply false 
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.kotlinter) apply false
 }
 
diff --git a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt
index f8150169d..e57d5e30f 100644
--- a/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt
+++ b/lib/burstcloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/burstcloudextractor/BurstCloudExtractor.kt
@@ -38,7 +38,6 @@ class BurstCloudExtractor(private val client: OkHttpClient) {
             } else {
                 null
             }
-
         }.getOrNull().orEmpty()
     }
 }
diff --git a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
index f59fbca1a..98c6dd5ac 100644
--- a/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
+++ b/lib/chillx-extractor/src/main/java/eu/kanade/tachiyomi/lib/chillxextractor/ChillxExtractor.kt
@@ -23,7 +23,7 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         private val REGEX_EVAL_KEY by lazy { Regex("""eval\(\S+\("(\S+)",\d+,"(\S+)",(\d+),(\d+),""") }
         private val REGEX_SOURCES by lazy { Regex("""sources:\s*\[\{"file":"([^"]+)""") }
         private val REGEX_FILE by lazy { Regex("""file: ?"([^"]+)"""") }
-        private val REGEX_SOURCE by lazy { Regex("""source = ?"([^"]+)"""")}
+        private val REGEX_SOURCE by lazy { Regex("""source = ?"([^"]+)"""") }
 
         // matches "[language]https://...,"
         private val REGEX_SUBS by lazy { Regex("""\[(.*?)\](.*?)"?\,""") }
@@ -100,7 +100,6 @@ class ChillxExtractor(private val client: OkHttpClient, private val headers: Hea
         return bits.joinToString("") { Char(it.toInt(index) - offset).toString() }
     }
 
-
     @Serializable
     data class CryptoInfo(
         @SerialName("ct")
diff --git a/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt b/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt
index 0ea500b0a..447003d89 100644
--- a/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt
+++ b/lib/dailymotion-extractor/src/main/java/eu/kanade/tachiyomi/lib/dailymotionextractor/DailymotionExtractor.kt
@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import kotlinx.serialization.decodeFromString
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.Headers
@@ -13,7 +13,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class DailymotionExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -133,8 +132,4 @@ class DailymotionExtractor(private val client: OkHttpClient, private val headers
             videoNameGen = { "$prefix$it" },
         )
     }
-
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 }
diff --git a/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt b/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt
index 7aba71fd3..b90d630fb 100644
--- a/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt
+++ b/lib/fastream-extractor/src/main/java/eu/kanade/tachiyomi/lib/fastreamextractor/FastreamExtractor.kt
@@ -1,15 +1,15 @@
 package eu.kanade.tachiyomi.lib.fastreamextractor
 
+import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import okhttp3.FormBody
 import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.internal.commonEmptyHeaders
-import dev.datlag.jsunpacker.JsUnpacker
 
 class FastreamExtractor(private val client: OkHttpClient, private val headers: Headers = commonEmptyHeaders) {
     private val videoHeaders by lazy {
@@ -35,8 +35,7 @@ class FastreamExtractor(private val client: OkHttpClient, private val headers: H
                 }.build()
                 val doc = client.newCall(POST(url, videoHeaders, body = form)).execute().use { it.asJsoup() }
                 doc.selectFirst("script:containsData(jwplayer):containsData(vplayer)") ?: return emptyList()
-            }
-            else {
+            } else {
                 firstDoc.selectFirst("script:containsData(jwplayer):containsData(vplayer)") ?: return emptyList()
             }
 
diff --git a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
index be38d17a5..f8fc201da 100644
--- a/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
+++ b/lib/filemoon-extractor/src/main/java/eu/kanade/tachiyomi/lib/filemoonextractor/FilemoonExtractor.kt
@@ -3,11 +3,11 @@ package eu.kanade.tachiyomi.lib.filemoonextractor
 import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
diff --git a/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt b/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt
index fc3d99a2b..78bbc0c49 100644
--- a/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt
+++ b/lib/fusevideo-extractor/src/main/java/eu/kanade/tachiyomi/lib/fusevideoextractor/FusevideoExtractor.kt
@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.lib.fusevideoextractor
 
+import android.util.Base64
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import android.util.Base64
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
@@ -28,5 +28,4 @@ class FusevideoExtractor(private val client: OkHttpClient, private val headers:
             PlaylistUtils(client, newHeaders).extractFromHls(videoUrl, videoNameGen = { "${prefix}Fusevideo - $it" })
         }.getOrDefault(emptyList())
     }
-
 }
diff --git a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt
index 1fc0f1fb5..4540c58b0 100644
--- a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt
+++ b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractor.kt
@@ -2,20 +2,19 @@ package eu.kanade.tachiyomi.lib.gogostreamextractor
 
 import android.util.Base64
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import java.lang.Exception
-import java.util.Locale
 import org.jsoup.nodes.Element
+import uy.kohesive.injekt.injectLazy
+import java.lang.Exception
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import uy.kohesive.injekt.injectLazy
 
 class GogoStreamExtractor(private val client: OkHttpClient) {
     private val json: Json by injectLazy()
diff --git a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt
index e89305aa7..8d6d8e5b2 100644
--- a/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt
+++ b/lib/gogostream-extractor/src/main/java/eu/kanade/tachiyomi/lib/gogostreamextractor/GogoStreamExtractorDto.kt
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.lib.gogostreamextractor
 
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
diff --git a/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt b/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt
index 56e8e3e6e..7d76dd660 100644
--- a/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt
+++ b/lib/googledrive-extractor/src/main/java/eu/kanade/tachiyomi/lib/googledriveextractor/GoogleDriveExtractor.kt
@@ -7,8 +7,8 @@ import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.internal.commonEmptyRequestBody
 
@@ -37,7 +37,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
         }.build()
 
         val docResp = noRedirectClient.newCall(
-            GET(itemUrl, headers = docHeaders)
+            GET(itemUrl, headers = docHeaders),
         ).execute()
 
         if (docResp.isRedirect) {
@@ -60,7 +60,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
         }.build()
 
         val newUrl = noRedirectClient.newCall(
-            POST(downloadUrl, headers = postHeaders, body = commonEmptyRequestBody)
+            POST(downloadUrl, headers = postHeaders, body = commonEmptyRequestBody),
         ).execute().use { it.headers["location"] ?: downloadUrl }
 
         return videoFromRedirect(newUrl, videoName, itemSize, cookieJar)
@@ -70,7 +70,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
         downloadUrl: String,
         videoName: String,
         itemSize: String,
-        cookieJar: GDriveCookieJar
+        cookieJar: GDriveCookieJar,
     ): List<Video> {
         var newUrl = downloadUrl
 
@@ -82,7 +82,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
         }.build()
 
         var newResp = noRedirectClient.newCall(
-            GET(newUrl, headers = newHeaders)
+            GET(newUrl, headers = newHeaders),
         ).execute()
 
         var redirectCounter = 1
@@ -101,7 +101,7 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
             }.build()
 
             newResp = noRedirectClient.newCall(
-                GET(newUrl, headers = newHeaders)
+                GET(newUrl, headers = newHeaders),
             ).execute()
             redirectCounter += 1
         }
@@ -120,8 +120,8 @@ class GoogleDriveExtractor(private val client: OkHttpClient, private val headers
                 videoUrl.toString(),
                 videoName + itemSize,
                 videoUrl.toString(),
-                headers = videoHeaders
-            )
+                headers = videoHeaders,
+            ),
         )
     }
 
diff --git a/lib/javcoverfetcher/src/main/java/eu/kanade/tachiyomi/lib/javcoverfetcher/JavCoverFetcher.kt b/lib/javcoverfetcher/src/main/java/eu/kanade/tachiyomi/lib/javcoverfetcher/JavCoverFetcher.kt
index de0f0e297..4b0360a39 100644
--- a/lib/javcoverfetcher/src/main/java/eu/kanade/tachiyomi/lib/javcoverfetcher/JavCoverFetcher.kt
+++ b/lib/javcoverfetcher/src/main/java/eu/kanade/tachiyomi/lib/javcoverfetcher/JavCoverFetcher.kt
@@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.lib.javcoverfetcher
 
 import android.content.SharedPreferences
 import android.util.Log
+import androidx.preference.PreferenceScreen
+import androidx.preference.SwitchPreferenceCompat
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.POST
@@ -13,13 +15,11 @@ import okhttp3.internal.commonEmptyHeaders
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.IOException
-import androidx.preference.PreferenceScreen
-import androidx.preference.SwitchPreferenceCompat
 
 object JavCoverFetcher {
 
     private val CLIENT by lazy {
-        Injekt.get<NetworkHelper>().cloudflareClient.newBuilder()
+        Injekt.get<NetworkHelper>().client.newBuilder()
             .addInterceptor(::amazonAgeVerifyIntercept)
             .build()
     }
@@ -149,5 +149,4 @@ object JavCoverFetcher {
 
     val SharedPreferences.fetchHDCovers
         get() = getBoolean("JavCoverFetcherPref", false)
-
 }
diff --git a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
index 67ffc28e8..cd5afe901 100644
--- a/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
+++ b/lib/megacloud-extractor/src/main/java/eu/kanade/tachiyomi/lib/megacloudextractor/MegaCloudExtractor.kt
@@ -24,7 +24,7 @@ import uy.kohesive.injekt.injectLazy
 class MegaCloudExtractor(
     private val client: OkHttpClient,
     private val headers: Headers,
-    private val preferences: SharedPreferences
+    private val preferences: SharedPreferences,
 ) {
     private val json: Json by injectLazy()
 
@@ -59,7 +59,7 @@ class MegaCloudExtractor(
             shouldUpdateKey = false
         }
         json.decodeFromString<List<List<Int>>>(
-            preferences.getString(PREF_KEY_KEY + type, PREF_KEY_DEFAULT)!!
+            preferences.getString(PREF_KEY_KEY + type, PREF_KEY_DEFAULT)!!,
         )
     }
 
@@ -79,8 +79,8 @@ class MegaCloudExtractor(
             val var1 = match.groupValues[1]
             val var2 = match.groupValues[2]
 
-            val regexVar1 = Regex(",${var1}=((?:0x)?([0-9a-fA-F]+))")
-            val regexVar2 = Regex(",${var2}=((?:0x)?([0-9a-fA-F]+))")
+            val regexVar1 = Regex(",$var1=((?:0x)?([0-9a-fA-F]+))")
+            val regexVar2 = Regex(",$var2=((?:0x)?([0-9a-fA-F]+))")
 
             val matchVar1 = regexVar1.find(script)?.groupValues?.get(1)?.removePrefix("0x")
             val matchVar2 = regexVar2.find(script)?.groupValues?.get(1)?.removePrefix("0x")
@@ -135,7 +135,7 @@ class MegaCloudExtractor(
             masterUrl,
             videoNameGen = { "$name - $it - $type" },
             subtitleList = subs2,
-            referer = "https://${url.toHttpUrl().host}/"
+            referer = "https://${url.toHttpUrl().host}/",
         )
     }
 
@@ -159,7 +159,6 @@ class MegaCloudExtractor(
         return VideoDto(decrypted, data.tracks)
     }
 
-
     @Serializable
     data class VideoDto(
         val sources: List<VideoLink>,
diff --git a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
index 3af9f32f3..72ab099f3 100644
--- a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
+++ b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
@@ -15,7 +15,7 @@ class MixDropExtractor(private val client: OkHttpClient) {
         lang: String = "",
         prefix: String = "",
         externalSubs: List<Track> = emptyList(),
-        referer: String = DEFAULT_REFERER
+        referer: String = DEFAULT_REFERER,
     ): List<Video> {
         val headers = Headers.headersOf("Referer", referer)
         val doc = client.newCall(GET(url, headers)).execute().use { it.asJsoup() }
diff --git a/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt b/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
index 155ffc936..cb9b8741e 100644
--- a/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
+++ b/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
@@ -1,11 +1,11 @@
 package eu.kanade.tachiyomi.lib.mp4uploadextractor
 
+import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.OkHttpClient
-import dev.datlag.jsunpacker.JsUnpacker
 
 class Mp4uploadExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, headers: Headers, prefix: String = "", suffix: String = ""): List<Video> {
diff --git a/lib/okru-extractor/src/main/java/eu/kanade/tachiyomi/lib/okruextractor/OkruExtractor.kt b/lib/okru-extractor/src/main/java/eu/kanade/tachiyomi/lib/okruextractor/OkruExtractor.kt
index 034215fd5..8d9c061cd 100644
--- a/lib/okru-extractor/src/main/java/eu/kanade/tachiyomi/lib/okruextractor/OkruExtractor.kt
+++ b/lib/okru-extractor/src/main/java/eu/kanade/tachiyomi/lib/okruextractor/OkruExtractor.kt
@@ -1,9 +1,9 @@
 package eu.kanade.tachiyomi.lib.okruextractor
 
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.OkHttpClient
 
 class OkruExtractor(private val client: OkHttpClient) {
@@ -37,7 +37,6 @@ class OkruExtractor(private val client: OkHttpClient) {
             "ondemandDash" in videoString -> {
                 val playlistUrl = videoString.extractLink("ondemandDash")
                 playlistUtils.extractFromDash(playlistUrl, videoNameGen = { it -> "Okru:$it".addPrefix(prefix) })
-
             }
             else -> videosFromJson(videoString, prefix, fixQualities)
         }
@@ -53,7 +52,6 @@ class OkruExtractor(private val client: OkHttpClient) {
             .substringBefore("\\\"")
             .replace("\\\\u0026", "&")
 
-
     private fun videosFromJson(videoString: String, prefix: String = "", fixQualities: Boolean = true): List<Video> {
         val arrayData = videoString.substringAfter("\\\"videos\\\":[{\\\"name\\\":\\\"")
             .substringBefore("]")
diff --git a/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt b/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
index f31091063..c25c32baa 100644
--- a/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
+++ b/lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
@@ -43,7 +43,7 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
             { _, _, _ -> videoHeaders },
             videoNameGen,
             subtitleList,
-            audioList
+            audioList,
         )
     }
 
@@ -90,8 +90,13 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
         if (PLAYLIST_SEPARATOR !in masterPlaylist) {
             return listOf(
                 Video(
-                    playlistUrl, videoNameGen("Video"), playlistUrl, headers = masterHeaders, subtitleTracks = subtitleList, audioTracks = audioList
-                )
+                    playlistUrl,
+                    videoNameGen("Video"),
+                    playlistUrl,
+                    headers = masterHeaders,
+                    subtitleTracks = subtitleList,
+                    audioTracks = audioList,
+                ),
             )
         }
 
@@ -107,16 +112,16 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
         // Get subtitles
         val subtitleTracks = subtitleList + SUBTITLE_REGEX.findAll(masterPlaylist).mapNotNull {
             Track(
-                getAbsoluteUrl(it.groupValues[2], playlistUrl, masterUrlBasePath ) ?: return@mapNotNull null,
-                it.groupValues[1]
+                getAbsoluteUrl(it.groupValues[2], playlistUrl, masterUrlBasePath) ?: return@mapNotNull null,
+                it.groupValues[1],
             )
         }.toList()
 
         // Get audio tracks
         val audioTracks = audioList + AUDIO_REGEX.findAll(masterPlaylist).mapNotNull {
             Track(
-                getAbsoluteUrl(it.groupValues[2], playlistUrl, masterUrlBasePath ) ?: return@mapNotNull null,
-                it.groupValues[1]
+                getAbsoluteUrl(it.groupValues[2], playlistUrl, masterUrlBasePath) ?: return@mapNotNull null,
+                it.groupValues[1],
             )
         }.toList()
 
@@ -127,15 +132,16 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
                 .substringBefore(",") + "p"
 
             val videoUrl = it.substringAfter("\n").substringBefore("\n").let { url ->
-                getAbsoluteUrl(url, playlistUrl, masterUrlBasePath )
+                getAbsoluteUrl(url, playlistUrl, masterUrlBasePath)
             } ?: return@mapNotNull null
 
-
-
             Video(
-                videoUrl, videoNameGen(resolution), videoUrl,
+                videoUrl,
+                videoNameGen(resolution),
+                videoUrl,
                 headers = videoHeadersGen(headers, referer, videoUrl),
-                subtitleTracks = subtitleTracks, audioTracks = audioTracks
+                subtitleTracks = subtitleTracks,
+                audioTracks = audioTracks,
             )
         }
     }
@@ -146,7 +152,7 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
             url.startsWith("http") -> url
             url.startsWith("//") -> "https:$url"
             url.startsWith("/") -> playlistUrl.toHttpUrl().newBuilder().encodedPath("/").build().toString()
-                    .substringBeforeLast("/") + url
+                .substringBeforeLast("/") + url
             else -> masterBase + url
         }
     }
@@ -192,10 +198,10 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
                 videoNameGen(videoRes) + " - ${formatBytes(bandwidth.toLongOrNull())}"
             },
             referer,
-            { _, _ -> mpdHeaders},
-            { _, _, _ -> videoHeaders},
+            { _, _ -> mpdHeaders },
+            { _, _, _ -> videoHeaders },
             subtitleList,
-            audioList
+            audioList,
         )
     }
 
@@ -242,7 +248,7 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
             mpdHeadersGen,
             videoHeadersGen,
             subtitleList,
-            audioList
+            audioList,
         )
     }
 
diff --git a/lib/sibnet-extractor/src/main/java/eu/kanade/tachiyomi/lib/sibnetextractor/SibnetExtractor.kt b/lib/sibnet-extractor/src/main/java/eu/kanade/tachiyomi/lib/sibnetextractor/SibnetExtractor.kt
index ab3887dd6..1a6f8f75d 100644
--- a/lib/sibnet-extractor/src/main/java/eu/kanade/tachiyomi/lib/sibnetextractor/SibnetExtractor.kt
+++ b/lib/sibnet-extractor/src/main/java/eu/kanade/tachiyomi/lib/sibnetextractor/SibnetExtractor.kt
@@ -36,5 +36,4 @@ class SibnetExtractor(private val client: OkHttpClient) {
 
         return videoList
     }
-
 }
diff --git a/lib/streamhub-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhubextractor/StreamHubExtractor.kt b/lib/streamhub-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhubextractor/StreamHubExtractor.kt
index 2112a961a..696839c5a 100644
--- a/lib/streamhub-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhubextractor/StreamHubExtractor.kt
+++ b/lib/streamhub-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhubextractor/StreamHubExtractor.kt
@@ -12,8 +12,8 @@ class StreamHubExtractor(private val client: OkHttpClient) {
         val document = client.newCall(GET(url)).execute().use { it.body.string() }
         val id = REGEX_ID.find(document)?.groupValues?.get(1)
         val sub = REGEX_SUB.find(document)?.groupValues?.get(1)
-        val masterUrl = "https://${sub}.streamhub.ink/hls/,${id},.urlset/master.m3u8"
-        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "${prefix}StreamHub - (${it})" })
+        val masterUrl = "https://$sub.streamhub.ink/hls/,$id,.urlset/master.m3u8"
+        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "${prefix}StreamHub - ($it)" })
     }
 
     companion object {
diff --git a/lib/streamvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamvidextractor/StreamVidExtractor.kt b/lib/streamvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamvidextractor/StreamVidExtractor.kt
index 7e9831746..633640b59 100644
--- a/lib/streamvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamvidextractor/StreamVidExtractor.kt
+++ b/lib/streamvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamvidextractor/StreamVidExtractor.kt
@@ -15,7 +15,7 @@ class StreamVidExtractor(private val client: OkHttpClient) {
             val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
                 ?.let(JsUnpacker::unpackAndCombine)
                 ?: return emptyList()
-            val masterUrl = if(!sourceChange) {
+            val masterUrl = if (!sourceChange) {
                 script.substringAfter("sources:[{src:\"").substringBefore("\",")
             } else {
                 script.substringAfter("sources:[{file:\"").substringBefore("\"")
diff --git a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
index f182976c1..1ed1da9e8 100644
--- a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
+++ b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
@@ -21,7 +21,9 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
             ?.let { script ->
                 if (script.contains("eval(function(p,a,c")) {
                     JsUnpacker.unpackAndCombine(script)
-                } else script
+                } else {
+                    script
+                }
             }
 
         val masterUrl = scriptBody
diff --git a/lib/upstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/upstreamextractor/UpstreamExtractor.kt b/lib/upstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/upstreamextractor/UpstreamExtractor.kt
index 7581a9dc3..d213db9ad 100644
--- a/lib/upstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/upstreamextractor/UpstreamExtractor.kt
+++ b/lib/upstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/upstreamextractor/UpstreamExtractor.kt
@@ -5,15 +5,13 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
 import okhttp3.OkHttpClient
-import okhttp3.internal.commonEmptyHeaders
 
 class UpstreamExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, prefix: String = ""): List<Video> =
         runCatching {
             val jsE = client.newCall(GET(url)).execute().asJsoup().selectFirst("script:containsData(eval)")!!.data()
             val masterUrl = JsUnpacker.unpackAndCombine(jsE)!!.substringAfter("{file:\"").substringBefore("\"}")
-            PlaylistUtils(client).extractFromHls(masterUrl, videoNameGen = { "${prefix}Upstream - $it" } )
+            PlaylistUtils(client).extractFromHls(masterUrl, videoNameGen = { "${prefix}Upstream - $it" })
         }.getOrDefault(emptyList())
 }
diff --git a/lib/vido-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidoextractor/VidoExtractor.kt b/lib/vido-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidoextractor/VidoExtractor.kt
index b06fc2a60..c64a49008 100644
--- a/lib/vido-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidoextractor/VidoExtractor.kt
+++ b/lib/vido-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidoextractor/VidoExtractor.kt
@@ -16,7 +16,7 @@ class VidoExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
         val document = client.newCall(GET(url)).execute().use { it.body.string() }
         val id = REGEX_ID.find(document)?.groupValues?.get(1)
-        val masterUrl = "$VIDO_URL/hls/${id}/master.m3u8"
-        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "${prefix}Vido - (${it})" })
+        val masterUrl = "$VIDO_URL/hls/$id/master.m3u8"
+        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "${prefix}Vido - ($it)" })
     }
 }
diff --git a/lib/vk-extractor/src/main/java/eu/kanade/tachiyomi/lib/vkextractor/VkExtractor.kt b/lib/vk-extractor/src/main/java/eu/kanade/tachiyomi/lib/vkextractor/VkExtractor.kt
index 033645ea6..d258443b4 100644
--- a/lib/vk-extractor/src/main/java/eu/kanade/tachiyomi/lib/vkextractor/VkExtractor.kt
+++ b/lib/vk-extractor/src/main/java/eu/kanade/tachiyomi/lib/vkextractor/VkExtractor.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.lib.vkextractor
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 
 class VkExtractor(private val client: OkHttpClient, private val headers: Headers) {
diff --git a/multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt b/multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt
index cbd6d0960..e76e104b6 100644
--- a/multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt
+++ b/multisrc/overrides/animestream/desuonline/src/extractors/CDAExtractor.kt
@@ -4,6 +4,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -16,7 +17,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class CDAExtractor(private val client: OkHttpClient, private val headers: Headers, private val referer: String) {
@@ -102,9 +102,4 @@ class CDAExtractor(private val client: OkHttpClient, private val headers: Header
             val resp: String,
         )
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt b/multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt
index a2ccb545d..77a9bb68a 100644
--- a/multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt
+++ b/multisrc/overrides/animestream/donghuastream/src/extractors/StreamPlayExtractor.kt
@@ -5,12 +5,12 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class StreamPlayExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -68,9 +68,4 @@ class StreamPlayExtractor(private val client: OkHttpClient, private val headers:
             val label: String,
         )
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/multisrc/overrides/animestream/lmanime/src/LMAnime.kt b/multisrc/overrides/animestream/lmanime/src/LMAnime.kt
index e91a63d76..52b577bec 100644
--- a/multisrc/overrides/animestream/lmanime/src/LMAnime.kt
+++ b/multisrc/overrides/animestream/lmanime/src/LMAnime.kt
@@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 
 class LMAnime : AnimeStream(
@@ -27,11 +28,11 @@ class LMAnime : AnimeStream(
             .filter { element ->
                 val text = element.text()
                 allowed.any { it in text }
-            }.parallelMap {
+            }.parallelCatchingFlatMapBlocking {
                 val language = it.text().substringBefore(" ")
                 val url = getHosterUrl(it)
                 getVideoList(url, language)
-            }.flatten().ifEmpty { throw Exception("Empty video list!") }
+            }
     }
 
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
diff --git a/multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt b/multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt
index c10505f19..59f3b0c32 100644
--- a/multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt
+++ b/multisrc/overrides/datalifeengine/frenchanime/src/FrenchAnime.kt
@@ -15,11 +15,11 @@ import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.multisrc.datalifeengine.DataLifeEngine
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import java.lang.Exception
 
 class FrenchAnime : DataLifeEngine(
@@ -87,8 +87,7 @@ class FrenchAnime : DataLifeEngine(
     override fun episodeFromElement(element: Element): SEpisode = throw Exception("not used")
 
     // ============================ Video Links =============================
-
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val list = episode.url.split(",").filter { it.isNotBlank() }.parallelCatchingFlatMap {
             with(it) {
                 when {
@@ -107,8 +106,7 @@ class FrenchAnime : DataLifeEngine(
                 }
             }
         }.sort()
-        if (list.isEmpty()) throw Exception("no player found")
-        return Observable.just(list)
+        return list
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
diff --git a/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt b/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
index af2469d76..a0feeefa7 100644
--- a/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
+++ b/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
@@ -12,11 +12,11 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.multisrc.datalifeengine.DataLifeEngine
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class Wiflix : DataLifeEngine(
     "Wiflix",
@@ -74,8 +74,7 @@ class Wiflix : DataLifeEngine(
     }
 
     // ============================ Video Links =============================
-
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val list = episode.url.split(",").filter { it.isNotBlank() }.parallelCatchingFlatMap {
             with(it) {
                 when {
@@ -93,7 +92,7 @@ class Wiflix : DataLifeEngine(
             }
         }.sort()
         if (list.isEmpty()) throw Exception("no player found")
-        return Observable.just(list)
+        return list
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt b/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
index 37cbce00f..8fba9cd17 100644
--- a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
+++ b/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
@@ -26,11 +26,11 @@ class AnimeOnlineNinja : DooPlay(
 ) {
     override val client by lazy {
         if (preferences.getBoolean(PREF_VRF_INTERCEPT_KEY, PREF_VRF_INTERCEPT_DEFAULT)) {
-            network.cloudflareClient.newBuilder()
+            network.client.newBuilder()
                 .addInterceptor(VrfInterceptor())
                 .build()
         } else {
-            network.cloudflareClient
+            network.client
         }
     }
 
diff --git a/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt b/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
index 981a7ff7d..7d9ed7800 100644
--- a/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
+++ b/multisrc/overrides/dooplay/animeplayer/src/AnimePlayer.kt
@@ -13,7 +13,6 @@ class AnimePlayer : DooPlay(
     "AnimePlayer",
     "https://animeplayer.com.br",
 ) {
-    override val client = network.cloudflareClient
 
     // ============================== Popular ===============================
     override fun popularAnimeSelector() = "div#featured-titles article div.poster"
diff --git a/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt b/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
index 9ddd18ce4..d210b93e7 100644
--- a/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
+++ b/multisrc/overrides/dooplay/animesgratis/src/AnimesOnline.kt
@@ -13,10 +13,7 @@ import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Response
@@ -60,7 +57,7 @@ class AnimesOnline : DooPlay(
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val players = document.select("ul#playeroptionsul li")
-        return players.parallelMap(::getPlayerVideos).flatten()
+        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
     }
 
     override val prefQualityValues = arrayOf("360p", "480p", "720p", "1080p")
@@ -138,11 +135,6 @@ class AnimesOnline : DooPlay(
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun getRealAnimeDoc(document: Document): Document {
         if (!document.location().contains("/episodio/")) return document
 
diff --git a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt
index d079ee07e..6229d6cc6 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/AnimesHouse.kt
@@ -27,7 +27,7 @@ class AnimesHouse : DooPlay(
     // ============================== Popular ===============================
     // This source does not have a "popular" animes page, so we're going to
     // use latest updates page instead.
-    override fun fetchPopularAnime(page: Int) = fetchLatestUpdates(page)
+    override suspend fun getPopularAnime(page: Int) = getLatestUpdates(page)
 
     // =============================== Latest ===============================
     override fun latestUpdatesNextPageSelector(): String = "div.resppages > a > span.icon-chevron-right"
diff --git a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
index 40e7086f7..4ccdc4c2d 100644
--- a/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
+++ b/multisrc/overrides/dooplay/cinemathek/src/Cinemathek.kt
@@ -11,11 +11,9 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -49,21 +47,19 @@ class Cinemathek : DooPlay(
     override fun videoListParse(response: Response): List<Video> {
         val players = response.use { it.asJsoup().select("ul#playeroptionsul li") }
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_SELECTION_KEY, PREF_HOSTER_SELECTION_DEFAULT)!!
-        return players.parallelMapNotNull { player ->
-            runCatching {
-                val url = getPlayerUrl(player).ifEmpty { return@parallelMapNotNull null }
-                getPlayerVideos(url, hosterSelection)
-            }.getOrNull()
-        }.flatten()
+        return players.parallelCatchingFlatMapBlocking { player ->
+            val url = getPlayerUrl(player).takeUnless(String::isEmpty)!!
+            getPlayerVideos(url, hosterSelection)
+        }
     }
 
-    private fun getPlayerUrl(player: Element): String {
+    private suspend fun getPlayerUrl(player: Element): String {
         val type = player.attr("data-type")
         val id = player.attr("data-post")
         val num = player.attr("data-nume")
         if (num == "trailer") return ""
         return client.newCall(GET("$baseUrl/wp-json/dooplayer/v2/$id/$type/$num"))
-            .execute()
+            .await()
             .use { it.body.string() }
             .substringAfter("\"embed_url\":\"")
             .substringBefore("\",")
@@ -76,7 +72,7 @@ class Cinemathek : DooPlay(
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) }
 
-    private fun getPlayerVideos(url: String, hosterSelection: Set<String>): List<Video>? {
+    private fun getPlayerVideos(url: String, hosterSelection: Set<String>): List<Video> {
         return when {
             url.contains("https://streamlare.com") && hosterSelection.contains("slare") -> {
                 streamlareExtractor.videosFromUrl(url)
@@ -95,7 +91,7 @@ class Cinemathek : DooPlay(
                 streamwishExtractor.videosFromUrl(url)
             }
             else -> null
-        }
+        }.orEmpty()
     }
 
     // ============================== Settings ==============================
@@ -163,11 +159,6 @@ class Cinemathek : DooPlay(
         ).reversed()
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll().filterNotNull()
-        }
-
     companion object {
         private const val PREF_HOSTER_KEY = "preferred_hoster"
         private const val PREF_HOSTER_TITLE = "Standard-Hoster"
diff --git a/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt b/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
index cb6737b67..620fcf169 100644
--- a/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
+++ b/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
@@ -10,11 +10,9 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 import org.jsoup.nodes.Element
 
@@ -76,10 +74,10 @@ class GoAnimes : DooPlay(
     override fun videoListParse(response: Response): List<Video> {
         val document = response.use { it.asJsoup() }
         val players = document.select("ul#playeroptionsul li")
-        return players.parallelCatchingFlatMap(::getPlayerVideos)
+        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
     }
 
-    private fun getPlayerVideos(player: Element): List<Video> {
+    private suspend fun getPlayerVideos(player: Element): List<Video> {
         val url = getPlayerUrl(player)
         return when {
             "player5.goanimes.net" in url -> goanimesExtractor.videosFromUrl(url)
@@ -88,7 +86,7 @@ class GoAnimes : DooPlay(
                     .set("referer", url)
                     .build()
 
-                val script = client.newCall(GET(url, headers)).execute()
+                val script = client.newCall(GET(url, headers)).await()
                     .use { it.body.string() }
                     .let { JsDecoder.decodeScript(it, false) }
 
@@ -111,7 +109,7 @@ class GoAnimes : DooPlay(
                     }
             }
             listOf("/bloggerjwplayer", "/m3u8", "/multivideo").any { it in url } -> {
-                val script = client.newCall(GET(url)).execute()
+                val script = client.newCall(GET(url)).await()
                     .use { it.body.string() }
                     .let(JsDecoder::decodeScript)
                 when {
@@ -132,12 +130,12 @@ class GoAnimes : DooPlay(
         }
     }
 
-    private fun getPlayerUrl(player: Element): String {
+    private suspend fun getPlayerUrl(player: Element): String {
         val type = player.attr("data-type")
         val id = player.attr("data-post")
         val num = player.attr("data-nume")
         val url = client.newCall(GET("$baseUrl/wp-json/dooplayer/v2/$id/$type/$num"))
-            .execute()
+            .await()
             .use { it.body.string() }
             .substringAfter("\"embed_url\":\"")
             .substringBefore("\",")
@@ -145,24 +143,14 @@ class GoAnimes : DooPlay(
 
         return when {
             "/protetorlinks/" in url -> {
-                val link = client.newCall(GET(url)).execute()
+                val link = client.newCall(GET(url)).await()
                     .use { it.asJsoup() }
                     .selectFirst("a[href]")!!.attr("href")
 
-                client.newCall(GET(link)).execute()
+                client.newCall(GET(link)).await()
                     .use(linkfunBypasser::getIframeUrl)
             }
             else -> url
         }
     }
-
-    // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
 }
diff --git a/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt b/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
index 78c2fc359..a85931a19 100644
--- a/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
+++ b/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
@@ -35,8 +35,6 @@ class Kinoking : DooPlay(
     override val videoSortPrefKey = PREF_HOSTER_KEY
     override val videoSortPrefDefault = PREF_HOSTER_DEFAULT
 
-    override val client = network.cloudflareClient
-
     // ============================== Popular ===============================
     override fun popularAnimeSelector(): String = "div#featured-titles div.poster"
 
diff --git a/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt b/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
index b20e98829..cdbcc5a7f 100644
--- a/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
+++ b/multisrc/overrides/dooplay/multimovies/src/Multimovies.kt
@@ -30,7 +30,6 @@ class Multimovies : DooPlay(
     "Multimovies",
     "https://multimovies.live",
 ) {
-    override val client = network.cloudflareClient
 
     private val defaultBaseUrl = "https://multimovies.live"
 
diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
index 9baf13042..03f29423b 100644
--- a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
+++ b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
@@ -689,10 +689,7 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
@@ -733,51 +730,47 @@ class AutoEmbedExtractor(private val client: OkHttpClient) {
         }
 
         // Get video servers from containers
-        val serverList = containerList.parallelMap { container ->
-            runCatching {
-                when (container.name) {
-                    "2embed" -> {
-                        getTwoEmbedServers(container.url, headers = headers)
-                    }
-                    "gomostream" -> {
-                        getGomoStreamServers(container.url, headers = headers)
-                    }
-                    else -> null
+        val serverList = containerList.parallelCatchingFlatMapBlocking { container ->
+            when (container.name) {
+                "2embed" -> {
+                    getTwoEmbedServers(container.url, headers = headers)
                 }
-            }.getOrNull() ?: emptyList()
-        }.flatten()
+                "gomostream" -> {
+                    getGomoStreamServers(container.url, headers = headers)
+                }
+                else -> null
+            }.orEmpty()
+        }
 
         val videoHeaders = headers.newBuilder()
             .add("Referer", "https://www.2embed.to/")
             .build()
 
-        return serverList.parallelMap { server ->
-            runCatching {
-                val prefix = server.name
-                val videoUrl = server.url
+        return serverList.parallelCatchingFlatMapBlocking { server ->
+            val prefix = server.name
+            val videoUrl = server.url
 
-                when {
-                    videoUrl.contains("streamlare") -> {
-                        StreamlareExtractor(client).videosFromUrl(videoUrl, prefix = prefix)
-                    }
-                    videoUrl.contains("mixdrop") -> {
-                        MixDropExtractor(client).videoFromUrl(videoUrl, prefix = prefix)
-                    }
-                    videoUrl.contains("https://voe") -> {
-                        VoeExtractor(client).videoFromUrl(videoUrl, server.name)
-                            ?.let(::listOf)
-                    }
-                    videoUrl.contains("rabbitstream") -> {
-                        RabbitStreamExtractor(client).videosFromUrl(videoUrl, headers = videoHeaders, prefix = prefix)
-                    }
-                    videoUrl.contains("https://dood") -> {
-                        DoodExtractor(client).videoFromUrl(videoUrl, server.name, false)
-                            ?.let(::listOf)
-                    }
-                    else -> null
+            when {
+                videoUrl.contains("streamlare") -> {
+                    StreamlareExtractor(client).videosFromUrl(videoUrl, prefix = prefix)
                 }
-            }.getOrNull() ?: emptyList()
-        }.flatten()
+                videoUrl.contains("mixdrop") -> {
+                    MixDropExtractor(client).videoFromUrl(videoUrl, prefix = prefix)
+                }
+                videoUrl.contains("https://voe") -> {
+                    VoeExtractor(client).videoFromUrl(videoUrl, server.name)
+                        ?.let(::listOf)
+                }
+                videoUrl.contains("rabbitstream") -> {
+                    RabbitStreamExtractor(client).videosFromUrl(videoUrl, headers = videoHeaders, prefix = prefix)
+                }
+                videoUrl.contains("https://dood") -> {
+                    DoodExtractor(client).videoFromUrl(videoUrl, server.name, false)
+                        ?.let(::listOf)
+                }
+                else -> null
+            }.orEmpty()
+        }
     }
 
     data class Server(
@@ -892,10 +885,4 @@ class AutoEmbedExtractor(private val client: OkHttpClient) {
                 }
         }.getOrNull()
     }
-
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 }
diff --git a/multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt b/multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt
index 39ababe83..a40e61e4f 100644
--- a/multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt
+++ b/multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt
@@ -3,12 +3,11 @@ package eu.kanade.tachiyomi.animeextension.pt.pifansubs.extractors
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeFromStream
 import okhttp3.Headers
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class BlembedExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -32,10 +31,6 @@ class BlembedExtractor(private val client: OkHttpClient, private val headers: He
 
         return res.sources.map { Video(it.file, "Blembed - ${it.label}", it.file, headers) }
     }
-
-    private inline fun <reified T> Response.parseAs(): T = use {
-        json.decodeFromStream(it.body.byteStream())
-    }
 }
 
 @Serializable
diff --git a/multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt b/multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt
index f84856de8..ef0e9d981 100644
--- a/multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt
+++ b/multisrc/overrides/dooplay/pobreflix/src/extractors/SuperFlixExtractor.kt
@@ -3,11 +3,9 @@ package eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
@@ -26,7 +24,7 @@ class SuperFlixExtractor(
     fun videosFromUrl(url: String): List<Video> {
         val links = linksFromUrl(url)
 
-        val fixedLinks = links.parallelCatchingFlatMap {
+        val fixedLinks = links.parallelCatchingFlatMapBlocking {
             val (language, linkUrl) = it
             when {
                 linkUrl.contains("?vid=") -> linksFromPlayer(linkUrl, language)
@@ -34,10 +32,10 @@ class SuperFlixExtractor(
             }
         }
 
-        return fixedLinks.parallelCatchingFlatMap { genericExtractor(it.second, it.first) }
+        return fixedLinks.parallelCatchingFlatMapBlocking { genericExtractor(it.second, it.first) }
     }
 
-    private fun linksFromPlayer(url: String, language: String): List<Pair<String, String>> {
+    private suspend fun linksFromPlayer(url: String, language: String): List<Pair<String, String>> {
         val httpUrl = url.toHttpUrl()
         val id = httpUrl.queryParameter("vid")!!
         val headers = defaultHeaders.newBuilder()
@@ -45,7 +43,7 @@ class SuperFlixExtractor(
             .set("origin", API_DOMAIN)
             .build()
 
-        val doc = client.newCall(GET(url, headers)).execute().use { it.asJsoup() }
+        val doc = client.newCall(GET(url, headers)).await().use { it.asJsoup() }
 
         val baseUrl = "https://" + httpUrl.host
         val apiUrl = "$baseUrl/ajax_sources.php"
@@ -66,7 +64,7 @@ class SuperFlixExtractor(
                 .add("ord", order)
                 .build()
 
-            val req = client.newCall(POST(apiUrl, apiHeaders, formBody)).execute()
+            val req = client.newCall(POST(apiUrl, apiHeaders, formBody)).await()
                 .use { it.body.string() }
 
             runCatching {
@@ -125,15 +123,6 @@ class SuperFlixExtractor(
 
     @Serializable
     data class DataDto(val video_url: String? = null)
-
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
 }
 
 private const val API_DOMAIN = "https://superflixapi.top"
diff --git a/multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt b/multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt
index 908695544..2781de1dd 100644
--- a/multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt
+++ b/multisrc/overrides/dooplay/uniquestream/src/UniqueStream.kt
@@ -16,7 +16,6 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 
 class UniqueStream : DooPlay(
@@ -24,7 +23,6 @@ class UniqueStream : DooPlay(
     "UniqueStream",
     "https://uniquestream.net",
 ) {
-    override val client = network.cloudflareClient
 
     private val json: Json by injectLazy()
 
@@ -183,7 +181,7 @@ class UniqueStream : DooPlay(
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = mutableListOf<Video>()
         val document = client.newCall(
             GET(baseUrl + episode.url, headers = headers),
@@ -290,7 +288,7 @@ class UniqueStream : DooPlay(
 
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
 
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     // ============================== Settings ==============================
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
index a16fdf116..3eb03aa9e 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStream.kt
@@ -21,11 +21,10 @@ import eu.kanade.tachiyomi.multisrc.animestream.AnimeStreamFilters.StudioFilter
 import eu.kanade.tachiyomi.multisrc.animestream.AnimeStreamFilters.SubFilter
 import eu.kanade.tachiyomi.multisrc.animestream.AnimeStreamFilters.TypeFilter
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@@ -34,7 +33,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
@@ -48,8 +46,6 @@ abstract class AnimeStream(
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     protected open val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -81,9 +77,9 @@ abstract class AnimeStream(
     protected open val animeListUrl = "$baseUrl/anime"
 
     // ============================== Popular ===============================
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
+    override suspend fun getPopularAnime(page: Int): AnimesPage {
         fetchFilterList()
-        return super.fetchPopularAnime(page)
+        return super.getPopularAnime(page)
     }
 
     override fun popularAnimeRequest(page: Int) = GET("$animeListUrl/?page=$page&order=popular")
@@ -95,9 +91,9 @@ abstract class AnimeStream(
     override fun popularAnimeNextPageSelector(): String? = searchAnimeNextPageSelector()
 
     // =============================== Latest ===============================
-    override fun fetchLatestUpdates(page: Int): Observable<AnimesPage> {
+    override suspend fun getLatestUpdates(page: Int): AnimesPage {
         fetchFilterList()
-        return super.fetchLatestUpdates(page)
+        return super.getLatestUpdates(page)
     }
 
     override fun latestUpdatesRequest(page: Int) = GET("$animeListUrl/?page=$page&order=update")
@@ -109,14 +105,14 @@ abstract class AnimeStream(
     override fun latestUpdatesNextPageSelector(): String? = searchAnimeNextPageSelector()
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -320,13 +316,11 @@ abstract class AnimeStream(
 
     override fun videoListParse(response: Response): List<Video> {
         val items = response.use { it.asJsoup() }.select(videoListSelector())
-        return items.parallelMap { element ->
-            runCatching {
-                val name = element.text()
-                val url = getHosterUrl(element)
-                getVideoList(url, name)
-            }.onFailure { it.printStackTrace() }.getOrElse { emptyList() }
-        }.flatten()
+        return items.parallelCatchingFlatMapBlocking { element ->
+            val name = element.text()
+            val url = getHosterUrl(element)
+            getVideoList(url, name)
+        }
     }
 
     protected open fun getHosterUrl(element: Element): String {
@@ -422,11 +416,6 @@ abstract class AnimeStream(
         } ?: 0L
     }
 
-    protected inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     /**
      * Tries to get the image url via various possible attributes.
      * Taken from Tachiyomi's Madara multisrc.
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt
index 412ffa1e5..3156ad28f 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/datalifeengine/DataLifeEngine.kt
@@ -12,21 +12,15 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -38,8 +32,6 @@ abstract class DataLifeEngine(
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
 
     // ============================== Popular ===============================
@@ -139,10 +131,10 @@ abstract class DataLifeEngine(
     }
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         return client.newCall(animeDetailsRequest(anime))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 animeDetailsParse(response, anime).apply { initialized = true }
             }
     }
@@ -183,11 +175,6 @@ abstract class DataLifeEngine(
         ).reversed()
     }
 
-    inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { runCatching { f(it) }.getOrElse { emptyList() } } }.awaitAll().flatten()
-        }
-
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
index 706355508..744b17310 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlay.kt
@@ -13,14 +13,12 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Exception
@@ -39,8 +37,6 @@ abstract class DooPlay(
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client
-
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
     protected open val preferences: SharedPreferences by lazy {
@@ -185,16 +181,14 @@ abstract class DooPlay(
         return AnimesPage(animes, hasNextPage)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path", headers))
-                .asObservableSuccess()
-                .map { response ->
-                    searchAnimeByPathParse(response)
-                }
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt
index 8f155d496..270bf4cad 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dopeflix/DopeFlix.kt
@@ -17,14 +17,10 @@ import eu.kanade.tachiyomi.multisrc.dopeflix.dto.VideoDto
 import eu.kanade.tachiyomi.multisrc.dopeflix.extractors.DopeFlixExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -45,8 +41,6 @@ abstract class DopeFlix(
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -191,7 +185,7 @@ abstract class DopeFlix(
         val doc = response.asJsoup()
         val episodeReferer = Headers.headersOf("Referer", response.request.header("referer")!!)
         return doc.select("ul.fss-list a.btn-play")
-            .parallelMap { server ->
+            .parallelCatchingFlatMapBlocking { server ->
                 val name = server.selectFirst("span")!!.text()
                 val id = server.attr("data-id")
                 val url = "$baseUrl/ajax/sources/$id"
@@ -199,19 +193,17 @@ abstract class DopeFlix(
                     .use { it.body.string() }
                 val sourceUrl = reqBody.substringAfter("\"link\":\"")
                     .substringBefore("\"")
-                runCatching {
-                    when {
-                        "DoodStream" in name ->
-                            DoodExtractor(client).videoFromUrl(sourceUrl)
-                                ?.let(::listOf)
-                        "Vidcloud" in name || "UpCloud" in name -> {
-                            val video = extractor.getVideoDto(sourceUrl)
-                            getVideosFromServer(video, name)
-                        }
-                        else -> null
+                when {
+                    "DoodStream" in name ->
+                        DoodExtractor(client).videoFromUrl(sourceUrl)
+                            ?.let(::listOf)
+                    "Vidcloud" in name || "UpCloud" in name -> {
+                        val video = extractor.getVideoDto(sourceUrl)
+                        getVideosFromServer(video, name)
                     }
-                }.getOrNull() ?: emptyList()
-            }.flatten()
+                    else -> null
+                }.orEmpty()
+            }
     }
 
     private fun getVideosFromServer(video: VideoDto, name: String): List<Video> {
@@ -343,11 +335,6 @@ abstract class DopeFlix(
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun HttpUrl.Builder.addIfNotBlank(query: String, value: String): HttpUrl.Builder {
         if (value.isNotBlank()) {
             addQueryParameter(query, value)
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
index f2374fa37..2433012e7 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt
@@ -16,13 +16,14 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.multisrc.zorotheme.dto.HtmlResponse
 import eu.kanade.tachiyomi.multisrc.zorotheme.dto.SourcesResponse
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import eu.kanade.tachiyomi.util.parallelMapNotNull
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -39,8 +40,6 @@ abstract class ZoroTheme(
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client
-
     private val json: Json by injectLazy()
 
     val preferences: SharedPreferences by lazy {
@@ -210,7 +209,7 @@ abstract class ZoroTheme(
     )
 
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
-        val response = client.newCall(videoListRequest(episode)).execute()
+        val response = client.newCall(videoListRequest(episode)).await()
 
         val episodeReferer = response.request.header("referer")!!
         val typeSelection = preferences.typeToggle
@@ -230,7 +229,7 @@ abstract class ZoroTheme(
 
                 val link = client.newCall(
                     GET("$baseUrl/ajax$ajaxRoute/episode/sources?id=$id", apiHeaders(episodeReferer)),
-                ).execute().parseAs<SourcesResponse>().link ?: ""
+                ).await().parseAs<SourcesResponse>().link ?: ""
 
                 VideoData(type, link, name)
             }
@@ -250,11 +249,6 @@ abstract class ZoroTheme(
     override fun videoUrlParse(document: Document) = throw Exception("not used")
 
     // ============================= Utilities ==============================
-
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     private fun Set<String>.contains(s: String, ignoreCase: Boolean): Boolean {
         return any { it.equals(s, ignoreCase) }
     }
diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
index 7418ea079..94e49d504 100644
--- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
+++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
@@ -81,7 +81,6 @@ interface ThemeSourceGenerator {
                 |    extClass = '.${source.className}'
                 |    extFactory = '$themePkg'
                 |    extVersionCode = ${baseVersionCode + source.overrideVersionCode + MULTISRC_LIBRARY_VERSION}
-                |    libVersion = '13'
                 |    ${if (source.isNsfw) "containsNsfw = true\n" else ""}
                 |}
                 |$defaultAdditionalGradleText
diff --git a/src/all/animeonsen/build.gradle b/src/all/animeonsen/build.gradle
index 6a78e4b45..b3f736b9c 100644
--- a/src/all/animeonsen/build.gradle
+++ b/src/all/animeonsen/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'all.animeonsen'
     extClass = '.AnimeOnsen'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/animeonsen/src/eu/kanade/tachiyomi/animeextension/all/animeonsen/AnimeOnsen.kt b/src/all/animeonsen/src/eu/kanade/tachiyomi/animeextension/all/animeonsen/AnimeOnsen.kt
index 0cfd2887a..e7d2bb992 100644
--- a/src/all/animeonsen/src/eu/kanade/tachiyomi/animeextension/all/animeonsen/AnimeOnsen.kt
+++ b/src/all/animeonsen/src/eu/kanade/tachiyomi/animeextension/all/animeonsen/AnimeOnsen.kt
@@ -18,14 +18,12 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
-import kotlinx.serialization.decodeFromString
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -43,11 +41,9 @@ class AnimeOnsen : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    private val cfClient = network.cloudflareClient
-
     override val client by lazy {
         network.client.newBuilder()
-            .addInterceptor(AOAPIInterceptor(cfClient))
+            .addInterceptor(AOAPIInterceptor(network.client))
             .build()
     }
 
@@ -88,15 +84,9 @@ class AnimeOnsen : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // =========================== Anime Details ============================
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(GET("$apiUrl/content/${anime.url}/extensive"))
-            .asObservableSuccess()
-            .map { response ->
-                animeDetailsParse(response).apply { initialized = true }
-            }
-    }
+    override fun animeDetailsRequest(anime: SAnime) = GET("$apiUrl/content/${anime.url}/extensive")
 
-    override fun animeDetailsRequest(anime: SAnime) = GET("$baseUrl/details/${anime.url}")
+    override fun getAnimeUrl(anime: SAnime) = "$baseUrl/details/${anime.url}"
 
     override fun animeDetailsParse(response: Response) = SAnime.create().apply {
         val details = response.parseAs<AnimeDetails>()
@@ -165,10 +155,6 @@ class AnimeOnsen : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     private fun parseStatus(statusString: String?): Int {
         return when (statusString?.trim()) {
             "finished_airing" -> SAnime.COMPLETED
diff --git a/src/all/animeworldindia/build.gradle b/src/all/animeworldindia/build.gradle
index ce36ad216..d76e97dca 100644
--- a/src/all/animeworldindia/build.gradle
+++ b/src/all/animeworldindia/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'all.animeworldindia'
     extClass = '.AnimeWorldIndiaFactory'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/all/animeworldindia/src/eu/kanade/tachiyomi/animeextension/all/animeworldindia/AnimeWorldIndia.kt b/src/all/animeworldindia/src/eu/kanade/tachiyomi/animeextension/all/animeworldindia/AnimeWorldIndia.kt
index b9a511bea..302a019ff 100644
--- a/src/all/animeworldindia/src/eu/kanade/tachiyomi/animeextension/all/animeworldindia/AnimeWorldIndia.kt
+++ b/src/all/animeworldindia/src/eu/kanade/tachiyomi/animeextension/all/animeworldindia/AnimeWorldIndia.kt
@@ -34,8 +34,6 @@ class AnimeWorldIndia(
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
diff --git a/src/all/googledrive/build.gradle b/src/all/googledrive/build.gradle
index 3e811ba47..39d36baf5 100644
--- a/src/all/googledrive/build.gradle
+++ b/src/all/googledrive/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'all.googledrive'
     extClass = '.GoogleDrive'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt b/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
index 2076ac7eb..d5b25b186 100644
--- a/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
+++ b/src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/GoogleDrive.kt
@@ -22,18 +22,17 @@ import eu.kanade.tachiyomi.lib.googledriveextractor.GoogleDriveExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.ProtocolException
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okhttp3.internal.commonEmptyRequestBody
 import org.jsoup.nodes.Document
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -63,8 +62,6 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val client: OkHttpClient = network.client
-
     // Overriding headersBuilder() seems to cause issues with webview
     private val getHeaders = headers.newBuilder().apply {
         add("Accept", "*/*")
@@ -77,8 +74,8 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================== Popular ===============================
 
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> =
-        Observable.just(parsePage(popularAnimeRequest(page), page))
+    override suspend fun getPopularAnime(page: Int): AnimesPage =
+        parsePage(popularAnimeRequest(page), page)
 
     override fun popularAnimeRequest(page: Int): Request {
         require(!baseUrlInternal.isNullOrEmpty()) { "Enter drive path(s) in extension settings." }
@@ -106,11 +103,11 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun searchAnimeParse(response: Response): AnimesPage = throw Exception("Not used")
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val urlFilter = filterList.find { it is URLFilter } as URLFilter
 
@@ -118,16 +115,16 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
             val req = searchAnimeRequest(page, query, filters)
 
             if (query.isEmpty()) {
-                Observable.just(parsePage(req, page))
+                parsePage(req, page)
             } else {
                 val parentId = req.url.pathSegments.last()
                 val cleanQuery = URLEncoder.encode(query, "UTF-8")
                 val genMultiFormReq = searchReq(parentId, cleanQuery)
 
-                Observable.just(parsePage(req, page, genMultiFormReq))
+                parsePage(req, page, genMultiFormReq)
             }
         } else {
-            Observable.just(addSinglePage(urlFilter.state))
+            addSinglePage(urlFilter.state)
         }
     }
 
@@ -187,10 +184,10 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
         return GET(parsed.url, headers = getHeaders)
     }
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         val parsed = json.decodeFromString<LinkData>(anime.url)
 
-        if (parsed.type == "single") return Observable.just(anime)
+        if (parsed.type == "single") return anime
 
         val folderId = DRIVE_FOLDER_REGEX.matchEntire(parsed.url)!!.groups["id"]!!.value
 
@@ -198,7 +195,7 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
             client.newCall(GET(parsed.url, headers = getHeaders)).execute().asJsoup()
         } catch (a: ProtocolException) {
             null
-        } ?: return Observable.just(anime)
+        } ?: return anime
 
         // Get cover
 
@@ -251,28 +248,26 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
             }
         }
 
-        return Observable.just(anime)
+        return anime
     }
 
     override fun animeDetailsParse(response: Response): SAnime = throw Exception("Not used")
 
     // ============================== Episodes ==============================
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val episodeList = mutableListOf<SEpisode>()
         val parsed = json.decodeFromString<LinkData>(anime.url)
 
         if (parsed.type == "single") {
-            return Observable.just(
-                listOf(
-                    SEpisode.create().apply {
-                        name = "Video"
-                        scanlator = parsed.info!!.size
-                        url = parsed.url
-                        episode_number = 1F
-                        date_upload = -1L
-                    },
-                ),
+            return listOf(
+                SEpisode.create().apply {
+                    name = "Video"
+                    scanlator = parsed.info!!.size
+                    url = parsed.url
+                    episode_number = 1F
+                    date_upload = -1L
+                },
             )
         }
 
@@ -354,15 +349,15 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
 
         traverseFolder(parsed.url, "")
 
-        return Observable.just(episodeList.reversed())
+        return episodeList.reversed()
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("Not used")
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> =
-        Observable.just(GoogleDriveExtractor(client, headers).videosFromUrl(episode.url))
+    override suspend fun getVideoList(episode: SEpisode): List<Video> =
+        GoogleDriveExtractor(client, headers).videosFromUrl(episode.url)
 
     // ============================= Utilities ==============================
 
@@ -508,11 +503,6 @@ class GoogleDrive : ConfigurableAnimeSource, AnimeHttpSource() {
         return AnimesPage(animeList, nextPageToken != null)
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     // https://github.com/yt-dlp/yt-dlp/blob/8f0be90ecb3b8d862397177bb226f17b245ef933/yt_dlp/extractor/youtube.py#L573
     private fun generateSapisidhashHeader(
         SAPISID: String,
diff --git a/src/all/googledriveindex/build.gradle b/src/all/googledriveindex/build.gradle
index 27db7b53d..63fd07e0a 100644
--- a/src/all/googledriveindex/build.gradle
+++ b/src/all/googledriveindex/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.googledriveindex'
     extClass = '.GoogleDriveIndex'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt b/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt
index 59d2e97c8..34e466d6d 100644
--- a/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt
+++ b/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt
@@ -21,19 +21,18 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.Credentials
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -59,7 +58,7 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor { chain ->
             var request = chain.request()
 
@@ -119,29 +118,22 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun searchAnimeParse(response: Response): AnimesPage = throw Exception("Not used")
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val urlFilter = filterList.find { it is URLFilter } as URLFilter
 
         return if (urlFilter.state.isEmpty()) {
             val req = searchAnimeRequest(page, query, filters)
-            Observable.defer {
-                try {
-                    client.newCall(req).asObservableSuccess()
-                } catch (e: NoClassDefFoundError) {
-                    // RxJava doesn't handle Errors, which tends to happen during global searches
-                    // if an old extension using non-existent classes is still around
-                    throw RuntimeException(e)
+            client.newCall(req).awaitSuccess()
+                .use { response ->
+                    searchAnimeParse(response, req.url.toString())
                 }
-            }.map { response ->
-                searchAnimeParse(response, req.url.toString())
-            }
         } else {
-            Observable.just(addSinglePage(urlFilter.state))
+            addSinglePage(urlFilter.state)
         }
     }
 
@@ -237,7 +229,7 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         val parsed = json.decodeFromString<LinkData>(anime.url)
         val newParsed = if (parsed.type != "search") {
             parsed
@@ -265,7 +257,7 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
         }
 
         if (newParsed.type == "single") {
-            return Observable.just(anime)
+            return anime
         }
 
         var newToken: String? = ""
@@ -309,14 +301,14 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
             newPageIndex += 1
         }
 
-        return Observable.just(anime)
+        return anime
     }
 
     override fun animeDetailsParse(response: Response): SAnime = throw Exception("Not used")
 
     // ============================== Episodes ==============================
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val episodeList = mutableListOf<SEpisode>()
         val parsed = json.decodeFromString<LinkData>(anime.url)
         var counter = 1
@@ -446,14 +438,14 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
             traverseDirectory(newParsed.url)
         }
 
-        return Observable.just(episodeList.reversed())
+        return episodeList.reversed()
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("Not used")
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val url = episode.url
 
         val doc = client.newCall(
@@ -462,10 +454,10 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
 
         val script = doc.selectFirst("script:containsData(videodomain)")?.data()
             ?: doc.selectFirst("script:containsData(downloaddomain)")?.data()
-            ?: return Observable.just(listOf(Video(url, "Video", url)))
+            ?: return listOf(Video(url, "Video", url))
 
         if (script.contains("\"second_domain_for_dl\":false")) {
-            return Observable.just(listOf(Video(url, "Video", url)))
+            return listOf(Video(url, "Video", url))
         }
 
         val domainUrl = if (script.contains("videodomain", true)) {
@@ -484,18 +476,10 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() {
             domainUrl + url.toHttpUrl().encodedPath
         }
 
-        return Observable.just(
-            listOf(Video(videoUrl, "Video", videoUrl)),
-        )
+        return listOf(Video(videoUrl, "Video", videoUrl))
     }
 
     // ============================= Utilities ==============================
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     private fun HttpUrl.hostAndCred(): String {
         return if (this.password.isNotBlank() && this.username.isNotBlank()) {
             "${this.username}:${this.password}@${this.host}"
diff --git a/src/all/javguru/build.gradle b/src/all/javguru/build.gradle
index 89af4a4a2..d296f8b0c 100644
--- a/src/all/javguru/build.gradle
+++ b/src/all/javguru/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'all.javguru'
     extClass = '.JavGuru'
     extVersionCode = 9
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/all/javguru/src/eu/kanade/tachiyomi/animeextension/all/javguru/JavGuru.kt b/src/all/javguru/src/eu/kanade/tachiyomi/animeextension/all/javguru/JavGuru.kt
index 8eb4d641b..4b8cb4fbc 100644
--- a/src/all/javguru/src/eu/kanade/tachiyomi/animeextension/all/javguru/JavGuru.kt
+++ b/src/all/javguru/src/eu/kanade/tachiyomi/animeextension/all/javguru/JavGuru.kt
@@ -20,20 +20,16 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservable
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Call
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.select.Elements
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import kotlin.math.min
@@ -48,8 +44,6 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val noRedirectClient = client.newBuilder()
         .followRedirects(false)
         .build()
@@ -60,13 +54,13 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
 
     private lateinit var popularElements: Elements
 
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
+    override suspend fun getPopularAnime(page: Int): AnimesPage {
         return if (page == 1) {
             client.newCall(popularAnimeRequest(page))
-                .asObservableSuccess()
-                .map(::popularAnimeParse)
+                .awaitSuccess()
+                .use(::popularAnimeParse)
         } else {
-            Observable.just(cachedPopularAnimeParse(page))
+            cachedPopularAnimeParse(page)
         }
     }
 
@@ -126,22 +120,22 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
         return AnimesPage(entries, page < lastPage)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         if (query.startsWith(PREFIX_ID)) {
             val id = query.substringAfter(PREFIX_ID)
             if (id.toIntOrNull() == null) {
-                return Observable.just(AnimesPage(emptyList(), false))
+                return AnimesPage(emptyList(), false)
             }
             val url = "/$id/"
             val tempAnime = SAnime.create().apply { this.url = url }
-            return fetchAnimeDetails(tempAnime).map {
+            return getAnimeDetails(tempAnime).let {
                 val anime = it.apply { this.url = url }
                 AnimesPage(listOf(anime), false)
             }
         } else if (query.isNotEmpty()) {
             return client.newCall(searchAnimeRequest(page, query, filters))
-                .asObservableSuccess()
-                .map(::searchAnimeParse)
+                .awaitSuccess()
+                .use(::searchAnimeParse)
         } else {
             filters.forEach { filter ->
                 when (filter) {
@@ -152,8 +146,8 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
                             val url = "$baseUrl${filter.toUrlPart()}" + if (page > 1) "page/$page/" else ""
                             val request = GET(url, headers)
                             return client.newCall(request)
-                                .asObservableSuccess()
-                                .map(::searchAnimeParse)
+                                .awaitSuccess()
+                                .use(::searchAnimeParse)
                         }
                     }
                     is ActressFilter,
@@ -165,8 +159,8 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
                             val url = "$baseUrl${filter.toUrlPart()}" + if (page > 1) "page/$page/" else ""
                             val request = GET(url, headers)
                             return client.newCall(request)
-                                .asObservableIgnoreCode(404)
-                                .map(::searchAnimeParse)
+                                .awaitIgnoreCode(404)
+                                .use(::searchAnimeParse)
                         }
                     }
                     else -> { }
@@ -218,14 +212,12 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
         }
     }
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
-        return Observable.just(
-            listOf(
-                SEpisode.create().apply {
-                    url = anime.url
-                    name = "Episode"
-                },
-            ),
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
+        return listOf(
+            SEpisode.create().apply {
+                url = anime.url
+                name = "Episode"
+            },
         )
     }
 
@@ -242,8 +234,7 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
 
         return iframeUrls
             .mapNotNull(::resolveHosterUrl)
-            .parallelMap(::getVideos)
-            .flatten()
+            .parallelCatchingFlatMapBlocking(::getVideos)
     }
 
     private fun resolveHosterUrl(iframeUrl: String): String? {
@@ -289,37 +280,33 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
     private val emTurboExtractor by lazy { EmTurboExtractor(client, headers) }
 
     private fun getVideos(hosterUrl: String): List<Video> {
-        return runCatching {
-            when {
-                hosterUrl.contains("javplaya") -> {
-                    streamWishExtractor.videosFromUrl(hosterUrl)
-                }
-
-                hosterUrl.contains("streamtape") -> {
-                    streamTapeExtractor.videoFromUrl(hosterUrl).let(::listOfNotNull)
-                }
-
-                hosterUrl.contains("dood") -> {
-                    doodExtractor.videosFromUrl(hosterUrl)
-                }
-
-                MIXDROP_DOMAINS.any { it in hosterUrl } -> {
-                    mixDropExtractor.videoFromUrl(hosterUrl)
-                }
-
-                hosterUrl.contains("maxstream") -> {
-                    maxStreamExtractor.videoFromUrl(hosterUrl)
-                }
-
-                hosterUrl.contains("emturbovid") -> {
-                    emTurboExtractor.getVideos(hosterUrl)
-                }
-
-                else -> {
-                    emptyList()
-                }
+        return when {
+            hosterUrl.contains("javplaya") -> {
+                streamWishExtractor.videosFromUrl(hosterUrl)
             }
-        }.getOrDefault(emptyList())
+
+            hosterUrl.contains("streamtape") -> {
+                streamTapeExtractor.videoFromUrl(hosterUrl).let(::listOfNotNull)
+            }
+
+            hosterUrl.contains("dood") -> {
+                doodExtractor.videosFromUrl(hosterUrl)
+            }
+
+            MIXDROP_DOMAINS.any { it in hosterUrl } -> {
+                mixDropExtractor.videoFromUrl(hosterUrl)
+            }
+
+            hosterUrl.contains("maxstream") -> {
+                maxStreamExtractor.videoFromUrl(hosterUrl)
+            }
+
+            hosterUrl.contains("emturbovid") -> {
+                emTurboExtractor.getVideos(hosterUrl)
+            }
+
+            else -> emptyList()
+        }
     }
 
     override fun List<Video>.sort(): List<Video> {
@@ -330,11 +317,6 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
         ).reversed()
     }
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun getIDFromUrl(element: Elements): String? {
         return element.attr("abs:href")
             .toHttpUrlOrNull()
@@ -353,8 +335,8 @@ class JavGuru : AnimeHttpSource(), ConfigurableAnimeSource {
             ?.last()
             ?.toIntOrNull()
 
-    private fun Call.asObservableIgnoreCode(code: Int): Observable<Response> {
-        return asObservable().doOnNext { response ->
+    private suspend fun Call.awaitIgnoreCode(code: Int): Response {
+        return await().also { response ->
             if (!response.isSuccessful && response.code != code) {
                 response.close()
                 throw Exception("HTTP error ${response.code}")
diff --git a/src/all/jellyfin/build.gradle b/src/all/jellyfin/build.gradle
index bf6b05342..22c35fd03 100644
--- a/src/all/jellyfin/build.gradle
+++ b/src/all/jellyfin/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'all.jellyfin'
     extClass = '.JellyfinFactory'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
index e8ef557f3..f268ed30d 100644
--- a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
+++ b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/Jellyfin.kt
@@ -19,7 +19,8 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -31,7 +32,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -135,10 +135,10 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
 
     override fun popularAnimeParse(response: Response): AnimesPage = throw Exception("Not used")
 
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
+    override suspend fun getPopularAnime(page: Int): AnimesPage {
         return client.newCall(popularAnimeRequest(page))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 popularAnimeParsePage(response, page)
             }
     }
@@ -175,10 +175,10 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
 
     override fun latestUpdatesParse(response: Response) = throw Exception("Not used")
 
-    override fun fetchLatestUpdates(page: Int): Observable<AnimesPage> {
+    override suspend fun getLatestUpdates(page: Int): AnimesPage {
         return client.newCall(latestUpdatesRequest(page))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 latestUpdatesParsePage(response, page)
             }
     }
@@ -211,7 +211,7 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
 
     override fun searchAnimeParse(response: Response) = throw Exception("Not used")
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         require(parentId.isNotEmpty()) { "Select library in the extension settings." }
         val startIndex = (page - 1) * 5
 
@@ -240,7 +240,7 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
             getAnimeFromId(it.Id)
         }
 
-        return Observable.just(AnimesPage(animeList, 5 * page < items.TotalRecordCount))
+        return AnimesPage(animeList, 5 * page < items.TotalRecordCount)
     }
 
     private fun getAnimeFromMovie(movieList: List<ItemsResponse.Item>): List<SAnime> {
@@ -557,11 +557,6 @@ class Jellyfin(private val suffix: String) : ConfigurableAnimeSource, AnimeHttpS
         return json.encodeToString(this)
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val mediaLibPref = medialibPreference(screen)
         screen.addPreference(
diff --git a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/JellyfinAuthenticator.kt b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/JellyfinAuthenticator.kt
index ca061689b..782b41d13 100644
--- a/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/JellyfinAuthenticator.kt
+++ b/src/all/jellyfin/src/eu/kanade/tachiyomi/animeextension/all/jellyfin/JellyfinAuthenticator.kt
@@ -5,6 +5,7 @@ import android.os.Build
 import android.util.Log
 import eu.kanade.tachiyomi.AppInfo
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
@@ -13,7 +14,6 @@ import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class JellyfinAuthenticator(
@@ -84,11 +84,6 @@ class JellyfinAuthenticator(
         value,
     ).apply()
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     companion object {
         private const val DEVICEID_KEY = "device_id"
         private const val CLIENT = "Aniyomi"
diff --git a/src/all/kamyroll/build.gradle b/src/all/kamyroll/build.gradle
index 30c5eedbe..ef90a477e 100644
--- a/src/all/kamyroll/build.gradle
+++ b/src/all/kamyroll/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'all.kamyroll'
     extClass = '.Yomiroll'
     extVersionCode = 29
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
index 2d48c86ed..a7fbf0bdb 100644
--- a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
+++ b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Yomiroll.kt
@@ -16,12 +16,12 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
@@ -30,7 +30,6 @@ import kotlinx.serialization.json.jsonObject
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -176,7 +175,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         val mediaId = json.decodeFromString<LinkData>(anime.url)
         val resp = client.newCall(
             if (mediaId.media_type == "series") {
@@ -186,9 +185,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
             },
         ).execute().use { it.body.string() }
         val info = json.decodeFromString<AnimeResult>(resp)
-        return Observable.just(
-            info.data.first().toSAnimeOrNull(anime) ?: anime,
-        )
+        return info.data.first().toSAnimeOrNull(anime) ?: anime
     }
 
     override fun animeDetailsParse(response: Response): SAnime = throw Exception("not used")
@@ -210,11 +207,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
         val chunkSize = Runtime.getRuntime().availableProcessors()
         return if (series) {
             seasons.data.sortedBy { it.season_number }.chunked(chunkSize).flatMap { chunk ->
-                chunk.parallelMap { seasonData ->
-                    runCatching {
-                        getEpisodes(seasonData)
-                    }.getOrNull()
-                }.filterNotNull().flatten()
+                chunk.parallelCatchingFlatMapBlocking(::getEpisodes)
             }.reversed()
         } else {
             seasons.data.mapIndexed { index, movie ->
@@ -263,7 +256,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val urlJson = json.decodeFromString<EpisodeData>(episode.url)
         val dubLocale = preferences.getString(PREF_AUD_KEY, PREF_AUD_DEFAULT)!!
 
@@ -276,13 +269,9 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
                 it.second == "en-US" ||
                 it.second == "" ||
                 if (isUsingLocalToken) it.second == urlJson.ids.first().second else false
-        }.parallelMap { media ->
-            runCatching {
-                extractVideo(media)
-            }.getOrNull()
-        }.filterNotNull().flatten()
+        }.parallelCatchingFlatMap(::extractVideo)
 
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     // ============================= Utilities ==============================
@@ -314,11 +303,11 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
         audLang: String,
         subsList: List<Track>,
     ): List<Video> {
-        return streams.streams?.adaptive_hls?.entries?.parallelMap { (_, value) ->
+        return streams.streams?.adaptive_hls?.entries?.parallelMapNotNullBlocking { (_, value) ->
             val stream = json.decodeFromString<HlsLinks>(value.jsonObject.toString())
             runCatching {
                 val playlist = client.newCall(GET(stream.url)).execute()
-                if (playlist.code != 200) return@parallelMap null
+                if (playlist.code != 200) return@parallelMapNotNullBlocking null
                 playlist.use { it.body.string() }.substringAfter("#EXT-X-STREAM-INF:")
                     .split("#EXT-X-STREAM-INF:").map {
                         val hardsub = stream.hardsub_locale.let { hs ->
@@ -342,7 +331,7 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
                         }
                     }
             }.getOrNull()
-        }?.filterNotNull()?.flatten() ?: emptyList()
+        }?.flatten() ?: emptyList()
     }
 
     private fun getVideoRequest(mediaId: String): Request {
@@ -421,7 +410,9 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
                 val media = json.decodeFromString<LinkData>(anime.url)
                 if (media.media_type == "series") {
                     fetchStatusByTitle(this@toSAnime.title)
-                } else SAnime.COMPLETED
+                } else {
+                    SAnime.COMPLETED
+                }
             } ?: SAnime.UNKNOWN
             author = content_provider
             description = anime?.description ?: StringBuilder().apply {
@@ -600,12 +591,6 @@ class Yomiroll : ConfigurableAnimeSource, AnimeHttpSource() {
             }
         }.apply { reload() }
 
-    // From Dopebox
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun getTokenDetail(force: Boolean = false): String {
         return runCatching {
             val storedToken = tokenInterceptor.getAccessToken(force)
diff --git a/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt b/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
index 5055a7ccd..5340cd9e0 100644
--- a/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
+++ b/src/all/missav/src/eu/kanade/tachiyomi/animeextension/all/missav/MissAV.kt
@@ -20,7 +20,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -34,8 +33,6 @@ class MissAV : AnimeHttpSource(), ConfigurableAnimeSource {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
 
@@ -136,14 +133,12 @@ class MissAV : AnimeHttpSource(), ConfigurableAnimeSource {
             .joinToString()
             .takeIf(String::isNotBlank)
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
-        return Observable.just(
-            listOf(
-                SEpisode.create().apply {
-                    url = anime.url
-                    name = "Episode"
-                },
-            ),
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
+        return listOf(
+            SEpisode.create().apply {
+                url = anime.url
+                name = "Episode"
+            },
         )
     }
 
diff --git a/src/all/supjav/build.gradle b/src/all/supjav/build.gradle
index bc816b44d..f96a66fb6 100644
--- a/src/all/supjav/build.gradle
+++ b/src/all/supjav/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'all.supjav'
     extClass = '.SupJavFactory'
     extVersionCode = 1
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/all/supjav/src/eu/kanade/tachiyomi/animeextension/all/supjav/SupJav.kt b/src/all/supjav/src/eu/kanade/tachiyomi/animeextension/all/supjav/SupJav.kt
index 0f6662281..61acfbb71 100644
--- a/src/all/supjav/src/eu/kanade/tachiyomi/animeextension/all/supjav/SupJav.kt
+++ b/src/all/supjav/src/eu/kanade/tachiyomi/animeextension/all/supjav/SupJav.kt
@@ -15,18 +15,14 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -38,8 +34,6 @@ class SupJav(override val lang: String = "en") : ConfigurableAnimeSource, Parsed
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .set("Referer", "$baseUrl/")
         .set("Origin", baseUrl)
@@ -87,14 +81,14 @@ class SupJav(override val lang: String = "en") : ConfigurableAnimeSource, Parsed
     }
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -129,14 +123,14 @@ class SupJav(override val lang: String = "en") : ConfigurableAnimeSource, Parsed
     private fun Elements.textsOrNull() = eachText().joinToString().takeUnless(String::isEmpty)
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val episode = SEpisode.create().apply {
             name = "JAV"
             episode_number = 1F
             url = anime.url
         }
 
-        return Observable.just(listOf(episode))
+        return listOf(episode)
     }
 
     override fun episodeListSelector(): String {
@@ -155,7 +149,7 @@ class SupJav(override val lang: String = "en") : ConfigurableAnimeSource, Parsed
             .filter { it.text() in SUPPORTED_PLAYERS }
             .map { it.text() to it.attr("data-link").reversed() }
 
-        return players.parallelCatchingFlatMap(::videosFromPlayer)
+        return players.parallelCatchingFlatMapBlocking(::videosFromPlayer)
     }
 
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
@@ -227,15 +221,6 @@ class SupJav(override val lang: String = "en") : ConfigurableAnimeSource, Parsed
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle
index 91fca898a..14cb87fa8 100644
--- a/src/ar/akwam/build.gradle
+++ b/src/ar/akwam/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.akwam'
     extClass = '.Akwam'
     extVersionCode = 9
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt
index 69aa518e2..604c28d90 100644
--- a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt
+++ b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class Akwam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/ar/anime4up/build.gradle b/src/ar/anime4up/build.gradle
index f61adef69..3f0c7218a 100644
--- a/src/ar/anime4up/build.gradle
+++ b/src/ar/anime4up/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'ar.anime4up'
     extClass = '.Anime4Up'
     extVersionCode = 52
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt b/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt
index 119d0e860..219f1bb06 100644
--- a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt
+++ b/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt
@@ -22,10 +22,7 @@ import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
@@ -48,8 +45,6 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -159,7 +154,7 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val parsedData = json.decodeFromString<Qualities>(base64)
         val streamLinks = with(parsedData) { fhd + hd + sd }
 
-        return streamLinks.values.distinct().parallelCatchingFlatMap(::extractVideos)
+        return streamLinks.values.distinct().parallelCatchingFlatMapBlocking(::extractVideos)
     }
 
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
@@ -216,15 +211,6 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/ar/animeblkom/build.gradle b/src/ar/animeblkom/build.gradle
index 4caac9eb4..d296df497 100644
--- a/src/ar/animeblkom/build.gradle
+++ b/src/ar/animeblkom/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.animeblkom'
     extClass = '.AnimeBlkom'
     extVersionCode = 16
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/AnimeBlkom.kt b/src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/AnimeBlkom.kt
index efa396c99..b0aa1c67c 100644
--- a/src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/AnimeBlkom.kt
+++ b/src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/AnimeBlkom.kt
@@ -32,8 +32,6 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("referer", baseUrl)
 
diff --git a/src/ar/animeiat/build.gradle b/src/ar/animeiat/build.gradle
index 30249807e..122d10184 100644
--- a/src/ar/animeiat/build.gradle
+++ b/src/ar/animeiat/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'ar.animeiat'
     extClass = '.Animeiat'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/animelek/build.gradle b/src/ar/animelek/build.gradle
index 5a36652fc..1c1d90345 100644
--- a/src/ar/animelek/build.gradle
+++ b/src/ar/animelek/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.animelek'
     extClass = '.AnimeLek'
     extVersionCode = 27
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
index 580d0889c..341b4f8c3 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class AnimeLek : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle
index 7e88cc8e6..2de21947b 100644
--- a/src/ar/animerco/build.gradle
+++ b/src/ar/animerco/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.animerco'
     extClass = '.Animerco'
     extVersionCode = 34
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
index 165e74c00..e8d2be483 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
@@ -23,12 +23,8 @@ import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -47,8 +43,6 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -160,9 +154,7 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val document = response.use { it.asJsoup() }
         val players = document.select(videoListSelector())
-        return players.parallelMap {
-            runCatching { getPlayerVideos(it) }.getOrElse { emptyList() }
-        }.flatten()
+        return players.parallelCatchingFlatMapBlocking(::getPlayerVideos)
     }
 
     override fun videoListSelector() = "li.dooplay_player_option" // ul#playeroptionsul
@@ -250,11 +242,6 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_TITLE = "Preferred quality"
diff --git a/src/ar/arabanime/build.gradle b/src/ar/arabanime/build.gradle
index a637d50f5..15ca026ac 100644
--- a/src/ar/arabanime/build.gradle
+++ b/src/ar/arabanime/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'ar.arabanime'
     extClass = '.ArabAnime'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/arabanime/src/eu/kanade/tachiyomi/animeextension/ar/arabanime/ArabAnime.kt b/src/ar/arabanime/src/eu/kanade/tachiyomi/animeextension/ar/arabanime/ArabAnime.kt
index 5f375111c..5e4675674 100644
--- a/src/ar/arabanime/src/eu/kanade/tachiyomi/animeextension/ar/arabanime/ArabAnime.kt
+++ b/src/ar/arabanime/src/eu/kanade/tachiyomi/animeextension/ar/arabanime/ArabAnime.kt
@@ -38,8 +38,6 @@ class ArabAnime : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
diff --git a/src/ar/arabseed/build.gradle b/src/ar/arabseed/build.gradle
index 3d8a71c0e..ead172e2b 100644
--- a/src/ar/arabseed/build.gradle
+++ b/src/ar/arabseed/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.arabseed'
     extClass = '.ArabSeed'
     extVersionCode = 9
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/arabseed/src/eu/kanade/tachiyomi/animeextension/ar/arabseed/ArabSeed.kt b/src/ar/arabseed/src/eu/kanade/tachiyomi/animeextension/ar/arabseed/ArabSeed.kt
index 59e012bdc..a7606cd59 100644
--- a/src/ar/arabseed/src/eu/kanade/tachiyomi/animeextension/ar/arabseed/ArabSeed.kt
+++ b/src/ar/arabseed/src/eu/kanade/tachiyomi/animeextension/ar/arabseed/ArabSeed.kt
@@ -18,10 +18,7 @@ import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -42,8 +39,6 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
     private val preferences by lazy {
@@ -97,11 +92,11 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListSelector() = "div.containerServers ul li"
 
     private fun videosFromElement(document: Document): List<Video> {
-        return document.select(videoListSelector()).parallelMap { element ->
+        return document.select(videoListSelector()).parallelCatchingFlatMapBlocking { element ->
             val quality = element.text()
             val embedUrl = element.attr("data-link")
-            runCatching { getVideosFromUrl(embedUrl, quality) }.getOrElse { emptyList() }
-        }.flatten()
+            getVideosFromUrl(embedUrl, quality)
+        }
     }
 
     private val doodExtractor by lazy { DoodExtractor(client) }
@@ -251,11 +246,6 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         // From egydead(ar)
         private const val PREF_DOMAIN_KEY = "default_domain_v${BuildConfig.VERSION_NAME}"
diff --git a/src/ar/asia2tv/build.gradle b/src/ar/asia2tv/build.gradle
index 3b0bd39f9..13a6ad698 100644
--- a/src/ar/asia2tv/build.gradle
+++ b/src/ar/asia2tv/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.asia2tv'
     extClass = '.Asia2TV'
     extVersionCode = 15
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/asia2tv/src/eu/kanade/tachiyomi/animeextension/ar/asia2tv/Asia2TV.kt b/src/ar/asia2tv/src/eu/kanade/tachiyomi/animeextension/ar/asia2tv/Asia2TV.kt
index 104c6141b..efd2a2631 100644
--- a/src/ar/asia2tv/src/eu/kanade/tachiyomi/animeextension/ar/asia2tv/Asia2TV.kt
+++ b/src/ar/asia2tv/src/eu/kanade/tachiyomi/animeextension/ar/asia2tv/Asia2TV.kt
@@ -19,12 +19,8 @@ import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -43,8 +39,6 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -90,7 +84,7 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.use { it.asJsoup() }
-        return document.select(videoListSelector()).parallelCatchingFlatMap {
+        return document.select(videoListSelector()).parallelCatchingFlatMapBlocking {
             val url = it.attr("data-server")
             getVideosFromUrl(url)
         }
@@ -265,15 +259,6 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     companion object {
         private val STREAM_WISH_DOMAINS by lazy { listOf("wishfast", "fviplions", "filelions", "streamwish", "dwish") }
         private val VID_BOM_DOMAINS by lazy { listOf("vidbam", "vadbam", "vidbom", "vidbm") }
diff --git a/src/ar/egydead/build.gradle b/src/ar/egydead/build.gradle
index 40786d664..f74ede2b2 100644
--- a/src/ar/egydead/build.gradle
+++ b/src/ar/egydead/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.egydead'
     extClass = '.EgyDead'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/egydead/src/eu/kanade/tachiyomi/animeextension/ar/egydead/EgyDead.kt b/src/ar/egydead/src/eu/kanade/tachiyomi/animeextension/ar/egydead/EgyDead.kt
index 2e667efd2..856c18849 100644
--- a/src/ar/egydead/src/eu/kanade/tachiyomi/animeextension/ar/egydead/EgyDead.kt
+++ b/src/ar/egydead/src/eu/kanade/tachiyomi/animeextension/ar/egydead/EgyDead.kt
@@ -19,13 +19,10 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -46,8 +43,6 @@ class EgyDead : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -132,19 +127,18 @@ class EgyDead : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // ================================== video urls ==================================
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
 
-    override fun videoListParse(response: Response): List<Video> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val requestBody = FormBody.Builder().add("View", "1").build()
-        val document = client.newCall(POST(response.request.url.toString(), body = requestBody)).execute().asJsoup()
-        return document.select(videoListSelector()).parallelMap {
+
+        val document = client.newCall(POST(baseUrl + episode.url, body = requestBody))
+            .await()
+            .use { it.asJsoup() }
+        return document.select(videoListSelector()).parallelCatchingFlatMap {
             val url = it.attr("data-link")
-            runCatching { extractVideos(url) }.getOrElse { emptyList() }
-        }.flatten()
+            extractVideos(url)
+        }
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
     private fun extractVideos(url: String): List<Video> {
         return when {
             DOOD_REGEX.containsMatchIn(url) -> {
diff --git a/src/ar/faselhd/build.gradle b/src/ar/faselhd/build.gradle
index 8d63b7b79..8006070e5 100644
--- a/src/ar/faselhd/build.gradle
+++ b/src/ar/faselhd/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.faselhd'
     extClass = '.FASELHD'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt b/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
index 7a4479074..4ffab744f 100644
--- a/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
+++ b/src/ar/faselhd/src/eu/kanade/tachiyomi/animeextension/ar/faselhd/FASELHD.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class FASELHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/ar/movies4u/build.gradle b/src/ar/movies4u/build.gradle
index 70b8d7249..dab2e69b0 100644
--- a/src/ar/movies4u/build.gradle
+++ b/src/ar/movies4u/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.movies4u'
     extClass = '.Movies4U'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/movies4u/src/eu/kanade/tachiyomi/animeextension/ar/movies4u/Movies4U.kt b/src/ar/movies4u/src/eu/kanade/tachiyomi/animeextension/ar/movies4u/Movies4U.kt
index 9d4ebab7c..1e59b2bed 100644
--- a/src/ar/movies4u/src/eu/kanade/tachiyomi/animeextension/ar/movies4u/Movies4U.kt
+++ b/src/ar/movies4u/src/eu/kanade/tachiyomi/animeextension/ar/movies4u/Movies4U.kt
@@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class Movies4U : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/ar/mycima/build.gradle b/src/ar/mycima/build.gradle
index fdf653d9f..3a4044d62 100644
--- a/src/ar/mycima/build.gradle
+++ b/src/ar/mycima/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.mycima'
     extClass = '.MyCima'
     extVersionCode = 20
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt b/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
index 99fff327a..6e9f28fa9 100644
--- a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
+++ b/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
@@ -16,11 +16,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -39,8 +35,6 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -124,19 +118,17 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
-        return document.select("ul.WatchServersList li btn").parallelMap {
+        return document.select("ul.WatchServersList li btn").parallelCatchingFlatMapBlocking {
             val frameURL = it.attr("data-url")
-            runCatching {
-                if (it.parent()?.hasClass("MyCimaServer") == true) {
-                    val referer = response.request.url.encodedPath
-                    val newHeader = headers.newBuilder().add("referer", baseUrl + referer).build()
-                    val iframeResponse = client.newCall(GET(frameURL, newHeader)).execute().asJsoup()
-                    videosFromElement(iframeResponse.selectFirst(videoListSelector())!!)
-                } else {
-                    extractVideos(frameURL)
-                }
-            }.getOrElse { emptyList() }
-        }.flatten()
+            if (it.parent()?.hasClass("MyCimaServer") == true) {
+                val referer = response.request.url.encodedPath
+                val newHeader = headers.newBuilder().add("referer", baseUrl + referer).build()
+                val iframeResponse = client.newCall(GET(frameURL, newHeader)).execute().asJsoup()
+                videosFromElement(iframeResponse.selectFirst(videoListSelector())!!)
+            } else {
+                extractVideos(frameURL)
+            }
+        }
     }
 
     private fun extractVideos(url: String): List<Video> {
@@ -367,10 +359,6 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private fun getPrefBaseUrl(): String = preferences.getString(PREF_BASE_URL_KEY, PREF_BASE_URL_DEFAULT)!!
 
     // ============================= Utilities ===================================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_TITLE = "Preferred quality"
diff --git a/src/ar/okanime/build.gradle b/src/ar/okanime/build.gradle
index 2847a5ccb..0fcb84e35 100644
--- a/src/ar/okanime/build.gradle
+++ b/src/ar/okanime/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.okanime'
     extClass = '.Okanime'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
index 83b07468e..26a5527c4 100644
--- a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
+++ b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
@@ -17,16 +17,12 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -69,14 +65,14 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "ul.pagination > li:last-child:not(.disabled)"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -141,7 +137,7 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_SELECTION_KEY, PREF_HOSTER_SELECTION_DEFAULT)!!
         return response.use { it.asJsoup() }
             .select("a.ep-link")
-            .parallelMap { element ->
+            .parallelCatchingFlatMapBlocking { element ->
                 val quality = element.selectFirst("span")?.text().orEmpty().let {
                     when (it) {
                         "HD" -> "720p"
@@ -152,7 +148,7 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
                 val url = element.attr("data-src")
                 extractVideosFromUrl(url, quality, hosterSelection)
-            }.flatten()
+            }
     }
 
     // Inspirated by JavGuru(all)
@@ -163,28 +159,26 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val vidBomExtractor by lazy { VidBomExtractor(client) }
 
     private fun extractVideosFromUrl(url: String, quality: String, selection: Set<String>): List<Video> {
-        return runCatching {
-            when {
-                "https://doo" in url && "/e/" in url && selection.contains("Dood") -> {
-                    doodExtractor.videoFromUrl(url, "DoodStream - $quality")
-                        ?.let(::listOf)
-                }
-                "mp4upload" in url && selection.contains("Mp4upload") -> {
-                    mp4uploadExtractor.videosFromUrl(url, headers)
-                }
-                "ok.ru" in url && selection.contains("Okru") -> {
-                    okruExtractor.videosFromUrl(url)
-                }
-                "voe.sx" in url && selection.contains("Voe") -> {
-                    voeExtractor.videoFromUrl(url, "VoeSX ($quality)")
-                        ?.let(::listOf)
-                }
-                VID_BOM_DOMAINS.any(url::contains) && selection.contains("VidBom") -> {
-                    vidBomExtractor.videosFromUrl(url)
-                }
-                else -> null
+        return when {
+            "https://doo" in url && "/e/" in url && selection.contains("Dood") -> {
+                doodExtractor.videoFromUrl(url, "DoodStream - $quality")
+                    ?.let(::listOf)
             }
-        }.getOrNull() ?: emptyList()
+            "mp4upload" in url && selection.contains("Mp4upload") -> {
+                mp4uploadExtractor.videosFromUrl(url, headers)
+            }
+            "ok.ru" in url && selection.contains("Okru") -> {
+                okruExtractor.videosFromUrl(url)
+            }
+            "voe.sx" in url && selection.contains("Voe") -> {
+                voeExtractor.videoFromUrl(url, "VoeSX ($quality)")
+                    ?.let(::listOf)
+            }
+            VID_BOM_DOMAINS.any(url::contains) && selection.contains("VidBom") -> {
+                vidBomExtractor.videosFromUrl(url)
+            }
+            else -> null
+        }.orEmpty()
     }
 
     override fun videoListSelector(): String {
@@ -238,11 +232,6 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         const val PREFIX_SEARCH = "id:"
 
diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle
index 7bc5c443e..3ab00f067 100644
--- a/src/ar/tuktukcinema/build.gradle
+++ b/src/ar/tuktukcinema/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.tuktukcinema'
     extClass = '.Tuktukcinema'
     extVersionCode = 15
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
index 41bd49442..0d8f4fa11 100644
--- a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
+++ b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
@@ -23,11 +23,7 @@ import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -48,8 +44,6 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -149,14 +143,9 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
-        return document.select(videoListSelector()).parallelMap {
-            runCatching { extractVideos(it) }.getOrElse { emptyList() }
-        }.flatten()
+        return document.select(videoListSelector())
+            .parallelCatchingFlatMapBlocking(::extractVideos)
     }
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 
     private fun extractVideos(element: Element): List<Video> {
         val url = element.attr("data-link")
diff --git a/src/ar/witanime/build.gradle b/src/ar/witanime/build.gradle
index 929bcd226..3f065b9c1 100644
--- a/src/ar/witanime/build.gradle
+++ b/src/ar/witanime/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'ar.witanime'
     extClass = '.WitAnime'
     extVersionCode = 47
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
index 5d1aa433b..65487252e 100755
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
@@ -19,10 +19,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -40,8 +37,6 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
     private val preferences by lazy {
@@ -130,7 +125,7 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
         return document.select("ul#episode-servers li a")
             .distinctBy { it.text().substringBefore(" -") } // remove duplicates by server name
-            .parallelCatchingFlatMap {
+            .parallelCatchingFlatMapBlocking {
                 val url = it.attr("data-url")
                     .takeUnless(String::isBlank)
                     ?.let { String(Base64.decode(it, Base64.DEFAULT)) }
@@ -237,15 +232,6 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     private fun getRealDoc(document: Document): Document {
         return document.selectFirst("div.anime-page-link a")?.let {
             client.newCall(GET(it.attr("href"), headers)).execute().asJsoup()
diff --git a/src/ar/xsanime/build.gradle b/src/ar/xsanime/build.gradle
index 8fdde72e6..1b234ecf0 100644
--- a/src/ar/xsanime/build.gradle
+++ b/src/ar/xsanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.xsanime'
     extClass = '.XsAnime'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt
index 10babd4c5..419424160 100644
--- a/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt
+++ b/src/ar/xsanime/src/eu/kanade/tachiyomi/animeextension/ar/xsanime/XsAnime.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class XsAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/ar/xsmovie/build.gradle b/src/ar/xsmovie/build.gradle
index 8ed050629..817c6481e 100644
--- a/src/ar/xsmovie/build.gradle
+++ b/src/ar/xsmovie/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.xsmovie'
     extClass = '.XsMovie'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt b/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt
index 8f73234a4..9461a8fdf 100644
--- a/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt
+++ b/src/ar/xsmovie/src/eu/kanade/tachiyomi/animeextension/ar/xsmovie/XsMovie.kt
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -32,8 +31,6 @@ class XsMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/aniflix/build.gradle b/src/de/aniflix/build.gradle
index 94b11f955..a8254a875 100644
--- a/src/de/aniflix/build.gradle
+++ b/src/de/aniflix/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.aniflix'
     extClass = '.Aniflix'
     extVersionCode = 25
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
index 4c98f48e2..d944fbd3b 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
@@ -23,16 +23,13 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -46,8 +43,6 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -59,16 +54,8 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val refererHeader = Headers.headersOf("Referer", baseUrl)
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(GET(baseUrl + anime.url))
-            .asObservableSuccess()
-            .map { response ->
-                animeDetailsParse(response).apply { initialized = true }
-            }
-    }
-
-    override fun animeDetailsRequest(anime: SAnime): Request {
-        return GET(baseUrl + anime.url.replace("api/", ""))
+    override fun getAnimeUrl(anime: SAnime): String {
+        return baseUrl + anime.url.replace("api/", "")
     }
 
     override fun animeDetailsParse(response: Response): SAnime {
diff --git a/src/de/aniking/build.gradle b/src/de/aniking/build.gradle
index f802bdfa2..8f9cb36f9 100644
--- a/src/de/aniking/build.gradle
+++ b/src/de/aniking/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'de.aniking'
     extClass = '.Aniking'
     extVersionCode = 16
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/aniking/src/eu/kanade/tachiyomi/animeextension/de/aniking/Aniking.kt b/src/de/aniking/src/eu/kanade/tachiyomi/animeextension/de/aniking/Aniking.kt
index c7d7e5cb7..a60e2db17 100644
--- a/src/de/aniking/src/eu/kanade/tachiyomi/animeextension/de/aniking/Aniking.kt
+++ b/src/de/aniking/src/eu/kanade/tachiyomi/animeextension/de/aniking/Aniking.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -35,8 +34,6 @@ class Aniking : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/animebase/build.gradle b/src/de/animebase/build.gradle
index 75bd67802..fb3def7ae 100644
--- a/src/de/animebase/build.gradle
+++ b/src/de/animebase/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'de.animebase'
     extClass = '.AnimeBase'
     extVersionCode = 18
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
index a2b4431e0..f8b0c3372 100644
--- a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
+++ b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
@@ -17,12 +17,8 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -40,8 +36,6 @@ class AnimeBase : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -198,26 +192,24 @@ class AnimeBase : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         return doc.select("$selector div.panel-body > button").toList()
             .filter { it.text() in hosterSettings.keys }
-            .parallelMap {
-                runCatching {
-                    val language = when (it.attr("data-dubbed")) {
-                        "0" -> "SUB"
-                        else -> "DUB"
-                    }
+            .parallelCatchingFlatMapBlocking {
+                val language = when (it.attr("data-dubbed")) {
+                    "0" -> "SUB"
+                    else -> "DUB"
+                }
 
-                    getVideosFromHoster(it.text(), it.attr("data-streamlink"))
-                        .map { video ->
-                            Video(
-                                video.url,
-                                "$language ${video.quality}",
-                                video.videoUrl,
-                                video.headers,
-                                video.subtitleTracks,
-                                video.audioTracks,
-                            )
-                        }
-                }.onFailure { it.printStackTrace() }.getOrElse { emptyList() }
-            }.flatten().ifEmpty { throw Exception("No videos xDDDDDD") }
+                getVideosFromHoster(it.text(), it.attr("data-streamlink"))
+                    .map { video ->
+                        Video(
+                            video.url,
+                            "$language ${video.quality}",
+                            video.videoUrl,
+                            video.headers,
+                            video.subtitleTracks,
+                            video.audioTracks,
+                        )
+                    }
+            }
     }
 
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
@@ -291,11 +283,6 @@ class AnimeBase : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private const val PREF_LANG_KEY = "preferred_sub"
         private const val PREF_LANG_TITLE = "Standardmäßig Sub oder Dub?"
diff --git a/src/de/animeloads/build.gradle b/src/de/animeloads/build.gradle
index c607e6dc9..82bd70692 100644
--- a/src/de/animeloads/build.gradle
+++ b/src/de/animeloads/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.animeloads'
     extClass = '.AnimeLoads'
     extVersionCode = 12
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt b/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
index 1f73f0abd..0cb9adf39 100644
--- a/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
+++ b/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
@@ -20,7 +20,6 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -44,7 +43,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val id: Long = 655155856096L
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor(DdosGuardInterceptor(network.client))
         .build()
 
@@ -197,7 +196,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     pnglist.forEach { itmax ->
                                         if (max.toInt() == itmax.substringBefore(" |").toInt()) {
                                             val maxhash = itmax.substringAfter("| ")
-                                            network.cloudflareClient.newCall(
+                                            network.client.newCall(
                                                 POST(
                                                     "$baseUrl/files/captcha",
                                                     body = "cID=0&pC=$maxhash&rT=2".toRequestBody("application/x-www-form-urlencoded".toMediaType()),
@@ -313,7 +312,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     pnglist.forEach { itmin ->
                                         if (min.toInt() == itmin.substringBefore(" |").toInt()) {
                                             val minhash = itmin.substringAfter("| ")
-                                            network.cloudflareClient.newCall(
+                                            network.client.newCall(
                                                 POST(
                                                     "$baseUrl/files/captcha",
                                                     body = "cID=0&pC=$minhash&rT=2".toRequestBody("application/x-www-form-urlencoded".toMediaType()),
@@ -517,7 +516,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     pnglist.forEach { itmax ->
                                         if (max.toInt() == itmax.substringBefore(" |").toInt()) {
                                             val maxhash = itmax.substringAfter("| ")
-                                            network.cloudflareClient.newCall(
+                                            network.client.newCall(
                                                 POST(
                                                     "$baseUrl/files/captcha",
                                                     body = "cID=0&pC=$maxhash&rT=2".toRequestBody("application/x-www-form-urlencoded".toMediaType()),
@@ -633,7 +632,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     pnglist.forEach { itmin ->
                                         if (min.toInt() == itmin.substringBefore(" |").toInt()) {
                                             val minhash = itmin.substringAfter("| ")
-                                            network.cloudflareClient.newCall(
+                                            network.client.newCall(
                                                 POST(
                                                     "$baseUrl/files/captcha",
                                                     body = "cID=0&pC=$minhash&rT=2".toRequestBody("application/x-www-form-urlencoded".toMediaType()),
diff --git a/src/de/animestream/build.gradle b/src/de/animestream/build.gradle
index 9171ecb92..2098d5c64 100644
--- a/src/de/animestream/build.gradle
+++ b/src/de/animestream/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.animestream'
     extClass = '.AnimeStream'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animestream/src/eu/kanade/tachiyomi/animeextension/de/animestream/AnimeStream.kt b/src/de/animestream/src/eu/kanade/tachiyomi/animeextension/de/animestream/AnimeStream.kt
index 803974a40..604fef8d2 100644
--- a/src/de/animestream/src/eu/kanade/tachiyomi/animeextension/de/animestream/AnimeStream.kt
+++ b/src/de/animestream/src/eu/kanade/tachiyomi/animeextension/de/animestream/AnimeStream.kt
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -28,8 +27,6 @@ class AnimeStream : ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.client
-
     override fun popularAnimeSelector(): String = "div.movies-list div.ml-item"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/series/page/$page/")
diff --git a/src/de/animetoast/build.gradle b/src/de/animetoast/build.gradle
index 0d14beadc..520182254 100644
--- a/src/de/animetoast/build.gradle
+++ b/src/de/animetoast/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.animetoast'
     extClass = '.AnimeToast'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
index f17127dca..dd4a3e53e 100644
--- a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
+++ b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/aniworld/build.gradle b/src/de/aniworld/build.gradle
index 4bc304e94..bf65f9363 100644
--- a/src/de/aniworld/build.gradle
+++ b/src/de/aniworld/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.aniworld'
     extClass = '.AniWorld'
     extVersionCode = 20
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
index bab83479b..6a916ade0 100644
--- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
+++ b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
@@ -56,7 +56,7 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor(DdosGuardInterceptor(network.client))
         .build()
 
diff --git a/src/de/cineclix/build.gradle b/src/de/cineclix/build.gradle
index aa4d16454..1beb97a90 100644
--- a/src/de/cineclix/build.gradle
+++ b/src/de/cineclix/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.cineclix'
     extClass = '.CineClix'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
index 1384998bb..287033583 100644
--- a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
+++ b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
@@ -26,7 +26,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -43,8 +42,6 @@ class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/einfach/build.gradle b/src/de/einfach/build.gradle
index 87115650b..2d07390da 100644
--- a/src/de/einfach/build.gradle
+++ b/src/de/einfach/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'de.einfach'
     extClass = '.Einfach'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/einfach/src/eu/kanade/tachiyomi/animeextension/de/einfach/Einfach.kt b/src/de/einfach/src/eu/kanade/tachiyomi/animeextension/de/einfach/Einfach.kt
index f86c3ef90..2986c6805 100644
--- a/src/de/einfach/src/eu/kanade/tachiyomi/animeextension/de/einfach/Einfach.kt
+++ b/src/de/einfach/src/eu/kanade/tachiyomi/animeextension/de/einfach/Einfach.kt
@@ -22,17 +22,13 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
@@ -79,14 +75,14 @@ class Einfach : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -129,17 +125,17 @@ class Einfach : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         if (anime.url.contains("/filme/")) {
             val episode = SEpisode.create().apply {
                 url = anime.url
                 name = "Movie - ${anime.title}"
                 episode_number = 1F
             }
-            return Observable.just(listOf(episode))
+            return listOf(episode)
         }
 
-        return super.fetchEpisodeList(anime)
+        return super.getEpisodeList(anime)
     }
 
     override fun episodeListParse(response: Response) =
@@ -181,7 +177,7 @@ class Einfach : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 element.text().lowercase() to fixedUrl
             }.toList()
 
-        return links.parallelCatchingFlatMap { (name, link) ->
+        return links.parallelCatchingFlatMapBlocking { (name, link) ->
             getVideosFromUrl(name, link)
         }
     }
@@ -260,15 +256,6 @@ class Einfach : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .getOrNull() ?: 0L
     }
 
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/de/filmpalast/build.gradle b/src/de/filmpalast/build.gradle
index 81210a223..39751aae1 100644
--- a/src/de/filmpalast/build.gradle
+++ b/src/de/filmpalast/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.filmpalast'
     extClass = '.FilmPalast'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/FilmPalast.kt b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/FilmPalast.kt
index 817166114..b88a679da 100644
--- a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/FilmPalast.kt
+++ b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/FilmPalast.kt
@@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -38,8 +37,6 @@ class FilmPalast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/kool/build.gradle b/src/de/kool/build.gradle
index db20032a9..aa7120b5b 100644
--- a/src/de/kool/build.gradle
+++ b/src/de/kool/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.kool'
     extClass = '.Kool'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt b/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
index baae1a761..aee3dc935 100644
--- a/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
+++ b/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
@@ -29,7 +29,6 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -46,8 +45,6 @@ class Kool : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.client
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/moflixstream/build.gradle b/src/de/moflixstream/build.gradle
index a3cda7d28..c1371f720 100644
--- a/src/de/moflixstream/build.gradle
+++ b/src/de/moflixstream/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'de.moflixstream'
     extClass = '.MoflixStream'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt b/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
index 9d33095c0..c9056f197 100644
--- a/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
+++ b/src/de/moflixstream/src/eu/kanade/tachiyomi/animeextension/de/moflixstream/MoflixStream.kt
@@ -25,6 +25,7 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamvidextractor.StreamVidExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.Response
@@ -43,8 +44,6 @@ class MoflixStream : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder().add("Referer", "$baseUrl/")
 
     private val preferences by lazy {
@@ -231,9 +230,6 @@ class MoflixStream : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     private fun List<ItemInfo>.parseItems() = map {
         SAnime.create().apply {
diff --git a/src/de/movie2k/build.gradle b/src/de/movie2k/build.gradle
index 112c365f8..0b00aee22 100644
--- a/src/de/movie2k/build.gradle
+++ b/src/de/movie2k/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.movie2k'
     extClass = '.Movie2k'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt
index 021cb4719..48481f35e 100644
--- a/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt
+++ b/src/de/movie2k/src/eu/kanade/tachiyomi/animeextension/de/movie2k/Movie2k.kt
@@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -37,8 +36,6 @@ class Movie2k : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/movie4k/build.gradle b/src/de/movie4k/build.gradle
index 970c263ec..806c4d6d5 100644
--- a/src/de/movie4k/build.gradle
+++ b/src/de/movie4k/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.movie4k'
     extClass = '.Movie4k'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt b/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
index 40b88801e..0204e031b 100644
--- a/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
+++ b/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
@@ -27,7 +27,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -45,8 +44,6 @@ class Movie4k : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.client
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/de/serienstream/build.gradle b/src/de/serienstream/build.gradle
index e9b060569..c466a17e1 100644
--- a/src/de/serienstream/build.gradle
+++ b/src/de/serienstream/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'de.serienstream'
     extClass = '.Serienstream'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
index a2a6353f1..461388291 100644
--- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
+++ b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
@@ -30,7 +30,6 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -56,11 +55,11 @@ class Serienstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor(DdosGuardInterceptor(network.client))
         .build()
 
-    private val authClient = network.cloudflareClient.newBuilder()
+    private val authClient = network.client.newBuilder()
         .addInterceptor(SerienstreamInterceptor(client, preferences))
         .build()
 
diff --git a/src/de/streamcloud/build.gradle b/src/de/streamcloud/build.gradle
index 65152ed26..bf096c242 100644
--- a/src/de/streamcloud/build.gradle
+++ b/src/de/streamcloud/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'de.streamcloud'
     extClass = '.StreamCloud'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
index 5e6294919..c863ee717 100644
--- a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
+++ b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
@@ -32,8 +32,6 @@ class StreamCloud : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle
index 19199ab88..b22599b34 100644
--- a/src/en/allanime/build.gradle
+++ b/src/en/allanime/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.allanime'
     extClass = '.AllAnime'
     extVersionCode = 30
-    libVersion = '14'
 }
 
 dependencies {
diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
index b1e758432..8b80589c8 100644
--- a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
+++ b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt
@@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
@@ -31,7 +32,6 @@ import kotlinx.serialization.json.put
 import kotlinx.serialization.json.putJsonObject
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -50,8 +50,6 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -275,7 +273,7 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
     private val streamlareExtractor by lazy { StreamlareExtractor(client) }
 
     override suspend fun getVideoList(episode: SEpisode): List<Video> {
-        val response = client.newCall(videoListRequest(episode)).execute()
+        val response = client.newCall(videoListRequest(episode)).await()
 
         val videoJson = response.parseAs<EpisodeResult>()
         val videoList = mutableListOf<Pair<Video, Float>>()
@@ -324,7 +322,7 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() {
                         allAnimeExtractor.videoFromUrl(server.sourceUrl, server.sourceName)
                     }
                     sName.startsWith("player@") -> {
-                        val endPoint = client.newCall(GET("${preferences.siteUrl}/getVersion")).execute()
+                        val endPoint = client.newCall(GET("${preferences.siteUrl}/getVersion")).await()
                             .parseAs<AllAnimeExtractor.VersionResponse>()
                             .episodeIframeHead
 
diff --git a/src/en/allanimechi/build.gradle b/src/en/allanimechi/build.gradle
index 3bbc0239b..e7e12b501 100644
--- a/src/en/allanimechi/build.gradle
+++ b/src/en/allanimechi/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.allanimechi'
     extClass = '.AllAnimeChi'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/AllAnimeChi.kt b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/AllAnimeChi.kt
index 57067b39c..cfec810c0 100644
--- a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/AllAnimeChi.kt
+++ b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/AllAnimeChi.kt
@@ -23,11 +23,8 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -39,11 +36,9 @@ import kotlinx.serialization.json.putJsonObject
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -60,8 +55,6 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -224,16 +217,7 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun getFilterList(): AnimeFilterList = AllAnimeChiFilters.FILTER_LIST
 
     // =========================== Anime Details ============================
-
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(animeDetailsRequestInternal(anime))
-            .asObservableSuccess()
-            .map { response ->
-                animeDetailsParse(response).apply { initialized = true }
-            }
-    }
-
-    private fun animeDetailsRequestInternal(anime: SAnime): Request {
+    override fun animeDetailsRequest(anime: SAnime): Request {
         val variables = buildJsonObject {
             put("_id", anime.url)
         }.encode()
@@ -254,9 +238,8 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
         return GET(url, apiHeaders)
     }
 
-    // TODO: replace with getAnimeUrl when new ext-lib is available
-    override fun animeDetailsRequest(anime: SAnime): Request {
-        return GET("data:text/plain,This%20extension%20does%20not%20have%20a%20website.")
+    override fun getAnimeUrl(anime: SAnime): String {
+        return "data:text/plain,This%20extension%20does%20not%20have%20a%20website."
     }
 
     override fun animeDetailsParse(response: Response): SAnime {
@@ -282,7 +265,7 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================== Episodes ==============================
 
-    override fun episodeListRequest(anime: SAnime): Request = animeDetailsRequestInternal(anime)
+    override fun episodeListRequest(anime: SAnime) = animeDetailsRequest(anime)
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val media = response.parseAs<SeriesResult>()
@@ -363,7 +346,7 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
         }
 
         return prioritySort(
-            serverList.parallelCatchingFlatMap { getVideoFromServer(it, useHosterNames) },
+            serverList.parallelCatchingFlatMapBlocking { getVideoFromServer(it, useHosterNames) },
         )
     }
 
@@ -442,11 +425,6 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
         return json.encodeToString(this)
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     data class Server(
         val sourceUrl: String,
         val sourceName: String,
@@ -458,15 +436,6 @@ class AllAnimeChi : ConfigurableAnimeSource, AnimeHttpSource() {
         return this.any { it.equals(element, ignoreCase = ignoreCase) }
     }
 
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     private fun prioritySort(pList: List<Pair<Video, Float>>): List<Video> {
         val prefServer = preferences.prefServer
         val quality = preferences.quality
diff --git a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/AllAnimeExtractor.kt b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/AllAnimeExtractor.kt
index 37af86b04..b11e120ba 100644
--- a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/AllAnimeExtractor.kt
+++ b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/AllAnimeExtractor.kt
@@ -4,12 +4,12 @@ import android.util.Base64
 import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class AllAnimeExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -58,11 +58,6 @@ class AllAnimeExtractor(private val client: OkHttpClient, private val headers: H
         return String(Base64.decode(this, Base64.DEFAULT))
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     private fun formatBytes(bytes: Long): String {
         return when {
             bytes >= 1_000_000_000 -> "%.2f GB".format(bytes / 1_000_000_000.0)
diff --git a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/InternalExtractor.kt b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/InternalExtractor.kt
index 6d41ec9d6..d108e8d5b 100644
--- a/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/InternalExtractor.kt
+++ b/src/en/allanimechi/src/eu/kanade/tachiyomi/animeextension/en/allanimechi/extractors/InternalExtractor.kt
@@ -5,13 +5,13 @@ import eu.kanade.tachiyomi.animeextension.en.allanimechi.AllAnimeChi
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 import java.util.Locale
 
@@ -151,9 +151,4 @@ class InternalExtractor(private val client: OkHttpClient, private val apiHeaders
     private fun String.decodeBase64(): String {
         return String(Base64.decode(this, Base64.DEFAULT))
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/src/en/allmovies/build.gradle b/src/en/allmovies/build.gradle
index 3b9d2bcb9..1c0afe6c9 100644
--- a/src/en/allmovies/build.gradle
+++ b/src/en/allmovies/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.allmovies'
     extClass = '.AllMovies'
     extVersionCode = 12
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/allmovies/src/eu/kanade/tachiyomi/animeextension/en/allmovies/AllMovies.kt b/src/en/allmovies/src/eu/kanade/tachiyomi/animeextension/en/allmovies/AllMovies.kt
index 3de3b7ec2..504ecf903 100644
--- a/src/en/allmovies/src/eu/kanade/tachiyomi/animeextension/en/allmovies/AllMovies.kt
+++ b/src/en/allmovies/src/eu/kanade/tachiyomi/animeextension/en/allmovies/AllMovies.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class AllMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/animeflix/build.gradle b/src/en/animeflix/build.gradle
index 82b76084b..3824e020e 100644
--- a/src/en/animeflix/build.gradle
+++ b/src/en/animeflix/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.animeflix'
     extClass = '.AnimeFlix'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
index b81f6122f..84777b303 100644
--- a/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
+++ b/src/en/animeflix/src/eu/kanade/tachiyomi/animeextension/en/animeflix/AnimeFlix.kt
@@ -14,20 +14,15 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -42,8 +37,6 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -166,7 +159,7 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     val seasonRegex by lazy { Regex("""season (\d+)""", RegexOption.IGNORE_CASE) }
     val qualityRegex by lazy { """(\d+)p""".toRegex() }
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val document = client.newCall(GET(baseUrl + anime.url)).execute()
             .use { it.asJsoup() }
 
@@ -210,7 +203,7 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             transposeEpisodes(serversList)
         }
 
-        return Observable.just(episodeList.reversed())
+        return episodeList.reversed()
     }
 
     private fun transposeEpisodes(serversList: List<List<EpUrl>>) =
@@ -227,7 +220,7 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun episodeFromElement(element: Element): SEpisode = throw Exception("Not Used")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val urls = json.decodeFromString<List<EpUrl>>(episode.url)
 
         val leechUrls = urls.map {
@@ -247,26 +240,22 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             EpUrl(it.quality, link, it.name)
         }
 
-        val videoList = leechUrls.parallelMap { url ->
-            runCatching {
-                if (url.url.toHttpUrl().encodedPath == "/404") return@runCatching null
-                val (videos, mediaUrl) = extractVideo(url)
-                when {
-                    videos.isEmpty() -> {
-                        extractGDriveLink(mediaUrl, url.quality).ifEmpty {
-                            getDirectLink(mediaUrl, "instant", "/mfile/")?.let {
-                                listOf(Video(it, "${url.quality}p - GDrive Instant link", it))
-                            } ?: emptyList()
-                        }
+        val videoList = leechUrls.parallelCatchingFlatMap { url ->
+            if (url.url.toHttpUrl().encodedPath == "/404") return@parallelCatchingFlatMap emptyList()
+            val (videos, mediaUrl) = extractVideo(url)
+            when {
+                videos.isEmpty() -> {
+                    extractGDriveLink(mediaUrl, url.quality).ifEmpty {
+                        getDirectLink(mediaUrl, "instant", "/mfile/")?.let {
+                            listOf(Video(it, "${url.quality}p - GDrive Instant link", it))
+                        } ?: emptyList()
                     }
-                    else -> videos
                 }
-            }.getOrNull()
-        }.filterNotNull().flatten()
+                else -> videos
+            }
+        }
 
-        require(videoList.isNotEmpty()) { "Failed to fetch videos" }
-
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
@@ -378,12 +367,6 @@ class AnimeFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     @Serializable
     data class DriveLeechDirect(val url: String? = null)
 
-    // From Dopebox
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val SIZE_REGEX = "\\[((?:.(?!\\[))+)][ ]*\$".toRegex(RegexOption.IGNORE_CASE)
 
diff --git a/src/en/animension/build.gradle b/src/en/animension/build.gradle
index d4e899caa..892f187bd 100644
--- a/src/en/animension/build.gradle
+++ b/src/en/animension/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.animension'
     extClass = '.Animension'
     extVersionCode = 20
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/animeowl/build.gradle b/src/en/animeowl/build.gradle
index 1cb4cb8d8..3f1f16092 100644
--- a/src/en/animeowl/build.gradle
+++ b/src/en/animeowl/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.animeowl'
     extClass = '.AnimeOwl'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
index 1d513fed5..d0a651c0b 100644
--- a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
+++ b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/AnimeOwl.kt
@@ -28,14 +28,12 @@ import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -52,8 +50,6 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -85,11 +81,11 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesFromElement(element: Element): SAnime = popularAnimeFromElement(element)
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val limit = 30
         val mediaType = "application/json; charset=utf-8".toMediaType()
         val body = """{"limit":$limit,"page":${page - 1},"pageCount":0,"value":"$query","sort":4,"selected":{"type":[],"genre":[],"year":[],"country":[],"season":[],"status":[],"sort":[],"language":[]}}""".toRequestBody(mediaType)
@@ -108,7 +104,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         }
 
-        return Observable.just(AnimesPage(animes, nextPage))
+        return AnimesPage(animes, nextPage)
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request =
@@ -172,7 +168,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun episodeFromElement(element: Element): SEpisode = throw Exception("Not Used")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val urlJson = json.decodeFromString<JsonObject>(episode.url)
         val videoList = mutableListOf<Video>()
         urlJson.mapNotNull { (key, value) ->
@@ -198,7 +194,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
         }
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
@@ -262,7 +258,7 @@ class AnimeOwl : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = client.newCall(GET(url)).execute().asJsoup()
 
         // Vidstreaming:
-        GogoCdnExtractor(network.client, json).videosFromUrl(url).map {
+        GogoCdnExtractor(client, json).videosFromUrl(url).map {
             videoList.add(
                 Video(
                     it.url,
diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle
index b5b89d195..be6e7be8d 100644
--- a/src/en/animepahe/build.gradle
+++ b/src/en/animepahe/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.animepahe'
     extClass = '.AnimePahe'
     extVersionCode = 26
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
index bdc50d5e9..0cb7eda1d 100644
--- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
+++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/AnimePahe.kt
@@ -18,12 +18,12 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -53,8 +53,6 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
         ignoreUnknownKeys = true
     }
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     // =========================== Anime Details ============================
     /**
      * This override is necessary because AnimePahe does not provide permanent
@@ -130,7 +128,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
     // ============================== Popular ===============================
     // This source doesnt have a popular animes page,
     // so we use latest animes page instead.
-    override fun fetchPopularAnime(page: Int) = fetchLatestUpdates(page)
+    override suspend fun getPopularAnime(page: Int) = getLatestUpdates(page)
     override fun popularAnimeParse(response: Response): AnimesPage = TODO()
     override fun popularAnimeRequest(page: Int): Request = TODO()
 
@@ -331,11 +329,6 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
         }.getOrNull() ?: 0L
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     companion object {
         private val DATE_FORMATTER by lazy {
             SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
diff --git a/src/en/animeparadise/build.gradle b/src/en/animeparadise/build.gradle
index 19dade8da..d3ff32ccf 100644
--- a/src/en/animeparadise/build.gradle
+++ b/src/en/animeparadise/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.animeparadise'
     extClass = '.AnimeParadise'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animeparadise/src/eu/kanade/tachiyomi/animeextension/en/animeparadise/AnimeParadise.kt b/src/en/animeparadise/src/eu/kanade/tachiyomi/animeextension/en/animeparadise/AnimeParadise.kt
index 40d8e895f..fba5e614a 100644
--- a/src/en/animeparadise/src/eu/kanade/tachiyomi/animeextension/en/animeparadise/AnimeParadise.kt
+++ b/src/en/animeparadise/src/eu/kanade/tachiyomi/animeextension/en/animeparadise/AnimeParadise.kt
@@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -36,8 +36,6 @@ class AnimeParadise : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -196,11 +194,6 @@ class AnimeParadise : ConfigurableAnimeSource, AnimeHttpSource() {
         ).reversed()
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_DEFAULT = "1080"
diff --git a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
index a70d9e1a8..683e8c944 100644
--- a/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
+++ b/src/en/animetake/src/eu/kanade/tachiyomi/animeextension/en/animetake/AnimeTake.kt
@@ -15,12 +15,10 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.gogostreamextractor.GogoStreamExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelFlatMap
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -40,8 +38,6 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -161,41 +157,38 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val scripts = document.select("div#divscript > script").filter { it ->
             it.data().contains("function")
         }
-        return scripts.parallelMap { elem ->
-            runCatching {
-                val data = elem.data().trimIndent()
-                val url = baseUrl + extractIframeSrc(data)
-                if (data.contains("vidstream()")) {
-                    val iframeSrc = client.newCall(GET(url)).execute().asJsoup()
-                        .select("iframe").attr("src")
-                    extractVideo(iframeSrc)
-                } else if (data.contains("fm()")) {
-                    val iframeSrc = client.newCall(GET(url)).execute().asJsoup()
-                        .select("iframe").attr("src")
-                    filemoonExtractor.videosFromUrl(url = iframeSrc, headers = headers)
-                } else {
-                    emptyList()
-                }
-            }.getOrElse { emptyList() }
-        }.flatten().ifEmpty { throw Exception("Failed to fetch videos") }
+        return scripts.parallelCatchingFlatMapBlocking { elem ->
+            val data = elem.data().trimIndent()
+            val url = baseUrl + extractIframeSrc(data)
+            if (data.contains("vidstream()")) {
+                val iframeSrc = client.newCall(GET(url)).execute().asJsoup()
+                    .select("iframe").attr("src")
+                extractVideo(iframeSrc)
+            } else if (data.contains("fm()")) {
+                val iframeSrc = client.newCall(GET(url)).execute().asJsoup()
+                    .select("iframe").attr("src")
+                filemoonExtractor.videosFromUrl(url = iframeSrc, headers = headers)
+            } else {
+                emptyList()
+            }
+        }
     }
 
-    private fun extractVideo(url: String): List<Video> {
+    private suspend fun extractVideo(url: String): List<Video> {
         val videos = gogoStreamExtractor.videosFromUrl(url)
 
         val request = GET(url)
-        val response = client.newCall(request).execute()
+        val response = client.newCall(request).await()
         val document = response.asJsoup()
         val servers = document.select("div#list-server-more > ul > li.linkserver")
-        return servers.parallelMap {
+        return servers.parallelFlatMap {
             val link = it.attr("data-video")
             when (it.text().lowercase()) {
                 "doodstream" -> doodExtractor.videosFromUrl(link)
                 "mp4upload" -> mp4uploadExtractor.videosFromUrl(link, headers)
                 else -> emptyList()
             }
-        }.flatten().toMutableList().apply { addAll(videos) }.toList()
-            .ifEmpty { throw Exception("Failed to extract videos") }
+        } + videos
     }
 
     override fun videoUrlParse(document: Document): String = throw Exception("Not Used")
@@ -240,10 +233,6 @@ class AnimeTake : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> = runBlocking {
-        map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-    }
-
     companion object {
         private val DATE_FORMATTER by lazy {
             SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH)
diff --git a/src/en/animeui/build.gradle b/src/en/animeui/build.gradle
index e1d38d6b6..1ebb3029d 100644
--- a/src/en/animeui/build.gradle
+++ b/src/en/animeui/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.animeui'
     extClass = '.AnimeUI'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUI.kt b/src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUI.kt
index 287862d4b..709fc23c1 100644
--- a/src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUI.kt
+++ b/src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUI.kt
@@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -34,8 +34,6 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -158,11 +156,6 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================= Utilities ==============================
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     override fun List<Video>.sort(): List<Video> {
         val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
         return sortedWith(
diff --git a/src/en/aniwave/build.gradle b/src/en/aniwave/build.gradle
index 3d3a7a0b4..306a39f76 100644
--- a/src/en/aniwave/build.gradle
+++ b/src/en/aniwave/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.nineanime'
     extClass = '.Aniwave'
     extVersionCode = 61
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt
index f7c98f655..7057b8a30 100644
--- a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt
+++ b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt
@@ -19,12 +19,10 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -49,8 +47,6 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val utils by lazy { AniwaveUtils() }
@@ -165,7 +161,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.parseAs<ResultResponse>().toDocument()
 
         val episodeElements = document.select(episodeListSelector())
-        return episodeElements.parallelMap { episodeFromElements(it, animeUrl) }.reversed()
+        return episodeElements.parallelMapBlocking { episodeFromElements(it, animeUrl) }.reversed()
     }
 
     override fun episodeFromElement(element: Element): SEpisode = throw Exception("not Used")
@@ -228,7 +224,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
         val typeSelection = preferences.getStringSet(PREF_TYPE_TOGGLE_KEY, PREF_TYPES_TOGGLE_DEFAULT)!!
 
-        return document.select("div.servers > div").parallelFlatMap { elem ->
+        return document.select("div.servers > div").parallelFlatMapBlocking { elem ->
             val type = elem.attr("data-type").replaceFirstChar { it.uppercase() }
             elem.select("li").mapNotNull { serverElement ->
                 val serverId = serverElement.attr("data-link-id")
@@ -239,8 +235,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 VideoData(type, serverId, serverName)
             }
         }
-            .parallelFlatMap { extractVideo(it, epurl) }
-            .ifEmpty { throw Exception("Failed to fetch videos") }
+            .parallelFlatMapBlocking { extractVideo(it, epurl) }
     }
 
     override fun videoListSelector() = throw Exception("not used")
@@ -315,20 +310,6 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> = runBlocking {
-        map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-    }
-
-    inline fun <A, B> Iterable<A>.parallelFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll().flatten()
-        }
-
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     companion object {
         private val SOFTSUB_REGEX by lazy { Regex("""\bsoftsub\b""", RegexOption.IGNORE_CASE) }
         private val RELEASE_REGEX by lazy { Regex("""Release: (\d+\/\d+\/\d+ \d+:\d+)""") }
diff --git a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt
index 4ed8a73f1..4cc97602f 100644
--- a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt
+++ b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt
@@ -7,12 +7,12 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.CacheControl
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 import java.net.URLDecoder
 import javax.crypto.Cipher
@@ -137,11 +137,6 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
         }
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     private fun List<MediaResponseBody.Result.SubTrack>.toTracks(): List<Track> {
         return filter {
             it.kind == "captions"
diff --git a/src/en/asiaflix/src/eu/kanade/tachiyomi/animeextension/en/asiaflix/AsiaFlix.kt b/src/en/asiaflix/src/eu/kanade/tachiyomi/animeextension/en/asiaflix/AsiaFlix.kt
index 98731c9dd..e4ab2d7d3 100644
--- a/src/en/asiaflix/src/eu/kanade/tachiyomi/animeextension/en/asiaflix/AsiaFlix.kt
+++ b/src/en/asiaflix/src/eu/kanade/tachiyomi/animeextension/en/asiaflix/AsiaFlix.kt
@@ -24,12 +24,9 @@ import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.decodeFromJsonElement
@@ -38,7 +35,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -59,8 +55,6 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
 
     private val json: Json by injectLazy()
 
-    override val client = network.cloudflareClient
-
     private val apiHeaders by lazy {
         headersBuilder()
             .set("Accept", "application/json, text/plain, */*")
@@ -103,11 +97,11 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
     // =============================== Search ===============================
     private lateinit var searchEntries: SearchDto
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (page == 1) {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         } else {
-            Observable.just(paginatedSearchParse(page))
+            paginatedSearchParse(page)
         }
     }
 
@@ -134,19 +128,13 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // =========================== Anime Details ============================
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(internalAnimeDetailsRequest(anime))
-            .asObservableSuccess()
-            .map(::animeDetailsParse)
-    }
-
     // workaround to get correct WebView url
-    override fun animeDetailsRequest(anime: SAnime): Request {
+    override fun getAnimeUrl(anime: SAnime): String {
         val slug = anime.title.titleToSlug()
-        return GET("$baseUrl/show-details/$slug/${anime.url}")
+        return "$baseUrl/show-details/$slug/${anime.url}"
     }
 
-    private fun internalAnimeDetailsRequest(anime: SAnime): Request {
+    override fun animeDetailsRequest(anime: SAnime): Request {
         return GET("$apiUrl/drama?id=${anime.url}", apiHeaders)
     }
 
@@ -155,7 +143,7 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // ============================== Episodes ==============================
-    override fun episodeListRequest(anime: SAnime) = internalAnimeDetailsRequest(anime)
+    override fun episodeListRequest(anime: SAnime) = animeDetailsRequest(anime)
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val result = response.parseAs<EpisodeResponseDto>()
@@ -195,7 +183,7 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
             it.attr("data-video")
         }
 
-        val videos = hostUrls.parallelCatchingFlatMap { hostUrl ->
+        val videos = hostUrls.parallelCatchingFlatMapBlocking { hostUrl ->
             when {
                 hostUrl.contains("dwish") -> {
                     streamWishExtractor.videosFromUrl(hostUrl)
@@ -217,8 +205,6 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
             videos.addAll(getSelfVideo(document))
         }
 
-        if (videos.isEmpty()) throw Exception("Failed to get Videos")
-
         return videos
     }
 
@@ -273,24 +259,10 @@ class AsiaFlix : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // ============================ Utilities =============================
-    private inline fun <reified T> String.parseAs(): T =
-        json.decodeFromString(this)
 
     private inline fun <reified T> JsonElement.parseAs(): T =
         json.decodeFromJsonElement(this)
 
-    private inline fun <reified T> Response.parseAs(): T =
-        use { it.body.string() }.parseAs()
-
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     companion object {
         private const val LIMIT = 20
 
diff --git a/src/en/asianload/build.gradle b/src/en/asianload/build.gradle
index d850e7217..005ed2f46 100644
--- a/src/en/asianload/build.gradle
+++ b/src/en/asianload/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.asianload'
     extClass = '.AsianLoad'
     extVersionCode = 36
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
index eb7ce6852..f0183f868 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -37,8 +36,6 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/ask4movie/build.gradle b/src/en/ask4movie/build.gradle
index c701e932e..b82574f7a 100644
--- a/src/en/ask4movie/build.gradle
+++ b/src/en/ask4movie/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.ask4movie'
     extClass = '.Ask4Movie'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/ask4movie/src/eu/kanade/tachiyomi/animeextension/en/ask4movie/Ask4Movie.kt b/src/en/ask4movie/src/eu/kanade/tachiyomi/animeextension/en/ask4movie/Ask4Movie.kt
index 6922f1991..2c65de0e7 100644
--- a/src/en/ask4movie/src/eu/kanade/tachiyomi/animeextension/en/ask4movie/Ask4Movie.kt
+++ b/src/en/ask4movie/src/eu/kanade/tachiyomi/animeextension/en/ask4movie/Ask4Movie.kt
@@ -17,12 +17,10 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Exception
@@ -37,8 +35,6 @@ class Ask4Movie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -174,10 +170,10 @@ class Ask4Movie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = FilemoonExtractor(client).videosFromUrl(episode.url, headers = headers)
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoListSelector() = throw Exception("not used")
diff --git a/src/en/bestdubbedanime/build.gradle b/src/en/bestdubbedanime/build.gradle
index c3cfbe80a..6ff0aeddd 100644
--- a/src/en/bestdubbedanime/build.gradle
+++ b/src/en/bestdubbedanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.bestdubbedanime'
     extClass = '.BestDubbedAnime'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/bestdubbedanime/src/eu/kanade/tachiyomi/animeextension/en/bestdubbedanime/BestDubbedAnime.kt b/src/en/bestdubbedanime/src/eu/kanade/tachiyomi/animeextension/en/bestdubbedanime/BestDubbedAnime.kt
index b0d4710f5..e873174f5 100644
--- a/src/en/bestdubbedanime/src/eu/kanade/tachiyomi/animeextension/en/bestdubbedanime/BestDubbedAnime.kt
+++ b/src/en/bestdubbedanime/src/eu/kanade/tachiyomi/animeextension/en/bestdubbedanime/BestDubbedAnime.kt
@@ -14,10 +14,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -25,7 +22,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
@@ -46,8 +42,6 @@ class BestDubbedAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -247,7 +241,7 @@ class BestDubbedAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             GET("$baseUrl/xz/v3/jsonEpi.php?slug=$slug&_=${System.currentTimeMillis() / 1000}", headers = serverHeaders),
         ).execute().body.string()
         val parsed = json.decodeFromString<ServerResponse>(serversResponse)
-        Jsoup.parse(parsed.result.anime.first().serversHTML).select("div.serversks").parallelMap { player ->
+        Jsoup.parse(parsed.result.anime.first().serversHTML).select("div.serversks").parallelMapBlocking { player ->
             val playerHeaders = headers.newBuilder()
                 .add("Accept", "*/*")
                 .add("Host", baseUrl.toHttpUrl().host)
@@ -322,12 +316,6 @@ class BestDubbedAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/en/dramacool/build.gradle b/src/en/dramacool/build.gradle
index af9ce6eab..0af4bfc94 100644
--- a/src/en/dramacool/build.gradle
+++ b/src/en/dramacool/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.dramacool'
     extClass = '.DramaCool'
     extVersionCode = 45
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
index cf2f91b1b..f794f359d 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
@@ -39,8 +39,6 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/edytjedhgmdhm/build.gradle b/src/en/edytjedhgmdhm/build.gradle
index f5fce7bee..3d79f1476 100644
--- a/src/en/edytjedhgmdhm/build.gradle
+++ b/src/en/edytjedhgmdhm/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.edytjedhgmdhm'
     extClass = '.Edytjedhgmdhm'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/edytjedhgmdhm/src/eu/kanade/tachiyomi/animeextension/en/edytjedhgmdhm/Edytjedhgmdhm.kt b/src/en/edytjedhgmdhm/src/eu/kanade/tachiyomi/animeextension/en/edytjedhgmdhm/Edytjedhgmdhm.kt
index 5cfdd1b77..2897ad6ec 100644
--- a/src/en/edytjedhgmdhm/src/eu/kanade/tachiyomi/animeextension/en/edytjedhgmdhm/Edytjedhgmdhm.kt
+++ b/src/en/edytjedhgmdhm/src/eu/kanade/tachiyomi/animeextension/en/edytjedhgmdhm/Edytjedhgmdhm.kt
@@ -10,12 +10,10 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import java.net.URI
 import java.net.URISyntaxException
 
@@ -31,8 +29,6 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     // ============================ Initializers ============================
 
     private val miscList by lazy {
@@ -55,7 +51,7 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
     // ============================== Popular ===============================
 
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
+    override suspend fun getPopularAnime(page: Int): AnimesPage {
         val results = tvsList.chunked(CHUNKED_SIZE).toList()
 
         val hasNextPage = results.size > page
@@ -70,7 +66,7 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
                 }
             }
         }
-        return Observable.just(AnimesPage(animeList, hasNextPage))
+        return AnimesPage(animeList, hasNextPage)
     }
 
     override fun popularAnimeRequest(page: Int): Request = throw Exception("Not used")
@@ -95,11 +91,11 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
     // =============================== Search ===============================
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val subPageFilter = filterList.find { it is SubPageFilter } as SubPageFilter
         val subPage = subPageFilter.toUriPart()
@@ -130,7 +126,7 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
                 }
             }
         }
-        return Observable.just(AnimesPage(animeList, hasNextPage))
+        return AnimesPage(animeList, hasNextPage)
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used")
@@ -164,13 +160,13 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> = Observable.just(anime)
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
 
     override fun animeDetailsParse(document: Document): SAnime = throw Exception("Not used")
 
     // ============================== Episodes ==============================
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val episodeList = mutableListOf<SEpisode>()
 
         fun traverseDirectory(url: String) {
@@ -215,7 +211,7 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
         traverseDirectory(baseUrl + anime.url)
 
-        return Observable.just(episodeList.reversed())
+        return episodeList.reversed()
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("Not used")
@@ -226,8 +222,8 @@ class Edytjedhgmdhm : ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> =
-        Observable.just(listOf(Video(baseUrl + episode.url, "Video", baseUrl + episode.url)))
+    override suspend fun getVideoList(episode: SEpisode): List<Video> =
+        listOf(Video(baseUrl + episode.url, "Video", baseUrl + episode.url))
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
 
diff --git a/src/en/fmovies/build.gradle b/src/en/fmovies/build.gradle
index 3b7248fe9..0f61cb6be 100644
--- a/src/en/fmovies/build.gradle
+++ b/src/en/fmovies/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.fmovies'
     extClass = '.FMovies'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
index dee9d13c8..96551f387 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
@@ -16,22 +16,19 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -46,8 +43,6 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -184,10 +179,10 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         return client.newCall(videoListRequest(episode))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 videoListParse(response, episode).sort()
             }
     }
@@ -210,49 +205,47 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val filemoonExtractor by lazy { FilemoonExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
 
-    private fun videoListParse(response: Response, episode: SEpisode): List<Video> {
+    private suspend fun videoListParse(response: Response, episode: SEpisode): List<Video> {
         val data = json.decodeFromString<EpisodeInfo>(episode.url)
         val document = Jsoup.parse(
             response.parseAs<AjaxResponse>().result,
         )
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
 
-        return document.select("ul.servers > li.server").parallelMap { server ->
-            runCatching {
-                val name = server.text().trim()
-                if (!hosterSelection.contains(name)) return@runCatching emptyList()
+        return document.select("ul.servers > li.server").parallelCatchingFlatMap { server ->
+            val name = server.text().trim()
+            if (!hosterSelection.contains(name)) return@parallelCatchingFlatMap emptyList()
 
-                // Get decrypted url
-                val vrf = vrfHelper.getVrf(server.attr("data-link-id"))
+            // Get decrypted url
+            val vrf = vrfHelper.getVrf(server.attr("data-link-id"))
 
-                val vrfHeaders = headers.newBuilder()
-                    .add("Accept", "application/json, text/javascript, */*; q=0.01")
-                    .add("Host", baseUrl.toHttpUrl().host)
-                    .add("Referer", data.url)
-                    .add("X-Requested-With", "XMLHttpRequest")
-                    .build()
-                val encrypted = client.newCall(
-                    GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders),
-                ).execute().parseAs<AjaxServerResponse>().result.url
+            val vrfHeaders = headers.newBuilder()
+                .add("Accept", "application/json, text/javascript, */*; q=0.01")
+                .add("Host", baseUrl.toHttpUrl().host)
+                .add("Referer", data.url)
+                .add("X-Requested-With", "XMLHttpRequest")
+                .build()
+            val encrypted = client.newCall(
+                GET("$baseUrl/ajax/server/${server.attr("data-link-id")}?vrf=$vrf", headers = vrfHeaders),
+            ).await().parseAs<AjaxServerResponse>().result.url
 
-                val decrypted = vrfHelper.decrypt(encrypted)
+            val decrypted = vrfHelper.decrypt(encrypted)
 
-                when (name) {
-                    "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
-                    "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
-                    "Streamtape" -> {
-                        val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
-                            client.newCall(GET(it, headers)).execute().parseAs<List<FMoviesSubs>>().map { t ->
-                                Track(t.file, t.label)
-                            }
-                        } ?: emptyList()
+            when (name) {
+                "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
+                "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
+                "Streamtape" -> {
+                    val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
+                        client.newCall(GET(it, headers)).await().parseAs<List<FMoviesSubs>>().map { t ->
+                            Track(t.file, t.label)
+                        }
+                    } ?: emptyList()
 
-                        streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
-                    }
-                    else -> emptyList()
+                    streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
                 }
-            }.getOrElse { emptyList() }
-        }.flatten().ifEmpty { throw Exception("Failed to fetch videos") }
+                else -> emptyList()
+            }
+        }
     }
 
     override fun videoListSelector() = throw Exception("not used")
@@ -276,17 +269,6 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ).reversed()
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun Int.toPageQuery(first: Boolean = true): String {
         return if (this == 1) "" else "${if (first) "?" else "&"}page=$this"
     }
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
index 2e235caf0..0873a4541 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
@@ -4,12 +4,12 @@ import eu.kanade.tachiyomi.AppInfo
 import eu.kanade.tachiyomi.animeextension.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 import java.net.URLEncoder
 
@@ -68,9 +68,4 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
         const val API_KEY = "aniyomi"
         val API_URL = "https://9anime.eltik.net".toHttpUrl()
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
index 005d6f375..7f3821dc9 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
@@ -7,11 +7,11 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class VidsrcExtractor(private val client: OkHttpClient, private val headers: Headers) {
@@ -78,9 +78,4 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
     private fun String.addAutoStart(): String {
         return this.toHttpUrl().newBuilder().setQueryParameter("autostart", "true").build().toString()
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/src/en/genoanime/build.gradle b/src/en/genoanime/build.gradle
index f0b5ba614..9bc9c6067 100644
--- a/src/en/genoanime/build.gradle
+++ b/src/en/genoanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.genoanime'
     extClass = '.GenoAnime'
     extVersionCode = 32
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
index a1fce4e0e..f4b30ff65 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -32,7 +31,6 @@ class GenoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override val baseUrl = "https://www.genoanime.com"
     override val lang = "en"
     override val supportsLatest = true
-    override val client: OkHttpClient = network.cloudflareClient
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
diff --git a/src/en/gogoanime/build.gradle b/src/en/gogoanime/build.gradle
index 5b11c93e8..24badb618 100644
--- a/src/en/gogoanime/build.gradle
+++ b/src/en/gogoanime/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.gogoanime'
     extClass = '.GogoAnime'
     extVersionCode = 78
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
index 01209e7ae..b3f88218d 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
@@ -19,10 +19,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -44,8 +41,6 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Origin", baseUrl)
         .add("Referer", "$baseUrl/")
@@ -163,12 +158,12 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_KEY, PREF_HOSTER_DEFAULT)!!
 
-        return document.select("div.anime_muti_link > ul > li").parallelCatchingFlatMap { server ->
+        return document.select("div.anime_muti_link > ul > li").parallelCatchingFlatMapBlocking { server ->
             val className = server.className()
-            if (!hosterSelection.contains(className)) return@parallelCatchingFlatMap emptyList()
+            if (!hosterSelection.contains(className)) return@parallelCatchingFlatMapBlocking emptyList()
             val serverUrl = server.selectFirst("a")
                 ?.attr("abs:data-video")
-                ?: return@parallelCatchingFlatMap emptyList()
+                ?: return@parallelCatchingFlatMapBlocking emptyList()
 
             getHosterVideos(className, serverUrl)
         }
@@ -222,15 +217,6 @@ class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     companion object {
         private const val AJAX_URL = "https://ajax.gogo-load.com/ajax"
 
diff --git a/src/en/hahomoe/build.gradle b/src/en/hahomoe/build.gradle
index e055ec184..082796cb6 100644
--- a/src/en/hahomoe/build.gradle
+++ b/src/en/hahomoe/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.hahomoe'
     extClass = '.HahoMoe'
     extVersionCode = 10
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt b/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
index 5e1ff4263..9b7adcb46 100644
--- a/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
+++ b/src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt
@@ -34,8 +34,6 @@ class HahoMoe : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/hanime/build.gradle b/src/en/hanime/build.gradle
index fb2b99d16..342c47883 100644
--- a/src/en/hanime/build.gradle
+++ b/src/en/hanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.hanime'
     extClass = '.Hanime'
     extVersionCode = 17
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/hanime/src/eu/kanade/tachiyomi/animeextension/en/hanime/Hanime.kt b/src/en/hanime/src/eu/kanade/tachiyomi/animeextension/en/hanime/Hanime.kt
index 725352f93..f444d34b4 100644
--- a/src/en/hanime/src/eu/kanade/tachiyomi/animeextension/en/hanime/Hanime.kt
+++ b/src/en/hanime/src/eu/kanade/tachiyomi/animeextension/en/hanime/Hanime.kt
@@ -32,7 +32,6 @@ import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -133,17 +132,17 @@ class Hanime : ConfigurableAnimeSource, AnimeHttpSource() {
         return GET(episode.url)
     }
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         setAuthCookie()
 
         if (authCookie != null) {
             return fetchVideoListPremium(episode)
         }
 
-        return super.fetchVideoList(episode)
+        return super.getVideoList(episode)
     }
 
-    private fun fetchVideoListPremium(episode: SEpisode): Observable<List<Video>> {
+    private fun fetchVideoListPremium(episode: SEpisode): List<Video> {
         val videoList = mutableListOf<Video>()
         val id = episode.url.substringAfter("?id=")
         val headers = headers.newBuilder()
@@ -165,7 +164,7 @@ class Hanime : ConfigurableAnimeSource, AnimeHttpSource() {
                 )
             }
         }
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoListParse(response: Response): List<Video> {
diff --git a/src/en/hentaimama/build.gradle b/src/en/hentaimama/build.gradle
index c6e808173..eaa243ee8 100644
--- a/src/en/hentaimama/build.gradle
+++ b/src/en/hentaimama/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.hentaimama'
     extClass = '.HentaiMama'
     extVersionCode = 7
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt b/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt
index d323e2680..5534b5ccb 100644
--- a/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt
+++ b/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class HentaiMama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/en/hstream/build.gradle b/src/en/hstream/build.gradle
index b2b215423..551754197 100644
--- a/src/en/hstream/build.gradle
+++ b/src/en/hstream/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.hstream'
     extClass = '.Hstream'
     extVersionCode = 7
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/hstream/src/eu/kanade/tachiyomi/animeextension/en/hstream/Hstream.kt b/src/en/hstream/src/eu/kanade/tachiyomi/animeextension/en/hstream/Hstream.kt
index 923e12af1..2ef8372e6 100644
--- a/src/en/hstream/src/eu/kanade/tachiyomi/animeextension/en/hstream/Hstream.kt
+++ b/src/en/hstream/src/eu/kanade/tachiyomi/animeextension/en/hstream/Hstream.kt
@@ -13,8 +13,9 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -24,7 +25,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -78,14 +78,14 @@ class Hstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = HstreamFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/hentai/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -239,10 +239,6 @@ class Hstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .getOrNull() ?: 0L
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/en/kawaiifu/build.gradle b/src/en/kawaiifu/build.gradle
index 6b3ac35d0..19133359c 100644
--- a/src/en/kawaiifu/build.gradle
+++ b/src/en/kawaiifu/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.kawaiifu'
     extClass = '.Kawaiifu'
     extVersionCode = 4
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/kawaiifu/src/eu/kanade/tachiyomi/animeextension/en/kawaiifu/Kawaiifu.kt b/src/en/kawaiifu/src/eu/kanade/tachiyomi/animeextension/en/kawaiifu/Kawaiifu.kt
index ab3be4422..616fcf4f3 100644
--- a/src/en/kawaiifu/src/eu/kanade/tachiyomi/animeextension/en/kawaiifu/Kawaiifu.kt
+++ b/src/en/kawaiifu/src/eu/kanade/tachiyomi/animeextension/en/kawaiifu/Kawaiifu.kt
@@ -12,17 +12,15 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -38,8 +36,6 @@ class Kawaiifu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -82,13 +78,11 @@ class Kawaiifu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("not used")
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val params = KawaiifuFilters.getSearchParameters(filters)
         return client.newCall(searchAnimeRequest(page, query, params))
-            .asObservableSuccess()
-            .map { response ->
-                searchAnimeParse(response)
-            }
+            .awaitSuccess()
+            .use(::searchAnimeParse)
     }
 
     private fun searchAnimeRequest(page: Int, query: String, filters: KawaiifuFilters.FilterSearchParams): Request =
@@ -175,7 +169,7 @@ class Kawaiifu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = mutableListOf<Video>()
         val parsed = json.decodeFromString<List<ServerInfo>>(episode.url)
 
@@ -197,7 +191,7 @@ class Kawaiifu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
 
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoListSelector() = "div#video_box div.player video source"
diff --git a/src/en/kayoanime/build.gradle b/src/en/kayoanime/build.gradle
index 2dbfff25f..53accacab 100644
--- a/src/en/kayoanime/build.gradle
+++ b/src/en/kayoanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.kayoanime'
     extClass = '.Kayoanime'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/kayoanime/src/eu/kanade/tachiyomi/animeextension/en/kayoanime/Kayoanime.kt b/src/en/kayoanime/src/eu/kanade/tachiyomi/animeextension/en/kayoanime/Kayoanime.kt
index 55596be49..85b28ba8c 100644
--- a/src/en/kayoanime/src/eu/kanade/tachiyomi/animeextension/en/kayoanime/Kayoanime.kt
+++ b/src/en/kayoanime/src/eu/kanade/tachiyomi/animeextension/en/kayoanime/Kayoanime.kt
@@ -16,19 +16,18 @@ import eu.kanade.tachiyomi.lib.googledriveextractor.GoogleDriveExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -54,8 +53,6 @@ class Kayoanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -424,7 +421,7 @@ class Kayoanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val host = episode.url.toHttpUrl().host
         val videoList = if (host == "drive.google.com") {
             GoogleDriveExtractor(client, headers).videosFromUrl(episode.url)
@@ -436,7 +433,7 @@ class Kayoanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
 
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoListSelector(): String = throw Exception("Not Used")
@@ -447,11 +444,6 @@ class Kayoanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================= Utilities ==============================
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     // https://github.com/yt-dlp/yt-dlp/blob/8f0be90ecb3b8d862397177bb226f17b245ef933/yt_dlp/extractor/youtube.py#L573
     private fun generateSapisidhashHeader(SAPISID: String, origin: String = "https://drive.google.com"): String {
         val timeNow = System.currentTimeMillis() / 1000
diff --git a/src/en/kickassanime/build.gradle b/src/en/kickassanime/build.gradle
index be22cd541..3f7d05ee7 100644
--- a/src/en/kickassanime/build.gradle
+++ b/src/en/kickassanime/build.gradle
@@ -8,7 +8,6 @@ ext {
     extName = 'KickAssAnime'
     pkgNameSuffix = 'en.kickassanime'
     extClass = '.KickAssAnime'
-    libVersion = '13'
     extVersionCode = 36
 }
 
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
index eed30aa54..2da04aaca 100644
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
+++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
@@ -25,7 +25,8 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
@@ -34,7 +35,6 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Exception
@@ -93,7 +93,7 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
             .parseAs()
     }
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val languages = client.newCall(
             GET("$apiUrl${anime.url}/language"),
         ).execute().parseAs<LanguagesDto>()
@@ -118,7 +118,7 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
             }
         }
 
-        return Observable.just(episodes.reversed())
+        return episodes.reversed()
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> {
@@ -147,21 +147,9 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // =========================== Anime Details ============================
-    // Uncomment when extensions-lib v14 gets released
-    // tested with extensions-lib:9d3dcb0
-    // override fun getAnimeUrl(anime: SAnime) = "$baseUrl${anime.url}"
+    override fun getAnimeUrl(anime: SAnime) = "$baseUrl${anime.url}"
 
-    override fun animeDetailsRequest(anime: SAnime): Request = GET(baseUrl + anime.url)
-
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(animeDetailsRequestInternal(anime))
-            .asObservableSuccess()
-            .map { response ->
-                animeDetailsParse(response).apply { initialized = true }
-            }
-    }
-
-    private fun animeDetailsRequestInternal(anime: SAnime) = GET(apiUrl + anime.url)
+    override fun animeDetailsRequest(anime: SAnime) = GET(apiUrl + anime.url)
 
     override fun animeDetailsParse(response: Response): SAnime {
         val languages = client.newCall(
@@ -245,17 +233,17 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val slug = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/api/show/$slug"))
-                .asObservableSuccess()
-                .map(::searchAnimeBySlugParse)
+                .awaitSuccess()
+                .use(::searchAnimeBySlugParse)
         } else {
             val params = KickAssAnimeFilters.getSearchParameters(filters)
             return client.newCall(searchAnimeRequest(page, query, params))
-                .asObservableSuccess()
-                .map { response ->
+                .awaitSuccess()
+                .use { response ->
                     searchAnimeParse(response, page)
                 }
         }
@@ -280,10 +268,6 @@ class KickAssAnime : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // ============================= Utilities ==============================
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return body.string().let(json::decodeFromString)
-    }
-
     private fun String.getLocale(): String {
         return LOCALE.firstOrNull { it.first == this }?.second ?: ""
     }
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/KickAssAnimeExtractor.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/KickAssAnimeExtractor.kt
index 274bd5e13..9b55932e9 100644
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/KickAssAnimeExtractor.kt
+++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/KickAssAnimeExtractor.kt
@@ -7,12 +7,12 @@ import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
 import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES.decodeHex
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.CacheControl
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import java.security.MessageDigest
 
 class KickAssAnimeExtractor(
@@ -166,7 +166,4 @@ class KickAssAnimeExtractor(
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return body.string().let(json::decodeFromString)
-    }
 }
diff --git a/src/en/kimoitv/build.gradle b/src/en/kimoitv/build.gradle
index 6bf0b1e16..287fb61ed 100644
--- a/src/en/kimoitv/build.gradle
+++ b/src/en/kimoitv/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.kimoitv'
     extClass = '.KimoiTV'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/kimoitv/src/eu/kanade/tachiyomi/animeextension/en/kimoitv/KimoiTV.kt b/src/en/kimoitv/src/eu/kanade/tachiyomi/animeextension/en/kimoitv/KimoiTV.kt
index a7e44f2cd..bc8b7a5a9 100644
--- a/src/en/kimoitv/src/eu/kanade/tachiyomi/animeextension/en/kimoitv/KimoiTV.kt
+++ b/src/en/kimoitv/src/eu/kanade/tachiyomi/animeextension/en/kimoitv/KimoiTV.kt
@@ -11,7 +11,6 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -29,8 +28,6 @@ class KimoiTV : ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     // ============================== Popular ===============================
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/list/Anime.html?sort=top".addPage(page), headers)
diff --git a/src/en/kissanime/build.gradle b/src/en/kissanime/build.gradle
index 3ffe935c7..8dab6e2dc 100644
--- a/src/en/kissanime/build.gradle
+++ b/src/en/kissanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.kissanime'
     extClass = '.KissAnime'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/kissanime/src/eu/kanade/tachiyomi/animeextension/en/kissanime/KissAnime.kt b/src/en/kissanime/src/eu/kanade/tachiyomi/animeextension/en/kissanime/KissAnime.kt
index 881ddcf61..4800f48a6 100644
--- a/src/en/kissanime/src/eu/kanade/tachiyomi/animeextension/en/kissanime/KissAnime.kt
+++ b/src/en/kissanime/src/eu/kanade/tachiyomi/animeextension/en/kissanime/KissAnime.kt
@@ -17,12 +17,10 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
@@ -34,7 +32,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -51,8 +48,6 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -87,13 +82,11 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used")
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val params = KissAnimeFilters.getSearchParameters(filters)
         return client.newCall(searchAnimeRequest(page, query, params))
-            .asObservableSuccess()
-            .map { response ->
-                searchAnimeParse(response)
-            }
+            .awaitSuccess()
+            .use(::searchAnimeParse)
     }
 
     private fun searchAnimeRequest(page: Int, query: String, filters: KissAnimeFilters.FilterSearchParams): Request {
@@ -160,8 +153,7 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
-        val videoList = mutableListOf<Video>()
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val serverList = mutableListOf<Server>()
 
         // GET VIDEO HOSTERS
@@ -169,7 +161,7 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         var document = client.newCall(
             GET(baseUrl + episode.url, headers = headers),
-        ).execute().asJsoup()
+        ).await().asJsoup()
         var newDocument = document
 
         for (server in document.select("select#selectServer > option")) {
@@ -178,7 +170,7 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             if (!server.hasAttr("selected")) {
                 newDocument = client.newCall(
                     GET(url, headers = headers),
-                ).execute().asJsoup()
+                ).await().asJsoup()
             }
 
             val ctk = newDocument.selectFirst("script:containsData(ctk)")!!.data().substringAfter("var ctk = '").substringBefore("';")
@@ -200,7 +192,7 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             val iframe = json.decodeFromString<IframeResponse>(
                 client.newCall(
                     POST("$baseUrl/ajax/anime/load_episodes_v2?s=$serverName", body = getIframeBody, headers = getIframeHeaders),
-                ).execute().body.string(),
+                ).await().body.string(),
             )
             var iframeUrl = Jsoup.parse(iframe.value).selectFirst("iframe")!!.attr("src")
 
@@ -215,34 +207,28 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
 
         // GET VIDEO URLS
-        videoList.addAll(
-            serverList.parallelMap { server ->
-                runCatching {
-                    val url = server.url
+        val videoList = serverList.parallelCatchingFlatMap { server ->
+            val url = server.url
 
-                    when {
-                        url.contains("yourupload") -> {
-                            YourUploadExtractor(client).videoFromUrl(url, headers = headers, name = server.name)
-                        }
-                        url.contains("mp4upload") -> {
-                            Mp4uploadExtractor(client).videosFromUrl(url, headers, "(${server.name}) ")
-                        }
-                        url.contains("embed.vodstream.xyz") -> {
-                            val referer = "$baseUrl/"
-                            VodstreamExtractor(client).getVideosFromUrl(url, referer = referer, prefix = "${server.name} - ")
-                        }
-                        url.contains("dailymotion") -> {
-                            DailymotionExtractor(client, headers).videosFromUrl(url, "${server.name} - ", baseUrl, server.password)
-                        }
-                        else -> null
-                    }
-                }.getOrNull()
-            }.filterNotNull().flatten(),
-        )
+            when {
+                url.contains("yourupload") -> {
+                    YourUploadExtractor(client).videoFromUrl(url, headers = headers, name = server.name)
+                }
+                url.contains("mp4upload") -> {
+                    Mp4uploadExtractor(client).videosFromUrl(url, headers, "(${server.name}) ")
+                }
+                url.contains("embed.vodstream.xyz") -> {
+                    val referer = "$baseUrl/"
+                    VodstreamExtractor(client).getVideosFromUrl(url, referer = referer, prefix = "${server.name} - ")
+                }
+                url.contains("dailymotion") -> {
+                    DailymotionExtractor(client, headers).videosFromUrl(url, "${server.name} - ", baseUrl, server.password)
+                }
+                else -> null
+            }.orEmpty()
+        }
 
-        require(videoList.isNotEmpty()) { "Failed to fetch videos" }
-
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoUrlParse(document: Document): String = throw Exception("Not Used")
@@ -285,12 +271,6 @@ class KissAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val DATE_FORMATTER by lazy {
             SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH)
diff --git a/src/en/kisskh/build.gradle b/src/en/kisskh/build.gradle
index d95101b02..a969a40d0 100644
--- a/src/en/kisskh/build.gradle
+++ b/src/en/kisskh/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.kisskh'
     extClass = '.KissKH'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/kisskh/src/eu/kanade/tachiyomi/animeextension/en/kisskh/KissKH.kt b/src/en/kisskh/src/eu/kanade/tachiyomi/animeextension/en/kisskh/KissKH.kt
index 6f79663f3..d8e3501df 100644
--- a/src/en/kisskh/src/eu/kanade/tachiyomi/animeextension/en/kisskh/KissKH.kt
+++ b/src/en/kisskh/src/eu/kanade/tachiyomi/animeextension/en/kisskh/KissKH.kt
@@ -17,7 +17,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 
@@ -31,8 +30,6 @@ class KissKH : AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client
-
     private val json = Json {
         isLenient = true
         ignoreUnknownKeys = true
diff --git a/src/en/myanime/build.gradle b/src/en/myanime/build.gradle
index ef2baea4c..48188ae5a 100644
--- a/src/en/myanime/build.gradle
+++ b/src/en/myanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.myanime'
     extClass = '.Myanime'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/myanime/src/eu/kanade/tachiyomi/animeextension/en/myanime/Myanime.kt b/src/en/myanime/src/eu/kanade/tachiyomi/animeextension/en/myanime/Myanime.kt
index 41156cff3..992df886d 100644
--- a/src/en/myanime/src/eu/kanade/tachiyomi/animeextension/en/myanime/Myanime.kt
+++ b/src/en/myanime/src/eu/kanade/tachiyomi/animeextension/en/myanime/Myanime.kt
@@ -17,16 +17,11 @@ import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -40,8 +35,6 @@ class Myanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -118,7 +111,7 @@ class Myanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> = Observable.just(anime)
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
 
     override fun animeDetailsParse(document: Document): SAnime = throw Exception("Not used")
 
@@ -200,29 +193,27 @@ class Myanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val videoList = mutableListOf<Video>()
 
         videoList.addAll(
-            document.select(videoListSelector()).parallelMap { element ->
-                runCatching {
-                    val url = element.attr("src")
-                        .replace("""^\/\/""".toRegex(), "https://")
+            document.select(videoListSelector()).parallelCatchingFlatMapBlocking { element ->
+                val url = element.attr("src")
+                    .replace("""^\/\/""".toRegex(), "https://")
 
-                    when {
-                        url.contains("dailymotion") -> {
-                            DailymotionExtractor(client, headers).videosFromUrl(url)
-                        }
-                        url.contains("ok.ru") -> {
-                            OkruExtractor(client).videosFromUrl(url)
-                        }
-                        url.contains("youtube.com") -> {
-                            YouTubeExtractor(client).videosFromUrl(url, "YouTube - ")
-                        }
-                        url.contains("gdriveplayer") -> {
-                            val newHeaders = headersBuilder().add("Referer", baseUrl).build()
-                            GdrivePlayerExtractor(client).videosFromUrl(url, name = "Gdriveplayer", headers = newHeaders)
-                        }
-                        else -> null
+                when {
+                    url.contains("dailymotion") -> {
+                        DailymotionExtractor(client, headers).videosFromUrl(url)
                     }
-                }.getOrNull()
-            }.filterNotNull().flatten(),
+                    url.contains("ok.ru") -> {
+                        OkruExtractor(client).videosFromUrl(url)
+                    }
+                    url.contains("youtube.com") -> {
+                        YouTubeExtractor(client).videosFromUrl(url, "YouTube - ")
+                    }
+                    url.contains("gdriveplayer") -> {
+                        val newHeaders = headersBuilder().add("Referer", baseUrl).build()
+                        GdrivePlayerExtractor(client).videosFromUrl(url, name = "Gdriveplayer", headers = newHeaders)
+                    }
+                    else -> null
+                }.orEmpty()
+            },
         )
 
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
@@ -250,12 +241,6 @@ class Myanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ).reversed()
     }
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
         private const val PREF_QUALITY_DEFAULT = "1080"
diff --git a/src/en/myrunningman/build.gradle b/src/en/myrunningman/build.gradle
index 8d14f4e2c..0283670f4 100644
--- a/src/en/myrunningman/build.gradle
+++ b/src/en/myrunningman/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.myrunningman'
     extClass = '.MyRunningMan'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/myrunningman/src/eu/kanade/tachiyomi/animeextension/en/myrunningman/MyRunningMan.kt b/src/en/myrunningman/src/eu/kanade/tachiyomi/animeextension/en/myrunningman/MyRunningMan.kt
index 29306759a..4ce078b72 100644
--- a/src/en/myrunningman/src/eu/kanade/tachiyomi/animeextension/en/myrunningman/MyRunningMan.kt
+++ b/src/en/myrunningman/src/eu/kanade/tachiyomi/animeextension/en/myrunningman/MyRunningMan.kt
@@ -10,19 +10,15 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -65,14 +61,14 @@ class MyRunningMan : ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/ep/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -174,16 +170,14 @@ class MyRunningMan : ParsedAnimeHttpSource() {
 
         return doc.select("a.changePlayer")
             .mapNotNull { getUrlById(it.attr("data-url")) }
-            .parallelMap { url ->
-                runCatching {
-                    when {
-                        url.contains("dooo") -> doodExtractor.videosFromUrl(url)
-                        url.contains("mixdro") -> mixdropExtractor.videoFromUrl(url, referer = doc.location())
-                        url.contains("streamtape.com") -> streamtapeExtractor.videoFromUrl(url)?.let(::listOf)
-                        else -> null
-                    }
-                }.getOrNull() ?: emptyList()
-            }.flatten().ifEmpty { throw Exception("No videos!") }
+            .parallelCatchingFlatMapBlocking { url ->
+                when {
+                    url.contains("dooo") -> doodExtractor.videosFromUrl(url)
+                    url.contains("mixdro") -> mixdropExtractor.videoFromUrl(url, referer = doc.location())
+                    url.contains("streamtape.com") -> streamtapeExtractor.videoFromUrl(url)?.let(::listOf)
+                    else -> null
+                }.orEmpty()
+            }
     }
 
     override fun videoListSelector(): String {
@@ -215,20 +209,12 @@ class MyRunningMan : ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     private fun String.toDate(): Long {
         return runCatching { DATE_FORMATTER.parse(trim())?.time }
             .getOrNull() ?: 0L
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         const val PREFIX_SEARCH = "id:"
 
diff --git a/src/en/noobsubs/build.gradle b/src/en/noobsubs/build.gradle
index 46dea7c82..c677b9cce 100644
--- a/src/en/noobsubs/build.gradle
+++ b/src/en/noobsubs/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'en.noobsubs'
     extClass = '.NoobSubs'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/noobsubs/src/eu/kanade/tachiyomi/animeextension/en/noobsubs/NoobSubs.kt b/src/en/noobsubs/src/eu/kanade/tachiyomi/animeextension/en/noobsubs/NoobSubs.kt
index bc7283c4b..7e4b935f7 100644
--- a/src/en/noobsubs/src/eu/kanade/tachiyomi/animeextension/en/noobsubs/NoobSubs.kt
+++ b/src/en/noobsubs/src/eu/kanade/tachiyomi/animeextension/en/noobsubs/NoobSubs.kt
@@ -12,15 +12,13 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -36,8 +34,6 @@ class NoobSubs : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -83,21 +79,14 @@ class NoobSubs : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // =============================== Search ===============================
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
-        return Observable.defer {
-            try {
-                client.newCall(searchAnimeRequest(page, query, filters)).asObservableSuccess()
-            } catch (e: NoClassDefFoundError) {
-                // RxJava doesn't handle Errors, which tends to happen during global searches
-                // if an old extension using non-existent classes is still around
-                throw RuntimeException(e)
-            }
-        }
-            .map { response ->
+    ): AnimesPage {
+        return client.newCall(searchAnimeRequest(page, query, filters))
+            .awaitSuccess()
+            .use { response ->
                 searchAnimeParse(response, query)
             }
     }
@@ -131,13 +120,13 @@ class NoobSubs : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> = Observable.just(anime)
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
 
     override fun animeDetailsParse(document: Document): SAnime = throw Exception("Not used")
 
     // ============================== Episodes ==============================
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val episodeList = mutableListOf<SEpisode>()
         var counter = 1
 
@@ -194,7 +183,7 @@ class NoobSubs : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         traverseDirectory(baseUrl + anime.url)
 
-        return Observable.just(episodeList.reversed())
+        return episodeList.reversed()
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("Not used")
@@ -205,8 +194,8 @@ class NoobSubs : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> =
-        Observable.just(listOf(Video(episode.url, "Video", episode.url)))
+    override suspend fun getVideoList(episode: SEpisode): List<Video> =
+        listOf(Video(episode.url, "Video", episode.url))
 
     override fun videoListSelector(): String = throw Exception("Not Used")
 
diff --git a/src/en/oppaistream/build.gradle b/src/en/oppaistream/build.gradle
index 88dfd93d5..1e88df7e0 100644
--- a/src/en/oppaistream/build.gradle
+++ b/src/en/oppaistream/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.oppaistream'
     extClass = '.OppaiStream'
     extVersionCode = 3
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/oppaistream/src/eu/kanade/tachiyomi/animeextension/en/oppaistream/OppaiStream.kt b/src/en/oppaistream/src/eu/kanade/tachiyomi/animeextension/en/oppaistream/OppaiStream.kt
index 34dadfb30..d0bbbe7c4 100644
--- a/src/en/oppaistream/src/eu/kanade/tachiyomi/animeextension/en/oppaistream/OppaiStream.kt
+++ b/src/en/oppaistream/src/eu/kanade/tachiyomi/animeextension/en/oppaistream/OppaiStream.kt
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.decodeFromString
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -40,8 +40,6 @@ class OppaiStream : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
     private val preferences by lazy {
@@ -268,9 +266,6 @@ class OppaiStream : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     // Function to fetch thumbnail URL using AniList GraphQL API
     // Only use in animeDetailsParse.
diff --git a/src/en/putlocker/build.gradle b/src/en/putlocker/build.gradle
index d98134c5e..f13af5557 100644
--- a/src/en/putlocker/build.gradle
+++ b/src/en/putlocker/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.putlocker'
     extClass = '.PutLocker'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
index 486039a05..52fd14c3d 100644
--- a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
+++ b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
@@ -13,10 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -26,13 +23,11 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -48,8 +43,6 @@ class PutLocker : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -168,16 +161,10 @@ class PutLocker : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val urlJson = json.decodeFromString<EpLinks>(episode.url)
-        val videoList = urlJson.ids.parallelMap { dataId ->
-            runCatching {
-                extractVideo(dataId)
-            }.getOrNull()
-        }
-            .filterNotNull()
-            .flatten()
-        return Observable.just(videoList.sort())
+        val videoList = urlJson.ids.parallelCatchingFlatMap(::extractVideo)
+        return videoList.sort()
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
@@ -388,10 +375,4 @@ class PutLocker : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val tracks: List<SubTrack>?,
         val backupLink: String?,
     )
-
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 }
diff --git a/src/en/ripcrabbyanime/build.gradle b/src/en/ripcrabbyanime/build.gradle
index 4ae6ae583..620dd2071 100644
--- a/src/en/ripcrabbyanime/build.gradle
+++ b/src/en/ripcrabbyanime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.ripcrabbyanime'
     extClass = '.Ripcrabbyanime'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/ripcrabbyanime/src/eu/kanade/tachiyomi/animeextension/en/ripcrabbyanime/Ripcrabbyanime.kt b/src/en/ripcrabbyanime/src/eu/kanade/tachiyomi/animeextension/en/ripcrabbyanime/Ripcrabbyanime.kt
index 6f1fc7da9..80798e12e 100644
--- a/src/en/ripcrabbyanime/src/eu/kanade/tachiyomi/animeextension/en/ripcrabbyanime/Ripcrabbyanime.kt
+++ b/src/en/ripcrabbyanime/src/eu/kanade/tachiyomi/animeextension/en/ripcrabbyanime/Ripcrabbyanime.kt
@@ -19,17 +19,16 @@ import eu.kanade.tachiyomi.lib.googledriveextractor.GoogleDriveExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -47,8 +46,6 @@ class Ripcrabbyanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -326,9 +323,9 @@ class Ripcrabbyanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = GoogleDriveExtractor(client, headers).videosFromUrl(episode.url)
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoListSelector(): String = throw Exception("Not Used")
@@ -339,11 +336,6 @@ class Ripcrabbyanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================= Utilities ==============================
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     // https://github.com/yt-dlp/yt-dlp/blob/8f0be90ecb3b8d862397177bb226f17b245ef933/yt_dlp/extractor/youtube.py#L573
     private fun generateSapisidhashHeader(SAPISID: String, origin: String = "https://drive.google.com"): String {
         val timeNow = System.currentTimeMillis() / 1000
diff --git a/src/en/rule34video/build.gradle b/src/en/rule34video/build.gradle
index 1e21fc734..d7467d39b 100644
--- a/src/en/rule34video/build.gradle
+++ b/src/en/rule34video/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.rule34video'
     extClass = '.Rule34Video'
     extVersionCode = 8
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt b/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt
index 7206f53ff..9bdcd8125 100644
--- a/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt
+++ b/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt
@@ -16,7 +16,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Exception
@@ -123,14 +122,12 @@ class Rule34Video : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
-        return Observable.just(
-            listOf(
-                SEpisode.create().apply {
-                    url = anime.url
-                    name = "Video"
-                },
-            ),
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
+        return listOf(
+            SEpisode.create().apply {
+                url = anime.url
+                name = "Video"
+            },
         )
     }
 
diff --git a/src/en/seez/build.gradle b/src/en/seez/build.gradle
index 3610dca30..fc6fe7868 100644
--- a/src/en/seez/build.gradle
+++ b/src/en/seez/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.seez'
     extClass = '.Seez'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/Seez.kt b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/Seez.kt
index f1b34dde7..75c0255e2 100644
--- a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/Seez.kt
+++ b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/Seez.kt
@@ -16,15 +16,12 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -45,8 +42,6 @@ class Seez : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -309,18 +304,16 @@ class Seez : ConfigurableAnimeSource, AnimeHttpSource() {
             Pair(vrfHelper.decrypt(encrypted), it.title)
         }
 
-        return urlList.parallelMap {
+        return urlList.parallelCatchingFlatMapBlocking {
             val url = it.first
             val name = it.second
 
-            runCatching {
-                when (name) {
-                    "Vidplay" -> vidsrcExtractor.videosFromUrl(url, name)
-                    "Filemoon" -> filemoonExtractor.videosFromUrl(url)
-                    else -> emptyList()
-                }
-            }.getOrElse { emptyList() }
-        }.flatten().ifEmpty { throw Exception("Failed to fetch videos") }
+            when (name) {
+                "Vidplay" -> vidsrcExtractor.videosFromUrl(url, name)
+                "Filemoon" -> filemoonExtractor.videosFromUrl(url)
+                else -> emptyList()
+            }
+        }
     }
 
     // ============================= Utilities ==============================
@@ -351,17 +344,6 @@ class Seez : ConfigurableAnimeSource, AnimeHttpSource() {
             .getOrNull() ?: 0L
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        val responseBody = use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val TMDB_URL = "https://api.themoviedb.org/3".toHttpUrl()
         private val IMG_URL = "https://image.tmdb.org/t/p/w300/"
diff --git a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
index efd4d95ef..c37a73477 100644
--- a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
+++ b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
@@ -2,13 +2,13 @@ package eu.kanade.tachiyomi.animeextension.en.seez
 
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
 
 class VrfHelper(private val client: OkHttpClient, private val headers: Headers) {
@@ -50,11 +50,6 @@ class VrfHelper(private val client: OkHttpClient, private val headers: Headers)
         val API_URL = "https://9anime.eltik.net".toHttpUrl()
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     @Serializable
     data class VrfResponse(
         val url: String,
diff --git a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
index 2e4218da1..a2a40e81d 100644
--- a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
+++ b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
@@ -5,14 +5,13 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import uy.kohesive.injekt.injectLazy
-
 // Stolen from fmovies
 class VidsrcExtractor(private val client: OkHttpClient, private val headers: Headers) {
 
@@ -79,11 +78,6 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
         return this.toHttpUrl().newBuilder().setQueryParameter("autostart", "true").build().toString()
     }
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     @Serializable
     data class VidsrcResponse(
         val result: ResultObject,
diff --git a/src/en/superstream/build.gradle b/src/en/superstream/build.gradle
index 0cd1d7535..1d5245a61 100644
--- a/src/en/superstream/build.gradle
+++ b/src/en/superstream/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.superstream'
     extClass = '.SuperStream'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt
index 3ccc56db0..40d14a149 100644
--- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt
+++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt
@@ -14,9 +14,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -37,22 +35,20 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val baseUrl = superStreamAPI.apiUrl
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun fetchPopularAnime(page: Int): Observable<AnimesPage> {
+    override suspend fun getPopularAnime(page: Int): AnimesPage {
         val animes = superStreamAPI.getMainPage(page)
-        return Observable.just(animes)
+        return animes
     }
 
     override fun popularAnimeRequest(page: Int) = throw Exception("not used")
 
     override fun popularAnimeParse(response: Response) = throw Exception("not used")
 
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val data = superStreamAPI.load(anime.url)
         val episodes = mutableListOf<SEpisode>()
         val (movie, seriesData) = data
@@ -82,24 +78,24 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
             }
         }
-        return Observable.just(episodes)
+        return episodes
     }
 
     override fun episodeListParse(response: Response) = throw Exception("not used")
 
-    override fun fetchLatestUpdates(page: Int): Observable<AnimesPage> {
+    override suspend fun getLatestUpdates(page: Int): AnimesPage {
         val animes = superStreamAPI.getLatest(page)
-        return Observable.just(animes)
+        return animes
     }
 
     override fun latestUpdatesParse(response: Response) = throw Exception("not used")
 
     override fun latestUpdatesRequest(page: Int) = throw Exception("not used")
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videos = superStreamAPI.loadLinks(episode.url)
         val sortedVideos = videos.sort()
-        return Observable.just(sortedVideos)
+        return sortedVideos
     }
 
     override fun videoListParse(response: Response) = throw Exception("not used")
@@ -123,20 +119,20 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() {
         return this
     }
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val searchResult = superStreamAPI.search(page, query)
-        return Observable.just(AnimesPage(searchResult, searchResult.size == 20))
+        return AnimesPage(searchResult, searchResult.size == 20)
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList) = throw Exception("not used")
 
     override fun searchAnimeParse(response: Response) = throw Exception("not used")
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         val data = superStreamAPI.load(anime.url)
         val ani = SAnime.create()
         val (movie, seriesData) = data
@@ -187,7 +183,7 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() {
                         )
             }
         }
-        return Observable.just(ani)
+        return ani
     }
     override fun animeDetailsParse(response: Response) = throw Exception("not used")
 
diff --git a/src/en/tokuzilla/build.gradle b/src/en/tokuzilla/build.gradle
index 7283f5258..c210e013d 100644
--- a/src/en/tokuzilla/build.gradle
+++ b/src/en/tokuzilla/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'en.tokuzilla'
     extClass = '.Tokuzilla'
     extVersionCode = 14
-    libVersion = '13'
     containsNsfw = false
 }
 
diff --git a/src/en/uhdmovies/build.gradle b/src/en/uhdmovies/build.gradle
index 718450cf3..ae5eb8a55 100644
--- a/src/en/uhdmovies/build.gradle
+++ b/src/en/uhdmovies/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.uhdmovies'
     extClass = '.UHDMovies'
     extVersionCode = 19
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt b/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt
index dcc652dd0..a80897888 100644
--- a/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt
+++ b/src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt
@@ -14,9 +14,8 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
@@ -28,7 +27,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -67,8 +65,6 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -221,7 +217,7 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun episodeFromElement(element: Element): SEpisode = throw Exception("Not Used")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val urlJson = json.decodeFromString<EpLinks>(episode.url)
 
         val videoList = urlJson.urls.parallelCatchingFlatMap { eplink ->
@@ -240,7 +236,7 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         }
 
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
@@ -430,15 +426,6 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return json.encodeToString(this)
     }
 
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     private fun getDomainPrefSummary(): String =
         preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!.let {
             """$it
diff --git a/src/en/wcofun/build.gradle b/src/en/wcofun/build.gradle
index 6f7e07c4d..ea43469f8 100644
--- a/src/en/wcofun/build.gradle
+++ b/src/en/wcofun/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'en.wcofun'
     extClass = '.Wcofun'
     extVersionCode = 12
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
index 5fd274b2b..d8f56308b 100644
--- a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
+++ b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt
@@ -12,13 +12,12 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -38,8 +37,6 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
         .add("Origin", baseUrl)
@@ -188,9 +185,6 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     companion object {
         private const val PREF_QUALITY_KEY = "preferred_quality"
diff --git a/src/en/wcostream/build.gradle b/src/en/wcostream/build.gradle
index d1f52cd77..4b0c72415 100644
--- a/src/en/wcostream/build.gradle
+++ b/src/en/wcostream/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.wcostream'
     extClass = '.WCOStream'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt b/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt
index 57b36f4e7..453351ba3 100644
--- a/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt
+++ b/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -22,14 +22,12 @@ import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -45,8 +43,6 @@ class WCOStream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -238,11 +234,11 @@ class WCOStream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // Details
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime {
         val parsed = json.decodeFromString<LinkData>(anime.url)
         return client.newCall(GET(baseUrl + parsed.url, headers = headers))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 animeDetailsParse(response, parsed.title, parsed.thumbnailUrl).apply { initialized = true }
             }
     }
diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index ffddb2c84..5d8953d57 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.animefenix'
     extClass = '.Animefenix'
     extVersionCode = 32
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
index 6f1270d71..36f8c1b57 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
@@ -29,7 +29,6 @@ import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -46,8 +45,6 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
 
     companion object {
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index 7a3e7be74..ae1e5fd5c 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.animeflv'
     extClass = '.AnimeFlv'
     extVersionCode = 51
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
index 49db2620e..d214c6b4a 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
@@ -23,7 +23,6 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -43,8 +42,6 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/animeid/build.gradle b/src/es/animeid/build.gradle
index a7c8f50df..d30e3e5c3 100644
--- a/src/es/animeid/build.gradle
+++ b/src/es/animeid/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.animeid'
     extClass = '.AnimeID'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
index 40fe6bf24..6c645390d 100644
--- a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
+++ b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
@@ -20,7 +20,6 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -41,8 +40,6 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index a8b22c5b6..837f03363 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.animelatinohd'
     extClass = '.AnimeLatinoHD'
     extVersionCode = 29
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
index 52494c8fc..8fab7b259 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
@@ -28,7 +28,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -45,8 +44,6 @@ class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/animemovil/build.gradle b/src/es/animemovil/build.gradle
index 074dc37a3..6f68e1b6d 100644
--- a/src/es/animemovil/build.gradle
+++ b/src/es/animemovil/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.animemovil'
     extClass = '.AnimeMovil'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
index 5aa6fcdcc..3951de848 100644
--- a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
+++ b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
@@ -30,7 +30,6 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -52,8 +51,6 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/animeyt/build.gradle b/src/es/animeyt/build.gradle
index 2232454ec..e415bc99b 100644
--- a/src/es/animeyt/build.gradle
+++ b/src/es/animeyt/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.animeyt'
     extClass = '.Animeyt'
     extVersionCode = 9
-    libVersion = '13'
 }
 dependencies {
     implementation(project(':lib-fastream-extractor'))
diff --git a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
index 1b30ea80d..34fe3f2c0 100644
--- a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
+++ b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -32,8 +31,6 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/asialiveaction/build.gradle b/src/es/asialiveaction/build.gradle
index 763885a2c..854b70e1f 100644
--- a/src/es/asialiveaction/build.gradle
+++ b/src/es/asialiveaction/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.asialiveaction'
     extClass = '.AsiaLiveAction'
     extVersionCode = 24
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
index c2737af5d..2fa1cae1e 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
@@ -30,7 +30,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -50,8 +49,6 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle
index a4e7d80ae..abf5def8c 100644
--- a/src/es/cuevana/build.gradle
+++ b/src/es/cuevana/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.cuevana'
     extClass = '.CuevanaFactory'
     extVersionCode = 26
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
index a50720343..5d10588f9 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
@@ -30,7 +30,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -48,8 +47,6 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
 
     private val json: Json by injectLazy()
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
index e400ccf65..7990e195e 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
@@ -24,14 +24,10 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -48,8 +44,6 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
 
     private val json = Json { ignoreUnknownKeys = true }
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -155,14 +149,9 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
         return videoList
     }
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun serverIterator(videos: Videos?): MutableList<Video> {
         val videoList = mutableListOf<Video>()
-        videos?.latino?.parallelMap {
+        videos?.latino?.parallelMapBlocking {
             try {
                 val body = client.newCall(GET(it.result!!)).execute().asJsoup()
                 val url = body.selectFirst("script:containsData(var message)")?.data()?.substringAfter("var url = '")?.substringBefore("'") ?: ""
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index 028f94720..c3340b97d 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.doramasflix'
     extClass = '.Doramasflix'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index e28967ef8..923553d00 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.doramasyt'
     extClass = '.Doramasyt'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
index 64d3ff5a6..90ff6f3fb 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
@@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class Doramasyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/ennovelas/build.gradle b/src/es/ennovelas/build.gradle
index f12f8d38f..f1ace5f9c 100644
--- a/src/es/ennovelas/build.gradle
+++ b/src/es/ennovelas/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.ennovelas'
     extClass = '.EnNovelas'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
index c242747e8..064542f0d 100644
--- a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
+++ b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
@@ -44,8 +44,6 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/fanpelis/build.gradle b/src/es/fanpelis/build.gradle
index 25ba754ab..a25052092 100644
--- a/src/es/fanpelis/build.gradle
+++ b/src/es/fanpelis/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.fanpelis'
     extClass = '.FanPelis'
     extVersionCode = 10
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt b/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
index db6f23bc3..7244af178 100644
--- a/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
+++ b/src/es/fanpelis/src/eu/kanade/tachiyomi/animeextension/es/fanpelis/FanPelis.kt
@@ -42,8 +42,6 @@ class FanPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/gnula/build.gradle b/src/es/gnula/build.gradle
index 176f4af82..7a4efd827 100644
--- a/src/es/gnula/build.gradle
+++ b/src/es/gnula/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.gnula'
     extClass = '.Gnula'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
index 0b8eb40eb..8a05adbbd 100644
--- a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
+++ b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
@@ -35,7 +35,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -55,8 +54,6 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/hentaijk/build.gradle b/src/es/hentaijk/build.gradle
index 680efe76a..a671efe0a 100644
--- a/src/es/hentaijk/build.gradle
+++ b/src/es/hentaijk/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.hentaijk'
     extClass = '.Hentaijk'
     extVersionCode = 11
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/Hentaijk.kt b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/Hentaijk.kt
index 83407f665..26096688a 100644
--- a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/Hentaijk.kt
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/Hentaijk.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Connection
@@ -36,8 +35,6 @@ class Hentaijk : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 00935fe40..0655d31df 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.hentaila'
     extClass = '.Hentaila'
     extVersionCode = 19
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
index 99644d199..6060db811 100644
--- a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
+++ b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
@@ -23,7 +23,6 @@ import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -46,8 +45,6 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 2802b73a2..3dff3ed47 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.jkanime'
     extClass = '.Jkanime'
     extVersionCode = 18
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
index 1da1a0b17..05d3ed239 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
@@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/jkhentai/build.gradle b/src/es/jkhentai/build.gradle
index aa6d8a1e5..48a5d2db7 100644
--- a/src/es/jkhentai/build.gradle
+++ b/src/es/jkhentai/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.jkhentai'
     extClass = '.Jkhentai'
     extVersionCode = 9
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt
index 93eadcc49..ce1a553fa 100644
--- a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,8 +33,6 @@ class Jkhentai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/latanime/build.gradle b/src/es/latanime/build.gradle
index 82fdb71e5..82c9ab256 100644
--- a/src/es/latanime/build.gradle
+++ b/src/es/latanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.latanime'
     extClass = '.Latanime'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
index 296079c4f..e7feba5b4 100644
--- a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
+++ b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
@@ -20,7 +20,6 @@ import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -39,8 +38,6 @@ class Latanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/legionanime/build.gradle b/src/es/legionanime/build.gradle
index 16bd68042..ff4f022f5 100644
--- a/src/es/legionanime/build.gradle
+++ b/src/es/legionanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.legionanime'
     extClass = '.LegionAnime'
     extVersionCode = 29
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
index d4e4a8707..80296e68a 100644
--- a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
+++ b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
@@ -30,7 +30,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -51,8 +50,6 @@ class LegionAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/locopelis/build.gradle b/src/es/locopelis/build.gradle
index 95453b295..f9bb62597 100644
--- a/src/es/locopelis/build.gradle
+++ b/src/es/locopelis/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.locopelis'
     extClass = '.LocoPelis'
     extVersionCode = 18
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
index 2a824299f..9cdfea646 100644
--- a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
+++ b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/metroseries/build.gradle b/src/es/metroseries/build.gradle
index 7121f7f44..10030eed1 100644
--- a/src/es/metroseries/build.gradle
+++ b/src/es/metroseries/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.metroseries'
     extClass = '.MetroSeries'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
index db292fb4a..b2cc57eee 100644
--- a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
+++ b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
@@ -20,14 +20,12 @@ import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
@@ -46,8 +44,6 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -123,15 +119,13 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
         val episodes = document.select(".season-list li a")
             .sortedByDescending { it.attr("data-season") }
             .chunked(chunkSize).flatMap { chunk ->
-                chunk.parallelMap { season ->
-                    runCatching {
-                        val pages = getDetailSeason(season, objectNumber, referer)
-                        getPageEpisodeList(pages, referer, objectNumber, season.attr("data-season"))
-                    }.getOrNull()
-                }.filterNotNull().flatten()
+                chunk.parallelCatchingFlatMapBlocking { season ->
+                    val pages = getDetailSeason(season, objectNumber, referer)
+                    getPageEpisodeList(pages, referer, objectNumber, season.attr("data-season"))
+                }
             }.sortedByDescending {
                 it.name.substringBeforeLast("-")
-            }.ifEmpty { emptyList() }
+            }
         return episodes
     }
 
@@ -167,7 +161,7 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
     private fun getPageEpisodeList(pages: IntRange, referer: String, objectNumber: String, season: String): List<SEpisode> {
         val episodes = mutableListOf<SEpisode>()
         try {
-            pages.parallelMap {
+            pages.parallelMapBlocking {
                 val formBody = FormBody.Builder()
                     .add("action", "action_pagination_ep")
                     .add("page", "$it")
@@ -184,17 +178,12 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
                     .header("Content-Type", "application/x-www-form-urlencoded")
                     .build()
 
-                client.newCall(requestPage).execute().parseAsEpisodeList().also(episodes::addAll)
+                client.newCall(requestPage).await().parseAsEpisodeList().also(episodes::addAll)
             }
         } catch (_: Exception) { }
         return episodes
     }
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index c2ab6cb7f..8b745ff7a 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.monoschinos'
     extClass = '.MonosChinos'
     extVersionCode = 23
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
index d3f7a332c..15d81f980 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
@@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,8 +35,6 @@ class MonosChinos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/mundodonghua/build.gradle b/src/es/mundodonghua/build.gradle
index ec8017b48..0985296fd 100644
--- a/src/es/mundodonghua/build.gradle
+++ b/src/es/mundodonghua/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.mundodonghua'
     extClass = '.MundoDonghua'
     extVersionCode = 15
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
index c3583c2e5..342967a85 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
@@ -34,8 +34,6 @@ class MundoDonghua : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/pelisflix/build.gradle b/src/es/pelisflix/build.gradle
index c235ace15..bf3ac7218 100644
--- a/src/es/pelisflix/build.gradle
+++ b/src/es/pelisflix/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.pelisflix'
     extClass = '.PelisflixFactory'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt
index 8610cc516..e99c76f0f 100644
--- a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt
+++ b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/Pelisflix.kt
@@ -15,7 +15,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -32,8 +31,6 @@ open class Pelisflix(override val name: String, override val baseUrl: String) :
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/es/pelisforte/build.gradle b/src/es/pelisforte/build.gradle
index 5fec16eae..6ece705ee 100644
--- a/src/es/pelisforte/build.gradle
+++ b/src/es/pelisforte/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'es.pelisforte'
     extClass = '.PelisForte'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
index ca5d2a7d1..e6b7de70c 100644
--- a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -28,7 +28,6 @@ import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
@@ -44,8 +43,6 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 838bc66a7..68dce257a 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.pelisplushd'
     extClass = '.PelisplushdFactory'
     extVersionCode = 47
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
index a941f1397..a5205ecb6 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -32,7 +32,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -47,8 +46,6 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     val preferences: SharedPreferences by lazy {
diff --git a/src/es/tioanime/build.gradle b/src/es/tioanime/build.gradle
index 086733049..11a5ddd03 100644
--- a/src/es/tioanime/build.gradle
+++ b/src/es/tioanime/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'es.tioanimeh'
     extClass = '.TioanimeHFactory'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
index 32cc04a67..3fb5df78b 100644
--- a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
+++ b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -32,8 +31,6 @@ open class TioanimeH(override val name: String, override val baseUrl: String) :
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/fr/animesama/build.gradle b/src/fr/animesama/build.gradle
index 290ac8eda..72d9047c6 100644
--- a/src/fr/animesama/build.gradle
+++ b/src/fr/animesama/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'fr.animesama'
     extClass = '.AnimeSama'
     extVersionCode = 6
-    libVersion = 13
     containsNsfw = false
 }
 
diff --git a/src/fr/animesama/src/eu/kanade/tachiyomi/animeextension/fr/animesama/AnimeSama.kt b/src/fr/animesama/src/eu/kanade/tachiyomi/animeextension/fr/animesama/AnimeSama.kt
index 2d91b2cd0..5922965f0 100644
--- a/src/fr/animesama/src/eu/kanade/tachiyomi/animeextension/fr/animesama/AnimeSama.kt
+++ b/src/fr/animesama/src/eu/kanade/tachiyomi/animeextension/fr/animesama/AnimeSama.kt
@@ -16,16 +16,11 @@ import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -40,8 +35,6 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -82,9 +75,9 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = AnimeSamaFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         if (query.startsWith(PREFIX_SEARCH)) {
-            return Observable.just(AnimesPage(fetchAnimeSeasons("$baseUrl/catalogue/${query.removePrefix(PREFIX_SEARCH)}/"), false))
+            return AnimesPage(fetchAnimeSeasons("$baseUrl/catalogue/${query.removePrefix(PREFIX_SEARCH)}/"), false)
         }
         val params = AnimeSamaFilters.getSearchFilters(filters)
         val elements = database
@@ -96,34 +89,34 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
             .filter { params.language.fold(params.language.isEmpty()) { v, p -> v || it.className().contains(p) } }
             .chunked(5)
             .toList()
-        if (elements.isEmpty()) return Observable.just(AnimesPage(emptyList(), false))
+        if (elements.isEmpty()) return AnimesPage(emptyList(), false)
         val animes = elements[page - 1].flatMap {
             fetchAnimeSeasons(it.getElementsByTag("a").attr("href"))
         }
-        return Observable.just(AnimesPage(animes, page < elements.size))
+        return AnimesPage(animes, page < elements.size)
     }
 
     override fun searchAnimeParse(response: Response): AnimesPage = throw Exception("not used")
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("not used")
 
     // =========================== Anime Details ============================
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> = Observable.just(anime)
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
 
     override fun animeDetailsParse(response: Response): SAnime = throw Exception("not used")
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val animeUrl = "$baseUrl${anime.url.substringBeforeLast("/")}"
         val movie = anime.url.split("#").getOrElse(1) { "" }.toIntOrNull()
         val players = VOICES_VALUES.map { fetchPlayers("$animeUrl/$it") }
         val episodes = playersToEpisodes(players)
-        return Observable.just(if (movie == null) episodes.reversed() else listOf(episodes[movie]))
+        return if (movie == null) episodes.reversed() else listOf(episodes[movie])
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("not used")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val playerUrls = json.decodeFromString<List<List<String>>>(episode.url)
         val videos = playerUrls.flatMapIndexed { i, it ->
             val prefix = "(${VOICES_VALUES[i].uppercase()}) "
@@ -139,15 +132,10 @@ class AnimeSama : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
             }
         }.sort()
-        return Observable.just(videos)
+        return videos
     }
 
     // ============================ Utils =============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { runCatching { f(it) }.getOrElse { emptyList() } } }.awaitAll().flatten()
-        }
-
     private fun sanitizeEpisodesJs(doc: String) = doc
         .replace(Regex("[\"\t]"), "") // Fix trash format
         .replace("'", "\"") // Fix quotes
diff --git a/src/fr/animevostfr/build.gradle b/src/fr/animevostfr/build.gradle
index ba4550577..9630db42f 100644
--- a/src/fr/animevostfr/build.gradle
+++ b/src/fr/animevostfr/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'fr.animevostfr'
     extClass = '.AnimeVostFr'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt
index df3621612..cdc427b0f 100644
--- a/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt
+++ b/src/fr/animevostfr/src/eu/kanade/tachiyomi/animeextension/fr/animevostfr/AnimeVostFr.kt
@@ -17,12 +17,10 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -36,8 +34,6 @@ class AnimeVostFr : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -157,7 +153,7 @@ class AnimeVostFr : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = mutableListOf<Video>()
 
         val url = if (episode.url.startsWith("https:")) {
@@ -184,7 +180,7 @@ class AnimeVostFr : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             )
         }
 
-        return Observable.just(videoList)
+        return videoList
     }
 
     private fun extractVideos(serverValue: String, serverName: String, epId: String): List<Video> {
diff --git a/src/fr/empirestreaming/build.gradle b/src/fr/empirestreaming/build.gradle
index e8a2d782b..922959c45 100644
--- a/src/fr/empirestreaming/build.gradle
+++ b/src/fr/empirestreaming/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'fr.empirestreaming'
     extClass = '.EmpireStreaming'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt b/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
index bc07b52dc..f5370a760 100644
--- a/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
+++ b/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
@@ -21,18 +21,14 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -50,10 +46,6 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
-    private val vclient: OkHttpClient = network.client
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -96,7 +88,7 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val entriesPages = searchItems.filter { it.title.contains(query, true) }
             .sortedBy { it.title }
             .chunked(30) // to prevent exploding the user screen with 984948984 results
@@ -110,7 +102,7 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         } ?: emptyList()
 
-        return Observable.just(AnimesPage(entries, hasNextPage))
+        return AnimesPage(entries, hasNextPage)
     }
 
     // =========================== Anime Details ============================
@@ -161,27 +153,25 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
     // val hosterSelection = preferences.getStringSet(PREF_HOSTER_SELECTION_KEY, PREF_HOSTER_SELECTION_DEFAULT)!!
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val hosterSelection = preferences.getStringSet(PREF_HOSTER_SELECTION_KEY, PREF_HOSTER_SELECTION_DEFAULT)!!
-        val videos = episode.url.split(", ").parallelMap {
-            runCatching {
-                val (id, type, hoster) = it.split("|")
-                if (hoster !in hosterSelection) return@parallelMap emptyList()
-                videosFromPath("$id/$type", hoster)
-            }.getOrElse { emptyList() }
-        }.flatten().sort()
-        return Observable.just(videos)
+        val videos = episode.url.split(", ").parallelCatchingFlatMap {
+            val (id, type, hoster) = it.split("|")
+            if (hoster !in hosterSelection) return@parallelCatchingFlatMap emptyList()
+            videosFromPath("$id/$type", hoster)
+        }
+        return videos
     }
 
-    private fun videosFromPath(path: String, hoster: String): List<Video> {
-        val url = client.newCall(GET("$baseUrl/player_submit/$path", headers)).execute()
+    private suspend fun videosFromPath(path: String, hoster: String): List<Video> {
+        val url = client.newCall(GET("$baseUrl/player_submit/$path", headers)).await()
             .use { it.body.string() }
             .substringAfter("window.location.href = \"")
             .substringBefore('"')
 
         return when (hoster) {
-            "doodstream" -> DoodExtractor(vclient).videosFromUrl(url)
-            "voe" -> VoeExtractor(vclient).videoFromUrl(url)?.let(::listOf)
+            "doodstream" -> DoodExtractor(client).videosFromUrl(url)
+            "voe" -> VoeExtractor(client).videoFromUrl(url)?.let(::listOf)
             "Eplayer" -> EplayerExtractor(client).videosFromUrl(url)
             else -> null
         } ?: emptyList()
@@ -277,11 +267,6 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private fun List<VideoDto>.encode() = joinToString { it.encoded }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val DATE_FORMATTER by lazy {
             SimpleDateFormat("yyyy-MM-dd", Locale.US)
diff --git a/src/fr/franime/build.gradle b/src/fr/franime/build.gradle
index 5c8f12d1b..4d814e90d 100644
--- a/src/fr/franime/build.gradle
+++ b/src/fr/franime/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'fr.franime'
     extClass = '.FrAnime'
     extVersionCode = 9
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/FrAnime.kt b/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/FrAnime.kt
index 150e3cc8c..c8e7f7150 100644
--- a/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/FrAnime.kt
+++ b/src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/FrAnime.kt
@@ -11,16 +11,12 @@ import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
 import eu.kanade.tachiyomi.network.GET
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.lang.Exception
 
@@ -39,8 +35,6 @@ class FrAnime : AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
         .add("Origin", baseUrl)
@@ -54,7 +48,7 @@ class FrAnime : AnimeHttpSource() {
     }
 
     // ============================== Popular ===============================
-    override fun fetchPopularAnime(page: Int) =
+    override suspend fun getPopularAnime(page: Int) =
         pagesToAnimesPage(database.sortedByDescending { it.note }, page)
 
     override fun popularAnimeParse(response: Response) = throw Exception("not used")
@@ -62,14 +56,14 @@ class FrAnime : AnimeHttpSource() {
     override fun popularAnimeRequest(page: Int) = throw Exception("not used")
 
     // =============================== Latest ===============================
-    override fun fetchLatestUpdates(page: Int) = pagesToAnimesPage(database.reversed(), page)
+    override suspend fun getLatestUpdates(page: Int) = pagesToAnimesPage(database.reversed(), page)
 
     override fun latestUpdatesParse(response: Response): AnimesPage = throw Exception("not used")
 
     override fun latestUpdatesRequest(page: Int): Request = throw Exception("not used")
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val pages = database.filter {
             it.title.contains(query, true) ||
                 it.originalTitle.contains(query, true) ||
@@ -86,12 +80,12 @@ class FrAnime : AnimeHttpSource() {
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("not used")
 
     // =========================== Anime Details ============================
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> = Observable.just(anime)
+    override suspend fun getAnimeDetails(anime: SAnime): SAnime = anime
 
     override fun animeDetailsParse(response: Response): SAnime = throw Exception("not used")
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         val url = (baseUrl + anime.url).toHttpUrl()
         val stem = url.encodedPathSegments.last()
         val language = url.queryParameter("lang") ?: "vo"
@@ -112,13 +106,13 @@ class FrAnime : AnimeHttpSource() {
                     episode_number = (index + 1).toFloat()
                 }
             }
-        return Observable.just(episodes.sortedByDescending { it.episode_number })
+        return episodes.sortedByDescending { it.episode_number }
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> = throw Exception("not used")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val url = (baseUrl + episode.url).toHttpUrl()
         val seasonNumber = url.queryParameter("s")?.toIntOrNull() ?: 1
         val episodeNumber = url.queryParameter("ep")?.toIntOrNull() ?: 1
@@ -130,9 +124,9 @@ class FrAnime : AnimeHttpSource() {
 
         val players = if (episodeLang == "vo") episodeData.languages.vo.players else episodeData.languages.vf.players
 
-        val videos = players.parallelCatchingFlatMapIndexed { index, playerName ->
+        val videos = players.withIndex().parallelCatchingFlatMap { (index, playerName) ->
             val apiUrl = "$videoBaseUrl/$episodeLang/$index"
-            val playerUrl = client.newCall(GET(apiUrl, headers)).execute().body.string()
+            val playerUrl = client.newCall(GET(apiUrl, headers)).await().body.string()
             when (playerName) {
                 "vido" -> listOf(Video(playerUrl, "FRAnime (Vido)", playerUrl))
                 "sendvid" -> SendvidExtractor(client, headers).videosFromUrl(playerUrl)
@@ -141,20 +135,15 @@ class FrAnime : AnimeHttpSource() {
                 else -> emptyList()
             }
         }
-        return Observable.just(videos)
+        return videos
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMapIndexed(crossinline f: suspend (Int, A) -> Iterable<B>): List<B> =
-        runBlocking {
-            mapIndexed { index, it -> async(Dispatchers.Default) { runCatching { f(index, it) }.getOrElse { emptyList() } } }.awaitAll().flatten()
-        }
-
-    private fun pagesToAnimesPage(pages: List<Anime>, page: Int): Observable<AnimesPage> {
+    private fun pagesToAnimesPage(pages: List<Anime>, page: Int): AnimesPage {
         val chunks = pages.chunked(50)
         val hasNextPage = chunks.size > page
         val entries = pageToSAnimes(chunks.getOrNull(page - 1) ?: emptyList())
-        return Observable.just(AnimesPage(entries, hasNextPage))
+        return AnimesPage(entries, hasNextPage)
     }
 
     private val titleRegex by lazy { Regex("[^A-Za-z0-9 ]") }
diff --git a/src/fr/nekosama/build.gradle b/src/fr/nekosama/build.gradle
index 0786671bb..db76272d0 100644
--- a/src/fr/nekosama/build.gradle
+++ b/src/fr/nekosama/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'fr.nekosama'
     extClass = '.NekoSama'
     extVersionCode = 8
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/fr/nekosama/src/eu/kanade/tachiyomi/animeextension/fr/nekosama/NekoSama.kt b/src/fr/nekosama/src/eu/kanade/tachiyomi/animeextension/fr/nekosama/NekoSama.kt
index a0a627688..958558450 100644
--- a/src/fr/nekosama/src/eu/kanade/tachiyomi/animeextension/fr/nekosama/NekoSama.kt
+++ b/src/fr/nekosama/src/eu/kanade/tachiyomi/animeextension/fr/nekosama/NekoSama.kt
@@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -37,8 +36,6 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
diff --git a/src/fr/otakufr/build.gradle b/src/fr/otakufr/build.gradle
index 0db7cd8c0..cfd0f7972 100644
--- a/src/fr/otakufr/build.gradle
+++ b/src/fr/otakufr/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'fr.otakufr'
     extClass = '.OtakuFR'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
index 0f83f1029..5b5fccfa2 100644
--- a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
+++ b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
@@ -21,12 +21,8 @@ import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -47,8 +43,6 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -180,9 +174,7 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         }
 
-        return serversList.parallelMap {
-            runCatching { getHosterVideos(it) }.getOrElse { emptyList() }
-        }.flatten().sort().ifEmpty { throw Exception("Failed to extract videos") }
+        return serversList.parallelCatchingFlatMapBlocking(::getHosterVideos)
     }
 
     private fun getHosterVideos(host: String): List<Video> {
@@ -244,12 +236,6 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val DATE_FORMATTER by lazy {
             SimpleDateFormat("d MMMM yyyy", Locale.FRENCH)
diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle
index df1c50093..0fae68526 100644
--- a/src/fr/vostfree/build.gradle
+++ b/src/fr/vostfree/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'fr.vostfree'
     extClass = '.Vostfree'
     extVersionCode = 18
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
index 034dadac1..9d6ce1e04 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
@@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -38,8 +37,6 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/hi/yomovies/build.gradle b/src/hi/yomovies/build.gradle
index c1575dfd9..daaee4659 100644
--- a/src/hi/yomovies/build.gradle
+++ b/src/hi/yomovies/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'hi.yomovies'
     extClass = '.YoMovies'
     extVersionCode = 7
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
index a934d4bfd..1cad1b015 100644
--- a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
+++ b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt
@@ -18,12 +18,8 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -42,8 +38,6 @@ class YoMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -151,16 +145,16 @@ class YoMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val document = response.use { it.asJsoup() }
 
-        val videoList = document.select("div[id*=tab]:has(div.movieplay > iframe)").parallelMap { server ->
-            val iframe = server.selectFirst("div.movieplay > iframe")!!
-            val name = document.selectFirst("ul.idTabs > li:has(a[href=#${server.id()}]) div.les-title")?.text()?.let { "[$it] - " } ?: ""
+        val videoList = document.select("div[id*=tab]:has(div.movieplay > iframe)")
+            .parallelCatchingFlatMapBlocking { server ->
+                val iframe = server.selectFirst("div.movieplay > iframe")!!
+                val name = document.selectFirst("ul.idTabs > li:has(a[href=#${server.id()}]) div.les-title")
+                    ?.text()
+                    ?.let { "[$it] - " }
+                    .orEmpty()
 
-            runCatching {
                 extractVideosFromIframe(iframe.attr("abs:src"), name)
-            }.getOrElse { emptyList() }
-        }.flatten()
-
-        require(videoList.isNotEmpty()) { "Failed to fetch videos" }
+            }
 
         return videoList.sort()
     }
@@ -214,12 +208,6 @@ class YoMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         ).reversed()
     }
 
-    // From Dopebox
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val PREF_DOMAIN_KEY = "preferred_domain_name_v${BuildConfig.VERSION_CODE}"
         private const val PREF_DOMAIN_TITLE = "Override BaseUrl"
diff --git a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
index 6c3c2d225..77f4d4bad 100644
--- a/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
+++ b/src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt
@@ -6,10 +6,7 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
@@ -20,11 +17,10 @@ class MovembedExtractor(private val client: OkHttpClient, private val headers: H
             GET(url, headers),
         ).execute().asJsoup()
 
-        return document.select("ul.list-server-items > li.linkserver").parallelMap { server ->
-            runCatching {
+        return document.select("ul.list-server-items > li.linkserver")
+            .parallelCatchingFlatMapBlocking { server ->
                 extractVideosFromIframe(server.attr("abs:data-video"))
-            }.getOrElse { emptyList() }
-        }.flatten()
+            }
     }
 
     private fun extractVideosFromIframe(iframeUrl: String): List<Video> {
@@ -49,12 +45,6 @@ class MovembedExtractor(private val client: OkHttpClient, private val headers: H
         }
     }
 
-    // From Dopebox
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
 
         private val MIXDROP_DOMAINS = listOf(
diff --git a/src/id/kuramanime/build.gradle b/src/id/kuramanime/build.gradle
index 41945e4d7..c19353a41 100644
--- a/src/id/kuramanime/build.gradle
+++ b/src/id/kuramanime/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'id.kuramanime'
     extClass = '.Kuramanime'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/id/kuramanime/src/eu/kanade/tachiyomi/animeextension/id/kuramanime/Kuramanime.kt b/src/id/kuramanime/src/eu/kanade/tachiyomi/animeextension/id/kuramanime/Kuramanime.kt
index 1677f3186..191ac08ef 100644
--- a/src/id/kuramanime/src/eu/kanade/tachiyomi/animeextension/id/kuramanime/Kuramanime.kt
+++ b/src/id/kuramanime/src/eu/kanade/tachiyomi/animeextension/id/kuramanime/Kuramanime.kt
@@ -32,8 +32,6 @@ class Kuramanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/id/kuronime/build.gradle b/src/id/kuronime/build.gradle
index e59314f95..f6855a633 100644
--- a/src/id/kuronime/build.gradle
+++ b/src/id/kuronime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'id.kuronime'
     extClass = '.Kuronime'
     extVersionCode = 8
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/id/neonime/build.gradle b/src/id/neonime/build.gradle
index 9140b2444..d2a7dda06 100644
--- a/src/id/neonime/build.gradle
+++ b/src/id/neonime/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'id.neonime'
     extClass = '.NeoNime'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
index 0d375d23e..c97a2d430 100644
--- a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
+++ b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt
@@ -18,16 +18,14 @@ import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
@@ -38,7 +36,6 @@ class NeoNime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override val lang: String = "id"
     override val name: String = "NeoNime"
     override val supportsLatest: Boolean = true
-    override val client: OkHttpClient = network.cloudflareClient
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
@@ -154,11 +151,11 @@ class NeoNime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return retElements
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val returnedSearch = searchAnimeRequest(page, query, filters)
         return client.newCall(returnedSearch)
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 searchQueryParse(response, query)
             }
     }
diff --git a/src/id/nimegami/build.gradle b/src/id/nimegami/build.gradle
index 5fa50d4bd..7a046b1d9 100644
--- a/src/id/nimegami/build.gradle
+++ b/src/id/nimegami/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'id.nimegami'
     extClass = '.NimeGami'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/id/nimegami/src/eu/kanade/tachiyomi/animeextension/id/nimegami/NimeGami.kt b/src/id/nimegami/src/eu/kanade/tachiyomi/animeextension/id/nimegami/NimeGami.kt
index 410dc73cd..e759a0bbe 100644
--- a/src/id/nimegami/src/eu/kanade/tachiyomi/animeextension/id/nimegami/NimeGami.kt
+++ b/src/id/nimegami/src/eu/kanade/tachiyomi/animeextension/id/nimegami/NimeGami.kt
@@ -9,19 +9,16 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import eu.kanade.tachiyomi.lib.synchrony.Deobfuscator as Synchrony
 
@@ -66,14 +63,14 @@ class NimeGami : ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "ul.pagination > li > a:contains(Next)"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -138,7 +135,7 @@ class NimeGami : ParsedAnimeHttpSource() {
     }
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val qualities = json.decodeFromString<List<VideoQuality>>(episode.url.b64Decode())
         val episodeIndex = episode.episode_number.toInt() - 1
         var usedBunga = false // to prevent repeating the same request to bunga.nimegami
@@ -156,7 +153,7 @@ class NimeGami : ParsedAnimeHttpSource() {
                     extractVideos(url, quality, episodeIndex)
                 }.getOrElse { emptyList() }
             }.flatten()
-        }.let { Observable.just(it) }
+        }.let { it }
     }
 
     private fun extractVideos(url: String, quality: String, episodeIndex: Int): List<Video> {
@@ -203,8 +200,7 @@ class NimeGami : ParsedAnimeHttpSource() {
                         .select("div.server_list ul > li")
                         .map { it.attr("url") to it.text() }
                         .filter { it.first.contains("uservideo") } // naniplay is absurdly slow
-                        .parallelMap(::extractUserVideo)
-                        .flatten()
+                        .parallelFlatMapBlocking(::extractUserVideo)
                 }
 
                 else -> emptyList()
@@ -216,13 +212,13 @@ class NimeGami : ParsedAnimeHttpSource() {
         Regex("\\.(?:title|file) =(?:\n.*?'| ')(.*?)'", RegexOption.MULTILINE)
     }
 
-    private fun extractUserVideo(pair: Pair<String, String>): List<Video> {
+    private suspend fun extractUserVideo(pair: Pair<String, String>): List<Video> {
         val (url, quality) = pair
-        val doc = client.newCall(GET(url, headers)).execute().use { it.asJsoup() }
+        val doc = client.newCall(GET(url, headers)).await().use { it.asJsoup() }
         val scriptUrl = doc.selectFirst("script[src*=/s/?data]")?.attr("src")
             ?: return emptyList()
 
-        return client.newCall(GET(scriptUrl, headers)).execute()
+        return client.newCall(GET(scriptUrl, headers)).await()
             .use { it.body.string() }
             .let(Synchrony::deobfuscateScript)
             ?.let(urlPartRegex::findAll)
@@ -261,11 +257,6 @@ class NimeGami : ParsedAnimeHttpSource() {
     // ============================= Utilities ==============================
     private fun String.b64Decode() = String(Base64.decode(this, Base64.DEFAULT))
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         const val PREFIX_SEARCH = "id:"
     }
diff --git a/src/id/oploverz/build.gradle b/src/id/oploverz/build.gradle
index fd91953a9..f94a0a84a 100644
--- a/src/id/oploverz/build.gradle
+++ b/src/id/oploverz/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'id.oploverz'
     extClass = '.Oploverz'
     extVersionCode = 20
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
index 54061df09..d4e71733e 100644
--- a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
+++ b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt
@@ -14,10 +14,8 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
@@ -106,12 +104,12 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.asJsoup()
         return doc.select("#server > ul > li > div.east_player_option")
-            .parallelMapNotNull {
+            .parallelMapNotNullBlocking {
                 runCatching { getEmbedLinks(it) }.getOrNull()
             }
-            .parallelMapNotNull {
-                runCatching { getVideosFromEmbed(it.first) }.getOrNull()
-            }.flatten()
+            .parallelCatchingFlatMapBlocking {
+                getVideosFromEmbed(it.first)
+            }
     }
 
     // ============================= Utilities ==============================
@@ -136,12 +134,6 @@ class Oploverz : ConfigurableAnimeSource, AnimeHttpSource() {
             }
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> {
-        return runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll().filterNotNull()
-        }
-    }
-
     private fun getAnimeParse(response: Response, query: String): AnimesPage {
         val doc = response.asJsoup()
         val animes = doc.select(query).map {
diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle
index e782ec59e..ce6b6e404 100644
--- a/src/id/otakudesu/build.gradle
+++ b/src/id/otakudesu/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'id.otakudesu'
     extClass = '.OtakuDesu'
     extVersionCode = 23
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
index 6f33df4a8..7dd4f0771 100644
--- a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
+++ b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt
@@ -17,10 +17,8 @@ import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
@@ -43,8 +41,6 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -187,14 +183,12 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val nonce = getNonce(nonceAction)
 
         return doc.select(videoListSelector())
-            .parallelMapNotNull {
+            .parallelMapNotNullBlocking {
                 runCatching { getEmbedLinks(it, action, nonce) }.getOrNull()
             }
-            .parallelMapNotNull {
-                runCatching {
-                    getVideosFromEmbed(it.first, it.second)
-                }.getOrNull()
-            }.flatten()
+            .parallelCatchingFlatMapBlocking {
+                getVideosFromEmbed(it.first, it.second)
+            }
     }
 
     private fun getEmbedLinks(element: Element, action: String, nonce: String): Pair<String, String> {
@@ -370,11 +364,6 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         )
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll().filterNotNull()
-        }
-
     private fun String.b64Decode(): String {
         return String(Base64.decode(this, Base64.DEFAULT))
     }
diff --git a/src/id/samehadaku/build.gradle b/src/id/samehadaku/build.gradle
index 26e1893ed..7813f4a19 100644
--- a/src/id/samehadaku/build.gradle
+++ b/src/id/samehadaku/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'id.samehadaku'
     extClass = '.Samehadaku'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/samehadaku/src/eu/kanade/tachiyomi/animeextension/id/samehadaku/Samehadaku.kt b/src/id/samehadaku/src/eu/kanade/tachiyomi/animeextension/id/samehadaku/Samehadaku.kt
index 6232e1a60..3e0059b74 100644
--- a/src/id/samehadaku/src/eu/kanade/tachiyomi/animeextension/id/samehadaku/Samehadaku.kt
+++ b/src/id/samehadaku/src/eu/kanade/tachiyomi/animeextension/id/samehadaku/Samehadaku.kt
@@ -14,10 +14,8 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.Response
@@ -113,12 +111,12 @@ class Samehadaku : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.asJsoup()
         return doc.select("#server > ul > li > div")
-            .parallelMapNotNull {
+            .parallelMapNotNullBlocking {
                 runCatching { getEmbedLinks(it) }.getOrNull()
             }
-            .parallelMapNotNull {
-                runCatching { getVideosFromEmbed(it.first, it.second) }.getOrNull()
-            }.flatten()
+            .parallelCatchingFlatMapBlocking {
+                getVideosFromEmbed(it.first, it.second)
+            }
     }
 
     // ============================= Utilities ==============================
@@ -143,12 +141,6 @@ class Samehadaku : ConfigurableAnimeSource, AnimeHttpSource() {
             }
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMapNotNull(crossinline f: suspend (A) -> B?): List<B> {
-        return runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll().filterNotNull()
-        }
-    }
-
     private fun getAnimeParse(document: Document, query: String): AnimesPage {
         val animes = document.select(query).map {
             SAnime.create().apply {
diff --git a/src/it/animesaturn/build.gradle b/src/it/animesaturn/build.gradle
index 75509da7e..fdccb2364 100644
--- a/src/it/animesaturn/build.gradle
+++ b/src/it/animesaturn/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'it.animesaturn'
     extClass = '.AnimeSaturn'
     extVersionCode = 8
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt b/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
index 9f0a0d543..1364f0d6a 100644
--- a/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
+++ b/src/it/animesaturn/src/eu/kanade/tachiyomi/animeextension/it/animesaturn/AnimeSaturn.kt
@@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -33,8 +32,6 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/it/animeunity/build.gradle b/src/it/animeunity/build.gradle
index f092ee6a9..1f72f3218 100644
--- a/src/it/animeunity/build.gradle
+++ b/src/it/animeunity/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'it.animeunity'
     extClass = '.AnimeUnity'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
index dca56e322..8cbeb81d4 100644
--- a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
+++ b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
@@ -18,18 +18,17 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -49,8 +48,6 @@ class AnimeUnity :
 
     private val json: Json by injectLazy()
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -109,16 +106,16 @@ class AnimeUnity :
         filters: AnimeFilterList,
     ): Request = throw Exception("Not used")
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
+    ): AnimesPage {
         val params = AnimeUnityFilters.getSearchParameters(filters)
         return client
             .newCall(searchAnimeRequest(page, query, params))
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 searchAnimeParse(response, page)
             }
     }
@@ -344,7 +341,7 @@ class AnimeUnity :
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoList = mutableListOf<Video>()
         val doc =
             client
@@ -411,7 +408,7 @@ class AnimeUnity :
 
         require(videoList.isNotEmpty()) { "Failed to fetch videos" }
 
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoListRequest(episode: SEpisode): Request = throw Exception("Not used")
@@ -420,11 +417,6 @@ class AnimeUnity :
 
     // ============================= Utilities ==============================
 
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
-
     private fun parseStatus(statusString: String): Int =
         when (statusString) {
             "In Corso" -> SAnime.ONGOING
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index 969c6bed6..eb1a2a4d1 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'it.animeworld'
     extClass = '.ANIMEWORLD'
     extVersionCode = 33
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
index 9b215b9cc..620341666 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
@@ -20,14 +20,10 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -47,8 +43,6 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -104,7 +98,6 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         "center a[href*=streamingaw.online][id=alternativeDownloadLink]"
 
     private fun videosFromElement(document: Document): List<Video> {
-        val videoList = mutableListOf<Video>()
         // afaik this element appears when videos are taken down, in this case instead of
         // displaying Videolist empty show the element's text
         val copyrightError = document.select("div.alert.alert-primary:contains(Copyright)")
@@ -148,33 +141,29 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             serverList.add(Pair(name, url))
         }
 
-        videoList.addAll(
-            serverList.parallelMap { server ->
-                runCatching {
-                    val url = server.second
-                    when {
-                        url.contains("streamingaw") -> {
-                            listOf(Video(url, "AnimeWorld Server", url))
-                        }
-                        url.contains("https://doo") -> {
-                            DoodExtractor(client).videoFromUrl(url, redirect = true)
-                                ?.let(::listOf)
-                        }
-                        url.contains("streamtape") -> {
-                            StreamTapeExtractor(client).videoFromUrl(url.replace("/v/", "/e/"))
-                                ?.let(::listOf)
-                        }
-                        url.contains("filemoon") -> {
-                            FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers)
-                        }
-                        server.first.contains("streamhide", true) -> {
-                            StreamHideExtractor(client).videosFromUrl(url, headers)
-                        }
-                        else -> null
-                    }
-                }.getOrNull()
-            }.filterNotNull().flatten(),
-        )
+        val videoList = serverList.parallelCatchingFlatMapBlocking { server ->
+            val url = server.second
+            when {
+                url.contains("streamingaw") -> {
+                    listOf(Video(url, "AnimeWorld Server", url))
+                }
+                url.contains("https://doo") -> {
+                    DoodExtractor(client).videoFromUrl(url, redirect = true)
+                        ?.let(::listOf)
+                }
+                url.contains("streamtape") -> {
+                    StreamTapeExtractor(client).videoFromUrl(url.replace("/v/", "/e/"))
+                        ?.let(::listOf)
+                }
+                url.contains("filemoon") -> {
+                    FilemoonExtractor(client).videosFromUrl(url, prefix = "${server.first} - ", headers = headers)
+                }
+                server.first.contains("streamhide", true) -> {
+                    StreamHideExtractor(client).videosFromUrl(url, headers)
+                }
+                else -> null
+            }.orEmpty()
+        }
 
         return videoList
     }
@@ -567,12 +556,6 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val target: String,
     )
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val PREF_DOMAIN_KEY = "preferred_domain_name_v${BuildConfig.VERSION_CODE}"
         private const val PREF_DOMAIN_TITLE = "Override BaseUrl"
diff --git a/src/it/aniplay/build.gradle b/src/it/aniplay/build.gradle
index 94c5e02d5..61bab3a01 100644
--- a/src/it/aniplay/build.gradle
+++ b/src/it/aniplay/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'it.aniplay'
     extClass = '.AniPlay'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/aniplay/src/eu/kanade/tachiyomi/animeextension/it/aniplay/AniPlay.kt b/src/it/aniplay/src/eu/kanade/tachiyomi/animeextension/it/aniplay/AniPlay.kt
index 81b472c09..56827e165 100644
--- a/src/it/aniplay/src/eu/kanade/tachiyomi/animeextension/it/aniplay/AniPlay.kt
+++ b/src/it/aniplay/src/eu/kanade/tachiyomi/animeextension/it/aniplay/AniPlay.kt
@@ -15,15 +15,13 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -43,8 +41,6 @@ class AniPlay : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val json: Json by injectLazy()
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -64,13 +60,11 @@ class AniPlay : ConfigurableAnimeSource, AnimeHttpSource() {
 
     // =============================== Search ===============================
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         val params = AniPlayFilters.getSearchParameters(filters)
         return client.newCall(searchAnimeRequest(page, query, params))
-            .asObservableSuccess()
-            .map { response ->
-                searchAnimeParse(response)
-            }
+            .awaitSuccess()
+            .use(::searchAnimeParse)
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used")
@@ -130,18 +124,9 @@ class AniPlay : ConfigurableAnimeSource, AnimeHttpSource() {
     override fun getFilterList(): AnimeFilterList = AniPlayFilters.FILTER_LIST
 
     // =========================== Anime Details ============================
+    override fun getAnimeUrl(anime: SAnime) = "$baseUrl/anime/${anime.url}"
 
-    override fun animeDetailsRequest(anime: SAnime): Request = GET("$baseUrl/anime/${anime.url}")
-
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return client.newCall(animeDetailsRequestInternal(anime))
-            .asObservableSuccess()
-            .map { response ->
-                animeDetailsParse(response).apply { initialized = true }
-            }
-    }
-
-    private fun animeDetailsRequestInternal(anime: SAnime): Request = GET("$baseUrl/api/anime/${anime.url}")
+    override fun animeDetailsRequest(anime: SAnime) = GET("$baseUrl/api/anime/${anime.url}")
 
     override fun animeDetailsParse(response: Response): SAnime {
         val detailsJson = json.decodeFromString<AnimeResult>(response.body.string())
diff --git a/src/it/hentaisaturn/build.gradle b/src/it/hentaisaturn/build.gradle
index 999bd5fdc..6de1aa5a1 100644
--- a/src/it/hentaisaturn/build.gradle
+++ b/src/it/hentaisaturn/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'it.hentaisaturn'
     extClass = '.HentaiSaturn'
     extVersionCode = 5
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/it/hentaisaturn/src/eu/kanade/tachiyomi/animeextension/it/hentaisaturn/HentaiSaturn.kt b/src/it/hentaisaturn/src/eu/kanade/tachiyomi/animeextension/it/hentaisaturn/HentaiSaturn.kt
index 314d0b696..d909cf0b2 100644
--- a/src/it/hentaisaturn/src/eu/kanade/tachiyomi/animeextension/it/hentaisaturn/HentaiSaturn.kt
+++ b/src/it/hentaisaturn/src/eu/kanade/tachiyomi/animeextension/it/hentaisaturn/HentaiSaturn.kt
@@ -14,7 +14,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -33,8 +32,6 @@ class HentaiSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/it/streamingcommunity/build.gradle b/src/it/streamingcommunity/build.gradle
index 944aae892..145f393df 100644
--- a/src/it/streamingcommunity/build.gradle
+++ b/src/it/streamingcommunity/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'it.streamingcommunity'
     extClass = '.StreamingCommunity'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt
index ff554553e..50884285d 100644
--- a/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt
+++ b/src/it/streamingcommunity/src/eu/kanade/tachiyomi/animeextension/it/streamingcommunity/StreamingCommunity.kt
@@ -20,7 +20,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -39,8 +38,6 @@ class StreamingCommunity : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/it/toonitalia/build.gradle b/src/it/toonitalia/build.gradle
index 2c2c6e3f2..13e23ed2c 100644
--- a/src/it/toonitalia/build.gradle
+++ b/src/it/toonitalia/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'it.toonitalia'
     extClass = '.Toonitalia'
     extVersionCode = 14
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt b/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
index 90e16fcbe..49528ee13 100644
--- a/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
+++ b/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
@@ -36,8 +36,6 @@ class Toonitalia : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/it/vvvvid/build.gradle b/src/it/vvvvid/build.gradle
index 9740bcc0b..ec49160ee 100644
--- a/src/it/vvvvid/build.gradle
+++ b/src/it/vvvvid/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'it.vvvvid'
     extClass = '.VVVVID'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt b/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
index 3d4906fdb..c9b72ffc6 100644
--- a/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
+++ b/src/it/vvvvid/src/eu/kanade/tachiyomi/animeextension/it/vvvvid/VVVVID.kt
@@ -15,17 +15,15 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -50,8 +48,6 @@ class VVVVID : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val json: Json by injectLazy()
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -406,11 +402,11 @@ class VVVVID : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun videoListParse(response: Response): List<Video> = throw Exception("Not used")
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val (request, videoId) = videoListRequestPair(episode)
         return client.newCall(request)
-            .asObservableSuccess()
-            .map { response ->
+            .awaitSuccess()
+            .use { response ->
                 videoListParse(response, videoId).sort()
             }
     }
diff --git a/src/ko/aniweek/build.gradle b/src/ko/aniweek/build.gradle
index 89c0925d8..04767bba4 100644
--- a/src/ko/aniweek/build.gradle
+++ b/src/ko/aniweek/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'ko.aniweek'
     extClass = '.Aniweek'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/ko/aniweek/src/eu/kanade/tachiyomi/animeextension/ko/aniweek/Aniweek.kt b/src/ko/aniweek/src/eu/kanade/tachiyomi/animeextension/ko/aniweek/Aniweek.kt
index bcb401482..7f437857c 100644
--- a/src/ko/aniweek/src/eu/kanade/tachiyomi/animeextension/ko/aniweek/Aniweek.kt
+++ b/src/ko/aniweek/src/eu/kanade/tachiyomi/animeextension/ko/aniweek/Aniweek.kt
@@ -22,7 +22,6 @@ import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
@@ -44,8 +43,6 @@ class Aniweek : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
diff --git a/src/pl/wbijam/build.gradle b/src/pl/wbijam/build.gradle
index 75e6ad616..334057914 100644
--- a/src/pl/wbijam/build.gradle
+++ b/src/pl/wbijam/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'pl.wbijam'
     extClass = '.Wbijam'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pl/wbijam/src/eu/kanade/tachiyomi/animeextension/pl/wbijam/Wbijam.kt b/src/pl/wbijam/src/eu/kanade/tachiyomi/animeextension/pl/wbijam/Wbijam.kt
index dff9d0bf3..aca356ba2 100644
--- a/src/pl/wbijam/src/eu/kanade/tachiyomi/animeextension/pl/wbijam/Wbijam.kt
+++ b/src/pl/wbijam/src/eu/kanade/tachiyomi/animeextension/pl/wbijam/Wbijam.kt
@@ -18,22 +18,17 @@ import eu.kanade.tachiyomi.lib.dailymotionextractor.DailymotionExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMap
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -50,8 +45,6 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences: SharedPreferences by lazy {
@@ -94,21 +87,14 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // button:contains(Lista anime) + div.dropdown-content > a:contains(chainsaw)
 
-    override fun fetchSearchAnime(
+    override suspend fun getSearchAnime(
         page: Int,
         query: String,
         filters: AnimeFilterList,
-    ): Observable<AnimesPage> {
-        return Observable.defer {
-            try {
-                client.newCall(searchAnimeRequest(page, query, filters)).asObservableSuccess()
-            } catch (e: NoClassDefFoundError) {
-                // RxJava doesn't handle Errors, which tends to happen during global searches
-                // if an old extension using non-existent classes is still around
-                throw RuntimeException(e)
-            }
-        }
-            .map { response ->
+    ): AnimesPage {
+        return client.newCall(searchAnimeRequest(page, query, filters))
+            .awaitSuccess()
+            .use { response ->
                 searchAnimeParse(response, query)
             }
     }
@@ -135,9 +121,7 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // =========================== Anime Details ============================
 
-    override fun fetchAnimeDetails(anime: SAnime): Observable<SAnime> {
-        return Observable.just(anime)
-    }
+    override suspend fun getAnimeDetails(anime: SAnime) = anime
 
     override fun animeDetailsParse(document: Document): SAnime = throw Exception("Not used")
 
@@ -240,9 +224,8 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val parsed = json.decodeFromString<EpisodeType>(episode.url)
-        val videoList = mutableListOf<Video>()
         val serverList = mutableListOf<String>()
 
         parsed.url.forEach {
@@ -267,32 +250,28 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
         }
 
-        videoList.addAll(
-            serverList.parallelMap { serverUrl ->
-                runCatching {
-                    when {
-                        serverUrl.contains("mp4upload") -> {
-                            Mp4uploadExtractor(client).videosFromUrl(serverUrl, headers)
-                        }
-                        serverUrl.contains("cda.pl") -> {
-                            CdaPlExtractor(client).getVideosFromUrl(serverUrl, headers)
-                        }
-                        serverUrl.contains("sibnet.ru") -> {
-                            SibnetExtractor(client).videosFromUrl(serverUrl)
-                        }
-                        serverUrl.contains("vk.com") -> {
-                            VkExtractor(client).getVideosFromUrl(serverUrl, headers)
-                        }
-                        serverUrl.contains("dailymotion") -> {
-                            DailymotionExtractor(client, headers).videosFromUrl(serverUrl)
-                        }
-                        else -> null
-                    }
-                }.getOrNull()
-            }.filterNotNull().flatten(),
-        )
+        val videoList = serverList.parallelCatchingFlatMap { serverUrl ->
+            when {
+                serverUrl.contains("mp4upload") -> {
+                    Mp4uploadExtractor(client).videosFromUrl(serverUrl, headers)
+                }
+                serverUrl.contains("cda.pl") -> {
+                    CdaPlExtractor(client).getVideosFromUrl(serverUrl, headers)
+                }
+                serverUrl.contains("sibnet.ru") -> {
+                    SibnetExtractor(client).videosFromUrl(serverUrl)
+                }
+                serverUrl.contains("vk.com") -> {
+                    VkExtractor(client).getVideosFromUrl(serverUrl, headers)
+                }
+                serverUrl.contains("dailymotion") -> {
+                    DailymotionExtractor(client, headers).videosFromUrl(serverUrl)
+                }
+                else -> null
+            }.orEmpty()
+        }
 
-        return Observable.just(videoList.sort())
+        return videoList.sort()
     }
 
     override fun videoFromElement(element: Element): Video = throw Exception("Not Used")
@@ -330,12 +309,6 @@ class Wbijam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .getOrNull() ?: 0L
     }
 
-    // From Dopebox
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
diff --git a/src/pt/anidong/build.gradle b/src/pt/anidong/build.gradle
index 13fde25ea..5a4f19762 100644
--- a/src/pt/anidong/build.gradle
+++ b/src/pt/anidong/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.anidong'
     extClass = '.AniDong'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anidong/src/eu/kanade/tachiyomi/animeextension/pt/anidong/AniDong.kt b/src/pt/anidong/src/eu/kanade/tachiyomi/animeextension/pt/anidong/AniDong.kt
index 943d357d2..ecb40b7f3 100644
--- a/src/pt/anidong/src/eu/kanade/tachiyomi/animeextension/pt/anidong/AniDong.kt
+++ b/src/pt/anidong/src/eu/kanade/tachiyomi/animeextension/pt/anidong/AniDong.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
@@ -19,7 +19,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 
 class AniDong : ParsedAnimeHttpSource() {
@@ -64,14 +63,14 @@ class AniDong : ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div.paginacao > a.next"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/animefire/build.gradle b/src/pt/animefire/build.gradle
index d2fa09ad3..d6175323a 100644
--- a/src/pt/animefire/build.gradle
+++ b/src/pt/animefire/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animefire'
     extClass = '.AnimeFire'
     extVersionCode = 5
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/AnimeFire.kt b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/AnimeFire.kt
index 2474ad6e3..1cf89565e 100644
--- a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/AnimeFire.kt
+++ b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/AnimeFire.kt
@@ -13,14 +13,13 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -36,8 +35,6 @@ class AnimeFire : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -77,14 +74,14 @@ class AnimeFire : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "ul.pagination img.seta-right"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/animes/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/animesaria/build.gradle b/src/pt/animesaria/build.gradle
index f030b9a94..839b77837 100644
--- a/src/pt/animesaria/build.gradle
+++ b/src/pt/animesaria/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.animesaria'
     extClass = '.AnimesAria'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesaria/src/eu/kanade/tachiyomi/animeextension/pt/animesaria/AnimesAria.kt b/src/pt/animesaria/src/eu/kanade/tachiyomi/animeextension/pt/animesaria/AnimesAria.kt
index 04a8788c2..a38e30101 100644
--- a/src/pt/animesaria/src/eu/kanade/tachiyomi/animeextension/pt/animesaria/AnimesAria.kt
+++ b/src/pt/animesaria/src/eu/kanade/tachiyomi/animeextension/pt/animesaria/AnimesAria.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -16,7 +16,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class AnimesAria : ParsedAnimeHttpSource() {
 
@@ -58,14 +57,14 @@ class AnimesAria : ParsedAnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = AnimesAriaFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/animesdigital/build.gradle b/src/pt/animesdigital/build.gradle
index 051efdcbd..0df0c2c26 100644
--- a/src/pt/animesdigital/build.gradle
+++ b/src/pt/animesdigital/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animesdigital'
     extClass = '.AnimesDigital'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animesdigital/src/eu/kanade/tachiyomi/animeextension/pt/animesdigital/AnimesDigital.kt b/src/pt/animesdigital/src/eu/kanade/tachiyomi/animeextension/pt/animesdigital/AnimesDigital.kt
index f95b02e09..58125031c 100644
--- a/src/pt/animesdigital/src/eu/kanade/tachiyomi/animeextension/pt/animesdigital/AnimesDigital.kt
+++ b/src/pt/animesdigital/src/eu/kanade/tachiyomi/animeextension/pt/animesdigital/AnimesDigital.kt
@@ -13,8 +13,9 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.unpacker.Unpacker
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
@@ -24,7 +25,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -71,14 +71,14 @@ class AnimesDigital : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = AnimesDigitalFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/a/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -305,10 +305,6 @@ class AnimesDigital : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         } ?: document
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     private fun Element.getInfo(key: String): String? {
         return selectFirst("div.info:has(span:containsOwn($key))")?.run {
             ownText()
diff --git a/src/pt/animesgames/build.gradle b/src/pt/animesgames/build.gradle
index 6fa04d00e..7ae47c4a8 100644
--- a/src/pt/animesgames/build.gradle
+++ b/src/pt/animesgames/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animesgames'
     extClass = '.AnimesGames'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt b/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
index 3b996bd80..b43fecd96 100644
--- a/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
+++ b/src/pt/animesgames/src/eu/kanade/tachiyomi/animeextension/pt/animesgames/AnimesGames.kt
@@ -9,8 +9,9 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
@@ -20,7 +21,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -67,14 +67,14 @@ class AnimesGames : ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "ol.pagination > a:contains(>)"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/animes/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -254,9 +254,6 @@ class AnimesGames : ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     private fun getRealDoc(document: Document): Document {
         if (!document.location().contains("/video/")) return document
diff --git a/src/pt/animesorion/build.gradle b/src/pt/animesorion/build.gradle
index e73e40a8a..89bf4968c 100644
--- a/src/pt/animesorion/build.gradle
+++ b/src/pt/animesorion/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.animesorion'
     extClass = '.AnimesOrion'
     extVersionCode = 1
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/animesorion/src/eu/kanade/tachiyomi/animeextension/pt/animesorion/AnimesOrion.kt b/src/pt/animesorion/src/eu/kanade/tachiyomi/animeextension/pt/animesorion/AnimesOrion.kt
index e7d35fa65..ab353570f 100644
--- a/src/pt/animesorion/src/eu/kanade/tachiyomi/animeextension/pt/animesorion/AnimesOrion.kt
+++ b/src/pt/animesorion/src/eu/kanade/tachiyomi/animeextension/pt/animesorion/AnimesOrion.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -16,7 +16,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class AnimesOrion : ParsedAnimeHttpSource() {
 
@@ -55,14 +54,14 @@ class AnimesOrion : ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "nav.pagination > a.next"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/animesroll/build.gradle b/src/pt/animesroll/build.gradle
index 1be461cce..af5382d8e 100644
--- a/src/pt/animesroll/build.gradle
+++ b/src/pt/animesroll/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animesroll'
     extClass = '.AnimesROLL'
     extVersionCode = 3
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesroll/src/eu/kanade/tachiyomi/animeextension/pt/animesroll/AnimesROLL.kt b/src/pt/animesroll/src/eu/kanade/tachiyomi/animeextension/pt/animesroll/AnimesROLL.kt
index 7d74259ac..988f0f389 100644
--- a/src/pt/animesroll/src/eu/kanade/tachiyomi/animeextension/pt/animesroll/AnimesROLL.kt
+++ b/src/pt/animesroll/src/eu/kanade/tachiyomi/animeextension/pt/animesroll/AnimesROLL.kt
@@ -14,13 +14,13 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
-import rx.Observable
 
 class AnimesROLL : AnimeHttpSource() {
 
@@ -59,14 +59,14 @@ class AnimesROLL : AnimeHttpSource() {
         return AnimesPage(listOf(details), false)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
     override fun searchAnimeParse(response: Response): AnimesPage {
@@ -144,9 +144,9 @@ class AnimesROLL : AnimeHttpSource() {
         GET("$NEW_API_URL/animes/$animeId/episodes?page=$page%order=desc")
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val epUrl = episode.url
-        return Observable.just(listOf(Video(epUrl, "default", epUrl)))
+        return listOf(Video(epUrl, "default", epUrl))
     }
 
     override fun videoListRequest(episode: SEpisode): Request {
@@ -166,10 +166,6 @@ class AnimesROLL : AnimeHttpSource() {
         return json.decodeFromString<PagePropDto<T>>(nextData).data
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     private fun String.ifNotEmpty(block: (String) -> String): String {
         return if (isNotEmpty() && this != "0") block(this) else ""
     }
diff --git a/src/pt/animestc/build.gradle b/src/pt/animestc/build.gradle
index 8523ce808..5931ca64e 100644
--- a/src/pt/animestc/build.gradle
+++ b/src/pt/animestc/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animestc'
     extClass = '.AnimesTC'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt
index 2946c24e9..f8fade006 100644
--- a/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt
+++ b/src/pt/animestc/src/eu/kanade/tachiyomi/animeextension/pt/animestc/AnimesTC.kt
@@ -18,17 +18,14 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -105,14 +102,14 @@ class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
         return AnimesPage(animes, hasNextPage)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val slug = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/series?slug=$slug"))
-                .asObservableSuccess()
-                .map(::searchAnimeBySlugParse)
+                .awaitSuccess()
+                .use(::searchAnimeBySlugParse)
         } else {
-            return super.fetchSearchAnime(page, query, filters)
+            return super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -180,6 +177,7 @@ class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
     private val linkBypasser by lazy { LinkBypasser(client, json) }
 
     private val supportedPlayers = listOf("anonfiles", "send")
+
     override fun videoListParse(response: Response): List<Video> {
         val videoDto = response.parseAs<ResponseDto<VideoDto>>().items.first()
         val links = videoDto.links
@@ -195,7 +193,7 @@ class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
 
         val videoId = videoDto.id
 
-        return online + allLinks.parallelCatchingFlatMap { extractVideosFromLink(it, videoId) }
+        return online + allLinks.parallelCatchingFlatMapBlocking { extractVideosFromLink(it, videoId) }
     }
 
     private fun extractVideosFromLink(video: VideoDto.VideoLink, videoId: Int): List<Video> {
@@ -252,22 +250,13 @@ class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelCatchingFlatMap(crossinline f: suspend (A) -> Iterable<B>): List<B> =
-        runBlocking {
-            map {
-                async(Dispatchers.Default) {
-                    runCatching { f(it) }.getOrElse { emptyList() }
-                }
-            }.awaitAll().flatten()
-        }
-
     private fun Response.getAnimeDto(): AnimeDto {
         val responseBody = use { it.body.string() }
         return try {
-            parseAs<AnimeDto>(responseBody)
+            parseAs<AnimeDto> { responseBody }
         } catch (e: Exception) {
             // URL intent handler moment
-            parseAs<ResponseDto<AnimeDto>>(responseBody).items.first()
+            parseAs<ResponseDto<AnimeDto>> { responseBody }.items.first()
         }
     }
 
@@ -277,11 +266,6 @@ class AnimesTC : ConfigurableAnimeSource, AnimeHttpSource() {
         }.getOrNull() ?: 0L
     }
 
-    private inline fun <reified T> Response.parseAs(preloaded: String? = null): T {
-        val responseBody = preloaded ?: use { it.body.string() }
-        return json.decodeFromString(responseBody)
-    }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
         val player = preferences.getString(PREF_PLAYER_KEY, PREF_PLAYER_DEFAULT)!!
diff --git a/src/pt/animesvision/build.gradle b/src/pt/animesvision/build.gradle
index 7a6ec40eb..3a80af470 100644
--- a/src/pt/animesvision/build.gradle
+++ b/src/pt/animesvision/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animesvision'
     extClass = '.AnimesVision'
     extVersionCode = 22
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
index 3b74fd876..afe9b136f 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
@@ -19,12 +19,10 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -34,7 +32,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -51,7 +48,7 @@ class AnimesVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor(::loginInterceptor)
         .build()
 
@@ -92,14 +89,14 @@ class AnimesVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = nextPageSelector()
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -222,7 +219,7 @@ class AnimesVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         val players = doc.select("div.server-item > a.btn")
 
-        return players.parallelMap {
+        return players.parallelFlatMapBlocking {
             val id = it.attr("wire:click")
                 .substringAfter("(")
                 .substringBefore(")")
@@ -232,12 +229,12 @@ class AnimesVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             val body = "$initialData, \"updates\": [$updateString]}"
             val reqBody = body.toRequestBody()
             val url = "$baseUrl/livewire/message/components.episodio.player-episodio-component"
-            val response = client.newCall(POST(url, headers, reqBody)).execute()
+            val response = client.newCall(POST(url, headers, reqBody)).await()
             val responseBody = response.use { it.body.string() }
             val resJson = json.decodeFromString<AVResponseDto>(responseBody)
             (resJson.serverMemo?.data?.framePlay ?: resJson.effects?.html)
                 ?.let(::parsePlayerData).orEmpty()
-        }.flatten()
+        }
     }
 
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
@@ -290,11 +287,6 @@ class AnimesVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return response
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private fun getRealDoc(document: Document): Document {
         val originalUrl = document.location()
         if ("/episodio-" in originalUrl || "/filme-" in originalUrl) {
diff --git a/src/pt/animeszone/build.gradle b/src/pt/animeszone/build.gradle
index 695d2fd7d..d97bb5fdf 100644
--- a/src/pt/animeszone/build.gradle
+++ b/src/pt/animeszone/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.animeszone'
     extClass = '.AnimesZone'
     extVersionCode = 6
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt
index 4559f48c5..4aa140043 100644
--- a/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt
+++ b/src/pt/animeszone/src/eu/kanade/tachiyomi/animeextension/pt/animeszone/AnimesZone.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
@@ -40,8 +41,6 @@ class AnimesZone : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
         .add("Origin", baseUrl)
@@ -379,10 +378,6 @@ class AnimesZone : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     @Serializable
     data class VideoResponse(val embed_url: String)
 
diff --git a/src/pt/anitube/build.gradle b/src/pt/anitube/build.gradle
index 0ec19889c..9ab415523 100644
--- a/src/pt/anitube/build.gradle
+++ b/src/pt/anitube/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.anitube'
     extClass = '.Anitube'
     extVersionCode = 13
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
index 8285ec93f..757d8b7b8 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt
@@ -32,8 +32,6 @@ class Anitube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
diff --git a/src/pt/betteranime/build.gradle b/src/pt/betteranime/build.gradle
index 603d0266b..b233c2e23 100644
--- a/src/pt/betteranime/build.gradle
+++ b/src/pt/betteranime/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.betteranime'
     extClass = '.BetterAnime'
     extVersionCode = 8
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt
index 5ea02f40f..1ffc9f9aa 100644
--- a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt
+++ b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/BetterAnime.kt
@@ -17,21 +17,19 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonPrimitive
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -48,7 +46,7 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+    override val client = network.client.newBuilder()
         .addInterceptor(::loginInterceptor)
         .build()
 
@@ -115,14 +113,14 @@ class BetterAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return AnimesPage(animes, hasNext)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH_PATH)) {
             val path = query.removePrefix(PREFIX_SEARCH_PATH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/extractors/BetterAnimeExtractor.kt b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/extractors/BetterAnimeExtractor.kt
index 5af5ae300..6b1053c47 100644
--- a/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/extractors/BetterAnimeExtractor.kt
+++ b/src/pt/betteranime/src/eu/kanade/tachiyomi/animeextension/pt/betteranime/extractors/BetterAnimeExtractor.kt
@@ -5,10 +5,8 @@ import eu.kanade.tachiyomi.animeextension.pt.betteranime.unescape
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.util.parallelMapNotNullBlocking
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
@@ -28,14 +26,14 @@ class BetterAnimeExtractor(
             Pair(it.groupValues[1], it.groupValues[2])
         }.toList()
         val token = html.substringAfter("_token:\"").substringBefore("\"")
-        return qualities.parallelMap { (quality, qtoken) ->
+        return qualities.parallelMapNotNullBlocking { (quality, qtoken) ->
             videoUrlFromToken(qtoken, token)?.let { videoUrl ->
                 Video(videoUrl, quality, videoUrl)
             }
-        }.filterNotNull()
+        }
     }
 
-    private fun videoUrlFromToken(qtoken: String, token: String): String? {
+    private suspend fun videoUrlFromToken(qtoken: String, token: String): String? {
         val body = """
             {
                 "_token": "$token",
@@ -45,14 +43,14 @@ class BetterAnimeExtractor(
         val reqBody = body.toRequestBody("application/json".toMediaType())
         val request = POST("$baseUrl/changePlayer", headers, reqBody)
         return runCatching {
-            val response = client.newCall(request).execute().use { it.body.string() }
+            val response = client.newCall(request).await().use { it.body.string() }
             val resJson = json.decodeFromString<ChangePlayerDto>(response)
-            resJson.frameLink?.let(::videoUrlFromPlayer)
+            videoUrlFromPlayer(resJson.frameLink!!)
         }.getOrNull()
     }
 
-    private fun videoUrlFromPlayer(url: String): String {
-        val html = client.newCall(GET(url, headers)).execute().use { it.body.string() }
+    private suspend fun videoUrlFromPlayer(url: String): String {
+        val html = client.newCall(GET(url, headers)).await().use { it.body.string() }
 
         val videoUrl = html.substringAfter("file\":")
             .substringAfter("\"")
@@ -62,11 +60,6 @@ class BetterAnimeExtractor(
         return videoUrl
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     companion object {
         private val REGEX_QUALITIES = """qualityString\["(\w+)"\] = "(\S+)"""".toRegex()
     }
diff --git a/src/pt/donghuanosekai/build.gradle b/src/pt/donghuanosekai/build.gradle
index f6d510d4b..c3cf452b1 100644
--- a/src/pt/donghuanosekai/build.gradle
+++ b/src/pt/donghuanosekai/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.donghuanosekai'
     extClass = '.DonghuaNoSekai'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/donghuanosekai/src/eu/kanade/tachiyomi/animeextension/pt/donghuanosekai/DonghuaNoSekai.kt b/src/pt/donghuanosekai/src/eu/kanade/tachiyomi/animeextension/pt/donghuanosekai/DonghuaNoSekai.kt
index 64c15c6b1..c6c98ad29 100644
--- a/src/pt/donghuanosekai/src/eu/kanade/tachiyomi/animeextension/pt/donghuanosekai/DonghuaNoSekai.kt
+++ b/src/pt/donghuanosekai/src/eu/kanade/tachiyomi/animeextension/pt/donghuanosekai/DonghuaNoSekai.kt
@@ -13,12 +13,11 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
@@ -28,7 +27,6 @@ import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -82,14 +80,14 @@ class DonghuaNoSekai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "ul.content-pagination > li.next"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -209,13 +207,11 @@ class DonghuaNoSekai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val doc = response.use { it.asJsoup() }
 
-        return doc.select("div.slideItem[data-video-url]").parallelMap {
-            runCatching {
-                client.newCall(GET(it.attr("data-video-url"), headers)).execute()
-                    .use { it.asJsoup() }
-                    .let(extractor::videosFromDocument)
-            }.getOrElse { emptyList() }
-        }.flatten()
+        return doc.select("div.slideItem[data-video-url]").parallelCatchingFlatMapBlocking {
+            client.newCall(GET(it.attr("data-video-url"), headers)).await()
+                .use { it.asJsoup() }
+                .let(extractor::videosFromDocument)
+        }
     }
 
     override fun videoListSelector(): String {
@@ -249,9 +245,6 @@ class DonghuaNoSekai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
 
     private fun getRealDoc(document: Document): Document {
         return document.selectFirst("div.controles li.list-ep > a")?.let { link ->
@@ -273,11 +266,6 @@ class DonghuaNoSekai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .getOrNull() ?: 0L
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
         return sortedWith(
diff --git a/src/pt/flixei/build.gradle b/src/pt/flixei/build.gradle
index ecd40e68c..34992fba0 100644
--- a/src/pt/flixei/build.gradle
+++ b/src/pt/flixei/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.flixei'
     extClass = '.Flixei'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt b/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
index 09951eb61..5f175ddfb 100644
--- a/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
+++ b/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
@@ -18,12 +18,10 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
@@ -31,7 +29,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -46,8 +43,6 @@ class Flixei : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -98,14 +93,14 @@ class Flixei : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div.paginationSystem a.next"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/assistir/$path/online/gratis"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -233,8 +228,7 @@ class Flixei : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
         }
-
-        return items.parallelMap(::getVideosFromItem).flatten()
+        return items.parallelCatchingFlatMapBlocking(::getVideosFromItem)
     }
 
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
@@ -308,14 +302,6 @@ class Flixei : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 
     private fun Element.getInfo(item: String) = selectFirst("*:containsOwn($item) b")?.text()
 
diff --git a/src/pt/hentaistube/build.gradle b/src/pt/hentaistube/build.gradle
index 86e766660..6bd6518fb 100644
--- a/src/pt/hentaistube/build.gradle
+++ b/src/pt/hentaistube/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.hentaistube'
     extClass = '.HentaisTube'
     extVersionCode = 1
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
index 68f61283d..cc3bf6491 100644
--- a/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
+++ b/src/pt/hentaistube/src/eu/kanade/tachiyomi/animeextension/pt/hentaistube/HentaisTube.kt
@@ -15,18 +15,15 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import kotlinx.serialization.json.Json
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -89,12 +86,12 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .asSequence()
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
             val params = HentaisTubeFilters.getSearchParameters(filters).apply {
                 animeName = query
@@ -113,7 +110,7 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     }
                 }
             }
-            Observable.just(AnimesPage(currentPage, hasNextPage))
+            AnimesPage(currentPage, hasNextPage)
         }
     }
 
@@ -164,13 +161,12 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // ============================ Video Links =============================
     override fun videoListParse(response: Response): List<Video> {
-        return response.use { it.asJsoup() }.select(videoListSelector()).parallelMap {
-            runCatching {
-                client.newCall(GET(it.attr("src"), headers)).execute().use { res ->
+        return response.use { it.asJsoup() }.select(videoListSelector())
+            .parallelCatchingFlatMapBlocking {
+                client.newCall(GET(it.attr("src"), headers)).await().use { res ->
                     extractVideosFromIframe(res.use { it.asJsoup() })
                 }
-            }.getOrElse { emptyList() }
-        }.flatten()
+            }
     }
 
     private val bloggerExtractor by lazy { BloggerExtractor(client) }
@@ -232,11 +228,6 @@ class HentaisTube : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .eachText()
             .joinToString()
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
         return sortedWith(
diff --git a/src/pt/hinatasoul/build.gradle b/src/pt/hinatasoul/build.gradle
index 17ef7af82..67cff34b6 100644
--- a/src/pt/hinatasoul/build.gradle
+++ b/src/pt/hinatasoul/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.hinatasoul'
     extClass = '.HinataSoul'
     extVersionCode = 4
-    libVersion = '13'
 }
 
 
diff --git a/src/pt/hinatasoul/src/eu/kanade/tachiyomi/animeextension/pt/hinatasoul/HinataSoul.kt b/src/pt/hinatasoul/src/eu/kanade/tachiyomi/animeextension/pt/hinatasoul/HinataSoul.kt
index a737cf2c6..7f237c952 100644
--- a/src/pt/hinatasoul/src/eu/kanade/tachiyomi/animeextension/pt/hinatasoul/HinataSoul.kt
+++ b/src/pt/hinatasoul/src/eu/kanade/tachiyomi/animeextension/pt/hinatasoul/HinataSoul.kt
@@ -12,12 +12,11 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
@@ -33,8 +32,6 @@ class HinataSoul : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val preferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -69,14 +66,14 @@ class HinataSoul : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = null
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val slug = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/animes/$slug"))
-                .asObservableSuccess()
-                .map(::searchAnimeBySlugParse)
+                .awaitSuccess()
+                .use(::searchAnimeBySlugParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/pt/listadeanimes/build.gradle b/src/pt/listadeanimes/build.gradle
index 97779c060..0ff39aeec 100644
--- a/src/pt/listadeanimes/build.gradle
+++ b/src/pt/listadeanimes/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.listadeanimes'
     extClass = '.ListaDeAnimes'
     extVersionCode = 2
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt b/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt
index 15e216d60..4f5966696 100644
--- a/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt
+++ b/src/pt/listadeanimes/src/eu/kanade/tachiyomi/animeextension/pt/listadeanimes/ListaDeAnimes.kt
@@ -11,7 +11,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class ListaDeAnimes : ParsedAnimeHttpSource() {
     override val name = "Lista de Animes"
@@ -94,8 +93,8 @@ class ListaDeAnimes : ParsedAnimeHttpSource() {
     }
 
     // ============================ Video Links =============================
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
-        return Observable.just(listOf(Video(episode.url, episode.name, episode.url)))
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
+        return listOf(Video(episode.url, episode.name, episode.url))
     }
 
     override fun videoListSelector() = throw UnsupportedOperationException("Not used.")
diff --git a/src/pt/megaflix/build.gradle b/src/pt/megaflix/build.gradle
index a256ef86a..b1ecac8a7 100644
--- a/src/pt/megaflix/build.gradle
+++ b/src/pt/megaflix/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'pt.megaflix'
     extClass = '.Megaflix'
     extVersionCode = 11
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
index 2a37e4ea0..9221f14f6 100644
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
+++ b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
@@ -15,17 +15,15 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelFlatMapBlocking
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -71,14 +69,14 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div.nav-links > a:containsOwn(PRÓXIMO)"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val path = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -129,13 +127,13 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     episode_number = 1F
                 },
             )
-            else -> seasons.parallelMap(::episodesFromSeason).flatten().reversed()
+            else -> seasons.parallelFlatMapBlocking(::episodesFromSeason).reversed()
         }
     }
 
-    private fun episodesFromSeason(seasonElement: Element): List<SEpisode> {
+    private suspend fun episodesFromSeason(seasonElement: Element): List<SEpisode> {
         return seasonElement.attr("href").let { url ->
-            client.newCall(GET(url, headers)).execute()
+            client.newCall(GET(url, headers)).await()
                 .use { it.asJsoup() }
                 .select(episodeListSelector())
                 .map(::episodeFromElement)
@@ -158,7 +156,7 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val items = response.use { it.asJsoup() }.select(videoListSelector())
         return items
-            .parallelMap { element ->
+            .parallelCatchingFlatMapBlocking { element ->
                 val language = element.text().substringAfter("-")
                 val id = element.attr("href")
                 val url = element.parents().get(5)?.selectFirst("div$id a")
@@ -167,23 +165,23 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                             .substringAfter("token=")
                             .let { String(Base64.decode(it, Base64.DEFAULT)) }
                             .substringAfter("||")
-                    } ?: return@parallelMap emptyList()
+                    } ?: return@parallelCatchingFlatMapBlocking emptyList()
 
-                runCatching { getVideoList(url, language) }.getOrNull().orEmpty()
-            }.flatten()
+                getVideoList(url, language)
+            }
     }
 
     private val mixdropExtractor by lazy { MixDropExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val megaflixExtractor by lazy { MegaflixExtractor(client, headers) }
 
-    private fun getVideoList(url: String, language: String): List<Video>? {
+    private fun getVideoList(url: String, language: String): List<Video> {
         return when {
             "mixdrop.co" in url -> mixdropExtractor.videoFromUrl(url, language)
             "streamtape.com" in url -> streamtapeExtractor.videosFromUrl(url, "StreamTape - $language")
             "mflix.vip" in url -> megaflixExtractor.videosFromUrl(url, language)
             else -> null
-        }
+        }.orEmpty()
     }
 
     override fun videoListSelector() = "aside.video-options li a"
@@ -248,11 +246,6 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
         val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
diff --git a/src/pt/muitohentai/build.gradle b/src/pt/muitohentai/build.gradle
index 1166a5cd5..55aea3868 100644
--- a/src/pt/muitohentai/build.gradle
+++ b/src/pt/muitohentai/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.muitohentai'
     extClass = '.MuitoHentai'
     extVersionCode = 2
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/vizer/build.gradle b/src/pt/vizer/build.gradle
index 4a04777d4..86fb1b5df 100644
--- a/src/pt/vizer/build.gradle
+++ b/src/pt/vizer/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'pt.vizer'
     extClass = '.Vizer'
     extVersionCode = 11
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
index cdabede53..45da6155c 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
@@ -21,8 +21,9 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
@@ -30,7 +31,6 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -46,8 +46,6 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -100,14 +98,14 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) {
             val path = query.removePrefix(PREFIX_SEARCH).replace("/", "/online/")
             client.newCall(GET("$baseUrl/$path"))
-                .asObservableSuccess()
-                .map(::searchAnimeByPathParse)
+                .awaitSuccess()
+                .use(::searchAnimeByPathParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -314,10 +312,6 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         ).reversed()
     }
 
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
     companion object {
         private const val PREF_POPULAR_PAGE_KEY = "pref_popular_page"
         private const val PREF_POPULAR_PAGE_DEFAULT = "movie"
diff --git a/src/ru/animevost/build.gradle b/src/ru/animevost/build.gradle
index 9551254b2..9e0563edc 100644
--- a/src/ru/animevost/build.gradle
+++ b/src/ru/animevost/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ru.animevost'
     extClass = '.Animevost'
     extVersionCode = 7
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/sr/animesrbija/build.gradle b/src/sr/animesrbija/build.gradle
index e584c05a9..6d14a9c02 100644
--- a/src/sr/animesrbija/build.gradle
+++ b/src/sr/animesrbija/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'sr.animesrbija'
     extClass = '.AnimeSrbija'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/sr/animesrbija/src/eu/kanade/tachiyomi/animeextension/sr/animesrbija/AnimeSrbija.kt b/src/sr/animesrbija/src/eu/kanade/tachiyomi/animeextension/sr/animesrbija/AnimeSrbija.kt
index eb125e2f3..ef5483540 100644
--- a/src/sr/animesrbija/src/eu/kanade/tachiyomi/animeextension/sr/animesrbija/AnimeSrbija.kt
+++ b/src/sr/animesrbija/src/eu/kanade/tachiyomi/animeextension/sr/animesrbija/AnimeSrbija.kt
@@ -15,14 +15,13 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
-import rx.Observable
 import uy.kohesive.injekt.injectLazy
 
 class AnimeSrbija : AnimeHttpSource() {
@@ -123,14 +122,14 @@ class AnimeSrbija : AnimeHttpSource() {
         return GET(url)
     }
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/tr/animeler/build.gradle b/src/tr/animeler/build.gradle
index 4918f39d5..6aa580046 100644
--- a/src/tr/animeler/build.gradle
+++ b/src/tr/animeler/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'tr.animeler'
     extClass = '.Animeler'
     extVersionCode = 6
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt b/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
index 637d9eebb..68e255d9b 100644
--- a/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
+++ b/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
@@ -30,12 +30,11 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -45,7 +44,6 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -91,14 +89,14 @@ class Animeler : AnimeHttpSource(), ConfigurableAnimeSource {
     override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -258,14 +256,12 @@ class Animeler : AnimeHttpSource(), ConfigurableAnimeSource {
             chosenHosts.any { it.contains(source.value, true) }
         }
 
-        return filteredSources.parallelMap {
+        return filteredSources.parallelCatchingFlatMapBlocking {
             val body = playerBody(it.key)
-            runCatching {
-                val res = client.newCall(POST(actionUrl, headers, body)).execute()
-                    .parseAs<VideoDto>()
-                videosFromUrl(res.videoSrc)
-            }.getOrElse { emptyList() }
-        }.flatten().ifEmpty { throw Exception("No video available.") }
+            val res = client.newCall(POST(actionUrl, headers, body)).await()
+                .parseAs<VideoDto>()
+            videosFromUrl(res.videoSrc)
+        }
     }
 
     private fun videosFromUrl(url: String): List<Video> {
@@ -320,20 +316,12 @@ class Animeler : AnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return body.string().let(json::decodeFromString)
-    }
 
     private fun String.toDate(): Long {
         return runCatching { DATE_FORMATTER.parse(trim())?.time }
             .getOrNull() ?: 0L
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     private val qualityRegex by lazy { Regex("""(\d+)p""") }
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
diff --git a/src/tr/anizm/build.gradle b/src/tr/anizm/build.gradle
index d8f3b66d5..21cc826b6 100644
--- a/src/tr/anizm/build.gradle
+++ b/src/tr/anizm/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'tr.anizm'
     extClass = '.Anizm'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
index 69b36bb3f..4008a473d 100644
--- a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
+++ b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
@@ -27,22 +27,18 @@ import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeFromStream
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -57,8 +53,6 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Origin", baseUrl)
         .add("Referer", "$baseUrl/")
@@ -103,12 +97,12 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override fun getFilterList(): AnimeFilterList = AnizmFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
             val params = AnizmFilters.getSearchParameters(filters).apply {
                 animeName = query
@@ -127,7 +121,7 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
                     }
                 }
             }
-            Observable.just(AnimesPage(currentPage, hasNextPage))
+            AnimesPage(currentPage, hasNextPage)
         }
     }
 
@@ -218,22 +212,18 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             }.getOrElse { emptyList() }
         }
 
-        return playerUrls.parallelMap { pair ->
+        return playerUrls.parallelCatchingFlatMapBlocking { pair ->
             val (fansub, url) = pair
-            runCatching {
-                getVideosFromUrl(url).map {
-                    Video(
-                        it.url,
-                        "[$fansub] ${it.quality}",
-                        it.videoUrl,
-                        it.headers,
-                        it.subtitleTracks,
-                        it.audioTracks,
-                    )
-                }
-            }.getOrElse { emptyList() }
-        }.flatten().ifEmpty {
-            throw Exception("No videos available, eat a yogurt and cry a bit.")
+            getVideosFromUrl(url).map {
+                Video(
+                    it.url,
+                    "[$fansub] ${it.quality}",
+                    it.videoUrl,
+                    it.headers,
+                    it.subtitleTracks,
+                    it.audioTracks,
+                )
+            }
         }
     }
 
@@ -356,14 +346,6 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T = use {
-        json.decodeFromStream(it.body.byteStream())
-    }
-
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
diff --git a/src/tr/hdfilmcehennemi/build.gradle b/src/tr/hdfilmcehennemi/build.gradle
index 19696955d..d0159e94b 100644
--- a/src/tr/hdfilmcehennemi/build.gradle
+++ b/src/tr/hdfilmcehennemi/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'tr.hdfilmcehennemi'
     extClass = '.HDFilmCehennemi'
     extVersionCode = 7
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
index 4e4e92f18..68f8a8b0a 100644
--- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt
@@ -15,14 +15,13 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.await
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
 import okhttp3.MultipartBody
@@ -30,7 +29,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -47,8 +45,6 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
         .add("Origin", baseUrl)
@@ -84,14 +80,14 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // =============================== Search ===============================
     override fun getFilterList() = HDFilmCehennemiFilters.FILTER_LIST
 
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -194,19 +190,17 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================== Episodes ==============================
-    override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
+    override suspend fun getEpisodeList(anime: SAnime): List<SEpisode> {
         // Series
-        if (anime.url.contains("/dizi/")) return super.fetchEpisodeList(anime)
+        if (anime.url.contains("/dizi/")) return super.getEpisodeList(anime)
 
         // Movies
-        return Observable.just(
-            listOf(
-                SEpisode.create().apply {
-                    url = anime.url
-                    name = "Movie"
-                    episode_number = 1F
-                },
-            ),
+        return listOf(
+            SEpisode.create().apply {
+                url = anime.url
+                name = "Movie"
+                episode_number = 1F
+            },
         )
     }
 
@@ -239,20 +233,18 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         return doc.select("div.card-body > nav > a:not([href^=#])")
             .drop(1)
-            .parallelMap { client.newCall(GET(it.absUrl("href") + "/")).execute().use { it.asJsoup() } }
+            .parallelMapBlocking { client.newCall(GET(it.absUrl("href") + "/")).await().use { it.asJsoup() } }
             .let { listOf(doc) + it }
             .mapNotNull { it.selectFirst("div.card-video > iframe")?.attr("data-src") }
             .filter(String::isNotBlank)
-            .parallelMap { url ->
-                runCatching {
-                    when {
-                        url.contains("vidmoly") -> vidmolyExtractor.videosFromUrl(url)
-                        url.contains("$baseUrl/playerr") -> rapidrameExtractor.videosFromUrl(url)
-                        url.contains("trstx.org") -> xbetExtractor.videosFromUrl(url)
-                        else -> emptyList()
-                    }
-                }.getOrNull().orEmpty()
-            }.flatten().ifEmpty { throw Exception("No videos available xD") }
+            .parallelCatchingFlatMapBlocking { url ->
+                when {
+                    url.contains("vidmoly") -> vidmolyExtractor.videosFromUrl(url)
+                    url.contains("$baseUrl/playerr") -> rapidrameExtractor.videosFromUrl(url)
+                    url.contains("trstx.org") -> xbetExtractor.videosFromUrl(url)
+                    else -> emptyList()
+                }
+            }
     }
 
     override fun videoListSelector(): String {
@@ -287,14 +279,6 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     // ============================= Utilities ==============================
-    private inline fun <reified T> Response.parseAs(): T {
-        return use { it.body.string() }.let(json::decodeFromString)
-    }
-
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
 
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/XBetExtractor.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/XBetExtractor.kt
index 0d80e43c4..49036bd1a 100644
--- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/XBetExtractor.kt
+++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/extractors/XBetExtractor.kt
@@ -5,12 +5,12 @@ import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import okhttp3.Response
 
 class XBetExtractor(
     private val client: OkHttpClient,
@@ -57,9 +57,4 @@ class XBetExtractor(
     data class VideoItemDto(val file: String, val title: String) {
         val path = "/playlist/${file.removeSuffix("~")}.txt"
     }
-
-    private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
-        val responseBody = use { transform(it.body.string()) }
-        return json.decodeFromString(responseBody)
-    }
 }
diff --git a/src/tr/hentaizm/build.gradle b/src/tr/hentaizm/build.gradle
index 63cda2eb3..15a9178f4 100644
--- a/src/tr/hentaizm/build.gradle
+++ b/src/tr/hentaizm/build.gradle
@@ -9,7 +9,6 @@ ext {
     pkgNameSuffix = 'tr.hentaizm'
     extClass = '.HentaiZM'
     extVersionCode = 1
-    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt b/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
index 83c414bb1..e2e929ea1 100644
--- a/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
+++ b/src/tr/hentaizm/src/eu/kanade/tachiyomi/animeextension/tr/hentaizm/HentaiZM.kt
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
@@ -23,7 +23,6 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -104,14 +103,14 @@ class HentaiZM : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     override fun latestUpdatesNextPageSelector() = "a[rel=next]:contains(Sonraki Sayfa)"
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/hentai-detay/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
diff --git a/src/tr/tranimeizle/build.gradle b/src/tr/tranimeizle/build.gradle
index 8d6df680a..5cd4c2c2c 100644
--- a/src/tr/tranimeizle/build.gradle
+++ b/src/tr/tranimeizle/build.gradle
@@ -8,7 +8,6 @@ ext {
     pkgNameSuffix = 'tr.tranimeizle'
     extClass = '.TRAnimeIzle'
     extVersionCode = 11
-    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
index 1509f84ea..50662ee7f 100644
--- a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
+++ b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
@@ -25,19 +25,15 @@ import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.network.awaitSuccess
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.runBlocking
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
@@ -54,7 +50,7 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     override val supportsLatest = true
 
     override val client by lazy {
-        network.cloudflareClient.newBuilder()
+        network.client.newBuilder()
             .addInterceptor(ShittyCaptchaInterceptor(baseUrl, headers))
             .build()
     }
@@ -94,14 +90,14 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
 
     // =============================== Search ===============================
-    override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable<AnimesPage> {
+    override suspend fun getSearchAnime(page: Int, query: String, filters: AnimeFilterList): AnimesPage {
         return if (query.startsWith(PREFIX_SEARCH)) { // URL intent handler
             val id = query.removePrefix(PREFIX_SEARCH)
             client.newCall(GET("$baseUrl/anime/$id"))
-                .asObservableSuccess()
-                .map(::searchAnimeByIdParse)
+                .awaitSuccess()
+                .use(::searchAnimeByIdParse)
         } else {
-            super.fetchSearchAnime(page, query, filters)
+            super.getSearchAnime(page, query, filters)
         }
     }
 
@@ -202,12 +198,9 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
                     .select("li.sourceBtn")
                     .toList()
                     .filter { it.selectFirst("p")?.ownText().orEmpty() in chosenHosts }
-                    .parallelMap {
-                        runCatching {
-                            getVideosFromId(it.attr("data-id"))
-                        }.getOrElse { emptyList() }
+                    .parallelCatchingFlatMapBlocking {
+                        getVideosFromId(it.attr("data-id"))
                     }
-                    .flatten()
                     .map {
                         Video(
                             it.url,
@@ -352,11 +345,6 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             .getOrNull() ?: 0L
     }
 
-    private inline fun <A, B> Iterable<A>.parallelMap(crossinline f: suspend (A) -> B): List<B> =
-        runBlocking {
-            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
-        }
-
     override fun List<Video>.sort(): List<Video> {
         val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
 
diff --git a/src/tr/turkanime/build.gradle b/src/tr/turkanime/build.gradle
index baf912b40..5b3691f61 100644
--- a/src/tr/turkanime/build.gradle
+++ b/src/tr/turkanime/build.gradle
@@ -26,7 +26,6 @@ ext {
     pkgNameSuffix = 'tr.turkanime'
     extClass = '.TurkAnime'
     extVersionCode = 18
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
index 09ae255de..cbe4a523c 100644
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
+++ b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
@@ -36,10 +36,11 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.await
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
+import eu.kanade.tachiyomi.util.parallelMapBlocking
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -66,8 +67,6 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
 
-    override val client = network.cloudflareClient
-
     private val json: Json by injectLazy()
 
     private val preferences by lazy {
@@ -205,11 +204,11 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 chosenFansubs.any(subName::contains) || allFansubs.none(subName::contains)
             }
 
-            filteredSubs.parallelMap {
+            filteredSubs.parallelCatchingFlatMapBlocking {
                 val url = it.attr("onclick").trimOnClick()
-                val subDoc = client.newCall(GET(url, xmlHeader)).execute().asJsoup()
+                val subDoc = client.newCall(GET(url, xmlHeader)).await().asJsoup()
                 getVideosFromHosters(subDoc, it.text().trim())
-            }.flatten()
+            }
         }
 
         require(videoList.isNotEmpty()) { "Failed to extract videos" }
@@ -231,15 +230,15 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
 
-            hosters.parallelMap {
+            hosters.parallelMapBlocking {
                 val hosterName = it.text().trim()
-                if (hosterName !in SUPPORTED_HOSTERS) return@parallelMap
-                if (hosterName !in hosterSelection) return@parallelMap
+                if (hosterName !in SUPPORTED_HOSTERS) return@parallelMapBlocking
+                if (hosterName !in hosterSelection) return@parallelMapBlocking
                 val url = it.attr("onclick").trimOnClick()
-                val videoDoc = client.newCall(GET(url, xmlHeader)).execute().asJsoup()
+                val videoDoc = client.newCall(GET(url, xmlHeader)).await().asJsoup()
                 val src = videoDoc.selectFirst("iframe")?.attr("src")
                     ?.replace("^//".toRegex(), "https://")
-                    ?: return@parallelMap
+                    ?: return@parallelMapBlocking
                 addAll(getVideosFromSource(src, hosterName, subber))
             }
         }
@@ -358,11 +357,6 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val xmlHeader = Headers.headersOf("X-Requested-With", "XMLHttpRequest")
     private val refererHeader = Headers.headersOf("Referer", baseUrl)
 
-    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
-        runBlocking(Dispatchers.Default) {
-            map { async { f(it) } }.awaitAll()
-        }
-
     private val mutex = Mutex()
     private var shouldUpdateKey = false
 
diff --git a/src/uk/uakino/build.gradle b/src/uk/uakino/build.gradle
index 210d535fd..b8a7efe87 100644
--- a/src/uk/uakino/build.gradle
+++ b/src/uk/uakino/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'uk.uakino'
     extClass = '.UAKino'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/uk/uakino/src/eu/kanade/tachiyomi/animeextension/uk/uakino/UAKino.kt b/src/uk/uakino/src/eu/kanade/tachiyomi/animeextension/uk/uakino/UAKino.kt
index 97e34e70c..c950ac2de 100644
--- a/src/uk/uakino/src/eu/kanade/tachiyomi/animeextension/uk/uakino/UAKino.kt
+++ b/src/uk/uakino/src/eu/kanade/tachiyomi/animeextension/uk/uakino/UAKino.kt
@@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.json.JSONObject
@@ -20,7 +19,6 @@ import org.json.JSONTokener
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class UAKino : ParsedAnimeHttpSource() {
 
@@ -36,8 +34,6 @@ class UAKino : ParsedAnimeHttpSource() {
 
     private val episodesAPI = "https://uakino.club/engine/ajax/playlists.php?news_id=%s&xfield=playlist" // %s - ID title
 
-    override val client: OkHttpClient = network.client
-
     // =========================== Anime Details ============================
 
     override fun animeDetailsParse(document: Document): SAnime {
@@ -187,7 +183,7 @@ class UAKino : ParsedAnimeHttpSource() {
 
     // ============================ Video ===============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         Log.d("fetchVideoList", episode.url)
 
         val videoList = mutableListOf<Video>()
@@ -212,7 +208,7 @@ class UAKino : ParsedAnimeHttpSource() {
             videoList.add(Video(videoUrl, quality, videoUrl))
         }
 
-        return Observable.just(videoList)
+        return videoList
     }
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
diff --git a/src/uk/ufdub/build.gradle b/src/uk/ufdub/build.gradle
index 6e9c9f44d..757a7364e 100644
--- a/src/uk/ufdub/build.gradle
+++ b/src/uk/ufdub/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'uk.ufdub'
     extClass = '.UFDub'
     extVersionCode = 1
-    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/uk/ufdub/src/eu/kanade/tachiyomi/animeextension/uk/ufdub/UFDub.kt b/src/uk/ufdub/src/eu/kanade/tachiyomi/animeextension/uk/ufdub/UFDub.kt
index aab0c2b1d..b3d7e9ba7 100644
--- a/src/uk/ufdub/src/eu/kanade/tachiyomi/animeextension/uk/ufdub/UFDub.kt
+++ b/src/uk/ufdub/src/eu/kanade/tachiyomi/animeextension/uk/ufdub/UFDub.kt
@@ -11,12 +11,10 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import rx.Observable
 
 class UFDub : ParsedAnimeHttpSource() {
 
@@ -29,8 +27,6 @@ class UFDub : ParsedAnimeHttpSource() {
     override val baseUrl = "https://ufdub.com/anime"
     private val baseUrlWithoutAnime = "https://ufdub.com"
 
-    override val client: OkHttpClient = network.client
-
     // =========================== Anime Details ============================
 
     override fun animeDetailsParse(document: Document): SAnime {
@@ -145,11 +141,11 @@ class UFDub : ParsedAnimeHttpSource() {
 
     // ============================ Video ===============================
 
-    override fun fetchVideoList(episode: SEpisode): Observable<List<Video>> {
+    override suspend fun getVideoList(episode: SEpisode): List<Video> {
         val videoUrl = client.newCall(GET(episode.url)).execute().request.url.toString().replace("dl=1", "raw=1")
         Log.d("fetchVideoList", videoUrl)
         val video = Video(videoUrl, "Quality", videoUrl)
-        return Observable.just(listOf(video))
+        return listOf(video)
     }
 
     override fun videoFromElement(element: Element) = throw Exception("not used")