                         
                         self.compassControl?.configureWith(site)
                         self.uploaderBatteryLabel?.text = watchEntry.batteryString
+                        
+                        self.uploaderBatteryLabel?.textColor = colorForDesiredColorState(watchEntry.batteryColorState)
+                                                
                         self.lastReadingLabel?.text = watchEntry.dateTimeAgoString
                         
                         if let rawValue = watchEntry.raw {
+                            let color = colorForDesiredColorState(site.configuration!.boundedColorForGlucoseValue(Int(rawValue)))
+                            self.rawReadingLabel?.textColor = color
                             self.rawReadingLabel?.text = "\(NSNumberFormatter.localizedStringFromNumber(rawValue, numberStyle: NSNumberFormatterStyle.DecimalStyle)) : \(watchEntry.sgv!.noise)"
                         }
                         
                         let timeAgo = watchEntry.date.timeIntervalSinceNow
                         
                         // TODO:// Deprecate this StaleDataTimeFram check and use the alarms when available. Fll back to this whne no alarm for stale data available.
-                        let maxValue: NSTimeInterval
+                        let timeAgoWarnValue: NSTimeInterval
+                        let timeAgoUrgentValue: NSTimeInterval
                         if let defaults = site.configuration?.defaults {
-                            maxValue = max(Constants.NotableTime.StaleDataTimeFrame, defaults.alarms.alarmTimeAgoWarnMins)
+                            timeAgoWarnValue = max(Constants.NotableTime.StaleDataTimeFrame, defaults.alarms.alarmTimeAgoWarnMins)
+                            timeAgoUrgentValue = defaults.alarms.alarmTimeAgoUrgentMins
                         } else {
-                            maxValue = Constants.NotableTime.StaleDataTimeFrame
-                        }
-                        
-                        if timeAgo < -maxValue {
+                            timeAgoWarnValue = Constants.NotableTime.StaleDataTimeFrame
+                            timeAgoUrgentValue = Constants.NotableTime.StaleDataTimeFrame * 10
+                        }
+                        
+                        if timeAgo < -timeAgoWarnValue {
                             self.compassControl?.alpha = 0.5
                             self.compassControl?.color = NSAssetKit.predefinedNeutralColor
                             self.compassControl?.sgvText = "---"

                        }
                    }
                    self.updateData()
                    self.view.setNeedsDisplay()
                })
            }
        }
    }
    
    func updateData() {
        print(">>> Entering \(__FUNCTION__) <<<")
        self.activityView?.startAnimating()
        
        if let site = self.site {

        
        if let siteOptional = site {
            nsApi = NightscoutAPIClient(url:siteOptional.url)
            AppDataManager.sharedInstance.shouldDisableIdleTimer = siteOptional.overrideScreenLock
            NSNotificationCenter.defaultCenter().addObserver(self, selector: "updateSite:", name: Constants.Notification.DataIsStaleUpdateNow, object: nil)
            
            updateSite(nil)
        }
    }
    
