diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/BackgroundChip.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/BackgroundChip.kt
index 0fc0efd24..a50843bbe 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/BackgroundChip.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/BackgroundChip.kt
@@ -92,7 +92,7 @@ import de.robv.android.xposed.callbacks.XC_LayoutInflated
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class BackgroundChip(context: Context?) : ModPack(context!!) {
+class BackgroundChip(context: Context) : ModPack(context) {
 
     private val mQsStatusIconsContainer = LinearLayout(mContext)
     private var mShowSBClockBg = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/BatteryStyleManager.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/BatteryStyleManager.kt
index 5a3a64957..8a84fb128 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/BatteryStyleManager.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/BatteryStyleManager.kt
@@ -153,7 +153,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @Suppress("unused")
 @SuppressLint("DiscouragedApi")
-class BatteryStyleManager(context: Context?) : ModPack(context!!) {
+class BatteryStyleManager(context: Context) : ModPack(context) {
 
     private var defaultLandscapeBatteryEnabled = false
     private var frameColor = Color.WHITE
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/ControllersProvider.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/ControllersProvider.kt
index af730dd03..230442e8f 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/ControllersProvider.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/ControllersProvider.kt
@@ -19,7 +19,7 @@ import de.robv.android.xposed.XposedHelpers.getIntField
 import de.robv.android.xposed.XposedHelpers.getObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
-class ControllersProvider(context: Context?) : ModPack(context!!) {
+class ControllersProvider(context: Context) : ModPack(context) {
 
     private var mBluetoothEnabled = false
 
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaper.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaper.kt
index 68de345f3..bfe5f6760 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaper.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaper.kt
@@ -45,7 +45,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
 @SuppressLint("DiscouragedApi")
-class DepthWallpaper(context: Context?) : ModPack(context!!) {
+class DepthWallpaper(context: Context) : ModPack(context) {
 
     private var showDepthWallpaper = false
     private var showFadingAnimation = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaperA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaperA14.kt
index 2a1645cb8..862c1197e 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaperA14.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/DepthWallpaperA14.kt
@@ -65,7 +65,7 @@ import java.util.concurrent.TimeUnit
 import kotlin.math.max
 
 @SuppressLint("DiscouragedApi")
-class DepthWallpaperA14(context: Context?) : ModPack(context!!) {
+class DepthWallpaperA14(context: Context) : ModPack(context) {
 
     private var showDepthWallpaper = false
     private var showCustomImages = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClock.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClock.kt
index d09db875c..9c049c453 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClock.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClock.kt
@@ -79,7 +79,7 @@ import java.util.concurrent.TimeUnit
 
 
 @SuppressLint("DiscouragedApi")
-class HeaderClock(context: Context?) : ModPack(context!!) {
+class HeaderClock(context: Context) : ModPack(context) {
 
     private var appContext: Context? = null
     private var showHeaderClock = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt
index c2eaf95bb..845746126 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt
@@ -89,7 +89,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
 @SuppressLint("DiscouragedApi")
-class HeaderClockA14(context: Context?) : ModPack(context!!) {
+class HeaderClockA14(context: Context) : ModPack(context) {
 
     private var appContext: Context? = null
     private var showHeaderClock = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderImage.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderImage.kt
index 2fd46e636..7a7758380 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderImage.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderImage.kt
@@ -46,7 +46,7 @@ import java.io.File
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-class HeaderImage(context: Context?) : ModPack(context!!) {
+class HeaderImage(context: Context) : ModPack(context) {
 
     private var showHeaderImage = false
     private var imageHeight = 140
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/IconUpdater.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/IconUpdater.kt
index a1b865a5e..301bc19d9 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/IconUpdater.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/IconUpdater.kt
@@ -12,7 +12,7 @@ import de.robv.android.xposed.XposedHelpers.callMethod
 import de.robv.android.xposed.XposedHelpers.findClass
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
-class IconUpdater(context: Context?) : ModPack(context!!) {
+class IconUpdater(context: Context) : ModPack(context) {
 
     private var launcherModel: Any? = null
 
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenClock.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenClock.kt
index f7edb0224..628116c77 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenClock.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenClock.kt
@@ -81,7 +81,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
 @SuppressLint("DiscouragedApi")
-class LockscreenClock(context: Context?) : ModPack(context!!) {
+class LockscreenClock(context: Context) : ModPack(context) {
 
     private var showLockscreenClock = false
     private var showDepthWallpaper = false // was used in android 13 and below
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWeather.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWeather.kt
index 967540663..cef3c08b8 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWeather.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWeather.kt
@@ -35,7 +35,7 @@ import de.robv.android.xposed.XposedHelpers.findClass
 import de.robv.android.xposed.XposedHelpers.getObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
-class LockscreenWeather(context: Context?) : ModPack(context!!) {
+class LockscreenWeather(context: Context) : ModPack(context) {
 
     private var customLockscreenClock = false
     private var weatherEnabled = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWidgets.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWidgets.kt
index 0c4a3b168..6b6c3f422 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWidgets.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenWidgets.kt
@@ -47,7 +47,7 @@ import de.robv.android.xposed.XposedHelpers.findClassIfExists
 import de.robv.android.xposed.XposedHelpers.getObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
-class LockscreenWidgets(context: Context?) : ModPack(context!!) {
+class LockscreenWidgets(context: Context) : ModPack(context) {
 
     // Parent
     private var mStatusViewContainer: ViewGroup? = null
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/Miscellaneous.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/Miscellaneous.kt
index 35a72eb9e..f375a3397 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/Miscellaneous.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/Miscellaneous.kt
@@ -35,7 +35,7 @@ import de.robv.android.xposed.callbacks.XC_LayoutInflated
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class Miscellaneous(context: Context?) : ModPack(context!!) {
+class Miscellaneous(context: Context) : ModPack(context) {
 
     private var hideQsCarrierGroup = false
     private var hideStatusIcons = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt
index 0d47cba94..1df4e3397 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/OpQsHeader.kt
@@ -114,7 +114,7 @@ import kotlin.properties.Delegates
 import kotlin.random.Random
 
 @Suppress("DiscouragedApi")
-class OpQsHeader(context: Context?) : ModPack(context!!) {
+class OpQsHeader(context: Context) : ModPack(context) {
 
     // Preferences
     private var showOpQsHeaderView = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/QSTransparency.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/QSTransparency.kt
index b15762060..9ed01a613 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/QSTransparency.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/QSTransparency.kt
@@ -27,7 +27,7 @@ import de.robv.android.xposed.XposedHelpers.setObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 
-class QSTransparency(context: Context?) : ModPack(context!!) {
+class QSTransparency(context: Context) : ModPack(context) {
 
     private val keyguardAlpha = 0.85f
     private var qsTransparencyActive = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.kt
index a6f7bbad4..ef4617cd9 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.kt
@@ -60,7 +60,7 @@ import de.robv.android.xposed.XposedHelpers.setObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class QuickSettings(context: Context?) : ModPack(context!!) {
+class QuickSettings(context: Context) : ModPack(context) {
 
     private var fixQsTileColor = true
     private var fixNotificationColor = true
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/Statusbar.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/Statusbar.kt
index ab8f4ece2..8208d78c7 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/Statusbar.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/Statusbar.kt
@@ -46,7 +46,7 @@ import de.robv.android.xposed.callbacks.XC_LayoutInflated
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class Statusbar(context: Context?) : ModPack(context!!) {
+class Statusbar(context: Context) : ModPack(context) {
 
     private var mColoredStatusbarIcon = false
     private var sbClockSizeSwitch = false
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/ThemeChange.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/ThemeChange.kt
index 7ff725330..bf25b97ec 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/ThemeChange.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/ThemeChange.kt
@@ -8,7 +8,7 @@ import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
-class ThemeChange(context: Context?) : ModPack(context!!) {
+class ThemeChange(context: Context) : ModPack(context) {
 
     private val mThemeChangedListeners = ArrayList<OnThemeChangedListener>()
 
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/VolumePanel.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/VolumePanel.kt
index eac2d6a8c..348dc632a 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/VolumePanel.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/VolumePanel.kt
@@ -29,7 +29,7 @@ import kotlin.math.ceil
 import kotlin.properties.Delegates
 
 @SuppressLint("DiscouragedApi", "DefaultLocale")
-class VolumePanel(context: Context?) : ModPack(context!!) {
+class VolumePanel(context: Context) : ModPack(context) {
 
     private var showPercentage = false
     private var showWarning = true
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA13.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA13.kt
index eb16616f1..848e8b3ec 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA13.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA13.kt
@@ -31,7 +31,7 @@ import de.robv.android.xposed.XposedHelpers.setObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class QSBlackThemeA13(context: Context?) : ModPack(context!!) {
+class QSBlackThemeA13(context: Context) : ModPack(context) {
 
     private var mBehindColors: Any? = null
     private var isDark: Boolean
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA14.kt
index 02327269c..b1a4a3f2c 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA14.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSBlackThemeA14.kt
@@ -39,7 +39,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 
 @SuppressLint("DiscouragedApi")
-class QSBlackThemeA14(context: Context?) : ModPack(context!!) {
+class QSBlackThemeA14(context: Context) : ModPack(context) {
 
     private var mBehindColors: Any? = null
     private var isDark: Boolean
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA13.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA13.kt
index 919d44654..76435a857 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA13.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA13.kt
@@ -48,7 +48,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 @SuppressLint("DiscouragedApi")
-class QSFluidThemeA13(context: Context?) : ModPack(context!!) {
+class QSFluidThemeA13(context: Context) : ModPack(context) {
 
     val colorActive = intArrayOf(
         mContext.resources.getColor(
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA14.kt
index ce8638f34..30e55b650 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA14.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSFluidThemeA14.kt
@@ -50,7 +50,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 @SuppressLint("DiscouragedApi")
-class QSFluidThemeA14(context: Context?) : ModPack(context!!) {
+class QSFluidThemeA14(context: Context) : ModPack(context) {
 
     private var wasDark: Boolean = SystemUtils.isDarkMode
     private var mSlider: SeekBar? = null
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA12.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA12.kt
index 99f4eabb5..f07f5cc4c 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA12.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA12.kt
@@ -28,7 +28,7 @@ import de.robv.android.xposed.XposedHelpers.setObjectField
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 @SuppressLint("DiscouragedApi")
-class QSLightThemeA12(context: Context?) : ModPack(context!!) {
+class QSLightThemeA12(context: Context) : ModPack(context) {
 
     private var mBehindColors: Any? = null
     private var isDark: Boolean
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA13.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA13.kt
index 754e5be8b..9430472f2 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA13.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA13.kt
@@ -37,7 +37,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 import java.util.Arrays
 
 @SuppressLint("DiscouragedApi")
-class QSLightThemeA13(context: Context?) : ModPack(context!!) {
+class QSLightThemeA13(context: Context) : ModPack(context) {
 
     private var mBehindColors: Any? = null
     private var isDark: Boolean
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA14.kt b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA14.kt
index 8fd86a900..38b2a2c1f 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA14.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/modules/themes/QSLightThemeA14.kt
@@ -42,7 +42,7 @@ import java.util.Arrays
 import java.util.function.Consumer
 
 @SuppressLint("DiscouragedApi")
-class QSLightThemeA14(context: Context?) : ModPack(context!!) {
+class QSLightThemeA14(context: Context) : ModPack(context) {
 
     private var mBehindColors: Any? = null
     private var isDark: Boolean
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/utils/HookCheck.kt b/app/src/main/java/com/drdisagree/iconify/xposed/utils/HookCheck.kt
index 9790cee86..9976482f4 100644
--- a/app/src/main/java/com/drdisagree/iconify/xposed/utils/HookCheck.kt
+++ b/app/src/main/java/com/drdisagree/iconify/xposed/utils/HookCheck.kt
@@ -12,7 +12,7 @@ import com.drdisagree.iconify.common.Const.SYSTEMUI_PACKAGE
 import com.drdisagree.iconify.xposed.ModPack
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
-class HookCheck(context: Context?) : ModPack(context!!) {
+class HookCheck(context: Context) : ModPack(context) {
 
     private var intentFilter = IntentFilter()
     private var broadcastRegistered = false