diff --git a/common-dependencies.gradle b/common-dependencies.gradle
index 369d4ae42..5aaeecce5 100644
--- a/common-dependencies.gradle
+++ b/common-dependencies.gradle
@@ -1,7 +1,7 @@
 // used both in common.gradle and themesources library
 dependencies {
     // Lib 12, but using specific commit so we don't need to bump up the version
-    compileOnly "com.github.jmir1:extensions-lib:3581001"
+    compileOnly "com.github.jmir1:extensions-lib:8400462"
 
     // These are provided by the app itself
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
diff --git a/src/all/onepace/build.gradle b/src/all/onepace/build.gradle
index 3f009cb81..487538a79 100644
--- a/src/all/onepace/build.gradle
+++ b/src/all/onepace/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Onepace'
     pkgNameSuffix = 'all.onepace'
     extClass = '.OnepaceFactory'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
     containsNsfw = false
 }
 
diff --git a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt
index d6f2ef0cb..66bdec1d9 100644
--- a/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt
+++ b/src/all/onepace/src/eu/kanade/tachiyomi/animeextension/all/onepace/Onepace.kt
@@ -133,7 +133,7 @@ open class Onepace(override val lang: String, override val name: String) : Confi
         val videoId = realUrl.substringAfter("/v/").substringBefore("/file")
         val videoName = document.selectFirst("div.center div font+font").text()
         val videoUrl = "$hostUrl/d/$videoId/${(timeId.toInt() % 1000) + 11}/${URLEncoder.encode(videoName)}"
-        return listOf(Video(videoUrl, "ZippyShare", videoUrl, null))
+        return listOf(Video(videoUrl, "ZippyShare", videoUrl))
     }
 
     override fun videoListSelector() = throw Exception("not used")
diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle
index b4d27d155..5a84e2330 100644
--- a/src/ar/akwam/build.gradle
+++ b/src/ar/akwam/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'أكوام'
     pkgNameSuffix = 'ar.akwam'
     extClass = '.Akwam'
-    extVersionCode = 6
-    libVersion = '12'
+    extVersionCode = 7
+    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 0753fcaf7..d160f3c86 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
@@ -82,7 +82,7 @@ class Akwam : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListSelector() = "source"
 
     override fun videoFromElement(element: Element): Video {
-        return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"), null)
+        return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"))
     }
 
     override fun List<Video>.sort(): List<Video> {
diff --git a/src/ar/akwams/build.gradle b/src/ar/akwams/build.gradle
index 3a573df9c..849787b09 100644
--- a/src/ar/akwams/build.gradle
+++ b/src/ar/akwams/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'اكوام مسلسلات'
     pkgNameSuffix = 'ar.akwams'
     extClass = '.AkwamS'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/akwams/src/eu/kanade/tachiyomi/animeextension/ar/akwams/AkwamS.kt b/src/ar/akwams/src/eu/kanade/tachiyomi/animeextension/ar/akwams/AkwamS.kt
index dab697a33..0106254ca 100644
--- a/src/ar/akwams/src/eu/kanade/tachiyomi/animeextension/ar/akwams/AkwamS.kt
+++ b/src/ar/akwams/src/eu/kanade/tachiyomi/animeextension/ar/akwams/AkwamS.kt
@@ -91,7 +91,7 @@ class AkwamS : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListSelector() = "source"
 
     override fun videoFromElement(element: Element): Video {
-        return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"), null)
+        return Video(element.attr("src").replace("https", "http"), element.attr("size") + "p", element.attr("src").replace("https", "http"))
     }
 
     override fun List<Video>.sort(): List<Video> {
diff --git a/src/ar/anime4up/build.gradle b/src/ar/anime4up/build.gradle
index b48f00bbf..18f9c9e72 100644
--- a/src/ar/anime4up/build.gradle
+++ b/src/ar/anime4up/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Anime4up'
     pkgNameSuffix = 'ar.anime4up'
     extClass = '.Anime4Up'
-    extVersionCode = 28
-    libVersion = '12'
+    extVersionCode = 29
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 0c06da1e8..27981c481 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
@@ -139,7 +139,7 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
                 val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
                 val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         }
diff --git a/src/ar/animeblkom/build.gradle b/src/ar/animeblkom/build.gradle
index 541faf356..85d1dead5 100644
--- a/src/ar/animeblkom/build.gradle
+++ b/src/ar/animeblkom/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'أنمي بالكوم'
     pkgNameSuffix = 'ar.animeblkom'
     extClass = '.AnimeBlkom'
-    extVersionCode = 6
-    libVersion = '12'
+    extVersionCode = 7
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 bc40d5a10..ed1a39638 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
@@ -114,7 +114,7 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListSelector() = "source"
 
     override fun videoFromElement(element: Element): Video {
-        return Video(element.attr("src").replace("watch", "download"), element.attr("res") + "p", element.attr("src").replace("watch", "download"), null)
+        return Video(element.attr("src").replace("watch", "download"), element.attr("res") + "p", element.attr("src").replace("watch", "download"))
     }
 
     override fun List<Video>.sort(): List<Video> {
diff --git a/src/ar/animelek/build.gradle b/src/ar/animelek/build.gradle
index 41b602ce0..c87159f3f 100644
--- a/src/ar/animelek/build.gradle
+++ b/src/ar/animelek/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeLek'
     pkgNameSuffix = 'ar.animelek'
     extClass = '.AnimeLek'
-    extVersionCode = 7
-    libVersion = '12'
+    extVersionCode = 8
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 1f767015e..953c10990 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
@@ -108,7 +108,7 @@ class AnimeLek : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
index 2b36002b8..a978c8673 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         // val newQuality = "Doodstream mirror"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/OkruExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/OkruExtractor.kt
index 5ad8f51c0..f6861157b 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/OkruExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/OkruExtractor.kt
@@ -22,7 +22,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                     .replace("\\\\u0026", "&")
                 val videoQuality = "Okru: " + it.substringBefore("\\\"")
                 if (videoUrl.startsWith("https://")) {
-                    videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                    videoList.add(Video(videoUrl, videoQuality, videoUrl))
                 }
             }
             return videoList
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/SharedExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/SharedExtractor.kt
index 430a94359..9b2d13cf8 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/SharedExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/SharedExtractor.kt
@@ -11,9 +11,9 @@ class SharedExtractor(private val client: OkHttpClient) {
         val check = document.select("div.error4shared").text()
         val videoUrl = document.select("source").attr("src")
         return if (check.contains("This file is not available any more")) {
-            Video(url, "no 1video", "https", null)
+            Video(url, "no 1video", "https")
         } else {
-            Video(url, quality, videoUrl, null)
+            Video(url, quality, videoUrl)
         }
     }
 }
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamSBExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamSBExtractor.kt
index 09ef24ba9..6d1e52436 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamSBExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamTapeExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamTapeExtractor.kt
index 8e94c6d87..31e713fa3 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamTapeExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/StreamTapeExtractor.kt
@@ -10,10 +10,10 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val script = document.select("script:containsData(document.getElementById('robotlink'))")
             .firstOrNull()?.data()?.substringAfter("document.getElementById('robotlink').innerHTML = '")
-            ?: return Video(url, "no video", "videoUrl", null)
+            ?: return Video(url, "no video", "videoUrl")
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/VidBomExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/VidBomExtractor.kt
index 3ba5b1d1e..b2a5457e9 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/VidBomExtractor.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/VidBomExtractor.kt
@@ -15,7 +15,7 @@ class VidBomExtractor(private val client: OkHttpClient) {
         for (source in sources) {
             val src = source.substringBefore("\"")
             val quality = "Vidbom:" + source.substringAfter("label:\"").substringBefore("\"") // .substringAfter("format: '")
-            val video = Video(src, quality, src, null)
+            val video = Video(src, quality, src)
             videoList.add(video)
         }
         return videoList
@@ -29,7 +29,7 @@ class VidBomExtractor(private val client: OkHttpClient) {
             val videoUrl = `object`.getString("file")
             Log.i("looool", videoUrl)
             val quality = "Vidbom:" + `object`.getString("label")
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList*/
         /*if (jas.contains("sources")) {
@@ -42,12 +42,12 @@ class VidBomExtractor(private val client: OkHttpClient) {
                 val videoUrl = `object`.getString("file")
                 Log.i("lol", videoUrl)
                 val quality = "Vidbom:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoList = mutableListOf<Video>()
-            videoList.add(Video(url, "no 2video", null, null))
+            videoList.add(Video(url, "no 2video", null))
             return videoList
         }*/
     }
diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle
index ea9956ae7..f36a75a9b 100644
--- a/src/ar/animerco/build.gradle
+++ b/src/ar/animerco/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Animerco'
     pkgNameSuffix = 'ar.animerco'
     extClass = '.Animerco'
-    extVersionCode = 9
-    libVersion = '12'
+    extVersionCode = 10
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 7a7705bde..0efc60d1e 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
@@ -188,7 +188,7 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     embedUrl.contains("cloudemb.com") || embedUrl.contains("playersb.com") || embedUrl.contains("tubesb.com") ||
                     embedUrl.contains("sbplay1.com") || embedUrl.contains("embedsb.com") || embedUrl.contains("watchsb.com") ||
                     embedUrl.contains("sbplay2.com") || embedUrl.contains("japopav.tv") || embedUrl.contains("viewsb.com") ||
-                    embedUrl.contains("sbfast")|| embedUrl.contains("sbfull.com") || embedUrl.contains("javplaya.com") ||
+                    embedUrl.contains("sbfast") || embedUrl.contains("sbfull.com") || embedUrl.contains("javplaya.com") ||
                     embedUrl.contains("ssbstream.net") || embedUrl.contains("p1ayerjavseen.com") || embedUrl.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
index 8a01867c1..6e35b6ca5 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "Doodstream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt
index 175122ba9..357950b28 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/FembedExtractor.kt
@@ -28,7 +28,7 @@ class FembedExtractor(private val client: OkHttpClient) {
             jsonR["data"]!!.jsonArray.forEach() {
                 val videoUrl = it.jsonObject["file"].toString().trim('"')
                 val quality = "Fembed:" + it.jsonObject["label"].toString().trim('"')
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             /*val jsonArray = json.getJSONArray("data")
             Log.i("jsoon", "$jsonArray")
@@ -36,13 +36,13 @@ class FembedExtractor(private val client: OkHttpClient) {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }*/
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/MpforuploadExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/MpforuploadExtractor.kt
index be243d939..80d5aa3b6 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/MpforuploadExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/MpforuploadExtractor.kt
@@ -11,9 +11,9 @@ class MpforuploadExtractor(private val client: OkHttpClient) {
         val check = document.select("div.error4shared").text()
         val videoUrl = document.select("source").attr("src")
         return if (check.contains("This file is not available any more")) {
-            Video(url, "no 1video", "https", null)
+            Video(url, "no 1video", "https")
         } else {
-            Video(url, quality, videoUrl, null)
+            Video(url, quality, videoUrl)
         }
     }
 }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/OkruExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/OkruExtractor.kt
index a78eebe1f..3c647f6e9 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/OkruExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/OkruExtractor.kt
@@ -22,7 +22,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                     .replace("\\\\u0026", "&")
                 val videoQuality = "Okru: " + it.substringBefore("\\\"")
                 if (videoUrl.startsWith("https://")) {
-                    videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                    videoList.add(Video(videoUrl, videoQuality, videoUrl))
                 }
             }
             return videoList
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/SharedExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/SharedExtractor.kt
index 17dce9b36..2162e05a3 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/SharedExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/SharedExtractor.kt
@@ -11,9 +11,9 @@ class SharedExtractor(private val client: OkHttpClient) {
         val check = document.select("div.error4shared").text()
         val videoUrl = document.select("source").attr("src")
         return if (check.contains("This file is not available any more")) {
-            Video(url, "no 1video", "https", null)
+            Video(url, "no 1video", "https")
         } else {
-            Video(url, quality, videoUrl, null)
+            Video(url, quality, videoUrl)
         }
     }
 }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamSBExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamSBExtractor.kt
index 9ca820f08..87646be92 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamSBExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamSBExtractor.kt
@@ -40,7 +40,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamTapeExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamTapeExtractor.kt
index a8e5310d8..e44a8bd4e 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamTapeExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/StreamTapeExtractor.kt
@@ -10,10 +10,10 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val script = document.select("script:containsData(document.getElementById('robotlink'))")
             .firstOrNull()?.data()?.substringAfter("document.getElementById('robotlink').innerHTML = '")
