diff --git a/src/es/pelisforte/AndroidManifest.xml b/src/es/pelisforte/AndroidManifest.xml
new file mode 100644
index 000000000..568741e54
--- /dev/null
+++ b/src/es/pelisforte/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
\ No newline at end of file
diff --git a/src/es/pelisforte/build.gradle b/src/es/pelisforte/build.gradle
new file mode 100644
index 000000000..37502ffa1
--- /dev/null
+++ b/src/es/pelisforte/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+    extName = 'PelisForte'
+    pkgNameSuffix = 'es.pelisforte'
+    extClass = '.PelisForte'
+    extVersionCode = 1
+    libVersion = '13'
+}
+
+dependencies {
+    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib-yourupload-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib-playlist-utils'))
+    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib-okru-extractor'))
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisforte/res/mipmap-hdpi/ic_launcher.png b/src/es/pelisforte/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..b295e339e
Binary files /dev/null and b/src/es/pelisforte/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/es/pelisforte/res/mipmap-mdpi/ic_launcher.png b/src/es/pelisforte/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..5f73a21ab
Binary files /dev/null and b/src/es/pelisforte/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/es/pelisforte/res/mipmap-xhdpi/ic_launcher.png b/src/es/pelisforte/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..6fedde8b9
Binary files /dev/null and b/src/es/pelisforte/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/es/pelisforte/res/mipmap-xxhdpi/ic_launcher.png b/src/es/pelisforte/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..bb4ce7347
Binary files /dev/null and b/src/es/pelisforte/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/es/pelisforte/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/pelisforte/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..e6841f553
Binary files /dev/null and b/src/es/pelisforte/res/mipmap-xxxhdpi/ic_launcher.png differ
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
new file mode 100644
index 000000000..71ca96660
--- /dev/null
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -0,0 +1,333 @@
+package eu.kanade.tachiyomi.animeextension.es.pelisforte
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+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.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
+
+    override val name = "PelisForte"
+
+    override val baseUrl = "https://pelisforte.nu"
+
+    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)
+    }
+
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]", "[CAST]")
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "StreamWish"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Doodstream",
+            "Fastream", "Filemoon", "StreamWish", "Okru",
+        )
+    }
+
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/ultimas-peliculas/page/$page", headers)
+
+    override fun popularAnimeParse(response: Response): AnimesPage {
+        val document = response.asJsoup()
+        val elements = document.select("#movies-a li[id*=post-]")
+        val nextPage = document.select(".pagination .nav-links .current ~ a:not(.page-link)").any()
+        val animeList = elements.map { element ->
+            SAnime.create().apply {
+                setUrlWithoutDomain(element.selectFirst("article > a")?.attr("abs:href") ?: "")
+                title = element.selectFirst("article .entry-header .entry-title")?.text() ?: ""
+                thumbnail_url = element.selectFirst("article .post-thumbnail figure img")?.getImageUrl()
+            }
+        }
+        return AnimesPage(animeList, nextPage)
+    }
+
+    protected open fun org.jsoup.nodes.Element.getImageUrl(): String? {
+        return if (hasAttr("srcset")) {
+            try {
+                fetchUrls(attr("abs:srcset")).maxOrNull()
+            } catch (_: Exception) {
+                attr("abs:src")
+            }
+        } else {
+            attr("abs:src")
+        }
+    }
+
+    override fun latestUpdatesRequest(page: Int) = popularAnimeRequest(page)
+
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
+
+    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/page/$page?s=$query", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/${genreFilter.toUriPart()}", headers)
+            else -> popularAnimeRequest(page)
+        }
+    }
+
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val document = response.asJsoup()
+        val animeDetails = SAnime.create().apply {
+            title = document.selectFirst(".alg-cr .entry-header .entry-title")?.text() ?: ""
+            description = document.select(".alg-cr .description").text()
+            thumbnail_url = document.selectFirst(".alg-cr .post-thumbnail img")?.getImageUrl()
+            genre = document.select(".genres a").joinToString { it.text() }
+            status = SAnime.UNKNOWN
+        }
+
+        document.select(".cast-lst li").map {
+            if (it.select("span").text().contains("Director", true)) {
+                animeDetails.author = it.selectFirst("p > a")?.text()
+            }
+            if (it.select("span").text().contains("Actores", true)) {
+                animeDetails.artist = it.selectFirst("p > a")?.text()
+            }
+        }
+        return animeDetails
+    }
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        return listOf(
+            SEpisode.create().apply {
+                setUrlWithoutDomain(response.request.url.toString())
+                name = "Película"
+                episode_number = 1F
+            },
+        )
+    }
+
+    private fun fetchUrls(text: String?): List<String> {
+        if (text.isNullOrEmpty()) return listOf()
+        val linkRegex = "(http|ftp|https):\\/\\/([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:\\/~+#-]*[\\w@?^=%&\\/~+#-])".toRegex()
+        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        document.select(".video-player iframe").forEach {
+            try {
+                val id = it.parent()?.attr("id")
+                val idTab = document.selectFirst("[href=\"#$id\"]")?.closest(".lrt")?.attr("id")
+                val lang = document.select("[tab=$idTab]").text()
+                val src = it.attr("src").ifEmpty { it.attr("data-src") }
+                val key = src.substringAfter("/?h=")
+                val player = "https://${src.toHttpUrl().host}/r.php?h=$key"
+                val prefix = when {
+                    lang.contains("Latino", true) -> "[LAT]"
+                    lang.contains("Subtitulado", true) -> "[SUB]"
+                    lang.contains("Castellano", true) -> "[CAST]"
+                    else -> ""
+                }
+                val locationsDdh = client.newCall(GET(player,headers = headers.newBuilder().add("referer", src).build()))
+                    .execute().networkResponse.toString()
+
+                fetchUrls(locationsDdh).forEach {
+                    serverVideoResolver(it, prefix, src).also(videoList::addAll)
+                }
+            } catch (_: Exception) {}
+        }
+        return videoList
+    }
+
+    private fun serverVideoResolver(url: String, prefix: String = "", referer: String = ""): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, "${prefix}Voe")?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "${prefix}Filemoon").also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") ||
+                embedUrl.contains("strwish") || embedUrl.contains("wish")
+            ) {
+                val docHeaders = headers.newBuilder()
+                    .add("Referer", referer)
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, "${prefix}StreamWish").also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                DoodExtractor(client).videoFromUrl(url, "${prefix}DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url, prefix = "${prefix}Fastream:").forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape")) {
+                StreamTapeExtractor(client).videoFromUrl(url, quality = "${prefix}StreamTape")?.let { videoList.add(it) }
+            }
+        } catch (_: Exception) {
+        }
+        return videoList
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        GenreFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Géneros",
+        arrayOf(
+            Pair("Seleccionar", ""),
+            Pair("Acción", "peliculas/accion-p01"),
+            Pair("Animación", "peliculas/animacion-p04"),
+            Pair("Aventura", "peliculas/aventura"),
+            Pair("Bélicas", "peliculas/belica"),
+            Pair("Ciencia ficción", "peliculas/ciencia-ficcion"),
+            Pair("Comedia", "peliculas/comedia"),
+            Pair("Crimen", "peliculas/crimen"),
+            Pair("Documentales", "peliculas/documental"),
+            Pair("Drama", "peliculas/drama"),
+            Pair("Familia", "peliculas/familia-p01"),
+            Pair("Fantasía", "peliculas/fantasia-p01"),
+            Pair("Historia", "peliculas/historia"),
+            Pair("Misterio", "peliculas/misterio"),
+            Pair("Música", "peliculas/musica"),
+            Pair("Navidad", "peliculas/navidad"),
+            Pair("Romance", "peliculas/romance"),
+            Pair("Suspenso", "peliculas/suspense"),
+            Pair("Terror", "peliculas/terror"),
+            Pair("Western", "peliculas/western"),
+        ),
+    )
+
+    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) {
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred server"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+    }
+}