diff --git a/lib/voe-extractor/build.gradle.kts b/lib/voe-extractor/build.gradle.kts
index c26cbc8a8..a503203dd 100644
--- a/lib/voe-extractor/build.gradle.kts
+++ b/lib/voe-extractor/build.gradle.kts
@@ -1,3 +1,7 @@
 plugins {
     id("lib-android")
 }
+
+dependencies {
+    implementation(project(":lib:playlist-utils"))
+}
\ No newline at end of file
diff --git a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
index e589ad795..a9c3293ad 100644
--- a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
+++ b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
@@ -1,26 +1,44 @@
 package eu.kanade.tachiyomi.lib.voeextractor
 
+import android.util.Base64
 import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
 
 class VoeExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String? = null, prefix: String = ""): Video? {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val script = document.selectFirst("script:containsData(const sources), script:containsData(var sources)")
-            ?.data()
-            ?: return null
-        val videoUrl = script.substringAfter("hls': '").substringBefore("'")
-        val resolution = script.substringAfter("video_height': ").substringBefore(",")
-        val qualityStr = when {
-            prefix.isNotEmpty() -> "$prefix${resolution}p"
-            else -> quality ?: "VoeCDN(${resolution}p)"
-        }
-        return Video(url, qualityStr, videoUrl)
-    }
 
-    fun videosFromUrl(url: String, quality: String? = null, prefix: String = ""): List<Video> {
-        return videoFromUrl(url, quality, prefix)?.let(::listOf).orEmpty()
+    private val json: Json by injectLazy()
+
+    private val playlistUtils by lazy { PlaylistUtils(client) }
+
+    @Serializable
+    data class VideoLinkDTO(val file: String)
+
+    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val script = document.selectFirst("script:containsData(const sources), script:containsData(var sources), script:containsData(wc0)")
+            ?.data()
+            ?: return emptyList()
+        val playlistUrl = when {
+            // Layout 1
+            script.contains("sources") -> {
+                script.substringAfter("hls': '").substringBefore("'")
+            }
+            // Layout 2
+            script.contains("wc0") -> {
+                val base64 = Regex("'.*'").find(script)!!.value
+                val decoded = Base64.decode(base64, Base64.DEFAULT).let(::String)
+                json.decodeFromString<VideoLinkDTO>(decoded).file
+            }
+            else -> return emptyList()
+        }
+        return playlistUtils.extractFromHls(playlistUrl,
+            videoNameGen = { quality -> "${prefix}Voe: $quality" }
+        )
     }
 }
diff --git a/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt b/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
index 378b4863c..20b162e2d 100644
--- a/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
+++ b/multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
@@ -86,7 +86,7 @@ class Wiflix : DataLifeEngine(
                     contains("streamvid.net") -> StreamHideVidExtractor(client).videosFromUrl(this)
                     contains("upstream.to") -> UpstreamExtractor(client).videosFromUrl(this)
                     contains("streamdav.com") -> StreamDavExtractor(client).videosFromUrl(this)
-                    contains("voe.sx") -> listOfNotNull(VoeExtractor(client).videoFromUrl(this))
+                    contains("voe.sx") -> VoeExtractor(client).videosFromUrl(this)
                     else -> emptyList()
                 }
             }