-            ?: return Video(url, "no video", "videoUrl", null)
+            ?: return Video(url, "no video", "videoUrl")
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
index c125fea00..935bb91dc 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
@@ -11,9 +11,9 @@ class UQLoadExtractor(private val client: OkHttpClient) {
         val check = document.selectFirst("script:containsData(sources)").data()
         val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
         return if (check.contains("sources")) {
-            Video(url, quality, videoUrl, null)
+            Video(url, quality, videoUrl)
         } else {
-            Video(url, "no 1video", "https", null)
+            Video(url, "no 1video", "https")
         }
     }
 }
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/VidBomExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/VidBomExtractor.kt
index 4586fa3cf..a0346a300 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/VidBomExtractor.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/VidBomExtractor.kt
@@ -15,7 +15,7 @@ class VidBomExtractor(private val client: OkHttpClient) {
         for (source in sources) {
             val src = source.substringBefore("\"")
             val quality = "Vidbom:" + source.substringAfter("label:\"").substringBefore("\"") // .substringAfter("format: '")
-            val video = Video(src, quality, src, null)
+            val video = Video(src, quality, src)
             videoList.add(video)
         }
         return videoList
@@ -29,7 +29,7 @@ class VidBomExtractor(private val client: OkHttpClient) {
             val videoUrl = `object`.getString("file")
             Log.i("looool", videoUrl)
             val quality = "Vidbom:" + `object`.getString("label")
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList*/
         /*if (jas.contains("sources")) {
@@ -42,12 +42,12 @@ class VidBomExtractor(private val client: OkHttpClient) {
                 val videoUrl = `object`.getString("file")
                 Log.i("lol", videoUrl)
                 val quality = "Vidbom:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoList = mutableListOf<Video>()
-            videoList.add(Video(url, "no 2video", null, null))
+            videoList.add(Video(url, "no 2video", null))
             return videoList
         }*/
     }
diff --git a/src/ar/arabseed/build.gradle b/src/ar/arabseed/build.gradle
index c47f080ca..9aee5b743 100644
--- a/src/ar/arabseed/build.gradle
+++ b/src/ar/arabseed/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'عرب سيد'
     pkgNameSuffix = 'ar.arabseed'
     extClass = '.ArabSeed'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 85136ea4f..16fad0929 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
@@ -100,7 +100,7 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 embedUrl.contains("seeeed") -> {
                     val iframeResponse = client.newCall(GET(embedUrl)).execute().asJsoup()
                     val videoUrl = iframeResponse.select("source").attr("src")
-                    val video = Video(embedUrl, dataQu + "p", videoUrl.replace("https", "http"), null)
+                    val video = Video(embedUrl, dataQu + "p", videoUrl.replace("https", "http"))
                     videoList.add(video)
                 }
             }
diff --git a/src/ar/asia2tv/build.gradle b/src/ar/asia2tv/build.gradle
index e9b96e825..9533f740d 100644
--- a/src/ar/asia2tv/build.gradle
+++ b/src/ar/asia2tv/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'asia2tv'
     pkgNameSuffix = 'ar.asia2tv'
     extClass = '.Asia2TV'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 b8b210b23..7dcc7fbd0 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
@@ -97,12 +97,12 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             when {
                 url.contains("https://dood") -> {
                     val newQuality = "Doodstream mirror"
-                    val video = Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
+                    val video = Video(url, newQuality, doodUrlParse(url), videoHeaders)
                     videoList.add(video)
                 }
                 url.contains("https://streamtape") -> {
                     val newQuality = "StreamTape mirror"
-                    val video = Video(url, newQuality, streamTapeParse(url), null, videoHeaders)
+                    val video = Video(url, newQuality, streamTapeParse(url), videoHeaders)
                     videoList.add(video)
                 }
                 url.contains("https://www.fembed.com") -> {
@@ -112,7 +112,7 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     for (source in sources) {
                         val src = source.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
                         val quality = source.substringAfter("\"label\":\"").substringBefore("\"")
-                        val video = Video(url, quality, src, null)
+                        val video = Video(url, quality, src)
                         videoList.add(video)
                     }
                 }
@@ -172,8 +172,8 @@ class Asia2TV : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         for (source in sources) {
             val src = source.substringAfter("\"file\":\"").substringBefore("\"")
             val quality = source.substringBefore("\"") // .substringAfter("format: '")
-            //val videos = Video(src, quality, src, null)
-            return Video(url, quality, src, null)
+            //val videos = Video(src, quality, src)
+            return Video(url, quality, src)
         }
          return Video(url, quality, )
     }*/
diff --git a/src/ar/cartoons4u/build.gradle b/src/ar/cartoons4u/build.gradle
index a4898cd4e..ff01ab73a 100644
--- a/src/ar/cartoons4u/build.gradle
+++ b/src/ar/cartoons4u/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'CARTOONS4U'
     pkgNameSuffix = 'ar.cartons4u'
     extClass = '.Cartoons4U'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/cartoons4u/src/eu/kanade/tachiyomi/animeextension/ar/cartoons4u/Cartoons4U.kt b/src/ar/cartoons4u/src/eu/kanade/tachiyomi/animeextension/ar/cartoons4u/Cartoons4U.kt
index 1ba0da636..1242987d5 100644
--- a/src/ar/cartoons4u/src/eu/kanade/tachiyomi/animeextension/ar/cartoons4u/Cartoons4U.kt
+++ b/src/ar/cartoons4u/src/eu/kanade/tachiyomi/animeextension/ar/cartoons4u/Cartoons4U.kt
@@ -90,7 +90,7 @@ class Cartoons4U : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         for (source in sources) {
             val src = source.substringAfter("\"file\":\"").substringBefore("\"").replace("\\/", "/")
             val quality = source.substringAfter("\"label\":\"").substringBefore("\"")
-            val video = Video(vidURL, quality, src, null)
+            val video = Video(vidURL, quality, src)
             videoList.add(video)
         }
         return videoList
diff --git a/src/ar/faselhd/build.gradle b/src/ar/faselhd/build.gradle
index 83167906e..fd52c4f05 100644
--- a/src/ar/faselhd/build.gradle
+++ b/src/ar/faselhd/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'فاصل اعلاني'
     pkgNameSuffix = 'ar.faselhd'
     extClass = '.FASELHD'
-    extVersionCode = 7
-    libVersion = '12'
+    extVersionCode = 8
+    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 2ef0fbc22..cbe1289e4 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
@@ -114,7 +114,7 @@ class FASELHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n").replace("https", "http")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/ar/faselhdmovies/build.gradle b/src/ar/faselhdmovies/build.gradle
index 4fd4d5046..1e4a7e609 100644
--- a/src/ar/faselhdmovies/build.gradle
+++ b/src/ar/faselhdmovies/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'فاصل اعلاني افلام بس'
     pkgNameSuffix = 'ar.faselhdmovies'
     extClass = '.FASELHDMOVIES'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt b/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
index bbafd39ca..015209cbc 100644
--- a/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
+++ b/src/ar/faselhdmovies/src/eu/kanade/tachiyomi/animeextension/ar/faselhdmovies/FASELHDMOVIES.kt
@@ -95,7 +95,7 @@ class FASELHDMOVIES : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n").replace("https", "http")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/ar/movies4u/build.gradle b/src/ar/movies4u/build.gradle
index dda7eaa00..70b8d7249 100644
--- a/src/ar/movies4u/build.gradle
+++ b/src/ar/movies4u/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'موفيز فور يو'
     pkgNameSuffix = 'ar.movies4u'
     extClass = '.Movies4U'
-    extVersionCode = 3
-    libVersion = '12'
+    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 a14308a29..9729c8e9d 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
@@ -140,7 +140,7 @@ class Movies4U : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         for (source in sources) {
             val src = source.substringBefore("\"")
             val quality = source.substringAfter("label:\"").substringBefore("\"") // .substringAfter("format: '")
-            val video = Video(src, quality, src, null)
+            val video = Video(src, quality, src)
             videoList.add(video)
         }
         return videoList
diff --git a/src/ar/mycima/build.gradle b/src/ar/mycima/build.gradle
index 3b6cdcde3..147a6d776 100644
--- a/src/ar/mycima/build.gradle
+++ b/src/ar/mycima/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'MY CIMA'
     pkgNameSuffix = 'ar.mycima'
     extClass = '.MyCima'
-    extVersionCode = 14
-    libVersion = '12'
+    extVersionCode = 15
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 929291c37..0d6b783c9 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
@@ -124,13 +124,13 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             for (source in sources) {
                 val src = source.substringAfter("src: \"").substringBefore("\"")
                 val quality = source.substringBefore("'") // .substringAfter("format: '")
-                val video = Video(src, quality, src, null)
+                val video = Video(src, quality, src)
                 videoList.add(video)
             }
             return videoList
         }
         val sourceTag = element.ownerDocument().select("source").firstOrNull()!!
-        return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null))
+        return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src")))
     }
 
     override fun List<Video>.sort(): List<Video> {
diff --git a/src/ar/mycimamovie/build.gradle b/src/ar/mycimamovie/build.gradle
index 45e3ef2e7..df87495c8 100644
--- a/src/ar/mycimamovie/build.gradle
+++ b/src/ar/mycimamovie/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'MY CIMA MOVIES'
     pkgNameSuffix = 'ar.mycimamovie'
     extClass = '.MyCimaMovie'
-    extVersionCode = 11
-    libVersion = '12'
+    extVersionCode = 12
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt b/src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt
index 7b1ec31ad..f20d28d08 100644
--- a/src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt
+++ b/src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt
@@ -97,13 +97,13 @@ class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             for (source in sources) {
                 val src = source.substringAfter("src: \"").substringBefore("\"")
                 val quality = source.substringBefore("'") // .substringAfter("format: '")
-                val video = Video(src, quality, src, null)
+                val video = Video(src, quality, src)
                 videoList.add(video)
             }
             return videoList
         }
         val sourceTag = element.ownerDocument().select("source").firstOrNull()!!
