diff --git a/app/src/main/java/helium314/keyboard/latin/LatinIME.java b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
index 997d84bb4..5f260ef6f 100644
--- a/app/src/main/java/helium314/keyboard/latin/LatinIME.java
+++ b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
@@ -73,7 +73,6 @@ import helium314.keyboard.latin.inputlogic.InputLogic;
 import helium314.keyboard.latin.permissions.PermissionsManager;
 import helium314.keyboard.latin.personalization.PersonalizationHelper;
 import helium314.keyboard.latin.settings.Settings;
-import helium314.keyboard.latin.settings.SettingsActivity;
 import helium314.keyboard.latin.settings.SettingsValues;
 import helium314.keyboard.latin.suggestions.SuggestionStripView;
 import helium314.keyboard.latin.suggestions.SuggestionStripViewAccessor;
@@ -89,8 +88,8 @@ import helium314.keyboard.latin.utils.StatsUtilsManager;
 import helium314.keyboard.latin.utils.SubtypeLocaleUtils;
 import helium314.keyboard.latin.utils.SubtypeSettingsKt;
 import helium314.keyboard.latin.utils.ViewLayoutUtils;
-import helium314.keyboard.settings.AllPrefsKt;
 import helium314.keyboard.settings.SettingsActivity2;
+import helium314.keyboard.settings.SettingsActivityKt;
 import kotlin.collections.CollectionsKt;
 
 import java.io.FileDescriptor;
@@ -1983,9 +1982,9 @@ public class LatinIME extends InputMethodService implements
 
     private void reloadIfNecessary() {
         // better do the reload when showing the keyboard next time, and not on settings change
-        if (AllPrefsKt.themeChanged) {
+        if (SettingsActivityKt.keyboardNeedsReload) {
             mKeyboardSwitcher.forceUpdateKeyboardTheme(mDisplayContext);
-            AllPrefsKt.themeChanged = false;
+            SettingsActivityKt.keyboardNeedsReload = false;
         }
     }
 }
diff --git a/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt b/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
index faa31112c..f733a38c6 100644
--- a/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
+++ b/app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt
@@ -146,4 +146,4 @@ class SettingsActivity2 : AppCompatActivity(), SharedPreferences.OnSharedPrefere
 }
 
 @JvmField
-var needsKeyboardReload = false
+var keyboardNeedsReload = false
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
index 2f3eedd26..0773d5dac 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/AdvancedScreen.kt
@@ -29,7 +29,7 @@ import helium314.keyboard.settings.SettingsDestination
 import helium314.keyboard.settings.SliderPreference
 import helium314.keyboard.settings.SwitchPreference
 import helium314.keyboard.settings.Theme
-import helium314.keyboard.settings.needsKeyboardReload
+import helium314.keyboard.settings.keyboardNeedsReload
 
 @Composable
 fun AdvancedSettingsScreen(
@@ -229,7 +229,7 @@ fun createAdvancedPrefs(context: Context) = listOf(
                     else -> "version unknown"
                 }
             },
