diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a9eb912e26537a0c1135b5c232cb7ad4b426179..cd832ad1a642d1dbfb59cd6356255491efdaba4b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,20 +206,20 @@
             android:name="com.android.calendar.alerts.AlertActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Dialog" />
+            android:theme="@style/customDialogStyle" />
 
         <activity
             android:name="com.android.calendar.alerts.QuickResponseActivity"
             android:excludeFromRecents="true"
             android:label="@string/quick_response_dialog_title"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Dialog" />
+            android:theme="@style/customDialogStyle" />
 
         <activity
             android:name="com.android.calendar.alerts.SnoozeDelayActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Dialog" />
+            android:theme="@style/customDialogStyle" />
 
         <receiver android:name="com.android.calendar.alerts.AlertReceiver">
             <intent-filter>
diff --git a/res/drawable/recurrence_day_view_text_color.xml b/res/drawable/recurrence_day_view_text_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..147fdee010ccf68beb905b8dd375767472180585
--- /dev/null
+++ b/res/drawable/recurrence_day_view_text_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_checked="true" android:color="@color/color_default_view_on_accent"/>
+    <item android:state_enabled="true" android:state_checked="false" android:color="@color/color_default_primary_text"/>
+    <item android:color="@color/color_default_secondary_text" />
+</selector>
diff --git a/res/layout/alert_activity.xml b/res/layout/alert_activity.xml
index 51b1086f1f0e137847a77e17b23991359942befd..58e06ac23fef62212e7297b9a829cac20e4a3ac2 100644
--- a/res/layout/alert_activity.xml
+++ b/res/layout/alert_activity.xml
@@ -40,6 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             style="?android:attr/buttonBarButtonStyle"
+            android:textColor="@color/colorAccent"
             android:text="@string/dismiss_all_label" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/alert_item.xml b/res/layout/alert_item.xml
index 79563f1d994cd8bc20e366fe0461eeba1c68f10e..b5ef596489843e211261049a879e66447969a844 100644
--- a/res/layout/alert_item.xml
+++ b/res/layout/alert_item.xml
@@ -42,6 +42,7 @@
             android:id="@+id/event_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/color_default_primary_text"
             android:ellipsize="end"
             android:maxLines="2"
             android:textSize="18sp" />
@@ -58,6 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:textColor="@color/color_default_secondary_text"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="14sp" />
@@ -69,6 +71,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="5dip"
             android:src="@drawable/ic_repeat_dark"
+            android:tint="@color/colorAccent"
             android:focusable="false"
             android:clickable="false" />
     </LinearLayout>
@@ -78,6 +81,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="44dip"
+        android:textColor="@color/color_default_secondary_text"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="14sp" />
diff --git a/res/layout/quick_response_item.xml b/res/layout/quick_response_item.xml
index 9ff88f0c9c5505dcd344ce12679e98fbcd9d677d..433668e5d6bc5509865e0bd3353821969a8bed18 100644
--- a/res/layout/quick_response_item.xml
+++ b/res/layout/quick_response_item.xml
@@ -19,6 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:textColor="@color/color_default_primary_text"
     android:gravity="center_vertical"
     android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
     android:paddingRight="?android:attr/listPreferredItemPaddingRight"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 403ee025c59a353668f5811bd91c1226bdc142f8..a3e9ead0147a2372953644315c3b435cd5bc7ae2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -45,5 +45,6 @@
         <attr name="iconAboutAuthors" format="reference"/>
         <attr name="iconAboutLicense" format="reference"/>
         <attr name="iconSettingsAbout" format="reference" />
+        <attr name="textColorPrimaryInverse" format="color" />
     </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b7ea385a679a2982af719722628b88e6a1ed94eb..1d912bb323a82299a04a79953459154b84bdc03c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -30,7 +30,6 @@
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
     <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
-
     <color name="color_default_blue_lite">@lineageos.platform:color/color_default_selector</color>
     <color name="color_gray2">@lineageos.platform:color/color_default_gray2</color>
 
@@ -190,7 +189,7 @@
 
     <color name="alert_event_title">@color/color_default_primary_text</color>
     <color name="alert_event_other">@color/color_default_secondary_text</color>