-        return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src"), null))
+        return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src")))
     }
 
     override fun List<Video>.sort(): List<Video> {
diff --git a/src/ar/witanime/build.gradle b/src/ar/witanime/build.gradle
index 6bf76c756..102e5d850 100644
--- a/src/ar/witanime/build.gradle
+++ b/src/ar/witanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'WIT ANIME'
     pkgNameSuffix = 'ar.witanime'
     extClass = '.WitAnime'
-    extVersionCode = 17
-    libVersion = '12'
+    extVersionCode = 18
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 98a8b48c8..51ef63802 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
@@ -108,7 +108,7 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     server.contains("cloudemb.com") || server.contains("playersb.com") || server.contains("tubesb.com") ||
                     server.contains("sbplay1.com") || server.contains("embedsb.com") || server.contains("watchsb.com") ||
                     server.contains("sbplay2.com") || server.contains("japopav.tv") || server.contains("viewsb.com") ||
-                    server.contains("sbfast")|| server.contains("sbfull.com") || server.contains("javplaya.com") ||
+                    server.contains("sbfast") || server.contains("sbfull.com") || server.contains("javplaya.com") ||
                     server.contains("ssbstream.net") || server.contains("p1ayerjavseen.com") || server.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
index ada669c26..84a0754bc 100755
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         // val newQuality = "Doodstream mirror"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/FembedExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/FembedExtractor.kt
index 1252bac83..c88d77df0 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/FembedExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/FembedExtractor.kt
@@ -23,13 +23,13 @@ class FembedExtractor(private val client: OkHttpClient) {
             jsonR["data"]!!.jsonArray.forEach() {
                 val videoUrl = it.jsonObject["file"].toString().trim('"')
                 val quality = "Fembed:" + it.jsonObject["label"].toString().trim('"')
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/OkruExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/OkruExtractor.kt
index b0acd5eb6..9147a8ddb 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/OkruExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/OkruExtractor.kt
@@ -22,7 +22,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                     .replace("\\\\u0026", "&")
                 val videoQuality = "Okru: " + it.substringBefore("\\\"")
                 if (videoUrl.startsWith("https://")) {
-                    videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                    videoList.add(Video(videoUrl, videoQuality, videoUrl))
                 }
             }
             return videoList
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SharedExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SharedExtractor.kt
index 73b652dc0..4783b5792 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SharedExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SharedExtractor.kt
@@ -10,10 +10,10 @@ class SharedExtractor(private val client: OkHttpClient) {
         val document = client.newCall(GET(url)).execute().asJsoup()
         /*val videoList = mutableListOf<Video>()
         val src = document.select("source > src")
-        val video = Video(src, "4Shared", src, null)
+        val video = Video(src, "4Shared", src)
         videoList.add(video)
         return videoList*/
         // val vidSource = 4Shared.select("source")
-        return Video(document.attr("source > src"), "4Shared", document.attr("source > src"), null)
+        return Video(document.attr("source > src"), "4Shared", document.attr("source > src"))
     }
 }
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
index f5d592e5a..ce4f28ef5 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
@@ -24,7 +24,7 @@ class SoraPlayExtractor(private val client: OkHttpClient) {
         for (source in sources) {
             val src = source.substringBefore("\"")
             val quality = "soraplay: " + source.substringAfter("\"label\":\"").substringBefore("\"") // .substringAfter("format: '")
-            val video = Video(src, quality, src, null)
+            val video = Video(src, quality, src)
             videoList.add(video)
         }
         return videoList
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/StreamSBExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/StreamSBExtractor.kt
index 006a8def9..9fc93397d 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/StreamSBExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/StreamSBExtractor.kt
@@ -40,7 +40,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/ar/xsanime/build.gradle b/src/ar/xsanime/build.gradle
index 99dddf80a..322430720 100644
--- a/src/ar/xsanime/build.gradle
+++ b/src/ar/xsanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'XS Anime'
     pkgNameSuffix = 'ar.xsanime'
     extClass = '.XsAnime'
-    extVersionCode = 8
-    libVersion = '12'
+    extVersionCode = 9
+    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 d081fc827..c4afa8adf 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
@@ -92,7 +92,7 @@ class XsAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoFromElement(element: Element): Video {
         element.attr("src")
-        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"), null)
+        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"))
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
diff --git a/src/ar/xsmovie/build.gradle b/src/ar/xsmovie/build.gradle
index aa6121012..13f5ce323 100644
--- a/src/ar/xsmovie/build.gradle
+++ b/src/ar/xsmovie/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'XS Movie'
     pkgNameSuffix = 'ar.xsmovie'
     extClass = '.XsMovie'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    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 e017e1947..8eff1cb02 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
@@ -80,7 +80,7 @@ class XsMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListSelector() = "source"
 
     override fun videoFromElement(element: Element): Video {
-        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"), null)
+        return Video(element.attr("src"), "Default: If you want to change the quality go to extension settings", element.attr("src"))
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
diff --git a/src/de/aniflix/build.gradle b/src/de/aniflix/build.gradle
index 054ee5462..1909b3610 100644
--- a/src/de/aniflix/build.gradle
+++ b/src/de/aniflix/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Aniflix'
     pkgNameSuffix = 'de.aniflix'
     extClass = '.Aniflix'
-    extVersionCode = 15
-    libVersion = '12'
+    extVersionCode = 16
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
index 453875dd5..1379ee4d3 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamTapeExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamTapeExtractor.kt
index 0d7892418..edd757c3a 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamTapeExtractor.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
index 911ab3099..8143361f9 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/StreamlareExtractor.kt
@@ -27,7 +27,7 @@ class StreamlareExtractor(private val client: OkHttpClient) {
                 .substringBefore("\",")
             val response = client.newCall(POST("https://larecontent.com/video?token=$token")).execute()
             val videoUrl = response.request.url.toString()
-            videoList.addAll((listOf(Video(videoUrl, quality, videoUrl, null))))
+            videoList.addAll((listOf(Video(videoUrl, quality, videoUrl))))
         }
         return videoList
     }
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/VoeExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/VoeExtractor.kt
index a04133ccd..67bb61443 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/VoeExtractor.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/VoeExtractor.kt
@@ -12,6 +12,6 @@ class VoeExtractor(private val client: OkHttpClient) {
         val script = document.select("script:containsData(function d04ad2e48229ae25a282e15c7c2f69a2(dea04c5949242bfd216e35def894b930))")
             .firstOrNull()?.data()?.substringAfter("\"hls\": \"") ?: return null
         val videoUrl = script.substringAfter("\"hls\": \"").substringBefore("\",")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/de/animeshitai/build.gradle b/src/de/animeshitai/build.gradle
index b4c822887..29981691b 100644
--- a/src/de/animeshitai/build.gradle
+++ b/src/de/animeshitai/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Anime Shitai'
     pkgNameSuffix = 'de.animeshitai'
     extClass = '.AnimeShitai'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
index 2059c1565..7b06f636c 100644
--- a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
+++ b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
@@ -25,7 +25,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/StreamTapeExtractor.kt b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/StreamTapeExtractor.kt
index 6f84c57f3..1ffdacd51 100644
--- a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/StreamTapeExtractor.kt
+++ b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/de/filmpalast/build.gradle b/src/de/filmpalast/build.gradle
index cc7229928..5ba61e3a0 100644
--- a/src/de/filmpalast/build.gradle
+++ b/src/de/filmpalast/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'FilmPalast'
     pkgNameSuffix = 'de.filmpalast'
     extClass = '.FilmPalast'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 a20a78a51..11957e4e6 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
@@ -108,10 +108,7 @@ class FilmPalast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                             linkRegex.find(this.select("script:containsData(document.getElementById('robotlink'))").toString())?.let {
                                 val quality = "Streamtape"
                                 val videoUrl = "https://streamtape.com/get_video?${it.groupValues[1]}&stream=1".replace("""" + '""", "")
-                                val video = Video(videoUrl, quality, videoUrl, null)
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
+                                videoList.add(Video(videoUrl, quality, videoUrl))
                             }
                         }
                     } catch (e: Exception) {
@@ -121,8 +118,8 @@ class FilmPalast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val quality = "Evoload"
                     if (document.select("#EvoVid_html5_api").attr("src").contains("EvoStreams")) {
                         val videoUrl = document.select("#EvoVid_html5_api").attr("src")
-                        if (Video(videoUrl, quality, videoUrl, null) != null) {
-                            videoList.add(Video(videoUrl, quality, videoUrl, null))
+                        if (videoUrl.isNotEmpty()) {
+                            videoList.add(Video(videoUrl, quality, videoUrl))
                         }
                     } else {
                         EvoloadExtractor(client).videoFromUrl(url, quality)
diff --git a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/EvoloadExtractor.kt b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/EvoloadExtractor.kt
index 3fba0013d..2f5ed0778 100644
--- a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/EvoloadExtractor.kt
+++ b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/EvoloadExtractor.kt
@@ -27,7 +27,7 @@ class EvoloadExtractor(private val client: OkHttpClient) {
             val videoUrl = file.substringAfter("\"encoded_src\":\"").substringBefore("\",")
             when {
                 !file.substringAfter("\"xstatus\":\"").substringBefore("\",").contains("del") -> {
-                    val video = Video(url, quality, videoUrl, null)
+                    val video = Video(url, quality, videoUrl)
                     videoList.add(video)
                 }
             }
@@ -35,7 +35,7 @@ class EvoloadExtractor(private val client: OkHttpClient) {
             val videoUrl = file.substringAfter("\"src\":\"").substringBefore("\",")
             when {
                 !file.substringAfter("\"xstatus\":\"").substringBefore("\",").contains("del") -> {
-                    val video = Video(url, quality, videoUrl, null)
+                    val video = Video(url, quality, videoUrl)
                     videoList.add(video)
                 }
             }
diff --git a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/VoeExtractor.kt b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/VoeExtractor.kt
index 2b95dcc05..d6ab8837b 100644
--- a/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/VoeExtractor.kt
+++ b/src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/extractors/VoeExtractor.kt
@@ -12,6 +12,6 @@ class VoeExtractor(private val client: OkHttpClient) {
         val script = document.select("script:containsData(function d04ad2e48229ae25a282e15c7c2f69a2(dea04c5949242bfd216e35def894b930))")
             .firstOrNull()?.data()?.substringAfter("\"hls\": \"") ?: return null
         val videoUrl = script.substringAfter("\"hls\": \"").substringBefore("\",")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/de/fireanime/build.gradle b/src/de/fireanime/build.gradle
index 79a5775ff..02eb8ab6c 100644
--- a/src/de/fireanime/build.gradle
+++ b/src/de/fireanime/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'FireAnime'
     pkgNameSuffix = 'de.fireanime'
     extClass = '.FireAnime'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
     containsNsfw = true
 }
 dependencies {
diff --git a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
index ab41f3d26..a0755b9a6 100644
--- a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
+++ b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/FireCdnExtractor.kt b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/FireCdnExtractor.kt
index af0b5d206..a78c18c80 100644
--- a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/FireCdnExtractor.kt
+++ b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/FireCdnExtractor.kt
@@ -24,6 +24,6 @@ class FireCdnExtractor(private val client: OkHttpClient, private val json: Json)
 
         val file = json.decodeFromString(FireCdnFileDto.serializer(), client.newCall(fileRequest).execute().body!!.string())
         val videoUrl = "${file.proxy.replace("\\", "")}/share/${file.file}/apple.mp4"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/de/xcine/build.gradle b/src/de/xcine/build.gradle
index 78690d970..8bdf1ae01 100644
--- a/src/de/xcine/build.gradle
+++ b/src/de/xcine/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'xCine'
     pkgNameSuffix = 'de.xcine'
     extClass = '.xCine'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/xcine/src/eu/kanade/tachiyomi/animeextension/de/xcine/extractors/HDFilmExtractor.kt b/src/de/xcine/src/eu/kanade/tachiyomi/animeextension/de/xcine/extractors/HDFilmExtractor.kt
index 2ade52917..a71f3e8c0 100644
--- a/src/de/xcine/src/eu/kanade/tachiyomi/animeextension/de/xcine/extractors/HDFilmExtractor.kt
+++ b/src/de/xcine/src/eu/kanade/tachiyomi/animeextension/de/xcine/extractors/HDFilmExtractor.kt
@@ -44,7 +44,7 @@ class HDFilmExtractor(private val client: OkHttpClient) {
             if (client.newCall(GET(videoUrl)).execute().code == 204) {
                 throw Exception("Einmal WebView öffnen und wieder schließen")
             } else {
-                videoList.addAll((listOf(Video(videoUrl, quality, videoUrl, null))))
+                videoList.addAll((listOf(Video(videoUrl, quality, videoUrl))))
             }
         }
         return videoList
diff --git a/src/en/allmovies/build.gradle b/src/en/allmovies/build.gradle
index 85f3d3878..40038fc09 100644
--- a/src/en/allmovies/build.gradle
+++ b/src/en/allmovies/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AllMovies'
     pkgNameSuffix = 'en.allmovies'
     extClass = '.AllMovies'
-    extVersionCode = 9
-    libVersion = '12'
+    extVersionCode = 10
+    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 ba066ad98..ef84c3007 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
@@ -128,7 +128,7 @@ class AllMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             when {
                 url.contains("https://dood") -> {
                     val newQuality = "Doodstream mirror"
-                    val video = Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
+                    val video = Video(url, newQuality, doodUrlParse(url), videoHeaders)
                     videoList.add(video)
                 }
                 url.contains("streamhub") -> {
@@ -140,7 +140,7 @@ class AllMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
                         val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
                         val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                        videoList.add(Video(videoUrl, quality, videoUrl, null))
+                        videoList.add(Video(videoUrl, quality, videoUrl))
                     }
                 }
             }
diff --git a/src/en/animekisa/build.gradle b/src/en/animekisa/build.gradle
index ab4db8da7..feab799ab 100644
--- a/src/en/animekisa/build.gradle
+++ b/src/en/animekisa/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeKisa'
     pkgNameSuffix = 'en.animekisa'
     extClass = '.AnimeKisa'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animekisa/src/eu/kanade/tachiyomi/animeextension/en/animekisa/AnimeKisa.kt b/src/en/animekisa/src/eu/kanade/tachiyomi/animeextension/en/animekisa/AnimeKisa.kt
index 461252ce2..be9aab87f 100644
--- a/src/en/animekisa/src/eu/kanade/tachiyomi/animeextension/en/animekisa/AnimeKisa.kt
+++ b/src/en/animekisa/src/eu/kanade/tachiyomi/animeextension/en/animekisa/AnimeKisa.kt
@@ -110,7 +110,7 @@ class AnimeKisa : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("hls").replace("\n", "") + "p"
             val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/en/animepahe/build.gradle b/src/en/animepahe/build.gradle
index 301d25d23..6ed6ac527 100644
--- a/src/en/animepahe/build.gradle
+++ b/src/en/animepahe/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimePahe'
     pkgNameSuffix = 'en.animepahe'
     extClass = '.AnimePahe'
-    extVersionCode = 16
-    libVersion = '12'
+    extVersionCode = 17
+    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 04fcbdd04..5959bc9e5 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
@@ -226,7 +226,7 @@ class AnimePahe : ConfigurableAnimeSource, AnimeHttpSource() {
             )
         } else {
             val videoUrl = KwikExtractor(client).getStreamUrlFromKwik(paheUrl)
-            Video(videoUrl, quality, videoUrl, null)
+            Video(videoUrl, quality, videoUrl)
         }
     }
 
diff --git a/src/en/animixplay/build.gradle b/src/en/animixplay/build.gradle
index 1aadf8fd5..89d88dd02 100644
--- a/src/en/animixplay/build.gradle
+++ b/src/en/animixplay/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Animixplay'
     pkgNameSuffix = 'en.animixplay'
     extClass = '.Animixplay'
-    extVersionCode = 11
-    libVersion = '12'
+    extVersionCode = 12
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/Animixplay.kt b/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/Animixplay.kt
index 14169be7a..d17c754e1 100644
--- a/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/Animixplay.kt
+++ b/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/Animixplay.kt
@@ -201,7 +201,7 @@ class Animixplay : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
                 val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
                 val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                videosList.add(Video(videoUrl, quality, videoUrl, null, headers))
+                videosList.add(Video(videoUrl, quality, videoUrl, headers))
             }
             videosList
         }
@@ -213,7 +213,7 @@ class Animixplay : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = "$masterUrlPrefix/${it.substringAfter("\n").substringBefore("\r").substringBefore("\n")}"
-            videosList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videosList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videosList
     }
diff --git a/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/extractors/GogoCdnExtractor.kt b/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/extractors/GogoCdnExtractor.kt
index 50da244fd..014506bc7 100644
--- a/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/extractors/GogoCdnExtractor.kt
+++ b/src/en/animixplay/src/eu/kanade/tachiyomi/animeextension/en/animixplay/extractors/GogoCdnExtractor.kt
@@ -47,7 +47,7 @@ class GogoCdnExtractor(private val client: OkHttpClient, private val json: Json)
                     .split("#EXT-X-STREAM-INF:").reversed().forEach {
                         val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("\n") + "p"
                         val videoUrl = fileURL.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-                        videoList.add(Video(videoUrl, quality, videoUrl, null))
+                        videoList.add(Video(videoUrl, quality, videoUrl))
                     }
             } else array.forEach {
                 val label = it.jsonObject["label"].toString().toLowerCase(Locale.ROOT)
@@ -63,7 +63,7 @@ class GogoCdnExtractor(private val client: OkHttpClient, private val json: Json)
                         videoHeaders
                     )
                 )
