diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fd8308f..35a06e22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - The space bar now shows the currently selected language ([#62])
 - Space bar cursor control now activates immediately on swipe ([#129])
+- Reorganized options on the settings screen
 
 ## [1.7.0] - 2025-12-16
 ### Added
diff --git a/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
index ead937ca..3d057645 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
@@ -74,7 +74,9 @@ class SettingsActivity : SimpleActivity() {
             arrayOf(
                 settingsColorCustomizationSectionLabel,
                 settingsGeneralSettingsLabel,
-                settingsKeyboardSettingsLabel,
+                settingsLayoutAppearanceLabel,
+                settingsKeypressLabel,
+                settingsTypingInputLabel,
                 settingsClipboardSettingsLabel
             ).forEach {
                 it.setTextColor(getProperPrimaryColor())
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 490c7c92..f1706073 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -73,7 +73,7 @@
             <org.fossify.commons.views.PurchaseThankYouItem
                 android:id="@+id/settings_purchase_thank_you_holder"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <RelativeLayout
                 android:id="@+id/settings_use_english_holder"
@@ -156,159 +156,181 @@
                 layout="@layout/divider" />
 
             <TextView
-                android:id="@+id/settings_keyboard_settings_label"
+                android:id="@+id/settings_layout_appearance_label"
                 style="@style/SettingsSectionLabelStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/keyboard_short" />
+                android:text="@string/layout_and_appearance" />
 
             <RelativeLayout
-                android:id="@+id/settings_vibrate_on_keypress_holder"
+                android:id="@+id/settings_show_key_borders_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_vibrate_on_keypress"
+                    android:id="@+id/settings_show_key_borders"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/vibrate_on_keypress" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/settings_sound_on_keypress_holder"
-                style="@style/SettingsHolderTextViewStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_sound_on_keypress_label"
-                    style="@style/SettingsTextLabelStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/sound_on_keypress" />
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_sound_on_keypress"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_sound_on_keypress_label" />
+                    android:text="@string/show_key_borders" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_show_popup_on_keypress_holder"
+                android:id="@+id/settings_show_numbers_row_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_show_popup_on_keypress"
+                    android:id="@+id/settings_show_numbers_row"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_popup" />
+                    android:text="@string/show_numbers_row" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_show_key_borders_holder"
+                android:id="@+id/settings_show_emoji_key_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_show_key_borders"
+                    android:id="@+id/settings_show_emoji_key"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_key_borders" />
+                    android:text="@string/show_emoji_key" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_show_numbers_row_holder"
+                android:id="@+id/settings_show_language_switch_key_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_show_numbers_row"
+                    android:id="@+id/settings_show_language_switch_key"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_numbers_row" />
+                    android:text="@string/show_language_switch_key" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_start_sentences_capitalized_holder"
-                style="@style/SettingsHolderSwitchStyle"
+                android:id="@+id/settings_keyboard_height_multiplier_holder"
+                style="@style/SettingsHolderTextViewStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_start_sentences_capitalized"
-                    style="@style/SettingsSwitchStyle"
+                <org.fossify.commons.views.MyTextView
+                    android:id="@+id/settings_keyboard_height_multiplier_label"
+                    style="@style/SettingsTextLabelStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/keyboard_height" />
+
+                <org.fossify.commons.views.MyTextView
+                    android:id="@+id/settings_keyboard_height_multiplier"
+                    style="@style/SettingsTextValueStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/start_sentences_capitalized" />
+                    android:layout_below="@+id/settings_keyboard_height_multiplier_label"
+                    tools:text="@string/small" />
 
             </RelativeLayout>
 
+            <include
+                android:id="@+id/settings_layout_appearance_divider"
+                layout="@layout/divider" />
+
+            <TextView
+                android:id="@+id/settings_keypress_label"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/keypress" />
+
             <RelativeLayout
-                android:id="@+id/settings_show_emoji_key_holder"
+                android:id="@+id/settings_show_popup_on_keypress_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_show_emoji_key"
+                    android:id="@+id/settings_show_popup_on_keypress"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_emoji_key" />
+                    android:text="@string/show_popup" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_show_language_switch_key_holder"
+                android:id="@+id/settings_vibrate_on_keypress_holder"
                 style="@style/SettingsHolderSwitchStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyMaterialSwitch
-                    android:id="@+id/settings_show_language_switch_key"
+                    android:id="@+id/settings_vibrate_on_keypress"
                     style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/show_language_switch_key" />
+                    android:text="@string/vibrate_on_keypress" />
 
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/settings_keyboard_height_multiplier_holder"
+                android:id="@+id/settings_sound_on_keypress_holder"
                 style="@style/SettingsHolderTextViewStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_keyboard_height_multiplier_label"
+                    android:id="@+id/settings_sound_on_keypress_label"
                     style="@style/SettingsTextLabelStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/keyboard_height" />
+                    android:text="@string/sound_on_keypress" />
 
                 <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_keyboard_height_multiplier"
+                    android:id="@+id/settings_sound_on_keypress"
                     style="@style/SettingsTextValueStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/settings_sound_on_keypress_label" />
+
+            </RelativeLayout>
+
+            <include
+                android:id="@+id/settings_keypress_divider"
+                layout="@layout/divider" />
+
+            <TextView
+                android:id="@+id/settings_typing_input_label"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/typing_and_input" />
+
+            <RelativeLayout
+                android:id="@+id/settings_start_sentences_capitalized_holder"
+                style="@style/SettingsHolderSwitchStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <org.fossify.commons.views.MyMaterialSwitch
+                    android:id="@+id/settings_start_sentences_capitalized"
+                    style="@style/SettingsSwitchStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_keyboard_height_multiplier_label"
-                    tools:text="@string/small" />
+                    android:text="@string/start_sentences_capitalized" />
 
             </RelativeLayout>
 
@@ -336,10 +358,9 @@
             </RelativeLayout>
 
             <include
-                android:id="@+id/settings_keyboard_divider"
+                android:id="@+id/settings_typing_input_divider"
                 layout="@layout/divider" />
 
-            <!-- CLIPBOARD SETTINGS -->
             <TextView
                 android:id="@+id/settings_clipboard_settings_label"
                 style="@style/SettingsSectionLabelStyle"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c73dd34..cceb4dcf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,9 @@
     <string name="keycode_enter">Enter</string>
     <string name="keycode_space">Spacebar</string>
     <!-- Settings -->
+    <string name="layout_and_appearance">Layout &amp; appearance</string>
+    <string name="keypress">Keypress</string>
+    <string name="typing_and_input">Typing &amp; input</string>
     <string name="show_clipboard_content">Show clipboard content if available</string>
     <string name="show_popup">Show a popup on keypress</string>
     <string name="vibrate_on_keypress">Vibrate on keypress</string>