diff --git a/src/data/flows/automation_doorbell.json b/src/data/flows/automation_doorbell.json
index 4931332..593366c 100644
--- a/src/data/flows/automation_doorbell.json
+++ b/src/data/flows/automation_doorbell.json
@@ -7,23 +7,23 @@
         "info": ""
     },
     {
-        "id": "07c18b5759c9d9cc",
+        "id": "f9393a59e792dd16",
         "type": "group",
         "z": "3637eeb0.d96232",
-        "name": "notify tts",
+        "name": "notify",
         "style": {
             "label": true
         },
         "nodes": [
-            "fcdc7ebb75e48ca6",
-            "2783264578fb402f",
-            "849b0848c1cfdceb",
-            "f355c8ecb91dbdcc",
-            "ac79c956f000331d",
-            "752f03e2805c8ca5"
+            "fcea9d7c3451b9d2",
+            "f51721063ea2c363",
+            "a2cfbe3c173fce64",
+            "461637b747fd187e",
+            "e3e3b04c06473832",
+            "9732e1196c40a631"
         ],
         "x": 1614,
-        "y": 399,
+        "y": 219,
         "w": 412,
         "h": 162
     },
@@ -49,38 +49,38 @@
         "h": 162
     },
     {
-        "id": "f9393a59e792dd16",
+        "id": "07c18b5759c9d9cc",
         "type": "group",
         "z": "3637eeb0.d96232",
-        "name": "notify",
+        "name": "notify tts",
         "style": {
             "label": true
         },
         "nodes": [
-            "fcea9d7c3451b9d2",
-            "f51721063ea2c363",
-            "a2cfbe3c173fce64",
-            "461637b747fd187e",
-            "e3e3b04c06473832",
-            "9732e1196c40a631"
+            "fcdc7ebb75e48ca6",
+            "2783264578fb402f",
+            "849b0848c1cfdceb",
+            "f355c8ecb91dbdcc",
+            "ac79c956f000331d",
+            "752f03e2805c8ca5"
         ],
         "x": 1614,
-        "y": 219,
+        "y": 399,
         "w": 412,
         "h": 162
     },
     {
-        "id": "ac79c956f000331d",
+        "id": "e3e3b04c06473832",
         "type": "junction",
         "z": "3637eeb0.d96232",
-        "g": "07c18b5759c9d9cc",
+        "g": "f9393a59e792dd16",
         "x": 1640,
-        "y": 480,
+        "y": 300,
         "wires": [
             [
-                "2783264578fb402f",
-                "fcdc7ebb75e48ca6",
-                "752f03e2805c8ca5"
+                "f51721063ea2c363",
+                "fcea9d7c3451b9d2",
+                "9732e1196c40a631"
             ]
         ]
     },
@@ -100,17 +100,17 @@
         ]
     },
     {
-        "id": "e3e3b04c06473832",
+        "id": "ac79c956f000331d",
         "type": "junction",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
+        "g": "07c18b5759c9d9cc",
         "x": 1640,
-        "y": 300,
+        "y": 480,
         "wires": [
             [
-                "f51721063ea2c363",
-                "fcea9d7c3451b9d2",
-                "9732e1196c40a631"
+                "2783264578fb402f",
+                "fcdc7ebb75e48ca6",
+                "752f03e2805c8ca5"
             ]
         ]
     },
@@ -139,73 +139,70 @@
         ]
     },
     {
-        "id": "f355c8ecb91dbdcc",
-        "type": "join",
+        "id": "752f03e2805c8ca5",
+        "type": "template",
         "z": "3637eeb0.d96232",
         "g": "07c18b5759c9d9cc",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1890,
-        "y": 480,
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "doorbell_rings",
+        "output": "str",
+        "x": 1750,
+        "y": 520,
         "wires": [
             [
-                "849b0848c1cfdceb"
+                "f355c8ecb91dbdcc"
             ]
         ]
     },
     {
-        "id": "849b0848c1cfdceb",
-        "type": "link out",
+        "id": "9732e1196c40a631",
+        "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "07c18b5759c9d9cc",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 1985,
-        "y": 480,
-        "wires": []
+        "g": "f9393a59e792dd16",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "door_openend",
+        "output": "str",
+        "x": 1750,
+        "y": 340,
+        "wires": [
+            [
+                "461637b747fd187e"
+            ]
+        ]
     },
     {
-        "id": "2783264578fb402f",
+        "id": "903fb95c9b8fd4db",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "07c18b5759c9d9cc",
-        "name": "title",
-        "field": "notify.title",
+        "g": "6a49852c474c3c78",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Deurbel",
+        "template": "doorbell_rings",
         "output": "str",
-        "x": 1730,
-        "y": 440,
+        "x": 1750,
+        "y": 160,
         "wires": [
             [
-                "f355c8ecb91dbdcc"
+                "6cf829e06aed396f"
             ]
         ]
     },
     {
-        "id": "fcdc7ebb75e48ca6",
+        "id": "fcea9d7c3451b9d2",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "07c18b5759c9d9cc",
+        "g": "f9393a59e792dd16",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -214,18 +211,52 @@
         "template": "",
         "output": "str",
         "x": 1730,
-        "y": 480,
+        "y": 300,
         "wires": [
             [
-                "f355c8ecb91dbdcc"
+                "461637b747fd187e"
             ]
         ]
     },
     {
-        "id": "6cf829e06aed396f",
+        "id": "f51721063ea2c363",
+        "type": "template",
+        "z": "3637eeb0.d96232",
+        "g": "f9393a59e792dd16",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Deurbel",
+        "output": "str",
+        "x": 1730,
+        "y": 260,
+        "wires": [
+            [
+                "461637b747fd187e"
+            ]
+        ]
+    },
+    {
+        "id": "a2cfbe3c173fce64",
+        "type": "link out",
+        "z": "3637eeb0.d96232",
+        "g": "f9393a59e792dd16",
+        "name": "link_out_notify_2",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1985,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "461637b747fd187e",
         "type": "join",
         "z": "3637eeb0.d96232",
-        "g": "6a49852c474c3c78",
+        "g": "f9393a59e792dd16",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -243,44 +274,27 @@
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1890,
-        "y": 120,
+        "y": 300,
         "wires": [
             [
-                "68e61dcfb6db1de4"
+                "a2cfbe3c173fce64"
             ]
         ]
     },
     {
-        "id": "68e61dcfb6db1de4",
-        "type": "link out",
-        "z": "3637eeb0.d96232",
-        "g": "6a49852c474c3c78",
-        "name": "link_out_notify_doorbell",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716",
-            "aeee8468f3d1b7ad",
-            "c13b2b4d87067c17"
-        ],
-        "x": 1985,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "1cd13aab2c910336",
+        "id": "b90f6aa7cea0d232",
         "type": "template",
         "z": "3637eeb0.d96232",
         "g": "6a49852c474c3c78",
-        "name": "title",
-        "field": "notify.title",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Deurbel",
+        "template": "",
         "output": "str",
         "x": 1730,
-        "y": 80,
+        "y": 120,
         "wires": [
             [
                 "6cf829e06aed396f"
@@ -288,19 +302,19 @@
         ]
     },
     {
-        "id": "b90f6aa7cea0d232",
+        "id": "1cd13aab2c910336",
         "type": "template",
         "z": "3637eeb0.d96232",
         "g": "6a49852c474c3c78",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "Deurbel",
         "output": "str",
         "x": 1730,
-        "y": 120,
+        "y": 80,
         "wires": [
             [
                 "6cf829e06aed396f"
@@ -308,10 +322,27 @@
         ]
     },
     {
-        "id": "461637b747fd187e",
+        "id": "68e61dcfb6db1de4",
+        "type": "link out",
+        "z": "3637eeb0.d96232",
+        "g": "6a49852c474c3c78",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716",
+            "aeee8468f3d1b7ad",
+            "c13b2b4d87067c17"
+        ],
+        "x": 1985,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "6cf829e06aed396f",
         "type": "join",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
+        "g": "6a49852c474c3c78",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -329,52 +360,18 @@
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1890,
-        "y": 300,
-        "wires": [
-            [
-                "a2cfbe3c173fce64"
-            ]
-        ]
-    },
-    {
-        "id": "a2cfbe3c173fce64",
-        "type": "link out",
-        "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1985,
-        "y": 300,
-        "wires": []
-    },
-    {
-        "id": "f51721063ea2c363",
-        "type": "template",
-        "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Deurbel",
-        "output": "str",
-        "x": 1730,
-        "y": 260,
+        "y": 120,
         "wires": [
             [
-                "461637b747fd187e"
+                "68e61dcfb6db1de4"
             ]
         ]
     },
     {
-        "id": "fcea9d7c3451b9d2",
+        "id": "fcdc7ebb75e48ca6",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
+        "g": "07c18b5759c9d9cc",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -383,70 +380,73 @@
         "template": "",
         "output": "str",
         "x": 1730,
-        "y": 300,
+        "y": 480,
         "wires": [
             [
-                "461637b747fd187e"
+                "f355c8ecb91dbdcc"
             ]
         ]
     },
     {
-        "id": "903fb95c9b8fd4db",
+        "id": "2783264578fb402f",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "6a49852c474c3c78",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "g": "07c18b5759c9d9cc",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "doorbell_rings",
+        "template": "Deurbel",
         "output": "str",
-        "x": 1750,
-        "y": 160,
+        "x": 1730,
+        "y": 440,
         "wires": [
             [
-                "6cf829e06aed396f"
+                "f355c8ecb91dbdcc"
             ]
         ]
     },
     {
-        "id": "9732e1196c40a631",
-        "type": "template",
+        "id": "849b0848c1cfdceb",
+        "type": "link out",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "door_openend",
-        "output": "str",
-        "x": 1750,
-        "y": 340,
-        "wires": [
-            [
-                "461637b747fd187e"
-            ]
-        ]
+        "g": "07c18b5759c9d9cc",
+        "name": "link_out_notify_3",
+        "mode": "link",
+        "links": [
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 1985,
+        "y": 480,
+        "wires": []
     },
     {
-        "id": "752f03e2805c8ca5",
-        "type": "template",
+        "id": "f355c8ecb91dbdcc",
+        "type": "join",
         "z": "3637eeb0.d96232",
         "g": "07c18b5759c9d9cc",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "doorbell_rings",
-        "output": "str",
-        "x": 1750,
-        "y": 520,
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1890,
+        "y": 480,
         "wires": [
             [
-                "f355c8ecb91dbdcc"
+                "849b0848c1cfdceb"
             ]
         ]
     },
diff --git a/src/data/flows/automation_guest_mode.json b/src/data/flows/automation_guest_mode.json
index a517aab..6987e0b 100644
--- a/src/data/flows/automation_guest_mode.json
+++ b/src/data/flows/automation_guest_mode.json
@@ -46,19 +46,19 @@
         ]
     },
     {
-        "id": "b2e6817cd694ba28",
+        "id": "3564790484706ae2",
         "type": "template",
         "z": "a7a34028d045deee",
         "g": "022e7feb1e4ea3ae",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "guest_mode",
+        "template": "",
         "output": "str",
-        "x": 1310,
-        "y": 360,
+        "x": 1290,
+        "y": 320,
         "wires": [
             [
                 "a3cf07381c3dba65"
@@ -66,54 +66,40 @@
         ]
     },
     {
-        "id": "88a668a5509178e0",
-        "type": "change",
+        "id": "d5d46cfd65fffc12",
+        "type": "template",
         "z": "a7a34028d045deee",
         "g": "022e7feb1e4ea3ae",
-        "name": "action titles",
-        "rules": [
-            {
-                "t": "set",
-                "p": "notify.action_1_title",
-                "pt": "msg",
-                "to": "JA",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2_title",
-                "pt": "msg",
-                "to": "NEE",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_1",
-                "pt": "msg",
-                "to": "GUEST_MODE_ON",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2",
-                "pt": "msg",
-                "to": "IGNORE",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1310,
-        "y": 280,
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Gastmodus",
+        "output": "str",
+        "x": 1290,
+        "y": 240,
         "wires": [
             [
                 "a3cf07381c3dba65"
             ]
         ]
     },
+    {
+        "id": "ba0bdc1db6e4e011",
+        "type": "link out",
+        "z": "a7a34028d045deee",
+        "g": "022e7feb1e4ea3ae",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "c76d311bb4b6991b",
+            "d1753081ba6b4004"
+        ],
+        "x": 1575,
+        "y": 280,
+        "wires": []
+    },
     {
         "id": "a3cf07381c3dba65",
         "type": "join",
@@ -144,34 +130,48 @@
         ]
     },
     {
-        "id": "ba0bdc1db6e4e011",
-        "type": "link out",
+        "id": "88a668a5509178e0",
+        "type": "change",
         "z": "a7a34028d045deee",
         "g": "022e7feb1e4ea3ae",
-        "name": "link_out_notify_guest_mode",
-        "mode": "link",
-        "links": [
-            "c76d311bb4b6991b",
-            "d1753081ba6b4004"
+        "name": "action titles",
+        "rules": [
+            {
+                "t": "set",
+                "p": "notify.action_1_title",
+                "pt": "msg",
+                "to": "JA",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2_title",
+                "pt": "msg",
+                "to": "NEE",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_1",
+                "pt": "msg",
+                "to": "GUEST_MODE_ON",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2",
+                "pt": "msg",
+                "to": "IGNORE",
+                "tot": "str"
+            }
         ],
-        "x": 1575,
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 1310,
         "y": 280,
-        "wires": []
-    },
-    {
-        "id": "d5d46cfd65fffc12",
-        "type": "template",
-        "z": "a7a34028d045deee",
-        "g": "022e7feb1e4ea3ae",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Gastmodus",
-        "output": "str",
-        "x": 1290,
-        "y": 240,
         "wires": [
             [
                 "a3cf07381c3dba65"
@@ -179,19 +179,19 @@
         ]
     },
     {
-        "id": "3564790484706ae2",
+        "id": "b2e6817cd694ba28",
         "type": "template",
         "z": "a7a34028d045deee",
         "g": "022e7feb1e4ea3ae",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "guest_mode",
         "output": "str",
-        "x": 1290,
-        "y": 320,
+        "x": 1310,
+        "y": 360,
         "wires": [
             [
                 "a3cf07381c3dba65"
diff --git a/src/data/flows/automation_infrared_panel.json b/src/data/flows/automation_infrared_panel.json
index eebab43..58356b5 100644
--- a/src/data/flows/automation_infrared_panel.json
+++ b/src/data/flows/automation_infrared_panel.json
@@ -46,19 +46,19 @@
         ]
     },
     {
-        "id": "b334886da3d39e67",
+        "id": "8f7ef08c7aea9511",
         "type": "template",
         "z": "d7c35c04cc0c5b68",
         "g": "36dc1da28ea112aa",
-        "name": "message",
-        "field": "notify.message",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Het Infrarood paneel in de souterrain stond nog aan en is nu automatisch uitgeschakeld",
+        "template": "",
         "output": "str",
-        "x": 1320,
-        "y": 180,
+        "x": 1310,
+        "y": 100,
         "wires": [
             [
                 "98c964aa61c96938"
@@ -66,25 +66,39 @@
         ]
     },
     {
-        "id": "87b3630fa6681255",
+        "id": "51bb0a67f9282d5f",
         "type": "template",
         "z": "d7c35c04cc0c5b68",
         "g": "36dc1da28ea112aa",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "infrared_panel",
+        "template": "Infrarood paneel",
         "output": "str",
-        "x": 1330,
-        "y": 140,
+        "x": 1310,
+        "y": 60,
         "wires": [
             [
                 "98c964aa61c96938"
             ]
         ]
     },
+    {
+        "id": "dfe89d053727bf74",
+        "type": "link out",
+        "z": "d7c35c04cc0c5b68",
+        "g": "36dc1da28ea112aa",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1605,
+        "y": 120,
+        "wires": []
+    },
     {
         "id": "98c964aa61c96938",
         "type": "join",
@@ -115,33 +129,19 @@
         ]
     },
     {
-        "id": "dfe89d053727bf74",
-        "type": "link out",
-        "z": "d7c35c04cc0c5b68",
-        "g": "36dc1da28ea112aa",
-        "name": "link_out_notify_infrared_panel",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1605,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "51bb0a67f9282d5f",
+        "id": "87b3630fa6681255",
         "type": "template",
         "z": "d7c35c04cc0c5b68",
         "g": "36dc1da28ea112aa",
-        "name": "title",
-        "field": "notify.title",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Infrarood paneel",
+        "template": "infrared_panel",
         "output": "str",
-        "x": 1310,
-        "y": 60,
+        "x": 1330,
+        "y": 140,
         "wires": [
             [
                 "98c964aa61c96938"
@@ -149,19 +149,19 @@
         ]
     },
     {
-        "id": "8f7ef08c7aea9511",
+        "id": "b334886da3d39e67",
         "type": "template",
         "z": "d7c35c04cc0c5b68",
         "g": "36dc1da28ea112aa",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "Het Infrarood paneel in de souterrain stond nog aan en is nu automatisch uitgeschakeld",
         "output": "str",
-        "x": 1310,
-        "y": 100,
+        "x": 1320,
+        "y": 180,
         "wires": [
             [
                 "98c964aa61c96938"
diff --git a/src/data/flows/automation_vacuum_cleaner.json b/src/data/flows/automation_vacuum_cleaner.json
index 5feae7d..9d00b69 100644
--- a/src/data/flows/automation_vacuum_cleaner.json
+++ b/src/data/flows/automation_vacuum_cleaner.json
@@ -7,26 +7,25 @@
         "info": ""
     },
     {
-        "id": "33fea7faee8e1f82",
+        "id": "faf17088fd1a6b16",
         "type": "group",
         "z": "55da1471.fda0fc",
-        "name": "notify two actions",
+        "name": "notify",
         "style": {
             "label": true
         },
         "nodes": [
-            "8f3e39fd9d879f86",
-            "d5ae8df68946471a",
-            "d7f92782a71d3837",
-            "b5cc0d26cf3e7ab2",
-            "237a19020921825d",
-            "09d4cdb039e852de",
-            "0e83125ead481334"
+            "c8bc013c45f3ae72",
+            "035b931bd0cea26e",
+            "57488cc36dcd2d00",
+            "051f31139e799468",
+            "07d3b997feaf3f7b",
+            "8205d58f610c05d0"
         ],
         "x": 1654,
-        "y": 419,
+        "y": 639,
         "w": 472,
-        "h": 202
+        "h": 162
     },
     {
         "id": "deb17c414e79ec63",
@@ -50,39 +49,39 @@
         "h": 162
     },
     {
-        "id": "faf17088fd1a6b16",
+        "id": "33fea7faee8e1f82",
         "type": "group",
         "z": "55da1471.fda0fc",
-        "name": "notify",
+        "name": "notify two actions",
         "style": {
             "label": true
         },
         "nodes": [
-            "c8bc013c45f3ae72",
-            "035b931bd0cea26e",
-            "57488cc36dcd2d00",
-            "051f31139e799468",
-            "07d3b997feaf3f7b",
-            "8205d58f610c05d0"
+            "8f3e39fd9d879f86",
+            "d5ae8df68946471a",
+            "d7f92782a71d3837",
+            "b5cc0d26cf3e7ab2",
+            "237a19020921825d",
+            "09d4cdb039e852de",
+            "0e83125ead481334"
         ],
         "x": 1654,
-        "y": 639,
+        "y": 419,
         "w": 472,
-        "h": 162
+        "h": 202
     },
     {
-        "id": "237a19020921825d",
+        "id": "07d3b997feaf3f7b",
         "type": "junction",
         "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
+        "g": "faf17088fd1a6b16",
         "x": 1680,
-        "y": 500,
+        "y": 700,
         "wires": [
             [
-                "d5ae8df68946471a",
-                "8f3e39fd9d879f86",
-                "09d4cdb039e852de",
-                "0e83125ead481334"
+                "035b931bd0cea26e",
+                "c8bc013c45f3ae72",
+                "8205d58f610c05d0"
             ]
         ]
     },
@@ -102,17 +101,18 @@
         ]
     },
     {
-        "id": "07d3b997feaf3f7b",
+        "id": "237a19020921825d",
         "type": "junction",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
+        "g": "33fea7faee8e1f82",
         "x": 1680,
-        "y": 700,
+        "y": 500,
         "wires": [
             [
-                "035b931bd0cea26e",
-                "c8bc013c45f3ae72",
-                "8205d58f610c05d0"
+                "d5ae8df68946471a",
+                "8f3e39fd9d879f86",
+                "09d4cdb039e852de",
+                "0e83125ead481334"
             ]
         ]
     },
@@ -129,65 +129,30 @@
         ]
     },
     {
-        "id": "8f3e39fd9d879f86",
-        "type": "template",
-        "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1770,
-        "y": 540,
-        "wires": [
-            [
-                "b5cc0d26cf3e7ab2"
-            ]
-        ]
-    },
-    {
-        "id": "d5ae8df68946471a",
+        "id": "8205d58f610c05d0",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
-        "name": "title",
-        "field": "notify.title",
+        "g": "faf17088fd1a6b16",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Stofzuiger",
+        "template": "vacuum",
         "output": "str",
-        "x": 1770,
-        "y": 460,
+        "x": 1810,
+        "y": 760,
         "wires": [
             [
-                "b5cc0d26cf3e7ab2"
+                "051f31139e799468"
             ]
         ]
     },
     {
-        "id": "d7f92782a71d3837",
-        "type": "link out",
-        "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
-        "name": "link_out_notify_guest_mode",
-        "mode": "link",
-        "links": [
-            "c76d311bb4b6991b",
-            "d1753081ba6b4004"
-        ],
-        "x": 2085,
-        "y": 500,
-        "wires": []
-    },
-    {
-        "id": "b5cc0d26cf3e7ab2",
+        "id": "051f31139e799468",
         "type": "join",
         "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
+        "g": "faf17088fd1a6b16",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -198,94 +163,59 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "8",
+        "count": "4",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1990,
-        "y": 500,
+        "y": 720,
         "wires": [
             [
-                "d7f92782a71d3837"
+                "57488cc36dcd2d00"
             ]
         ]
     },
     {
-        "id": "09d4cdb039e852de",
-        "type": "change",
+        "id": "57488cc36dcd2d00",
+        "type": "link out",
         "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
-        "name": "action titles",
-        "rules": [
-            {
-                "t": "set",
-                "p": "notify.action_1_title",
-                "pt": "msg",
-                "to": "JA",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2_title",
-                "pt": "msg",
-                "to": "NEE",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_1",
-                "pt": "msg",
-                "to": "IGNORE",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2",
-                "pt": "msg",
-                "to": "VACUUM_AUTOCLEANING_OFF",
-                "tot": "str"
-            }
+        "g": "faf17088fd1a6b16",
+        "name": "link_out_notify_3",
+        "mode": "link",
+        "links": [
+            "c4660dc11fb0e5b8"
         ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1790,
-        "y": 500,
-        "wires": [
-            [
-                "b5cc0d26cf3e7ab2"
-            ]
-        ]
+        "x": 2085,
+        "y": 720,
+        "wires": []
     },
     {
-        "id": "0e83125ead481334",
+        "id": "035b931bd0cea26e",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "33fea7faee8e1f82",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "g": "faf17088fd1a6b16",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "vacuum",
+        "template": "Stofzuiger",
         "output": "str",
         "x": 1790,
-        "y": 580,
+        "y": 680,
         "wires": [
             [
-                "b5cc0d26cf3e7ab2"
+                "051f31139e799468"
             ]
         ]
     },
     {
-        "id": "f60ecb3be0ebc2af",
+        "id": "c8bc013c45f3ae72",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "deb17c414e79ec63",
+        "g": "faf17088fd1a6b16",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -294,49 +224,33 @@
         "template": "",
         "output": "str",
         "x": 1790,
-        "y": 320,
+        "y": 720,
         "wires": [
             [
-                "ba409d3499824364"
+                "051f31139e799468"
             ]
         ]
     },
     {
-        "id": "dec04d7f3b819fb2",
+        "id": "0fa8b59e2735c07d",
         "type": "template",
         "z": "55da1471.fda0fc",
         "g": "deb17c414e79ec63",
-        "name": "title",
-        "field": "notify.title",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Stofzuiger",
+        "template": "vacuum",
         "output": "str",
-        "x": 1790,
-        "y": 280,
+        "x": 1810,
+        "y": 360,
         "wires": [
             [
                 "ba409d3499824364"
             ]
         ]
     },
-    {
-        "id": "c5f04c8242157305",
-        "type": "link out",
-        "z": "55da1471.fda0fc",
-        "g": "deb17c414e79ec63",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 2085,
-        "y": 340,
-        "wires": []
-    },
     {
         "id": "ba409d3499824364",
         "type": "join",
@@ -367,19 +281,35 @@
         ]
     },
     {
-        "id": "0fa8b59e2735c07d",
+        "id": "c5f04c8242157305",
+        "type": "link out",
+        "z": "55da1471.fda0fc",
+        "g": "deb17c414e79ec63",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad",
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 2085,
+        "y": 340,
+        "wires": []
+    },
+    {
+        "id": "dec04d7f3b819fb2",
         "type": "template",
         "z": "55da1471.fda0fc",
         "g": "deb17c414e79ec63",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "vacuum",
+        "template": "Stofzuiger",
         "output": "str",
-        "x": 1810,
-        "y": 360,
+        "x": 1790,
+        "y": 280,
         "wires": [
             [
                 "ba409d3499824364"
@@ -387,10 +317,10 @@
         ]
     },
     {
-        "id": "c8bc013c45f3ae72",
+        "id": "f60ecb3be0ebc2af",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
+        "g": "deb17c414e79ec63",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -399,52 +329,87 @@
         "template": "",
         "output": "str",
         "x": 1790,
-        "y": 720,
+        "y": 320,
         "wires": [
             [
-                "051f31139e799468"
+                "ba409d3499824364"
             ]
         ]
     },
     {
-        "id": "035b931bd0cea26e",
+        "id": "0e83125ead481334",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
-        "name": "title",
-        "field": "notify.title",
+        "g": "33fea7faee8e1f82",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Stofzuiger",
+        "template": "vacuum",
         "output": "str",
         "x": 1790,
-        "y": 680,
+        "y": 580,
         "wires": [
             [
-                "051f31139e799468"
+                "b5cc0d26cf3e7ab2"
             ]
         ]
     },
     {
-        "id": "57488cc36dcd2d00",
-        "type": "link out",
+        "id": "09d4cdb039e852de",
+        "type": "change",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "c4660dc11fb0e5b8"
+        "g": "33fea7faee8e1f82",
+        "name": "action titles",
+        "rules": [
+            {
+                "t": "set",
+                "p": "notify.action_1_title",
+                "pt": "msg",
+                "to": "JA",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2_title",
+                "pt": "msg",
+                "to": "NEE",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_1",
+                "pt": "msg",
+                "to": "IGNORE",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2",
+                "pt": "msg",
+                "to": "VACUUM_AUTOCLEANING_OFF",
+                "tot": "str"
+            }
         ],
-        "x": 2085,
-        "y": 720,
-        "wires": []
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 1790,
+        "y": 500,
+        "wires": [
+            [
+                "b5cc0d26cf3e7ab2"
+            ]
+        ]
     },
     {
-        "id": "051f31139e799468",
+        "id": "b5cc0d26cf3e7ab2",
         "type": "join",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
+        "g": "33fea7faee8e1f82",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -455,37 +420,72 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "4",
+        "count": "8",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1990,
-        "y": 720,
+        "y": 500,
         "wires": [
             [
-                "57488cc36dcd2d00"
+                "d7f92782a71d3837"
             ]
         ]
     },
     {
-        "id": "8205d58f610c05d0",
+        "id": "d7f92782a71d3837",
+        "type": "link out",
+        "z": "55da1471.fda0fc",
+        "g": "33fea7faee8e1f82",
+        "name": "link_out_notify_2",
+        "mode": "link",
+        "links": [
+            "c76d311bb4b6991b",
+            "d1753081ba6b4004"
+        ],
+        "x": 2085,
+        "y": 500,
+        "wires": []
+    },
+    {
+        "id": "d5ae8df68946471a",
         "type": "template",
         "z": "55da1471.fda0fc",
-        "g": "faf17088fd1a6b16",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "g": "33fea7faee8e1f82",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "vacuum",
+        "template": "Stofzuiger",
         "output": "str",
-        "x": 1810,
-        "y": 760,
+        "x": 1770,
+        "y": 460,
         "wires": [
             [
-                "051f31139e799468"
+                "b5cc0d26cf3e7ab2"
+            ]
+        ]
+    },
+    {
+        "id": "8f3e39fd9d879f86",
+        "type": "template",
+        "z": "55da1471.fda0fc",
+        "g": "33fea7faee8e1f82",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1770,
+        "y": 540,
+        "wires": [
+            [
+                "b5cc0d26cf3e7ab2"
             ]
         ]
     },
diff --git a/src/data/flows/energy_solar_record.json b/src/data/flows/energy_solar_record.json
index f2e655e..3368949 100644
--- a/src/data/flows/energy_solar_record.json
+++ b/src/data/flows/energy_solar_record.json
@@ -7,6 +7,26 @@
         "info": "",
         "env": []
     },
+    {
+        "id": "a51faa8090a268f4",
+        "type": "group",
+        "z": "99c1372046e45da7",
+        "name": "notification_sensors",
+        "style": {
+            "label": true
+        },
+        "nodes": [
+            "59d4d6719e262bbb",
+            "e8714993e53c2d5e",
+            "0561341e4ea54205",
+            "29ad6bfc437abec2",
+            "afc68deb5ab5e4be"
+        ],
+        "x": 1354,
+        "y": 339,
+        "w": 872,
+        "h": 82
+    },
     {
         "id": "b268fa78a872617d",
         "type": "group",
@@ -29,26 +49,6 @@
         "w": 412,
         "h": 202
     },
-    {
-        "id": "a51faa8090a268f4",
-        "type": "group",
-        "z": "99c1372046e45da7",
-        "name": "notification_sensors",
-        "style": {
-            "label": true
-        },
-        "nodes": [
-            "59d4d6719e262bbb",
-            "e8714993e53c2d5e",
-            "0561341e4ea54205",
-            "29ad6bfc437abec2",
-            "afc68deb5ab5e4be"
-        ],
-        "x": 1354,
-        "y": 339,
-        "w": 872,
-        "h": 82
-    },
     {
         "id": "9655b1065753069f",
         "type": "junction",
@@ -66,63 +66,133 @@
         ]
     },
     {
-        "id": "7b9d796ac83c32bf",
-        "type": "join",
+        "id": "451f25b73596ddf8",
+        "type": "template",
         "z": "99c1372046e45da7",
         "g": "b268fa78a872617d",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1630,
-        "y": 200,
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "solar_record",
+        "output": "str",
+        "x": 1490,
+        "y": 280,
         "wires": [
             [
-                "8c93b438701888a6"
+                "7b9d796ac83c32bf"
             ]
         ]
     },
     {
-        "id": "8c93b438701888a6",
+        "id": "afc68deb5ab5e4be",
         "type": "link out",
         "z": "99c1372046e45da7",
-        "g": "b268fa78a872617d",
-        "name": "link_out_notify_ac_solar_record",
+        "g": "a51faa8090a268f4",
+        "name": "notification",
         "mode": "link",
         "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716"
+            "60e14e33a793f50d"
         ],
-        "x": 1725,
-        "y": 200,
+        "x": 2185,
+        "y": 380,
         "wires": []
     },
     {
-        "id": "781d3a645a5e3130",
+        "id": "29ad6bfc437abec2",
         "type": "template",
         "z": "99c1372046e45da7",
-        "g": "b268fa78a872617d",
-        "name": "message",
-        "field": "notify.message",
+        "g": "a51faa8090a268f4",
+        "name": "notification_level",
+        "field": "notification_level",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Er is een nieuw zonne-energie dagrecord gemeten vandaag.\\n\\nOud: {{data.state}} {{data.attributes.unit_of_measurement}} op {{data.attributes.date}}\\nNieuw: {{payload.value}} {{data.attributes.unit_of_measurement}} op {{date}}",
+        "template": "info",
+        "output": "str",
+        "x": 2050,
+        "y": 380,
+        "wires": [
+            [
+                "afc68deb5ab5e4be"
+            ]
+        ]
+    },
+    {
+        "id": "0561341e4ea54205",
+        "type": "template",
+        "z": "99c1372046e45da7",
+        "g": "a51faa8090a268f4",
+        "name": "topic",
+        "field": "topic",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "garbage",
+        "output": "str",
+        "x": 1890,
+        "y": 380,
+        "wires": [
+            [
+                "29ad6bfc437abec2"
+            ]
+        ]
+    },
+    {
+        "id": "e8714993e53c2d5e",
+        "type": "template",
+        "z": "99c1372046e45da7",
+        "g": "a51faa8090a268f4",
+        "name": "primary information",
+        "field": "primary_information",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Er is een nieuw zonne-energie dagrecord gemeten vandaag",
+        "output": "str",
+        "x": 1710,
+        "y": 380,
+        "wires": [
+            [
+                "0561341e4ea54205"
+            ]
+        ]
+    },
+    {
+        "id": "59d4d6719e262bbb",
+        "type": "template",
+        "z": "99c1372046e45da7",
+        "g": "a51faa8090a268f4",
+        "name": "secondary information",
+        "field": "secondary_information",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Oud: {{data.state}} {{data.attributes.unit_of_measurement}} op {{data.attributes.date}}\nNieuw: {{payload.value}} {{data.attributes.unit_of_measurement}} op {{date}}",
         "output": "str",
         "x": 1480,
-        "y": 200,
+        "y": 380,
+        "wires": [
+            [
+                "e8714993e53c2d5e"
+            ]
+        ]
+    },
+    {
+        "id": "148de36202032274",
+        "type": "template",
+        "z": "99c1372046e45da7",
+        "g": "b268fa78a872617d",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": ":door:",
+        "output": "str",
+        "x": 1470,
+        "y": 240,
         "wires": [
             [
                 "7b9d796ac83c32bf"
@@ -150,25 +220,69 @@
         ]
     },
     {
-        "id": "148de36202032274",
+        "id": "781d3a645a5e3130",
         "type": "template",
         "z": "99c1372046e45da7",
         "g": "b268fa78a872617d",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": ":door:",
+        "template": "Er is een nieuw zonne-energie dagrecord gemeten vandaag.\\n\\nOud: {{data.state}} {{data.attributes.unit_of_measurement}} op {{data.attributes.date}}\\nNieuw: {{payload.value}} {{data.attributes.unit_of_measurement}} op {{date}}",
         "output": "str",
-        "x": 1470,
-        "y": 240,
+        "x": 1480,
+        "y": 200,
         "wires": [
             [
                 "7b9d796ac83c32bf"
             ]
         ]
     },
+    {
+        "id": "8c93b438701888a6",
+        "type": "link out",
+        "z": "99c1372046e45da7",
+        "g": "b268fa78a872617d",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716"
+        ],
+        "x": 1725,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "7b9d796ac83c32bf",
+        "type": "join",
+        "z": "99c1372046e45da7",
+        "g": "b268fa78a872617d",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1630,
+        "y": 200,
+        "wires": [
+            [
+                "8c93b438701888a6"
+            ]
+        ]
+    },
     {
         "id": "80dc13087104d323",
         "type": "server-state-changed",
@@ -378,120 +492,6 @@
             ]
         ]
     },
