diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
index 54eb19fd3..fe7d42008 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
@@ -91,7 +91,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
     @Override
     public void setUpUiComponents() {
         TypedValue tv = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false);
+        getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false);
         getTouchListView().setDragndropBackgroundColor(tv.data);
         getTouchListView().setDropListener(dropListener);
         getTouchListView().setClickListener(rowClickListener);
diff --git a/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java
index 3b01b583e..bb6f3e4c8 100644
--- a/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java
+++ b/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java
@@ -16,11 +16,11 @@ import com.todoroo.astrid.service.StartupService;
 import org.tasks.R;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.injection.ThemedInjectingAppCompatActivity;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.Preferences;
 import org.tasks.preferences.ResourceResolver;
+import org.tasks.preferences.ThemeManager;
 import org.tasks.scheduling.AlarmManager;
 import org.tasks.scheduling.CalendarNotificationIntentService;
 
@@ -44,6 +44,7 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
     @Inject ResourceResolver resourceResolver;
     @Inject DialogBuilder dialogBuilder;
     @Inject AlarmManager alarmManager;
+    @Inject ThemeManager themeManager;
 
     private String eventName;
     private long endTime;
@@ -137,7 +138,7 @@ public class CalendarReminderActivity extends ThemedInjectingAppCompatActivity {
 
         dialogView.setText(speechText);
 
-        createListButton.setBackgroundColor(resourceResolver.getData(R.attr.asThemeTextColor));
+        createListButton.setBackgroundColor(themeManager.getAccentTheme().getAccentColor());
 
         if (fromPostpone) {
             postponeButton.setVisibility(View.GONE);
diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
index ff49418b6..a4410de45 100644
--- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@@ -82,7 +82,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
     @Override
     public void setUpUiComponents() {
         TypedValue tv = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false);
+        getActivity().getTheme().resolveAttribute(R.attr.colorAccent, tv, false);
         DraggableListView draggableListView = (DraggableListView) fragment.getListView();
         draggableListView.setDragndropBackgroundColor(tv.data);
         draggableListView.setDropListener(dropListener);
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index a14cdd3a8..b04469d68 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -17,7 +17,6 @@
     <attr name="asDueDateCompletedColor" format="color" />
     <attr name="asSeparator" format="color" />
     <attr name="asListDividerColor" format="color" />
-    <attr name="asThemeTextColor" format="color" />
     <attr name="asEditTextBackground" format="reference" />
     <attr name="separatorHeight" format="dimension" />
     <attr name="popup_theme" format="reference" />
diff --git a/src/main/res/values/theme_base_dark.xml b/src/main/res/values/theme_base_dark.xml
index b655e5520..e58e1274e 100644
--- a/src/main/res/values/theme_base_dark.xml
+++ b/src/main/res/values/theme_base_dark.xml
@@ -17,7 +17,6 @@
         <item name="asDetailsColor">#6666aa</item>
         <item name="asDueDateColor">#c3c3c3</item>
         <item name="asListDividerColor">#dddddd</item>
-        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="task_edit_divider">@color/task_edit_divider</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
@@ -30,7 +29,6 @@
     <style name="DialogBaseDark" parent="@style/Theme.AppCompat.Dialog">
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/white</item>
         <item name="asListDividerColor">#dddddd</item>
     </style>
diff --git a/src/main/res/values/theme_base_light.xml b/src/main/res/values/theme_base_light.xml
index 65ede00a2..c05823254 100644
--- a/src/main/res/values/theme_base_light.xml
+++ b/src/main/res/values/theme_base_light.xml
@@ -17,7 +17,6 @@
         <item name="asDetailsColor">#6666aa</item>
         <item name="asDueDateColor">#878787</item>
         <item name="asListDividerColor">#dddddd</item>
-        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="task_edit_divider">@color/task_edit_divider</item>
         <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
@@ -30,7 +29,6 @@
     <style name="LightDialogBase" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/black</item>
         <item name="asListDividerColor">#dddddd</item>
     </style>