diff --git a/DimmerBed/dn-hold-ct.rule.json b/DimmerBed/dn-0-hold-ct.rule.json
similarity index 92%
rename from DimmerBed/dn-hold-ct.rule.json
rename to DimmerBed/dn-0-hold-ct.rule.json
index 6bb56df..47a7e40 100644
--- a/DimmerBed/dn-hold-ct.rule.json
+++ b/DimmerBed/dn-0-hold-ct.rule.json
@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.dn-hold-ct",
+	"name": "BASENAME.dn-0-hold-ct",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
diff --git a/DimmerBed/dn-0-short-bri.rule.json b/DimmerBed/dn-0-short-bri.rule.json
new file mode 100644
index 0000000..4489510
--- /dev/null
+++ b/DimmerBed/dn-0-short-bri.rule.json
@@ -0,0 +1,29 @@
+{
+	"name": "BASENAME.dn-0-short-bri",
+	"conditions": [
+		{
+			"address": "/sensors/MEMORY/state/status",
+			"operator": "lt",
+			"value": "1"
+		},
+		{
+			"address": "/sensors/DIMMER/state/buttonevent",
+			"operator": "eq",
+			"value": "3002"
+		},
+		{
+			"address": "/sensors/DIMMER/state/lastupdated",
+			"operator": "dx"
+		}
+	],
+	"actions": [
+		{
+			"address": "/groups/GROUP/action",
+			"method": "PUT",
+			"body": {
+				"transitiontime": 1,
+				"bri_inc": -25
+			}
+		}
+	]
+}
diff --git a/DimmerBed/dn-hold-hue.rule.json b/DimmerBed/dn-1-hold-hue.rule.json
similarity index 84%
rename from DimmerBed/dn-hold-hue.rule.json
rename to DimmerBed/dn-1-hold-hue.rule.json
index be1627f..633a4b7 100644
--- a/DimmerBed/dn-hold-hue.rule.json
+++ b/DimmerBed/dn-1-hold-hue.rule.json
@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.dn-hold-hue",
+	"name": "BASENAME.dn-1-hold-hue",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "eq",
-			"value": "1"
+			"operator": "gt",
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
diff --git a/DimmerBed/dn-hold-sat.rule.json b/DimmerBed/dn-1-short-sat.rule.json
similarity index 85%
rename from DimmerBed/dn-hold-sat.rule.json
rename to DimmerBed/dn-1-short-sat.rule.json
index 85c009b..b9cc597 100644
--- a/DimmerBed/dn-hold-sat.rule.json
+++ b/DimmerBed/dn-1-short-sat.rule.json
@@ -1,15 +1,15 @@
 {
-	"name": "BASENAME.dn-hold-sat",
+	"name": "BASENAME.dn-1-short-sat",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",
-			"value": "3001"
+			"value": "3002"
 		},
 		{
 			"address": "/sensors/DIMMER/state/lastupdated",
diff --git a/DimmerBed/dn-short.rule.json b/DimmerBed/dn-short.rule.json
deleted file mode 100644
index b75fd9c..0000000
--- a/DimmerBed/dn-short.rule.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"name": "BASENAME.dn-short",
-	"conditions": [
-		{
-			"address": "/sensors/DIMMER/state/buttonevent",
-			"operator": "eq",
-			"value": "3002"
-		},
-		{
-			"address": "/sensors/DIMMER/state/lastupdated",
-			"operator": "dx"
-		}
-	],
-	"actions": [
-		{
-			"address": "/groups/GROUP/action",
-			"method": "PUT",
-			"body": {
-				"transitiontime": 1,
-				"bri_inc": -25
-			}
-		}
-	]
-}
diff --git a/DimmerBed/on-long-hue.rule.json b/DimmerBed/on-0-long.rule.json
similarity index 69%
rename from DimmerBed/on-long-hue.rule.json
rename to DimmerBed/on-0-long.rule.json
index f2cb7fd..f1329c9 100644
--- a/DimmerBed/on-long-hue.rule.json
+++ b/DimmerBed/on-0-long.rule.json
@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.on-long-hue",
+	"name": "BASENAME.on-0-long",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
@@ -17,15 +17,6 @@
 		}
 	],
 	"actions": [
-		{
-			"address": "/groups/GROUP/action",
-			"method": "PUT",
-			"body": {
-				"transitiontime": 1,
-				"hue_inc": 40000,
-				"sat_inc": 100
-			}
-		},
 		{
 			"address": "/sensors/MEMORY/state",
 			"method": "PUT",
diff --git a/DimmerBed/on-long-ct.rule.json b/DimmerBed/on-1-long.rule.json
similarity index 69%
rename from DimmerBed/on-long-ct.rule.json
rename to DimmerBed/on-1-long.rule.json
index be75726..61ac5b2 100644
--- a/DimmerBed/on-long-ct.rule.json
+++ b/DimmerBed/on-1-long.rule.json
@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.on-long-ct",
+	"name": "BASENAME.on-1-long",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
@@ -17,14 +17,6 @@
 		}
 	],
 	"actions": [
-		{
-			"address": "/groups/GROUP/action",
-			"method": "PUT",
-			"body": {
-				"transitiontime": 1,
-				"ct_inc": 96
-			}
-		},
 		{
 			"address": "/sensors/MEMORY/state",
 			"method": "PUT",
diff --git a/DimmerBed/on-long-sat.rule.json b/DimmerBed/on-long-sat.rule.json
deleted file mode 100644
index 5c22d3f..0000000
--- a/DimmerBed/on-long-sat.rule.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"name": "BASENAME.on-long-sat",
-	"conditions": [
-		{
-			"address": "/sensors/MEMORY/state/status",
-			"operator": "eq",
-			"value": "1"
-		},
-		{
-			"address": "/sensors/DIMMER/state/buttonevent",
-			"operator": "eq",
-			"value": "1003"
-		},
-		{
-			"address": "/sensors/DIMMER/state/lastupdated",
-			"operator": "dx"
-		}
-	],
-	"actions": [
-		{
-			"address": "/groups/GROUP/action",
-			"method": "PUT",
-			"body": {
-				"transitiontime": 1,
-				"sat_inc": -100
-			}
-		},
-		{
-			"address": "/sensors/MEMORY/state",
-			"method": "PUT",
-			"body": {
-				"status": 2
-			}
-		}
-	]
-}
diff --git a/DimmerBed/up-hold-ct.rule.json b/DimmerBed/up-0-hold-ct.rule.json
similarity index 92%
rename from DimmerBed/up-hold-ct.rule.json
rename to DimmerBed/up-0-hold-ct.rule.json
index 1e7534f..06f0e4c 100644
--- a/DimmerBed/up-hold-ct.rule.json
+++ b/DimmerBed/up-0-hold-ct.rule.json
@@ -1,5 +1,5 @@
 {
-	"name": "BASENAME.up-hold-ct",
+	"name": "BASENAME.up-0-hold-ct",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
diff --git a/DimmerBed/up-0-short-bri.rule.json b/DimmerBed/up-0-short-bri.rule.json
new file mode 100644
index 0000000..e2a1f73
--- /dev/null
+++ b/DimmerBed/up-0-short-bri.rule.json
@@ -0,0 +1,29 @@
+{
+	"name": "BASENAME.up-0-short-bri",
+	"conditions": [
+		{
+			"address": "/sensors/MEMORY/state/status",
+			"operator": "lt",
+			"value": "1"
+		},
+		{
+			"address": "/sensors/DIMMER/state/buttonevent",
+			"operator": "eq",
+			"value": "2002"
+		},
+		{
+			"address": "/sensors/DIMMER/state/lastupdated",
+			"operator": "dx"
+		}
+	],
+	"actions": [
+		{
+			"address": "/groups/GROUP/action",
+			"method": "PUT",
+			"body": {
+				"transitiontime": 1,
+				"bri_inc": 25
+			}
+		}
+	]
+}
diff --git a/DimmerBed/up-hold-hue.rule.json b/DimmerBed/up-1-hold-hue.rule.json
similarity index 84%
rename from DimmerBed/up-hold-hue.rule.json
rename to DimmerBed/up-1-hold-hue.rule.json
index 7ca8b4c..07a1554 100644
--- a/DimmerBed/up-hold-hue.rule.json
+++ b/DimmerBed/up-1-hold-hue.rule.json
@@ -1,10 +1,10 @@
 {
-	"name": "BASENAME.up-hold-hue",
+	"name": "BASENAME.up-1-hold-hue",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
-			"operator": "eq",
-			"value": "1"
+			"operator": "gt",
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
diff --git a/DimmerBed/up-hold-sat.rule.json b/DimmerBed/up-1-short-sat.rule.json
similarity index 85%
rename from DimmerBed/up-hold-sat.rule.json
rename to DimmerBed/up-1-short-sat.rule.json
index 1614427..1ad461f 100644
--- a/DimmerBed/up-hold-sat.rule.json
+++ b/DimmerBed/up-1-short-sat.rule.json
@@ -1,15 +1,15 @@
 {
-	"name": "BASENAME.up-hold-sat",
+	"name": "BASENAME.up-1-short-sat",
 	"conditions": [
 		{
 			"address": "/sensors/MEMORY/state/status",
 			"operator": "gt",
-			"value": "1"
+			"value": "0"
 		},
 		{
 			"address": "/sensors/DIMMER/state/buttonevent",
 			"operator": "eq",
-			"value": "2001"
+			"value": "2002"
 		},
 		{
 			"address": "/sensors/DIMMER/state/lastupdated",
diff --git a/DimmerBed/up-short.rule.json b/DimmerBed/up-short.rule.json
deleted file mode 100644
index cf2908f..0000000
--- a/DimmerBed/up-short.rule.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"name": "BASENAME.up-short",
-	"conditions": [
-		{
-			"address": "/sensors/DIMMER/state/buttonevent",
-			"operator": "eq",
-			"value": "2002"
-		},
-		{
-			"address": "/sensors/DIMMER/state/lastupdated",
-			"operator": "dx"
-		}
-	],
-	"actions": [
-		{
-			"address": "/groups/GROUP/action",
-			"method": "PUT",
-			"body": {
-				"transitiontime": 1,
-				"bri_inc": 25
-			}
-		}
-	]
-}