diff --git a/src/data/flows/automation_doorbell.json b/src/data/flows/automation_doorbell.json
index b750a67..3bf89de 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_ac_solar_record",
+        "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_doorbell",
+        "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,64 +360,93 @@
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1890,
-        "y": 300,
+        "y": 120,
         "wires": [
             [
-                "a2cfbe3c173fce64"
+                "68e61dcfb6db1de4"
             ]
         ]
     },
     {
-        "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",
+        "id": "fcdc7ebb75e48ca6",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
-        "name": "title",
-        "field": "notify.title",
+        "g": "07c18b5759c9d9cc",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Deurbel",
+        "template": "",
         "output": "str",
         "x": 1730,
-        "y": 260,
+        "y": 480,
         "wires": [
             [
-                "461637b747fd187e"
+                "f355c8ecb91dbdcc"
             ]
         ]
     },
     {
-        "id": "fcea9d7c3451b9d2",
+        "id": "2783264578fb402f",
         "type": "template",
         "z": "3637eeb0.d96232",
-        "g": "f9393a59e792dd16",
-        "name": "icon",
-        "field": "notify.icon",
+        "g": "07c18b5759c9d9cc",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "Deurbel",
         "output": "str",
         "x": 1730,
-        "y": 300,
+        "y": 440,
         "wires": [
             [
-                "461637b747fd187e"
+                "f355c8ecb91dbdcc"
+            ]
+        ]
+    },
+    {
+        "id": "849b0848c1cfdceb",
+        "type": "link out",
+        "z": "3637eeb0.d96232",
+        "g": "07c18b5759c9d9cc",
+        "name": "link_out_notify_ac_solar_record",
+        "mode": "link",
+        "links": [
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 1985,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "f355c8ecb91dbdcc",
+        "type": "join",
+        "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,
+        "wires": [
+            [
+                "849b0848c1cfdceb"
             ]
         ]
     },
@@ -399,7 +459,7 @@
         "version": 5,
         "outputs": 2,
         "exposeAsEntityConfig": "",
-        "entityId": "binary_sensor.smart-doorbell_button",
+        "entityId": "binary_sensor.smart_doorbell_button",
         "entityIdType": "exact",
         "outputInitially": false,
         "stateType": "str",
@@ -535,7 +595,7 @@
         "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "switch.smart-doorbell_active",
+        "entity_id": "switch.smart_doorbell_active",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -629,7 +689,7 @@
         "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "switch.smart-doorbell_active",
+        "entity_id": "switch.smart_doorbell_active",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -671,7 +731,7 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "switch.smart-doorbell_active"
+            "switch.smart_doorbell_active"
         ],
         "data": "",
         "dataType": "json",
@@ -1101,66 +1161,6 @@
             ]
         ]
     },
