MSA-1626: Complete integration for all Tado Heating & Cooling products with SmartThings, this release includes discovery for the Tado Smart Thermostat, Smart Radiator Thermostat, Extension Kit & Smart AC Control Units

2026-03-10 05:11:51 +00:00 · 2016-12-01 07:26:01 -08:00
211 changed files with 5069 additions and 2982 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'

 buildscript {
    dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
    }
    repositories {
        mavenLocal()
--- a/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy
+++ b/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy
@@ -23,8 +23,8 @@ metadata {

 	tiles {
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc")
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC")
+			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
 		}

 		main "acceleration"
--- a/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy
+++ b/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy
@@ -23,8 +23,8 @@ metadata {

 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC")
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
 		}
 		main "contact"
 		details "contact"
--- a/devicetypes/capabilities/lock-capability.src/lock-capability.groovy
+++ b/devicetypes/capabilities/lock-capability.src/lock-capability.groovy
@@ -27,7 +27,7 @@ metadata {
 	tiles {
 		standardTile("toggle", "device.lock", width: 2, height: 2) {
 			state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
-			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00A0DC"
+			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 		}
 		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'lock', action:"lock.lock", icon:"st.locks.lock.locked"
--- a/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy
+++ b/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy
@@ -29,7 +29,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		main "switch"
 		details "switch"
--- a/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy
+++ b/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy
@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
 			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}
 		main "motion"
 		details "motion"
--- a/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy
+++ b/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy
@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2) {
 			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
-			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#00A0DC")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
 		}
 		main "presence"
 		details "presence"
--- a/devicetypes/capabilities/switch-capability.src/switch-capability.groovy
+++ b/devicetypes/capabilities/switch-capability.src/switch-capability.groovy
@@ -31,7 +31,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		main "switch"
 		details "switch"
--- a/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy
+++ b/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy
@@ -35,8 +35,8 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2) {
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
-			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821"
 			state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {
--- a/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy
+++ b/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy
@@ -79,8 +79,8 @@ metadata {
 		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
 			state "off", label:'${name}', action:"thermostat.emergencyHeat", backgroundColor:"#ffffff"
 			state "emergencyHeat", label:'${name}', action:"thermostat.heat", backgroundColor:"#e86d13"
-			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13"
-			state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC"
+			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffc000"
+			state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#269bd2"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
 			state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff"
--- a/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy
+++ b/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy
@@ -24,7 +24,7 @@ metadata {
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC"
+			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 		}

 		main "water"
--- a/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy
+++ b/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy
@@ -37,7 +37,7 @@ metadata {

 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#00A0DC")
+			state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0")
 			state("not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
 		}
 		valueTile("inRange", "device.inRangeFriendly", inactiveLabel: true, height:1, width:3, decoration: "flat") {
--- a/devicetypes/com-obycode/obything-music.src/obything-music.groovy
+++ b/devicetypes/com-obycode/obything-music.src/obything-music.groovy
@@ -38,7 +38,7 @@ metadata {
 		// Main
 		standardTile("main", "device.status", width: 1, height: 1, canChangeIcon: true) {
 			state "paused", label:'Paused', action:"music Player.play", icon:"st.Electronics.electronics19", nextState:"playing", backgroundColor:"#ffffff"
-			state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#00A0DC"
+			state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#79b821"
 		}

 		// Row 1
--- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy
+++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy
@@ -34,8 +34,8 @@ metadata {
    tiles(scale: 2) {
    	multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
        	tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
-            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
-                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821")
            }
            
            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -44,7 +44,7 @@ metadata {
 			}  
        }
                
-        valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+        valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") {
            state "battery", label:'${currentValue}% battery', unit:""
        }
        
--- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy
+++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy
@@ -31,8 +31,8 @@ metadata {
    tiles(scale: 2) {
    	multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
        	tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
-            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
-                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+            	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+                attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821")
            }
            
            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -41,7 +41,7 @@ metadata {
 			}  
        }
                
-        valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+        valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") {
            state "battery", label:'${currentValue}% battery', unit:""
        }
        
--- a/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy
+++ b/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy
@@ -21,7 +21,6 @@ metadata {
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
-		capability "Health Check"
        
        fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x9C, 0x31, 0x86", outClusters: ""
 	}
@@ -33,13 +32,13 @@ metadata {
    tiles(scale: 2) {
    	multiAttributeTile(name:"FGFS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
        	tileAttribute("device.water", key:"PRIMARY_CONTROL") {
-            	attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#00a0dc")
-            	attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#e86d13")
+            	attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#79b821")
+            	attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#ffa81e")
            }
            
            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
-				attributeState("active", label:'tamper active', backgroundColor:"#00a0dc")
-				attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc")
+				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
 			}       
        }
        
@@ -229,9 +228,7 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca

 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
+	
    def cmds = []
    
 	cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds:21600, nodeid: zwaveHubNodeId)//FGFS' default wake up interval
--- a/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy
+++ b/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy
@@ -22,7 +22,6 @@ metadata {
 		capability "Sensor"
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
-		capability "Health Check"
        
        fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
 	}
@@ -39,8 +38,8 @@ metadata {
            }
            
            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
-				attributeState("active", label:'tamper active', backgroundColor:"#00a0dc")
-				attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc")
+				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
 			}  
        }
        
@@ -241,9 +240,7 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca

 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
+    
    def cmds = []
    
    cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds: 7200, nodeid: zwaveHubNodeId)//FGMS' default wake up interval
--- a/devicetypes/fuzzysb/tado-cooling-thermostat.src/tado-cooling-thermostat.groovy
+++ b/devicetypes/fuzzysb/tado-cooling-thermostat.src/tado-cooling-thermostat.groovy
@@ -0,0 +1,600 @@
+/**
+ *  Copyright 2015 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado AC Thermostat
+ *
+ *	Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+ *	Date: 2016-11-28 v3.0 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13 v2.9 Quick dirty workaround to control zones with a single account.
+ *	Date: 2016-05-07 v2.8 Corrected issue with Fan Speed commands not working.
+ *	Date: 2016-04-25 v2.7 Minor changes to thermostatOperatingState to Show "idle" and "fan only" state
+ *	Date: 2016-04-25 v2.6 Minor bug fix to correct issue with reading existing set point value.
+ *	Date: 2016-04-09 v2.5 Major bug fix exercise, found lots and lots and lots.....now 100% conforms to ST Thermostat capability. main panel now shows colour of operating state. new attributes tadoMode and tadoFanSpeed created.
+ *	Date: 2016-04-05 v2.4 Performed Testing with Thermostat Mode Director and found some deficiencies where this would not work correctly. i have now corrected, this now works fine and has been tested.
+ *	Date: 2016-04-05 v2.3 added device preference for default temps for some commands as requested by @mitchell_lu66, also added some additional refreshes and error control for unsupported capabilities
+ *	Date: 2016-04-05 v2.2 Added Fan Speed & Emergency Heat (1 Hour) Controls and also a manual Mode End function to fall back to Tado Control.
+ 						  Also added preference for how long manual mode runs for either ends at Tado Mode Change (TADO_MODE) or User Control (MANUAL),
+                          please ensure the default method is Set in the device properties
+ *	Date: 2016-04-05 v2.1 Minor Bug Fixes & improved Icons
+ *	Date: 2016-04-05 v2.0 Further Changes to MultiAttribute Tile
+ *	Date: 2016-04-05 v1.9 Amended Device Handler Name
+ *	Date: 2016-04-05 v1.8 Added all thermostat related capabilities
+ *  Date: 2016-04-05 v1.7 Amended device to be capable of both Fahrenheit and celsius and amended the Device multiattribute tile
+ *  Date: 2016-04-05 v1.6 switched API calls to new v2 calls as the old ones had been deprecated.
+ *  Date: 2016-02-21 v1.5 switched around thermostatOperatingState & thermostatMode to get better compatibility with Home Remote
+ *  Date: 2016-02-21 v1.4 added HeatingSetPoint & CoolingSetPoint to make compatible with SmartTiles
+ *  Date: 2016-02-21 v1.3 amended the read thermostat properties to match the ST Thermostat Capability
+ *  Date: 2016-02-14 v1.2 amended the thermostat properties to match the ST Capability.Thermostat values
+ *  Date: 2016-01-23 v1.1 fixed error in Tado Mode detection
+ *	Date: 2016-01-22 v1.1 Add Heating & Cooling Controls (initial offering, will need to look into adding all possible commands)
+ *	Date: 2015-12-04 v1.0 Initial Release With Temperatures & Relative Humidity
+ */
+
+import groovy.json.JsonOutput
+
+preferences {
+}
+
+metadata {
+	definition (name: "Tado Cooling Thermostat", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Cooling Setpoint"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Fan Mode"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Relative Humidity Measurement"
+		capability "Polling"
+		capability "Refresh"
+
+    attribute "tadoMode", "string"
+    attribute "tadoFanSpeed", "string"
+    command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+    command "coolingSetpointUp"
+    command "coolingSetpointDown"
+    command "cmdFanSpeedAuto"
+    command "cmdFanSpeedHigh"
+    command "cmdFanSpeedMid"
+    command "cmdFanSpeedLow"
+    command "dry"
+    command "on"
+		command "fan"
+    command "endManualControl"
+    command "emergencyHeat"
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+	tiles(scale: 2){
+    multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+      tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+        attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"st.Home.home1"
+      }
+      tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+        attributeState("VALUE_UP", action: "temperatureUp")
+        attributeState("VALUE_DOWN", action: "temperatureDown")
+      }
+      tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
+        attributeState("default", label:'${currentValue}%', unit:"%")
+      }
+      tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+        attributeState("idle", backgroundColor:"#666666")
+        attributeState("heating", backgroundColor:"#ff471a")
+        attributeState("cooling", backgroundColor:"#1a75ff")
+        attributeState("emergency heat", backgroundColor:"#ff471a")
+        attributeState("drying", backgroundColor:"#c68c53")
+        attributeState("fan only", backgroundColor:"#39e600")
+        attributeState("heating|cooling", backgroundColor:"#ff9900")
+      }
+      tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+        attributeState("off", label:'${name}')
+        attributeState("heat", label:'${name}')
+        attributeState("cool", label:'${name}')
+        attributeState("auto", label:'${name}')
+        attributeState("fan", label:'${name}')
+        attributeState("dry", label:'${name}')
+      }
+      tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+        attributeState("default", label:'${currentValue}', unit:"dF")
+      }
+      tileAttribute("device.coolingSetpoint", key: "COOLING_SETPOINT") {
+        attributeState("default", label:'${currentValue}', unit:"dF")
+      }
+    }
+
+    standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+      state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+      state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+      state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+      state("OFF", label:'${name}', backgroundColor:"#ffffff", icon:"st.switches.switch.off", defaultState: true)
+      state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+    }
+
+    standardTile("refresh", "device.switch", inactiveLabel: false, width: 2, height: 1, decoration: "flat") {
+      state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+    }
+
+    standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+      state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_mode_icon.png")
+      state("emergency heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_mode_icon.png")
+      state("cool", label:'COOL', backgroundColor:"#089afb", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_mode_icon.png")
+      state("dry", label:'DRY', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/dry_mode_icon.png")
+      state("fan", label:'FAN', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_mode_icononly.png")
+      state("auto", label:'AUTO', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/auto_mode_icon.png")
+      state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_off.png", defaultState: true)
+		}
+
+		valueTile("thermostatSetpoint", "device.thermostatSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+    valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+    valueTile("coolingSetpoint", "device.coolingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+
+		standardTile("tadoFanSpeed", "device.tadoFanSpeed", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true, decoration: "flat") {
+      state("OFF", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_off_icon.png", defaultState: true)
+      state("AUTO", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_auto_icon.png")
+      state("HIGH", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_high_icon.png")
+      state("MIDDLE", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_med_icon.png")
+      state("LOW", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_low_icon.png")
+		}
+
+		standardTile("setAuto", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.auto", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_auto.png"
+		}
+    standardTile("setDry", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"dry", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_dry.png"
+		}
+    standardTile("setOn", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"on", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_on.png"
+		}
+    standardTile("setOff", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_off.png"
+		}
+    standardTile("cool", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.cool", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_cool.png"
+		}
+    standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_heat.png"
+		}
+    standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/emergencyHeat.png"
+		}
+    standardTile("fan", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.fan", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_mode_icon.png"
+		}
+    standardTile("coolingSetpointUp", "device.coolingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "coolingSetpointUp", label:'  ', action:"coolingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_arrow_up.png"
+    }
+		standardTile("coolingSetpointDown", "device.coolingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "coolingSetpointDown", label:'  ', action:"coolingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_arrow_down.png"
+    }
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "heatingSetpointUp", label:'  ', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_arrow_up.png"
+    }
+    standardTile("heatingSetpointDown", "device.heatingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "heatingSetpointDown", label:'  ', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_arrow_down.png"
+    }
+		standardTile("cmdFanSpeedAuto", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedAuto",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_auto_icon.png")
+    }
+    standardTile("cmdFanSpeedHigh", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedHigh",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_high_icon.png")
+    }
+    standardTile("cmdFanSpeedMid", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedMid",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_med_icon.png")
+    }
+    standardTile("cmdFanSpeedLow", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedLow",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_low_icon.png")
+    }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/endManual.png")
+		}
+
+		main(["thermostat"])
+		details(["thermostat","thermostatMode","coolingSetpointUp","coolingSetpointDown","autoOperation","heatingSetpointUp","heatingSetpointDown","outsidetemperature","thermostatSetpoint","tadoMode","refresh","tadoFanSpeed","setAuto","setOn","setOff","fan","cool","heat","setDry","cmdFanSpeedAuto","emergencyHeat","endManualControl","cmdFanSpeedLow","cmdFanSpeedMid","cmdFanSpeedHigh"])
+  }
+}
+
+def setCapabilitytadoType(value){
+  state.tadoType = value
+  log.debug("state.tadoType = ${state.tadoType}")
+}
+
+def getCapabilitytadoType() {
+  def map = null
+  map = [name: "capabilityTadoType", value: state.tadoType]
+  return map
+}
+
+def setCapabilitySupportsAuto(value){
+  state.supportsAuto = value
+  log.debug("state.supportsAuto = ${state.supportsAuto}")
+}
+
+def getCapabilitySupportsAuto() {
+  def map = null
+  map = [name: "capabilitySupportsAuto", value: state.supportsAuto]
+  return map
+}
+
+def setCapabilitySupportsCool(value){
+  state.supportsCool = value
+  log.debug("state.supportsCool = ${state.supportsCool}")
+}
+
+def getCapabilitySupportsCool() {
+  def map = null
+  map = [name: "capabilitySupportsCool", value: state.supportsCool]
+  return map
+}
+
+def setCapabilitySupportsCoolAutoFanSpeed(value){
+  state.SupportsCoolAutoFanSpeed = value
+  log.debug("state.SupportsCoolAutoFanSpeed = ${state.SupportsCoolAutoFanSpeed}")
+}
+
+def getCapabilitySupportsCoolAutoFanSpeed() {
+  def map = null
+  map = [name: "capabilitySupportsCoolAutoFanSpeed", value: state.supportsCoolAutoFanSpeed]
+  return map
+}
+
+def setCapabilitySupportsDry(value){
+  state.supportsDry = value
+  log.debug("state.supportsDry = ${state.supportsDry}")
+}
+
+def getCapabilitySupportsDry() {
+  def map = null
+  map = [name: "capabilitySupportsDry", value: state.supportsDry]
+  return map
+}
+
+def setCapabilitySupportsFan(value){
+  state.supportsFan = value
+  log.debug("state.supportsFan = ${state.supportsFan}")
+}
+
+def getCapabilitySupportsFan() {
+  def map = null
+  map = [name: "capabilitySupportsFan", value: state.supportsFan]
+  return map
+}
+
+def setCapabilitySupportsHeat(value){
+  state.supportsHeat = value
+  log.debug("state.supportsHeat = ${state.supportsHeat}")
+}
+
+def getCapabilitySupportsHeat() {
+  def map = null
+  map = [name: "capabilitySupportsHeat", value: state.supportsHeat]
+  return map
+}
+
+def setCapabilitySupportsHeatAutoFanSpeed(value){
+  state.SupportsHeatAutoFanSpeed = value
+  log.debug("state.SupportsHeatAutoFanSpeed = ${state.SupportsHeatAutoFanSpeed}")
+}
+
+def getCapabilitySupportsHeatAutoFanSpeed() {
+  def map = null
+  map = [name: "capabilitySupportsHeatAutoFanSpeed", value: state.SupportsHeatAutoFanSpeed]
+  return map
+}
+
+def setCapabilityMaxCoolTemp(value){
+  state.MaxCoolTemp = value
+  log.debug("set state.MaxCoolTemp to : " + state.MaxCoolTemp)
+}
+
+def getCapabilityMaxCoolTemp() {
+  def map = null
+  map = [name: "capabilityMaxCoolTemp", value: state.MaxCoolTemp]
+  return map
+}
+
+def setCapabilityMinCoolTemp(value){
+  state.MinCoolTemp = value
+  log.debug("set state.MinCoolTemp to : " + state.MinCoolTemp)
+}
+
+def getCapabilityMinCoolTemp() {
+  def map = null
+  map = [name: "capabilityMinCoolTemp", value: state.MinCoolTemp]
+  return map
+}
+
+def setCapabilityMaxHeatTemp(value){
+  state.MaxHeatTemp = value
+  log.debug("set state.MaxHeatTemp to : " + state.MaxHeatTemp)
+}
+
+def getCapabilityMaxHeatTemp() {
+  def map = null
+  map = [name: "capabilityMaxHeatTemp", value: state.MaxHeatTemp]
+  return map
+}
+
+def setCapabilityMinHeatTemp(value){
+  state.MinHeatTemp = value
+  log.debug("set state.MinHeatTemp to : " + state.MinHeatTemp)
+}
+
+def getCapabilityMinHeatTemp() {
+  def map = null
+  map = [name: "capabilityMinHeatTemp", value: state.MinHeatTemp]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+  refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	parent.onCommand(this)
+  parent.statusCommand(this)
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	parent.offCommand(this)
+  parent.statusCommand(this)
+}
+
+def dry() {
+	log.debug "Executing 'dry'"
+	parent.dryCommand(this)
+  parent.statusCommand(this)
+}
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "dry":
+        	dry()
+        break
+    	case "heat":
+        	heat()
+        break
+        case "cool":
+        	cool()
+        break
+        case "auto":
+        	auto()
+        break
+        case "fan":
+        	fan()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def thermostatFanMode(requiredMode){
+	switch (requiredMode) {
+    	case "auto":
+        	fan()
+        break
+    	case "on":
+        	fan()
+        break
+        case "circulate":
+        	fan()
+        break
+     }
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setHeatingTempCommand(this,targetTemperature)
+	refresh()
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else if (device.currentValue("thermostatMode") == "cool") {
+    	coolingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else if (device.currentValue("thermostatMode") == "cool") {
+    	coolingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	def capabilitysupported = state.supportsHeat
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+    		log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+    }
+}
+
+def heatingSetpointDown(){
+	def capabilitysupported = state.supportsHeat
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+    		log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+    }
+}
+
+def setCoolingSetpoint(targetTemperature) {
+	log.debug "Executing 'setCoolingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setCoolingTempCommand(this,targetTemperature)
+	refresh()
+}
+
+def coolingSetpointUp(){
+	def capabilitysupported = state.supportsCool
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxCoolTemp){
+    		log.debug("cannot increase cool setpoint, its already at the maximum level of " + state.MaxCoolTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting coolingSetpoint up to: ${newSetpoint}"
+			setCoolingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def coolingSetpointDown(){
+	def capabilitysupported = state.supportsCool
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinCoolTemp){
+    		log.debug("cannot decrease cool setpoint, its already at the minimum level of " + state.MinCoolTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting coolingSetpoint down to: ${newSetpoint}"
+			setCoolingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def fanOn(){
+	fan()
+}
+
+def fanCirculate(){
+	fan()
+}
+
+def cool(){
+	def capabilitysupported = state.supportsCool
+  if (capabilitysupported == "true"){
+		parent.coolCommand(this)
+    parent.statusCommand(this)
+	} else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def heat(){
+	def capabilitysupported = state.supportsHeat
+	if (capabilitysupported == "true"){
+	parent.heatCommand(this)
+  parent.statusCommand(this)
+  } else {
+  	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+  }
+}
+
+def fan(){
+	parent.fanAuto(this)
+	refresh()
+}
+
+def emergencyHeat(){
+	parent.emergencyHeat(this)
+}
+
+def cmdFanSpeedAuto(){
+	parent.cmdFanSpeedAuto(this)
+}
+
+def cmdFanSpeedHigh(){
+	parent.cmdFanSpeedHigh(this)
+}
+
+def cmdFanSpeedMed(){
+	parent.cmdFanSpeedMed(this)
+}
+
+def cmdFanSpeedLow(){
+	parent.cmdFanSpeedLow(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/fuzzysb/tado-heating-thermostat.src/tado-heating-thermostat.groovy
+++ b/devicetypes/fuzzysb/tado-heating-thermostat.src/tado-heating-thermostat.groovy
@@ -0,0 +1,270 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ * Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+ *
+ *	Updates:
+ *	Date: 2016-11-28  v1.9 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13  v1.8 Quick dirty workaround to control zones with a single account.
+ *  Date: 2016-04-25 	v1.7 Finally found time to update this with the lessons learnt from the Tado Cooling Device Type. will bring better support for RM and Thermostat Director
+ *  Date: 2016-04-08 	v1.6 added statusCommand calls to refresh more frequently, also improved compatibility with Rule Machine and Thermostat Mode Director in addition also added default heating temperature where you can set the default temperature for the mode commands.
+ *  Date: 2016-04-05 	v1.5 added improved icons and also a manual Mode End function to fall back to Tado Control.
+ 				Also added preference for how long manual mode runs for either ends at Tado Mode Change (TADO_MODE) or User Control (MANUAL),
+                please ensure the default method is Set in the device properties
+ *  Date: 2016-04-05 	v1.4 rewrite of complete functions to support Tado API v2
+ *  Date: 2016-01-20  v1.3 Updated hvacStatus to include include the correct HomeId for Humidity Value
+ *  Date: 2016-01-15  v1.2 Refactored API request code and added querying/display of humidity
+ *	Date: 2015-12-23	v1.1 Added functionality to change thermostat settings
+ *	Date: 2015-12-04	v1.0 Initial release
+ */
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadoZoneId", "number", title: "Enter Tado Zone ID?", required: true)
+  input("manualmode", "enum", title: "Default Manual Overide Method", options: ["TADO_MODE","MANUAL"], required: false, defaultValue:"TADO_MODE")
+	input("defHeatingTemp", "number", title: "Default Heating Temperature?", required: false, defaultValue: 21)
+}
+
+metadata {
+	definition (name: "Tado Heating Thermostat", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Relative Humidity Measurement"
+		capability "Polling"
+		capability "Refresh"
+		attribute "tadoMode", "string"
+		command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+		command "on"
+    command "endManualControl"
+		command "emergencyHeat"
+
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+tiles(scale: 2){
+      	multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+			tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+            	attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"st.Home.home1"
+            }
+			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+    			attributeState("VALUE_UP", action: "temperatureUp")
+    			attributeState("VALUE_DOWN", action: "temperatureDown")
+  			}
+			tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
+    			attributeState("default", label:'${currentValue}%', unit:"%")
+  			}
+            tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+    			attributeState("idle", backgroundColor:"#666666")
+    			attributeState("heating", backgroundColor:"#ff471a")
+                attributeState("emergency heat", backgroundColor:"#ff471a")
+  			}
+            tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+    			attributeState("off", label:'${name}')
+    			attributeState("heat", label:'${name}')
+  			}
+			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+    			attributeState("default", label:'${currentValue}', unit:"dF")
+  			}
+		}
+
+        valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+        standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+			state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+            state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+            state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+            state("OFF", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png", defaultState: true)
+            state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+		}
+
+		standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+        	state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_mode_icon.png")
+            state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png", defaultState: true)
+		}
+
+        standardTile("refresh", "device.switch", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("Off", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png"
+		}
+		standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/emergencyHeat.png"
+		}
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+		standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_heat.png"
+		}
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointUp", label:'', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_arrow_up.png"
+        }
+        standardTile("heatingSetpointDown", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointDown", label:'', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_arrow_down.png"
+        }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+            state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/endManual.png")
+		}
+		main "thermostat"
+		details (["thermostat","thermostatMode","outsidetemperature","heatingSetpoint","refresh","heatingSetpointUp","heatingSetpointDown","tadoMode","emergencyHeat","heat","Off","endManualControl"])
+	}
+}
+
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def setCapabilitySupportsHeat(value){
+  state.supportsHeat = value
+  log.debug("state.supportsHeat = ${state.supportsHeat}")
+}
+
+def getCapabilitySupportsHeat() {
+  def map = null
+  map = [name: "capabilitySupportsHeat", value: state.supportsHeat]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+	refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	parent.onCommand(this)
+  parent.statusCommand(this)
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	parent.offCommand(this)
+  parent.statusCommand(this)
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setHeatingTempCommand(this,targetTemperature)
+	parent.statusCommand(this)
+}
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "heat":
+        	heat()
+        break
+        case "auto":
+        	auto()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+    	log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+    } else {
+		int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+		log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+		setHeatingSetpoint(newSetpoint)
+    }
+}
+
+def heatingSetpointDown(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+  if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+    log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+    } else {
+      int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+      log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+      setHeatingSetpoint(newSetpoint)
+    }
+}
+
+
+// Commands to device
+def heat(){
+	parent.heatCommand(this)
+	parent.statusCommand(this)
+}
+
+def emergencyHeat(){
+  parent.emergencyHeat(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/fuzzysb/tado-heating-user-presence.src/tado-heating-user-presence.groovy
+++ b/devicetypes/fuzzysb/tado-heating-user-presence.src/tado-heating-user-presence.groovy
@@ -0,0 +1,174 @@
+/**
+ *  Copyright 2015 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ *	Author: Stuart Buchanan, Based on original work by Ian M with thanks
+ *	Date: 2015-04-28 v1.3 changed Presence tile as this was reporting a bug
+ *	Date: 2015-04-28 v1.2 updated API call found issue where session was closed and nothing else was returned, now add number generator to input noCache statement in the query
+ *	Date: 2015-04-27 v1.1 updated API call and added refresh function
+ *	Date: 2015-12-04 v1.0 Initial Release
+ */
+ 
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import java.util.Random  
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadouser", "text", title: "Tado User", description: "Your Tado User")
+}  
+ 
+metadata {
+	definition (name: "Tado Heating User Presence", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Presence Sensor"
+		capability "Sensor"
+		capability "Polling"
+		capability "Refresh"
+        
+        command "arrived"
+		command "departed"
+              
+	}
+
+	// simulator metadata
+	simulator {
+		status "present": "presence: present"
+		status "not present": "presence: not present"
+	}
+
+	tiles {
+		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
+			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
+		}
+		standardTile("refresh", "device.refresh", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+		main "presence"
+		details (["presence","refresh"])
+	}
+}
+
+// Parse incoming device messages to generate events
+private parseResponse(resp) {
+	def result
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+    	log.debug("Executing parseResponse.successTrue")
+        def evtJson = new groovy.json.JsonOutput().toJson(resp.data)
+        def json = new JsonSlurper().parseText(evtJson)
+		def appuserarray = new groovy.json.JsonOutput().toJson(json.appUsers)
+        def list = new JsonSlurper().parseText(appuserarray)
+		list.each {
+    		if ((it.nickname).capitalize() == (settings.tadouser).capitalize()) {
+            	log.debug("Found Tado User : " + it.nickname)
+                if (it.geoTrackingEnabled == true) {
+                	log.debug("Users GeoTracking is Enabled")
+                	if (it.geolocationIsStale == false){
+                    	log.debug("Users Current Relative Position is : " + it.relativePosition )
+                		if (it.relativePosition == 0) {
+                  		  	result = arrived()
+                  		}else{
+                  		  	result = departed()
+                 	   }
+                	}else{
+                	log.debug("Geolocation is Stale Skipping")
+                	}
+                }else{
+                	log.debug("Users GeoTracking Not Enabled")
+                }     
+		}  
+        }
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+    return result  
+}
+
+def installed() {
+	log.debug "Executing 'installed'"
+	statusCommand()
+}
+
+def updated() {
+	log.debug "Executing 'updated'"
+	statusCommand()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    statusCommand()   
+}
+
+
+private sendCommand(method, args = []) {
+    def methods = [
+		'status': [
+        			uri: "https://my.tado.com", 
+                    path: "/mobile/1.6/getAppUsersRelativePositions", 
+                    requestContentType: "application/json", 
+                    query: [username:settings.username, password:settings.password, noCache:args[0], webapp:1]
+                    ],
+	]
+
+	def request = methods.getAt(method)
+    
+    log.debug "Http Params ("+request+")"
+    
+    try{
+        log.debug "Executing 'sendCommand'"
+        
+        if (method == "status"){
+            httpGet(request) { resp ->            
+                parseResponse(resp)
+            }
+        }else{
+            httpGet(request)
+        }
+    } catch(Exception e){
+        log.debug("___exception: " + e)
+    }
+}
+
+
+
+// Commands
+def statusCommand(){
+	log.debug "Executing 'sendCommand.statusCommand'"
+    Random rand = new Random()
+    int min = 10000
+    int max = 99999
+    int randomNum = rand.nextInt((max - min) + 1) + min
+	sendCommand("status",[randomNum])
+}
+
+def arrived() {
+	log.trace "Executing 'arrived'"
+    def result = sendEvent(name: "presence", value: "present")
+    return result
+}
+
+
+def departed() {
+	log.trace "Executing 'departed'"
+	def result = sendEvent(name: "presence", value: "not present")
+    return result
+}
+
--- a/devicetypes/fuzzysb/tado-hot-water-control.src/tado-hot-water-control.groovy
+++ b/devicetypes/fuzzysb/tado-hot-water-control.src/tado-hot-water-control.groovy
@@ -0,0 +1,280 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ * 	Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+* 	Date: 2016-11-28 v1.6 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13 v1.5 Quick dirty workaround to control zones with a single account.
+ * 	Date: 2016-04-25 v1.4 Tado Hot water does not actually return the current water temps, it only returns the Current set point temp. to get around this when the power is on for the hot water botht the temp and setpoint will both display the setpoint value, otherwise will display --
+ * 	Date: 2016-04-25 v1.3 Finally found time to update this with the lessons learnt from the Tado Cooling Device Type. will bring better support for RM and Thermostat Director
+ * 	Date: 2016-04-08 v1.2 added setThermostatMode(mode) function to work better with Rule Machine and Thermostat Mode Director
+ *	Date: 2016-04-05 v1.1 change of default Water Heating Temps can now be defined in device preferences (default Value is 90C).
+ *	Date: 2016-04-05 v1.0 Initial release
+ */
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadoZoneId", "number", title: "Enter Tado Zone ID?", required: true)
+    input("manualmode", "enum", title: "Default Manual Overide Method", options: ["TADO_MODE","MANUAL"], required: false, defaultValue:"TADO_MODE")
+	input("defWaterTemp", "number", title: "Default Water Heating Temperature", required: false, defaultValue: 90)
+}
+
+metadata {
+	definition (name: "Tado Hot Water Control", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Polling"
+		capability "Refresh"
+    attribute "tadoMode", "string"
+		command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+		command "on"
+    command "endManualControl"
+		command "emergencyHeat"
+
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+tiles(scale: 2){
+      	multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+			tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+            	attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/tap_icon.png"
+            }
+			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+    			attributeState("VALUE_UP", action: "temperatureUp")
+    			attributeState("VALUE_DOWN", action: "temperatureDown")
+  			}
+            tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+    			attributeState("idle", backgroundColor:"#666666")
+    			attributeState("heating", backgroundColor:"#ff471a")
+                attributeState("emergency heat", backgroundColor:"#ff471a")
+  			}
+			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+    			attributeState("off", label:'${name}')
+    			attributeState("heat", label:'${name}')
+  			}
+			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+    			attributeState("default", label:'${currentValue}', unit:"dF")
+  			}
+		}
+
+        valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+        standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+			state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+            state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+            state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+            state("OFF", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png", defaultState: true)
+            state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+		}
+
+		standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+        	state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_mode_icon.png")
+            state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png", defaultState: true)
+		}
+
+        standardTile("refresh", "device.switch", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("Off", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png"
+		}
+		standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/emergencyHeat.png"
+		}
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+		standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_heat.png"
+		}
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointUp", label:'', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_arrow_up.png"
+        }
+        standardTile("heatingSetpointDown", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointDown", label:'', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_arrow_down.png"
+        }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+            state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/endManual.png")
+		}
+		main "thermostat"
+		details (["thermostat","thermostatMode","outsidetemperature","heatingSetpoint","refresh","heatingSetpointUp","heatingSetpointDown","tadoMode","emergencyHeat","heat","Off","endManualControl"])
+	}
+}
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def setCapabilitySupportsWater(value){
+  state.supportsWater = value
+  log.debug("state.supportsWater = ${state.supportsWater}")
+}
+
+def getCapabilitySupportsWater() {
+  def map = null
+  map = [name: "capabilitySupportsWater", value: state.supportsWater]
+  return map
+}
+
+def setCapabilitySupportsWaterTempControl(value){
+  state.supportsWaterTempControl = value
+  log.debug("state.supportsWaterTempControl = ${state.supportsWaterTempControl}")
+}
+
+def getCapabilitySupportsWaterTempControl() {
+  def map = null
+  map = [name: "capabilitySupportsWaterTempControl", value: state.supportsWaterTempControl]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+	refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	onCommand()
+    statusCommand()
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	offCommand()
+    statusCommand()
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+    log.debug "Target Temperature ${targetTemperature}"
+    setHeatingTempCommand(targetTemperature)
+	statusCommand()
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+	if(state.supportsWaterTempControl == "true"){
+		if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+			log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+		} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+			statusCommand()
+		}
+	} else {
+		log.debug "Hot Water Temperature Capability Not Supported"
+	}
+}
+
+def heatingSetpointDown(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+	if(state.supportsWaterTempControl == "true"){
+		if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+			log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+		} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+			statusCommand()
+		}
+	} else {
+		log.debug "Hot Water Temperature Capability Not Supported"
+	}
+}
+
+// Commands to device
+
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "heat":
+        	heat()
+        break
+        case "auto":
+        	auto()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def heat(){
+  parent.heatCommand(this)
+  parent.statusCommand(this)
+}
+
+def emergencyHeat(){
+  parent.emergencyHeat(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy
+++ b/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy
@@ -112,10 +112,10 @@ metadata {
 		multiAttributeTile(name:"dtlsDoorCtrl", type:"generic", width:6, height:4) {tileAttribute("device.doorState", key: "PRIMARY_CONTROL") 
        	{
      		attributeState "unknown", label: '${name}', action:"openDoor", icon: "st.secondary.tools", nextState:"Sent"
-      		attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#00A0DC", nextState:"Sent"
-            attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#00A0DC"
-            attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ffffff", nextState:"Sent"
-            attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffffff"
+      		attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#0000ff", nextState:"Sent"
+            attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e" 
+            attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821", nextState:"Sent"
+            attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e" 
            attributeState "jammed", label: '${name}', action:"closeDoorHiI", icon: "st.doors.garage.garage-open", backgroundColor: "#ff0000", nextState:"Sent"
            attributeState "forced close", label: "forced", action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ff8000", nextState:"Sent"
            attributeState "fault", label: 'FAULT', action:"openDoor", icon: "st.secondary.tools", backgroundColor: "#ff0000", nextState:"Sent"  
--- a/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy
+++ b/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy
@@ -24,7 +24,7 @@ metadata {
    tiles {
        standardTile("sleeping", "device.sleeping", width: 1, height: 1, canChangeIcon: false, canChangeBackground: false) {
            state("sleeping", label: "Sleeping", icon:"st.Bedroom.bedroom12", backgroundColor:"#ffffff")
-            state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#00A0DC")
+            state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#79b821")
        }
        standardTile("steps", "device.steps", width: 2, height: 2, canChangeIcon: false, canChangeBackground: false) {
            state("steps", label: '${currentValue} Steps', icon:"st.Health & Wellness.health11", backgroundColor:"#ffffff")                     
--- a/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy
+++ b/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy
@@ -122,13 +122,13 @@ metadata {
            state "raintoday", label: 'Rain Today', icon: "st.custom.wuk.nt_chancerain"
            state "rainy", label: 'Previous Rain', icon: "st.custom.wuk.nt_chancerain"
            state "raintom", label: 'Rain Tomorrow', icon: "st.custom.wuk.nt_chancerain"           
-            state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#00A0DC"
+            state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#52c435"
            state "skipping", label: 'Skip Today', icon: "st.Outdoor.outdoor20", backgroundColor: "#36cfe3"
            state "moisture", label: '', icon: "st.Weather.weather2", backgroundColor: "#36cfe3"
-            state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
+            state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#f2a51f"           
            state "active", label: 'Active', icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E"
            state "season", label: 'Seasonal Adjustment', icon: "st.Outdoor.outdoor17", backgroundColor: "#ffb900"
-            state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#cccccc"
+            state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#888888"
            state "warning", label: '', icon: "st.categories.damageAndDanger", backgroundColor: "#ffff7f"
            state "alarm", label: 'Alarm', icon: "st.categories.damageAndDanger", backgroundColor: "#f9240c"
        }
@@ -144,67 +144,67 @@ metadata {
 		}    	
        standardTile("switch1", "device.switch1") {			
 			state "z1off", label: '1', action: "z1on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch2", "device.switch2") {            
            state "z2off", label: '2', action: "z2on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
        standardTile("switch3", "device.switch3", inactiveLabel: false) {			
 			state "z3off", label: '3', action: "z3on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch4", "device.switch4", inactiveLabel: false) {            
            state "z4off", label: '4', action: "z4on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch5", "device.switch5", inactiveLabel: false) {            
            state "z5off", label: '5', action: "z5on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
 		standardTile("switch6", "device.switch6", inactiveLabel: false) {            
            state "z6off", label: '6', action: "z6on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch7", "device.switch7", inactiveLabel: false) {            
            state "z7off", label: '7', action: "z7on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
 		standardTile("switch8", "device.switch8", inactiveLabel: false) {            
            state "z8off", label: '8', action: "z8on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch9", "device.switch9", inactiveLabel: false) {			
 			state "z9off", label: '9', action: "z9on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch10", "device.switch10", inactiveLabel: false) {            
            state "z10off", label: '10', action: "z10on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
        standardTile("switch11", "device.switch11", inactiveLabel: false) {			
 			state "z11off", label: '11', action: "z11on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch12", "device.switch12", inactiveLabel: false) {            
            state "z12off", label: '12', action: "z12on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch13", "device.switch13", inactiveLabel: false) {            
            state "z13off", label: '13', action: "z13on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
 		standardTile("switch14", "device.switch14", inactiveLabel: false) {            
            state "z14off", label: '14', action: "z14on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}
        standardTile("switch15", "device.switch15", inactiveLabel: false) {            
            state "z15off", label: '15', action: "z15on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}		
        standardTile("switch16", "device.switch16", inactiveLabel: false) {            
            state "z16off", label: '16', action: "z16on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-            state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+            state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
 		}        
        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", action: "refresh", icon:"st.secondary.refresh"            
--- a/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy
+++ b/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy
@@ -47,9 +47,9 @@ metadata {

 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC"
+			state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821"
 			state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {
--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
@@ -37,14 +37,14 @@ metadata {
 	tiles {
 		standardTile("button", "device.button", width: 2, height: 2) {
 			state "default", label: "", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
-			state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC"
-			state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
-			state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13"
+			state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821"
+			state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
+			state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e"
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state "battery", label:'${currentValue}% battery', unit:""
--- a/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy
+++ b/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy
@@ -37,9 +37,9 @@ metadata {
 	}

 	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 	}
 	standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy
+++ b/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy
@@ -45,7 +45,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("energy", "device.energy", decoration: "flat") {
--- a/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy
+++ b/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy
@@ -60,7 +60,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("power", "device.power", decoration: "flat") {
@@ -78,7 +78,7 @@ metadata {

 		(1..4).each { n ->
 			standardTile("switch$n", "switch$n", canChangeIcon: true) {
-				state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+				state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 				state "off", label: '${name}', action: "on$n", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}
 			valueTile("power$n", "power$n", decoration: "flat") {
--- a/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy
+++ b/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy
@@ -11,6 +11,7 @@
 *  for the specific language governing permissions and limitations under the License.
 *
 */
+ 
 metadata {
    definition (name: "Arrival Sensor HA", namespace: "smartthings", author: "SmartThings") {
        capability "Tone"
@@ -39,7 +40,7 @@ metadata {

    tiles {
        standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-            state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#00a0dc"
+            state "present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0"
            state "not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff"
        }
        standardTile("beep", "device.beep", decoration: "flat") {
@@ -59,7 +60,7 @@ def updated() {
 }

 def configure() {
-    def cmds = zigbee.batteryConfig(20, 20, 0x01)
+    def cmds = zigbee.configureReporting(0x0001, 0x0020, 0x20, 20, 20, 0x01)
    log.debug "configure -- cmds: ${cmds}"
    return cmds
 }
@@ -151,7 +152,7 @@ private handlePresenceEvent(present) {

 private startTimer() {
    log.debug "Scheduling periodic timer"
-    runEvery1Minute("checkPresenceCallback")
+    schedule("0 * * * * ?", checkPresenceCallback)
 }

 private stopTimer() {
--- a/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy
+++ b/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy
@@ -55,13 +55,13 @@ metadata {
 			state "fanOn", label:'${name}', action:"thermostat.setThermostatFanMode"
 		}
 		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#e86d13"
+			state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#d04e00"
 		}
 		valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "heat", label:'${currentValue}° heat', unit:"F", backgroundColor:"#ffffff"
 		}
 		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#00a0dc"
+			state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#1e9cbb"
 		}
 		valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "cool", label:'${currentValue}° cool', unit:"F", backgroundColor:"#ffffff"
@@ -81,47 +81,51 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	List result = []
-	def descMap = zigbee.parseDescriptionAsMap(description)
-	log.debug "Desc Map: $descMap"
-	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
-	descMap.additionalAttrs.each {
-	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
-	}
-	attrData.each {
-		def map = [:]
-		if (it.cluster == "0201" && it.attrId == "0000") {
+	def map = [:]
+	if (description?.startsWith("read attr -")) {
+		def descMap = parseDescriptionAsMap(description)
+		log.debug "Desc Map: $descMap"
+		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0011") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0012") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "001c") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[it.value]
-		} else if (it.cluster == "0202" && it.attrId == "0000") {
+			map.value = getModeMap()[descMap.value]
+		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[it.value]
+			map.value = getFanModeMap()[descMap.value]
 		}
-		if (map) {
-			result << createEvent(map)
-		}
-		log.debug "Parse returned $map"
 	}
+
+	def result = null
+	if (map) {
+		result = createEvent(map)
+	}
+	log.debug "Parse returned $map"
 	return result
 }

+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",
--- a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
+++ b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
@@ -36,7 +36,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.Home.home30", backgroundColor: "#ffffff"
-			state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#79b821"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
--- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
+++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -23,7 +23,6 @@ metadata {
        capability "Switch"
        capability "Switch Level"
        capability "Health Check"
-        capability "Light"

        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
    }
@@ -43,9 +42,9 @@ metadata {
    tiles(scale: 2) {
        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
            }
            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -83,7 +82,7 @@ def on() {
 }

 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 /**
--- a/devicetypes/smartthings/danalock.src/danalock.groovy
+++ b/devicetypes/smartthings/danalock.src/danalock.groovy
@@ -33,10 +33,10 @@ metadata {

 	tiles {
 		standardTile("toggle", "device.lock", width: 2, height: 2) {
-			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00a0dc", nextState:"unlocking"
+			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking"
 			state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking"
 			state "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
-			state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#00a0dc"
+			state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 			state "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
 		}
 		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/dimmer-switch.src/README.md
+++ b/devicetypes/smartthings/dimmer-switch.src/README.md
@@ -7,8 +7,6 @@ Works with:
 * [GE Z-Wave In-Wall Smart Dimmer (GE 12724)](http://products.z-wavealliance.org/products/1197)
 * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729)](http://products.z-wavealliance.org/products/1201)
 * [GE Z-Wave Plug-in Smart Dimmer (GE 12718)](http://products.z-wavealliance.org/products/1191)
-* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725)](http://products.z-wavealliance.org/products/1198)
-* [GE In-Wall Smart Fan Control (GE 12730)](http://products.z-wavealliance.org/products/1202)

 ## Table of contents

@@ -29,7 +27,7 @@ Works with:

 ## Device Health

-Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In), 1000-watt In-Wall Smart Dimmer Switch and In-Wall Smart Fan Control are polled by the hub.
+Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In) are polled by the hub.
 As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
 Check-in interval = 32 mins.
 Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
@@ -46,6 +44,4 @@ Instructions related to pairing, resetting and removing the device from SmartThi
 * [General Z-Wave Dimmer/Switch Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200955890-Troubleshooting-GE-in-wall-switch-or-dimmer-won-t-respond-to-commands-or-automations-Z-Wave-)
 * [GE Z-Wave In-Wall Smart Dimmer (GE 12724) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200902600-GE-In-Wall-Paddle-Dimmer-Switch-GE-12724-Z-Wave-)
 * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207568463-GE-In-Wall-Smart-Toggle-Dimmer-GE-12729-Z-Wave-)
-* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-)
-* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274)
-* [GE In-Wall Smart Fan Control (GE 12730) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274)
+* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-)
--- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
+++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
@@ -21,12 +21,10 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"

-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
 	}

 	simulator {
@@ -54,9 +52,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
--- a/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
+++ b/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
@@ -47,8 +47,8 @@ metadata {
 		}

 		standardTile("motion", "device.motion") {
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}

 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy
+++ b/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy
@@ -33,7 +33,7 @@ metadata {
 		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
 				attributeState "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-				attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#00a0dc"
+				attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
--- a/devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
+++ b/devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
@@ -39,7 +39,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Configuration"
 		capability "Battery"
-		capability "Health Check"
       
        command		"resetParams2StDefaults"
        command		"listCurrentParams"
@@ -305,9 +304,6 @@ def lateConfigure(setConf = False) {
 */
 def configure() {
 	log.debug "Configuring Device..."
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
    def cmds = []
    
    // send associate to group 2 to get alarm data
--- a/devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy
+++ b/devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy
@@ -46,7 +46,6 @@
 		capability 	"Illuminance Measurement"
 		capability 	"Sensor"
 		capability 	"Battery"
-		capability  "Health Check"
        
        command		"resetParams2StDefaults"
        command		"listCurrentParams"
@@ -126,9 +125,6 @@
 */
 def configure() {
 	log.debug "Configuring Device For SmartThings Use"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
    def cmds = []
    
    // send associate to group 3 to get sensor data reported only to hub
--- a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
+++ b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
@@ -89,9 +89,9 @@
            state "whiteLevel", action:"setWhiteLevel", label:'White Level'
        }
 		standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        	state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC", nextState:"turningOff"
+        	state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821", nextState:"turningOff"
            state "off", label:'${name}', action:"switch.on", icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC"
+            state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821"
            state "turningOff", label:'${name}', icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff"
        }
        valueTile("power", "device.power", decoration: "flat") {
--- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
+++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
@@ -34,10 +34,10 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) {
-			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
-			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
-			state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
-			state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+			state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#ffe71e"
+			state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffe71e"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
--- a/devicetypes/smartthings/foscam.src/foscam.groovy
+++ b/devicetypes/smartthings/foscam.src/foscam.groovy
@@ -41,7 +41,7 @@

 		standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
 			state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
-			state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#00A0DC"
+			state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#53a7c0"
 			state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking"
 		}

--- a/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy
+++ b/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy
@@ -61,9 +61,9 @@ metadata {
    tiles(scale: 2) {
        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
            }
            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -99,7 +99,7 @@ def parse(String description) {

 def poll() {
    def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
    ]

    return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {

 def refresh() {
    def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
    ]

    return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()
--- a/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy
+++ b/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy
@@ -31,7 +31,7 @@ metadata {
            tileAttribute("sessionStatus", key: "PRIMARY_CONTROL") {
                attributeState "cancelled", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "running"
                attributeState "stopped", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "cancelled"
-                attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#00A0DC", nextState: "cancelled"
+                attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#79b821", nextState: "cancelled"
            }
            tileAttribute("timeRemaining", key: "SECONDARY_CONTROL") {
                attributeState "timeRemaining", label:'${currentValue} remaining'
@@ -45,7 +45,7 @@ metadata {
        standardTile("sessionStatusTile", "sessionStatus", width: 1, height: 1, canChangeIcon: true) {
            state "cancelled", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
            state "stopped", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
-            state "running", label: "Running", action: "timed session.stop", backgroundColor: "#00A0DC", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
+            state "running", label: "Running", action: "timed session.stop", backgroundColor: "#79b821", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png"
        }

        // duration
--- a/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy
+++ b/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy
@@ -32,7 +32,7 @@ metadata {
 	tiles {
 		standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Off', action: "switch.on", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#00A0DC", nextState: "off"
+			state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#79b821", nextState: "off"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
--- a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
+++ b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
@@ -17,7 +17,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"

 		command "setAdjustedColor"
        command "reset"
@@ -31,9 +30,9 @@ metadata {
 	tiles (scale: 2){
 		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -58,7 +57,7 @@ metadata {
 }

 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }

 // parse events into attributes
--- a/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
+++ b/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
@@ -7,7 +7,6 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
-		capability "Bridge"
 		capability "Health Check"

 		attribute "networkAddress", "string"
@@ -27,7 +26,7 @@ metadata {
     	multiAttributeTile(name:"rich-control"){
 			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
 				attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff"
-	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#00A0DC"
+	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821"
 			}
 			}
 		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
@@ -46,7 +45,7 @@ metadata {
 }

 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }

 // parse events into attributes
--- a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
+++ b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
@@ -18,7 +18,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"

 		command "setAdjustedColor"
        command "reset"
@@ -32,9 +31,9 @@ metadata {
 	tiles (scale: 2){
 		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -67,7 +66,7 @@ metadata {
 }

 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }

 // parse events into attributes
--- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
+++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -14,8 +14,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
-		capability "Light"
+        capability "Health Check"

        command "refresh"
 	}
@@ -27,9 +26,9 @@ metadata {
    tiles(scale: 2) {
        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
            }
            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -51,7 +50,7 @@ metadata {
 }

 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }

 // parse events into attributes
--- a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
+++ b/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
@@ -16,7 +16,6 @@ metadata {
        capability "Switch"
        capability "Refresh"
        capability "Health Check"
-        capability "Light"

        command "refresh"
    }
@@ -28,9 +27,9 @@ metadata {
    tiles (scale: 2){
        multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
            }
            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -56,7 +55,7 @@ metadata {
 }

 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
 }

 // parse events into attributes
--- a/devicetypes/smartthings/life360-user.src/life360-user.groovy
+++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy
@@ -29,7 +29,7 @@ metadata {

 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC")
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
 			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
 		}

@@ -39,7 +39,7 @@ metadata {
 }

 def generatePresenceEvent(boolean present) {
-	log.info "Life360 generatePresenceEvent($present)"
+	log.debug "Here in generatePresenceEvent!"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)
--- a/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy
+++ b/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy
@@ -14,7 +14,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}

 	simulator {
@@ -24,9 +23,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
 			}

--- a/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy
+++ b/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy
@@ -13,7 +13,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 	}

 	simulator {
@@ -23,9 +22,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
 			}

--- a/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy
+++ b/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy
@@ -36,7 +36,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Contact Sensor"
-		capability "Light"

 		attribute "powered", "string"

@@ -54,11 +53,11 @@ metadata {
 	// UI tile definitions 
 	tiles {
        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC"
-            state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#e86d13"
-            state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#e86d13"
-            state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#00A0DC"
-            state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC"
+			state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821"
+            state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#ffa81e"
+            state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e"
+            state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e"
+            state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#53a7c0"
 			state "off", label: '${name}', action: "on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
        }
        standardTile("contact", "device.contact", inactiveLabel: false) {
--- a/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy
+++ b/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy
@@ -27,8 +27,8 @@ metadata {

 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC")
-			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
+			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ebeef2")
 		}
 		main "presence"
 		details "presence"
--- a/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy
+++ b/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy
@@ -32,7 +32,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Push', action: "momentary.push", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'Push', action: "momentary.push", backgroundColor: "#00A0DC"
+			state "on", label: 'Push', action: "momentary.push", backgroundColor: "#53a7c0"
 		}
 		main "switch"
 		details "switch"
--- a/devicetypes/smartthings/motion-detector.src/motion-detector.groovy
+++ b/devicetypes/smartthings/motion-detector.src/motion-detector.groovy
@@ -28,8 +28,8 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
 		}

 		main "motion"
--- a/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy
+++ b/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy
@@ -31,7 +31,7 @@ metadata {
 	tiles {
 		standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on"
-			state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "off"
+			state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "off"
 		}
 		main "button"
 		details "button"
--- a/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy
+++ b/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy
@@ -31,7 +31,7 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}

--- a/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy
+++ b/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy
@@ -29,8 +29,8 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
-			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC"
+			state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
+			state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
 		}

 		main "contact"
@@ -40,11 +40,14 @@ metadata {

 // Parse incoming device messages to generate events
 def parse(String description) {
-	def resMap
-	if (description.startsWith("zone")) {
-		resMap = createEvent(name: "contact", value: zigbee.parseZoneStatus(description).isAlarm1Set() ? "open" : "closed")
+	def name = null
+	def value = description
+	if (zigbee.isZoneType19(description)) {
+		name = "contact"
+		value = zigbee.translateStatusZoneType19(description) ? "open" : "closed"
 	}
 	
-	log.debug "Parse returned $resMap"
-	return resMap
+	def result = createEvent(name: name, value: value)
+	log.debug "Parse returned ${result?.descriptionText}"
+	return result
 }
--- a/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy
+++ b/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy
@@ -37,9 +37,9 @@ metadata {
 	}

 	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff"
+		state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 		state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 	}
 	standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy
+++ b/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy
@@ -42,9 +42,9 @@ metadata {

 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) {
--- a/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy
@@ -24,7 +24,6 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
-		capability "Outlet"

 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"

@@ -70,36 +69,288 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"

-	def event = zigbee.getEvent(description)
-	if (!event) {
-		log.warn "DID NOT PARSE MESSAGE for description : $description"
-		log.debug zigbee.parseDescriptionAsMap(description)
-	} else if (event.name == "power") {
-		/*
-			Dividing by 10 as the Divisor is 10000 and unit is kW for the device. Simplifying to 10 power level is an integer.
-		*/
-		event.value = event.value / 10
-	}
+	def event = [:]
+	def finalResult = isKnownDescription(description)
+	if (finalResult) {
+		log.info finalResult
+		if (finalResult.type == "update") {
+			log.info "$device updates: ${finalResult.value}"
+			event = null
+		}
+		else if (finalResult.type == "power") {
+			def powerValue = (finalResult.value as Integer)/10
+			event = createEvent(name: "power", value: powerValue)

-	return event ? createEvent(event) : event
+			/*
+				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+
+				power level is an integer. The exact power level with correct units needs to be handled in the device type
+				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
+			*/
+		}
+		else {
+			event = createEvent(name: finalResult.type, value: finalResult.value)
+		}
+	}
+	else {
+		log.warn "DID NOT PARSE MESSAGE for description : $description"
+		log.debug parseDescriptionAsMap(description)
+	}
+	return event
 }

-def setLevel(value) {
-	zigbee.setLevel(value)
+// Commands to device
+def zigbeeCommand(cluster, attribute){
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} ${cluster} ${attribute} {}"
 }

 def off() {
-	zigbee.off()
+	zigbeeCommand("6", "0")
 }

 def on() {
-	zigbee.on()
+	zigbeeCommand("6", "1")
+}
+
+def setLevel(value) {
+	value = value as Integer
+	if (value == 0) {
+		off()
+	}
+	else {
+		if (device.latestValue("switch") == "off") {
+			sendEvent(name: "switch", value: "on")
+		}
+		sendEvent(name: "level", value: value)
+		setLevelWithRate(value, "0000")		//value is between 0 to 100
+	}
 }

 def refresh() {
-	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.electricMeasurementPowerRefresh()
+	[
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
+	]
+
 }

 def configure() {
-	refresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.electricMeasurementPowerConfig()
+	refresh() + onOffConfig() + levelConfig() + powerConfig()
+}
+
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value, width=2) {
+	def s = new BigInteger(Math.round(value).toString()).toString(16)
+	while (s.size() < width) {
+		s = "0" + s
+	}
+	s
+}
+
+private String swapEndianHex(String hex) {
+	reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,16)
+}
+
+//Need to reverse array of size 2
+private byte[] reverseArray(byte[] array) {
+	byte tmp;
+	tmp = array[1];
+	array[1] = array[0];
+	array[0] = tmp;
+	return array
+}
+
+def parseDescriptionAsMap(description) {
+	if (description?.startsWith("read attr -")) {
+		(description - "read attr - ").split(",").inject([:]) { map, param ->
+			def nameAndValue = param.split(":")
+			map += [(nameAndValue[0].trim()): nameAndValue[1].trim()]
+		}
+	}
+	else if (description?.startsWith("catchall: ")) {
+		def seg = (description - "catchall: ").split(" ")
+		def zigbeeMap = [:]
+		zigbeeMap += [raw: (description - "catchall: ")]
+		zigbeeMap += [profileId: seg[0]]
+		zigbeeMap += [clusterId: seg[1]]
+		zigbeeMap += [sourceEndpoint: seg[2]]
+		zigbeeMap += [destinationEndpoint: seg[3]]
+		zigbeeMap += [options: seg[4]]
+		zigbeeMap += [messageType: seg[5]]
+		zigbeeMap += [dni: seg[6]]
+		zigbeeMap += [isClusterSpecific: Short.valueOf(seg[7], 16) != 0]
+		zigbeeMap += [isManufacturerSpecific: Short.valueOf(seg[8], 16) != 0]
+		zigbeeMap += [manufacturerId: seg[9]]
+		zigbeeMap += [command: seg[10]]
+		zigbeeMap += [direction: seg[11]]
+		zigbeeMap += [data: seg.size() > 12 ? seg[12].split("").findAll { it }.collate(2).collect {
+			it.join('')
+		} : []]
+
+		zigbeeMap
+	}
+}
+
+def isKnownDescription(description) {
+	if ((description?.startsWith("catchall:")) || (description?.startsWith("read attr -"))) {
+		def descMap = parseDescriptionAsMap(description)
+		if (descMap.cluster == "0006" || descMap.clusterId == "0006") {
+			isDescriptionOnOff(descMap)
+		}
+		else if (descMap.cluster == "0008" || descMap.clusterId == "0008"){
+			isDescriptionLevel(descMap)
+		}
+		else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
+			isDescriptionPower(descMap)
+		}
+		else {
+			return [:]
+		}
+	}
+	else if(description?.startsWith("on/off:")) {
+		def switchValue = description?.endsWith("1") ? "on" : "off"
+		return	[type: "switch", value : switchValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+def isDescriptionOnOff(descMap) {
+	def switchValue = "undefined"
+	if (descMap.cluster == "0006") {				//cluster info from read attr
+		value = descMap.value
+		if (value == "01"){
+			switchValue = "on"
+		}
+		else if (value == "00"){
+			switchValue = "off"
+		}
+	}
+	else if (descMap.clusterId == "0006") {
+		//cluster info from catch all
+		//command 0B is Default response and the last two bytes are [on/off][success]. on/off=00, success=00
+		//command 01 is Read attr response. the last two bytes are [datatype][value]. boolean datatype=10; on/off value = 01/00
+		if ((descMap.command=="0B" && descMap.raw.endsWith("0100")) || (descMap.command=="01" && descMap.raw.endsWith("1001"))){
+			switchValue = "on"
+		}
+		else if ((descMap.command=="0B" && descMap.raw.endsWith("0000")) || (descMap.command=="01" && descMap.raw.endsWith("1000"))){
+			switchValue = "off"
+		}
+		else if(descMap.command=="07"){
+			return	[type: "update", value : "switch (0006) capability configured successfully"]
+		}
+	}
+
+	if (switchValue != "undefined"){
+		return	[type: "switch", value : switchValue]
+	}
+	else {
+		return [:]
+	}
+
+}
+
+//@return - false or "success" or level [0-100]
+def isDescriptionLevel(descMap) {
+	def dimmerValue = -1
+	if (descMap.cluster == "0008"){
+		//TODO: the message returned with catchall is command 0B with clusterId 0008. That is just a confirmation message
+		def value = convertHexToInt(descMap.value)
+		dimmerValue = Math.round(value * 100 / 255)
+		if(dimmerValue==0 && value > 0) {
+			dimmerValue = 1						//handling for non-zero hex value less than 3
+		}
+	}
+	else if(descMap.clusterId == "0008") {
+		if(descMap.command=="0B"){
+			return	[type: "update", value : "level updated successfully"]					//device updating the level change was successful. no value sent.
+		}
+		else if(descMap.command=="07"){
+			return	[type: "update", value : "level (0008) capability configured successfully"]
+		}
+	}
+
+	if (dimmerValue != -1){
+		return	[type: "level", value : dimmerValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+def isDescriptionPower(descMap) {
+	def powerValue = "undefined"
+	if (descMap.cluster == "0B04") {
+		if (descMap.attrId == "050b") {
+			if(descMap.value!="ffff")
+				powerValue = convertHexToInt(descMap.value)
+		}
+	}
+	else if (descMap.clusterId == "0B04") {
+		if(descMap.command=="07"){
+			return	[type: "update", value : "power (0B04) capability configured successfully"]
+		}
+	}
+
+	if (powerValue != "undefined"){
+		return	[type: "power", value : powerValue]
+	}
+	else {
+		return [:]
+	}
+}
+
+
+def onOffConfig() {
+	[
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
+			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+	]
+}
+
+//level config for devices with min reporting interval as 5 seconds and reporting interval if no activity as 1hour (3600s)
+//min level change is 01
+def levelConfig() {
+	[
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
+			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+	]
+}
+
+//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
+//min change in value is 05
+def powerConfig() {
+	[
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+	]
+}
+
+def setLevelWithRate(level, rate) {
+	if(rate == null){
+		rate = "0000"
+	}
+	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
+}
+
+String convertToHexString(value, width=2) {
+	def s = new BigInteger(Math.round(value).toString()).toString(16)
+	while (s.size() < width) {
+		s = "0" + s
+	}
+	s
 }
--- a/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy
+++ b/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy
@@ -4,7 +4,6 @@ metadata {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
-		capability "Outlet"

 		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}
@@ -24,7 +23,7 @@ metadata {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			}
 		}
 		main "switch"
@@ -52,7 +51,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'

 	]

@@ -63,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 	]
 }
--- a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
@@ -13,9 +13,10 @@
 *  License for the specific language governing permissions and limitations
 *  under the License.
 */
+
 metadata {
 	// Automatically generated. Make future change here.
-	definition(name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Power Meter"
@@ -23,12 +24,10 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
-		capability "Outlet"

-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200-Sgb", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-RZHAC", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200-Sgb", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "4257050-RZHAC", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
 	}

@@ -46,32 +45,32 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-					"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS1.jpg",
-					"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS2.jpg"
-			])
+				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS1.jpg",
+				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS2.jpg"
+				])
 		}
 	}

 	// UI tile definitions
 	tiles(scale: 2) {
-		multiAttributeTile(name: "switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
-			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "turningOff"
+		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+				attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
 				attributeState "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
-				attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "turningOff"
+				attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
 				attributeState "turningOff", label: 'Turning Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
 			}
-			tileAttribute("power", key: "SECONDARY_CONTROL") {
-				attributeState "power", label: '${currentValue} W'
+			tileAttribute ("power", key: "SECONDARY_CONTROL") {
+				attributeState "power", label:'${currentValue} W'
 			}
 		}

 		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label: '', action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

 		main "switch"
-		details(["switch", "refresh"])
+		details(["switch","refresh"])
 	}
 }

@@ -79,33 +78,52 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"

-	def event = zigbee.getEvent(description)
+	def finalResult = zigbee.getKnownDescription(description)
+	def event = [:]

-	if (event) {
-		if (event.name == "power") {
-			def value = (event.value as Integer) / 10
-			event = createEvent(name: event.name, value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true)
-		} else if (event.name == "switch") {
-			def descriptionText = event.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
-			event = createEvent(name: event.name, value: event.value, descriptionText: descriptionText, translatable: true)
+	//TODO: Remove this after getKnownDescription can parse it automatically
+	if (!finalResult && description!="updated")
+		finalResult = getPowerDescription(zigbee.parseDescriptionAsMap(description))
+
+	if (finalResult) {
+		log.info "final result = $finalResult"
+		if (finalResult.type == "update") {
+			log.info "$device updates: ${finalResult.value}"
+			event = null
 		}
-	} else {
+		else if (finalResult.type == "power") {
+			def powerValue = (finalResult.value as Integer)/10
+			event = createEvent(name: "power", value: powerValue, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true)
+			/*
+				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+				power level is an integer. The exact power level with correct units needs to be handled in the device type
+				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
+			*/
+		}
+		else {
+			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
+			event = createEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
+		}
+	}
+	else {
 		def cluster = zigbee.parse(description)

-		if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+		if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07){
 			if (cluster.data[0] == 0x00) {
 				log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
 				event = createEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-			} else {
+			}
+			else {
 				log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
 				event = null
 			}
-		} else {
+		}
+		else {
 			log.warn "DID NOT PARSE MESSAGE for description : $description"
 			log.debug "${cluster}"
 		}
 	}
-	return event ? createEvent(event) : event
+	return event
 }

 def off() {
@@ -132,6 +150,42 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])

 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	refresh() + zigbee.onOffConfig(0, 300) + zigbee.electricMeasurementPowerConfig()
+	refresh() + zigbee.onOffConfig(0, 300) + powerConfig()
 }

+//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
+//min change in value is 01
+def powerConfig() {
+	[
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+//TODO: Remove this after getKnownDescription can parse it automatically
+def getPowerDescription(descMap) {
+	def powerValue = "undefined"
+	if (descMap.cluster == "0B04") {
+		if (descMap.attrId == "050b") {
+			if(descMap.value!="ffff")
+				powerValue = zigbee.convertHexToInt(descMap.value)
+		}
+	}
+	else if (descMap.clusterId == "0B04") {
+		if(descMap.command=="07"){
+			return	[type: "update", value : "power (0B04) capability configured successfully"]
+		}
+	}
+
+	if (powerValue != "undefined"){
+		return	[type: "power", value : powerValue]
+	}
+	else {
+		return [:]
+	}
+}
--- a/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy
+++ b/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy
@@ -50,18 +50,18 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "closed", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#00A0DC", nextState:"opening"
-				attributeState "open", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#e86d13", nextState:"closing"
-				attributeState "opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#e86d13"
-				attributeState "closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#00A0DC"
+				attributeState "closed", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821", nextState:"opening"
+				attributeState "open", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e", nextState:"closing"
+				attributeState "opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#ffe71e"
+				attributeState "closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#ffe71e"
 			}
 		}
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 		standardTile("acceleration", "device.acceleration", decoration: "flat", width: 2, height: 2) {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC")
+			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("temperature", "device.temperature", decoration: "flat", width: 2, height: 2) {
@@ -88,7 +88,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = [:]

-	if (!isSupportedDescription(description) || description.startsWith("zone")) {
+	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}
--- a/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy
+++ b/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy
@@ -50,17 +50,17 @@ metadata {

 	tiles {
 		standardTile("status", "device.status", width: 2, height: 2) {
-			state("closed", label:'${name}', icon:"st.doors.garage.garage-closed", action: "actuate", backgroundColor:"#00A0DC", nextState:"opening")
-			state("open", label:'${name}', icon:"st.doors.garage.garage-open", action: "actuate", backgroundColor:"#e86d13", nextState:"closing")
-			state("opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#e86d13")
-			state("closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#00A0DC")
+			state("closed", label:'${name}', icon:"st.doors.garage.garage-closed", action: "actuate", backgroundColor:"#79b821", nextState:"opening")
+			state("open", label:'${name}', icon:"st.doors.garage.garage-open", action: "actuate", backgroundColor:"#ffa81e", nextState:"closing")
+			state("opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#ffe71e")
+			state("closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#ffe71e")
 		}
 		standardTile("contact", "device.contact") {
 			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
 			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 		standardTile("acceleration", "device.acceleration", decoration: "flat") {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC")
+			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("temperature", "device.temperature", decoration: "flat") {
@@ -117,7 +117,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = null

-	if (!isSupportedDescription(description) || description.startsWith("zone")) {
+	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}
--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -17,7 +17,7 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus


 metadata {
-	definition(name: "SmartSense Moisture Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
@@ -29,10 +29,9 @@ metadata {
 		command "enrollResponse"


-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}

@@ -43,10 +42,10 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-					"http://cdn.device-gse.smartthings.com/Moisture/Moisture1.png",
-					"http://cdn.device-gse.smartthings.com/Moisture/Moisture2.png",
-					"http://cdn.device-gse.smartthings.com/Moisture/Moisture3.png"
-			])
+				"http://cdn.device-gse.smartthings.com/Moisture/Moisture1.png",
+				"http://cdn.device-gse.smartthings.com/Moisture/Moisture2.png",
+				"http://cdn.device-gse.smartthings.com/Moisture/Moisture3.png"
+				])
 		}
 		section {
 			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -55,32 +54,32 @@ metadata {
 	}

 	tiles(scale: 2) {
-		multiAttributeTile(name: "water", type: "generic", width: 6, height: 4) {
-			tileAttribute("device.water", key: "PRIMARY_CONTROL") {
-				attributeState "dry", label: "Dry", icon: "st.alarm.water.dry", backgroundColor: "#ffffff"
-				attributeState "wet", label: "Wet", icon: "st.alarm.water.wet", backgroundColor: "#53a7c0"
+		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
+				attributeState "dry", label: "Dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
+				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label: '${currentValue}°',
-					backgroundColors: [
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
+			state "temperature", label:'${currentValue}°',
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label: '${currentValue}% battery', unit: ""
+			state "battery", label:'${currentValue}% battery', unit:""
 		}
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

-		main(["water", "temperature"])
+		main (["water", "temperature"])
 		details(["water", "temperature", "battery", "refresh"])
 	}
 }
@@ -88,43 +87,117 @@ metadata {
 def parse(String description) {
 	log.debug "description: $description"

-	// getEvent will handle temperature and humidity
-	Map map = zigbee.getEvent(description)
-	if (!map) {
-		if (description?.startsWith('zone status')) {
-			map = parseIasMessage(description)
-		} else {
-			Map descMap = zigbee.parseDescriptionAsMap(description)
-			if (descMap.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
-				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
-			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
-				if (descMap.data[0] == "00") {
-					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
-					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-				} else {
-					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
-				}
-			}
-		}
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}
+	else if (description?.startsWith('temperature: ')) {
+		map = parseCustomMessage(description)
+	}
+	else if (description?.startsWith('zone status')) {
+		map = parseIasMessage(description)
 	}

 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]

 	if (description?.startsWith('enroll request')) {
-		List cmds = zigbee.enrollResponse()
+		List cmds = enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
 	return result
 }

+private Map parseCatchAllMessage(String description) {
+	Map resultMap = [:]
+	def cluster = zigbee.parse(description)
+	if (shouldProcessMessage(cluster)) {
+		switch(cluster.clusterId) {
+			case 0x0001:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+				break
+
+            case 0x0402:
+				if (cluster.command == 0x07) {
+					if (cluster.data[0] == 0x00){
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+					}
+					else {
+						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+					}
+				}
+				else {
+					// temp is last 2 data values. reverse to swap endian
+					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					def value = getTemperature(temp)
+					resultMap = getTemperatureResult(value)
+				}
+                break
+        }
+    }
+
+    return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+	// 0x0B is default response indicating message got through
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
+		cluster.command == 0x0B ||
+		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+	return !ignoredMessage
+}
+
+private Map parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+	log.debug "Desc Map: $descMap"
+
+	Map resultMap = [:]
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		resultMap = getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+
+	return resultMap
+}
+
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	return resultMap
+}
+
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)

 	return zs.isAlarm1Set() ? getMoistureResult('wet') : getMoistureResult('dry')
 }

+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return Math.round(celsius)
+	} else {
+		return Math.round(celsiusToFahrenheit(celsius))
+	}
+}
+
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
@@ -165,18 +238,40 @@ private Map getBatteryResult(rawValue) {
 	return result
 }

+private Map getTemperatureResult(value) {
+	log.debug 'TEMP'
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
+	}
+    def descriptionText
+    if ( temperatureScale == 'C' )
+    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
+    else
+    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
+
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		translatable: true,
+		unit: temperatureScale
+	]
+}
+
 private Map getMoistureResult(value) {
 	log.debug "water"
-	def descriptionText
-	if (value == "wet")
-		descriptionText = '{{ device.displayName }} is wet'
-	else
-		descriptionText = '{{ device.displayName }} is dry'
+    def descriptionText
+    if ( value == "wet" )
+    	descriptionText = '{{ device.displayName }} is wet'
+    else
+    	descriptionText = '{{ device.displayName }} is dry'
 	return [
-			name           : 'water',
-			value          : value,
-			descriptionText: descriptionText,
-			translatable   : true
+		name: 'water',
+		value: value,
+		descriptionText: descriptionText,
+        translatable: true
 	]
 }

@@ -189,10 +284,12 @@ def ping() {

 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
-	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
+	def refreshCmds = [
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+	]

-	return refreshCmds + zigbee.enrollResponse()
+	return refreshCmds + enrollResponse()
 }

 def configure() {
@@ -204,3 +301,42 @@ def configure() {
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
 }
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+	reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+	int i = 0;
+	int j = array.length - 1;
+	byte tmp;
+	while (j > i) {
+		tmp = array[j];
+		array[j] = array[i];
+		array[i] = tmp;
+		j--;
+		i++;
+	}
+	return array
+}
--- a/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy
+++ b/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy
@@ -37,13 +37,13 @@ metadata {
 		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
 				attributeState "dry", label: "Dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC"
+				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
 		standardTile("temperatureState", "device.temperature", width: 2, height: 2) {
 			state "normal", icon:"st.alarm.temperature.normal", backgroundColor:"#ffffff"
-			state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#00A0DC"
-			state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#e86d13"
+			state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#53a7c0"
+			state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#F80000"
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
            state("temperature", label:'${currentValue}°',
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -17,7 +17,7 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus


 metadata {
-	definition(name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
 		capability "Configuration"
 		capability "Battery"
@@ -35,7 +35,6 @@ metadata {
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326-L", deviceJoinName: "Iris Motion Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor"
-		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv5", deviceJoinName: "Motion Sensor"
 	}

 	simulator {
@@ -46,10 +45,10 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-					"http://cdn.device-gse.smartthings.com/Motion/Motion1.jpg",
-					"http://cdn.device-gse.smartthings.com/Motion/Motion2.jpg",
-					"http://cdn.device-gse.smartthings.com/Motion/Motion3.jpg"
-			])
+				"http://cdn.device-gse.smartthings.com/Motion/Motion1.jpg",
+				"http://cdn.device-gse.smartthings.com/Motion/Motion2.jpg",
+				"http://cdn.device-gse.smartthings.com/Motion/Motion3.jpg"
+				])
 		}
 		section {
 			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -58,30 +57,30 @@ metadata {
 	}

 	tiles(scale: 2) {
-		multiAttributeTile(name: "motion", type: "generic", width: 6, height: 4) {
-			tileAttribute("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label: 'motion', icon: "st.motion.motion.active", backgroundColor: "#53a7c0"
-				attributeState "inactive", label: 'no motion', icon: "st.motion.motion.inactive", backgroundColor: "#ffffff"
+		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
+				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 			}
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label: '${currentValue}°', unit: "F",
-					backgroundColors: [
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
+			state("temperature", label:'${currentValue}°', unit:"F",
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
 			)
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label: '${currentValue}% battery', unit: ""
+			state "battery", label:'${currentValue}% battery', unit:""
 		}
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

 		main(["motion", "temperature"])
@@ -91,40 +90,116 @@ metadata {

 def parse(String description) {
 	log.debug "description: $description"
-	Map map = zigbee.getEvent(description)
-	if (!map) {
-		if (description?.startsWith('zone status')) {
-			map = parseIasMessage(description)
-		} else {
-			Map descMap = zigbee.parseDescriptionAsMap(description)
-			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
-				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
-			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
-				if (descMap.data[0] == "00") {
-					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
-					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-				} else {
-					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
-				}
-			} else if (descMap.clusterInt == 0x0406 && descMap.attrInt == 0x0000) {
-				def value = descMap.value.endsWith("01") ? "active" : "inactive"
-				log.debug "Doing a read attr motion event"
-				map = getMotionResult(value)
-			}
-		}
+
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}
+	else if (description?.startsWith('temperature: ')) {
+		map = parseCustomMessage(description)
+	}
+	else if (description?.startsWith('zone status')) {
+		map = parseIasMessage(description)
 	}

 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]

 	if (description?.startsWith('enroll request')) {
-		List cmds = zigbee.enrollResponse()
+		List cmds = enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
 	return result
 }

+private Map parseCatchAllMessage(String description) {
+	Map resultMap = [:]
+	def cluster = zigbee.parse(description)
+	if (shouldProcessMessage(cluster)) {
+		switch(cluster.clusterId) {
+			case 0x0001:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+				break
+
+			case 0x0402:
+				if (cluster.command == 0x07) {
+					if (cluster.data[0] == 0x00) {
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+					}
+					else {
+						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+					}
+
+				}
+				else {
+					// temp is last 2 data values. reverse to swap endian
+					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					def value = getTemperature(temp)
+					resultMap = getTemperatureResult(value)
+				}
+				break
+
+			case 0x0406:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					log.debug 'motion'
+					resultMap.name = 'motion'
+				}
+				break
+		}
+	}
+
+	return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+	// 0x0B is default response indicating message got through
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
+		cluster.command == 0x0B ||
+		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+	return !ignoredMessage
+}
+
+private Map parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+	log.debug "Desc Map: $descMap"
+
+	Map resultMap = [:]
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		resultMap = getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+	else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
+		def value = descMap.value.endsWith("01") ? "active" : "inactive"
+		resultMap = getMotionResult(value)
+	}
+
+	return resultMap
+}
+
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	return resultMap
+}
+
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)

@@ -132,6 +207,15 @@ private Map parseIasMessage(String description) {
 	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }

+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return Math.round(celsius)
+	} else {
+		return Math.round(celsiusToFahrenheit(celsius))
+	}
+}
+
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
@@ -171,14 +255,36 @@ private Map getBatteryResult(rawValue) {
 	return result
 }

+private Map getTemperatureResult(value) {
+	log.debug 'TEMP'
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
+	}
+    def descriptionText
+    if ( temperatureScale == 'C' )
+    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
+    else
+    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
+
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		translatable: true,
+		unit: temperatureScale
+	]
+}
+
 private Map getMotionResult(value) {
 	log.debug 'motion'
 	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
 	return [
-			name           : 'motion',
-			value          : value,
-			descriptionText: descriptionText,
-			translatable   : true
+		name: 'motion',
+		value: value,
+		descriptionText: descriptionText,
+        translatable: true
 	]
 }

@@ -186,16 +292,17 @@ private Map getMotionResult(value) {
 * PING is used by Device-Watch in attempt to reach the Device
 * */
 def ping() {
-	return zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) // Read the Battery Level
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }

 def refresh() {
 	log.debug "refresh called"
+	def refreshCmds = [
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+	]

-	def refreshCmds = zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
-			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000)
-
-	return refreshCmds + zigbee.enrollResponse()
+	return refreshCmds + enrollResponse()
 }

 def configure() {
@@ -207,3 +314,42 @@ def configure() {
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
 }
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+	reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+	int i = 0;
+	int j = array.length - 1;
+	byte tmp;
+	while (j > i) {
+		tmp = array[j];
+		array[j] = array[i];
+		array[i] = tmp;
+		j--;
+		i++;
+	}
+	return array
+}
--- a/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
+++ b/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
@@ -45,7 +45,7 @@ metadata {

 def parse(String description) {
 	def results = [:]
-	if (description.startsWith("zone") || !isSupportedDescription(description)) {
+	if (isZoneType19(description) || !isSupportedDescription(description)) {
 		results = parseBasicMessage(description)
 	}
 	else if (isMotionStatusMessage(description)){
@@ -87,12 +87,16 @@ private String parseName(String description) {
 }

 private String parseValue(String description) {
-	def zs = zigbee.parseZoneStatus(description)
-	if (zs) {
-		zs.isAlarm1Set() ? "active" : "inactive"
-	} else {
-		description
+	if (isZoneType19(description)) {
+		if (translateStatusZoneType19(description)) {
+			return "active"
+		}
+		else {
+			return "inactive"
+		}
 	}
+
+	description
 }

 private parseDescriptionText(String linkText, String value, String description) {
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -14,23 +14,22 @@
 *  under the License.
 */
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
-import physicalgraph.zigbee.zcl.DataType

 metadata {
-	definition(name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {

 		capability "Three Axis"
 		capability "Battery"
 		capability "Configuration"
 		capability "Sensor"
-		capability "Contact Sensor"
-		capability "Acceleration Sensor"
-		capability "Refresh"
-		capability "Temperature Measurement"
+ 		capability "Contact Sensor"
+ 		capability "Acceleration Sensor"
+ 		capability "Refresh"
+ 		capability "Temperature Measurement"
 		capability "Health Check"

-		command "enrollResponse"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"
+ 		command "enrollResponse"
+ 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321-S", deviceJoinName: "Multipurpose Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500,FC02", outClusters: "0019", manufacturer: "SmartThings", model: "multiv4", deviceJoinName: "Multipurpose Sensor"
@@ -58,11 +57,11 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-					"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
-					"http://cdn.device-gse.smartthings.com/Multi/Multi2.jpg",
-					"http://cdn.device-gse.smartthings.com/Multi/Multi3.jpg",
-					"http://cdn.device-gse.smartthings.com/Multi/Multi4.jpg"
-			])
+				"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
+				"http://cdn.device-gse.smartthings.com/Multi/Multi2.jpg",
+				"http://cdn.device-gse.smartthings.com/Multi/Multi3.jpg",
+				"http://cdn.device-gse.smartthings.com/Multi/Multi4.jpg"
+				])
 		}
 		section {
 			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -74,170 +73,211 @@ metadata {
 	}

 	tiles(scale: 2) {
-		multiAttributeTile(name: "status", type: "generic", width: 6, height: 4) {
-			tileAttribute("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
-				attributeState "closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#00a0dc"
-				attributeState "garage-open", label: 'Open', icon: "st.doors.garage.garage-open", backgroundColor: "#e86d13"
-				attributeState "garage-closed", label: 'Closed', icon: "st.doors.garage.garage-closed", backgroundColor: "#00a0dc"
+		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
+				attributeState "open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+				attributeState "garage-open", label:'Open', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e"
+				attributeState "garage-closed", label:'Closed', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821"
 			}
 		}
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#e86d13")
-			state("closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#00a0dc")
+			state("open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("active", label: 'Active', icon: "st.motion.acceleration.active", backgroundColor: "#53a7c0")
-			state("inactive", label: 'Inactive', icon: "st.motion.acceleration.inactive", backgroundColor: "#ffffff")
+			state("active", label:'Active', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'Inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label: '${currentValue}°',
-					backgroundColors: [
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
+			state("temperature", label:'${currentValue}°',
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
 			)
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label: '${currentValue}% battery', unit: ""
+			state "battery", label:'${currentValue}% battery', unit:""
 		}
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}


 		main(["status", "acceleration", "temperature"])
 		details(["status", "acceleration", "temperature", "battery", "refresh"])
 	}
-}
+ }

 def parse(String description) {
-	def maps = []
-	maps << zigbee.getEvent(description)
-	if (!maps[0]) {
-		maps = []
-		if (description?.startsWith('zone status')) {
-			maps += parseIasMessage(description)
-		} else {
-			Map descMap = zigbee.parseDescriptionAsMap(description)
-			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
-				maps << getBatteryResult(Integer.parseInt(descMap.value, 16))
-			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
-				if (descMap.data[0] == "00") {
-					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
-					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-				} else {
-					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
-				}
-			} else {
-
-				maps += handleAcceleration(descMap)
-			}
-		}
-	} else if (maps[0].name == "temperature") {
-		def map = maps[0]
-		if (tempOffset) {
-			map.value = (int) map.value + (int) tempOffset
-		}
-		map.descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C' : '{{ device.displayName }} was {{ value }}°F'
-		map.translatable = true
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('temperature: ')) {
+		map = parseCustomMessage(description)
+	}
+	else if (description?.startsWith('zone status')) {
+		map = parseIasMessage(description)
 	}

-	def result = maps.inject([]) {acc, it ->
-		if (it) {
-			acc << createEvent(it)
-		}
-	}
+	def result = map ? createEvent(map) : [:]
+
 	if (description?.startsWith('enroll request')) {
-		List cmds = zigbee.enrollResponse()
+		List cmds = enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
+	else if (description?.startsWith('read attr -')) {
+		result = parseReportAttributeMessage(description).each { createEvent(it) }
+	}
 	return result
 }

-private List<Map> handleAcceleration(descMap) {
-	def result = []
-	if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0010) {
-		def value = descMap.value == "01" ? "active" : "inactive"
-		log.debug "Acceleration $value"
-		result << [
-				name           : "acceleration",
-				value          : value,
-				descriptionText: "{{ device.displayName }} was $value",
-				isStateChange  : isStateChange(device, "acceleration", value),
-				translatable   : true
-		]
+private Map parseCatchAllMessage(String description) {
+	Map resultMap = [:]
+	def cluster = zigbee.parse(description)
+	log.debug cluster
+	if (shouldProcessMessage(cluster)) {
+		switch(cluster.clusterId) {
+			case 0x0001:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+			break

-		if (descMap.additionalAttrs) {
-			result += parseAxis(descMap.additionalAttrs)
+			case 0xFC02:
+				log.debug 'ACCELERATION'
+			break
+
+			case 0x0402:
+				if (cluster.command == 0x07) {
+					if(cluster.data[0] == 0x00) {
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+					}
+					else {
+						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+					}
+				}
+				else {
+					// temp is last 2 data values. reverse to swap endian
+					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					def value = getTemperature(temp)
+					resultMap = getTemperatureResult(value)
+				}
+			break
 		}
-	} else if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0012) {
-		def addAttrs = descMap.additionalAttrs
-		addAttrs << ["attrInt": descMap.attrInt, "value": descMap.value]
-		result += parseAxis(addAttrs)
 	}
+
+	return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+	// 0x0B is default response indicating message got through
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
+	cluster.command == 0x0B ||
+	(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+	return !ignoredMessage
+}
+
+private List parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+
+	List result = []
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		result << getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "FC02" && descMap.attrId == "0010") {
+		if (descMap.value.size() == 32) {
+			// value will look like 00ae29001403e2290013001629001201
+			// breaking this apart and swapping byte order where appropriate, this breaks down to:
+			//   X (0x0012) = 0x0016
+			//   Y (0x0013) = 0x03E2
+			//   Z (0x0014) = 0x00AE
+			// note that there is a known bug in that the x,y,z attributes are interpreted in the wrong order
+			// this will be fixed in a future update
+			def threeAxisAttributes = descMap.value[0..-9]
+			result << parseAxis(threeAxisAttributes)
+			descMap.value = descMap.value[-2..-1]
+		}
+		result << getAccelerationResult(descMap.value)
+	}
+	else if (descMap.cluster == "FC02" && descMap.attrId == "0012" && descMap.value.size() == 24) {
+		// The size is checked to ensure the attribute report contains X, Y and Z values
+		// If all three axis are not included then the attribute report is ignored
+		result << parseAxis(descMap.value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		result << getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+
 	return result
 }

-private List<Map> parseAxis(List<Map> attrData) {
-	def results = []
-	def x = hexToSignedInt(attrData.find { it.attrInt == 0x0012 }?.value)
-	def y = hexToSignedInt(attrData.find { it.attrInt == 0x0013 }?.value)
-	def z = hexToSignedInt(attrData.find { it.attrInt == 0x0014 }?.value)
-
-	def xyzResults = [:]
-	if (device.getDataValue("manufacturer") == "SmartThings") {
-		// This mapping matches the current behavior of the Device Handler for the Centralite sensors
-		xyzResults.x = z
-		xyzResults.y = y
-		xyzResults.z = -x
-	} else {
-		// The axises reported by the Device Handler differ from the axises reported by the sensor
-		// This may change in the future
-		xyzResults.x = z
-		xyzResults.y = x
-		xyzResults.z = y
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
 	}
-
-	log.debug "parseAxis -- ${xyzResults}"
-
-	if (garageSensor == "Yes")
-		results += garageEvent(xyzResults.z)
-
-	def value = "${xyzResults.x},${xyzResults.y},${xyzResults.z}"
-	results << [
-			name           : "threeAxis",
-			value          : value,
-			linkText       : getLinkText(device),
-			descriptionText: "${getLinkText(device)} was ${value}",
-			handlerName    : name,
-			isStateChange  : isStateChange(device, "threeAxis", value),
-			displayed      : false
-	]
-	results
+	return resultMap
 }

-private List<Map> parseIasMessage(String description) {
+private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
-	List<Map> results = []
+	Map resultMap = [:]

-	if (garageSensor != "Yes") {
-		def value = zs.isAlarm1Set() ? 'open' : 'closed'
-		log.debug "Contact: ${device.displayName} value = ${value}"
-		def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
-		results << [name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true]
-		results << [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
-	}
+			if (garageSensor != "Yes"){
+		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
+			}

-	return results
+	return resultMap
 }

+def updated() {
+	log.debug "updated called"
+	log.info "garage value : $garageSensor"
+	if (garageSensor == "Yes") {
+		def descriptionText = "Updating device to garage sensor"
+		if (device.latestValue("status") == "open") {
+			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText, translatable: true)
+		}
+		else if (device.latestValue("status") == "closed") {
+			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText, translatable: true)
+		}
+	}
+	else {
+		def descriptionText = "Updating device to open/close sensor"
+		if (device.latestValue("status") == "garage-open") {
+			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText, translatable: true)
+		}
+		else if (device.latestValue("status") == "garage-closed") {
+			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText, translatable: true)
+		}
+	}
+}
+
+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return Math.round(celsius)
+		} else {
+			return Math.round(celsiusToFahrenheit(celsius))
+		}
+	}
+
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"

@@ -276,24 +316,54 @@ private Map getBatteryResult(rawValue) {
 	return result
 }

-List<Map> garageEvent(zValue) {
-	List<Map> results = []
-	def absValue = zValue.abs()
-	def contactValue = null
-	def garageValue = null
-	if (absValue > 900) {
-		contactValue = 'closed'
-		garageValue = 'garage-closed'
-	} else if (absValue < 100) {
-		contactValue = 'open'
-		garageValue = 'garage-open'
+private Map getTemperatureResult(value) {
+	log.debug "Temperature"
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
 	}
-	if (contactValue != null) {
-		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
-		results << [name: 'contact', value: contactValue, descriptionText: descriptionText, displayed: false, translatable: true]
-		results << [name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true]
-	}
-	results
+	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
+			'{{ device.displayName }} was {{ value }}°F'
+
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		translatable: true,
+		unit: temperatureScale
+	]
+}
+
+private Map getContactResult(value) {
+	log.debug "Contact: ${device.displayName} value = ${value}"
+	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
+	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
+}
+
+private getAccelerationResult(numValue) {
+	log.debug "Acceleration"
+	def name = "acceleration"
+    def value
+    def descriptionText
+
+	if ( numValue.endsWith("1") ) {
+    	value = "active"
+        descriptionText = '{{ device.displayName }} was active'
+    } else {
+    	value = "inactive"
+        descriptionText = '{{ device.displayName }} was inactive'
+    }
+
+	def isStateChange = isStateChange(device, name, value)
+	return [
+		name: name,
+		value: value,
+		descriptionText: descriptionText,
+		isStateChange: isStateChange,
+		translatable: true
+	]
 }

 /**
@@ -306,21 +376,7 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Values "

-	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
-			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode]) +
-			zigbee.enrollResponse()
-
-	return refreshCmds
-}
-
-def configure() {
-	// Device-Watch allows 2 check-in misses from device + ping (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-	log.debug "Configuring Reporting"
-	def configCmds = []
+	def refreshCmds = []

 	if (device.getDataValue("manufacturer") == "SmartThings") {
 		log.debug "Refreshing Values for manufacturer: SmartThings "
@@ -329,45 +385,81 @@ def configure() {
            Separating these out in a separate if-else because I do not want to touch Centralite part
            as of now.
        */
-		configCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x01, [mfgCode: manufacturerCode])
-		configCmds += zigbee.writeAttribute(0xFC02, 0x0002, 0x21, 0x0276, [mfgCode: manufacturerCode])
+		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x01, [mfgCode: manufacturerCode])
+		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0002, 0x21, 0x0276, [mfgCode: manufacturerCode])
 	} else {
-		// Write a motion threshold of 2 * .063g = .126g
-		// Currently due to a Centralite firmware issue, this will cause a read attribute response that
-		// indicates acceleration even when there isn't.
-		configCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x02, [mfgCode: manufacturerCode])
+		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x02, [mfgCode: manufacturerCode])
 	}

+	//Common refresh commands
+	refreshCmds += zigbee.readAttribute(0x0402, 0x0000) +
+			zigbee.readAttribute(0x0001, 0x0020) +
+			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode])
+
+	return refreshCmds + enrollResponse()
+}
+
+def configure() {
+	// Device-Watch allows 2 check-in misses from device + ping (plus 1 min lag time)
+	// enrolls with default periodic reporting until newer 5 min interval is confirmed
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+
+	log.debug "Configuring Reporting"
+
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	configCmds += zigbee.batteryConfig() +
+	def configCmds = zigbee.batteryConfig() +
 			zigbee.temperatureConfig(30, 300) +
-			zigbee.configureReporting(0xFC02, 0x0010, DataType.BITMAP8, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0012, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0013, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0014, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode])
+			zigbee.configureReporting(0xFC02, 0x0010, 0x18, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0012, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0013, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0014, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode])

 	return refresh() + configCmds
 }

-def updated() {
-	log.debug "updated called"
-	log.info "garage value : $garageSensor"
-	if (garageSensor == "Yes") {
-		def descriptionText = "Updating device to garage sensor"
-		if (device.latestValue("status") == "open") {
-			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText, translatable: true)
-		} else if (device.latestValue("status") == "closed") {
-			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText, translatable: true)
-		}
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private Map parseAxis(String description) {
+	def z = hexToSignedInt(description[0..3])
+	def y = hexToSignedInt(description[10..13])
+	def x = hexToSignedInt(description[20..23])
+	def xyzResults = [x: x, y: y, z: z]
+
+	if (device.getDataValue("manufacturer") == "SmartThings") {
+		// This mapping matches the current behavior of the Device Handler for the Centralite sensors
+		xyzResults.x = z
+		xyzResults.y = y
+		xyzResults.z = -x
 	} else {
-		def descriptionText = "Updating device to open/close sensor"
-		if (device.latestValue("status") == "garage-open") {
-			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText, translatable: true)
-		} else if (device.latestValue("status") == "garage-closed") {
-			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText, translatable: true)
-		}
+		// The axises reported by the Device Handler differ from the axises reported by the sensor
+		// This may change in the future
+		xyzResults.x = z
+		xyzResults.y = x
+		xyzResults.z = y
 	}
+
+	log.debug "parseAxis -- ${xyzResults}"
+
+	if (garageSensor == "Yes")
+		garageEvent(xyzResults.z)
+
+	getXyzResult(xyzResults, description)
 }

 private hexToSignedInt(hexVal) {
@@ -375,6 +467,44 @@ private hexToSignedInt(hexVal) {
 	unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
 }

+def garageEvent(zValue) {
+	def absValue = zValue.abs()
+	def contactValue = null
+	def garageValue = null
+	if (absValue>900) {
+		contactValue = 'closed'
+		garageValue = 'garage-closed'
+	}
+	else if (absValue < 100) {
+		contactValue = 'open'
+		garageValue = 'garage-open'
+	}
+	if (contactValue != null){
+		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' :'{{ device.displayName }} was closed'
+		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false, translatable: true)
+		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true)
+	}
+}
+
+private Map getXyzResult(results, description) {
+	def name = "threeAxis"
+	def value = "${results.x},${results.y},${results.z}"
+	def linkText = getLinkText(device)
+	def descriptionText = "$linkText was $value"
+	def isStateChange = isStateChange(device, name, value)
+
+	[
+		name: name,
+		value: value,
+		unit: null,
+		linkText: linkText,
+		descriptionText: descriptionText,
+		handlerName: name,
+		isStateChange: isStateChange,
+		displayed: false
+	]
+}
+
 private getManufacturerCode() {
 	if (device.getDataValue("manufacturer") == "SmartThings") {
 		return "0x110A"
@@ -386,3 +516,25 @@ private getManufacturerCode() {
 private hexToInt(value) {
 	new BigInteger(value, 16)
 }
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+	reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+	int i = 0;
+	int j = array.length - 1;
+	byte tmp;
+	while (j > i) {
+		tmp = array[j];
+		array[j] = array[i];
+		array[i] = tmp;
+		j--;
+		i++;
+	}
+	return array
+}
--- a/devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy
+++ b/devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy
@@ -86,7 +86,7 @@ metadata {
 def parse(String description) {
 	def results

-	if (!isSupportedDescription(description) || description.startsWith("zone")) {
+	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
 		results = parseSingleMessage(description)
 	}
 	else if (description == 'updated') {
@@ -488,7 +488,12 @@ private String parseValue(String description) {
 	if (!isSupportedDescription(description)) {
 		return description
 	}
-	return zigbee.parseZoneStatus(description)?.isAlarm1Set() ? "open" : "closed"
+	else if (zigbee.translateStatusZoneType19(description)) {
+		return "open"
+	}
+	else {
+		return "closed"
+	}
 }

 private parseDescriptionText(String linkText, String value, String description) {
--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -16,7 +16,7 @@
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus

 metadata {
-	definition(name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
@@ -43,77 +43,155 @@ metadata {
 	}

 	tiles(scale: 2) {
-		multiAttributeTile(name: "contact", type: "generic", width: 6, height: 4) {
-			tileAttribute("device.contact", key: "PRIMARY_CONTROL") {
-				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
-				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
 			}
 		}

 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label: '${currentValue}°',
-					backgroundColors: [
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
+			state "temperature", label:'${currentValue}°',
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label: '${currentValue}% battery', unit: ""
+			state "battery", label:'${currentValue}% battery', unit:""
 		}

 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

-		main(["contact", "temperature"])
-		details(["contact", "temperature", "battery", "refresh"])
+		main (["contact", "temperature"])
+		details(["contact","temperature","battery","refresh"])
 	}
 }

 def parse(String description) {
 	log.debug "description: $description"

-	Map map = zigbee.getEvent(description)
-	if (!map) {
-		if (description?.startsWith('zone status')) {
-			map = parseIasMessage(description)
-		} else {
-			Map descMap = zigbee.parseDescriptionAsMap(description)
-			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
-				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
-			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
-				if (descMap.data[0] == "00") {
-					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
-					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-				} else {
-					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
-				}
-			}
-		}
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
 	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}
+	else if (description?.startsWith('temperature: ')) {
+		map = parseCustomMessage(description)
+	}
+    else if (description?.startsWith('zone status')) {
+    	map = parseIasMessage(description)
+    }

 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]

-	if (description?.startsWith('enroll request')) {
-		List cmds = zigbee.enrollResponse()
-		log.debug "enroll response: ${cmds}"
-		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-	}
-	return result
+    if (description?.startsWith('enroll request')) {
+    	List cmds = enrollResponse()
+        log.debug "enroll response: ${cmds}"
+        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+    }
+    return result
 }

+private Map parseCatchAllMessage(String description) {
+    Map resultMap = [:]
+    def cluster = zigbee.parse(description)
+    if (shouldProcessMessage(cluster)) {
+        switch(cluster.clusterId) {
+            case 0x0001:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+                break
+
+            case 0x0402:
+				if (cluster.command == 0x07){
+					if (cluster.data[0] == 0x00) {
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+					}
+					else {
+						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+					}
+				}
+				else {
+					// temp is last 2 data values. reverse to swap endian
+					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					def value = getTemperature(temp)
+					resultMap = getTemperatureResult(value)
+				}
+                break
+        }
+    }
+
+    return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+    // 0x0B is default response indicating message got through
+    boolean ignoredMessage = cluster.profileId != 0x0104 ||
+        cluster.command == 0x0B ||
+        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+    return !ignoredMessage
+}
+
+private int getHumidity(value) {
+    return Math.round(Double.parseDouble(value))
+}
+
+private Map parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+	log.debug "Desc Map: $descMap"
+
+	Map resultMap = [:]
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		resultMap = getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+
+	return resultMap
+}
+
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	return resultMap
+}

 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }

+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return celsius
+	} else {
+		return celsiusToFahrenheit(celsius) as Integer
+	}
+}
+
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
@@ -126,8 +204,8 @@ private Map getBatteryResult(rawValue) {
 		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
-		if (roundedPct <= 0)
-			roundedPct = 1
+	    if (roundedPct <= 0)
+		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 		result.name = 'battery'
@@ -136,14 +214,31 @@ private Map getBatteryResult(rawValue) {
 	return result
 }

+private Map getTemperatureResult(value) {
+	log.debug 'TEMP'
+	def linkText = getLinkText(device)
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
+	}
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		unit: temperatureScale
+	]
+}
+
 private Map getContactResult(value) {
 	log.debug 'Contact Status'
 	def linkText = getLinkText(device)
 	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
 	return [
-			name           : 'contact',
-			value          : value,
-			descriptionText: descriptionText
+		name: 'contact',
+		value: value,
+		descriptionText: descriptionText
 	]
 }

@@ -156,10 +251,12 @@ def ping() {

 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
-	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
+	def refreshCmds = [
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+	]

-	return refreshCmds + zigbee.enrollResponse()
+	return refreshCmds + enrollResponse()
 }

 def configure() {
@@ -171,5 +268,44 @@ def configure() {

 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+    return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+}
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+    int i = 0;
+    int j = array.length - 1;
+    byte tmp;
+    while (j > i) {
+        tmp = array[j];
+        array[j] = array[i];
+        array[i] = tmp;
+        j--;
+        i++;
+    }
+    return array
 }
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -13,10 +13,8 @@
 *  for the specific language governing permissions and limitations under the License.
 *
 */
-import physicalgraph.zigbee.zcl.DataType
-
 metadata {
-	definition(name: "SmartSense Temp/Humidity Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
@@ -33,7 +31,7 @@ metadata {
 		status 'H 45': 'catchall: 0104 FC45 01 01 0140 00 D9B9 00 04 C2DF 0A 01 0000218911'
 		status 'H 57': 'catchall: 0104 FC45 01 01 0140 00 4E55 00 04 C2DF 0A 01 0000211316'
 		status 'H 53': 'catchall: 0104 FC45 01 01 0140 00 20CD 00 04 C2DF 0A 01 0000219814'
-		status 'H 43': 'read attr - raw: BF7601FC450C00000021A410, dni: BF76, endpoint: 01, cluster: FC45, size: 0C, attrId: 0000, result: success, encoding: 21, value: 10a4'
+		status 'H 43':  'read attr - raw: BF7601FC450C00000021A410, dni: BF76, endpoint: 01, cluster: FC45, size: 0C, attrId: 0000, result: success, encoding: 21, value: 10a4'
 	}

 	preferences {
@@ -42,28 +40,28 @@ metadata {
 	}

 	tiles(scale: 2) {
-		multiAttributeTile(name: "temperature", type: "generic", width: 6, height: 4) {
-			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState "temperature", label: '${currentValue}°',
-						backgroundColors: [
-								[value: 31, color: "#153591"],
-								[value: 44, color: "#1e9cbb"],
-								[value: 59, color: "#90d2a7"],
-								[value: 74, color: "#44b621"],
-								[value: 84, color: "#f1d801"],
-								[value: 95, color: "#d04e00"],
-								[value: 96, color: "#bc2323"]
-						]
+		multiAttributeTile(name:"temperature", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.temperature", key: "PRIMARY_CONTROL") {
+				attributeState "temperature", label:'${currentValue}°',
+					backgroundColors:[
+						[value: 31, color: "#153591"],
+						[value: 44, color: "#1e9cbb"],
+						[value: 59, color: "#90d2a7"],
+						[value: 74, color: "#44b621"],
+						[value: 84, color: "#f1d801"],
+						[value: 95, color: "#d04e00"],
+						[value: 96, color: "#bc2323"]
+					]
 			}
 		}
 		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
-			state "humidity", label: '${currentValue}% humidity', unit: ""
+			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label: '${currentValue}% battery'
+			state "battery", label:'${currentValue}% battery'
 		}
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

 		main "temperature", "humidity"
@@ -74,31 +72,142 @@ metadata {
 def parse(String description) {
 	log.debug "description: $description"

-	// getEvent will handle temperature and humidity
-	Map map = zigbee.getEvent(description)
-	if (!map) {
-		Map descMap = zigbee.parseDescriptionAsMap(description)
-		if (descMap.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
-			map = getBatteryResult(Integer.parseInt(descMap.value, 16))
-		} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
-			if (descMap.data[0] == "00") {
-				log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
-				sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-			} else {
-				log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
-			}
-		}
+	Map map = [:]
+	if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}
+	else if (description?.startsWith('temperature: ') || description?.startsWith('humidity: ')) {
+		map = parseCustomMessage(description)
 	}

 	log.debug "Parse returned $map"
 	return map ? createEvent(map) : [:]
 }

+private Map parseCatchAllMessage(String description) {
+    Map resultMap = [:]
+    def cluster = zigbee.parse(description)
+    if (shouldProcessMessage(cluster)) {
+        switch(cluster.clusterId) {
+            case 0x0001:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+                break
+
+            case 0x0402:
+				if (cluster.command == 0x07) {
+					if (cluster.data[0] == 0x00){
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+					}
+					else {
+						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+					}
+				}
+				else {
+					// temp is last 2 data values. reverse to swap endian
+					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					def value = getTemperature(temp)
+					resultMap = getTemperatureResult(value)
+				}
+				break
+
+			case 0xFC45:
+				// 0x07 - configure reporting
+				if (cluster.command != 0x07) {
+					String pctStr = cluster.data[-1, -2].collect { Integer.toHexString(it) }.join('')
+					String display = Math.round(Integer.valueOf(pctStr, 16) / 100)
+					resultMap = getHumidityResult(display)
+				}
+                break
+        }
+    }
+
+    return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+    // 0x0B is default response indicating message got through
+    boolean ignoredMessage = cluster.profileId != 0x0104 ||
+        cluster.command == 0x0B ||
+        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+    return !ignoredMessage
+}
+
+private Map parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+	log.debug "Desc Map: $descMap"
+
+	Map resultMap = [:]
+	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
+		def value = getTemperature(descMap.value)
+		resultMap = getTemperatureResult(value)
+	}
+	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+	}
+	else if (descMap.cluster == "FC45" && descMap.attrId == "0000") {
+		def value = getReportAttributeHumidity(descMap.value)
+		resultMap = getHumidityResult(value)
+	}
+
+	return resultMap
+}
+
+def getReportAttributeHumidity(String value) {
+    def humidity = null
+    if (value?.trim()) {
+        try {
+        	// value is hex with no decimal
+            def pct = Integer.parseInt(value.trim(), 16) / 100
+            humidity = String.format('%.0f', pct)
+        } catch(NumberFormatException nfe) {
+            log.debug "Error converting $value to humidity"
+        }
+    }
+    return humidity
+}
+
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	else if (description?.startsWith('humidity: ')) {
+		def pct = (description - "humidity: " - "%").trim()
+		if (pct.isNumber()) {
+			def value = Math.round(new BigDecimal(pct)).toString()
+			resultMap = getHumidityResult(value)
+		} else {
+			log.error "invalid humidity: ${pct}"
+		}
+	}
+	return resultMap
+}
+
+def getTemperature(value) {
+	def celsius = Integer.parseInt(value, 16).shortValue() / 100
+	if(getTemperatureScale() == "C"){
+		return celsius
+	} else {
+		return celsiusToFahrenheit(celsius) as Integer
+	}
+}
+
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)