-                else videoList.add(Video(fileURL, label, fileURL, null, videoHeaders))
+                else videoList.add(Video(fileURL, label, fileURL, videoHeaders))
             }
             return videoList.reversed() + autoList
         } catch (e: Exception) {
diff --git a/src/en/asianload/build.gradle b/src/en/asianload/build.gradle
index 5c2663950..ff351df40 100644
--- a/src/en/asianload/build.gradle
+++ b/src/en/asianload/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AsianLoad'
     pkgNameSuffix = 'en.asianload'
     extClass = '.AsianLoad'
-    extVersionCode = 13
-    libVersion = '12'
+    extVersionCode = 14
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 84895c8ba..09a15a369 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
@@ -113,7 +113,7 @@ class AsianLoad : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
index 69a416519..1d9bbb544 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "Doodstream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/FembedExtractor.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/FembedExtractor.kt
index c9ed29a74..e48a984c6 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/FembedExtractor.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt
index b26553ee2..941c45a10 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamTapeExtractor.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamTapeExtractor.kt
index 70371a3f0..69243ce00 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamTapeExtractor.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/StreamTapeExtractor.kt
@@ -14,6 +14,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/en/dopebox/build.gradle b/src/en/dopebox/build.gradle
index 1a867c2d1..61571bfbc 100644
--- a/src/en/dopebox/build.gradle
+++ b/src/en/dopebox/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'DopeBox'
     pkgNameSuffix = 'en.dopebox'
     extClass = '.DopeBox'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
index 6e593c9e2..76d94593c 100644
--- a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
+++ b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
@@ -176,11 +176,11 @@ class DopeBox : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
                 val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("\n") + "p"
                 val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else if (test.contains("index.m3u8")) {
-            return listOf(Video(masterUrl, "Default", masterUrl, null))
+            return listOf(Video(masterUrl, "Default", masterUrl))
         } else {
             throw Exception("never give up and try again :)")
         }
diff --git a/src/en/dramacool/build.gradle b/src/en/dramacool/build.gradle
index 19eff06d2..22058406c 100644
--- a/src/en/dramacool/build.gradle
+++ b/src/en/dramacool/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'DramaCool'
     pkgNameSuffix = 'en.dramacool'
     extClass = '.DramaCool'
-    extVersionCode = 16
-    libVersion = '12'
+    extVersionCode = 17
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 8f95237f5..f081162c2 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
@@ -123,7 +123,7 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
index 8bbc2aa60..0b90af929 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "Doodstream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/FembedExtractor.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/FembedExtractor.kt
index 6758c2210..81188b8b9 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/FembedExtractor.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt
index ac54bf1f8..cf73ef317 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamTapeExtractor.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamTapeExtractor.kt
index 36db29ad9..963f7c183 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamTapeExtractor.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/StreamTapeExtractor.kt
@@ -14,6 +14,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/en/genoanime/build.gradle b/src/en/genoanime/build.gradle
index 9098ebd98..166d29fb5 100644
--- a/src/en/genoanime/build.gradle
+++ b/src/en/genoanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'GenoAnime'
     pkgNameSuffix = 'en.genoanime'
     extClass = '.GenoAnime'
-    extVersionCode = 13
-    libVersion = '12'
+    extVersionCode = 14
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 98d2b5a86..79171c72b 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
@@ -127,7 +127,7 @@ class GenoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
index d5ebc6206..e45b0eeef 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "Doodstream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/FembedExtractor.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/FembedExtractor.kt
index 5e81710dd..f3e3e965a 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/FembedExtractor.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt
index a31225789..6f29e00c0 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt
@@ -40,7 +40,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamTapeExtractor.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamTapeExtractor.kt
index 452e1907f..fb6d5a89f 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamTapeExtractor.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamTapeExtractor.kt
@@ -14,6 +14,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/en/gogoanime/build.gradle b/src/en/gogoanime/build.gradle
index d0cba3c97..7cd17bca1 100644
--- a/src/en/gogoanime/build.gradle
+++ b/src/en/gogoanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Gogoanime'
     pkgNameSuffix = 'en.gogoanime'
     extClass = '.GogoAnime'
-    extVersionCode = 44
-    libVersion = '12'
+    extVersionCode = 45
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
index a6be24754..c4f082ce0 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
                 )
             ).execute().body!!.string()
             val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            return listOf(Video(serverUrl, "Doodstream", videoUrl, null, doodHeaders(doodTld)))
+            return listOf(Video(serverUrl, "Doodstream", videoUrl, doodHeaders(doodTld)))
         } catch (e: Exception) {
             return emptyList()
         }
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/GogoCdnExtractor.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/GogoCdnExtractor.kt
index 4f024e207..6ae6660b8 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/GogoCdnExtractor.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/GogoCdnExtractor.kt
@@ -70,7 +70,7 @@ class GogoCdnExtractor(private val client: OkHttpClient, private val json: Json)
                         if (!videoUrl.startsWith("http")) {
                             videoUrl = fileURL.substringBeforeLast("/") + "/$videoUrl"
                         }
-                        videoList.add(Video(videoUrl, qualityPrefix + quality, videoUrl, null))
+                        videoList.add(Video(videoUrl, qualityPrefix + quality, videoUrl))
                     }
             } else array.forEach {
                 val label = it.jsonObject["label"].toString().lowercase(Locale.ROOT)
@@ -86,7 +86,7 @@ class GogoCdnExtractor(private val client: OkHttpClient, private val json: Json)
                         videoHeaders
                     )
                 )
-                else videoList.add(Video(fileURL, qualityPrefix + label, fileURL, null, videoHeaders))
+                else videoList.add(Video(fileURL, qualityPrefix + label, fileURL, videoHeaders))
             }
             return videoList.sortedByDescending {
                 it.quality.substringAfter(qualityPrefix).substringBefore("p").toIntOrNull() ?: -1
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/StreamSBExtractor.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/StreamSBExtractor.kt
index 79c00170c..f5bbb2534 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/StreamSBExtractor.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/StreamSBExtractor.kt
@@ -54,7 +54,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
                     val quality = "StreamSB: " + it.substringAfter("RESOLUTION=").substringAfter("x")
                         .substringBefore(",") + "p"
                     val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                    videoList.add(Video(videoUrl, quality, videoUrl, null, sbHeaders))
+                    videoList.add(Video(videoUrl, quality, videoUrl, sbHeaders))
                 }
             return videoList.reversed()
         } catch (e: Exception) {
diff --git a/src/en/hahomoe/build.gradle b/src/en/hahomoe/build.gradle
index f70361883..fbb7e5441 100644
--- a/src/en/hahomoe/build.gradle
+++ b/src/en/hahomoe/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'haho.moe'
     pkgNameSuffix = 'en.hahomoe'
     extClass = '.HahoMoe'
-    extVersionCode = 7
-    libVersion = '12'
+    extVersionCode = 8
+    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 dc74db9ee..a88a115f7 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
@@ -114,7 +114,7 @@ class HahoMoe : ParsedAnimeHttpSource() {
     override fun videoListSelector() = "source"
 
     override fun videoFromElement(element: Element): Video {
-        return Video(element.attr("src"), element.attr("title"), element.attr("src"), null)
+        return Video(element.attr("src"), element.attr("title"), element.attr("src"))
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
diff --git a/src/en/hanime/build.gradle b/src/en/hanime/build.gradle
index 2cdcc38fc..fe90b7d7c 100644
--- a/src/en/hanime/build.gradle
+++ b/src/en/hanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'hanime.tv'
     pkgNameSuffix = 'en.hanime'
     extClass = '.Hanime'
-    extVersionCode = 14
-    libVersion = '12'
+    extVersionCode = 15
+    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/en/hentaimama/build.gradle b/src/en/hentaimama/build.gradle
index a8ad273cc..09a71d991 100644
--- a/src/en/hentaimama/build.gradle
+++ b/src/en/hentaimama/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'HentaiMama'
     pkgNameSuffix = 'en.hentaimama'
     extClass = '.HentaiMama'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    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 6f6335a1b..6f885927b 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
@@ -124,8 +124,8 @@ class HentaiMama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .body().select("video source").attr("src")
 
         val videoList = mutableListOf<Video>()
-        videoList.add(Video(source1, "Mirror 1", source1, null))
-        videoList.add(Video(source2, "Mirror 2", source2, null))
+        videoList.add(Video(source1, "Mirror 1", source1))
+        videoList.add(Video(source2, "Mirror 2", source2))
         return videoList
     }
 
diff --git a/src/en/nineanime/build.gradle b/src/en/nineanime/build.gradle
index fa02c4156..4e76fd8ef 100644
--- a/src/en/nineanime/build.gradle
+++ b/src/en/nineanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = '9anime'
     pkgNameSuffix = 'en.nineanime'
     extClass = '.NineAnime'
-    extVersionCode = 8
-    libVersion = '12'
+    extVersionCode = 9
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/NineAnime.kt b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/NineAnime.kt
index ff039c8ab..7ed003187 100644
--- a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/NineAnime.kt
+++ b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/NineAnime.kt
@@ -123,7 +123,7 @@ class NineAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             .split("#EXT-X-STREAM-INF:").map {
                 val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("\n") + "p"
                 val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-                Video(videoUrl, quality, videoUrl, null, headers)
+                Video(videoUrl, quality, videoUrl, headers)
             }
     }
 
diff --git a/src/en/sflix/build.gradle b/src/en/sflix/build.gradle
index ba87ca740..c489f1976 100644
--- a/src/en/sflix/build.gradle
+++ b/src/en/sflix/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Sflix'
     pkgNameSuffix = 'en.sflix'
     extClass = '.SFlix'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
index 6b4f346d3..3f681fdf9 100644
--- a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
+++ b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
@@ -176,11 +176,11 @@ class SFlix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
                 val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("\n") + "p"
                 val videoUrl = it.substringAfter("\n").substringBefore("\n")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else if (test.contains("index.m3u8")) {
-            return listOf(Video(masterUrl, "Default", masterUrl, null))
+            return listOf(Video(masterUrl, "Default", masterUrl))
         } else {
             throw Exception("never give up and try again :)")
         }
diff --git a/src/en/tenshimoe/build.gradle b/src/en/tenshimoe/build.gradle
index 90d9c33e9..2723ffc2f 100644
--- a/src/en/tenshimoe/build.gradle
+++ b/src/en/tenshimoe/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'tenshi.moe'
     pkgNameSuffix = 'en.tenshimoe'
     extClass = '.TenshiMoe'
-    extVersionCode = 24
-    libVersion = '12'
+    extVersionCode = 25
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/twistmoe/build.gradle b/src/en/twistmoe/build.gradle
index 332c2315b..63aadd7c0 100644
--- a/src/en/twistmoe/build.gradle
+++ b/src/en/twistmoe/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'twist.moe'
     pkgNameSuffix = 'en.twistmoe'
     extClass = '.TwistMoe'
-    extVersionCode = 8
-    libVersion = '12'
+    extVersionCode = 9
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt b/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt
index e545ac303..c211a175b 100644
--- a/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt
+++ b/src/en/twistmoe/src/eu/kanade/tachiyomi/animeextension/en/twistmoe/TwistMoe.kt
@@ -188,7 +188,7 @@ class TwistMoe : AnimeHttpSource() {
                 val toDecode = aes.getToDecode(source)
                 val url = "https://air-cdn.twist.moe" +
                     aes.unpad(aes.aesDecrypt(toDecode, ivAndKey.sliceArray(0..31), ivAndKey.sliceArray(32..47)))
-                videoList.add(Video(url, "1080p", url, null))
+                videoList.add(Video(url, "1080p", url))
             }
         }
         return videoList