diff --git a/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt b/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
index eed56e0cd..4b78c2ad9 100644
--- a/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
+++ b/multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
@@ -92,7 +92,7 @@ class Kinoking : DooPlay(
                 doodExtractor.videosFromUrl(link, quality, redirect)
             }
             link.contains("https://voe.sx") && hosterSelection.contains("voe") -> {
-                voeExtractor.videosFromUrl(link, "Voe")
+                voeExtractor.videosFromUrl(link)
             }
             link.contains("filehosted") && hosterSelection.contains("filehosted") -> {
                 listOf(Video(link, "Filehosted", link))
diff --git a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
index 03f29423b..e5ade9559 100644
--- a/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
+++ b/multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
@@ -758,8 +758,7 @@ class AutoEmbedExtractor(private val client: OkHttpClient) {
                     MixDropExtractor(client).videoFromUrl(videoUrl, prefix = prefix)
                 }
                 videoUrl.contains("https://voe") -> {
-                    VoeExtractor(client).videoFromUrl(videoUrl, server.name)
-                        ?.let(::listOf)
+                    VoeExtractor(client).videosFromUrl(videoUrl)
                 }
                 videoUrl.contains("rabbitstream") -> {
                     RabbitStreamExtractor(client).videosFromUrl(videoUrl, headers = videoHeaders, prefix = prefix)
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 75648549e..68028c00b 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
@@ -178,7 +178,7 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             url.contains("ok.ru") -> okruExtractor.videosFromUrl(url)
             url.contains("mp4upload") -> mp4uploadExtractor.videosFromUrl(url, headers)
             url.contains("uqload") -> uqloadExtractor.videosFromUrl(url)
-            url.contains("voe") -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            url.contains("voe") -> voeExtractor.videosFromUrl(url)
             url.contains("shared") -> sharedExtractor.videosFromUrl(url)?.let(::listOf)
             DOOD_REGEX.containsMatchIn(url) -> doodExtractor.videosFromUrl(url, "Dood mirror")
             VIDBOM_REGEX.containsMatchIn(url) -> vidbomExtractor.videosFromUrl(url)
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 9af9c706b..4fcac5c43 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
@@ -113,7 +113,7 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             "dood" in url -> doodExtractor.videosFromUrl(url)
             "fviplions" in url || "wish" in url -> streamwishExtractor.videosFromUrl(url)
-            "voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            "voe.sx" in url -> voeExtractor.videosFromUrl(url)
             else -> null
         } ?: emptyList()
     }
diff --git a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
index 1c151e6db..cb1f249a5 100644
--- a/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
+++ b/src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
@@ -171,8 +171,7 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 okruExtractor.videosFromUrl(url)
             }
             "voe.sx" in url && selection.contains("Voe") -> {
-                voeExtractor.videoFromUrl(url, "VoeSX ($quality)")
-                    ?.let(::listOf)
+                voeExtractor.videosFromUrl(url)
             }
             VID_BOM_DOMAINS.any(url::contains) && selection.contains("VidBom") -> {
                 vidBomExtractor.videosFromUrl(url)
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
index 304cd14a4..8c4ee605c 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
@@ -197,10 +197,7 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
                     }
                 }
                 link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
