diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/helpers/Config.kt
index b69e077..4c3e289 100644
--- a/app/src/main/kotlin/com/simplemobiletools/thankyou/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/helpers/Config.kt
@@ -15,6 +15,4 @@ class Config(context: Context) : BaseConfig(context) {
         set(hideLauncherIcon) = prefs.edit().putBoolean(HIDE_LAUNCHER_ICON, hideLauncherIcon).apply()
 
     val hideLauncherIconFlow: Flow<Boolean> = ::hideLauncherIcon.asFlowNonNull()
-    val wasUseEnglishToggledFlow: Flow<Boolean> = ::wasUseEnglishToggled.asFlowNonNull()
-    val useEnglishFlow: Flow<Boolean> = ::useEnglish.asFlowNonNull()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/MainScreen.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/MainScreen.kt
index d13f79c..3b277a8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/MainScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/MainScreen.kt
@@ -20,10 +20,10 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.compose.extensions.MyDevices
+import com.simplemobiletools.commons.compose.lists.*
 import com.simplemobiletools.commons.compose.menus.ActionItem
 import com.simplemobiletools.commons.compose.menus.ActionMenu
 import com.simplemobiletools.commons.compose.menus.OverflowMode
-import com.simplemobiletools.commons.compose.settings.scaffold.*
 import com.simplemobiletools.commons.compose.theme.AppThemeSurface
 import com.simplemobiletools.commons.compose.theme.SimpleTheme
 import kotlinx.collections.immutable.toImmutableList
@@ -36,7 +36,7 @@ internal fun MainScreen(
     moreAppsFromUs: () -> Unit,
     linkColor: Color,
 ) {
-    SettingsLazyScaffold(customTopBar = { scrolledColor: Color, _: MutableInteractionSource, scrollBehavior: TopAppBarScrollBehavior, statusBarColor: Int, colorTransitionFraction: Float, contrastColor: Color ->
+    SimpleScaffold(customTopBar = { scrolledColor: Color, _: MutableInteractionSource, scrollBehavior: TopAppBarScrollBehavior, statusBarColor: Int, colorTransitionFraction: Float, contrastColor: Color ->
         TopAppBar(
             title = {},
             actions = {
@@ -45,7 +45,7 @@ internal fun MainScreen(
                 ActionMenu(items = actionMenus, numIcons = 2, isMenuVisible = isMenuVisible, onMenuToggle = { isMenuVisible = it }, iconsColor = scrolledColor)
             },
             scrollBehavior = scrollBehavior,
-            colors = topAppBarColors(statusBarColor, colorTransitionFraction, contrastColor),
+            colors = simpleTopAppBarColors(statusBarColor, colorTransitionFraction, contrastColor),
             modifier = Modifier.topAppBarPaddings(),
             windowInsets = topAppBarInsets()
         )
diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt
index aa98d30..9b85d5f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/screens/SettingsScreen.kt
@@ -1,15 +1,13 @@
 package com.simplemobiletools.thankyou.screens
 
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.compose.extensions.MyDevices
+import com.simplemobiletools.commons.compose.lists.SimpleColumnScaffold
 import com.simplemobiletools.commons.compose.settings.*
-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
 
 @Composable
@@ -24,7 +22,7 @@ internal fun SettingsScreen(
     customizeColors: () -> Unit,
     goBack: () -> Unit,
 ) {
-    SettingsScaffold(title = stringResource(id = R.string.settings), goBack = goBack) {
+    SimpleColumnScaffold(title = stringResource(id = R.string.settings), goBack = goBack) {
         SettingsGroup(title = {
             SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
         }) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f894d46..6756eb4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 #jetbrains
 kotlin = "1.9.10"
 #Simple tools
-simple-commons = "80c40375a5"
+simple-commons = "fd497d3719"
 #Compose
 composeActivity = "1.8.0"
 compose = "1.6.0-alpha07"