diff --git a/src/en/vidembed/build.gradle b/src/en/vidembed/build.gradle
index f085e5242..83aa1edac 100644
--- a/src/en/vidembed/build.gradle
+++ b/src/en/vidembed/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Vidembed'
     pkgNameSuffix = 'en.vidembed'
     extClass = '.Vidembed'
-    extVersionCode = 13
-    libVersion = '12'
+    extVersionCode = 14
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Vidembed.kt b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Vidembed.kt
index 2db6eff9d..1528d43c9 100644
--- a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Vidembed.kt
+++ b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Vidembed.kt
@@ -102,7 +102,7 @@ class Vidembed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 url.contains("https://dood") -> {
                     val newQuality = "Doodstream mirror"
                     val video = try {
-                        Video(url, newQuality, doodUrlParse(url), null, videoHeaders)
+                        Video(url, newQuality, doodUrlParse(url), videoHeaders)
                     } catch (e: Exception) {
                         null
                     }
@@ -113,7 +113,7 @@ class Vidembed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val newUrl = url.replace("/d/", "/e/")
@@ -134,7 +134,7 @@ class Vidembed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         else -> quality
                     }
                     val video =
-                        Video(url, parsedQuality, videoUrlParse(url, location), null, videoHeaders)
+                        Video(url, parsedQuality, videoUrlParse(url, location), videoHeaders)
                     videoList.add(video)
                 }
             }
diff --git a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/StreamSBExtractor.kt b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/StreamSBExtractor.kt
index d482b1e00..357b9972c 100644
--- a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/StreamSBExtractor.kt
+++ b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/StreamSBExtractor.kt
@@ -40,7 +40,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/en/wcofun/build.gradle b/src/en/wcofun/build.gradle
index 08e31346d..217d64149 100644
--- a/src/en/wcofun/build.gradle
+++ b/src/en/wcofun/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Wcofun'
     pkgNameSuffix = 'en.wcofun'
     extClass = '.Wcofun'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    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 588f52ffa..e1da0fab7 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
@@ -137,13 +137,13 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         hd?.let {
             if (it.isNotEmpty()) {
                 val videoUrl = "$server/getvid?evid=$it"
-                videoList.add(Video(videoUrl, "HD", videoUrl, null))
+                videoList.add(Video(videoUrl, "HD", videoUrl))
             }
         }
         sd?.let {
             if (it.isNotEmpty()) {
                 val videoUrl = "$server/getvid?evid=$it"
-                videoList.add(Video(videoUrl, "SD", videoUrl, null))
+                videoList.add(Video(videoUrl, "SD", videoUrl))
             }
         }
         return videoList
diff --git a/src/en/wcostream/build.gradle b/src/en/wcostream/build.gradle
index 28778ae40..b7128744f 100644
--- a/src/en/wcostream/build.gradle
+++ b/src/en/wcostream/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'WCOStream'
     pkgNameSuffix = 'en.wcostream'
     extClass = '.WCOStream'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    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 3401c7f62..fde1484e7 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
@@ -112,8 +112,8 @@ class WCOStream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore("hls").replace("\n", "") + "p"
             val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
-            // val video = Video(videoUrl, quality, videoUrl, null)
+            videoList.add(Video(videoUrl, quality, videoUrl))
+            // val video = Video(videoUrl, quality, videoUrl)
         }
         return videoList
     }
diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle
index 3e29ee224..6ae0be387 100644
--- a/src/en/zoro/build.gradle
+++ b/src/en/zoro/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'zoro.to (experimental)'
     pkgNameSuffix = 'en.zoro'
     extClass = '.Zoro'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
index 5b3c6f5d2..a3fb851db 100644
--- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
+++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
@@ -118,7 +118,7 @@ class Zoro : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p - $subDub"
             val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index e593bec22..a9cec771a 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Animefenix'
     pkgNameSuffix = 'es.animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 99df8e23d..5b28b159a 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
@@ -105,12 +105,12 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             if (server == "Amazon" || server == "AMAZON" || server == "amazon") {
                 val amazonUrl = "https://www.animefenix.com/stream/amz.php?v=$serverCode"
                 val video = amazonExtractor(amazonUrl)
-                videoList.add(Video(video, "Amazon", video, null))
+                videoList.add(Video(video, "Amazon", video))
             }
             if (server == "AmazonEs" || server == "AmazonES" || server == "amazones") {
                 val amazonUrl = "https://www.animefenix.com/stream/amz.php?v=$serverCode&ext=es"
                 val video = amazonExtractor(amazonUrl)
-                videoList.add(Video(video, "AmazonES", video, null))
+                videoList.add(Video(video, "AmazonES", video))
             }
         }
         return videoList
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/FembedExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/FembedExtractor.kt
index eacf18b62..171cd001b 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/FembedExtractor.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt
index 606b4486c..d450be236 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt
index 46ce1215a..9761c0381 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/SolidFilesExtractor.kt
@@ -15,7 +15,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val url = data.replace("\"", "")
                 val videoUrl = url
                 val quality = "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/StreamTapeExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/StreamTapeExtractor.kt
index a3bed12b9..dc64b429e 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/StreamTapeExtractor.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index 8f1e7e704..ef7fecf22 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeFLV'
     pkgNameSuffix = 'es.animeflv'
     extClass = '.AnimeFlv'
-    extVersionCode = 23
-    libVersion = '12'
+    extVersionCode = 24
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
index 027686968..d3312bdc1 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt
index 7ab6d64a9..6863499a9 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt
@@ -18,13 +18,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = prefix + "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/OkruExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/OkruExtractor.kt
index 860789551..2385b1b57 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/OkruExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = qualityPrefix + "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamSBExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamSBExtractor.kt
index 7f2afa0e6..83cd73e5d 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamSBExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamSBExtractor.kt
@@ -44,7 +44,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamTapeExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamTapeExtractor.kt
index de4b71b03..bf265fe63 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamTapeExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/YourUploadExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/YourUploadExtractor.kt
index fa17c25a1..f551049dd 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/YourUploadExtractor.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/YourUploadExtractor.kt
@@ -18,7 +18,7 @@ class YourUploadExtractor(private val client: OkHttpClient) {
                     content!!.selectFirst("script:containsData(jwplayerOptions)")!!.data()
                 if (!baseData.isNullOrEmpty()) {
                     val basicUrl = baseData.substringAfter("file: '").substringBefore("',")
-                    videoList.add(Video(basicUrl, "YourUpload", basicUrl, null, headers))
+                    videoList.add(Video(basicUrl, "YourUpload", basicUrl, headers))
                 }
             }
         } catch (e: IOException) {
diff --git a/src/es/animeid/build.gradle b/src/es/animeid/build.gradle
index 103113e28..619773273 100644
--- a/src/es/animeid/build.gradle
+++ b/src/es/animeid/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeID'
     pkgNameSuffix = 'es.animeid'
     extClass = '.AnimeID'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/extractors/StreamTapeExtractor.kt b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/extractors/StreamTapeExtractor.kt
index 4e7dc2216..a955af0a2 100644
--- a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/extractors/StreamTapeExtractor.kt
+++ b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index 65121f9a6..643d1e33b 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeLatinoHD'
     pkgNameSuffix = 'es.animelatinohd'
     extClass = '.AnimeLatinoHD'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 f13003afd..6187fc601 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
@@ -202,10 +202,10 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                             videoList.addAll(videos)
                         }
                         if (url.lowercase().contains("od.lk")) {
-                            videoList.add(Video(url, language + "Od.lk", url, null))
+                            videoList.add(Video(url, language + "Od.lk", url))
                         }
                         if (url.lowercase().contains("cldup.com")) {
-                            videoList.add(Video(url, language + "CldUp", url, null))
+                            videoList.add(Video(url, language + "CldUp", url))
                         }
                     }
                 }
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt
index 37fbbf22b..8c1a424f8 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/FembedExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/FembedExtractor.kt
index 5c438e6d0..f97809128 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/FembedExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/FembedExtractor.kt
@@ -18,13 +18,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = prefix + "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/OkruExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/OkruExtractor.kt
index 90133c06b..3375919ff 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/OkruExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = qualityPrefix + "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/SolidFilesExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/SolidFilesExtractor.kt
index d347ee92e..0592f77c9 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/SolidFilesExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/SolidFilesExtractor.kt
@@ -15,7 +15,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val url = data.replace("\"", "")
                 val videoUrl = url
                 val quality = prefix + "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamSBExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamSBExtractor.kt
index 483e4799c..59000aca3 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamSBExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamSBExtractor.kt
@@ -42,7 +42,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = prefix + "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamTapeExtractor.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamTapeExtractor.kt
index 40207cd55..816af4492 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamTapeExtractor.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/animeonlineninja/build.gradle b/src/es/animeonlineninja/build.gradle
index bb1fda9a2..e67d3d332 100644
--- a/src/es/animeonlineninja/build.gradle
+++ b/src/es/animeonlineninja/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeonlineNinja'
     pkgNameSuffix = 'es.animeonlineninja'
     extClass = '.AnimeonlineNinja'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
index 082ce19cb..e4823c013 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
@@ -154,14 +154,14 @@ class AnimeonlineNinja : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 if (jsE.contains("MDCore")) {
                     val url = "http:" + JsUnpacker(jsE).unpack().toString().substringAfter("MDCore.wurl=\"").substringBefore("\"")
                     if (!url.contains("\$(document).ready(function(){});")) {
-                        videos.add(Video(url, "$lang MixDrop", url, null))
+                        videos.add(Video(url, "$lang MixDrop", url))
                     }
                 }
             }
             serverUrl.contains("wolfstream") && lang.contains(langSelect) -> {
                 val jsE = client.newCall(GET(serverUrl)).execute().asJsoup().selectFirst("script:containsData(sources)").data()
                 val url = jsE.substringAfter("{file:\"").substringBefore("\"")
-                videos.add(Video(url, "$lang WolfStream", url, null))
+                videos.add(Video(url, "$lang WolfStream", url))
             }
             serverUrl.contains("uqload") && lang.contains(langSelect) -> {
                 val headers = headers.newBuilder().add("referer", "https://uqload.com/").build()
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
index deab52b2b..28cb7da45 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt
index ecef3c6c5..7740c34e9 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "$qualityP Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "$qualityP Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/OkruExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/OkruExtractor.kt
index ce97fe0b4..68de2dc87 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/OkruExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/SolidFilesExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/SolidFilesExtractor.kt
index e2048e5e2..58f2322b9 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/SolidFilesExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/SolidFilesExtractor.kt
@@ -15,7 +15,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val url = data.replace("\"", "")
                 val videoUrl = url
                 val quality = "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamSBExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamSBExtractor.kt
index d9038238b..b26daa7ee 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamSBExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = "$lang StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamTapeExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamTapeExtractor.kt
index b9982ff6e..6fb3370bf 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamTapeExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/uploadExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/uploadExtractor.kt
index 5cfa6073a..358f10336 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/uploadExtractor.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/uploadExtractor.kt
@@ -10,6 +10,6 @@ class uploadExtractor(private val client: OkHttpClient) {
     fun videofromurl(url: String, headers: Headers, quality: String): Video {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val basicUrl = document.selectFirst("script:containsData(var player =)").data().substringAfter("sources: [\"").substringBefore("\"],")
-        return Video(basicUrl, "$quality Uqload", basicUrl, null, headers)
+        return Video(basicUrl, "$quality Uqload", basicUrl, headers)
     }
 }
diff --git a/src/es/animeyt/build.gradle b/src/es/animeyt/build.gradle
index 6e7ca13e4..852e5f1af 100644
--- a/src/es/animeyt/build.gradle
+++ b/src/es/animeyt/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Animeyt'
     pkgNameSuffix = 'es.animeyt'
     extClass = '.Animeyt'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/extractors/FastreamExtractor.kt b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/extractors/FastreamExtractor.kt
index 999e4cccb..09be07528 100644
--- a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/extractors/FastreamExtractor.kt
+++ b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/extractors/FastreamExtractor.kt
@@ -13,6 +13,6 @@ class FastreamExtractor(private val client: OkHttpClient) {
                 url1 = it.data().substringAfter("sources: [{file:\"").substringBefore("\"}],")
             }
         }
