diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
index 51ab135dd..82e29caee 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt
@@ -14,10 +14,13 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.futo.inputmethod.latin.R
+import org.futo.inputmethod.latin.uix.HiddenKeysSetting
+import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
 import org.futo.inputmethod.latin.uix.settings.ScreenTitle
 import org.futo.inputmethod.latin.uix.settings.ScrollableList
+import org.futo.inputmethod.latin.uix.settings.SettingToggleDataStore
 
 
 val IS_DEVELOPER = booleanPreferencesKey("isDeveloperMode")
@@ -31,6 +34,12 @@ fun DeveloperScreen(navController: NavHostController = rememberNavController())
     ScrollableList {
         ScreenTitle("Developer", showBack = true, navController)
 
+        SettingToggleDataStore(
+            title = "Touch typing mode",
+            subtitle = "Hides all keys. Touch typists only! Recommended to disable emoji key and enable key borders",
+            setting = SettingsKey(HiddenKeysSetting, false)
+        )
+
         NavigationItem(
             title = "Crash the app",
             style = NavigationItemStyle.MiscNoArrow,
diff --git a/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt b/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
index 1515417ca..2efb959cc 100644
--- a/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
@@ -194,17 +194,9 @@ fun ThemePicker(onSelected: (ThemeOption) -> Unit) {
             item(span = { GridItemSpan(maxCurrentLineSpan) }) {
                 SettingToggleDataStore(
                     title = "Show symbol hints",
-                    subtitle = "",
                     setting = SettingsKey(KeyHintsSetting, false)
                 )
             }
-            item(span = { GridItemSpan(maxCurrentLineSpan) }) {
-                SettingToggleDataStore(
-                    title = "Expert mode",
-                    subtitle = "Hides all keys. Touch typists only",
-                    setting = SettingsKey(HiddenKeysSetting, false)
-                )
-            }
             items(availableThemeOptions.count()) {
                 val themeOption = availableThemeOptions[it].second