MSA-632: Device Type for Climax power outlet. Supports switch and power meter functions.

* Product Page: http://www.climax.com.tw/psm29zb-zb.php * Developer manual https://fccid.io/document.php?id=2553357
2026-03-09 13:21:53 +00:00 · 2015-10-20 08:04:23 -05:00
68 changed files with 1254 additions and 2238 deletions
--- a/devicetypes/bortuzar/climax-power-outlet.src/climax-power-outlet.groovy
+++ b/devicetypes/bortuzar/climax-power-outlet.src/climax-power-outlet.groovy
@@ -0,0 +1,195 @@
+/**
+ *  Climax PSM-29ZBSR - Zigbee - Power Outlet Switch and Energy Meter
+ *
+ *  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.
+ *
+ *  Thanks to SmartThings and its community!
+ * 
+ *  Product Page: http://www.climax.com.tw/psm29zb-zb.php
+ *  Developer manual https://fccid.io/document.php?id=2553357
+ *
+ */
+metadata {
+	definition (name: "Climax Power Outlet", namespace: "bortuzar", author: "bortuzar") {
+	
+    	capability "Actuator"
+        capability "Configuration"
+        capability "Refresh"
+		capability "Sensor"
+        capability "Switch"
+        capability "Power Meter"
+
+		fingerprint endpointId: "0x0A", profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0702", outClusters: "0000"
+	}
+    
+
+	// simulator metadata
+	simulator {
+		// status messages
+		status "on": "on/off: 1"
+		status "off": "on/off: 0"
+
+		// reply messages
+		reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off off": "on/off: 0"
+	}
+
+	// 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:"#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:"#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") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+		valueTile("power", "device.power", inactiveLabel: false, decoration: "flat") {
+			state "power", label: '${currentValue} W'
+		}
+        
+        //standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
+		//	state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		//}
+
+		
+		main(["switch", "power"])
+		details(["switch", "power", "refresh"])
+	}
+}
+
+
+// Parse incoming device messages to generate events
+def parse(String description) {
+
+	log.debug "Parse Method Called"
+	log.trace description
+    
+	if (description?.startsWith("catchall:")) {
+		def msg = zigbee.parse(description)
+		log.trace "data: $msg.data"
+
+	} else if (description?.startsWith("read attr -")) {
+		def descMap = parseDescriptionAsMap(description)
+        log.debug "Desc Map:"
+        log.debug descMap
+		
+        if (descMap.cluster == "0006" && descMap.attrId == "0000") {
+                name = "switch"
+                value = descMap.value.endsWith("01") ? "on" : "off"
+                def result = createEvent(name: name, value: value)
+                log.debug "Parse returned ${result?.descriptionText}"
+                return result
+        } else if(descMap.cluster =="0702" && descMap.attrId == "0400") {
+            
+            def value = convertHexToInt(descMap.value[-4..-1])/10 
+            // Reading the last 4 characters of the string...Maybe 4 are needed. Needs further test.
+            // Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+            log.debug value
+            def name = "power"
+            def result = createEvent(name: name, value: value)
+            log.debug "Parse returned ${result?.descriptionText}"
+            return result 
+        }
+    } else {
+		def name = description?.startsWith("on/off: ") ? "switch" : null
+		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
+		def result = createEvent(name: name, value: value)
+		log.debug "Parse returned ${result?.descriptionText}"
+		return result
+	}
+}
+
+def on() {
+	log.debug "On Method called"
+	sendEvent(name: "switch", value: "on")
+	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
+}
+
+def off() {
+	log.debug "Off Method called"
+	sendEvent(name: "switch", value: "off")
+	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
+}
+
+def refresh() {
+  	log.debug "Refresh Method called";	
+    //read attribute 1024Decimal, translates to 400Hex.
+    [
+		"st rattr 0x${device.deviceNetworkId} 1 6 0", "delay 500",    
+        "st rattr 0x${device.deviceNetworkId} 1 0x0702 1024", , "delay 500" 
+	]
+}
+
+
+def configure() {
+
+	log.debug "Configure Method called"
+
+	String zigbeeId = swapEndianHex(device.hub.zigbeeId)
+	
+	def configCmds = [	
+  
+        //Switch Reporting
+        "zcl global send-me-a-report 6 0 0x10 0 3600 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 1000",
+        
+        //bing to cluster 0x006. Switch On-Off
+        "zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 1000",
+        
+        //bind to cluster 0x702. Power Consumption
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0702 {${device.zigbeeId}} {}", "delay 500",
+        
+	]
+    return configCmds + refresh() // send refresh cmds as part of config
+}
+
+
+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
+private hex(value, width=2) {
+	def s = new BigInteger(Math.round(value).toString()).toString(16)
+	while (s.size() < width) {
+		s = "0" + s
+	}
+	s
+}
+
+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,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/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy
+++ b/devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy
@@ -1,9 +1,12 @@
-// keen home smart vent
-// http://www.keenhome.io
-// SmartThings Device Handler v1.0.0
+/**
+ *  Keen Home Smart Vent
+ *
+ *  Author: Keen Home
+ *  Date: 2015-06-23
+ */

 metadata {
-    definition (name: "Keen Home Smart Vent", namespace: "Keen Home", author: "Keen Home") {
+    definition (name: "Keen Home Smart Vent", namespace: "Keen Home", author: "Gregg Altschul") {
        capability "Switch Level"
        capability "Switch"
        capability "Configuration"
@@ -18,7 +21,6 @@ metadata {
        command "getBattery"
        command "getTemperature"
        command "setZigBeeIdTile"
-        command "clearObstruction"

        fingerprint endpoint: "1",
        profileId: "0104",
@@ -40,10 +42,9 @@ metadata {
    // UI tile definitions
    tiles {
        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            state "on", action: "switch.off", icon: "st.vents.vent-open-text", backgroundColor: "#53a7c0"
-            state "off", action: "switch.on", icon: "st.vents.vent-closed", backgroundColor: "#ffffff"
-            state "obstructed", action: "clearObstruction", icon: "st.vents.vent-closed", backgroundColor: "#ff0000"
-            state "clearing", action: "", icon: "st.vents.vent-closed", backgroundColor: "#ffff33"
+            state "on", action:"switch.off", icon:"st.vents.vent-open-text", backgroundColor:"#53a7c0"
+            state "off", action:"switch.on", icon:"st.vents.vent-closed", backgroundColor:"#ffffff"
+            state "obstructed", action: "switch.off", icon:"st.vents.vent-closed", backgroundColor:"#ff0000"
        }
        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false) {
            state "level", action:"switch level.setLevel"
@@ -205,12 +206,12 @@ private Map makeOnOffResult(rawValue) {

 private Map makeLevelResult(rawValue) {
    def linkText = getLinkText(device)
+    // log.debug "rawValue: ${rawValue}"
    def value = Integer.parseInt(rawValue, 16)
    def rangeMax = 254

-    // catch obstruction level
    if (value == 255) {
-        log.debug "${linkText} is obstructed"
+        log.debug "obstructed"
        // Just return here. Once the vent is power cycled
        // it will go back to the previous level before obstruction.
        // Therefore, no need to update level on the display.
@@ -219,9 +220,24 @@ private Map makeLevelResult(rawValue) {
            value: "obstructed",
            descriptionText: "${linkText} is obstructed. Please power cycle."
        ]
+    } else if ( device.currentValue("switch") == "obstructed" &&
+                value == 254)  {
+        // When the device is reset after an obstruction, the switch
+        // state will be obstructed and the value coming from the device
+        // will be 254. Since we're not using heating/cooling mode from
+        // the device type handler, we need to bump it down to the lower
+        // (cooling) range
+        sendEvent(makeOnOffResult(1)) // clear the obstructed switch state
+        value = rangeMax
    }
+    // else if (device.currentValue("switch") == "off") {
+    //     sendEvent(makeOnOffResult(1)) // turn back on if in off state
+    // }

+
+    // log.debug "pre-value: ${value}"
    value = Math.floor(value / rangeMax * 100)
+    // log.debug "post-value: ${value}"

    return [
        name: "level",
@@ -311,79 +327,35 @@ private def makeSerialResult(serial) {
        value: serial,
        descriptionText: "${linkText} has serial ${serial}" ]
 }
-
-// takes a level from 0 to 100 and translates it to a ZigBee move to level with on/off command
-private def makeLevelCommand(level) {
-    def rangeMax = 254
-    def scaledLevel = Math.round(level * rangeMax / 100)
-    log.debug "scaled level for ${level}%: ${scaledLevel}"
-
-    // convert to hex string and pad to two digits
-    def hexLevel = new BigInteger(scaledLevel.toString()).toString(16).padLeft(2, '0')
-
-    "st cmd 0x${device.deviceNetworkId} 1 8 4 {${hexLevel} 0000}"
-}
-
 /**** COMMAND METHODS ****/
+// def mfgCode() {
+// 	 ["zcl mfg-code 0x115B", "delay 200"]
+// }
+
 def on() {
-    def linkText = getLinkText(device)
-    log.debug "open ${linkText}"
-
-    // only change the state if the vent is not obstructed
-    if (device.currentValue("switch") == "obstructed") {
-        log.error("cannot open because ${linkText} is obstructed")
-        return
-    }
-
+    log.debug "on()"
    sendEvent(makeOnOffResult(1))
    "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
 }

 def off() {
-    def linkText = getLinkText(device)
-    log.debug "close ${linkText}"
-
-    // only change the state if the vent is not obstructed
-    if (device.currentValue("switch") == "obstructed") {
-        log.error("cannot close because ${linkText} is obstructed")
-        return
-    }
-
+    log.debug "off()"
    sendEvent(makeOnOffResult(0))
    "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
 }

-def clearObstruction() {
-    def linkText = getLinkText(device)
-    log.debug "attempting to clear ${linkText} obstruction"
+// does this work?
+def toggle() {
+    log.debug "toggle()"

-    sendEvent([
-        name: "switch",
-        value: "clearing",
-        descriptionText: "${linkText} is clearing obstruction"
-    ])
-
-    // send a move command to ensure level attribute gets reset for old, buggy firmware
-    // then send a reset to factory defaults
-    // finally re-configure to ensure reports and binding is still properly set after the rtfd
-    [
-        makeLevelCommand(device.currentValue("level")), "delay 500",
-        "st cmd 0x${device.deviceNetworkId} 1 0 0 {}", "delay 5000"
-    ] + configure()
+    "st cmd 0x${device.deviceNetworkId} 1 6 2 {}"
 }

 def setLevel(value) {
    log.debug "setting level: ${value}"
+
    def linkText = getLinkText(device)

-    // only change the level if the vent is not obstructed
-    def currentState = device.currentValue("switch")
-
-    if (currentState == "obstructed") {
-        log.error("cannot set level because ${linkText} is obstructed")
-        return
-    }
-
    sendEvent(name: "level", value: value)
    if (value > 0) {
        sendEvent(name: "switch", value: "on", descriptionText: "${linkText} is on by setting a level")
@@ -391,26 +363,29 @@ def setLevel(value) {
    else {
        sendEvent(name: "switch", value: "off", descriptionText: "${linkText} is off by setting level to 0")
    }
+    def rangeMax = 254
+    def computedLevel = Math.round(value * rangeMax / 100)
+    log.debug "computedLevel: ${computedLevel}"

-    makeLevelCommand(value)
+    def level = new BigInteger(computedLevel.toString()).toString(16)
+    log.debug "level: ${level}"
+
+    if (level.size() < 2){
+        level = '0' + level
+    }
+
+    "st cmd 0x${device.deviceNetworkId} 1 8 4 {${level} 0000}"
 }

+
 def getOnOff() {
    log.debug "getOnOff()"

-    // disallow on/off updates while vent is obstructed
-    if (device.currentValue("switch") == "obstructed") {
-        log.error("cannot update open/close status because ${getLinkText(device)} is obstructed")
-        return []
-    }
-
    ["st rattr 0x${device.deviceNetworkId} 1 0x0006 0"]
 }

 def getPressure() {
    log.debug "getPressure()"
-
-    // using a Keen Home specific attribute in the pressure measurement cluster
    [
        "zcl mfg-code 0x115B", "delay 200",
        "zcl global read 0x0403 0x20", "delay 200",
@@ -420,13 +395,12 @@ def getPressure() {

 def getLevel() {
    log.debug "getLevel()"
-
-    // disallow level updates while vent is obstructed
-    if (device.currentValue("switch") == "obstructed") {
-        log.error("cannot update level status because ${getLinkText(device)} is obstructed")
-        return []
-    }
-
+    // rattr = read attribute
+    // 0x${} = device net id
+    // 1 = endpoint
+    // 8 = cluster id (level control, in this case)
+    // 0 = attribute within cluster
+    // sendEvent(name: "level", value: value)
    ["st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"]
 }

@@ -451,59 +425,78 @@ def setZigBeeIdTile() {
        name: "zigbeeId",
        value: device.zigbeeId,
        descriptionText: "${linkText} has zigbeeId ${device.zigbeeId}" ])
-    return [
+	return [
        name: "zigbeeId",
        value: device.zigbeeId,
        descriptionText: "${linkText} has zigbeeId ${device.zigbeeId}" ]
 }

 def refresh() {
-    getOnOff() +
+	getOnOff() +
    getLevel() +
    getTemperature() +
    getPressure() +
    getBattery()
 }

+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
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
 def configure() {
    log.debug "CONFIGURE"
+    log.debug "zigbeeId: ${device.hub.zigbeeId}"

-    // get ZigBee ID by hidden tile because that's the only way we can do it
    setZigBeeIdTile()

    def configCmds = [
-        // bind reporting clusters to hub
+        // binding commands
        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0006 {${device.zigbeeId}} {}", "delay 500",
        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0008 {${device.zigbeeId}} {}", "delay 500",
        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0402 {${device.zigbeeId}} {}", "delay 500",
        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0403 {${device.zigbeeId}} {}", "delay 500",
-        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0001 {${device.zigbeeId}} {}", "delay 500"
-
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0001 {${device.zigbeeId}} {}", "delay 500",
+        
        // configure report commands
-        // zcl global send-me-a-report [cluster] [attr] [type] [min-interval] [max-interval] [min-change]
+        // [cluster] [attr] [type] [min-interval] [max-interval] [min-change]

-        // report with these parameters is preconfigured in firmware, can be overridden here
+        // mike 2015/06/22: preconfigured; see tech spec
        // vent on/off state - type: boolean, change: 1
        // "zcl global send-me-a-report 6 0 0x10 5 60 {01}", "delay 200",
        // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",

-        // report with these parameters is preconfigured in firmware, can be overridden here
+        // mike 2015/06/22: preconfigured; see tech spec
        // vent level - type: int8u, change: 1
        // "zcl global send-me-a-report 8 0 0x20 5 60 {01}", "delay 200",
        // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",

-        // report with these parameters is preconfigured in firmware, can be overridden here
+        // mike 2015/06/22: temp and pressure reports are preconfigured, but
+        //   we'd like to override their settings for our own purposes
        // temperature - type: int16s, change: 0xA = 10 = 0.1C
-        // "zcl global send-me-a-report 0x0402 0 0x29 60 60 {0A00}", "delay 200",
-        // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
+        "zcl global send-me-a-report 0x0402 0 0x29 10 60 {0A00}", "delay 200",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 1500",

-        // report with these parameters is preconfigured in firmware, can be overridden here
-        // keen home custom pressure (tenths of Pascals) - type: int32u, change: 1 = 0.1Pa
-        // "zcl mfg-code 0x115B", "delay 200",
-        // "zcl global send-me-a-report 0x0403 0x20 0x22 60 60 {010000}", "delay 200",
-        // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
+        // mike 2015/06/22: use new custom pressure attribute
+        // pressure - type: int32u, change: 1 = 0.1Pa
+        "zcl mfg-code 0x115B", "delay 200",
+        "zcl global send-me-a-report 0x0403 0x20 0x22 10 60 {010000}", "delay 200",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 1500"

-        // report with these parameters is preconfigured in firmware, can be overridden here
+        // mike 2015/06/22: preconfigured; see tech spec
        // battery - type: int8u, change: 1
        // "zcl global send-me-a-report 1 0x21 0x20 60 3600 {01}", "delay 200",
        // "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
--- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
@@ -24,8 +24,6 @@ metadata {
 		capability "Battery"

 		attribute "tamper", "enum", ["detected", "clear"]
-		attribute "batteryStatus", "string"
-		attribute "powerSupply", "enum", ["USB Cable", "Battery"]

 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
 	}
@@ -65,19 +63,6 @@ metadata {
 		status "wake up" : "command: 8407, payload: "
 	}

-	preferences {
-		input description: "Please consult AEOTEC MULTISENSOR 6 operating manual for advanced setting options. You can skip this configuration to use default settings",
-				title: "Advanced Configuration", displayDuringSetup: true, type: "paragraph", element: "paragraph"
-
-		input "motionDelayTime", "enum", title: "Motion Sensor Delay Time",
-				options: ["20 seconds", "40 seconds", "1 minute", "2 minutes", "3 minutes", "4 minutes"], defaultValue: "${motionDelayTime}", displayDuringSetup: true
-
-		input "motionSensitivity", "enum", title: "Motion Sensor Sensitivity", options: ["normal","maximum","minimum"], defaultValue: "${motionSensitivity}", displayDuringSetup: true
-
-		input "reportInterval", "enum", title: "Sensors Report Interval",
-				options: ["8 minutes", "15 minutes", "30 minutes", "1 hour", "6 hours", "12 hours", "18 hours", "24 hours"], defaultValue: "${reportInterval}", displayDuringSetup: true
-	}
-
 	tiles(scale: 2) {
 		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
@@ -100,78 +85,53 @@ metadata {
 		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
 			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
-
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "illuminance", label:'${currentValue} ${unit}', unit:"lux"
+			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
 		}
-
-		valueTile("ultravioletIndex", "device.ultravioletIndex", inactiveLabel: false, width: 2, height: 2) {
-			state "ultravioletIndex", label:'${currentValue} UV index', unit:""
-		}
-
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}

-		valueTile("batteryStatus", "device.batteryStatus", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "batteryStatus", label:'${currentValue}', unit:""
-		}
-
-		valueTile("powerSupply", "device.powerSupply", height: 2, width: 2, decoration: "flat") {
-			state "powerSupply", label:'${currentValue} powered', backgroundColor:"#ffffff"
-		}
-
-		main(["motion", "temperature", "humidity", "illuminance", "ultravioletIndex"])
-		details(["motion", "temperature", "humidity", "illuminance", "ultravioletIndex", "batteryStatus"])
+		main(["motion", "temperature", "humidity", "illuminance"])
+		details(["motion", "temperature", "humidity", "illuminance", "battery"])
 	}
 }

-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"
-
-	if (device.latestValue("powerSupply") == "USB Cable") {  //case1: USB powered
+def updated()
+{
+	if (state.sec && !isConfigured()) {
+		// in case we miss the SCSR
 		response(configure())
-	} else if (device.latestValue("powerSupply") == "Battery") {  //case2: battery powered
-		// setConfigured("false") is used by WakeUpNotification
-		setConfigured("false") //wait until the next time device wakeup to send configure command after user change preference
-	} else { //case3: power source is not identified, ask user to properly pair the sensor again
-		log.warn "power source is not identified, check it sensor is powered by USB, if so > configure()"
-		def request = []
-		request << zwave.configurationV1.configurationGet(parameterNumber: 101)
-		response(commands(request))
 	}
 }

-def parse(String description) {
-	log.debug "parse() >> description: $description"
+def parse(String description)
+{
 	def result = null
 	if (description.startsWith("Err 106")) {
-		log.debug "parse() >> Err 106"
+		state.sec = 0
 		result = createEvent( name: "secureInclusion", value: "failed", isStateChange: true,
-				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
+			descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
 	} else if (description != "updated") {
-		log.debug "parse() >> zwave.parse(description)"
 		def cmd = zwave.parse(description, [0x31: 5, 0x30: 2, 0x84: 1])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 		}
 	}
-	log.debug "After zwaveEvent(cmd) >> Parsed '${description}' to ${result.inspect()}"
+	log.debug "Parsed '${description}' to ${result.inspect()}"
 	return result
 }

-//this notification will be sent only when device is battery powered
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
+{
 	def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)]
-	def cmds = []
+
 	if (!isConfigured()) {
+		// we're still in the process of configuring a newly joined device
 		log.debug("late configure")
-		result << response(configure())
+		result += response(configure())
 	} else {
-		log.debug("Device has been configured sending >> wakeUpNoMoreInformation()")
-		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
-		result << response(cmds)
+		result += response(zwave.wakeUpV1.wakeUpNoMoreInformation())
 	}
 	result
 }
@@ -189,29 +149,10 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulat
 }

 def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
-	log.info "Executing zwaveEvent 98 (SecurityV1): 03 (SecurityCommandsSupportedReport) with cmd: $cmd"
-	state.sec = 1
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.NetworkKeyVerify cmd) {
-	state.sec = 1
-	log.info "Executing zwaveEvent 98 (SecurityV1): 07 (NetworkKeyVerify) with cmd: $cmd (node is securely included)"
-	def result = [createEvent(name:"secureInclusion", value:"success", descriptionText:"Secure inclusion was successful", isStateChange: true)]
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	log.info "Executing zwaveEvent 72 (ManufacturerSpecificV2) : 05 (ManufacturerSpecificReport) with cmd: $cmd"
-	log.debug "manufacturerId:   ${cmd.manufacturerId}"
-	log.debug "manufacturerName: ${cmd.manufacturerName}"
-	log.debug "productId:        ${cmd.productId}"
-	log.debug "productTypeId:    ${cmd.productTypeId}"
-	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
-	updateDataValue("MSR", msr)
+	response(configure())
 }

 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def result = []
 	def map = [ name: "battery", unit: "%" ]
 	if (cmd.batteryLevel == 0xFF) {
 		map.value = 1
@@ -221,14 +162,11 @@ def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 		map.value = cmd.batteryLevel
 	}
 	state.lastbatt = now()
-	result << createEvent(map)
-	if (device.latestValue("powerSupply") != "USB Cable"){
-		result << createEvent(name: "batteryStatus", value: "${map.value} % battery", displayed: false)
-	}
-	result
+	createEvent(map)
 }

-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd){
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd)
+{
 	def map = [:]
 	switch (cmd.sensorType) {
 		case 1:
@@ -270,6 +208,7 @@ def motionEvent(value) {
 }

 def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv2.SensorBinaryReport cmd) {
+	setConfigured()
 	motionEvent(cmd.sensorValue)
 }

@@ -286,112 +225,47 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
 				result << createEvent(name: "tamper", value: "clear", displayed: false)
 				break
 			case 3:
-				result << createEvent(name: "tamper", value: "detected", descriptionText: "$device.displayName was tampered")
+				result << createEvent(name: "tamper", value: "detected", descriptionText: "$device.displayName was moved")
 				break
 			case 7:
 				result << motionEvent(1)
 				break
 		}
 	} else {
-		log.warn "Need to handle this cmd.notificationType: ${cmd.notificationType}"
 		result << createEvent(descriptionText: cmd.toString(), isStateChange: false)
 	}
 	result
 }

-def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
-	log.debug "ConfigurationReport: $cmd"
-	def result = []
-	def value
-	if (cmd.parameterNumber == 9 && cmd.configurationValue[0] == 0) {
-		value = "USB Cable"
-		if (!isConfigured()) {
-			log.debug("ConfigurationReport: configuring device")
-			result << response(configure())
-		}
-		result << createEvent(name: "batteryStatus", value: value, displayed: false)
-		result << createEvent(name: "powerSupply", value: value, displayed: false)
-	}else if (cmd.parameterNumber == 9 && cmd.configurationValue[0] == 1) {
-		value = "Battery"
-		result << createEvent(name: "powerSupply", value: value, displayed: false)
-	} else if (cmd.parameterNumber == 101){
-		result << response(configure())
-	}
-	result
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "General zwaveEvent cmd: ${cmd}"
 	createEvent(descriptionText: cmd.toString(), isStateChange: false)
 }

 def configure() {
 	// This sensor joins as a secure device if you double-click the button to include it
-	log.debug "${device.displayName} is configuring its settings"
-	def request = []
+	if (device.device.rawDescription =~ /98/ && !state.sec) {
+		log.debug "Multi 6 not sending configure until secure"
+		return []
+	}
+	log.debug "Multi 6 configure()"
+	def request = [
+		// send no-motion report 20 seconds after motion stops
+		zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: 20),

-	//1. set association groups for hub
-	request << zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId)
+		// report every 8 minutes (threshold reports don't work on battery power)
+		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 8*60),

-	request << zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId)
-
-	//2. automatic report flags
-	// param 101 -103 [4 bytes] 128: light sensor, 64 humidity, 32 temperature sensor, 2 ultraviolet sensor, 1 battery sensor -> send command 227 to get all reports
-	request << zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 226) //association group 1
-
-	request << zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 1) //association group 2
-
-	//3. no-motion report x seconds after motion stops (default 20 secs)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: timeOptionValueMap[motionDelayTime] ?: 20)
-
-	//4. motionSensitivity 3 levels: 64-normal (default), 127-maximum, 0-minimum
-	request << zwave.configurationV1.configurationSet(parameterNumber: 6, size: 1,
-			scaledConfigurationValue:
-					motionSensitivity == "normal" ? 64 :
-							motionSensitivity == "maximum" ? 127 :
-									motionSensitivity == "minimum" ? 0 : 64)
-
-	//5. report every x minutes (threshold reports don't work on battery power, default 8 mins)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1
-
-	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60)  //association group 2
-
-	//6. report automatically on threshold change
-	request << zwave.configurationV1.configurationSet(parameterNumber: 40, size: 1, scaledConfigurationValue: 1)
-
-	//7. query sensor data
-	request << zwave.batteryV1.batteryGet()
-	request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: 0x0C) //motion
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x01) //temperature
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x03) //illuminance
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x05) //humidity
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x1B) //ultravioletIndex
-
-	setConfigured("true")
+		// report automatically on threshold change
+		zwave.configurationV1.configurationSet(parameterNumber: 40, size: 1, scaledConfigurationValue: 1),