-                    val video = VoeExtractor(client).videoFromUrl(link, quality)
-                    if (video != null) {
-                        videoList.add(video)
-                    }
+                    videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(${stream.lang}) "))
                 }
                 link.contains("https://streamlare") && hosterSelection?.contains("slare") == true -> {
                     videoList.addAll(StreamlareExtractor(client).videosFromUrl(link, suffix = stream.lang ?: "Unknown language"))
diff --git a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
index b3e06eed1..95ca17b0f 100644
--- a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
+++ b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
@@ -221,7 +221,7 @@ class AnimeBase : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val url = hosterSettings.get(hoster)!! + urlpart
         return when (hoster) {
             "Streamwish" -> streamWishExtractor.videosFromUrl(url)
-            "Voe.SX" -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            "Voe.SX" -> voeExtractor.videosFromUrl(url)
             "VTube", "Lulustream" -> unpackerExtractor.videosFromUrl(url, hoster)
             "VidGuard" -> vidguardExtractor.videosFromUrl(url)
             else -> null
diff --git a/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt b/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
index 516f9a2f4..51cf17bbd 100644
--- a/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
+++ b/src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
@@ -229,15 +229,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                             val link = client.newCall(GET(decode)).execute().request.url.toString()
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Sub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(link, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Sub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -267,15 +259,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                         } else {
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Sub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(leaveurl, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Sub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -358,15 +342,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                             val link = client.newCall(GET(decode)).execute().request.url.toString()
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Sub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(link, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Sub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -396,15 +372,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                         } else {
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Sub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(leaveurl, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Sub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -549,15 +517,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                             val link = client.newCall(GET(decode)).execute().request.url.toString()
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Dub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(link, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Dub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -587,15 +547,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                         } else {
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Dub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(leaveurl, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Dub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -678,15 +630,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                             val link = client.newCall(GET(decode)).execute().request.url.toString()
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Dub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(link, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Dub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@@ -716,15 +660,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                                         } else {
                                                             when {
                                                                 hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
-                                                                    val quality = "Voe Deutsch Dub"
-                                                                    val video = try {
-                                                                        VoeExtractor(client).videoFromUrl(leaveurl, quality)
-                                                                    } catch (e: Exception) {
-                                                                        null
-                                                                    }
-                                                                    if (video != null) {
-                                                                        videoList.add(video)
-                                                                    }
+                                                                    videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Dub) "))
                                                                 }
 
                                                                 hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
diff --git a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
index 9073c32de..9d2b6af06 100644
--- a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
+++ b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
@@ -151,12 +151,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     link.contains("https://voe.sx") && hosterSelection?.contains(
                                         "voe",
                                     ) == true -> {
-                                        val quality = "Voe"
-                                        val video =
-                                            VoeExtractor(client).videoFromUrl(link, quality)
-                                        if (video != null) {
-                                            videoList.add(video)
-                                        }
+                                        videoList.addAll(VoeExtractor(client).videosFromUrl(link))
                                     }
                                 }
                             }
@@ -217,11 +212,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         val link = element.select("a").attr("abs:href")
                         when {
                             link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
-                                val quality = "Voe"
-                                val video = VoeExtractor(client).videoFromUrl(link, quality)
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
+                                videoList.addAll(VoeExtractor(client).videosFromUrl(link))
                             }
                         }
                     }
diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
index 31e834f64..b841e4811 100644
--- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
+++ b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
@@ -238,15 +238,11 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             if (hosterSelection != null) {
                 when {
                     hoster.contains("VOE") && hosterSelection.contains(AWConstants.NAME_VOE) -> {
-                        val quality = "Voe $language"
                         var url = redirectInterceptor.newCall(GET(redirectgs)).execute().request.url.toString()
                         if (url.contains("payload") || url.contains(redirectgs)) {
                             url = recapbypass(jsInterceptor, redirectgs)
                         }
-                        val video = VoeExtractor(client).videoFromUrl(url, quality)
-                        if (video != null) {
-                            videoList.add(video)
-                        }
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(url, "($language) "))
                     }
 
                     hoster.contains("Doodstream") && hosterSelection.contains(AWConstants.NAME_DOOD) -> {
diff --git a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
index 4c407f52c..1cfc96dc4 100644
--- a/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
+++ b/src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
@@ -206,10 +206,7 @@ class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
                         }
                     }
                     host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
-                        val video = VoeExtractor(client).videoFromUrl(eUrl)
-                        if (video != null) {
-                            videoList.add(video)
-                        }
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(eUrl))
                     }
                 }
             }
@@ -246,10 +243,7 @@ class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
                         }
                     }
                     host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
