diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppManageFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppManageFragment.kt
index c9f27e7..222f3cc 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppManageFragment.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppManageFragment.kt
@@ -1,7 +1,6 @@
 package icu.nullptr.hidemyapplist.ui.fragment
 
 import android.os.Bundle
-import com.google.android.material.transition.MaterialSharedAxis
 import icu.nullptr.hidemyapplist.service.ConfigManager
 import icu.nullptr.hidemyapplist.ui.adapter.AppManageAdapter
 import icu.nullptr.hidemyapplist.ui.util.navController
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSettingsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSettingsFragment.kt
index 63f8c9d..c6ec812 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSettingsFragment.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/AppSettingsFragment.kt
@@ -13,12 +13,11 @@ import androidx.navigation.fragment.navArgs
 import androidx.preference.Preference
 import androidx.preference.PreferenceDataStore
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreference
 import androidx.preference.SwitchPreferenceCompat
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import icu.nullptr.hidemyapplist.common.AppPresets
 import icu.nullptr.hidemyapplist.common.JsonConfig
-import icu.nullptr.hidemyapplist.common.Presets
 import icu.nullptr.hidemyapplist.service.ConfigManager
 import icu.nullptr.hidemyapplist.ui.util.navController
 import icu.nullptr.hidemyapplist.ui.util.setupToolbar