+		zwave.batteryV1.batteryGet(),
+		zwave.sensorBinaryV2.sensorBinaryGet(sensorType: 0x0C),
+    ]
 	commands(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
 }

-private def getTimeOptionValueMap() { [
-		"20 seconds" : 20,
-		"40 seconds" : 40,
-		"1 minute"   : 60,
-		"2 minutes"  : 2*60,
-		"3 minutes"  : 3*60,
-		"4 minutes"  : 4*60,
-		"5 minutes"  : 5*60,
-		"8 minutes"  : 8*60,
-		"15 minutes" : 15*60,
-		"30 minutes" : 30*60,
-		"1 hours"    : 1*60*60,
-		"6 hours"    : 6*60*60,
-		"12 hours"   : 12*60*60,
-		"18 hours"   : 6*60*60,
-		"24 hours"   : 24*60*60,
-]}
-
-private setConfigured(configure) {
-	updateDataValue("configured", configure)
+private setConfigured() {
+	updateDataValue("configured", "true")
 }

 private isConfigured() {
@@ -407,6 +281,5 @@ private command(physicalgraph.zwave.Command cmd) {
 }

 private commands(commands, delay=200) {
-	log.info "sending commands: ${commands}"
 	delayBetween(commands.collect{ command(it) }, delay)
 }
--- a/devicetypes/smartthings/aeon-rgbw-bulb.src/aeon-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/aeon-rgbw-bulb.src/aeon-rgbw-bulb.groovy
--- a/devicetypes/smartthings/centralite-dimmer.src/centralite-dimmer.groovy
+++ b/devicetypes/smartthings/centralite-dimmer.src/centralite-dimmer.groovy
@@ -15,7 +15,6 @@
 *	Author: SmartThings
 *	Date: 2013-12-04
 */
-//DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
 metadata {
 	definition (name: "CentraLite Dimmer", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
@@ -26,6 +25,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"

+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019"
 	}

 	// simulator metadata
--- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
+++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -38,63 +38,168 @@ metadata {
 	}

 	// 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:'${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:"#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") {
-                attributeState "level", action:"switch level.setLevel"
-            }
-        }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-        main "switch"
-        details(["switch", "refresh"])
-    }
+	tiles {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "off", label: '${name}', action: "switch.on", icon: "st.switches.light.off", backgroundColor: "#ffffff"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.light.on", backgroundColor: "#79b821"
+		}
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) {
+			state "level", action:"switch level.setLevel"
+		}
+		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
+			state "level", label: 'Level ${currentValue}%'
+		}
+		
+
+		main(["switch"])
+		details(["switch", "level", "levelSliderControl", "refresh"])
+	}
 }

 // Parse incoming device messages to generate events
+
 def parse(String description) {
-    log.debug "description is $description"
-
-    def resultMap = zigbee.getKnownDescription(description)
-    if (resultMap) {
-        log.info resultMap
-        if (resultMap.type == "update") {
-            log.info "$device updates: ${resultMap.value}"
+	log.trace description
+	if (description?.startsWith("catchall:")) {
+		def msg = zigbee.parse(description)
+		log.trace msg
+		log.trace "data: $msg.data"
+        
+        if(description?.endsWith("0100") ||description?.endsWith("1001"))
+        {
+        	def result = createEvent(name: "switch", value: "on")
+            log.debug "Parse returned ${result?.descriptionText}"
+            return result
        }
-        else {
-            sendEvent(name: resultMap.type, value: resultMap.value)
+        
+        if(description?.endsWith("0000") || description?.endsWith("1000"))
+        {
+        	def result = createEvent(name: "switch", value: "off")
+            log.debug "Parse returned ${result?.descriptionText}"
+            return result
        }
+	}
+    
+    
+   if (description?.startsWith("read attr")) {
+   		
+        log.debug description[-2..-1]
+        def i = Math.round(convertHexToInt(description[-2..-1]) / 256 * 100 )
+        
+		sendEvent( name: "level", value: i )
    }
-    else {
-        log.warn "DID NOT PARSE MESSAGE for description : $description"
-        log.debug zigbee.parseDescriptionAsMap(description)
-    }
-}
-
-def off() {
-    zigbee.off()
+    
+	
 }

 def on() {
-    zigbee.on()
-}
+	log.debug "on()"
+	sendEvent(name: "switch", value: "on")
+    
+    "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 1 {}"
+    }

-def setLevel(value) {
-    zigbee.setLevel(value)
+def off() {
+	log.debug "off()"
+	sendEvent(name: "switch", value: "off")
+    
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
+ 
 }

 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
+    // Schedule poll every 1 min
+    //schedule("0 */1 * * * ?", poll)
+    //poll()
+    
+    [
+	"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
+    "st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0"
+    ]
+}
+
+def setLevel(value) {
+	log.trace "setLevel($value)"
+	def cmds = []
+
+	if (value == 0) {
+		sendEvent(name: "switch", value: "off")
+		cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {0000 0000}"
+	}
+	else if (device.latestValue("switch") == "off") {
+		sendEvent(name: "switch", value: "on")
+	}
+
+	sendEvent(name: "level", value: value)
+    def level = hex(value * 255/100)
+	cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {${level} 0000}"
+
+	//log.debug cmds
+	cmds
 }

 def configure() {
-    log.debug "Configuring Reporting and Bindings."
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
+
+	log.debug "Configuring Reporting and Bindings."
+	def configCmds = [	
+  
+        //Switch Reporting
+        "zcl global send-me-a-report 6 0 0x10 0 3600 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1000",
+        
+        //Level Control Reporting
+        "zcl global send-me-a-report 8 0 0x20 5 3600 {0010}", "delay 200",
+        "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1500",
+        
+        "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 6 {${device.zigbeeId}} {}", "delay 1000",
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 8 {${device.zigbeeId}} {}", "delay 500",
+	]
+    return configCmds + refresh() // send refresh cmds as part of config
+}
+
+def uninstalled() {
+
+	log.debug "uninstalled()"
+		
+	response("zcl rftd")
+ 
+}
+
+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 Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,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/ge-link-bulb.src/ge-link-bulb.groovy
+++ b/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy
@@ -50,7 +50,7 @@ metadata {
 		capability "Switch Level"
        capability "Polling"

-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0019", manufacturer: "GE_Appliances", model: "ZLL Light", deviceJoinName: "GE Link Bulb"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0019"
 	}

 	// UI tile definitions
--- a/devicetypes/smartthings/ge-zigbee-dimmer.src/ge-zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/ge-zigbee-dimmer.src/ge-zigbee-dimmer.groovy
@@ -26,6 +26,8 @@ metadata {
 		capability "Actuator"
 		capability "Sensor"

+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45852"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45857"
 	}

 	// simulator metadata
--- a/devicetypes/smartthings/ge-zigbee-switch.src/ge-zigbee-switch.groovy
+++ b/devicetypes/smartthings/ge-zigbee-switch.src/ge-zigbee-switch.groovy
@@ -26,6 +26,8 @@ metadata {
 		capability "Actuator"
 		capability "Sensor"

+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B05,0702", outClusters: "0003, 000A,0019", manufacturer: "Jasco Products", model: "45853"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45856"
 	}

 	// simulator metadata
--- a/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy
+++ b/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy
@@ -1,81 +0,0 @@
-/**
- *  Logitech Harmony Activity
- *
- *  Copyright 2015 Juan Risso
- *
- *  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.
- *
- */
-metadata {
-        definition (name: "Harmony Activity", namespace: "smartthings", author: "Juan Risso") {
-        capability "Switch"
-        capability "Actuator"
-		capability "Refresh"
-
-        command "huboff"
-        command "alloff"
-        command "refresh"
-	}
-
-	// simulator metadata
-	simulator {
-	}
-
-	// UI tile definitions
-	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: "#79b821", nextState: "off"
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-		standardTile("forceoff", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'Force End', action:"switch.off", icon:"st.secondary.off"
-		}
-		standardTile("huboff", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'End Hub Action', action:"huboff", icon:"st.harmony.harmony-hub-icon"
-		}
-		standardTile("alloff", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'All Actions', action:"alloff", icon:"st.secondary.off"
-		}
-		main "button"
-		details(["button", "refresh", "forceoff", "huboff", "alloff"])
-	}
-}
-
-def parse(String description) {
-}
-
-def on() {
-	sendEvent(name: "switch", value: "on")
-    log.trace parent.activity(device.deviceNetworkId,"start")
-}
-
-def off() {
-	sendEvent(name: "switch", value: "off")
-    log.trace parent.activity(device.deviceNetworkId,"end")
-}
-
-def huboff() {
-	sendEvent(name: "switch", value: "off")
-    log.trace parent.activity(device.deviceNetworkId,"hub")
-}
-
-def alloff() {
-	sendEvent(name: "switch", value: "off")
-    log.trace parent.activity("all","end")
-}
-
-
-def refresh() {
-	log.debug "Executing 'refresh'"
-	log.trace parent.poll()
-}
--- a/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy
+++ b/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy
@@ -17,50 +17,44 @@ metadata {
 	}

 	simulator {
-
+		// TODO: define status and reply messages here
 	}

-	tiles(scale: 2) {
-		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "unreachable", label: "?", action:"refresh.refresh", icon:"http://hosted.lifx.co/smartthings/v1/196xUnreachable.png", backgroundColor:"#666666"
-				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:"#79b821", nextState:"turningOff"
-				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
-
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel"
-			}
-
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"setColor"
-			}
-
-			tileAttribute ("device.model", key: "SECONDARY_CONTROL") {
-				attributeState "model", label: '${currentValue}'
-			}
+	tiles {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "unreachable", label: "?", action:"refresh.refresh", icon:"st.switches.light.off", backgroundColor:"#666666"
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "turningOn", label:'Turning on', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOff", label:'Turning off', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
-
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-
 		valueTile("null", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:''
 		}

-		controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 2, width: 4, inactiveLabel: false, range:"(2700..9000)") {
-			state "colorTemp", action:"color temperature.setColorTemperature"
+		controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {
+			state "color", action:"setColor"
 		}

-		valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", height: 2, width: 2) {
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false, range:"(0..100)") {
+			state "level", action:"switch level.setLevel"
+		}
+		valueTile("level", "device.level", inactiveLabel: false, icon: "st.illuminance.illuminance.light", decoration: "flat") {
+			state "level", label: '${currentValue}%'
+		}
+
+		controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 1, width: 2, inactiveLabel: false, range:"(2700..9000)") {
+			state "colorTemp", action:"color temperature.setColorTemperature"
+		}
+		valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat") {
 			state "colorTemp", label: '${currentValue}K'
 		}

