diff --git a/app/build.gradle b/app/build.gradle
index d0cbf524..3253aca2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,6 +98,8 @@ static def surroundWithQuotes(Object[] arr) {
 
 dependencies {
 
+    implementation project(":core-ui")
+
 // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/AppDownloadDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/AppDownloadDialog.kt
index 43c0810c..8f61e6ee 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/AppDownloadDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/AppDownloadDialog.kt
@@ -15,8 +15,8 @@ import com.vanced.manager.R
 import com.vanced.manager.core.downloader.MicrogDownloader.downloadMicrog
 import com.vanced.manager.core.downloader.MusicDownloader.downloadMusic
 import com.vanced.manager.core.downloader.VancedDownloader.downloadVanced
+import com.vanced.manager.core.ui.base.BindingDialogFragment
 import com.vanced.manager.databinding.DialogAppDownloadBinding
-import com.vanced.manager.ui.core.BindingDialogFragment
 import com.vanced.manager.utils.DownloadHelper.downloadProgress
 
 class AppDownloadDialog : BindingDialogFragment<DialogAppDownloadBinding>() {
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/AppInfoDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/AppInfoDialog.kt
index 517e881e..6f5157a3 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/AppInfoDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/AppInfoDialog.kt
@@ -8,8 +8,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.graphics.drawable.toBitmap
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingDialogFragment
 import com.vanced.manager.databinding.DialogAppInfoBinding
-import com.vanced.manager.ui.core.BindingDialogFragment
 
 class AppInfoDialog : BindingDialogFragment<DialogAppInfoBinding>() {
 
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
index 1e7805c3..53635097 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
@@ -7,11 +7,11 @@ import android.view.ViewGroup
 import androidx.core.content.edit
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogBottomRadioButtonBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
 import com.vanced.manager.utils.Extensions.getDefaultPrefs
-import com.vanced.manager.utils.Extensions.show
 
 class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRadioButtonBinding>() {
 
@@ -83,9 +83,9 @@ class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRa
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         if (arguments?.getString(TAG_APP) == "vanced") {
-            VancedPreferencesDialog().show(requireActivity())
+            showDialog(VancedPreferencesDialog())
         } else {
-            MusicPreferencesDialog().show(requireActivity())
+            showDialog(MusicPreferencesDialog())
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/InstallationFilesDetectedDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/InstallationFilesDetectedDialog.kt
index 5d1cbd77..c2b7b9a3 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/InstallationFilesDetectedDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/InstallationFilesDetectedDialog.kt
@@ -8,9 +8,9 @@ import com.vanced.manager.R
 import com.vanced.manager.core.downloader.MicrogDownloader.startMicrogInstall
 import com.vanced.manager.core.downloader.MusicDownloader.startMusicInstall
 import com.vanced.manager.core.downloader.VancedDownloader.startVancedInstall
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogInstallationFilesDetectedBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
-import com.vanced.manager.utils.Extensions.show
 
 class InstallationFilesDetectedDialog : BindingBottomSheetDialogFragment<DialogInstallationFilesDetectedBinding>() {
 
@@ -45,23 +45,30 @@ class InstallationFilesDetectedDialog : BindingBottomSheetDialogFragment<DialogI
             installationDetectedRedownload.setOnClickListener {
                 dismiss()
                 if (app == getString(R.string.vanced))
-                    VancedPreferencesDialog().show(requireActivity())
+                    showDialog(VancedPreferencesDialog())
                 else {
-                    AppDownloadDialog.newInstance(app).show(requireActivity())
+                    showDialog(AppDownloadDialog.newInstance(app))
                 }
             }
             installationDetectedInstall.setOnClickListener {
                 dismiss()
                 when (app) {
-                    getString(R.string.vanced) -> startVancedInstall(requireContext(),
-                        getDefaultSharedPreferences(requireContext()).getString("vanced_variant", "nonroot"))
+                    getString(R.string.vanced) -> startVancedInstall(
+                        requireContext(),
+                        getDefaultSharedPreferences(requireContext()).getString(
+                            "vanced_variant",
+                            "nonroot"
+                        )
+                    )
                     getString(R.string.music) -> startMusicInstall(requireContext())
                     getString(R.string.microg) -> startMicrogInstall(requireContext())
                 }
-                AppDownloadDialog.newInstance(
-                    app = app,
-                    installing = true
-                ).show(requireActivity())
+                showDialog(
+                    AppDownloadDialog.newInstance(
+                        app = app,
+                        installing = true
+                    )
+                )
             }
         }
     }
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
index 13a0c35f..bca19100 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import com.google.android.material.radiobutton.MaterialRadioButton
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
 import com.vanced.manager.databinding.DialogManagerAccentColorBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
 
 class ManagerAccentColorDialog : BindingBottomSheetDialogFragment<DialogManagerAccentColorBinding>() {
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerLanguageDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerLanguageDialog.kt
index 3b371d99..b967f254 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerLanguageDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerLanguageDialog.kt
@@ -9,8 +9,8 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.vanced.manager.BuildConfig.MANAGER_LANGUAGES
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
 import com.vanced.manager.databinding.DialogManagerLanguageBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
 import com.vanced.manager.utils.LanguageHelper.getLanguageFormat
 
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerThemeDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerThemeDialog.kt
index b33a6912..57cef02a 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerThemeDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerThemeDialog.kt
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import com.google.android.material.radiobutton.MaterialRadioButton
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
 import com.vanced.manager.databinding.DialogManagerThemeBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
 
 class ManagerThemeDialog : BindingBottomSheetDialogFragment<DialogManagerThemeBinding>() {
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt
index 5b78c576..609724fc 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerUpdateDialog.kt
@@ -12,8 +12,8 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingDialogFragment
 import com.vanced.manager.databinding.DialogManagerUpdateBinding
-import com.vanced.manager.ui.core.BindingDialogFragment
 import com.vanced.manager.utils.DownloadHelper.downloadManager
 import com.vanced.manager.utils.DownloadHelper.downloadProgress
 import com.vanced.manager.utils.InternetTools.isUpdateAvailable
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerVariantDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerVariantDialog.kt
index d19f0633..94849e14 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerVariantDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerVariantDialog.kt
@@ -7,8 +7,8 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.topjohnwu.superuser.Shell
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
 import com.vanced.manager.databinding.DialogManagerVariantBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
 
 class ManagerVariantDialog : BindingBottomSheetDialogFragment<DialogManagerVariantBinding>() {
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
index 3a40696d..91fd6870 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
@@ -4,11 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogMusicPreferencesBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.convertToAppVersions
 import com.vanced.manager.utils.Extensions.getDefaultPrefs
-import com.vanced.manager.utils.Extensions.show
 import com.vanced.manager.utils.InternetTools.musicVersions
 
 class MusicPreferencesDialog : BindingBottomSheetDialogFragment<DialogMusicPreferencesBinding>() {
@@ -39,16 +39,20 @@ class MusicPreferencesDialog : BindingBottomSheetDialogFragment<DialogMusicPrefe
             musicVersion.text = getString(R.string.chosen_version, prefs.getString("music_version", "latest"))
             openVersionSelector.setOnClickListener {
                 dismiss()
-                AppVersionSelectorDialog.newInstance(
-                    versions = musicVersionsConv,
-                    app = "music"
-                ).show(requireActivity())
+                showDialog(
+                    AppVersionSelectorDialog.newInstance(
+                        versions = musicVersionsConv,
+                        app = "music"
+                    )
+                )
             }
             musicInstall.setOnClickListener {
                 dismiss()
-                AppDownloadDialog.newInstance(
-                    app = getString(R.string.music)
-                ).show(requireActivity())
+                showDialog(
+                    AppDownloadDialog.newInstance(
+                        app = getString(R.string.music)
+                    )
+                )
             }
         }
     }
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/SelectAppsDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/SelectAppsDialog.kt
index fb9208d6..825f2827 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/SelectAppsDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/SelectAppsDialog.kt
@@ -9,8 +9,8 @@ import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.vanced.manager.R
 import com.vanced.manager.adapter.SelectAppsAdapter
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
 import com.vanced.manager.databinding.DialogSelectAppsBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 
 class SelectAppsDialog : BindingBottomSheetDialogFragment<DialogSelectAppsBinding>() {
 
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/URLChangeDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/URLChangeDialog.kt
index b0e6b694..8289b95c 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/URLChangeDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/URLChangeDialog.kt
@@ -9,8 +9,8 @@ import android.widget.TextView
 import androidx.core.content.edit
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
+import com.vanced.manager.core.ui.base.BindingDialogFragment
 import com.vanced.manager.databinding.DialogCustomUrlBinding
-import com.vanced.manager.ui.core.BindingDialogFragment
 import com.vanced.manager.utils.Extensions.fetchData
 import com.vanced.manager.utils.InternetTools.baseUrl
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedLanguageSelectionDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedLanguageSelectionDialog.kt
index 52184dd0..f132a544 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedLanguageSelectionDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedLanguageSelectionDialog.kt
@@ -13,9 +13,9 @@ import androidx.core.content.edit
 import androidx.core.content.res.ResourcesCompat
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogVancedLanguageSelectionBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
-import com.vanced.manager.utils.Extensions.show
 import com.vanced.manager.utils.InternetTools.vanced
 import com.vanced.manager.utils.LanguageHelper.getDefaultVancedLanguages
 import java.util.*
@@ -79,6 +79,6 @@ class VancedLanguageSelectionDialog : BindingBottomSheetDialogFragment<DialogVan
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        VancedPreferencesDialog().show(requireActivity())
+        showDialog(VancedPreferencesDialog())
     }
 }
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
index 8b7ba823..adb165fc 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
@@ -5,12 +5,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogVancedPreferencesBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.convertToAppTheme
 import com.vanced.manager.utils.Extensions.convertToAppVersions
 import com.vanced.manager.utils.Extensions.getDefaultPrefs
-import com.vanced.manager.utils.Extensions.show
 import com.vanced.manager.utils.InternetTools.vancedVersions
 import com.vanced.manager.utils.LanguageHelper.getDefaultVancedLanguages
 import java.util.*
@@ -51,24 +51,28 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment<DialogVancedPre
             vancedLang.text = getString(R.string.chosen_lang, showLang)
             openThemeSelector.setOnClickListener {
                 dismiss()
-                VancedThemeSelectorDialog().show(requireActivity())
+                showDialog(VancedThemeSelectorDialog())
             }
             openVersionSelector.setOnClickListener {
                 dismiss()
-                AppVersionSelectorDialog.newInstance(
-                    versions = vancedVersionsConv,
-                    app = "vanced"
-                ).show(requireActivity())
+                showDialog(
+                    AppVersionSelectorDialog.newInstance(
+                        versions = vancedVersionsConv,
+                        app = "vanced"
+                    )
+                )
             }
             openLanguageSelector.setOnClickListener {
                 dismiss()
-                VancedLanguageSelectionDialog().show(requireActivity())
+                showDialog(VancedLanguageSelectionDialog())
             }
             vancedInstall.setOnClickListener {
                 dismiss()
-                AppDownloadDialog.newInstance(
-                    app = getString(R.string.vanced)
-                ).show(requireActivity())
+                showDialog(
+                    AppDownloadDialog.newInstance(
+                        app = getString(R.string.vanced)
+                    )
+                )
             }
         }
     }
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedThemeSelectorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedThemeSelectorDialog.kt
index 643c79ee..73bd7afc 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedThemeSelectorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedThemeSelectorDialog.kt
@@ -8,11 +8,11 @@ import android.view.ViewGroup
 import androidx.core.content.edit
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogBottomRadioButtonBinding
-import com.vanced.manager.ui.core.BindingBottomSheetDialogFragment
 import com.vanced.manager.utils.Extensions.convertToAppTheme
 import com.vanced.manager.utils.Extensions.getCheckedButtonTag
-import com.vanced.manager.utils.Extensions.show
 import com.vanced.manager.utils.InternetTools.vanced
 
 class VancedThemeSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRadioButtonBinding>() {
@@ -70,6 +70,6 @@ class VancedThemeSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomR
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        VancedPreferencesDialog().show(requireActivity())
+        showDialog(VancedPreferencesDialog())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/AboutFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/AboutFragment.kt
index 515eef4a..b22b397a 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/AboutFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/AboutFragment.kt
@@ -11,9 +11,9 @@ import androidx.core.content.edit
 import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager
 import com.vanced.manager.R
-import com.vanced.manager.core.ext.showDialog
+import com.vanced.manager.core.ui.base.BindingFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.FragmentAboutBinding
-import com.vanced.manager.ui.core.BindingFragment
 import com.vanced.manager.ui.dialogs.AppInfoDialog
 import com.vanced.manager.ui.viewmodels.AboutViewModel
 import com.vanced.manager.utils.InternetTools.manager
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/GrantRootFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/GrantRootFragment.kt
index ca7cc514..4fd75dae 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/GrantRootFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/GrantRootFragment.kt
@@ -9,9 +9,9 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import com.topjohnwu.superuser.Shell
 import com.vanced.manager.R
+import com.vanced.manager.core.ui.base.BindingFragment
 import com.vanced.manager.databinding.FragmentGrantRootBinding
 import com.vanced.manager.ui.MainActivity
-import com.vanced.manager.ui.core.BindingFragment
 
 class GrantRootFragment : BindingFragment<FragmentGrantRootBinding>() {
 
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
index 229e07e2..21b97abb 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
@@ -23,8 +23,8 @@ import com.vanced.manager.R
 import com.vanced.manager.adapter.AppListAdapter
 import com.vanced.manager.adapter.LinkAdapter
 import com.vanced.manager.adapter.SponsorAdapter
+import com.vanced.manager.core.ui.base.BindingFragment
 import com.vanced.manager.databinding.FragmentHomeBinding
-import com.vanced.manager.ui.core.BindingFragment
 import com.vanced.manager.ui.dialogs.DialogContainer.installAlertBuilder
 import com.vanced.manager.ui.viewmodels.HomeViewModel
 import com.vanced.manager.ui.viewmodels.HomeViewModelFactory
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SelectAppsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SelectAppsFragment.kt
index df94499a..07fc19b7 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SelectAppsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SelectAppsFragment.kt
@@ -10,8 +10,8 @@ import androidx.preference.PreferenceManager.getDefaultSharedPreferences
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.vanced.manager.R
 import com.vanced.manager.adapter.SelectAppsAdapter
+import com.vanced.manager.core.ui.base.BindingFragment
 import com.vanced.manager.databinding.FragmentSelectAppsBinding
-import com.vanced.manager.ui.core.BindingFragment
 
 class SelectAppsFragment : BindingFragment<FragmentSelectAppsBinding>() {
 
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index 4cd42c6d..04f6bfd4 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -13,9 +13,9 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.perf.FirebasePerformance
 import com.vanced.manager.R
 import com.vanced.manager.adapter.GetNotifAdapter
-import com.vanced.manager.core.ext.showDialogRefl
+import com.vanced.manager.core.ui.base.BindingFragment
+import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.FragmentSettingsBinding
-import com.vanced.manager.ui.core.BindingFragment
 import com.vanced.manager.ui.dialogs.*
 import com.vanced.manager.utils.LanguageHelper.getLanguageFormat
 import java.io.File
@@ -54,7 +54,7 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
             bindManagerTheme()
             bindManagerAccentColor()
             bindManagerLanguage()
-            selectApps.setOnClickListener { showDialogRefl<SelectAppsDialog>() }
+            selectApps.setOnClickListener { showDialog(SelectAppsDialog()) }
         }
     }
 
@@ -76,7 +76,7 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
     private fun FragmentSettingsBinding.bindManagerVariant() {
         managerVariant.apply {
             prefs.getString("vanced_variant", "nonroot")?.let { setSummary(it) }
-            setOnClickListener { showDialogRefl<ManagerVariantDialog>() }
+            setOnClickListener { showDialog(ManagerVariantDialog()) }
         }
     }
     private fun FragmentSettingsBinding.bindClearFiles() {
@@ -96,11 +96,11 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
             setSummary(
                 when (themePref) {
                     LIGHT -> getString(R.string.theme_light)
-                    DARK  -> getString(R.string.theme_dark)
-                    else  -> getString(R.string.system_default)
+                    DARK -> getString(R.string.theme_dark)
+                    else -> getString(R.string.system_default)
                 }
             )
-            setOnClickListener { showDialogRefl<ManagerThemeDialog>() }
+            setOnClickListener { showDialog(ManagerThemeDialog()) }
         }
     }
 
@@ -109,14 +109,14 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
         managerAccentColor.apply {
             setSummary(
                 when (accentPref) {
-                    BLUE   -> getString(R.string.accent_blue)
-                    RED    -> getString(R.string.accent_red)
-                    GREEN  -> getString(R.string.accent_green)
+                    BLUE -> getString(R.string.accent_blue)
+                    RED -> getString(R.string.accent_red)
+                    GREEN -> getString(R.string.accent_green)
                     YELLOW -> getString(R.string.accent_yellow)
-                    else   -> getString(R.string.accent_purple)
+                    else -> getString(R.string.accent_purple)
                 }
             )
-            setOnClickListener { showDialogRefl<ManagerAccentColorDialog>() }
+            setOnClickListener { showDialog(ManagerAccentColorDialog()) }
         }
     }
 
@@ -124,7 +124,7 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
         val langPref = prefs.getString("manager_lang", "System Default")
         managerLanguage.apply {
             setSummary(getLanguageFormat(requireActivity(), requireNotNull(langPref)))
-            setOnClickListener { showDialogRefl<ManagerLanguageDialog>() }
+            setOnClickListener { showDialog(ManagerLanguageDialog()) }
         }
 
     }
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/WelcomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/WelcomeFragment.kt
index 1c7a53c1..3cffe219 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/WelcomeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/WelcomeFragment.kt
@@ -4,8 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
+import com.vanced.manager.core.ui.base.BindingFragment
 import com.vanced.manager.databinding.FragmentWelcomeBinding
-import com.vanced.manager.ui.core.BindingFragment
 
 class WelcomeFragment : BindingFragment<FragmentWelcomeBinding>() {
 
diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
index 1edd7666..20bfa1de 100644
--- a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
+++ b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
@@ -51,6 +51,10 @@ object InternetTools {
     suspend fun loadJson(context: Context) = withContext(Dispatchers.IO) {
         val installUrl = context.getDefaultPrefs().getString("install_url", baseUrl)
         val latest = JsonHelper.getJson("$installUrl/latest.json?fetchTime=${SimpleDateFormat("HHmmss", Locale.ROOT)}")
+        Log.d(
+            "latest",
+            "$installUrl/latest.json?fetchTime=${SimpleDateFormat("HHmmss", Locale.ROOT)}"
+        )
         val versions = JsonHelper.getJson("$installUrl/versions.json?fetchTime=${SimpleDateFormat("HHmmss", Locale.ROOT)}")
 //      braveTiers.apply {
 //          set(getJson("$installUrl/sponsor.json"))
diff --git a/core-ui/.gitignore b/core-ui/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/core-ui/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
new file mode 100644
index 00000000..825307cb
--- /dev/null
+++ b/core-ui/build.gradle
@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    buildFeatures {
+        viewBinding true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
+
+    //https://developer.android.com/jetpack/androidx/releases/lifecycle
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+}
\ No newline at end of file
diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..55b93fbf
--- /dev/null
+++ b/core-ui/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.vanced.manager.core.ui" />
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/ui/core/BindingBottomSheetDialogFragment.kt b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingBottomSheetDialogFragment.kt
similarity index 52%
rename from app/src/main/java/com/vanced/manager/ui/core/BindingBottomSheetDialogFragment.kt
rename to core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingBottomSheetDialogFragment.kt
index 1b8408e1..d632edef 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/BindingBottomSheetDialogFragment.kt
+++ b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingBottomSheetDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.vanced.manager.ui.core
+package com.vanced.manager.core.ui.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,29 +9,29 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 abstract class BindingBottomSheetDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment() {
 
-	private var _binding: VB? = null
-	protected val binding: VB get() = requireNotNull(_binding)
+    private var _binding: VB? = null
+    protected val binding: VB get() = requireNotNull(_binding)
 
-	override fun onCreateView(
+    override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		savedInstanceState: Bundle?
 	): View {
-		_binding = binding(inflater, container, savedInstanceState)
-		otherSetups()
-		return binding.root
-	}
+        _binding = binding(inflater, container, savedInstanceState)
+        otherSetups()
+        return binding.root
+    }
 
-	protected abstract fun binding(
+    protected abstract fun binding(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		savedInstanceState: Bundle?
 	): VB
 
-	protected open fun otherSetups() = Unit
+    protected open fun otherSetups() = Unit
 
-	override fun onDestroyView() {
-		super.onDestroyView()
-		_binding = null
-	}
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/ui/core/BindingDialogFragment.kt b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingDialogFragment.kt
similarity index 95%
rename from app/src/main/java/com/vanced/manager/ui/core/BindingDialogFragment.kt
rename to core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingDialogFragment.kt
index b2a224aa..bc3ffa9b 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/BindingDialogFragment.kt
+++ b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.vanced.manager.ui.core
+package com.vanced.manager.core.ui.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/vanced/manager/ui/core/BindingFragment.kt b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingFragment.kt
similarity index 95%
rename from app/src/main/java/com/vanced/manager/ui/core/BindingFragment.kt
rename to core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingFragment.kt
index 62a0d0ed..3462c79e 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/BindingFragment.kt
+++ b/core-ui/src/main/java/com/vanced/manager/core/ui/base/BindingFragment.kt
@@ -1,4 +1,4 @@
-package com.vanced.manager.ui.core
+package com.vanced.manager.core.ui.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/vanced/manager/core/ext/FragmentExt.kt b/core-ui/src/main/java/com/vanced/manager/core/ui/ext/FragmentExt.kt
similarity index 55%
rename from app/src/main/java/com/vanced/manager/core/ext/FragmentExt.kt
rename to core-ui/src/main/java/com/vanced/manager/core/ui/ext/FragmentExt.kt
index d10352ca..c7fe6fe0 100644
--- a/app/src/main/java/com/vanced/manager/core/ext/FragmentExt.kt
+++ b/core-ui/src/main/java/com/vanced/manager/core/ui/ext/FragmentExt.kt
@@ -1,15 +1,10 @@
-package com.vanced.manager.core.ext
+package com.vanced.manager.core.ui.ext
 
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import kotlin.reflect.full.createInstance
 
 fun Fragment.requireSupportFM() = requireActivity().supportFragmentManager
 
-inline fun <reified D : DialogFragment> Fragment.showDialogRefl() {
-	D::class.createInstance().show(requireSupportFM(), D::class.simpleName)
-}
-
 fun <D : DialogFragment> Fragment.showDialog(dialog: D) {
 	dialog.show(requireSupportFM(), dialog::class.simpleName)
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 0828cd2b..c5f58a4e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,4 @@
 rootProject.name='Vanced Manager'
 include ':app'
+
+include ':core-ui'
\ No newline at end of file