diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index 316a89b64..335cc6f43 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -57,7 +57,6 @@ import exh.log.XLogLogcatLogger
 import exh.log.xLogD
 import exh.log.xLogE
 import exh.syDebugVersion
-import exh.util.days
 import io.realm.Realm
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -71,6 +70,7 @@ import java.io.File
 import java.security.Security
 import java.text.SimpleDateFormat
 import java.util.Locale
+import kotlin.time.Duration.Companion.days
 
 open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt
index 390b4133a..aa2c40445 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/BiometricTimesController.kt
@@ -22,9 +22,9 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.shrinkOnScroll
-import exh.util.hours
-import exh.util.minutes
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
 import kotlin.time.ExperimentalTime
 
 /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/TimeRange.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/TimeRange.kt
index c1c2e4a81..7d4383c60 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/TimeRange.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/biometric/TimeRange.kt
@@ -2,11 +2,11 @@ package eu.kanade.tachiyomi.ui.category.biometric
 
 import android.content.Context
 import android.text.format.DateFormat
-import exh.util.hours
-import exh.util.minutes
 import java.util.Date
 import java.util.SimpleTimeZone
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
 
 data class TimeRange(private val startTime: Duration, private val endTime: Duration) {
     override fun toString(): String {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index c7f340da8..17644d71e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -52,8 +52,6 @@ import exh.source.isEhBasedManga
 import exh.source.mangaDexSourceIds
 import exh.source.nHentaiSourceIds
 import exh.ui.LoaderManager
-import exh.util.milliseconds
-import exh.util.seconds
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.drop
@@ -69,6 +67,8 @@ import rx.android.schedulers.AndroidSchedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 class LibraryController(
     bundle: Bundle? = null,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 063f2b1e8..db250af4f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -120,6 +120,7 @@ import uy.kohesive.injekt.injectLazy
 import java.io.File
 import kotlin.math.abs
 import kotlin.math.max
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * Activity containing the reader of Tachiyomi. This activity is mostly a container of the
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
index e94b3308b..a0c1fb837 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
@@ -7,14 +7,14 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.category.biometric.TimeRange
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
 import eu.kanade.tachiyomi.util.view.setSecureScreen
-import exh.util.hours
-import exh.util.minutes
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.injectLazy
 import java.util.Calendar
 import java.util.Date
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
 
 class SecureActivityDelegate(private val activity: FragmentActivity) {
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
index 46e4543df..d3242ad75 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
@@ -48,13 +48,8 @@ import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.source.isEhBasedManga
 import exh.uconfig.WarnConfigureDialogController
 import exh.ui.login.EhLoginActivity
-import exh.util.days
 import exh.util.executeOnIO
-import exh.util.hours
-import exh.util.milliseconds
-import exh.util.minutes
 import exh.util.nullIfBlank
-import exh.util.seconds
 import exh.util.trans
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
@@ -66,6 +61,11 @@ import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import uy.kohesive.injekt.injectLazy
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * EH Settings fragment
@@ -584,7 +584,7 @@ class SettingsEhController : SettingsController() {
                     period.inWholeMilliseconds.let {
                         relativeTime.milliseconds = it
                     }
-                    period = 0.milliseconds
+                    period = Duration.ZERO
                 }
             }
         }
diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
index 0011cb4b0..89b505352 100644
--- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
+++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
@@ -33,7 +33,6 @@ import exh.metadata.metadata.base.getFlatMetadataForManga
 import exh.metadata.metadata.base.insertFlatMetadataAsync
 import exh.source.isEhBasedManga
 import exh.util.cancellable
-import exh.util.days
 import exh.util.executeOnIO
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.mapNotNull
@@ -45,6 +44,7 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.days
 
 class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerParameters) :
     CoroutineWorker(context, workerParams) {
diff --git a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
index c8c1e10de..9fe159d97 100644
--- a/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
+++ b/app/src/main/java/exh/md/network/MangaDexLoginHelper.kt
@@ -9,9 +9,9 @@ import exh.md.dto.LoginRequestDto
 import exh.md.dto.RefreshTokenDto
 import exh.md.service.MangaDexAuthService
 import exh.md.utils.MdUtil
-import exh.util.seconds
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.time.Duration.Companion.seconds
 
 class MangaDexLoginHelper(val authServiceLazy: Lazy<MangaDexAuthService>, val preferences: PreferencesHelper, val mdList: MdList) {
     val authService by authServiceLazy
diff --git a/app/src/main/java/exh/md/utils/MdConstants.kt b/app/src/main/java/exh/md/utils/MdConstants.kt
index e52adb727..eabacdd72 100644
--- a/app/src/main/java/exh/md/utils/MdConstants.kt
+++ b/app/src/main/java/exh/md/utils/MdConstants.kt
@@ -1,6 +1,6 @@
 package exh.md.utils
 
-import exh.util.minutes
+import kotlin.time.Duration.Companion.minutes
 
 object MdConstants {
     const val baseUrl = "https://mangadex.org"
diff --git a/app/src/main/java/exh/util/Duration.kt b/app/src/main/java/exh/util/Duration.kt
deleted file mode 100644
index 710bfa0c2..000000000
--- a/app/src/main/java/exh/util/Duration.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package exh.util
-
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
-
-val Int.nanoseconds get() = toDuration(DurationUnit.NANOSECONDS)
-val Long.nanoseconds get() = toDuration(DurationUnit.NANOSECONDS)
-val Double.nanoseconds get() = toDuration(DurationUnit.NANOSECONDS)
-val Int.microseconds get() = toDuration(DurationUnit.MICROSECONDS)
-val Long.microseconds get() = toDuration(DurationUnit.MICROSECONDS)
-val Double.microseconds get() = toDuration(DurationUnit.MICROSECONDS)
-val Int.milliseconds get() = toDuration(DurationUnit.MILLISECONDS)
-val Long.milliseconds get() = toDuration(DurationUnit.MILLISECONDS)
-val Double.milliseconds get() = toDuration(DurationUnit.MILLISECONDS)
-val Int.seconds get() = toDuration(DurationUnit.SECONDS)
-val Long.seconds get() = toDuration(DurationUnit.SECONDS)
-val Double.seconds get() = toDuration(DurationUnit.SECONDS)
-val Int.minutes get() = toDuration(DurationUnit.MINUTES)
-val Long.minutes get() = toDuration(DurationUnit.MINUTES)
-val Double.minutes get() = toDuration(DurationUnit.MINUTES)
-val Int.hours get() = toDuration(DurationUnit.HOURS)
-val Long.hours get() = toDuration(DurationUnit.HOURS)
-val Double.hours get() = toDuration(DurationUnit.HOURS)
-val Int.days get() = toDuration(DurationUnit.DAYS)
-val Long.days get() = toDuration(DurationUnit.DAYS)
-val Double.days get() = toDuration(DurationUnit.DAYS)