@@ -155,7 +154,7 @@ class AppSettingsFragment : Fragment(R.layout.fragment_settings) {
                 true
             }
             findPreference<Preference>("applyPresets")?.setOnPreferenceClickListener {
-                val presetNames = Presets.instance.getAllPresetNames()
+                val presetNames = AppPresets.instance.getAllPresetNames()
                 val presetTranslations = presetNames.map { name ->
                     try {
                         val id = resources.getIdentifier(
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/LogsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/LogsFragment.kt
index c362d6e..ea2d19c 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/LogsFragment.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/LogsFragment.kt
@@ -6,7 +6,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.WindowInsets
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.size
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt
index d22a823..0aa4fd3 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/TemplateSettingsFragment.kt
@@ -1,6 +1,5 @@
 package icu.nullptr.hidemyapplist.ui.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import androidx.activity.addCallback
@@ -14,7 +13,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.navArgs
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.transition.MaterialContainerTransform
 import icu.nullptr.hidemyapplist.service.ConfigManager
 import icu.nullptr.hidemyapplist.ui.util.navController
 import icu.nullptr.hidemyapplist.ui.util.setupToolbar
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/Fragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/Fragment.kt
index 58f3c60..5807f6c 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/Fragment.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/Fragment.kt
@@ -13,7 +13,6 @@ import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
-import org.frknkrc44.hma_oss.R
 
 val Fragment.navController get() = NavHostFragment.findNavController(this)
 
diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/ThemeUtils.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/ThemeUtils.kt
index 3752365..569543e 100644
--- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/ThemeUtils.kt
+++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/util/ThemeUtils.kt
@@ -4,14 +4,11 @@ import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
-import android.widget.ImageView
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.StyleRes
 import androidx.fragment.app.Fragment
-import icu.nullptr.hidemyapplist.hmaApp
 import icu.nullptr.hidemyapplist.service.PrefManager
 import org.frknkrc44.hma_oss.R
 
diff --git a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt
index ccc6c29..eb495bd 100644
--- a/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt
+++ b/app/src/main/java/org/frknkrc44/hma_oss/ui/fragment/HomeFragment.kt
@@ -10,7 +10,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.marginLeft
 import androidx.fragment.app.Fragment
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/Presets.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt
similarity index 87%
rename from common/src/main/java/icu/nullptr/hidemyapplist/common/Presets.kt
rename to common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt
index bf2cbde..91a0656 100644
--- a/common/src/main/java/icu/nullptr/hidemyapplist/common/Presets.kt
+++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/AppPresets.kt
@@ -4,23 +4,23 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.IPackageManager
 import icu.nullptr.hidemyapplist.common.Utils.getInstalledApplicationsCompat
 import icu.nullptr.hidemyapplist.common.Utils.getPackageInfoCompat
-import icu.nullptr.hidemyapplist.common.presets.BasePreset
-import icu.nullptr.hidemyapplist.common.presets.CustomROMPreset
-import icu.nullptr.hidemyapplist.common.presets.RootAppsPreset
-import icu.nullptr.hidemyapplist.common.presets.XposedModulesPreset
+import icu.nullptr.hidemyapplist.common.app_presets.BasePreset
+import icu.nullptr.hidemyapplist.common.app_presets.CustomROMPreset
+import icu.nullptr.hidemyapplist.common.app_presets.RootAppsPreset
+import icu.nullptr.hidemyapplist.common.app_presets.XposedModulesPreset
 
 // TODO: Update presets when package added/removed
-class Presets private constructor() {
+class AppPresets private constructor() {
     private val presetList = mutableListOf<BasePreset>()
     var loggerFunction: ((String) -> Unit)? = null
 
     companion object {
-        private var hiddenInstance: Presets? = null
+        private var hiddenInstance: AppPresets? = null
 
-        val instance: Presets
+        val instance: AppPresets
             get() {
                 if (hiddenInstance == null) {
-                    hiddenInstance = Presets()
+                    hiddenInstance = AppPresets()
                 }
 
                 return hiddenInstance!!
diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/BasePreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt
similarity index 95%
rename from common/src/main/java/icu/nullptr/hidemyapplist/common/presets/BasePreset.kt
rename to common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt
index e734c0c..d317c34 100644
--- a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/BasePreset.kt
+++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/BasePreset.kt
@@ -1,4 +1,4 @@
-package icu.nullptr.hidemyapplist.common.presets
+package icu.nullptr.hidemyapplist.common.app_presets
 
 import android.content.pm.ApplicationInfo
 
diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/CustomROMPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt
similarity index 94%
rename from common/src/main/java/icu/nullptr/hidemyapplist/common/presets/CustomROMPreset.kt
rename to common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt
index 4ec19f7..151405c 100644
--- a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/CustomROMPreset.kt
+++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/CustomROMPreset.kt
@@ -1,4 +1,4 @@
-package icu.nullptr.hidemyapplist.common.presets
+package icu.nullptr.hidemyapplist.common.app_presets
 
 import android.content.pm.ApplicationInfo
 import icu.nullptr.hidemyapplist.common.Utils
diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/RootAppsPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt
similarity index 98%
rename from common/src/main/java/icu/nullptr/hidemyapplist/common/presets/RootAppsPreset.kt
rename to common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt
index ce225d8..fadadbe 100644
--- a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/RootAppsPreset.kt
+++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/RootAppsPreset.kt
@@ -1,4 +1,4 @@
-package icu.nullptr.hidemyapplist.common.presets
+package icu.nullptr.hidemyapplist.common.app_presets
 
 import android.content.pm.ApplicationInfo
 import java.util.zip.ZipFile
diff --git a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/XposedModulesPreset.kt b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt
similarity index 94%
rename from common/src/main/java/icu/nullptr/hidemyapplist/common/presets/XposedModulesPreset.kt
rename to common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt
index 07846e3..665d707 100644
--- a/common/src/main/java/icu/nullptr/hidemyapplist/common/presets/XposedModulesPreset.kt
+++ b/common/src/main/java/icu/nullptr/hidemyapplist/common/app_presets/XposedModulesPreset.kt
@@ -1,4 +1,4 @@
-package icu.nullptr.hidemyapplist.common.presets
+package icu.nullptr.hidemyapplist.common.app_presets
 
 import android.content.pm.ApplicationInfo
 import java.util.zip.ZipFile
diff --git a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt
index 37ff737..b919747 100644
--- a/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt
+++ b/xposed/src/main/java/icu/nullptr/hidemyapplist/xposed/HMAService.kt
@@ -4,10 +4,10 @@ import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.IPackageManager
 import android.os.Build
+import icu.nullptr.hidemyapplist.common.AppPresets
 import icu.nullptr.hidemyapplist.common.Constants
 import icu.nullptr.hidemyapplist.common.IHMAService
 import icu.nullptr.hidemyapplist.common.JsonConfig
-import icu.nullptr.hidemyapplist.common.Presets
 import icu.nullptr.hidemyapplist.common.Utils
 import icu.nullptr.hidemyapplist.xposed.hook.ActivityHook
 import icu.nullptr.hidemyapplist.xposed.hook.IFrameworkHook
@@ -62,8 +62,8 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
         instance = this
         loadConfig()
         installHooks()
-        Presets.instance.loggerFunction = { logD(TAG, it) }
-        Presets.instance.reloadPresetsIfEmpty(pms)
+        AppPresets.instance.loggerFunction = { logD(TAG, it) }
+        AppPresets.instance.reloadPresetsIfEmpty(pms)
         logI(TAG, "HMA service initialized")
     }
 
@@ -174,7 +174,7 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
         }
 
         for (presetName in appConfig.applyPresets) {
-            val preset = Presets.instance.getPresetByName(presetName) ?: continue
+            val preset = AppPresets.instance.getPresetByName(presetName) ?: continue
             if (preset.containsPackage(query)) return !appConfig.useWhitelist
         }
 
@@ -240,8 +240,8 @@ class HMAService(val pms: IPackageManager) : IHMAService.Stub() {
         if (packageName == null) return
 
         when (eventType) {
-            Intent.ACTION_PACKAGE_ADDED -> Presets.instance.handlePackageAdded(pms, packageName)
-            Intent.ACTION_PACKAGE_REMOVED -> Presets.instance.handlePackageRemoved(packageName)
+            Intent.ACTION_PACKAGE_ADDED -> AppPresets.instance.handlePackageAdded(pms, packageName)
+            Intent.ACTION_PACKAGE_REMOVED -> AppPresets.instance.handlePackageRemoved(packageName)
         }
     }
 }