-  def result = [:]
+    def result = [:]

 	def volts = rawValue / 10
 	if (!(rawValue == 0 || rawValue == 255)) {
@@ -117,22 +226,41 @@ private Map getBatteryResult(rawValue) {
 	return result
 }

+private Map getTemperatureResult(value) {
+	log.debug 'TEMP'
+	def linkText = getLinkText(device)
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset
+	}
+	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		unit: temperatureScale
+	]
+}
+
+private Map getHumidityResult(value) {
+	log.debug 'Humidity'
+	return value ? [name: 'humidity', value: value, unit: '%'] : [:]
+}
+
 /**
 * PING is used by Device-Watch in attempt to reach the Device
 * */
 def ping() {
-	return zigbee.readAttribute(0x0001, 0x0020) // Read the Battery Level
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }

-def refresh() {
+def refresh()
+{
 	log.debug "refresh temperature, humidity, and battery"
-	return zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0x104E]) +   // New firmware
-			zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0xC2DF]) +   // Original firmware
-			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
-			zigbee.configureReporting(0xFC45, 0x0000, DataType.INT16, 30, 3600, 100) +
-			zigbee.batteryConfig() +
-			zigbee.temperatureConfig(30, 300)
+	return zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0xC2DF]) +   // Original firmware
+			zigbee.readAttribute(0x0402, 0x0000) +
+			zigbee.readAttribute(0x0001, 0x0020)
 }

 def configure() {
@@ -141,8 +269,35 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])

 	log.debug "Configuring Reporting and Bindings."