-    <color name="alert_past_event">#8F999999</color>
+    <color name="alert_past_event">@color/color_default_secondary_text</color>
 
     <color name="appwidget_row_in_progress">#6633b5e5</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index aeef08f8c0cb28de56b50edbb012887398c42914..a22fe3e3a434f7a0ffffaa2844fdee4e220a5e0f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -290,6 +290,7 @@
         <item name="android:layout_weight">1</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@drawable/recurrence_day_view_text_color</item>
         <item name="android:textStyle">bold</item>
         <item name="android:singleLine">true</item>
         <item name="android:background">@drawable/recurrence_bubble_fill</item>
@@ -312,11 +313,33 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
-        <item name="android:alertDialogTheme">@style/customAlertButton</item>
+        <item name="android:alertDialogTheme">@style/customDialogStyle</item>
         <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:textColorPrimaryInverse">@color/white</item>
-        <item name="android:buttonBarNegativeButtonStyle">@style/datePicker.buttonBarNegativeButtonStyle</item>
-        <item name="android:buttonBarPositiveButtonStyle">@style/datePicker.buttonBarNegativeButtonStyle</item>
+        <item name="colorControlNormal">@color/colorAccent</item>
+        <item name="textColorPrimaryInverse">@color/color_default_view_on_accent</item>
+        <item name="android:textColorPrimaryInverse">@color/color_default_view_on_accent</item>
+        <item name="buttonBarNegativeButtonStyle">@style/datePicker.buttonBarNegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/datePicker.buttonBarNegativeButtonStyle</item>
+    </style>
+
+    <style name="customDialogStyle" parent="@android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:colorBackground">@color/background_color</item>
+        <item name="android:windowTitleStyle">@style/customDialogWindowTitle</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
+    </style>
+
+    <style name="customDialogWindowTitle">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">@style/customDialogWindowTitleTextAppearance</item>
+    </style>
+
+    <style name="customDialogWindowTitleTextAppearance" parent="@android:style/TextAppearance.Holo.DialogWindowTitle">
+        <item name="android:textColor">@color/colorAccent</item>
     </style>
 
     <style name="customAlertButton" parent="android:style/Widget.Button">
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index e6c6f5e1964b01bc61a912d496a829c616871aa2..03d4554d4519d9fabd33b68220c54350494eec48 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -923,7 +923,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
                     mController.sendEvent(this, EventType.GO_TO, selectedTime, null, selectedTime, -1, ViewType.CURRENT, extras, null, null);
                 }
             };
