diff --git a/src/es/jkhentai/AndroidManifest.xml b/src/es/jkhentai/AndroidManifest.xml
new file mode 100644
index 000000000..acb4de356
--- /dev/null
+++ b/src/es/jkhentai/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/jkhentai/build.gradle b/src/es/jkhentai/build.gradle
new file mode 100644
index 000000000..6a9cd3177
--- /dev/null
+++ b/src/es/jkhentai/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'Jkhentai'
+    pkgNameSuffix = 'es.jkhentai'
+    extClass = '.Jkhentai'
+    extVersionCode = 1
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/es/jkhentai/res/mipmap-hdpi/ic_launcher.png b/src/es/jkhentai/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..131d077f0
Binary files /dev/null and b/src/es/jkhentai/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/jkhentai/res/mipmap-mdpi/ic_launcher.png b/src/es/jkhentai/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..131d077f0
Binary files /dev/null and b/src/es/jkhentai/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/jkhentai/res/mipmap-xhdpi/ic_launcher.png b/src/es/jkhentai/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..131d077f0
Binary files /dev/null and b/src/es/jkhentai/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/jkhentai/res/mipmap-xxhdpi/ic_launcher.png b/src/es/jkhentai/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..131d077f0
Binary files /dev/null and b/src/es/jkhentai/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/jkhentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/jkhentai/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..131d077f0
Binary files /dev/null and b/src/es/jkhentai/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt
new file mode 100644
index 000000000..cd3c10971
--- /dev/null
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/Jkhentai.kt
@@ -0,0 +1,242 @@
+package eu.kanade.tachiyomi.animeextension.es.jkhentai
+
+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.jkhentai.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
+import java.lang.Exception
+
+class Jkhentai : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Jkhentai"
+
+    override val baseUrl = "https://www.jkhentai.net"
+
+    override val lang = "es"
+
+    override val supportsLatest = false
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "div#contenedor div.items div#directorio div#box_movies div.movie"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("https://www.jkhentai.net/lista/$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(
+            element.select("div.imagen a").attr("href")
+        )
+        anime.title = element.select("h2").text()
+        anime.thumbnail_url = element.select("div.imagen img").attr("src")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "a.page.larger"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+
+        val jsoup = response.asJsoup()
+        val animeId = response.request.url.pathSegments.last().replace("-sub-espanol", "").replace("-080p", "-1080p")
+        Log.i("bruh", "$animeId")
+        jsoup.select("div#contenedor div.items.ptts div#movie div.post div#cssmenu ul li.has-sub.open ul li").forEach { it ->
+            Log.i("bruh", "e")
+
+            val epNum = it.select("a").attr("href").replace("https://www.jkhentai.net/ver/$animeId-", "")
+            Log.i("bruh", "Episode-$epNum")
+            val episode = SEpisode.create().apply {
+                episode_number = epNum.toFloat()
+                name = "Episodio $epNum"
+                url = "/ver/$animeId-$epNum"
+                date_upload = System.currentTimeMillis()
+            }
+            episodes.add(episode)
+        }
+
+        return episodes
+    }
+
+    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 videoList = mutableListOf<Video>()
+        document.select("div#contenedor div.items.ptts div#movie div.post div#player-container ul.player-menu li").forEach { it ->
+            val server = it.select("a").text()
+            Log.i("bruh", "1Server:$server")
+            document.select("div#contenedor div.items.ptts div#movie div.post div#player-container div.play-c").forEach() {
+                if (server == "StreamTape") {
+                    val url = it.select("div.player-content iframe").attr("src")
+                    val video = StreamTapeExtractor(client).videoFromUrl(url, server)
+                    if (video != null) {
+                        videoList.add(video)
+                    }
+                }
+            }
+        }
+        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", "StreamTape")
+        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/buscador.php?search=$query&page=$page", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/genero/${genreFilter.toUriPart()}/$page")
+            else -> GET("$baseUrl/lista/$page ")
+        }
+    }
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        return popularAnimeFromElement(element)
+    }
+
+    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#contenedor div.items.ptts div#movie div.post div.headingder div.datos div.imgs.tsll a img").attr("src")
+        anime.title = document.selectFirst("div#contenedor div.items.ptts div#movie div.post div.headingder div.datos div.dataplus h1").text()
+        anime.description = "Titulo Original: " + document.select("div#contenedor div.items.ptts div#movie div.post div.headingder div.datos div.dataplus span.original").first().ownText()
+        anime.genre = document.select("div.items.ptts div#movie div.post div.headingder div.datos div.dataplus div#dato-1.data-content div.xmll p.xcsd strong a").joinToString { it.text() }
+        anime.status = SAnime.COMPLETED
+        return anime
+    }
+
+    override fun latestUpdatesNextPageSelector() = throw Exception("not used")
+
+    override fun latestUpdatesFromElement(element: Element) = throw Exception("not used")
+
+    override fun latestUpdatesRequest(page: Int) = throw Exception("not used")
+
+    override fun latestUpdatesSelector() = throw Exception("not used")
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter()
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Generos",
+        arrayOf(
+            Pair("<selecionar>", ""),
+            Pair("Acción", "accion"),
+            Pair("Ahegao", "ahegao"),
+            Pair("Anal", "anal"),
+            Pair("Bakunyuu", "bakunyuu"),
+            Pair("Bondage", "bondage"),
+            Pair("Comedia", "comedia"),
+            Pair("Drama", "drama"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Escolares", "escolares"),
+            Pair("Fantasía", "fantasía"),
+            Pair("Enfermeras", "enfermeras"),
+            Pair("Futanari", "futanari"),
+            Pair("Harem", "Harem"),
+            Pair("Incesto", "incesto"),
+            Pair("Juegos Sexuales", "juegos-sexuales"),
+            Pair("Lolicon", "lolicon"),
+            Pair("Maduras", "milf"),
+            Pair("Notorare", "netorare"),
+            Pair("Ninfomania", "ninfomania"),
+            Pair("Orgia", "orgia"),
+            Pair("Romance", "romance"),
+            Pair("Sin censura", "sin-censura"),
+            Pair("Sumisas", "sumisas"),
+            Pair("Sirvientas", "sirvientas"),
+            Pair("Teacher", "teacher"),
+            Pair("Tentaculos", "tentaculos"),
+            Pair("TETONAS", "tetonas"),
+            Pair("Violacion", "violacion"),
+            Pair("Virgenes(como tu)", "virgenes"),
+            Pair("Yaoi", "Yaoi"),
+            Pair("Yuri", "yuri"),
+            Pair("Hentai 3D", "hentai-3d"),
+            Pair("Bestialidad", "bestialidad"),
+            Pair("Chikan", "chikan"),
+            Pair("Casadas", "casadas"),
+            Pair("Cream Pie", "cream-pie"),
+            Pair("Gangbang", "gangbang"),
+            Pair("Hardcore", "hardcore"),
+            Pair("Maids", "maids"),
+            Pair("Netorase", "netorase"),
+            Pair("Shota", "shota"),
+            Pair("Succubus", "succubus")
+        )
+    )
+
+    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("StreamTape")
+            entryValues = arrayOf("StreamTape")
+            setDefaultValue("StreamTape")
+            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/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt
new file mode 100644
index 000000000..d5ae0f53c
--- /dev/null
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/FembedExtractor.kt
@@ -0,0 +1,24 @@
+package eu.kanade.tachiyomi.animeextension.es.jkhentai.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())
+        check(json.getBoolean("success")) { "Request was not succeeded" }
+        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
+    }
+}
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt
new file mode 100644
index 000000000..31360559f
--- /dev/null
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/OkruExtractor.kt
@@ -0,0 +1,26 @@
+package eu.kanade.tachiyomi.animeextension.es.jkhentai.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/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt
new file mode 100644
index 000000000..caefdd7e3
--- /dev/null
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/SolidFilesExtractor.kt
@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.animeextension.es.jkhentai.extractors
+
+import android.util.Log
+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 url = data.replace("\"", "")
+                Log.i("bruh", "$url")
+                val videoUrl = url
+                val quality = "SolidFiles"
+                videoList.add(Video(videoUrl, quality, videoUrl, null))
+            }
+        }
+        return videoList
+    }
+}
diff --git a/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt
new file mode 100644
index 000000000..55e583a97
--- /dev/null
+++ b/src/es/jkhentai/src/eu/kanade/tachiyomi/animeextension/es/jkhentai/extractors/StreamTapeExtractor.kt
@@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.animeextension.es.jkhentai.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)
+    }
+}