diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1334060..2291bfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,8 @@
     <string name="pref_automatic_note_deletion_summary">Automatically remove notes when setting values on connected cells</string>
     <string name="pref_timer_reset">Timer Reset</string>
     <string name="pref_timer_reset_summary">Also reset the timer, when resetting the game board.</string>
-    <string name="pref_dark_mode">Dark Mode</string>
+    <string name="pref_dark_mode">Dark Theme</string>
+    <string name="pref_group_dark_theme">Dark Theme settings</string>
 
     <string name="pref_dark_mode_setting">Dark Theme</string>
     <string name="pref_dark_mode_summary">switch between light and dark theme</string>
diff --git a/app/src/main/res/xml/pref_settings_general.xml b/app/src/main/res/xml/pref_settings_general.xml
index 6d59eec..b014bbe 100644
--- a/app/src/main/res/xml/pref_settings_general.xml
+++ b/app/src/main/res/xml/pref_settings_general.xml
@@ -19,12 +19,6 @@
         android:summary="@string/pref_keep_screen_on_summary"
         android:defaultValue="true"/>
 
-        <SwitchPreference android:id="@+id/pref_dark_theme"
-            android:key="pref_dark_mode_setting"
-            android:title="@string/pref_dark_mode"
-            android:summary="@string/pref_dark_mode_summary"
-            android:defaultValue="true"/>
-
         <ListPreference
         android:key="pref_symbols"
         android:title="@string/pref_symbols"
@@ -35,6 +29,14 @@
         android:positiveButtonText="@null" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/pref_group_dark_theme">
+    <SwitchPreference android:id="@+id/pref_dark_theme"
+        android:key="pref_dark_mode_setting"
+        android:title="@string/pref_dark_mode"
+        android:summary="@string/pref_dark_mode_summary"
+        android:defaultValue="true"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/pref_group_highlight_selection">
         <SwitchPreference android:id="@+id/pref_highlight_connected"
             android:key="pref_highlight_connected"