diff --git a/habit.php b/habit.php
index 8d24054..75ac47f 100644
--- a/habit.php
+++ b/habit.php
@@ -955,14 +955,16 @@
 
             if( $weekCount < $multiplier )
                 $jsonArray['buttonClass'] = 'button-yellow';
-                //if($todayCheck)
+                if($todayCheck)
                     $jsonArray['buttonText'] = $weekCount;
             if($weekCount >= $multiplier)
                 $jsonArray['buttonClass'] = 'button-done';
             if( $todayCheck ) {
                 $jsonArray['buttonClass'] = 'button-neut';
-                if($weekCount >= $multiplier)
+                if($weekCount >= $multiplier){
                     $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
             }
             break;
         }
@@ -1054,7 +1056,12 @@
                 $jsonArray['buttonClass'] = 'button-yellow';
             } elseif ($weekCount >= $multiplier) {
                 $jsonArray['buttonClass'] = 'button-done';
-            } elseif ($todayCheck) {
+                if($todayCheck){
+                    $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
+            } 
+            if ($todayCheck) {
                 $jsonArray['buttonClass'] = 'button-neut';
 
                 if ($weekCount >= $multiplier) {

diff --git a/habit.php b/habit.php
index 8d24054..75ac47f 100644
--- a/habit.php
+++ b/habit.php
@@ -955,14 +955,16 @@
 
             if( $weekCount < $multiplier )
                 $jsonArray['buttonClass'] = 'button-yellow';
-                //if($todayCheck)
+                if($todayCheck)
                     $jsonArray['buttonText'] = $weekCount;
             if($weekCount >= $multiplier)
                 $jsonArray['buttonClass'] = 'button-done';
             if( $todayCheck ) {
                 $jsonArray['buttonClass'] = 'button-neut';
-                if($weekCount >= $multiplier)
+                if($weekCount >= $multiplier){
                     $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
             }
             break;
         }
@@ -1054,7 +1056,12 @@
                 $jsonArray['buttonClass'] = 'button-yellow';
             } elseif ($weekCount >= $multiplier) {
                 $jsonArray['buttonClass'] = 'button-done';
-            } elseif ($todayCheck) {
+                if($todayCheck){
+                    $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
+            } 
+            if ($todayCheck) {
                 $jsonArray['buttonClass'] = 'button-neut';
 
                 if ($weekCount >= $multiplier) {
diff --git a/habit_ui.php b/habit_ui.php
index 9e73124..9b663ce 100644
--- a/habit_ui.php
+++ b/habit_ui.php
@@ -145,12 +145,18 @@
                 $last10_conv[$key] = "red"; 
         }
 
-		if ($weekCount < $multiplier) {
+	
+        if ($weekCount < $multiplier) {
             $buttText = $weekCount;
             $buttonClass = 'button-yellow';
         } elseif ($weekCount >= $multiplier) {
             $buttonClass = 'button-done';
-        } elseif ($todayCheck) {
+            if($todayCheck){
+                $buttonClass= 'button-good';
+                $buttText = "";
+            }
+        } 
+        if ($todayCheck) {
             $buttonClass = 'button-neut';
 
             if ($weekCount >= $multiplier) {

diff --git a/habit.php b/habit.php
index 8d24054..75ac47f 100644
--- a/habit.php
+++ b/habit.php
@@ -955,14 +955,16 @@
 
             if( $weekCount < $multiplier )
                 $jsonArray['buttonClass'] = 'button-yellow';
-                //if($todayCheck)
+                if($todayCheck)
                     $jsonArray['buttonText'] = $weekCount;
             if($weekCount >= $multiplier)
                 $jsonArray['buttonClass'] = 'button-done';
             if( $todayCheck ) {
                 $jsonArray['buttonClass'] = 'button-neut';
-                if($weekCount >= $multiplier)
+                if($weekCount >= $multiplier){
                     $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
             }
             break;
         }
@@ -1054,7 +1056,12 @@
                 $jsonArray['buttonClass'] = 'button-yellow';
             } elseif ($weekCount >= $multiplier) {
                 $jsonArray['buttonClass'] = 'button-done';
-            } elseif ($todayCheck) {
+                if($todayCheck){
+                    $jsonArray['buttonClass'] = 'button-good';
+                    $jsonArray['buttonText'] = "";
+                }
+            } 
+            if ($todayCheck) {
                 $jsonArray['buttonClass'] = 'button-neut';
 
                 if ($weekCount >= $multiplier) {
diff --git a/habit_ui.php b/habit_ui.php
index 9e73124..9b663ce 100644
--- a/habit_ui.php
+++ b/habit_ui.php
@@ -145,12 +145,18 @@
                 $last10_conv[$key] = "red"; 
         }
 
-		if ($weekCount < $multiplier) {
+	
+        if ($weekCount < $multiplier) {
             $buttText = $weekCount;
             $buttonClass = 'button-yellow';
         } elseif ($weekCount >= $multiplier) {
             $buttonClass = 'button-done';
-        } elseif ($todayCheck) {
+            if($todayCheck){
+                $buttonClass= 'button-good';
+                $buttText = "";
+            }
+        } 
+        if ($todayCheck) {
             $buttonClass = 'button-neut';
 
             if ($weekCount >= $multiplier) {
diff --git a/style.css b/style.css
index 60be515..019099a 100755
--- a/style.css
+++ b/style.css
@@ -194,7 +194,7 @@
 }
 
 .button-done{  background-color: #399113; color:#000; }
-.button-good{ background-color: #58e81b; color:#000; }
+.button-good{ background-color: #58e81b; color:#58e81b; }
 .button-bad{ background-color: #e81b1b; color:#000; }
 .button-neut{ background-color: #efe23e; color:#000; }
 
@@ -229,7 +229,7 @@
 .habit-cal-week .r2{ fill:#58e81b; }
 .habit-cal-week .r0{ fill:#000; }
 
-.week-container .green{ background-color: #58e81b; }
+.week-container .green{ background-color: #58e81b;  color: #58e81b; }
 .week-container .neut{ 
 	background-color: #efe23e;
     color: #111;