diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..176a458f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..107acd32c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/en/genoanime/AndroidManifest.xml b/src/en/genoanime/AndroidManifest.xml
index 8b54e3957..acb4de356 100644
--- a/src/en/genoanime/AndroidManifest.xml
+++ b/src/en/genoanime/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest package="eu.kanade.tachiyomi.animeextension" />
\ No newline at end of file
diff --git a/src/en/genoanime/build.gradle b/src/en/genoanime/build.gradle
index e5e4397b5..cfed46319 100644
--- a/src/en/genoanime/build.gradle
+++ b/src/en/genoanime/build.gradle
@@ -1,12 +1,12 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    extName = 'GenoAnime'
-    pkgNameSuffix = 'en.genoanime'
-    extClass = '.GenoAnime'
-    extVersionCode = 8
-    libVersion = '12'
-}
-
-apply from: "$rootDir/common.gradle"
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'GenoAnime'
+    pkgNameSuffix = 'en.genoanime'
+    extClass = '.GenoAnime'
+    extVersionCode = 8
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/gogoanime/build.gradle b/src/en/gogoanime/build.gradle
index d0025b538..79f0b7f71 100644
--- a/src/en/gogoanime/build.gradle
+++ b/src/en/gogoanime/build.gradle
@@ -1,12 +1,12 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    extName = 'Gogoanime'
-    pkgNameSuffix = 'en.gogoanime'
-    extClass = '.GogoAnime'
-    extVersionCode = 30
-    libVersion = '12'
-}
-
-apply from: "$rootDir/common.gradle"
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'Gogoanime'
+    pkgNameSuffix = 'en.gogoanime'
+    extClass = '.GogoAnime'
+    extVersionCode = 30
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
index e26db1930..5b3cc894e 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
@@ -1,274 +1,274 @@
-package eu.kanade.tachiyomi.animeextension.en.gogoanime
-
-import android.app.Application
-import android.content.SharedPreferences
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.DoodExtractor
-import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.GogoCdnExtractor
-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 kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-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 uy.kohesive.injekt.injectLazy
-import java.lang.Exception
-
-@ExperimentalSerializationApi
-class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
-
-    override val name = "Gogoanime"
-
-    override val baseUrl = "https://gogoanime.fi"
-
-    override val lang = "en"
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient = network.cloudflareClient
-
-    private val json: Json by injectLazy()
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    override fun popularAnimeSelector(): String = "div.img a"
-
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/popular.html?page=$page")
-
-    override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.attr("href"))
-        anime.thumbnail_url = element.select("img").first().attr("src")
-        anime.title = element.attr("title")
-        return anime
-    }
-
-    override fun popularAnimeNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
-
-    override fun episodeListSelector() = "ul#episode_page li a"
-
-    override fun episodeListParse(response: Response): List<SEpisode> {
-        val document = response.asJsoup()
-        val totalEpisodes = document.select(episodeListSelector()).last().attr("ep_end")
-        val id = document.select("input#movie_id").attr("value")
-        return episodesRequest(totalEpisodes, id)
-    }
-
-    private fun episodesRequest(totalEpisodes: String, id: String): List<SEpisode> {
-        val request = GET("https://ajax.gogo-load.com/ajax/load-list-episode?ep_start=0&ep_end=$totalEpisodes&id=$id", headers)
-        val epResponse = client.newCall(request).execute()
-        val document = epResponse.asJsoup()
-        return document.select("a").map { episodeFromElement(it) }
-    }
-
-    override fun episodeFromElement(element: Element): SEpisode {
-        val episode = SEpisode.create()
-        episode.setUrlWithoutDomain(baseUrl + element.attr("href").substringAfter(" "))
-        val ep = element.selectFirst("div.name").ownText().substringAfter(" ")
-        episode.episode_number = ep.toFloat()
-        episode.name = "Episode $ep"
-        episode.date_upload = System.currentTimeMillis()
-        return episode
-    }
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val serverUrl = "https:" + document.select("div.anime_muti_link > ul > li.anime > a")
-            .attr("data-video")
-        val doodUrl = document.select("div.anime_muti_link > ul > li.doodstream > a")
-            .attr("data-video")
-        val gogoVideos = GogoCdnExtractor(client, json).videosFromUrl(serverUrl)
-        return gogoVideos.ifEmpty {
-            DoodExtractor(client).videosFromUrl(doodUrl)
-        }
-    }
-
-    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")
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "1080")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality.contains(quality)) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
-    }
-
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.attr("href"))
-        anime.thumbnail_url = element.select("img").first().attr("src")
-        anime.title = element.attr("title")
-        return anime
-    }
-
-    override fun searchAnimeNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
-
-    override fun searchAnimeSelector(): String = "div.img a"
-
-    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/search.html?keyword=$query&page=$page", headers)
-            genreFilter.state != 0 -> GET("$baseUrl/genre/${genreFilter.toUriPart()}?page=$page")
-            else -> GET("$baseUrl/popular.html?page=$page")
-        }
-    }
-
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.title = document.select("div.anime_info_body_bg h1").text()
-        anime.genre = document.select("p.type:eq(5) a").joinToString("") { it.text() }
-        anime.description = document.select("p.type:eq(4)").first().ownText()
-        anime.status = parseStatus(document.select("p.type:eq(7) a").text())
-
-        // add alternative name to anime description
-        val altName = "Other name(s): "
-        document.select("p.type:eq(8)").firstOrNull()?.ownText()?.let {
-            if (it.isBlank().not()) {
-                anime.description = when {
-                    anime.description.isNullOrBlank() -> altName + it
-                    else -> anime.description + "\n\n$altName" + it
-                }
-            }
-        }
-        return anime
-    }
-
-    private fun parseStatus(statusString: String): Int {
-        return when (statusString) {
-            "Ongoing" -> SAnime.ONGOING
-            "Completed" -> SAnime.COMPLETED
-            else -> SAnime.UNKNOWN
-        }
-    }
-
-    override fun latestUpdatesNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
-
-    override fun latestUpdatesFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(baseUrl + element.attr("href"))
-        val style = element.select("div.thumbnail-popular").attr("style")
-        anime.thumbnail_url = style.substringAfter("background: url('").substringBefore("');")
-        anime.title = element.attr("title")
-        return anime
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request =
-        GET("https://ajax.gogo-load.com/ajax/page-recent-release-ongoing.html?page=$page&type=1", headers)
-
-    override fun latestUpdatesSelector(): String = "div.added_series_body.popular li a:has(div)"
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("1080p", "720p", "480p", "360p")
-            entryValues = arrayOf("1080", "720", "480", "360")
-            setDefaultValue("1080")
-            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)
-    }
-
-    // Filters
-    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
-        AnimeFilter.Header("Text search ignores filters"),
-        GenreFilter()
-    )
-
-    private class GenreFilter : UriPartFilter(
-        "Genres",
-        arrayOf(
-            Pair("<select>", ""),
-            Pair("Action", "action"),
-            Pair("Adventure", "adventure"),
-            Pair("Cars", "cars"),
-            Pair("Comedy", "comedy"),
-            Pair("Crime", "crime"),
-            Pair("Dementia", "dementia"),
-            Pair("Demons", "demons"),
-            Pair("Drama", "drama"),
-            Pair("Dub", "dub"),
-            Pair("Ecchi", "ecchi"),
-            Pair("Family", "family"),
-            Pair("Fantasy", "fantasy"),
-            Pair("Game", "game"),
-            Pair("Harem", "harem"),
-            Pair("Historical", "historical"),
-            Pair("Horror", "horror"),
-            Pair("Josei", "josei"),
-            Pair("Kids", "kids"),
-            Pair("Magic", "magic"),
-            Pair("Martial Arts", "martial-arts"),
-            Pair("Mature", "mature"),
-            Pair("Mecha", "mecha"),
-            Pair("Military", "military"),
-            Pair("Music", "music"),
-            Pair("Mystery", "mystery"),
-            Pair("Parody", "parody"),
-            Pair("Police", "police"),
-            Pair("Psychological", "psychological"),
-            Pair("Romance", "romance"),
-            Pair("Samurai", "samurai"),
-            Pair("School", "school"),
-            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("Slice of Life", "slice-of-life"),
-            Pair("Space", "space"),
-            Pair("Sports", "sports"),
-            Pair("Super Power", "super-power"),
-            Pair("Supernatural", "supernatural"),
-            Pair("Thriller", "thriller"),
-            Pair("Vampire", "vampire"),
-            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
-    }
-}
+package eu.kanade.tachiyomi.animeextension.en.gogoanime
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.GogoCdnExtractor
+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 kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.Json
+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 uy.kohesive.injekt.injectLazy
+import java.lang.Exception
+
+@ExperimentalSerializationApi
+class GogoAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Gogoanime"
+
+    override val baseUrl = "https://gogoanime.fi"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val json: Json by injectLazy()
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "div.img a"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/popular.html?page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.select("img").first().attr("src")
+        anime.title = element.attr("title")
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
+
+    override fun episodeListSelector() = "ul#episode_page li a"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        val totalEpisodes = document.select(episodeListSelector()).last().attr("ep_end")
+        val id = document.select("input#movie_id").attr("value")
+        return episodesRequest(totalEpisodes, id)
+    }
+
+    private fun episodesRequest(totalEpisodes: String, id: String): List<SEpisode> {
+        val request = GET("https://ajax.gogo-load.com/ajax/load-list-episode?ep_start=0&ep_end=$totalEpisodes&id=$id", headers)
+        val epResponse = client.newCall(request).execute()
+        val document = epResponse.asJsoup()
+        return document.select("a").map { episodeFromElement(it) }
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.setUrlWithoutDomain(baseUrl + element.attr("href").substringAfter(" "))
+        val ep = element.selectFirst("div.name").ownText().substringAfter(" ")
+        episode.episode_number = ep.toFloat()
+        episode.name = "Episode $ep"
+        episode.date_upload = System.currentTimeMillis()
+        return episode
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val serverUrl = "https:" + document.select("div.anime_muti_link > ul > li.anime > a")
+            .attr("data-video")
+        val doodUrl = document.select("div.anime_muti_link > ul > li.doodstream > a")
+            .attr("data-video")
+        val gogoVideos = GogoCdnExtractor(client, json).videosFromUrl(serverUrl)
+        return gogoVideos.ifEmpty {
+            DoodExtractor(client).videosFromUrl(doodUrl)
+        }
+    }
+
+    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")
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "1080")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(quality)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href"))
+        anime.thumbnail_url = element.select("img").first().attr("src")
+        anime.title = element.attr("title")
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
+
+    override fun searchAnimeSelector(): String = "div.img a"
+
+    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/search.html?keyword=$query&page=$page", headers)
+            genreFilter.state != 0 -> GET("$baseUrl/genre/${genreFilter.toUriPart()}?page=$page")
+            else -> GET("$baseUrl/popular.html?page=$page")
+        }
+    }
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.title = document.select("div.anime_info_body_bg h1").text()
+        anime.genre = document.select("p.type:eq(5) a").joinToString("") { it.text() }
+        anime.description = document.select("p.type:eq(4)").first().ownText()
+        anime.status = parseStatus(document.select("p.type:eq(7) a").text())
+
+        // add alternative name to anime description
+        val altName = "Other name(s): "
+        document.select("p.type:eq(8)").firstOrNull()?.ownText()?.let {
+            if (it.isBlank().not()) {
+                anime.description = when {
+                    anime.description.isNullOrBlank() -> altName + it
+                    else -> anime.description + "\n\n$altName" + it
+                }
+            }
+        }
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when (statusString) {
+            "Ongoing" -> SAnime.ONGOING
+            "Completed" -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector(): String = "ul.pagination-list li:last-child:not(.selected)"
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(baseUrl + element.attr("href"))
+        val style = element.select("div.thumbnail-popular").attr("style")
+        anime.thumbnail_url = style.substringAfter("background: url('").substringBefore("');")
+        anime.title = element.attr("title")
+        return anime
+    }
+
+    override fun latestUpdatesRequest(page: Int): Request =
+        GET("https://ajax.gogo-load.com/ajax/page-recent-release-ongoing.html?page=$page&type=1", headers)
+
+    override fun latestUpdatesSelector(): String = "div.added_series_body.popular li a:has(div)"
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("1080p", "720p", "480p", "360p")
+            entryValues = arrayOf("1080", "720", "480", "360")
+            setDefaultValue("1080")
+            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)
+    }
+
+    // Filters
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("Text search ignores filters"),
+        GenreFilter()
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Genres",
+        arrayOf(
+            Pair("<select>", ""),
+            Pair("Action", "action"),
+            Pair("Adventure", "adventure"),
+            Pair("Cars", "cars"),
+            Pair("Comedy", "comedy"),
+            Pair("Crime", "crime"),
+            Pair("Dementia", "dementia"),
+            Pair("Demons", "demons"),
+            Pair("Drama", "drama"),
+            Pair("Dub", "dub"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Family", "family"),
+            Pair("Fantasy", "fantasy"),
+            Pair("Game", "game"),
+            Pair("Harem", "harem"),
+            Pair("Historical", "historical"),
+            Pair("Horror", "horror"),
+            Pair("Josei", "josei"),
+            Pair("Kids", "kids"),
+            Pair("Magic", "magic"),
+            Pair("Martial Arts", "martial-arts"),
+            Pair("Mature", "mature"),
+            Pair("Mecha", "mecha"),
+            Pair("Military", "military"),
+            Pair("Music", "music"),
+            Pair("Mystery", "mystery"),
+            Pair("Parody", "parody"),
+            Pair("Police", "police"),
+            Pair("Psychological", "psychological"),
+            Pair("Romance", "romance"),
+            Pair("Samurai", "samurai"),
+            Pair("School", "school"),
+            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("Slice of Life", "slice-of-life"),
+            Pair("Space", "space"),
+            Pair("Sports", "sports"),
+            Pair("Super Power", "super-power"),
+            Pair("Supernatural", "supernatural"),
+            Pair("Thriller", "thriller"),
+            Pair("Vampire", "vampire"),
+            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
+    }
+}
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
index ab8e8773a..6db66efd4 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
@@ -1,39 +1,39 @@
-package eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(serverUrl: String): List<Video> {
-        val response = client.newCall(GET(serverUrl)).execute()
-        val doodTld = serverUrl.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return emptyList()
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", serverUrl)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        return listOf(Video(serverUrl, "Doodstream mirror", videoUrl, null, doodHeaders(doodTld)))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
+package eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class DoodExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(serverUrl: String): List<Video> {
+        val response = client.newCall(GET(serverUrl)).execute()
+        val doodTld = serverUrl.substringAfter("https://dood.").substringBefore("/")
+        val content = response.body!!.string()
+        if (!content.contains("'/pass_md5/")) return emptyList()
+        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
+        val token = md5.substringAfterLast("/")
+        val randomString = getRandomString()
+        val expiry = System.currentTimeMillis()
+        val videoUrlStart = client.newCall(
+            GET(
+                "https://dood.$doodTld/pass_md5/$md5",
+                Headers.headersOf("referer", serverUrl)
+            )
+        ).execute().body!!.string()
+        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
+        return listOf(Video(serverUrl, "Doodstream mirror", videoUrl, null, doodHeaders(doodTld)))
+    }
+
+    private fun getRandomString(length: Int = 10): String {
+        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
+        return (1..length)
+            .map { allowedChars.random() }
+            .joinToString("")
+    }
+
+    private fun doodHeaders(tld: String) = Headers.Builder().apply {
+        add("User-Agent", "Aniyomi")
+        add("Referer", "https://dood.$tld/")
+    }.build()
+}
diff --git a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/JSONUtil.java b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/JSONUtil.java
index d385a25be..94a622cb9 100644
--- a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/JSONUtil.java
+++ b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/JSONUtil.java
@@ -1,88 +1,88 @@
-package eu.kanade.tachiyomi.animeextension.en.nineanime;
-
-public class JSONUtil {
-    public static String escape(String input) {
-        StringBuilder output = new StringBuilder();
-
-        for(int i=0; i<input.length(); i++) {
-            char ch = input.charAt(i);
-            int chx = (int) ch;
-
-            // let's not put any nulls in our strings
-            assert(chx != 0);
-
-            if(ch == '\n') {
-                output.append("\\n");
-            } else if(ch == '\t') {
-                output.append("\\t");
-            } else if(ch == '\r') {
-                output.append("\\r");
-            } else if(ch == '\\') {
-                output.append("\\\\");
-            } else if(ch == '"') {
-                output.append("\\\"");
-            } else if(ch == '\b') {
-                output.append("\\b");
-            } else if(ch == '\f') {
-                output.append("\\f");
-            } else if(chx >= 0x10000) {
-                assert false : "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't.";
-            } else if(chx > 127) {
-                output.append(String.format("\\u%04x", chx));
-            } else {
-                output.append(ch);
-            }
-        }
-
-        return output.toString();
-    }
-
-    public static String unescape(String input) {
-        StringBuilder builder = new StringBuilder();
-
-        int i = 0;
-        while (i < input.length()) {
-            char delimiter = input.charAt(i); i++; // consume letter or backslash
-
-            if(delimiter == '\\' && i < input.length()) {
-
-                // consume first after backslash
-                char ch = input.charAt(i); i++;
-
-                if(ch == '\\' || ch == '/' || ch == '"' || ch == '\'') {
-                    builder.append(ch);
-                }
-                else if(ch == 'n') builder.append('\n');
-                else if(ch == 'r') builder.append('\r');
-                else if(ch == 't') builder.append('\t');
-                else if(ch == 'b') builder.append('\b');
-                else if(ch == 'f') builder.append('\f');
-                else if(ch == 'u') {
-
-                    StringBuilder hex = new StringBuilder();
-
-                    // expect 4 digits
-                    if (i+4 > input.length()) {
-                        throw new RuntimeException("Not enough unicode digits! ");
-                    }
-                    for (char x : input.substring(i, i + 4).toCharArray()) {
-                        if(!Character.isLetterOrDigit(x)) {
-                            throw new RuntimeException("Bad character in unicode escape.");
-                        }
-                        hex.append(Character.toLowerCase(x));
-                    }
-                    i+=4; // consume those four digits.
-
-                    int code = Integer.parseInt(hex.toString(), 16);
-                    builder.append((char) code);
-                } else {
-                    throw new RuntimeException("Illegal escape sequence: \\"+ch);
-                }
-            } else { // it's not a backslash, or it's the last character.
-                builder.append(delimiter);
-            }
-        }
-
-        return builder.toString();
-    }
-}
+package eu.kanade.tachiyomi.animeextension.en.nineanime;
+
+public class JSONUtil {
+    public static String escape(String input) {
+        StringBuilder output = new StringBuilder();
+
+        for(int i=0; i<input.length(); i++) {
+            char ch = input.charAt(i);
+            int chx = (int) ch;
+
+            // let's not put any nulls in our strings
+            assert(chx != 0);
+
+            if(ch == '\n') {
+                output.append("\\n");
+            } else if(ch == '\t') {
+                output.append("\\t");
+            } else if(ch == '\r') {
+                output.append("\\r");
+            } else if(ch == '\\') {
+                output.append("\\\\");
+            } else if(ch == '"') {
+                output.append("\\\"");
+            } else if(ch == '\b') {
+                output.append("\\b");
+            } else if(ch == '\f') {
+                output.append("\\f");
+            } else if(chx >= 0x10000) {
+                assert false : "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't.";
+            } else if(chx > 127) {
+                output.append(String.format("\\u%04x", chx));
+            } else {
+                output.append(ch);
+            }
+        }
+
+        return output.toString();
+    }
+
+    public static String unescape(String input) {
+        StringBuilder builder = new StringBuilder();
+
+        int i = 0;
+        while (i < input.length()) {
+            char delimiter = input.charAt(i); i++; // consume letter or backslash
+
+            if(delimiter == '\\' && i < input.length()) {
+
+                // consume first after backslash
+                char ch = input.charAt(i); i++;
+
+                if(ch == '\\' || ch == '/' || ch == '"' || ch == '\'') {
+                    builder.append(ch);
+                }
+                else if(ch == 'n') builder.append('\n');
+                else if(ch == 'r') builder.append('\r');
+                else if(ch == 't') builder.append('\t');
+                else if(ch == 'b') builder.append('\b');
+                else if(ch == 'f') builder.append('\f');
+                else if(ch == 'u') {
+
+                    StringBuilder hex = new StringBuilder();
+
+                    // expect 4 digits
+                    if (i+4 > input.length()) {
+                        throw new RuntimeException("Not enough unicode digits! ");
+                    }
+                    for (char x : input.substring(i, i + 4).toCharArray()) {
+                        if(!Character.isLetterOrDigit(x)) {
+                            throw new RuntimeException("Bad character in unicode escape.");
+                        }
+                        hex.append(Character.toLowerCase(x));
+                    }
+                    i+=4; // consume those four digits.
+
+                    int code = Integer.parseInt(hex.toString(), 16);
+                    builder.append((char) code);
+                } else {
+                    throw new RuntimeException("Illegal escape sequence: \\"+ch);
+                }
+            } else { // it's not a backslash, or it's the last character.
+                builder.append(delimiter);
+            }
+        }
+
+        return builder.toString();
+    }
+}
diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/JSONUtil.java b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/JSONUtil.java
index 914995394..72c7a419f 100644
--- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/JSONUtil.java
+++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/JSONUtil.java
@@ -1,88 +1,88 @@
-package eu.kanade.tachiyomi.animeextension.en.zoro;
-
-public class JSONUtil {
-    public static String escape(String input) {
-        StringBuilder output = new StringBuilder();
-
-        for(int i=0; i<input.length(); i++) {
-            char ch = input.charAt(i);
-            int chx = (int) ch;
-
-            // let's not put any nulls in our strings
-            assert(chx != 0);
-
-            if(ch == '\n') {
-                output.append("\\n");
-            } else if(ch == '\t') {
-                output.append("\\t");
-            } else if(ch == '\r') {
-                output.append("\\r");
-            } else if(ch == '\\') {
-                output.append("\\\\");
-            } else if(ch == '"') {
-                output.append("\\\"");
-            } else if(ch == '\b') {
-                output.append("\\b");
-            } else if(ch == '\f') {
-                output.append("\\f");
-            } else if(chx >= 0x10000) {
-                assert false : "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't.";
-            } else if(chx > 127) {
-                output.append(String.format("\\u%04x", chx));
-            } else {
-                output.append(ch);
-            }
-        }
-
-        return output.toString();
-    }
-
-    public static String unescape(String input) {
-        StringBuilder builder = new StringBuilder();
-
-        int i = 0;
-        while (i < input.length()) {
-            char delimiter = input.charAt(i); i++; // consume letter or backslash
-
-            if(delimiter == '\\' && i < input.length()) {
-
-                // consume first after backslash
-                char ch = input.charAt(i); i++;
-
-                if(ch == '\\' || ch == '/' || ch == '"' || ch == '\'') {
-                    builder.append(ch);
-                }
-                else if(ch == 'n') builder.append('\n');
-                else if(ch == 'r') builder.append('\r');
-                else if(ch == 't') builder.append('\t');
-                else if(ch == 'b') builder.append('\b');
-                else if(ch == 'f') builder.append('\f');
-                else if(ch == 'u') {
-
-                    StringBuilder hex = new StringBuilder();
-
-                    // expect 4 digits
-                    if (i+4 > input.length()) {
-                        throw new RuntimeException("Not enough unicode digits! ");
-                    }
-                    for (char x : input.substring(i, i + 4).toCharArray()) {
-                        if(!Character.isLetterOrDigit(x)) {
-                            throw new RuntimeException("Bad character in unicode escape.");
-                        }
-                        hex.append(Character.toLowerCase(x));
-                    }
-                    i+=4; // consume those four digits.
-
-                    int code = Integer.parseInt(hex.toString(), 16);
-                    builder.append((char) code);
-                } else {
-                    throw new RuntimeException("Illegal escape sequence: \\"+ch);
-                }
-            } else { // it's not a backslash, or it's the last character.
-                builder.append(delimiter);
-            }
-        }
-
-        return builder.toString();
-    }
-}
+package eu.kanade.tachiyomi.animeextension.en.zoro;
+
+public class JSONUtil {
+    public static String escape(String input) {
+        StringBuilder output = new StringBuilder();
+
+        for(int i=0; i<input.length(); i++) {
+            char ch = input.charAt(i);
+            int chx = (int) ch;
+
+            // let's not put any nulls in our strings
+            assert(chx != 0);
+
+            if(ch == '\n') {
+                output.append("\\n");
+            } else if(ch == '\t') {
+                output.append("\\t");
+            } else if(ch == '\r') {
+                output.append("\\r");
+            } else if(ch == '\\') {
+                output.append("\\\\");
+            } else if(ch == '"') {
+                output.append("\\\"");
+            } else if(ch == '\b') {
+                output.append("\\b");
+            } else if(ch == '\f') {
+                output.append("\\f");
+            } else if(chx >= 0x10000) {
+                assert false : "Java stores as u16, so it should never give us a character that's bigger than 2 bytes. It literally can't.";
+            } else if(chx > 127) {
+                output.append(String.format("\\u%04x", chx));
+            } else {
+                output.append(ch);
+            }
+        }
+
+        return output.toString();
+    }
+
+    public static String unescape(String input) {
+        StringBuilder builder = new StringBuilder();
+
+        int i = 0;
+        while (i < input.length()) {
+            char delimiter = input.charAt(i); i++; // consume letter or backslash
+
+            if(delimiter == '\\' && i < input.length()) {
+
+                // consume first after backslash
+                char ch = input.charAt(i); i++;
+
+                if(ch == '\\' || ch == '/' || ch == '"' || ch == '\'') {
+                    builder.append(ch);
+                }
+                else if(ch == 'n') builder.append('\n');
+                else if(ch == 'r') builder.append('\r');
+                else if(ch == 't') builder.append('\t');
+                else if(ch == 'b') builder.append('\b');
+                else if(ch == 'f') builder.append('\f');
+                else if(ch == 'u') {
+
+                    StringBuilder hex = new StringBuilder();
+
+                    // expect 4 digits
+                    if (i+4 > input.length()) {
+                        throw new RuntimeException("Not enough unicode digits! ");
+                    }
+                    for (char x : input.substring(i, i + 4).toCharArray()) {
+                        if(!Character.isLetterOrDigit(x)) {
+                            throw new RuntimeException("Bad character in unicode escape.");
+                        }
+                        hex.append(Character.toLowerCase(x));
+                    }
+                    i+=4; // consume those four digits.
+
+                    int code = Integer.parseInt(hex.toString(), 16);
+                    builder.append((char) code);
+                } else {
+                    throw new RuntimeException("Illegal escape sequence: \\"+ch);
+                }
+            } else { // it's not a backslash, or it's the last character.
+                builder.append(delimiter);
+            }
+        }
+
+        return builder.toString();
+    }
+}
diff --git a/src/id/otakudesu/AndroidManifest.xml b/src/id/otakudesu/AndroidManifest.xml
index 8b54e3957..acb4de356 100644
--- a/src/id/otakudesu/AndroidManifest.xml
+++ b/src/id/otakudesu/AndroidManifest.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest package="eu.kanade.tachiyomi.animeextension" />
\ No newline at end of file
diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle
index 6d19d937f..249577250 100644
--- a/src/id/otakudesu/build.gradle
+++ b/src/id/otakudesu/build.gradle
@@ -1,12 +1,12 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    extName = 'OtakuDesu'
-    pkgNameSuffix = 'id.otakudesu'
-    extClass = '.OtakuDesu'
-    extVersionCode = 10
-    libVersion = '12'
-}
-
-apply from: "$rootDir/common.gradle"
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'OtakuDesu'
+    pkgNameSuffix = 'id.otakudesu'
+    extClass = '.OtakuDesu'
+    extVersionCode = 10
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"