diff --git a/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.css b/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.css
index 3a426ddb96..fbb9ee00d2 100644
--- a/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.css
+++ b/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.css
@@ -7,10 +7,11 @@
  *  GPLv3: http://www.opensource.org/licenses/gpl-3.0.html
  */
 
-.under_minute { 
-    background-color: #FFD700; 
+ /* Near to 0 seconds should be red */
+.time_warning_one { 
+    background-color: #FB3A35; 
 }
 
-.under_thirty_seconds {
-    background-color: #DB4A45; 
+.time_warning_two {
+    background-color: #FFD700; 
 }
diff --git a/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js b/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js
index f9d52057ad..39033bab9d 100644
--- a/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js
+++ b/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js
@@ -7,30 +7,18 @@
  *      MIT: http://www.opensource.org/licenses/mit-license.php
  *      GPLv3: http://www.opensource.org/licenses/gpl-3.0.html
  */
-
 "use strict";
 
 /*global window, jQuery */
-
 /*jslint white: true, browser: true, onevar: true, undef: true, eqeqeq: true, bitwise: true, regexp: true, strict: true, newcap: true, immed: true, maxerr: 50, indent: 4 */
 
 (function ($) {
-
-   
     //constants
-
     var epClock;   // clock object
 
-    
-    //------------------------------
-    //
     //  Setup
-    //
-    //------------------------------
-
     $.epiclock.addRenderer('minute', function (element, value)
     {
-
         var currentTime = new Date().valueOf();
         var dist = epClock.time+epClock.__offset - currentTime;
        
@@ -38,24 +26,24 @@
         element.text(value);
         
         var div_clock = $('#text-content');
-
-        if (dist <= 60000) {  // 60000 = 60 seconds
-            if (!(div_clock.hasClass('under_minute'))) {
-                div_clock.addClass('under_minute');
+        
+        // 60000 = 60 seconds
+        if (dist <= 180000) {  //3min
+            if (!(div_clock.hasClass('time_warning_two'))) {
+                div_clock.addClass('time_warning_two');
             }
         }
         
-        if (dist <= 30000) {  // 60000 = 60 seconds
-            if (!(div_clock.hasClass('under_thirty_seconds'))) {
-                div_clock.removeClass('under_minute');
-                div_clock.addClass('under_thirty_seconds');
-            }        
+        if (dist <= 60000) { //1min
+            div_clock.removeClass('time_warning_two');
+            if (!(div_clock.hasClass('time_warning_one'))) {                
+                div_clock.addClass('time_warning_one');
+            }
+            
         }
-    },     
+    },
     function ()
     {
        epClock = this;
-
-    });
-	
-}(jQuery));
+    });	
+}(jQuery));
\ No newline at end of file