diff --git a/app/src/main/java/com/topjohnwu/magisk/core/App.kt b/app/src/main/java/com/topjohnwu/magisk/core/App.kt
index b81b9bba2..4adab55bd 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/App.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/App.kt
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.core.utils.RootInit
 import com.topjohnwu.magisk.core.utils.updateConfig
 import com.topjohnwu.magisk.di.koinModules
-import com.topjohnwu.magisk.extensions.unwrap
+import com.topjohnwu.magisk.ktx.unwrap
 import com.topjohnwu.superuser.Shell
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Config.kt b/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
index a847e665f..16c93fbe5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
@@ -13,8 +13,8 @@ import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.repository.DBConfig
 import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.inject
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.inject
 import com.topjohnwu.magisk.model.preference.PreferenceModel
 import com.topjohnwu.magisk.ui.theme.Theme
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
index ea243b962..701a2bc47 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
@@ -8,7 +8,7 @@ import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.core.view.Shortcuts
-import com.topjohnwu.magisk.extensions.reboot
+import com.topjohnwu.magisk.ktx.reboot
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt b/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
index 35026da39..b73dc51ba 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.utils.refreshLocale
 import com.topjohnwu.magisk.core.utils.updateConfig
-import com.topjohnwu.magisk.extensions.forceGetDeclaredField
+import com.topjohnwu.magisk.ktx.forceGetDeclaredField
 import com.topjohnwu.magisk.ui.MainActivity
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
index ee86c7235..57aa98b3c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
@@ -4,8 +4,8 @@ import androidx.databinding.ObservableField
 import com.topjohnwu.magisk.DynAPK
 import com.topjohnwu.magisk.core.model.UpdateInfo
 import com.topjohnwu.magisk.core.net.NetworkObserver
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.utils.CachedValue
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils.fastCmd
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
index 41d68b2d2..080d13a67 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/SplashActivity.kt
@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.core.view.Shortcuts
 import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.model.navigation.Navigation
 import com.topjohnwu.superuser.Shell
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt b/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
index 826843d4c..be4dc38aa 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
@@ -11,7 +11,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.extensions.set
+import com.topjohnwu.magisk.ktx.set
 import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
 import kotlin.random.Random
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
index 868057295..0103290a7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
@@ -10,9 +10,9 @@ import android.webkit.MimeTypeMap
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.tasks.EnvFixTask
-import com.topjohnwu.magisk.extensions.chooser
-import com.topjohnwu.magisk.extensions.exists
-import com.topjohnwu.magisk.extensions.provide
+import com.topjohnwu.magisk.ktx.chooser
+import com.topjohnwu.magisk.ktx.exists
+import com.topjohnwu.magisk.ktx.provide
 import com.topjohnwu.magisk.model.entity.internal.Configuration.*
 import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerUpgrade.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerUpgrade.kt
index 4431225f3..bd0753a7a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerUpgrade.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/ManagerUpgrade.kt
@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.utils.PatchAPK
-import com.topjohnwu.magisk.extensions.writeTo
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt
index 2787d4127..6c14d7242 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/ModuleProcessor.kt
@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.core.download
 
-import com.topjohnwu.magisk.extensions.withStreams
+import com.topjohnwu.magisk.ktx.withStreams
 import java.io.File
 import java.io.InputStream
 import java.util.zip.ZipEntry
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt
index 66b5d504b..e68c217c8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/RemoteFileService.kt
@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.core.ForegroundTracker
 import com.topjohnwu.magisk.core.utils.ProgressInputStream
 import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.writeTo
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Module
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt b/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt
index 62b16faf9..9b0342cd4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt
@@ -6,7 +6,7 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.model.toMap
 import com.topjohnwu.magisk.core.model.toPolicy
-import com.topjohnwu.magisk.extensions.now
+import com.topjohnwu.magisk.ktx.now
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/Query.kt b/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/Query.kt
index 50900feb3..61c04f1e3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/Query.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/magiskdb/Query.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.core.magiskdb
 
 import androidx.annotation.StringDef
