diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
index 7e0f687d0..e14139acc 100644
--- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -141,7 +141,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     private final Map<String, TagData> tagMap = new HashMap<>();
 
-    private final int textColorPrimary;
     private final int textColorSecondary;
     private final int textColorHint;
     private final int textColorOverdue;
@@ -173,7 +172,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         displayMetrics = new DisplayMetrics();
         fragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 
-        textColorPrimary = getData(context, android.R.attr.textColorPrimary);
         textColorSecondary = getData(context, android.R.attr.textColorSecondary);
         textColorHint = getData(context, android.R.attr.textColorTertiary);
         textColorOverdue = resources.getColor(R.color.overdue);
@@ -474,14 +472,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * uncompleted.
      */
     protected void setTaskAppearance(ViewHolder viewHolder, Task task) {
-        boolean state = task.isCompleted();
+        boolean completed = task.isCompleted();
 
         TextView name = viewHolder.nameView;
-        if(state) {
-            name.setTextColor(textColorHint);
+        if (completed) {
+            name.setEnabled(false);
             name.setPaintFlags(name.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
         } else {
-            name.setTextColor(textColorPrimary);
+            name.setEnabled(true);
             name.setPaintFlags(name.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
         }
         name.setTextSize(fontSize);
diff --git a/src/main/res/color-night/text_primary.xml b/src/main/res/color-night/text_primary.xml
new file mode 100644
index 000000000..9ed021e68
--- /dev/null
+++ b/src/main/res/color-night/text_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="false" android:color="@color/white_50"/>
+    <item android:color="@color/white_100"/>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/color/task_edit_toggle_button_text.xml b/src/main/res/color/task_edit_toggle_button_text.xml
deleted file mode 100644
index 378c4af3e..000000000
--- a/src/main/res/color/task_edit_toggle_button_text.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-        <item android:state_checked="true"
-              android:color="@android:color/white"/>
-        <item android:state_checked="false"
-              android:color="@color/task_edit_deadline_gray"/>
-</selector>
diff --git a/src/main/res/color/text_primary.xml b/src/main/res/color/text_primary.xml
new file mode 100644
index 000000000..003b2be28
--- /dev/null
+++ b/src/main/res/color/text_primary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="false" android:color="@color/black_38"/>
+    <item android:color="@color/black_87"/>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml
index c7a257f4f..25300962a 100644
--- a/src/main/res/layout/task_adapter_row_simple.xml
+++ b/src/main/res/layout/task_adapter_row_simple.xml
@@ -51,6 +51,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="100"
                     android:ellipsize="end"
+                    android:textColor="?android:attr/textColorPrimary"
                     android:gravity="start|center_vertical"
                     android:textAlignment="viewStart"
                     android:maxLines="1"
diff --git a/src/main/res/values-night/colors.xml b/src/main/res/values-night/colors.xml
index 6aaf111bc..c37bb8e88 100644
--- a/src/main/res/values-night/colors.xml
+++ b/src/main/res/values-night/colors.xml
@@ -5,7 +5,6 @@
     <color name="icon_tint">@color/icon_tint_dark</color>
     <color name="drawer_color">@color/drawer_background_dark</color>
     <color name="drawer_color_selected">@color/drawer_background_dark_selected</color>
-    <color name="text_primary">@color/white_100</color>
     <color name="text_secondary">@color/white_70</color>
     <color name="text_tertiary">@color/white_50</color>
     <color name="divider">@color/white_12</color>
diff --git a/src/main/res/values-notnight/colors.xml b/src/main/res/values-notnight/colors.xml
index 5836559e7..f03e50dd3 100644
--- a/src/main/res/values-notnight/colors.xml
+++ b/src/main/res/values-notnight/colors.xml
@@ -5,7 +5,6 @@
     <color name="icon_tint">@color/icon_tint_light</color>
     <color name="drawer_color">@color/drawer_background_light</color>
     <color name="drawer_color_selected">@color/drawer_background_light_selected</color>
-    <color name="text_primary">@color/black_87</color>
     <color name="text_secondary">@color/black_54</color>
     <color name="text_tertiary">@color/black_38</color>
     <color name="divider">@color/black_12</color>