diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index e7497f9..38858e3 100755
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/app/src/main/java/com/josh/trackcovid19v2/HomeActivity.java b/app/src/main/java/com/josh/trackcovid19v2/HomeActivity.java
index 760d02b..1a6df6b 100755
--- a/app/src/main/java/com/josh/trackcovid19v2/HomeActivity.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/HomeActivity.java
@@ -26,8 +26,8 @@ public class HomeActivity extends AppCompatActivity {
     private int SPLASH_SCREEN_TIME_OUT = 30000;
     private Button button;
     private Handler handler;
-    private int STORAGE_PERMISSION_CODE = 1;
-    private int INTERNET_PERMISSION_CODE = 1;
+    private final int STORAGE_PERMISSION_CODE = 1;
+    private final int INTERNET_PERMISSION_CODE = 1;
     private Runnable myRunnable;
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/josh/trackcovid19v2/SettingsActivity.java b/app/src/main/java/com/josh/trackcovid19v2/SettingsActivity.java
index d32719e..c9417b2 100755
--- a/app/src/main/java/com/josh/trackcovid19v2/SettingsActivity.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/SettingsActivity.java
@@ -1,6 +1,7 @@
 package com.josh.trackcovid19v2;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -36,8 +37,13 @@ public class SettingsActivity extends AppCompatActivity {
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                        darkModeSwitch.setDefaultValue(true);
+                        Log.i("aa","set off dark mode");
                     } else {
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                        darkModeSwitch.setDefaultValue(false);
+                        Log.i("aa","set on dark mode");
+
                     }
                     return false;
                 }
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index ec16815..9181d83 100755
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -6,7 +6,10 @@
 
         <SwitchPreference
             android:key="darkMode"
-            android:title="Dark Mode" />
+            android:title="Dark Mode"
+            android:defaultValue="false"
+            android:summaryOff="Disabled"
+            android:summaryOn="Enabled"/>