-import com.topjohnwu.magisk.extensions.await
+import com.topjohnwu.magisk.ktx.await
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/model/MagiskPolicy.kt b/app/src/main/java/com/topjohnwu/magisk/core/model/MagiskPolicy.kt
index aebdd20f4..881965482 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/model/MagiskPolicy.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/model/MagiskPolicy.kt
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.model
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.INTERACTIVE
-import com.topjohnwu.magisk.extensions.getLabel
+import com.topjohnwu.magisk.ktx.getLabel
 
 
 data class MagiskPolicy(
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/model/module/Repo.kt b/app/src/main/java/com/topjohnwu/magisk/core/model/module/Repo.kt
index 04e6e097c..291c839aa 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/model/module/Repo.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/model/module/Repo.kt
@@ -5,8 +5,8 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.StringRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.legalFilename
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.legalFilename
 import kotlinx.android.parcel.Parcelize
 import java.text.DateFormat
 import java.util.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt b/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
index f1a63ca79..79514f9e1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
@@ -16,9 +16,9 @@ import com.topjohnwu.magisk.core.model.toPolicy
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.startActivity
-import com.topjohnwu.magisk.extensions.startActivityWithRoot
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.startActivity
+import com.topjohnwu.magisk.ktx.startActivityWithRoot
 import com.topjohnwu.magisk.model.entity.toLog
 import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt b/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
index d3736bd2a..731077351 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.model.toPolicy
-import com.topjohnwu.magisk.extensions.now
+import com.topjohnwu.magisk.ktx.now
 import kotlinx.coroutines.*
 import timber.log.Timber
 import java.io.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
index 91f0570c2..b1a23fc73 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
@@ -5,8 +5,8 @@ import android.net.Uri
 import androidx.core.os.postDelayed
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.utils.unzip
-import com.topjohnwu.magisk.extensions.fileName
-import com.topjohnwu.magisk.extensions.readUri
+import com.topjohnwu.magisk.ktx.fileName
+import com.topjohnwu.magisk.ktx.readUri
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index e1f2254e3..537aa90ee 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -15,9 +15,9 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.di.Protected
-import com.topjohnwu.magisk.extensions.readUri
-import com.topjohnwu.magisk.extensions.reboot
-import com.topjohnwu.magisk.extensions.withStreams
+import com.topjohnwu.magisk.ktx.readUri
+import com.topjohnwu.magisk.ktx.reboot
+import com.topjohnwu.magisk.ktx.withStreams
 import com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
 import com.topjohnwu.signing.SignBoot
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
index e34df967b..2956fb1d1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/Locales.kt
@@ -11,8 +11,8 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.ResMgr
 import com.topjohnwu.magisk.core.addAssetPath
-import com.topjohnwu.magisk.extensions.langTagToLocale
-import com.topjohnwu.magisk.extensions.toLangTag
+import com.topjohnwu.magisk.ktx.langTagToLocale
+import com.topjohnwu.magisk.ktx.toLangTag
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.util.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
index a9658f5a1..af7502dd3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/PatchAPK.kt
@@ -10,8 +10,8 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.view.Notifications
 import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.writeTo
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.signing.JarMap
 import com.topjohnwu.signing.SignAPK
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
index 7b099cfcc..6d38d656a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
@@ -5,7 +5,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.wrap
-import com.topjohnwu.magisk.extensions.rawResource
+import com.topjohnwu.magisk.ktx.rawResource
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
index 049c97d72..6be087477 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/Utils.kt
@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.UpdateCheckService
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import java.io.File
 import java.util.concurrent.TimeUnit
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt b/app/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt
index a0fe52183..fec42f689 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt
@@ -13,8 +13,8 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.*
 import com.topjohnwu.magisk.core.Const.ID.PROGRESS_NOTIFICATION_CHANNEL
 import com.topjohnwu.magisk.core.Const.ID.UPDATE_NOTIFICATION_CHANNEL
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.getBitmap
+import com.topjohnwu.magisk.ktx.get
+import com.topjohnwu.magisk.ktx.getBitmap
 
 object Notifications {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt b/app/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt
index cb9b0b58c..9cff55379 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt
@@ -16,7 +16,7 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.SplashActivity
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.utils.Utils
-import com.topjohnwu.magisk.extensions.getBitmap
+import com.topjohnwu.magisk.ktx.getBitmap
 
 object Shortcuts {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt b/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
index 8b88f98f3..58604dcb2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/LogRepository.kt
@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.data.repository
 
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.database.SuLogDao
-import com.topjohnwu.magisk.extensions.await
+import com.topjohnwu.magisk.ktx.await
 import com.topjohnwu.magisk.model.entity.MagiskLog
 import com.topjohnwu.superuser.Shell
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt b/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt
index 6936e38d5..dbb5bafae 100644
--- a/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt
@@ -4,9 +4,9 @@ import android.content.pm.PackageManager
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.await
-import com.topjohnwu.magisk.extensions.getLabel
-import com.topjohnwu.magisk.extensions.packageName
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.magisk.ktx.getLabel
+import com.topjohnwu.magisk.ktx.packageName
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt b/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt
index 61fcb7e10..fd6f5a69e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersGeneric.kt
@@ -7,7 +7,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.widget.TextViewCompat
 import androidx.databinding.BindingAdapter
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.get
 import io.noties.markwon.Markwon
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
diff --git a/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersRecycler.kt b/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersRecycler.kt
index 9815383b3..c8ef22a60 100644
--- a/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersRecycler.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/databinding/AdaptersRecycler.kt
@@ -4,8 +4,8 @@ import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.InsetDrawable
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.topjohnwu.magisk.extensions.startEndToLeftRight
-import com.topjohnwu.magisk.extensions.toPx
+import com.topjohnwu.magisk.ktx.startEndToLeftRight
+import com.topjohnwu.magisk.ktx.toPx
 import com.topjohnwu.magisk.utils.KItemDecoration
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/DataBinding.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/DataBinding.kt
similarity index 97%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/DataBinding.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/DataBinding.kt
index 45352929c..812918e43 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/DataBinding.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/DataBinding.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import androidx.databinding.Observable
 import androidx.databinding.ObservableBoolean
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/Dimens.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/Dimens.kt
similarity index 87%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/Dimens.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/Dimens.kt
index 77c5d3439..e009de17e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/Dimens.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/Dimens.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.content.res.Resources
 import kotlin.math.ceil
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/Snackbar.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/Snackbar.kt
similarity index 98%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/Snackbar.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/Snackbar.kt
index a9e5e133f..150c537c4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/Snackbar.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/Snackbar.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -123,4 +123,4 @@ fun Snackbar.alert() {
 
 fun Snackbar.success() {
     textColor(0x4CAF50)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
similarity index 99%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
index 3cc8a6be6..b351409cb 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.app.Activity
 import android.content.ComponentName
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XBinding.kt
similarity index 98%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XBinding.kt
index dec32e851..59bbf6128 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XBinding.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XBinding.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import androidx.databinding.ObservableField
 import androidx.databinding.ObservableList
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
similarity index 99%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
index 4a149528e..53adb4b5c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XJava.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XJava.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.os.Build
 import timber.log.Timber
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
similarity index 84%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
index c4f1e5576..a6f0a8246 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XKoin.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import org.koin.core.context.KoinContextHandler
 import org.koin.core.parameter.ParametersDefinition
@@ -14,4 +14,4 @@ inline fun <reified T> inject(
 inline fun <reified T> get(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
-): T = getKoin().get(qualifier, parameters)
\ No newline at end of file
+): T = getKoin().get(qualifier, parameters)
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XList.kt
similarity index 98%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XList.kt
index 6dc6812d7..93822f1bc 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XList.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XList.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import androidx.collection.SparseArrayCompat
 import androidx.databinding.ObservableList
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XSU.kt
similarity index 90%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XSU.kt
index 236cc2bc4..d13efc0f6 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XSU.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XSU.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XString.kt
similarity index 97%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XString.kt
index 26b1a0ac9..c48027411 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XString.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XString.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.content.res.Resources
 import android.os.Build
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XTime.kt
similarity index 95%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XTime.kt
index 7b513cbed..ab8c6a8db 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XTime.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XTime.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import com.topjohnwu.magisk.core.utils.currentLocale
 import java.text.DateFormat
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XView.kt
similarity index 95%
rename from app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt
rename to app/src/main/java/com/topjohnwu/magisk/ktx/XView.kt
index 16183dd61..ec51d0b50 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XView.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XView.kt
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.extensions
+package com.topjohnwu.magisk.ktx
 
 import android.view.View
 import android.view.ViewGroup
@@ -20,4 +20,4 @@ fun View.addOnGlobalLayoutListener(oneShot: Boolean = false, callback: () -> Uni
 fun ViewGroup.startAnimations() {
     val transition = AutoTransition().setInterpolator(FastOutSlowInInterpolator()).setDuration(400)
     TransitionManager.beginDelayedTransition(this, transition)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt
index 73d1410ea..f14fea6af 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/HideAppInfo.kt
@@ -2,8 +2,8 @@ package com.topjohnwu.magisk.model.entity
 
 import android.content.pm.ApplicationInfo
 import android.graphics.drawable.Drawable
-import com.topjohnwu.magisk.extensions.packageInfo
-import com.topjohnwu.magisk.extensions.processes
+import com.topjohnwu.magisk.ktx.packageInfo
+import com.topjohnwu.magisk.ktx.processes
 
 class HideAppInfo(
     val info: ApplicationInfo,
@@ -24,4 +24,4 @@ data class StatefulProcess(
 class ProcessHideApp(
     val info: HideAppInfo,
     val processes: List<StatefulProcess>
-)
\ No newline at end of file
+)
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt
index 6eea78783..a9a47ed68 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt
@@ -5,9 +5,9 @@ import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.ALLOW
-import com.topjohnwu.magisk.extensions.now
-import com.topjohnwu.magisk.extensions.timeFormatTime
-import com.topjohnwu.magisk.extensions.toTime
+import com.topjohnwu.magisk.ktx.now
+import com.topjohnwu.magisk.ktx.timeFormatTime
+import com.topjohnwu.magisk.ktx.toTime
 
 @Entity(tableName = "logs")
 data class MagiskLog(
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
index 97cb26d04..df7091923 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
@@ -7,8 +7,8 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.model.MagiskJson
 import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.core.model.module.Repo
-import com.topjohnwu.magisk.extensions.cachedFile
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.cachedFile
+import com.topjohnwu.magisk.ktx.get
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 import java.io.File
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt
index 11ba41d0d..24c13030f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt
@@ -5,10 +5,10 @@ import android.view.ViewGroup
 import androidx.databinding.ObservableField
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.extensions.startAnimations
-import com.topjohnwu.magisk.extensions.toggle
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.ktx.startAnimations
+import com.topjohnwu.magisk.ktx.toggle
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.ProcessHideApp
 import com.topjohnwu.magisk.model.entity.StatefulProcess
 import com.topjohnwu.magisk.model.observer.Observer
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt
index fe919e39a..f7f4dcffa 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt
@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.model.entity.recycler
 import androidx.databinding.Bindable
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.extensions.timeDateFormat
-import com.topjohnwu.magisk.extensions.toTime
+import com.topjohnwu.magisk.ktx.timeDateFormat
+import com.topjohnwu.magisk.ktx.toTime
 import com.topjohnwu.magisk.model.entity.MagiskLog
 
 class LogItem(val item: MagiskLog) : ObservableItem<LogItem>() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt
index 9974e50c8..dd0594bd1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt
@@ -7,8 +7,8 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.toggle
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.toggle
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
 
 class PolicyItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyItem>() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/RebootEvent.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/RebootEvent.kt
index e6949f04e..b64dfa23f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/RebootEvent.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/RebootEvent.kt
@@ -6,7 +6,7 @@ import android.widget.PopupMenu
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.superuser.Shell
-import com.topjohnwu.magisk.extensions.reboot as systemReboot
+import com.topjohnwu.magisk.ktx.reboot as systemReboot
 
 object RebootEvent {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt
index 73b57e1ee..c24a95d3a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.annotation.StringRes
 import com.google.android.material.snackbar.Snackbar
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.extensions.snackbar
+import com.topjohnwu.magisk.ktx.snackbar
 import com.topjohnwu.magisk.ui.base.BaseUIActivity
 
 class SnackbarEvent private constructor(
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
index dc80ab2e7..9496f0c9f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
@@ -9,8 +9,8 @@ import com.topjohnwu.magisk.core.base.BaseActivity
 import com.topjohnwu.magisk.core.model.module.Repo
 import com.topjohnwu.magisk.core.utils.SafetyNetHelper
 import com.topjohnwu.magisk.data.network.GithubRawServices
-import com.topjohnwu.magisk.extensions.DynamicClassLoader
-import com.topjohnwu.magisk.extensions.writeTo
+import com.topjohnwu.magisk.ktx.DynamicClassLoader
+import com.topjohnwu.magisk.ktx.writeTo
 import com.topjohnwu.magisk.ui.safetynet.SafetyNetResult
 import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.MarkDownWindow
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/ManagerInstallDialog.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/ManagerInstallDialog.kt
index c10d572b1..9c8e62660 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/ManagerInstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/ManagerInstallDialog.kt
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.model.events.dialog
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.DownloadService
-import com.topjohnwu.magisk.extensions.res
+import com.topjohnwu.magisk.ktx.res
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.view.MagiskDialog
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt
index fbe0cd6fa..28779c028 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class BooleanProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt
index f2f223f12..ba41fbdf8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class FloatProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt
index e40164949..1122f6703 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class IntProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt
index 4a0738a7f..390eea788 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class LongProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt
index c5777f0e1..5e6e464df 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class StringProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt
index 49e20926c..435cadc70 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt
@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.preference
 
 import androidx.core.content.edit
-import com.topjohnwu.magisk.extensions.trimEmptyToNull
+import com.topjohnwu.magisk.ktx.trimEmptyToNull
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +27,4 @@ class StringSetProperty(
         val prefName = name.trimEmptyToNull() ?: property.name
         thisRef.prefs.edit(commit) { put(prefName, value) }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
index 3b822fffd..ac5d3d147 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
@@ -16,7 +16,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
-import com.topjohnwu.magisk.extensions.startAnimations
+import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.magisk.ui.base.BaseUIActivity
 import com.topjohnwu.magisk.ui.home.HomeFragmentDirections
 import com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
index 5b3268247..b103fbed2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
@@ -18,9 +18,9 @@ import androidx.navigation.findNavController
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.base.BaseActivity
-import com.topjohnwu.magisk.extensions.snackbar
-import com.topjohnwu.magisk.extensions.startAnimations
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.snackbar
+import com.topjohnwu.magisk.ktx.startAnimations
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.events.SnackbarEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIFragment.kt
index ee0e908d2..f10c2a55d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIFragment.kt
@@ -12,7 +12,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavDirections
 import com.topjohnwu.magisk.BR
-import com.topjohnwu.magisk.extensions.startAnimations
+import com.topjohnwu.magisk.ktx.startAnimations
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.events.ViewEvent
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/CompatDelegate.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/CompatDelegate.kt
index f6fad1265..84ec1b91a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/CompatDelegate.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/CompatDelegate.kt
@@ -5,7 +5,7 @@ import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.events.ActivityExecutor
 import com.topjohnwu.magisk.model.events.ContextExecutor
 import com.topjohnwu.magisk.model.events.FragmentExecutor
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index 36f9e1c87..e4de9af20 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.core.tasks.FlashZip
 import com.topjohnwu.magisk.core.tasks.MagiskInstaller
 import com.topjohnwu.magisk.core.view.Notifications
-import com.topjohnwu.magisk.extensions.*
+import com.topjohnwu.magisk.ktx.*
 import com.topjohnwu.magisk.model.binding.BindingAdapter
 import com.topjohnwu.magisk.model.entity.recycler.ConsoleItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
index c8be5377d..43d9236ef 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideFragment.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentHideMd2Binding
-import com.topjohnwu.magisk.extensions.hideKeyboard
+import com.topjohnwu.magisk.ktx.hideKeyboard
 import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.MotionRevealHelper
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
index 1d9a5c5f3..9abb75430 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.data.repository.MagiskRepository
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.magisk.model.entity.ProcessHideApp
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index 3751027b2..b7ed04998 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -12,10 +12,10 @@ import com.topjohnwu.magisk.core.download.RemoteFileService
 import com.topjohnwu.magisk.core.model.MagiskJson
 import com.topjohnwu.magisk.core.model.ManagerJson
 import com.topjohnwu.magisk.data.repository.MagiskRepository
-import com.topjohnwu.magisk.extensions.await
-import com.topjohnwu.magisk.extensions.packageName
-import com.topjohnwu.magisk.extensions.res
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.await
+import com.topjohnwu.magisk.ktx.packageName
+import com.topjohnwu.magisk.ktx.res
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Manager
 import com.topjohnwu.magisk.model.entity.recycler.DeveloperItem
 import com.topjohnwu.magisk.model.entity.recycler.HomeItem
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
index cf26b4886..e19012502 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.events.RequestFileEvent
 import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index d9a810be1..c3c99d256 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -10,8 +10,8 @@ import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.RemoteFileService
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.repository.StringRepository
-import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.addOnPropertyChangedCallback
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.events.RequestFileEvent
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
index 4fb1bfaf2..b2c35ff21 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
@@ -7,7 +7,7 @@ import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.Const
 import com.topjohnwu.magisk.data.repository.LogRepository
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.recycler.LogItem
 import com.topjohnwu.magisk.model.entity.recycler.TextItem
 import com.topjohnwu.magisk.model.events.SnackbarEvent
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
index 3f194608d..766899563 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
-import com.topjohnwu.magisk.extensions.hideKeyboard
+import com.topjohnwu.magisk.ktx.hideKeyboard
 import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
 import com.topjohnwu.magisk.ui.MainActivity
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
index c84399c97..3da68f51f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
@@ -14,9 +14,9 @@ import com.topjohnwu.magisk.core.tasks.RepoUpdater
 import com.topjohnwu.magisk.data.database.RepoByNameDao
 import com.topjohnwu.magisk.data.database.RepoByUpdatedDao
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.addOnListChangedCallback
-import com.topjohnwu.magisk.extensions.reboot
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.addOnListChangedCallback
+import com.topjohnwu.magisk.ktx.reboot
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.recycler.*
 import com.topjohnwu.magisk.model.events.InstallExternalModuleEvent
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
index 4756ca186..d29e3bf47 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
@@ -4,7 +4,7 @@ import androidx.databinding.Bindable
 import androidx.databinding.ObservableField
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.events.CheckSafetyNetEvent
 import com.topjohnwu.magisk.ui.base.BaseViewModel
 import com.topjohnwu.magisk.ui.safetynet.SafetyNetState.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
index f6816a7b4..7f1d9efd7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.core.utils.*
 import com.topjohnwu.magisk.databinding.DialogSettingsAppNameBinding
 import com.topjohnwu.magisk.databinding.DialogSettingsDownloadPathBinding
 import com.topjohnwu.magisk.databinding.DialogSettingsUpdateChannelBinding
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
 import com.topjohnwu.magisk.utils.asTransitive
 import com.topjohnwu.superuser.Shell
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
index 81c09109a..9ca99eaf0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
@@ -12,7 +12,7 @@ import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.utils.PatchAPK
 import com.topjohnwu.magisk.core.utils.Utils
 import com.topjohnwu.magisk.data.database.RepoDao
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
index 9cccd1a72..e8759f05f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
@@ -11,7 +11,7 @@ import com.topjohnwu.magisk.core.model.MagiskPolicy
 import com.topjohnwu.magisk.core.utils.BiometricHelper
 import com.topjohnwu.magisk.core.utils.currentLocale
 import com.topjohnwu.magisk.databinding.ComparableRvItem
-import com.topjohnwu.magisk.extensions.toggle
+import com.topjohnwu.magisk.ktx.toggle
 import com.topjohnwu.magisk.model.entity.recycler.PolicyItem
 import com.topjohnwu.magisk.model.entity.recycler.TappableHeadlineItem
 import com.topjohnwu.magisk.model.entity.recycler.TextItem
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
index 9e73e3bdb..d097967ff 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
@@ -15,7 +15,7 @@ import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.ALLOW
 import com.topjohnwu.magisk.core.model.MagiskPolicy.Companion.DENY
 import com.topjohnwu.magisk.core.su.SuRequestHandler
 import com.topjohnwu.magisk.core.utils.BiometricHelper
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.model.entity.recycler.SpinnerRvItem
 import com.topjohnwu.magisk.model.events.DieEvent
 import com.topjohnwu.magisk.ui.base.BaseViewModel
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
index bbad3a7a0..ccb943814 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
@@ -21,7 +21,7 @@ import com.google.android.material.card.MaterialCardView
 import com.google.android.material.chip.Chip
 import com.google.android.material.textfield.TextInputLayout
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.extensions.replaceRandomWithSpecial
+import com.topjohnwu.magisk.ktx.replaceRandomWithSpecial
 import com.topjohnwu.superuser.internal.UiThreadHandler
 import kotlinx.coroutines.*
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/KItemDecoration.kt b/app/src/main/java/com/topjohnwu/magisk/utils/KItemDecoration.kt
index 28887ad2d..24c5017c2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/KItemDecoration.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/KItemDecoration.kt
@@ -9,7 +9,7 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.get
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
-import com.topjohnwu.magisk.extensions.drawableCompat
+import com.topjohnwu.magisk.ktx.drawableCompat
 import kotlin.math.roundToInt
 
 class KItemDecoration(
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/TransitiveText.kt b/app/src/main/java/com/topjohnwu/magisk/utils/TransitiveText.kt
index 7181223b6..3dfa0a864 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/TransitiveText.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/TransitiveText.kt
@@ -4,7 +4,7 @@ import android.content.res.Resources
 import android.widget.TextView
 import androidx.databinding.BindingAdapter
 import androidx.databinding.InverseBindingAdapter
-import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.ktx.get
 
 sealed class TransitiveText {
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
index b0eff1453..d8963b603 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
@@ -23,7 +23,7 @@ import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.databinding.DialogMagiskBaseBinding
-import com.topjohnwu.magisk.extensions.value
+import com.topjohnwu.magisk.ktx.value
 import com.topjohnwu.magisk.ui.base.itemBindingOf
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapters
 import me.tatarka.bindingcollectionadapter2.ItemBinding