diff --git a/src/data/flows/scene_sleepmode.json b/src/data/flows/scene_sleepmode.json
index 983f882..78a1e27 100644
--- a/src/data/flows/scene_sleepmode.json
+++ b/src/data/flows/scene_sleepmode.json
@@ -8,7 +8,7 @@
         "env": []
     },
     {
-        "id": "12e8b8acaeaeb3fa",
+        "id": "13b1135f0e749c31",
         "type": "group",
         "z": "e4381ced98d2a929",
         "style": {
@@ -21,35 +21,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": "1fb2b225cc711d77",
@@ -79,7 +57,7 @@
         "h": 202
     },
     {
-        "id": "13b1135f0e749c31",
+        "id": "12e8b8acaeaeb3fa",
         "type": "group",
         "z": "e4381ced98d2a929",
         "style": {
@@ -92,13 +70,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": "bd90d247a95feb9d",
@@ -123,30 +123,30 @@
         "h": 162
     },
     {
-        "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"
             ]
         ]
     },
     {
-        "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"
             ]
         ]
     },
@@ -184,124 +184,213 @@
         ]
     },
     {
-        "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"
             ]
         ]
     },
     {
-        "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": "f5a1c4dd087e0795",
-        "type": "link out",
+        "id": "a0bb528ecdb6c5fe",
+        "type": "api-call-service",
         "z": "e4381ced98d2a929",
-        "g": "bd90d247a95feb9d",
-        "name": "link_out_notify_1",
-        "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": "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": "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": "3dd82a4a5a5f543f",
-        "type": "api-current-state",
+        "id": "269da6e81145bb4b",
+        "type": "ha-get-entities",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "state outdoor dark",
+        "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": [
+            [
+                "47f54cec68e78d0a"
+            ]
+        ]
+    },
+    {
+        "id": "0135d0d0e0806d33",
+        "type": "link out",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "link out sleepmode",
+        "mode": "link",
+        "links": [
+            "51f8fd5354fac718"
+        ],
+        "x": 475,
+        "y": 60,
+        "wires": []
+    },
+    {
+        "id": "f69361468483265d",
+        "type": "api-current-state",
+        "z": "e4381ced98d2a929",
+        "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": [
@@ -321,23 +410,62 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 550,
-        "y": 240,
+        "x": 780,
+        "y": 840,
         "wires": [
             [
-                "d1324fbb34721b63"
+                "3392b339fb5fe297"
             ],
+            []
+        ]
+    },
+    {
+        "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": [
             [
-                "2db276d509393d03"
-            ]
+                "28d474865ab8bbeb"
+            ],
+            []
         ]
     },
     {
-        "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,
@@ -346,88 +474,61 @@
         "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,
-        "wires": [
-            [
-                "c49e5bd8f93bd496"
-            ]
-        ]
-    },
-    {
-        "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,
+        "x": 1000,
+        "y": 840,
         "wires": [
-            [
-                "9c4864f0ca0d2d96"
-            ]
+            []
         ]
     },
     {
-        "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": "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": [
@@ -447,30 +548,31 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 570,
-        "y": 300,
+        "x": 550,
+        "y": 840,
         "wires": [
             [
-                "b9a725c627f8ca76"
+                "3fd3c31faf84dc25",
+                "f69361468483265d"
             ],
             []
         ]
     },
     {
-        "id": "b9a725c627f8ca76",
+        "id": "38276d0327ca72c0",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "turn on switch chime active",
+        "name": "start timer security",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "switch",
-        "service": "turn_on",
+        "domain": "timer",
+        "service": "start",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "switch.smart-doorbell_active"
+            "timer.home_security"
         ],
         "data": "",
         "dataType": "json",
@@ -478,53 +580,53 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 820,
-        "y": 300,
+        "x": 790,
+        "y": 420,
         "wires": [
             []
         ]
     },
     {
-        "id": "6f6fc24f15222254",
+        "id": "c20492a470484001",
         "type": "api-call-service",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "turn on home security",
+        "name": "start speedtest",
         "server": "4ba92433.2478cc",
         "version": 5,
         "debugenabled": false,
-        "domain": "input_boolean",
-        "service": "turn_on",
+        "domain": "homeassistant",
+        "service": "update_entity",
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "input_boolean.home_security"
+            "sensor.speedtest_download"
         ],
         "data": "",
-        "dataType": "json",
+        "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 360,
+        "x": 540,
+        "y": 180,
         "wires": [
             []
         ]
     },
     {
-        "id": "1583a7af300c58e0",
+        "id": "5d3c3503fee346db",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "state home security off",
+        "name": "state garbage today",
         "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_vandaag",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -541,90 +643,130 @@
                 "valueType": "entity"
             }
         ],
-        "for": 0,
+        "for": "0",
         "forType": "num",
         "forUnits": "minutes",