-    {
-        "id": "59d4d6719e262bbb",
-        "type": "template",
-        "z": "99c1372046e45da7",
-        "g": "a51faa8090a268f4",
-        "name": "secondary information",
-        "field": "secondary_information",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Oud: {{data.state}} {{data.attributes.unit_of_measurement}} op {{data.attributes.date}}\nNieuw: {{payload.value}} {{data.attributes.unit_of_measurement}} op {{date}}",
-        "output": "str",
-        "x": 1480,
-        "y": 380,
-        "wires": [
-            [
-                "e8714993e53c2d5e"
-            ]
-        ]
-    },
-    {
-        "id": "e8714993e53c2d5e",
-        "type": "template",
-        "z": "99c1372046e45da7",
-        "g": "a51faa8090a268f4",
-        "name": "primary information",
-        "field": "primary_information",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Er is een nieuw zonne-energie dagrecord gemeten vandaag",
-        "output": "str",
-        "x": 1710,
-        "y": 380,
-        "wires": [
-            [
-                "0561341e4ea54205"
-            ]
-        ]
-    },
-    {
-        "id": "0561341e4ea54205",
-        "type": "template",
-        "z": "99c1372046e45da7",
-        "g": "a51faa8090a268f4",
-        "name": "topic",
-        "field": "topic",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "garbage",
-        "output": "str",
-        "x": 1890,
-        "y": 380,
-        "wires": [
-            [
-                "29ad6bfc437abec2"
-            ]
-        ]
-    },
-    {
-        "id": "29ad6bfc437abec2",
-        "type": "template",
-        "z": "99c1372046e45da7",
-        "g": "a51faa8090a268f4",
-        "name": "notification_level",
-        "field": "notification_level",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "info",
-        "output": "str",
-        "x": 2050,
-        "y": 380,
-        "wires": [
-            [
-                "afc68deb5ab5e4be"
-            ]
-        ]
-    },
-    {
-        "id": "afc68deb5ab5e4be",
-        "type": "link out",
-        "z": "99c1372046e45da7",
-        "g": "a51faa8090a268f4",
-        "name": "notification",
-        "mode": "link",
-        "links": [
-            "60e14e33a793f50d"
-        ],
-        "x": 2185,
-        "y": 380,
-        "wires": []
-    },
-    {
-        "id": "451f25b73596ddf8",
-        "type": "template",
-        "z": "99c1372046e45da7",
-        "g": "b268fa78a872617d",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "solar_record",
-        "output": "str",
-        "x": 1490,
-        "y": 280,
-        "wires": [
-            [
-                "7b9d796ac83c32bf"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/entertainment_activity.json b/src/data/flows/entertainment_activity.json
index 86a29a3..06575c4 100644
--- a/src/data/flows/entertainment_activity.json
+++ b/src/data/flows/entertainment_activity.json
@@ -8,29 +8,33 @@
         "env": []
     },
     {
-        "id": "3deebaf17197f452",
+        "id": "2ff8dfb43d1ba6a3",
         "type": "group",
         "z": "fd9cd80f14f860fe",
-        "name": "notify",
         "style": {
-            "label": true
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
         },
         "nodes": [
-            "f562bc76d4f77c72",
-            "aaefbd870a81bd90",
-            "2c7cc629bd4dabbf",
-            "dca8060d69453e87",
-            "594222d1e705061c",
-            "c6c71296e724485a",
-            "7c90580485197cda"
+            "eab9993ce7699f6b",
+            "03b947a910d98181",
+            "29e2ecd31302f193",
+            "2cb2976afbc3a262",
+            "f8662655dac98e18",
+            "e07be8f58a2d80b1"
         ],
-        "x": 994,
-        "y": 1779,
-        "w": 412,
-        "h": 202
+        "x": 754,
+        "y": 779,
+        "w": 672,
+        "h": 242
     },
     {
-        "id": "fc9a0630f16ecdaf",
+        "id": "cd256ec259a611f4",
         "type": "group",
         "z": "fd9cd80f14f860fe",
         "style": {
@@ -43,23 +47,23 @@
             "color": "#a4a4a4"
         },
         "nodes": [
-            "e020d358e653c079",
-            "33f7961ae7010284",
-            "496e9f6b60f7e763",
-            "ae3e3c86c7a641ae",
-            "afc206d613ea28f4",
-            "aa0c955739836a72",
-            "38e2ec5bd89aa669",
-            "2088e9c0c8feb10f",
-            "95ff475953e46b14",
-            "0e86c16e42286a1a",
-            "2e7591d57201c05a",
-            "5f0e58ef16111e75"
+            "1852cb62226e78b0",
+            "f47b4545239299ad",
+            "cbfc90e6e5368c5d",
+            "2799232b4b346c51",
+            "64218c054bcb7baf",
+            "54b7f080b2edea10",
+            "1e7eae419a9ec64f",
+            "18e6577d292535de",
+            "9c1c2c9c48c9ec78",
+            "f2b96ebabab906de",
+            "61e6d10bbacb84be",
+            "fa9bc69bfdcf7c2c"
         ],
         "x": 754,
-        "y": 1039,
-        "w": 932,
-        "h": 302
+        "y": 399,
+        "w": 1012,
+        "h": 362
     },
     {
         "id": "d3868dc5f4aa2d65",
@@ -92,7 +96,7 @@
         "h": 362
     },
     {
-        "id": "cd256ec259a611f4",
+        "id": "fc9a0630f16ecdaf",
         "type": "group",
         "z": "fd9cd80f14f860fe",
         "style": {
@@ -105,80 +109,74 @@
             "color": "#a4a4a4"
         },
         "nodes": [
-            "1852cb62226e78b0",
-            "f47b4545239299ad",
-            "cbfc90e6e5368c5d",
-            "2799232b4b346c51",
-            "64218c054bcb7baf",
-            "54b7f080b2edea10",
-            "1e7eae419a9ec64f",
-            "18e6577d292535de",
-            "9c1c2c9c48c9ec78",
-            "f2b96ebabab906de",
-            "61e6d10bbacb84be",
-            "fa9bc69bfdcf7c2c"
+            "e020d358e653c079",
+            "33f7961ae7010284",
+            "496e9f6b60f7e763",
+            "ae3e3c86c7a641ae",
+            "afc206d613ea28f4",
+            "aa0c955739836a72",
+            "38e2ec5bd89aa669",
+            "2088e9c0c8feb10f",
+            "95ff475953e46b14",
+            "0e86c16e42286a1a",
+            "2e7591d57201c05a",
+            "5f0e58ef16111e75"
         ],
         "x": 754,
-        "y": 399,
-        "w": 1012,
-        "h": 362
+        "y": 1039,
+        "w": 932,
+        "h": 302
     },
     {
-        "id": "2ff8dfb43d1ba6a3",
+        "id": "3deebaf17197f452",
         "type": "group",
         "z": "fd9cd80f14f860fe",
+        "name": "notify",
         "style": {
-            "stroke": "#999999",
-            "stroke-opacity": "1",
-            "fill": "none",
-            "fill-opacity": "1",
-            "label": true,
-            "label-position": "nw",
-            "color": "#a4a4a4"
+            "label": true
         },
         "nodes": [
-            "eab9993ce7699f6b",
-            "03b947a910d98181",
-            "29e2ecd31302f193",
-            "2cb2976afbc3a262",
-            "f8662655dac98e18",
-            "e07be8f58a2d80b1"
+            "f562bc76d4f77c72",
+            "aaefbd870a81bd90",
+            "2c7cc629bd4dabbf",
+            "dca8060d69453e87",
+            "594222d1e705061c",
+            "c6c71296e724485a",
+            "7c90580485197cda"
         ],
-        "x": 754,
-        "y": 779,
-        "w": 672,
-        "h": 242
+        "x": 994,
+        "y": 1779,
+        "w": 412,
+        "h": 202
     },
     {
-        "id": "594222d1e705061c",
+        "id": "e07be8f58a2d80b1",
         "type": "junction",
         "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "x": 1020,
-        "y": 1860,
+        "g": "2ff8dfb43d1ba6a3",
+        "x": 780,
+        "y": 920,
         "wires": [
             [
-                "aaefbd870a81bd90",
-                "f562bc76d4f77c72",
-                "c6c71296e724485a",
-                "7c90580485197cda"
+                "03b947a910d98181",
+                "2cb2976afbc3a262",
+                "f8662655dac98e18"
             ]
         ]
     },
     {
-        "id": "b564e25effcfc627",
+        "id": "0e86c16e42286a1a",
         "type": "junction",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
+        "g": "fc9a0630f16ecdaf",
         "x": 780,
-        "y": 220,
+        "y": 1220,
         "wires": [
             [
-                "cae37222d5922c33",
-                "f9e486866e6d65f1",
-                "4a25ba1ed70574f1",
-                "0f78726aa8d18ced",
-                "a341a192bdb5e4d7"
+                "33f7961ae7010284",
+                "95ff475953e46b14",
+                "2e7591d57201c05a",
+                "5f0e58ef16111e75"
             ]
         ]
     },
@@ -200,174 +198,83 @@
         ]
     },
     {
-        "id": "0e86c16e42286a1a",
+        "id": "b564e25effcfc627",
         "type": "junction",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
+        "g": "d3868dc5f4aa2d65",
         "x": 780,
-        "y": 1220,
+        "y": 220,
         "wires": [
             [
-                "33f7961ae7010284",
-                "95ff475953e46b14",
-                "2e7591d57201c05a",
-                "5f0e58ef16111e75"
+                "cae37222d5922c33",
+                "f9e486866e6d65f1",
+                "4a25ba1ed70574f1",
+                "0f78726aa8d18ced",
+                "a341a192bdb5e4d7"
             ]
         ]
     },
     {
-        "id": "e07be8f58a2d80b1",
+        "id": "594222d1e705061c",
         "type": "junction",
         "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "x": 780,
-        "y": 920,
-        "wires": [
-            [
-                "03b947a910d98181",
-                "2cb2976afbc3a262",
-                "f8662655dac98e18"
-            ]
-        ]
-    },
-    {
-        "id": "7c90580485197cda",
-        "type": "template",
-        "z": "fd9cd80f14f860fe",
         "g": "3deebaf17197f452",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "TV gepauseerd i.v.m. telefoongesprek.",
-        "output": "str",
-        "x": 1120,
+        "x": 1020,
         "y": 1860,
         "wires": [
             [
-                "dca8060d69453e87"
+                "aaefbd870a81bd90",
+                "f562bc76d4f77c72",
+                "c6c71296e724485a",
+                "7c90580485197cda"
             ]
         ]
     },
     {
-        "id": "c6c71296e724485a",
-        "type": "template",
+        "id": "fa9bc69bfdcf7c2c",
+        "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "pause_entertaiment",
-        "output": "str",
-        "x": 1130,
-        "y": 1940,
+        "g": "cd256ec259a611f4",
+        "name": "stop mediaplayer powernode",
+        "server": "4ba92433.2478cc",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "media_player",
+        "service": "media_stop",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "media_player.powernode_2i_ea48"
+        ],
+        "data": "",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 960,
+        "y": 660,
         "wires": [
             [
-                "dca8060d69453e87"
+                "54b7f080b2edea10"
             ]
         ]
     },
     {
-        "id": "dca8060d69453e87",
-        "type": "join",
+        "id": "5f0e58ef16111e75",
+        "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1270,
-        "y": 1860,
-        "wires": [
-            [
-                "2c7cc629bd4dabbf"
-            ]
-        ]
-    },
-    {
-        "id": "2c7cc629bd4dabbf",
-        "type": "link out",
-        "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "name": "link_out_notify_entertainment",
-        "mode": "link",
-        "links": [
-            "c13b2b4d87067c17"
-        ],
-        "x": 1365,
-        "y": 1860,
-        "wires": []
-    },
-    {
-        "id": "aaefbd870a81bd90",
-        "type": "template",
-        "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Entertainment",
-        "output": "str",
-        "x": 1110,
-        "y": 1820,
-        "wires": [
-            [
-                "dca8060d69453e87"
-            ]
-        ]
-    },
-    {
-        "id": "f562bc76d4f77c72",
-        "type": "template",
-        "z": "fd9cd80f14f860fe",
-        "g": "3deebaf17197f452",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1110,
-        "y": 1900,
-        "wires": [
-            [
-                "dca8060d69453e87"
-            ]
-        ]
-    },
-    {
-        "id": "03b947a910d98181",
-        "type": "api-call-service",
-        "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "name": "stop mediaplayer powernode",
+        "g": "fc9a0630f16ecdaf",
+        "name": "turn off tv mediaplayers",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "media_stop",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "group.tv_media_players"
         ],
         "data": "",
         "dataType": "jsonata",