-        return Video(url1, server, url1, null)
+        return Video(url1, server, url1)
     }
 }
diff --git a/src/es/asialiveaction/build.gradle b/src/es/asialiveaction/build.gradle
index ce6c97df0..655a5e3e4 100644
--- a/src/es/asialiveaction/build.gradle
+++ b/src/es/asialiveaction/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AsiaLiveAction'
     pkgNameSuffix = 'es.asialiveaction'
     extClass = '.AsiaLiveAction'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/FembedExtractor.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/FembedExtractor.kt
index f4916c4c7..e9960441b 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/FembedExtractor.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/OkruExtractor.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/OkruExtractor.kt
index c0f9e151c..cbee8c83f 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/OkruExtractor.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/StreamSBExtractor.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/StreamSBExtractor.kt
index 00530d7bc..b6e29b106 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/StreamSBExtractor.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/StreamSBExtractor.kt
@@ -42,7 +42,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index 439343d35..9caae23fa 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Doramasyt'
     pkgNameSuffix = 'es.doramasyt'
     extClass = '.Doramasyt'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/FembedExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/FembedExtractor.kt
index 67b4d6b0c..2c6d1284a 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/FembedExtractor.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/OkruExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/OkruExtractor.kt
index fc79b6554..18e94c53b 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/OkruExtractor.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
index 8fb2f7593..b8c711582 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
@@ -14,7 +14,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
                 val videoUrl = data.replace("\"", "")
                 val quality = "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/StreamTapeExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/StreamTapeExtractor.kt
index d754a4709..3e7d5bd39 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/StreamTapeExtractor.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/hentaijk/build.gradle b/src/es/hentaijk/build.gradle
index 727275fac..c74c8b8df 100644
--- a/src/es/hentaijk/build.gradle
+++ b/src/es/hentaijk/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Hentaijk'
     pkgNameSuffix = 'es.hentaijk'
     extClass = '.Hentaijk'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    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 b07a088a8..7af5f836c 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
@@ -173,7 +173,7 @@ class Hentaijk : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                 nozomitext.toString().split("}").forEach { file ->
                                     val nozomiUrl = file.substringAfter("\"file\":\"").substringBefore("\"").replace("\\", "")
                                     if (nozomiUrl.isNotBlank() && !nozomiUrl.contains("{")) {
-                                        videos.add(Video(nozomiUrl, server, nozomiUrl, null))
+                                        videos.add(Video(nozomiUrl, server, nozomiUrl))
                                     }
                                 }
                             }
@@ -182,7 +182,7 @@ class Hentaijk : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     when {
                         "embedsito" in url -> FembedExtractor().videosFromUrl(url).forEach { videos.add(it) }
                         "ok" in url -> OkruExtractor(client).videosFromUrl(url).forEach { videos.add(it) }
-                        "stream/jkmedia" in url -> videos.add(Video(url, "Xtreme S", url, null))
+                        "stream/jkmedia" in url -> videos.add(Video(url, "Xtreme S", url))
                         "um.php" in url -> videos.add(HentaijkExtractor().videoFromUrl(url, server))
                     }
                 }
@@ -199,7 +199,7 @@ class Hentaijk : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url1 = it.data().substringAfter("url: '").substringBefore("'")
                 }
             }
-            return Video(url1, server, url1, null)
+            return Video(url1, server, url1)
         }
     }
 
diff --git a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/FembedExtractor.kt b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/FembedExtractor.kt
index bed18adb2..17c41369e 100644
--- a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/FembedExtractor.kt
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/OkruExtractor.kt b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/OkruExtractor.kt
index a6f5b7ade..44b263e0d 100644
--- a/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/OkruExtractor.kt
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 56873e6e1..ea79cbcad 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Hentaila'
     pkgNameSuffix = 'es.hentaila'
     extClass = '.Hentaila'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    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 34f343581..1d1ac53f5 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
@@ -106,7 +106,7 @@ class Hentaila : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             if (nameServer.lowercase() == "arc") {
                 val videoUrl = urlServer.substringAfter("#")
-                videoList.add(Video(videoUrl, "Arc", videoUrl, null))
+                videoList.add(Video(videoUrl, "Arc", videoUrl))
             }
         }
 
diff --git a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/FembedExtractor.kt b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/FembedExtractor.kt
index e49eea69d..f9e260b75 100644
--- a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/FembedExtractor.kt
+++ b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/OkruExtractor.kt b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/OkruExtractor.kt
index 973a67ab8..e54c003e5 100644
--- a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/OkruExtractor.kt
+++ b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index eb4cb14ff..ddd9d4359 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Jkanime'
     pkgNameSuffix = 'es.jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 74348ca65..e105776d5 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
@@ -168,7 +168,7 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                 nozomitext.toString().split("}").forEach { file ->
                                     val nozomiUrl = file.substringAfter("\"file\":\"").substringBefore("\"").replace("\\", "")
                                     if (nozomiUrl.isNotBlank() && !nozomiUrl.contains("{")) {
-                                        videos.add(Video(nozomiUrl, server, nozomiUrl, null))
+                                        videos.add(Video(nozomiUrl, server, nozomiUrl))
                                     }
                                 }
                             }
@@ -177,7 +177,7 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     when {
                         "embedsito" in url -> FembedExtractor().videosFromUrl(url).forEach { videos.add(it) }
                         "ok" in url -> OkruExtractor(client).videosFromUrl(url).forEach { videos.add(it) }
-                        "stream/jkmedia" in url -> videos.add(Video(url, "Xtreme S", url, null))
+                        "stream/jkmedia" in url -> videos.add(Video(url, "Xtreme S", url))
                         "um.php" in url -> videos.add(JkanimeExtractor().videoFromUrl(url, server))
                     }
                 }
@@ -194,7 +194,7 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url1 = it.data().substringAfter("url: '").substringBefore("'")
                 }
             }
-            return Video(url1, server, url1, null)
+            return Video(url1, server, url1)
         }
     }
 
diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/FembedExtractor.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/FembedExtractor.kt
index 3b62a7eff..9787a87d8 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/FembedExtractor.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/OkruExtractor.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/OkruExtractor.kt
index 85e76ff80..bc2282939 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/OkruExtractor.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/jkhentai/build.gradle b/src/es/jkhentai/build.gradle
index bdbd12b14..efd106b4a 100644
--- a/src/es/jkhentai/build.gradle
+++ b/src/es/jkhentai/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Jkhentai'
     pkgNameSuffix = 'es.jkhentai'
     extClass = '.Jkhentai'
-    extVersionCode = 4
-    libVersion = '12'
+    extVersionCode = 5
+    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt
index 4a86ad199..8027f0c79 100644
--- a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt
index 31360559f..84ef5c77f 100644
--- a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt
index 550055841..cfb36b3ca 100644
--- a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt
@@ -15,7 +15,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val url = data.replace("\"", "")
                 val videoUrl = url
                 val quality = "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt
index 55e583a97..18d8a684f 100644
--- a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index f0888ee43..4955c3fcb 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'MonosChinos'
     pkgNameSuffix = 'es.monoschinos'
     extClass = '.MonosChinos'
-    extVersionCode = 6
-    libVersion = '12'
+    extVersionCode = 7
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/FembedExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/FembedExtractor.kt
index 64c2c779f..328de386c 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/FembedExtractor.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/OkruExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/OkruExtractor.kt
index 53703f99e..12797de7e 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/OkruExtractor.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt
index 83e47d25a..0f997217d 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/SolidFilesExtractor.kt
@@ -14,7 +14,7 @@ class SolidFilesExtractor(private val client: OkHttpClient) {
                 val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
                 val videoUrl = data.replace("\"", "")
                 val quality = "SolidFiles"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/uploadExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/uploadExtractor.kt
index e2b593965..e17d31e1a 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/uploadExtractor.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/uploadExtractor.kt
@@ -10,6 +10,6 @@ class uploadExtractor(private val client: OkHttpClient) {
     fun videofromurl(url: String, headers: Headers): Video {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val basicUrl = document.selectFirst("script:containsData(var player =)").data().substringAfter("sources: [\"").substringBefore("\"],")
-        return Video(basicUrl, "Upload", basicUrl, null, headers)
+        return Video(basicUrl, "Upload", basicUrl, headers)
     }
 }
diff --git a/src/es/mundodonghua/build.gradle b/src/es/mundodonghua/build.gradle
index 629a4a44c..33495a12d 100644
--- a/src/es/mundodonghua/build.gradle
+++ b/src/es/mundodonghua/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'MundoDonghua'
     pkgNameSuffix = 'es.mundodonghua'
     extClass = '.MundoDonghua'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/FembedExtractor.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/FembedExtractor.kt
index 2d368c894..c027db2f0 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/FembedExtractor.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/extractors/FembedExtractor.kt
@@ -18,13 +18,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = prefix + "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index aa72778b5..e96492d7f 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Pelisplushd'
     pkgNameSuffix = 'es.pelisplushd'
     extClass = '.Pelisplushd'
-    extVersionCode = 10
-    libVersion = '12'
+    extVersionCode = 11
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 253709b9d..87dce5769 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
@@ -167,7 +167,7 @@ class Pelisplushd : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
                         val amazonApi = client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId")).execute().asJsoup()
                         val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
-                        videoList.add(Video(videoUrl, "uwu", videoUrl, null))
+                        videoList.add(Video(videoUrl, "uwu", videoUrl))
                     }
                 }
             }
@@ -175,7 +175,7 @@ class Pelisplushd : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val body = client.newCall(GET(url)).execute().asJsoup()
                 val data1 = body.selectFirst("script:containsData(const sources = {)").data()
                 val video = data1.substringAfter("hls\": \"").substringBefore("\"")