+	def humidityConfigCmds = [
+		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
+		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
+	]

 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh()
+	return refresh() + humidityConfigCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300)  // send refresh cmds as part of config
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+    int i = 0;
+    int j = array.length - 1;
+    byte tmp;
+    while (j > i) {
+        tmp = array[j];
+        array[j] = array[i];
+        array[i] = tmp;
+        j--;
+        i++;
+    }
+    return array
 }
--- a/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy
+++ b/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy
@@ -51,12 +51,12 @@ metadata {

 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
 		standardTile("acceleration", "device.acceleration") {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00a0dc")
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc")
+			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("temperature", "device.temperature") {
 			state("temperature", label:'${currentValue}°',
@@ -96,7 +96,7 @@ metadata {
 def parse(String description) {
 	def results

-	if (!isSupportedDescription(description) || description.startsWith("zone")) {
+	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}
--- a/devicetypes/smartthings/spark.src/spark.groovy
+++ b/devicetypes/smartthings/spark.src/spark.groovy
@@ -20,7 +20,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}

--- a/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy
+++ b/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy
@@ -36,7 +36,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {
 			state "level", action:"switch level.setLevel"
--- a/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy
+++ b/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy
@@ -28,8 +28,8 @@ metadata {

 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC", action: "open")
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13", action: "close")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821", action: "open")
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e", action: "close")
 		}
 		main "contact"
 		details "contact"
--- a/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy
+++ b/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy
@@ -29,10 +29,10 @@ metadata {

 	tiles {
 		standardTile("toggle", "device.door", width: 2, height: 2) {
-			state("closed", label:'${name}', action:"door control.open", icon:"st.doors.garage.garage-closed", backgroundColor:"#00A0DC", nextState:"opening")
-			state("open", label:'${name}', action:"door control.close", icon:"st.doors.garage.garage-open", backgroundColor:"#e86d13", nextState:"closing")
-			state("opening", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#e86d13")
-			state("closing", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#00A0DC")
+			state("closed", label:'${name}', action:"door control.open", icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821", nextState:"opening")
+			state("open", label:'${name}', action:"door control.close", icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e", nextState:"closing")
+			state("opening", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#ffe71e")
+			state("closing", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#ffe71e")
 			
 		}
 		standardTile("open", "device.door", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy
+++ b/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy
@@ -23,7 +23,7 @@ metadata {
 	tiles {
 		standardTile("toggle", "device.lock", width: 2, height: 2) {
 			state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
-			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00A0DC"
+			state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 		}
 		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'lock', action:"lock.lock", icon:"st.locks.lock.locked"
--- a/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy
+++ b/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy
@@ -28,8 +28,8 @@ metadata {

 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc", action: "active")
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC", action: "inactive")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff", action: "active")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0", action: "inactive")
 		}
 		main "motion"
 		details "motion"
--- a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy
+++ b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy
@@ -29,7 +29,7 @@ metadata {
 	tiles {
 		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
 			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff", action:"arrived")
-			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#00A0DC", action:"departed")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0", action:"departed")
 		}
 		main "presence"
 		details "presence"
--- a/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy
+++ b/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy
@@ -12,7 +12,7 @@
 *
 */
 metadata {
-
+	
    definition (name: "Simulated Switch", namespace: "smartthings/testing", author: "bob") {
 		capability "Switch"
        capability "Relay Switch"
@@ -26,7 +26,7 @@ metadata {
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}
 		standardTile("on", "device.switch", decoration: "flat") {
 			state "default", label: 'On', action: "onPhysical", backgroundColor: "#ffffff"
@@ -39,7 +39,9 @@ metadata {
 	}
 }

-def parse(description) {
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
 }

 def on() {
--- a/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy
+++ b/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy
@@ -101,9 +101,9 @@ metadata {

 		standardTile("mode", "device.thermostatMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "off", label:'${name}', action:"thermostat.heat", backgroundColor:"#ffffff"
-			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13"
-			state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#00A0DC"
-			state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC"
+			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffa81e"
+			state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#269bd2"
+			state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#79b821"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff"
@@ -112,8 +112,8 @@ metadata {
 		}
 		standardTile("operatingState", "device.thermostatOperatingState", width: 2, height: 2) {
 			state "idle", label:'${name}', backgroundColor:"#ffffff"
-			state "heating", label:'${name}', backgroundColor:"#e86d13"
-			state "cooling", label:'${name}', backgroundColor:"#00A0DC"
+			state "heating", label:'${name}', backgroundColor:"#ffa81e"
+			state "cooling", label:'${name}', backgroundColor:"#269bd2"
 		}

 		main("thermostatMulti")
--- a/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy
+++ b/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy
@@ -29,7 +29,7 @@ metadata {
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff", action: "wet"
-			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC", action: "dry"
+			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0", action: "dry"
 		}
 		standardTile("wet", "device.water", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'Wet', action:"wet", icon: "st.alarm.water.wet"
--- a/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy
+++ b/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy
@@ -21,8 +21,8 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) {
-			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
-			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13"
+			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
--- a/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy
@@ -41,9 +41,9 @@ metadata {
 				attributeState("default", label:'${currentValue}%', unit:"%")
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#ffffff")
-				attributeState("heating", backgroundColor:"#e86d13")
-				attributeState("cooling", backgroundColor:"#00a0dc")
+				attributeState("idle", backgroundColor:"#44b621")
+				attributeState("heating", backgroundColor:"#ffa81e")
+				attributeState("cooling", backgroundColor:"#269bd2")
 			}
 			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
 				attributeState("off", label:'${name}')
--- a/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy
@@ -26,8 +26,8 @@ metadata {
 	tiles(scale: 2) {
 		// You only get a presence tile view when the size is 3x3 otherwise it's a value tile
 		standardTile("presence", "device.presence", width: 3, height: 3, canChangeBackground: true) {
-			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC")
-			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#cccccc")
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
+			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ebeef2")
 		}

 		standardTile("notPresentBtn", "device.fake", width: 3, height: 3, decoration: "flat") {
@@ -35,7 +35,7 @@ metadata {
 		}

 		standardTile("presentBtn", "device.fake", width: 3, height: 3, decoration: "flat") {
-			state("present", label:'present', backgroundColor:"#00A0DC", action:"arrived")
+			state("present", label:'present', backgroundColor:"#53a7c0", action:"arrived")
 		}

 		main("presence")
--- a/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy
@@ -24,19 +24,19 @@ metadata {
 		// standard tile with actions
 		standardTile("actionRings", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}

 		// standard flat tile with actions
 		standardTile("actionFlat", "device.switch", width: 2, height: 2, canChangeIcon: true, decoration: "flat") {
 			state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}

 		// standard flat tile without actions
 		standardTile("noActionFlat", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "off", label: '${currentValue}',icon: "st.switches.switch.off", backgroundColor: "#ffffff"
-			state "on", label: '${currentValue}', icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${currentValue}', icon: "st.switches.switch.on", backgroundColor: "#79b821"
 		}

 		// standard flat tile with only a label
--- a/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy
@@ -25,7 +25,7 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"basicTile", type:"generic", width:6, height:4) {
 			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
@@ -33,7 +33,7 @@ metadata {
 		}
 		multiAttributeTile(name:"sliderTile", type:"generic", width:6, height:4) {
 			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', backgroundColor:"#ffffff", nextState:"turningOn"
 				attributeState "turningOn", label:'${name}', backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', backgroundColor:"#ffffff", nextState:"turningOn"
@@ -57,7 +57,7 @@ metadata {
 				]
 			}
 			tileAttribute("device.switch", key: "SECONDARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
 				attributeState "turningOn", label:'…', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'…', action:"switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
--- a/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy
@@ -33,9 +33,9 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.power", key: "SECONDARY_CONTROL") {
@@ -51,9 +51,9 @@ metadata {

 		multiAttributeTile(name:"switchNoPower", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
@@ -66,9 +66,9 @@ metadata {

 		multiAttributeTile(name:"switchNoSlider", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.power", key: "SECONDARY_CONTROL") {
@@ -81,9 +81,9 @@ metadata {

 		multiAttributeTile(name:"switchNoSliderOrColor", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.power", key: "SECONDARY_CONTROL") {
--- a/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy
@@ -42,9 +42,9 @@ metadata {
 				attributeState("humidity", label:'${currentValue}%', unit:"%", defaultState: true)
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#00A0DC")
-				attributeState("heating", backgroundColor:"#e86d13")
-				attributeState("cooling", backgroundColor:"#00A0DC")
+				attributeState("idle", backgroundColor:"#44b621")
+				attributeState("heating", backgroundColor:"#ffa81e")
+				attributeState("cooling", backgroundColor:"#269bd2")
 			}
 			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
 				attributeState("off", label:'${name}')
@@ -69,9 +69,9 @@ metadata {
 				attributeState("VALUE_DOWN", action: "tempDown")
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#00A0DC")
-				attributeState("heating", backgroundColor:"#e86d13")
-				attributeState("cooling", backgroundColor:"#00A0DC")
+				attributeState("idle", backgroundColor:"#44b621")
+				attributeState("heating", backgroundColor:"#ffa81e")
+				attributeState("cooling", backgroundColor:"#269bd2")
 			}
 			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
 				attributeState("off", label:'${name}')
@@ -148,9 +148,9 @@ metadata {

 		standardTile("mode", "device.thermostatMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "off", label:'${name}', action:"thermostat.heat", backgroundColor:"#ffffff"
-			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13"
-			state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#00A0DC"
-			state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC"
+			state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffa81e"
+			state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#269bd2"
+			state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#79b821"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff"
@@ -159,8 +159,8 @@ metadata {
 		}
 		standardTile("operatingState", "device.thermostatOperatingState", width: 2, height: 2) {
 			state "idle", label:'${name}', backgroundColor:"#ffffff"
-			state "heating", label:'${name}', backgroundColor:"#e86d13"
-			state "cooling", label:'${name}', backgroundColor:"#00A0DC"
+			state "heating", label:'${name}', backgroundColor:"#ffa81e"
+			state "cooling", label:'${name}', backgroundColor:"#269bd2"
 		}


--- a/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy
+++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy
@@ -34,10 +34,10 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name: "videoPlayer", type: "videoPlayer", width: 6, height: 4) {
 			tileAttribute("device.switch", key: "CAMERA_STATUS") {
-				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#00A0DC", defaultState: true)
+				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#79b821", defaultState: true)
 				attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", action: "switch.on", backgroundColor: "#ffffff")
-				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC")
-				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#cccccc")
+				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0")
+				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#F22000")
 			}

 			tileAttribute("device.errorMessage", key: "CAMERA_ERROR_MESSAGE") {
@@ -45,10 +45,10 @@ metadata {
 			}

 			tileAttribute("device.camera", key: "PRIMARY_CONTROL") {
-				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC", defaultState: true)
+				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#79b821", defaultState: true)
 				attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", backgroundColor: "#ffffff")
-				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC")
-				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#cccccc")
+				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0")
+				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#F22000")
 			}

 			tileAttribute("device.startLive", key: "START_LIVE") {
@@ -72,10 +72,10 @@ metadata {
 		
 		multiAttributeTile(name: "videoPlayerMin", type: "videoPlayer", width: 6, height: 4) {
 			tileAttribute("device.switch", key: "CAMERA_STATUS") {
-				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#00A0DC", defaultState: true)
+				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#79b821", defaultState: true)
 				attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", action: "switch.on", backgroundColor: "#ffffff")
-				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC")
-				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#cccccc")
+				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0")
+				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#F22000")
 			}

 			tileAttribute("device.errorMessage", key: "CAMERA_ERROR_MESSAGE") {
@@ -83,10 +83,10 @@ metadata {
 			}

 			tileAttribute("device.camera", key: "PRIMARY_CONTROL") {
-				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC", defaultState: true)
+				attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#79b821", defaultState: true)
 				attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", backgroundColor: "#ffffff")
-				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC")
-				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#cccccc")
+				attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0")
+				attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#F22000")
 			}

 			tileAttribute("device.startLive", key: "START_LIVE") {
--- a/devicetypes/smartthings/unknown.src/unknown.groovy
+++ b/devicetypes/smartthings/unknown.src/unknown.groovy
@@ -23,7 +23,7 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("unknown", "device.unknown", width: 2, height: 2) {
-			state(name:"default", icon:"st.unknown.unknown.unknown", backgroundColor:"#ffffff", label: "Unknown")
+			state(name:"default", icon:"st.unknown.unknown.unknown", backgroundColor:"#767676", label: "Unknown")
 		}

 		main "unknown"
--- a/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy
+++ b/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy
@@ -43,9 +43,9 @@ metadata {
 	// UI tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
+++ b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
@@ -52,11 +52,11 @@ metadata {
        }

        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            state "on", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#00A0DC", nextState:"turningOff"
+            state "on", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff"
            state "off", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "turningOn", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#00A0DC", nextState:"turningOff"
+            state "turningOn", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff"
            state "turningOff", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "offline", label:'${name}', icon:"st.Home.home30", backgroundColor:"#cccccc"
+            state "offline", label:'${name}', icon:"st.Home.home30", backgroundColor:"#ff0000"
        }

        standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
@@ -86,7 +86,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
 		unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)

 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
--- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
+++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
@@ -36,9 +36,9 @@
    tiles(scale: 2) {
        multiAttributeTile(name:"rich-control", type: "motion", canChangeIcon: true){
            tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
-                 attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC"
-                 attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
-                 attributeState "offline", label:'${name}', icon:"st.motion.motion.active", backgroundColor:"#cccccc"
+                 attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+                 attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
+                 attributeState "offline", label:'${name}', icon:"st.motion.motion.active", backgroundColor:"#ff0000"
 			}
            tileAttribute ("currentIP", key: "SECONDARY_CONTROL") {
             	 attributeState "currentIP", label: ''
@@ -78,7 +78,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
    	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
 			result << timeSyncResponse()
--- a/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
+++ b/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
@@ -84,7 +84,7 @@ def parse(String description) {
    def bodyString = msg.body
    if (bodyString) {
    	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
+        def body = new XmlSlurper().parseText(bodyString)
 		if (body?.property?.TimeSyncRequest?.text()) {
        	log.trace "Got TimeSyncRequest"
        	result << timeSyncResponse()
@@ -208,7 +208,7 @@ def subscribe(ip, port) {
    def existingIp = getDataValue("ip")
    def existingPort = getDataValue("port")
    if (ip && ip != existingIp) {
-         log.debug "Updating ip from $existingIp to $ip"
+         log.debug "Updating ip from $existingIp to $ip"    
    	 updateDataValue("ip", ip)
    	 def ipvalue = convertHexToIP(getDataValue("ip"))
         sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}")
@@ -291,4 +291,4 @@ User-Agent: CyberGarage-HTTP/1.0
 </u:GetBinaryState>
 </s:Body>
 </s:Envelope>""", physicalgraph.device.Protocol.LAN)
-}
+}
--- a/Show More
+++ b/Show More