@@ -375,57 +282,55 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 860,
+        "x": 950,
+        "y": 1300,
         "wires": [
-            [
-                "29e2ecd31302f193"
-            ]
+            []
         ]
     },
     {
-        "id": "29e2ecd31302f193",
+        "id": "2e7591d57201c05a",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "name": "clear playlist mediaplayer powernode",
+        "g": "fc9a0630f16ecdaf",
+        "name": "turn off tv",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "clear_playlist",
+        "domain": "webostv",
+        "service": "command",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "media_player.lg_webos_smart_tv"
         ],
-        "data": "",
-        "dataType": "jsonata",
+        "data": "{\"command\":\"system/turnOff\"}",
+        "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1250,
-        "y": 860,
+        "x": 900,
+        "y": 1240,
         "wires": [
             []
         ]
     },
     {
-        "id": "95ff475953e46b14",
+        "id": "f8662655dac98e18",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "stop mediaplayer powernode",
+        "g": "2ff8dfb43d1ba6a3",
+        "name": "turn off tv mediaplayers",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "media_stop",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "group.tv_media_players"
         ],
         "data": "",
         "dataType": "jsonata",
@@ -433,311 +338,221 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 1120,
+        "x": 950,
+        "y": 980,
         "wires": [
-            [
-                "2088e9c0c8feb10f"
-            ]
+            []
         ]
     },
     {
-        "id": "2088e9c0c8feb10f",
+        "id": "2cb2976afbc3a262",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "clear playlist mediaplayer powernode",
+        "g": "2ff8dfb43d1ba6a3",
+        "name": "turn off tv",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "clear_playlist",
+        "domain": "webostv",
+        "service": "command",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "media_player.lg_webos_smart_tv"
         ],
-        "data": "",
-        "dataType": "jsonata",
+        "data": "{\"command\":\"system/turnOff\"}",
+        "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1250,
-        "y": 1120,
-        "wires": [
-            [
-                "e020d358e653c079"
-            ]
-        ]
-    },
-    {
-        "id": "38e2ec5bd89aa669",
-        "type": "comment",
-        "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "Spotify",
-        "info": "",
-        "x": 890,
-        "y": 1080,
-        "wires": []
-    },
-    {
-        "id": "aa0c955739836a72",
-        "type": "link out",
-        "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "link out entertainment_activity",
-        "mode": "link",
-        "links": [
-            "7264146e613f154c"
-        ],
-        "x": 1375,
-        "y": 1180,
-        "wires": []
-    },
-    {
-        "id": "afc206d613ea28f4",
-        "type": "rbe",
-        "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "",
-        "func": "rbe",
-        "gap": "",
-        "start": "",
-        "inout": "out",
-        "septopics": true,
-        "property": "payload.state",
-        "topi": "topic",
-        "x": 1290,
-        "y": 1180,
-        "wires": [
-            [
-                "aa0c955739836a72"
-            ]
-        ]
-    },
-    {
-        "id": "ae3e3c86c7a641ae",
-        "type": "switch",
-        "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "",
-        "property": "payload.state",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "eq",
-                "v": "unknown",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 1170,
-        "y": 1180,
-        "wires": [
-            [
-                "afc206d613ea28f4"
-            ]
-        ]
-    },
-    {
-        "id": "496e9f6b60f7e763",
-        "type": "split",
-        "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "",
-        "splt": "\\n",
-        "spltType": "str",
-        "arraySplt": 1,
-        "arraySpltType": "len",
-        "stream": false,
-        "addname": "",
-        "x": 1050,
-        "y": 1180,
+        "x": 900,
+        "y": 920,
         "wires": [
-            [
-                "ae3e3c86c7a641ae"
-            ]
+            []
         ]
     },
     {
-        "id": "33f7961ae7010284",
-        "type": "ha-get-entities",
+        "id": "f2b96ebabab906de",
+        "type": "api-current-state",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "",
+        "g": "cd256ec259a611f4",
+        "name": "state input boolean music is on",
         "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "on",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.music",
+        "state_type": "str",
+        "blockInputOverrides": true,
+        "outputProperties": [
             {
-                "property": "entity_id",
-                "logic": "starts_with",
-                "value": "sensor.playlist_",
-                "valueType": "str"
-            }
-        ],
-        "outputType": "array",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 910,
-        "y": 1180,
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": 0,
+        "forType": "num",
+        "forUnits": "minutes",
+        "x": 970,
+        "y": 720,
         "wires": [
             [
-                "496e9f6b60f7e763"
-            ]
+                "9c1c2c9c48c9ec78"
+            ],
+            []
         ]
     },
     {
-        "id": "e020d358e653c079",
+        "id": "9c1c2c9c48c9ec78",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "select powernode in spotify",
+        "g": "cd256ec259a611f4",
+        "name": "turn off input boolean music",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "select_source",
+        "domain": "input_boolean",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.spotify_coen_s_nl"
+            "input_boolean.music"
         ],
-        "data": "{\"source\":\"POWERNODE 2i-EA48\"}",
+        "data": "",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1540,
-        "y": 1120,
+        "x": 1240,
+        "y": 720,
         "wires": [
             []
         ]
     },
     {
-        "id": "1f82b6c0e5dbebf0",
-        "type": "comment",
-        "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "Uitschakelen",
-        "info": "",
-        "x": 910,
-        "y": 60,
-        "wires": []
-    },
-    {
-        "id": "1e7eae419a9ec64f",
-        "type": "comment",
-        "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "TV",
-        "info": "",
-        "x": 890,
-        "y": 440,
-        "wires": []
-    },
-    {
-        "id": "54b7f080b2edea10",
+        "id": "0d2317e40dbcbd17",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "select source optical input on bluesound powernode",
+        "g": "d3868dc5f4aa2d65",
+        "name": "turn off media_player",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "select_source",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "{{payload.entity_id}}"
         ],
-        "data": "{\"source\":\"Optical Input 1\"}",
+        "data": "",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1290,
-        "y": 660,
+        "x": 1220,
+        "y": 100,
         "wires": [
-            [
-                "18e6577d292535de"
-            ]
+            []
         ]
     },
     {
-        "id": "64218c054bcb7baf",
-        "type": "api-call-service",
+        "id": "a341a192bdb5e4d7",
+        "type": "ha-get-entities",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "turn on screen",
+        "g": "d3868dc5f4aa2d65",
+        "name": "lookup media_player is not off",
         "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "webostv",
-        "service": "command",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "media_player.lg_webos_smart_tv"
+        "version": 1,
+        "rules": [
+            {
+                "property": "entity_id",
+                "logic": "starts_with",
+                "value": "media_player.",
+                "valueType": "str"
+            },
+            {
+                "property": "state",
+                "logic": "is_not",
+                "value": "off",
+                "valueType": "str"
+            }
         ],
-        "data": "{\"command\":\"com.webos.service.tvpower/power/turnOnScreen\"}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 920,
-        "y": 600,
+        "outputType": "split",
+        "outputEmptyResults": false,
+        "outputLocationType": "msg",
+        "outputLocation": "payload",
+        "outputResultsCount": 1,
+        "x": 970,
+        "y": 100,
         "wires": [
-            []
+            [
+                "0d2317e40dbcbd17"
+            ]
         ]
     },
     {
-        "id": "2799232b4b346c51",
+        "id": "18e6577d292535de",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
         "g": "cd256ec259a611f4",
-        "name": "turn on input boolean tv",
+        "name": "play optical input powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_on",
+        "domain": "media_player",
+        "service": "media_play",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "input_boolean.tv"
+            "media_player.powernode_2i_ea48"
         ],
         "data": "",
-        "dataType": "json",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1210,
-        "y": 540,
+        "x": 1620,
+        "y": 660,
         "wires": [
             []
         ]
     },
     {
-        "id": "cbfc90e6e5368c5d",
+        "id": "eab9993ce7699f6b",
+        "type": "comment",
+        "z": "fd9cd80f14f860fe",
+        "g": "2ff8dfb43d1ba6a3",
+        "name": "Radio",
+        "info": "",
+        "x": 890,
+        "y": 820,
+        "wires": []
+    },
+    {
+        "id": "4a25ba1ed70574f1",
         "type": "api-current-state",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "state input boolean tv is off",
+        "g": "d3868dc5f4aa2d65",
+        "name": "state input boolean tv is on",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "off",
+        "halt_if": "on",
         "halt_if_type": "str",
         "halt_if_compare": "is",
         "entity_id": "input_boolean.tv",
@@ -761,57 +576,57 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 960,
-        "y": 540,
+        "y": 280,
         "wires": [
             [
-                "2799232b4b346c51"
+                "3f247e6d9480542a"
             ],
             []
         ]
     },
     {
-        "id": "f47b4545239299ad",
+        "id": "3f247e6d9480542a",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "turn on universal tv",
+        "g": "d3868dc5f4aa2d65",
+        "name": "turn off input boolean tv",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "turn_on",
+        "domain": "input_boolean",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.universal_tv"
+            "input_boolean.tv"
         ],
         "data": "",
-        "dataType": "jsonata",
+        "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1190,
-        "y": 480,
+        "x": 1230,
+        "y": 280,
         "wires": [
             []
         ]
     },
     {
-        "id": "1852cb62226e78b0",
+        "id": "0f78726aa8d18ced",
         "type": "api-current-state",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "universal tv is not on",
+        "g": "d3868dc5f4aa2d65",
+        "name": "state input boolean music is on",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
         "halt_if": "on",
         "halt_if_type": "str",
-        "halt_if_compare": "is_not",
-        "entity_id": "media_player.universal_tv",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.music",
         "state_type": "str",
-        "blockInputOverrides": false,
+        "blockInputOverrides": true,
         "outputProperties": [
             {
                 "property": "payload",
@@ -826,38 +641,33 @@
                 "valueType": "entity"
             }
         ],
-        "for": "0",
+        "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 940,
-        "y": 480,
+        "x": 970,
+        "y": 340,
         "wires": [
             [
-                "f47b4545239299ad"
+                "88aeefa87a0d1bde"
             ],
             []
         ]
     },
     {
-        "id": "f9e486866e6d65f1",
+        "id": "88aeefa87a0d1bde",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
         "g": "d3868dc5f4aa2d65",
-        "name": "stop bluesound powernode",
+        "name": "turn off input boolean music",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "media_stop",
+        "domain": "input_boolean",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "input_boolean.music"
         ],
         "data": "",
         "dataType": "json",
@@ -865,8 +675,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 220,
+        "x": 1240,
+        "y": 340,
         "wires": [
             []
         ]
@@ -900,20 +710,20 @@
         ]
     },
     {
-        "id": "88aeefa87a0d1bde",
+        "id": "f9e486866e6d65f1",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
         "g": "d3868dc5f4aa2d65",
-        "name": "turn off input boolean music",
+        "name": "stop bluesound powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_off",
+        "domain": "media_player",
+        "service": "media_stop",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "input_boolean.music"
+            "media_player.powernode_2i_ea48"
         ],
         "data": "",
         "dataType": "json",
@@ -921,27 +731,27 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1240,
-        "y": 340,
+        "x": 960,
+        "y": 220,
         "wires": [
             []
         ]
     },
     {
-        "id": "0f78726aa8d18ced",
+        "id": "1852cb62226e78b0",
         "type": "api-current-state",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "state input boolean music is on",
+        "g": "cd256ec259a611f4",
+        "name": "universal tv is not on",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
         "halt_if": "on",
         "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "input_boolean.music",
+        "halt_if_compare": "is_not",
+        "entity_id": "media_player.universal_tv",
         "state_type": "str",
-        "blockInputOverrides": true,
+        "blockInputOverrides": false,
         "outputProperties": [
             {
                 "property": "payload",
@@ -956,56 +766,61 @@
                 "valueType": "entity"
             }
         ],
-        "for": 0,
+        "for": "0",
         "forType": "num",
         "forUnits": "minutes",
-        "x": 970,
-        "y": 340,
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 940,
+        "y": 480,
         "wires": [
             [
-                "88aeefa87a0d1bde"
+                "f47b4545239299ad"
             ],
             []
         ]
     },
     {
-        "id": "3f247e6d9480542a",
+        "id": "f47b4545239299ad",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "turn off input boolean tv",
+        "g": "cd256ec259a611f4",
+        "name": "turn on universal tv",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_off",
+        "domain": "media_player",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "input_boolean.tv"
+            "media_player.universal_tv"
         ],
         "data": "",
-        "dataType": "json",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1230,
-        "y": 280,
+        "x": 1190,
+        "y": 480,
         "wires": [
             []
         ]
     },
     {
-        "id": "4a25ba1ed70574f1",
+        "id": "cbfc90e6e5368c5d",
         "type": "api-current-state",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "state input boolean tv is on",
+        "g": "cd256ec259a611f4",
+        "name": "state input boolean tv is off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "on",
+        "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
         "entity_id": "input_boolean.tv",
@@ -1029,228 +844,286 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 960,
-        "y": 280,
+        "y": 540,
         "wires": [
             [
-                "3f247e6d9480542a"
+                "2799232b4b346c51"
             ],
             []
         ]
     },
     {
-        "id": "eab9993ce7699f6b",
-        "type": "comment",
-        "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "name": "Radio",
-        "info": "",
-        "x": 890,
-        "y": 820,
-        "wires": []
-    },
-    {
-        "id": "18e6577d292535de",
+        "id": "2799232b4b346c51",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
         "g": "cd256ec259a611f4",
-        "name": "play optical input powernode",
+        "name": "turn on input boolean tv",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "media_player",
-        "service": "media_play",
+        "domain": "input_boolean",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.powernode_2i_ea48"
+            "input_boolean.tv"
         ],
         "data": "",
-        "dataType": "jsonata",
+        "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1620,
-        "y": 660,
+        "x": 1210,
+        "y": 540,
         "wires": [
             []
         ]
     },
     {
-        "id": "a341a192bdb5e4d7",
-        "type": "ha-get-entities",
+        "id": "64218c054bcb7baf",
+        "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "lookup media_player is not off",
+        "g": "cd256ec259a611f4",
+        "name": "turn on screen",
         "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
-            {
-                "property": "entity_id",
-                "logic": "starts_with",
-                "value": "media_player.",
-                "valueType": "str"
-            },
-            {
-                "property": "state",
-                "logic": "is_not",
-                "value": "off",
-                "valueType": "str"
-            }
+        "version": 5,
+        "debugenabled": false,
+        "domain": "webostv",
+        "service": "command",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "media_player.lg_webos_smart_tv"
         ],
-        "outputType": "split",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 970,
-        "y": 100,
+        "data": "{\"command\":\"com.webos.service.tvpower/power/turnOnScreen\"}",
+        "dataType": "json",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 920,
+        "y": 600,
         "wires": [
-            [
-                "0d2317e40dbcbd17"
-            ]
+            []
         ]
     },
     {
-        "id": "0d2317e40dbcbd17",
+        "id": "54b7f080b2edea10",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "d3868dc5f4aa2d65",
-        "name": "turn off media_player",
+        "g": "cd256ec259a611f4",
+        "name": "select source optical input on bluesound powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "turn_off",
+        "service": "select_source",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "{{payload.entity_id}}"
+            "media_player.powernode_2i_ea48"
         ],
-        "data": "",
+        "data": "{\"source\":\"Optical Input 1\"}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1220,
-        "y": 100,
+        "x": 1290,
+        "y": 660,
         "wires": [
-            []
+            [
+                "18e6577d292535de"
+            ]
         ]
     },
     {
-        "id": "9c1c2c9c48c9ec78",
-        "type": "api-call-service",
+        "id": "1e7eae419a9ec64f",
+        "type": "comment",
         "z": "fd9cd80f14f860fe",
         "g": "cd256ec259a611f4",
-        "name": "turn off input boolean music",
+        "name": "TV",
+        "info": "",
+        "x": 890,
+        "y": 440,
+        "wires": []
+    },
+    {
+        "id": "1f82b6c0e5dbebf0",
+        "type": "comment",
+        "z": "fd9cd80f14f860fe",
+        "g": "d3868dc5f4aa2d65",
+        "name": "Uitschakelen",
+        "info": "",
+        "x": 910,
+        "y": 60,
+        "wires": []
+    },
+    {
+        "id": "e020d358e653c079",
+        "type": "api-call-service",
+        "z": "fd9cd80f14f860fe",
+        "g": "fc9a0630f16ecdaf",
+        "name": "select powernode in spotify",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_off",
+        "domain": "media_player",
+        "service": "select_source",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "input_boolean.music"
+            "media_player.spotify_coen_s_nl"
         ],
