diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9431a9c..fd47525 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Dark">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java
index 2da252a..a64a90e 100644
--- a/app/src/main/java/com/philliphsu/clock2/BaseActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/BaseActivity.java
@@ -30,13 +30,23 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(layoutResId());
         // Initialize the associated SharedPreferences file with default values
         // for each preference when the user first opens your application.
         // When false, the system sets the default values only if this method has
         // never been called in the past (or the KEY_HAS_SET_DEFAULT_VALUES in the
         // default value shared preferences file is false).
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+        // ========================================================================================
+        // TOneverDO: Set theme after setContentView()
+        // Since the default theme is light, we only need to check against the dark theme.
+        String themeDark = getString(R.string.theme_dark);
+        String theme = PreferenceManager.getDefaultSharedPreferences(this).getString(
+                getString(R.string.key_theme), null);
+        if (themeDark.equals(theme)) {
+            setTheme(R.style.AppTheme_Dark);
+        }
+        // ========================================================================================
+        setContentView(layoutResId());
         // Direct volume changes to the alarm stream
         setVolumeControlStream(AudioManager.STREAM_ALARM);
         ButterKnife.bind(this);