-                videoList.add(Video(video, "Voex", video, null))
+                videoList.add(Video(video, "Voex", video))
             }
             "streamlare" -> {
                 val id = url.substringAfter("/e/").substringBefore("?poster")
@@ -183,7 +183,7 @@ class Pelisplushd : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 json.decodeFromString<JsonObject>(videoUrlResponse.select("body").text())["result"]?.jsonObject?.forEach { quality ->
                     val resolution = quality.toString().substringAfter("\"label\":\"").substringBefore("\"")
                     val videoUrl = quality.toString().substringAfter("\"file\":\"").substringBefore("\"")
-                    videoList.add(Video(videoUrl, "Streamlare:$resolution", videoUrl, null))
+                    videoList.add(Video(videoUrl, "Streamlare:$resolution", videoUrl))
                 }
             }
             "doodstream" -> {
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
index 0678593c3..90871cad6 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/FembedExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/FembedExtractor.kt
index 4ffebf6a1..f515646f7 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/FembedExtractor.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/FembedExtractor.kt
@@ -16,7 +16,7 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             videoList.reversed()
         } else {
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamSBExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamSBExtractor.kt
index 9530df88e..93aaa38bc 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamSBExtractor.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamTapeExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamTapeExtractor.kt
index 072da5c33..267c84c4e 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamTapeExtractor.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/StreamTapeExtractor.kt
@@ -13,6 +13,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
             ?: return null
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/es/tioanime/build.gradle b/src/es/tioanime/build.gradle
index d451172bb..1921bacf3 100644
--- a/src/es/tioanime/build.gradle
+++ b/src/es/tioanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'TioanimeH'
     pkgNameSuffix = 'es.tioanimeh'
     extClass = '.TioanimeHFactory'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 edee66176..2088aa347 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
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.animeextension.es.tioanimeh
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.tioanimeh.extractors.fembedExtractor
diff --git a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeHFactory.kt b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeHFactory.kt
index a37ec051e..1fcf9ad20 100644
--- a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeHFactory.kt
+++ b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeHFactory.kt
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.animeextension.es.tioanimeh
 
-import android.util.Log
 import eu.kanade.tachiyomi.animesource.AnimeSource
 import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
diff --git a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/fembedExtractor.kt b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/fembedExtractor.kt
index 6375c7ab2..640dbe596 100644
--- a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/fembedExtractor.kt
+++ b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/fembedExtractor.kt
@@ -16,13 +16,13 @@ class fembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = qualityPrefix + "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/okruExtractor.kt b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/okruExtractor.kt
index fd87ec9aa..3a5983252 100644
--- a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/okruExtractor.kt
+++ b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/okruExtractor.kt
@@ -17,7 +17,7 @@ class okruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = qualityPrefix + "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/yourUploadExtractor.kt b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/yourUploadExtractor.kt
index 5b2aaae0c..740ef6bb7 100644
--- a/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/yourUploadExtractor.kt
+++ b/src/es/tioanime/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/extractors/yourUploadExtractor.kt
@@ -10,6 +10,6 @@ class yourUploadExtractor(private val client: OkHttpClient) {
     fun videofromurl(url: String, headers: Headers): Video {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val basicUrl = document.selectFirst("script:containsData(jwplayerOptions)").data().substringAfter("file: '").substringBefore("',")
-        return Video(basicUrl, "YourUpload", basicUrl, null, headers)
+        return Video(basicUrl, "YourUpload", basicUrl, headers)
     }
 }
diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle
index b45a98f02..d76133263 100644
--- a/src/fr/vostfree/build.gradle
+++ b/src/fr/vostfree/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Vostfree'
     pkgNameSuffix = 'fr.vostfree'
     extClass = '.Vostfree'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
index 5103bb688..ecdc7917e 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
@@ -23,7 +23,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         ).execute().body!!.string()
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
 
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, quality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/FembedExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/FembedExtractor.kt
index 4a86ad199..8027f0c79 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/FembedExtractor.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/FembedExtractor.kt
@@ -17,13 +17,13 @@ class FembedExtractor {
                 val `object` = jsonArray.getJSONObject(i)
                 val videoUrl = `object`.getString("file")
                 val quality = "Fembed:" + `object`.getString("label")
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
             return videoList
         } else {
             val videoUrl = "not used"
             val quality = "Video taken down for dmca"
-            videoList.add(Video(videoUrl, quality, videoUrl, null))
+            videoList.add(Video(videoUrl, quality, videoUrl))
         }
         return videoList
     }
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt
index bee75f0d1..351fb410a 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/MytvExtractor.kt
@@ -15,9 +15,9 @@ class MytvExtractor(private val client: OkHttpClient) {
                 val videoUrl = videosString.substringAfter("\"v=").substringBefore("\\u0026tp=video").replace("%26", "&").replace("%3a", ":").replace("%2f", "/").replace("%3f", "?").replace("%3d", "=")
                 if (!videoUrl.contains("https:")) {
                     val videoUrl = "https:$videoUrl"
-                    videoList.add(Video(videoUrl, "Stream", videoUrl, null))
+                    videoList.add(Video(videoUrl, "Stream", videoUrl))
                 } else {
-                    videoList.add(Video(videoUrl, "Mytv", videoUrl, null))
+                    videoList.add(Video(videoUrl, "Mytv", videoUrl))
                 }
             }
         }
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/OkruExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/OkruExtractor.kt
index 2bb70f1ab..bc8295829 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/OkruExtractor.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/OkruExtractor.kt
@@ -18,7 +18,7 @@ class OkruExtractor(private val client: OkHttpClient) {
                 .replace("\\\\u0026", "&")
             val videoQuality = "Okru: " + it.substringBefore("\\\"")
             if (videoUrl.startsWith("https://")) {
-                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+                videoList.add(Video(videoUrl, videoQuality, videoUrl))
             }
         }
         return videoList
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/VudeoExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/VudeoExtractor.kt
index cbedc0362..53111c6eb 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/VudeoExtractor.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/VudeoExtractor.kt
@@ -13,7 +13,7 @@ class VudeoExtractor(private val client: OkHttpClient) {
             if (script.data().contains("sources: [\"")) {
                 val videoUrl = script.data().substringAfter("sources: [\"").substringBefore("\"],")
                 val quality = "Vudeo"
-                videoList.add(Video(videoUrl, quality, videoUrl, null))
+                videoList.add(Video(videoUrl, quality, videoUrl))
             }
         }
         return videoList
diff --git a/src/hi/animeWorld/build.gradle b/src/hi/animeWorld/build.gradle
index cab7996a3..24e94cbc0 100644
--- a/src/hi/animeWorld/build.gradle
+++ b/src/hi/animeWorld/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'AnimeWorld (experimental)'
     pkgNameSuffix = 'hi.animeWorld'
     extClass = '.AnimeWorld'
-    extVersionCode = 8
-    libVersion = '12'
+    extVersionCode = 9
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/AnimeWorld.kt b/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/AnimeWorld.kt
index b14737ad1..ea4e672e0 100644
--- a/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/AnimeWorld.kt
+++ b/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/AnimeWorld.kt
@@ -161,7 +161,7 @@ class AnimeWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                 url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                 url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                 url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
             -> {
                 val newheaders = headers.newBuilder()
diff --git a/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/extractors/StreamSBExtractor.kt b/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/extractors/StreamSBExtractor.kt
index 9891383d3..d7f9778ad 100644
--- a/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/extractors/StreamSBExtractor.kt
+++ b/src/hi/animeWorld/src/eu/kanade/tachiyomi/animeextension/hi/animeWorld/extractors/StreamSBExtractor.kt
@@ -41,7 +41,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
         masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
             val quality = "$language :" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/id/kuramanime/build.gradle b/src/id/kuramanime/build.gradle
index 643c63621..215c75321 100644
--- a/src/id/kuramanime/build.gradle
+++ b/src/id/kuramanime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Kuramanime'
     pkgNameSuffix = 'id.kuramanime'
     extClass = '.Kuramanime'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 de14e207b..252afb87d 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
@@ -146,7 +146,7 @@ class Kuramanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "Default"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
diff --git a/src/id/kuronime/build.gradle b/src/id/kuronime/build.gradle
index b196c5a5f..24476c25b 100644
--- a/src/id/kuronime/build.gradle
+++ b/src/id/kuronime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Kuronime'
     pkgNameSuffix = 'id.kuronime'
     extClass = '.Kuronime'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt b/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
index c692ab9d8..859d82b57 100644
--- a/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
+++ b/src/id/kuronime/src/eu/kanade/tachiyomi/animeextension/id/kuronime/Kuronime.kt
@@ -137,7 +137,7 @@ class Kuronime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "ZippyShare - Unknown Resolution"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     override fun videoListSelector(): String = throw Exception("not used")
diff --git a/src/id/minioppai/build.gradle b/src/id/minioppai/build.gradle
index f1d317b11..ad823211e 100644
--- a/src/id/minioppai/build.gradle
+++ b/src/id/minioppai/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'MiniOppai'
     pkgNameSuffix = 'id.minioppai'
     extClass = '.MiniOppai'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt b/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt
index a372fb8a4..78d34bd0b 100644
--- a/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt
+++ b/src/id/minioppai/src/eu/kanade/tachiyomi/animeextension/id/minioppai/MiniOppai.kt
@@ -139,7 +139,7 @@ class MiniOppai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "ZippyShare - Unknown Resolution"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     override fun videoListSelector(): String = throw Exception("not used")
diff --git a/src/id/neonime/build.gradle b/src/id/neonime/build.gradle
index cba1fbf1a..085b7f0bf 100644
--- a/src/id/neonime/build.gradle
+++ b/src/id/neonime/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'NeoNime'
     pkgNameSuffix = 'id.neonime'
     extClass = '.NeoNime'
-    extVersionCode = 6
-    libVersion = '12'
+    extVersionCode = 7
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 1bba80e9d..458e19fe6 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
@@ -232,7 +232,7 @@ class NeoNime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "Default"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     // screen
diff --git a/src/id/oploverz/build.gradle b/src/id/oploverz/build.gradle
index c4adc48e3..7fa1dc8e3 100644
--- a/src/id/oploverz/build.gradle
+++ b/src/id/oploverz/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Oploverz'
     pkgNameSuffix = 'id.oploverz'
     extClass = '.Oploverz'
-    extVersionCode = 10
-    libVersion = '12'
+    extVersionCode = 11
+    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 a1a48a343..dcfa788e2 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
@@ -152,7 +152,7 @@ class Oploverz : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 "22" -> "Google - 720p"
                 else -> "Unknown Resolution"
             }
-            videoList.add(Video(url, quality, url, null))
+            videoList.add(Video(url, quality, url))
         }
         return videoList
     }
@@ -176,7 +176,7 @@ class Oploverz : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "ZippyShare - Unknown Resolution"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     override fun videoListSelector(): String = throw Exception("not used")
diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle
index d717dd039..cd148438e 100644
--- a/src/id/otakudesu/build.gradle
+++ b/src/id/otakudesu/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'OtakuDesu'
     pkgNameSuffix = 'id.otakudesu'
     extClass = '.OtakuDesu'
-    extVersionCode = 12
-    libVersion = '12'
+    extVersionCode = 13
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 3e2f26b9f..3f82e2654 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
@@ -228,7 +228,7 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 else -> "Default"
             }
         }
-        return Video(url, quality, url, null)
+        return Video(url, quality, url)
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
diff --git a/src/it/animesaturn/build.gradle b/src/it/animesaturn/build.gradle
index c06bc5662..efdb36181 100644
--- a/src/it/animesaturn/build.gradle
+++ b/src/it/animesaturn/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Anime Saturn'
     pkgNameSuffix = 'it.animesaturn'
     extClass = '.AnimeSaturn'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    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 c9beb0c55..0a59f3f35 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
@@ -115,8 +115,7 @@ class AnimeSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 Video(
                     link,
                     qualities[i],
-                    link,
-                    null
+                    link
                 )
             }
         } else {
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index 0619125ef..8719722bb 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'ANIMEWORLD.tv'
     pkgNameSuffix = 'it.animeworld'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 8
-    libVersion = '12'
+    extVersionCode = 9
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
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 cefd2ba03..c454b095a 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
@@ -100,7 +100,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url.contains("cloudemb.com") || url.contains("playersb.com") || url.contains("tubesb.com") ||
                     url.contains("sbplay1.com") || url.contains("embedsb.com") || url.contains("watchsb.com") ||
                     url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") ||
-                    url.contains("sbfast")|| url.contains("sbfull.com") || url.contains("javplaya.com") ||
+                    url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") ||
                     url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com")
                 -> {
                     val headers = headers.newBuilder()
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
index c279f6570..ec2d8577e 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "Doodstream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamSBExtractor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamSBExtractor.kt
index 3fdc73dc8..4f3e19cee 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamSBExtractor.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamSBExtractor.kt
@@ -42,7 +42,7 @@ class StreamSBExtractor(private val client: OkHttpClient) {
             val quality = "StreamSB:" + it.substringAfter("RESOLUTION=").substringAfter("x")
                 .substringBefore(",") + "p"
             val videoUrl = it.substringAfter("\n").substringBefore("\n")
-            videoList.add(Video(videoUrl, quality, videoUrl, null, headers))
+            videoList.add(Video(videoUrl, quality, videoUrl, headers))
         }
         return videoList
     }
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamTapeExtractor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamTapeExtractor.kt
index 12bc54154..dabcbe564 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamTapeExtractor.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/StreamTapeExtractor.kt
@@ -14,6 +14,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/it/hentaisaturn/build.gradle b/src/it/hentaisaturn/build.gradle
index 09169ba15..7bd1a8509 100644
--- a/src/it/hentaisaturn/build.gradle
+++ b/src/it/hentaisaturn/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Hentai Saturn'
     pkgNameSuffix = 'it.hentaisaturn'
     extClass = '.HentaiSaturn'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    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 6e70585cd..513abe3c7 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
@@ -115,8 +115,7 @@ class HentaiSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 Video(
                     link,
                     qualities[i],
-                    link,
-                    null
+                    link
                 )
             }
         } else {
@@ -125,7 +124,6 @@ class HentaiSaturn : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     url,
                     "Qualità predefinita",
                     url,
-                    null,
                     Headers.headersOf("Referer", referer)
                 )
             )
diff --git a/src/pt/animefire/build.gradle b/src/pt/animefire/build.gradle
index 3019ca9bf..a5647101e 100644
--- a/src/pt/animefire/build.gradle
+++ b/src/pt/animefire/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Anime Fire'
     pkgNameSuffix = 'pt.animefire'
     extClass = '.AnimeFire'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/AnimeFireExtractor.kt b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/AnimeFireExtractor.kt
index 13c28bf80..ea99d3e59 100644
--- a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/AnimeFireExtractor.kt
+++ b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/AnimeFireExtractor.kt
@@ -17,7 +17,7 @@ class AnimeFireExtractor(private val client: OkHttpClient, private val json: Jso
         )
         val videoList = responseDto.videos.map {
             val url = it.url.replace("\\", "")
-            Video(url, it.quality, url, null)
+            Video(url, it.quality, url)
         }
         return videoList
     }