-        "data": "",
+        "data": "{\"source\":\"POWERNODE 2i-EA48\"}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1240,
-        "y": 720,
+        "x": 1540,
+        "y": 1120,
         "wires": [
             []
         ]
     },
     {
-        "id": "f2b96ebabab906de",
-        "type": "api-current-state",
+        "id": "33f7961ae7010284",
+        "type": "ha-get-entities",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
-        "name": "state input boolean music is on",
+        "g": "fc9a0630f16ecdaf",
+        "name": "",
         "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "on",
-        "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "input_boolean.music",
-        "state_type": "str",
-        "blockInputOverrides": true,
-        "outputProperties": [
+        "version": 1,
+        "rules": [
             {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
+                "property": "entity_id",
+                "logic": "starts_with",
+                "value": "sensor.playlist_",
+                "valueType": "str"
+            }
+        ],
+        "outputType": "array",
+        "outputEmptyResults": false,
+        "outputLocationType": "msg",
+        "outputLocation": "payload",
+        "outputResultsCount": 1,
+        "x": 910,
+        "y": 1180,
+        "wires": [
+            [
+                "496e9f6b60f7e763"
+            ]
+        ]
+    },
+    {
+        "id": "496e9f6b60f7e763",
+        "type": "split",
+        "z": "fd9cd80f14f860fe",
+        "g": "fc9a0630f16ecdaf",
+        "name": "",
+        "splt": "\\n",
+        "spltType": "str",
+        "arraySplt": 1,
+        "arraySpltType": "len",
+        "stream": false,
+        "addname": "",
+        "x": 1050,
+        "y": 1180,
+        "wires": [
+            [
+                "ae3e3c86c7a641ae"
+            ]
+        ]
+    },
+    {
+        "id": "ae3e3c86c7a641ae",
+        "type": "switch",
+        "z": "fd9cd80f14f860fe",
+        "g": "fc9a0630f16ecdaf",
+        "name": "",
+        "property": "payload.state",
+        "propertyType": "msg",
+        "rules": [
             {
-                "property": "data",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entity"
+                "t": "eq",
+                "v": "unknown",
+                "vt": "str"
             }
         ],
-        "for": 0,
-        "forType": "num",
-        "forUnits": "minutes",
-        "x": 970,
-        "y": 720,
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 1170,
+        "y": 1180,
         "wires": [
             [
-                "9c1c2c9c48c9ec78"
-            ],
-            []
+                "afc206d613ea28f4"
+            ]
         ]
     },
     {
-        "id": "2cb2976afbc3a262",
-        "type": "api-call-service",
+        "id": "afc206d613ea28f4",
+        "type": "rbe",
         "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "name": "turn off tv",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "webostv",
-        "service": "command",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "media_player.lg_webos_smart_tv"
-        ],
-        "data": "{\"command\":\"system/turnOff\"}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 900,
-        "y": 920,
+        "g": "fc9a0630f16ecdaf",
+        "name": "",
+        "func": "rbe",
+        "gap": "",
+        "start": "",
+        "inout": "out",
+        "septopics": true,
+        "property": "payload.state",
+        "topi": "topic",
+        "x": 1290,
+        "y": 1180,
         "wires": [
-            []
+            [
+                "aa0c955739836a72"
+            ]
         ]
     },
     {
-        "id": "f8662655dac98e18",
+        "id": "aa0c955739836a72",
+        "type": "link out",
+        "z": "fd9cd80f14f860fe",
+        "g": "fc9a0630f16ecdaf",
+        "name": "link out entertainment_activity",
+        "mode": "link",
+        "links": [
+            "7264146e613f154c"
+        ],
+        "x": 1375,
+        "y": 1180,
+        "wires": []
+    },
+    {
+        "id": "38e2ec5bd89aa669",
+        "type": "comment",
+        "z": "fd9cd80f14f860fe",
+        "g": "fc9a0630f16ecdaf",
+        "name": "Spotify",
+        "info": "",
+        "x": 890,
+        "y": 1080,
+        "wires": []
+    },
+    {
+        "id": "2088e9c0c8feb10f",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "2ff8dfb43d1ba6a3",
-        "name": "turn off tv mediaplayers",
+        "g": "fc9a0630f16ecdaf",
+        "name": "clear playlist mediaplayer powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "turn_off",
+        "service": "clear_playlist",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "group.tv_media_players"
+            "media_player.powernode_2i_ea48"
         ],
         "data": "",
         "dataType": "jsonata",
@@ -1258,55 +1131,59 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 950,
-        "y": 980,
+        "x": 1250,
+        "y": 1120,
         "wires": [
-            []
+            [
+                "e020d358e653c079"
+            ]
         ]
     },
     {
-        "id": "2e7591d57201c05a",
+        "id": "95ff475953e46b14",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
         "g": "fc9a0630f16ecdaf",
-        "name": "turn off tv",
+        "name": "stop mediaplayer powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "webostv",
-        "service": "command",
+        "domain": "media_player",
+        "service": "media_stop",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "media_player.lg_webos_smart_tv"
+            "media_player.powernode_2i_ea48"
         ],
-        "data": "{\"command\":\"system/turnOff\"}",
-        "dataType": "json",
+        "data": "",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 900,
-        "y": 1240,
+        "x": 960,
+        "y": 1120,
         "wires": [
-            []
+            [
+                "2088e9c0c8feb10f"
+            ]
         ]
     },
     {
-        "id": "5f0e58ef16111e75",
+        "id": "29e2ecd31302f193",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "fc9a0630f16ecdaf",
-        "name": "turn off tv mediaplayers",
+        "g": "2ff8dfb43d1ba6a3",
+        "name": "clear playlist mediaplayer powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "media_player",
-        "service": "turn_off",
+        "service": "clear_playlist",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "group.tv_media_players"
+            "media_player.powernode_2i_ea48"
         ],
         "data": "",
         "dataType": "jsonata",
@@ -1314,17 +1191,17 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 950,
-        "y": 1300,
+        "x": 1250,
+        "y": 860,
         "wires": [
             []
         ]
     },
     {
-        "id": "fa9bc69bfdcf7c2c",
+        "id": "03b947a910d98181",
         "type": "api-call-service",
         "z": "fd9cd80f14f860fe",
-        "g": "cd256ec259a611f4",
+        "g": "2ff8dfb43d1ba6a3",
         "name": "stop mediaplayer powernode",
         "server": "4ba92433.2478cc",
         "version": 5,
@@ -1343,10 +1220,133 @@
         "outputProperties": [],
         "queue": "none",
         "x": 960,
-        "y": 660,
+        "y": 860,
         "wires": [
             [
-                "54b7f080b2edea10"
+                "29e2ecd31302f193"
+            ]
+        ]
+    },
+    {
+        "id": "f562bc76d4f77c72",
+        "type": "template",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1110,
+        "y": 1900,
+        "wires": [
+            [
+                "dca8060d69453e87"
+            ]
+        ]
+    },
+    {
+        "id": "aaefbd870a81bd90",
+        "type": "template",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Entertainment",
+        "output": "str",
+        "x": 1110,
+        "y": 1820,
+        "wires": [
+            [
+                "dca8060d69453e87"
+            ]
+        ]
+    },
+    {
+        "id": "2c7cc629bd4dabbf",
+        "type": "link out",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "c13b2b4d87067c17"
+        ],
+        "x": 1365,
+        "y": 1860,
+        "wires": []
+    },
+    {
+        "id": "dca8060d69453e87",
+        "type": "join",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1270,
+        "y": 1860,
+        "wires": [
+            [
+                "2c7cc629bd4dabbf"
+            ]
+        ]
+    },
+    {
+        "id": "c6c71296e724485a",
+        "type": "template",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "pause_entertaiment",
+        "output": "str",
+        "x": 1130,
+        "y": 1940,
+        "wires": [
+            [
+                "dca8060d69453e87"
+            ]
+        ]
+    },
+    {
+        "id": "7c90580485197cda",
+        "type": "template",
+        "z": "fd9cd80f14f860fe",
+        "g": "3deebaf17197f452",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "TV gepauseerd i.v.m. telefoongesprek.",
+        "output": "str",
+        "x": 1120,
+        "y": 1860,
+        "wires": [
+            [
+                "dca8060d69453e87"
             ]
         ]
     },
diff --git a/src/data/flows/light_dynamics_on_and_restore.json b/src/data/flows/light_dynamics_on_and_restore.json
index 385dc3c..14716d7 100644
--- a/src/data/flows/light_dynamics_on_and_restore.json
+++ b/src/data/flows/light_dynamics_on_and_restore.json
@@ -458,7 +458,8 @@
         "z": "9a7094e42d673dc4",
         "name": "lights_on_and_restore_all",
         "links": [
-            "5874beb71c3c9523"
+            "5874beb71c3c9523",
+            "e426c9cc0865f723"
         ],
         "x": 215,
         "y": 100,
diff --git a/src/data/flows/machine_state_dishwasher.json b/src/data/flows/machine_state_dishwasher.json
index f5b10e8..46952bc 100644
--- a/src/data/flows/machine_state_dishwasher.json
+++ b/src/data/flows/machine_state_dishwasher.json
@@ -78,7 +78,7 @@
         "type": "link out",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
-        "name": "link_out_notify_ac_solar_record",
+        "name": "link_out_notify_1",
         "mode": "link",
         "links": [
             "8ed3b0974336e55b",
diff --git a/src/data/flows/machine_state_thumble_dryer.json b/src/data/flows/machine_state_thumble_dryer.json
index 1ff8439..2346655 100644
--- a/src/data/flows/machine_state_thumble_dryer.json
+++ b/src/data/flows/machine_state_thumble_dryer.json
@@ -45,19 +45,19 @@
         ]
     },
     {
-        "id": "7913c8cedd9b8d45",
+        "id": "95286ff3.9f33d",
         "type": "template",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "tumble_dryer",
+        "template": "De droger is klaar.",
         "output": "str",
-        "x": 1400,
-        "y": 200,
+        "x": 1390,
+        "y": 240,
         "wires": [
             [
                 "a91faa17c024af1e"
@@ -65,50 +65,25 @@
         ]
     },
     {
-        "id": "a91faa17c024af1e",
-        "type": "join",
+        "id": "f359939883ebec80",
+        "type": "template",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1580,
-        "y": 180,
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1380,
+        "y": 160,
         "wires": [
             [
-                "0993d50e3c03d798"
+                "a91faa17c024af1e"
             ]
         ]
     },
-    {
-        "id": "0993d50e3c03d798",
-        "type": "link out",
-        "z": "72ef82b8.9d086c",
-        "g": "677a462e190a4c92",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 1675,
-        "y": 180,
-        "wires": []
-    },
     {
         "id": "70a25e05987238de",
         "type": "template",
@@ -130,39 +105,64 @@
         ]
     },
     {
-        "id": "f359939883ebec80",
-        "type": "template",
+        "id": "0993d50e3c03d798",
+        "type": "link out",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1380,
-        "y": 160,
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad",
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 1675,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "a91faa17c024af1e",
+        "type": "join",
+        "z": "72ef82b8.9d086c",
+        "g": "677a462e190a4c92",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1580,
+        "y": 180,
         "wires": [
             [
-                "a91faa17c024af1e"
+                "0993d50e3c03d798"
             ]
         ]
     },
     {
-        "id": "95286ff3.9f33d",
+        "id": "7913c8cedd9b8d45",
         "type": "template",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
-        "name": "message",
-        "field": "notify.message",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "De droger is klaar.",
+        "template": "tumble_dryer",
         "output": "str",
-        "x": 1390,
-        "y": 240,
+        "x": 1400,
+        "y": 200,
         "wires": [
             [
                 "a91faa17c024af1e"
@@ -485,14 +485,14 @@
             },
             {
                 "property": "icon",
-                "value": "mdi:tumble-dryer"
+                "value": ""
             },
             {
-                "property": "entity_picture",
+                "property": "entity_category",
                 "value": ""
             },
             {
-                "property": "entity_category",
+                "property": "entity_picture",
                 "value": ""
             },
             {
diff --git a/src/data/flows/machine_state_washing_machine.json b/src/data/flows/machine_state_washing_machine.json
index 3a12b73..adda5de 100644
--- a/src/data/flows/machine_state_washing_machine.json
+++ b/src/data/flows/machine_state_washing_machine.json
@@ -44,6 +44,131 @@
             ]
         ]
     },
+    {
+        "id": "96679db36a4a3636",
+        "type": "template",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "De wasmachine is klaar.",
+        "output": "str",
+        "x": 1480,
+        "y": 220,
+        "wires": [
+            [
+                "beedc605a0a3cbac"
+            ]
+        ]
+    },
+    {
+        "id": "61f9d42e4c070321",
+        "type": "template",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "washing_machine",
+        "output": "str",
+        "x": 1490,
+        "y": 180,
+        "wires": [
+            [
+                "beedc605a0a3cbac"
+            ]
+        ]
+    },
+    {
+        "id": "beedc605a0a3cbac",
+        "type": "join",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1670,
+        "y": 160,
+        "wires": [
+            [
+                "1e0f934a3493b12f"
+            ]
+        ]
+    },
+    {
+        "id": "1e0f934a3493b12f",
+        "type": "link out",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad",
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 1765,
+        "y": 160,
+        "wires": []
+    },
+    {
+        "id": "d93bd58ac5ac0363",
+        "type": "template",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Wasmachine",
+        "output": "str",
+        "x": 1470,
+        "y": 100,
+        "wires": [
+            [
+                "beedc605a0a3cbac"
+            ]
+        ]
+    },
+    {
+        "id": "96e077260be2f7fb",
+        "type": "template",
+        "z": "c23003c7.1c978",
+        "g": "283f88d61789c306",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1470,
+        "y": 140,
+        "wires": [
+            [
+                "beedc605a0a3cbac"
+            ]
+        ]
+    },
     {
         "id": "3e4cd67e.efae1a",
         "type": "switch",
@@ -322,131 +447,6 @@
             ]
         ]
     },
-    {
-        "id": "96e077260be2f7fb",
-        "type": "template",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1470,
-        "y": 140,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
-    {
-        "id": "d93bd58ac5ac0363",
-        "type": "template",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Wasmachine",
-        "output": "str",
-        "x": 1470,
-        "y": 100,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
-    {
-        "id": "1e0f934a3493b12f",
-        "type": "link out",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 1765,
-        "y": 160,
-        "wires": []
-    },
-    {
-        "id": "beedc605a0a3cbac",
-        "type": "join",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1670,
-        "y": 160,
-        "wires": [
-            [
-                "1e0f934a3493b12f"
-            ]
-        ]
-    },
-    {
-        "id": "61f9d42e4c070321",
-        "type": "template",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "washing_machine",
-        "output": "str",
-        "x": 1490,
-        "y": 180,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
-    {
-        "id": "96679db36a4a3636",
-        "type": "template",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "De wasmachine is klaar.",
-        "output": "str",
-        "x": 1480,
-        "y": 220,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_basement_window.json b/src/data/flows/notification_basement_window.json
index 31ab937..8e78a18 100644
--- a/src/data/flows/notification_basement_window.json
+++ b/src/data/flows/notification_basement_window.json
@@ -43,48 +43,44 @@
         ]
     },
     {
-        "id": "11d068d3ad86d2dd",
-        "type": "join",
+        "id": "a22e2a028512634f",
+        "type": "template",
         "z": "b1a9214c.4c71c",
         "g": "6b44c062cbc05f0a",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1770,
-        "y": 140,
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "natural_basement_ventilation",
+        "output": "str",
+        "x": 1630,
+        "y": 180,
         "wires": [
             [
-                "73e546f49b2e02e1"
+                "11d068d3ad86d2dd"
             ]
         ]
     },
     {
-        "id": "73e546f49b2e02e1",
-        "type": "link out",
+        "id": "db7934b4b14446da",
+        "type": "template",
         "z": "b1a9214c.4c71c",
         "g": "6b44c062cbc05f0a",
-        "name": "link_out_notify_basement_window",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716"
-        ],
-        "x": 1865,
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": ":door:",
+        "output": "str",
+        "x": 1610,
         "y": 140,
-        "wires": []
+        "wires": [
+            [
+                "11d068d3ad86d2dd"
+            ]
+        ]
     },
     {
         "id": "232a01493b9307b0",
@@ -107,22 +103,46 @@
         ]
     },
     {
-        "id": "db7934b4b14446da",
-        "type": "template",
+        "id": "73e546f49b2e02e1",
+        "type": "link out",
         "z": "b1a9214c.4c71c",
         "g": "6b44c062cbc05f0a",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": ":door:",
-        "output": "str",
-        "x": 1610,
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716"
+        ],
+        "x": 1865,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "11d068d3ad86d2dd",
+        "type": "join",
+        "z": "b1a9214c.4c71c",
+        "g": "6b44c062cbc05f0a",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1770,
         "y": 140,
         "wires": [
             [
-                "11d068d3ad86d2dd"
+                "73e546f49b2e02e1"
             ]
         ]
     },
@@ -998,26 +1018,6 @@
             ]
         ]
     },
-    {
-        "id": "a22e2a028512634f",
-        "type": "template",
-        "z": "b1a9214c.4c71c",
-        "g": "6b44c062cbc05f0a",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "natural_basement_ventilation",
-        "output": "str",
-        "x": 1630,
-        "y": 180,
-        "wires": [
-            [
-                "11d068d3ad86d2dd"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_garbage_collection.json b/src/data/flows/notification_garbage_collection.json
index cc70c74..4838e16 100644
--- a/src/data/flows/notification_garbage_collection.json
+++ b/src/data/flows/notification_garbage_collection.json
@@ -71,6 +71,179 @@
             ]
         ]
     },
+    {
+        "id": "ebcb50cdabc72f91",
+        "type": "template",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "garbage",
+        "output": "str",
+        "x": 1290,
+        "y": 320,
+        "wires": [
+            [
+                "d0d3f913b8c035f3"
+            ]
+        ]
+    },
+    {
+        "id": "46d50645e39da463",
+        "type": "template",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "{{secondary_information}}.\\nStaat de container al aan de weg?",
+        "output": "str",
+        "x": 1280,
+        "y": 280,
+        "wires": [
+            [
+                "d0d3f913b8c035f3"
+            ]
+        ]
+    },
+    {
+        "id": "dd3030c9ae0f7a07",
+        "type": "change",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "action titles",
+        "rules": [
+            {
+                "t": "set",
+                "p": "notify.action_1_title",
+                "pt": "msg",
+                "to": "JA",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2_title",
+                "pt": "msg",
+                "to": "NEE",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_1",
+                "pt": "msg",
+                "to": "GARBAGE_ON",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2",
+                "pt": "msg",
+                "to": "IGNORE",
+                "tot": "str"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 1290,
+        "y": 200,
+        "wires": [
+            [
+                "d0d3f913b8c035f3"
+            ]
+        ]
+    },
+    {
+        "id": "d0d3f913b8c035f3",
+        "type": "join",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "8",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1470,
+        "y": 200,
+        "wires": [
+            [
+                "0af5a06e405527e9"
+            ]
+        ]
+    },
+    {
+        "id": "0af5a06e405527e9",
+        "type": "link out",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "c76d311bb4b6991b",
+            "d1753081ba6b4004"
+        ],
+        "x": 1555,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "dcc306682fd0ffa8",
+        "type": "template",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Afval",
+        "output": "str",
+        "x": 1270,
+        "y": 160,
+        "wires": [
+            [
+                "d0d3f913b8c035f3"
+            ]
+        ]
+    },
+    {
+        "id": "3a3b8fdb9d6f4ab0",
+        "type": "template",
+        "z": "72f3a564e626ff9a",
+        "g": "3b89d483d3628b14",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1270,
+        "y": 240,
+        "wires": [
+            [
+                "d0d3f913b8c035f3"
+            ]
+        ]
+    },
     {
         "id": "fc015c3acdd57ee4",
         "type": "template",
@@ -470,139 +643,6 @@
             []
         ]
     },
-    {
-        "id": "3a3b8fdb9d6f4ab0",
-        "type": "template",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1270,
-        "y": 240,
-        "wires": [
-            [
-                "d0d3f913b8c035f3"
-            ]
-        ]
-    },
-    {
-        "id": "dcc306682fd0ffa8",
-        "type": "template",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Afval",
-        "output": "str",
-        "x": 1270,
-        "y": 160,
-        "wires": [
-            [
-                "d0d3f913b8c035f3"
-            ]
-        ]
-    },
-    {
-        "id": "0af5a06e405527e9",
-        "type": "link out",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "link_out_notify_guest_mode",
-        "mode": "link",
-        "links": [
-            "c76d311bb4b6991b",
-            "d1753081ba6b4004"
-        ],
-        "x": 1555,
-        "y": 200,
-        "wires": []
-    },
-    {
-        "id": "d0d3f913b8c035f3",
-        "type": "join",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "8",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1470,
-        "y": 200,
-        "wires": [
-            [
-                "0af5a06e405527e9"
-            ]
-        ]
-    },
-    {
-        "id": "dd3030c9ae0f7a07",
-        "type": "change",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "action titles",
-        "rules": [
-            {
-                "t": "set",
-                "p": "notify.action_1_title",
-                "pt": "msg",
-                "to": "JA",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2_title",
-                "pt": "msg",
-                "to": "NEE",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_1",
-                "pt": "msg",
-                "to": "GARBAGE_ON",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2",
-                "pt": "msg",
-                "to": "IGNORE",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1290,
-        "y": 200,
-        "wires": [
-            [
-                "d0d3f913b8c035f3"
-            ]
-        ]
-    },
     {
         "id": "3bbeb5287f1c9e72",
         "type": "comment",
@@ -647,46 +687,6 @@
             ]
         ]
     },
-    {
-        "id": "46d50645e39da463",
-        "type": "template",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "{{secondary_information}}.\\nStaat de container al aan de weg?",
-        "output": "str",
-        "x": 1280,
-        "y": 280,
-        "wires": [
-            [
-                "d0d3f913b8c035f3"
-            ]
-        ]
-    },
-    {
-        "id": "ebcb50cdabc72f91",
-        "type": "template",
-        "z": "72f3a564e626ff9a",
-        "g": "3b89d483d3628b14",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "garbage",
-        "output": "str",
-        "x": 1290,
-        "y": 320,
-        "wires": [
-            [
-                "d0d3f913b8c035f3"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_gas_consumption.json b/src/data/flows/notification_gas_consumption.json
index 0137c9c..e6cf03c 100644
--- a/src/data/flows/notification_gas_consumption.json
+++ b/src/data/flows/notification_gas_consumption.json
@@ -44,6 +44,129 @@
             ]
         ]
     },