-		main "switch"
-		details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
+		main(["switch"])
+		details(["switch", "refresh", "level", "levelSliderControl", "rgbSelector", "colorTempSliderControl", "colorTemp"])
 	}
 }

@@ -76,7 +70,7 @@ def parse(String description) {
 def setHue(percentage) {
 	log.debug "setHue ${percentage}"
 	parent.logErrors(logObject: log) {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [color: "hue:${percentage * 3.6}", power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", [color: "hue:${percentage * 3.6}"])
 		if (resp.status < 300) {
 			sendEvent(name: "hue", value: percentage)
 			sendEvent(name: "switch", value: "on")
@@ -89,7 +83,7 @@ def setHue(percentage) {
 def setSaturation(percentage) {
 	log.debug "setSaturation ${percentage}"
 	parent.logErrors(logObject: log) {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [color: "saturation:${percentage / 100}", power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", [color: "saturation:${percentage / 100}"])
 		if (resp.status < 300) {
 			sendEvent(name: "saturation", value: percentage)
 			sendEvent(name: "switch", value: "on")
@@ -120,7 +114,7 @@ def setColor(Map color) {
 		}
 	}
 	parent.logErrors(logObject:log) {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [color: attrs.join(" "), power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", [color: attrs.join(" ")])
 		if (resp.status < 300) {
 			sendEvent(name: "color", value: color.hex)
 			sendEvent(name: "switch", value: "on")
@@ -141,10 +135,9 @@ def setLevel(percentage) {
 		return off() // if the brightness is set to 0, just turn it off
 	}
 	parent.logErrors(logObject:log) {
-		def resp = parent.apiPUT("/lights/${selector()}/state", ["brightness": percentage / 100, "power": "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", ["color": "brightness:${percentage / 100}"])
 		if (resp.status < 300) {
 			sendEvent(name: "level", value: percentage)
-			sendEvent(name: "switch.setLevel", value: percentage)
 			sendEvent(name: "switch", value: "on")
 		} else {
 			log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
@@ -155,7 +148,7 @@ def setLevel(percentage) {
 def setColorTemperature(kelvin) {
 	log.debug "Executing 'setColorTemperature' to ${kelvin}"
 	parent.logErrors() {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [color: "kelvin:${kelvin}", power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", [color: "kelvin:${kelvin}"])
 		if (resp.status < 300) {
 			sendEvent(name: "colorTemperature", value: kelvin)
 			sendEvent(name: "color", value: "#ffffff")
@@ -170,7 +163,7 @@ def setColorTemperature(kelvin) {
 def on() {
 	log.debug "Device setOn"
 	parent.logErrors() {
-		if (parent.apiPUT("/lights/${selector()}/state", [power: "on"]) != null) {
+		if (parent.apiPUT("/lights/${device.deviceNetworkId}/power", [state: "on"]) != null) {
 			sendEvent(name: "switch", value: "on")
 		}
 	}
@@ -179,7 +172,7 @@ def on() {
 def off() {
 	log.debug "Device setOff"
 	parent.logErrors() {
-		if (parent.apiPUT("/lights/${selector()}/state", [power: "off"]) != null) {
+		if (parent.apiPUT("/lights/${device.deviceNetworkId}/power", [state: "off"]) != null) {
 			sendEvent(name: "switch", value: "off")
 		}
 	}
@@ -187,26 +180,19 @@ def off() {

 def poll() {
 	log.debug "Executing 'poll' for ${device} ${this} ${device.deviceNetworkId}"
-	def resp = parent.apiGET("/lights/${selector()}")
-	if (resp.status == 404) {
-		sendEvent(name: "switch", value: "unreachable")
-		return []
-	} else if (resp.status != 200) {
+	def resp = parent.apiGET("/lights/${device.deviceNetworkId}")
+	if (resp.status != 200) {
 		log.error("Unexpected result in poll(): [${resp.status}] ${resp.data}")
 		return []
 	}
-	def data = resp.data[0]
-	log.debug("Data: ${data}")
+	def data = resp.data

-	sendEvent(name: "label", value: data.label)
-	sendEvent(name: "level", value: Math.round((data.brightness ?: 1) * 100))
-	sendEvent(name: "switch.setLevel", value: Math.round((data.brightness ?: 1) * 100))
+	sendEvent(name: "level", value: sprintf("%.1f", (data.brightness ?: 1) * 100))
 	sendEvent(name: "switch", value: data.connected ? data.power : "unreachable")
 	sendEvent(name: "color", value: colorUtil.hslToHex((data.color.hue / 3.6) as int, (data.color.saturation * 100) as int))
-	sendEvent(name: "hue", value: data.color.hue / 3.6)
+	sendEvent(name: "hue",        value: data.color.hue / 3.6)
 	sendEvent(name: "saturation", value: data.color.saturation * 100)
 	sendEvent(name: "colorTemperature", value: data.color.kelvin)
-	sendEvent(name: "model", value: "${data.product.company} ${data.product.name}")

 	return []
 }
@@ -215,11 +201,3 @@ def refresh() {
 	log.debug "Executing 'refresh'"
 	poll()
 }
-
-def selector() {
-	if (device.deviceNetworkId.contains(":")) {
-		return device.deviceNetworkId
-	} else {
-		return "id:${device.deviceNetworkId}"
-	}
-}
--- a/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy
+++ b/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy
@@ -16,44 +16,41 @@ metadata {
 	}

 	simulator {
-
+		// TODO: define status and reply messages here
 	}

-	tiles(scale: 2) {
-		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "unreachable", label: "?", action:"refresh.refresh", icon:"http://hosted.lifx.co/smartthings/v1/196xUnreachable.png", backgroundColor:"#666666"
-				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:"#79b821", nextState:"turningOff"
-				attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn"
-
-			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel"
-			}
+	tiles {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "turningOn", label:'Turning on', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOff", label:'Turning off', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "unreachable", label: "?", action:"refresh.refresh", icon:"st.switches.light.off", backgroundColor:"#666666"
 		}
-
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-
 		valueTile("null", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:''
 		}

-		controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 2, width: 4, inactiveLabel: false, range:"(2700..9000)") {
-			state "colorTemp", action:"color temperature.setColorTemperature"
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false, range:"(0..100)") {
+			state "level", action:"switch level.setLevel"
+		}
+		valueTile("level", "device.level", inactiveLabel: false, icon: "st.illuminance.illuminance.light", decoration: "flat") {
+			state "level", label: '${currentValue}%'
 		}

-		valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", height: 2, width: 2) {
+		controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 1, width: 2, inactiveLabel: false, range:"(2700..6500)") {
+			state "colorTemp", action:"color temperature.setColorTemperature"
+		}
+		valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat") {
 			state "colorTemp", label: '${currentValue}K'
 		}

-		main "switch"
-		details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
+		main(["switch"])
+		details(["switch", "refresh", "level", "levelSliderControl", "colorTempSliderControl", "colorTemp"])
 	}
-
 }

 // parse events into attributes
@@ -75,10 +72,9 @@ def setLevel(percentage) {
 		return off() // if the brightness is set to 0, just turn it off
 	}
 	parent.logErrors(logObject:log) {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [brightness: percentage / 100, power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", ["color": "brightness:${percentage / 100}"])
 		if (resp.status < 300) {
 			sendEvent(name: "level", value: percentage)
-			sendEvent(name: "switch.setLevel", value: percentage)
 			sendEvent(name: "switch", value: "on")
 		} else {
 			log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
@@ -89,7 +85,7 @@ def setLevel(percentage) {
 def setColorTemperature(kelvin) {
 	log.debug "Executing 'setColorTemperature' to ${kelvin}"
 	parent.logErrors() {
-		def resp = parent.apiPUT("/lights/${selector()}/state", [color: "kelvin:${kelvin}", power: "on"])
+		def resp = parent.apiPUT("/lights/${device.deviceNetworkId}/color", [color: "kelvin:${kelvin}"])
 		if (resp.status < 300) {
 			sendEvent(name: "colorTemperature", value: kelvin)
 			sendEvent(name: "color", value: "#ffffff")
@@ -104,7 +100,7 @@ def setColorTemperature(kelvin) {
 def on() {
 	log.debug "Device setOn"
 	parent.logErrors() {
-		if (parent.apiPUT("/lights/${selector()}/state", [power: "on"]) != null) {
+		if (parent.apiPUT("/lights/${device.deviceNetworkId}/power", [state: "on"]) != null) {
 			sendEvent(name: "switch", value: "on")
 		}
 	}
@@ -113,7 +109,7 @@ def on() {
 def off() {
 	log.debug "Device setOff"
 	parent.logErrors() {
-		if (parent.apiPUT("/lights/${selector()}/state", [power: "off"]) != null) {
+		if (parent.apiPUT("/lights/${device.deviceNetworkId}/power", [state: "off"]) != null) {
 			sendEvent(name: "switch", value: "off")
 		}
 	}
@@ -121,22 +117,16 @@ def off() {

 def poll() {
 	log.debug "Executing 'poll' for ${device} ${this} ${device.deviceNetworkId}"
-	def resp = parent.apiGET("/lights/${selector()}")
-	if (resp.status == 404) {
-		sendEvent(name: "switch", value: "unreachable")
-		return []
-	} else if (resp.status != 200) {
+	def resp = parent.apiGET("/lights/${device.deviceNetworkId}")
+	if (resp.status != 200) {
 		log.error("Unexpected result in poll(): [${resp.status}] ${resp.data}")
 		return []
 	}
-	def data = resp.data[0]
+	def data = resp.data

-	sendEvent(name: "label", value: data.label)
-	sendEvent(name: "level", value: Math.round((data.brightness ?: 1) * 100))
-	sendEvent(name: "switch.setLevel", value: Math.round((data.brightness ?: 1) * 100))
+	sendEvent(name: "level", value: sprintf("%f", (data.brightness ?: 1) * 100))
 	sendEvent(name: "switch", value: data.connected ? data.power : "unreachable")
 	sendEvent(name: "colorTemperature", value: data.color.kelvin)
-	sendEvent(name: "model", value: data.product.name)

 	return []
 }
@@ -145,11 +135,3 @@ def refresh() {
 	log.debug "Executing 'refresh'"
 	poll()
 }
-
-def selector() {
-	if (device.deviceNetworkId.contains(":")) {
-		return device.deviceNetworkId
-	} else {
-		return "id:${device.deviceNetworkId}"
-	}
-}
--- a/devicetypes/smartthings/osram-lightify-led-tunable-white-60w.src/osram-lightify-led-tunable-white-60w.groovy
+++ b/devicetypes/smartthings/osram-lightify-led-tunable-white-60w.src/osram-lightify-led-tunable-white-60w.groovy
@@ -5,8 +5,6 @@
    that issue by using state variables
 */

-//DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
-
 metadata {
    definition (name: "OSRAM LIGHTIFY LED Tunable White 60W", namespace: "smartthings", author: "SmartThings") {

@@ -22,7 +20,10 @@ metadata {

        // indicates that device keeps track of heartbeat (in state.heartbeat)
        attribute "heartbeat", "string"
-        
+
+
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White"

    }

--- 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
@@ -79,8 +79,8 @@ metadata {
 	}
    
 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}    
 }

--- 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
@@ -88,8 +88,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 }

--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -43,8 +43,8 @@ metadata {
 				])
 		}
 		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"
-			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+			input 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"
+			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}
 
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -45,8 +45,8 @@ metadata {
 				])
 		}
 		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"
-			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+			input 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"
+			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}

--- a/devicetypes/smartthings/smartsense-motion-temp-sensor.src/smartsense-motion-temp-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-temp-sensor.src/smartsense-motion-temp-sensor.groovy
@@ -37,8 +37,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}

 	tiles(scale: 2) {
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -61,8 +61,8 @@
 				])
 		}
 		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"
- 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+ 			input 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"
+ 			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 		section {
 			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
--- a/devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy
+++ b/devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy
@@ -43,8 +43,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}

 	tiles(scale: 2) {
--- a/devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy
@@ -32,8 +32,8 @@
 	}

 	preferences {
- 		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"
- 		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+ 		input 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"
+ 		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}

 	tiles(scale: 2) {
--- 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
@@ -34,8 +34,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles(scale: 2) {
--- 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
@@ -33,8 +33,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}

 	tiles(scale: 2) {
--- 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
@@ -45,8 +45,8 @@ metadata {
 	}
    
 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}    

 	tiles {
--- a/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy
+++ b/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy
@@ -11,9 +11,6 @@
 *  for the specific language governing permissions and limitations under the License.
 *
 */
-
-//DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
-
 metadata {
 	definition (name: "Sylvania Ultra iQ", namespace:"smartthings", author: "SmartThings") {
 		capability "Switch Level"
--- a/devicetypes/smartthings/testing/simulated-color-control.src/simulated-color-control.groovy
+++ b/devicetypes/smartthings/testing/simulated-color-control.src/simulated-color-control.groovy
@@ -1,5 +1,5 @@
 metadata {
-	definition (name: "Simulated Color Control", namespace: "smartthings/testing", author: "SmartThings") {
+	definition (name: "Color Control Capability", namespace: "capabilities", author: "SmartThings") {
    	capability "Color Control"
 	}

--- a/devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy
+++ b/devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy
@@ -33,8 +33,8 @@ metadata {
 	}

 	preferences {
-		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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input 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"
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles {
--- a/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy
+++ b/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy
@@ -15,8 +15,6 @@
 *  Thanks to Chad Monroe @cmonroe and Patrick Stuart @pstuart
 *
 */
-//DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
-
 metadata {
 	definition (name: "WeMo Bulb", namespace: "smartthings", author: "SmartThings") {
 	
@@ -27,6 +25,7 @@ metadata {
        capability "Switch"
 		capability "Switch Level"

+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,FF00", outClusters: "0019"
 	}

 	// simulator metadata
--- a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
+++ b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
@@ -25,8 +25,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"

-    attribute "currentIP", "string"
-
 		command "subscribe"
 		command "resubscribe"
 		command "unsubscribe"
@@ -36,36 +34,21 @@ metadata {
 	// simulator metadata
 	simulator {}

- // UI tile definitions
-    tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "switch", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                 attributeState "on", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff"
-                 attributeState "off", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn"
-                 attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff"
-                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn"
-                 attributeState "offline", label:'${name}', icon:"st.Home.home30", backgroundColor:"#ff0000"
- 			}
-            tileAttribute ("currentIP", key: "SECONDARY_CONTROL") {
-             	 attributeState "currentIP", label: ''
- 			}
-        }
+	// 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:"#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:"#79b821"
+			state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
+		}
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}

-        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            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:"#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:"#ff0000"
-        }
-
-        standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-
-        main(["switch"])
-        details(["rich-control", "refresh"])
-    }
+		main "switch"
+		details (["switch", "refresh"])
+	}
 }

 // parse events into attributes
@@ -85,7 +68,6 @@ def parse(String description) {
 	def result = []
 	def bodyString = msg.body
 	if (bodyString) {
-		unschedule("setOffline")
 		def body = new XmlSlurper().parseText(bodyString)

 		if (body?.property?.TimeSyncRequest?.text()) {
@@ -96,14 +78,13 @@ def parse(String description) {
 		} else if (body?.property?.BinaryState?.text()) {
 			def value = body?.property?.BinaryState?.text().toInteger() == 1 ? "on" : "off"
 			log.trace "Notify: BinaryState = ${value}"
-			          result << createEvent(name: "switch", value: value, descriptionText: "Switch is ${value}")
+			result << createEvent(name: "switch", value: value)
 		} else if (body?.property?.TimeZoneNotification?.text()) {
 			log.debug "Notify: TimeZoneNotification = ${body?.property?.TimeZoneNotification?.text()}"
 		} else if (body?.Body?.GetBinaryStateResponse?.BinaryState?.text()) {
 			def value = body?.Body?.GetBinaryStateResponse?.BinaryState?.text().toInteger() == 1 ? "on" : "off"
 			log.trace "GetBinaryResponse: BinaryState = ${value}"
-			def dispaux = device.currentValue("switch") != value
-			result << createEvent(name: "switch", value: value, descriptionText: "Switch is ${value}", displayed: dispaux)
+			result << createEvent(name: "switch", value: value)
 		}
 	}

@@ -120,6 +101,14 @@ private getCallBackAddress() {
 	device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
 }

+private Integer convertHexToInt(hex) {
+    Integer.parseInt(hex,16)
+}
+
+private String convertHexToIP(hex) {
+    [convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+}
+
 private getHostAddress() {
 	def ip = getDataValue("ip")
 	def port = getDataValue("port")
@@ -206,8 +195,6 @@ def subscribe(ip, port) {
 	if (ip && ip != existingIp) {
 		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}")
 	}
 	if (port && port != existingPort) {
 		log.debug "Updating port from $existingPort to $port"
@@ -272,8 +259,6 @@ User-Agent: CyberGarage-HTTP/1.0

 def poll() {
 log.debug "Executing 'poll'"
-if (device.currentValue("currentIP") != "Offline")
-    runIn(10, setOffline)
 new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
 SOAPACTION: "urn:Belkin:service:basicevent:1#GetBinaryState"
 Content-Length: 277
@@ -289,15 +274,3 @@ User-Agent: CyberGarage-HTTP/1.0
 </s:Body>
 </s:Envelope>""", physicalgraph.device.Protocol.LAN)
 }
-
-def setOffline() {
-    sendEvent(name: "switch", value: "offline", descriptionText: "The device is offline")
-}
-
-private Integer convertHexToInt(hex) {
- 	Integer.parseInt(hex,16)
-}
-
-private String convertHexToIP(hex) {
- 	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
-}
--- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
+++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
@@ -21,8 +21,6 @@
 		capability "Refresh"
 		capability "Sensor"

-    	attribute "currentIP", "string"
-
 		command "subscribe"
 		command "resubscribe"
 		command "unsubscribe"
@@ -33,30 +31,17 @@
 	}

 	// UI tile definitions
-    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:"#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: ''
- 			}
-        }
-
+	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
 			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
-      		state("offline", label:'${name}', icon:"st.motion.motion.inactive", backgroundColor:"#ff0000")
+		}
+		standardTile("refresh", "device.motion", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

-        standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-
 		main "motion"
-		details (["rich-control", "refresh"])
+		details (["motion", "refresh"])
 	}
 }

@@ -77,7 +62,6 @@ def parse(String description) {
 	def result = []
 	def bodyString = msg.body
 	if (bodyString) {
-    unschedule("setOffline")
 		def body = new XmlSlurper().parseText(bodyString)

 		if (body?.property?.TimeSyncRequest?.text()) {
@@ -88,7 +72,7 @@ def parse(String description) {
 		} else if (body?.property?.BinaryState?.text()) {
 			def value = body?.property?.BinaryState?.text().toInteger() == 1 ? "active" : "inactive"
 			log.debug "Notify - BinaryState = ${value}"
-      result << createEvent(name: "motion", value: value, descriptionText: "Motion is ${value}")
+			result << createEvent(name: "motion", value: value)
 		} else if (body?.property?.TimeZoneNotification?.text()) {
 			log.debug "Notify: TimeZoneNotification = ${body?.property?.TimeZoneNotification?.text()}"
 		}
@@ -107,6 +91,14 @@ private getCallBackAddress() {
 	device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
 }

+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,16)
+}
+
+private String convertHexToIP(hex) {
+	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+}
+
 private getHostAddress() {
 	def ip = getDataValue("ip")
 	def port = getDataValue("port")
@@ -133,8 +125,6 @@ def refresh() {
 ////////////////////////////
 def getStatus() {
 log.debug "Executing WeMo Motion 'getStatus'"
-if (device.currentValue("currentIP") != "Offline")
-    runIn(10, setOffline)
 new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
 SOAPACTION: "urn:Belkin:service:basicevent:1#GetBinaryState"
 Content-Length: 277
@@ -175,9 +165,7 @@ def subscribe(ip, port) {
 	def existingPort = getDataValue("port")
 	if (ip && ip != existingIp) {
 		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}")
+		updateDataValue("ip", ip)
 	}
 	if (port && port != existingPort) {
 		log.debug "Updating port from $existingPort to $port"
@@ -238,15 +226,3 @@ User-Agent: CyberGarage-HTTP/1.0
 </s:Envelope>
 """, physicalgraph.device.Protocol.LAN)
 }
-
-def setOffline() {
-    sendEvent(name: "motion", value: "offline", descriptionText: "The device is offline")
-}
-
-private Integer convertHexToInt(hex) {
- 	Integer.parseInt(hex,16)
-}
-
-private String convertHexToIP(hex) {
- 	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
-}
--- a/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
+++ b/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
@@ -10,142 +10,120 @@
 *  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.
 *
- * Wemo Switch
+ *	Wemo Switch
 *
- * Author: Juan Risso (SmartThings)
- * Date: 2015-10-11
+ *	Author: superuser
+ *	Date: 2013-10-11
 */
 metadata {
- 	definition (name: "Wemo Switch", namespace: "smartthings", author: "SmartThings") {
-        capability "Actuator"
-        capability "Switch"
-        capability "Polling"
-        capability "Refresh"
-        capability "Sensor"
+	definition (name: "Wemo Switch", namespace: "smartthings", author: "SmartThings") {
+		capability "Actuator"
+		capability "Switch"
+		capability "Polling"
+		capability "Refresh"
+		capability "Sensor"

-        attribute "currentIP", "string"
+		command "subscribe"
+		command "resubscribe"
+		command "unsubscribe"
+	}

-        command "subscribe"
-        command "resubscribe"
-        command "unsubscribe"
- }
+	// simulator metadata
+	simulator {}

- // simulator metadata
- simulator {}
+	// 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:"#79b821"
+			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff"
+		}
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}

- // UI tile definitions
-    tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "switch", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-                 attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.off", backgroundColor:"#79b821", nextState:"turningOff"
-                 attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
-                 attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.off", backgroundColor:"#79b821", nextState:"turningOff"
-                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
-                 attributeState "offline", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ff0000"
- 			}
-            tileAttribute ("currentIP", key: "SECONDARY_CONTROL") {
-             	 attributeState "currentIP", label: ''
- 			}
-        }
-
-        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.off", backgroundColor:"#79b821", nextState:"turningOff"
-            state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.off", backgroundColor:"#79b821", nextState:"turningOff"
-            state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.on", backgroundColor:"#ffffff", nextState:"turningOn"
-            state "offline", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ff0000"
-        }
-
-        standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-
-        main(["switch"])
-        details(["rich-control", "refresh"])
-    }
+		main "switch"
+		details (["switch", "refresh"])
+	}
 }

 // parse events into attributes
 def parse(String description) {
-    log.debug "Parsing '${description}'"
+	log.debug "Parsing '${description}'"

-    def msg = parseLanMessage(description)
-    def headerString = msg.header
+	def msg = parseLanMessage(description)
+	def headerString = msg.header

-    if (headerString?.contains("SID: uuid:")) {
-        def sid = (headerString =~ /SID: uuid:.*/) ? ( headerString =~ /SID: uuid:.*/)[0] : "0"
-        sid -= "SID: uuid:".trim()
+	if (headerString?.contains("SID: uuid:")) {
+		def sid = (headerString =~ /SID: uuid:.*/) ? ( headerString =~ /SID: uuid:.*/)[0] : "0"
+		sid -= "SID: uuid:".trim()

-        updateDataValue("subscriptionId", sid)
- 	}
+		updateDataValue("subscriptionId", sid)
+	}

-    def result = []
-    def bodyString = msg.body
-    if (bodyString) {
-    	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString)
- 		if (body?.property?.TimeSyncRequest?.text()) {
-        	log.trace "Got TimeSyncRequest"
-        	result << timeSyncResponse()
-        } else if (body?.Body?.SetBinaryStateResponse?.BinaryState?.text()) {
- 			log.trace "Got SetBinaryStateResponse = ${body?.Body?.SetBinaryStateResponse?.BinaryState?.text()}"
- 		} else if (body?.property?.BinaryState?.text()) {
-        	def value = body?.property?.BinaryState?.text().substring(0, 1).toInteger() == 0 ? "off" : "on"
-        	log.trace "Notify: BinaryState = ${value}, ${body.property.BinaryState}"
-            def dispaux = device.currentValue("switch") != value
-            result << createEvent(name: "switch", value: value, descriptionText: "Switch is ${value}", displayed: dispaux)
-        } else if (body?.property?.TimeZoneNotification?.text()) {
- 			log.debug "Notify: TimeZoneNotification = ${body?.property?.TimeZoneNotification?.text()}"
- 		} else if (body?.Body?.GetBinaryStateResponse?.BinaryState?.text()) {
- 			def value = body?.Body?.GetBinaryStateResponse?.BinaryState?.text().substring(0, 1).toInteger() == 0 ? "off" : "on"
- 			log.trace "GetBinaryResponse: BinaryState = ${value}, ${body.property.BinaryState}"
-            log.info "Connection: ${device.currentValue("connection")}"
-            if (device.currentValue("currentIP") == "Offline") {
-                def ipvalue = convertHexToIP(getDataValue("ip"))
-                sendEvent(name: "IP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
-            }
-            def dispaux2 = device.currentValue("switch") != value
-     		result << createEvent(name: "switch", value: value, descriptionText: "Switch is ${value}", displayed: dispaux2)
- 		}
- 	}
- result
+	def result = []
+	def bodyString = msg.body
+	if (bodyString) {
+		def body = new XmlSlurper().parseText(bodyString)
+
+		if (body?.property?.TimeSyncRequest?.text()) {
+			log.trace "Got TimeSyncRequest"
+			result << timeSyncResponse()
+		} else if (body?.Body?.SetBinaryStateResponse?.BinaryState?.text()) {
+			log.trace "Got SetBinaryStateResponse = ${body?.Body?.SetBinaryStateResponse?.BinaryState?.text()}"
+		} else if (body?.property?.BinaryState?.text()) {
+			def value = body?.property?.BinaryState?.text().toInteger() == 1 ? "on" : "off"
+			log.trace "Notify: BinaryState = ${value}"
+			result << createEvent(name: "switch", value: value)
+		} else if (body?.property?.TimeZoneNotification?.text()) {
+			log.debug "Notify: TimeZoneNotification = ${body?.property?.TimeZoneNotification?.text()}"
+		} else if (body?.Body?.GetBinaryStateResponse?.BinaryState?.text()) {
+			def value = body?.Body?.GetBinaryStateResponse?.BinaryState?.text().toInteger() == 1 ? "on" : "off"
+			log.trace "GetBinaryResponse: BinaryState = ${value}"
+			result << createEvent(name: "switch", value: value)
+		}
+	}
+
+	result
 }

 private getTime() {
-    // This is essentially System.currentTimeMillis()/1000, but System is disallowed by the sandbox.
-    ((new GregorianCalendar().time.time / 1000l).toInteger()).toString()
+	// This is essentially System.currentTimeMillis()/1000, but System is disallowed by the sandbox.
+	((new GregorianCalendar().time.time / 1000l).toInteger()).toString()
 }

 private getCallBackAddress() {
- 	device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
+	device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
 }

 private Integer convertHexToInt(hex) {
- 	Integer.parseInt(hex,16)
+	Integer.parseInt(hex,16)
 }

 private String convertHexToIP(hex) {
- 	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
 }

 private getHostAddress() {
- 	def ip = getDataValue("ip")
- 	def port = getDataValue("port")
- 	if (!ip || !port) {
- 		def parts = device.deviceNetworkId.split(":")
- 		if (parts.length == 2) {
- 			ip = parts[0]
- 			port = parts[1]
- 		} else {
- 			log.warn "Can't figure out ip and port for device: ${device.id}"
-		 }
- 	}
- 	log.debug "Using ip: ${ip} and port: ${port} for device: ${device.id}"
- 	return convertHexToIP(ip) + ":" + convertHexToInt(port)
+	def ip = getDataValue("ip")
+	def port = getDataValue("port")
+
+	if (!ip || !port) {
+		def parts = device.deviceNetworkId.split(":")
+		if (parts.length == 2) {
+			ip = parts[0]
+			port = parts[1]
+		} else {
+			log.warn "Can't figure out ip and port for device: ${device.id}"
+		}
+	}
+	log.debug "Using ip: ${ip} and port: ${port} for device: ${device.id}"
+	return convertHexToIP(ip) + ":" + convertHexToInt(port)
 }

+
 def on() {
-log.debug "Executing 'on'"
+	log.debug "Executing 'on'"
+    sendEvent(name: "switch", value: "on")
 def turnOn = new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
 SOAPAction: "urn:Belkin:service:basicevent:1#SetBinaryState"
 Host: ${getHostAddress()}
@@ -155,16 +133,17 @@ Content-Length: 333
 <?xml version="1.0"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
 <SOAP-ENV:Body>
- <m:SetBinaryState xmlns:m="urn:Belkin:service:basicevent:1">
+	<m:SetBinaryState xmlns:m="urn:Belkin:service:basicevent:1">
 <BinaryState>1</BinaryState>
- </m:SetBinaryState>
+	</m:SetBinaryState>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>""", physicalgraph.device.Protocol.LAN)
 }

 def off() {
-log.debug "Executing 'off'"
-def turnOff = new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
+	log.debug "Executing 'off'"
+	sendEvent(name: "switch", value: "off")
+	def turnOff = new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
 SOAPAction: "urn:Belkin:service:basicevent:1#SetBinaryState"
 Host: ${getHostAddress()}
 Content-Type: text/xml
@@ -173,13 +152,36 @@ Content-Length: 333
 <?xml version="1.0"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
 <SOAP-ENV:Body>
- <m:SetBinaryState xmlns:m="urn:Belkin:service:basicevent:1">
+	<m:SetBinaryState xmlns:m="urn:Belkin:service:basicevent:1">
 <BinaryState>0</BinaryState>
- </m:SetBinaryState>
+	</m:SetBinaryState>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>""", physicalgraph.device.Protocol.LAN)
 }

+/*def refresh() {
+	log.debug "Executing 'refresh'"
+new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
+SOAPACTION: "urn:Belkin:service:basicevent:1#GetBinaryState"
+Content-Length: 277
+Content-Type: text/xml; charset="utf-8"
+HOST: ${getHostAddress()}
+User-Agent: CyberGarage-HTTP/1.0
+
+<?xml version="1.0" encoding="utf-8"?>
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<s:Body>
+<u:GetBinaryState xmlns:u="urn:Belkin:service:basicevent:1">
+</u:GetBinaryState>
+</s:Body>
+</s:Envelope>""", physicalgraph.device.Protocol.LAN)
+}*/
+
+def refresh() {
+	log.debug "Executing WeMo Switch 'subscribe', then 'timeSyncResponse', then 'poll'"
+	[subscribe(), timeSyncResponse(), poll()]
+}
+
 def subscribe(hostAddress) {
 log.debug "Executing 'subscribe()'"
 def address = getCallBackAddress()
@@ -198,30 +200,27 @@ def subscribe() {
 	subscribe(getHostAddress())
 }

-def refresh() {
- 	log.debug "Executing WeMo Switch 'subscribe', then 'timeSyncResponse', then 'poll'"
- 	[subscribe(), timeSyncResponse(), poll()]
-}
-
 def subscribe(ip, port) {
-    def existingIp = getDataValue("ip")
-    def existingPort = getDataValue("port")
-    if (ip && ip != existingIp) {
-         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}")
-    }
- 	if (port && port != existingPort) {
- 		log.debug "Updating port from $existingPort to $port"
- 		updateDataValue("port", port)
+	def existingIp = getDataValue("ip")
+	def existingPort = getDataValue("port")
+	if (ip && ip != existingIp) {
+		log.debug "Updating ip from $existingIp to $ip"
+		updateDataValue("ip", ip)
 	}
+	if (port && port != existingPort) {
+		log.debug "Updating port from $existingPort to $port"
+		updateDataValue("port", port)
+	}
+
 	subscribe("${ip}:${port}")
 }

+////////////////////////////
 def resubscribe() {
-    log.debug "Executing 'resubscribe()'"
-    def sid = getDeviceDataByName("subscriptionId")
+log.debug "Executing 'resubscribe()'"
+
+def sid = getDeviceDataByName("subscriptionId")
+
 new physicalgraph.device.HubAction("""SUBSCRIBE /upnp/event/basicevent1 HTTP/1.1
 HOST: ${getHostAddress()}
 SID: uuid:${sid}
@@ -229,11 +228,12 @@ TIMEOUT: Second-5400


 """, physicalgraph.device.Protocol.LAN)
+
 }

-
+////////////////////////////
 def unsubscribe() {
-    def sid = getDeviceDataByName("subscriptionId")
+def sid = getDeviceDataByName("subscriptionId")
 new physicalgraph.device.HubAction("""UNSUBSCRIBE publisher path HTTP/1.1
 HOST: ${getHostAddress()}
 SID: uuid:${sid}
@@ -242,7 +242,7 @@ SID: uuid:${sid}
 """, physicalgraph.device.Protocol.LAN)
 }

-
+////////////////////////////
 //TODO: Use UTC Timezone
 def timeSyncResponse() {
 log.debug "Executing 'timeSyncResponse()'"
@@ -267,15 +267,9 @@ User-Agent: CyberGarage-HTTP/1.0
 """, physicalgraph.device.Protocol.LAN)
 }

-def setOffline() {
-	//sendEvent(name: "currentIP", value: "Offline", displayed: false)
-    sendEvent(name: "switch", value: "offline", descriptionText: "The device is offline")
-}

 def poll() {
 log.debug "Executing 'poll'"
-if (device.currentValue("currentIP") != "Offline")
-    runIn(10, setOffline)
 new physicalgraph.device.HubAction("""POST /upnp/control/basicevent1 HTTP/1.1
 SOAPACTION: "urn:Belkin:service:basicevent:1#GetBinaryState"
 Content-Length: 277
--- a/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy
@@ -24,9 +24,6 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-CIA19NAE26", deviceJoinName: "Sengled Element touch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45852", deviceJoinName: "GE Zigbee Plug-In Dimmer"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45857", deviceJoinName: "GE Zigbee In-Wall Dimmer"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -17,14 +17,12 @@ metadata {
        capability "Actuator"
        capability "Configuration"
        capability "Refresh"
+        capability "Sensor"
        capability "Switch"
        capability "Switch Level"


        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
+++ b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
@@ -32,13 +32,7 @@
        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019",
                        manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_10T", deviceJoinName: "Kwikset 10-Button Touch Deadbolt"
        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019",
-                        manufacturer: "Yale", model: "YRL220 TS LL", deviceJoinName: "Yale Touch Screen Lever Lock"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019",
-                        manufacturer: "Yale", model: "YRD210 PB DB", deviceJoinName: "Yale Push Button Deadbolt Lock"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019",
-                        manufacturer: "Yale", model: "YRD220/240 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019",
-                        manufacturer: "Yale", model: "YRL210 PB LL", deviceJoinName: "Yale Push Button Lever Lock"
+                        manufacturer: "Yale", model: "YRL220 TS LL", deviceJoinName: "Yale YRL220 Lock"
    }

    tiles(scale: 2) {
@@ -91,24 +85,11 @@ def uninstalled() {
 }

 def configure() {
-    /*
    def cmds =
        zigbee.configSetup("${CLUSTER_DOORLOCK}", "${DOORLOCK_ATTR_LOCKSTATE}",
                           "${TYPE_ENUM8}", 0, 3600, "{01}") +
        zigbee.configSetup("${CLUSTER_POWER}", "${POWER_ATTR_BATTERY_PERCENTAGE_REMAINING}",
-                           "${TYPE_U8}", 600, 21600, "{01}")
-    */
-    def zigbeeId = device.zigbeeId
-    def cmds =
-        [
-            "zdo bind 0x${device.deviceNetworkId} 0x${device.endpointId} 1 ${CLUSTER_DOORLOCK} {$zigbeeId} {}", "delay 200",
-            "zcl global send-me-a-report ${CLUSTER_DOORLOCK} ${DOORLOCK_ATTR_LOCKSTATE} ${TYPE_ENUM8} 0 3600 {01}", "delay 200",
-            "send 0x${device.deviceNetworkId} 1 0x${device.endpointId}", "delay 200",
-
-            "zdo bind 0x${device.deviceNetworkId} 0x${device.endpointId} 1 ${CLUSTER_POWER} {$zigbeeId} {}", "delay 200",
-            "zcl global send-me-a-report ${CLUSTER_POWER} ${POWER_ATTR_BATTERY_PERCENTAGE_REMAINING} ${TYPE_U8} 600 21600 {01}", "delay 200",
-            "send 0x${device.deviceNetworkId} 1 0x${device.endpointId}", "delay 200",
-        ]
+                           "${TYPE_U8}", 3600, 3600, "{01}")
    log.info "configure() --- cmds: $cmds"
    return cmds + refresh() // send refresh cmds as part of config
 }
@@ -138,15 +119,13 @@ def parse(String description) {
 def lock() {
    def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_LOCK_DOOR}", "{}")
    log.info "lock() -- cmds: $cmds"
-    //return cmds
-    "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_LOCK_DOOR} {}"
+    return cmds
 }

 def unlock() {
    def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_UNLOCK_DOOR}", "{}")
    log.info "unlock() -- cmds: $cmds"
-    //return cmds
-    "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_UNLOCK_DOOR} {}"
+    return cmds
 }

 // Private methods
@@ -160,10 +139,8 @@ private Map parseReportAttributeMessage(String description) {
    Map resultMap = [:]
    if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) {
        resultMap.name = "battery"
-        resultMap.value = Math.round(Integer.parseInt(descMap.value, 16) / 2)
-        if (device.getDataValue("manufacturer") == "Yale") {            //Handling issue with Yale locks incorrect battery reporting
-            resultMap.value = Integer.parseInt(descMap.value, 16)
-        }
+        // BatteryPercentageRemaining is specified in .5% increments
+        resultMap.value = Integer.parseInt(descMap.value, 16) / 2
        log.info "parseReportAttributeMessage() --- battery: ${resultMap.value}"
    }
    else if (descMap.clusterInt == CLUSTER_DOORLOCK && descMap.attrInt == DOORLOCK_ATTR_LOCKSTATE) {
--- a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
+++ b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
@@ -23,8 +23,6 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0B04"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy
+++ b/devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy
@@ -17,6 +17,7 @@ metadata {
        capability "Actuator"
        capability "Configuration"
        capability "Refresh"
+        capability "Sensor"
        capability "Switch"

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
--- a/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
@@ -23,18 +23,14 @@ metadata {
        capability "Color Temperature"
        capability "Configuration"
        capability "Refresh"
+        capability "Sensor"
        capability "Switch"
        capability "Switch Level"

        attribute "colorName", "string"
        command "setGenericName"

-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04", outClusters: "0019"
    }

    // UI tile definitions
--- a/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
+++ b/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
--- a/smartapps/bravenel/rule-machine.src/rule-machine.groovy
+++ b/smartapps/bravenel/rule-machine.src/rule-machine.groovy
@@ -1,52 +0,0 @@
-/**
- *  Rule
- *
- *  Copyright 2015 Bruce Ravenel
- *
- *  Version 1.1.0  25 Nov 2015
- *
- *  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.
- *
- */
-
-definition(
-    name: "Rule Machine",
-    singleInstance: true,
-    namespace: "bravenel",
-    author: "Bruce Ravenel",
-    description: "Rule Machine",
-    category: "My Apps",
-  	iconUrl: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/Cat-ModeMagic.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/Cat-ModeMagic@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/Cat-ModeMagic@3x.png"
-)
-
-preferences {
-    page(name: "mainPage", title: "Rules", install: true, uninstall: true,submitOnChange: true) {
-            section {
-                    app(name: "childRules", appName: "Rule", namespace: "bravenel", title: "Create New Rule...", multiple: true)
-            }
-    }
-}
-
-def installed() {
-    initialize()
-}
-
-def updated() {
-    unsubscribe()
-    initialize()
-}
-
-def initialize() {
-    childApps.each {child ->
-            log.info "Installed Rules: ${child.label}"
-    }
-}
--- a/smartapps/bravenel/rule.src/rule.groovy
+++ b/smartapps/bravenel/rule.src/rule.groovy
--- a/smartapps/com-obycode/obything-music-connect.src/obything-music-connect.groovy
+++ b/smartapps/com-obycode/obything-music-connect.src/obything-music-connect.groovy
@@ -20,8 +20,7 @@ definition(
    description: "Use this free SmartApp in conjunction with the ObyThing Music app for your Mac to control and automate music and more with iTunes and SmartThings.",
    category: "SmartThings Labs",
    iconUrl: "http://obycode.com/obything/ObyThingSTLogo.png",
-    iconX2Url: "http://obycode.com/obything/ObyThingSTLogo@2x.png",
-    singleInstance: true)
+    iconX2Url: "http://obycode.com/obything/ObyThingSTLogo@2x.png")


 preferences {
--- a/smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy
+++ b/smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy
@@ -22,8 +22,7 @@ definition(
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png",
-    oauth: true,
-    singleInstance: true
+    oauth: true
 ){
 	appSetting "clientId"
 	appSetting "clientSecret"
--- a/smartapps/juano2310/jawbone-up-connect.src/jawbone-up-connect.groovy
+++ b/smartapps/juano2310/jawbone-up-connect.src/jawbone-up-connect.groovy
@@ -13,11 +13,11 @@ definition(
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/jawbone-up.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/jawbone-up@2x.png",
 	oauth: true,
-    usePreferencesForAuthorization: false,
-    singleInstance: true
+    usePreferencesForAuthorization: false
 ) {
 	appSetting "clientId"
 	appSetting "clientSecret"
+	appSetting "serverUrl"
 }

 preferences {
@@ -28,13 +28,16 @@ mappings {
 	path("/receivedToken") { action: [ POST: "receivedToken", GET: "receivedToken"] }
 	path("/receiveToken") { action: [ POST: "receiveToken", GET: "receiveToken"] }
 	path("/hookCallback") { action: [ POST: "hookEventHandler", GET: "hookEventHandler"] }
-    path("/oauth/initialize") {action: [GET: "oauthInitUrl"]}    
 	path("/oauth/callback") { action: [ GET: "callback" ] }
 }

-def getServerUrl() { return "https://graph.api.smartthings.com" }
-def getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${apiServerUrl}" }
-def buildRedirectUrl(page) { return buildActionUrl(page) }
+def getSmartThingsClientId() {
+   return appSettings.clientId
+}
+
+def getSmartThingsClientSecret() {
+   return appSettings.clientSecret
+}

 def callback() {
 	def redirectUrl = null
@@ -60,8 +63,9 @@ def callback() {
 				// SmartThings code, which we ignore, as we don't need to exchange for an access token.
 				// Instead, go initiate the Jawbone OAuth flow.
 				log.debug "Executing callback redirect to auth page"
+			    def stcid = getSmartThingsClientId()
 			    state.oauthInitState = UUID.randomUUID().toString()
-			    def oauthParams = [response_type: "code", client_id: appSettings.clientId, scope: "move_read sleep_read", redirect_uri: "${serverUrl}/oauth/callback"]
+			    def oauthParams = [response_type: "code", client_id: stcid, scope: "move_read sleep_read", redirect_uri: "${serverUrl}/oauth/callback"]
 				redirect(location: "https://jawbone.com/auth/oauth2/auth?${toQueryString(oauthParams)}")
 			}
 		} else {
@@ -80,11 +84,10 @@ def authPage() {
 			createAccessToken()
 		}
        description = "Click to enter Jawbone Credentials"
-        def redirectUrl = buildRedirectUrl
-        log.debug "RedirectURL = ${redirectUrl}"
-        def donebutton= state.JawboneAccessToken != null 
-        return dynamicPage(name: "Credentials", title: "Jawbone UP", nextPage: null, uninstall: true, install: donebutton) {
-               section { href url:redirectUrl, style:"embedded", required:true, title:"Jawbone UP", state: hast ,description:description }
+        def redirectUrl = oauthInitUrl()
+        // log.debug "RedirectURL = ${redirectUrl}"
+        return dynamicPage(name: "Credentials", title: "Jawbone UP", nextPage: null, uninstall: true, install:false) {
+               section { href url:redirectUrl, style:"embedded", required:true, title:"Jawbone UP", description:description }
        }
    } else {
        description = "Jawbone Credentials Already Entered." 
@@ -96,14 +99,17 @@ def authPage() {

 def oauthInitUrl() {
    log.debug "oauthInitUrl"
+    def stcid = getSmartThingsClientId()
    state.oauthInitState = UUID.randomUUID().toString()
-    def oauthParams = [ response_type: "code", client_id: appSettings.clientId, scope: "move_read sleep_read", redirect_uri: "${serverUrl}/oauth/callback" ]
-	redirect(location: "https://jawbone.com/auth/oauth2/auth?${toQueryString(oauthParams)}")
+    def oauthParams = [ response_type: "code", client_id: stcid, scope: "move_read sleep_read", redirect_uri: buildRedirectUrl("receiveToken") ]
+	return "https://jawbone.com/auth/oauth2/auth?${toQueryString(oauthParams)}"
 }

 def receiveToken(redirectUrl = null) {
 	log.debug "receiveToken"
-    def oauthParams = [ client_id: appSettings.clientId, client_secret: appSettings.clientSecret, grant_type: "authorization_code", code: params.code ]
+    def stcid = getSmartThingsClientId()
+    def oauthClientSecret = getSmartThingsClientSecret()
+    def oauthParams = [ client_id: stcid, client_secret: oauthClientSecret, grant_type: "authorization_code", code: params.code ]
    def params = [
      uri: "https://jawbone.com/auth/oauth2/token?${toQueryString(oauthParams)}",
    ]
@@ -225,10 +231,18 @@ String toQueryString(Map m) {
 	return m.collect { k, v -> "${k}=${URLEncoder.encode(v.toString())}" }.sort().join("&")
 }

+def getServerUrl() { return appSettings.serverUrl ?: "https://graph.api.smartthings.com" }
+
+def buildRedirectUrl(page) {
+    // log.debug "buildRedirectUrl"
+    // /api/token/:st_token/smartapps/installations/:id/something
+    return "${serverUrl}/api/token/${state.accessToken}/smartapps/installations/${app.id}/${page}"
+}
+
 def validateCurrentToken() {
 	log.debug "validateCurrentToken"
    def url = "https://jawbone.com/nudge/api/v.1.1/users/@me/refreshToken"
-    def requestBody = "secret=${appSettings.clientSecret}"
+    def requestBody = "secret=${getSmartThingsClientSecret()}"
 	
 	try {
 		httpPost(uri: url, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],  body: requestBody) {response ->
@@ -242,7 +256,9 @@ def validateCurrentToken() {
        if (e.statusCode == 401) { // token is expired
        	log.debug "Access token is expired"
        	if (state.refreshToken) { // if we have this we are okay
-    			def oauthParams = [client_id: appSettings.clientId, client_secret: appSettings.clientSecret, grant_type: "refresh_token", refresh_token: state.refreshToken]
+            	def stcid = getSmartThingsClientId()
+    			def oauthClientSecret = getSmartThingsClientSecret()
+    			def oauthParams = [client_id: stcid, client_secret: oauthClientSecret, grant_type: "refresh_token", refresh_token: state.refreshToken]
        		def tokenUrl = "https://jawbone.com/auth/oauth2/token?${toQueryString(oauthParams)}"
        		def params = [
          			uri: tokenUrl
@@ -271,10 +287,9 @@ def validateCurrentToken() {
 }

 def initialize() {
-    log.debug "Callback URL - Webhook"  
-	def localServerUrl = getApiServerUrl() 
-	def hookUrl = "${localServerUrl}/api/token/${state.accessToken}/smartapps/installations/${app.id}/hookCallback"
-    def webhook = "https://jawbone.com/nudge/api/v.1.1/users/@me/pubsub?webhook=$hookUrl"      
+	def hookUrl = "${serverUrl}/api/token/${state.accessToken}/smartapps/installations/${app.id}/hookCallback"
+    def webhook = "https://jawbone.com/nudge/api/v.1.1/users/@me/pubsub?webhook=$hookUrl"
+    log.debug "Callback URL: $webhook"        
 	httpPost(uri: webhook, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ])
 }

@@ -312,6 +327,7 @@ def setup() {
 }

 def installed() {
+	enableCallback()
 	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
@@ -324,6 +340,7 @@ def installed() {
 }

 def updated() {
+	enableCallback()
 	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
@@ -482,4 +499,4 @@ def hookEventHandler() {

 	def html = """{"code":200,"message":"OK"}"""
 	render contentType: 'application/json', data: html
-}
+}
--- a/smartapps/macstainless/lights-on-when-door-opens-after-sundown.src/lights-on-when-door-opens-after-sundown.groovy
+++ b/smartapps/macstainless/lights-on-when-door-opens-after-sundown.src/lights-on-when-door-opens-after-sundown.groovy
@@ -0,0 +1,53 @@
+/**
+ *
+ *  Lights On When Door Open After Sundown
+ *
+ *  Based on "Turn It On When It Opens" by SmartThings
+ *
+ *  Author: Aaron Crocco
+ */
+preferences {
+	section("When the door opens..."){
+		input "contact1", "capability.contactSensor", title: "Where?"
+	}
+	section("Turn on these lights..."){
+		input "switches", "capability.switch", multiple: true
+	}
+	section("and change mode to...") {
+		input "HomeAfterDarkMode", "mode", title: "Mode?"
+	}
+}
+
+
+def installed()
+{
+	subscribe(contact1, "contact.open", contactOpenHandler)
+}
+
+def updated()
+{
+	unsubscribe()
+	subscribe(contact1, "contact.open", contactOpenHandler)
+}
+
+def contactOpenHandler(evt) {
+	log.debug "$evt.value: $evt, $settings"
+	
+	//Check current time to see if it's after sundown.
+	def s = getSunriseAndSunset(zipCode: zipCode, sunriseOffset: sunriseOffset, sunsetOffset: sunsetOffset)
+	def now = new Date()
+	def setTime = s.sunset
+	log.debug "Sunset is at $setTime. Current time is $now"
+        
+        
+    if (setTime.before(now)) {	//Executes only if it's after sundown.
+			
+		log.trace "Turning on switches: $switches"
+		switches.on()
+		log.trace "Changing house mode to $HomeAfterDarkMode"
+        setLocationMode(HomeAfterDarkMode)
+        sendPush("Welcome home! Changing mode to $HomeAfterDarkMode.")
+
+	}   
+}
+
--- a/smartapps/mager/weather-underground-pws-connect.src/weather-underground-pws-connect.groovy
+++ b/smartapps/mager/weather-underground-pws-connect.src/weather-underground-pws-connect.groovy
@@ -26,8 +26,7 @@ definition(
    iconUrl: "http://i.imgur.com/HU0ANBp.png",
    iconX2Url: "http://i.imgur.com/HU0ANBp.png",
    iconX3Url: "http://i.imgur.com/HU0ANBp.png",
-    oauth: true,
-    singleInstance: true)
+    oauth: true)


 preferences {
--- a/smartapps/smart-auto-lock-/-unlock/smart-auto-lock-unlock.src/smart-auto-lock-unlock.groovy
+++ b/smartapps/smart-auto-lock-/-unlock/smart-auto-lock-unlock.src/smart-auto-lock-unlock.groovy
@@ -14,8 +14,8 @@
 *
 */
 definition(
-    name: "Smart Auto Lock / Unlock",
-    namespace: "smart-auto-lock-unlock",
+    name: "Smart Lock / Unlock",
+    namespace: "",
    author: "Arnaud",
    description: "Automatically locks door X minutes after being closed and keeps door unlocked if door is open.",
    category: "Safety & Security",
--- a/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
+++ b/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
@@ -21,8 +21,7 @@
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    singleInstance: true
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png"
 )

 preferences {
--- a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
+++ b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
@@ -26,8 +26,7 @@ definition(
    description: "Connect your Ecobee thermostat to SmartThings.",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/ecobee.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ecobee@2x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ecobee@2x.png"
 ) {
 	appSetting "clientId"
 	appSetting "serverUrl"
--- a/smartapps/smartthings/foscam-connect.src/foscam-connect.groovy
+++ b/smartapps/smartthings/foscam-connect.src/foscam-connect.groovy
@@ -23,8 +23,7 @@ definition(
    description: "Connect and take pictures using your Foscam camera from inside the Smartthings app.",
    category: "SmartThings Internal",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/foscam.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/foscam@2x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/foscam@2x.png"
 )

 preferences {
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -23,8 +23,7 @@ definition(
 	description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.",
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
-	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-    singleInstance: true
+	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png"
 )

 preferences {
@@ -144,7 +143,7 @@ def bulbDiscovery() {
    if (numFound == 0)
    	app.updateSetting("selectedBulbs", "") 
        
-	if((bulbRefreshCount % 5) == 0) {
+	if((bulbRefreshCount % 3) == 0) {
 		discoverHueBulbs()
 	}

@@ -319,15 +318,11 @@ def addBulbs() {
 			def newHueBulb
 			if (bulbs instanceof java.util.Map) {
 				newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
-                if (newHueBulb != null) {
-                    if (newHueBulb?.value?.type?.equalsIgnoreCase("Dimmable light") ) {
-                        d = addChildDevice("smartthings", "Hue Lux Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
-                    } else {
-                        d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
-                    }
-                } else {
-                	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
-                }
+				if (newHueBulb?.value?.type?.equalsIgnoreCase("Dimmable light")) {
+					d = addChildDevice("smartthings", "Hue Lux Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
+				} else {
+					d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
+				}
 			} else { 
            	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
@@ -609,22 +604,23 @@ def parse(childDevice, description) {
 	}
 }

-def on(childDevice) {
+def on(childDevice, transition_deprecated = 0) {
 	log.debug "Executing 'on'"
-	put("lights/${getId(childDevice)}/state", [on: true])
-    return "Bulb is On"
+    def percent = childDevice.device?.currentValue("level") as Integer
+	def level = Math.min(Math.round(percent * 255 / 100), 255)
+	put("lights/${getId(childDevice)}/state", [bri: level, on: true])
+    return "level: $percent"
 }

-def off(childDevice) {
+def off(childDevice, transition_deprecated = 0) {
 	log.debug "Executing 'off'"
 	put("lights/${getId(childDevice)}/state", [on: false])
-    return "Bulb is Off"
+    return "level: 0"
 }

 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
-    def level 
-    if (percent == 1) level = 1 else level = Math.min(Math.round(percent * 255 / 100), 255)
+	def level = Math.min(Math.round(percent * 255 / 100), 255)
 	put("lights/${getId(childDevice)}/state", [bri: level, on: percent > 0])
 }

@@ -640,7 +636,7 @@ def setHue(childDevice, percent) {
 	put("lights/${getId(childDevice)}/state", [hue: level])
 }

-def setColor(childDevice, huesettings) {
+def setColor(childDevice, huesettings, alert_deprecated = "", transition_deprecated = 0) {
 	log.debug "Executing 'setColor($huesettings)'"
 	def hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
 	def sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
@@ -649,7 +645,7 @@ def setColor(childDevice, huesettings) {

 	def value = [sat: sat, hue: hue, alert: alert, transitiontime: transition]
 	if (huesettings.level != null) {
-        if (huesettings.level == 1) value.bri = 1 else value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
+		value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
 		value.on = value.bri > 0
 	}

@@ -727,6 +723,8 @@ private getBridgeIP() {
            def serialNumber = selectedHue
            def bridge = getHueBridges().find { it?.value?.serialNumber?.equalsIgnoreCase(serialNumber) }?.value
            if (!bridge) { 
+            	//failed because mac address sent from hub is wrong and doesn't match the hue's real mac address and serial number
+                //in this case we will look up the bridge by comparing the incorrect mac addresses
            	bridge = getHueBridges().find { it?.value?.mac?.equalsIgnoreCase(serialNumber) }?.value
            }
            if (bridge?.ip && bridge?.port) {
--- a/smartapps/smartthings/ifttt.src/ifttt.groovy
+++ b/smartapps/smartthings/ifttt.src/ifttt.groovy
@@ -98,15 +98,6 @@ def installed() {
 }

 def updated() {
-	def currentDeviceIds = settings.collect { k, devices -> devices }.flatten().collect { it.id }.unique()
-	def subscriptionDevicesToRemove = app.subscriptions*.device.findAll { device ->
-		!currentDeviceIds.contains(device.id)
-	}
-	subscriptionDevicesToRemove.each { device ->
-		log.debug "Removing $device.displayName subscription"
-		state.remove(device.id)
-		unsubscribe(device)
-	}
 	log.debug settings
 }

--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -22,8 +22,7 @@ definition(
 	category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/life360.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/life360@2x.png",
-    oauth: [displayName: "Life360", displayLink: "Life360"],
-    singleInstance: true
+    oauth: [displayName: "Life360", displayLink: "Life360"]
 ) {
 	appSetting "clientId"
 	appSetting "clientSecret"
@@ -592,7 +591,7 @@ def updated() {
        	// log.debug "External Id=${app.id}:${member.id}"
       
       		// create the device
-       		def childDevice = addChildDevice("smartthings", "Life360 User", "${app.id}.${member.id}",null,[name:member.firstName, completedSetup: true])
+       		def childDevice = addChildDevice("smartthings", "life360-user", "${app.id}.${member.id}",null,[name:member.firstName, completedSetup: true])
            // childDevice.setMemberId(member.id)
        
        	if (childDevice)
--- a/smartapps/smartthings/lifx-connect.src/lifx-connect.groovy
+++ b/smartapps/smartthings/lifx-connect.src/lifx-connect.groovy
@@ -5,23 +5,22 @@
 *
 */
 definition(
-		name: "LIFX (Connect)",
-		namespace: "smartthings",
-		author: "LIFX",
-		description: "Allows you to use LIFX smart light bulbs with SmartThings.",
-		category: "Convenience",
-		iconUrl: "https://cloud.lifx.com/images/lifx.png",
-		iconX2Url: "https://cloud.lifx.com/images/lifx.png",
-		iconX3Url: "https://cloud.lifx.com/images/lifx.png",
-		oauth: true,
-		singleInstance: true) {
-	appSetting "clientId"
-	appSetting "clientSecret"
-}
+	name: "LIFX (Connect)",
+	namespace: "smartthings",
+	author: "LIFX",
+	description: "Allows you to use LIFX smart light bulbs with SmartThings.",
+	category: "Convenience",
+	iconUrl: "https://cloud.lifx.com/images/lifx.png",
+	iconX2Url: "https://cloud.lifx.com/images/lifx.png",
+	iconX3Url: "https://cloud.lifx.com/images/lifx.png",
+	oauth: true) {
+		appSetting "clientId"
+		appSetting "clientSecret"
+	}


 preferences {
-	page(name: "Credentials", title: "LIFX", content: "authPage", install: true)
+	page(name: "Credentials", title: "LIFX", content: "authPage", install: false)
 }

 mappings {
@@ -33,29 +32,29 @@ mappings {
 	path("/test") { action: [ GET: "oauthSuccess" ] }
 }

-def getServerUrl()               { return "https://graph.api.smartthings.com" }
-def getCallbackUrl()             { return "https://graph.api.smartthings.com/oauth/callback"}
-def apiURL(path = '/') 			 { return "https://api.lifx.com/v1${path}" }
-def getSecretKey()               { return appSettings.secretKey }
-def getClientId()                { return appSettings.clientId }
+def getServerUrl() { return "https://graph.api.smartthings.com" }
+def apiURL(path = '/') { return "https://api.lifx.com/v1beta1${path}" }
+def buildRedirectUrl(page) {
+	return "${serverUrl}/api/token/${state.accessToken}/smartapps/installations/${app.id}/${page}"
+}

 def authPage() {
-	log.debug "authPage test1"
+	log.debug "authPage"
 	if (!state.lifxAccessToken) {
 		log.debug "no LIFX access token"
 		// This is the SmartThings access token
 		if (!state.accessToken) {
 			log.debug "no access token, create access token"
-			state.accessToken = createAccessToken() // predefined method
+			createAccessToken() // predefined method
 		}
 		def description = "Tap to enter LIFX credentials"
-		def redirectUrl = "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${apiServerUrl}" // this triggers oauthInit() below
-//        def redirectUrl = "${apiServerUrl}"
-        log.debug "app id: ${app.id}"
+		def redirectUrl = "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}" // this triggers oauthInit() below
+		log.debug "app id: ${app.id}"
 		log.debug "redirect url: ${redirectUrl}"
-		return dynamicPage(name: "Credentials", title: "Connect to LIFX", nextPage: null, uninstall: true, install:true) {
+		return dynamicPage(name: "Credentials", title: "Connect to LIFX", nextPage: null, uninstall: true, install:false) {
 			section {
 				href(url:redirectUrl, required:true, title:"Connect to LIFX", description:"Tap here to connect your LIFX account")
+				// href(url:buildRedirectUrl("test"), title: "Message test")
 			}
 		}
 	} else {
@@ -63,15 +62,17 @@ def authPage() {

 		def options = locationOptions() ?: []
 		def count = options.size()
+        def refreshInterval = 3

-		return dynamicPage(name:"Credentials", title:"", nextPage:"", install:true, uninstall: true) {
+		return dynamicPage(name:"Credentials", title:"Select devices...", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
 			section("Select your location") {
-				input "selectedLocationId", "enum", required:true, title:"Select location (${count} found)", multiple:false, options:options, submitOnChange: true
+				input "selectedLocationId", "enum", required:true, title:"Select location (${count} found)", multiple:false, options:options
 			}
 		}
 	}
 }

+
 // OAuth

 def oauthInit() {
@@ -110,7 +111,7 @@ def oauthCallback() {
 }

 def oauthReceiveToken(redirectUrl = null) {
-	// Not sure what redirectUrl is for
+
 	log.debug "receiveToken - params: ${params}"
 	def oauthParams = [ client_id: "${appSettings.clientId}", client_secret: "${appSettings.clientSecret}", grant_type: "authorization_code", code: params.code, scope: params.scope ] // how is params.code valid here?
 	def params = [
@@ -133,25 +134,25 @@ def oauthReceiveToken(redirectUrl = null) {

 def oauthSuccess() {
 	def message = """
-		<p>Your LIFX Account is now connected to SmartThings!</p>
-		<p>Click 'Done' to finish setup.</p>
-	"""
+        <p>Your LIFX Account is now connected to SmartThings!</p>
+        <p>Click 'Done' to finish setup.</p>
+    """
 	oauthConnectionStatus(message)
 }

 def oauthFailure() {
 	def message = """
-		<p>The connection could not be established!</p>
-		<p>Click 'Done' to return to the menu.</p>
-	"""
+        <p>The connection could not be established!</p>
+        <p>Click 'Done' to return to the menu.</p>
+    """
 	oauthConnectionStatus(message)
 }

 def oauthReceivedToken() {
 	def message = """
-		<p>Your LIFX Account is already connected to SmartThings!</p>
-		<p>Click 'Done' to finish setup.</p>
-	"""
+        <p>Your LIFX Account is already connected to SmartThings!</p>
+        <p>Click 'Done' to finish setup.</p>
+    """
 	oauthConnectionStatus(message)
 }

@@ -159,74 +160,74 @@ def oauthConnectionStatus(message, redirectUrl = null) {
 	def redirectHtml = ""
 	if (redirectUrl) {
 		redirectHtml = """
-			<meta http-equiv="refresh" content="3; url=${redirectUrl}" />
-		"""
+            <meta http-equiv="refresh" content="3; url=${redirectUrl}" />
+        """
 	}

 	def html = """
-		<!DOCTYPE html>
-		<html>
-		<head>
-		<meta name="viewport" content="width=device-width">
-		<title>SmartThings Connection</title>
-		<style type="text/css">
-			@font-face {
-				font-family: 'Swiss 721 W01 Thin';
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
-				font-weight: normal;
-				font-style: normal;
-			}
-			@font-face {
-				font-family: 'Swiss 721 W01 Light';
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
-					 url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
-				font-weight: normal;
-				font-style: normal;
-			}
-			.container {
-				width: 280;
-				padding: 20px;
-				text-align: center;
-			}
-			img {
-				vertical-align: middle;
-			}
-			img:nth-child(2) {
-				margin: 0 15px;
-			}
-			p {
-				font-size: 1.2em;
-				font-family: 'Swiss 721 W01 Thin';
-				text-align: center;
-				color: #666666;
-				padding: 0 20px;
-				margin-bottom: 0;
-			}
-			span {
-				font-family: 'Swiss 721 W01 Light';
-			}
-		</style>
-		${redirectHtml}
-		</head>
-		<body>
-			<div class="container">
-				<img src='https://cloud.lifx.com/images/lifx.png' alt='LIFX icon' width='100'/>
-				<img src='https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png' alt='connected device icon' width="40"/>
-				<img src='https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png' alt='SmartThings logo' width="100"/>
-				<p>
-					${message}
-				</p>
-			</div>
-		</body>
-		</html>
-	"""
+        <!DOCTYPE html>
+        <html>
+        <head>
+        <meta name="viewport" content="width=device-width">
+        <title>SmartThings Connection</title>
+        <style type="text/css">
+            @font-face {
+                font-family: 'Swiss 721 W01 Thin';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            @font-face {
+                font-family: 'Swiss 721 W01 Light';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            .container {
+                width: 280;
+                padding: 20px;
+                text-align: center;
+            }
+            img {
+                vertical-align: middle;
+            }
+            img:nth-child(2) {
+                margin: 0 15px;
+            }
+            p {
+                font-size: 1.2em;
+                font-family: 'Swiss 721 W01 Thin';
+                text-align: center;
+                color: #666666;
+                padding: 0 20px;
+                margin-bottom: 0;
+            }
+            span {
+                font-family: 'Swiss 721 W01 Light';
+            }
+        </style>
+        ${redirectHtml}
+        </head>
+        <body>
+            <div class="container">
+                <img src='https://cloud.lifx.com/images/lifx.png' alt='LIFX icon' width='100'/>
+                <img src='https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png' alt='connected device icon' width="40"/>
+                <img src='https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png' alt='SmartThings logo' width="100"/>
+                <p>
+                    ${message}
+                </p>
+            </div>
+        </body>
+        </html>
+    """
 	render contentType: 'text/html', data: html
 }

@@ -237,6 +238,7 @@ String toQueryString(Map m) {
 // App lifecycle hooks

 def installed() {
+	enableCallback() // wtf does this do?
 	if (!state.accessToken) {
 		createAccessToken()
 	} else {
@@ -248,6 +250,7 @@ def installed() {

 // called after settings are changed
 def updated() {
+	enableCallback() // not sure what this does
 	if (!state.accessToken) {
 		createAccessToken()
 	} else {
@@ -301,36 +304,27 @@ def logErrors(options = [errorReturn: null, logObject: log], Closure c) {
 			state.remove("lifxAccessToken")
 			options.logObject.warn "Access token is not valid"
 		}
-		return options.errorReturn
+		return options.errerReturn
 	} catch (java.net.SocketTimeoutException e) {
 		options.logObject.warn "Connection timed out, not much we can do here"
-		return options.errorReturn
+		return options.errerReturn
 	}
 }

 def apiGET(path) {
-	try {
-		httpGet(uri: apiURL(path), headers: apiRequestHeaders()) {response ->
-			logResponse(response)
-			return response
-		}
-	} catch (groovyx.net.http.HttpResponseException e) {
-		logResponse(e.response)
-		return e.response
+	httpGet(uri: apiURL(path), headers: apiRequestHeaders()) {response ->
+		logResponse(response)
+		return response
 	}
 }

 def apiPUT(path, body = [:]) {
-	try {
-		log.debug("Beginning API PUT: ${path}, ${body}")
-		httpPutJson(uri: apiURL(path), body: new groovy.json.JsonBuilder(body).toString(), headers: apiRequestHeaders(), ) {response ->
-			logResponse(response)
-			return response
-		}
-	} catch (groovyx.net.http.HttpResponseException e) {
-		logResponse(e.response)
-		return e.response
-	}}
+	log.debug("Beginning API PUT: ${path}, ${body}")
+	httpPutJson(uri: apiURL(path), body: new groovy.json.JsonBuilder(body).toString(), headers: apiRequestHeaders(), ) {response ->
+		logResponse(response)
+		return response
+	}
+}

 def devicesList(selector = '') {
 	logErrors([]) {
@@ -345,12 +339,12 @@ def devicesList(selector = '') {
 }

 Map locationOptions() {
+
 	def options = [:]
 	def devices = devicesList()
 	devices.each { device ->
 		options[device.location.id] = device.location.name
 	}
-	log.debug("Locations: ${options}")
 	return options
 }

@@ -364,32 +358,28 @@ def updateDevices() {
 		state.devices = [:]
 	}
 	def devices = devicesInLocation()
-	def selectors = []
-
-	log.debug("All selectors: ${selectors}")
-
+	def deviceIds = devices*.id
 	devices.each { device ->
 		def childDevice = getChildDevice(device.id)
-		selectors.add("${device.id}")
 		if (!childDevice) {
-			log.info("Adding device ${device.id}: ${device.product}")
+			log.info("Adding device ${device.id}: ${device.capabilities}")
 			def data = [
 					label: device.label,
-					level: Math.round((device.brightness ?: 1) * 100),
+					level: sprintf("%f", (device.brightness ?: 1) * 100),
 					switch: device.connected ? device.power : "unreachable",
 					colorTemperature: device.color.kelvin
 			]
-			if (device.product.capabilities.has_color) {
+			if (device.capabilities.has_color) {
 				data["color"] = colorUtil.hslToHex((device.color.hue / 3.6) as int, (device.color.saturation * 100) as int)
 				data["hue"] = device.color.hue / 3.6
 				data["saturation"] = device.color.saturation * 100
-				childDevice = addChildDevice(app.namespace, "LIFX Color Bulb", device.id, null, data)
+				childDevice = addChildDevice("smartthings", "LIFX Color Bulb", device.id, null, data)
 			} else {
-				childDevice = addChildDevice(app.namespace, "LIFX White Bulb", device.id, null, data)
+				childDevice = addChildDevice("smartthings", "LIFX White Bulb", device.id, null, data)
 			}
 		}
 	}
-	getChildDevices().findAll { !selectors.contains("${it.deviceNetworkId}") }.each {
+	getChildDevices().findAll { !deviceIds.contains(it.deviceNetworkId) }.each {
 		log.info("Deleting ${it.deviceNetworkId}")
 		deleteChildDevice(it.deviceNetworkId)
 	}
@@ -401,4 +391,4 @@ def refreshDevices() {
 	getChildDevices().each { device ->
 		device.refresh()
 	}
-}
+}
--- a/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
+++ b/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
@@ -34,7 +34,7 @@
 *  locks                | lock              | lock, unlock                | locked, unlocked
 *  ---------------------+-------------------+-----------------------------+------------------------------------
 */
-
+ 
 definition(
    name: "Logitech Harmony (Connect)",
    namespace: "smartthings",
@@ -43,11 +43,11 @@ definition(
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/harmony.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/harmony%402x.png",
-    oauth: [displayName: "Logitech Harmony", displayLink: "http://www.logitech.com/en-us/harmony-remotes"],
-    singleInstance: true
+    oauth: [displayName: "Logitech Harmony", displayLink: "http://www.logitech.com/en-us/harmony-remotes"]    
 ){
 	appSetting "clientId"
 	appSetting "clientSecret"
+	appSetting "callbackUrl"
 }

 preferences(oauthPage: "deviceAuthorization") {
@@ -89,18 +89,16 @@ mappings {
 }

 def getServerUrl() { return "https://graph.api.smartthings.com" }
-def getCallbackUrl() { "https://graph.api.smartthings.com/oauth/callback" }
-def getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${apiServerUrl}" }

 def authPage() {
-    def description = null
+    def description = null          
    if (!state.HarmonyAccessToken) {
 		if (!state.accessToken) {
 			log.debug "About to create access token"
 			createAccessToken()
 		}
        description = "Click to enter Harmony Credentials"
-        def redirectUrl = buildRedirectUrl
+        def redirectUrl = "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}"
        return dynamicPage(name: "Credentials", title: "Harmony", nextPage: null, uninstall: true, install:false) {
               section { href url:redirectUrl, style:"embedded", required:true, title:"Harmony", description:description }
        }
@@ -112,7 +110,7 @@ def authPage() {

 		def huboptions = state.HarmonyHubs ?: []
 		def actoptions = state.HarmonyActivities ?: []
-
+        
 		def numFoundHub = huboptions.size() ?: 0
        def numFoundAct = actoptions.size() ?: 0
 		if((deviceRefreshCount % 5) == 0) {
@@ -122,14 +120,13 @@ def authPage() {
 			section("Please wait while we discover your Harmony Hubs and Activities. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 				input "selectedhubs", "enum", required:false, title:"Select Harmony Hubs (${numFoundHub} found)", multiple:true, options:huboptions
 			}
-            // Virtual activity flag
-            if (numFoundHub > 0 && numFoundAct > 0 && true)
+            if (numFoundHub > 0 && numFoundAct > 0 && false)
 			section("You can also add activities as virtual switches for other convenient integrations") {
 				input "selectedactivities", "enum", required:false, title:"Select Harmony Activities (${numFoundAct} found)", multiple:true, options:actoptions
-			}
+			}     
            if (state.resethub)
-			section("Connection to the hub timed out. Please restart the hub and try again.") {}
-		}
+			section("Connection to the hub timed out. Please restart the hub and try again.") {}     
+		}                       
    }
 }

@@ -141,7 +138,7 @@ def callback() {
 	} else {
 		log.warn "No authQueryString"
 	}
-
+	
 	if (state.HarmonyAccessToken) {
 		log.debug "Access token already exists"
 		discovery()
@@ -166,8 +163,8 @@ def callback() {

 def init() {
 	log.debug "Requesting Code"
-	def oauthParams = [client_id: "${appSettings.clientId}", scope: "remote", response_type: "code", redirect_uri: "${callbackUrl}" ]
-	redirect(location: "https://home.myharmony.com/oauth2/authorize?${toQueryString(oauthParams)}")
+    def oauthParams = [client_id: "${appSettings.clientId}", scope: "remote", response_type: "code", redirect_uri: "${appSettings.callbackUrl}" ]
+    redirect(location: "https://home.myharmony.com/oauth2/authorize?${toQueryString(oauthParams)}")
 }

 def receiveToken(redirectUrl = null) {
@@ -177,7 +174,7 @@ def receiveToken(redirectUrl = null) {
      uri: "https://home.myharmony.com/oauth2/token?${toQueryString(oauthParams)}",
    ]
 	try {
-        httpPost(params) { response ->
+        httpPost(params) { response -> 
            state.HarmonyAccessToken = response.data.access_token
        }
 	} catch (java.util.concurrent.TimeoutException e) {
@@ -224,7 +221,7 @@ def connectionStatus(message, redirectUrl = null) {
 			<meta http-equiv="refresh" content="3; url=${redirectUrl}" />
 		"""
 	}
-
+	
    def html = """
        <!DOCTYPE html>
        <html>
@@ -305,28 +302,30 @@ def buildRedirectUrl(page) {
 }

 def installed() {
+	enableCallback()	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
 		createAccessToken()
-	} else {
+	} else {	
 		initialize()
 	}
 }

 def updated() {
 	unsubscribe()
-  unschedule()
+    unschedule()
+	enableCallback()	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
 		createAccessToken()
-	} else {
+	} else {	
 		initialize()
-	}
+	}   
 }

 def uninstalled() {
 	if (state.HarmonyAccessToken) {
-		try {
+		try {	
        	state.HarmonyAccessToken = ""
        	log.debug "Success disconnecting Harmony from SmartThings"
 		} catch (groovyx.net.http.HttpResponseException e) {
@@ -340,7 +339,7 @@ def initialize() {
 	if (selectedhubs || selectedactivities) {
 		addDevice()
        runEvery5Minutes("discovery")
-	}
+	}	
 }

 def getHarmonydevices() {
@@ -360,20 +359,20 @@ Map discoverDevices() {
            def hubname = getHubName(it.key)
            def hubvalue = "${hubname}"
            hubs["harmony-${hubkey}"] = hubvalue
-        	it.value.response.data.activities.each {
+        	it.value.response.data.activities.each { 
                def value = "${it.value.name}"
                def key = "harmony-${hubkey}-${it.key}"
                activities["${key}"] = value
-           }
+           }            
        }
        state.HarmonyHubs = hubs
-        state.HarmonyActivities = activities
-    }
+        state.HarmonyActivities = activities              
+    }    
 }

 //CHILD DEVICE METHODS
 def discovery() {
-    def Params = [auth: state.HarmonyAccessToken]
+    def Params = [auth: state.HarmonyAccessToken]	    
    def url = "https://home.myharmony.com/cloudapi/activity/all?${toQueryString(Params)}"
 	try {
 		httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
@@ -385,11 +384,11 @@ def discovery() {
                poll()
 	        } else {
            	log.debug "Error: $response.status"
-            }
+            }    
 	    }
 	} catch (groovyx.net.http.HttpResponseException e) {
        if (e.statusCode == 401) { // token is expired
-            state.remove("HarmonyAccessToken")
+            state.remove("HarmonyAccessToken")        
            log.warn "Harmony Access token has expired"
        }
 	} catch (java.net.SocketTimeoutException e) {
@@ -397,12 +396,12 @@ def discovery() {
        state.resethub = true
 	} catch (e) {
 		log.warn "Hostname in certificate didn't match. Please try again later."
-	}
+	}	          
    return null
 }

 def addDevice() {
-    log.trace "Adding Hubs"
+    log.trace "Adding Hubs" 
    selectedhubs.each { dni ->
        def d = getChildDevice(dni)
        if(!d) {
@@ -413,8 +412,8 @@ def addDevice() {
        } else {
            log.trace "found ${d.displayName} with id $dni already exists"
        }
-    }
-    log.trace "Adding Activities"
+    }  
+    log.trace "Adding Activities" 
    selectedactivities.each { dni ->
        def d = getChildDevice(dni)
        if(!d) {
@@ -425,7 +424,7 @@ def addDevice() {
        } else {
            log.trace "found ${d.displayName} with id $dni already exists"
        }
-    }
+    }    
 }

 def activity(dni,mode) {
@@ -433,26 +432,26 @@ def activity(dni,mode) {
    def msg = "Command failed"
    def url = ''
    if (dni == "all") {
-        url = "https://home.myharmony.com/cloudapi/activity/off?${toQueryString(Params)}"
-    } else {
+        url = "https://home.myharmony.com/cloudapi/activity/off?${toQueryString(Params)}"  
+    } else {    
        def aux = dni.split('-')
        def hubId = aux[1]
-        if (mode == "hub" || (aux.size() <= 2) || (aux[2] == "off")){
-        	url = "https://home.myharmony.com/cloudapi/hub/${hubId}/activity/off?${toQueryString(Params)}"
+        if (mode == "hub" || (aux.size() <= 2) || (aux[2] == "off")){	
+        	url = "https://home.myharmony.com/cloudapi/hub/${hubId}/activity/off?${toQueryString(Params)}" 
        } else {
            def activityId = aux[2]
        	url = "https://home.myharmony.com/cloudapi/hub/${hubId}/activity/${activityId}/${mode}?${toQueryString(Params)}"
        }
-	}
+	}     
 	try {
-    	httpPostJson(uri: url) { response ->
+    	httpPostJson(uri: url) { response -> 
        	if (response.data.code == 200 || dni == "all") {
            	msg = "Command sent succesfully"
-            	state.aux = 0
+            	state.aux = 0 
            } else {
            	msg = "Command failed. Error: $response.data.code"
            }
-		}
+		} 
    } catch (groovyx.net.http.HttpResponseException ex) {
        log.error ex
        if (state.aux == 0) {
@@ -460,7 +459,7 @@ def activity(dni,mode) {
        	activity(dni,mode)
        } else {
        	msg = ex
-            state.aux = 0
+            state.aux = 0 
        }
    } catch(Exception ex) {
    	msg = ex
@@ -473,10 +472,10 @@ def poll() {
 	// GET THE LIST OF ACTIVITIES
    if (state.HarmonyAccessToken) {
    	getActivityList()
-        def Params = [auth: state.HarmonyAccessToken]
+        def Params = [auth: state.HarmonyAccessToken]	    
        def url = "https://home.myharmony.com/cloudapi/state?${toQueryString(Params)}"
        try {
-            httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
+            httpGet(uri: url, headers: ["Accept": "application/json"]) {response -> 
                def map = [:]
                response.data.hubs.each {
 		            if (it.value.message == "OK") {
@@ -489,20 +488,20 @@ def poll() {
 	                            def currentActivity = getActivityName(it.value.response.data.currentAvActivity,it.key)
 	                            hub.sendEvent(name: "currentActivity", value: currentActivity, descriptionText: "Current activity is ${currentActivity}", display: false)
 	                        }
-	                    }
+	                    }   
 	                } else {
 		                log.trace it.value.message
-	                }
+	                }   
                }
-                def activities = getChildDevices()
+                def activities = getChildDevices() 
                def activitynotrunning = true
                activities.each { activity ->
-                    def act = activity.deviceNetworkId.split('-')
+                    def act = activity.deviceNetworkId.split('-') 
                    if (act.size() > 2) {
                        def aux = map.find { it.key == act[1] }
                        if (aux) {
                            def aux2 = aux.value.split(',')
-                            def childDevice = getChildDevice(activity.deviceNetworkId)
+                            def childDevice = getChildDevice(activity.deviceNetworkId)                   
                            if ((act[2] == aux2[0]) && (aux2[1] == "1" || aux2[1] == "2")) {
                                childDevice?.sendEvent(name: "switch", value: "on")
                                if (aux2[1] == "1")
@@ -512,30 +511,30 @@ def poll() {
                                if (aux2[1] == "3")
                                    runIn(5, "poll", [overwrite: true])
                            }
-                        }
-                    }
+                        } 
+                    }    
                }
                return "Poll completed $map - $state.hubs"
            }
        } catch (groovyx.net.http.HttpResponseException e) {
            if (e.statusCode == 401) { // token is expired
-                state.remove("HarmonyAccessToken")
+                state.remove("HarmonyAccessToken")        
                return "Harmony Access token has expired"
-            }
+            }    
 		} catch(Exception e) {
        	log.trace e
 		}
-	}
+	}        
 }


 def getActivityList() {
 	// GET ACTIVITY'S NAME
    if (state.HarmonyAccessToken) {
-        def Params = [auth: state.HarmonyAccessToken]
+        def Params = [auth: state.HarmonyAccessToken]	    
        def url = "https://home.myharmony.com/cloudapi/activity/all?${toQueryString(Params)}"
        try {
-            httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
+            httpGet(uri: url, headers: ["Accept": "application/json"]) {response -> 
                response.data.hubs.each {
                    def hub = getChildDevice("harmony-${it.key}")
                    if (hub) {
@@ -548,10 +547,10 @@ def getActivityList() {
                            }
                            activities += [id: "off", name: "Activity OFF", type: "0"]
                            log.trace activities
-                        }
-                        hub.sendEvent(name: "activities", value: new groovy.json.JsonBuilder(activities).toString(), descriptionText: "Activities are ${activities.collect { it.name }?.join(', ')}", display: false)
+                        }    
+                        hub.sendEvent(name: "activities", value: new groovy.json.JsonBuilder(activities).toString(), descriptionText: "Activities are ${activities.collect { it.name }?.join(', ')}", display: false)   		
 					}
-                }
+                }    
            }
        } catch (groovyx.net.http.HttpResponseException e) {
        	log.trace e
@@ -560,7 +559,7 @@ def getActivityList() {
 		} catch(Exception e) {
        	log.trace e
 		}
-    }
+    }    
 	return activity
 }

@@ -568,16 +567,16 @@ def getActivityName(activity,hubId) {
 	// GET ACTIVITY'S NAME
    def actname = activity
    if (state.HarmonyAccessToken) {
-        def Params = [auth: state.HarmonyAccessToken]
+        def Params = [auth: state.HarmonyAccessToken]	    
        def url = "https://home.myharmony.com/cloudapi/hub/${hubId}/activity/all?${toQueryString(Params)}"
        try {
-            httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
+            httpGet(uri: url, headers: ["Accept": "application/json"]) {response -> 
                actname = response.data.data.activities[activity].name
            }
 		} catch(Exception e) {
        	log.trace e
 		}
-    }
+    }    
 	return actname
 }

@@ -585,19 +584,19 @@ def getActivityId(activity,hubId) {
 	// GET ACTIVITY'S NAME
    def actid = activity
    if (state.HarmonyAccessToken) {
-        def Params = [auth: state.HarmonyAccessToken]
+        def Params = [auth: state.HarmonyAccessToken]	    
        def url = "https://home.myharmony.com/cloudapi/hub/${hubId}/activity/all?${toQueryString(Params)}"
        try {
-            httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
+            httpGet(uri: url, headers: ["Accept": "application/json"]) {response -> 
            	response.data.data.activities.each {
                	if (it.value.name == activity)
                		actid = it.key
-                }
+                }   
            }
 		} catch(Exception e) {
        	log.trace e
 		}
-    }
+    }    
 	return actid
 }

@@ -605,16 +604,16 @@ def getHubName(hubId) {
 	// GET HUB'S NAME
    def hubname = hubId
    if (state.HarmonyAccessToken) {
-        def Params = [auth: state.HarmonyAccessToken]
+        def Params = [auth: state.HarmonyAccessToken]	    
        def url = "https://home.myharmony.com/cloudapi/hub/${hubId}/discover?${toQueryString(Params)}"
        try {
-            httpGet(uri: url, headers: ["Accept": "application/json"]) {response ->
+            httpGet(uri: url, headers: ["Accept": "application/json"]) {response -> 
                hubname = response.data.data.name
            }
 		} catch(Exception e) {
        	log.trace e
-		}
-    }
+		}     
+    }    
 	return hubname
 }

@@ -625,8 +624,8 @@ def sendNotification(msg) {
 def hookEventHandler() {
    // log.debug "In hookEventHandler method."
    log.debug "request = ${request}"
-
-    def json = request.JSON
+    
+    def json = request.JSON 

 	def html = """{"code":200,"message":"OK"}"""
 	render contentType: 'application/json', data: html
@@ -660,16 +659,12 @@ def updateDevice() {
 	} else {
 		def device = allDevices.find { it.id == params.id }
 		if (device) {
-        	if (device.hasCommand("$command")) {
-                if (arguments) {
-                    device."$command"(*arguments)
-                } else {
-                    device."$command"()
-                }
-                render status: 204, data: "{}"
-           	} else {
-				render status: 404, data: '{"msg": "Command not supported by this Device"}'
+			if (arguments) {
+				device."$command"(*arguments)
+			} else {
+				device."$command"()
 			}
+			render status: 204, data: "{}"
 		} else {
 			render status: 404, data: '{"msg": "Device not found"}'
 		}
--- a/smartapps/smartthings/samsung-tv-connect.src/samsung-tv-connect.groovy
+++ b/smartapps/smartthings/samsung-tv-connect.src/samsung-tv-connect.groovy
@@ -22,8 +22,7 @@ definition(
 	description: "Allows you to control your Samsung TV from the SmartThings app. Perform basic functions like power Off, source, volume, channels and other remote control functions.",
 	category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Samsung/samsung-remote%402x.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Samsung/samsung-remote%403x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Samsung/samsung-remote%403x.png"
 )

 preferences {
--- a/smartapps/smartthings/send-ham-bridge-command-when.src/send-ham-bridge-command-when.groovy
+++ b/smartapps/smartthings/send-ham-bridge-command-when.src/send-ham-bridge-command-when.groovy
@@ -16,8 +16,8 @@
 *
 */
 definition(
-    name: "Send HAM Bridge Command When",
-    namespace: "smartthings",
+    name: "Send HAM Bridge Command When…",
+    namespace: "soletc.com",
    author: "Scottin Pollock",
    description: "Sends a command to your HAM Bridge server when SmartThings are activated.",
    category: "Convenience",
@@ -25,6 +25,7 @@ definition(
    iconX2Url: "http://solutionsetcetera.com/stuff/STIcons/HB@2x.png"
 )

+
 preferences {
 	section("Choose one or more, when..."){
 		input "motion", "capability.motionSensor", title: "Motion Here", required: false, multiple: true
--- a/smartapps/smartthings/speaker-control.src/speaker-control.groovy
+++ b/smartapps/smartthings/speaker-control.src/speaker-control.groovy
@@ -10,24 +10,24 @@
 *  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.
 *
- *  Speaker Control
+ *  Sonos Control
 *
 *  Author: SmartThings
 *
 *  Date: 2013-12-10
 */
 definition(
-    name: "Speaker Control",
+    name: "Sonos Control",
    namespace: "smartthings",
    author: "SmartThings",
-    description: "Play or pause your Speaker when certain actions take place in your home.",
+    description: "Play or pause your Sonos when certain actions take place in your home.",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos@2x.png"
 )

 preferences {
-	page(name: "mainPage", title: "Control your Speaker when something happens", install: true, uninstall: true)
+	page(name: "mainPage", title: "Control your Sonos when something happens", install: true, uninstall: true)
 	page(name: "timeIntervalInput", title: "Only during a certain time") {
 		section {
 			input "starting", "time", title: "Starting", required: false
@@ -81,7 +81,7 @@ def mainPage() {
 			]
 		}
 		section {
-			input "sonos", "capability.musicPlayer", title: "Speaker music player", required: true
+			input "sonos", "capability.musicPlayer", title: "Sonos music player", required: true
 		}
 		section("More options", hideable: true, hidden: true) {
 			input "volume", "number", title: "Set the volume volume", description: "0-100%", required: false
--- a/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy
+++ b/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy
@@ -10,7 +10,7 @@
 *  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.
 *
- *  Speaker Mood Music
+ *  Sonos Mood Music
 *
 *  Author: SmartThings
 *  Date: 2014-02-12
@@ -65,7 +65,7 @@ private saveSelectedSong() {
 }

 definition(
-    name: "Speaker Mood Music",
+    name: "Sonos Mood Music",
    namespace: "smartthings",
    author: "SmartThings",
    description: "Plays a selected song or station.",
@@ -75,7 +75,7 @@ definition(
 )

 preferences {
-	page(name: "mainPage", title: "Play a selected song or station on your Speaker when something happens", nextPage: "chooseTrack", uninstall: true)
+	page(name: "mainPage", title: "Play a selected song or station on your Sonos when something happens", nextPage: "chooseTrack", uninstall: true)
 	page(name: "chooseTrack", title: "Select a song", install: true)
 	page(name: "timeIntervalInput", title: "Only during a certain time") {
 		section {
@@ -125,7 +125,7 @@ def mainPage() {
 			ifUnset "timeOfDay", "time", title: "At a Scheduled Time", required: false
 		}
 		section {
-			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
+			input "sonos", "capability.musicPlayer", title: "On this Sonos player", required: true
 		}
 		section("More options", hideable: true, hidden: true) {
 			input "volume", "number", title: "Set the volume", description: "0-100%", required: false
--- a/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy
+++ b/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy
@@ -10,23 +10,23 @@
 *  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.
 *
- *  Speaker Custom Message
+ *  Sonos Custom Message
 *
 *  Author: SmartThings
 *  Date: 2014-1-29
 */
 definition(
-	name: "Speaker Notify with Sound",
+	name: "Sonos Notify with Sound",
 	namespace: "smartthings",
 	author: "SmartThings",
-	description: "Play a sound or custom message through your Speaker when the mode changes or other events occur.",
+	description: "Play a sound or custom message through your Sonos when the mode changes or other events occur.",
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos@2x.png"
 )

 preferences {
-	page(name: "mainPage", title: "Play a message on your Speaker when something happens", install: true, uninstall: true)
+	page(name: "mainPage", title: "Play a message on your Sonos when something happens", install: true, uninstall: true)
 	page(name: "chooseTrack", title: "Select a song or station")
 	page(name: "timeIntervalInput", title: "Only during a certain time") {
 		section {
@@ -92,7 +92,7 @@ def mainPage() {
 			input "message","text",title:"Play this message", required:false, multiple: false
 		}
 		section {
-			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
+			input "sonos", "capability.musicPlayer", title: "On this Sonos player", required: true
 		}
 		section("More options", hideable: true, hidden: true) {
 			input "resumePlaying", "bool", title: "Resume currently playing music after notification", required: false, defaultValue: true
--- a/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy
+++ b/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy
@@ -10,23 +10,23 @@
 *  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.
 *
- *  Speaker Weather Forecast
+ *  Sonos Weather Forecast
 *
 *  Author: SmartThings
 *  Date: 2014-1-29
 */
 definition(
-    name: "Speaker Weather Forecast",
+    name: "Sonos Weather Forecast",
    namespace: "smartthings",
    author: "SmartThings",
-    description: "Play a weather report through your Speaker when the mode changes or other events occur",
+    description: "Play a weather report through your Sonos when the mode changes or other events occur",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/sonos@2x.png"
 )

 preferences {
-	page(name: "mainPage", title: "Play the weather report on your speaker", install: true, uninstall: true)
+	page(name: "mainPage", title: "Play the weather report on your sonos", install: true, uninstall: true)
 	page(name: "chooseTrack", title: "Select a song or station")
 	page(name: "timeIntervalInput", title: "Only during a certain time") {
 		section {
@@ -85,7 +85,7 @@ def mainPage() {
 			)
 		}
 		section {
-			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
+			input "sonos", "capability.musicPlayer", title: "On this Sonos player", required: true
 		}
 		section("More options", hideable: true, hidden: true) {
 			input "resumePlaying", "bool", title: "Resume currently playing music after weather report finishes", required: false, defaultValue: true
--- a/smartapps/smartthings/tesla-connect.src/tesla-connect.groovy
+++ b/smartapps/smartthings/tesla-connect.src/tesla-connect.groovy
@@ -23,8 +23,7 @@ definition(
    description: "Integrate your Tesla car with SmartThings.",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/tesla-app%402x.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/tesla-app%403x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/tesla-app%403x.png"
 )

 preferences {
--- a/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
+++ b/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
@@ -22,8 +22,7 @@ definition(
    description: "Allows you to integrate your WeMo Switch and Wemo Motion sensor with SmartThings.",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo@2x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo@2x.png"
 )

 preferences {
@@ -62,7 +61,10 @@ def firstPage()

 		log.debug "REFRESH COUNT :: ${refreshCount}"

-		subscribe(location, null, locationHandler, [filterEvents:false])
+		if(!state.subscribe) {
+			subscribe(location, null, locationHandler, [filterEvents:false])
+			state.subscribe = true
+		}

 		//ssdp request every 25 seconds
 		if((refreshCount % 5) == 0) {
@@ -78,7 +80,7 @@ def firstPage()
 		def motionsDiscovered = motionsDiscovered()
 		def lightSwitchesDiscovered = lightSwitchesDiscovered()

-		return dynamicPage(name:"firstPage", title:"Discovery Started!", nextPage:"", refreshInterval: refreshInterval, install:true, uninstall: true) {
+		return dynamicPage(name:"firstPage", title:"Discovery Started!", nextPage:"", refreshInterval: refreshInterval, install:true, uninstall: selectedSwitches != null || selectedMotions != null || selectedLightSwitches != null) {
 			section("Select a device...") {
 				input "selectedSwitches", "enum", required:false, title:"Select Wemo Switches \n(${switchesDiscovered.size() ?: 0} found)", multiple:true, options:switchesDiscovered
 				input "selectedMotions", "enum", required:false, title:"Select Wemo Motions \n(${motionsDiscovered.size() ?: 0} found)", multiple:true, options:motionsDiscovered
@@ -166,30 +168,21 @@ def getWemoLightSwitches()
 def installed() {
 	log.debug "Installed with settings: ${settings}"
 	initialize()
+
+	runIn(5, "subscribeToDevices") //initial subscriptions delayed by 5 seconds
+	runIn(10, "refreshDevices") //refresh devices, delayed by 10 seconds
+	runIn(900, "doDeviceSync" , [overwrite: false]) //setup ip:port syncing every 15 minutes
+
+	// SUBSCRIBE responses come back with TIMEOUT-1801 (30 minutes), so we refresh things a bit before they expire (29 minutes)
+	runIn(1740, "refresh", [overwrite: false])
 }

 def updated() {
 	log.debug "Updated with settings: ${settings}"
 	initialize()
-}

-def initialize() {
-	unsubscribe()
-    unschedule()
-	subscribe(location, null, locationHandler, [filterEvents:false])
-
-	if (selectedSwitches)
-		addSwitches()
-
-	if (selectedMotions)
-		addMotions()
-
-	if (selectedLightSwitches)
-		addLightSwitches()
-
-	runIn(5, "subscribeToDevices") //initial subscriptions delayed by 5 seconds
-	runIn(10, "refreshDevices") //refresh devices, delayed by 10 seconds
-    runEvery5Minutes("refresh")
+	runIn(5, "subscribeToDevices") //subscribe again to new/old devices wait 5 seconds
+	runIn(10, "refreshDevices") //refresh devices again, delayed by 10 seconds
 }

 def resubscribe() {
@@ -199,7 +192,8 @@ def resubscribe() {

 def refresh() {
 	log.debug "refresh() called"
-    doDeviceSync()
+	//reschedule the refreshes
+	runIn(1740, "refresh", [overwrite: false])
 	refreshDevices()
 }

@@ -242,8 +236,7 @@ def addSwitches() {
 							"port": selectedSwitch.value.port
 					]
 			])
-      def ipvalue = convertHexToIP(selectedSwitch.value.ip)
-			d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
+
 			log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
@@ -273,9 +266,8 @@ def addMotions() {
 					"port": selectedMotion.value.port
 				]
 			])
-      def ipvalue = convertHexToIP(selectedMotion.value.ip)
-      d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
-      log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
+
+			log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
 		}
@@ -304,8 +296,7 @@ def addLightSwitches() {
 					"port": selectedLightSwitch.value.port
 				]
 			])
-      def ipvalue = convertHexToIP(selectedLightSwitch.value.ip)
-      d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
+
 			log.debug "created ${d.displayName} with id $dni"
 		} else {
 		   log.debug "found ${d.displayName} with id $dni already exists"
@@ -313,6 +304,27 @@ def addLightSwitches() {
 	}
 }

+def initialize() {
+	// remove location subscription afterwards
+	 unsubscribe()
+	 state.subscribe = false
+
+	if (selectedSwitches)
+	{
+		addSwitches()
+	}
+
+	if (selectedMotions)
+	{
+		addMotions()
+	}
+
+	if (selectedLightSwitches)
+	{
+		addLightSwitches()
+	}
+}
+
 def locationHandler(evt) {
 	def description = evt.description
 	def hub = evt?.hubId
@@ -321,32 +333,53 @@ def locationHandler(evt) {
    log.debug parsedEvent

 	if (parsedEvent?.ssdpTerm?.contains("Belkin:device:controllee") || parsedEvent?.ssdpTerm?.contains("Belkin:device:insight")) {
+
 		def switches = getWemoSwitches()
-		if (!(switches."${parsedEvent.ssdpUSN.toString()}")) {
-        	//if it doesn't already exist
+
+		if (!(switches."${parsedEvent.ssdpUSN.toString()}"))
+		{ //if it doesn't already exist
 			switches << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-		} else {
+		}
+		else
+		{ // just update the values
+
 			log.debug "Device was already found in state..."
+
 			def d = switches."${parsedEvent.ssdpUSN.toString()}"
 			boolean deviceChangedValues = false
-			log.debug "$d.ip <==> $parsedEvent.ip"
+
 			if(d.ip != parsedEvent.ip || d.port != parsedEvent.port) {
 				d.ip = parsedEvent.ip
 				d.port = parsedEvent.port
 				deviceChangedValues = true
 				log.debug "Device's port or ip changed..."
-                def child = getChildDevice(parsedEvent.mac)
-				child.subscribe(parsedEvent.ip, parsedEvent.port)
-                child.poll()
 			}
+
+			if (deviceChangedValues) {
+				def children = getChildDevices()
+				log.debug "Found children ${children}"
+				children.each {
+					if (it.getDeviceDataByName("mac") == parsedEvent.mac) {
+						log.debug "updating ip and port, and resubscribing, for device ${it} with mac ${parsedEvent.mac}"
+						it.subscribe(parsedEvent.ip, parsedEvent.port)
+					}
+				}
+			}
+
 		}
+
 	}
 	else if (parsedEvent?.ssdpTerm?.contains("Belkin:device:sensor")) {
+
 		def motions = getWemoMotions()
-		if (!(motions."${parsedEvent.ssdpUSN.toString()}")) {
-        	//if it doesn't already exist
+
+		if (!(motions."${parsedEvent.ssdpUSN.toString()}"))
+		{ //if it doesn't already exist
 			motions << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-		} else { // just update the values
+		}
+		else
+		{ // just update the values
+
 			log.debug "Device was already found in state..."

 			def d = motions."${parsedEvent.ssdpUSN.toString()}"
@@ -379,7 +412,10 @@ def locationHandler(evt) {
 		if (!(lightSwitches."${parsedEvent.ssdpUSN.toString()}"))
 		{ //if it doesn't already exist
 			lightSwitches << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-		} else {
+		}
+		else
+		{ // just update the values
+
 			log.debug "Device was already found in state..."

 			def d = lightSwitches."${parsedEvent.ssdpUSN.toString()}"
@@ -390,11 +426,21 @@ def locationHandler(evt) {
 				d.port = parsedEvent.port
 				deviceChangedValues = true
 				log.debug "Device's port or ip changed..."
-				def child = getChildDevice(parsedEvent.mac)
-				log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
-				child.subscribe(parsedEvent.ip, parsedEvent.port)
 			}
+
+			if (deviceChangedValues) {
+				def children = getChildDevices()
+				log.debug "Found children ${children}"
+				children.each {
+					if (it.getDeviceDataByName("mac") == parsedEvent.mac) {
+						log.debug "updating ip and port, and resubscribing, for device ${it} with mac ${parsedEvent.mac}"
+						it.subscribe(parsedEvent.ip, parsedEvent.port)
+					}
+				}
+			}
+
 		}
+
 	}
 	else if (parsedEvent.headers && parsedEvent.body) {
 		String headerString = new String(parsedEvent.headers.decodeBase64())?.toLowerCase()
@@ -534,30 +580,73 @@ private def parseDiscoveryMessage(String description) {
 			}
 		}
 	}
+
 	device
 }

 def doDeviceSync(){
 	log.debug "Doing Device Sync!"
+	runIn(900, "doDeviceSync" , [overwrite: false]) //schedule to run again in 15 minutes
+
+	if(!state.subscribe) {
+		subscribe(location, null, locationHandler, [filterEvents:false])
+		state.subscribe = true
+	}
+
 	discoverAllWemoTypes()
 }

-private String convertHexToIP(hex) {
-	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+def pollChildren() {
+	def devices = getAllChildDevices()
+	devices.each { d ->
+		//only poll switches?
+		d.poll()
+	}
 }

-private Integer convertHexToInt(hex) {
-	Integer.parseInt(hex,16)
+def delayPoll() {
+	log.debug "Executing 'delayPoll'"
+
+	runIn(5, "pollChildren")
 }

-private Boolean canInstallLabs() {
+/*def poll() {
+	log.debug "Executing 'poll'"
+	runIn(600, "poll", [overwrite: false]) //schedule to run again in 10 minutes
+
+	def lastPoll = getLastPollTime()
+	def currentTime = now()
+	def lastPollDiff = currentTime - lastPoll
+	log.debug "lastPoll: $lastPoll, currentTime: $currentTime, lastPollDiff: $lastPollDiff"
+	setLastPollTime(currentTime)
+
+	doDeviceSync()
+}
+
+
+def setLastPollTime(currentTime) {
+	state.lastpoll = currentTime
+}
+
+def getLastPollTime() {
+	state.lastpoll ?: now()
+}
+
+def now() {
+	new Date().getTime()
+}*/
+
+private Boolean canInstallLabs()
+{
 	return hasAllHubsOver("000.011.00603")
 }

-private Boolean hasAllHubsOver(String desiredFirmware) {
+private Boolean hasAllHubsOver(String desiredFirmware)
+{
 	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
 }

-private List getRealHubFirmwareVersions() {
+private List getRealHubFirmwareVersions()
+{
 	return location.hubs*.firmwareVersionString.findAll { it }
 }
--- a/smartapps/smartthings/withings.src/withings.groovy
+++ b/smartapps/smartthings/withings.src/withings.groovy
@@ -24,8 +24,7 @@ definition(
    category: "Connections",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/withings.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/withings%402x.png",
-    oauth: true,
-    singleInstance: true
+    oauth: true
 ) {
 	appSetting "clientId"
 	appSetting "clientSecret"
--- a/smartapps/smartthings/yoics-connect.src/yoics-connect.groovy
+++ b/smartapps/smartthings/yoics-connect.src/yoics-connect.groovy
@@ -24,8 +24,7 @@ definition(
    category: "SmartThings Internal",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience%402x.png",
-    oauth: true,
-    singleInstance: true
+    oauth: true
 ) {
  appSetting "serverUrl"
 }
--- a/smartapps/sprayercontroller/sprayer-controller-2.src/sprayer-controller-2.groovy
+++ b/smartapps/sprayercontroller/sprayer-controller-2.src/sprayer-controller-2.groovy
@@ -15,7 +15,7 @@
 */
 definition(
    name: "Sprayer Controller 2",
-    namespace: "sprayercontroller",
+    namespace: "",
    author: "Cooper Lee",
    description: "Control Sprayers for a period of time a number of times per hour",
    category: "My Apps",
--- a/smartapps/tslagle13/routine-director.src/routine-director.groovy
+++ b/smartapps/tslagle13/routine-director.src/routine-director.groovy
@@ -50,7 +50,7 @@ preferences {
        }
        section("Send Notifications?") {
            input("recipients", "contact", title: "Send notifications to") {
-                input "phone", "phone", title: "Send an SMS to this number?", required:false
+                input "phone", "phone", title: "Send an SMS to this number?"
            }
        }

@@ -266,9 +266,7 @@ def sendAway(msg) {
        }
        else {
        	sendPush(msg)
-        	if(phone){
-            		sendSms(phone, msg)
-        	}	
+            sendSms(phone, msg)
        }    
    }

@@ -282,9 +280,7 @@ def sendHome(msg) {
        }
        else {
        	sendPush(msg)
-                if(phone){
-            		sendSms(phone, msg)
-        	}
+            sendSms(phone, msg)
        }    
    }

@@ -343,4 +339,4 @@ private getTimeIntervalLabel() {

 private hideOptionsSection() {
    (starting || ending || days || modes) ? false: true
-}
+}
--- a/smartapps/wackford/quirky-connect.src/quirky-connect.groovy
+++ b/smartapps/wackford/quirky-connect.src/quirky-connect.groovy
@@ -58,8 +58,7 @@ definition(
    description: "Connect your Quirky to SmartThings.",
    category: "SmartThings Labs",
    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/quirky.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/quirky@2x.png",
-    singleInstance: true
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/quirky@2x.png"
 ) {
 	appSetting "clientId"
 	appSetting "clientSecret"
--- a/smartapps/wackford/tcp-bulbs-connect.src/tcp-bulbs-connect.groovy
+++ b/smartapps/wackford/tcp-bulbs-connect.src/tcp-bulbs-connect.groovy
@@ -25,8 +25,7 @@ definition(
 	description: "Connect your TCP bulbs to SmartThings using Cloud to Cloud integration. You must create a remote login acct on TCP Mobile App.",
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/tcp.png",
-	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/tcp@2x.png",
-	singleInstance: true
+	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/tcp@2x.png"
 )