diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt
index e151445..8e90029 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/dialogs/SleepTimerCustomAlertDialog.kt
@@ -44,8 +44,8 @@ fun SleepTimerCustomAlertDialog(
                 Text(
                     modifier = Modifier.padding(bottom = SimpleTheme.dimens.margin.extraLarge),
                     text = stringResource(id = R.string.sleep_timer),
-                    style = MaterialTheme.typography.headlineSmall,
-                    color = MaterialTheme.colorScheme.onSurface
+                    style = SimpleTheme.typography.headlineSmall,
+                    color = SimpleTheme.colorScheme.onSurface
                 )
 
                 Column(
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/BrightDisplayScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/BrightDisplayScreen.kt
index ded6f86..e58c6e8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/BrightDisplayScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/BrightDisplayScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -18,6 +17,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.simplemobiletools.commons.compose.extensions.MyDevices
 import com.simplemobiletools.commons.compose.theme.AppThemeSurface
+import com.simplemobiletools.commons.compose.theme.SimpleTheme
 import com.simplemobiletools.commons.extensions.getContrastColor
 import com.simplemobiletools.flashlight.R
 import com.simplemobiletools.flashlight.views.AnimatedSleepTimer
@@ -41,7 +41,7 @@ internal fun BrightDisplayScreen(
                 .border(
                     width = 1.dp,
                     color = Color(contrastColor),
-                    shape = MaterialTheme.shapes.extraLarge
+                    shape = SimpleTheme.shapes.extraLarge
                 ),
             onClick = onChangeColorPress
         ) {
@@ -66,8 +66,8 @@ internal fun BrightDisplayScreen(
 private fun BrightDisplayScreenPreview() {
     AppThemeSurface {
         BrightDisplayScreen(
-            backgroundColor = MaterialTheme.colorScheme.background.toArgb(),
-            contrastColor = MaterialTheme.colorScheme.background.toArgb().getContrastColor(),
+            backgroundColor = SimpleTheme.colorScheme.background.toArgb(),
+            contrastColor = SimpleTheme.colorScheme.background.toArgb().getContrastColor(),
             sleepTimer = {
                 AnimatedSleepTimer(timerText = "00:00", timerVisible = true, onTimerClosePress = {})
             },
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt
index 997f484..6d71659 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/MainScreen.kt
@@ -104,7 +104,7 @@ internal fun FlashlightButton(
             ),
         painter = painterResource(id = R.drawable.ic_flashlight_vector),
         contentDescription = stringResource(id = R.string.flashlight_short),
-        tint = if (flashlightActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface
+        tint = if (flashlightActive) SimpleTheme.colorScheme.primary else SimpleTheme.colorScheme.onSurface
     )
 }
 
@@ -123,7 +123,7 @@ internal fun BrightDisplayButton(
             ),
         painter = painterResource(id = R.drawable.ic_bright_display_vector),
         contentDescription = stringResource(id = R.string.bright_display),
-        tint = MaterialTheme.colorScheme.onSurface
+        tint = SimpleTheme.colorScheme.onSurface
     )
 }
 
@@ -143,7 +143,7 @@ internal fun SosButton(
         text = stringResource(id = R.string.sos),
         fontSize = AppDimensions.sosTextSize,
         fontWeight = FontWeight.Bold,
-        color = if (sosActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface
+        color = if (sosActive) SimpleTheme.colorScheme.primary else SimpleTheme.colorScheme.onSurface
     )
 }
 
@@ -163,7 +163,7 @@ internal fun StroboscopeButton(
             ),
         painter = painterResource(id = R.drawable.ic_stroboscope_vector),
         contentDescription = stringResource(id = R.string.stroboscope),
-        tint = if (stroboscopeActive) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface
+        tint = if (stroboscopeActive) SimpleTheme.colorScheme.primary else SimpleTheme.colorScheme.onSurface
     )
 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/SettingsScreen.kt
index 8b61d92..bc4ee9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/SettingsScreen.kt
@@ -1,7 +1,6 @@
 package com.simplemobiletools.flashlight.screens
 
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.simplemobiletools.commons.compose.extensions.MyDevices
@@ -11,6 +10,7 @@ import com.simplemobiletools.commons.compose.settings.SettingsPreferenceComponen
 import com.simplemobiletools.commons.compose.settings.SettingsTitleTextComponent
 import com.simplemobiletools.commons.compose.settings.scaffold.SettingsScaffold
 import com.simplemobiletools.commons.compose.theme.AppThemeSurface
+import com.simplemobiletools.commons.compose.theme.SimpleTheme
 import com.simplemobiletools.commons.compose.theme.divider_grey
 import com.simplemobiletools.commons.helpers.isTiramisuPlus
 import com.simplemobiletools.flashlight.R
@@ -71,7 +71,7 @@ internal fun GeneralSettingsSection(
             label = stringResource(id = R.string.language),
             value = displayLanguage,
             doOnPreferenceClick = onSetupLanguagePress,
-            preferenceValueColor = MaterialTheme.colorScheme.onSurface,
+            preferenceValueColor = SimpleTheme.colorScheme.onSurface,
         )
     }
     SettingsCheckBoxComponent(
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
index b26b946..76c8378 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/screens/WidgetConfigureScreen.kt
@@ -76,7 +76,7 @@ internal fun WidgetConfigureScreen(
                     .padding(start = SimpleTheme.dimens.margin.medium)
                     .background(
                         color = colorResource(id = R.color.md_grey_white),
-                        shape = MaterialTheme.shapes.extraLarge
+                        shape = SimpleTheme.shapes.extraLarge
                     )
                     .padding(horizontal = SimpleTheme.dimens.margin.extraLarge)
             )
@@ -97,7 +97,7 @@ private fun WidgetBrightDisplayConfigureScreenPreview() {
     AppThemeSurface {
         WidgetConfigureScreen(
             widgetDrawable = R.drawable.ic_bright_display_vector,
-            widgetColor = MaterialTheme.colorScheme.primary.toArgb(),
+            widgetColor = SimpleTheme.colorScheme.primary.toArgb(),
             widgetAlpha = 1f,
             onSliderChanged = {},
             onColorPressed = {},
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt
index 8bdfc61..58cc6d4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/views/SleepTimer.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -42,12 +41,12 @@ internal fun SleepTimer(
                 .align(Alignment.CenterVertically)
                 .padding(horizontal = SimpleTheme.dimens.margin.large),
             text = stringResource(id = R.string.sleep_timer),
-            color = MaterialTheme.colorScheme.onSurface
+            color = SimpleTheme.colorScheme.onSurface
         )
         Text(
             modifier = Modifier.align(Alignment.CenterVertically),
             text = timerText,
-            color = MaterialTheme.colorScheme.onSurface
+            color = SimpleTheme.colorScheme.onSurface
         )
         IconButton(
             modifier = Modifier
@@ -58,7 +57,7 @@ internal fun SleepTimer(
             Icon(
                 painter = painterResource(id = R.drawable.ic_cross_vector),
                 contentDescription = stringResource(id = R.string.close),
-                tint = MaterialTheme.colorScheme.onSurface
+                tint = SimpleTheme.colorScheme.onSurface
             )
         }
     }