+    {
+        "id": "fdc4c2eef34c0a15",
+        "type": "template",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "gas",
+        "output": "str",
+        "x": 1030,
+        "y": 220,
+        "wires": [
+            [
+                "5db5047bb3f69eb7"
+            ]
+        ]
+    },
+    {
+        "id": "5db5047bb3f69eb7",
+        "type": "join",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1170,
+        "y": 140,
+        "wires": [
+            [
+                "b9f5925e88c3b14b"
+            ]
+        ]
+    },
+    {
+        "id": "b9f5925e88c3b14b",
+        "type": "link out",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1265,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "bdce8718917c4dcb",
+        "type": "template",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Gas",
+        "output": "str",
+        "x": 1010,
+        "y": 100,
+        "wires": [
+            [
+                "5db5047bb3f69eb7"
+            ]
+        ]
+    },
+    {
+        "id": "253b2fc1dbf20ad4",
+        "type": "template",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1010,
+        "y": 180,
+        "wires": [
+            [
+                "5db5047bb3f69eb7"
+            ]
+        ]
+    },
+    {
+        "id": "496caddb.5ba724",
+        "type": "template",
+        "z": "98a989e.d6bca78",
+        "g": "7b3e33afc7e5d51f",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Er is {{payload}}m³ gas gemeten en niemand is aanwezig, controleer of het gas of verwarming is uitgezet.",
+        "output": "str",
+        "x": 1020,
+        "y": 140,
+        "wires": [
+            [
+                "5db5047bb3f69eb7"
+            ]
+        ]
+    },
     {
         "id": "6429429b.d1375c",
         "type": "server-state-changed",
@@ -202,26 +325,6 @@
             []
         ]
     },
-    {
-        "id": "496caddb.5ba724",
-        "type": "template",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Er is {{payload}}m³ gas gemeten en niemand is aanwezig, controleer of het gas of verwarming is uitgezet.",
-        "output": "str",
-        "x": 1020,
-        "y": 140,
-        "wires": [
-            [
-                "5db5047bb3f69eb7"
-            ]
-        ]
-    },
     {
         "id": "fac5f99c.1b7438",
         "type": "comment",
@@ -232,109 +335,6 @@
         "y": 40,
         "wires": []
     },
-    {
-        "id": "253b2fc1dbf20ad4",
-        "type": "template",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1010,
-        "y": 180,
-        "wires": [
-            [
-                "5db5047bb3f69eb7"
-            ]
-        ]
-    },
-    {
-        "id": "bdce8718917c4dcb",
-        "type": "template",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Gas",
-        "output": "str",
-        "x": 1010,
-        "y": 100,
-        "wires": [
-            [
-                "5db5047bb3f69eb7"
-            ]
-        ]
-    },
-    {
-        "id": "b9f5925e88c3b14b",
-        "type": "link out",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1265,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "5db5047bb3f69eb7",
-        "type": "join",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1170,
-        "y": 140,
-        "wires": [
-            [
-                "b9f5925e88c3b14b"
-            ]
-        ]
-    },
-    {
-        "id": "fdc4c2eef34c0a15",
-        "type": "template",
-        "z": "98a989e.d6bca78",
-        "g": "7b3e33afc7e5d51f",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "gas",
-        "output": "str",
-        "x": 1030,
-        "y": 220,
-        "wires": [
-            [
-                "5db5047bb3f69eb7"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_inverter.json b/src/data/flows/notification_inverter.json
index 487e8e9..dd92e2a 100644
--- a/src/data/flows/notification_inverter.json
+++ b/src/data/flows/notification_inverter.json
@@ -43,6 +43,110 @@
             ]
         ]
     },
+    {
+        "id": "cdbb5b48e71b5866",
+        "type": "template",
+        "z": "42b354a7f0284779",
+        "g": "392300741f68f312",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "{{primary_information}}.\\n{{secondary_information}}",
+        "output": "str",
+        "x": 1460,
+        "y": 200,
+        "wires": [
+            [
+                "4dd6478ac62b8c2f"
+            ]
+        ]
+    },
+    {
+        "id": "4dd6478ac62b8c2f",
+        "type": "join",
+        "z": "42b354a7f0284779",
+        "g": "392300741f68f312",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "3",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1610,
+        "y": 200,
+        "wires": [
+            [
+                "17c484a9c9a917ac"
+            ]
+        ]
+    },
+    {
+        "id": "17c484a9c9a917ac",
+        "type": "link out",
+        "z": "42b354a7f0284779",
+        "g": "392300741f68f312",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716"
+        ],
+        "x": 1705,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "c6941b34f3402196",
+        "type": "template",
+        "z": "42b354a7f0284779",
+        "g": "392300741f68f312",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Zonne-energie",
+        "output": "str",
+        "x": 1450,
+        "y": 160,
+        "wires": [
+            [
+                "4dd6478ac62b8c2f"
+            ]
+        ]
+    },
+    {
+        "id": "59327076bed18754",
+        "type": "template",
+        "z": "42b354a7f0284779",
+        "g": "392300741f68f312",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1450,
+        "y": 240,
+        "wires": [
+            [
+                "4dd6478ac62b8c2f"
+            ]
+        ]
+    },
     {
         "id": "08c71b7711856e9c",
         "type": "comment",
@@ -255,109 +359,6 @@
             ]
         ]
     },
-    {
-        "id": "59327076bed18754",
-        "type": "template",
-        "z": "42b354a7f0284779",
-        "g": "392300741f68f312",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1450,
-        "y": 240,
-        "wires": [
-            [
-                "4dd6478ac62b8c2f"
-            ]
-        ]
-    },
-    {
-        "id": "c6941b34f3402196",
-        "type": "template",
-        "z": "42b354a7f0284779",
-        "g": "392300741f68f312",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Zonne-energie",
-        "output": "str",
-        "x": 1450,
-        "y": 160,
-        "wires": [
-            [
-                "4dd6478ac62b8c2f"
-            ]
-        ]
-    },
-    {
-        "id": "17c484a9c9a917ac",
-        "type": "link out",
-        "z": "42b354a7f0284779",
-        "g": "392300741f68f312",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1705,
-        "y": 200,
-        "wires": []
-    },
-    {
-        "id": "4dd6478ac62b8c2f",
-        "type": "join",
-        "z": "42b354a7f0284779",
-        "g": "392300741f68f312",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "3",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1610,
-        "y": 200,
-        "wires": [
-            [
-                "17c484a9c9a917ac"
-            ]
-        ]
-    },
-    {
-        "id": "cdbb5b48e71b5866",
-        "type": "template",
-        "z": "42b354a7f0284779",
-        "g": "392300741f68f312",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "{{primary_information}}.\\n{{secondary_information}}",
-        "output": "str",
-        "x": 1460,
-        "y": 200,
-        "wires": [
-            [
-                "4dd6478ac62b8c2f"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_main.json b/src/data/flows/notification_main.json
index 46d395b..04809e0 100644
--- a/src/data/flows/notification_main.json
+++ b/src/data/flows/notification_main.json
@@ -20,7 +20,7 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\"message\":\"{{notify.message}}\",\"title\":\"{{notify.title}}\"}",
+        "data": "{\"message\":\"{{notify.message}}\",\"title\":\"{{notify.title}}\",\"data\":{\"vibrationPattern\":\"{{notify.vibrationPattern}}\",\"channel\":\"{{notify.channel}}\"}}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
@@ -57,7 +57,8 @@
             "dfe89d053727bf74",
             "59c627d5f35a1bc2",
             "d43e56b2e0de8b6e",
-            "b41a40c1e135e55c"
+            "b41a40c1e135e55c",
+            "ac254d4235d71700"
         ],
         "x": 195,
         "y": 140,
@@ -76,7 +77,8 @@
             "68e61dcfb6db1de4",
             "ef18c5c2564a7e77",
             "c6bc1abd0ea4d3e7",
-            "d43e56b2e0de8b6e"
+            "d43e56b2e0de8b6e",
+            "ac254d4235d71700"
         ],
         "x": 195,
         "y": 200,
@@ -109,7 +111,7 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\"message\":\"{{notify.message}}\",\"title\":\"{{notify.title}}\"}",
+        "data": "{\"message\":\"{{notify.message}}\",\"title\":\"{{notify.title}}\",\"data\":{\"vibrationPattern\":\"{{notify.vibrationPattern}}\",\"channel\":\"{{notify.channel}}\"}}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
diff --git a/src/data/flows/notification_outdoor_temperature.json b/src/data/flows/notification_outdoor_temperature.json
index 870c4d4..b5978f5 100644
--- a/src/data/flows/notification_outdoor_temperature.json
+++ b/src/data/flows/notification_outdoor_temperature.json
@@ -42,6 +42,110 @@
             ]
         ]
     },
+    {
+        "id": "1414f6788bc8c787",
+        "type": "template",
+        "z": "d5421f8d.f7208",
+        "g": "f236f0a913f70054",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Open ramen en deuren om het in huis af te laten koelen, binnen is de gemiddelde temperatuur {{payload}} Buiten is de temperatuur {{buiten_temp}}.",
+        "output": "str",
+        "x": 1660,
+        "y": 140,
+        "wires": [
+            [
+                "6858101eee61155a"
+            ]
+        ]
+    },
+    {
+        "id": "6858101eee61155a",
+        "type": "join",
+        "z": "d5421f8d.f7208",
+        "g": "f236f0a913f70054",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "3",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1810,
+        "y": 140,
+        "wires": [
+            [
+                "ef18c5c2564a7e77"
+            ]
+        ]
+    },
+    {
+        "id": "ef18c5c2564a7e77",
+        "type": "link out",
+        "z": "d5421f8d.f7208",
+        "g": "f236f0a913f70054",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad"
+        ],
+        "x": 1905,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "4b276bf7ef0c3217",
+        "type": "template",
+        "z": "d5421f8d.f7208",
+        "g": "f236f0a913f70054",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Ventilatie",
+        "output": "str",
+        "x": 1650,
+        "y": 100,
+        "wires": [
+            [
+                "6858101eee61155a"
+            ]
+        ]
+    },
+    {
+        "id": "0db5f8033b5c9adf",
+        "type": "template",
+        "z": "d5421f8d.f7208",
+        "g": "f236f0a913f70054",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1650,
+        "y": 180,
+        "wires": [
+            [
+                "6858101eee61155a"
+            ]
+        ]
+    },
     {
         "id": "317fcdab.4c33d2",
         "type": "ha-get-entities",
@@ -306,110 +410,6 @@
             []
         ]
     },
-    {
-        "id": "0db5f8033b5c9adf",
-        "type": "template",
-        "z": "d5421f8d.f7208",
-        "g": "f236f0a913f70054",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1650,
-        "y": 180,
-        "wires": [
-            [
-                "6858101eee61155a"
-            ]
-        ]
-    },
-    {
-        "id": "4b276bf7ef0c3217",
-        "type": "template",
-        "z": "d5421f8d.f7208",
-        "g": "f236f0a913f70054",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Ventilatie",
-        "output": "str",
-        "x": 1650,
-        "y": 100,
-        "wires": [
-            [
-                "6858101eee61155a"
-            ]
-        ]
-    },
-    {
-        "id": "ef18c5c2564a7e77",
-        "type": "link out",
-        "z": "d5421f8d.f7208",
-        "g": "f236f0a913f70054",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad"
-        ],
-        "x": 1905,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "6858101eee61155a",
-        "type": "join",
-        "z": "d5421f8d.f7208",
-        "g": "f236f0a913f70054",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "3",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1810,
-        "y": 140,
-        "wires": [
-            [
-                "ef18c5c2564a7e77"
-            ]
-        ]
-    },
-    {
-        "id": "1414f6788bc8c787",
-        "type": "template",
-        "z": "d5421f8d.f7208",
-        "g": "f236f0a913f70054",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Open ramen en deuren om het in huis af te laten koelen, binnen is de gemiddelde temperatuur {{payload}} Buiten is de temperatuur {{buiten_temp}}.",
-        "output": "str",
-        "x": 1660,
-        "y": 140,
-        "wires": [
-            [
-                "6858101eee61155a"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/notification_stookalert.json b/src/data/flows/notification_stookalert.json
index ab1ea8a..cc8ae9a 100644
--- a/src/data/flows/notification_stookalert.json
+++ b/src/data/flows/notification_stookalert.json
@@ -45,6 +45,130 @@
             ]
         ]
     },
+    {
+        "id": "ad8e3a3f408efd86",
+        "type": "template",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "stookalert",
+        "output": "str",
+        "x": 1330,
+        "y": 280,
+        "wires": [
+            [
+                "6cdaa7e9c55994da"
+            ]
+        ]
+    },
+    {
+        "id": "48b102061eef4776",
+        "type": "template",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "{{secondary_information}}",
+        "output": "str",
+        "x": 1320,
+        "y": 200,
+        "wires": [
+            [
+                "6cdaa7e9c55994da"
+            ]
+        ]
+    },
+    {
+        "id": "6cdaa7e9c55994da",
+        "type": "join",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1470,
+        "y": 200,
+        "wires": [
+            [
+                "c6bc1abd0ea4d3e7"
+            ]
+        ]
+    },
+    {
+        "id": "c6bc1abd0ea4d3e7",
+        "type": "link out",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad"
+        ],
+        "x": 1565,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "194df75621104155",
+        "type": "template",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Stookalert",
+        "output": "str",
+        "x": 1310,
+        "y": 160,
+        "wires": [
+            [
+                "6cdaa7e9c55994da"
+            ]
+        ]
+    },
+    {
+        "id": "5273660ff2a42a63",
+        "type": "template",
+        "z": "b1b994b3d43d6aad",
+        "g": "9d6561fb99238a4d",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1310,
+        "y": 240,
+        "wires": [
+            [
+                "6cdaa7e9c55994da"
+            ]
+        ]
+    },
     {
         "id": "277a8323827b9390",
         "type": "comment",
@@ -241,130 +365,6 @@
             ]
         ]
     },
-    {
-        "id": "5273660ff2a42a63",
-        "type": "template",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1310,
-        "y": 240,
-        "wires": [
-            [
-                "6cdaa7e9c55994da"
-            ]
-        ]
-    },
-    {
-        "id": "194df75621104155",
-        "type": "template",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Stookalert",
-        "output": "str",
-        "x": 1310,
-        "y": 160,
-        "wires": [
-            [
-                "6cdaa7e9c55994da"
-            ]
-        ]
-    },
-    {
-        "id": "c6bc1abd0ea4d3e7",
-        "type": "link out",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad"
-        ],
-        "x": 1565,
-        "y": 200,
-        "wires": []
-    },
-    {
-        "id": "6cdaa7e9c55994da",
-        "type": "join",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1470,
-        "y": 200,
-        "wires": [
-            [
-                "c6bc1abd0ea4d3e7"
-            ]
-        ]
-    },
-    {
-        "id": "48b102061eef4776",
-        "type": "template",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "{{secondary_information}}",
-        "output": "str",
-        "x": 1320,
-        "y": 200,
-        "wires": [
-            [
-                "6cdaa7e9c55994da"
-            ]
-        ]
-    },
-    {
-        "id": "ad8e3a3f408efd86",
-        "type": "template",
-        "z": "b1b994b3d43d6aad",
-        "g": "9d6561fb99238a4d",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "stookalert",
-        "output": "str",
-        "x": 1330,
-        "y": 280,
-        "wires": [
-            [
-                "6cdaa7e9c55994da"
-            ]
-        ]
-    },
     {
         "id": "3c05c027bd8c6081",
         "type": "api-call-service",
diff --git a/src/data/flows/notification_update_hacs.json b/src/data/flows/notification_update_hacs.json
index ea9ca6b..ff65d7e 100644
--- a/src/data/flows/notification_update_hacs.json
+++ b/src/data/flows/notification_update_hacs.json
@@ -44,6 +44,130 @@
             ]
         ]
     },
+    {
+        "id": "729f7d37f7551233",
+        "type": "template",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "hacs_update",
+        "output": "str",
+        "x": 1010,
+        "y": 220,
+        "wires": [
+            [
+                "ad08a3376d632cdc"
+            ]
+        ]
+    },
+    {
+        "id": "c2cde99283db35e2",
+        "type": "template",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "{{msg.payload}} {{msg.update}} beschikbaar in de Home Assistant Community Store (hacs) \\n[Link](https://home-assistant.theautomation.nl/hacs)",
+        "output": "str",
+        "x": 1000,
+        "y": 140,
+        "wires": [
+            [
+                "ad08a3376d632cdc"
+            ]
+        ]
+    },
+    {
+        "id": "ad08a3376d632cdc",
+        "type": "join",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1150,
+        "y": 140,
+        "wires": [
+            [
+                "0b0c89810da47741"
+            ]
+        ]
+    },
+    {
+        "id": "0b0c89810da47741",
+        "type": "link out",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716"
+        ],
+        "x": 1245,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "f84f54b2de24abeb",
+        "type": "template",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Update",
+        "output": "str",
+        "x": 990,
+        "y": 100,
+        "wires": [
+            [
+                "ad08a3376d632cdc"
+            ]
+        ]
+    },
+    {
+        "id": "ecf579456bbf27a1",
+        "type": "template",
+        "z": "5a8d7bb1.6263b4",
+        "g": "17572ea875148733",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 990,
+        "y": 180,
+        "wires": [
+            [
+                "ad08a3376d632cdc"
+            ]
+        ]
+    },
     {
         "id": "c053e3f3.16b41",
         "type": "comment",
@@ -184,130 +308,6 @@
             []
         ]
     },
-    {
-        "id": "ecf579456bbf27a1",
-        "type": "template",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 990,
-        "y": 180,
-        "wires": [
-            [
-                "ad08a3376d632cdc"
-            ]
-        ]
-    },
-    {
-        "id": "f84f54b2de24abeb",
-        "type": "template",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Update",
-        "output": "str",
-        "x": 990,
-        "y": 100,
-        "wires": [
-            [
-                "ad08a3376d632cdc"
-            ]
-        ]
-    },
-    {
-        "id": "0b0c89810da47741",
-        "type": "link out",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716"
-        ],
-        "x": 1245,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "ad08a3376d632cdc",
-        "type": "join",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1150,
-        "y": 140,
-        "wires": [
-            [
-                "0b0c89810da47741"
-            ]
-        ]
-    },
-    {
-        "id": "c2cde99283db35e2",
-        "type": "template",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "{{msg.payload}} {{msg.update}} beschikbaar in de Home Assistant Community Store (hacs) \\n[Link](https://home-assistant.theautomation.nl/hacs)",
-        "output": "str",
-        "x": 1000,
-        "y": 140,
-        "wires": [
-            [
-                "ad08a3376d632cdc"
-            ]
-        ]
-    },
-    {
-        "id": "729f7d37f7551233",
-        "type": "template",
-        "z": "5a8d7bb1.6263b4",
-        "g": "17572ea875148733",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "hacs_update",
-        "output": "str",
-        "x": 1010,
-        "y": 220,
-        "wires": [
-            [
-                "ad08a3376d632cdc"
-            ]
-        ]
-    },
     {
         "id": "6b37fa1065800145",
         "type": "template",
diff --git a/src/data/flows/notification_vacuum.json b/src/data/flows/notification_vacuum.json
index a4fb070..7b883f2 100644
--- a/src/data/flows/notification_vacuum.json
+++ b/src/data/flows/notification_vacuum.json
@@ -44,19 +44,19 @@
         ]
     },
     {
-        "id": "b560dfc6f3c2aec1",
+        "id": "db50c5b6f4f302b4",
         "type": "template",
         "z": "8d2de69b4c0fd2b9",
         "g": "bb1cc6878bf6f696",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "vacuum",
+        "template": "",
         "output": "str",
-        "x": 1450,
-        "y": 140,
+        "x": 1430,
+        "y": 100,
         "wires": [
             [
                 "344ad3f982a92730"
@@ -64,31 +64,22 @@
         ]
     },
     {
-        "id": "344ad3f982a92730",
-        "type": "join",
+        "id": "c0d0c36d39f527e2",
+        "type": "template",
         "z": "8d2de69b4c0fd2b9",
         "g": "bb1cc6878bf6f696",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1630,
-        "y": 120,
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Stofzuiger",
+        "output": "str",
+        "x": 1430,
+        "y": 60,
         "wires": [
             [
-                "372e878f27b4b2b2"
+                "344ad3f982a92730"
             ]
         ]
     },
@@ -97,7 +88,7 @@
         "type": "link out",
         "z": "8d2de69b4c0fd2b9",
         "g": "bb1cc6878bf6f696",
-        "name": "link_out_notify_basement_ventilation",
+        "name": "link_out_notify_1",
         "mode": "link",
         "links": [
             "8ed3b0974336e55b",
@@ -109,39 +100,48 @@
         "wires": []
     },
     {
-        "id": "c0d0c36d39f527e2",
-        "type": "template",
+        "id": "344ad3f982a92730",
+        "type": "join",
         "z": "8d2de69b4c0fd2b9",
         "g": "bb1cc6878bf6f696",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Stofzuiger",
-        "output": "str",
-        "x": 1430,
-        "y": 60,
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1630,
+        "y": 120,
         "wires": [
             [
-                "344ad3f982a92730"
+                "372e878f27b4b2b2"
             ]
         ]
     },
     {
-        "id": "db50c5b6f4f302b4",
+        "id": "b560dfc6f3c2aec1",
         "type": "template",
         "z": "8d2de69b4c0fd2b9",
         "g": "bb1cc6878bf6f696",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "vacuum",
         "output": "str",
-        "x": 1430,
-        "y": 100,
+        "x": 1450,
+        "y": 140,
         "wires": [
             [
                 "344ad3f982a92730"
diff --git a/src/data/flows/scene_home_entering.json b/src/data/flows/scene_home_entering.json
index 4457b7a..7df1057 100644
--- a/src/data/flows/scene_home_entering.json
+++ b/src/data/flows/scene_home_entering.json
@@ -41,25 +41,48 @@
         ]
     },
     {
-        "id": "4d43c0c59596c396",
-        "type": "template",
+        "id": "52f21d3060c57706",
+        "type": "join",
         "z": "c0da8379.b0dd3",
         "g": "47af9932f18884cc",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 2070,
-        "y": 340,
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "3",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 2230,
+        "y": 300,
         "wires": [
             [
-                "52f21d3060c57706"
+                "5e72b91e3ad4066d"
             ]
         ]
     },
+    {
+        "id": "5e72b91e3ad4066d",
+        "type": "link out",
+        "z": "c0da8379.b0dd3",
+        "g": "47af9932f18884cc",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 2325,
+        "y": 300,
+        "wires": []
+    },
     {
         "id": "7063678cde99b775",
         "type": "template",
@@ -81,45 +104,22 @@
         ]
     },
     {
-        "id": "5e72b91e3ad4066d",
-        "type": "link out",
-        "z": "c0da8379.b0dd3",
-        "g": "47af9932f18884cc",
-        "name": "link_out_notify_home_entering",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 2325,
-        "y": 300,
-        "wires": []
-    },
-    {
-        "id": "52f21d3060c57706",
-        "type": "join",
+        "id": "4d43c0c59596c396",
+        "type": "template",
         "z": "c0da8379.b0dd3",
         "g": "47af9932f18884cc",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "3",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 2230,
-        "y": 300,
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 2070,
+        "y": 340,
         "wires": [
             [
-                "5e72b91e3ad4066d"
+                "52f21d3060c57706"
             ]
         ]
     },
diff --git a/src/data/flows/scene_home_leaving.json b/src/data/flows/scene_home_leaving.json
index 9a289c6..d68eb62 100644
--- a/src/data/flows/scene_home_leaving.json
+++ b/src/data/flows/scene_home_leaving.json
@@ -7,7 +7,7 @@
         "info": ""
     },
     {
-        "id": "cc3f4f06d9ee1050",
+        "id": "14187342a7b09482",
         "type": "group",
         "z": "8aa6edec.5a013",
         "name": "notify",
@@ -15,16 +15,18 @@
             "label": true
         },
         "nodes": [
-            "8bd431aac8edba25",
-            "1d9212ada487b166",
-            "2d9c5a51a0d3d65a",
-            "934778f06d5ff810",
-            "11441b9d4ec597d9"
+            "19cfd22b49a2e356",
+            "8aa74b4cb48558f8",
+            "3bdaf73ce37b7397",
+            "d512fe1ba0adbf42",
+            "83e460c17170065f",
+            "1b8772493fd3aa94",
+            "c8db6380b138fd4e"
         ],
         "x": 1594,
