diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e92ae31..bce8e6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:required="false" />
 
     <application
+        android:name="tech.zettervall.notes.BaseApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_agenda"
         android:label="@string/app_name"
diff --git a/app/src/main/java/tech/zettervall/notes/BaseActivity.java b/app/src/main/java/tech/zettervall/notes/BaseActivity.java
index e33e9fc..235e262 100644
--- a/app/src/main/java/tech/zettervall/notes/BaseActivity.java
+++ b/app/src/main/java/tech/zettervall/notes/BaseActivity.java
@@ -4,7 +4,6 @@
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
 
 import org.parceler.Parcels;
@@ -18,28 +17,15 @@
  */
 public abstract class BaseActivity extends AppCompatActivity {
 
-    protected boolean mEnableDarkTheme, mIsTablet;
+    protected boolean mNightMode, mIsTablet;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mEnableDarkTheme = PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean(getString(R.string.dark_theme_key), false);
+        mNightMode = PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(getString(R.string.dark_theme_key),
+                        getResources().getBoolean(R.bool.defaultNightMode));
         mIsTablet = getResources().getBoolean(R.bool.isTablet);
-
-        // Set Theme
-        setTheme();
-    }
-
-    /**
-     * Set App theme.
-     */
-    public void setTheme() {
-        if (mEnableDarkTheme) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        } else {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        }
     }
 
     /**
diff --git a/app/src/main/java/tech/zettervall/notes/BaseApplication.java b/app/src/main/java/tech/zettervall/notes/BaseApplication.java
new file mode 100644
index 0000000..f9256ca
--- /dev/null
+++ b/app/src/main/java/tech/zettervall/notes/BaseApplication.java
@@ -0,0 +1,30 @@
+package tech.zettervall.notes;
+
+import android.app.Application;
+import android.content.SharedPreferences;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+
+import tech.zettervall.mNotes.R;
+
+public class BaseApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean nightMode = sharedPreferences.getBoolean(getString(R.string.dark_theme_key),
+                getResources().getBoolean(R.bool.defaultNightMode));
+        setTheme(nightMode);
+    }
+
+    private void setTheme(boolean nightMode) {
+        if (nightMode) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        } else {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+    }
+}
diff --git a/app/src/main/java/tech/zettervall/notes/MainActivity.java b/app/src/main/java/tech/zettervall/notes/MainActivity.java
index 2a4245e..4033f11 100644
--- a/app/src/main/java/tech/zettervall/notes/MainActivity.java
+++ b/app/src/main/java/tech/zettervall/notes/MainActivity.java
@@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mNavView.setNavigationItemSelectedListener(this);
 
         // Set Navigation Drawer item background/text/icon color (for currently checked item)
-        if (!mEnableDarkTheme) { // Light Theme
+        if (!mNightMode) { // Light Theme
             mNavView.setItemBackground(getResources().getDrawable(R.color.selector_navitem));
         } else { // Dark Theme
             mNavView.setItemTextColor(ColorStateListUtil.getNavigationDrawerNightColorStateList(this));
diff --git a/app/src/main/java/tech/zettervall/notes/SettingsActivity.java b/app/src/main/java/tech/zettervall/notes/SettingsActivity.java
index bc3930c..b77c413 100644
--- a/app/src/main/java/tech/zettervall/notes/SettingsActivity.java
+++ b/app/src/main/java/tech/zettervall/notes/SettingsActivity.java
@@ -108,13 +108,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         @Override
         public boolean onPreferenceClick(Preference preference) {
             if (preference == findPreference(getString(R.string.dark_theme_key))) { // Dark Theme
-                boolean setDarkTheme = mSharedPreferences.getBoolean(getString(R.string.dark_theme_key), false);
-                if (setDarkTheme) {
+                boolean nightMode = mSharedPreferences.getBoolean(getString(R.string.dark_theme_key),
+                        getResources().getBoolean(R.bool.defaultNightMode));
+                if (nightMode) {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 } else {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 }
-                getActivity().recreate();
             } else if (preference == findPreference(getString(R.string.backup_key))) { // Backup Db
                 String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
                 requestPermissions(permissions, BACKUP_DB_REQUEST_CODE);
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 7aa5ebe..c669b4b 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <bool name="defaultNightMode">false</bool>
     <bool name="isLandscape">false</bool>
     <bool name="isTablet">false</bool>
 </resources>
\ No newline at end of file