-    {
-        "id": "903fb95c9b8fd4db",
-        "type": "template",
-        "z": "3637eeb0.d96232",
-        "g": "6a49852c474c3c78",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "doorbell_rings",
-        "output": "str",
-        "x": 1750,
-        "y": 160,
-        "wires": [
-            [
-                "6cf829e06aed396f"
-            ]
-        ]
-    },
-    {
-        "id": "9732e1196c40a631",
-        "type": "template",
-        "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"
-            ]
-        ]
-    },
-    {
-        "id": "752f03e2805c8ca5",
-        "type": "template",
-        "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,
-        "wires": [
-            [
-                "f355c8ecb91dbdcc"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/scene_home_leaving.json b/src/data/flows/scene_home_leaving.json
index 735d617..ef831af 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,26 +99,64 @@
         ]
     },
     {
-        "id": "83e460c17170065f",
+        "id": "11441b9d4ec597d9",
         "type": "junction",
         "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
+        "g": "cc3f4f06d9ee1050",
         "x": 1620,
+        "y": 540,
+        "wires": [
+            [
+                "1d9212ada487b166",
+                "8bd431aac8edba25"
+            ]
+        ]
+    },
+    {
+        "id": "c8db6380b138fd4e",
+        "type": "template",
+        "z": "8aa6edec.5a013",
+        "g": "14187342a7b09482",
+        "name": "message",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.",
+        "output": "str",
+        "x": 1720,
         "y": 320,
         "wires": [
             [
-                "8aa74b4cb48558f8",
-                "19cfd22b49a2e356",
-                "1b8772493fd3aa94",
-                "c8db6380b138fd4e"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "934778f06d5ff810",
+        "id": "1b8772493fd3aa94",
+        "type": "template",
+        "z": "8aa6edec.5a013",
+        "g": "14187342a7b09482",
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "lights",
+        "output": "str",
+        "x": 1730,
+        "y": 360,
+        "wires": [
+            [
+                "d512fe1ba0adbf42"
+            ]
+        ]
+    },
+    {
+        "id": "d512fe1ba0adbf42",
         "type": "join",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
+        "g": "14187342a7b09482",
         "name": "",
         "mode": "custom",
         "build": "merged",
@@ -127,59 +167,59 @@
         "joinerType": "str",
         "accumulate": false,
         "timeout": "",
-        "count": "3",
+        "count": "4",
         "reduceRight": false,
         "reduceExp": "",
         "reduceInit": "",
         "reduceInitType": "",
         "reduceFixup": "",
         "x": 1870,
-        "y": 540,
+        "y": 320,
         "wires": [
             [
-                "2d9c5a51a0d3d65a"
+                "3bdaf73ce37b7397"
             ]
         ]
     },
     {
-        "id": "2d9c5a51a0d3d65a",
+        "id": "3bdaf73ce37b7397",
         "type": "link out",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
-        "name": "link_out_notify_home_leaving_2",
+        "g": "14187342a7b09482",
+        "name": "link_out_notify_ac_solar_record",
         "mode": "link",
         "links": [
-            "8ed3b0974336e55b"
+            "a97f87cfab413716"
         ],
         "x": 1965,
-        "y": 540,
+        "y": 320,
         "wires": []
     },
     {
-        "id": "1d9212ada487b166",
+        "id": "8aa74b4cb48558f8",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
+        "g": "14187342a7b09482",
         "name": "title",
         "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Gastmodus",
+        "template": "Verlichting",
         "output": "str",
         "x": 1710,
-        "y": 500,
+        "y": 280,
         "wires": [
             [
-                "934778f06d5ff810"
+                "d512fe1ba0adbf42"
             ]
         ]
     },
     {
-        "id": "8bd431aac8edba25",
+        "id": "19cfd22b49a2e356",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "cc3f4f06d9ee1050",
+        "g": "14187342a7b09482",
         "name": "icon",
         "field": "notify.icon",
         "fieldType": "msg",
@@ -188,13 +228,67 @@
         "template": "",
         "output": "str",
         "x": 1710,
-        "y": 580,
+        "y": 400,
         "wires": [
             [
-                "934778f06d5ff810"
+                "d512fe1ba0adbf42"
+            ]
+        ]
+    },
+    {
+        "id": "60a9200995b666e2",
+        "type": "template",
+        "z": "8aa6edec.5a013",
+        "g": "9c946ef945c199e5",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1710,
+        "y": 160,
+        "wires": [
+            [
+                "f7c20be07a75c04e"
+            ]
+        ]
+    },
+    {
+        "id": "254201c717321a67",
+        "type": "template",
+        "z": "8aa6edec.5a013",
+        "g": "9c946ef945c199e5",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Beveiliging",
+        "output": "str",
+        "x": 1710,
+        "y": 80,
+        "wires": [
+            [
+                "f7c20be07a75c04e"
             ]
         ]
     },
+    {
+        "id": "37c73ac2e71d9a61",
+        "type": "link out",
+        "z": "8aa6edec.5a013",
+        "g": "9c946ef945c199e5",
+        "name": "link_out_notify_home_leaving_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b"
+        ],
+        "x": 1965,
+        "y": 120,
+        "wires": []
+    },
     {
         "id": "f7c20be07a75c04e",
         "type": "join",
@@ -225,56 +319,85 @@
         ]
     },
     {
-        "id": "37c73ac2e71d9a61",
-        "type": "link out",
-        "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
-        "name": "link_out_notify_home_leaving_1",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b"
-        ],
-        "x": 1965,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "254201c717321a67",
+        "id": "8bd431aac8edba25",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
-        "name": "title",
-        "field": "notify.title",
+        "g": "cc3f4f06d9ee1050",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "Beveiliging",
+        "template": "",
         "output": "str",
         "x": 1710,
-        "y": 80,
+        "y": 580,
         "wires": [
             [
-                "f7c20be07a75c04e"
+                "934778f06d5ff810"
             ]
         ]
     },
     {
-        "id": "60a9200995b666e2",
+        "id": "1d9212ada487b166",
         "type": "template",
         "z": "8aa6edec.5a013",
-        "g": "9c946ef945c199e5",
-        "name": "icon",
-        "field": "notify.icon",
+        "g": "cc3f4f06d9ee1050",
+        "name": "title",
+        "field": "notify.title",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "Gastmodus",
         "output": "str",
         "x": 1710,
-        "y": 160,
+        "y": 500,
         "wires": [
             [
-                "f7c20be07a75c04e"
+                "934778f06d5ff810"
+            ]
+        ]
+    },
+    {
+        "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": "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"
             ]
         ]
     },