-        "y": 459,
+        "y": 239,
         "w": 412,
-        "h": 162
+        "h": 202
     },
     {
         "id": "9c946ef945c199e5",
@@ -47,7 +49,7 @@
         "h": 162
     },
     {
-        "id": "14187342a7b09482",
+        "id": "cc3f4f06d9ee1050",
         "type": "group",
         "z": "8aa6edec.5a013",
         "name": "notify",
@@ -55,30 +57,30 @@
             "label": true
         },
         "nodes": [
-            "19cfd22b49a2e356",
-            "8aa74b4cb48558f8",
-            "3bdaf73ce37b7397",
-            "d512fe1ba0adbf42",
-            "83e460c17170065f",
-            "1b8772493fd3aa94",
-            "c8db6380b138fd4e"
+            "8bd431aac8edba25",
+            "1d9212ada487b166",
+            "2d9c5a51a0d3d65a",
+            "934778f06d5ff810",
+            "11441b9d4ec597d9"
         ],
         "x": 1594,
-        "y": 239,
+        "y": 459,
         "w": 412,
-        "h": 202
+        "h": 162
     },
     {
-        "id": "11441b9d4ec597d9",
+        "id": "83e460c17170065f",
         "type": "junction",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
+        "g": "14187342a7b09482",
         "x": 1620,
-        "y": 540,
+        "y": 320,
         "wires": [
             [
-                "1d9212ada487b166",
-                "8bd431aac8edba25"
+                "8aa74b4cb48558f8",
+                "19cfd22b49a2e356",
+                "1b8772493fd3aa94",
+                "c8db6380b138fd4e"
             ]
         ]
     },
@@ -97,109 +99,64 @@
         ]
     },
     {
-        "id": "83e460c17170065f",
+        "id": "11441b9d4ec597d9",
         "type": "junction",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "x": 1620,
-        "y": 320,
-        "wires": [
-            [
-                "8aa74b4cb48558f8",
-                "19cfd22b49a2e356",
-                "1b8772493fd3aa94",
-                "c8db6380b138fd4e"
-            ]
-        ]
-    },
-    {
-        "id": "934778f06d5ff810",
-        "type": "join",
-        "z": "8aa6edec.5a013",
         "g": "cc3f4f06d9ee1050",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "3",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1870,
+        "x": 1620,
         "y": 540,
         "wires": [
             [
-                "2d9c5a51a0d3d65a"
+                "1d9212ada487b166",
+                "8bd431aac8edba25"
             ]
         ]
     },
     {
-        "id": "2d9c5a51a0d3d65a",
-        "type": "link out",
-        "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
-        "name": "link_out_notify_home_leaving_2",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1965,
-        "y": 540,
-        "wires": []
-    },
-    {
-        "id": "1d9212ada487b166",
+        "id": "c8db6380b138fd4e",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
-        "name": "title",
-        "field": "notify.title",
+        "g": "14187342a7b09482",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Gastmodus",
+        "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.",
         "output": "str",
-        "x": 1710,
-        "y": 500,
+        "x": 1720,
+        "y": 320,
         "wires": [
             [
-                "934778f06d5ff810"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "8bd431aac8edba25",
+        "id": "1b8772493fd3aa94",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
-        "name": "icon",
-        "field": "notify.icon",
+        "g": "14187342a7b09482",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "lights",
         "output": "str",
-        "x": 1710,
-        "y": 580,
+        "x": 1730,
+        "y": 360,
         "wires": [
             [
-                "934778f06d5ff810"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "f7c20be07a75c04e",
+        "id": "d512fe1ba0adbf42",
         "type": "join",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
+        "g": "14187342a7b09482",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -210,59 +167,59 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "3",
+        "count": "4",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1870,
-        "y": 120,
+        "y": 320,
         "wires": [
             [
-                "37c73ac2e71d9a61"
+                "3bdaf73ce37b7397"
             ]
         ]
     },
     {
-        "id": "37c73ac2e71d9a61",
+        "id": "3bdaf73ce37b7397",
         "type": "link out",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
-        "name": "link_out_notify_home_leaving_1",
+        "g": "14187342a7b09482",
+        "name": "link_out_notify_2",
         "mode": "link",
         "links": [
-            "8ed3b0974336e55b"
+            "a97f87cfab413716"
         ],
         "x": 1965,
-        "y": 120,
+        "y": 320,
         "wires": []
     },
     {
-        "id": "254201c717321a67",
+        "id": "8aa74b4cb48558f8",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
+        "g": "14187342a7b09482",
         "name": "title",
         "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Beveiliging",
+        "template": "Verlichting",
         "output": "str",
         "x": 1710,
-        "y": 80,
+        "y": 280,
         "wires": [
             [
-                "f7c20be07a75c04e"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "60a9200995b666e2",
+        "id": "19cfd22b49a2e356",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
+        "g": "14187342a7b09482",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -271,18 +228,18 @@
         "template": "",
         "output": "str",
         "x": 1710,
-        "y": 160,
+        "y": 400,
         "wires": [
             [
-                "f7c20be07a75c04e"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "19cfd22b49a2e356",
+        "id": "60a9200995b666e2",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
+        "g": "9c946ef945c199e5",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -291,52 +248,52 @@
         "template": "",
         "output": "str",
         "x": 1710,
-        "y": 400,
+        "y": 160,
         "wires": [
             [
-                "d512fe1ba0adbf42"
+                "f7c20be07a75c04e"
             ]
         ]
     },
     {
-        "id": "8aa74b4cb48558f8",
+        "id": "254201c717321a67",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
+        "g": "9c946ef945c199e5",
         "name": "title",
         "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Verlichting",
+        "template": "Beveiliging",
         "output": "str",
         "x": 1710,
-        "y": 280,
+        "y": 80,
         "wires": [
             [
-                "d512fe1ba0adbf42"
+                "f7c20be07a75c04e"
             ]
         ]
     },
     {
-        "id": "3bdaf73ce37b7397",
+        "id": "37c73ac2e71d9a61",
         "type": "link out",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "link_out_notify_ac_solar_record",
+        "g": "9c946ef945c199e5",
+        "name": "link_out_notify_1",
         "mode": "link",
         "links": [
-            "a97f87cfab413716"
+            "8ed3b0974336e55b"
         ],
         "x": 1965,
-        "y": 320,
+        "y": 120,
         "wires": []
     },
     {
-        "id": "d512fe1ba0adbf42",
+        "id": "f7c20be07a75c04e",
         "type": "join",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
+        "g": "9c946ef945c199e5",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -347,57 +304,100 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "4",
+        "count": "3",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1870,
-        "y": 320,
+        "y": 120,
         "wires": [
             [
-                "3bdaf73ce37b7397"
+                "37c73ac2e71d9a61"
             ]
         ]
     },
     {
-        "id": "1b8772493fd3aa94",
+        "id": "8bd431aac8edba25",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "g": "cc3f4f06d9ee1050",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "lights",
+        "template": "",
         "output": "str",
-        "x": 1730,
-        "y": 360,
+        "x": 1710,
+        "y": 580,
         "wires": [
             [
-                "d512fe1ba0adbf42"
+                "934778f06d5ff810"
             ]
         ]
     },
     {
-        "id": "c8db6380b138fd4e",
+        "id": "1d9212ada487b166",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "message",
-        "field": "notify.message",
+        "g": "cc3f4f06d9ee1050",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.",
+        "template": "Gastmodus",
         "output": "str",
-        "x": 1720,
-        "y": 320,
+        "x": 1710,
+        "y": 500,
         "wires": [
             [
-                "d512fe1ba0adbf42"
+                "934778f06d5ff810"
+            ]
+        ]
+    },
+    {
+        "id": "2d9c5a51a0d3d65a",
+        "type": "link out",
+        "z": "8aa6edec.5a013",
+        "g": "cc3f4f06d9ee1050",
+        "name": "link_out_notify_3",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1965,
+        "y": 540,
+        "wires": []
+    },
+    {
+        "id": "934778f06d5ff810",
+        "type": "join",
+        "z": "8aa6edec.5a013",
+        "g": "cc3f4f06d9ee1050",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "3",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1870,
+        "y": 540,
+        "wires": [
+            [
+                "2d9c5a51a0d3d65a"
             ]
         ]
     },
diff --git a/src/data/flows/scene_off_mode.json b/src/data/flows/scene_off_mode.json
index 42b3cda..85c5d14 100644
--- a/src/data/flows/scene_off_mode.json
+++ b/src/data/flows/scene_off_mode.json
@@ -42,48 +42,25 @@
         ]
     },
     {
-        "id": "8a1366db3f33e113",
-        "type": "join",
+        "id": "72ef2fc0d180fcea",
+        "type": "template",
         "z": "eb1939ba1b7e9b73",
         "g": "725af18957967e99",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "3",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1350,
-        "y": 260,
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": ":door:",
+        "output": "str",
+        "x": 1230,
+        "y": 280,
         "wires": [
             [
-                "30a8a878728a6a2b"
+                "8a1366db3f33e113"
             ]
         ]
     },
-    {
-        "id": "30a8a878728a6a2b",
-        "type": "link out",
-        "z": "eb1939ba1b7e9b73",
-        "g": "725af18957967e99",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "a97f87cfab413716"
-        ],
-        "x": 1445,
-        "y": 260,
-        "wires": []
-    },
     {
         "id": "343f37d7fe9484fd",
         "type": "template",
@@ -105,22 +82,45 @@
         ]
     },
     {
-        "id": "72ef2fc0d180fcea",
-        "type": "template",
+        "id": "30a8a878728a6a2b",
+        "type": "link out",
         "z": "eb1939ba1b7e9b73",
         "g": "725af18957967e99",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": ":door:",
-        "output": "str",
-        "x": 1230,
-        "y": 280,
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "a97f87cfab413716"
+        ],
+        "x": 1445,
+        "y": 260,
+        "wires": []
+    },
+    {
+        "id": "8a1366db3f33e113",
+        "type": "join",
+        "z": "eb1939ba1b7e9b73",
+        "g": "725af18957967e99",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "3",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1350,
+        "y": 260,
         "wires": [
             [
-                "8a1366db3f33e113"
+                "30a8a878728a6a2b"
             ]
         ]
     },
diff --git a/src/data/flows/scene_sleepmode.json b/src/data/flows/scene_sleepmode.json
index b128215..983f882 100644
--- a/src/data/flows/scene_sleepmode.json
+++ b/src/data/flows/scene_sleepmode.json
@@ -8,7 +8,7 @@
         "env": []
     },
     {
-        "id": "13b1135f0e749c31",
+        "id": "12e8b8acaeaeb3fa",
         "type": "group",
         "z": "e4381ced98d2a929",
         "style": {
@@ -21,13 +21,35 @@
             "color": "#a4a4a4"
         },
         "nodes": [
-            "f9ccc0bad1f19231",
-            "8ee38710dd301911"
+            "38276d0327ca72c0",
+            "c20492a470484001",
+            "5d3c3503fee346db",
+            "c527f80ad015aec2",
+            "dbd19cce541f73bc",
+            "0ccbc5bbe180df8e",
+            "1583a7af300c58e0",
+            "6f6fc24f15222254",
+            "b9a725c627f8ca76",
+            "013e749edd3fa5ad",
+            "9c4864f0ca0d2d96",
+            "c49e5bd8f93bd496",
+            "d1324fbb34721b63",
+            "3dd82a4a5a5f543f",
+            "2db276d509393d03",
+            "cdc4fcc574f8d36a",
+            "0135d0d0e0806d33",
+            "269da6e81145bb4b",
+            "47f54cec68e78d0a",
+            "a0bb528ecdb6c5fe",
+            "aab38cb48d0dd6a2",
+            "7804abbba8a75b19",
+            "bd90d247a95feb9d",
+            "a1aa1dc96a54a58d"
         ],
         "x": 434,
-        "y": 619,
-        "w": 532,
-        "h": 82
+        "y": 19,
+        "w": 1432,
+        "h": 588
     },
     {
         "id": "1fb2b225cc711d77",
@@ -57,7 +79,7 @@
         "h": 202
     },
     {
-        "id": "12e8b8acaeaeb3fa",
+        "id": "13b1135f0e749c31",
         "type": "group",
         "z": "e4381ced98d2a929",
         "style": {
@@ -70,35 +92,13 @@
             "color": "#a4a4a4"
         },
         "nodes": [
-            "38276d0327ca72c0",
-            "c20492a470484001",
-            "5d3c3503fee346db",
-            "c527f80ad015aec2",
-            "dbd19cce541f73bc",
-            "0ccbc5bbe180df8e",
-            "1583a7af300c58e0",
-            "6f6fc24f15222254",
-            "b9a725c627f8ca76",
-            "013e749edd3fa5ad",
-            "9c4864f0ca0d2d96",
-            "c49e5bd8f93bd496",
-            "d1324fbb34721b63",
-            "3dd82a4a5a5f543f",
-            "2db276d509393d03",
-            "cdc4fcc574f8d36a",
-            "0135d0d0e0806d33",
-            "269da6e81145bb4b",
-            "47f54cec68e78d0a",
-            "a0bb528ecdb6c5fe",
-            "aab38cb48d0dd6a2",
-            "7804abbba8a75b19",
-            "bd90d247a95feb9d",
-            "a1aa1dc96a54a58d"
+            "f9ccc0bad1f19231",
+            "8ee38710dd301911"
         ],
         "x": 434,
-        "y": 19,
-        "w": 1432,
-        "h": 588
+        "y": 619,
+        "w": 532,
+        "h": 82
     },
     {
         "id": "bd90d247a95feb9d",
@@ -123,30 +123,30 @@
         "h": 162
     },
     {
-        "id": "2db276d509393d03",
+        "id": "ce2746e7cd66f603",
         "type": "junction",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "x": 1040,
-        "y": 260,
+        "g": "bd90d247a95feb9d",
+        "x": 1100,
+        "y": 500,
         "wires": [
             [
-                "9c4864f0ca0d2d96"
+                "cae0f9255059d5ce",
+                "ad62962b589ed07d",
+                "13dd6df8c5e31625"
             ]
         ]
     },
     {
-        "id": "ce2746e7cd66f603",
+        "id": "2db276d509393d03",
         "type": "junction",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "x": 1100,
-        "y": 500,
+        "g": "12e8b8acaeaeb3fa",
+        "x": 1040,
+        "y": 260,
         "wires": [
             [
-                "cae0f9255059d5ce",
-                "ad62962b589ed07d",
-                "13dd6df8c5e31625"
+                "9c4864f0ca0d2d96"
             ]
         ]
     },
@@ -184,213 +184,124 @@
         ]
     },
     {
-        "id": "a1aa1dc96a54a58d",
-        "type": "switch",
+        "id": "13dd6df8c5e31625",
+        "type": "template",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "light is bathroom or master_bedroom",
-        "property": "payload.entity_id",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "eq",
-                "v": "light.shelly1_bathroom",
-                "vt": "str"
-            },
-            {
-                "t": "eq",
-                "v": "light.shellydimmer_master_bedroom",
-                "vt": "str"
-            },
-            {
-                "t": "else"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 3,
-        "x": 1210,
-        "y": 120,
+        "g": "bd90d247a95feb9d",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1230,
+        "y": 540,
         "wires": [
             [
-                "7804abbba8a75b19"
-            ],
-            [
-                "7804abbba8a75b19"
-            ],
-            [
-                "a0bb528ecdb6c5fe"
+                "c1f0224f374a67a6"
             ]
         ]
     },
     {
-        "id": "7804abbba8a75b19",
-        "type": "switch",
+        "id": "c1f0224f374a67a6",
+        "type": "join",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "lights on longer then 10 min",
-        "property": "payload.timeSinceChangedMs",
+        "g": "bd90d247a95feb9d",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
         "propertyType": "msg",
-        "rules": [
-            {
-                "t": "gt",
-                "v": "60000",
-                "vt": "num"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 1540,
-        "y": 100,
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "4",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1370,
+        "y": 480,
         "wires": [
             [
-                "a0bb528ecdb6c5fe"
+                "f5a1c4dd087e0795"
             ]
         ]
     },
     {
-        "id": "a0bb528ecdb6c5fe",
-        "type": "api-call-service",
+        "id": "f5a1c4dd087e0795",
+        "type": "link out",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "turn off lights",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "light",
-        "service": "turn_off",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "{{payload.entity_id}}"
+        "g": "bd90d247a95feb9d",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716",
+            "aeee8468f3d1b7ad",
+            "c4660dc11fb0e5b8"
         ],
-        "data": "{\"transition\":5000}",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 1770,
-        "y": 140,
-        "wires": [
-            []
-        ]
+        "x": 1465,
+        "y": 480,
+        "wires": []
     },
     {
-        "id": "aab38cb48d0dd6a2",
-        "type": "switch",
+        "id": "cae0f9255059d5ce",
+        "type": "template",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "is not kitchen light",
-        "property": "payload.entity_id",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "neq",
-                "v": "light.shellydimmer_kitchen",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 950,
-        "y": 120,
+        "g": "bd90d247a95feb9d",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Afval",
+        "output": "str",
+        "x": 1210,
+        "y": 460,
         "wires": [
             [
-                "a1aa1dc96a54a58d"
+                "c1f0224f374a67a6"
             ]
         ]
     },
     {
-        "id": "47f54cec68e78d0a",
-        "type": "switch",
+        "id": "ad62962b589ed07d",
+        "type": "template",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "is not upstairs hall light",
-        "property": "payload.entity_id",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "neq",
-                "v": "light.shelly1_upstairs_hall",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 740,
-        "y": 120,
-        "wires": [
-            [
-                "aab38cb48d0dd6a2"
-            ]
-        ]
-    },
-    {
-        "id": "269da6e81145bb4b",
-        "type": "ha-get-entities",
-        "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "lookup lights on",
-        "server": "4ba92433.2478cc",
-        "version": 1,
-        "rules": [
-            {
-                "property": "entity_id",
-                "logic": "starts_with",
-                "value": "light.",
-                "valueType": "str"
-            },
-            {
-                "property": "state",
-                "logic": "is",
-                "value": "on",
-                "valueType": "str"
-            }
-        ],
-        "outputType": "split",
-        "outputEmptyResults": false,
-        "outputLocationType": "msg",
-        "outputLocation": "payload",
-        "outputResultsCount": 1,
-        "x": 540,
-        "y": 120,
+        "g": "bd90d247a95feb9d",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1210,
+        "y": 500,
         "wires": [
             [
-                "47f54cec68e78d0a"
+                "c1f0224f374a67a6"
             ]
         ]
     },
     {
-        "id": "0135d0d0e0806d33",
-        "type": "link out",
-        "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "link out sleepmode",
-        "mode": "link",
-        "links": [
-            "51f8fd5354fac718"
-        ],
-        "x": 475,
-        "y": 60,
-        "wires": []
-    },
-    {
-        "id": "f69361468483265d",
+        "id": "3dd82a4a5a5f543f",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "state backyard light off",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "state outdoor dark",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "off",
+        "halt_if": "dark",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "light.shellydimmer_backyard_string_l",
+        "entity_id": "sensor.outdoor_light_dark",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -410,62 +321,23 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 780,
-        "y": 840,
+        "x": 550,
+        "y": 240,
         "wires": [
             [
-                "3392b339fb5fe297"
+                "d1324fbb34721b63"
             ],
-            []
-        ]
-    },
-    {
-        "id": "3fd3c31faf84dc25",
-        "type": "api-current-state",
-        "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "state frontdoor light off",
-        "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "off",
-        "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "light.shelly1_front_door",
-        "state_type": "str",
-        "blockInputOverrides": false,
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "data",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entity"
-            }
-        ],
-        "for": 0,
-        "forType": "num",
-        "forUnits": "minutes",
-        "x": 780,
-        "y": 900,
-        "wires": [
             [
-                "28d474865ab8bbeb"
-            ],
-            []
+                "2db276d509393d03"
+            ]
         ]
     },
     {
-        "id": "3392b339fb5fe297",
+        "id": "d1324fbb34721b63",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "turn on light backyard",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "turn on light kitchen",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
@@ -474,61 +346,88 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.shellydimmer_backyard_string_l"
+            "light.shellydimmer_kitchen"
         ],