diff --git a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/IframeExtractor.kt b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/IframeExtractor.kt
index 91685bb0f..45ae271ca 100644
--- a/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/IframeExtractor.kt
+++ b/src/pt/animefire/src/eu/kanade/tachiyomi/animeextension/pt/animefire/extractors/IframeExtractor.kt
@@ -19,7 +19,7 @@ class IframeExtractor(private val client: OkHttpClient) {
         val url = html.substringAfter("play_url")
             .substringAfter(":\"")
             .substringBefore("\"")
-        val video = Video(url, "Default", url, null, headers)
+        val video = Video(url, "Default", url, headers)
         return listOf(video)
     }
 }
diff --git a/src/pt/animesvision/build.gradle b/src/pt/animesvision/build.gradle
index fc8d549fe..d06a2ff0f 100644
--- a/src/pt/animesvision/build.gradle
+++ b/src/pt/animesvision/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'AnimesVision'
     pkgNameSuffix = 'pt.animesvision'
     extClass = '.AnimesVision'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt
index 0fa1243dd..e3e46079d 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt
@@ -26,7 +26,7 @@ class DoodExtractor(private val client: OkHttpClient) {
         val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
         val newQuality = "DoodStream mirror"
 
-        return Video(url, newQuality, videoUrl, null, doodHeaders(doodTld))
+        return Video(url, newQuality, videoUrl, doodHeaders(doodTld))
     }
 
     private fun getRandomString(length: Int = 10): String {
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/GlobalVisionExtractor.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/GlobalVisionExtractor.kt
index eb6bc62c9..7f0b0605b 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/GlobalVisionExtractor.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/GlobalVisionExtractor.kt
@@ -10,7 +10,7 @@ class GlobalVisionExtractor {
         return REGEX_URL.findAll(html).map {
             val videoUrl = it.groupValues[1].replace("\\", "")
             val qualityName = it.groupValues[2]
-            Video(videoUrl, "$PREFIX $qualityName", videoUrl, null)
+            Video(videoUrl, "$PREFIX $qualityName", videoUrl)
         }.toList()
     }
 }
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/StreamTapeExtractor.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/StreamTapeExtractor.kt
index 1df8a8dbd..bbb7a6251 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/StreamTapeExtractor.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/StreamTapeExtractor.kt
@@ -14,6 +14,6 @@ class StreamTapeExtractor(private val client: OkHttpClient) {
         val videoUrl = "https:" + script.substringBefore("'") +
             script.substringAfter("+ ('xcd").substringBefore("'")
         val quality = "StreamTape"
-        return Video(url, quality, videoUrl, null)
+        return Video(url, quality, videoUrl)
     }
 }
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/VoeExtractor.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/VoeExtractor.kt
index 291e1771c..7b4ef06b5 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/VoeExtractor.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/VoeExtractor.kt
@@ -16,6 +16,6 @@ class VoeExtractor(private val client: OkHttpClient) {
         val quality = script.substringAfter("video_height\": ")
             .substringBefore(",")
         val qualityStr = "VoeCDN(${quality}p)"
-        return Video(videoUrl, qualityStr, videoUrl, null)
+        return Video(videoUrl, qualityStr, videoUrl)
     }
 }
diff --git a/src/pt/animeyabu/build.gradle b/src/pt/animeyabu/build.gradle
index 09b1222a6..426108066 100644
--- a/src/pt/animeyabu/build.gradle
+++ b/src/pt/animeyabu/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'AnimeYabu!'
     pkgNameSuffix = 'pt.animeyabu'
     extClass = '.AnimeYabu'
-    extVersionCode = 3
-    libVersion = '12'
+    extVersionCode = 4
+    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerOneExtractor.kt b/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerOneExtractor.kt
index 2d27c6296..059558106 100644
--- a/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerOneExtractor.kt
+++ b/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerOneExtractor.kt
@@ -15,7 +15,7 @@ class PlayerOneExtractor(private val client: OkHttpClient? = null) {
         return regex.findAll(html).map { it ->
             val quality = "$PREFIX (${it.groupValues[1]})"
             val videoUrl = it.groupValues[2]
-            Video(videoUrl, quality, videoUrl, null, headers)
+            Video(videoUrl, quality, videoUrl, headers)
         }.toList()
     }
 
diff --git a/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerTwoExtractor.kt b/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerTwoExtractor.kt
index 37e49e1d8..6d07c291a 100644
--- a/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerTwoExtractor.kt
+++ b/src/pt/animeyabu/src/eu/kanade/tachiyomi/animeextension/pt/animeyabu/extractors/PlayerTwoExtractor.kt
@@ -20,6 +20,6 @@ class PlayerTwoExtractor(private val client: OkHttpClient) {
         }
         val quality = "$PREFIX (${match.groupValues[1]})"
         val videoUrl = match.groupValues[2]
-        return Video(videoUrl, quality, videoUrl, null)
+        return Video(videoUrl, quality, videoUrl)
     }
 }
diff --git a/src/pt/anitube/build.gradle b/src/pt/anitube/build.gradle
index ce200335b..23964a4de 100644
--- a/src/pt/anitube/build.gradle
+++ b/src/pt/anitube/build.gradle
@@ -5,8 +5,8 @@ ext {
     extName = 'Anitube'
     pkgNameSuffix = 'pt.anitube'
     extClass = '.Anitube'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 
diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
index 8b87ee845..586634e22 100644
--- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
+++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/extractors/AnitubeExtractor.kt
@@ -24,7 +24,7 @@ object AnitubeExtractor {
         return qualities.mapIndexed { index, quality ->
             val path = paths[index]
             val url = serverUrl.replace(type, path)
-            Video(url, quality, url, null, headers)
+            Video(url, quality, url, headers)
         }.reversed()
     }
 }
diff --git a/src/pt/betteranime/build.gradle b/src/pt/betteranime/build.gradle
index c7d74e4d3..6576e97fb 100644
--- a/src/pt/betteranime/build.gradle
+++ b/src/pt/betteranime/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Better Anime'
     pkgNameSuffix = 'pt.betteranime'
     extClass = '.BetterAnime'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 dependencies {
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 320d9c9e8..015b17fe0 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
@@ -30,7 +30,7 @@ class BetterAnimeExtractor(
             if (videoUrl == null)
                 null
             else
-                Video(videoUrl, it.first, videoUrl, null)
+                Video(videoUrl, it.first, videoUrl)
         }.toList()
     }
 
diff --git a/src/pt/goyabu/build.gradle b/src/pt/goyabu/build.gradle
index 1263411a7..8f12c5f40 100644
--- a/src/pt/goyabu/build.gradle
+++ b/src/pt/goyabu/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Goyabu'
     pkgNameSuffix = 'pt.goyabu'
     extClass = '.Goyabu'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
 }
 
 
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt
index dc8ece543..4892b98f7 100644
--- a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerOneExtractor.kt
@@ -11,7 +11,7 @@ class PlayerOneExtractor {
         return GYConstants.PLAYER_REGEX.findAll(html).map { it ->
             val quality = "$PREFIX (${it.groupValues[1]})"
             val videoUrl = it.groupValues[2]
-            Video(videoUrl, quality, videoUrl, null)
+            Video(videoUrl, quality, videoUrl)
         }.toList()
     }
 }
diff --git a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt
index 50dbc11fd..0320d88e8 100644
--- a/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt
+++ b/src/pt/goyabu/src/eu/kanade/tachiyomi/animeextension/pt/goyabu/extractors/PlayerTwoExtractor.kt
@@ -20,6 +20,6 @@ class PlayerTwoExtractor(private val client: OkHttpClient) {
         }
         val quality = "$PREFIX (${match.groupValues[1]})"
         val videoUrl = match.groupValues[2]
-        return Video(videoUrl, quality, videoUrl, null)
+        return Video(videoUrl, quality, videoUrl)
     }
 }
diff --git a/src/pt/hentaiyabu/build.gradle b/src/pt/hentaiyabu/build.gradle
index 4cd8d1083..135dc7680 100644
--- a/src/pt/hentaiyabu/build.gradle
+++ b/src/pt/hentaiyabu/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'HentaiYabu'
     pkgNameSuffix = 'pt.hentaiyabu'
     extClass = '.HentaiYabu'
-    extVersionCode = 1
-    libVersion = '12'
+    extVersionCode = 2
+    libVersion = '13'
     containsNsfw = true
 }
 
diff --git a/src/pt/hentaiyabu/src/eu/kanade/tachiyomi/animeextension/pt/hentaiyabu/extractors/PlayerOneExtractor.kt b/src/pt/hentaiyabu/src/eu/kanade/tachiyomi/animeextension/pt/hentaiyabu/extractors/PlayerOneExtractor.kt
index a1a9e4463..e63405c8e 100644
--- a/src/pt/hentaiyabu/src/eu/kanade/tachiyomi/animeextension/pt/hentaiyabu/extractors/PlayerOneExtractor.kt
+++ b/src/pt/hentaiyabu/src/eu/kanade/tachiyomi/animeextension/pt/hentaiyabu/extractors/PlayerOneExtractor.kt
@@ -15,7 +15,7 @@ class PlayerOneExtractor(private val client: OkHttpClient? = null) {
         return regex.findAll(html).map { it ->
             val quality = "$PREFIX (${it.groupValues[1]})"
             val videoUrl = it.groupValues[2]
-            Video(videoUrl, quality, videoUrl, null, headers)
+            Video(videoUrl, quality, videoUrl, headers)
         }.toList()
     }
 
diff --git a/src/pt/puraymoe/build.gradle b/src/pt/puraymoe/build.gradle
index 4544e7bde..aa512341c 100644
--- a/src/pt/puraymoe/build.gradle
+++ b/src/pt/puraymoe/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Puray.moe'
     pkgNameSuffix = 'pt.puraymoe'
     extClass = '.PurayMoe'
-    extVersionCode = 2
-    libVersion = '12'
+    extVersionCode = 3
+    libVersion = '13'
 }
 
 dependencies {
diff --git a/src/pt/puraymoe/src/eu/kanade/tachiyomi/animeextension/pt/puraymoe/PurayMoe.kt b/src/pt/puraymoe/src/eu/kanade/tachiyomi/animeextension/pt/puraymoe/PurayMoe.kt
index 57a8d6be0..a568b0e46 100644
--- a/src/pt/puraymoe/src/eu/kanade/tachiyomi/animeextension/pt/puraymoe/PurayMoe.kt
+++ b/src/pt/puraymoe/src/eu/kanade/tachiyomi/animeextension/pt/puraymoe/PurayMoe.kt
@@ -136,7 +136,7 @@ class PurayMoe : ConfigurableAnimeSource, AnimeHttpSource() {
         val episodeObject = response.parseAs<MinimalEpisodeDto>()
         return episodeObject.streams!!.map {
             val quality = "${it.quality.last()}p"
-            Video(it.url, quality, it.url, null)
+            Video(it.url, quality, it.url)
         }.toList()
     }
 
diff --git a/src/ru/animevost/build.gradle b/src/ru/animevost/build.gradle
index c15016c34..e0057ff4c 100644
--- a/src/ru/animevost/build.gradle
+++ b/src/ru/animevost/build.gradle
@@ -6,8 +6,8 @@ ext {
     extName = 'Animevost'
     pkgNameSuffix = 'ru.animevost'
     extClass = '.Animevost'
-    extVersionCode = 5
-    libVersion = '12'
+    extVersionCode = 6
+    libVersion = '13'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/AnimevostSource.kt b/src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/AnimevostSource.kt
index 0be6e68bf..b693a6875 100644
--- a/src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/AnimevostSource.kt
+++ b/src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/AnimevostSource.kt
@@ -277,7 +277,7 @@ class AnimevostSource(override val name: String, override val baseUrl: String, p
             val linkData = it.replace("[", "").split("]")
             val quality = linkData.first()
             val url = linkData.last().split(" or").first()
-            videoList.add(Video(url, quality, url, null))
+            videoList.add(Video(url, quality, url))
         }
 
         return videoList
diff --git a/src/sr/animesrbija/build.gradle b/src/sr/animesrbija/build.gradle
index 9ad4c2e6c..ac9e4d281 100644
--- a/src/sr/animesrbija/build.gradle
+++ b/src/sr/animesrbija/build.gradle
@@ -5,9 +5,9 @@ ext {
     extName = 'Anime Srbija'
     pkgNameSuffix = 'sr.animesrbija'
     extClass = '.AnimeSrbija'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = false
-    libVersion = '12'
+    libVersion = '13'
 }
 dependencies {
     compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
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 3e3874fdb..b3ffdf581 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
@@ -115,7 +115,7 @@ class AnimeSrbija : ParsedAnimeHttpSource() {
         val source = element.attr("src").substringAfter("?file=")
         val relative = source.substringAfter("/file/")
         val testSource = "https://cdn.asroll.tk/file/$relative"
-        return Video(testSource, "AS Cloud", testSource, null)
+        return Video(testSource, "AS Cloud", testSource)
     }
 
     override fun videoListSelector(): String {