diff --git a/build.gradle b/build.gradle
index c10799633..b1686df58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
-    ext.coroutines_version = '1.3.9'
+    ext.kotlin_version = '1.4.32'
+    ext.coroutines_version = '1.4.3'
     repositories {
         mavenCentral()
         google()
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 4a296469a..fe87a5100 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,6 +1,6 @@
 object Config {
     const val compileSdk = 29
-    const val minSdk = 16
+    const val minSdk = 21
     const val targetSdk = 29
     const val buildTools = "29.0.3"
 }
diff --git a/common-dependencies.gradle b/common-dependencies.gradle
index 888a3df16..fd767b181 100644
--- a/common-dependencies.gradle
+++ b/common-dependencies.gradle
@@ -1,18 +1,18 @@
 // used both in common.gradle and themesources library
 dependencies {
     // Lib 1.2, but using specific commit so we don't need to bump up the version
-    compileOnly "com.github.tachiyomiorg:extensions-lib:a596412"
+    compileOnly "com.github.tachiyomiorg:extensions-lib:cc271c3"
 
     // These are provided by the app itself
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     compileOnly 'com.github.inorichi.injekt:injekt-core:65b0440'
-    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
-    compileOnly 'io.reactivex:rxjava:1.3.6'
-    compileOnly 'org.jsoup:jsoup:1.10.2'
-    compileOnly 'com.google.code.gson:gson:2.8.2'
+    compileOnly 'com.squareup.okhttp3:okhttp:4.9.1'
+    compileOnly 'io.reactivex:rxjava:1.3.8'
+    compileOnly 'org.jsoup:jsoup:1.13.1'
+    compileOnly 'com.google.code.gson:gson:2.8.6'
     compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'
 
     implementation project(":annotations")
     compileOnly project(':duktape-stub')
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index a85c021b0..ae3b5127c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx3072m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/SpecificHostRateLimitInterceptor.kt b/lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/SpecificHostRateLimitInterceptor.kt
index 3a237c860..b9e8ee9b5 100644
--- a/lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/SpecificHostRateLimitInterceptor.kt
+++ b/lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/SpecificHostRateLimitInterceptor.kt
@@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit
  *
  * Examples:
  *
- * httpUrl = Httpurl.parse("api.manga.com"), permits = 5, period = 1, unit = seconds  =>  5 requests per second to api.manga.com
- * httpUrl = Httpurl.parse("imagecdn.manga.com"), permits = 10, period = 2, unit = minutes  =>  10 requests per 2 minutes to imagecdn.manga.com
+ * httpUrl = "api.manga.com".toHttpUrlOrNull(), permits = 5, period = 1, unit = seconds  =>  5 requests per second to api.manga.com
+ * httpUrl = "imagecdn.manga.com".toHttpUrlOrNull(), permits = 10, period = 2, unit = minutes  =>  10 requests per 2 minutes to imagecdn.manga.com
  *
  * @param httpUrl {HttpUrl} The url host that this interceptor should handle. Will get url's host by using HttpUrl.host()
  * @param permits {Int}   Number of requests allowed within a period of units.
diff --git a/multisrc/overrides/eromuse/erofus/src/Erofus.kt b/multisrc/overrides/eromuse/erofus/src/Erofus.kt
index 08de650af..f604b9eb3 100644
--- a/multisrc/overrides/eromuse/erofus/src/Erofus.kt
+++ b/multisrc/overrides/eromuse/erofus/src/Erofus.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Response
 import rx.Observable
 
@@ -32,7 +32,7 @@ class Erofus : EroMuse("Erofus", "https://www.erofus.com") {
                 pageStack.addLast(StackItem("$baseUrl/?search=$query&sort=$currentSortingMode&page=1", SEARCH_RESULTS_OR_BASE))
             } else {
                 val albumFilter = filterList.filterIsInstance<AlbumFilter>().first().selection()
-                val url = HttpUrl.parse(baseUrl + albumFilter.pathSegments)!!.newBuilder()
+                val url = (baseUrl + albumFilter.pathSegments).toHttpUrl().newBuilder()
                     .addQueryParameter("sort", currentSortingMode)
                     .addQueryParameter("page", "1")
 
@@ -48,7 +48,7 @@ class Erofus : EroMuse("Erofus", "https://www.erofus.com") {
     override fun mangaDetailsParse(response: Response): SManga {
         return SManga.create().apply {
             with(response.asJsoup()) {
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
                 thumbnail_url = select("$albumSelector img").firstOrNull()?.imgAttr()
                 author = when (getAlbumType(url)) {
                     AUTHOR -> {
diff --git a/multisrc/overrides/fmreader/heroscan/src/HeroScan.kt b/multisrc/overrides/fmreader/heroscan/src/HeroScan.kt
index f5ffa1ade..a03a0e800 100644
--- a/multisrc/overrides/fmreader/heroscan/src/HeroScan.kt
+++ b/multisrc/overrides/fmreader/heroscan/src/HeroScan.kt
@@ -8,7 +8,7 @@ class HeroScan : FMReader("HeroScan", "https://heroscan.com", "en") {
             .addInterceptor { chain ->
                 val originalRequest = chain.request()
                 chain.proceed(originalRequest).let { response ->
-                    if (response.code() == 403 && originalRequest.url().host().contains("b-cdn")) {
+                    if (response.code == 403 && originalRequest.url.host.contains("b-cdn")) {
                         response.close()
                         chain.proceed(originalRequest.newBuilder().removeHeader("Referer").addHeader("Referer", "https://isekaiscan.com").build())
                     } else {
diff --git a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt
index c91843740..63a63d4fa 100644
--- a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt
+++ b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt
@@ -24,7 +24,7 @@ class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") {
             GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=last_update&sort_type=DESC&ungenre=raw", headers)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val noRawsUrl = super.searchMangaRequest(page, query, filters).url().newBuilder().addQueryParameter("ungenre", "raw").toString()
+        val noRawsUrl = super.searchMangaRequest(page, query, filters).url.newBuilder().addQueryParameter("ungenre", "raw").toString()
         return GET(noRawsUrl, headers)
     }
 
@@ -35,7 +35,7 @@ class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") {
 class Manhwa18NetRaw : FMReader("Manhwa18.net", "https://manhwa18.net", "ko") {
     override val requestPath = "manga-list-genre-raw.html"
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val onlyRawsUrl = super.searchMangaRequest(page, query, filters).url().newBuilder().addQueryParameter("genre", "raw").toString()
+        val onlyRawsUrl = super.searchMangaRequest(page, query, filters).url.newBuilder().addQueryParameter("genre", "raw").toString()
         return GET(onlyRawsUrl, headers)
     }
 
diff --git a/multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt b/multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt
index f566c8341..cfaab650c 100644
--- a/multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt
+++ b/multisrc/overrides/foolslide/foolslidecustomizable/src/FoolSlideCustomizableFactory.kt
@@ -5,10 +5,8 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.widget.Toast
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -49,30 +47,6 @@ class FoolSlideCustomizable : ConfigurableSource, FoolSlide("FoolSlide Customiza
         screen.addPreference(baseUrlPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val baseUrlPref = EditTextPreference(screen.context).apply {
-            key = BASE_URL_PREF_TITLE
-            title = BASE_URL_PREF_TITLE
-            summary = BASE_URL_PREF_SUMMARY
-            this.setDefaultValue(DEFAULT_BASEURL)
-            dialogTitle = BASE_URL_PREF_TITLE
-            dialogMessage = "Default: $DEFAULT_BASEURL"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(BASE_URL_PREF, newValue as String).commit()
-                    Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(baseUrlPref)
-    }
-
     /**
      *  Tell the user to include /directory/ in the URL even though we remove it
      *  To increase the chance they input a usable URL
diff --git a/multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt b/multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt
index 954daa864..88a3e9f17 100644
--- a/multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt
+++ b/multisrc/overrides/foolslide/hniscantrad/src/HNIScantradFactory.kt
@@ -43,7 +43,7 @@ class HNIScantradEN : FoolSlide("HNI-Scantrad", "https://hni-scantrad.com", "en"
         }
     }
     override fun pageListParse(response: Response): List<Page> {
-        return Regex("""imageArray\[\d+]='(.*)'""").findAll(response.body()!!.string()).toList().mapIndexed { i, mr ->
+        return Regex("""imageArray\[\d+]='(.*)'""").findAll(response.body!!.string()).toList().mapIndexed { i, mr ->
             Page(i, "", "$baseUrl$urlModifier/${mr.groupValues[1]}")
         }
     }
diff --git a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt
index 54977fcfc..26e2b4f00 100644
--- a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt
+++ b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt
@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
@@ -29,7 +29,7 @@ class DoujinHentai : Madara("DoujinHentai", "https://doujinhentai.net", "es", Si
     override fun popularMangaNextPageSelector() = "a[rel=next]"
     override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/lista-manga-hentai?orderby=last&page=$page", headers)
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse(baseUrl)!!.newBuilder()
+        val url = baseUrl.toHttpUrl().newBuilder()
         if (query.isNotBlank()) {
             url.addPathSegment("search")
             url.addQueryParameter("query", query) // query returns results all on one page
diff --git a/multisrc/overrides/madara/manhuaga/src/Manhuaga.kt b/multisrc/overrides/madara/manhuaga/src/Manhuaga.kt
index e3c5e23d4..9e8ddf99d 100644
--- a/multisrc/overrides/madara/manhuaga/src/Manhuaga.kt
+++ b/multisrc/overrides/madara/manhuaga/src/Manhuaga.kt
@@ -8,7 +8,7 @@ class Manhuaga : Madara("Manhuaga", "https://manhuaga.com", "en") {
         .addInterceptor { chain ->
             val originalRequest = chain.request()
             chain.proceed(originalRequest).let { response ->
-                if (response.code() == 403) {
+                if (response.code == 403) {
                     response.close()
                     chain.proceed(originalRequest.newBuilder().removeHeader("Referer").addHeader("Referer", "https://manhuaga.com").build())
                 } else {
diff --git a/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt b/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt
index 184139563..26ad6743d 100644
--- a/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt
+++ b/multisrc/overrides/mangabox/mangakakalots/src/Mangakakalots.kt
@@ -10,7 +10,7 @@ class Mangakakalots : MangaBox("Mangakakalots (unoriginal)", "https://mangakakal
     override fun searchMangaParse(response: Response): MangasPage {
         val document = response.asJsoup()
         val mangas = document.select(searchMangaSelector()).map { mangaFromElement(it) }
-        val hasNextPage = !response.request().url().toString()
+        val hasNextPage = !response.request.url.toString()
             .contains(document.select(searchMangaNextPageSelector()).attr("href"))
 
         return MangasPage(mangas, hasNextPage)
diff --git a/multisrc/overrides/mangasproject/leitornet/src/LeitorNet.kt b/multisrc/overrides/mangasproject/leitornet/src/LeitorNet.kt
index ffc5e592e..cd176544f 100644
--- a/multisrc/overrides/mangasproject/leitornet/src/LeitorNet.kt
+++ b/multisrc/overrides/mangasproject/leitornet/src/LeitorNet.kt
@@ -25,7 +25,7 @@ class LeitorNet : MangasProject("Leitor.net", "https://leitor.net", "pt-BR") {
      * Temporary fix to bypass Cloudflare.
      */
     override fun pageListRequest(chapter: SChapter): Request {
-        val newHeaders = super.pageListRequest(chapter).headers().newBuilder()
+        val newHeaders = super.pageListRequest(chapter).headers.newBuilder()
             .set("Referer", "https://mangalivre.net/home")
             .build()
 
diff --git a/multisrc/overrides/mangasproject/mangalivre/src/MangaLivre.kt b/multisrc/overrides/mangasproject/mangalivre/src/MangaLivre.kt
index 872834f0b..20f086072 100644
--- a/multisrc/overrides/mangasproject/mangalivre/src/MangaLivre.kt
+++ b/multisrc/overrides/mangasproject/mangalivre/src/MangaLivre.kt
@@ -21,7 +21,7 @@ class MangaLivre : MangasProject("Mangá Livre", "https://mangalivre.net", "pt-B
         .build()
 
     override fun popularMangaRequest(page: Int): Request {
-        val originalRequestUrl = super.popularMangaRequest(page).url().toString()
+        val originalRequestUrl = super.popularMangaRequest(page).url.toString()
         return GET(originalRequestUrl + DEFAULT_TYPE, sourceHeaders)
     }
 
@@ -30,7 +30,7 @@ class MangaLivre : MangasProject("Mangá Livre", "https://mangalivre.net", "pt-B
             return super.searchMangaRequest(page, query, filters)
         }
 
-        val popularRequestUrl = super.popularMangaRequest(page).url().toString()
+        val popularRequestUrl = super.popularMangaRequest(page).url.toString()
         val type = filters.filterIsInstance<TypeFilter>()
             .firstOrNull()?.selected?.value ?: DEFAULT_TYPE
 
@@ -38,7 +38,7 @@ class MangaLivre : MangasProject("Mangá Livre", "https://mangalivre.net", "pt-B
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        if (response.request().url().pathSegments().contains("search")) {
+        if (response.request.url.pathSegments.contains("search")) {
             return super.searchMangaParse(response)
         }
 
diff --git a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt
index a19ede0f5..539ed0ec8 100644
--- a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt
+++ b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -39,7 +39,7 @@ class KomikCast : WPMangaStream("Komik Cast", "https://komikcast.com", "id") {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val url = if (query.isNotBlank()) {
-            val url = HttpUrl.parse("$baseUrl/page/$page")!!.newBuilder()
+            val url = "$baseUrl/page/$page".toHttpUrlOrNull()!!.newBuilder()
             val pattern = "\\s+".toRegex()
             val q = query.replace(pattern, "+")
             if (query.isNotEmpty()) {
@@ -49,7 +49,7 @@ class KomikCast : WPMangaStream("Komik Cast", "https://komikcast.com", "id") {
             }
             url.toString()
         } else {
-            val url = HttpUrl.parse("$baseUrl/daftar-komik/page/$page")!!.newBuilder()
+            val url = "$baseUrl/daftar-komik/page/$page".toHttpUrlOrNull()!!.newBuilder()
             var orderBy: String
             (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
                 when (filter) {
diff --git a/multisrc/overrides/wpmangastream/komikgo/src/KomikGO.kt b/multisrc/overrides/wpmangastream/komikgo/src/KomikGO.kt
index b2218de10..b1bc14b0d 100644
--- a/multisrc/overrides/wpmangastream/komikgo/src/KomikGO.kt
+++ b/multisrc/overrides/wpmangastream/komikgo/src/KomikGO.kt
@@ -10,7 +10,7 @@ import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import eu.kanade.tachiyomi.source.model.Filter
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
@@ -48,7 +48,7 @@ class KomikGO : WPMangaStream("Komik GO", "https://komikgo.com", "id") {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/page/$page")!!.newBuilder()
+        val url = "$baseUrl/page/$page".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("post_type", "wp-manga")
         val pattern = "\\s+".toRegex()
         val q = query.replace(pattern, "+")
diff --git a/multisrc/overrides/wpmangastream/mangaswat/src/MangaSwat.kt b/multisrc/overrides/wpmangastream/mangaswat/src/MangaSwat.kt
index e176c1526..8699955b5 100644
--- a/multisrc/overrides/wpmangastream/mangaswat/src/MangaSwat.kt
+++ b/multisrc/overrides/wpmangastream/mangaswat/src/MangaSwat.kt
@@ -21,7 +21,7 @@ class MangaSwat : WPMangaStream("MangaSwat", "https://mangaswat.com", "ar") {
     private class Sucuri : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
             val response = chain.proceed(chain.request())
-            if (response.header("x-sucuri-cache").isNullOrEmpty() && response.request().url().toString().contains("//mangaswat.com"))
+            if (response.header("x-sucuri-cache").isNullOrEmpty() && response.request.url.toString().contains("//mangaswat.com"))
                 throw IOException("Site protected, open webview | موقع محمي ، عرض ويب مفتوح")
             return response
         }
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCake.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCake.kt
index 5114651ce..32ea95e7b 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCake.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCake.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.multisrc.comicake
 
 import android.os.Build
-import eu.kanade.tachiyomi.extensions.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -45,7 +45,7 @@ abstract class ComiCake(
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return getMangasPageFromComicsResponse(res)
     }
 
@@ -97,7 +97,7 @@ abstract class ComiCake(
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val comicJson = JSONObject(response.body()!!.string())
+        val comicJson = JSONObject(response.body!!.string())
         return parseComicJson(comicJson, true)
     }
 
@@ -130,7 +130,7 @@ abstract class ComiCake(
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return getMangasPageFromComicsResponse(res)
     }
 
@@ -139,7 +139,7 @@ abstract class ComiCake(
     }
 
     override fun latestUpdatesParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return getMangasPageFromComicsResponse(res, true)
     }
 
@@ -156,7 +156,7 @@ abstract class ComiCake(
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val chapterJson = JSONObject(response.body()!!.string())
+        val chapterJson = JSONObject(response.body!!.string())
         val results = chapterJson.getJSONArray("results")
         val ret = ArrayList<SChapter>()
         for (i in 0 until results.length()) {
@@ -166,7 +166,7 @@ abstract class ComiCake(
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val webPub = JSONObject(response.body()!!.string())
+        val webPub = JSONObject(response.body!!.string())
         val readingOrder = webPub.getJSONArray("readingOrder")
         val ret = ArrayList<Page>()
         for (i in 0 until readingOrder.length()) {
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
index 857412f7b..5cf63985d 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuse.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -59,9 +59,9 @@ open class EroMuse(override val name: String, override val baseUrl: String) : Ht
             if (url.contains(pageQueryRegex)) {
                 url.replace(pageQueryRegex, "page=$int")
             } else {
-                val httpUrl = HttpUrl.parse(url)!!
-                val builder = if (httpUrl.pathSegments().last().toIntOrNull() is Int) {
-                    httpUrl.newBuilder().removePathSegment(httpUrl.pathSegments().lastIndex)
+                val httpUrl = url.toHttpUrlOrNull()!!
+                val builder = if (httpUrl.pathSegments.last().toIntOrNull() is Int) {
+                    httpUrl.newBuilder().removePathSegment(httpUrl.pathSegments.lastIndex)
                 } else {
                     httpUrl.newBuilder()
                 }
@@ -165,7 +165,7 @@ open class EroMuse(override val name: String, override val baseUrl: String) : Ht
     protected fun stackRequest(): Request {
         stackItem = pageStack.removeLast()
         val url = if (stackItem.pageType == AUTHOR && currentSortingMode.isNotEmpty() && !stackItem.url.contains("sort")) {
-            HttpUrl.parse(stackItem.url)!!.newBuilder().addQueryParameter("sort", currentSortingMode).toString()
+            stackItem.url.toHttpUrlOrNull()!!.newBuilder().addQueryParameter("sort", currentSortingMode).toString()
         } else {
             stackItem.url
         }
@@ -208,14 +208,14 @@ open class EroMuse(override val name: String, override val baseUrl: String) : Ht
             currentSortingMode = filterList.filterIsInstance<SortFilter>().first().toQueryValue()
 
             if (query.isNotBlank()) {
-                val url = HttpUrl.parse("$baseUrl/search?q=$query")!!.newBuilder().apply {
+                val url = "$baseUrl/search?q=$query".toHttpUrlOrNull()!!.newBuilder().apply {
                     if (currentSortingMode.isNotEmpty()) addQueryParameter("sort", currentSortingMode)
                     addQueryParameter("page", "1")
                 }
                 pageStack.addLast(StackItem(url.toString(), SEARCH_RESULTS_OR_BASE))
             } else {
                 val albumFilter = filterList.filterIsInstance<AlbumFilter>().first().selection()
-                val url = HttpUrl.parse("$baseUrl/comics/${albumFilter.pathSegments}")!!.newBuilder().apply {
+                val url = "$baseUrl/comics/${albumFilter.pathSegments}".toHttpUrlOrNull()!!.newBuilder().apply {
                     if (currentSortingMode.isNotEmpty()) addQueryParameter("sort", currentSortingMode)
                     if (albumFilter.pageType != AUTHOR) addQueryParameter("page", "1")
                 }
@@ -236,7 +236,7 @@ open class EroMuse(override val name: String, override val baseUrl: String) : Ht
     override fun mangaDetailsParse(response: Response): SManga {
         return SManga.create().apply {
             with(response.asJsoup()) {
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
                 thumbnail_url = select("$albumSelector img").firstOrNull()?.imgAttr()
                 author = when (getAlbumType(url)) {
                     AUTHOR -> {
@@ -278,7 +278,7 @@ open class EroMuse(override val name: String, override val baseUrl: String) : Ht
                     chapters.add(
                         SChapter.create().apply {
                             name = "Chapter"
-                            setUrlWithoutDomain(response.request().url().toString())
+                            setUrlWithoutDomain(response.request.url.toString())
                         }
                     )
                 }
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
index 0b62a19fe..94de1ea25 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -62,7 +62,7 @@ abstract class FMReader(
         GET("$baseUrl/$requestPath?listType=pagination&page=$page&$popularSort&sort_type=DESC", headers)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/$requestPath?")!!.newBuilder()
+        val url = "$baseUrl/$requestPath?".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("name", query)
             .addQueryParameter("page", page.toString())
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
index d68dbe457..80625f9b1 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt
@@ -135,7 +135,7 @@ abstract class FoolSlide(
     /**
      * Transform a GET request into a POST request that automatically authorizes all adult content
      */
-    private fun allowAdult(request: Request) = allowAdult(request.url().toString())
+    private fun allowAdult(request: Request) = allowAdult(request.url.toString())
 
     private fun allowAdult(url: String): Request {
         return POST(
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
index a651f7eea..502a80a3d 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
@@ -1,5 +1,10 @@
 package eu.kanade.tachiyomi.multisrc.luscious
 
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.CheckBoxPreference
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.addProperty
 import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
@@ -9,6 +14,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
@@ -16,23 +22,13 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import android.app.Application
-import android.content.SharedPreferences
-import android.net.Uri
-import androidx.preference.CheckBoxPreference
-import androidx.preference.PreferenceScreen
-import androidx.preference.ListPreference
-import eu.kanade.tachiyomi.source.ConfigurableSource
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import android.support.v7.preference.CheckBoxPreference as LegacyCheckBoxPreference
-import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen
-import android.support.v7.preference.ListPreference as LegacyListPreference
 
 abstract class Luscious(
     override val name: String,
@@ -138,7 +134,7 @@ abstract class Luscious(
 
     private fun buildAlbumListRequest(page: Int, filters: FilterList, query: String = ""): Request {
         val input = buildAlbumListRequestInput(page, filters, query)
-        val url = HttpUrl.parse(apiBaseUrl)!!.newBuilder()
+        val url = apiBaseUrl.toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("operationName", "AlbumList")
             .addQueryParameter("query", ALBUM_LIST_REQUEST_GQL)
             .addQueryParameter("variables", input.toString())
@@ -147,7 +143,7 @@ abstract class Luscious(
     }
 
     private fun parseAlbumListResponse(response: Response): MangasPage {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         with(data["data"]["album"]["list"]) {
             return MangasPage(
                 this["items"].asJsonArray.map {
@@ -170,7 +166,7 @@ abstract class Luscious(
 
     private fun buildAlbumInfoRequest(id: String): Request {
         val input = buildAlbumInfoRequestInput(id)
-        val url = HttpUrl.parse(apiBaseUrl)!!.newBuilder()
+        val url = apiBaseUrl.toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("operationName", "AlbumGet")
             .addQueryParameter("query", albumInfoQuery)
             .addQueryParameter("variables", input.toString())
@@ -208,12 +204,12 @@ abstract class Luscious(
             false -> {
                 var nextPage = true
                 var page = 2
-                val id = response.request().url().queryParameter("variables").toString()
+                val id = response.request.url.queryParameter("variables").toString()
                     .let { gson.fromJson<JsonObject>(it)["input"]["filters"].asJsonArray }
                     .let { it.first { f -> f["name"].asString == "album_id" } }
                     .let { it["value"].asString }
 
-                var data = gson.fromJson<JsonObject>(response.body()!!.string())
+                var data = gson.fromJson<JsonObject>(response.body!!.string())
                     .let { it["data"]["picture"]["list"].asJsonObject }
 
                 while (nextPage) {
@@ -231,7 +227,7 @@ abstract class Luscious(
                     }
                     if (nextPage) {
                         val newPage = client.newCall(GET(buildAlbumPicturesPageUrl(id, page, sortPagesByOption))).execute()
-                        data = gson.fromJson<JsonObject>(newPage.body()!!.string())
+                        data = gson.fromJson<JsonObject>(newPage.body!!.string())
                             .let { it["data"]["picture"]["list"].asJsonObject }
                     }
                     page++
@@ -272,7 +268,7 @@ abstract class Luscious(
 
     private fun buildAlbumPicturesPageUrl(id: String, page: Int, sortPagesByOption: String): String {
         val input = buildAlbumPicturesRequestInput(id, page, sortPagesByOption)
-        return HttpUrl.parse(apiBaseUrl)!!.newBuilder()
+        return apiBaseUrl.toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("operationName", "AlbumListOwnPictures")
             .addQueryParameter("query", ALBUM_PICTURES_REQUEST_GQL)
             .addQueryParameter("variables", input.toString())
@@ -283,12 +279,12 @@ abstract class Luscious(
         val pages = mutableListOf<Page>()
         var nextPage = true
         var page = 2
-        val id = response.request().url().queryParameter("variables").toString()
+        val id = response.request.url.queryParameter("variables").toString()
             .let { gson.fromJson<JsonObject>(it)["input"]["filters"].asJsonArray }
             .let { it.first { f -> f["name"].asString == "album_id" } }
             .let { it["value"].asString }
 
-        var data = gson.fromJson<JsonObject>(response.body()!!.string())
+        var data = gson.fromJson<JsonObject>(response.body!!.string())
             .let { it["data"]["picture"]["list"].asJsonObject }
 
         while (nextPage) {
@@ -305,7 +301,7 @@ abstract class Luscious(
             }
             if (nextPage) {
                 val newPage = client.newCall(GET(buildAlbumPicturesPageUrl(id, page, sortPagesByOption))).execute()
-                data = gson.fromJson<JsonObject>(newPage.body()!!.string())
+                data = gson.fromJson<JsonObject>(newPage.body!!.string())
                     .let { it["data"]["picture"]["list"].asJsonObject }
             }
             page++
@@ -341,7 +337,7 @@ abstract class Luscious(
         return client.newCall(GET(page.url, headers))
             .asObservableSuccess()
             .map {
-                val data = gson.fromJson<JsonObject>(it.body()!!.string()).let { data ->
+                val data = gson.fromJson<JsonObject>(it.body!!.string()).let { data ->
                     data["data"]["picture"]["list"].asJsonObject
                 }
                 when (getResolutionPref()){
@@ -360,7 +356,7 @@ abstract class Luscious(
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         with(data["data"]["album"]["get"]) {
             val manga = SManga.create()
             manga.url = this["url"].asString
@@ -790,37 +786,6 @@ abstract class Luscious(
         screen.addPreference(mergeChapterPref)
     }
 
-    override fun setupPreferenceScreen(screen: LegacyPreferenceScreen) {
-        val resolutionPref = LegacyListPreference(screen.context).apply {
-            key = "${RESOLUTION_PREF_KEY}_$lang"
-            title = RESOLUTION_PREF_TITLE
-            entries = RESOLUTION_PREF_ENTRIES
-            entryValues = RESOLUTION_PREF_ENTRY_VALUES
-            setDefaultValue(RESOLUTION_PREF_DEFAULT_VALUE)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString("${RESOLUTION_PREF_KEY}_$lang", entry).commit()
-            }
-        }
-        val mergeChapterPref = LegacyCheckBoxPreference(screen.context).apply {
-            key = "${MERGE_CHAPTER_PREF_KEY}_$lang"
-            title = MERGE_CHAPTER_PREF_TITLE
-            summary = MERGE_CHAPTER_PREF_SUMMARY
-            setDefaultValue(MERGE_CHAPTER_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("${MERGE_CHAPTER_PREF_KEY}_$lang", checkValue).commit()
-            }
-        }
-        screen.addPreference(resolutionPref)
-        screen.addPreference(mergeChapterPref)
-    }
-
     private fun getMergeChapterPref(): Boolean = preferences.getBoolean("${MERGE_CHAPTER_PREF_KEY}_$lang", MERGE_CHAPTER_PREF_DEFAULT_VALUE)
     private fun getResolutionPref(): String? = preferences.getString("${RESOLUTION_PREF_KEY}_$lang", RESOLUTION_PREF_DEFAULT_VALUE)
 }
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
index 850c7b0a7..23056fdb5 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.CacheControl
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -123,9 +123,9 @@ abstract class Madara(
                 if (!response.isSuccessful) {
                     response.close()
                     // Error message for exceeding last page
-                    if (response.code() == 404)
+                    if (response.code == 404)
                         error("Already on the Last Page!")
-                    else throw Exception("HTTP error ${response.code()}")
+                    else throw Exception("HTTP error ${response.code}")
                 }
             }
             .map { response ->
@@ -138,7 +138,7 @@ abstract class Madara(
     protected open fun searchPage(page: Int): String = "page/$page/"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/${searchPage(page)}")!!.newBuilder()
+        val url = "$baseUrl/${searchPage(page)}".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("s", query)
         url.addQueryParameter("post_type", "wp-manga")
         filters.forEach { filter ->
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
index 84fbcb7ba..9d6644f5a 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -80,7 +80,7 @@ abstract class MangaBox(
         return if (query.isNotBlank() && getAdvancedGenreFilters().isEmpty()) {
             GET("$baseUrl/$simpleQueryPath${normalizeSearchQuery(query)}?page=$page", headers)
         } else {
-            val url = HttpUrl.parse(baseUrl)!!.newBuilder()
+            val url = baseUrl.toHttpUrlOrNull()!!.newBuilder()
             if (getAdvancedGenreFilters().isNotEmpty()) {
                 url.addPathSegment("advanced_search")
                 url.addQueryParameter("page", page.toString())
@@ -206,7 +206,8 @@ abstract class MangaBox(
             element.select("a").let {
                 url = it.attr("abs:href").substringAfter(baseUrl) // intentionally not using setUrlWithoutDomain
                 name = it.text()
-                scanlator = HttpUrl.parse(it.attr("abs:href"))!!.host() // show where chapters are actually from
+                scanlator =
+                    it.attr("abs:href").toHttpUrlOrNull()!!.host // show where chapters are actually from
             }
             date_upload = parseChapterDate(element.selectDateFromElement().text(), scanlator!!) ?: 0
         }
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
index 12661b697..41f0be0c3 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt
@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.multisrc.mangadventure
 
 import android.net.Uri
 import android.os.Build.VERSION
-import eu.kanade.tachiyomi.extensions.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.Filter
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureExtensions.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureExtensions.kt
index 14e3596c5..6a9ea3c66 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureExtensions.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureExtensions.kt
@@ -9,7 +9,7 @@ import org.json.JSONObject
 import java.text.DecimalFormat
 
 /** Returns the body of a response as a `String`. */
-fun Response.asString(): String = body()!!.string()
+fun Response.asString(): String = body!!.string()
 
 /**
  * Formats the number according to [fmt].
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasproject/MangasProject.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasproject/MangasProject.kt
index 83d79de5d..848090bb8 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasproject/MangasProject.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasproject/MangasProject.kt
@@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -64,7 +64,7 @@ abstract class MangasProject(
         val popularMangas = result["most_read"].array
             .map { popularMangaItemParse(it.obj) }
 
-        val hasNextPage = response.request().url().queryParameter("page")!!.toInt() < 10
+        val hasNextPage = response.request.url.queryParameter("page")!!.toInt() < 10
 
         return MangasPage(popularMangas, hasNextPage)
     }
@@ -85,7 +85,7 @@ abstract class MangasProject(
         val latestMangas = result["releases"].array
             .map { latestMangaItemParse(it.obj) }
 
-        val hasNextPage = response.request().url().queryParameter("page")!!.toInt() < 5
+        val hasNextPage = response.request.url.queryParameter("page")!!.toInt() < 5
 
         return MangasPage(latestMangas, hasNextPage)
     }
@@ -197,7 +197,7 @@ abstract class MangasProject(
             throw Exception(MANGA_REMOVED)
         }
 
-        val mangaUrl = response.request().url().toString().replace(baseUrl, "")
+        val mangaUrl = response.request.url.toString().replace(baseUrl, "")
         val mangaId = mangaUrl.substringAfterLast("/")
         var page = 1
 
@@ -277,13 +277,13 @@ abstract class MangasProject(
     }
 
     open fun getChapterUrl(response: Response): String {
-        return response.request().url().toString()
+        return response.request.url.toString()
     }
 
     protected open fun getReaderToken(document: Document): String? {
         return document.select("script[src*=\"reader.\"]").firstOrNull()
             ?.attr("abs:src")
-            ?.let { HttpUrl.parse(it) }
+            ?.let { it.toHttpUrlOrNull() }
             ?.queryParameter("token")
     }
 
@@ -301,10 +301,10 @@ abstract class MangasProject(
 
     private fun Response.asJsonObject(): JsonObject {
         if (!isSuccessful) {
-            throw Exception("HTTP error ${code()}")
+            throw Exception("HTTP error $code")
         }
 
-        return JSON_PARSER.parse(body()!!.string()).obj
+        return JSON_PARSER.parse(body!!.string()).obj
     }
 
     private fun String.toDate(): Long {
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
index 4cb8df952..2f201779b 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt
@@ -259,7 +259,7 @@ abstract class NepNep(
             val indexChapter = json["Chapter"].string
             SChapter.create().apply {
                 name = json["ChapterName"].nullString.let { if (it.isNullOrEmpty()) "${json["Type"].string} ${chapterImage(indexChapter, true)}" else it }
-                url = "/read-online/" + response.request().url().toString().substringAfter("/manga/") + chapterURLEncode(indexChapter)
+                url = "/read-online/" + response.request.url.toString().substringAfter("/manga/") + chapterURLEncode(indexChapter)
                 date_upload = try {
                     json["Date"].nullString?.let { dateFormat.parse("$it +0600")?.time } ?: 0
                 } catch (_: Exception) {
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt
index dc754b0d4..b60fd7ae9 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt
@@ -112,7 +112,7 @@ abstract class NyaHentai (
         listOf(
             SChapter.create().apply {
                 name = "Single Chapter"
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
             }
         )
     }
@@ -185,7 +185,7 @@ abstract class NyaHentai (
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (response.request().url().toString().contains("tag?")) {
+        return if (response.request.url.toString().contains("tag?")) {
             response.asJsoup().select("table.table tbody tr a:first-of-type").attr("abs:href").let {
                 if (it.isNotEmpty()) {
                     tagUrl = it
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
index b3f995da9..a13051ba3 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/Paprika.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -67,7 +67,7 @@ abstract class Paprika(
         return if (query.isNotBlank()) {
             GET("$baseUrl/search?q=$query&page=$page")
         } else {
-            val url = HttpUrl.parse("$baseUrl/mangas/")!!.newBuilder()
+            val url = "$baseUrl/mangas/".toHttpUrlOrNull()!!.newBuilder()
             filters.forEach { filter ->
                 when (filter) {
                     is GenreFilter -> url.addPathSegment(filter.toUriPart())
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
index d5f3c158b..04b728757 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAlt.kt
@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,7 +36,7 @@ abstract class PaprikaAlt(
         return if (query.isNotBlank()) {
             GET("$baseUrl/search?s=$query&post_type=manga&page=$page")
         } else {
-            val url = HttpUrl.parse("$baseUrl/genres/")!!.newBuilder()
+            val url = "$baseUrl/genres/".toHttpUrlOrNull()!!.newBuilder()
             filters.forEach { filter ->
                 when (filter) {
                     is GenreFilter -> url.addPathSegment(filter.toUriPart())
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
index 109c81048..f8112ccc0 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt
@@ -5,12 +5,17 @@ import eu.kanade.tachiyomi.source.model.Filter.Header
 import eu.kanade.tachiyomi.source.model.Filter.Select
 import eu.kanade.tachiyomi.source.model.Filter.Separator
 import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.MangasPage
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.Headers
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -18,12 +23,8 @@ import org.json.JSONObject
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
-import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.model.SChapter
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.model.MangasPage
-import java.util.Locale
 import java.util.Calendar
+import java.util.Locale
 
 open class Webtoons(
     override val name: String,
@@ -129,7 +130,7 @@ open class Webtoons(
     override fun latestUpdatesNextPageSelector(): String? = null
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/$langCode/search?keyword=$query")?.newBuilder()!!
+        val url = "$baseUrl/$langCode/search?keyword=$query".toHttpUrlOrNull()?.newBuilder()!!
         val uriPart = (filters.find { it is SearchType } as? SearchType)?.toUriPart() ?: ""
 
         url.addQueryParameter("searchType", uriPart)
@@ -232,7 +233,7 @@ open class Webtoons(
         val docUrl = docUrlRegex.find(docString)!!.destructured.toList()[0]
         val motiontoonPath = motiontoonPathRegex.find(docString)!!.destructured.toList()[0]
 
-        val motiontoonJson = JSONObject(client.newCall(GET(docUrl, headers)).execute().body()!!.string()).getJSONObject("assets").getJSONObject("image")
+        val motiontoonJson = JSONObject(client.newCall(GET(docUrl, headers)).execute().body!!.string()).getJSONObject("assets").getJSONObject("image")
 
         val keys = motiontoonJson.keys().asSequence().toList().filter { it.contains("layer") }
 
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
index dfb7749e5..e8d186e12 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslate.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.json.JSONObject
@@ -26,8 +26,8 @@ open class WebtoonsTranslate (
     // popularMangaRequest already returns manga sorted by latest update
     override val supportsLatest = false
 
-    private val apiBaseUrl = HttpUrl.parse("https://global.apis.naver.com")!!
-    private val mobileBaseUrl = HttpUrl.parse("https://m.webtoons.com")!!
+    private val apiBaseUrl = "https://global.apis.naver.com".toHttpUrlOrNull()!!
+    private val mobileBaseUrl = "https://m.webtoons.com".toHttpUrlOrNull()!!
     private val thumbnailBaseUrl = "https://mwebtoon-phinf.pstatic.net"
 
     private val pageListUrlPattern = "/lineWebtoon/ctrans/translatedEpisodeDetail_jsonp.json?titleNo=%s&episodeNo=%d&languageCode=%s&teamVersion=%d"
@@ -56,11 +56,11 @@ open class WebtoonsTranslate (
     override fun popularMangaRequest(page: Int): Request = mangaRequest(page, pageSize)
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val offset = response.request().url().queryParameter("offset")!!.toInt()
+        val offset = response.request.url.queryParameter("offset")!!.toInt()
         var totalCount: Int
         val mangas = mutableListOf<SManga>()
 
-        JSONObject(response.body()!!.string()).let { json ->
+        JSONObject(response.body!!.string()).let { json ->
             json.getString("code").let { code ->
                 if (code != "000") throw Exception("Error getting popular manga: error code $code")
             }
@@ -118,7 +118,7 @@ open class WebtoonsTranslate (
     private fun searchMangaParse(response: Response, query: String): MangasPage {
         val mangas = mutableListOf<SManga>()
 
-        JSONObject(response.body()!!.string()).let { json ->
+        JSONObject(response.body!!.string()).let { json ->
             json.getString("code").let { code ->
                 if (code != "000") throw Exception("Error getting manga: error code $code")
             }
@@ -168,7 +168,7 @@ open class WebtoonsTranslate (
     override fun pageListParse(document: Document): List<Page> = throw Exception("Not used")
 
     override fun chapterListRequest(manga: SManga): Request {
-        val titleNo = HttpUrl.parse(manga.url)!!
+        val titleNo = manga.url.toHttpUrlOrNull()!!
             .queryParameter("titleNo")
         val chapterUrl = apiBaseUrl
             .resolve("/lineWebtoon/ctrans/translatedEpisodes_jsonp.json")!!
@@ -182,7 +182,7 @@ open class WebtoonsTranslate (
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val chapterData = response.body()!!.string()
+        val chapterData = response.body!!.string()
         val chapterJson = JSONObject(chapterData)
         val responseCode = chapterJson.getString("code")
         if (responseCode != "000") {
@@ -217,7 +217,7 @@ open class WebtoonsTranslate (
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val pageJson = JSONObject(response.body()!!.string())
+        val pageJson = JSONObject(response.body!!.string())
         val results = pageJson.getJSONObject("result").getJSONArray("imageInfo")
         val ret = ArrayList<Page>()
         for (i in 0 until results.length()) {
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
index dda9c1cbc..9ec6ad39f 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComics.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -78,7 +78,7 @@ abstract class WPComics(
         return if (filterList.isEmpty()) {
             GET("$baseUrl/?s=$query&post_type=comics&page=$page")
         } else {
-            val url = HttpUrl.parse("$baseUrl/$searchPath")!!.newBuilder()
+            val url = "$baseUrl/$searchPath".toHttpUrlOrNull()!!.newBuilder()
 
             filterList.forEach { filter ->
                 when (filter) {
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt
index a811fd2a4..b90da89c0 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt
@@ -1,10 +1,8 @@
 package eu.kanade.tachiyomi.multisrc.wpmangastream
 
+//import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor // added to override
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
-//import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor // added to override
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Filter
@@ -15,7 +13,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -67,23 +65,6 @@ abstract class WPMangaStream(
         screen.addPreference(thumbsPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val thumbsPref = ListPreference(screen.context).apply {
-            key = SHOW_THUMBNAIL_PREF_Title
-            title = SHOW_THUMBNAIL_PREF_Title
-            entries = arrayOf("Show high quality", "Show mid quality", "Show low quality")
-            entryValues = arrayOf("0", "1", "2")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                preferences.edit().putInt(SHOW_THUMBNAIL_PREF, index).commit()
-            }
-        }
-        screen.addPreference(thumbsPref)
-    }
-
     private fun getShowThumbnail(): Int = preferences.getInt(SHOW_THUMBNAIL_PREF, 0)
 
     //private val rateLimitInterceptor = RateLimitInterceptor(4)
@@ -106,7 +87,7 @@ abstract class WPMangaStream(
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/manga/")!!.newBuilder()
+        val url = "$baseUrl/manga/".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("title", query)
         url.addQueryParameter("page", page.toString())
         filters.forEach { filter ->
diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
index c2c274c5a..ffeecc5f7 100644
--- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
+++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.json.JSONArray
@@ -70,7 +70,7 @@ open class BatoTo(
         return if (query.isNotBlank()) {
             GET("$baseUrl/search?word=$query&page=$page")
         } else {
-            val url = HttpUrl.parse("$baseUrl/browse")!!.newBuilder()
+            val url = "$baseUrl/browse".toHttpUrlOrNull()!!.newBuilder()
             url.addQueryParameter("page", page.toString())
             url.addQueryParameter("langs", siteLang)
             filters.forEach { filter ->
@@ -311,7 +311,7 @@ open class BatoTo(
                 "https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js",
                 headers
             )
-        ).execute().body()!!.string()
+        ).execute().body!!.string()
     }
 
     override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
index cc833c3f5..02054ca63 100644
--- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
+++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt
@@ -10,8 +10,8 @@ class BatoToFactory : SourceFactory {
 }
 
 private val languages = listOf(
-    //commented langueges do currently not exist on Bato.to but haven in the past
-    Pair("all",""),
+    // commented langueges do currently not exist on Bato.to but haven in the past
+    Pair("all", ""),
     Pair("ar", "ar"),
     Pair("bg", "bg"),
     Pair("cs", "cs"),
@@ -28,14 +28,14 @@ private val languages = listOf(
     Pair("fil", "fil"),
     Pair("fr", "fr"),
     Pair("he", "he"),
-    //Pair("hi", "hi"),
+    // Pair("hi", "hi"),
     Pair("hr", "hr"),
     Pair("hu", "hu"),
     Pair("id", "id"),
     Pair("it", "it"),
     Pair("ja", "ja"),
     Pair("ko", "ko"),
-    //Pair("ku", "ku"),
+    // Pair("ku", "ku"),
     Pair("ml", "ml"),
     Pair("mn", "mn"),
     Pair("ms", "ms"),
@@ -52,7 +52,7 @@ private val languages = listOf(
     Pair("tr", "tr"),
     Pair("uk", "uk"),
     Pair("vi", "vi"),
-    //Pair("xh", "xh"),
+    // Pair("xh", "xh"),
     Pair("zh", "zh"),
     Pair("zh-rHK", "zh_hk"),
     Pair("zh-rTW", "zh_tw"),
diff --git a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
index b918bd30f..2be9ac56c 100644
--- a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
+++ b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.all.cubari
 
 import android.os.Build
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -40,14 +40,14 @@ open class Cubari(override val lang: String) : HttpSource() {
     override fun fetchLatestUpdates(page: Int): Observable<MangasPage> {
         return client.newBuilder()
             .addInterceptor(RemoteStorageUtils.HomeInterceptor())
-            .build()!!
+            .build()
             .newCall(latestUpdatesRequest(page))
             .asObservableSuccess()
             .map { response -> latestUpdatesParse(response) }
     }
 
     override fun latestUpdatesParse(response: Response): MangasPage {
-        return parseMangaList(JSONArray(response.body()!!.string()), SortType.UNPINNED)
+        return parseMangaList(JSONArray(response.body!!.string()), SortType.UNPINNED)
     }
 
     override fun popularMangaRequest(page: Int): Request {
@@ -57,14 +57,14 @@ open class Cubari(override val lang: String) : HttpSource() {
     override fun fetchPopularManga(page: Int): Observable<MangasPage> {
         return client.newBuilder()
             .addInterceptor(RemoteStorageUtils.HomeInterceptor())
-            .build()!!
+            .build()
             .newCall(popularMangaRequest(page))
             .asObservableSuccess()
             .map { response -> popularMangaParse(response) }
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        return parseMangaList(JSONArray(response.body()!!.string()), SortType.PINNED)
+        return parseMangaList(JSONArray(response.body!!.string()), SortType.PINNED)
     }
 
     override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
@@ -83,7 +83,7 @@ open class Cubari(override val lang: String) : HttpSource() {
     }
 
     private fun mangaDetailsParse(response: Response, manga: SManga): SManga {
-        return parseMangaFromApi(JSONObject(response.body()!!.string()), manga)
+        return parseMangaFromApi(JSONObject(response.body!!.string()), manga)
     }
 
     override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
@@ -107,7 +107,7 @@ open class Cubari(override val lang: String) : HttpSource() {
 
     // Called after the request
     private fun chapterListParse(response: Response, manga: SManga): List<SChapter> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return parseChapterList(res, manga)
     }
 
@@ -146,7 +146,7 @@ open class Cubari(override val lang: String) : HttpSource() {
     }
 
     private fun directPageListParse(response: Response): List<Page> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val pages = JSONArray(res)
         val pageArray = ArrayList<Page>()
 
@@ -162,7 +162,7 @@ open class Cubari(override val lang: String) : HttpSource() {
     }
 
     private fun seriesJsonPageListParse(response: Response, chapter: SChapter): List<Page> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val json = JSONObject(res)
         val groups = json.getJSONObject("groups")
         val groupIter = groups.keys()
@@ -210,7 +210,7 @@ open class Cubari(override val lang: String) : HttpSource() {
                 // Only tag for recently read on search
                 client.newBuilder()
                     .addInterceptor(RemoteStorageUtils.TagInterceptor())
-                    .build()!!
+                    .build()
                     .newCall(searchMangaRequest(page, trimmedQuery, filters))
                     .asObservableSuccess()
                     .map { response ->
@@ -238,7 +238,7 @@ open class Cubari(override val lang: String) : HttpSource() {
     }
 
     private fun searchMangaParse(response: Response, query: String): MangasPage {
-        return parseSearchList(JSONObject(response.body()!!.string()), query)
+        return parseSearchList(JSONObject(response.body!!.string()), query)
     }
 
     // ------------- Helpers and whatnot ---------------
diff --git a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/RemoteStorageUtils.kt b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/RemoteStorageUtils.kt
index 3e4fbd060..0184dac56 100644
--- a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/RemoteStorageUtils.kt
+++ b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/RemoteStorageUtils.kt
@@ -50,8 +50,8 @@ class RemoteStorageUtils {
 
             var webView: WebView? = null
 
-            val origRequestUrl = request.url().toString()
-            val headers = request.headers().toMultimap().mapValues {
+            val origRequestUrl = request.url.toString()
+            val headers = request.headers.toMultimap().mapValues {
                 it.value.getOrNull(0) ?: ""
             }.toMutableMap()
             val jsInterface = JsInterface(latch)
@@ -94,7 +94,7 @@ class RemoteStorageUtils {
             return if (transparent) {
                 response
             } else {
-                response.newBuilder().body(ResponseBody.create(response.body()?.contentType(), jsInterface.payload)).build()
+                response.newBuilder().body(ResponseBody.create(response.body?.contentType(), jsInterface.payload)).build()
             }
         }
     }
diff --git a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
index 4ad56d9de..e0714a271 100644
--- a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
+++ b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
@@ -32,8 +32,6 @@ import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.net.URLEncoder
-import android.support.v7.preference.CheckBoxPreference as LegacyCheckBoxPreference
-import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen
 
 open class EHentai(override val lang: String, private val ehLang: String) : ConfigurableSource, HttpSource() {
 
@@ -196,7 +194,7 @@ open class EHentai(override val lang: String, private val ehLang: String) : Conf
     @SuppressLint("DefaultLocale")
     override fun mangaDetailsParse(response: Response) = with(response.asJsoup()) {
         with(ExGalleryMetadata()) {
-            url = response.request().url().encodedPath()
+            url = response.request.url.encodedPath
             title = select("#gn").text().nullIfBlank()?.trim()
 
             altTitle = select("#gj").text().nullIfBlank()?.trim()
@@ -514,20 +512,5 @@ open class EHentai(override val lang: String, private val ehLang: String) : Conf
         screen.addPreference(enforceLanguagePref)
     }
 
-    override fun setupPreferenceScreen(screen: LegacyPreferenceScreen) {
-        val enforceLanguagePref = LegacyCheckBoxPreference(screen.context).apply {
-            key = "${ENFORCE_LANGUAGE_PREF_KEY}_$lang"
-            title = ENFORCE_LANGUAGE_PREF_TITLE
-            summary = ENFORCE_LANGUAGE_PREF_SUMMARY
-            setDefaultValue(ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("${ENFORCE_LANGUAGE_PREF_KEY}_$lang", checkValue).commit()
-            }
-        }
-        screen.addPreference(enforceLanguagePref)
-    }
-
     private fun getEnforceLanguagePref(): Boolean = preferences.getBoolean("${ENFORCE_LANGUAGE_PREF_KEY}_$lang", ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE)
 }
diff --git a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt
index 9bd165f46..fd993f62c 100644
--- a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt
+++ b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt
@@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.extension.all.hentaihand
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import android.widget.Toast
 import com.github.salomonbrys.kotson.fromJson
@@ -26,9 +24,9 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -59,7 +57,7 @@ class HentaiHand(
         .build()
 
     private fun parseGenericResponse(response: Response): MangasPage {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         return MangasPage(
             data.getAsJsonArray("data").map {
                 SManga.create().apply {
@@ -100,7 +98,7 @@ class HentaiHand(
             .asObservableSuccess()
             .subscribeOn(Schedulers.io())
             .map {
-                val data = gson.fromJson<JsonObject>(it.body()!!.string())
+                val data = gson.fromJson<JsonObject>(it.body!!.string())
                 // only the first tag will be used
                 data.getAsJsonArray("data").firstOrNull()?.let { t -> t["id"].asInt }
             }.toBlocking().first()
@@ -108,7 +106,7 @@ class HentaiHand(
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
 
-        val url = HttpUrl.parse("$baseUrl/api/comics")!!.newBuilder()
+        val url = "$baseUrl/api/comics".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
             .addQueryParameter("q", query)
 
@@ -158,7 +156,7 @@ class HentaiHand(
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         return SManga.create().apply {
 
             artist = tagArrayToString(data.getAsJsonArray("artists"))
@@ -188,7 +186,7 @@ class HentaiHand(
     override fun chapterListRequest(manga: SManga): Request = mangaDetailsApiRequest(manga)
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         return listOf(
             SChapter.create().apply {
                 url = "/en/comic/${data["slug"].asString}/reader/1"
@@ -207,7 +205,7 @@ class HentaiHand(
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val data = gson.fromJson<JsonObject>(response.body()!!.string())
+        val data = gson.fromJson<JsonObject>(response.body!!.string())
         return data.getAsJsonArray("images").mapIndexed { i, it ->
             Page(i, "/en/comic/${data["comic"]["slug"].asString}/reader/${it["page"].asInt}", it["source_url"].asString)
         }
@@ -240,14 +238,14 @@ class HentaiHand(
         }
         val body = RequestBody.create(MEDIA_TYPE, jsonObject.toString())
         val response = chain.proceed(POST("$baseUrl/api/login", headers, body))
-        if (response.code() == 401) {
+        if (response.code == 401) {
             throw Exception("Failed to login, check if username and password are correct")
         }
 
-        if (response.body() == null)
+        if (response.body == null)
             throw Exception("Login response body is empty")
         try {
-            return JSONObject(response.body()!!.string())
+            return JSONObject(response.body!!.string())
                 .getJSONObject("auth")
                 .getString("access_token")
         } catch (e: JSONException) {
@@ -296,32 +294,6 @@ class HentaiHand(
         }
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.addPreference(screen.supportEditTextPreference(USERNAME_TITLE, USERNAME_DEFAULT, username))
-        screen.addPreference(screen.supportEditTextPreference(PASSWORD_TITLE, PASSWORD_DEFAULT, password))
-    }
-
-    private fun PreferenceScreen.supportEditTextPreference(title: String, default: String, value: String): EditTextPreference {
-        return EditTextPreference(context).apply {
-            key = title
-            this.title = title
-            summary = value
-            this.setDefaultValue(default)
-            dialogTitle = title
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(title, newValue as String).commit()
-                    Toast.makeText(context, "Restart Tachiyomi to apply new setting.", Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-    }
-
     private fun getPrefUsername(): String = preferences.getString(USERNAME_TITLE, USERNAME_DEFAULT)!!
     private fun getPrefPassword(): String = preferences.getString(PASSWORD_TITLE, PASSWORD_DEFAULT)!!
 
@@ -387,7 +359,7 @@ class HentaiHand(
     companion object {
         @SuppressLint("SimpleDateFormat")
         private val DATE_FORMAT = SimpleDateFormat("yyyy-dd-MM")
-        private val MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+        private val MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
         private const val USERNAME_TITLE = "Username"
         private const val USERNAME_DEFAULT = ""
         private const val PASSWORD_TITLE = "Password"
diff --git a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt
index e579ebf2c..c4c2b926e 100644
--- a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt
+++ b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/Hitomi.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.all.hitomi
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.string
@@ -61,7 +59,7 @@ open class Hitomi(override val lang: String, private val nozomiLang: String) : H
         val range = response.header("Content-Range")!!
         val total = range.substringAfter('/').toLong()
         val end = range.substringBefore('/').substringAfter('-').toLong()
-        val body = response.body()!!
+        val body = response.body!!
         return parseNozomiPage(body.bytes())
             .map {
                 MangasPage(it, end < total - 1)
@@ -276,7 +274,7 @@ open class Hitomi(override val lang: String, private val nozomiLang: String) : H
     private val jsonParser = JsonParser()
 
     override fun pageListParse(response: Response): List<Page> {
-        val str = response.body()!!.string()
+        val str = response.body!!.string()
         val json = jsonParser.parse(str.removePrefix("var galleryinfo = "))
         return json["files"].array.mapIndexed { i, jsonElement ->
             val hash = jsonElement["hash"].string
@@ -305,7 +303,7 @@ open class Hitomi(override val lang: String, private val nozomiLang: String) : H
 
     override fun imageRequest(page: Page): Request {
         val request = super.imageRequest(page)
-        val hlId = request.url().pathSegments().let {
+        val hlId = request.url.pathSegments.let {
             it[it.lastIndex - 1]
         }
         return request.newBuilder()
@@ -343,35 +341,6 @@ open class Hitomi(override val lang: String, private val nozomiLang: String) : H
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val webpPref = CheckBoxPreference(screen.context).apply {
-            key = "${WEBP_PREF_KEY}_$lang"
-            title = WEBP_PREF_TITLE
-            summary = WEBP_PREF_SUMMARY
-            setDefaultValue(WEBP_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("${WEBP_PREF_KEY}_$lang", checkValue).commit()
-            }
-        }
-
-        val coverPref = CheckBoxPreference(screen.context).apply {
-            key = "${COVER_PREF_KEY}_$lang"
-            title = COVER_PREF_TITLE
-            summary = COVER_PREF_SUMMARY
-            setDefaultValue(COVER_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("${COVER_PREF_KEY}_$lang", checkValue).commit()
-            }
-        }
-
-        screen.addPreference(webpPref)
-        screen.addPreference(coverPref)
-    }
-
     override fun setupPreferenceScreen(screen: AndroidXPreferenceScreen) {
         val webpPref = AndroidXCheckBoxPreference(screen.context).apply {
             key = "${WEBP_PREF_KEY}_$lang"
diff --git a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiNozomi.kt b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiNozomi.kt
index 43a397e40..9443080bc 100644
--- a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiNozomi.kt
+++ b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiNozomi.kt
@@ -83,7 +83,7 @@ class HitomiNozomi(
         return client.newCall(rangedGet(url, offset, offset + length - 1))
             .asObservable()
             .map {
-                it.body()?.bytes() ?: ByteArray(0)
+                it.body?.bytes() ?: ByteArray(0)
             }
             .onErrorReturn { ByteArray(0) }
             .map { inbuf ->
@@ -192,7 +192,7 @@ class HitomiNozomi(
         return client.newCall(rangedGet(url, address, address + MAX_NODE_SIZE - 1))
             .asObservableSuccess()
             .map {
-                it.body()?.bytes() ?: ByteArray(0)
+                it.body?.bytes() ?: ByteArray(0)
             }
             .onErrorReturn { ByteArray(0) }
             .map { nodedata ->
@@ -215,7 +215,7 @@ class HitomiNozomi(
         )
             .asObservableSuccess()
             .map { resp ->
-                val body = resp.body()!!.bytes()
+                val body = resp.body!!.bytes()
                 val cursor = ByteCursor(body)
                 (1..body.size / 4).map {
                     cursor.nextInt()
@@ -251,7 +251,7 @@ class HitomiNozomi(
         fun getIndexVersion(httpClient: OkHttpClient, name: String): Observable<Long> {
             return httpClient.newCall(GET("$LTN_BASE_URL/$name/version?_=${System.currentTimeMillis()}"))
                 .asObservableSuccess()
-                .map { it.body()!!.string().toLong() }
+                .map { it.body!!.string().toLong() }
         }
     }
 }
diff --git a/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentai.kt b/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentai.kt
index 695d9a286..75ec365e2 100644
--- a/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentai.kt
+++ b/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentai.kt
@@ -11,11 +11,11 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -72,7 +72,7 @@ class IMHentai(override val lang: String, private val imhLang: String) : ParsedH
     private fun toBinary(boolean: Boolean) = if (boolean) "1" else "0"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("key", query)
             .addQueryParameter("page", page.toString())
             .addQueryParameter(getLanguageURIByName(imhLang).uri, toBinary(true)) // main language always enabled
@@ -168,7 +168,7 @@ class IMHentai(override val lang: String, private val imhLang: String) : ParsedH
     override fun chapterListParse(response: Response): List<SChapter> {
         return listOf(
             SChapter.create().apply {
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
                 name = "Chapter"
                 chapter_number = 1f
             }
@@ -185,7 +185,7 @@ class IMHentai(override val lang: String, private val imhLang: String) : ParsedH
         return client.newCall(GET("$baseUrl${chapter.url}"))
             .asObservableSuccess()
             .map { pageLoadMetaParse(it.asJsoup()) }
-            .map { RequestBody.create(MediaType.parse("application/x-www-form-urlencoded; charset=UTF-8"), it) }
+            .map { it.toRequestBody("application/x-www-form-urlencoded; charset=UTF-8".toMediaTypeOrNull()) }
             .concatMap { client.newCall(POST(PAEG_LOAD_URL, pageLoadHeaders, it)).asObservableSuccess() }
             .map { pageListParse(it) }
     }
diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
index 5ce8d73c7..d5aa41e72 100644
--- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
+++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
@@ -2,14 +2,12 @@ package eu.kanade.tachiyomi.extension.all.komga
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import android.util.Log
 import android.widget.Toast
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.extension.all.komga.dto.AuthorDto
 import eu.kanade.tachiyomi.extension.all.komga.dto.BookDto
 import eu.kanade.tachiyomi.extension.all.komga.dto.CollectionDto
@@ -30,7 +28,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Credentials
 import okhttp3.Dns
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -67,7 +65,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
             else -> "series"
         }
 
-        val url = HttpUrl.parse("$baseUrl/api/v1/$type?search=$query&page=${page - 1}")!!.newBuilder()
+        val url = "$baseUrl/api/v1/$type?search=$query&page=${page - 1}".toHttpUrlOrNull()!!.newBuilder()
 
         filters.forEach { filter ->
             when (filter) {
@@ -168,10 +166,10 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
 
     override fun mangaDetailsParse(response: Response): SManga =
         if (response.fromReadList()) {
-            val readList = gson.fromJson<ReadListDto>(response.body()?.charStream()!!)
+            val readList = gson.fromJson<ReadListDto>(response.body?.charStream()!!)
             readList.toSManga()
         } else {
-            val series = gson.fromJson<SeriesDto>(response.body()?.charStream()!!)
+            val series = gson.fromJson<SeriesDto>(response.body?.charStream()!!)
             series.toSManga()
         }
 
@@ -179,7 +177,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
         GET("${manga.url}/books?unpaged=true&media_status=READY", headers)
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body()?.charStream()!!).content
+        val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body?.charStream()!!).content
 
         val r = page.map { book ->
             SChapter.create().apply {
@@ -197,9 +195,9 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
         GET("${chapter.url}/pages")
 
     override fun pageListParse(response: Response): List<Page> {
-        val pages = gson.fromJson<List<PageDto>>(response.body()?.charStream()!!)
+        val pages = gson.fromJson<List<PageDto>>(response.body?.charStream()!!)
         return pages.map {
-            val url = "${response.request().url()}/${it.number}" +
+            val url = "${response.request.url}/${it.number}" +
                 if (!supportedImageTypes.contains(it.mediaType)) {
                     "?convert=png"
                 } else {
@@ -214,11 +212,11 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
 
     private fun processSeriesPage(response: Response): MangasPage {
         if (response.fromReadList()) {
-            with(gson.fromJson<PageWrapperDto<ReadListDto>>(response.body()?.charStream()!!)) {
+            with(gson.fromJson<PageWrapperDto<ReadListDto>>(response.body?.charStream()!!)) {
                 return MangasPage(content.map { it.toSManga() }, !last)
             }
         } else {
-            with(gson.fromJson<PageWrapperDto<SeriesDto>>(response.body()?.charStream()!!)) {
+            with(gson.fromJson<PageWrapperDto<SeriesDto>>(response.body?.charStream()!!)) {
                 return MangasPage(content.map { it.toSManga() }, !last)
             }
         }
@@ -250,7 +248,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
             status = SManga.UNKNOWN
         }
 
-    private fun Response.fromReadList() = request().url().toString().contains("/api/v1/readlists")
+    private fun Response.fromReadList() = request.url.toString().contains("/api/v1/readlists")
 
     private fun parseDate(date: String?): Long =
         if (date == null)
@@ -355,10 +353,10 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
     override val client: OkHttpClient =
         network.client.newBuilder()
             .authenticator { _, response ->
-                if (response.request().header("Authorization") != null) {
+                if (response.request.header("Authorization") != null) {
                     null // Give up, we've already failed to authenticate.
                 } else {
-                    response.request().newBuilder()
+                    response.request.newBuilder()
                         .addHeader("Authorization", Credentials.basic(username, password))
                         .build()
                 }
@@ -399,33 +397,6 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
         }
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.addPreference(screen.supportEditTextPreference(ADDRESS_TITLE, ADDRESS_DEFAULT, baseUrl))
-        screen.addPreference(screen.supportEditTextPreference(USERNAME_TITLE, USERNAME_DEFAULT, username))
-        screen.addPreference(screen.supportEditTextPreference(PASSWORD_TITLE, PASSWORD_DEFAULT, password))
-    }
-
-    private fun PreferenceScreen.supportEditTextPreference(title: String, default: String, value: String): EditTextPreference {
-        return EditTextPreference(context).apply {
-            key = title
-            this.title = title
-            summary = value
-            this.setDefaultValue(default)
-            dialogTitle = title
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(title, newValue as String).commit()
-                    Toast.makeText(context, "Restart Tachiyomi to apply new setting.", Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-    }
-
     private fun getPrefBaseUrl(): String = preferences.getString(ADDRESS_TITLE, ADDRESS_DEFAULT)!!
     private fun getPrefUsername(): String = preferences.getString(USERNAME_TITLE, USERNAME_DEFAULT)!!
     private fun getPrefPassword(): String = preferences.getString(PASSWORD_TITLE, PASSWORD_DEFAULT)!!
@@ -440,7 +411,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         libraries = try {
-                            gson.fromJson(response.body()?.charStream()!!)
+                            gson.fromJson(response.body?.charStream()!!)
                         } catch (e: Exception) {
                             emptyList()
                         }
@@ -458,7 +429,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         collections = try {
-                            gson.fromJson<PageWrapperDto<CollectionDto>>(response.body()?.charStream()!!).content
+                            gson.fromJson<PageWrapperDto<CollectionDto>>(response.body?.charStream()!!).content
                         } catch (e: Exception) {
                             emptyList()
                         }
@@ -476,7 +447,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         genres = try {
-                            gson.fromJson(response.body()?.charStream()!!)
+                            gson.fromJson(response.body?.charStream()!!)
                         } catch (e: Exception) {
                             emptySet()
                         }
@@ -494,7 +465,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         tags = try {
-                            gson.fromJson(response.body()?.charStream()!!)
+                            gson.fromJson(response.body?.charStream()!!)
                         } catch (e: Exception) {
                             emptySet()
                         }
@@ -512,7 +483,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         publishers = try {
-                            gson.fromJson(response.body()?.charStream()!!)
+                            gson.fromJson(response.body?.charStream()!!)
                         } catch (e: Exception) {
                             emptySet()
                         }
@@ -530,7 +501,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
                 .subscribe(
                     { response ->
                         authors = try {
-                            val list: List<AuthorDto> = gson.fromJson(response.body()?.charStream()!!)
+                            val list: List<AuthorDto> = gson.fromJson(response.body?.charStream()!!)
                             list.groupBy { it.role }
                         } catch (e: Exception) {
                             emptyMap()
diff --git a/src/all/lanraragi/build.gradle b/src/all/lanraragi/build.gradle
index 9201f365c..ba19fa839 100644
--- a/src/all/lanraragi/build.gradle
+++ b/src/all/lanraragi/build.gradle
@@ -11,7 +11,7 @@ ext {
 
 dependencies {
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.6'
+    implementation 'io.reactivex:rxjava:1.3.8'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt b/src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt
index ab824428b..df22742b3 100644
--- a/src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt
+++ b/src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt
@@ -3,9 +3,6 @@ package eu.kanade.tachiyomi.extension.all.lanraragi
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.util.Base64
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
@@ -65,7 +62,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
 
         return client.newCall(GET(uri.toString(), headers))
             .asObservable().doOnNext {
-                if (!it.isSuccessful && it.code() == 404) error("Log in with WebView then try again.")
+                if (!it.isSuccessful && it.code == 404) error("Log in with WebView then try again.")
             }
             .map { mangaDetailsParse(it).apply { initialized = true } }
     }
@@ -78,7 +75,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val archive = gson.fromJson<Archive>(response.body()!!.string())
+        val archive = gson.fromJson<Archive>(response.body!!.string())
 
         return archiveToSManga(archive)
     }
@@ -91,7 +88,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val archive = gson.fromJson<Archive>(response.body()!!.string())
+        val archive = gson.fromJson<Archive>(response.body!!.string())
         val uri = getApiUriBuilder("/api/archives/${archive.arcid}/extract")
 
         // Replicate old behavior and unset "isnew" for the archive.
@@ -124,7 +121,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val archivePage = gson.fromJson<ArchivePage>(response.body()!!.string())
+        val archivePage = gson.fromJson<ArchivePage>(response.body!!.string())
 
         return archivePage.pages.mapIndexed { index, url ->
             val uri = Uri.parse("${baseUrl}${url.trimStart('.')}")
@@ -197,7 +194,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val jsonResult = gson.fromJson<ArchiveSearchResult>(response.body()!!.string())
+        val jsonResult = gson.fromJson<ArchiveSearchResult>(response.body!!.string())
         val currentStart = getStart(response)
         val archives = arrayListOf<SManga>()
 
@@ -231,7 +228,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
         return (
             totalRecords > 0 &&
                 getStart(response) == 0 &&
-                response.request().url().querySize() == 1 // ?start=
+                response.request.url.querySize == 1 // ?start=
             )
     }
 
@@ -276,84 +273,6 @@ open class LANraragi : ConfigurableSource, HttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val hostnamePref = EditTextPreference(screen.context).apply {
-            key = "Hostname"
-            title = "Hostname"
-            text = baseUrl
-            summary = baseUrl
-            dialogTitle = "Hostname"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                var hostname = newValue as String
-                if (!hostname.startsWith("http://") && !hostname.startsWith("https://")) {
-                    hostname = "http://$hostname"
-                }
-
-                this.apply {
-                    text = hostname
-                    summary = hostname
-                }
-
-                preferences.edit().putString("hostname", hostname).commit()
-            }
-        }
-
-        val apiKeyPref = EditTextPreference(screen.context).apply {
-            key = "API Key"
-            title = "API Key"
-            text = apiKey
-            summary = "Required if No-Fun Mode is enabled."
-            dialogTitle = "API Key"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val apiKey = newValue as String
-
-                this.apply {
-                    text = apiKey
-                    summary = "Required if No-Fun Mode is enabled."
-                }
-
-                preferences.edit().putString("apiKey", newValue).commit()
-            }
-        }
-
-        val latestNewOnlyPref = CheckBoxPreference(screen.context).apply {
-            key = "latestNewOnly"
-            title = "Latest - New Only"
-            setDefaultValue(true)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("latestNewOnly", checkValue).commit()
-            }
-        }
-
-        val latestNamespacePref = EditTextPreference(screen.context).apply {
-            key = "latestNamespacePref"
-            title = "Latest - Sort by Namespace"
-            text = latestNamespacePref
-            summary = "Sort by the given namespace for Latest, such as date_added."
-            dialogTitle = "Latest - Sort by Namespace"
-            setDefaultValue(DEFAULT_SORT_BY_NS)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val latestNamespacePref = newValue as String
-
-                this.apply {
-                    text = latestNamespacePref
-                }
-
-                preferences.edit().putString("latestNamespacePref", newValue).commit()
-            }
-        }
-
-        screen.addPreference(hostnamePref)
-        screen.addPreference(apiKeyPref)
-        screen.addPreference(latestNewOnlyPref)
-        screen.addPreference(latestNamespacePref)
-    }
-
     override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
         val hostnamePref = androidx.preference.EditTextPreference(screen.context).apply {
             key = "Hostname"
@@ -457,7 +376,7 @@ open class LANraragi : ConfigurableSource, HttpSource() {
             .subscribe(
                 {
                     categories = try {
-                        gson.fromJson(it.body()?.charStream()!!)
+                        gson.fromJson(it.body?.charStream()!!)
                     } catch (e: Exception) {
                         emptyList()
                     }
@@ -505,15 +424,15 @@ open class LANraragi : ConfigurableSource, HttpSource() {
     }
 
     private fun getTopResponse(response: Response): Response {
-        return if (response.priorResponse() == null) response else getTopResponse(response.priorResponse()!!)
+        return if (response.priorResponse == null) response else getTopResponse(response.priorResponse!!)
     }
 
     private fun getId(response: Response): String {
-        return getTopResponse(response).request().url().queryParameter("id").toString()
+        return getTopResponse(response).request.url.queryParameter("id").toString()
     }
 
     private fun getStart(response: Response): Int {
-        return getTopResponse(response).request().url().queryParameter("start")!!.toInt()
+        return getTopResponse(response).request.url.queryParameter("start")!!.toInt()
     }
 
     private fun getReaderId(url: String): String {
diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
index 50ede068b..23cd5c2ad 100644
--- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
+++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.all.mangadex
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import android.util.Log
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.bool
@@ -33,7 +31,7 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.CacheControl
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -230,7 +228,7 @@ abstract class MangaDex(
         val genresToExclude = mutableListOf<String>()
 
         // Do traditional search
-        val url = HttpUrl.parse("$baseUrl/?page=search")!!.newBuilder()
+        val url = "$baseUrl/?page=search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("p", page.toString())
             .addQueryParameter("title", query.replace(WHITESPACE_REGEX, " "))
 
@@ -346,7 +344,7 @@ abstract class MangaDex(
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (response.request().url().toString().contains("/groups/")) {
+        return if (response.request.url.toString().contains("/groups/")) {
             response.asJsoup()
                 .select(".table > tbody:nth-child(2) > tr:nth-child(1) > td:nth-child(2) > a")
                 .firstOrNull()?.attr("abs:href")
@@ -428,7 +426,7 @@ abstract class MangaDex(
 
     override fun mangaDetailsParse(response: Response): SManga {
         val manga = SManga.create()
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject["data"]
         val mangaJson = json["manga"].asJsonObject
         val chapterJson = json["chapters"].asJsonArray
@@ -519,7 +517,7 @@ abstract class MangaDex(
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val now = Date().time
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject["data"]
         val mangaJson = json["manga"].asJsonObject
 
@@ -615,10 +613,10 @@ abstract class MangaDex(
             .asObservable().doOnNext { response ->
                 if (!response.isSuccessful) {
                     response.close()
-                    if (response.code() == 451) {
+                    if (response.code == 451) {
                         error("Error 451: Log in to view manga; contact MangaDex if error persists.")
                     } else {
-                        throw Exception("HTTP error ${response.code()}")
+                        throw Exception("HTTP error ${response.code}")
                     }
                 }
             }
@@ -645,7 +643,7 @@ abstract class MangaDex(
     override fun pageListParse(document: Document) = throw Exception("Not used")
 
     override fun pageListParse(response: Response): List<Page> {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject["data"]
 
         val hash = json["hash"].string
@@ -653,7 +651,7 @@ abstract class MangaDex(
 
         return json["pages"].asJsonArray.mapIndexed { idx, it ->
             val url = "$hash/${it.asString}"
-            val mdAtHomeMetadataUrl = "$server,${response.request().url()},${Date().time}"
+            val mdAtHomeMetadataUrl = "$server,${response.request.url},${Date().time}"
             Page(idx, mdAtHomeMetadataUrl, url)
         }
     }
@@ -682,7 +680,7 @@ abstract class MangaDex(
                         }
                     val jsonData =
                         client.newCall(GET(tokenRequestUrl, headers, cacheControl)).execute()
-                            .body()!!.string()
+                            .body!!.string()
                     tokenedServer =
                         JsonParser().parse(jsonData).asJsonObject["data"]["server"].string
                 }
@@ -766,69 +764,6 @@ abstract class MangaDex(
         screen.addPreference(dataSaverPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val r18Pref = ListPreference(screen.context).apply {
-            key = SHOW_R18_PREF_Title
-            title = SHOW_R18_PREF_Title
-
-            title = SHOW_R18_PREF_Title
-            entries = arrayOf("Show No R18+", "Show All", "Show Only R18+")
-            entryValues = arrayOf("0", "1", "2")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                preferences.edit().putInt(SHOW_R18_PREF, index).commit()
-            }
-        }
-        val thumbsPref = ListPreference(screen.context).apply {
-            key = SHOW_THUMBNAIL_PREF_Title
-            title = SHOW_THUMBNAIL_PREF_Title
-            entries = arrayOf("Show high quality", "Show low quality")
-            entryValues = arrayOf("0", "1")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                preferences.edit().putInt(SHOW_THUMBNAIL_PREF, index).commit()
-            }
-        }
-        val serverPref = ListPreference(screen.context).apply {
-            key = SERVER_PREF_Title
-            title = SERVER_PREF_Title
-            entries = SERVER_PREF_ENTRIES
-            entryValues = SERVER_PREF_ENTRY_VALUES
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(SERVER_PREF, entry).commit()
-            }
-        }
-        val dataSaverPref = ListPreference(screen.context).apply {
-            key = DATA_SAVER_PREF_Title
-            title = DATA_SAVER_PREF_Title
-            entries = arrayOf("Disable", "Enable")
-            entryValues = arrayOf("0", "1")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                preferences.edit().putInt(DATA_SAVER_PREF, index).commit()
-            }
-        }
-
-        screen.addPreference(r18Pref)
-        screen.addPreference(thumbsPref)
-        screen.addPreference(serverPref)
-        screen.addPreference(dataSaverPref)
-    }
-
     private fun getShowR18(): Int = preferences.getInt(SHOW_R18_PREF, 0)
     private fun getShowThumbnail(): Int = preferences.getInt(SHOW_THUMBNAIL_PREF, 0)
     private fun getServer(): String {
@@ -1068,11 +1003,11 @@ class CoverInterceptor : Interceptor {
         val originalRequest = chain.request()
 
         return chain.proceed(chain.request()).let { response ->
-            if (response.code() == 404 && originalRequest.url().toString().contains(coverRegex)) {
+            if (response.code == 404 && originalRequest.url.toString().contains(coverRegex)) {
                 response.close()
                 chain.proceed(
                     originalRequest.newBuilder().url(
-                        originalRequest.url().toString().substringBeforeLast(".") + ".thumb.jpg"
+                        originalRequest.url.toString().substringBeforeLast(".") + ".thumb.jpg"
                     ).build()
                 )
             } else {
@@ -1087,7 +1022,7 @@ class MdRateLimitInterceptor : Interceptor {
     private val baseInterceptor = RateLimitInterceptor(2)
 
     override fun intercept(chain: Interceptor.Chain): Response =
-        if (chain.request().url().toString().contains(coverRegex))
+        if (chain.request().url.toString().contains(coverRegex))
             chain.proceed(chain.request())
         else
             baseInterceptor.intercept(chain)
@@ -1105,7 +1040,7 @@ class MdAtHomeReportInterceptor(
         val originalRequest = chain.request()
 
         return chain.proceed(chain.request()).let { response ->
-            val url = originalRequest.url().toString()
+            val url = originalRequest.url.toString()
             if (url.contains(mdAtHomeUrlRegex)) {
                 val jsonString = gson.toJson(
                     mapOf(
diff --git a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
index 5ecbe83bd..a84f35db0 100644
--- a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
+++ b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt
@@ -3,9 +3,6 @@ package eu.kanade.tachiyomi.extension.all.mangaplus
 import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import com.google.gson.Gson
 import com.squareup.duktape.Duktape
 import eu.kanade.tachiyomi.network.GET
@@ -19,9 +16,9 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import kotlinx.serialization.protobuf.ProtoBuf
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -59,7 +56,7 @@ abstract class MangaPlus(
 
     private val protobufJs: String by lazy {
         val request = GET(PROTOBUFJS_CDN, headers)
-        client.newCall(request).execute().body()!!.string()
+        client.newCall(request).execute().body!!.string()
     }
 
     private val gson: Gson by lazy { Gson() }
@@ -274,7 +271,7 @@ abstract class MangaPlus(
             .set("Referer", "$baseUrl/viewer/$chapterId")
             .build()
 
-        val url = HttpUrl.parse("$API_URL/manga_viewer")!!.newBuilder()
+        val url = "$API_URL/manga_viewer".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("chapter_id", chapterId)
             .addQueryParameter("split", splitImages)
             .addQueryParameter("img_quality", imageResolution)
@@ -289,7 +286,7 @@ abstract class MangaPlus(
         if (result.success == null)
             throw Exception(result.error!!.langPopup.body)
 
-        val referer = response.request().header("Referer")!!
+        val referer = response.request.header("Referer")!!
 
         return result.success.mangaViewer!!.pages
             .mapNotNull { it.page }
@@ -344,48 +341,16 @@ abstract class MangaPlus(
         screen.addPreference(splitPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val resolutionPref = ListPreference(screen.context).apply {
-            key = "${RESOLUTION_PREF_KEY}_$lang"
-            title = RESOLUTION_PREF_TITLE
-            entries = RESOLUTION_PREF_ENTRIES
-            entryValues = RESOLUTION_PREF_ENTRY_VALUES
-            setDefaultValue(RESOLUTION_PREF_DEFAULT_VALUE)
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString("${RESOLUTION_PREF_KEY}_$lang", entry).commit()
-            }
-        }
-        val splitPref = CheckBoxPreference(screen.context).apply {
-            key = "${SPLIT_PREF_KEY}_$lang"
-            title = SPLIT_PREF_TITLE
-            summary = SPLIT_PREF_SUMMARY
-            setDefaultValue(SPLIT_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean("${SPLIT_PREF_KEY}_$lang", checkValue).commit()
-            }
-        }
-
-        screen.addPreference(resolutionPref)
-        screen.addPreference(splitPref)
-    }
-
     private fun imageIntercept(chain: Interceptor.Chain): Response {
         var request = chain.request()
 
-        if (request.url().queryParameter("encryptionKey") == null)
+        if (request.url.queryParameter("encryptionKey") == null)
             return chain.proceed(request)
 
-        val encryptionKey = request.url().queryParameter("encryptionKey")!!
+        val encryptionKey = request.url.queryParameter("encryptionKey")!!
 
         // Change the url and remove the encryptionKey to avoid detection.
-        val newUrl = request.url().newBuilder()
+        val newUrl = request.url.newBuilder()
             .removeAllQueryParameters("encryptionKey")
             .build()
         request = request.newBuilder()
@@ -395,8 +360,8 @@ abstract class MangaPlus(
         val response = chain.proceed(request)
 
         val contentType = response.header("Content-Type", "image/jpeg")!!
-        val image = decodeImage(encryptionKey, response.body()!!.bytes())
-        val body = ResponseBody.create(MediaType.parse(contentType), image)
+        val image = decodeImage(encryptionKey, response.body!!.bytes())
+        val body = ResponseBody.create(contentType.toMediaTypeOrNull(), image)
 
         return response.newBuilder()
             .body(body)
@@ -427,17 +392,17 @@ abstract class MangaPlus(
         val response = chain.proceed(request)
 
         // Check if it is 404 to maintain compatibility when the extension used Weserv.
-        val isBadCode = (response.code() == 401 || response.code() == 404)
+        val isBadCode = (response.code == 401 || response.code == 404)
 
-        if (isBadCode && request.url().toString().contains(TITLE_THUMBNAIL_PATH)) {
-            val titleId = request.url().toString()
+        if (isBadCode && request.url.toString().contains(TITLE_THUMBNAIL_PATH)) {
+            val titleId = request.url.toString()
                 .substringBefore("/$TITLE_THUMBNAIL_PATH")
                 .substringAfterLast("/")
                 .toInt()
             val title = titleList?.find { it.titleId == titleId } ?: return response
 
             response.close()
-            val thumbnailRequest = GET(title.portraitImageUrl, request.headers())
+            val thumbnailRequest = GET(title.portraitImageUrl, request.headers)
             return chain.proceed(thumbnailRequest)
         }
 
@@ -457,13 +422,13 @@ abstract class MangaPlus(
 
     private fun Response.asProto(): MangaPlusResponse {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M)
-            return ProtoBuf.decodeFromByteArray(MangaPlusSerializer, body()!!.bytes())
+            return ProtoBuf.decodeFromByteArray(MangaPlusSerializer, body!!.bytes())
 
         // The kotlinx.serialization library eventually always have some issues with
         // devices with Android version below Nougat. So, if the device is running Marshmallow
         // or lower, the deserialization is done using ProtobufJS + Duktape + Gson.
 
-        val bytes = body()!!.bytes()
+        val bytes = body!!.bytes()
         val messageBytes = "var BYTE_ARR = new Uint8Array([${bytes.joinToString()}]);"
 
         val res = Duktape.create().use {
diff --git a/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt b/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt
index 873fdfe8e..4aba053a7 100644
--- a/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt
+++ b/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -42,7 +42,7 @@ open class MangaToon(
         return GET("$baseUrl/$urllang/genre/new?page=$page0", headers)
     }
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/$urllang/search?word=$query")?.newBuilder()
+        val url = "$baseUrl/$urllang/search?word=$query".toHttpUrlOrNull()?.newBuilder()
         return GET(url.toString(), headers)
     }
 
diff --git a/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt b/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt
index 75cf52e32..a1081ffaa 100644
--- a/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt
+++ b/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.all.mango
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import android.widget.Toast
 import com.github.salomonbrys.kotson.fromJson
@@ -11,7 +9,7 @@ import com.github.salomonbrys.kotson.get
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import com.google.gson.JsonSyntaxException
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -44,7 +42,7 @@ class Mango : ConfigurableSource, HttpSource() {
     // Our popular manga are just our library of manga
     override fun popularMangaParse(response: Response): MangasPage {
         val result = try {
-            gson.fromJson<JsonObject>(response.body()!!.string())
+            gson.fromJson<JsonObject>(response.body!!.string())
         } catch (e: JsonSyntaxException) {
             apiCookies = ""
             throw Exception("Login Likely Failed. Try Refreshing.")
@@ -120,7 +118,7 @@ class Mango : ConfigurableSource, HttpSource() {
     // This will just return the same thing as the main library endpoint
     override fun mangaDetailsParse(response: Response): SManga {
         val result = try {
-            gson.fromJson<JsonObject>(response.body()!!.string())
+            gson.fromJson<JsonObject>(response.body!!.string())
         } catch (e: JsonSyntaxException) {
             apiCookies = ""
             throw Exception("Login Likely Failed. Try Refreshing.")
@@ -138,7 +136,7 @@ class Mango : ConfigurableSource, HttpSource() {
     // The chapter url will contain how many pages the chapter contains for our page list endpoint
     override fun chapterListParse(response: Response): List<SChapter> {
         val result = try {
-            gson.fromJson<JsonObject>(response.body()!!.string())
+            gson.fromJson<JsonObject>(response.body!!.string())
         } catch (e: JsonSyntaxException) {
             apiCookies = ""
             throw Exception("Login Likely Failed. Try Refreshing.")
@@ -235,7 +233,7 @@ class Mango : ConfigurableSource, HttpSource() {
             .build()
         val loginRequest = POST("$baseUrl/login", formHeaders, formBody)
         val response = chain.proceed(loginRequest)
-        if (response.code() != 200 || response.header("Set-Cookie") == null) {
+        if (response.code != 200 || response.header("Set-Cookie") == null) {
             throw Exception("Login Failed. Check Address and Credentials")
         }
         // Save the cookies from the response
@@ -276,33 +274,6 @@ class Mango : ConfigurableSource, HttpSource() {
         }
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.addPreference(screen.supportEditTextPreference(ADDRESS_TITLE, ADDRESS_DEFAULT, baseUrl))
-        screen.addPreference(screen.supportEditTextPreference(USERNAME_TITLE, USERNAME_DEFAULT, username))
-        screen.addPreference(screen.supportEditTextPreference(PASSWORD_TITLE, PASSWORD_DEFAULT, password))
-    }
-
-    private fun PreferenceScreen.supportEditTextPreference(title: String, default: String, value: String): EditTextPreference {
-        return EditTextPreference(context).apply {
-            key = title
-            this.title = title
-            summary = value
-            this.setDefaultValue(default)
-            dialogTitle = title
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(title, newValue as String).commit()
-                    Toast.makeText(context, "Restart Tachiyomi to apply new setting.", Toast.LENGTH_LONG).show()
-                    apiCookies = ""
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-    }
-
     // We strip the last slash since we will append it above
     private fun getPrefBaseUrl(): String {
         var path = preferences.getString(ADDRESS_TITLE, ADDRESS_DEFAULT)!!
diff --git a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/Generator.kt b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/Generator.kt
index 2af17d67b..d8fb575ec 100644
--- a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/Generator.kt
+++ b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/Generator.kt
@@ -17,7 +17,6 @@ import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
-import kotlin.jvm.Throws
 
 /**
  * This class generates the sources for MMRCMS.
@@ -123,21 +122,21 @@ class Generator {
             val request = Request.Builder().url(url)
             getOkHttpClient().newCall(request.build()).execute().let { response ->
                 // Bypass Cloudflare ("Please wait 5 seconds" page)
-                if (response.code() == 503 && response.header("Server") in serverCheck) {
+                if (response.code == 503 && response.header("Server") in serverCheck) {
                     var cookie = "${response.header("Set-Cookie")!!.substringBefore(";")}; "
-                    Jsoup.parse(response.body()!!.string()).let { document ->
+                    Jsoup.parse(response.body!!.string()).let { document ->
                         val path = document.select("[id=\"challenge-form\"]").attr("action")
                         val chk = document.select("[name=\"s\"]").attr("value")
                         getOkHttpClient().newCall(Request.Builder().url("$url/$path?s=$chk").build()).execute().let { solved ->
                             cookie += solved.header("Set-Cookie")!!.substringBefore(";")
                             request.addHeader("Cookie", cookie).build().let {
-                                return Jsoup.parse(getOkHttpClient().newCall(it).execute().body()?.string())
+                                return Jsoup.parse(getOkHttpClient().newCall(it).execute().body?.string())
                             }
                         }
                     }
                 }
-                if (response.code() == 200) {
-                    return Jsoup.parse(response.body()?.string())
+                if (response.code == 200) {
+                    return Jsoup.parse(response.body?.string())
                 }
             }
         } catch (e: Exception) {
diff --git a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSource.kt b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSource.kt
index 644af8f64..a214a09a4 100644
--- a/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSource.kt
+++ b/src/all/mmrcms/src/eu/kanade/tachiyomi/extension/all/mmrcms/MyMangaReaderCMSSource.kt
@@ -109,9 +109,9 @@ open class MyMangaReaderCMSSource(
 
     override fun popularMangaParse(response: Response) = internalMangaParse(response)
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (listOf("query", "q").any { it in response.request().url().queryParameterNames() }) {
+        return if (listOf("query", "q").any { it in response.request.url.queryParameterNames }) {
             // If a search query was specified, use search instead!
-            val jsonArray = jsonParser.parse(response.body()!!.string()).let {
+            val jsonArray = jsonParser.parse(response.body!!.string()).let {
                 if (name == "Mangas.pw") it.array else it["suggestions"].array
             }
             MangasPage(
diff --git a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt
index 2fc471020..ff3ef8510 100644
--- a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt
+++ b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingManga.kt
@@ -231,7 +231,7 @@ open class MyReadingManga(override val lang: String, private val siteLang: Strin
     // Grabs page containing filters and puts it into cache
     private fun filterAssist(url: String): String {
         val response = client.newCall(GET(url, headers)).execute()
-        return response.body()!!.string()
+        return response.body!!.string()
     }
 
     // Returns page from cache to reduce calls to website
diff --git a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt
index 6c025e51d..7fb298a5f 100644
--- a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt
+++ b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.all.nhentai
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.extension.all.nhentai.NHUtils.getArtists
 import eu.kanade.tachiyomi.extension.all.nhentai.NHUtils.getGroups
 import eu.kanade.tachiyomi.extension.all.nhentai.NHUtils.getNumPages
@@ -22,7 +20,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -83,29 +81,6 @@ open class NHentai(
         screen.addPreference(serverPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val serverPref = ListPreference(screen.context).apply {
-            key = TITLE_PREF
-            title = TITLE_PREF
-            entries = arrayOf("Full Title", "Short Title")
-            entryValues = arrayOf("full", "short")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                displayFullTitle = when (newValue) {
-                    "full" -> true
-                    else -> false
-                }
-                true
-            }
-        }
-
-        if (!preferences.contains(TITLE_PREF))
-            preferences.edit().putString(TITLE_PREF, "full").apply()
-
-        screen.addPreference(serverPref)
-    }
-
     override fun latestUpdatesRequest(page: Int) = GET(if (nhLang.isBlank()) "$baseUrl/?page=$page" else "$baseUrl/language/$nhLang/?page=$page", headers)
 
     override fun latestUpdatesSelector() = "#content .gallery"
@@ -161,13 +136,13 @@ open class NHentai(
         val isOkayToSort = filterList.findInstance<UploadedFilter>()?.state?.isBlank() ?: true
 
         if (favoriteFilter?.state == true) {
-            val url = HttpUrl.parse("$baseUrl/favorites")!!.newBuilder()
+            val url = "$baseUrl/favorites".toHttpUrlOrNull()!!.newBuilder()
                 .addQueryParameter("q", "$query $advQuery")
                 .addQueryParameter("page", page.toString())
 
             return GET(url.toString(), headers)
         } else {
-            val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+            val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
                 .addQueryParameter("q", "$query $nhLangSearch$advQuery")
                 .addQueryParameter("page", page.toString())
 
@@ -211,7 +186,7 @@ open class NHentai(
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        if (response.request().url().toString().contains("/login/")) {
+        if (response.request.url.toString().contains("/login/")) {
             val document = response.asJsoup()
             if (document.select(".fa-sign-in").isNotEmpty()) {
                 throw Exception("Log in via WebView to view favorites")
@@ -256,7 +231,7 @@ open class NHentai(
                 name = "Chapter"
                 scanlator = getGroups(document)
                 date_upload = getTime(document)
-                setUrlWithoutDomain(response.request().url().encodedPath())
+                setUrlWithoutDomain(response.request.url.encodedPath)
             }
         )
     }
diff --git a/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt b/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt
index 050f9ffc2..d43079d52 100644
--- a/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt
+++ b/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt
@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -75,7 +75,7 @@ class NineHentai : HttpSource() {
     }
 
     private fun getMangaList(response: Response, page: Int): MangasPage {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val jsonObject = JsonParser().parse(jsonData).asJsonObject
         val totalPages = jsonObject["total_count"].int
         val results = jsonObject["results"].array
@@ -150,7 +150,7 @@ class NineHentai : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val jsonObject = JsonParser().parse(jsonData).asJsonObject
         val jsonArray = jsonObject.getAsJsonObject("results")
         var imageUrl: String
@@ -168,7 +168,7 @@ class NineHentai : HttpSource() {
                 "$imageUrl/preview/${totalPages}t.jpg",
                 headersBuilder().build()
             )
-        ).execute().code().let { code ->
+        ).execute().code.let { code ->
             if (code == 404) totalPages--
         }
 
@@ -214,7 +214,7 @@ class NineHentai : HttpSource() {
     override fun chapterListParse(response: Response): List<SChapter> = throw Exception("Not Used")
 
     companion object {
-        private val MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+        private val MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
         private const val SEARCH_URL = "/api/getBook"
         private const val MANGA_URL = "/api/getBookByID"
     }
diff --git a/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt b/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt
index 98ac0203f..5d37c3686 100644
--- a/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt
+++ b/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -113,7 +113,7 @@ open class NineManga(override val name: String, override val baseUrl: String, ov
     override fun imageUrlParse(document: Document) = document.select("div.pic_box img.manga_pic").first().attr("src").orEmpty()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/")!!.newBuilder()
+        val url = "$baseUrl/search/".toHttpUrlOrNull()!!.newBuilder()
 
         url.addQueryParameter("wd", query)
         url.addQueryParameter("page", page.toString())
diff --git a/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentai.kt b/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentai.kt
index 32284f862..f7c6daefc 100644
--- a/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentai.kt
+++ b/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentai.kt
@@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -75,7 +75,7 @@ abstract class SimplyHentai(
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("query", query)
             .addQueryParameter("language_ids[$searchLang]", searchLang)
             .addQueryParameter("page", page.toString())
@@ -135,7 +135,7 @@ abstract class SimplyHentai(
         return listOf(
             SChapter.create().apply {
                 name = "Chapter"
-                url = response.request().url().toString().removeSuffix("/").substringAfterLast("/")
+                url = response.request.url.toString().removeSuffix("/").substringAfterLast("/")
                 chapter_number = 1f
 
                 date_upload = response.asJsoup().select(".stat-container div:contains(Uploaded) div.bold")?.text().let {
@@ -158,7 +158,7 @@ abstract class SimplyHentai(
     override fun pageListParse(response: Response): List<Page> {
         val pages = mutableListOf<Page>()
 
-        gson.fromJson<JsonObject>(response.body()!!.string()).forEach { _, jsonElement ->
+        gson.fromJson<JsonObject>(response.body!!.string()).forEach { _, jsonElement ->
             pages.add(Page(pages.size, "", jsonElement["sizes"]["full"].string))
         }
 
diff --git a/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt b/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt
index d14ad740c..8544fe439 100644
--- a/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt
+++ b/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt
@@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
@@ -46,7 +46,7 @@ class AndromedaScans : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val type = "application/x-www-form-urlencoded; charset=UTF-8"
-        val body = RequestBody.create(MediaType.parse(type), "action=data_fetch&keyword=$query")
+        val body = "action=data_fetch&keyword=$query".toRequestBody(type.toMediaTypeOrNull())
 
         return POST("$baseUrl/wp-admin/admin-ajax.php", headers, body)
     }
diff --git a/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/Gmanga.kt b/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/Gmanga.kt
index 020b97c59..51e726993 100644
--- a/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/Gmanga.kt
+++ b/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/Gmanga.kt
@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.extension.ar.gmanga
 
-import android.support.v7.preference.PreferenceScreen
+import androidx.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.nullString
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -55,8 +55,6 @@ class Gmanga : ConfigurableSource, HttpSource() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) = preferences.setupPreferenceScreen(screen)
 
-    override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) = preferences.setupPreferenceScreen(screen)
-
     override fun chapterListRequest(manga: SManga): Request {
         val mangaId = manga.url.substringAfterLast("/")
         return GET("$baseUrl/api/mangas/$mangaId/releases", headers)
@@ -128,7 +126,7 @@ class Gmanga : ConfigurableSource, HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val url = response.request().url().toString()
+        val url = response.request.url.toString()
         val data = gson.fromJson<JsonObject>(response.asJsoup().select(".js-react-on-rails-component").html())
         val releaseData = data["readerDataAction"]["readerData"]["release"].asJsonObject
 
@@ -163,7 +161,7 @@ class Gmanga : ConfigurableSource, HttpSource() {
     }
 
     private fun decryptResponse(response: Response): JsonObject {
-        val encryptedData = gson.fromJson<JsonObject>(response.body()!!.string())["data"].asString
+        val encryptedData = gson.fromJson<JsonObject>(response.body!!.string())["data"].asString
         val decryptedData = decrypt(encryptedData)
         return gson.fromJson(decryptedData)
     }
@@ -179,6 +177,6 @@ class Gmanga : ConfigurableSource, HttpSource() {
 
     companion object {
         private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36"
-        private val MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+        private val MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
     }
 }
diff --git a/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/GmangaPreferences.kt b/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/GmangaPreferences.kt
index 76af1c357..15269611f 100644
--- a/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/GmangaPreferences.kt
+++ b/src/ar/gmanga/src/eu/kanade/tachiyomi/extension/ar/gmanga/GmangaPreferences.kt
@@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.extension.ar.gmanga
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -14,7 +14,6 @@ class GmangaPreferences(id: Long) {
     }
 
     fun setupPreferenceScreen(screen: PreferenceScreen) {
-
         STRING_PREFERENCES.forEach {
             val preference = ListPreference(screen.context).apply {
                 key = it.key
@@ -31,24 +30,6 @@ class GmangaPreferences(id: Long) {
         }
     }
 
-    fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
-
-        STRING_PREFERENCES.forEach {
-            val preference = androidx.preference.ListPreference(screen.context).apply {
-                key = it.key
-                title = it.title
-                entries = it.entries()
-                entryValues = it.entryValues()
-                summary = "%s"
-            }
-
-            if (!preferences.contains(it.key))
-                preferences.edit().putString(it.key, it.default().key).apply()
-
-            screen.addPreference(preference)
-        }
-    }
-
     fun getString(pref: StringPreference): String {
         return preferences.getString(pref.key, pref.default().key)!!
     }
diff --git a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
index a2134a2c5..264a67e39 100644
--- a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
+++ b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -90,7 +90,7 @@ class MangaAe : ParsedHttpSource() {
             }
         }
         url += "|arrange:minus"
-        return GET(HttpUrl.parse(url)!!.newBuilder().build().toString(), headers)
+        return GET(url.toHttpUrlOrNull()!!.newBuilder().build().toString(), headers)
     }
 
     override fun searchMangaSelector(): String = popularMangaSelector()
diff --git a/src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCat.kt b/src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCat.kt
index 2f9d34e86..7cec89e66 100644
--- a/src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCat.kt
+++ b/src/ca/fansubscat/src/eu/kanade/tachiyomi/extension/ca/fansubscat/FansubsCat.kt
@@ -8,7 +8,7 @@ import com.github.salomonbrys.kotson.nullString
 import com.github.salomonbrys.kotson.string
 import com.google.gson.Gson
 import com.google.gson.JsonObject
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -44,7 +44,7 @@ class FansubsCat : HttpSource() {
     private val apiBaseUrl = "https://api.fansubs.cat"
 
     private fun parseMangaFromJson(response: Response): MangasPage {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         val mangas = jsonObject["result"].asJsonArray.map { json ->
             SManga.create().apply {
@@ -62,7 +62,7 @@ class FansubsCat : HttpSource() {
     }
 
     private fun parseChapterListFromJson(response: Response): List<SChapter> {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return jsonObject["result"].asJsonArray.map { json ->
             SChapter.create().apply {
@@ -76,7 +76,7 @@ class FansubsCat : HttpSource() {
     }
 
     private fun parsePageListFromJson(response: Response): List<Page> {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return jsonObject["result"].asJsonArray.mapIndexed { i, it ->
             Page(i, it["url"].asString, it["url"].asString)
@@ -102,7 +102,7 @@ class FansubsCat : HttpSource() {
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$apiBaseUrl/manga/search/$page")!!.newBuilder()
+        val url = "$apiBaseUrl/manga/search/$page".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("query", query)
         return GET(url.toString(), headers)
     }
@@ -124,7 +124,7 @@ class FansubsCat : HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return SManga.create().apply {
             url = jsonObject["result"]["slug"].string
diff --git a/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt b/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt
index 7d6b72314..0b506b185 100644
--- a/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt
+++ b/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt
@@ -66,7 +66,7 @@ class MangaTube : ParsedHttpSource() {
     // for future reference: if adding filters, advanced search might use a different key
     private fun parseMangaFromJson(response: Response, hasNextPage: Boolean): MangasPage {
         var titleKey = "manga_title"
-        val mangas = gson.fromJson<JsonObject>(response.body()!!.string())
+        val mangas = gson.fromJson<JsonObject>(response.body!!.string())
             .let { it["success"] ?: it["suggestions"].also { titleKey = "value" } }
             .asJsonArray
             .map { json ->
diff --git a/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt b/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt
index 15cea7eaa..4c43948b7 100644
--- a/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt
+++ b/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt
@@ -8,11 +8,12 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -69,7 +70,7 @@ class Comicastle : ParsedHttpSource() {
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/library/search")!!.newBuilder()
+        val url = "$baseUrl/library/search".toHttpUrlOrNull()!!.newBuilder()
         var rBody: RequestBody? = null
 
         (filters.let { if (it.isEmpty()) getFilterList() else filters })
@@ -160,4 +161,5 @@ class Comicastle : ParsedHttpSource() {
     private fun getPublisherList() = arrayOf("<Select>", "Action Lab", "Aftershock", "AHOY", "American Mythology", "Aspen", "Avatar Press", "AWA Studios", "Black Mask", "BOOM! Studios", "Dark Horse", "DC", "Death Rattle", "Dynamite", "IDW", "Image", "Magnetic Press", "Marvel", "MAX", "Titan", "Ubiworkshop", "Valiant", "Vault", "Vertigo", "Wildstorm", "Zenescope")
 }
 
-private fun createRequestBody(value: String) = RequestBody.create(MediaType.parse("application/x-www-form-urlencoded"), "search=" + URLEncoder.encode(value, "UTF-8"))
+private fun createRequestBody(value: String) =
+    ("search=" + URLEncoder.encode(value, "UTF-8")).toRequestBody("application/x-www-form-urlencoded".toMediaTypeOrNull())
diff --git a/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt b/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt
index acb22eb19..dd3653fd9 100644
--- a/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt
+++ b/src/en/dilbert/src/eu/kanade/tachiyomi/extension/en/dilbert/Dilbert.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.dilbert
 
 import android.os.Build.VERSION
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -89,7 +89,7 @@ class Dilbert : ParsedHttpSource() {
             val res = client.newCall(chapterListRequest(manga, page)).execute()
             if (!res.isSuccessful) {
                 res.close()
-                throw Exception("HTTP error ${res.code()}")
+                throw Exception("HTTP error ${res.code}")
             }
             return res.asJsoup().also {
                 chapters.addAll(it.select(".comic-item").map(::chapterFromElement))
diff --git a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
index 8340654a6..08f1b59ee 100644
--- a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
+++ b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
@@ -49,7 +49,7 @@ class Doujins : HttpSource() {
         return listOf(
             SChapter.create().apply {
                 name = "Chapter"
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
 
                 val dateAndPageCountString = response.asJsoup().select(".text-md-right.text-sm-left > .folder-message").text()
 
@@ -68,7 +68,7 @@ class Doujins : HttpSource() {
 
     override fun latestUpdatesParse(response: Response): MangasPage {
         return MangasPage(
-            gson.fromJson<JsonObject>(response.body()!!.string())["folders"].asJsonArray.map {
+            gson.fromJson<JsonObject>(response.body!!.string())["folders"].asJsonArray.map {
                 SManga.create().apply {
                     setUrlWithoutDomain(it["link"].asString)
                     title = it["name"].asString
@@ -114,7 +114,7 @@ class Doujins : HttpSource() {
 
     override fun pageListParse(response: Response): List<Page> {
         val document = response.asJsoup()
-        val pageUrl = response.request().url().toString()
+        val pageUrl = response.request.url.toString()
         return document.select(".doujin").mapIndexed { i, page ->
             Page(i, "$pageUrl${page.attr("data-link")}", page.attr("data-file").replace("amp;", ""))
         }
diff --git a/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt b/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt
index 0f86d02cd..c76298ff3 100644
--- a/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt
+++ b/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -74,11 +74,11 @@ class Eggporncomics : ParsedHttpSource() {
                 if (!response.isSuccessful) {
                     // when combining a category filter and comics filter, if there are no results the source
                     // issues a 404, override that so as not to confuse users
-                    if (response.request().url().toString().contains("category-tag") && response.code() == 404) {
+                    if (response.request.url.toString().contains("category-tag") && response.code == 404) {
                         Observable.just(MangasPage(emptyList(), false))
                     } else {
                         response.close()
-                        throw Exception("HTTP error ${response.code()}")
+                        throw Exception("HTTP error ${response.code}")
                     }
                 }
             }
@@ -93,7 +93,7 @@ class Eggporncomics : ParsedHttpSource() {
         return if (query.isNotBlank()) {
             GET("$baseUrl/search/${query.replace(queryRegex, "-")}?page=$page", headers)
         } else {
-            val url = HttpUrl.parse(baseUrl)!!.newBuilder()
+            val url = baseUrl.toHttpUrlOrNull()!!.newBuilder()
             val filterList = if (filters.isEmpty()) getFilterList() else filters
             val category = filterList.find { it is CategoryFilter } as UriPartFilter
             val comics = filterList.find { it is ComicsFilter } as UriPartFilter
@@ -141,7 +141,7 @@ class Eggporncomics : ParsedHttpSource() {
     override fun chapterListParse(response: Response): List<SChapter> {
         return listOf(
             SChapter.create().apply {
-                setUrlWithoutDomain(response.request().url().toString())
+                setUrlWithoutDomain(response.request.url.toString())
                 name = "Chapter"
                 date_upload = response.asJsoup().select("div.info > div.meta li:contains(days ago)").firstOrNull()
                     ?.let { Calendar.getInstance().apply { add(Calendar.DAY_OF_YEAR, -(it.text().substringBefore(" ").toIntOrNull() ?: 0)) }.timeInMillis }
diff --git a/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt b/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
index ec262b789..46339b6d8 100644
--- a/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
+++ b/src/en/guya/src/eu/kanade/tachiyomi/extension/en/guya/Guya.kt
@@ -3,9 +3,7 @@ package eu.kanade.tachiyomi.extension.en.guya
 import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservable
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -61,7 +59,7 @@ open class Guya : ConfigurableSource, HttpSource() {
 
     // Gets the response object from the request
     override fun popularMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return parseManga(JSONObject(res))
     }
 
@@ -99,7 +97,7 @@ open class Guya : ConfigurableSource, HttpSource() {
     }
 
     private fun mangaDetailsParse(response: Response, manga: SManga): SManga {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return parseMangaFromJson(JSONObject(res), "", manga.title)
     }
 
@@ -133,7 +131,7 @@ open class Guya : ConfigurableSource, HttpSource() {
 
     // Called after the request
     private fun chapterListParse(response: Response, manga: SManga): List<SChapter> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return parseChapterList(res, manga)
     }
 
@@ -167,7 +165,7 @@ open class Guya : ConfigurableSource, HttpSource() {
     }
 
     private fun pageListParse(response: Response, chapter: SChapter): List<Page> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
 
         val json = JSONObject(res)
         val chapterNum = chapter.name.split(" - ")[0]
@@ -225,7 +223,7 @@ open class Guya : ConfigurableSource, HttpSource() {
     }
 
     private fun searchMangaParseWithSlug(response: Response, slug: String): MangasPage {
-        val results = JSONObject(response.body()!!.string())
+        val results = JSONObject(response.body!!.string())
         val mangaIter = results.keys()
         val truncatedJSON = JSONObject()
 
@@ -242,7 +240,7 @@ open class Guya : ConfigurableSource, HttpSource() {
     }
 
     private fun searchMangaParse(response: Response, query: String): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val json = JSONObject(res)
         val truncatedJSON = JSONObject()
 
@@ -284,32 +282,6 @@ open class Guya : ConfigurableSource, HttpSource() {
         screen.addPreference(preference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val preference = ListPreference(screen.context).apply {
-            key = "preferred_scanlator"
-            title = "Preferred scanlator"
-            entries = arrayOf<String>()
-            entryValues = arrayOf<String>()
-            for (key in scanlators.keys()) {
-                entries += scanlators.getValueFromKey(key)
-                entryValues += key
-            }
-            summary = "Current: %s\n\n" +
-                "This setting sets the scanlation group to prioritize " +
-                "on chapter refresh/update. It will get the next available if " +
-                "your preferred scanlator isn't an option (yet)."
-
-            this.setDefaultValue("1")
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue.toString()
-                preferences.edit().putString(scanlatorPreference, selected).commit()
-            }
-        }
-
-        screen.addPreference(preference)
-    }
-
     // ---------------- Proxy methods ------------------
 
     private fun proxySeriesRequest(query: String, api: Boolean = true): Request {
@@ -347,7 +319,7 @@ open class Guya : ConfigurableSource, HttpSource() {
     }
 
     private fun proxyPageListParse(response: Response, chapter: SChapter): List<Page> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val pages = if (chapter.url.removePrefix(PROXY_PREFIX).startsWith(NESTED_PROXY_API_PREFIX)) {
             JSONArray(res)
         } else {
@@ -378,7 +350,7 @@ open class Guya : ConfigurableSource, HttpSource() {
 
     private fun proxySearchMangaParse(response: Response, query: String): MangasPage {
         return MangasPage(
-            arrayListOf(parseMangaFromJson(JSONObject(response.body()!!.string()), query)),
+            arrayListOf(parseMangaFromJson(JSONObject(response.body!!.string()), query)),
             false
         )
     }
@@ -572,7 +544,7 @@ open class Guya : ConfigurableSource, HttpSource() {
             if (!response.isSuccessful) {
                 retryCount++
             } else {
-                val json = JSONObject(response.body()!!.string())
+                val json = JSONObject(response.body!!.string())
                 val iter = json.keys()
                 while (iter.hasNext()) {
                     val scanId = iter.next()
diff --git a/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt b/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt
index 391049e02..029d1b1bb 100644
--- a/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt
+++ b/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt
@@ -42,7 +42,7 @@ class HBrowse : ParsedHttpSource() {
         .addInterceptor { chain ->
             val originalRequest = chain.request()
             when {
-                originalRequest.url().toString() == searchUrl -> {
+                originalRequest.url.toString() == searchUrl -> {
                     phpSessId = searchClient.newCall(originalRequest).execute()
                         .headers("Set-Cookie")
                         .firstOrNull { it.contains("PHPSESSID") }
@@ -53,11 +53,11 @@ class HBrowse : ParsedHttpSource() {
                     val newHeaders = headersBuilder()
                         .add("Cookie", phpSessId)
 
-                    val contentLength = originalRequest.body()!!.contentLength()
+                    val contentLength = originalRequest.body!!.contentLength()
 
                     searchClient.newCall(GET("$baseUrl/${if (contentLength > 8000) "result" else "search"}/1", newHeaders.build())).execute()
                 }
-                originalRequest.url().toString().contains(nextSearchPageUrlRegex) -> {
+                originalRequest.url.toString().contains(nextSearchPageUrlRegex) -> {
                     searchClient.newCall(originalRequest).execute()
                 }
                 else -> chain.proceed(originalRequest)
diff --git a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
index 391af2df5..abcb130b5 100644
--- a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
+++ b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
@@ -19,7 +19,6 @@ import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
-import java.lang.UnsupportedOperationException
 import java.util.Calendar
 import java.util.regex.Pattern
 
@@ -248,7 +247,7 @@ class Hentai2Read : ParsedHttpSource() {
 
     override fun pageListParse(response: Response): List<Page> {
         val pages = mutableListOf<Page>()
-        val m = pagesUrlPattern.matcher(response.body()!!.string())
+        val m = pagesUrlPattern.matcher(response.body!!.string())
         var i = 0
         while (m.find()) {
             m.group(1)?.split(",")?.forEach {
diff --git a/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt b/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt
index 1243869bb..9b75c1453 100644
--- a/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt
+++ b/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt
@@ -113,7 +113,7 @@ class HentaiFox : ParsedHttpSource() {
             SChapter.create().apply {
                 name = "Chapter"
                 // page path with a marker at the end
-                url = "${response.request().url().toString().replace("/gallery/", "/g/")}#"
+                url = "${response.request.url.toString().replace("/gallery/", "/g/")}#"
                 // number of pages
                 url += response.asJsoup().select("[id=load_pages]").attr("value")
             }
diff --git a/src/en/hiveworks/src/eu/kanade/tachiyomi/extension/en/hiveworks/Hiveworks.kt b/src/en/hiveworks/src/eu/kanade/tachiyomi/extension/en/hiveworks/Hiveworks.kt
index 4fc6917a1..f11e099c4 100644
--- a/src/en/hiveworks/src/eu/kanade/tachiyomi/extension/en/hiveworks/Hiveworks.kt
+++ b/src/en/hiveworks/src/eu/kanade/tachiyomi/extension/en/hiveworks/Hiveworks.kt
@@ -103,7 +103,7 @@ class Hiveworks : ParsedHttpSource() {
     override fun searchMangaSelector() = popularMangaSelector() + ", div.originalsblock"
     override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
     override fun searchMangaParse(response: Response): MangasPage {
-        val url = response.request().url().toString()
+        val url = response.request.url.toString()
         val document = response.asJsoup()
 
         val selectManga = document.select(searchMangaSelector())
@@ -195,7 +195,7 @@ class Hiveworks : ParsedHttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val url = response.request().url().toString()
+        val url = response.request.url.toString()
         val document = response.asJsoup()
         val baseUrl = document.select("div script").html().substringAfter("href='").substringBefore("'")
         val elements = document.select(chapterListSelector())
@@ -227,7 +227,7 @@ class Hiveworks : ParsedHttpSource() {
 
     override fun pageListRequest(chapter: SChapter) = GET(chapter.url, headers)
     override fun pageListParse(response: Response): List<Page> {
-        val url = response.request().url().toString()
+        val url = response.request.url.toString()
         val document = response.asJsoup()
         val pages = mutableListOf<Page>()
 
@@ -430,9 +430,9 @@ class Hiveworks : ParsedHttpSource() {
         return asObservable().doOnNext { response ->
             if (!response.isSuccessful) {
                 response.close()
-                when (response.code()) {
+                when (response.code) {
                     404 -> throw Exception("This comic has a unsupported chapter list")
-                    else -> throw Exception("HiveWorks Comics HTTP Error ${response.code()}")
+                    else -> throw Exception("HiveWorks Comics HTTP Error ${response.code}")
                 }
             }
         }
diff --git a/src/en/honkaiimpact3/src/eu/kanade/tachiyomi/extension/en/honkaiimpact/Honkaiimpact.kt b/src/en/honkaiimpact3/src/eu/kanade/tachiyomi/extension/en/honkaiimpact/Honkaiimpact.kt
index 0efdbdfb5..dab4a863d 100644
--- a/src/en/honkaiimpact3/src/eu/kanade/tachiyomi/extension/en/honkaiimpact/Honkaiimpact.kt
+++ b/src/en/honkaiimpact3/src/eu/kanade/tachiyomi/extension/en/honkaiimpact/Honkaiimpact.kt
@@ -34,7 +34,7 @@ class Honkaiimpact : ParsedHttpSource() {
         .readTimeout(1, TimeUnit.MINUTES)
         .retryOnConnectionFailure(true)
         .followRedirects(true)
-        .build()!!
+        .build()
 
     // Popular
     override fun popularMangaSelector() = "a[href*=book]"
@@ -80,7 +80,7 @@ class Honkaiimpact : ParsedHttpSource() {
     override fun chapterFromElement(element: Element) = throw Exception("Not Used")
     override fun chapterListRequest(manga: SManga) = GET(baseUrl + manga.url + "/get_chapter", headers)
     override fun chapterListParse(response: Response): List<SChapter> {
-        val jsondata = response.body()!!.string()
+        val jsondata = response.body!!.string()
         val json = JsonParser().parse(jsondata).asJsonArray
         val chapters = mutableListOf<SChapter>()
         json.forEach {
diff --git a/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt b/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt
index d992bf684..2f2a6ad8c 100644
--- a/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt
+++ b/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.madokami
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.Gson
@@ -17,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Credentials
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -52,7 +51,7 @@ class Madokami : ConfigurableSource, ParsedHttpSource() {
 
     override val client: OkHttpClient = super.client.newBuilder().addInterceptor { chain ->
         val response = chain.proceed(chain.request())
-        if (response.code() == 401) throw IOException("You are currently logged out.\nGo to Extensions > Details to input your credentials.")
+        if (response.code == 401) throw IOException("You are currently logged out.\nGo to Extensions > Details to input your credentials.")
         response
     }.build()
 
@@ -83,14 +82,14 @@ class Madokami : ConfigurableSource, ParsedHttpSource() {
     override fun searchMangaNextPageSelector(): String? = null
 
     override fun mangaDetailsRequest(manga: SManga): Request {
-        val url = HttpUrl.parse(baseUrl + manga.url)!!
-        if (url.pathSize() > 5 && url.pathSegments()[0] == "Manga" && url.pathSegments()[1].length == 1) {
-            return authenticate(GET(url.newBuilder().removePathSegment(5).build().url().toExternalForm(), headers))
+        val url = (baseUrl + manga.url).toHttpUrlOrNull()!!
+        if (url.pathSize > 5 && url.pathSegments[0] == "Manga" && url.pathSegments[1].length == 1) {
+            return authenticate(GET(url.newBuilder().removePathSegment(5).build().toUrl().toExternalForm(), headers))
         }
-        if (url.pathSize() > 2 && url.pathSegments()[0] == "Raws") {
-            return authenticate(GET(url.newBuilder().removePathSegment(2).build().url().toExternalForm(), headers))
+        if (url.pathSize > 2 && url.pathSegments[0] == "Raws") {
+            return authenticate(GET(url.newBuilder().removePathSegment(2).build().toUrl().toExternalForm(), headers))
         }
-        return authenticate(GET(url.url().toExternalForm(), headers))
+        return authenticate(GET(url.toUrl().toExternalForm(), headers))
     }
 
     /**
@@ -164,7 +163,8 @@ class Madokami : ConfigurableSource, ParsedHttpSource() {
                 .addPathSegments("reader/image")
                 .addEncodedQueryParameter("path", URLEncoder.encode(path, "UTF-8"))
                 .addEncodedQueryParameter("file", URLEncoder.encode(file.asString, "UTF-8"))
-                .build().url()
+                .build()
+                .toUrl()
             pages.add(Page(index, url.toExternalForm(), url.toExternalForm()))
         }
         return pages
@@ -204,26 +204,4 @@ class Madokami : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(username)
         screen.addPreference(password)
     }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val username = EditTextPreference(screen.context).apply {
-            key = "username"
-            title = "Username"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                preferences.edit().putString(key, newValue as String).commit()
-            }
-        }
-        val password = EditTextPreference(screen.context).apply {
-            key = "password"
-            title = "Password"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                preferences.edit().putString(key, newValue as String).commit()
-            }
-        }
-
-        screen.addPreference(username)
-        screen.addPreference(password)
-    }
 }
diff --git a/src/en/manga1s/src/eu/kanade/tachiyomi/extension/en/manga1s/manga1s.kt b/src/en/manga1s/src/eu/kanade/tachiyomi/extension/en/manga1s/manga1s.kt
index 7d60afa67..3d20e47ac 100644
--- a/src/en/manga1s/src/eu/kanade/tachiyomi/extension/en/manga1s/manga1s.kt
+++ b/src/en/manga1s/src/eu/kanade/tachiyomi/extension/en/manga1s/manga1s.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -67,7 +67,7 @@ class manga1s : ParsedHttpSource() {
 
     // Search
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("text", query)
         filters.forEach { filter ->
             when (filter) {
diff --git a/src/en/mangadog/src/eu/kanade/tachiyomi/extension/en/mangadog/Mangadog.kt b/src/en/mangadog/src/eu/kanade/tachiyomi/extension/en/mangadog/Mangadog.kt
index d1de97901..0ad823e19 100644
--- a/src/en/mangadog/src/eu/kanade/tachiyomi/extension/en/mangadog/Mangadog.kt
+++ b/src/en/mangadog/src/eu/kanade/tachiyomi/extension/en/mangadog/Mangadog.kt
@@ -37,8 +37,8 @@ class Mangadog : HttpSource() {
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        // val page = response.request().url().queryParameterValues("page").toString().toInt()
-        val jsonData = response.body()!!.string()
+        // val page = response.request.url.queryParameterValues("page").toString().toInt()
+        val jsonData = response.body!!.string()
         val results = JsonParser().parse(jsonData)
         val data = results["data"]["data"]
         val mangas = mutableListOf<SManga>()
@@ -61,7 +61,7 @@ class Mangadog : HttpSource() {
     }
 
     override fun latestUpdatesParse(response: Response): MangasPage {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val results = JsonParser().parse(jsonData)
         val data = results["data"]
         val mangas = mutableListOf<SManga>()
@@ -74,7 +74,7 @@ class Mangadog : HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val results = JsonParser().parse(jsonData)
         val data = results["suggestions"]
         val mangas = mutableListOf<SManga>()
@@ -100,7 +100,7 @@ class Mangadog : HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val results = JsonParser().parse(jsonData)
         val data = results["data"]["data"]
         val chapters = mutableListOf<SChapter>()
diff --git a/src/en/mangadoom/src/eu/kanade/tachiyomi/extension/en/mangadoom/MangaDoom.kt b/src/en/mangadoom/src/eu/kanade/tachiyomi/extension/en/mangadoom/MangaDoom.kt
index 023dcf0cc..d8f0a1633 100644
--- a/src/en/mangadoom/src/eu/kanade/tachiyomi/extension/en/mangadoom/MangaDoom.kt
+++ b/src/en/mangadoom/src/eu/kanade/tachiyomi/extension/en/mangadoom/MangaDoom.kt
@@ -95,7 +95,7 @@ class MangaDoom : HttpSource() {
         val dlElement = innerContentElement.select("div.col-md-8 > dl").first()
 
         return SManga.create().apply {
-            this.url = response.request().url().toString()
+            this.url = response.request.url.toString()
 
             this.title = innerContentElement
                 .select("h5.widget-heading:matchText").first().text()
@@ -517,8 +517,8 @@ class MangaDoom : HttpSource() {
                     )
                 ).execute()
 
-            return if (genreResponse.code() == 200 &&
-                contentUpToDate(genreResponse.receivedResponseAtMillis())
+            return if (genreResponse.code == 200 &&
+                contentUpToDate(genreResponse.receivedResponseAtMillis)
             ) {
                 responseToGenreFilterContentPair(genreResponse)
             } else {
@@ -534,7 +534,7 @@ class MangaDoom : HttpSource() {
                         }
 
                         override fun onResponse(call: Call, response: Response) {
-                            genreFilterContentFrom = response.receivedResponseAtMillis()
+                            genreFilterContentFrom = response.receivedResponseAtMillis
                             genreFiltersContent = responseToGenreFilterContentPair(response)
                         }
                     }
diff --git a/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt b/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt
index fa3a960cc..01a979a86 100644
--- a/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt
+++ b/src/en/mangaeden/src/eu/kanade/tachiyomi/extension/en/mangaeden/Mangaeden.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -49,7 +49,7 @@ class Mangaeden : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/en/en-directory/")?.newBuilder()!!.addQueryParameter("title", query)
+        val url = "$baseUrl/en/en-directory/".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("title", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is StatusList ->
diff --git a/src/en/mangahasu/src/eu/kanade/tachiyomi/extension/en/mangahasu/Mangahasu.kt b/src/en/mangahasu/src/eu/kanade/tachiyomi/extension/en/mangahasu/Mangahasu.kt
index 4cc744e68..7168bf189 100644
--- a/src/en/mangahasu/src/eu/kanade/tachiyomi/extension/en/mangahasu/Mangahasu.kt
+++ b/src/en/mangahasu/src/eu/kanade/tachiyomi/extension/en/mangahasu/Mangahasu.kt
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -66,7 +66,7 @@ class Mangahasu : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/advanced-search.html")!!.newBuilder()
+        val url = "$baseUrl/advanced-search.html".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("keyword", query)
         url.addQueryParameter("page", page.toString())
 
diff --git a/src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt b/src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt
index d0cfaa8d8..721d48b43 100644
--- a/src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt
+++ b/src/en/mangahere/src/eu/kanade/tachiyomi/extension/en/mangahere/Mangahere.kt
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -36,7 +37,7 @@ class Mangahere : ParsedHttpSource() {
     override val client: OkHttpClient = super.client.newBuilder()
         .cookieJar(
             object : CookieJar {
-                override fun saveFromResponse(url: HttpUrl, cookies: MutableList<Cookie>) {}
+                override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {}
                 override fun loadForRequest(url: HttpUrl): MutableList<Cookie> {
                     return ArrayList<Cookie>().apply {
                         add(
@@ -86,7 +87,7 @@ class Mangahere : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div.pager-list-left a:last-child"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
 
         filters.forEach { filter ->
             when (filter) {
@@ -267,7 +268,7 @@ class Mangahere : ParsedHttpSource() {
                         .build()
 
                     val response = client.newCall(request).execute()
-                    responseText = response.body()!!.string()
+                    responseText = response.body!!.string()
 
                     if (responseText.isNotEmpty())
                         break
diff --git a/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt b/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt
index 8c2fe7591..afbc671ac 100644
--- a/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt
+++ b/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.Response
@@ -155,7 +155,7 @@ class Mangahub : ParsedHttpSource() {
     override fun pageListParse(response: Response): List<Page> {
         val cdn = "https://img.mghubcdn.com/file/imghub"
 
-        return gson.fromJson<JsonObject>(response.body()!!.string())["data"]["chapter"]["pages"].string
+        return gson.fromJson<JsonObject>(response.body!!.string())["data"]["chapter"]["pages"].string
             .removeSurrounding("\"").replace("\\", "")
             .let { cleaned ->
                 val jsonObject = gson.fromJson<JsonObject>(cleaned)
@@ -170,7 +170,7 @@ class Mangahub : ParsedHttpSource() {
 
     // https://mangahub.io/search/page/1?q=a&order=POPULAR&genre=all
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/page/$page")?.newBuilder()!!.addQueryParameter("q", query)
+        val url = "$baseUrl/search/page/$page".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("q", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is OrderBy -> {
diff --git a/src/en/mangajar/src/eu/kanade/tachiyomi/extension/en/mangajar/MangaJar.kt b/src/en/mangajar/src/eu/kanade/tachiyomi/extension/en/mangajar/MangaJar.kt
index b0a8ccf90..3eff57eae 100644
--- a/src/en/mangajar/src/eu/kanade/tachiyomi/extension/en/mangajar/MangaJar.kt
+++ b/src/en/mangajar/src/eu/kanade/tachiyomi/extension/en/mangajar/MangaJar.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -60,7 +60,7 @@ class MangaJar : ParsedHttpSource() {
         val genreFilter = filters.findInstance<GenreList>()
         val genre = genreFilter?.let { f -> f.values[f.state] }
 
-        val url = HttpUrl.parse(if (genre!!.isEmpty()) "$baseUrl/search" else "$baseUrl/genre/$genre")!!.newBuilder()
+        val url = (if (genre!!.isEmpty()) "$baseUrl/search" else "$baseUrl/genre/$genre").toHttpUrlOrNull()!!.newBuilder()
 
         url.addQueryParameter("q", query)
         url.addQueryParameter("page", page.toString())
diff --git a/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt b/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt
index 32e30815e..981877e3d 100644
--- a/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt
+++ b/src/en/mangakatana/src/eu/kanade/tachiyomi/extension/en/mangakatana/MangaKatana.kt
@@ -8,10 +8,10 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
@@ -29,9 +29,9 @@ class MangaKatana : ParsedHttpSource() {
     override val client: OkHttpClient = network.cloudflareClient.newBuilder().addNetworkInterceptor { chain ->
         val originalResponse = chain.proceed(chain.request())
         if (originalResponse.headers("Content-Type").contains("application/octet-stream")) {
-            val orgBody = originalResponse.body()!!.bytes()
-            val extension = chain.request().url().toString().substringAfterLast(".")
-            val newBody = ResponseBody.create(MediaType.parse("image/$extension"), orgBody)
+            val orgBody = originalResponse.body!!.bytes()
+            val extension = chain.request().url.toString().substringAfterLast(".")
+            val newBody = orgBody.toResponseBody("image/$extension".toMediaTypeOrNull())
             originalResponse.newBuilder()
                 .body(newBody)
                 .build()
@@ -69,13 +69,13 @@ class MangaKatana : ParsedHttpSource() {
     override fun searchMangaNextPageSelector() = latestUpdatesNextPageSelector()
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (response.request().url().toString().contains("/manga/")) {
+        return if (response.request.url.toString().contains("/manga/")) {
             val document = response.asJsoup()
             val manga = SManga.create().apply {
                 thumbnail_url = parseThumbnail(document)
                 title = document.select("h1.heading").first().text()
             }
-            manga.setUrlWithoutDomain(response.request().url().toString())
+            manga.setUrlWithoutDomain(response.request.url.toString())
             MangasPage(listOf(manga), false)
         } else {
             super.searchMangaParse(response)
diff --git a/src/en/mangamutiny/src/eu/kanade/tachiyomi/extension/en/mangamutiny/MangaMutiny.kt b/src/en/mangamutiny/src/eu/kanade/tachiyomi/extension/en/mangamutiny/MangaMutiny.kt
index 6d7f57e5c..9660342f1 100644
--- a/src/en/mangamutiny/src/eu/kanade/tachiyomi/extension/en/mangamutiny/MangaMutiny.kt
+++ b/src/en/mangamutiny/src/eu/kanade/tachiyomi/extension/en/mangamutiny/MangaMutiny.kt
@@ -17,11 +17,9 @@ import okhttp3.Headers
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
-import java.lang.Exception
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.TimeZone
-import kotlin.collections.ArrayList
 
 fun JsonObject.getNullable(key: String): JsonElement? {
     val value: JsonElement = this.get(key) ?: return null
@@ -81,7 +79,7 @@ class MangaMutiny : HttpSource() {
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val chapterList = mutableListOf<SChapter>()
-        val responseBody = response.body()
+        val responseBody = response.body
 
         if (responseBody != null) {
             val jsonChapters = JsonParser().parse(responseBody.charStream()).asJsonObject
@@ -165,7 +163,7 @@ class MangaMutiny : HttpSource() {
 
     override fun mangaDetailsParse(response: Response): SManga {
         val manga = SManga.create()
-        val responseBody = response.body()
+        val responseBody = response.body
 
         if (responseBody != null) {
             val rootNode = parser.parse(responseBody.charStream()).asJsonObject
@@ -203,7 +201,7 @@ class MangaMutiny : HttpSource() {
     override fun pageListParse(response: Response): List<Page> {
         val pageList = ArrayList<Page>()
 
-        val responseBody = response.body()
+        val responseBody = response.body
 
         if (responseBody != null) {
             val rootNode = parser.parse(responseBody.charStream()).asJsonObject
@@ -237,7 +235,7 @@ class MangaMutiny : HttpSource() {
     // commonly used functions
     private fun mangaParse(response: Response): MangasPage {
         val mangasPage = ArrayList<SManga>()
-        val responseBody = response.body()
+        val responseBody = response.body
 
         var totalObjects = 0
 
@@ -267,7 +265,7 @@ class MangaMutiny : HttpSource() {
             responseBody.close()
         }
 
-        val skipped = response.request().url().queryParameter("skip")?.toInt() ?: 0
+        val skipped = response.request.url.queryParameter("skip")?.toInt() ?: 0
 
         val moreElementsToSkip = skipped + fetchAmount < totalObjects
 
diff --git a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt
index bf08931be..134ce2564 100644
--- a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt
+++ b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt
@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Filter
@@ -126,7 +124,6 @@ class MangaPark : ConfigurableSource, ParsedHttpSource() {
                 }
             }
         }
-
     }
 
     // force network to make sure chapter prefs take effect
@@ -279,8 +276,8 @@ class MangaPark : ConfigurableSource, ParsedHttpSource() {
     private val objRegex = Regex("""var _load_pages = (\[.*])""")
 
     override fun pageListParse(response: Response): List<Page> {
-        val obj = objRegex.find(response.body()!!.string())?.groupValues?.get(1)
-            ?: throw Exception("_load_pages not found - ${response.request().url()}")
+        val obj = objRegex.find(response.body!!.string())?.groupValues?.get(1)
+            ?: throw Exception("_load_pages not found - ${response.request.url}")
         val jsonArray = JSONArray(obj)
         return (0 until jsonArray.length()).map { i -> jsonArray.getJSONObject(i).getString("u") }
             .mapIndexed { i, url -> Page(i, "", if (url.startsWith("//")) "https://$url" else url) }
@@ -590,23 +587,6 @@ class MangaPark : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(myPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val myPref = ListPreference(screen.context).apply {
-            key = SOURCE_PREF_TITLE
-            title = SOURCE_PREF_TITLE
-            entries = sourceArray.map { it.first }.toTypedArray()
-            entryValues = sourceArray.map { it.second }.toTypedArray()
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(SOURCE_PREF, entry).commit()
-            }
-        }
-        screen.addPreference(myPref)
-    }
     private fun getSourcePref(): String? = preferences.getString(SOURCE_PREF, "all")
 
     companion object {
diff --git a/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt b/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt
index 2c973b30f..1840d4c24 100644
--- a/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt
+++ b/src/en/mangapill/src/eu/kanade/tachiyomi/extension/en/mangapill/MangaPill.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -102,7 +102,7 @@ class MangaPill : ParsedHttpSource() {
     override fun imageUrlParse(document: Document) = ""
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
 
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
             .addQueryParameter("q", query)
 
diff --git a/src/en/mangarockes/src/eu/kanade/tachiyomi/extension/en/mangarockes/MangaRockEs.kt b/src/en/mangarockes/src/eu/kanade/tachiyomi/extension/en/mangarockes/MangaRockEs.kt
index e44901c2c..3395fb19b 100644
--- a/src/en/mangarockes/src/eu/kanade/tachiyomi/extension/en/mangarockes/MangaRockEs.kt
+++ b/src/en/mangarockes/src/eu/kanade/tachiyomi/extension/en/mangarockes/MangaRockEs.kt
@@ -10,12 +10,12 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
@@ -37,13 +37,13 @@ class MangaRockEs : ParsedHttpSource() {
     // Handles the page decoding
     override val client: OkHttpClient = network.cloudflareClient.newBuilder().addInterceptor(
         fun(chain): Response {
-            val url = chain.request().url().toString()
+            val url = chain.request().url.toString()
             val response = chain.proceed(chain.request())
             if (!url.endsWith(".mri")) return response
 
             val decoded: ByteArray = decodeMri(response)
-            val mediaType = MediaType.parse("image/webp")
-            val rb = ResponseBody.create(mediaType, decoded)
+            val mediaType = "image/webp".toMediaTypeOrNull()
+            val rb = decoded.toResponseBody(mediaType)
             return response.newBuilder().body(rb).build()
         }
     ).build()
@@ -82,7 +82,7 @@ class MangaRockEs : ParsedHttpSource() {
         return if (query.isNotBlank()) {
             GET("$baseUrl/search/${query.replace(" ", "+")}/$page", headers)
         } else {
-            val url = HttpUrl.parse("$baseUrl/manga" + if (page > 1) "/$page" else "")!!.newBuilder()
+            val url = ("$baseUrl/manga" + if (page > 1) "/$page" else "").toHttpUrl().newBuilder()
             filters.forEach { filter ->
                 when (filter) {
                     is StatusFilter -> url.addQueryParameter("status", filter.toUriPart())
@@ -163,7 +163,7 @@ class MangaRockEs : ParsedHttpSource() {
     private val gson by lazy { Gson() }
 
     override fun pageListParse(response: Response): List<Page> {
-        val responseString = response.body()!!.string()
+        val responseString = response.body!!.string()
         return Regex("""mangaData = (\[.*]);""", RegexOption.IGNORE_CASE).find(responseString)?.groupValues?.get(1)?.let { array ->
             gson.fromJson<JsonArray>(array)
                 .mapIndexed { i, jsonElement -> Page(i, "", jsonElement.asJsonObject["url"].asString) }
@@ -181,7 +181,7 @@ class MangaRockEs : ParsedHttpSource() {
     // See drawWebpToCanvas function in the site's client.js file
     // Extracted code: https://jsfiddle.net/6h2sLcs4/30/
     private fun decodeMri(response: Response): ByteArray {
-        val data = response.body()!!.bytes()
+        val data = response.body!!.bytes()
 
         // Decode file if it starts with "E" (space when XOR-ed later)
         if (data[0] != 69.toByte()) return data
diff --git a/src/en/mangasail/src/eu/kanade/tachiyomi/extension/en/mangasail/Mangasail.kt b/src/en/mangasail/src/eu/kanade/tachiyomi/extension/en/mangasail/Mangasail.kt
index 7cf1a4450..0751c42ce 100644
--- a/src/en/mangasail/src/eu/kanade/tachiyomi/extension/en/mangasail/Mangasail.kt
+++ b/src/en/mangasail/src/eu/kanade/tachiyomi/extension/en/mangasail/Mangasail.kt
@@ -97,7 +97,7 @@ class Mangasail : ParsedHttpSource() {
     // Function to get data fragments from website
     private fun getNodeDetail(node: String, field: String): String? {
         val requestUrl = "$baseUrl/sites/all/modules/authcache/modules/authcache_p13n/frontcontroller/authcache.php?a[field][0]=$node:full:en&r=asm/field/node/$field&o[q]=node/$node"
-        val responseString = client.newCall(GET(requestUrl, headers)).execute().body()?.string() ?: return null
+        val responseString = client.newCall(GET(requestUrl, headers)).execute().body?.string() ?: return null
         return with(gson.fromJson<JsonObject>(responseString)) {
             when (field) {
                 "field_image2" -> this["field"]["$node:full:en"].asString.substringAfter("src=\"").substringBefore("\"")
diff --git a/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt b/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt
index e2d39ce69..b7e536a65 100644
--- a/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt
+++ b/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.Response
@@ -45,7 +45,7 @@ class ManhwaManga : ParsedHttpSource() {
         return if (query.isNotBlank()) {
             GET("$baseUrl/?s=$query", headers)
         } else {
-            val url = HttpUrl.parse("$baseUrl/category/")!!.newBuilder()
+            val url = "$baseUrl/category/".toHttpUrlOrNull()!!.newBuilder()
             filters.forEach { filter ->
                 when (filter) {
 
diff --git a/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt b/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt
index 7b13604c6..ca0562059 100644
--- a/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt
+++ b/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt
@@ -19,11 +19,11 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import rx.Observable
@@ -67,12 +67,12 @@ class Multporn : ParsedHttpSource() {
     override fun popularMangaRequest(page: Int) = buildPopularMangaRequest(page - 1)
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val html = gson.fromJson<JsonArray>(response.body()!!.string())
+        val html = gson.fromJson<JsonArray>(response.body!!.string())
             .last { it["command"].asString == "insert" }.asJsonObject["data"].asString
 
         return super.popularMangaParse(
             response.newBuilder()
-                .body(ResponseBody.create(MediaType.parse("text/html; charset=UTF-8"), html))
+                .body(html.toResponseBody("text/html; charset=UTF-8".toMediaTypeOrNull()))
                 .build()
         )
     }
@@ -88,7 +88,7 @@ class Multporn : ParsedHttpSource() {
     // Latest
 
     private fun buildLatestMangaRequest(page: Int, filters: FilterList = FilterList()): Request {
-        val url = HttpUrl.parse("$baseUrl/new")!!.newBuilder()
+        val url = "$baseUrl/new".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
 
         (if (filters.isEmpty()) getFilterList(LATEST_DEFAULT_SORT_BY_FILTER_STATE) else filters).forEach {
@@ -126,7 +126,7 @@ class Multporn : ParsedHttpSource() {
     }
 
     private fun buildSearchMangaRequest(page: Int, query: String, filtersArg: FilterList = FilterList()): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
             .addQueryParameter("views_fulltext", query)
 
@@ -176,7 +176,7 @@ class Multporn : ParsedHttpSource() {
                 squashMangasPageObservables(
                     requests.map {
                         client.newCall(it).asObservable().map { res ->
-                            if (res.code() == 200) textSearchFilterParse(res)
+                            if (res.code == 200) textSearchFilterParse(res)
                             else null
                         }
                     }
diff --git a/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt b/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt
index 0f0ff80d5..c1e0bc88d 100644
--- a/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt
+++ b/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -84,7 +84,7 @@ class MyHentaiGallery : ParsedHttpSource() {
         return if (query.isNotBlank()) {
             GET("$baseUrl/search/$page?query=$query", headers)
         } else {
-            val url = HttpUrl.parse("$baseUrl/gallery/category")!!.newBuilder()
+            val url = "$baseUrl/gallery/category".toHttpUrl().newBuilder()
 
             filters.forEach { filter ->
                 when (filter) {
@@ -130,7 +130,7 @@ class MyHentaiGallery : ParsedHttpSource() {
         return listOf(
             SChapter.create().apply {
                 name = "Chapter"
-                url = response.request().url().toString().substringAfter(baseUrl)
+                url = response.request.url.toString().substringAfter(baseUrl)
             }
         )
     }
diff --git a/src/en/naniscans/src/eu/kanade/tachiyomi/extension/en/naniscans/NaniScans.kt b/src/en/naniscans/src/eu/kanade/tachiyomi/extension/en/naniscans/NaniScans.kt
index 3785cd56d..ef1775a15 100644
--- a/src/en/naniscans/src/eu/kanade/tachiyomi/extension/en/naniscans/NaniScans.kt
+++ b/src/en/naniscans/src/eu/kanade/tachiyomi/extension/en/naniscans/NaniScans.kt
@@ -13,7 +13,6 @@ import okhttp3.Response
 import org.json.JSONArray
 import org.json.JSONObject
 import rx.Observable
-import java.lang.UnsupportedOperationException
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -29,7 +28,7 @@ class NaniScans : HttpSource() {
     override fun latestUpdatesRequest(page: Int): Request = popularMangaRequest(page)
 
     override fun latestUpdatesParse(response: Response): MangasPage {
-        val titlesJson = JSONArray(response.body()!!.string())
+        val titlesJson = JSONArray(response.body!!.string())
         val mangaMap = mutableMapOf<Long, SManga>()
 
         for (i in 0 until titlesJson.length()) {
@@ -52,7 +51,7 @@ class NaniScans : HttpSource() {
     override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/api/titles")
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val titlesJson = JSONArray(response.body()!!.string())
+        val titlesJson = JSONArray(response.body!!.string())
         val mangaList = mutableListOf<SManga>()
 
         for (i in 0 until titlesJson.length()) {
@@ -78,7 +77,7 @@ class NaniScans : HttpSource() {
     override fun mangaDetailsRequest(manga: SManga) = GET("$baseUrl/titles/${manga.url}")
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val titleJson = JSONObject(response.body()!!.string())
+        val titleJson = JSONObject(response.body!!.string())
 
         if (titleJson.getString("type") != "Comic")
             throw UnsupportedOperationException("Tachiyomi only supports Comics.")
@@ -98,7 +97,7 @@ class NaniScans : HttpSource() {
     override fun chapterListRequest(manga: SManga) = GET("$baseUrl/api/titles/${manga.url}")
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val titleJson = JSONObject(response.body()!!.string())
+        val titleJson = JSONObject(response.body!!.string())
 
         if (titleJson.getString("type") != "Comic")
             throw UnsupportedOperationException("Tachiyomi only supports Comics.")
@@ -125,7 +124,7 @@ class NaniScans : HttpSource() {
     override fun pageListRequest(chapter: SChapter): Request = GET("$baseUrl/api/chapters/${chapter.url.substring(37, 73)}")
 
     override fun pageListParse(response: Response): List<Page> {
-        val jsonObject = JSONObject(response.body()!!.string())
+        val jsonObject = JSONObject(response.body!!.string())
 
         val pagesJson = jsonObject.getJSONArray("pages")
         val pagesList = mutableListOf<Page>()
diff --git a/src/en/nhentaicom/src/eu/kanade/tachiyomi/extension/en/nhentai/com/NHentaiCom.kt b/src/en/nhentaicom/src/eu/kanade/tachiyomi/extension/en/nhentai/com/NHentaiCom.kt
index acf4bf0a2..c281717ed 100644
--- a/src/en/nhentaicom/src/eu/kanade/tachiyomi/extension/en/nhentai/com/NHentaiCom.kt
+++ b/src/en/nhentaicom/src/eu/kanade/tachiyomi/extension/en/nhentai/com/NHentaiCom.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -51,7 +51,7 @@ class NHentaiCom : HttpSource() {
     private val gson = Gson()
 
     private fun parseMangaFromJson(response: Response): MangasPage {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         val mangas = jsonObject["data"].asJsonArray.map { json ->
             SManga.create().apply {
@@ -64,7 +64,7 @@ class NHentaiCom : HttpSource() {
         return MangasPage(mangas, jsonObject["current_page"].int < jsonObject["last_page"].int)
     }
     private fun getMangaUrl(url: String): String {
-        return HttpUrl.parse(url)!!.newBuilder()
+        return url.toHttpUrlOrNull()!!.newBuilder()
             .setQueryParameter("nsfw", "false").toString()
     }
 
@@ -87,7 +87,7 @@ class NHentaiCom : HttpSource() {
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/api/comics")!!.newBuilder()
+        val url = "$baseUrl/api/comics".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("per_page", "18")
             .addQueryParameter("page", page.toString())
             .addQueryParameter("order", "desc")
@@ -120,7 +120,7 @@ class NHentaiCom : HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return SManga.create().apply {
             description = jsonObject["description"].nullString
@@ -163,7 +163,7 @@ class NHentaiCom : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["images"].asJsonArray.mapIndexed { i, json ->
+        return gson.fromJson<JsonObject>(response.body!!.string())["images"].asJsonArray.mapIndexed { i, json ->
             Page(i, "", json["source_url"].string)
         }
     }
diff --git a/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt b/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt
index 7822e5542..79910a237 100644
--- a/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt
+++ b/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -45,7 +45,7 @@ class Perveden : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/en/en-directory/")?.newBuilder()!!.addQueryParameter("title", query)
+        val url = "$baseUrl/en/en-directory/".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("title", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is StatusList ->
diff --git a/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt b/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt
index e60408519..b459147ff 100644
--- a/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt
+++ b/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt
@@ -127,7 +127,7 @@ class Pururin : ParsedHttpSource() {
             listOf(
                 SChapter.create().apply {
                     name = "Chapter"
-                    setUrlWithoutDomain(response.request().url().toString())
+                    setUrlWithoutDomain(response.request.url.toString())
 
                     if (mangaInfoElements.containsKey("Scanlator"))
                         scanlator = mangaInfoElements.getValue("Scanlator").select("li a")?.joinToString { s -> s.text() }
@@ -195,7 +195,7 @@ class Pururin : ParsedHttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (response.request().url().toString().contains("tag?")) {
+        return if (response.request.url.toString().contains("tag?")) {
             response.asJsoup().select("table.table tbody tr a:first-of-type").attr("abs:href").let {
                 if (it.isNotEmpty()) {
                     tagUrl = it
diff --git a/src/en/rainofsnow/src/eu/kanade/tachiyomi/extension/en/rainofsnow/RainOfSnow.kt b/src/en/rainofsnow/src/eu/kanade/tachiyomi/extension/en/rainofsnow/RainOfSnow.kt
index 3da7d6513..fa2833312 100644
--- a/src/en/rainofsnow/src/eu/kanade/tachiyomi/extension/en/rainofsnow/RainOfSnow.kt
+++ b/src/en/rainofsnow/src/eu/kanade/tachiyomi/extension/en/rainofsnow/RainOfSnow.kt
@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -49,7 +49,7 @@ open class RainOfSnow() : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = ".page-numbers .next"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/")!!.newBuilder()
+        val url = "$baseUrl/".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("serchfor", "comics")
         url.addQueryParameter("s", query)
         return GET(url.build().toString(), headers)
diff --git a/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt b/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt
index a50a6de04..e2fbdc757 100644
--- a/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt
+++ b/src/en/readcomiconline/src/eu/kanade/tachiyomi/extension/en/readcomiconline/Readcomiconline.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.readcomiconline
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.source.ConfigurableSource
@@ -130,7 +128,7 @@ class Readcomiconline : ConfigurableSource, ParsedHttpSource() {
     override fun pageListRequest(chapter: SChapter) = GET(baseUrl + chapter.url + "&quality=${qualitypref()}", headers)
 
     override fun pageListParse(response: Response): List<Page> {
-        return Regex("""lstImages\.push\("(http.*)"\)""").findAll(response.body()!!.string())
+        return Regex("""lstImages\.push\("(http.*)"\)""").findAll(response.body!!.string())
             .toList()
             .mapIndexed { i, mr -> Page(i, "", mr.groupValues[1]) }
     }
@@ -220,24 +218,6 @@ class Readcomiconline : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(qualitypref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualitypref = ListPreference(screen.context).apply {
-            key = QUALITY_PREF_Title
-            title = QUALITY_PREF_Title
-            entries = arrayOf("High Quality", "Low Quality")
-            entryValues = arrayOf("hq", "lq")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(QUALITY_PREF, entry).commit()
-            }
-        }
-        screen.addPreference(qualitypref)
-    }
-
     private fun qualitypref() = preferences.getString(QUALITY_PREF, "hq")
 
     companion object {
diff --git a/src/en/readm/src/eu/kanade/tachiyomi/extension/en/readm/ReadM.kt b/src/en/readm/src/eu/kanade/tachiyomi/extension/en/readm/ReadM.kt
index f9395c139..b8ec82351 100644
--- a/src/en/readm/src/eu/kanade/tachiyomi/extension/en/readm/ReadM.kt
+++ b/src/en/readm/src/eu/kanade/tachiyomi/extension/en/readm/ReadM.kt
@@ -77,7 +77,7 @@ class ReadM : ParsedHttpSource() {
     override fun searchMangaFromElement(element: Element): SManga = throw Exception("Not used")
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val json = JSONObject(response.body()!!.string()).getJSONArray("manga")
+        val json = JSONObject(response.body!!.string()).getJSONArray("manga")
 
         val manga = (0 until json.length()).asSequence().toList().map { it ->
             SManga.create().apply {
diff --git a/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt b/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt
index 91ff2492a..503ece982 100644
--- a/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt
+++ b/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.readmanhwa
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.int
@@ -24,7 +22,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -61,7 +59,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
     private val gson = Gson()
 
     private fun parseMangaFromJson(response: Response): MangasPage {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         val mangas = jsonObject["data"].asJsonArray.map { json ->
             SManga.create().apply {
@@ -74,7 +72,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
         return MangasPage(mangas, jsonObject["current_page"].int < jsonObject["last_page"].int)
     }
     private fun getMangaUrl(url: String): String {
-        return HttpUrl.parse(url)!!.newBuilder()
+        return url.toHttpUrlOrNull()!!.newBuilder()
             .setQueryParameter("nsfw", isNSFWEnabledInPref().toString()).toString()
     }
 
@@ -99,7 +97,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val enableNsfw = (filters.find { it is NSFWFilter } as? Filter.CheckBox)?.state ?: true
 
-        val url = HttpUrl.parse("$baseUrl/api/comics")!!.newBuilder()
+        val url = "$baseUrl/api/comics".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("per_page", "36")
             .addQueryParameter("page", page.toString())
             .addQueryParameter("q", query)
@@ -163,7 +161,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return SManga.create().apply {
             description = jsonObject["description"].nullString
@@ -197,7 +195,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
     }
 
     private fun chapterListParse(response: Response, titleSlug: String): List<SChapter> {
-        return gson.fromJson<JsonArray>(response.body()!!.string()).map { json ->
+        return gson.fromJson<JsonArray>(response.body!!.string()).map { json ->
             SChapter.create().apply {
                 name = json["name"].string
                 url = "$titleSlug/${json["slug"].string}"
@@ -229,7 +227,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["images"].asJsonArray.mapIndexed { i, json ->
+        return gson.fromJson<JsonObject>(response.body!!.string())["images"].asJsonArray.mapIndexed { i, json ->
             Page(i, "", json["source_url"].string)
         }
     }
@@ -366,20 +364,6 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
         Selection(0, false)
     )
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val nsfw = CheckBoxPreference(screen.context).apply {
-            key = NSFW
-            title = NSFW_TITLE
-            setDefaultValue(NSFW_DEFAULT)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as Boolean
-                preferences.edit().putBoolean(NSFW, selected).commit()
-            }
-        }
-        screen.addPreference(nsfw)
-    }
-
     override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
         val nsfw = androidx.preference.CheckBoxPreference(screen.context).apply {
             key = NSFW
diff --git a/src/en/silentmangaaudition/src/eu/kanade/tachiyomi/extension/en/silentmangaaudition/SilentMangaAudition.kt b/src/en/silentmangaaudition/src/eu/kanade/tachiyomi/extension/en/silentmangaaudition/SilentMangaAudition.kt
index 087a878e8..edbb0ae00 100644
--- a/src/en/silentmangaaudition/src/eu/kanade/tachiyomi/extension/en/silentmangaaudition/SilentMangaAudition.kt
+++ b/src/en/silentmangaaudition/src/eu/kanade/tachiyomi/extension/en/silentmangaaudition/SilentMangaAudition.kt
@@ -84,7 +84,7 @@ class SilentMangaAudition : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val chapterUrl = response.request().url().toString()
+        val chapterUrl = response.request.url.toString()
 
         return response.asJsoup()
             .select("div.swiper-wrapper div.swiper-slide img.swiper-lazy")
diff --git a/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt b/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt
index 6a637c0c5..a3244992f 100644
--- a/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt
+++ b/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt
@@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.extension.en.tapastic
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.bool
 import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
@@ -57,24 +55,6 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(chapterListPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val chapterListPref = ListPreference(screen.context).apply {
-            key = SHOW_LOCKED_CHAPTERS_Title
-            title = SHOW_LOCKED_CHAPTERS_Title
-            entries = prefsEntries
-            entryValues = prefsEntryValues
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(SHOW_LOCKED_CHAPTERS, entry).commit()
-            }
-        }
-        screen.addPreference(chapterListPref)
-    }
-
     private fun chapterListPref() = preferences.getString(SHOW_LOCKED_CHAPTERS, "free")
 
     companion object {
@@ -182,7 +162,7 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() {
         // recursively build the chapter list
         fun parseChapters(page: Int) {
             val url = "$baseUrl/series/$mangaId/episodes?page=$page&sort=NEWEST&init_load=0&large=true&last_access=0&"
-            val json = gson.fromJson<JsonObject>(client.newCall(GET(url, headers)).execute().body()!!.string())["data"]
+            val json = gson.fromJson<JsonObject>(client.newCall(GET(url, headers)).execute().body!!.string())["data"]
 
             Jsoup.parse(json["body"].string).select(chapterListSelector())
                 .let { list ->
diff --git a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt
index ce19449e0..3820ba08c 100644
--- a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt
+++ b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt
@@ -49,7 +49,7 @@ class Tsumino : ParsedHttpSource() {
 
     override fun latestUpdatesParse(response: Response): MangasPage {
         val allManga = mutableListOf<SManga>()
-        val body = response.body()!!.string()
+        val body = response.body!!.string()
         val jsonManga = gson.fromJson<JsonObject>(body)["data"].asJsonArray
         for (i in 0 until jsonManga.size()) {
             val manga = SManga.create()
diff --git a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/TsuminoUtils.kt b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/TsuminoUtils.kt
index c62deff06..de048573f 100644
--- a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/TsuminoUtils.kt
+++ b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/TsuminoUtils.kt
@@ -87,7 +87,7 @@ class TsuminoUtils {
                 name = "Chapter"
                 scanlator = getGroups(document)
                 chapter_number = 1f
-                url = response.request().url().encodedPath()
+                url = response.request.url.encodedPath
                     .replace("entry", "Read/Index")
             }
             chapterList.add(chapter)
diff --git a/src/en/vgperson/src/eu/kanade/tachiyomi/extension/en/vgperson/Vgperson.kt b/src/en/vgperson/src/eu/kanade/tachiyomi/extension/en/vgperson/Vgperson.kt
index 2f3db3df6..be6565542 100644
--- a/src/en/vgperson/src/eu/kanade/tachiyomi/extension/en/vgperson/Vgperson.kt
+++ b/src/en/vgperson/src/eu/kanade/tachiyomi/extension/en/vgperson/Vgperson.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.vgperson
 
 import android.os.Build.VERSION
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.FilterList
diff --git a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
index 053ccac48..6cf25bc6a 100644
--- a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
+++ b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizImageInterceptor.kt
@@ -7,7 +7,7 @@ import android.graphics.Rect
 import com.drew.imaging.ImageMetadataReader
 import com.drew.metadata.exif.ExifSubIFDDirectory
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Response
 import okhttp3.ResponseBody
 import java.io.ByteArrayInputStream
@@ -19,10 +19,10 @@ class VizImageInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val response = chain.proceed(chain.request())
 
-        if (chain.request().url().queryParameter(SIGNATURE) == null)
+        if (chain.request().url.queryParameter(SIGNATURE) == null)
             return response
 
-        val image = decodeImage(response.body()!!.byteStream())
+        val image = decodeImage(response.body!!.byteStream())
         val body = ResponseBody.create(MEDIA_TYPE, image)
         return response.newBuilder()
             .body(body)
@@ -155,7 +155,7 @@ class VizImageInterceptor : Interceptor {
 
     companion object {
         private const val SIGNATURE = "Signature"
-        private val MEDIA_TYPE = MediaType.parse("image/png")
+        private val MEDIA_TYPE = "image/png".toMediaTypeOrNull()
 
         private const val CELL_WIDTH_COUNT = 10
         private const val CELL_HEIGHT_COUNT = 15
diff --git a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizShonenJump.kt b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizShonenJump.kt
index 4f2163f40..15f61f946 100644
--- a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizShonenJump.kt
+++ b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/VizShonenJump.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.CacheControl
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -149,7 +149,7 @@ class VizShonenJump : ParsedHttpSource() {
 
         val newHeaders = headersBuilder()
             .add("X-Requested-With", "XMLHttpRequest")
-            .set("Referer", response.request().url().toString())
+            .set("Referer", response.request.url.toString())
             .build()
 
         val loginCheckRequest = GET(REFRESH_LOGIN_LINKS_URL, newHeaders)
@@ -214,7 +214,7 @@ class VizShonenJump : ParsedHttpSource() {
 
         return IntRange(1, pageCount)
             .map {
-                val imageUrl = HttpUrl.parse("$baseUrl/manga/get_manga_url")!!.newBuilder()
+                val imageUrl = "$baseUrl/manga/get_manga_url".toHttpUrlOrNull()!!.newBuilder()
                     .addQueryParameter("device_id", "3")
                     .addQueryParameter("manga_id", mangaId)
                     .addQueryParameter("page", it.toString())
@@ -226,7 +226,7 @@ class VizShonenJump : ParsedHttpSource() {
     }
 
     override fun imageUrlRequest(page: Page): Request {
-        val url = HttpUrl.parse(page.url)!!
+        val url = page.url.toHttpUrlOrNull()!!
         val referer = url.queryParameter("referer")!!
         val newUrl = url.newBuilder()
             .removeAllEncodedQueryParameters("referer")
@@ -241,10 +241,10 @@ class VizShonenJump : ParsedHttpSource() {
     }
 
     override fun imageUrlParse(response: Response): String {
-        val cdnUrl = response.body()!!.string()
-        val referer = response.request().header("Referer")!!
+        val cdnUrl = response.body!!.string()
+        val referer = response.request.header("Referer")!!
 
-        return HttpUrl.parse(cdnUrl)!!.newBuilder()
+        return cdnUrl.toHttpUrlOrNull()!!.newBuilder()
             .addEncodedQueryParameter("referer", referer)
             .toString()
     }
@@ -252,7 +252,7 @@ class VizShonenJump : ParsedHttpSource() {
     override fun imageUrlParse(document: Document) = ""
 
     override fun imageRequest(page: Page): Request {
-        val imageUrl = HttpUrl.parse(page.imageUrl!!)!!
+        val imageUrl = page.imageUrl!!.toHttpUrlOrNull()!!
         val referer = imageUrl.queryParameter("referer")!!
         val newImageUrl = imageUrl.newBuilder()
             .removeAllEncodedQueryParameters("referer")
diff --git a/src/en/webcomics/src/eu/kanade/tachiyomi/extension/en/webcomics/Webcomics.kt b/src/en/webcomics/src/eu/kanade/tachiyomi/extension/en/webcomics/Webcomics.kt
index ac477b586..1cdfb003f 100644
--- a/src/en/webcomics/src/eu/kanade/tachiyomi/extension/en/webcomics/Webcomics.kt
+++ b/src/en/webcomics/src/eu/kanade/tachiyomi/extension/en/webcomics/Webcomics.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -81,7 +81,7 @@ class Webcomics : ParsedHttpSource() {
     override fun searchMangaSelector() = ".wiki-book-list > .row"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/wiki.html?search=$query&page=$page")?.newBuilder()
+        val url = "$baseUrl/wiki.html?search=$query&page=$page".toHttpUrlOrNull()?.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is GenreFilter -> {
diff --git a/src/en/wecomics/src/eu/kanade/tachiyomi/extension/en/wecomics/WeComics.kt b/src/en/wecomics/src/eu/kanade/tachiyomi/extension/en/wecomics/WeComics.kt
index 0c91dcd8e..dcac78b58 100644
--- a/src/en/wecomics/src/eu/kanade/tachiyomi/extension/en/wecomics/WeComics.kt
+++ b/src/en/wecomics/src/eu/kanade/tachiyomi/extension/en/wecomics/WeComics.kt
@@ -52,7 +52,7 @@ class WeComics : HttpSource() {
         GET("$baseUrl/h5/rank/getAllComicList/page/$page?plain=1")
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         val mangas = jsonObject["data"]["comic_list"].asJsonArray.map {
             SManga.create().apply {
@@ -84,7 +84,7 @@ class WeComics : HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         return MangasPage(
             jsonObject["data"].asJsonArray.map {
@@ -116,7 +116,7 @@ class WeComics : HttpSource() {
         GET("${baseUrl}${manga.url}&type=search", headers)
 
     override fun mangaDetailsParse(response: Response): SManga {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
         val it = jsonObject["data"]["comic"].asJsonObject
         return SManga.create().apply {
@@ -136,7 +136,7 @@ class WeComics : HttpSource() {
         GET("https://m.wecomics.com/h5/comic/detail/id/${getMangaId(manga.url)}?plain=1", headers)
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
         val mangaId = jsonObject["data"]["comic"]["comic_id"].asInt
 
         return jsonObject["data"]["chapter_list"].asJsonArray.map {
@@ -158,11 +158,11 @@ class WeComics : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val url = response.request().url().toString()
+        val url = response.request.url.toString()
 
         // Error code 401 when not logged in and data is empty when logged in,
         // assuming this is populated after a purchase
-        val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+        val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
         if (jsonObject["error_code"].asInt != 2 &&
             jsonObject["data"]["chapter"]["data"].asString != ""
         )
diff --git a/src/en/wutopia/src/eu/kanade/tachiyomi/extension/en/wutopia/Wutopia.kt b/src/en/wutopia/src/eu/kanade/tachiyomi/extension/en/wutopia/Wutopia.kt
index c16b9e204..f9a108756 100644
--- a/src/en/wutopia/src/eu/kanade/tachiyomi/extension/en/wutopia/Wutopia.kt
+++ b/src/en/wutopia/src/eu/kanade/tachiyomi/extension/en/wutopia/Wutopia.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.wutopia
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import com.github.salomonbrys.kotson.bool
 import com.github.salomonbrys.kotson.fromJson
 import com.github.salomonbrys.kotson.get
@@ -55,7 +53,7 @@ class Wutopia : ConfigurableSource, HttpSource() {
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val json = gson.fromJson<JsonObject>(response.body()!!.string())
+        val json = gson.fromJson<JsonObject>(response.body!!.string())
 
         val mangas = json["list"].asJsonArray.map {
             SManga.create().apply {
@@ -106,7 +104,7 @@ class Wutopia : ConfigurableSource, HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["cartoon"].let { json ->
+        return gson.fromJson<JsonObject>(response.body!!.string())["cartoon"].let { json ->
             SManga.create().apply {
                 thumbnail_url = json["acrossPicUrlWebp"].asString
                 author = json["author"].asString
@@ -132,7 +130,7 @@ class Wutopia : ConfigurableSource, HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["list"].asJsonArray
+        return gson.fromJson<JsonObject>(response.body!!.string())["list"].asJsonArray
             .let { json ->
                 if (chapterListPref() == "free") json.filter { it["isPayed"].bool } else json
             }
@@ -153,7 +151,7 @@ class Wutopia : ConfigurableSource, HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["chapter"]["picList"].asJsonArray.mapIndexed { i, json ->
+        return gson.fromJson<JsonObject>(response.body!!.string())["chapter"]["picList"].asJsonArray.mapIndexed { i, json ->
             Page(i, "", json["picUrl"].asString)
         }
     }
@@ -184,24 +182,6 @@ class Wutopia : ConfigurableSource, HttpSource() {
         screen.addPreference(chapterListPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val chapterListPref = ListPreference(screen.context).apply {
-            key = SHOW_LOCKED_CHAPTERS_Title
-            title = SHOW_LOCKED_CHAPTERS_Title
-            entries = prefsEntries
-            entryValues = prefsEntryValues
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(SHOW_LOCKED_CHAPTERS, entry).commit()
-            }
-        }
-        screen.addPreference(chapterListPref)
-    }
-
     private fun chapterListPref() = preferences.getString(SHOW_LOCKED_CHAPTERS, "free")
 
     companion object {
diff --git a/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt b/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt
index 34279b400..b772d2088 100644
--- a/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt
+++ b/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt
@@ -138,7 +138,7 @@ class DoujinYang : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return response.body()!!.string().substringAfter(",[").substringBefore("]")
+        return response.body!!.string().substringAfter(",[").substringBefore("]")
             .replace(Regex("""[\\"]"""), "").split(",").let { list ->
                 val path = "https:" + list[0]
                 list.drop(1).mapIndexed { i, img -> Page(i, "", path + img) }
diff --git a/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt b/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt
index c739bda97..d0af9f9f2 100644
--- a/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt
+++ b/src/es/heavenmanga/src/eu/kanade/tachiyomi/extension/es/heavenmanga/HeavenManga.kt
@@ -89,7 +89,7 @@ class HeavenManga : ParsedHttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return if (response.request().url().toString().contains("query=")) super.searchMangaParse(response)
+        return if (response.request.url.toString().contains("query=")) super.searchMangaParse(response)
         else popularMangaParse(response)
     }
 
diff --git a/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt b/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt
index 5015b36a1..b4e135651 100755
--- a/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt
+++ b/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -54,7 +54,7 @@ class Ikuhentai : ParsedHttpSource() {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/page/$page")!!.newBuilder()
+        val url = "$baseUrl/page/$page".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("post_type", "wp-manga")
         val pattern = "\\s+".toRegex()
         val q = query.replace(pattern, "+")
diff --git a/src/es/inmanga/src/eu/kanade/tachiyomi/extension/es/inmanga/InManga.kt b/src/es/inmanga/src/eu/kanade/tachiyomi/extension/es/inmanga/InManga.kt
index 292f95218..2d4973f60 100644
--- a/src/es/inmanga/src/eu/kanade/tachiyomi/extension/es/inmanga/InManga.kt
+++ b/src/es/inmanga/src/eu/kanade/tachiyomi/extension/es/inmanga/InManga.kt
@@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -47,7 +47,10 @@ class InManga : ParsedHttpSource() {
 
     override fun popularMangaRequest(page: Int): Request {
         val skip = (page - 1) * 10
-        val body = RequestBody.create(null, "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=1&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=")
+        val body =
+            "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=1&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=".toRequestBody(
+                null
+            )
 
         return POST("$baseUrl/manga/getMangasConsultResult", postHeaders, body)
     }
@@ -63,7 +66,10 @@ class InManga : ParsedHttpSource() {
     // Search filtered by "Recién actualizado"
     override fun latestUpdatesRequest(page: Int): Request {
         val skip = (page - 1) * 10
-        val body = RequestBody.create(null, "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=3&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=")
+        val body =
+            "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=3&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=".toRequestBody(
+                null
+            )
 
         return POST("$baseUrl/manga/getMangasConsultResult", postHeaders, body)
     }
@@ -78,7 +84,10 @@ class InManga : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val skip = (page - 1) * 10
-        val body = RequestBody.create(null, "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=$query&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=1&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=")
+        val body =
+            "filter%5Bgeneres%5D%5B%5D=-1&filter%5BqueryString%5D=$query&filter%5Bskip%5D=$skip&filter%5Btake%5D=10&filter%5Bsortby%5D=1&filter%5BbroadcastStatus%5D=0&filter%5BonlyFavorites%5D=false&d=".toRequestBody(
+                null
+            )
 
         return POST("$baseUrl/manga/getMangasConsultResult", postHeaders, body)
     }
@@ -138,7 +147,7 @@ class InManga : ParsedHttpSource() {
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val chapters = mutableListOf<SChapter>()
-        val data = response.body()!!.string().substringAfter("{\"data\":\"").substringBeforeLast("\"}")
+        val data = response.body!!.string().substringAfter("{\"data\":\"").substringBeforeLast("\"}")
             .replace("\\", "")
 
         gson.fromJson<JsonObject>(data)["result"].asJsonArray.forEach { chapters.add(chapterFromJson(it)) }
diff --git a/src/es/kumanga/src/eu/kanade/tachiyomi/extension/es/kumanga/Kumanga.kt b/src/es/kumanga/src/eu/kanade/tachiyomi/extension/es/kumanga/Kumanga.kt
index 4b92aa3a7..a3d0053aa 100755
--- a/src/es/kumanga/src/eu/kanade/tachiyomi/extension/es/kumanga/Kumanga.kt
+++ b/src/es/kumanga/src/eu/kanade/tachiyomi/extension/es/kumanga/Kumanga.kt
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -34,9 +34,9 @@ class Kumanga : HttpSource() {
         .followRedirects(true)
         .addInterceptor { chain ->
             val originalRequest = chain.request()
-            if (originalRequest.url().toString().endsWith("token=")) {
+            if (originalRequest.url.toString().endsWith("token=")) {
                 getKumangaToken()
-                val url = originalRequest.url().toString() + kumangaToken
+                val url = originalRequest.url.toString() + kumangaToken
                 val newRequest = originalRequest.newBuilder().url(url).build()
                 chain.proceed(newRequest)
             } else {
@@ -105,7 +105,7 @@ class Kumanga : HttpSource() {
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val json = parseJson(res)
         val data = json["contents"].array
         val retrievedCount = json["retrievedCount"].int
@@ -196,7 +196,7 @@ class Kumanga : HttpSource() {
     override fun imageUrlParse(response: Response) = throw Exception("Not Used")
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/backend/ajax/searchengine.php?page=$page&perPage=10&keywords=$query&retrieveCategories=true&retrieveAuthors=false&contentType=manga&token=$kumangaToken")!!.newBuilder()
+        val url = "$baseUrl/backend/ajax/searchengine.php?page=$page&perPage=10&keywords=$query&retrieveCategories=true&retrieveAuthors=false&contentType=manga&token=$kumangaToken".toHttpUrlOrNull()!!.newBuilder()
 
         filters.forEach { filter ->
             when (filter) {
diff --git a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
index d79fca478..84d5d4dea 100755
--- a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
+++ b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt
@@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.es.lectormanga
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -18,7 +15,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -56,13 +53,13 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
     }
 
     private val webRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(baseUrl)!!,
+        baseUrl.toHttpUrlOrNull()!!,
         preferences.getString(WEB_RATELIMIT_PREF, WEB_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
         60
     )
 
     private val imageCDNRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(imageCDNUrl)!!,
+        imageCDNUrl.toHttpUrlOrNull()!!,
         preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
         60
     )
@@ -93,7 +90,7 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
     override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/library")!!.newBuilder()
+        val url = "$baseUrl/library".toHttpUrlOrNull()!!.newBuilder()
 
         url.addQueryParameter("title", query)
         url.addQueryParameter("page", page.toString())
@@ -511,84 +508,6 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(imgCDNRateLimitPreference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-
-        val scanlatorPref = CheckBoxPreference(screen.context).apply {
-            key = SCANLATOR_PREF
-            title = SCANLATOR_PREF_TITLE
-            summary = SCANLATOR_PREF_SUMMARY
-            setDefaultValue(SCANLATOR_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean(SCANLATOR_PREF, checkValue).commit()
-            }
-        }
-
-        val pageMethodPref = ListPreference(screen.context).apply {
-            key = PAGE_METHOD_PREF
-            title = PAGE_METHOD_PREF_TITLE
-            entries = arrayOf("Cascada", "Páginado")
-            entryValues = arrayOf("cascade", "paginated")
-            summary = PAGE_METHOD_PREF_SUMMARY
-            setDefaultValue(PAGE_METHOD_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(PAGE_METHOD_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        // Rate limit
-        val apiRateLimitPreference = ListPreference(screen.context).apply {
-            key = WEB_RATELIMIT_PREF
-            title = WEB_RATELIMIT_PREF_TITLE
-            summary = WEB_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue(WEB_RATELIMIT_PREF_DEFAULT_VALUE)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(WEB_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val imgCDNRateLimitPreference = ListPreference(screen.context).apply {
-            key = IMAGE_CDN_RATELIMIT_PREF
-            title = IMAGE_CDN_RATELIMIT_PREF_TITLE
-            summary = IMAGE_CDN_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue(IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(IMAGE_CDN_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(scanlatorPref)
-        screen.addPreference(pageMethodPref)
-        screen.addPreference(apiRateLimitPreference)
-        screen.addPreference(imgCDNRateLimitPreference)
-    }
-
     private fun getScanlatorPref(): Boolean = preferences.getBoolean(SCANLATOR_PREF, SCANLATOR_PREF_DEFAULT_VALUE)
 
     private fun getPageMethodPref() = preferences.getString(PAGE_METHOD_PREF, PAGE_METHOD_PREF_DEFAULT_VALUE)
diff --git a/src/es/mangamx/src/eu/kanade/tachiyomi/extension/es/mangamx/MangaMx.kt b/src/es/mangamx/src/eu/kanade/tachiyomi/extension/es/mangamx/MangaMx.kt
index 2532f6ac4..0f4ce86c7 100644
--- a/src/es/mangamx/src/eu/kanade/tachiyomi/extension/es/mangamx/MangaMx.kt
+++ b/src/es/mangamx/src/eu/kanade/tachiyomi/extension/es/mangamx/MangaMx.kt
@@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.extension.es.mangamx
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.PreferenceScreen
 import android.util.Base64
 import com.github.salomonbrys.kotson.get
 import com.github.salomonbrys.kotson.string
@@ -143,8 +141,8 @@ open class MangaMx : ConfigurableSource, ParsedHttpSource() {
     override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
 
     override fun searchMangaParse(response: Response): MangasPage {
-        if (!response.isSuccessful) throw Exception("Búsqueda fallida ${response.code()}")
-        if ("directorio" in response.request().url().toString()) {
+        if (!response.isSuccessful) throw Exception("Búsqueda fallida ${response.code}")
+        if ("directorio" in response.request.url.toString()) {
             val document = response.asJsoup()
             val mangas = document.select(searchMangaSelector()).map { element ->
                 searchMangaFromElement(element)
@@ -156,7 +154,7 @@ open class MangaMx : ConfigurableSource, ParsedHttpSource() {
 
             return MangasPage(mangas, hasNextPage)
         } else {
-            val body = response.body()!!.string()
+            val body = response.body!!.string()
             if (body == "[]") throw Exception("Término de búsqueda demasiado corto")
             val json = JsonParser().parse(body)["mangas"].asJsonArray
 
@@ -330,23 +328,6 @@ open class MangaMx : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(contentPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-
-        val contentPref = CheckBoxPreference(screen.context).apply {
-            key = CONTENT_PREF
-            title = CONTENT_PREF_TITLE
-            summary = CONTENT_PREF_SUMMARY
-            setDefaultValue(CONTENT_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean(CONTENT_PREF, checkValue).commit()
-            }
-        }
-
-        screen.addPreference(contentPref)
-    }
-
     private fun hideNSFWContent(): Boolean = preferences.getBoolean(CONTENT_PREF, CONTENT_PREF_DEFAULT_VALUE)
 
     companion object {
diff --git a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt
index 4818d7ea2..1b31ea89e 100755
--- a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt
+++ b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.es.tmohentai
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.annotations.Nsfw
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -15,7 +13,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -125,7 +123,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() {
     override fun imageRequest(page: Page) = GET("$baseUrl${page.imageUrl!!}", headers)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/section/all?view=list")!!.newBuilder()
+        val url = "$baseUrl/section/all?view=list".toHttpUrlOrNull()!!.newBuilder()
 
         url.addQueryParameter("search[searchText]", query)
         url.addQueryParameter("page", page.toString())
@@ -311,29 +309,6 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(pageMethodPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val pageMethodPref = ListPreference(screen.context).apply {
-            key = PAGE_METHOD_PREF
-            title = PAGE_METHOD_PREF_TITLE
-            entries = arrayOf("Cascada", "Páginado")
-            entryValues = arrayOf(PAGE_METHOD_PREF_CASCADE, PAGE_METHOD_PREF_PAGINATED)
-            summary = PAGE_METHOD_PREF_SUMMARY
-            setDefaultValue(PAGE_METHOD_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(PAGE_METHOD_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(pageMethodPref)
-    }
-
     private fun getPageMethodPref() = preferences.getString(PAGE_METHOD_PREF, PAGE_METHOD_PREF_DEFAULT_VALUE)
 
     companion object {
diff --git a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
index cb9b95da6..bca7434d5 100644
--- a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
+++ b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
@@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.es.tumangaonline
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -17,7 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -46,13 +43,13 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
     }
 
     private val webRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(baseUrl)!!,
+        baseUrl.toHttpUrlOrNull()!!,
         preferences.getString(WEB_RATELIMIT_PREF, WEB_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
         60
     )
 
     private val imageCDNRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(imageCDNUrl)!!,
+        imageCDNUrl.toHttpUrlOrNull()!!,
         preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)!!.toInt(),
         60
     )
@@ -88,7 +85,7 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
     override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/library")!!.newBuilder()
+        val url = "$baseUrl/library".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("title", query)
         if (getSFWModePref()) {
             SFW_MODE_PREF_EXCLUDE_GENDERS.forEach { gender ->
@@ -524,97 +521,6 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(imgCDNRateLimitPreference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-
-        val SFWModePref = CheckBoxPreference(screen.context).apply {
-            key = SFW_MODE_PREF
-            title = SFW_MODE_PREF_TITLE
-            summary = SFW_MODE_PREF_SUMMARY
-            setDefaultValue(SFW_MODE_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean(SFW_MODE_PREF, checkValue).commit()
-            }
-        }
-
-        val scanlatorPref = CheckBoxPreference(screen.context).apply {
-            key = SCANLATOR_PREF
-            title = SCANLATOR_PREF_TITLE
-            summary = SCANLATOR_PREF_SUMMARY
-            setDefaultValue(SCANLATOR_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val checkValue = newValue as Boolean
-                preferences.edit().putBoolean(SCANLATOR_PREF, checkValue).commit()
-            }
-        }
-
-        val pageMethodPref = ListPreference(screen.context).apply {
-            key = PAGE_METHOD_PREF
-            title = PAGE_METHOD_PREF_TITLE
-            entries = arrayOf("Cascada", "Páginado")
-            entryValues = arrayOf("cascade", "paginated")
-            summary = PAGE_METHOD_PREF_SUMMARY
-            setDefaultValue(PAGE_METHOD_PREF_DEFAULT_VALUE)
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(PAGE_METHOD_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        // Rate limit
-        val apiRateLimitPreference = ListPreference(screen.context).apply {
-            key = WEB_RATELIMIT_PREF
-            title = WEB_RATELIMIT_PREF_TITLE
-            summary = WEB_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue(WEB_RATELIMIT_PREF_DEFAULT_VALUE)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(WEB_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val imgCDNRateLimitPreference = ListPreference(screen.context).apply {
-            key = IMAGE_CDN_RATELIMIT_PREF
-            title = IMAGE_CDN_RATELIMIT_PREF_TITLE
-            summary = IMAGE_CDN_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue(IMAGE_CDN_RATELIMIT_PREF_DEFAULT_VALUE)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(IMAGE_CDN_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(SFWModePref)
-        screen.addPreference(scanlatorPref)
-        screen.addPreference(pageMethodPref)
-        screen.addPreference(apiRateLimitPreference)
-        screen.addPreference(imgCDNRateLimitPreference)
-    }
-
     private fun getScanlatorPref(): Boolean = preferences.getBoolean(SCANLATOR_PREF, SCANLATOR_PREF_DEFAULT_VALUE)
 
     private fun getSFWModePref(): Boolean = preferences.getBoolean(SFW_MODE_PREF, SFW_MODE_PREF_DEFAULT_VALUE)
diff --git a/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMP.kt b/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMP.kt
index bc92c1466..dfb09289c 100644
--- a/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMP.kt
+++ b/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMP.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -70,7 +70,7 @@ open class VCPVMP(override val name: String, override val baseUrl: String) : Par
     override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used")
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        var url = HttpUrl.parse(baseUrl)!!.newBuilder()
+        var url = baseUrl.toHttpUrlOrNull()!!.newBuilder()
         val isOnVCP = (baseUrl == "https://vercomicsporno.com")
 
         url.addPathSegments("page")
@@ -82,7 +82,7 @@ open class VCPVMP(override val name: String, override val baseUrl: String) : Par
                 is Genre -> {
                     when (filter.toUriPart().isNotEmpty()) {
                         true -> {
-                            url = HttpUrl.parse(baseUrl)!!.newBuilder()
+                            url = baseUrl.toHttpUrlOrNull()!!.newBuilder()
 
                             url.addPathSegments(if (isOnVCP) "tags" else "genero")
                             url.addPathSegments(filter.toUriPart())
diff --git a/src/fr/japanread/src/eu/kanade/tachiyomi/extension/fr/japanread/Japanread.kt b/src/fr/japanread/src/eu/kanade/tachiyomi/extension/fr/japanread/Japanread.kt
index 9be4cc854..39773fdab 100644
--- a/src/fr/japanread/src/eu/kanade/tachiyomi/extension/fr/japanread/Japanread.kt
+++ b/src/fr/japanread/src/eu/kanade/tachiyomi/extension/fr/japanread/Japanread.kt
@@ -159,7 +159,7 @@ class Japanread : ParsedHttpSource() {
 
         val apiResponse = client.newCall(GET("$baseUrl/api/?id=$mangaId&type=manga", apiHeaders())).execute()
 
-        val jsonData = apiResponse.body()!!.string()
+        val jsonData = apiResponse.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject
 
         return json["chapter"].obj.entrySet()
@@ -184,7 +184,7 @@ class Japanread : ParsedHttpSource() {
 
         val apiResponse = client.newCall(GET("$baseUrl/api/?id=$chapterId&type=chapter", apiHeaders())).execute()
 
-        val jsonData = apiResponse.body()!!.string()
+        val jsonData = apiResponse.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject
 
         val baseImagesUrl = json["baseImagesUrl"].string
diff --git a/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt b/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt
index 18304d93b..456bf6a95 100644
--- a/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt
+++ b/src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt
@@ -10,8 +10,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import android.util.Log
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -39,11 +37,11 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
@@ -55,16 +53,6 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.CyclicBarrier
-import kotlin.collections.ArrayList
-import kotlin.collections.List
-import kotlin.collections.distinctBy
-import kotlin.collections.filter
-import kotlin.collections.first
-import kotlin.collections.forEach
-import kotlin.collections.forEachIndexed
-import kotlin.collections.map
-import kotlin.collections.mutableListOf
-import kotlin.collections.toTypedArray
 
 class Japscan : ConfigurableSource, ParsedHttpSource() {
 
@@ -97,7 +85,7 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
         val indicator = "&wvsc"
         val cleanupjs = "var checkExist=setInterval(function(){if(document.getElementsByTagName('CNV-VV').length){clearInterval(checkExist);var e=document.body,a=e.children;for(e.appendChild(document.getElementsByTagName('CNV-VV')[0]);'CNV-VV'!=a[0].tagName;)e.removeChild(a[0]);for(var t of[].slice.call(a[0].all_canvas))t.style.maxWidth='100%';window.android.passSize(a[0].all_canvas[0].width,a[0].all_canvas[0].width/a[0].all_canvas[0].height)}},100);"
         val request = chain.request()
-        val url = request.url().toString()
+        val url = request.url.toString()
 
         val newRequest = request.newBuilder()
             .url(url.substringBefore(indicator))
@@ -145,13 +133,13 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
         Thread.sleep(350)
 
         val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-        var canvas = Canvas(bitmap)
+        val canvas = Canvas(bitmap)
         webView!!.draw(canvas)
 
         // val bitmap: Bitmap = webView!!.drawingCache
         val output = ByteArrayOutputStream()
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, output)
-        val rb = ResponseBody.create(MediaType.parse("image/png"), output.toByteArray())
+        val rb = output.toByteArray().toResponseBody("image/png".toMediaTypeOrNull())
         handler.post { webView!!.destroy() }
         response.newBuilder().body(rb).build()
     }.build()
@@ -242,7 +230,7 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
                 return client.newCall(POST("$baseUrl/live-search/", searchHeaders, formBody)).execute().use { response ->
                     if (!response.isSuccessful) throw Exception("Unexpected code $response")
 
-                    val jsonObject = gson.fromJson<JsonObject>(response.body()!!.string())
+                    val jsonObject = gson.fromJson<JsonObject>(response.body!!.string())
 
                     if (jsonObject.asJsonArray.size() === 0) {
                         Log.d("japscan", "Search not returning anything, using duckduckgo")
@@ -250,7 +238,7 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
                         throw Exception("No data")
                     }
 
-                    return response.request()
+                    return response.request
                 }
             } finally {
                 // Fallback to duckduckgo if the search does not return any result
@@ -265,8 +253,8 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
     override fun searchMangaNextPageSelector(): String? = "li.page-item:last-child:not(li.active),.next_form .navbutton"
     override fun searchMangaSelector(): String = "div.card div.p-2, a.result-link"
     override fun searchMangaParse(response: Response): MangasPage {
-        if ("live-search" in response.request().url().toString()) {
-            val body = response.body()!!.string()
+        if ("live-search" in response.request.url.toString()) {
+            val body = response.body!!.string()
             val json = JsonParser().parse(body).asJsonArray
             val mangas = json.map { jsonElement ->
                 searchMangaFromJson(jsonElement)
@@ -369,7 +357,7 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
 
         val zjsurl = document.getElementsByTag("script").first { it.attr("src").contains("zjs", ignoreCase = true) }.attr("src")
         Log.d("japscan", "ZJS at $zjsurl")
-        val zjs = client.newCall(GET(baseUrl + zjsurl, headers)).execute().body()!!.string()
+        val zjs = client.newCall(GET(baseUrl + zjsurl, headers)).execute().body!!.string()
         Log.d("japscan", "webtoon, netdumping initiated")
         val pagecount = document.getElementsByTag("option").size
         val pages = ArrayList<Page>()
@@ -471,22 +459,4 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
         }
         screen.addPreference(chapterListPref)
     }
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val chapterListPref = ListPreference(screen.context).apply {
-            key = SHOW_SPOILER_CHAPTERS_Title
-            title = SHOW_SPOILER_CHAPTERS_Title
-            entries = prefsEntries
-            entryValues = prefsEntryValues
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = this.findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(SHOW_SPOILER_CHAPTERS, entry).commit()
-            }
-        }
-        screen.addPreference(chapterListPref)
-    }
 }
diff --git a/src/fr/kangaryu/src/eu/kanade/tachiyomi/extension/fr/kangaryu/Kangaryu.kt b/src/fr/kangaryu/src/eu/kanade/tachiyomi/extension/fr/kangaryu/Kangaryu.kt
index 6f281a219..002435cee 100644
--- a/src/fr/kangaryu/src/eu/kanade/tachiyomi/extension/fr/kangaryu/Kangaryu.kt
+++ b/src/fr/kangaryu/src/eu/kanade/tachiyomi/extension/fr/kangaryu/Kangaryu.kt
@@ -90,7 +90,7 @@ class Kangaryu : ParsedHttpSource() {
     private val gson by lazy { Gson() }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val mangas = gson.fromJson<JsonObject>(response.body()!!.string())["suggestions"].array.map { json ->
+        val mangas = gson.fromJson<JsonObject>(response.body!!.string())["suggestions"].array.map { json ->
             SManga.create().apply {
                 url = "/manga/${json["data"].string}"
                 title = json["value"].string
diff --git a/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt b/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt
index 3b866d464..e94c6711e 100644
--- a/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt
+++ b/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt
@@ -126,7 +126,7 @@ class ScanManga : ParsedHttpSource() {
     }
 
     private fun parseMangaFromJson(response: Response): MangasPage {
-        val jsonData = response.body()!!.string()!!
+        val jsonData = response.body!!.string()!!
         if (jsonData == "") {
             return MangasPage(listOf<SManga>(), false)
         }
diff --git a/src/id/bacakomik/src/eu/kanade/tachiyomi/extension/id/bacakomik/Bacakomik.kt b/src/id/bacakomik/src/eu/kanade/tachiyomi/extension/id/bacakomik/Bacakomik.kt
index 1f9863e7e..a2aaea725 100644
--- a/src/id/bacakomik/src/eu/kanade/tachiyomi/extension/id/bacakomik/Bacakomik.kt
+++ b/src/id/bacakomik/src/eu/kanade/tachiyomi/extension/id/bacakomik/Bacakomik.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -56,7 +56,7 @@ class Bacakomik : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val builtUrl = if (page == 1) "$baseUrl/daftar-manga/" else "$baseUrl/daftar-manga/page/$page/?order="
-        val url = HttpUrl.parse(builtUrl)!!.newBuilder()
+        val url = builtUrl.toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("title", query)
         url.addQueryParameter("page", page.toString())
         filters.forEach { filter ->
diff --git a/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt b/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt
index ebe40f845..09f878f5a 100644
--- a/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt
+++ b/src/id/bacamanga/src/eu/kanade/tachiyomi/extension/id/bacamanga/BacaManga.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -33,7 +33,7 @@ class BacaManga : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val url = if (query.isNotBlank()) {
-            val url = HttpUrl.parse("$baseUrl/page/$page")!!.newBuilder()
+            val url = "$baseUrl/page/$page".toHttpUrlOrNull()!!.newBuilder()
             val pattern = "\\s+".toRegex()
             val q = query.replace(pattern, "+")
             if (query.isNotEmpty()) {
@@ -43,7 +43,7 @@ class BacaManga : ParsedHttpSource() {
             }
             url.toString()
         } else {
-            val url = HttpUrl.parse("$baseUrl/daftar-komik/page/$page")!!.newBuilder()
+            val url = "$baseUrl/daftar-komik/page/$page".toHttpUrlOrNull()!!.newBuilder()
             var orderBy: String
             (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
                 when (filter) {
@@ -143,7 +143,7 @@ class BacaManga : ParsedHttpSource() {
     override fun pageListParse(document: Document): List<Page> {
         val pages = mutableListOf<Page>()
         val scriptToParse = document.select("script[src*=cache]").first().attr("src")
-        val slideaid = client.newCall(GET(scriptToParse, headers)).execute().body()!!.string()
+        val slideaid = client.newCall(GET(scriptToParse, headers)).execute().body!!.string()
         val imagesList = slideaid.substringAfter("var imgch").substringBefore(";").substringAfter("=").trim()
         val img_url = slideaid.substringAfter("#chimg").substringBefore("onError").substringAfter("src=\"").substringBefore("'").trim()
         val json = JsonParser().parse(imagesList).asJsonArray
diff --git a/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt b/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt
index 37c14b270..a4eacdb87 100644
--- a/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt
+++ b/src/id/komiku/src/eu/kanade/tachiyomi/extension/id/komiku/Komiku.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -79,7 +79,7 @@ class Komiku : ParsedHttpSource() {
     override fun searchMangaSelector() = popularMangaSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/pustaka/page/$page/")?.newBuilder()!!.addQueryParameter("s", query)
+        val url = "$baseUrl/pustaka/page/$page/".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("s", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is CategoryNames -> {
diff --git a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt
index 2641981ab..23052fdce 100644
--- a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt
+++ b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -50,7 +50,7 @@ class MaidManga : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/advanced-search/${pagePathSegment(page)}")!!.newBuilder()
+        val url = "$baseUrl/advanced-search/${pagePathSegment(page)}".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("title", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
diff --git a/src/id/mangaindo/src/eu/kanade/tachiyomi/extension/id/mangaindo/MangaIndo.kt b/src/id/mangaindo/src/eu/kanade/tachiyomi/extension/id/mangaindo/MangaIndo.kt
index 8a63171a4..e54dc157c 100644
--- a/src/id/mangaindo/src/eu/kanade/tachiyomi/extension/id/mangaindo/MangaIndo.kt
+++ b/src/id/mangaindo/src/eu/kanade/tachiyomi/extension/id/mangaindo/MangaIndo.kt
@@ -76,7 +76,7 @@ class MangaIndo : ParsedHttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        return gson.fromJson<JsonObject>(response.body()!!.string()).let { json ->
+        return gson.fromJson<JsonObject>(response.body!!.string()).let { json ->
             val mangas = json["data"].asJsonArray.map { data ->
                 SManga.create().apply {
                     title = data["post"]["post_title"].asString
diff --git a/src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt b/src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt
index b10343c66..629f81404 100644
--- a/src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt
+++ b/src/id/mangayu/src/eu/kanade/tachiyomi/extension/id/mangayu/MangaYu.kt
@@ -7,11 +7,10 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -35,7 +34,7 @@ class MangaYu : ParsedHttpSource() {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/manga?")!!.newBuilder()
+        val url = "$baseUrl/manga?".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("search", query)
             .addQueryParameter("page", page.toString())
         val newUrl = null
diff --git a/src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt b/src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt
index 5547a0a95..b81dbb50b 100644
--- a/src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt
+++ b/src/id/neumanga/src/eu/kanade/tachiyomi/extension/id/neumanga/Neumanga.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.json.JSONArray
 import org.jsoup.nodes.Document
@@ -81,7 +81,7 @@ class Neumanga : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "div#gov-result ul.pagination li.active + li a"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/advanced_search")!!.newBuilder()
+        val url = "$baseUrl/advanced_search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("advpage", page.toString())
             .addQueryParameter("name_search_mode", "contain")
             .addQueryParameter("artist_search_mode", "contain")
diff --git a/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt b/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt
index 47f208d38..52474407d 100644
--- a/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt
+++ b/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt
@@ -174,7 +174,7 @@ class HentaiFantasy : ParsedHttpSource() {
     override fun pageListRequest(chapter: SChapter) = POST(baseUrl + chapter.url, headers)
 
     override fun pageListParse(response: Response): List<Page> {
-        val body = response.body()!!.string()
+        val body = response.body!!.string()
         val pages = mutableListOf<Page>()
 
         val p = pagesUrlPattern
diff --git a/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt b/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt
index 93dc5011c..561831d30 100644
--- a/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt
+++ b/src/it/mangaeden/src/eu/kanade/tachiyomi/extension/it/mangaeden/Mangaeden.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -49,7 +49,7 @@ class Mangaeden : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/it/it-directory/")?.newBuilder()!!.addQueryParameter("title", query)
+        val url = "$baseUrl/it/it-directory/".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("title", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is StatusList ->
diff --git a/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt
index 639d806df..04a2d4519 100644
--- a/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt
+++ b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -82,10 +82,9 @@ class Mangaworld : ParsedHttpSource() {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/archive?page=$page")!!.newBuilder()
-        val pattern = "\\s+".toRegex()
+        val url = "$baseUrl/archive?page=$page".toHttpUrlOrNull()!!.newBuilder()
         val q = query
-        if (query.length > 0) {
+        if (query.isNotEmpty()) {
             url.addQueryParameter("keyword", q)
         } else {
             url.addQueryParameter("keyword", "")
diff --git a/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt b/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt
index e4e2fcff4..6ae340059 100644
--- a/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt
+++ b/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -45,7 +45,7 @@ class Perveden : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = searchMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/it/it-directory/")?.newBuilder()!!.addQueryParameter("title", query)
+        val url = "$baseUrl/it/it-directory/".toHttpUrlOrNull()?.newBuilder()!!.addQueryParameter("title", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is StatusList ->
diff --git a/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt b/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt
index c9541b02c..9d2364aab 100644
--- a/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt
+++ b/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -57,7 +57,7 @@ class Rawdevart : ParsedHttpSource() {
     override fun popularMangaNextPageSelector() = latestUpdatesNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/")!!.newBuilder()
+        val url = "$baseUrl/search/".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("page", page.toString())
         url.addQueryParameter("title", query)
         filters.forEach { filter ->
diff --git a/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt b/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt
index 9aec9a1aa..07643fab9 100644
--- a/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt
+++ b/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt
@@ -8,17 +8,13 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-/**
- * Sen Manga source
- */
-
 class SenManga : ParsedHttpSource() {
     override val lang: String = "ja"
 
@@ -30,18 +26,18 @@ class SenManga : ParsedHttpSource() {
     override val client = super.client.newBuilder().addInterceptor {
         // Intercept any image requests and add a referer to them
         // Enables bandwidth stealing feature
-        val request = if (it.request().url().pathSegments().firstOrNull()?.trim()?.toLowerCase() == "viewer") {
+        val request = if (it.request().url.pathSegments.firstOrNull()?.trim()?.toLowerCase() == "viewer") {
             it.request().newBuilder()
                 .addHeader(
                     "Referer",
-                    it.request().url().newBuilder()
+                    it.request().url.newBuilder()
                         .removePathSegment(0)
                         .toString()
                 )
                 .build()
         } else it.request()
         it.proceed(request)
-    }.build()!!
+    }.build()
 
     override fun popularMangaSelector() = "div.item"
 
@@ -68,7 +64,7 @@ class SenManga : ParsedHttpSource() {
     override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("s", query)
             .addQueryParameter("page", page.toString())
 
diff --git a/src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt b/src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt
index c5be2d3cf..d0268b7c1 100644
--- a/src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt
+++ b/src/ja/shonenjumpplus/src/eu/kanade/tachiyomi/extension/ja/shonenjumpplus/ShonenJumpPlus.kt
@@ -19,13 +19,13 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -85,7 +85,7 @@ class ShonenJumpPlus : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         if (query.isNotEmpty()) {
-            val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+            val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
                 .addQueryParameter("q", query)
 
             return GET(url.toString(), headers)
@@ -96,7 +96,7 @@ class ShonenJumpPlus : ParsedHttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        if (response.request().url().toString().contains("search"))
+        if (response.request.url.toString().contains("search"))
             return super.searchMangaParse(response)
 
         return popularMangaParse(response)
@@ -126,13 +126,15 @@ class ShonenJumpPlus : ParsedHttpSource() {
     override fun chapterListParse(response: Response): List<SChapter> {
         val document = response.asJsoup()
         val readableProductList = document.select("div.js-readable-product-list").first()!!
-        val latestListEndpoint = HttpUrl.parse(readableProductList.attr("data-latest-list-endpoint"))!!
-        val firstListEndpoint = HttpUrl.parse(readableProductList.attr("data-first-list-endpoint"))!!
+        val latestListEndpoint = readableProductList.attr("data-latest-list-endpoint")
+            .toHttpUrlOrNull()!!
+        val firstListEndpoint = readableProductList.attr("data-first-list-endpoint")
+            .toHttpUrlOrNull()!!
         val numberSince = latestListEndpoint.queryParameter("number_since")!!.toInt()
             .coerceAtLeast(firstListEndpoint.queryParameter("number_since")!!.toInt())
 
         val newHeaders = headers.newBuilder()
-            .set("Referer", response.request().url().toString())
+            .set("Referer", response.request.url.toString())
             .build()
         var readMoreEndpoint = firstListEndpoint.newBuilder()
             .setQueryParameter("number_since", numberSince.toString())
@@ -143,10 +145,10 @@ class ShonenJumpPlus : ParsedHttpSource() {
         var request = GET(readMoreEndpoint, newHeaders)
         var result = client.newCall(request).execute()
 
-        while (result.code() != 404) {
+        while (result.code != 404) {
             val json = result.asJsonObject()
             readMoreEndpoint = json["nextUrl"].string
-            val tempDocument = Jsoup.parse(json["html"].string, response.request().url().toString())
+            val tempDocument = Jsoup.parse(json["html"].string, response.request.url.toString())
 
             chapters += tempDocument
                 .select("ul.series-episode-list " + chapterListSelector())
@@ -183,7 +185,7 @@ class ShonenJumpPlus : ParsedHttpSource() {
         return episodeJson["readableProduct"]["pageStructure"]["pages"].asJsonArray
             .filter { it["type"].string == "main" }
             .mapIndexed { i, pageObj ->
-                val imageUrl = HttpUrl.parse(pageObj["src"].string)!!.newBuilder()
+                val imageUrl = pageObj["src"].string.toHttpUrlOrNull()!!.newBuilder()
                     .addQueryParameter("width", pageObj["width"].string)
                     .addQueryParameter("height", pageObj["height"].string)
                     .toString()
@@ -211,22 +213,22 @@ class ShonenJumpPlus : ParsedHttpSource() {
     private fun imageIntercept(chain: Interceptor.Chain): Response {
         var request = chain.request()
 
-        if (!request.url().toString().startsWith(CDN_URL)) {
+        if (!request.url.toString().startsWith(CDN_URL)) {
             return chain.proceed(request)
         }
 
-        val width = request.url().queryParameter("width")!!.toInt()
-        val height = request.url().queryParameter("height")!!.toInt()
+        val width = request.url.queryParameter("width")!!.toInt()
+        val height = request.url.queryParameter("height")!!.toInt()
 
-        val newUrl = request.url().newBuilder()
+        val newUrl = request.url.newBuilder()
             .removeAllQueryParameters("width")
             .removeAllQueryParameters("height")
             .build()
         request = request.newBuilder().url(newUrl).build()
 
         val response = chain.proceed(request)
-        val image = decodeImage(response.body()!!.byteStream(), width, height)
-        val body = ResponseBody.create(MediaType.parse("image/png"), image)
+        val image = decodeImage(response.body!!.byteStream(), width, height)
+        val body = image.toResponseBody("image/png".toMediaTypeOrNull())
         return response.newBuilder().body(body).build()
     }
 
@@ -267,7 +269,7 @@ class ShonenJumpPlus : ParsedHttpSource() {
         }
     }
 
-    private fun Response.asJsonObject(): JsonObject = JSON_PARSER.parse(body()!!.string()).obj
+    private fun Response.asJsonObject(): JsonObject = JSON_PARSER.parse(body!!.string()).obj
 
     companion object {
         private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Safari/537.36"
diff --git a/src/ko/jmana/src/eu/kanade/tachiyomi/extension/ko/jmana/JMana.kt b/src/ko/jmana/src/eu/kanade/tachiyomi/extension/ko/jmana/JMana.kt
index 47978a2e7..47d777210 100644
--- a/src/ko/jmana/src/eu/kanade/tachiyomi/extension/ko/jmana/JMana.kt
+++ b/src/ko/jmana/src/eu/kanade/tachiyomi/extension/ko/jmana/JMana.kt
@@ -2,10 +2,8 @@ package eu.kanade.tachiyomi.extension.ko.jmana
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.widget.Toast
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -15,7 +13,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -98,7 +96,7 @@ class JMana : ConfigurableSource, ParsedHttpSource() {
         val rawName = linkElement.text()
 
         return SChapter.create().apply {
-            url = HttpUrl.parse(linkElement.attr("abs:href"))!!.let { "${it.encodedPath()}?${it.encodedQuery()}" }
+            url = linkElement.attr("abs:href").toHttpUrlOrNull()!!.let { "${it.encodedPath}?${it.encodedQuery}" }
             chapter_number = parseChapterNumber(rawName)
             name = rawName.trim()
             date_upload = parseChapterDate(element.select("li.publish-date span").last().text())
@@ -202,29 +200,5 @@ class JMana : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(baseUrlPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val baseUrlPref = EditTextPreference(screen.context).apply {
-            key = BASE_URL_PREF_TITLE
-            title = BASE_URL_PREF_TITLE
-            summary = BASE_URL_PREF_SUMMARY
-            this.setDefaultValue(DEFAULT_BASEURL)
-            dialogTitle = BASE_URL_PREF_TITLE
-            dialogMessage = "Default: $DEFAULT_BASEURL"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(BASE_URL_PREF, newValue as String).commit()
-                    Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(baseUrlPref)
-    }
-
     private fun getPrefBaseUrl() = preferences.getString(BASE_URL_PREF, DEFAULT_BASEURL)
 }
diff --git a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/ManaToki.kt b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/ManaToki.kt
index 1ddc4c92f..4ac184856 100644
--- a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/ManaToki.kt
+++ b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/ManaToki.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.CacheControl
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
@@ -102,7 +102,7 @@ class ManaToki(domainNumber: Long) : NewToki("ManaToki", "https://manatoki$domai
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/comic" + (if (page > 1) "/p$page" else ""))!!.newBuilder()
+        val url = ("$baseUrl/comic" + (if (page > 1) "/p$page" else "")).toHttpUrl().newBuilder()
 
         val genres = mutableListOf<String>()
 
diff --git a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewToki.kt b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewToki.kt
index 4dcec1fd9..c9523f6f6 100644
--- a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewToki.kt
+++ b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewToki.kt
@@ -3,11 +3,8 @@ package eu.kanade.tachiyomi.extension.ko.newtoki
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.widget.Toast
-import eu.kanade.tachiyomi.extensions.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -338,96 +335,6 @@ open class NewToki(override val name: String, private val defaultBaseUrl: String
         screen.addPreference(rateLimitPeriodPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val baseUrlPref = EditTextPreference(screen.context).apply {
-            key = BASE_URL_PREF_TITLE
-            title = BASE_URL_PREF_TITLE
-            summary = BASE_URL_PREF_SUMMARY
-            this.setDefaultValue(defaultBaseUrl)
-            dialogTitle = BASE_URL_PREF_TITLE
-            dialogMessage = "Default: $defaultBaseUrl"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(BASE_URL_PREF, newValue as String).commit()
-                    Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val latestExperimentPref = CheckBoxPreference(screen.context).apply {
-            key = EXPERIMENTAL_LATEST_PREF_TITLE
-            title = EXPERIMENTAL_LATEST_PREF_TITLE
-            summary = EXPERIMENTAL_LATEST_PREF_SUMMARY
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putBoolean(EXPERIMENTAL_LATEST_PREF, newValue as Boolean).commit()
-                    Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val latestWithDetailPref = CheckBoxPreference(screen.context).apply {
-            key = EXPERIMENTAL_LATEST_WITH_DETAIL_PREF_TITLE
-            title = EXPERIMENTAL_LATEST_WITH_DETAIL_PREF_TITLE
-            summary = EXPERIMENTAL_LATEST_WITH_DETAIL_PREF_SUMMARY
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putBoolean(EXPERIMENTAL_LATEST_WITH_DETAIL_PREF, newValue as Boolean).commit()
-                    // Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val rateLimitPeriodPref = EditTextPreference(screen.context).apply {
-            key = RATE_LIMIT_PERIOD_PREF_TITLE
-            title = RATE_LIMIT_PERIOD_PREF_TITLE
-            summary = RATE_LIMIT_PERIOD_PREF_SUMMARY
-            this.setDefaultValue(defaultRateLimitPeriod.toString())
-            dialogTitle = RATE_LIMIT_PERIOD_PREF_TITLE
-            dialogMessage = "Min 1 to Max 9, Invalid value will treat as $defaultRateLimitPeriod. Only Integer.\nDefault: $defaultRateLimitPeriod"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    // Make sure to validate the value.
-                    val p = (newValue as String).toLongOrNull(10)
-                    var value = p ?: defaultRateLimitPeriod
-                    if (p == null || value !in 1..9) {
-                        Toast.makeText(screen.context, RATE_LIMIT_PERIOD_PREF_WARNING_INVALID_VALUE, Toast.LENGTH_LONG).show()
-                        value = defaultRateLimitPeriod
-                    }
-                    val res = preferences.edit().putLong(RATE_LIMIT_PERIOD_PREF, value).commit()
-                    Toast.makeText(screen.context, RESTART_TACHIYOMI, Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(baseUrlPref)
-        if (name == "ManaToki") {
-            screen.addPreference(latestExperimentPref)
-            screen.addPreference(latestWithDetailPref)
-        }
-        screen.addPreference(rateLimitPeriodPref)
-    }
-
     protected fun getUrlPath(orig: String): String {
         return try {
             URI(orig).path
diff --git a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewTokiFactory.kt b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewTokiFactory.kt
index dd11b9522..2efde9c93 100644
--- a/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewTokiFactory.kt
+++ b/src/ko/newtoki/src/eu/kanade/tachiyomi/extension/ko/newtoki/NewTokiFactory.kt
@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.FilterList
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
@@ -34,7 +34,7 @@ class NewTokiWebtoon : NewToki("NewToki", "https://newtoki$domainNumber.com", "w
     override val id by lazy { generateSourceId("NewToki (Webtoon)", lang, versionId) }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/webtoon" + (if (page > 1) "/p$page" else ""))!!.newBuilder()
+        val url = ("$baseUrl/webtoon" + (if (page > 1) "/p$page" else "")).toHttpUrl().newBuilder()
         filters.forEach { filter ->
             when (filter) {
                 is SearchTargetTypeList -> {
diff --git a/src/ko/toonkor/src/eu/kanade/tachiyomi/extension/ko/toonkor/Toonkor.kt b/src/ko/toonkor/src/eu/kanade/tachiyomi/extension/ko/toonkor/Toonkor.kt
index bfc020252..e8936702e 100644
--- a/src/ko/toonkor/src/eu/kanade/tachiyomi/extension/ko/toonkor/Toonkor.kt
+++ b/src/ko/toonkor/src/eu/kanade/tachiyomi/extension/ko/toonkor/Toonkor.kt
@@ -2,10 +2,8 @@ package eu.kanade.tachiyomi.extension.ko.toonkor
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.util.Base64
-import eu.kanade.tachiyomi.extension.BuildConfig
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Filter
@@ -20,7 +18,6 @@ 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
 import java.nio.charset.Charset
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -216,29 +213,6 @@ class Toonkor : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(baseUrlPref)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val baseUrlPref = EditTextPreference(screen.context).apply {
-            key = BASE_URL_PREF_TITLE
-            title = BASE_URL_PREF_TITLE
-            summary = BASE_URL_PREF_SUMMARY
-            this.setDefaultValue(defaultBaseUrl)
-            dialogTitle = BASE_URL_PREF_TITLE
-            dialogMessage = "Default: $defaultBaseUrl"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(BASE_URL_PREF, newValue as String).commit()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(baseUrlPref)
-    }
-
     private fun getPrefBaseUrl(): String = preferences.getString(BASE_URL_PREF, defaultBaseUrl)!!
 
     companion object {
diff --git a/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt b/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt
index 00a1c7ccd..c29402248 100644
--- a/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt
+++ b/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt
@@ -98,7 +98,7 @@ class Bruttal : HttpSource() {
     override fun mangaDetailsParse(response: Response): SManga {
         val json = response.asJson().array
 
-        val titleUrl = response.request().header("Referer")!!.substringAfter("/bruttal")
+        val titleUrl = response.request.header("Referer")!!.substringAfter("/bruttal")
         val titleObj = json.first { it.obj["url"].string == titleUrl }.obj
         val soonText = titleObj["soon_text"].string
 
@@ -120,7 +120,7 @@ class Bruttal : HttpSource() {
     override fun chapterListParse(response: Response): List<SChapter> {
         val json = response.asJson().array
 
-        val titleUrl = response.request().header("Referer")!!.substringAfter("/bruttal")
+        val titleUrl = response.request.header("Referer")!!.substringAfter("/bruttal")
         val title = json.first { it.obj["url"].string == titleUrl }.obj
 
         return title["seasons"].array
@@ -147,7 +147,7 @@ class Bruttal : HttpSource() {
     override fun pageListParse(response: Response): List<Page> {
         val json = response.asJson().array
 
-        val chapterUrl = response.request().header("Referer")!!
+        val chapterUrl = response.request.header("Referer")!!
         val titleSlug = chapterUrl.substringAfter("bruttal/").substringBefore("/")
         val season = chapterUrl.substringAfter("temporada-").substringBefore("/").toInt()
         val chapter = chapterUrl.substringAfter("capitulo-")
@@ -184,7 +184,7 @@ class Bruttal : HttpSource() {
 
     override fun latestUpdatesParse(response: Response): MangasPage = throw UnsupportedOperationException("Not used")
 
-    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body()!!.string())
+    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body!!.string())
 
     companion object {
         private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
diff --git a/src/pt/centraldemangas/src/eu/kanade/tachiyomi/extension/pt/centraldemangas/CentralDeMangas.kt b/src/pt/centraldemangas/src/eu/kanade/tachiyomi/extension/pt/centraldemangas/CentralDeMangas.kt
index 2221b90a9..38fb0c63a 100644
--- a/src/pt/centraldemangas/src/eu/kanade/tachiyomi/extension/pt/centraldemangas/CentralDeMangas.kt
+++ b/src/pt/centraldemangas/src/eu/kanade/tachiyomi/extension/pt/centraldemangas/CentralDeMangas.kt
@@ -192,7 +192,7 @@ class CentralDeMangas : ParsedHttpSource() {
 
     private fun getCoverUrl(slug: String): String = "$COVER_CDN/150x200/$slug.jpg"
 
-    private fun Response.asJsonArray(): JsonArray = JSON_PARSER.parse(body()!!.string()).array
+    private fun Response.asJsonArray(): JsonArray = JSON_PARSER.parse(body!!.string()).array
 
     companion object {
         private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
diff --git a/src/pt/goldenmangas/src/eu/kanade/tachiyomi/extension/pt/goldenmangas/GoldenMangas.kt b/src/pt/goldenmangas/src/eu/kanade/tachiyomi/extension/pt/goldenmangas/GoldenMangas.kt
index 1b637e391..113311167 100644
--- a/src/pt/goldenmangas/src/eu/kanade/tachiyomi/extension/pt/goldenmangas/GoldenMangas.kt
+++ b/src/pt/goldenmangas/src/eu/kanade/tachiyomi/extension/pt/goldenmangas/GoldenMangas.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -81,7 +81,7 @@ class GoldenMangas : ParsedHttpSource() {
             .set("Referer", "$baseUrl/mangas")
             .build()
 
-        val url = HttpUrl.parse("$baseUrl/mangas")!!.newBuilder()
+        val url = "$baseUrl/mangas".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("busca", query)
             .toString()
 
diff --git a/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt b/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt
index 442b3502d..9584c80e4 100644
--- a/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt
+++ b/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt
@@ -21,11 +21,11 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import rx.Observable
 import java.text.ParseException
@@ -96,7 +96,7 @@ class Hipercool : HttpSource() {
     override fun latestUpdatesParse(response: Response): MangasPage = genericMangaListParse(response)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val mediaType = MediaType.parse("application/json; charset=utf-8")
+        val mediaType = "application/json; charset=utf-8".toMediaTypeOrNull()
 
         // Create json body.
         val json = jsonObject(
@@ -106,7 +106,7 @@ class Hipercool : HttpSource() {
             "type" to "text"
         )
 
-        val body = RequestBody.create(mediaType, json.toString())
+        val body = json.toString().toRequestBody(mediaType)
 
         return POST("$baseUrl/api/books/chapters/search", headers, body)
     }
@@ -176,7 +176,7 @@ class Hipercool : HttpSource() {
         // The property is written wrong.
         date_upload = DATE_FORMATTER.tryParseTime(obj["publishied_at"].string)
 
-        val fullUrl = HttpUrl.parse("$baseUrl/books")!!.newBuilder()
+        val fullUrl = "$baseUrl/books".toHttpUrlOrNull()!!.newBuilder()
             .addPathSegment(book["slug"].string)
             .addPathSegment(obj["slug"].string)
             .addQueryParameter("images", obj["images"].int.toString())
@@ -187,10 +187,10 @@ class Hipercool : HttpSource() {
     }
 
     override fun fetchPageList(chapter: SChapter): Observable<List<Page>> {
-        val chapterUrl = HttpUrl.parse(baseUrl + chapter.url)!!
+        val chapterUrl = (baseUrl + chapter.url).toHttpUrlOrNull()!!
 
-        val bookSlug = chapterUrl.pathSegments()[1]
-        val chapterSlug = chapterUrl.pathSegments()[2]
+        val bookSlug = chapterUrl.pathSegments[1]
+        val chapterSlug = chapterUrl.pathSegments[2]
         val images = chapterUrl.queryParameter("images")!!.toInt()
         val revision = chapterUrl.queryParameter("revision")!!.toInt()
 
@@ -198,7 +198,7 @@ class Hipercool : HttpSource() {
 
         // Create the pages.
         for (i in 1..images) {
-            val imageUrl = HttpUrl.parse("$STATIC_URL/books")!!.newBuilder()
+            val imageUrl = "$STATIC_URL/books".toHttpUrlOrNull()!!.newBuilder()
                 .addPathSegment(bookSlug)
                 .addPathSegment(chapterSlug)
                 .addPathSegment("$bookSlug-chapter-$chapterSlug-page-$i.jpg")
@@ -236,15 +236,15 @@ class Hipercool : HttpSource() {
     }
 
     private fun String.toThumbnailUrl(revision: Int): String =
-        HttpUrl.parse("$STATIC_URL/books")!!.newBuilder()
+        "$STATIC_URL/books".toHttpUrlOrNull()!!.newBuilder()
             .addPathSegment(this)
             .addPathSegment("$this-cover.jpg")
             .addQueryParameter("revision", revision.toString())
             .toString()
 
-    private fun Response.asJsonObject(): JsonObject = JSON_PARSER.parse(body()!!.string()).obj
+    private fun Response.asJsonObject(): JsonObject = JSON_PARSER.parse(body!!.string()).obj
 
-    private fun Response.asJsonArray(): JsonArray = JSON_PARSER.parse(body()!!.string()).array
+    private fun Response.asJsonArray(): JsonArray = JSON_PARSER.parse(body!!.string()).array
 
     companion object {
         private const val STATIC_URL = "https://static.hiper.cool"
diff --git a/src/pt/hqdragon/src/eu/kanade/tachiyomi/extension/pt/hqdragon/HQDragon.kt b/src/pt/hqdragon/src/eu/kanade/tachiyomi/extension/pt/hqdragon/HQDragon.kt
index 084cbf6e6..5bf24977b 100644
--- a/src/pt/hqdragon/src/eu/kanade/tachiyomi/extension/pt/hqdragon/HQDragon.kt
+++ b/src/pt/hqdragon/src/eu/kanade/tachiyomi/extension/pt/hqdragon/HQDragon.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -113,7 +113,7 @@ class HQDragon : ParsedHttpSource() {
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/pesquisa")!!.newBuilder()
+        val url = "$baseUrl/pesquisa".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("titulo", query)
 
         return GET(url.toString(), headers)
diff --git a/src/pt/hqnow/src/eu/kanade/tachiyomi/extension/pt/hqnow/HQNow.kt b/src/pt/hqnow/src/eu/kanade/tachiyomi/extension/pt/hqnow/HQNow.kt
index 8745e5d4a..110db5da9 100644
--- a/src/pt/hqnow/src/eu/kanade/tachiyomi/extension/pt/hqnow/HQNow.kt
+++ b/src/pt/hqnow/src/eu/kanade/tachiyomi/extension/pt/hqnow/HQNow.kt
@@ -39,7 +39,7 @@ class HQNow : HttpSource() {
     private val jsonHeaders = headersBuilder().add("content-type", "application/json").build()
 
     private fun mangaFromResponse(response: Response, selector: String, coversAvailable: Boolean = true): List<SManga> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["data"][selector].asJsonArray
+        return gson.fromJson<JsonObject>(response.body!!.string())["data"][selector].asJsonArray
             .map {
                 SManga.create().apply {
                     url = it["id"].asString
@@ -103,7 +103,7 @@ class HQNow : HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["data"]["getHqsById"][0]
+        return gson.fromJson<JsonObject>(response.body!!.string())["data"]["getHqsById"][0]
             .let {
                 SManga.create().apply {
                     title = it["name"].asString
@@ -126,7 +126,7 @@ class HQNow : HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["data"]["getHqsById"][0]["capitulos"].asJsonArray
+        return gson.fromJson<JsonObject>(response.body!!.string())["data"]["getHqsById"][0]["capitulos"].asJsonArray
             .map {
                 SChapter.create().apply {
                     url = it["id"].asString
@@ -144,7 +144,7 @@ class HQNow : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["data"]["getChapterById"]["pictures"].asJsonArray
+        return gson.fromJson<JsonObject>(response.body!!.string())["data"]["getChapterById"]["pictures"].asJsonArray
             .mapIndexed { i, json -> Page(i, "", json["pictureUrl"].asString) }
     }
 
diff --git a/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt b/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt
index da2c7fc64..eee79f0e8 100644
--- a/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt
+++ b/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Call
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -111,7 +111,7 @@ class MangaHost : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/find")!!.newBuilder()
+        val url = "$baseUrl/find".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("this", query)
 
         return GET(url.toString(), headers)
@@ -230,7 +230,7 @@ class MangaHost : ParsedHttpSource() {
     private fun blockMessageIntercept(chain: Interceptor.Chain): Response {
         val response = chain.proceed(chain.request())
 
-        if (response.code() == 403 || response.code() == 1020) {
+        if (response.code == 403 || response.code == 1020) {
             response.close()
             throw Exception(BLOCK_MESSAGE)
         }
@@ -240,9 +240,9 @@ class MangaHost : ParsedHttpSource() {
 
     private fun Call.asObservableIgnoreCode(code: Int): Observable<Response> {
         return asObservable().doOnNext { response ->
-            if (!response.isSuccessful && response.code() != code) {
+            if (!response.isSuccessful && response.code != code) {
                 response.close()
-                throw Exception("HTTP error ${response.code()}")
+                throw Exception("HTTP error ${response.code}")
             }
         }
     }
diff --git a/src/pt/mangatube/src/eu/kanade/tachiyomi/extension/pt/mangatube/MangaTube.kt b/src/pt/mangatube/src/eu/kanade/tachiyomi/extension/pt/mangatube/MangaTube.kt
index 75bd74b20..1bb1e7efc 100644
--- a/src/pt/mangatube/src/eu/kanade/tachiyomi/extension/pt/mangatube/MangaTube.kt
+++ b/src/pt/mangatube/src/eu/kanade/tachiyomi/extension/pt/mangatube/MangaTube.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -108,7 +108,7 @@ class MangaTube : HttpSource() {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/wp-json/site/search/")!!.newBuilder()
+        val url = "$baseUrl/wp-json/site/search/".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("keyword", query)
             .addQueryParameter("type", "undefined")
             .toString()
@@ -152,7 +152,7 @@ class MangaTube : HttpSource() {
             .set("Referer", baseUrl + mangaUrl)
             .build()
 
-        val url = HttpUrl.parse("$baseUrl/jsons/series/chapters_list.json")!!.newBuilder()
+        val url = "$baseUrl/jsons/series/chapters_list.json".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("page", page.toString())
             .addQueryParameter("id_s", mangaId)
             .toString()
@@ -161,7 +161,7 @@ class MangaTube : HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val mangaUrl = response.request().header("Referer")!!.substringAfter(baseUrl)
+        val mangaUrl = response.request.header("Referer")!!.substringAfter(baseUrl)
 
         var result = response.asJson().obj
 
@@ -201,7 +201,7 @@ class MangaTube : HttpSource() {
             .set("Referer", chapterUrl)
             .build()
 
-        val url = HttpUrl.parse("$baseUrl/jsons/series/images_list.json")!!.newBuilder()
+        val url = "$baseUrl/jsons/series/images_list.json".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("id_serie", serieId)
             .addQueryParameter("secury", token)
             .toString()
@@ -214,7 +214,7 @@ class MangaTube : HttpSource() {
         val apiParams = document.select("script:containsData(id_serie)").firstOrNull()
             ?.data() ?: throw Exception(TOKEN_NOT_FOUND)
 
-        val chapterUrl = response.request().url().toString()
+        val chapterUrl = response.request.url.toString()
         val serieId = apiParams.substringAfter("\"")
             .substringBefore("\"")
         val token = TOKEN_REGEX.find(apiParams)!!.groupValues[1]
@@ -241,7 +241,7 @@ class MangaTube : HttpSource() {
     }
 
     private fun searchIntercept(chain: Interceptor.Chain): Response {
-        if (chain.request().url().toString().contains("/search/")) {
+        if (chain.request().url.toString().contains("/search/")) {
             val homeRequest = popularMangaRequest(1)
             val document = chain.proceed(homeRequest).asJsoup()
 
@@ -250,7 +250,7 @@ class MangaTube : HttpSource() {
                 .substringBeforeLast(";")
                 .let { JSON_PARSER.parse(it) }
 
-            val newUrl = chain.request().url().newBuilder()
+            val newUrl = chain.request().url.newBuilder()
                 .addQueryParameter("nonce", apiParams["nonce"].string)
                 .build()
 
@@ -272,7 +272,7 @@ class MangaTube : HttpSource() {
         }
     }
 
-    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body()!!.string())
+    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body!!.string())
 
     companion object {
         private const val ACCEPT = "application/json, text/plain, */*"
diff --git a/src/pt/mundohentai/src/eu/kanade/tachiyomi/extension/pt/mundohentai/MundoHentai.kt b/src/pt/mundohentai/src/eu/kanade/tachiyomi/extension/pt/mundohentai/MundoHentai.kt
index b484d9866..f8b5f353c 100644
--- a/src/pt/mundohentai/src/eu/kanade/tachiyomi/extension/pt/mundohentai/MundoHentai.kt
+++ b/src/pt/mundohentai/src/eu/kanade/tachiyomi/extension/pt/mundohentai/MundoHentai.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -63,7 +63,7 @@ class MundoHentai : ParsedHttpSource() {
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         if (query.isNotEmpty()) {
-            val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+            val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
                 .addQueryParameter("q", query)
                 .toString()
 
diff --git a/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt b/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt
index ab06f481a..ca1605444 100644
--- a/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt
+++ b/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt
@@ -13,13 +13,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import java.lang.UnsupportedOperationException
 import java.util.concurrent.TimeUnit
 
 class MundoMangaKun : ParsedHttpSource() {
@@ -70,7 +69,7 @@ class MundoMangaKun : ParsedHttpSource() {
             .build()
 
         val pagePath = if (page != 1) "page/$page/" else ""
-        val url = HttpUrl.parse("$baseUrl/leitor-online/$pagePath")!!.newBuilder()
+        val url = "$baseUrl/leitor-online/$pagePath".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("leitor_titulo_projeto", query)
 
         filters.forEach { filter ->
diff --git a/src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScan.kt b/src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScan.kt
index 100a89fc3..069d716fa 100644
--- a/src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScan.kt
+++ b/src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScan.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -66,7 +66,7 @@ class SaikaiScan : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector(): String? = null
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/busca")!!.newBuilder()
+        val url = "$baseUrl/busca".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("q", query)
 
         return GET(url.toString(), headers)
diff --git a/src/pt/socialcomics/src/eu/kanade/tachiyomi/extension/pt/socialcomics/SocialComics.kt b/src/pt/socialcomics/src/eu/kanade/tachiyomi/extension/pt/socialcomics/SocialComics.kt
index 1b7d39dc9..a4c6c7efe 100644
--- a/src/pt/socialcomics/src/eu/kanade/tachiyomi/extension/pt/socialcomics/SocialComics.kt
+++ b/src/pt/socialcomics/src/eu/kanade/tachiyomi/extension/pt/socialcomics/SocialComics.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.pt.socialcomics
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import android.widget.Toast
 import com.github.salomonbrys.kotson.array
@@ -26,18 +24,18 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.IOException
-import java.lang.UnsupportedOperationException
 import java.util.concurrent.TimeUnit
 import androidx.preference.EditTextPreference as AndroidXEditTextPreference
 import androidx.preference.PreferenceScreen as AndroidXPreferenceScreen
@@ -118,7 +116,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
             .add("Referer", "$baseUrl/pesquisa")
             .build()
 
-        val endpointUrl = HttpUrl.parse("$SERVICE_URL/api/mobile/search/")!!.newBuilder()
+        val endpointUrl = "$SERVICE_URL/api/mobile/search/".toHttpUrlOrNull()!!.newBuilder()
             .addEncodedPathSegment(query)
             .toString()
 
@@ -225,46 +223,6 @@ class SocialComics : HttpSource(), ConfigurableSource {
         return GET(page.imageUrl!!, newHeaders)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val emailPref = EditTextPreference(screen.context).apply {
-            key = EMAIL_PREF_KEY
-            title = EMAIL_PREF_TITLE
-            setDefaultValue("")
-            summary = EMAIL_PREF_SUMMARY
-            dialogTitle = EMAIL_PREF_TITLE
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val res = preferences.edit()
-                    .putString(EMAIL_PREF_KEY, newValue as String)
-                    .putString(API_TOKEN_PREF_KEY, "")
-                    .commit()
-
-                Toast.makeText(screen.context, TOAST_RESTART_TO_APPLY, Toast.LENGTH_LONG).show()
-                res
-            }
-        }
-        val passwordPref = EditTextPreference(screen.context).apply {
-            key = PASSWORD_PREF_KEY
-            title = PASSWORD_PREF_TITLE
-            setDefaultValue("")
-            summary = PASSWORD_PREF_SUMMARY
-            dialogTitle = PASSWORD_PREF_TITLE
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val res = preferences.edit()
-                    .putString(PASSWORD_PREF_KEY, newValue as String)
-                    .putString(API_TOKEN_PREF_KEY, "")
-                    .commit()
-
-                Toast.makeText(screen.context, TOAST_RESTART_TO_APPLY, Toast.LENGTH_LONG).show()
-                res
-            }
-        }
-
-        screen.addPreference(emailPref)
-        screen.addPreference(passwordPref)
-    }
-
     override fun setupPreferenceScreen(screen: AndroidXPreferenceScreen) {
         val emailPref = AndroidXEditTextPreference(screen.context).apply {
             key = EMAIL_PREF_KEY
@@ -318,7 +276,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
     private fun authIntercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
 
-        if (request.url().toString().contains(THUMBNAIL_CDN)) {
+        if (request.url.toString().contains(THUMBNAIL_CDN)) {
             return chain.proceed(request)
         }
 
@@ -365,7 +323,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
         val loginRequest = POST("$SERVICE_URL/api/mobile/login", loginHeaders, loginBody)
         val response = chain.proceed(loginRequest)
 
-        if (response.code() != 200) {
+        if (response.code != 200) {
             throw IOException(ERROR_CANNOT_LOGIN)
         }
 
@@ -385,7 +343,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
             "hash_master" to userHash
         )
 
-        val logoutBody = RequestBody.create(JSON_MEDIA_TYPE, logoutPayload.toString())
+        val logoutBody = logoutPayload.toString().toRequestBody(JSON_MEDIA_TYPE)
 
         val logoutHeaders = sourceHeadersBuilder()
             .add("Content-Type", logoutBody.contentType().toString())
@@ -395,7 +353,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
         val logoutRequest = POST("$SERVICE_URL/api/mobile/logout", logoutHeaders, logoutBody)
         val response = chain.proceed(logoutRequest)
 
-        if (response.code() != 200) {
+        if (response.code != 200) {
             throw IOException(ERROR_CANNOT_RENEW_TOKEN)
         }
 
@@ -405,7 +363,7 @@ class SocialComics : HttpSource(), ConfigurableSource {
         response.close()
     }
 
-    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body()!!.string())
+    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body!!.string())
 
     companion object {
         private const val SERVICE_URL = "https://service.socialcomics.com.br"
@@ -435,6 +393,6 @@ class SocialComics : HttpSource(), ConfigurableSource {
 
         private const val TOAST_RESTART_TO_APPLY = "Reinicie o Tachiyomi para aplicar as novas configurações."
 
-        private val JSON_MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+        private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
     }
 }
diff --git a/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt b/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt
index ad7588f84..ee5c65f69 100644
--- a/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt
+++ b/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt
@@ -9,13 +9,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import java.lang.UnsupportedOperationException
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -60,7 +59,7 @@ class TaoSect : ParsedHttpSource() {
     override fun popularMangaNextPageSelector(): String? = null
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/pesquisar-leitor")!!.newBuilder()
+        val url = "$baseUrl/pesquisar-leitor".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("leitor_titulo_projeto", query)
 
         filters.forEach { filter ->
diff --git a/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt b/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt
index d92c936f5..ddcb43cce 100644
--- a/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt
+++ b/src/pt/tsukimangas/src/eu/kanade/tachiyomi/extension/pt/tsukimangas/TsukiMangas.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -94,7 +94,7 @@ class TsukiMangas : HttpSource() {
             .set("Referer", "$baseUrl/lista-completa")
             .build()
 
-        val url = HttpUrl.parse("$baseUrl/api/v2/mangas?page=$page")!!.newBuilder()
+        val url = "$baseUrl/api/v2/mangas?page=$page".toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("title", query)
 
         filters.forEach { filter ->
@@ -193,7 +193,7 @@ class TsukiMangas : HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val mangaUrl = response.request().header("Referer")!!.substringAfter(baseUrl)
+        val mangaUrl = response.request.header("Referer")!!.substringAfter(baseUrl)
 
         return response.asJson().array
             .flatMap { chapterListItemParse(it.obj, mangaUrl) }
@@ -347,7 +347,7 @@ class TsukiMangas : HttpSource() {
         else -> SManga.UNKNOWN
     }
 
-    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body()!!.string())
+    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body!!.string())
 
     companion object {
         private const val ACCEPT = "application/json, text/plain, */*"
diff --git a/src/pt/unionmangas/src/eu/kanade/tachiyomi/extension/pt/unionmangas/UnionMangas.kt b/src/pt/unionmangas/src/eu/kanade/tachiyomi/extension/pt/unionmangas/UnionMangas.kt
index 881fe0131..a054b20e8 100644
--- a/src/pt/unionmangas/src/eu/kanade/tachiyomi/extension/pt/unionmangas/UnionMangas.kt
+++ b/src/pt/unionmangas/src/eu/kanade/tachiyomi/extension/pt/unionmangas/UnionMangas.kt
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.FormBody
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -133,14 +133,14 @@ class UnionMangas : ParsedHttpSource() {
             .add("X-Requested-With", "XMLHttpRequest")
             .build()
 
-        val url = HttpUrl.parse("$baseUrl/assets/busca.php")!!.newBuilder()
+        val url = "$baseUrl/assets/busca.php".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("titulo", query)
 
         return GET(url.toString(), newHeaders)
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val requestUrl = response.request().url().toString()
+        val requestUrl = response.request.url.toString()
 
         if (requestUrl.contains("pagina-manga")) {
             val slug = requestUrl.substringAfter("pagina-manga/")
@@ -255,7 +255,7 @@ class UnionMangas : ParsedHttpSource() {
 
     private fun Element.textWithoutLabel(): String = text()!!.substringAfter(":").trim()
 
-    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body()!!.string())
+    private fun Response.asJson(): JsonElement = JSON_PARSER.parse(body!!.string())
 
     companion object {
         private const val ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9," +
diff --git a/src/pt/yesmangas/src/eu/kanade/tachiyomi/extension/pt/yesmangas/YesMangas.kt b/src/pt/yesmangas/src/eu/kanade/tachiyomi/extension/pt/yesmangas/YesMangas.kt
index cb2560fbd..101d351db 100644
--- a/src/pt/yesmangas/src/eu/kanade/tachiyomi/extension/pt/yesmangas/YesMangas.kt
+++ b/src/pt/yesmangas/src/eu/kanade/tachiyomi/extension/pt/yesmangas/YesMangas.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -63,7 +63,7 @@ class YesMangas : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector(): String? = null
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search")!!.newBuilder()
+        val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("q", query)
 
         return GET(url.toString(), headers)
diff --git a/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt b/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt
index 0bf950a76..0ca329eca 100644
--- a/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt
+++ b/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt
@@ -138,7 +138,7 @@ class AComics : ParsedHttpSource() {
             val chapter = SChapter.create()
             chapter.chapter_number = index.toFloat()
             chapter.name = index.toString()
-            val url = response.request().url().toString().split("/about")[0].split(baseUrl)[1]
+            val url = response.request.url.toString().split("/about")[0].split(baseUrl)[1]
             chapter.url = "$url/$index"
             res.add(chapter)
         }
diff --git a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
index 7bc154e6f..60d521e6a 100644
--- a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
+++ b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -66,7 +66,7 @@ class AllHentai : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+        val url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is GenreList -> filter.state.forEach { genre ->
@@ -200,7 +200,7 @@ class AllHentai : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("rm_h.init( [")
         val endIndex = html.indexOf(");", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex)
diff --git a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
index 1995358f9..442d58591 100644
--- a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
+++ b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
@@ -156,7 +156,7 @@ class ComX : ParsedHttpSource() {
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val document = response.asJsoup()
-        val id = response.request().url().toString().removePrefix("$baseUrl/").split('-')[0]
+        val id = response.request.url.toString().removePrefix("$baseUrl/").split('-')[0]
 
         val list = mutableListOf<SChapter>()
         list += chapterResponseParse(document)
@@ -190,7 +190,7 @@ class ComX : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val baseImgUrl = "https://img.com-x.life/comix/"
 
         val beginTag = "\"images\":["
diff --git a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
index 4c56fddf4..0ae0cc835 100644
--- a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
+++ b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt
@@ -101,7 +101,7 @@ class Desu : HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val obj = JSONObject(res).getJSONArray("response")
         val nav = JSONObject(res).getJSONObject("pageNavParams")
         val count = nav.getInt("count")
@@ -131,12 +131,12 @@ class Desu : HttpSource() {
         return GET(baseUrl.substringBefore("/api") + manga.url, headers)
     }
     override fun mangaDetailsParse(response: Response) = SManga.create().apply {
-        val obj = JSONObject(response.body()!!.string()).getJSONObject("response")
+        val obj = JSONObject(response.body!!.string()).getJSONObject("response")
         mangaFromJSON(obj, true)
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val obj = JSONObject(response.body()!!.string()).getJSONObject("response")
+        val obj = JSONObject(response.body!!.string()).getJSONObject("response")
         val ret = ArrayList<SChapter>()
 
         val cid = obj.getInt("id")
@@ -164,7 +164,7 @@ class Desu : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val obj = JSONObject(response.body()!!.string()).getJSONObject("response")
+        val obj = JSONObject(response.body!!.string()).getJSONObject("response")
         val pages = obj.getJSONObject("pages")
         val list = pages.getJSONArray("list")
         val ret = ArrayList<Page>(list.length())
diff --git a/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt b/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt
index 5a3b8ee33..70ebc93cf 100644
--- a/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt
+++ b/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt
@@ -148,7 +148,7 @@ class Henchan : ParsedHttpSource() {
                 if (!response.isSuccessful) {
                     response.close()
                     // Error message for exceeding last page
-                    if (response.code() == 404)
+                    if (response.code == 404)
                         Observable.just(
                             listOf(
                                 SChapter.create().apply {
@@ -158,7 +158,7 @@ class Henchan : ParsedHttpSource() {
                                 }
                             )
                         )
-                    else throw Exception("HTTP error ${response.code()}")
+                    else throw Exception("HTTP error ${response.code}")
                 }
             }
             .map { response ->
@@ -178,7 +178,7 @@ class Henchan : ParsedHttpSource() {
     override fun chapterListSelector() = ".related"
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val responseUrl = response.request().url().toString()
+        val responseUrl = response.request.url.toString()
         val document = response.asJsoup()
 
         // exhentai chapter
@@ -219,7 +219,7 @@ class Henchan : ParsedHttpSource() {
         var url = document.select("div#pagination_related a:contains(Вперед)").attr("href")
         while (url.isNotBlank()) {
             val get = GET(
-                "${response.request().url()}/$url",
+                "${response.request.url}/$url",
                 headers = headers
             )
             val nextPage = client.newCall(get).execute().asJsoup()
diff --git a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt
index c521182ef..4056cf403 100644
--- a/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt
+++ b/src/ru/libmanga/src/eu/kanade/tachiyomi/extension/ru/libmanga/LibManga.kt
@@ -29,7 +29,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -39,8 +39,6 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.text.SimpleDateFormat
 import java.util.Locale
-import android.support.v7.preference.ListPreference as LegacyListPreference
-import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen
 
 class LibManga : ConfigurableSource, HttpSource() {
 
@@ -110,7 +108,7 @@ class LibManga : ConfigurableSource, HttpSource() {
                 .asObservableSuccess()
                 .flatMap { response ->
                     // Obtain token
-                    val resBody = response.body()!!.string()
+                    val resBody = response.body!!.string()
                     csrfToken = "_token\" content=\"(.*)\"".toRegex().find(resBody)!!.groups[1]!!.value
                     return@flatMap fetchPopularMangaFromApi(page)
                 }
@@ -127,7 +125,7 @@ class LibManga : ConfigurableSource, HttpSource() {
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val resBody = response.body()!!.string()
+        val resBody = response.body!!.string()
         val result = jsonParser.parse(resBody).obj
         val items = result["items"]
         val popularMangas = items["data"].nullArray?.map { popularMangaFromElement(it) }
@@ -417,10 +415,10 @@ class LibManga : ConfigurableSource, HttpSource() {
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         if (csrfToken.isEmpty()) {
             val tokenResponse = client.newCall(popularMangaRequest(page)).execute()
-            val resBody = tokenResponse.body()!!.string()
+            val resBody = tokenResponse.body!!.string()
             csrfToken = "_token\" content=\"(.*)\"".toRegex().find(resBody)!!.groups[1]!!.value
         }
-        val url = HttpUrl.parse("$baseUrl/filterlist?page=$page")!!.newBuilder()
+        val url = "$baseUrl/filterlist?page=$page".toHttpUrlOrNull()!!.newBuilder()
         if (query.isNotEmpty()) {
             url.addQueryParameter("name", query)
         }
@@ -472,7 +470,7 @@ class LibManga : ConfigurableSource, HttpSource() {
 
     // Hack search method to add some results from search popup
     override fun searchMangaParse(response: Response): MangasPage {
-        val searchRequest = response.request().url().queryParameter("name")
+        val searchRequest = response.request.url.queryParameter("name")
         val mangas = mutableListOf<SManga>()
 
         if (!searchRequest.isNullOrEmpty()) {
@@ -486,7 +484,7 @@ class LibManga : ConfigurableSource, HttpSource() {
             val popup = client.newCall(
                 GET("$baseUrl/search?query=$searchRequest", popupSearchHeaders)
             )
-                .execute().body()!!.string()
+                .execute().body!!.string()
 
             val jsonList = jsonParser.parse(popup).array
             jsonList.forEach {
@@ -779,38 +777,4 @@ class LibManga : ConfigurableSource, HttpSource() {
         screen.addPreference(sortingPref)
         screen.addPreference(serverPref)
     }
-
-    override fun setupPreferenceScreen(screen: LegacyPreferenceScreen) {
-        val serverPref = LegacyListPreference(screen.context).apply {
-            key = SERVER_PREF
-            title = SERVER_PREF_Title
-            entries = arrayOf("Основной", "Второй (тестовый)", "Третий (эконом трафика)", "Авто")
-            entryValues = arrayOf("secondary", "fourth", "compress", "auto")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                server = newValue.toString()
-                true
-            }
-        }
-
-        val sortingPref = LegacyListPreference(screen.context).apply {
-            key = SORTING_PREF
-            title = SORTING_PREF_Title
-            entries = arrayOf(
-                "Полный список (без повторных переводов)", "Все переводы (друг за другом)",
-                "Наибольшее число глав", "Активный перевод"
-            )
-            entryValues = arrayOf("ms_mixing", "ms_combining", "ms_largest", "ms_active")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                preferences.edit().putString(SORTING_PREF, selected).commit()
-            }
-        }
-
-        screen.addPreference(sortingPref)
-        screen.addPreference(serverPref)
-    }
 }
diff --git a/src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/Mangachan.kt b/src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/Mangachan.kt
index 0e349bf7f..3ae8e9482 100644
--- a/src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/Mangachan.kt
+++ b/src/ru/mangachan/src/eu/kanade/tachiyomi/extension/ru/mangachan/Mangachan.kt
@@ -213,7 +213,7 @@ class Mangachan : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("fullimg\":[") + 10
         val endIndex = html.indexOf(",]", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex).replace("\"", "")
diff --git a/src/ru/mangaonlinebiz/src/eu/kanade/tachiyomi/extension/ru/mangaonlinebiz/MangaOnlineBiz.kt b/src/ru/mangaonlinebiz/src/eu/kanade/tachiyomi/extension/ru/mangaonlinebiz/MangaOnlineBiz.kt
index cfee7d248..a78755e95 100644
--- a/src/ru/mangaonlinebiz/src/eu/kanade/tachiyomi/extension/ru/mangaonlinebiz/MangaOnlineBiz.kt
+++ b/src/ru/mangaonlinebiz/src/eu/kanade/tachiyomi/extension/ru/mangaonlinebiz/MangaOnlineBiz.kt
@@ -64,10 +64,10 @@ class MangaOnlineBiz : ParsedHttpSource() {
     override fun latestUpdatesSelector() = popularMangaSelector()
 
     override fun searchMangaParse(response: Response): MangasPage {
-        if (!response.request().url().toString().contains("search-ajax")) {
+        if (!response.request.url.toString().contains("search-ajax")) {
             return popularMangaParse(response)
         }
-        val jsonData = response.body()!!.string()
+        val jsonData = response.body!!.string()
         val json = JsonParser().parse(jsonData).asJsonObject
         val results = json.getAsJsonArray("results")
         val mangas = mutableListOf<SManga>()
@@ -126,7 +126,7 @@ class MangaOnlineBiz : ParsedHttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
 
         val jsonData = html.split("App.Collection.MangaChapter(").last().split("]);").first() + "]"
         val mangaName = html.split("mangaName: '").last().split("' });").first()
@@ -150,7 +150,7 @@ class MangaOnlineBiz : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val jsonData = html.split("new App.Router.Chapter(").last().split("});").first() + "}"
         val json = JsonParser().parse(jsonData).asJsonObject
         val cdnUrl = json.get("srcBaseUrl").string
diff --git a/src/ru/mangapoisk/src/eu/kanade/tachiyomi/extension/ru/mangapoisk/MangaPoisk.kt b/src/ru/mangapoisk/src/eu/kanade/tachiyomi/extension/ru/mangapoisk/MangaPoisk.kt
index af878f49f..07a61b774 100644
--- a/src/ru/mangapoisk/src/eu/kanade/tachiyomi/extension/ru/mangapoisk/MangaPoisk.kt
+++ b/src/ru/mangapoisk/src/eu/kanade/tachiyomi/extension/ru/mangapoisk/MangaPoisk.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -46,7 +46,7 @@ class MangaPoisk : ParsedHttpSource() {
         val url = if (query.isNotBlank()) {
             "$baseUrl/search?q=$query"
         } else {
-            val url = HttpUrl.parse("$baseUrl/manga")!!.newBuilder()
+            val url = "$baseUrl/manga".toHttpUrlOrNull()!!.newBuilder()
             (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
                 when (filter) {
                     is OrderBy -> {
diff --git a/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt b/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt
index 4c0e3d5be..04a33bf51 100644
--- a/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt
+++ b/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -68,7 +68,7 @@ class Mintmanga : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        var url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+        var url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is GenreList -> filter.state.forEach { genre ->
@@ -98,10 +98,10 @@ class Mintmanga : ParsedHttpSource() {
                 }
                 is OrderBy -> {
                     if (filter.state == 0) {
-                        url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+                        url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
                     } else {
                         val ord = arrayOf("not", "year", "name", "rate", "popularity", "votes", "created", "updated")[filter.state]
-                        url = HttpUrl.parse("$baseUrl/list?sortType=$ord")!!.newBuilder()
+                        url = "$baseUrl/list?sortType=$ord".toHttpUrlOrNull()!!.newBuilder()
                         return GET(url.toString(), headers)
                     }
                 }
@@ -231,7 +231,7 @@ class Mintmanga : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("rm_h.init( [")
         val endIndex = html.indexOf(");", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex)
diff --git a/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt b/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt
index b6e02340f..6590b632a 100644
--- a/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt
+++ b/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt
@@ -154,7 +154,7 @@ class Nudemoon : ParsedHttpSource() {
     override fun chapterListSelector() = popularMangaSelector()
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val responseUrl = response.request().url().toString()
+        val responseUrl = response.request.url.toString()
         val document = response.asJsoup()
 
         if (!responseUrl.contains("/vse_glavy/")) {
diff --git a/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt b/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt
index b4543eb55..78e99d8e6 100644
--- a/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt
+++ b/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -68,7 +68,7 @@ class Readmanga : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        var url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+        var url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is GenreList -> filter.state.forEach { genre ->
@@ -98,10 +98,10 @@ class Readmanga : ParsedHttpSource() {
                 }
                 is OrderBy -> {
                     if (filter.state == 0) {
-                        url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+                        url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
                     } else {
                         val ord = arrayOf("not", "name", "rate", "popularity", "votes", "created", "updated")[filter.state]
-                        url = HttpUrl.parse("$baseUrl/list?sortType=$ord")!!.newBuilder()
+                        url = "$baseUrl/list?sortType=$ord".toHttpUrlOrNull()!!.newBuilder()
                         return GET(url.toString(), headers)
                     }
                 }
@@ -231,7 +231,7 @@ class Readmanga : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("rm_h.init( [")
         val endIndex = html.indexOf(");", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex)
diff --git a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
index 569c1d9ff..3c98a126d 100644
--- a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
+++ b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
@@ -15,8 +15,6 @@ import android.annotation.TargetApi
 import android.app.Application
 import android.content.SharedPreferences
 import android.os.Build
-import android.support.v7.preference.EditTextPreference
-import android.support.v7.preference.PreferenceScreen
 import android.text.InputType
 import android.widget.Toast
 import com.github.salomonbrys.kotson.fromJson
@@ -37,12 +35,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import org.json.JSONObject
 import org.jsoup.Jsoup
@@ -105,12 +103,12 @@ class Remanga : ConfigurableSource, HttpSource() {
         val jsonObject = JSONObject()
         jsonObject.put("user", username)
         jsonObject.put("password", password)
-        val body = RequestBody.create(MEDIA_TYPE, jsonObject.toString())
+        val body = jsonObject.toString().toRequestBody(MEDIA_TYPE)
         val response = chain.proceed(POST("$baseUrl/api/users/login/", headers, body))
-        if (response.code() == 400) {
+        if (response.code == 400) {
             throw Exception("Failed to login")
         }
-        val user = gson.fromJson<SeriesWrapperDto<UserDto>>(response.body()?.charStream()!!)
+        val user = gson.fromJson<SeriesWrapperDto<UserDto>>(response.body?.charStream()!!)
         return user.content.access_token
     }
 
@@ -123,7 +121,7 @@ class Remanga : ConfigurableSource, HttpSource() {
     override fun latestUpdatesParse(response: Response): MangasPage = searchMangaParse(response)
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val page = gson.fromJson<PageWrapperDto<LibraryDto>>(response.body()?.charStream()!!)
+        val page = gson.fromJson<PageWrapperDto<LibraryDto>>(response.body?.charStream()!!)
         val mangas = page.content.map {
             it.toSManga()
         }
@@ -152,9 +150,9 @@ class Remanga : ConfigurableSource, HttpSource() {
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        var url = HttpUrl.parse("$baseUrl/api/search/catalog/?page=$page")!!.newBuilder()
+        var url = "$baseUrl/api/search/catalog/?page=$page".toHttpUrlOrNull()!!.newBuilder()
         if (query.isNotEmpty()) {
-            url = HttpUrl.parse("$baseUrl/api/search/?page=$page")!!.newBuilder()
+            url = "$baseUrl/api/search/?page=$page".toHttpUrlOrNull()!!.newBuilder()
             url.addQueryParameter("query", query)
         }
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
@@ -235,7 +233,7 @@ class Remanga : ConfigurableSource, HttpSource() {
             .asObservable().doOnNext { response ->
                 if (!response.isSuccessful) {
                     response.close()
-                    if (response.code() == 401) warnLogin = true else throw Exception("HTTP error ${response.code()}")
+                    if (response.code == 401) warnLogin = true else throw Exception("HTTP error ${response.code}")
                 }
             }
             .map { response ->
@@ -249,13 +247,13 @@ class Remanga : ConfigurableSource, HttpSource() {
         return GET(baseUrl.replace("api.", "") + "/manga/" + manga.url.substringAfter("/api/titles/", "/"), headers)
     }
     override fun mangaDetailsParse(response: Response): SManga {
-        val series = gson.fromJson<SeriesWrapperDto<MangaDetDto>>(response.body()?.charStream()!!)
+        val series = gson.fromJson<SeriesWrapperDto<MangaDetDto>>(response.body?.charStream()!!)
         branches[series.content.en_name] = series.content.branches
         return series.content.toSManga()
     }
 
     private fun mangaBranches(manga: SManga): List<BranchesDto> {
-        val responseString = client.newCall(GET("$baseUrl/${manga.url}")).execute().body()?.string() ?: return emptyList()
+        val responseString = client.newCall(GET("$baseUrl/${manga.url}")).execute().body?.string() ?: return emptyList()
         // manga requiring login return "content" as a JsonArray instead of the JsonObject we expect
         return if (gson.fromJson<JsonObject>(responseString)["content"].isJsonObject) {
             val series = gson.fromJson<SeriesWrapperDto<MangaDetDto>>(responseString)
@@ -301,7 +299,7 @@ class Remanga : ConfigurableSource, HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val chapters = gson.fromJson<PageWrapperDto<BookDto>>(response.body()?.charStream()!!)
+        val chapters = gson.fromJson<PageWrapperDto<BookDto>>(response.body?.charStream()!!)
         return chapters.content.filter { !it.is_paid or it.is_bought }.map { chapter ->
             SChapter.create().apply {
                 chapter_number = chapter.chapter.split(".").take(2).joinToString(".").toFloat()
@@ -317,7 +315,7 @@ class Remanga : ConfigurableSource, HttpSource() {
 
     @TargetApi(Build.VERSION_CODES.N)
     override fun pageListParse(response: Response): List<Page> {
-        val body = response.body()?.string()!!
+        val body = response.body?.string()!!
         return try {
             val page = gson.fromJson<SeriesWrapperDto<PageDto>>(body)
             page.content.pages.filter { it.height > 1 }.map {
@@ -566,32 +564,6 @@ class Remanga : ConfigurableSource, HttpSource() {
         }
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.addPreference(screen.supportEditTextPreference(USERNAME_TITLE, USERNAME_DEFAULT, username))
-        screen.addPreference(screen.supportEditTextPreference(PASSWORD_TITLE, PASSWORD_DEFAULT, password))
-    }
-
-    private fun PreferenceScreen.supportEditTextPreference(title: String, default: String, value: String): EditTextPreference {
-        return EditTextPreference(context).apply {
-            key = title
-            this.title = title
-            summary = value
-            this.setDefaultValue(default)
-            dialogTitle = title
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val res = preferences.edit().putString(title, newValue as String).commit()
-                    Toast.makeText(context, "Restart Tachiyomi to apply new setting.", Toast.LENGTH_LONG).show()
-                    res
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-    }
-
     private fun getPrefUsername(): String = preferences.getString(USERNAME_TITLE, USERNAME_DEFAULT)!!
     private fun getPrefPassword(): String = preferences.getString(PASSWORD_TITLE, PASSWORD_DEFAULT)!!
 
@@ -600,7 +572,7 @@ class Remanga : ConfigurableSource, HttpSource() {
     private val password by lazy { getPrefPassword() }
 
     companion object {
-        private val MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+        private val MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
         private const val USERNAME_TITLE = "Username"
         private const val USERNAME_DEFAULT = ""
         private const val PASSWORD_TITLE = "Password"
diff --git a/src/ru/risensteam/src/eu/kanade/tachiyomi/extension/ru/risensteam/RisensTeam.kt b/src/ru/risensteam/src/eu/kanade/tachiyomi/extension/ru/risensteam/RisensTeam.kt
index b84832223..ee8ff6b84 100644
--- a/src/ru/risensteam/src/eu/kanade/tachiyomi/extension/ru/risensteam/RisensTeam.kt
+++ b/src/ru/risensteam/src/eu/kanade/tachiyomi/extension/ru/risensteam/RisensTeam.kt
@@ -18,9 +18,9 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import rx.Observable
 import java.text.ParseException
@@ -58,7 +58,7 @@ class RisensTeam : HttpSource() {
     }
 
     override fun popularMangaParse(response: Response): MangasPage {
-        val mangas = gson.fromJson<JsonArray>(response.body()!!.string())
+        val mangas = gson.fromJson<JsonArray>(response.body!!.string())
             .map { json -> mangaFromJson(json) }
 
         return MangasPage(mangas, false)
@@ -72,7 +72,8 @@ class RisensTeam : HttpSource() {
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val rbody = RequestBody.create(MediaType.parse("application/json;charset=utf-8"), """{"queryString":"$query","limit":3}""")
+        val rbody =
+            """{"queryString":"$query","limit":3}""".toRequestBody("application/json;charset=utf-8".toMediaTypeOrNull())
         return POST("$baseUrl/api/title/search", headers, rbody)
     }
 
@@ -97,7 +98,7 @@ class RisensTeam : HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
-        return mangaFromJson(gson.fromJson<JsonObject>(response.body()!!.string()))
+        return mangaFromJson(gson.fromJson<JsonObject>(response.body!!.string()))
     }
 
     // Chapters
@@ -105,7 +106,7 @@ class RisensTeam : HttpSource() {
     override fun chapterListRequest(manga: SManga): Request = apiMangaDetailsRequest(manga)
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["entities"].asJsonArray.map { json ->
+        return gson.fromJson<JsonObject>(response.body!!.string())["entities"].asJsonArray.map { json ->
             SChapter.create().apply {
                 url = json["id"].int.toString()
                 name = listOfNotNull(json["label"].nullString, json["name"].nullString).joinToString(" - ")
@@ -134,7 +135,7 @@ class RisensTeam : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        return gson.fromJson<JsonArray>(response.body()!!.string())
+        return gson.fromJson<JsonArray>(response.body!!.string())
             .mapIndexed { i, json -> Page(i, "", json.string) }
     }
 
diff --git a/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt b/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt
index 21e2c18ff..50be5d6ec 100644
--- a/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt
+++ b/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -56,7 +56,7 @@ class Selfmanga : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/advanced")!!.newBuilder()
+        val url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is GenreList -> filter.state.forEach { genre ->
@@ -145,7 +145,7 @@ class Selfmanga : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("rm_h.init( [")
         val endIndex = html.indexOf(");", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex)
diff --git a/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt b/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt
index cc71b7e70..809442f6a 100644
--- a/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt
+++ b/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt
@@ -171,7 +171,7 @@ class Yaoichan : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val html = response.body()!!.string()
+        val html = response.body!!.string()
         val beginIndex = html.indexOf("fullimg\":[") + 10
         val endIndex = html.indexOf(",]", beginIndex)
         val trimmedHtml = html.substring(beginIndex, endIndex).replace("\"", "")
diff --git a/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt b/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt
index 30921d97b..dfd3884ef 100644
--- a/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt
+++ b/src/tr/MangaDenizi/src/eu/kanade/tachiyomi/extension/tr/mangadenizi/MangaDenizi.kt
@@ -70,7 +70,7 @@ class MangaDenizi : ParsedHttpSource() {
     override fun searchMangaFromElement(element: Element) = throw UnsupportedOperationException("Unused")
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         return getMangasPage(res)
     }
 
diff --git a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt
index 9d2fc63bf..0f3734e3b 100644
--- a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt
+++ b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/HocVienTruyenTranh.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
@@ -60,7 +60,7 @@ class HocVienTruyenTranh : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector(): String = "li > a:contains(»)"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/searchs?")!!.newBuilder().addQueryParameter("keyword", query)
+        val url = "$baseUrl/searchs?".toHttpUrlOrNull()!!.newBuilder().addQueryParameter("keyword", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is Type -> url.addQueryParameter("type", if (filter.state == 0) "-1" else type.indexOf(filter.state.toString()).toString())
diff --git a/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt b/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt
index eaab85117..c3660aaf1 100644
--- a/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt
+++ b/src/vi/blogtruyen/src/eu/kanade/tachiyomi/extension/vi/blogtruyen/BlogTruyen.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -109,7 +109,7 @@ class BlogTruyen : ParsedHttpSource() {
         else "$temp/-1"
         temp = if (genresEx.isNotEmpty()) temp + "/" + genresEx.joinToString(",")
         else "$temp/-1"
-        val url = HttpUrl.parse(temp)!!.newBuilder()
+        val url = temp.toHttpUrlOrNull()!!.newBuilder()
         url.addQueryParameter("txt", query)
         if (aut.isNotEmpty()) url.addQueryParameter("aut", aut)
         url.addQueryParameter("p", page.toString())
diff --git a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
index 410c73cbd..911485b6f 100644
--- a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
+++ b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt
@@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.CookieJar
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -38,7 +38,7 @@ class HentaiVN : ParsedHttpSource() {
         .addInterceptor { chain ->
             val originalRequest = chain.request()
             when {
-                originalRequest.url().toString().startsWith(searchUrl) -> {
+                originalRequest.url.toString().startsWith(searchUrl) -> {
                     searchClient.newCall(originalRequest).execute()
                 }
                 else -> chain.proceed(originalRequest)
@@ -157,7 +157,7 @@ class HentaiVN : ParsedHttpSource() {
     override fun searchMangaNextPageSelector() = "ul.pagination > li:contains(Cuối)"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$searchUrl?name=$query&page=$page&dou=&char=&group=0&search=")!!.newBuilder()
+        val url = "$searchUrl?name=$query&page=$page&dou=&char=&group=0&search=".toHttpUrlOrNull()!!.newBuilder()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is TextField -> url.addQueryParameter(filter.key, filter.state)
diff --git a/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt b/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt
index 19ac7c5eb..fc2fddd62 100644
--- a/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt
+++ b/src/vi/iutruyentranh/src/eu/kanade/tachiyomi/extension/vi/iutruyentranh/IuTruyenTranh.kt
@@ -8,12 +8,11 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
-import java.lang.UnsupportedOperationException
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -61,7 +60,7 @@ class IuTruyenTranh : ParsedHttpSource() {
 
     @SuppressLint("DefaultLocale")
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/$page?")!!.newBuilder().addQueryParameter("name", query)
+        val url = "$baseUrl/search/$page?".toHttpUrlOrNull()!!.newBuilder().addQueryParameter("name", query)
         val genres = mutableListOf<String>()
         val genresEx = mutableListOf<String>()
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
diff --git a/src/vi/medoctruyentranh/src/eu/kanade/tachiyomi/extension/vi/medoctruyentranh/MeDocTruyenTranh.kt b/src/vi/medoctruyentranh/src/eu/kanade/tachiyomi/extension/vi/medoctruyentranh/MeDocTruyenTranh.kt
index f99de28cf..8cf49db95 100644
--- a/src/vi/medoctruyentranh/src/eu/kanade/tachiyomi/extension/vi/medoctruyentranh/MeDocTruyenTranh.kt
+++ b/src/vi/medoctruyentranh/src/eu/kanade/tachiyomi/extension/vi/medoctruyentranh/MeDocTruyenTranh.kt
@@ -138,7 +138,7 @@ class MeDocTruyenTranh : ParsedHttpSource() {
             .mapJSONArray { _, jsonObject: JSONObject ->
                 SChapter.create().apply {
                     name = jsonObject.getString("title")
-                    setUrlWithoutDomain("${response.request().url()}/${jsonObject.getString("chapter_index")}")
+                    setUrlWithoutDomain("${response.request.url}/${jsonObject.getString("chapter_index")}")
                     date_upload = parseChapterDate(jsonObject.getString("time"))
                 }
             }
diff --git a/src/zh/bainianmanga/src/eu/kanade/tachiyomi/extension/zh/bainianmanga/BainianManga.kt b/src/zh/bainianmanga/src/eu/kanade/tachiyomi/extension/zh/bainianmanga/BainianManga.kt
index b1b64b283..a92368a58 100755
--- a/src/zh/bainianmanga/src/eu/kanade/tachiyomi/extension/zh/bainianmanga/BainianManga.kt
+++ b/src/zh/bainianmanga/src/eu/kanade/tachiyomi/extension/zh/bainianmanga/BainianManga.kt
@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -25,7 +25,7 @@ class BainianManga : ParsedHttpSource() {
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/page/hot/$page.html", headers)
     override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/page/new/$page.html", headers)
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/index.php?m=vod-search-pg-$page-wd-$query.html")?.newBuilder()
+        val url = "$baseUrl/index.php?m=vod-search-pg-$page-wd-$query.html".toHttpUrlOrNull()?.newBuilder()
         return GET(url.toString(), headers)
     }
 
diff --git a/src/zh/bh3/src/eu/kanade/tachiyomi/extension/zh/bh3/BH3.kt b/src/zh/bh3/src/eu/kanade/tachiyomi/extension/zh/bh3/BH3.kt
index a4a2dd688..851cebf8b 100644
--- a/src/zh/bh3/src/eu/kanade/tachiyomi/extension/zh/bh3/BH3.kt
+++ b/src/zh/bh3/src/eu/kanade/tachiyomi/extension/zh/bh3/BH3.kt
@@ -66,7 +66,7 @@ class BH3 : ParsedHttpSource() {
     override fun chapterFromElement(element: Element) = throw Exception("Not Used")
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val jsondata = response.body()!!.string()
+        val jsondata = response.body!!.string()
         val json = JsonParser().parse(jsondata).asJsonArray
         val chapters = mutableListOf<SChapter>()
         json.forEach {
diff --git a/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/Comico.kt b/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/Comico.kt
index 3ed4ae7a9..381d0f0d9 100644
--- a/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/Comico.kt
+++ b/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/Comico.kt
@@ -135,7 +135,7 @@ abstract class Comico(
     override fun chapterListParse(response: Response): List<SChapter> {
         val chapters = mutableListOf<SChapter>()
 
-        gson.fromJson<JsonObject>(response.body()!!.string())["result"]["list"].asJsonArray.forEach {
+        gson.fromJson<JsonObject>(response.body!!.string())["result"]["list"].asJsonArray.forEach {
             if (it["freeFlg"].asString == "Y") chapters.add(chapterFromJson(it))
         }
 
diff --git a/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/ComicoFactory.kt b/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/ComicoFactory.kt
index 1c308c5e7..f3716777f 100644
--- a/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/ComicoFactory.kt
+++ b/src/zh/comico/src/eu/kanade/tachiyomi/extension/zh/comico/ComicoFactory.kt
@@ -34,7 +34,7 @@ class ComicoChallenge : Comico("Comico Challenge", "/challenge", true) {
 
     override fun popularMangaParse(response: Response): MangasPage {
         val mangas = mutableListOf<SManga>()
-        val body = response.body()!!.string()
+        val body = response.body!!.string()
 
         gson.fromJson<JsonObject>(body)["result"]["list"].asJsonArray.forEach {
             val manga = SManga.create()
@@ -82,7 +82,7 @@ class ComicoChallenge : Comico("Comico Challenge", "/challenge", true) {
     override fun chapterListParse(response: Response): List<SChapter> {
         val chapters = mutableListOf<SChapter>()
 
-        gson.fromJson<JsonObject>(response.body()!!.string())["result"]["list"].asJsonArray
+        gson.fromJson<JsonObject>(response.body!!.string())["result"]["list"].asJsonArray
             .forEach { chapters.add(chapterFromJson(it)) }
 
         return chapters.reversed()
diff --git a/src/zh/copymanga/src/eu/kanade/tachiyomi/extension/zh/copymanga/CopyManga.kt b/src/zh/copymanga/src/eu/kanade/tachiyomi/extension/zh/copymanga/CopyManga.kt
index d8ca2b0e4..d02a64d2a 100644
--- a/src/zh/copymanga/src/eu/kanade/tachiyomi/extension/zh/copymanga/CopyManga.kt
+++ b/src/zh/copymanga/src/eu/kanade/tachiyomi/extension/zh/copymanga/CopyManga.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.zh.copymanga
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.PreferenceScreen
 import com.luhuiguo.chinese.ChineseUtils
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.source.ConfigurableSource
@@ -15,7 +13,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -34,7 +32,6 @@ import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 import javax.net.ssl.SSLContext
 import javax.net.ssl.X509TrustManager
-import kotlin.collections.ArrayList
 
 class CopyManga : ConfigurableSource, HttpSource() {
 
@@ -84,11 +81,11 @@ class CopyManga : ConfigurableSource, HttpSource() {
         }.filter { it != "" }.joinToString("&")
         // perform html search only when do have filter and not search anything
         if (params != "" && query == "") {
-            requestUrlString = htmlUrlString + "&$params"
+            requestUrlString = "$htmlUrlString&$params"
         } else {
             requestUrlString = apiUrlString
         }
-        val url = HttpUrl.parse(requestUrlString)?.newBuilder()
+        val url = requestUrlString.toHttpUrlOrNull()?.newBuilder()
         return GET(url.toString(), headers)
     }
     override fun searchMangaParse(response: Response): MangasPage {
@@ -308,7 +305,7 @@ class CopyManga : ConfigurableSource, HttpSource() {
     }
 
     private fun parseSearchMangaResponseAsJson(response: Response): MangasPage {
-        val body = response.body()!!.string()
+        val body = response.body!!.string()
         // results > comic > list []
         val res = JSONObject(body)
         val comicArray = res.optJSONObject("results")?.optJSONArray("list")
@@ -416,26 +413,6 @@ class CopyManga : ConfigurableSource, HttpSource() {
         screen.addPreference(zhPreference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val zhPreference = CheckBoxPreference(screen.context).apply {
-            key = SHOW_Simplified_Chinese_TITLE_PREF
-            title = "将标题转换为简体中文"
-            summary = "需要重启软件以生效。已添加漫画需要迁移改变标题。"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putBoolean(SHOW_Simplified_Chinese_TITLE_PREF, newValue as Boolean).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(zhPreference)
-    }
-
     companion object {
         private const val SHOW_Simplified_Chinese_TITLE_PREF = "showSCTitle"
     }
diff --git a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt
index 4302c7641..01e806adc 100644
--- a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt
+++ b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt
@@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.extension.zh.dmzj
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -53,15 +53,15 @@ class Dmzj : ConfigurableSource, HttpSource() {
     }
 
     private val v3apiRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(v3apiUrl)!!,
+        v3apiUrl.toHttpUrlOrNull()!!,
         preferences.getString(API_RATELIMIT_PREF, "5")!!.toInt()
     )
     private val apiRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(apiUrl)!!,
+        apiUrl.toHttpUrlOrNull()!!,
         preferences.getString(API_RATELIMIT_PREF, "5")!!.toInt()
     )
     private val imageCDNRateLimitInterceptor = SpecificHostRateLimitInterceptor(
-        HttpUrl.parse(imageCDNUrl)!!,
+        imageCDNUrl.toHttpUrlOrNull()!!,
         preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "5")!!.toInt()
     )
 
@@ -190,7 +190,7 @@ class Dmzj : ConfigurableSource, HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val body = response.body()!!.string()
+        val body = response.body!!.string()
 
         return if (body.contains("g_search_data")) {
             simpleSearchJsonParse(body.substringAfter("=").trim().removeSuffix(";"))
@@ -223,9 +223,9 @@ class Dmzj : ConfigurableSource, HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response) = SManga.create().apply {
-        val obj = JSONObject(response.body()!!.string())
+        val obj = JSONObject(response.body!!.string())
 
-        if (response.request().url().toString().startsWith(v3apiUrl)) {
+        if (response.request.url.toString().startsWith(v3apiUrl)) {
             title = obj.getString("title")
             thumbnail_url = obj.getString("cover")
             var arr = obj.getJSONArray("authors")
@@ -285,10 +285,10 @@ class Dmzj : ConfigurableSource, HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val obj = JSONObject(response.body()!!.string())
+        val obj = JSONObject(response.body!!.string())
         val ret = ArrayList<SChapter>()
 
-        if (response.request().url().toString().startsWith(v3apiUrl)) {
+        if (response.request.url.toString().startsWith(v3apiUrl)) {
             val cid = obj.getString("id")
             val chaptersList = obj.getJSONArray("chapters")
             for (i in 0 until chaptersList.length()) {
@@ -326,29 +326,29 @@ class Dmzj : ConfigurableSource, HttpSource() {
     override fun pageListRequest(chapter: SChapter) = GET(chapter.url, headers) // Bypass base url
 
     override fun pageListParse(response: Response): List<Page> {
-        val arr = if (response.request().url().toString().startsWith(oldPageListApiUrl)) {
-            JSONObject(response.body()!!.string()).getJSONArray("page_url")
+        val arr = if (response.request.url.toString().startsWith(oldPageListApiUrl)) {
+            JSONObject(response.body!!.string()).getJSONArray("page_url")
         } else {
             // some chapters are hidden and won't return a JSONObject from api.m.dmzj, have to get them through v3api (but images won't be as HQ)
             try {
-                val obj = JSONObject(response.body()!!.string())
+                val obj = JSONObject(response.body!!.string())
                 obj.getJSONObject("chapter").getJSONArray("page_url") // api.m.dmzj1.com already return HD image url
             } catch (_: Exception) {
                 // example url: http://v3api.dmzj.com/chapter/44253/101852.json
-                val url = response.request().url().toString()
+                val url = response.request.url.toString()
                     .replace("api.m", "v3api")
                     .replace("comic/", "")
                     .replace(".html", ".json")
-                val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body()!!.string()) }
+                val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body!!.string()) }
                 obj.getJSONArray("page_url_hd") // page_url in v3api.dmzj1.com will return compressed image, page_url_hd will return HD image url as api.m.dmzj1.com does.
             } catch (_: Exception) {
                 // Fallback to old api
                 // example url: https://m.dmzj.com/chapinfo/44253/101852.html
-                val url = response.request().url().toString()
+                val url = response.request.url.toString()
                     .replaceFirst("api.", "")
                     .replaceFirst(".dmzj1.", ".dmzj.")
                     .replaceFirst("comic/chapter", "chapinfo")
-                val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body()!!.string()) }
+                val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body!!.string()) }
                 obj.getJSONArray("page_url")
             }
         }
@@ -480,49 +480,6 @@ class Dmzj : ConfigurableSource, HttpSource() {
         open fun toUriPart() = vals[state].second
     }
 
-    override fun setupPreferenceScreen(screen: androidx.preference.PreferenceScreen) {
-        val apiRateLimitPreference = androidx.preference.ListPreference(screen.context).apply {
-            key = API_RATELIMIT_PREF
-            title = API_RATELIMIT_PREF_TITLE
-            summary = API_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue("5")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(API_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val imgCDNRateLimitPreference = androidx.preference.ListPreference(screen.context).apply {
-            key = IMAGE_CDN_RATELIMIT_PREF
-            title = IMAGE_CDN_RATELIMIT_PREF_TITLE
-            summary = IMAGE_CDN_RATELIMIT_PREF_SUMMARY
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-
-            setDefaultValue("5")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(IMAGE_CDN_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(apiRateLimitPreference)
-        screen.addPreference(imgCDNRateLimitPreference)
-    }
-
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val apiRateLimitPreference = ListPreference(screen.context).apply {
             key = API_RATELIMIT_PREF
@@ -561,6 +518,7 @@ class Dmzj : ConfigurableSource, HttpSource() {
                 }
             }
         }
+
         screen.addPreference(apiRateLimitPreference)
         screen.addPreference(imgCDNRateLimitPreference)
     }
diff --git a/src/zh/hanhankuman/src/eu/kanade/tachiyomi/extension/zh/hanhankuman/HanhanKuman.kt b/src/zh/hanhankuman/src/eu/kanade/tachiyomi/extension/zh/hanhankuman/HanhanKuman.kt
index b9f83edbe..cf653dcea 100644
--- a/src/zh/hanhankuman/src/eu/kanade/tachiyomi/extension/zh/hanhankuman/HanhanKuman.kt
+++ b/src/zh/hanhankuman/src/eu/kanade/tachiyomi/extension/zh/hanhankuman/HanhanKuman.kt
@@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -36,7 +36,7 @@ class HanhanKuman : ParsedHttpSource() {
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/top/hotrating.aspx", headers)
     override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/top/newrating.aspx", headers)
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/comic/?act=search&st=$query")?.newBuilder()
+        val url = "$baseUrl/comic/?act=search&st=$query".toHttpUrlOrNull()?.newBuilder()
         return GET(url.toString(), headers)
     }
 
@@ -96,7 +96,7 @@ class HanhanKuman : ParsedHttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val url = response.request().url().url().toString()
+        val url = response.request.url.toString()
 
         val re = Regex(""".*\/(.*?)\/\d+\.html\?s=(\d+)""")
 
diff --git a/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt b/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt
index 171040374..0b61a97d7 100644
--- a/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt
+++ b/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt
@@ -18,12 +18,12 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
@@ -34,8 +34,6 @@ import java.io.InputStream
 import java.text.SimpleDateFormat
 import java.util.Locale
 import kotlin.math.floor
-import android.support.v7.preference.EditTextPreference as LegacyEditTextPreference
-import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen
 
 @Nsfw
 class Jinmantiantang : ConfigurableSource, ParsedHttpSource() {
@@ -56,16 +54,16 @@ class Jinmantiantang : ConfigurableSource, ParsedHttpSource() {
     // 处理URL请求
     override val client: OkHttpClient = network.cloudflareClient.newBuilder().addInterceptor(
         fun(chain): Response {
-            val url = chain.request().url().toString()
+            val url = chain.request().url.toString()
             val response = chain.proceed(chain.request())
             if (!url.contains("media/photos", ignoreCase = true)) return response // 对非漫画图片连接直接放行
             if (url.substring(url.indexOf("photos/") + 7, url.lastIndexOf("/")).toInt() < scrambleId) return response // 对在漫画章节ID为220980之前的图片未进行图片分割,直接放行
 // 章节ID:220980(包含)之后的漫画(2020.10.27之后)图片进行了分割倒序处理
-            val res = response.body()!!.byteStream().use {
+            val res = response.body!!.byteStream().use {
                 decodeImage(it)
             }
-            val mediaType = MediaType.parse("image/avif,image/webp,image/apng,image/*,*/*")
-            val outputBytes = ResponseBody.create(mediaType, res)
+            val mediaType = "image/avif,image/webp,image/apng,image/*,*/*".toMediaTypeOrNull()
+            val outputBytes = res.toResponseBody(mediaType)
             return response.newBuilder().body(outputBytes).build()
         }
     ).build()
@@ -158,15 +156,15 @@ class Jinmantiantang : ConfigurableSource, ParsedHttpSource() {
                 newQuery = "$newQuery+%2B$keyword"
                 params = params.substringAfter("&")
             }
-            HttpUrl.parse("$baseUrl/search/photos?search_query=$newQuery&page=$page&$params")?.newBuilder()
+            "$baseUrl/search/photos?search_query=$newQuery&page=$page&$params".toHttpUrlOrNull()?.newBuilder()
         } else {
             params = if (params == "") "/albums?" else params
             if (query == "") {
-                HttpUrl.parse("$baseUrl$params&page=$page")?.newBuilder()
+                "$baseUrl$params&page=$page".toHttpUrlOrNull()?.newBuilder()
             } else {
                 // 在搜索栏的关键词前添加-号来实现对筛选结果的过滤, 像 "-YAOI -扶他 -毛絨絨 -獵奇", 注意此时搜索功能不可用.
                 val removedGenres = query.split(" ").filter { it.startsWith("-") }.joinToString("+") { it.removePrefix("-") }
-                HttpUrl.parse("$baseUrl$params&page=$page&screen=$removedGenres")?.newBuilder()
+                "$baseUrl$params&page=$page&screen=$removedGenres".toHttpUrlOrNull()?.newBuilder()
             }
         }
         return GET(url.toString(), headers)
@@ -432,18 +430,4 @@ class Jinmantiantang : ConfigurableSource, ParsedHttpSource() {
             screen.addPreference(it)
         }
     }
-
-    override fun setupPreferenceScreen(screen: LegacyPreferenceScreen) {
-        LegacyEditTextPreference(screen.context).apply {
-            key = "BLOCK_GENRES_LIST"
-            title = BLOCK_PREF_TITLE
-            setDefaultValue(BLOCK_PREF_DEFAULT)
-            dialogTitle = BLOCK_PREF_DIALOGTITLE
-            setOnPreferenceChangeListener { _, newValue ->
-                preferences.edit().putString("BLOCK_GENRES_LIST", newValue as String).commit()
-            }
-        }.let {
-            screen.addPreference(it)
-        }
-    }
 }
diff --git a/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt b/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt
index bb2f35702..f5dc22ad4 100644
--- a/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt
+++ b/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt
@@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.zh.mangabz
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import com.squareup.duktape.Duktape
 import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
@@ -18,7 +15,7 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Headers
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -43,9 +40,9 @@ class Mangabz : ConfigurableSource, HttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    private val mainSiteRateLimitInterceptor = SpecificHostRateLimitInterceptor(HttpUrl.parse(baseUrl)!!, preferences.getString(MAINSITE_RATELIMIT_PREF, "5")!!.toInt())
-    private val imageCDNRateLimitInterceptor1 = SpecificHostRateLimitInterceptor(HttpUrl.parse(imageServer[0])!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "5")!!.toInt())
-    private val imageCDNRateLimitInterceptor2 = SpecificHostRateLimitInterceptor(HttpUrl.parse(imageServer[1])!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "5")!!.toInt())
+    private val mainSiteRateLimitInterceptor = SpecificHostRateLimitInterceptor(baseUrl.toHttpUrlOrNull()!!, preferences.getString(MAINSITE_RATELIMIT_PREF, "5")!!.toInt())
+    private val imageCDNRateLimitInterceptor1 = SpecificHostRateLimitInterceptor(imageServer[0].toHttpUrlOrNull()!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "5")!!.toInt())
+    private val imageCDNRateLimitInterceptor2 = SpecificHostRateLimitInterceptor(imageServer[1].toHttpUrlOrNull()!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "5")!!.toInt())
 
     override fun headersBuilder(): Headers.Builder = super.headersBuilder()
         .set("Referer", "https://mangabz.com")
@@ -248,7 +245,7 @@ class Mangabz : ConfigurableSource, HttpSource() {
     override fun pageListParse(response: Response): List<Page> {
         val document = response.asJsoup()
         val scriptTag = (document.select("head script").filter { it.data().isNotBlank() })[0].data()
-        val chapterUrl = response.request().url().toString()
+        val chapterUrl = response.request.url.toString()
 
         val mid = getJSVar(scriptTag, "MANGABZ_MID", "(\\w+)")!!
         val cid = getJSVar(scriptTag, "MANGABZ_CID", "(\\w+)")!!
@@ -271,7 +268,7 @@ class Mangabz : ConfigurableSource, HttpSource() {
 
         // Page 1 may return 1~2 image urls.
         val apiUrlInPage1 = "$baseUrl/$path/chapterimage.ashx?cid=$cid&page=1&key=&_cid=$cid&_mid=$mid&_sign=$sign&_dt="
-        val imgUrlList = fetchImageUrlListFromAPI(apiUrlInPage1, response.request().headers())
+        val imgUrlList = fetchImageUrlListFromAPI(apiUrlInPage1, response.request.headers)
         for (i in 0 until imgUrlList.length()) {
             val imgUrl = imgUrlList[i] as String
             val pageNum = extractPageNumFromImageUrlRegex.find(imgUrl)!!.groups[1]!!.value.toInt() - 1
@@ -282,7 +279,7 @@ class Mangabz : ConfigurableSource, HttpSource() {
     }
 
     private fun fetchImageUrlListFromAPI(apiUrl: String, requestHeaders: Headers = headers): JSONArray {
-        val jsEvalPayload = client.newCall(GET(apiUrl, requestHeaders)).execute().body()!!.string()
+        val jsEvalPayload = client.newCall(GET(apiUrl, requestHeaders)).execute().body!!.string()
         val imgUrlDecode = Duktape.create().use {
             it.evaluate("$jsEvalPayload; JSON.stringify(d);") as String
         }
@@ -374,67 +371,6 @@ class Mangabz : ConfigurableSource, HttpSource() {
         screen.addPreference(zhHantPreference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val mainSiteRateLimitPreference = ListPreference(screen.context).apply {
-            key = MAINSITE_RATELIMIT_PREF
-            title = MAINSITE_RATELIMIT_PREF_TITLE
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-            summary = MAINSITE_RATELIMIT_PREF_SUMMARY
-
-            setDefaultValue("5")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(MAINSITE_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val imgCDNRateLimitPreference = ListPreference(screen.context).apply {
-            key = IMAGE_CDN_RATELIMIT_PREF
-            title = IMAGE_CDN_RATELIMIT_PREF_TITLE
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-            summary = IMAGE_CDN_RATELIMIT_PREF_SUMMARY
-
-            setDefaultValue("5")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(IMAGE_CDN_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val zhHantPreference = CheckBoxPreference(screen.context).apply {
-            key = SHOW_ZH_HANT_WEBSITE_PREF
-            title = SHOW_ZH_HANT_WEBSITE_PREF_TITLE
-            summary = SHOW_ZH_HANT_WEBSITE_PREF_SUMMARY
-
-            setDefaultValue(false)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putBoolean(SHOW_ZH_HANT_WEBSITE_PREF, newValue as Boolean).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(mainSiteRateLimitPreference)
-        screen.addPreference(imgCDNRateLimitPreference)
-        screen.addPreference(zhHantPreference)
-    }
-
     companion object {
         private const val MAINSITE_RATELIMIT_PREF = "mainSiteRatelimitPreference"
         private const val MAINSITE_RATELIMIT_PREF_TITLE = "主站每秒连接数限制" // "Ratelimit permits per second for main website"
diff --git a/src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/Manhuadui.kt b/src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/Manhuadui.kt
index 09e94914a..83fb2d89d 100644
--- a/src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/Manhuadui.kt
+++ b/src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/Manhuadui.kt
@@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -39,7 +39,7 @@ class Manhuadui : ParsedHttpSource() {
     override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/update/$page/", headers)
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         return if (query != "") {
-            val url = HttpUrl.parse("$baseUrl/search/?keywords=$query")?.newBuilder()
+            val url = "$baseUrl/search/?keywords=$query".toHttpUrlOrNull()?.newBuilder()
             GET(url.toString(), headers)
         } else {
             val params = filters.map {
@@ -47,7 +47,7 @@ class Manhuadui : ParsedHttpSource() {
                     it.toUriPart()
                 } else ""
             }.filter { it != "" }.joinToString("-")
-            val url = HttpUrl.parse("$baseUrl/list/$params/$page/")?.newBuilder()
+            val url = "$baseUrl/list/$params/$page/".toHttpUrlOrNull()?.newBuilder()
             GET(url.toString(), headers)
         }
     }
diff --git a/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt b/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt
index ccc29667c..554ef4344 100644
--- a/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt
+++ b/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt
@@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.zh.manhuagui
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.support.v7.preference.CheckBoxPreference
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.PreferenceScreen
 import com.google.gson.Gson
 import com.squareup.duktape.Duktape
 import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
@@ -29,6 +26,7 @@ import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Headers
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -68,12 +66,12 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
     private val imageServer = arrayOf("https://i.hamreus.com", "https://cf.hamreus.com")
     private val mobileWebsiteUrl = "https://m.$baseHost"
     private val gson = Gson()
-    private val baseHttpUrl: HttpUrl = HttpUrl.parse(baseUrl)!!
+    private val baseHttpUrl: HttpUrl = baseUrl.toHttpUrlOrNull()!!
 
     // Add rate limit to fix manga thumbnail load failure
     private val mainSiteRateLimitInterceptor = SpecificHostRateLimitInterceptor(baseHttpUrl, preferences.getString(MAINSITE_RATELIMIT_PREF, "2")!!.toInt())
-    private val imageCDNRateLimitInterceptor1 = SpecificHostRateLimitInterceptor(HttpUrl.parse(imageServer[0])!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "4")!!.toInt())
-    private val imageCDNRateLimitInterceptor2 = SpecificHostRateLimitInterceptor(HttpUrl.parse(imageServer[1])!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "4")!!.toInt())
+    private val imageCDNRateLimitInterceptor1 = SpecificHostRateLimitInterceptor(imageServer[0].toHttpUrlOrNull()!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "4")!!.toInt())
+    private val imageCDNRateLimitInterceptor2 = SpecificHostRateLimitInterceptor(imageServer[1].toHttpUrlOrNull()!!, preferences.getString(IMAGE_CDN_RATELIMIT_PREF, "4")!!.toInt())
 
     override val client: OkHttpClient =
         if (getShowR18())
@@ -81,7 +79,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
                 .addNetworkInterceptor(mainSiteRateLimitInterceptor)
                 .addNetworkInterceptor(imageCDNRateLimitInterceptor1)
                 .addNetworkInterceptor(imageCDNRateLimitInterceptor2)
-                .addNetworkInterceptor(AddCookieHeaderInterceptor(baseHttpUrl.host()!!))
+                .addNetworkInterceptor(AddCookieHeaderInterceptor(baseHttpUrl.host))
                 .build()
         else
             network.client.newBuilder()
@@ -93,7 +91,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
     // Add R18 verification cookie
     class AddCookieHeaderInterceptor(private val baseHost: String) : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
-            if (chain.request().url().host() == baseHost) {
+            if (chain.request().url.host == baseHost) {
                 val originalCookies = chain.request().header("Cookie") ?: ""
                 if (originalCookies != "" && !originalCookies.contains("isAdult=1")) {
                     return chain.proceed(
@@ -220,7 +218,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
 
     override fun searchMangaParse(response: Response): MangasPage {
         val document = response.asJsoup()
-        if (response.request().url().encodedPath().startsWith("/s/")) {
+        if (response.request.url.encodedPath.startsWith("/s/")) {
             // Normal search
             val mangas = document.select(searchMangaSelector()).map { element ->
                 searchMangaFromElement(element)
@@ -299,7 +297,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
                             """LZString.decompressFromBase64('${hiddenEncryptedChapterList.`val`()}');"""
                     ) as String
                 }
-                val hiddenChapterList = Jsoup.parse(decodedHiddenChapterList, response.request().url().toString())
+                val hiddenChapterList = Jsoup.parse(decodedHiddenChapterList, response.request.url.toString())
                 if (hiddenChapterList != null) {
                     // Replace R18 warning with actual chapter list
                     document.select("#erroraudit_show").first().replaceWith(hiddenChapterList)
@@ -497,101 +495,6 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
         screen.addPreference(mirrorURLPreference)
     }
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val mainSiteRateLimitPreference = ListPreference(screen.context).apply {
-            key = MAINSITE_RATELIMIT_PREF
-            title = MAINSITE_RATELIMIT_PREF_TITLE
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-            summary = MAINSITE_RATELIMIT_PREF_SUMMARY
-
-            setDefaultValue("2")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(MAINSITE_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val imgCDNRateLimitPreference = ListPreference(screen.context).apply {
-            key = IMAGE_CDN_RATELIMIT_PREF
-            title = IMAGE_CDN_RATELIMIT_PREF_TITLE
-            entries = ENTRIES_ARRAY
-            entryValues = ENTRIES_ARRAY
-            summary = IMAGE_CDN_RATELIMIT_PREF_SUMMARY
-
-            setDefaultValue("4")
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putString(IMAGE_CDN_RATELIMIT_PREF, newValue as String).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val zhHantPreference = CheckBoxPreference(screen.context).apply {
-            key = SHOW_ZH_HANT_WEBSITE_PREF
-            title = SHOW_ZH_HANT_WEBSITE_PREF_TITLE
-            summary = SHOW_ZH_HANT_WEBSITE_PREF_SUMMARY
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val setting = preferences.edit().putBoolean(SHOW_ZH_HANT_WEBSITE_PREF, newValue as Boolean).commit()
-                    setting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val r18Preference = CheckBoxPreference(screen.context).apply {
-            key = SHOW_R18_PREF
-            title = SHOW_R18_PREF_TITLE
-            summary = SHOW_R18_PREF_SUMMARY
-
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val newSetting = preferences.edit().putBoolean(SHOW_R18_PREF, newValue as Boolean).commit()
-                    newSetting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        val mirrorURLPreference = CheckBoxPreference(screen.context).apply {
-            key = USE_MIRROR_URL_PREF
-            title = USE_MIRROR_URL_PREF_TITLE
-            summary = USE_MIRROR_URL_PREF_SUMMARY
-
-            setDefaultValue(false)
-            setOnPreferenceChangeListener { _, newValue ->
-                try {
-                    val newSetting = preferences.edit().putBoolean(USE_MIRROR_URL_PREF, newValue as Boolean).commit()
-                    newSetting
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    false
-                }
-            }
-        }
-
-        screen.addPreference(mainSiteRateLimitPreference)
-        screen.addPreference(imgCDNRateLimitPreference)
-        screen.addPreference(zhHantPreference)
-        screen.addPreference(r18Preference)
-        screen.addPreference(mirrorURLPreference)
-    }
-
     private fun getShowR18(): Boolean = preferences.getBoolean(SHOW_R18_PREF, false)
 
     private open class UriPartFilter(
diff --git a/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt b/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt
index 683e20712..3db972cfe 100644
--- a/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt
+++ b/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt
@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import okhttp3.CacheControl
 import okhttp3.Headers
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import okhttp3.Response
 import org.json.JSONArray
@@ -30,14 +31,14 @@ class Manhuaren : HttpSource() {
     override val baseUrl = "http://mangaapi.manhuaren.com"
 
     private val pageSize = 20
-    private val baseHttpUrl = HttpUrl.parse(baseUrl)!!
+    private val baseHttpUrl = baseUrl.toHttpUrlOrNull()!!
 
     private val c = "4e0a48e1c0b54041bce9c8f0e036124d"
     private val cacheControl: CacheControl by lazy { CacheControl.Builder().maxAge(10, MINUTES).build() }
 
     private fun generateGSNHash(url: HttpUrl): String {
         var s = c + "GET"
-        url.queryParameterNames().toSortedSet().forEach {
+        url.queryParameterNames.toSortedSet().forEach {
             if (it != "gsn") {
                 s += it
                 s += urlEncode(url.queryParameterValues(it)[0])
@@ -118,7 +119,7 @@ class Manhuaren : HttpSource() {
     }
 
     private fun mangasPageParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val arr = JSONObject(res).getJSONObject("response").getJSONArray("mangas")
         return mangasFromJSONArray(arr)
     }
@@ -178,7 +179,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun searchMangaParse(response: Response): MangasPage {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val obj = JSONObject(res).getJSONObject("response")
         if (obj.has("result")) {
             return mangasFromJSONArray(obj.getJSONArray("result"))
@@ -187,7 +188,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun mangaDetailsParse(response: Response) = SManga.create().apply {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val obj = JSONObject(res).getJSONObject("response")
         title = obj.getString("mangaName")
         thumbnail_url = ""
@@ -224,7 +225,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun mangaDetailsRequest(manga: SManga): Request {
-        return myGet(HttpUrl.parse(baseUrl + manga.url)!!)
+        return myGet((baseUrl + manga.url).toHttpUrlOrNull()!!)
     }
 
     override fun chapterListRequest(manga: SManga) = mangaDetailsRequest(manga)
@@ -251,7 +252,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val obj = JSONObject(res).getJSONObject("response")
         val ret = ArrayList<SChapter>()
         listOf("mangaEpisode", "mangaWords", "mangaRolls").forEach {
@@ -263,7 +264,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun pageListParse(response: Response): List<Page> {
-        val res = response.body()!!.string()
+        val res = response.body!!.string()
         val obj = JSONObject(res).getJSONObject("response")
         val ret = ArrayList<Page>()
         val host = obj.getJSONArray("hostList").getString(0)
@@ -276,7 +277,7 @@ class Manhuaren : HttpSource() {
     }
 
     override fun pageListRequest(chapter: SChapter): Request {
-        val url = HttpUrl.parse(baseUrl + chapter.url)!!.newBuilder()
+        val url = (baseUrl + chapter.url).toHttpUrlOrNull()!!.newBuilder()
             .addQueryParameter("netType", "4")
             .addQueryParameter("loadreal", "1")
             .addQueryParameter("imageQuality", "2")
diff --git a/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt
index 5e3d5b876..16ea3264e 100644
--- a/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt
+++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -70,7 +70,7 @@ class Onemanhua : ParsedHttpSource() {
         return if (query.isNotBlank()) {
             GET("$baseUrl/search?searchString=$query&page=$page", headers)
         } else {
-            val url = HttpUrl.parse("$baseUrl/show")!!.newBuilder()
+            val url = "$baseUrl/show".toHttpUrlOrNull()!!.newBuilder()
             url.addQueryParameter("page", page.toString())
 
             filters.forEach { filter ->
diff --git a/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt b/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
index 71c07cf85..fb76b1cda 100644
--- a/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
+++ b/src/zh/pufei/src/eu/kanade/tachiyomi/extension/zh/pufei/Pufei.kt
@@ -13,23 +13,23 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 
 fun asJsoup(response: Response, html: String? = null): Document {
-    return Jsoup.parse(html ?: bodyWithAutoCharset(response), response.request().url().toString())
+    return Jsoup.parse(html ?: bodyWithAutoCharset(response), response.request.url.toString())
 }
 
 fun bodyWithAutoCharset(response: Response, _charset: String? = null): String {
-    val htmlBytes: ByteArray = response.body()!!.bytes()
+    val htmlBytes: ByteArray = response.body!!.bytes()
     var c = _charset
 
     if (c == null) {
@@ -60,9 +60,9 @@ class Pufei : ParsedHttpSource() {
 
     private val rewriteOctetStream: Interceptor = Interceptor { chain ->
         val originalResponse: Response = chain.proceed(chain.request())
-        if (originalResponse.headers("Content-Type").contains("application/octet-stream") && originalResponse.request().url().toString().contains(".jpg")) {
-            val orgBody = originalResponse.body()!!.bytes()
-            val newBody = ResponseBody.create(MediaType.parse("image/jpeg"), orgBody)
+        if (originalResponse.headers("Content-Type").contains("application/octet-stream") && originalResponse.request.url.toString().contains(".jpg")) {
+            val orgBody = originalResponse.body!!.bytes()
+            val newBody = orgBody.toResponseBody("image/jpeg".toMediaTypeOrNull())
             originalResponse.newBuilder()
                 .body(newBody)
                 .build()
@@ -115,7 +115,8 @@ class Pufei : ParsedHttpSource() {
     private fun encodeGBK(str: String) = "%" + str.toByteArray(charset("gb2312")).toHexString()
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/e/search/?searchget=1&tbname=mh&show=title,player,playadmin,bieming,pinyin,playadmin&tempid=4&keyboard=" + encodeGBK(query))?.newBuilder()
+        val url = ("$baseUrl/e/search/?searchget=1&tbname=mh&show=title,player,playadmin,bieming,pinyin,playadmin&tempid=4&keyboard=" + encodeGBK(query)).toHttpUrlOrNull()
+            ?.newBuilder()
         return GET(url.toString(), headers)
     }
 
diff --git a/src/zh/qimiaomh/src/eu/kanade/tachiyomi/extension/zh/qimiaomh/Qimiaomh.kt b/src/zh/qimiaomh/src/eu/kanade/tachiyomi/extension/zh/qimiaomh/Qimiaomh.kt
index 0f57a3808..c1f4b09c5 100644
--- a/src/zh/qimiaomh/src/eu/kanade/tachiyomi/extension/zh/qimiaomh/Qimiaomh.kt
+++ b/src/zh/qimiaomh/src/eu/kanade/tachiyomi/extension/zh/qimiaomh/Qimiaomh.kt
@@ -93,7 +93,7 @@ class Qimiaomh : ParsedHttpSource() {
         val did = script.substringAfter("var did = ").substringBefore(";")
         val sid = script.substringAfter("var sid = ").substringBefore(";")
         val url = "$baseUrl/Action/Play/AjaxLoadImgUrl?did=$did&sid=$sid&tmp=${Random().nextFloat()}"
-        val body = client.newCall(GET(url, headers)).execute().body()!!.string()
+        val body = client.newCall(GET(url, headers)).execute().body!!.string()
         val json = JsonParser().parse(body).asJsonObject
         val images = json["listImg"].asJsonArray
         images.forEachIndexed { index, jsonElement ->
diff --git a/src/zh/qiximh/src/eu/kanade/tachiyomi/extension/zh/qiximh/Qiximh.kt b/src/zh/qiximh/src/eu/kanade/tachiyomi/extension/zh/qiximh/Qiximh.kt
index a1435c390..a562dae43 100644
--- a/src/zh/qiximh/src/eu/kanade/tachiyomi/extension/zh/qiximh/Qiximh.kt
+++ b/src/zh/qiximh/src/eu/kanade/tachiyomi/extension/zh/qiximh/Qiximh.kt
@@ -56,7 +56,7 @@ class Qiximh : HttpSource() {
 
     // Override
     private fun FormBody.value(name: String): String {
-        return (0 until size())
+        return (0 until size)
             .first { name(it) == name }
             .let { value(it) }
     }
@@ -100,7 +100,7 @@ class Qiximh : HttpSource() {
             )
         }
 
-        val requestBody = origRequest.body() as FormBody
+        val requestBody = origRequest.body as FormBody
         val currentPage: Int = requestBody.value("page_num").toInt()
         val hasNextPage = currentPage < maxPage
 
@@ -108,7 +108,7 @@ class Qiximh : HttpSource() {
     }
 
     private fun commonRankDataParse(response: Response): MangasPage {
-        return commonDataProcess(response.request(), response.body()!!.string())
+        return commonDataProcess(response.request, response.body!!.string())
     }
 
     // Popular Manga
@@ -152,7 +152,7 @@ class Qiximh : HttpSource() {
         }
     }
     override fun searchMangaParse(response: Response): MangasPage {
-        val responseBody = response.body()
+        val responseBody = response.body
         val mangaArr = mutableListOf<SManga>()
 
         if (responseBody != null) {
@@ -160,7 +160,7 @@ class Qiximh : HttpSource() {
             if (!responseString.isNullOrEmpty()) {
                 if (responseString.startsWith("[")) {
                     // This is to process filter
-                    return commonDataProcess(response.request(), responseString)
+                    return commonDataProcess(response.request, responseString)
                 } else {
                     val jsonData = JSONObject(responseString)
                     if (jsonData.get("msg") == "success") {
@@ -255,7 +255,7 @@ class Qiximh : HttpSource() {
             }
         }
 
-        val mangaUrl = response.request().url().toString()
+        val mangaUrl = response.request.url.toString()
 
         val request = POST(
             "$baseUrl/bookchapter/",
@@ -267,7 +267,7 @@ class Qiximh : HttpSource() {
         )
 
         val inlineResponse = client.newCall(request).execute()
-        val jsonData = JSONArray(inlineResponse.body()!!.string())
+        val jsonData = JSONArray(inlineResponse.body!!.string())
 
         val chapterArr = mutableListOf<SChapter>()
         chapterArr.addAll(htmlChapters)
diff --git a/src/zh/tohomh123/src/eu/kanade/tachiyomi/extension/zh/tohomh123/Tohomh.kt b/src/zh/tohomh123/src/eu/kanade/tachiyomi/extension/zh/tohomh123/Tohomh.kt
index 5b5f8f5d1..3334b622b 100644
--- a/src/zh/tohomh123/src/eu/kanade/tachiyomi/extension/zh/tohomh123/Tohomh.kt
+++ b/src/zh/tohomh123/src/eu/kanade/tachiyomi/extension/zh/tohomh123/Tohomh.kt
@@ -145,7 +145,7 @@ class Tohomh : ParsedHttpSource() {
     private val gson = Gson()
 
     override fun imageUrlParse(response: Response): String {
-        return gson.fromJson<JsonObject>(response.body()!!.string())["Code"].asString
+        return gson.fromJson<JsonObject>(response.body!!.string())["Code"].asString
     }
 
     override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")