-        "data": "{\"transition\":5000}",
+        "data": "{\"brightness_pct\":45,\"transition\":5000}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1000,
-        "y": 840,
+        "x": 790,
+        "y": 220,
         "wires": [
-            []
+            [
+                "c49e5bd8f93bd496"
+            ]
         ]
     },
     {
-        "id": "28d474865ab8bbeb",
+        "id": "c49e5bd8f93bd496",
+        "type": "delay",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "",
+        "pauseType": "delay",
+        "timeout": "20",
+        "timeoutUnits": "minutes",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "outputs": 1,
+        "x": 970,
+        "y": 220,
+        "wires": [
+            [
+                "9c4864f0ca0d2d96"
+            ]
+        ]
+    },
+    {
+        "id": "9c4864f0ca0d2d96",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "turn on light front door ",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "turn off light kitchen",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "light",
-        "service": "turn_on",
+        "service": "turn_off",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.shelly1_front_door"
+            "light.shellydimmer_kitchen"
         ],
-        "data": "",
+        "data": "{\"transition\":5000}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1000,
-        "y": 900,
+        "x": 1150,
+        "y": 220,
         "wires": [
             []
         ]
     },
     {
-        "id": "ab4badbb40ac3f96",
+        "id": "013e749edd3fa5ad",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "state outdoor dark",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "state doorbell chime off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "dark",
+        "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "sensor.outdoor_light_dark",
+        "entity_id": "switch.smart-doorbell_active",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -548,31 +447,30 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 550,
-        "y": 840,
+        "x": 570,
+        "y": 300,
         "wires": [
             [
-                "3fd3c31faf84dc25",
-                "f69361468483265d"
+                "b9a725c627f8ca76"
             ],
             []
         ]
     },
     {
-        "id": "38276d0327ca72c0",
+        "id": "b9a725c627f8ca76",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "start timer security",
+        "name": "turn on switch chime active",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "timer",
-        "service": "start",
+        "domain": "switch",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "timer.home_security"
+            "switch.smart-doorbell_active"
         ],
         "data": "",
         "dataType": "json",
@@ -580,53 +478,53 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 790,
-        "y": 420,
+        "x": 820,
+        "y": 300,
         "wires": [
             []
         ]
     },
     {
-        "id": "c20492a470484001",
+        "id": "6f6fc24f15222254",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "start speedtest",
+        "name": "turn on home security",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "homeassistant",
-        "service": "update_entity",
+        "domain": "input_boolean",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "sensor.speedtest_download"
+            "input_boolean.home_security"
         ],
         "data": "",
-        "dataType": "jsonata",
+        "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 540,
-        "y": 180,
+        "x": 960,
+        "y": 360,
         "wires": [
             []
         ]
     },
     {
-        "id": "5d3c3503fee346db",
+        "id": "1583a7af300c58e0",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "state garbage today",
+        "name": "state home security off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "Geen",
+        "halt_if": "off",
         "halt_if_type": "str",
-        "halt_if_compare": "is_not",
-        "entity_id": "sensor.afval_vandaag",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.home_security",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -643,130 +541,90 @@
                 "valueType": "entity"
             }
         ],
-        "for": "0",
+        "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 720,
-        "y": 540,
+        "x": 560,
+        "y": 360,
         "wires": [
             [
-                "c527f80ad015aec2"
+                "0ccbc5bbe180df8e",
+                "38276d0327ca72c0"
             ],
             []
         ]
     },
     {
-        "id": "cdc4fcc574f8d36a",
-        "type": "time-range-switch",
+        "id": "0ccbc5bbe180df8e",
+        "type": "delay",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
         "name": "",
-        "lat": "52.0434",
-        "lon": "5.6773",
-        "startTime": "05:00",
-        "endTime": "00:00",
-        "startOffset": 0,
-        "endOffset": 0,
-        "x": 530,
-        "y": 480,
-        "wires": [
-            [
-                "dbd19cce541f73bc"
-            ],
-            [
-                "5d3c3503fee346db"
-            ]
-        ]
-    },
-    {
-        "id": "c527f80ad015aec2",
-        "type": "template",
-        "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Let op, morgen wordt de {{payload}} container opgehaald.",
-        "output": "str",
-        "x": 960,
-        "y": 480,
+        "pauseType": "delay",
+        "timeout": "20",
+        "timeoutUnits": "minutes",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "outputs": 1,
+        "x": 770,
+        "y": 360,
         "wires": [
             [
-                "ce2746e7cd66f603"
+                "6f6fc24f15222254"
             ]
         ]
     },
     {
-        "id": "dbd19cce541f73bc",
-        "type": "api-current-state",
+        "id": "ec72f7b2db4cc37c",
+        "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "state garbage tomorrow",
+        "g": "1fb2b225cc711d77",
+        "name": "stop timer security",
         "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "Geen",
-        "halt_if_type": "str",
-        "halt_if_compare": "is_not",
-        "entity_id": "sensor.afval_morgen",
-        "state_type": "str",
-        "blockInputOverrides": false,
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "data",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entity"
-            }
+        "version": 5,
+        "debugenabled": false,
+        "domain": "timer",
+        "service": "cancel",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "timer.home_security"
         ],
-        "for": "0",
-        "forType": "num",
-        "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 730,
-        "y": 480,
+        "data": "",
+        "dataType": "json",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 790,
+        "y": 780,
         "wires": [
-            [
-                "c527f80ad015aec2"
-            ],
             []
         ]
     },
     {
-        "id": "8ee38710dd301911",
+        "id": "764ff273496b0193",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "13b1135f0e749c31",
-        "name": "state doorbell chime off",
+        "g": "1fb2b225cc711d77",
+        "name": "state timer security active",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "off",
+        "halt_if": "active",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "switch.smart-doorbell_active",
+        "entity_id": "timer.home_security",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
             {
-                "property": "payload",
+                "property": "timer.security",
                 "propertyType": "msg",
                 "value": "",
                 "valueType": "entityState"
@@ -782,10 +640,10 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 570,
-        "y": 660,
+        "y": 780,
         "wires": [
             [
-                "f9ccc0bad1f19231"
+                "ec72f7b2db4cc37c"
             ],
             []
         ]
@@ -819,23 +677,23 @@
         ]
     },
     {
-        "id": "764ff273496b0193",
+        "id": "8ee38710dd301911",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "state timer security active",
+        "g": "13b1135f0e749c31",
+        "name": "state doorbell chime off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "active",
+        "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "timer.home_security",
+        "entity_id": "switch.smart-doorbell_active",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
             {
-                "property": "timer.security",
+                "property": "payload",
                 "propertyType": "msg",
                 "value": "",
                 "valueType": "entityState"
@@ -851,80 +709,27 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 570,
-        "y": 780,
+        "y": 660,
         "wires": [
             [
-                "ec72f7b2db4cc37c"
+                "f9ccc0bad1f19231"
             ],
             []
         ]
     },
     {
-        "id": "ec72f7b2db4cc37c",
-        "type": "api-call-service",
-        "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "stop timer security",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "timer",
-        "service": "cancel",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "timer.home_security"
-        ],
-        "data": "",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 790,
-        "y": 780,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "0ccbc5bbe180df8e",
-        "type": "delay",
-        "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "",
-        "pauseType": "delay",
-        "timeout": "20",
-        "timeoutUnits": "minutes",
-        "rate": "1",
-        "nbRateUnits": "1",
-        "rateUnits": "second",
-        "randomFirst": "1",
-        "randomLast": "5",
-        "randomUnits": "seconds",
-        "drop": false,
-        "outputs": 1,
-        "x": 770,
-        "y": 360,
-        "wires": [
-            [
-                "6f6fc24f15222254"
-            ]
-        ]
-    },
-    {
-        "id": "1583a7af300c58e0",
+        "id": "dbd19cce541f73bc",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "state home security off",
+        "name": "state garbage tomorrow",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "off",
+        "halt_if": "Geen",
         "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "input_boolean.home_security",
+        "halt_if_compare": "is_not",
+        "entity_id": "sensor.afval_morgen",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -941,62 +746,155 @@
                 "valueType": "entity"
             }
         ],
-        "for": 0,
+        "for": "0",
         "forType": "num",
         "forUnits": "minutes",
-        "x": 560,
-        "y": 360,
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 730,
+        "y": 480,
         "wires": [
             [
-                "0ccbc5bbe180df8e",
-                "38276d0327ca72c0"
+                "c527f80ad015aec2"
             ],
             []
         ]
     },
     {
-        "id": "6f6fc24f15222254",
-        "type": "api-call-service",
+        "id": "c527f80ad015aec2",
+        "type": "template",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "turn on home security",
-        "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_on",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "input_boolean.home_security"
-        ],
-        "data": "",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Let op, morgen wordt de {{payload}} container opgehaald.",
+        "output": "str",
         "x": 960,
-        "y": 360,
+        "y": 480,
         "wires": [
-            []
+            [
+                "ce2746e7cd66f603"
+            ]
         ]
     },
     {
-        "id": "b9a725c627f8ca76",
-        "type": "api-call-service",
+        "id": "cdc4fcc574f8d36a",
+        "type": "time-range-switch",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "turn on switch chime active",
+        "name": "",
+        "lat": "52.0434",
+        "lon": "5.6773",
+        "startTime": "05:00",
+        "endTime": "00:00",
+        "startOffset": 0,
+        "endOffset": 0,
+        "x": 530,
+        "y": 480,
+        "wires": [
+            [
+                "dbd19cce541f73bc"
+            ],
+            [
+                "5d3c3503fee346db"
+            ]
+        ]
+    },
+    {
+        "id": "5d3c3503fee346db",
+        "type": "api-current-state",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "state garbage today",
+        "server": "4ba92433.2478cc",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "Geen",
+        "halt_if_type": "str",
+        "halt_if_compare": "is_not",
+        "entity_id": "sensor.afval_vandaag",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": "0",
+        "forType": "num",
+        "forUnits": "minutes",
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 720,
+        "y": 540,
+        "wires": [
+            [
+                "c527f80ad015aec2"
+            ],
+            []
+        ]
+    },
+    {
+        "id": "c20492a470484001",
+        "type": "api-call-service",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "start speedtest",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "switch",
-        "service": "turn_on",
+        "domain": "homeassistant",
+        "service": "update_entity",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "switch.smart-doorbell_active"
+            "sensor.speedtest_download"
+        ],
+        "data": "",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 540,
+        "y": 180,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "38276d0327ca72c0",
+        "type": "api-call-service",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "start timer security",
+        "server": "4ba92433.2478cc",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "timer",
+        "service": "start",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "timer.home_security"
         ],
         "data": "",
         "dataType": "json",
@@ -1004,25 +902,25 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 820,
-        "y": 300,
+        "x": 790,
+        "y": 420,
         "wires": [
             []
         ]
     },
     {
-        "id": "013e749edd3fa5ad",
+        "id": "ab4badbb40ac3f96",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "state doorbell chime off",
+        "g": "1fb2b225cc711d77",
+        "name": "state outdoor dark",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "off",
+        "halt_if": "dark",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "switch.smart-doorbell_active",
+        "entity_id": "sensor.outdoor_light_dark",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -1042,74 +940,50 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 570,
-        "y": 300,
+        "x": 550,
+        "y": 840,
         "wires": [
             [
-                "b9a725c627f8ca76"
+                "3fd3c31faf84dc25",
+                "f69361468483265d"
             ],
             []
         ]
     },
     {
-        "id": "9c4864f0ca0d2d96",
+        "id": "28d474865ab8bbeb",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "turn off light kitchen",
+        "g": "1fb2b225cc711d77",
+        "name": "turn on light front door ",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
         "domain": "light",
-        "service": "turn_off",
+        "service": "turn_on",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.shellydimmer_kitchen"
+            "light.shelly1_front_door"
         ],
-        "data": "{\"transition\":5000}",
+        "data": "",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1150,
-        "y": 220,
+        "x": 1000,
+        "y": 900,
         "wires": [
             []
         ]
     },
     {
-        "id": "c49e5bd8f93bd496",
-        "type": "delay",
-        "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "",
-        "pauseType": "delay",
-        "timeout": "20",
-        "timeoutUnits": "minutes",
-        "rate": "1",
-        "nbRateUnits": "1",
-        "rateUnits": "second",
-        "randomFirst": "1",
-        "randomLast": "5",
-        "randomUnits": "seconds",
-        "drop": false,
-        "outputs": 1,
-        "x": 970,
-        "y": 220,
-        "wires": [
-            [
-                "9c4864f0ca0d2d96"
-            ]
-        ]
-    },
-    {
-        "id": "d1324fbb34721b63",
+        "id": "3392b339fb5fe297",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "turn on light kitchen",
+        "g": "1fb2b225cc711d77",
+        "name": "turn on light backyard",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
@@ -1118,35 +992,74 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "light.shellydimmer_kitchen"
+            "light.shellydimmer_backyard_string_l"
         ],
-        "data": "{\"brightness_pct\":45,\"transition\":5000}",
+        "data": "{\"transition\":5000}",
         "dataType": "json",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 790,
-        "y": 220,
+        "x": 1000,
+        "y": 840,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3fd3c31faf84dc25",
+        "type": "api-current-state",
+        "z": "e4381ced98d2a929",
+        "g": "1fb2b225cc711d77",
+        "name": "state frontdoor light off",
+        "server": "4ba92433.2478cc",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "light.shelly1_front_door",
+        "state_type": "str",
+        "blockInputOverrides": false,
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "data",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entity"
+            }
+        ],
+        "for": 0,
+        "forType": "num",
+        "forUnits": "minutes",
+        "x": 780,
+        "y": 900,
         "wires": [
             [
-                "c49e5bd8f93bd496"
-            ]
+                "28d474865ab8bbeb"
+            ],
+            []
         ]
     },
     {
-        "id": "3dd82a4a5a5f543f",
+        "id": "f69361468483265d",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
-        "g": "12e8b8acaeaeb3fa",
-        "name": "state outdoor dark",
+        "g": "1fb2b225cc711d77",
+        "name": "state backyard light off",
         "server": "4ba92433.2478cc",
         "version": 3,
         "outputs": 2,
-        "halt_if": "dark",
+        "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "sensor.outdoor_light_dark",
+        "entity_id": "light.shellydimmer_backyard_string_l",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -1166,120 +1079,207 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 550,
-        "y": 240,
+        "x": 780,
+        "y": 840,
         "wires": [
             [
-                "d1324fbb34721b63"
+                "3392b339fb5fe297"
             ],
+            []
+        ]
+    },
+    {
+        "id": "0135d0d0e0806d33",
+        "type": "link out",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "link out sleepmode",
+        "mode": "link",
+        "links": [
+            "51f8fd5354fac718"
+        ],
+        "x": 475,
+        "y": 60,
+        "wires": []
+    },
+    {
+        "id": "269da6e81145bb4b",
+        "type": "ha-get-entities",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "lookup lights on",
+        "server": "4ba92433.2478cc",
+        "version": 1,
+        "rules": [
+            {
+                "property": "entity_id",
+                "logic": "starts_with",
+                "value": "light.",
+                "valueType": "str"
+            },
+            {
+                "property": "state",
+                "logic": "is",
+                "value": "on",
+                "valueType": "str"
+            }
+        ],
+        "outputType": "split",
+        "outputEmptyResults": false,
+        "outputLocationType": "msg",
+        "outputLocation": "payload",
+        "outputResultsCount": 1,
+        "x": 540,
+        "y": 120,
+        "wires": [
             [
-                "2db276d509393d03"
+                "47f54cec68e78d0a"
             ]
         ]
     },
     {
-        "id": "ad62962b589ed07d",
-        "type": "template",
+        "id": "47f54cec68e78d0a",
+        "type": "switch",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1210,
-        "y": 500,
+        "g": "12e8b8acaeaeb3fa",
+        "name": "is not upstairs hall light",
+        "property": "payload.entity_id",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "neq",
+                "v": "light.shelly1_upstairs_hall",
+                "vt": "str"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 740,
+        "y": 120,
         "wires": [
             [
-                "c1f0224f374a67a6"
+                "aab38cb48d0dd6a2"
             ]
         ]
     },
     {
-        "id": "cae0f9255059d5ce",
-        "type": "template",
+        "id": "aab38cb48d0dd6a2",
+        "type": "switch",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Afval",
-        "output": "str",
-        "x": 1210,
-        "y": 460,
+        "g": "12e8b8acaeaeb3fa",
+        "name": "is not kitchen light",
+        "property": "payload.entity_id",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "neq",
+                "v": "light.shellydimmer_kitchen",
+                "vt": "str"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 950,
+        "y": 120,
         "wires": [
             [
-                "c1f0224f374a67a6"
+                "a1aa1dc96a54a58d"
             ]
         ]
     },
     {
-        "id": "f5a1c4dd087e0795",
-        "type": "link out",
+        "id": "a0bb528ecdb6c5fe",
+        "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
+        "g": "12e8b8acaeaeb3fa",
+        "name": "turn off lights",
+        "server": "4ba92433.2478cc",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "light",
+        "service": "turn_off",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "{{payload.entity_id}}"
         ],
-        "x": 1465,
-        "y": 480,
-        "wires": []
+        "data": "{\"transition\":5000}",
+        "dataType": "json",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 1770,
+        "y": 140,
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "c1f0224f374a67a6",
-        "type": "join",
+        "id": "7804abbba8a75b19",
+        "type": "switch",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "lights on longer then 10 min",
+        "property": "payload.timeSinceChangedMs",
         "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1370,