-        "x": 560,
-        "y": 360,
-        "wires": [
-            [
-                "0ccbc5bbe180df8e",
-                "38276d0327ca72c0"
-            ],
-            []
+        "override_topic": false,
+        "state_location": "payload",
+        "override_payload": "msg",
+        "entity_location": "data",
+        "override_data": "msg",
+        "x": 720,
+        "y": 540,
+        "wires": [
+            [
+                "c527f80ad015aec2"
+            ],
+            []
         ]
     },
     {
-        "id": "0ccbc5bbe180df8e",
-        "type": "delay",
+        "id": "cdc4fcc574f8d36a",
+        "type": "time-range-switch",
         "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,
+        "lat": "52.0434",
+        "lon": "5.6773",
+        "startTime": "05:00",
+        "endTime": "00:00",
+        "startOffset": 0,
+        "endOffset": 0,
+        "x": 530,
+        "y": 480,
         "wires": [
             [
-                "6f6fc24f15222254"
+                "dbd19cce541f73bc"
+            ],
+            [
+                "5d3c3503fee346db"
             ]
         ]
     },
     {
-        "id": "ec72f7b2db4cc37c",
-        "type": "api-call-service",
+        "id": "c527f80ad015aec2",
+        "type": "template",
         "z": "e4381ced98d2a929",
-        "g": "1fb2b225cc711d77",
-        "name": "stop timer security",
+        "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,
+        "wires": [
+            [
+                "ce2746e7cd66f603"
+            ]
+        ]
+    },
+    {
+        "id": "dbd19cce541f73bc",
+        "type": "api-current-state",
+        "z": "e4381ced98d2a929",
+        "g": "12e8b8acaeaeb3fa",
+        "name": "state garbage tomorrow",
         "server": "4ba92433.2478cc",
-        "version": 5,
-        "debugenabled": false,
-        "domain": "timer",
-        "service": "cancel",
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "timer.home_security"
+        "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"
+            }
         ],
-        "data": "",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "x": 790,
-        "y": 780,
+        "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,
         "wires": [
+            [
+                "c527f80ad015aec2"
+            ],
             []
         ]
     },
     {
-        "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"
@@ -640,10 +782,10 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 570,
-        "y": 780,
+        "y": 660,
         "wires": [
             [
-                "ec72f7b2db4cc37c"
+                "f9ccc0bad1f19231"
             ],
             []
         ]
@@ -662,7 +804,7 @@
         "areaId": [],
         "deviceId": [],
         "entityId": [
-            "switch.smart-doorbell_active"
+            "switch.smart_doorbell_active"
         ],
         "data": "",
         "dataType": "json",
@@ -677,23 +819,23 @@
         ]
     },
     {
-        "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"
@@ -709,27 +851,80 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 570,
-        "y": 660,
+        "y": 780,
         "wires": [
             [
-                "f9ccc0bad1f19231"
+                "ec72f7b2db4cc37c"
             ],
             []
         ]
     },
     {
-        "id": "dbd19cce541f73bc",
+        "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",
         "type": "api-current-state",
         "z": "e4381ced98d2a929",
         "g": "12e8b8acaeaeb3fa",
-        "name": "state garbage tomorrow",
+        "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_morgen",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.home_security",
         "state_type": "str",
         "blockInputOverrides": false,
         "outputProperties": [
@@ -746,155 +941,62 @@
                 "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": 730,
-        "y": 480,
+        "x": 560,
+        "y": 360,
         "wires": [
             [
-                "c527f80ad015aec2"
+                "0ccbc5bbe180df8e",
+                "38276d0327ca72c0"
             ],
             []
         ]
     },
     {
-        "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,
-        "wires": [
-            [
-                "ce2746e7cd66f603"
-            ]
-        ]
-    },
-    {
-        "id": "cdc4fcc574f8d36a",
-        "type": "time-range-switch",
+        "id": "6f6fc24f15222254",
+        "type": "api-call-service",
         "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": "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",
+        "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": "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",
@@ -902,25 +1004,25 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 790,
-        "y": 420,
+        "x": 820,
+        "y": 300,
         "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": [
@@ -940,50 +1042,74 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 550,
-        "y": 840,
+        "x": 570,
+        "y": 300,
         "wires": [
             [
-                "3fd3c31faf84dc25",
-                "f69361468483265d"
+                "b9a725c627f8ca76"
             ],
             []
         ]
     },
     {
-        "id": "28d474865ab8bbeb",
+        "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": "3392b339fb5fe297",
+        "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",
         "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,
@@ -992,74 +1118,35 @@
         "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,
-        "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,
+        "x": 790,
+        "y": 220,
         "wires": [
             [
-                "28d474865ab8bbeb"
-            ],
-            []
+                "c49e5bd8f93bd496"
+            ]
         ]
     },
     {
-        "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": [
@@ -1079,207 +1166,120 @@
         "for": 0,
         "forType": "num",
         "forUnits": "minutes",
-        "x": 780,
-        "y": 840,
+        "x": 550,
+        "y": 240,
         "wires": [
             [
-                "3392b339fb5fe297"
+                "d1324fbb34721b63"
             ],
-            []
-        ]
-    },
-    {
-        "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": [
             [
-                "47f54cec68e78d0a"
+                "2db276d509393d03"
             ]
         ]
     },
     {
-        "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,
+        "g": "bd90d247a95feb9d",
+        "name": "icon",
+        "field": "notify.icon",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "",
+        "output": "str",
+        "x": 1210,
+        "y": 500,
         "wires": [
             [
-                "aab38cb48d0dd6a2"
+                "c1f0224f374a67a6"
             ]
         ]
     },
     {
-        "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": "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": "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": "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"
             ]
         ]
     },