-                        val video = VoeExtractor(client).videoFromUrl(fUrl)
-                        if (video != null) {
-                            videoList.add(video)
-                        }
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(fUrl))
                     }
                 }
             }
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 ed81c1b8f..0380eca48 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
@@ -88,8 +88,7 @@ class FilmPalast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             when {
                 url.contains("https://voe.sx") && hosterSelection.contains("voe") ->
-                    VoeExtractor(client).videoFromUrl(url, "Voe")
-                        ?.let(::listOf)
+                    VoeExtractor(client).videosFromUrl(url)
 
                 url.contains("https://upstream.to") && hosterSelection.contains("up") ->
                     UpstreamExtractor(client).videoFromUrl(url)
diff --git a/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt b/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
index 9cf92ad4c..18f667296 100644
--- a/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
+++ b/src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
@@ -388,10 +388,7 @@ class Kool : ConfigurableAnimeSource, AnimeHttpSource() {
                 item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://voe") ||
                     item.jsonObject["url"]!!.jsonPrimitive.content.contains("scatch176duplicities") && hosterSelection?.contains("voe") == true -> {
                     val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content
-                    val video = VoeExtractor(client).videoFromUrl(videoUrl)
-                    if (video != null) {
-                        videoList.add(video)
-                    }
+                    videoList.addAll(VoeExtractor(client).videosFromUrl(videoUrl))
                 }
                 item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://clipboard") && hosterSelection?.contains("clip") == true -> {
                     val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content
diff --git a/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt b/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
index d8b557aa9..bd70b825c 100644
--- a/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
+++ b/src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
@@ -221,20 +221,7 @@ class Movie4k : ConfigurableAnimeSource, AnimeHttpSource() {
                         link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") ||
                             link.contains("//fraudclatterflyingcar") ||
                             link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> {
-                            if (!link.contains("https:")) {
-                                val url = "https:$link"
-                                val quality = "Voe"
-                                val video = VoeExtractor(client).videoFromUrl(url, quality)
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
-                            } else {
-                                val quality = "Voe"
-                                val video = VoeExtractor(client).videoFromUrl(link, quality)
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
-                            }
+                            videoList.addAll(VoeExtractor(client).videosFromUrl(if (link.contains("https:")) link else "https:$link"))
                         }
                     }
                 }
@@ -317,20 +304,7 @@ class Movie4k : ConfigurableAnimeSource, AnimeHttpSource() {
                     link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") ||
                         link.contains("//fraudclatterflyingcar") ||
                         link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> {
-                        if (!link.contains("https:")) {
-                            val url = "https:$link"
-                            val quality = "Voe"
-                            val video = VoeExtractor(client).videoFromUrl(url, quality)
-                            if (video != null) {
-                                videoList.add(video)
-                            }
-                        } else {
-                            val quality = "Voe"
-                            val video = VoeExtractor(client).videoFromUrl(link, quality)
-                            if (video != null) {
-                                videoList.add(video)
-                            }
-                        }
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(if (link.contains("https:")) link else "https:$link"))
                     }
                 }
             }
diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
index 99c14e3b3..4832d27a8 100644
--- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
+++ b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
@@ -233,12 +233,8 @@ class Serienstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             if (hosterSelection != null) {
                 when {
                     hoster.contains("VOE") && hosterSelection.contains(SConstants.NAME_VOE) -> {
-                        val quality = "Voe $language"
                         val url = client.newCall(GET(redirectgs)).execute().request.url.toString()
-                        val video = VoeExtractor(client).videoFromUrl(url, quality)
-                        if (video != null) {
-                            videoList.add(video)
-                        }
+                        videoList.addAll(VoeExtractor(client).videosFromUrl(url, "($language) "))
                     }
 
                     hoster.contains("Doodstream") && hosterSelection.contains(SConstants.NAME_DOOD) -> {
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 36f8c1b57..910919639 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
@@ -159,7 +159,7 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val video = amazonExtractor(baseUrl + url.substringAfter(".."))
diff --git a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
index e0712bc3f..1427fe75c 100644
--- a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
+++ b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
@@ -234,7 +234,7 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
                 FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll)
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
index bd7b81ccc..296453733 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
@@ -159,7 +159,7 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
index 2997c8a4a..0e477dda3 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
@@ -161,7 +161,7 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
index 1ffbc735b..bbd3b01c1 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
@@ -220,7 +220,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
             OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll)
         }
         if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+            VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
         }
         if (embedUrl.contains("streamtape")) {
             StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
index b821b968c..d8b185fec 100644
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
+++ b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
@@ -372,7 +372,7 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
index 3efa1c632..6e555ded2 100644
--- a/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
+++ b/src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
@@ -163,7 +163,7 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             if (link.contains("voe")) {
                 try {
-                    VoeExtractor(client).videoFromUrl(link, "Voex")?.let { videoList.add(it) }
+                    VoeExtractor(client).videosFromUrl(link).also(videoList::addAll)
                 } catch (_: Exception) {}
             }
             if (link.contains("vudeo")) {
diff --git a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
index 95c8fef76..89f2205d7 100644
--- a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
+++ b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
@@ -215,7 +215,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
index 68e2ab15a..54ac53b9a 100644
--- a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
+++ b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
@@ -220,7 +220,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     }
                 }
                 server.contains("voe") -> {
-                    val video = VoeExtractor(client).videosFromUrl(url, if (isLatino) "VOE Latino" else if (isSub) "VOE Subtitulado" else "VOE Castellano")
+                    val video = VoeExtractor(client).videosFromUrl(url, if (isLatino) "(Latino) " else if (isSub) "(Subtitulado) " else "(Castellano) ")
                     videoList.addAll(video)
                 }
                 server.contains("filemoon") -> {
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 6060db811..bcced3329 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
@@ -212,8 +212,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                     videoList.addAll(StreamWishExtractor(client, headers).videosFromUrl(urlServer, videoNameGen = { "StreamWish:$it" }))
                 }
                 "voe" -> {
-                    val video = VoeExtractor(client).videoFromUrl(urlServer, prefix = "Voe:")
-                    if (video != null) videoList.add(video)
+                    videoList.addAll(VoeExtractor(client).videosFromUrl(urlServer))
                 }
                 "arc" -> {
                     val videoUrl = urlServer.substringAfter("#")
diff --git a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
index b2cc57eee..cffb3e525 100644
--- a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
+++ b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
@@ -227,7 +227,7 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
                         YourUploadExtractor(client).videoFromUrl(src, headers).let { videoList.addAll(it) }
                     }
                     if (src.contains("voe")) {
-                        VoeExtractor(client).videoFromUrl(src)?.let { videoList.add(it) }
+                        VoeExtractor(client).videosFromUrl(src).also(videoList::addAll)
                     }
                     if (src.contains("wishembed") || src.contains("streamwish") || src.contains("wish")) {
                         StreamWishExtractor(client, headers).videosFromUrl(src) { "StreamWish:$it" }.also(videoList::addAll)
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
index 548a9f28f..0bcee0f31 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
@@ -106,7 +106,7 @@ class MundoDonghua : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     if (unpack.contains("amagi_tab")) {
                         fetchUrls(unpack).map { url ->
                             try {
-                                VoeExtractor(client).videoFromUrl(url, "VoeCDN")?.let { videoList.add(it) }
+                                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
                             } catch (_: Exception) {}
                         }
                     }
diff --git a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
index e6b7de70c..9de7bf1c8 100644
--- a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -180,7 +180,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "${prefix}Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
             }
             if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
                 OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
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 c8786b0c3..8d965ae8c 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
@@ -171,7 +171,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
index 6afe075a9..3dd791096 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
@@ -152,7 +152,7 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
index 0e594883c..f8743b6c6 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
@@ -177,7 +177,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+                VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
                 val body = client.newCall(GET(url)).execute().asJsoup()
diff --git a/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt b/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
index 34c9d85df..acd3753c5 100644
--- a/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
+++ b/src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
@@ -170,7 +170,7 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         return when (hoster) {
             "doodstream" -> DoodExtractor(client).videosFromUrl(url)
-            "voe" -> VoeExtractor(client).videoFromUrl(url)?.let(::listOf)
+            "voe" -> VoeExtractor(client).videosFromUrl(url)
             "Eplayer" -> EplayerExtractor(client).videosFromUrl(url)
             else -> null
         } ?: emptyList()