-        "y": 480,
+        "rules": [
+            {
+                "t": "gt",
+                "v": "60000",
+                "vt": "num"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 1540,
+        "y": 100,
         "wires": [
             [
-                "f5a1c4dd087e0795"
+                "a0bb528ecdb6c5fe"
             ]
         ]
     },
     {
-        "id": "13dd6df8c5e31625",
-        "type": "template",
+        "id": "a1aa1dc96a54a58d",
+        "type": "switch",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1230,
-        "y": 540,
+        "g": "12e8b8acaeaeb3fa",
+        "name": "light is bathroom or master_bedroom",
+        "property": "payload.entity_id",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "eq",
+                "v": "light.shelly1_bathroom",
+                "vt": "str"
+            },
+            {
+                "t": "eq",
+                "v": "light.shellydimmer_master_bedroom",
+                "vt": "str"
+            },
+            {
+                "t": "else"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 3,
+        "x": 1210,
+        "y": 120,
         "wires": [
             [
-                "c1f0224f374a67a6"
+                "7804abbba8a75b19"
+            ],
+            [
+                "7804abbba8a75b19"
+            ],
+            [
+                "a0bb528ecdb6c5fe"
             ]
         ]
     },
diff --git a/src/data/flows/scene_vacation_mode.json b/src/data/flows/scene_vacation_mode.json
index cf24ef7..05b4b87 100644
--- a/src/data/flows/scene_vacation_mode.json
+++ b/src/data/flows/scene_vacation_mode.json
@@ -46,19 +46,19 @@
         ]
     },
     {
-        "id": "e3fe28933ad4f9bd",
+        "id": "994e86eeb88c5f08",
         "type": "template",
         "z": "e98ae3c9db1bd6c3",
         "g": "bd6a21379a46d377",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "vacation_mode",
+        "template": "",
         "output": "str",
-        "x": 810,
-        "y": 240,
+        "x": 790,
+        "y": 200,
         "wires": [
             [
                 "dc2683f08bbcdd2e"
@@ -66,54 +66,40 @@
         ]
     },
     {
-        "id": "c6805d02b9eb3b45",
-        "type": "change",
+        "id": "65114fbadc1625ff",
+        "type": "template",
         "z": "e98ae3c9db1bd6c3",
         "g": "bd6a21379a46d377",
-        "name": "action titles",
-        "rules": [
-            {
-                "t": "set",
-                "p": "notify.action_1_title",
-                "pt": "msg",
-                "to": "JA",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2_title",
-                "pt": "msg",
-                "to": "NEE",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_1",
-                "pt": "msg",
-                "to": "VACATION_MODE_ON",
-                "tot": "str"
-            },
-            {
-                "t": "set",
-                "p": "notify.action_2",
-                "pt": "msg",
-                "to": "IGNORE",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 810,
-        "y": 160,
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Vakantiemodus",
+        "output": "str",
+        "x": 790,
+        "y": 120,
         "wires": [
             [
                 "dc2683f08bbcdd2e"
             ]
         ]
     },
+    {
+        "id": "b53dc3ab1408794a",
+        "type": "link out",
+        "z": "e98ae3c9db1bd6c3",
+        "g": "bd6a21379a46d377",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "c76d311bb4b6991b",
+            "d1753081ba6b4004"
+        ],
+        "x": 1075,
+        "y": 160,
+        "wires": []
+    },
     {
         "id": "dc2683f08bbcdd2e",
         "type": "join",
@@ -144,34 +130,48 @@
         ]
     },
     {
-        "id": "b53dc3ab1408794a",
-        "type": "link out",
+        "id": "c6805d02b9eb3b45",
+        "type": "change",
         "z": "e98ae3c9db1bd6c3",
         "g": "bd6a21379a46d377",
-        "name": "link_out_notify_guest_mode",
-        "mode": "link",
-        "links": [
-            "c76d311bb4b6991b",
-            "d1753081ba6b4004"
+        "name": "action titles",
+        "rules": [
+            {
+                "t": "set",
+                "p": "notify.action_1_title",
+                "pt": "msg",
+                "to": "JA",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2_title",
+                "pt": "msg",
+                "to": "NEE",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_1",
+                "pt": "msg",
+                "to": "VACATION_MODE_ON",
+                "tot": "str"
+            },
+            {
+                "t": "set",
+                "p": "notify.action_2",
+                "pt": "msg",
+                "to": "IGNORE",
+                "tot": "str"
+            }
         ],
-        "x": 1075,
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 810,
         "y": 160,
-        "wires": []
-    },
-    {
-        "id": "65114fbadc1625ff",
-        "type": "template",
-        "z": "e98ae3c9db1bd6c3",
-        "g": "bd6a21379a46d377",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Vakantiemodus",
-        "output": "str",
-        "x": 790,
-        "y": 120,
         "wires": [
             [
                 "dc2683f08bbcdd2e"
@@ -179,19 +179,19 @@
         ]
     },
     {
-        "id": "994e86eeb88c5f08",
+        "id": "e3fe28933ad4f9bd",
         "type": "template",
         "z": "e98ae3c9db1bd6c3",
         "g": "bd6a21379a46d377",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "vacation_mode",
         "output": "str",
-        "x": 790,
-        "y": 200,
+        "x": 810,
+        "y": 240,
         "wires": [
             [
                 "dc2683f08bbcdd2e"
diff --git a/src/data/flows/security_backyard.json b/src/data/flows/security_backyard.json
index b1e21fc..e17ce73 100644
--- a/src/data/flows/security_backyard.json
+++ b/src/data/flows/security_backyard.json
@@ -22,12 +22,13 @@
             "be68c8baf380f74e",
             "dfebcb371c6d37c4",
             "b41a40c1e135e55c",
-            "ed20a5d29a5eb136"
+            "ed20a5d29a5eb136",
+            "29504140078fb34c"
         ],
         "x": 754,
         "y": 39,
         "w": 422,
-        "h": 202
+        "h": 242
     },
     {
         "id": "be68c8baf380f74e",
@@ -41,7 +42,8 @@
                 "6011ff5a330d5f46",
                 "2e62b582b5ace0b2",
                 "dfebcb371c6d37c4",
-                "ed20a5d29a5eb136"
+                "ed20a5d29a5eb136",
+                "29504140078fb34c"
             ]
         ]
     },
@@ -58,19 +60,19 @@
         ]
     },
     {
-        "id": "ed20a5d29a5eb136",
+        "id": "2e62b582b5ace0b2",
         "type": "template",
         "z": "645478ab1138fd33",
         "g": "f2952a0e7861984f",
-        "name": "message",
-        "field": "notify.message",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Beweging in de achtertuin gedetecteerd!",
+        "template": "",
         "output": "str",
-        "x": 900,
-        "y": 200,
+        "x": 890,
+        "y": 120,
         "wires": [
             [
                 "b151676bc37a1e90"
@@ -78,33 +80,19 @@
         ]
     },
     {
-        "id": "b41a40c1e135e55c",
-        "type": "link out",
-        "z": "645478ab1138fd33",
-        "g": "f2952a0e7861984f",
-        "name": "backyard_motion_to_notify",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1135,
-        "y": 100,
-        "wires": []
-    },
-    {
-        "id": "dfebcb371c6d37c4",
+        "id": "6011ff5a330d5f46",
         "type": "template",
         "z": "645478ab1138fd33",
         "g": "f2952a0e7861984f",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "backyard_alarm",
+        "template": "Alarm",
         "output": "str",
-        "x": 910,
-        "y": 160,
+        "x": 890,
+        "y": 80,
         "wires": [
             [
                 "b151676bc37a1e90"
@@ -126,7 +114,7 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "4",
+        "count": "5",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
@@ -141,19 +129,19 @@
         ]
     },
     {
-        "id": "6011ff5a330d5f46",
+        "id": "dfebcb371c6d37c4",
         "type": "template",
         "z": "645478ab1138fd33",
         "g": "f2952a0e7861984f",
-        "name": "title",
-        "field": "notify.title",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Alarm",
+        "template": "backyard_alarm",
         "output": "str",
-        "x": 890,
-        "y": 80,
+        "x": 910,
+        "y": 160,
         "wires": [
             [
                 "b151676bc37a1e90"
@@ -161,19 +149,33 @@
         ]
     },
     {
-        "id": "2e62b582b5ace0b2",
+        "id": "b41a40c1e135e55c",
+        "type": "link out",
+        "z": "645478ab1138fd33",
+        "g": "f2952a0e7861984f",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1135,
+        "y": 100,
+        "wires": []
+    },
+    {
+        "id": "ed20a5d29a5eb136",
         "type": "template",
         "z": "645478ab1138fd33",
         "g": "f2952a0e7861984f",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "Beweging in de achtertuin gedetecteerd!",
         "output": "str",
-        "x": 890,
-        "y": 120,
+        "x": 900,
+        "y": 200,
         "wires": [
             [
                 "b151676bc37a1e90"
@@ -352,13 +354,13 @@
         "id": "133af224fc73de70",
         "type": "link out",
         "z": "645478ab1138fd33",
-        "name": "backyard_motion_to_lights_restore",
+        "name": "link_out_light_dynamics_1",
         "mode": "link",
         "links": [
             "164322a018845856"
         ],
-        "x": 765,
-        "y": 280,
+        "x": 775,
+        "y": 320,
         "wires": []
     },
     {
@@ -382,8 +384,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 750,
-        "y": 340,
+        "x": 760,
+        "y": 380,
         "wires": [
             [
                 "1a622c0b1aadf203"
@@ -426,8 +428,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 580,
-        "y": 340,
+        "x": 590,
+        "y": 380,
         "wires": [
             [
                 "f3661c593b291998"
@@ -444,8 +446,8 @@
         "payloadtype": "num",
         "payloadval": "0",
         "name": "",
-        "x": 930,
-        "y": 340,
+        "x": 940,
+        "y": 380,
         "wires": [
             [
                 "0361aab005f490ca"
@@ -474,12 +476,32 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1110,
-        "y": 340,
+        "x": 1120,
+        "y": 380,
         "wires": [
             []
         ]
     },
+    {
+        "id": "29504140078fb34c",
+        "type": "template",
+        "z": "645478ab1138fd33",
+        "g": "f2952a0e7861984f",
+        "name": "notification channel",
+        "field": "notify.channel",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Warning",
+        "output": "str",
+        "x": 930,
+        "y": 240,
+        "wires": [
+            [
+                "b151676bc37a1e90"
+            ]
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/security_house.json b/src/data/flows/security_house.json
index f87fb46..1333ecf 100644
--- a/src/data/flows/security_house.json
+++ b/src/data/flows/security_house.json
@@ -7,76 +7,80 @@
         "info": ""
     },
     {
-        "id": "1b05fecd5ed3289b",
+        "id": "37c7c59a61d38b32",
         "type": "group",
         "z": "b13ca13c.9328e",
-        "name": "notify",
+        "name": "notify two actions",
         "style": {
             "label": true
         },
         "nodes": [
-            "dab28de38f3a6629",
-            "ab8c69e6298f0ad4",
-            "ac254d4235d71700",
-            "47c9e5d66b827b3c",
-            "3a0c4f886a8c4e54",
-            "52d10ab03d478bae"
+            "16bf3029dc11f50b",
+            "8bd6ce7359e6fe2f",
+            "48cae6c1e3fb0c75",
+            "1c8dfa7ab499ce29",
+            "3ad564319a62aa0f",
+            "3f7e2f446cdb3e90",
+            "66e66f9f5828f878",
+            "5922c1dac60ed4ec"
         ],
         "x": 1774,
-        "y": 399,
-        "w": 432,
-        "h": 162
+        "y": 159,
+        "w": 422,
+        "h": 242
     },
     {
-        "id": "37c7c59a61d38b32",
+        "id": "1b05fecd5ed3289b",
         "type": "group",
         "z": "b13ca13c.9328e",
-        "name": "notify two actions",
+        "name": "notify",
         "style": {
             "label": true
         },
         "nodes": [
-            "16bf3029dc11f50b",
-            "8bd6ce7359e6fe2f",
-            "48cae6c1e3fb0c75",
-            "1c8dfa7ab499ce29",
-            "3ad564319a62aa0f",
-            "3f7e2f446cdb3e90",
-            "66e66f9f5828f878"
+            "dab28de38f3a6629",
+            "ab8c69e6298f0ad4",
+            "ac254d4235d71700",
+            "47c9e5d66b827b3c",
+            "3a0c4f886a8c4e54",
+            "52d10ab03d478bae",
+            "322d16b061f4e108"
         ],
         "x": 1774,
-        "y": 159,
-        "w": 442,
+        "y": 419,
+        "w": 422,
         "h": 202
     },
     {
-        "id": "3a0c4f886a8c4e54",
+        "id": "3ad564319a62aa0f",
         "type": "junction",
         "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
+        "g": "37c7c59a61d38b32",
         "x": 1800,
-        "y": 460,
+        "y": 240,
         "wires": [
             [
-                "ab8c69e6298f0ad4",
-                "dab28de38f3a6629",
-                "52d10ab03d478bae"
+                "8bd6ce7359e6fe2f",
+                "16bf3029dc11f50b",
+                "3f7e2f446cdb3e90",
+                "66e66f9f5828f878",
+                "5922c1dac60ed4ec"
             ]
         ]
     },
     {
-        "id": "3ad564319a62aa0f",
+        "id": "3a0c4f886a8c4e54",
         "type": "junction",
         "z": "b13ca13c.9328e",
-        "g": "37c7c59a61d38b32",
+        "g": "1b05fecd5ed3289b",
         "x": 1800,
-        "y": 240,
+        "y": 480,
         "wires": [
             [
-                "8bd6ce7359e6fe2f",
-                "16bf3029dc11f50b",
-                "3f7e2f446cdb3e90",
-                "66e66f9f5828f878"
+                "ab8c69e6298f0ad4",
+                "dab28de38f3a6629",
+                "52d10ab03d478bae",
+                "322d16b061f4e108"
             ]
         ]
     },
@@ -130,74 +134,30 @@
         ]
     },
     {
-        "id": "52d10ab03d478bae",
+        "id": "16bf3029dc11f50b",
         "type": "template",
         "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "g": "37c7c59a61d38b32",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
         "template": "",
         "output": "str",
-        "x": 1930,
-        "y": 520,
-        "wires": [
-            [
-                "47c9e5d66b827b3c"
-            ]
-        ]
-    },
-    {
-        "id": "47c9e5d66b827b3c",
-        "type": "join",
-        "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 2070,
-        "y": 460,
+        "x": 1890,
+        "y": 280,
         "wires": [
             [
-                "ac254d4235d71700"
+                "1c8dfa7ab499ce29"
             ]
         ]
     },
     {
-        "id": "ac254d4235d71700",
-        "type": "link out",
-        "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
-        "name": "link_out_notify_basement_ventilation",
-        "mode": "link",
-        "links": [
-            "c13b2b4d87067c17",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 2165,
-        "y": 460,
-        "wires": []
-    },
-    {
-        "id": "ab8c69e6298f0ad4",
+        "id": "8bd6ce7359e6fe2f",
         "type": "template",
         "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
+        "g": "37c7c59a61d38b32",
         "name": "title",
         "field": "notify.title",
         "fieldType": "msg",
@@ -205,51 +165,55 @@
         "syntax": "mustache",
         "template": "Beveiliging",
         "output": "str",
-        "x": 1910,
-        "y": 440,
+        "x": 1890,
+        "y": 200,
         "wires": [
             [
-                "47c9e5d66b827b3c"
+                "1c8dfa7ab499ce29"
             ]
         ]
     },
     {
-        "id": "dab28de38f3a6629",
-        "type": "template",
+        "id": "48cae6c1e3fb0c75",
+        "type": "link out",
         "z": "b13ca13c.9328e",
-        "g": "1b05fecd5ed3289b",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1910,
-        "y": 480,
-        "wires": [
-            [
-                "47c9e5d66b827b3c"
-            ]
-        ]
+        "g": "37c7c59a61d38b32",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "c76d311bb4b6991b",
+            "d1753081ba6b4004"
+        ],
+        "x": 2155,
+        "y": 240,
+        "wires": []
     },
     {
-        "id": "66e66f9f5828f878",
-        "type": "template",
+        "id": "1c8dfa7ab499ce29",
+        "type": "join",
         "z": "b13ca13c.9328e",
         "g": "37c7c59a61d38b32",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "home_security",
-        "output": "str",
-        "x": 1910,
-        "y": 320,
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "9",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 2070,
+        "y": 240,
         "wires": [
             [
-                "1c8dfa7ab499ce29"
+                "48cae6c1e3fb0c75"
             ]
         ]
     },
@@ -303,54 +267,50 @@
         ]
     },
     {
-        "id": "1c8dfa7ab499ce29",
-        "type": "join",
+        "id": "66e66f9f5828f878",
+        "type": "template",
         "z": "b13ca13c.9328e",
         "g": "37c7c59a61d38b32",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "8",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 2090,
-        "y": 240,
+        "name": "id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "home_security",
+        "output": "str",
+        "x": 1890,
+        "y": 320,
         "wires": [
             [
-                "48cae6c1e3fb0c75"
+                "1c8dfa7ab499ce29"
             ]
         ]
     },
     {
-        "id": "48cae6c1e3fb0c75",
-        "type": "link out",
+        "id": "dab28de38f3a6629",
+        "type": "template",
         "z": "b13ca13c.9328e",
-        "g": "37c7c59a61d38b32",
-        "name": "link_out_notify_guest_mode",
-        "mode": "link",
-        "links": [
-            "c76d311bb4b6991b",
-            "d1753081ba6b4004"
-        ],
-        "x": 2175,
-        "y": 240,
-        "wires": []
+        "g": "1b05fecd5ed3289b",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1890,
+        "y": 500,
+        "wires": [
+            [
+                "47c9e5d66b827b3c"
+            ]
+        ]
     },
     {
-        "id": "8bd6ce7359e6fe2f",
+        "id": "ab8c69e6298f0ad4",
         "type": "template",
         "z": "b13ca13c.9328e",
-        "g": "37c7c59a61d38b32",
+        "g": "1b05fecd5ed3289b",
         "name": "title",
         "field": "notify.title",
         "fieldType": "msg",
@@ -359,30 +319,76 @@
         "template": "Beveiliging",
         "output": "str",
         "x": 1890,
-        "y": 200,
+        "y": 460,
         "wires": [
             [
-                "1c8dfa7ab499ce29"
+                "47c9e5d66b827b3c"
             ]
         ]
     },
     {
-        "id": "16bf3029dc11f50b",
+        "id": "ac254d4235d71700",
+        "type": "link out",
+        "z": "b13ca13c.9328e",
+        "g": "1b05fecd5ed3289b",
+        "name": "link_out_notify_2",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad",
+            "c13b2b4d87067c17",
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 2155,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "47c9e5d66b827b3c",
+        "type": "join",
+        "z": "b13ca13c.9328e",
+        "g": "1b05fecd5ed3289b",
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "5",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 2070,
+        "y": 480,
+        "wires": [
+            [
+                "ac254d4235d71700"
+            ]
+        ]
+    },
+    {
+        "id": "52d10ab03d478bae",
         "type": "template",
         "z": "b13ca13c.9328e",
-        "g": "37c7c59a61d38b32",
-        "name": "icon",
-        "field": "notify.icon",
+        "g": "1b05fecd5ed3289b",
+        "name": "id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
         "template": "",
         "output": "str",
         "x": 1890,
-        "y": 280,
+        "y": 540,
         "wires": [
             [
-                "1c8dfa7ab499ce29"
+                "47c9e5d66b827b3c"
             ]
         ]
     },
@@ -836,7 +842,7 @@
         "id": "218b9cc3.1e7df4",
         "type": "server-state-changed",
         "z": "b13ca13c.9328e",
-        "name": "state home securty",
+        "name": "state home security",
         "server": "4ba92433.2478cc",
         "version": 5,
         "outputs": 1,
@@ -1303,7 +1309,7 @@
         "id": "5874beb71c3c9523",
         "type": "link out",
         "z": "b13ca13c.9328e",
-        "name": "security_home",
+        "name": "link_out_light_dynamics_1",
         "mode": "link",
         "links": [
             "43cbfb522e72cbe5"
@@ -1312,6 +1318,46 @@
         "y": 400,
         "wires": []
     },
+    {
+        "id": "322d16b061f4e108",
+        "type": "template",
+        "z": "b13ca13c.9328e",
+        "g": "1b05fecd5ed3289b",
+        "name": "channel",
+        "field": "notify.channel",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Warning",
+        "output": "str",
+        "x": 1900,
+        "y": 580,
+        "wires": [
+            [
+                "47c9e5d66b827b3c"
+            ]
+        ]
+    },
+    {
+        "id": "5922c1dac60ed4ec",
+        "type": "template",
+        "z": "b13ca13c.9328e",
+        "g": "37c7c59a61d38b32",
+        "name": "channel",
+        "field": "notify.channel",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Warning",
+        "output": "str",
+        "x": 1900,
+        "y": 360,
+        "wires": [
+            [
+                "1c8dfa7ab499ce29"
+            ]
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/security_smoke_co.json b/src/data/flows/security_smoke_co.json
index 67ff017..58e0393 100644
--- a/src/data/flows/security_smoke_co.json
+++ b/src/data/flows/security_smoke_co.json
@@ -20,12 +20,13 @@
             "fdba7cd037a9da5a",
             "9a02e08c1760e584",
             "ef17b4eb0dc0871b",
-            "c7b88c5f533c105b"
+            "c7b88c5f533c105b",
+            "8ca7529cee95086c"
         ],
         "x": 814,
         "y": 139,
         "w": 432,
-        "h": 162
+        "h": 202
     },
     {
         "id": "ef17b4eb0dc0871b",
@@ -38,24 +39,25 @@
             [
                 "8bda876328e49e67",
                 "af6a4d51c1e99b4e",
-                "c7b88c5f533c105b"
+                "c7b88c5f533c105b",
+                "8ca7529cee95086c"
             ]
         ]
     },
     {
-        "id": "af6a4d51c1e99b4e",
+        "id": "c7b88c5f533c105b",
         "type": "template",
         "z": "cde79c08.e4f488",
         "g": "60a8ffbec987c377",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "notification id",
+        "field": "notify.notification_id",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "firealarm",
         "output": "str",
-        "x": 950,
-        "y": 220,
+        "x": 970,
+        "y": 260,
         "wires": [
             [
                 "9a02e08c1760e584"
@@ -63,22 +65,31 @@
         ]
     },
     {
-        "id": "8bda876328e49e67",
-        "type": "template",
+        "id": "9a02e08c1760e584",
+        "type": "join",
         "z": "cde79c08.e4f488",
         "g": "60a8ffbec987c377",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Alarm",
-        "output": "str",
-        "x": 950,
-        "y": 180,
+        "name": "",
+        "mode": "custom",
+        "build": "merged",
+        "property": "notify",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "5",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 1110,
+        "y": 200,
         "wires": [
             [
-                "9a02e08c1760e584"
+                "fdba7cd037a9da5a"
             ]
         ]
     },
@@ -87,7 +98,7 @@
         "type": "link out",
         "z": "cde79c08.e4f488",
         "g": "60a8ffbec987c377",
-        "name": "link_out_notify_basement_ventilation",
+        "name": "link_out_notify_1",
         "mode": "link",
         "links": [
             "8ed3b0974336e55b",
@@ -99,48 +110,39 @@
         "wires": []
     },
     {
-        "id": "9a02e08c1760e584",
-        "type": "join",
+        "id": "8bda876328e49e67",
+        "type": "template",
         "z": "cde79c08.e4f488",
         "g": "60a8ffbec987c377",
-        "name": "",
-        "mode": "custom",
-        "build": "merged",
-        "property": "notify",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "\\n",
-        "joinerType": "str",
-        "accumulate": false,
-        "timeout": "",
-        "count": "4",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 1110,
-        "y": 200,
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Alarm",
+        "output": "str",
+        "x": 950,
+        "y": 180,
         "wires": [
             [
-                "fdba7cd037a9da5a"
+                "9a02e08c1760e584"
             ]
         ]
     },
     {
-        "id": "c7b88c5f533c105b",
+        "id": "af6a4d51c1e99b4e",
         "type": "template",
         "z": "cde79c08.e4f488",
         "g": "60a8ffbec987c377",
-        "name": "notification id",
-        "field": "notify.notification_id",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "firealarm",
+        "template": "",
         "output": "str",
-        "x": 970,
-        "y": 260,
+        "x": 950,
+        "y": 220,
         "wires": [
             [
                 "9a02e08c1760e584"
@@ -954,13 +956,35 @@
         "id": "e426c9cc0865f723",
         "type": "link out",
         "z": "cde79c08.e4f488",
-        "name": "smoke_co_alarm",
+        "name": "link_out_light_dynamics_1",
         "mode": "link",
-        "links": [],
+        "links": [
+            "43cbfb522e72cbe5"
+        ],
         "x": 1125,
         "y": 440,
         "wires": []
     },
+    {
+        "id": "8ca7529cee95086c",
+        "type": "template",
+        "z": "cde79c08.e4f488",
+        "g": "60a8ffbec987c377",
+        "name": "notification channel",
+        "field": "notify.channel",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Warning",
+        "output": "str",
+        "x": 990,
+        "y": 300,
+        "wires": [
+            [
+                "9a02e08c1760e584"
+            ]
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",