diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java
index 500ccbe..209e51d 100644
--- a/app/src/main/java/com/a1/nextlocation/MainActivity.java
+++ b/app/src/main/java/com/a1/nextlocation/MainActivity.java
@@ -38,7 +38,6 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
      */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         super.onCreate(savedInstanceState);
 
         // initialize saved language from sharedPreferences
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index e0a2937..6155a58 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -108,7 +108,7 @@ public class SettingsFragment extends Fragment {
             editor.commit();
         });
 
-        this.colorBlindMode = view.findViewById(R.id.settingsEyesButton);
+        this.colorBlindMode = view.findViewById(R.id.colourblindSwitch);
         this.colorBlindMode.setOnClickListener(view1 -> {
             editor.putBoolean("colorBlindModeSwitch", imperialSwitch.isChecked());
             editor.apply();
@@ -117,10 +117,12 @@ public class SettingsFragment extends Fragment {
             if (colorBlindMode.isChecked()){
                 requireActivity().setTheme(R.style.Theme_NextLocation);
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                getActivity().recreate();
                 System.out.println("AAN");
             }else if (!colorBlindMode.isChecked()){
-                requireActivity().setTheme(R.style.Theme_NextLocationNight);
+                requireActivity().setTheme(R.style.Theme_NextLocation);
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                getActivity().recreate();
                 System.out.println("UIT");
             }