diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 8074824a8..6fcdc631b 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -12,25 +12,33 @@
     <color name="brand">#7a12f8</color>
 
     <!--  HabitRPG task color -->
-    <color name="worst">#E6B8AF</color>
-    <color name="worst_btn">#c96652</color>
-    <color name="worse">#F4CCCC</color>
-    <color name="worse_btn">#dc5d5d</color>
+    <color name="worst_100">#E6B8AF</color>
+    <color name="worst_50">#c96652</color>
+    <color name="worst_10">#c96652</color>
 
-    <color name="bad">#FCE5CD</color>
-    <color name="bad_btn">#f4a24c</color>
+    <color name="worse_100">#FF6165</color>
+    <color name="worse_50">#F74E52</color>
+    <color name="worse_10">#F23035</color>
 
-    <color name="neutral">#FFF2CC</color>
-    <color name="neutral_btn">#ffcf42</color>
+    <color name="bad_100">#FF944C</color>
+    <color name="bad_50">#FA8537</color>
+    <color name="bad_10">#F47825</color>
 
-    <color name="good">#D9EAD3</color>
-    <color name="good_btn">#8bbf79</color>
+    <color name="neutral_100">#FFBE5D</color>
+    <color name="neutral_50">#FFB445</color>
+    <color name="neutral_10">#FFA624</color>
 
-    <color name="better">#D0E0E3</color>
-    <color name="better_btn">#7eaab2</color>
+    <color name="good_100">#D9EAD3</color>
+    <color name="good_50">#8bbf79</color>
+    <color name="good_10">#8bbf79</color>
 
-    <color name="best">#C9DAF8</color>
-    <color name="best_btn">#5288e9</color>
+    <color name="better_100">#5AE4B2</color>
+    <color name="better_50">#3FDAA2</color>
+    <color name="better_10">#23CC8F</color>
+
+    <color name="best_100">#50B5E9</color>
+    <color name="best_50">#46A7D9</color>
+    <color name="best_10">#2995CD</color>
 
     <color name="completed">#D9D9D9</color>
     <color name="completed_btn">#989898</color>
@@ -75,4 +83,6 @@
     <color name="material_drawer_dark_header_selection_text">#FFF</color>
 
     <color name="checkbox_tint_color">#ffd8dcdd</color>
+
+    <color name="cell_separator">#c3c2c6</color>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
index 243914d51..7a92f3138 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
@@ -313,16 +313,37 @@ public class Task extends BaseModel {
     public int getLightTaskColor()
     {
         if (this.value < -20)
-            return R.color.worst;
+            return R.color.worst_100;
         if (this.value < -10)
-            return R.color.worse;
+            return R.color.worse_100;
         if (this.value < -1)
-            return R.color.bad;
+            return R.color.bad_100;
         if (this.value < 5)
-            return R.color.neutral;
+            return R.color.neutral_100;
         if (this.value < 10)
-            return R.color.better;
-        return R.color.best;
+            return R.color.better_100;
+        return R.color.best_100;
+    }
+
+    /**
+     * Get the button color resources depending on a certain score
+     *
+     * @return the color resource id
+     */
+    public int getMediumTaskColor()
+    {
+        if (this.value < -20)
+            return R.color.worst_50;
+        if (this.value < -10)
+            return R.color.worse_50;
+        if (this.value < -1)
+            return R.color.bad_50;
+        if (this.value < 5)
+            return R.color.neutral_50;
+        if (this.value < 10)
+            return R.color.better_50;
+
+        return R.color.best_50;
     }
 
     /**
@@ -333,16 +354,16 @@ public class Task extends BaseModel {
     public int getDarkTaskColor()
     {
         if (this.value < -20)
-            return R.color.worst_btn;
+            return R.color.worst_10;
         if (this.value < -10)
-            return R.color.worse_btn;
+            return R.color.worse_10;
         if (this.value < -1)
-            return R.color.bad_btn;
+            return R.color.bad_10;
         if (this.value < 5)
-            return R.color.neutral_btn;
+            return R.color.neutral_10;
         if (this.value < 10)
-            return R.color.better_btn;
+            return R.color.better_10;
 
-        return R.color.best_btn;
+        return R.color.best_10;
     }
 }