diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 587b5e0..045038e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,5 +102,11 @@
     <string name="enable_blur_pref">Blur</string>
     <string name="repo_enabled">Repo on</string>
     <string name="repo_disabled">Repo off</string>
+    <string name="add_repo">Add Repo</string>
+    <string name="remove_repo">Remove Repo</string>
+    <string name="custom_url">Custom url</string>
     <string name="androidacy_repo_info">The Androidacy repo has ads and trackers.</string>
+    <string name="backup_module_list">Backup modules</string>
+    <string name="restore_module_list">Restore modules</string>
+    <string name="require_internet">This operation require an internet connection</string>
 </resources>
diff --git a/app/src/main/res/values/themable.xml b/app/src/main/res/values/themable.xml
new file mode 100644
index 0000000..95b5fa6
--- /dev/null
+++ b/app/src/main/res/values/themable.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Resource file for values that can be overwritten with an overlay -->
+</resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 30c057a..f658a6f 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -7,16 +7,13 @@
             app:icon="@drawable/ic_baseline_extension_24"
             app:title="@string/manage_repos_pref"
             app:singleLineTitle="false"	/>
-    </PreferenceCategory>
 
-    <PreferenceCategory
-        app:title="@string/pref_category_general">
         <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:key="pref_use_magisk_install_command"
-            app:icon="@drawable/ic_baseline_numbers_24"
-            app:title="@string/use_magisk_install_command_pref"
-            app:summary="@string/use_magisk_install_command_desc"
+            app:key="pref_show_incompatible"
+            app:icon="@drawable/ic_baseline_hide_source_24"
+            app:title="@string/show_incompatible_pref"
+            app:summary="@string/show_incompatible_desc"
             app:singleLineTitle="false"	/>
 
         <SwitchPreferenceCompat
@@ -28,11 +25,11 @@
             app:singleLineTitle="false"	/>
 
         <SwitchPreferenceCompat
-            app:defaultValue="true"
-            app:key="pref_dns_over_https"
-            app:icon="@drawable/ic_baseline_security_24"
-            app:title="@string/dns_over_https_pref"
-            app:summary="@string/dns_over_https_desc"
+            app:defaultValue="false"
+            app:key="pref_use_magisk_install_command"
+            app:icon="@drawable/ic_baseline_numbers_24"
+            app:title="@string/use_magisk_install_command_pref"
+            app:summary="@string/use_magisk_install_command_desc"
             app:singleLineTitle="false"	/>
     </PreferenceCategory>
 
@@ -78,11 +75,11 @@
 
     <PreferenceCategory app:title="@string/pref_category_security">
         <SwitchPreferenceCompat
-            app:defaultValue="false"
-            app:key="pref_show_incompatible"
-            app:icon="@drawable/ic_baseline_hide_source_24"
-            app:title="@string/show_incompatible_pref"
-            app:summary="@string/show_incompatible_desc"
+            app:defaultValue="true"
+            app:key="pref_dns_over_https"
+            app:icon="@drawable/ic_baseline_security_24"
+            app:title="@string/dns_over_https_pref"
+            app:summary="@string/dns_over_https_desc"
             app:singleLineTitle="false"	/>
         <!-- Note: Lockdown mode used to be called showcase mode -->
         <SwitchPreferenceCompat