diff --git a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
index e1c46fa0a..3091a94bb 100644
--- a/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
+++ b/src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
@@ -186,7 +186,7 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             host.contains("sendvid.com") -> sendvidExtractor.videosFromUrl(host)
             host.contains("ok.ru") -> okruExtractor.videosFromUrl(host)
             host.contains("upstream") -> upstreamExtractor.videosFromUrl(host)
-            host.startsWith("https://voe") -> voeExtractor.videoFromUrl(host, quality = "Voe")?.let(::listOf) ?: emptyList()
+            host.startsWith("https://voe") -> voeExtractor.videosFromUrl(host)
             else -> emptyList()
         }
     }
diff --git a/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt b/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
index 1629b84a4..cd8543713 100644
--- a/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
+++ b/src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
@@ -195,7 +195,7 @@ class Toonitalia : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private fun extractVideos(url: String): List<Video> =
         when {
-            "https://voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            "https://voe.sx" in url -> voeExtractor.videosFromUrl(url)
             "https://streamtape" in url -> streamTapeExtractor.videoFromUrl(url)?.let(::listOf)
             "https://maxstream" in url -> maxStreamExtractor.videosFromUrl(url)
             "https://streamz" in url || "streamz.cc" in url -> {
diff --git a/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt b/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
index cebcfbe5c..c36f93f33 100644
--- a/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
+++ b/src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
@@ -277,7 +277,7 @@ class Animeler : AnimeHttpSource(), ConfigurableAnimeSource {
             "sibnet" in url -> sibnetExtractor.videosFromUrl(url)
             "streamlare" in url -> streamlareExtractor.videosFromUrl(url)
             "uqload" in url -> uqloadExtractor.videosFromUrl(url)
-            "voe." in url -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            "voe." in url -> voeExtractor.videosFromUrl(url)
             "vudeo." in url -> vudeoExtractor.videosFromUrl(url)
             else -> null
         } ?: emptyList()
diff --git a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
index dd51f84e5..eb78aaef6 100644
--- a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
+++ b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
@@ -263,7 +263,7 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
                 gdrivePlayerExtractor.videosFromUrl(newUrl, "GdrivePlayer", headers)
             }
             "uqload" in url -> uqloadExtractor.videosFromUrl(url)
-            "voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf)
+            "voe.sx" in url -> voeExtractor.videosFromUrl(url)
             "anizmplayer.com" in url -> aincradExtractor.videosFromUrl(url)
             else -> null
         } ?: emptyList()
diff --git a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
index c1ad79d47..ce6c157f5 100644
--- a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
+++ b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
@@ -250,7 +250,7 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             "sendvid.com" in url -> sendvidExtractor.videosFromUrl(url)
             "video.sibnet" in url -> sibnetExtractor.videosFromUrl(url)
             "streamlare.com" in url -> streamlareExtractor.videosFromUrl(url)
-            "voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) ?: emptyList()
+            "voe.sx" in url -> voeExtractor.videosFromUrl(url)
             "//vudeo." in url -> vudeoExtractor.videosFromUrl(url)
             "yourupload.com" in url -> {
                 yourUploadExtractor.videoFromUrl(url, headers)
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
index 1cea947a2..8a28136fe 100644
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
+++ b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
@@ -308,7 +308,7 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     VkExtractor(client, headers).videosFromUrl(vkUrl, prefix = "$subber: ")
                 }
                 "VOE" -> {
-                    VoeExtractor(client).videoFromUrl(hosterLink, "$subber: VOE")?.let(::listOf)
+                    VoeExtractor(client).videosFromUrl(hosterLink, "($subber) ")
                 }
                 "VTUBE" -> {
                     VTubeExtractor(client, headers).videosFromUrl(hosterLink, baseUrl, prefix = "$subber: ")