-            DatePickerDialog datePickerDialog = new DatePickerDialog(this, datePickerListener, t.year, t.month, t.monthDay);
+            DatePickerDialog datePickerDialog = new DatePickerDialog(this, R.style.datepicker, datePickerListener, t.year, t.month, t.monthDay);
             datePickerDialog.show();
 
         } else if (itemId == R.id.action_hide_controls) {
diff --git a/src/com/android/calendar/DynamicTheme.java b/src/com/android/calendar/DynamicTheme.java
index d2d3d2bf5cd7abcea6c8eea6b98050af52112487..6c25afce544b8f3159fae31d1d156888fca5a98e 100644
--- a/src/com/android/calendar/DynamicTheme.java
+++ b/src/com/android/calendar/DynamicTheme.java
@@ -131,19 +131,6 @@ public class DynamicTheme {
         return res.getIdentifier(id + suffix, "drawable", context.getPackageName());
     }
 
-    public static int getDialogStyle(Context context) {
-        String theme = getTheme(context);
-        switch (getTheme(context)) {
-            case LIGHT:
-                return android.R.style.Theme_DeviceDefault_Light_Dialog;
-            case DARK:
-            case BLACK:
-                return android.R.style.Theme_DeviceDefault_Dialog;
-            default:
-                throw new UnsupportedOperationException("Unknown theme: " + theme);
-        }
-    }
-
     private static final class OverridePendingTransition {
         static void invoke(Activity activity) {
             activity.overridePendingTransition(0, 0);
diff --git a/src/com/android/calendar/alerts/AlertAdapter.java b/src/com/android/calendar/alerts/AlertAdapter.java
index d3e3044bf535f752cdd8a9567a44e4b94a445d69..3d2af049a8b225a5e84c2e1b79f1f0762a12cc75 100644
--- a/src/com/android/calendar/alerts/AlertAdapter.java
+++ b/src/com/android/calendar/alerts/AlertAdapter.java
@@ -37,7 +37,6 @@ import foundation.e.calendar.R;
 public class AlertAdapter extends ResourceCursorAdapter {
 
     private static AlertActivity alertActivity;
-    private static boolean mFirstTime = true;
     private static int mTitleColor;
     private static int mOtherColor; // non-title fields
     private static int mPastEventColor;
@@ -48,18 +47,16 @@ public class AlertAdapter extends ResourceCursorAdapter {
     }
 
     public static void updateView(Context context, View view, String eventName, String location,
-            long startMillis, long endMillis, boolean allDay) {
+                                  long startMillis, long endMillis, boolean allDay) {
         Resources res = context.getResources();
 
         TextView titleView = (TextView) view.findViewById(R.id.event_title);
         TextView whenView = (TextView) view.findViewById(R.id.when);
         TextView whereView = (TextView) view.findViewById(R.id.where);
-        if (mFirstTime) {
-            mPastEventColor = res.getColor(R.color.alert_past_event);
-            mTitleColor = res.getColor(R.color.alert_event_title);
-            mOtherColor = res.getColor(R.color.alert_event_other);
-            mFirstTime = false;
-        }
+
+        mPastEventColor = res.getColor(R.color.alert_past_event);
+        mTitleColor = res.getColor(R.color.alert_event_title);
+        mOtherColor = res.getColor(R.color.alert_event_other);
 
         if (endMillis < System.currentTimeMillis()) {
             titleView.setTextColor(mPastEventColor);
@@ -148,7 +145,7 @@ public class AlertAdapter extends ResourceCursorAdapter {
     }
 
     @Override
-    protected void onContentChanged () {
+    protected void onContentChanged() {
         super.onContentChanged();
 
         // Prevent empty popup notification.
diff --git a/src/com/android/calendar/alerts/QuickResponseActivity.java b/src/com/android/calendar/alerts/QuickResponseActivity.java
index 81278a1aa0dc12f68118e3aae6a2963f25b0a9f4..8cb67117ffcb070b3c472b92518ab25b009740ee 100644
--- a/src/com/android/calendar/alerts/QuickResponseActivity.java
+++ b/src/com/android/calendar/alerts/QuickResponseActivity.java
@@ -49,7 +49,6 @@ public class QuickResponseActivity extends ListActivity implements OnItemClickLi
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        setTheme(DynamicTheme.getDialogStyle(this));
         Intent intent = getIntent();
         if (intent == null) {
             finish();
diff --git a/src/com/android/calendar/alerts/SnoozeDelayActivity.java b/src/com/android/calendar/alerts/SnoozeDelayActivity.java
index a80bf1db06a91b2c4a28ab1d4a8a8894c3898d09..e22a17304fd8656c205877300156adab56f1ff25 100644
--- a/src/com/android/calendar/alerts/SnoozeDelayActivity.java
+++ b/src/com/android/calendar/alerts/SnoozeDelayActivity.java
@@ -40,7 +40,7 @@ public class SnoozeDelayActivity extends Activity implements
     @Override
     protected Dialog onCreateDialog(int id) {
         if (id == DIALOG_DELAY) {
-            TimePickerDialog d = new TimePickerDialog(this, this, 0, 0, true);
+            TimePickerDialog d = new TimePickerDialog(this, R.style.datepicker,this, 0, 0, true);
             d.setTitle(R.string.snooze_delay_dialog_title);
             d.setCancelable(true);
             d.setOnCancelListener(this);
diff --git a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
index 81177187795a1fb7a02b1b54ae54e839b0aefdb8..71d9f6c569d1d5e297932783166eefb89f736e08 100644
--- a/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
+++ b/src/com/android/calendar/recurrencepicker/RecurrencePickerDialog.java
@@ -947,7 +947,7 @@ public class RecurrencePickerDialog extends DialogFragment implements OnItemSele
             if (mDatePickerDialog != null) {
                 mDatePickerDialog.dismiss();
             }
-            mDatePickerDialog = new DatePickerDialog(getActivity(), this,
+            mDatePickerDialog = new DatePickerDialog(getActivity(), R.style.datepicker, this,
                     mModel.endDate.year, mModel.endDate.month, mModel.endDate.monthDay);
             mDatePickerDialog.show();
         } else if (mDone == v) {