diff --git a/broadcast_timer/css/custom.css b/broadcast_timer/css/custom.css
index 7b3f3b4..bacb7f1 100644
--- a/broadcast_timer/css/custom.css
+++ b/broadcast_timer/css/custom.css
@@ -4,8 +4,9 @@ body {
 .warn	{ color: yellow; }
 .green	{ color: lime; }
 .over	{ color: red; }
+.current { color: orange; }
 .events-current {
-  background: #666; }
+  background: #555; }
 .subject {
   float: left;
   color: #FFF;
diff --git a/broadcast_timer/main.js b/broadcast_timer/main.js
index 7dc253e..1a379df 100644
--- a/broadcast_timer/main.js
+++ b/broadcast_timer/main.js
@@ -1,7 +1,10 @@
 // meta
-var version = "0.10.3"
+var version = "0.10.010"
 var debug = false;
 
+
+events.sort(function(a, b){return new Date(a.date).getTime() - new Date(b.date).getTime()});
+
 var initialized = false;
 
 var style = 'green';
@@ -27,6 +30,7 @@ var nextEnd = events[(nextObject + 1)].date;
 var currentSubject = events[currentObject].subject;
 var nextSubject = events[nextObject].subject;
 
+
 // Set the date we're counting down to
 var countDownDate = new Date(nextDate).getTime();
 var currentTimer = new Date(currentDate).getTime();
diff --git a/broadcast_timer/timerMath.js b/broadcast_timer/timerMath.js
index 90ceb9d..26d14e2 100755
--- a/broadcast_timer/timerMath.js
+++ b/broadcast_timer/timerMath.js
@@ -41,7 +41,8 @@ function countdown(targetDate, current) {
   style = "green"; // reset style
 
   if (current === "current") {
-    if (nextDays < 1 && nextHours < 1) {
+		style = 'current';
+/*    if (nextDays < 1 && nextHours < 1) {
       if (nextMinutes < 0) {
 	style = 'over';
       } else if (nextMinutes < 15) {
@@ -49,7 +50,7 @@ function countdown(targetDate, current) {
       } else {
 	style = 'green';
       }
-    }
+    } */
   } else {
     if (days < 1 && hours < 1) {
       if (minutes < 0) {