diff --git a/src/de/anime24/AndroidManifest.xml b/src/de/anime24/AndroidManifest.xml
new file mode 100644
index 000000000..acb4de356
--- /dev/null
+++ b/src/de/anime24/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/de/anime24/build.gradle b/src/de/anime24/build.gradle
new file mode 100644
index 000000000..369cc1416
--- /dev/null
+++ b/src/de/anime24/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+    extName = 'Anime24'
+    pkgNameSuffix = 'de.anime24'
+    extClass = '.Anime24'
+    extVersionCode = 1
+    libVersion = '13'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/de/anime24/res/mipmap-hdpi/ic_launcher.png b/src/de/anime24/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..c7614560f
Binary files /dev/null and b/src/de/anime24/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_back.png b/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..8dc560dd4
Binary files /dev/null and b/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_fore.png b/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..4b45af0a4
Binary files /dev/null and b/src/de/anime24/res/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/de/anime24/res/mipmap-mdpi/ic_launcher.png b/src/de/anime24/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..f16ed70cc
Binary files /dev/null and b/src/de/anime24/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_back.png b/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..f8feb6e59
Binary files /dev/null and b/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_fore.png b/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..546fc123b
Binary files /dev/null and b/src/de/anime24/res/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/de/anime24/res/mipmap-xhdpi/ic_launcher.png b/src/de/anime24/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..d2e4a4c8a
Binary files /dev/null and b/src/de/anime24/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_back.png b/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..1b560124d
Binary files /dev/null and b/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..3b26091b1
Binary files /dev/null and b/src/de/anime24/res/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/de/anime24/res/mipmap-xxhdpi/ic_launcher.png b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..28e59888b
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..369383ac8
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..2f010778f
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..7f3a3f701
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..de26e98f5
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..ba83f89e8
Binary files /dev/null and b/src/de/anime24/res/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/Anime24.kt b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/Anime24.kt
new file mode 100644
index 000000000..d08fa45b8
--- /dev/null
+++ b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/Anime24.kt
@@ -0,0 +1,258 @@
+package eu.kanade.tachiyomi.animeextension.de.anime24
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.MultiSelectListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.de.anime24.extractors.StreamTapeExtractor
+import eu.kanade.tachiyomi.animeextension.de.anime24.extractors.VoeExtractor
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+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 org.jsoup.select.Elements
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import kotlin.Exception
+
+class Anime24 : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Anime24"
+
+    override val baseUrl = "https://anime24.to"
+
+    override val lang = "de"
+
+    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 = "article.bs"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/anime/?page=$page&status=&type=&order=popular")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a.tip").attr("href"))
+        anime.thumbnail_url = element.select("div.limit img").attr("src")
+        anime.title = element.select("div.limit img").attr("title")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "a.r"
+
+    // episodes
+
+    override fun episodeListSelector() = throw Exception("not used")
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val episodeList = mutableListOf<SEpisode>()
+        val episodeElement = document.select("div.eplister ul")
+        val episode = parseEpisodesFromSeries(episodeElement)
+        episodeList.addAll(episode)
+        return episodeList
+    }
+
+    private fun parseEpisodesFromSeries(element: Elements): List<SEpisode> {
+        val episodeElements = element.select("li")
+        return episodeElements.map { episodeFromElement(it) }
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.episode_number = element.select("a div.epl-num").text().toFloat()
+        val folge = element.select("a div.epl-num").text()
+        episode.name = "Folge $folge : " + element.select("a div.epl-title").text()
+        episode.setUrlWithoutDomain(element.select("a").attr("href").replace("dub", "sub"))
+        return episode
+    }
+
+    // Video Extractor
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        return videosFromElement(document)
+    }
+
+    private fun videosFromElement(document: Document): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val link = document.select("#pembed iframe").attr("src")
+        val hosterSelection = preferences.getStringSet("hoster_selection", setOf("stape", "voe"))
+        when {
+            link.contains("https://streamtape") || link.contains("https://adblockeronstape") && hosterSelection?.contains("stape") == true -> {
+                val quality = "Streamtape, Sub"
+                val video = StreamTapeExtractor(client).videoFromUrl(link, quality)
+                if (video != null) {
+                    videoList.add(video)
+                }
+            }
+            link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
+                val quality = "Voe, Sub"
+                val video = VoeExtractor(client).videoFromUrl(link, quality)
+                if (video != null) {
+                    videoList.add(video)
+                }
+            }
+        }
+        val duburl = document.select("link[rel=canonical]").attr("href").replace("sub", "dub")
+        val dubdoc = client.newCall(GET(duburl)).execute().asJsoup()
+        val dublink = dubdoc.select("#pembed iframe").attr("src")
+        when {
+            dublink.contains("https://streamtape") || dublink.contains("https://adblockeronstape") && hosterSelection?.contains("stape") == true -> {
+                val quality = "Streamtape, Dub"
+                val video = StreamTapeExtractor(client).videoFromUrl(dublink, quality)
+                if (video != null) {
+                    videoList.add(video)
+                }
+            }
+            dublink.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
+                val quality = "Voe, Dub"
+                val video = VoeExtractor(client).videoFromUrl(dublink, quality)
+                if (video != null) {
+                    videoList.add(video)
+                }
+            }
+        }
+        return videoList.reversed()
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val hoster = preferences.getString("preferred_hoster", null)
+        val subPreference = preferences.getString("preferred_sub", "Sub")!!
+        val hosterList = mutableListOf<Video>()
+        val otherList = mutableListOf<Video>()
+        if (hoster != null) {
+            for (video in this) {
+                if (video.url.contains(hoster)) {
+                    hosterList.add(video)
+                } else {
+                    otherList.add(video)
+                }
+            }
+        } else otherList += this
+        val newList = mutableListOf<Video>()
+        var preferred = 0
+        for (video in hosterList) {
+            if (video.quality.contains(subPreference)) {
+                newList.add(preferred, video)
+                preferred++
+            } else newList.add(video)
+        }
+        for (video in otherList) {
+            if (video.quality.contains(subPreference)) {
+                newList.add(preferred, video)
+                preferred++
+            } else newList.add(video)
+        }
+        return newList
+    }
+
+    override fun videoListSelector() = throw Exception("not used")
+
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    // Search
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a.tip").attr("href"))
+        anime.thumbnail_url = element.select("div.limit img").attr("src")
+        anime.title = element.select("div.limit img").attr("title")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "a.next"
+
+    override fun searchAnimeSelector(): String = "article.bs"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/page/$page/?s=$query")
+
+    // Details
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.select("div.thumb img").attr("data-lazy-src")
+        anime.title = document.select("div.infox h1").text()
+        anime.genre = document.select("div.genxed a").joinToString(", ") { it.text() }
+        anime.description = document.select("div.entry-content p").text()
+        anime.author = document.select("span.split a").joinToString(", ") { it.text() }
+        anime.status = SAnime.COMPLETED
+        return anime
+    }
+
+    // Latest
+
+    override fun latestUpdatesNextPageSelector(): String = throw Exception("Not used")
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = throw Exception("Not used")
+
+    override fun latestUpdatesRequest(page: Int): Request = throw Exception("Not used")
+
+    override fun latestUpdatesSelector(): String = throw Exception("Not used")
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val hosterPref = ListPreference(screen.context).apply {
+            key = "preferred_hoster"
+            title = "Standard-Hoster"
+            entries = arrayOf("Streamtape", "Voe")
+            entryValues = arrayOf("https://streamtape", "https://voe.sx")
+            setDefaultValue("https://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()
+            }
+        }
+        val subSelection = MultiSelectListPreference(screen.context).apply {
+            key = "hoster_selection"
+            title = "Hoster auswählen"
+            entries = arrayOf("Streamtape", "Voe")
+            entryValues = arrayOf("stape", "voe")
+            setDefaultValue(setOf("stape", "voe"))
+
+            setOnPreferenceChangeListener { _, newValue ->
+                preferences.edit().putStringSet(key, newValue as Set<String>).commit()
+            }
+        }
+        val subPref = ListPreference(screen.context).apply {
+            key = "preferred_sub"
+            title = "Standardmäßig Sub oder Dub?"
+            entries = arrayOf("Sub", "Dub")
+            entryValues = arrayOf("Sub", "Dub")
+            setDefaultValue("Sub")
+            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(subPref)
+        screen.addPreference(hosterPref)
+        screen.addPreference(subSelection)
+    }
+}
diff --git a/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/StreamTapeExtractor.kt b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/StreamTapeExtractor.kt
new file mode 100644
index 000000000..2428380d0
--- /dev/null
+++ b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/StreamTapeExtractor.kt
@@ -0,0 +1,18 @@
+package eu.kanade.tachiyomi.animeextension.de.anime24.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)
+    }
+}
diff --git a/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/VoeExtractor.kt b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/VoeExtractor.kt
new file mode 100644
index 000000000..c985641c5
--- /dev/null
+++ b/src/de/anime24/src/eu/kanade/tachiyomi/animeextension/de/anime24/extractors/VoeExtractor.kt
@@ -0,0 +1,17 @@
+package eu.kanade.tachiyomi.animeextension.de.anime24.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.OkHttpClient
+
+class VoeExtractor(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(function d04ad2e48229ae25a282e15c7c2f69a2(dea04c5949242bfd216e35def894b930))")
+            .firstOrNull()?.data()?.substringAfter("\"hls\": \"") ?: return null
+        val videoUrl = script.substringAfter("\"hls\": \"").substringBefore("\",")
+        return Video(url, quality, videoUrl)
+    }
+}