diff --git a/src/es/doramasyt/AndroidManifest.xml b/src/es/doramasyt/AndroidManifest.xml
new file mode 100644
index 000000000..acb4de356
--- /dev/null
+++ b/src/es/doramasyt/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.kanade.tachiyomi.animeextension" />
\ No newline at end of file
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
new file mode 100644
index 000000000..439343d35
--- /dev/null
+++ b/src/es/doramasyt/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'Doramasyt'
+    pkgNameSuffix = 'es.doramasyt'
+    extClass = '.Doramasyt'
+    extVersionCode = 1
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"
\ No newline at end of file
diff --git a/src/es/doramasyt/res/mipmap-hdpi/ic_launcher.png b/src/es/doramasyt/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..76672eecc
Binary files /dev/null and b/src/es/doramasyt/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/doramasyt/res/mipmap-mdpi/ic_launcher.png b/src/es/doramasyt/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..8843b752a
Binary files /dev/null and b/src/es/doramasyt/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/doramasyt/res/mipmap-xhdpi/ic_launcher.png b/src/es/doramasyt/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..377109c04
Binary files /dev/null and b/src/es/doramasyt/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/doramasyt/res/mipmap-xxhdpi/ic_launcher.png b/src/es/doramasyt/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..f6f95d37b
Binary files /dev/null and b/src/es/doramasyt/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/doramasyt/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/doramasyt/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..494d802aa
Binary files /dev/null and b/src/es/doramasyt/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
new file mode 100644
index 000000000..212d55825
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
@@ -0,0 +1,287 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt
+
+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.doramasyt.extractors.FembedExtractor
+import eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors.OkruExtractor
+import eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors.SolidFilesExtractor
+import eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors.StreamTapeExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class Doramasyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Doramasyt"
+
+    override val baseUrl = "https://doramasyt.com"
+
+    override val lang = "es"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "div.col-lg-2.col-md-4.col-6 div.animes"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("https://doramasyt.com/doramas/?p=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.select("div.anithumb a").attr("href")
+        )
+        anime.title = element.select("div.animedtls p").text()
+        anime.thumbnail_url = element.select(" div.anithumb a img").attr("src")
+        anime.description = element.select("div.animedtls p").text()
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination li:last-child a"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        return super.episodeListParse(response).reversed()
+    }
+
+    override fun episodeListSelector(): String = "div.mainrowdiv.pagesdiv div.jpage div.col-item"
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        val epNum = getNumberFromEpsString(element.select("a div.flimss div.dtlsflim p").text())
+        Log.i("bruh ep", element.select("a").attr("href"))
+        val formatedEp = when {
+            (epNum.isNotEmpty()) -> epNum.toFloat()
+            else -> 1F
+        }
+        episode.setUrlWithoutDomain(element.select("a").attr("href"))
+        episode.episode_number = formatedEp
+        episode.name = "Episodio $formatedEp"
+
+        return episode
+    }
+
+    private fun getNumberFromEpsString(epsStr: String): String {
+        return epsStr.filter { it.isDigit() }
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        document.select("div.playermain ul.dropcaps li#play-video a.cap").forEach { players ->
+            val server = players.text()
+            val urlEncoded = players.attr("data-player")
+            val byte = android.util.Base64.decode(urlEncoded, android.util.Base64.DEFAULT)
+            val url = String(byte, charset("UTF-8")).replace("https://doramasyt.com/reproductor?url=", "")
+            Log.i("bruh server", url)
+            if (server == "fembed") {
+                val videos = FembedExtractor().videosFromUrl(url)
+                videoList.addAll(videos)
+            }
+            if (server == "streamtape") {
+                val video = StreamTapeExtractor(client).videoFromUrl(url, "Streamtape")
+                if (video != null) {
+                    videoList.add(video)
+                }
+            }
+            if (server == "ok") {
+                val videos = OkruExtractor(client).videosFromUrl(url)
+                videoList.addAll(videos)
+            }
+            if (server == "zeus") {
+                val videos = SolidFilesExtractor(client).videosFromUrl(url)
+                videoList.addAll(videos)
+            }
+        }
+        return videoList
+    }
+
+    override fun videoListSelector() = throw Exception("not used")
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "fembed")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality == quality) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/buscar?q=$query&p=$page", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/doramas?categoria=false&genero=${genreFilter.toUriPart()}&fecha=false&letra=false&p=$page")
+            else -> GET("$baseUrl/doramas/?p=$page")
+        }
+        // GET("$baseUrl/buscar?q=$query&p=$page")
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.selectFirst("a").attr("href")
+        )
+        anime.title = element.select("div.animedtls p").text()
+        anime.thumbnail_url = element.select("a img").attr("src")
+        anime.description = element.select("div.animedtls p").text()
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = popularAnimeSelector()
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        // anime.thumbnail_url = document.selectFirst("div.herohead div.heroheadmain").attr("style").substringAfter(",url(").substringBefore(") no-repeat;")
+        val sub = document.selectFirst("div.herohead div.heroheadmain strong").text()
+        val title = document.selectFirst("div.herohead div.heroheadmain h1").text().trim()
+        anime.title = title + if (sub.isNotEmpty()) " ($sub)" else ""
+        anime.description = document.selectFirst("div.herohead div.heroheadmain div.flimdtls p.textComplete")
+            .text().removeSurrounding("\"").replace("Ver menos", "")
+        anime.genre = document.select("div.herohead div.heroheadmain div.writersdiv div.nobel h6 a").joinToString { it.text() }
+        anime.status = parseStatus(document.select("div.herohead div.heroheadmain div.writersdiv div.state h6").text())
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("Estreno") -> SAnime.ONGOING
+            statusString.contains("Finalizado") -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = "" // popularAnimeNextPageSelector()
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.selectFirst("a").attr("href")
+        )
+        anime.title = element.selectFirst("a div.chapter p").text()
+        anime.thumbnail_url = element.select("a div.chapter img").attr("src")
+        anime.description = element.select("div.animedtls p").text()
+        return anime
+    }
+
+    override fun latestUpdatesRequest(page: Int) = GET(baseUrl)
+
+    override fun latestUpdatesSelector() = "div.heroarea div.heromain div.chapters div.row div.chaps" // popularAnimeSelector()
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter()
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Generos",
+        arrayOf(
+            Pair("<selecionar>", "false"),
+            Pair("Acción", "accion"),
+            Pair("Amistad", "amistad"),
+            Pair("Artes marciales", "artes-marciales"),
+            Pair("Aventuras", "aventuras"),
+            Pair("Bélico", "belico"),
+            Pair("C-Drama", "c-drama"),
+            Pair("Ciencia Ficción", "ciencia-ficcion"),
+            Pair("Comedia", "comedia"),
+            Pair("Comida", "comida"),
+            Pair("Crimen ", "crimen"),
+            Pair("Deporte", "deporte"),
+            Pair("Documental", "documental"),
+            Pair("Drama", "drama"),
+            Pair("Escolar", "escolar"),
+            Pair("Familiar", "familiar"),
+            Pair("Fantasia", "fantasia"),
+            Pair("Histórico", "historico"),
+            Pair("HK-Drama", "hk-drama"),
+            Pair("Horror", "horror"),
+            Pair("Idols", "idols"),
+            Pair("J-Drama", "j-drama"),
+            Pair("Juvenil", "juvenil"),
+            Pair("K-Drama", "k-drama"),
+            Pair("Legal", "legal"),
+            Pair("Médico", "medico"),
+            Pair("Melodrama", "melodrama"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Musical", "musical"),
+            Pair("Negocios", "negocios"),
+            Pair("Policial", "policial"),
+            Pair("Política", "politica"),
+            Pair("Psicológico", "psicologico"),
+            Pair("Reality Show", "reality-show"),
+            Pair("Recuentos de la vida", "recuentos-de-la-vida"),
+            Pair("Romance", "romance"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Supervivencia", "supervivencia"),
+            Pair("Suspenso", "suspenso"),
+            Pair("Thai-Drama", "thai-drama"),
+            Pair("Thriller", "thriller"),
+            Pair("Time Travel", "time-travel"),
+            Pair("TW-Drama", "tw-drama"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri")
+        )
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("Fembed:480p", "Fembed:720p", "Fembed:1080p", "Streamtape", "SolidFiles", "Okru: mobile", "Okru: lowest", "Okru: low", "Okru: sd", "Okru: hd")
+            entryValues = arrayOf("Fembed:480p", "Fembed:720p", "Fembed:1080p", "Streamtape", "SolidFiles", "Okru: mobile", "Okru: lowest", "Okru: low", "Okru: sd", "Okru: hd")
+            setDefaultValue("Fembed:720p")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
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
new file mode 100644
index 000000000..67b4d6b0c
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/FembedExtractor.kt
@@ -0,0 +1,30 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import org.json.JSONObject
+import org.jsoup.Connection
+import org.jsoup.Jsoup
+
+class FembedExtractor {
+    fun videosFromUrl(url: String): List<Video> {
+        val videoApi = url.replace("/v/", "/api/source/")
+        val json = JSONObject(Jsoup.connect(videoApi).ignoreContentType(true).method(Connection.Method.POST).execute().body())
+        val videoList = mutableListOf<Video>()
+        if (json.getBoolean("success")) {
+            val videoList = mutableListOf<Video>()
+            val jsonArray = json.getJSONArray("data")
+            for (i in 0 until jsonArray.length()) {
+                val `object` = jsonArray.getJSONObject(i)
+                val videoUrl = `object`.getString("file")
+                val quality = "Fembed:" + `object`.getString("label")
+                videoList.add(Video(videoUrl, quality, videoUrl, null))
+            }
+            return videoList
+        } else {
+            val videoUrl = "not used"
+            val quality = "Video taken down for dmca"
+            videoList.add(Video(videoUrl, quality, videoUrl, null))
+        }
+        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
new file mode 100644
index 000000000..fc79b6554
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/OkruExtractor.kt
@@ -0,0 +1,26 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class OkruExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String): List<Video> {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val videoList = mutableListOf<Video>()
+        val videosString = document.select("div[data-options]").attr("data-options")
+            .substringAfter("\\\"videos\\\":[{\\\"name\\\":\\\"")
+            .substringBefore("]")
+        videosString.split("{\\\"name\\\":\\\"").reversed().forEach {
+            val videoUrl = it.substringAfter("url\\\":\\\"")
+                .substringBefore("\\\"")
+                .replace("\\\\u0026", "&")
+            val videoQuality = "Okru: " + it.substringBefore("\\\"")
+            if (videoUrl.startsWith("https://")) {
+                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+            }
+        }
+        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
new file mode 100644
index 000000000..8fb2f7593
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/SolidFilesExtractor.kt
@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class SolidFilesExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String): List<Video> {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val videoList = mutableListOf<Video>()
+        document.select("script").forEach { script ->
+            if (script.data().contains("\"downloadUrl\":")) {
+                val data = script.data().substringAfter("\"downloadUrl\":").substringBefore(",")
+                val videoUrl = data.replace("\"", "")
+                val quality = "SolidFiles"
+                videoList.add(Video(videoUrl, quality, videoUrl, null))
+            }
+        }
+        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
new file mode 100644
index 000000000..d754a4709
--- /dev/null
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/StreamTapeExtractor.kt
@@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class StreamTapeExtractor(private val client: OkHttpClient) {
+    fun videoFromUrl(url: String, quality: String): Video? {
+        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 null
+        val videoUrl = "https:" + script.substringBefore("'") +
+            script.substringAfter("+ ('xcd").substringBefore("'")
+        return Video(url, quality, videoUrl, null)
+    }
+}
diff --git a/src/es/hentaijk/AndroidManifest.xml b/src/es/hentaijk/AndroidManifest.xml
new file mode 100644
index 000000000..acb4de356
--- /dev/null
+++ b/src/es/hentaijk/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.kanade.tachiyomi.animeextension" />
\ No newline at end of file
diff --git a/src/es/hentaijk/build.gradle b/src/es/hentaijk/build.gradle
new file mode 100644
index 000000000..eb548d097
--- /dev/null
+++ b/src/es/hentaijk/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'Hentaijk'
+    pkgNameSuffix = 'es.hentaijk'
+    extClass = '.Hentaijk'
+    extVersionCode = 1
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/es/hentaijk/res/mipmap-hdpi/ic_launcher.png b/src/es/hentaijk/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..e324c53a1
Binary files /dev/null and b/src/es/hentaijk/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/hentaijk/res/mipmap-mdpi/ic_launcher.png b/src/es/hentaijk/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..59f516b5e
Binary files /dev/null and b/src/es/hentaijk/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/hentaijk/res/mipmap-xhdpi/ic_launcher.png b/src/es/hentaijk/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..7065c8184
Binary files /dev/null and b/src/es/hentaijk/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/hentaijk/res/mipmap-xxhdpi/ic_launcher.png b/src/es/hentaijk/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..8811943ca
Binary files /dev/null and b/src/es/hentaijk/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/hentaijk/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/hentaijk/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..5317736da
Binary files /dev/null and b/src/es/hentaijk/res/mipmap-xxxhdpi/ic_launcher.png differ
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
new file mode 100644
index 000000000..b07a088a8
--- /dev/null
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/Hentaijk.kt
@@ -0,0 +1,463 @@
+package eu.kanade.tachiyomi.animeextension.es.hentaijk
+
+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.hentaijk.extractors.FembedExtractor
+import eu.kanade.tachiyomi.animeextension.es.hentaijk.extractors.OkruExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.Connection
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.lang.Exception
+
+class Hentaijk : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Hentaijk"
+
+    override val baseUrl = "https://hentaijk.com"
+
+    override val lang = "es"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "div.col-lg-12 div.list"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("https://hentaijk.com/top/")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.select("div#conb a").attr("href")
+        )
+        anime.title = element.select("div#conb a").attr("title")
+        anime.thumbnail_url = element.select("div#conb a img").attr("src")
+        anime.description = element.select("div#conb div#animinfo p").text()
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "uwu"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        val episodeLink = response.request.url
+        val pageBody = response.asJsoup()
+        val scriptText = pageBody.selectFirst("script:containsData(var invertir =)").data()
+        val animeId = scriptText.substringAfter("'/ajax/last_episode/", "")
+            .substringBefore("/',", "")
+            .ifEmpty { throw Exception("no video links found.") }
+
+        val pageNumber = pageBody.select("div.anime__pagination a")
+        val lastPage = pageNumber.last()?.attr("href")
+            ?.replace("#pag", "")
+        val firstPage = pageNumber.first()?.attr("href")
+            ?.replace("#pag", "")
+        Log.i("bruh", "ULTIMA: $lastPage")
+
+        if (firstPage != lastPage) {
+            var checkLast = 0
+            for (i in 1 until lastPage?.toInt()!!) {
+                Log.i("bruh", "aaa")
+                for (j in 1..12) {
+                    // Log.i("bruh", (j + checkLast).toString())
+                    val episode = SEpisode.create().apply {
+                        episode_number = (j + checkLast).toFloat()
+                        name = "Episodio ${j + checkLast}"
+                        date_upload = System.currentTimeMillis()
+                    }
+                    episode.setUrlWithoutDomain("$episodeLink/${j + checkLast}")
+                    episodes.add(episode)
+                }
+                checkLast += 12
+            }
+            Jsoup.connect("https://hentaijk.com/ajax/pagination_episodes/$animeId/$lastPage").get()
+                .body().select("body").text().replace("}]", "").split("}").forEach { json ->
+                    val number = json.substringAfter("\"number\":\"").substringBefore("\"")
+                    Log.i("bruh", number)
+                    val episode = SEpisode.create().apply {
+                        episode_number = number.toFloat()
+                        name = "Episodio $number"
+                        date_upload = System.currentTimeMillis()
+                    }
+                    episode.setUrlWithoutDomain("$episodeLink/$number")
+                    episodes.add(episode)
+                }
+        }
+
+        if (firstPage == lastPage) {
+            Jsoup.connect("https://hentaijk.com/ajax/pagination_episodes/$animeId/$lastPage").get()
+                .body().select("body").text().replace("}]", "").split("}").forEach { json ->
+                    val number = json.substringAfter("\"number\":\"").substringBefore("\"")
+                    Log.i("bruh", number)
+                    val episode = SEpisode.create().apply {
+                        episode_number = number.toFloat()
+                        name = "Episodio $number"
+                        date_upload = System.currentTimeMillis()
+                    }
+                    episode.setUrlWithoutDomain("$episodeLink/$number")
+                    episodes.add(episode)
+                }
+        }
+        return episodes.reversed()
+    }
+
+    override fun episodeListSelector() = throw Exception("not used")
+
+    override fun episodeFromElement(element: Element) = throw Exception("not used")
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val episodeLink = response.request.url.toString()
+        val videos = mutableListOf<Video>()
+        document.select("div.col-lg-12.rounded.bg-servers.text-white.p-3.mt-2 a").forEach { it ->
+            val server = it.text()
+            val serverId = it.attr("data-id")
+            document.select("script").forEach { script ->
+                if (script.data().contains("var video = [];")) {
+                    val url = (
+                        script.data().substringAfter("video[$serverId] = '<iframe class=\"player_conte\" src=\"")
+                            .substringBefore("\"")
+                        )
+                        .replace("$baseUrl/jkfembed.php?u=", "https://embedsito.com/v/")
+                        .replace("$baseUrl/jkokru.php?u=", "http://ok.ru/videoembed/")
+                        .replace("$baseUrl/jkvmixdrop.php?u=", "https://mixdrop.co/e/")
+                        .replace("$baseUrl/jk.php?u=", "$baseUrl/")
+                    if (url.contains("um2")) {
+                        val doc = Jsoup.connect(url).referrer(episodeLink).get()
+                        val dataKey = doc.select("form input[value]").attr("value")
+                        Jsoup.connect("$baseUrl/gsplay/redirect_post.php").headers(
+                            mapOf(
+                                "Host" to "hentaijk.com",
+                                "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+                                "Accept-Language" to "en-US,en;q=0.5",
+                                "Referer" to url,
+                                "Content-Type" to "application/x-www-form-urlencoded",
+                                "Origin" to "https://hentaijk.com",
+                                "DNT" to "1",
+                                "Connection" to "keep-alive",
+                                "Upgrade-Insecure-Requests" to "1",
+                                "Sec-Fetch-Dest" to "iframe",
+                                "Sec-Fetch-Mode" to "navigate",
+                                "Sec-Fetch-Site" to "same-origin",
+                                "TE" to "trailers",
+                                "Pragma" to "no-cache",
+                                "Cache-Control" to "no-cache",
+                            )
+                        ).data(mapOf("data" to dataKey)).method(Connection.Method.POST).followRedirects(false)
+                            .execute().headers("location").forEach { loc ->
+                                val postkey = loc.replace("/gsplay/player.html#", "")
+                                val nozomitext = Jsoup.connect("https://hentaijk.com/gsplay/api.php").method(Connection.Method.POST).data("v", postkey).ignoreContentType(true).execute().body()
+                                nozomitext.toString().split("}").forEach { file ->
+                                    val nozomiUrl = file.substringAfter("\"file\":\"").substringBefore("\"").replace("\\", "")
+                                    if (nozomiUrl.isNotBlank() && !nozomiUrl.contains("{")) {
+                                        videos.add(Video(nozomiUrl, server, nozomiUrl, null))
+                                    }
+                                }
+                            }
+                    }
+
+                    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))
+                        "um.php" in url -> videos.add(HentaijkExtractor().videoFromUrl(url, server))
+                    }
+                }
+            }
+        }
+        return videos
+    }
+
+    private class HentaijkExtractor() {
+        fun videoFromUrl(url: String, server: String): Video {
+            var url1 = ""
+            Jsoup.connect(url).get().body().select("script").forEach {
+                if (it.data().contains("var parts = {")) {
+                    url1 = it.data().substringAfter("url: '").substringBefore("'")
+                }
+            }
+            return Video(url1, server, url1, null)
+        }
+    }
+
+    override fun videoListSelector() = throw Exception("not used")
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "Sabrosio")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality == quality) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/buscar/$query/$page/?filtro=fecha&tipo=none&estado=none&orden=desc", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/genero/${genreFilter.toUriPart()}/$page")
+            else -> GET("$baseUrl/directorio/$page/?filtro=fecha&tipo=none&estado=none&fecha=none&temporada=none&orden=desc")
+        }
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.select("div.anime__item a").attr("href")
+        )
+        anime.title = element.select("div.anime__item div#ainfo div.title").text()
+        anime.thumbnail_url = element.select("div.anime__item a div").attr("data-setbg")
+        anime.description = element.select("div.anime__item#ainfo p").text()
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = ".anime__page__content #botones ~ .row"
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        return parseSearchJson(response)
+        // return super.searchAnimeParse(response)
+    }
+
+    private fun parseSearchJson(jsonLine: Response): AnimesPage {
+        val animeList = mutableListOf<SAnime>()
+        val document = jsonLine.asJsoup()
+        val hasNextPage = document.select("section.contenido.spad div.container div.navigation a.nav-next").any()
+        var isSearchLayer = document.select(".col-lg-2.col-md-6.col-sm-6").any()
+        val isFilterLayer = document.select(".card.mb-3.custom_item2").any()
+        if (isSearchLayer) {
+            document.select(".col-lg-2.col-md-6.col-sm-6").forEach { animeData ->
+                val anime = SAnime.create()
+                anime.title = animeData.select("div.anime__item #ainfo div.title").html()
+                anime.thumbnail_url = animeData.select("div.anime__item a div.anime__item__pic").attr("data-setbg")
+                anime.setUrlWithoutDomain(animeData.select("div.anime__item a").attr("href"))
+                anime.status = parseStatus(animeData.select("div.anime__item div.anime__item__text ul li:nth-child(1)").html())
+                val tags = animeData.select("div.anime__item div.anime__item__text ul li").joinToString { it.text() }
+                anime.genre = tags
+                animeList.add(anime)
+            }
+        } else if (isFilterLayer) {
+            document.select(".card.mb-3.custom_item2").forEach { animeData ->
+                val anime = SAnime.create()
+                anime.title = animeData.select("div.row div.col-md-7 div.card-body h5.card-title a").html()
+                anime.thumbnail_url = animeData.select("div.row div.custom_thumb2 a img").attr("src")
+                anime.setUrlWithoutDomain(animeData.select("div.row div.col-md-7 div.card-body h5.card-title a").attr("href"))
+                anime.status = parseStatus(animeData.select("div.row div.col-md-7 div.card-body div.card-info p.card-status").text())
+                val tags = animeData.select("div.row div.col-md-7 div.card-body div.card-info p").joinToString { it.text() }
+                anime.genre = tags
+                anime.description = animeData.select("div.row div.col-md-7 div.card-body p.synopsis").text()
+                animeList.add(anime)
+            }
+        }
+        Log.i("bruh parseSearchJson", hasNextPage.toString())
+        return AnimesPage(animeList, hasNextPage)
+    }
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.selectFirst("div.col-lg-3 div.anime__details__pic.set-bg").attr("data-setbg")
+        anime.title = document.selectFirst("div.anime__details__text div.anime__details__title h3").text()
+        anime.description = document.select("div.col-lg-9 div.anime__details__text p").first().ownText()
+        document.select("div.row div.col-lg-6.col-md-6 ul li").forEach { animeData ->
+            val data = animeData.select("span").text()
+            if (data.contains("Genero")) {
+                anime.genre = animeData.select("a").joinToString { it.text() }
+            }
+            if (data.contains("Estado")) {
+                anime.status = parseStatus(animeData.select("span").text())
+            }
+            if (data.contains("Studios")) {
+                anime.author = animeData.select("a").text()
+            }
+        }
+
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when {
+            statusString.contains("Por estrenar") -> SAnime.ONGOING
+            statusString.contains("En emision") -> SAnime.ONGOING
+            statusString.contains("Concluido") -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector(): String = "div.container div.navigation a.text.nav-next"
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.select("div.row.g-0 div.col-md-5.custom_thumb2 a").attr("href")
+        )
+        anime.title = element.select("div.row.g-0 div.col-md-7 div.card-body h5.card-title a").text()
+        anime.thumbnail_url = element.select("div.row.g-0 div.col-md-5.custom_thumb2 a img").attr("src")
+        anime.description = element.select("div.row.g-0 div.col-md-7 div.card-body p.card-text.synopsis").text()
+        return anime
+    }
+
+    override fun latestUpdatesRequest(page: Int): Request = GET("https://hentaijk.com/directorio/$page/?filtro=fecha&tipo=none&estado=none&fecha=none&temporada=none&orden=desc")
+
+    override fun latestUpdatesSelector(): String = "div.card.mb-3.custom_item2"
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter()
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Generos",
+        arrayOf(
+            Pair("<selecionar>", "none"),
+            Pair("Español latino", "latino"),
+            Pair("Accion", "accion"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Autos", "autos"),
+            Pair("Aventura", "aventura"),
+            Pair("Colegial", "colegial"),
+            Pair("Comedia", "comedia"),
+            Pair("Cosas de la vida", "cosas-de-la-vida"),
+            Pair("Dementia", "dementia"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Fantasia", "fantasa"),
+            Pair("Harem", "harem"),
+            Pair("Historico", "historico"),
+            Pair("Josei", "josei"),
+            Pair("Juegos", "juegos"),
+            Pair("Magia", "magia"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Musica", "musica"),
+            Pair("Niños", "nios"),
+            Pair("Parodia", "parodia"),
+            Pair("Policial", "policial"),
+            Pair("Psicologico", "psicologico"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Sci-fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("Shounen ai", "shounen-ai"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Super poderes", "super-poderes"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampiros", "vampiros"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+            Pair("Español latino", "latino"),
+            Pair("Accion", "accion"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Autos", "autos"),
+            Pair("Aventura", "aventura"),
+            Pair("Colegial", "colegial"),
+            Pair("Comedia", "comedia"),
+            Pair("Cosas de la vida", "cosas-de-la-vida"),
+            Pair("Dementia", "dementia"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Fantasia", "fantasa"),
+            Pair("Harem", "harem"),
+            Pair("Historico", "historico"),
+            Pair("Josei", "josei"),
+            Pair("Juegos", "juegos"),
+            Pair("Magia", "magia"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Musica", "musica"),
+            Pair("Niños", "nios"),
+            Pair("Parodia", "parodia"),
+            Pair("Policial", "policial"),
+            Pair("Psicologico", "psicologico"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Sci-fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("Shounen ai", "shounen-ai"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Super poderes", "super-poderes"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampiros", "vampiros"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+        )
+    )
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("Sabrosio", "Desu", "Xtreme S", "Fembed:480p", "Fembed:720p", "Fembed:1080p", "Okru: full", "Okru: sd", "Okru: low", "Okru: lowest", "Okru: mobile")
+            entryValues = arrayOf("Sabrosio", "Desu", "Xtreme S", "Fembed:480p", "Fembed:720p", "Fembed:1080p", "Okru: full", "Okru: sd", "Okru: low", "Okru: lowest", "Okru: mobile")
+            setDefaultValue("Sabrosio")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}
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
new file mode 100644
index 000000000..bed18adb2
--- /dev/null
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/FembedExtractor.kt
@@ -0,0 +1,30 @@
+package eu.kanade.tachiyomi.animeextension.es.hentaijk.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import org.json.JSONObject
+import org.jsoup.Connection
+import org.jsoup.Jsoup
+
+class FembedExtractor {
+    fun videosFromUrl(url: String): List<Video> {
+        val videoApi = url.replace("/v/", "/api/source/")
+        val json = JSONObject(Jsoup.connect(videoApi).ignoreContentType(true).method(Connection.Method.POST).execute().body())
+        val videoList = mutableListOf<Video>()
+        if (json.getBoolean("success")) {
+            val videoList = mutableListOf<Video>()
+            val jsonArray = json.getJSONArray("data")
+            for (i in 0 until jsonArray.length()) {
+                val `object` = jsonArray.getJSONObject(i)
+                val videoUrl = `object`.getString("file")
+                val quality = "Fembed:" + `object`.getString("label")
+                videoList.add(Video(videoUrl, quality, videoUrl, null))
+            }
+            return videoList
+        } else {
+            val videoUrl = "not used"
+            val quality = "Video taken down for dmca"
+            videoList.add(Video(videoUrl, quality, videoUrl, null))
+        }
+        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
new file mode 100644
index 000000000..a6f5b7ade
--- /dev/null
+++ b/src/es/hentaijk/src/eu/kanade/tachiyomi/animeextension/es/hentaijk/extractors/OkruExtractor.kt
@@ -0,0 +1,26 @@
+package eu.kanade.tachiyomi.animeextension.es.hentaijk.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class OkruExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String): List<Video> {
+        val document = client.newCall(GET(url)).execute().asJsoup()
+        val videoList = mutableListOf<Video>()
+        val videosString = document.select("div[data-options]").attr("data-options")
+            .substringAfter("\\\"videos\\\":[{\\\"name\\\":\\\"")
+            .substringBefore("]")
+        videosString.split("{\\\"name\\\":\\\"").reversed().forEach {
+            val videoUrl = it.substringAfter("url\\\":\\\"")
+                .substringBefore("\\\"")
+                .replace("\\\\u0026", "&")
+            val videoQuality = "Okru: " + it.substringBefore("\\\"")
+            if (videoUrl.startsWith("https://")) {
+                videoList.add(Video(videoUrl, videoQuality, videoUrl, null))
+            }
+        }
+        return videoList
+    }
+}
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 1a3fe5813..eb4cb14ff 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Jkanime'
     pkgNameSuffix = 'es.jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 2
+    extVersionCode = 3
     libVersion = '12'
 }
 
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 adddb49f1..74348ca65 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
@@ -10,12 +10,12 @@ import eu.kanade.tachiyomi.animeextension.es.jkanime.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -227,11 +227,52 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
 
         return when {
-            query.isNotBlank() -> GET("$baseUrl/buscar/$query/$page", headers)
+            query.isNotBlank() -> GET("$baseUrl/buscar/$query/$page/?filtro=fecha&tipo=none&estado=none&orden=desc", headers)
             genreFilter.state != 0 -> GET("$baseUrl/genero/${genreFilter.toUriPart()}/$page")
-            else -> GET("$baseUrl/directorio/$page ")
+            else -> GET("$baseUrl/directorio/$page/?filtro=fecha&tipo=none&estado=none&fecha=none&temporada=none&orden=desc")
         }
     }
+
+    override fun searchAnimeSelector(): String = ".anime__page__content #botones ~ .row"
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        return parseSearchJson(response)
+        // return super.searchAnimeParse(response)
+    }
+
+    private fun parseSearchJson(jsonLine: Response): AnimesPage {
+        val animeList = mutableListOf<SAnime>()
+        val document = jsonLine.asJsoup()
+        val hasNextPage = document.select("section.contenido.spad div.container div.navigation a.nav-next").any()
+        var isSearchLayer = document.select(".col-lg-2.col-md-6.col-sm-6").any()
+        val isFilterLayer = document.select(".card.mb-3.custom_item2").any()
+        if (isSearchLayer) {
+            document.select(".col-lg-2.col-md-6.col-sm-6").forEach { animeData ->
+                val anime = SAnime.create()
+                anime.title = animeData.select("div.anime__item #ainfo div.title").html()
+                anime.thumbnail_url = animeData.select("div.anime__item a div.anime__item__pic").attr("data-setbg")
+                anime.setUrlWithoutDomain(animeData.select("div.anime__item a").attr("href"))
+                anime.status = parseStatus(animeData.select("div.anime__item div.anime__item__text ul li:nth-child(1)").html())
+                val tags = animeData.select("div.anime__item div.anime__item__text ul li").joinToString { it.text() }
+                anime.genre = tags
+                animeList.add(anime)
+            }
+        } else if (isFilterLayer) {
+            document.select(".card.mb-3.custom_item2").forEach { animeData ->
+                val anime = SAnime.create()
+                anime.title = animeData.select("div.row div.col-md-7 div.card-body h5.card-title a").html()
+                anime.thumbnail_url = animeData.select("div.row div.custom_thumb2 a img").attr("src")
+                anime.setUrlWithoutDomain(animeData.select("div.row div.col-md-7 div.card-body h5.card-title a").attr("href"))
+                anime.status = parseStatus(animeData.select("div.row div.col-md-7 div.card-body div.card-info p.card-status").text())
+                val tags = animeData.select("div.row div.col-md-7 div.card-body div.card-info p").joinToString { it.text() }
+                anime.genre = tags
+                anime.description = animeData.select("div.row div.col-md-7 div.card-body p.synopsis").text()
+                animeList.add(anime)
+            }
+        }
+        return AnimesPage(animeList, hasNextPage)
+    }
+
     override fun searchAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
         anime.setUrlWithoutDomain(
@@ -245,8 +286,6 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
 
-    override fun searchAnimeSelector(): String = "div.row div.col-lg-2.col-md-6.col-sm-6"
-
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()
         anime.thumbnail_url = document.selectFirst("div.col-lg-3 div.anime__details__pic.set-bg").attr("data-setbg")
@@ -270,6 +309,7 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private fun parseStatus(statusString: String): Int {
         return when {
+            statusString.contains("Por estrenar") -> SAnime.ONGOING
             statusString.contains("En emision") -> SAnime.ONGOING
             statusString.contains("Concluido") -> SAnime.COMPLETED
             else -> SAnime.UNKNOWN
@@ -301,8 +341,93 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private class GenreFilter : UriPartFilter(
         "Generos",
         arrayOf(
-            Pair("<selecionar>", ""),
-            Pair("Español Latino", "latino")
+            Pair("<selecionar>", "none"),
+            Pair("Español latino", "latino"),
+            Pair("Accion", "accion"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Autos", "autos"),
+            Pair("Aventura", "aventura"),
+            Pair("Colegial", "colegial"),
+            Pair("Comedia", "comedia"),
+            Pair("Cosas de la vida", "cosas-de-la-vida"),
+            Pair("Dementia", "dementia"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Fantasia", "fantasa"),
+            Pair("Harem", "harem"),
+            Pair("Historico", "historico"),
+            Pair("Josei", "josei"),
+            Pair("Juegos", "juegos"),
+            Pair("Magia", "magia"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Musica", "musica"),
+            Pair("Niños", "nios"),
+            Pair("Parodia", "parodia"),
+            Pair("Policial", "policial"),
+            Pair("Psicologico", "psicologico"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Sci-fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("Shounen ai", "shounen-ai"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Super poderes", "super-poderes"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampiros", "vampiros"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri"),
+            Pair("Español latino", "latino"),
+            Pair("Accion", "accion"),
+            Pair("Artes Marciales", "artes-marciales"),
+            Pair("Autos", "autos"),
+            Pair("Aventura", "aventura"),
+            Pair("Colegial", "colegial"),
+            Pair("Comedia", "comedia"),
+            Pair("Cosas de la vida", "cosas-de-la-vida"),
+            Pair("Dementia", "dementia"),
+            Pair("Demonios", "demonios"),
+            Pair("Deportes", "deportes"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Fantasia", "fantasa"),
+            Pair("Harem", "harem"),
+            Pair("Historico", "historico"),
+            Pair("Josei", "josei"),
+            Pair("Juegos", "juegos"),
+            Pair("Magia", "magia"),
+            Pair("Mecha", "mecha"),
+            Pair("Militar", "militar"),
+            Pair("Misterio", "misterio"),
+            Pair("Musica", "musica"),
+            Pair("Niños", "nios"),
+            Pair("Parodia", "parodia"),
+            Pair("Policial", "policial"),
+            Pair("Psicologico", "psicologico"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("Sci-fi", "sci-fi"),
+            Pair("Seinen", "seinen"),
+            Pair("Shoujo", "shoujo"),
+            Pair("Shoujo ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("Shounen ai", "shounen-ai"),
+            Pair("Sobrenatural", "sobrenatural"),
+            Pair("Space", "space"),
+            Pair("Super poderes", "super-poderes"),
+            Pair("Terror", "terror"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampiros", "vampiros"),
+            Pair("Yaoi", "yaoi"),
+            Pair("Yuri", "yuri")
         )
     )