diff --git a/src/rules.cpp b/src/rules.cpp
index 001ba377f..c3efe851f 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -224,42 +224,22 @@ static void colorizeUDA (Task& task, const std::string& rule, const Color& base,
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeDue (Task& task, const Color& base, Color& c, bool merge)
 {
-  if (task.has ("due"))
-  {
-    auto status = task.getStatus ();
-    if (status != Task::completed &&
-        status != Task::deleted   &&
-        task.getDateState ("due") == Task::dateAfterToday)
-      applyColor (base, c, merge);
-  }
+  if (task.is_due ())
+    applyColor (base, c, merge);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeDueToday (Task& task, const Color& base, Color& c, bool merge)
 {
-  if (task.has ("due"))
-  {
-    auto status = task.getStatus ();
-    auto dateState = task.getDateState ("due");
-    if (status != Task::completed &&
-        status != Task::deleted   &&
-        (dateState == Task::dateLaterToday || dateState == Task::dateEarlierToday))
-      applyColor (base, c, merge);
-  }
+  if (task.is_duetoday ())
+    applyColor (base, c, merge);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeOverdue (Task& task, const Color& base, Color& c, bool merge)
 {
-  if (task.has ("due"))
-  {
-    auto status = task.getStatus ();
-    auto dateState = task.getDateState ("due");
-    if (status != Task::completed &&
-        status != Task::deleted   &&
-        (dateState == Task::dateBeforeToday || dateState == Task::dateEarlierToday))
-      applyColor (base, c, merge);
-  }
+  if (task.is_overdue ())
+    applyColor (base, c, merge);
 }
 
 ////////////////////////////////////////////////////////////////////////////////