diff --git a/src/com/android/calendar/DynamicTheme.java b/src/com/android/calendar/DynamicTheme.java
index 942f68d016054f1845a92fe8caf5481375515fc7..3160d9eef8529545123db93d00ee6042dbbaa084 100644
--- a/src/com/android/calendar/DynamicTheme.java
+++ b/src/com/android/calendar/DynamicTheme.java
@@ -9,6 +9,7 @@ import android.graphics.Color;
 import android.util.Log;
 
 import androidx.annotation.ColorInt;
+
 import foundation.e.calendar.R;
 
 /**
@@ -46,11 +47,20 @@ public class DynamicTheme {
     }
 
     private static String getTheme(Context context) {
+        /**
+         * Migrate the user preferences to light mode.
+         * It makes sure we don't unnecessarily access a wrong resource as we have disabled dark/black theme.
+         */
+        if (Utils.getSharedPreference(context, THEME_PREF, LIGHT).equalsIgnoreCase(BLACK)
+                || Utils.getSharedPreference(context, THEME_PREF, LIGHT).equalsIgnoreCase(DARK)) {
+            Utils.setSharedPreference(context, THEME_PREF, LIGHT);
+        }
         return Utils.getSharedPreference(context, THEME_PREF, LIGHT);
+
     }
 
     private static int getSelectedTheme(Activity activity) {
-       // String theme = getTheme(activity) + getPrimaryColor(activity);
+        // String theme = getTheme(activity) + getPrimaryColor(activity);
         return R.style.CalendarAppThemeLightTeal;
     }
 
@@ -111,6 +121,7 @@ public class DynamicTheme {
     public static int getColor(Context context, String id) {
         String suffix = getSuffix(getTheme(context));
         Resources res = context.getResources();
+        Log.d("DynamicTheme", "Resource id: " + (id + suffix));
         return res.getColor(res.getIdentifier(id + suffix, "color", context.getPackageName()));
     }
 
diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java
index 2e53a97ab433143e22aa31597b9f755f5fddd720..27d6a3b82fc454d97014773649b246192eae03d0 100644
--- a/src/com/android/calendar/month/MonthWeekEventsView.java
+++ b/src/com/android/calendar/month/MonthWeekEventsView.java
@@ -233,10 +233,8 @@ public class MonthWeekEventsView extends SimpleWeekView {
         mMonthWeekNumColor = DynamicTheme.getColor(context, "month_week_num_color");
         mMonthNumColor = DynamicTheme.getColor(context, "month_day_number");
         mMonthNumOtherColor = DynamicTheme.getColor(context, "month_day_number_other");
-        //current date
-        mMonthNumTodayColor = DynamicTheme.getColor(context, "month_today_number_black");
-        //current event
-        mMonthEventColor = DynamicTheme.getColor(context, "month_day_number_other_black");
+        mMonthNumTodayColor = DynamicTheme.getColor(context, "month_today_number");
+        mMonthEventColor = DynamicTheme.getColor(context, "month_event_color");
         mMonthDeclinedEventColor = DynamicTheme.getColor(context, "agenda_item_declined_color");
         mMonthDeclinedExtrasColor = DynamicTheme.getColor(context, "agenda_item_where_declined_text_color");
         mMonthEventExtraColor = DynamicTheme.getColor(context, "month_event_extra_color");