-            onValueChanged =  { needsKeyboardReload = true }
+            onValueChanged =  { keyboardNeedsReload = true }
         )
     },
     PrefDef(context, Settings.PREF_URL_DETECTION, R.string.url_detection_title, R.string.url_detection_summary) {
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
index 2debd25f9..04ac2d54f 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/DebugScreen.kt
@@ -22,7 +22,7 @@ import helium314.keyboard.settings.SearchPrefScreen
 import helium314.keyboard.settings.SettingsActivity2
 import helium314.keyboard.settings.SwitchPreference
 import helium314.keyboard.settings.Theme
-import helium314.keyboard.settings.needsKeyboardReload
+import helium314.keyboard.settings.keyboardNeedsReload
 
 @Composable
 fun DebugScreen(
@@ -63,7 +63,7 @@ fun createDebugPrefs(context: Context) = listOf(
         }
     },
     PrefDef(context, DebugSettings.PREF_SHOW_SUGGESTION_INFOS, R.string.prefs_show_suggestion_infos) { def ->
-        SwitchPreference(def, false) { needsKeyboardReload = true }
+        SwitchPreference(def, false) { keyboardNeedsReload = true }
     },
     PrefDef(context, DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH, R.string.prefs_force_non_distinct_multitouch) { def ->
         SwitchPreference(def, false) { needsRestart = true }
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/GestureTypingScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/GestureTypingScreen.kt
index 228c05cd4..94f1fbf72 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/GestureTypingScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/GestureTypingScreen.kt
@@ -20,7 +20,7 @@ import helium314.keyboard.settings.SettingsActivity2
 import helium314.keyboard.settings.SliderPreference
 import helium314.keyboard.settings.SwitchPreference
 import helium314.keyboard.settings.Theme
-import helium314.keyboard.settings.needsKeyboardReload
+import helium314.keyboard.settings.keyboardNeedsReload
 
 @Composable
 fun GestureTypingScreen(
@@ -74,7 +74,7 @@ fun createGestureTypingPrefs(context: Context) = listOf(
         SwitchPreference(
             def = it,
             default = true
-        ) { needsKeyboardReload = true }
+        ) { keyboardNeedsReload = true }
     },
     PrefDef(context, Settings.PREF_GESTURE_SPACE_AWARE, R.string.gesture_space_aware, R.string.gesture_space_aware_summary) {
         SwitchPreference(
@@ -106,7 +106,7 @@ fun createGestureTypingPrefs(context: Context) = listOf(
             range = 100f..1900f,
             description = { stringResource(R.string.abbreviation_unit_milliseconds, (it + 100).toString()) },
             // todo: 50 ms steps?
-        ) { needsKeyboardReload = true }
+        ) { keyboardNeedsReload = true }
     },
 )
 
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt
index 91e92d4d6..788f83dba 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/TextCorrectionScreen.kt
@@ -37,7 +37,7 @@ import helium314.keyboard.settings.SettingsActivity2
 import helium314.keyboard.settings.SwitchPreference
 import helium314.keyboard.settings.Theme
 import helium314.keyboard.settings.dialogs.ConfirmationDialog
-import helium314.keyboard.settings.needsKeyboardReload
+import helium314.keyboard.settings.keyboardNeedsReload
 
 @Composable
 fun TextCorrectionScreen(
@@ -204,7 +204,7 @@ fun createCorrectionPrefs(context: Context) = listOf(
         R.string.bigram_prediction,
         R.string.bigram_prediction_summary
     ) {
-        SwitchPreference(it, true) { needsKeyboardReload = true }
+        SwitchPreference(it, true) { keyboardNeedsReload = true }
     },
     PrefDef(context,
         Settings.PREF_CENTER_SUGGESTION_TEXT_TO_ENTER,
diff --git a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
index 1b012670d..1d0edc77f 100644
--- a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
+++ b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt
@@ -32,6 +32,7 @@ import helium314.keyboard.latin.utils.defaultClipboardToolbarPref
 import helium314.keyboard.latin.utils.defaultPinnedToolbarPref
 import helium314.keyboard.latin.utils.defaultToolbarPref
 import helium314.keyboard.latin.utils.getStringResourceOrName
+import helium314.keyboard.latin.utils.prefs
 import helium314.keyboard.settings.AllPrefs
 import helium314.keyboard.settings.NonSettingsPrefs
 import helium314.keyboard.settings.PrefDef
@@ -42,8 +43,7 @@ import helium314.keyboard.settings.SwitchPreference
 import helium314.keyboard.settings.Theme
 import helium314.keyboard.settings.dialogs.ReorderDialog
 import helium314.keyboard.settings.dialogs.ToolbarKeysCustomizer
-import helium314.keyboard.settings.prefs
-import helium314.keyboard.settings.needsKeyboardReload
+import helium314.keyboard.settings.keyboardNeedsReload
 
 @Composable
 fun ToolbarScreen(
@@ -123,7 +123,7 @@ fun createToolbarPrefs(context: Context) = listOf(
         SwitchPreference(
             def,
             false,
-        ) { needsKeyboardReload = true }
+        ) { keyboardNeedsReload = true }
     },
     PrefDef(context, Settings.PREF_AUTO_SHOW_TOOLBAR, R.string.auto_show_toolbar, R.string.auto_show_toolbar_summary) { def ->
         SwitchPreference(
@@ -145,8 +145,6 @@ fun createToolbarPrefs(context: Context) = listOf(
     }
 )
 
-private class KeyAndState(var name: String, var state: Boolean)
-
 @Composable
 fun ToolbarKeyReorderDialog(
     prefKey: String,
@@ -164,7 +162,7 @@ fun ToolbarKeyReorderDialog(
         onConfirmed = { reorderedItems ->
             val value = reorderedItems.joinToString(";") { it.name + "," + it.state }
             prefs.edit().putString(prefKey, value).apply()
-            needsKeyboardReload = true
+            keyboardNeedsReload = true
         },
         onDismissRequest = onDismiss,
         items = items,
@@ -185,6 +183,8 @@ fun ToolbarKeyReorderDialog(
     )
 }
 
+private class KeyAndState(var name: String, var state: Boolean)
+
 @Preview
 @Composable
 private fun Preview() {