diff --git a/devicetypes/kriskit-trendsetter/color-temperature-light-group-device.src/color-temperature-light-group-device.groovy b/devicetypes/kriskit-trendsetter/color-temperature-light-group-device.src/color-temperature-light-group-device.groovy
index 3318b63..db0f38f 100644
--- a/devicetypes/kriskit-trendsetter/color-temperature-light-group-device.src/color-temperature-light-group-device.groovy
+++ b/devicetypes/kriskit-trendsetter/color-temperature-light-group-device.src/color-temperature-light-group-device.groovy
@@ -207,7 +207,7 @@ def setLevel(val, triggerGroup) {
     }
         
     sendEvent(name: "level", value: val, isStateChange: true)
-    sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
+    sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)
     
     if (triggerGroup)
     	parent.performGroupCommand("setLevel", [val])
diff --git a/devicetypes/kriskit-trendsetter/colorful-light-group-device.src/colorful-light-group-device.groovy b/devicetypes/kriskit-trendsetter/colorful-light-group-device.src/colorful-light-group-device.groovy
index 4b8badd..0b9976b 100644
--- a/devicetypes/kriskit-trendsetter/colorful-light-group-device.src/colorful-light-group-device.groovy
+++ b/devicetypes/kriskit-trendsetter/colorful-light-group-device.src/colorful-light-group-device.groovy
@@ -229,7 +229,7 @@ def setLevel(val, triggerGroup) {
     }
         
     sendEvent(name: "level", value: val, isStateChange: true)
-    sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
+    sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)
     
     if (triggerGroup)
     	parent.performGroupCommand("setLevel", [val])
diff --git a/devicetypes/kriskit-trendsetter/colorful-temperature-light-group-device.src/colorful-temperature-light-group-device.groovy b/devicetypes/kriskit-trendsetter/colorful-temperature-light-group-device.src/colorful-temperature-light-group-device.groovy
index 757a4e9..20fb422 100644
--- a/devicetypes/kriskit-trendsetter/colorful-temperature-light-group-device.src/colorful-temperature-light-group-device.groovy
+++ b/devicetypes/kriskit-trendsetter/colorful-temperature-light-group-device.src/colorful-temperature-light-group-device.groovy
@@ -279,7 +279,7 @@ def setLevel(val, triggerGroup) {
     }
         
     sendEvent(name: "level", value: val, isStateChange: true)
-    sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
+    sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)
     
     if (triggerGroup)
     	parent.performGroupCommand("setLevel", [val])
diff --git a/devicetypes/kriskit-trendsetter/dimmer-group-device.src/dimmer-group-device.groovy b/devicetypes/kriskit-trendsetter/dimmer-group-device.src/dimmer-group-device.groovy
index 0c1af4d..85415a7 100644
--- a/devicetypes/kriskit-trendsetter/dimmer-group-device.src/dimmer-group-device.groovy
+++ b/devicetypes/kriskit-trendsetter/dimmer-group-device.src/dimmer-group-device.groovy
@@ -37,9 +37,9 @@ metadata {
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#ffffff", nextState: "turningOn"
 				attributeState "turningOn", label: '${name}', action: "switch.off", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#00a0dc", nextState: "turningOff"
 				attributeState "turningOff", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#ffffff", nextState: "turningOn"
-                attributeState "half", label: '${name}', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#6bb3ce", nextState: "turningOn"
-                attributeState "mostlyOn", label: 'Onish', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#2fa8d6", nextState: "turningOn"
-                attributeState "mostlyOff", label: 'Offish', action: "switch.off", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#98c1d1", nextState: "turningOff"
+                attributeState "Half On", label: 'Half', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#6bb3ce", nextState: "turningOn"
+                attributeState "Mainly On", label: 'Onish', action: "switch.on", icon: "st.lights.multi-light-bulb-on", backgroundColor: "#2fa8d6", nextState: "turningOn"
+                attributeState "Mostly Off", label: 'Offish', action: "switch.off", icon: "st.lights.multi-light-bulb-off", backgroundColor: "#98c1d1", nextState: "turningOff"
 			}
             
 			tileAttribute ("device.onPercentage", key: "SECONDARY_CONTROL") {
@@ -155,11 +155,11 @@ def syncSwitch(values) {
     def value = null
     
     if (percentOn == 50)
-    	value = "half"
+    	value = "Half On"
     else if (percentOn > 0 && percentOn < 50)
-		value = "mostlyOff"
+		value = "Mostly Off"
     else if (percentOn > 50 && percentOn < 100)
-		value = "mostlyOn"
+		value = "Mainly On"
         
 	sendEvent(name: "switch", value: value)
 	sendEvent(name: "onPercentage", value: percentOn, displayed: false)
@@ -187,7 +187,7 @@ def setLevel(val, triggerGroup) {
     }
         
     sendEvent(name: "level", value: val, isStateChange: true)
-    sendEvent(name: "switch.setLevel", value: val, isStateChange: true)
+    sendEvent(name: "switch level.setLevel", value: val, isStateChange: true)
     
     if (triggerGroup)
     	parent.performGroupCommand("setLevel", [val])
diff --git a/smartapps/kriskit-trendsetter/group.src/group.groovy b/smartapps/kriskit-trendsetter/group.src/group.groovy
index daba226..2fa30d3 100644
--- a/smartapps/kriskit-trendsetter/group.src/group.groovy
+++ b/smartapps/kriskit-trendsetter/group.src/group.groovy
@@ -26,7 +26,7 @@ definition(
     iconX3Url: "https://cdn.rawgit.com/Kriskit/SmartThings/master/icons/trendsetter/icon@3x.png")
     
 def version() {
-	return "1.2.2"
+	return "1.2.3"
 }
 
 def typeDefinitions() {
@@ -44,7 +44,7 @@ def typeDefinitions() {
         ],
         [
         	id: "switchLevel",
-        	type: "switchLevel", 
+        	type: "switch", 
             singular: "Dimmer", 
             plural: "Dimmers", 
             groupDeviceType: "Dimmer Group Device",
@@ -230,7 +230,7 @@ def onDeviceAttributeChange(evt) {
         	runCommand(it, commandInfo.command, commandInfo.arguments)
         }
     }
-    
+    pause(500)
     updateControllerState()
 }
 
@@ -347,43 +347,43 @@ def selectedDevicesContainsController() {
 private $performCommand(target, command, args) {
     switch(args?.size()) {
     	default: 
-        	target?."$command"()
+        	for(it in target) if(it.hasCommand("$command")) it."$command"()
         break
     
     	case 1: 
-        	target?."$command"(args[0])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0])
         break
         
 		case 2: 
-        	target?."$command"(args[0], args[1])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1])
         break
         
 		case 3: 
-        	target?."$command"(args[0], args[1], args[2])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2])
         break
         
 		case 4: 
-        	target?."$command"(args[0], args[1], args[2], args[3])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3])
         break
         
 		case 5: 
-        	target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5])
         break
         
 		case 6: 
-        	target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6])
         break
         
         case 7: 
-        	target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7])
         break
         
         case 8: 
-        	target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])
         break
         
         case 9: 
-        	target?."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9])
+        	for(it in target) if(it.hasCommand("$command")) it."$command"(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9])
         break
     }
 }