@@ -581,7 +704,7 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "switch.smart-doorbell_active"
+            "switch.smart_doorbell_active"
         ],
         "data": "",
         "dataType": "json",
@@ -606,7 +729,7 @@
         "halt_if": "off",
         "halt_if_type": "str",
         "halt_if_compare": "is",
-        "entity_id": "switch.smart-doorbell_active",
+        "entity_id": "switch.smart_doorbell_active",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -893,7 +1016,7 @@
         "syntax": "mustache",
         "template": "Beveiliging is ingeschakeld ",
         "output": "str",
-        "x": 1440,
+        "x": 1500,
         "y": 120,
         "wires": [
             [
@@ -912,7 +1035,7 @@
         "syntax": "mustache",
         "template": "Beveiliging is ingeschakeld ",
         "output": "str",
-        "x": 960,
+        "x": 1500,
         "y": 540,
         "wires": [
             [
@@ -996,109 +1119,6 @@
             ]
         ]
     },
-    {
-        "id": "19cfd22b49a2e356",
-        "type": "template",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1710,
-        "y": 400,
-        "wires": [
-            [
-                "d512fe1ba0adbf42"
-            ]
-        ]
-    },
-    {
-        "id": "8aa74b4cb48558f8",
-        "type": "template",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "title",
-        "field": "notify.title",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "Verlichting",
-        "output": "str",
-        "x": 1710,
-        "y": 280,
-        "wires": [
-            [
-                "d512fe1ba0adbf42"
-            ]
-        ]
-    },
-    {
-        "id": "3bdaf73ce37b7397",
-        "type": "link out",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "link_out_notify_ac_solar_record",
-        "mode": "link",
-        "links": [
-            "a97f87cfab413716"
-        ],
-        "x": 1965,
-        "y": 320,
-        "wires": []
-    },
-    {
-        "id": "d512fe1ba0adbf42",
-        "type": "join",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "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": 1870,
-        "y": 320,
-        "wires": [
-            [
-                "3bdaf73ce37b7397"
-            ]
-        ]
-    },
-    {
-        "id": "1b8772493fd3aa94",
-        "type": "template",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "lights",
-        "output": "str",
-        "x": 1730,
-        "y": 360,
-        "wires": [
-            [
-                "d512fe1ba0adbf42"
-            ]
-        ]
-    },
     {
         "id": "cdc07b973642084c",
         "type": "ha-get-entities",
@@ -1133,26 +1153,6 @@
             ]
         ]
     },
-    {
-        "id": "c8db6380b138fd4e",
-        "type": "template",
-        "z": "8aa6edec.5a013",
-        "g": "14187342a7b09482",
-        "name": "message",
-        "field": "notify.message",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "{{{friendly_name}}} verlichting stond nog aan en is nu automatisch uitgeschakeld.",
-        "output": "str",
-        "x": 1720,
-        "y": 320,
-        "wires": [
-            [
-                "d512fe1ba0adbf42"
-            ]
-        ]
-    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",