diff --git a/res/values/config.xml b/res/values/config.xml
index dda669e..e2e8c8f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -20,4 +20,5 @@
     <!-- The type of sim image to display.
          0=default sim image, 1=sim on side, 2=sim on back-->
     <integer name="sim_image_type">0</integer>
+    <bool name="check_custom_theme_by_default">true</bool>
 </resources>
diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index d751461..dbfd439 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -413,9 +413,13 @@ public class CyanogenSettingsPage extends SetupPage {
         private void updateThemeOption() {
             if (!mHideThemeRow) {
                 final Bundle myPageBundle = mPage.getData();
-                boolean themesChecked =
-                        !myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME) || myPageBundle
-                                .getBoolean(KEY_APPLY_DEFAULT_THEME);
+                boolean themesChecked;
+                if (myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME)) {
+                    themesChecked = myPageBundle.getBoolean(KEY_APPLY_DEFAULT_THEME);
+                } else {
+                    themesChecked = getActivity().getResources().getBoolean(
+                            R.bool.check_custom_theme_by_default);
+                }
                 mDefaultTheme.setChecked(themesChecked);
                 myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked);
             }