diff --git a/app/build.gradle b/app/build.gradle
index f9eae0684..8e0011551 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,10 @@ androidExtensions {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 	kotlinOptions {
 		jvmTarget = JavaVersion.VERSION_1_8.toString()
-		freeCompilerArgs += ['-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi', '-Xjvm-default=all']
+		freeCompilerArgs += [
+				'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+				'-Xopt-in=org.koin.core.component.KoinApiExtension'
+		]
 	}
 }
 dependencies {
@@ -63,42 +66,42 @@ dependencies {
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
-	implementation 'androidx.core:core-ktx:1.5.0-alpha03'
-	implementation 'androidx.activity:activity-ktx:1.2.0-alpha08'
-	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha08'
-	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha07'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+	implementation 'androidx.core:core-ktx:1.5.0-alpha04'
+	implementation 'androidx.activity:activity-ktx:1.2.0-beta01'
+	implementation 'androidx.fragment:fragment-ktx:1.3.0-beta01'
+	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-beta01'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05'
+	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha06'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
 	implementation 'androidx.preference:preference-ktx:1.1.1'
 	implementation 'androidx.work:work-runtime-ktx:2.4.0'
-	implementation 'com.google.android.material:material:1.3.0-alpha02'
+	implementation 'com.google.android.material:material:1.3.0-alpha03'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha07'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-beta01'
 
 	implementation 'androidx.room:room-runtime:2.2.5'
 	implementation 'androidx.room:room-ktx:2.2.5'
 	kapt 'androidx.room:room-compiler:2.2.5'
 
-	implementation 'com.github.moxy-community:moxy:2.1.2'
-	implementation 'com.github.moxy-community:moxy-androidx:2.1.2'
-	implementation 'com.github.moxy-community:moxy-material:2.1.2'
-	implementation 'com.github.moxy-community:moxy-ktx:2.1.2'
-	kapt 'com.github.moxy-community:moxy-compiler:2.1.2'
+	implementation 'com.github.moxy-community:moxy:2.2.0'
+	implementation 'com.github.moxy-community:moxy-androidx:2.2.0'
+	implementation 'com.github.moxy-community:moxy-material:2.2.0'
+	implementation 'com.github.moxy-community:moxy-ktx:2.2.0'
+	kapt 'com.github.moxy-community:moxy-compiler:2.2.0'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-	implementation 'com.squareup.okio:okio:2.8.0'
+	implementation 'com.squareup.okio:okio:2.9.0'
 	implementation 'org.jsoup:jsoup:1.13.1'
 
-	implementation 'org.koin:koin-android:2.2.0-beta-1'
+	implementation 'org.koin:koin-android:2.2.0-rc-2'
 	implementation 'io.coil-kt:coil:1.0.0-rc3'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 	implementation 'com.tomclaw.cache:cache:1.0'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
-	debugImplementation 'com.github.ChuckerTeam.Chucker:library:3.2.0'
-	releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.2.0'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
+	debugImplementation 'com.github.ChuckerTeam.Chucker:library:3.3.0'
+	releaseImplementation 'com.github.ChuckerTeam.Chucker:library-no-op:3.3.0'
 
 	testImplementation 'junit:junit:4.13'
 	testImplementation 'org.json:json:20200518'
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
index b6a6d000c..0828f1155 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubRepository.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.core.github
 
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.utils.ext.await
 import org.koitharu.kotatsu.utils.ext.parseJson
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt
index 484e7f7a9..e8b5a7ebb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt
@@ -7,8 +7,8 @@ import android.webkit.MimeTypeMap
 import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.local.CbzFilter
 import org.koitharu.kotatsu.core.model.*
 import org.koitharu.kotatsu.domain.local.MangaIndex
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaDataRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaDataRepository.kt
index ac2b87645..adbb3b59f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaDataRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaDataRepository.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.domain
 
 import androidx.room.withTransaction
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaLoaderContext.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaLoaderContext.kt
index 583e8775b..0e803519c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaLoaderContext.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaLoaderContext.kt
@@ -4,9 +4,9 @@ import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import org.koin.core.KoinComponent
-import org.koin.core.get
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.SourceConfig
 import org.koitharu.kotatsu.utils.ext.await
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaProviderFactory.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaProviderFactory.kt
index 5cc4a3000..e5d109c77 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaProviderFactory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaProviderFactory.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.domain
 
-import org.koin.core.KoinComponent
-import org.koin.core.get
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.LocalMangaRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaSearchRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaSearchRepository.kt
index d3de9b5d1..10dbdf72d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaSearchRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaSearchRepository.kt
@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.domain
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.SortOrder
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt
index 03323a620..a9a261f4b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt
@@ -6,8 +6,8 @@ import android.util.Size
 import androidx.annotation.WorkerThread
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.get
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.core.prefs.ReaderMode
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
index 70dbf46c9..059c91563 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt
@@ -4,8 +4,8 @@ import androidx.collection.ArraySet
 import androidx.room.withTransaction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.FavouriteCategoryEntity
 import org.koitharu.kotatsu.core.db.entity.FavouriteEntity
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
index b64cdbd81..d374b21d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt
@@ -4,8 +4,8 @@ import androidx.collection.ArraySet
 import androidx.room.withTransaction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.HistoryEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.domain.tracking.TrackingRepository
-import java.util.*
 
 class HistoryRepository : KoinComponent {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/tracking/TrackingRepository.kt b/app/src/main/java/org/koitharu/kotatsu/domain/tracking/TrackingRepository.kt
index 774f5af96..9f6df13f3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/domain/tracking/TrackingRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/tracking/TrackingRepository.kt
@@ -1,8 +1,8 @@
 package org.koitharu.kotatsu.domain.tracking
 
 import androidx.room.withTransaction
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.TrackEntity
 import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
@@ -27,7 +27,8 @@ class TrackingRepository : KoinComponent {
 		return mangas.mapNotNull { me ->
 			var manga = me.toManga()
 			if (manga.source == MangaSource.LOCAL) {
-				manga = MangaProviderFactory.createLocal().getRemoteManga(manga) ?: return@mapNotNull null
+				manga = MangaProviderFactory.createLocal().getRemoteManga(manga)
+					?: return@mapNotNull null
 			}
 			val track = tracks[manga.id]?.singleOrNull()
 			MangaTracking(
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt b/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt
index 8245b2dbd..bda99170d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt
@@ -7,8 +7,8 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.utils.ext.safe
 
 class BrowserClient(private val callback: BrowserCallback) : WebViewClient(), KoinComponent {
@@ -38,7 +38,10 @@ class BrowserClient(private val callback: BrowserCallback) : WebViewClient(), Ko
 		return url?.let(::doRequest)
 	}
 
-	override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
+	override fun shouldInterceptRequest(
+		view: WebView?,
+		request: WebResourceRequest?
+	): WebResourceResponse? {
 		return request?.url?.toString()?.let(::doRequest)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt
index f6cb18b76..996f26d94 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/common/BaseActivity.kt
@@ -4,10 +4,9 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import moxy.MvpAppCompatActivity
-import org.koin.core.KoinComponent
 import org.koitharu.kotatsu.R
 
-abstract class BaseActivity : MvpAppCompatActivity(), KoinComponent {
+abstract class BaseActivity : MvpAppCompatActivity() {
 
 	override fun setContentView(layoutResID: Int) {
 		super.setContentView(layoutResID)
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/common/BasePresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/common/BasePresenter.kt
index 8b92be6dd..f41d77eb2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/common/BasePresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/common/BasePresenter.kt
@@ -2,6 +2,6 @@ package org.koitharu.kotatsu.ui.common
 
 import moxy.MvpPresenter
 import moxy.MvpView
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 
 abstract class BasePresenter<V : MvpView> : MvpPresenter<V>(), KoinComponent
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseRecyclerAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseRecyclerAdapter.kt
index 073a23af5..e5fa1da0b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseRecyclerAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseRecyclerAdapter.kt
@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.ui.common.list
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import okhttp3.internal.toImmutableList
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 import org.koitharu.kotatsu.utils.ext.replaceWith
 
 abstract class BaseRecyclerAdapter<T, E>(private val onItemClickListener: OnRecyclerItemClickListener<T>? = null) :
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseViewHolder.kt b/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseViewHolder.kt
index 37f82fbf0..44185f22e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseViewHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/common/list/BaseViewHolder.kt
@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.extensions.LayoutContainer
-import org.koin.core.KoinComponent
+import org.koin.core.component.KoinComponent
 import org.koitharu.kotatsu.utils.ext.inflate
 
 abstract class BaseViewHolder<T, E> protected constructor(view: View) :
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
index 17633fbc1..4cc046bfe 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt
@@ -17,7 +17,7 @@ import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_main.*
 import moxy.ktx.moxyPresenter
-import org.koin.core.inject
+import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSection
@@ -194,7 +194,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 	}
 
 	private fun openDefaultSection() {
-		when(settings.defaultSection) {
+		when (settings.defaultSection) {
 			AppSection.LOCAL -> {
 				navigationView.setCheckedItem(R.id.nav_local_storage)
 				setPrimaryFragment(LocalListFragment.newInstance())
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
index 37d09c0c8..f3d5cca1d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/history/HistoryListPresenter.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moxy.InjectViewState
 import moxy.presenterScope
-import org.koin.core.get
+import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaHistory
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
index 0d755809c..3c99e52c6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/list/local/LocalListPresenter.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import moxy.InjectViewState
 import moxy.presenterScope
-import org.koin.core.get
+import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.model.Manga
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt
index e69127145..6d9724dd3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt
@@ -9,8 +9,8 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.local.PagesCache
 import org.koitharu.kotatsu.utils.CacheUtils
 import org.koitharu.kotatsu.utils.ext.await
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt
index 3ae531fdc..96ca1e6b8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt
@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import moxy.MvpDelegate
 import moxy.ktx.moxyPresenter
-import org.koin.core.inject
+import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaChapter
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderPresenter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderPresenter.kt
index 2bc094545..a94ccb9dc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderPresenter.kt
@@ -7,7 +7,7 @@ import moxy.InjectViewState
 import moxy.presenterScope
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.koin.core.get
+import org.koin.core.component.get
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaPage
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/thumbnails/PagesThumbnailsAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/thumbnails/PagesThumbnailsAdapter.kt
index 10b12e1df..8daf0f9ab 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/thumbnails/PagesThumbnailsAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/thumbnails/PagesThumbnailsAdapter.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.DisposableHandle
 import kotlinx.coroutines.SupervisorJob
-import org.koin.core.inject
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.local.PagesCache
 import org.koitharu.kotatsu.core.model.MangaPage
 import org.koitharu.kotatsu.ui.common.list.BaseRecyclerAdapter
@@ -13,21 +13,22 @@ import org.koitharu.kotatsu.ui.common.list.OnRecyclerItemClickListener
 import kotlin.coroutines.CoroutineContext
 
 class PagesThumbnailsAdapter(onItemClickListener: OnRecyclerItemClickListener<MangaPage>?) :
-    BaseRecyclerAdapter<MangaPage, PagesCache>(onItemClickListener), CoroutineScope, DisposableHandle {
+	BaseRecyclerAdapter<MangaPage, PagesCache>(onItemClickListener), CoroutineScope,
+	DisposableHandle {
 
-    private val job = SupervisorJob()
-    private val cache by inject<PagesCache>()
+	private val job = SupervisorJob()
+	private val cache by inject<PagesCache>()
 
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
+	override val coroutineContext: CoroutineContext
+		get() = Dispatchers.Main + job
 
-    override fun dispose() {
-        job.cancel()
-    }
+	override fun dispose() {
+		job.cancel()
+	}
 
-    override fun getExtra(item: MangaPage, position: Int) = cache
+	override fun getExtra(item: MangaPage, position: Int) = cache
 
-    override fun onCreateViewHolder(parent: ViewGroup) = PageThumbnailHolder(parent, this)
+	override fun onCreateViewHolder(parent: ViewGroup) = PageThumbnailHolder(parent, this)
 
-    override fun onGetItemId(item: MangaPage) = item.id
+	override fun onGetItemId(item: MangaPage) = item.id
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/AppUpdateChecker.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/AppUpdateChecker.kt
index 77ffa9cb5..6eac3ce7a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/AppUpdateChecker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/AppUpdateChecker.kt
@@ -12,8 +12,8 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.github.AppVersion
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/SourceSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/SourceSettingsFragment.kt
index 15d1d63a9..ac559e581 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/SourceSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/SourceSettingsFragment.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.ui.settings
 import android.os.Bundle
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceFragmentCompat
-import org.koin.core.KoinComponent
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@@ -11,7 +10,7 @@ import org.koitharu.kotatsu.domain.MangaProviderFactory
 import org.koitharu.kotatsu.ui.settings.utils.EditTextSummaryProvider
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class SourceSettingsFragment : PreferenceFragmentCompat(), KoinComponent {
+class SourceSettingsFragment : PreferenceFragmentCompat() {
 
 	private val source by lazy(LazyThreadSafetyMode.NONE) {
 		requireArguments().getParcelable<MangaSource>(EXTRA_SOURCE)!!
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesAdapter.kt
index a2bd052e8..4081dc37b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/settings/sources/SourcesAdapter.kt
@@ -5,8 +5,8 @@ import android.view.MotionEvent
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.item_source_config.*
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.domain.MangaProviderFactory
@@ -51,7 +51,11 @@ class SourcesAdapter(private val onItemClickListener: OnRecyclerItemClickListene
 		}
 		holder.imageView_handle.setOnTouchListener { v, event ->
 			if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-				onItemClickListener.onItemLongClick(holder.requireData(), holder.bindingAdapterPosition, v)
+				onItemClickListener.onItemLongClick(
+					holder.requireData(),
+					holder.bindingAdapterPosition,
+					v
+				)
 			} else {
 				false
 			}
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
index 289e1f893..fcc6d8bfc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/tracker/TrackWorker.kt
@@ -13,8 +13,8 @@ import coil.Coil
 import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaChapter