diff --git a/src/data/flows/machine_state_washing_machine.json b/src/data/flows/machine_state_washing_machine.json
deleted file mode 100644
index ed36223..0000000
--- a/src/data/flows/machine_state_washing_machine.json
+++ /dev/null
@@ -1,506 +0,0 @@
-[
-    {
-        "id": "c23003c7.1c978",
-        "type": "tab",
-        "label": "machine_state_washing_machine",
-        "disabled": false,
-        "info": ""
-    },
-    {
-        "id": "283f88d61789c306",
-        "type": "group",
-        "z": "c23003c7.1c978",
-        "name": "notify",
-        "style": {
-            "label": true
-        },
-        "nodes": [
-            "96e077260be2f7fb",
-            "d93bd58ac5ac0363",
-            "1e0f934a3493b12f",
-            "beedc605a0a3cbac",
-            "2191e2bfc331009c",
-            "61f9d42e4c070321",
-            "96679db36a4a3636"
-        ],
-        "x": 1314,
-        "y": 39,
-        "w": 472,
-        "h": 202
-    },
-    {
-        "id": "2191e2bfc331009c",
-        "type": "junction",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "x": 1340,
-        "y": 100,
-        "wires": [
-            [
-                "d93bd58ac5ac0363",
-                "96e077260be2f7fb",
-                "61f9d42e4c070321",
-                "96679db36a4a3636"
-            ]
-        ]
-    },
-    {
-        "id": "96e077260be2f7fb",
-        "type": "template",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1450,
-        "y": 120,
-        "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": 1450,
-        "y": 80,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
-    {
-        "id": "1e0f934a3493b12f",
-        "type": "link out",
-        "z": "c23003c7.1c978",
-        "g": "283f88d61789c306",
-        "name": "link_out_notify_1",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 1745,
-        "y": 140,
-        "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": 1650,
-        "y": 140,
-        "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": 1470,
-        "y": 160,
-        "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": 1460,
-        "y": 200,
-        "wires": [
-            [
-                "beedc605a0a3cbac"
-            ]
-        ]
-    },
-    {
-        "id": "3e4cd67e.efae1a",
-        "type": "switch",
-        "z": "c23003c7.1c978",
-        "name": "",
-        "property": "payload",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "gt",
-                "v": "10",
-                "vt": "num"
-            },
-            {
-                "t": "lte",
-                "v": "3.9",
-                "vt": "num"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 2,
-        "x": 530,
-        "y": 100,
-        "wires": [
-            [
-                "487d5ed4.e5e61"
-            ],
-            [
-                "bf29d7a3.4b42e8"
-            ]
-        ]
-    },
-    {
-        "id": "9def52c1.f5b5a",
-        "type": "trigger-state",
-        "z": "c23003c7.1c978",
-        "name": "state washing machine watt",
-        "server": "4ba92433.2478cc",
-        "version": 4,
-        "inputs": 1,
-        "outputs": 2,
-        "exposeAsEntityConfig": "",
-        "entityId": "sensor.shellyplug_washing_machine_power",
-        "entityIdType": "exact",
-        "debugEnabled": false,
-        "constraints": [],
-        "customOutputs": [],
-        "outputInitially": false,
-        "stateType": "num",
-        "enableInput": true,
-        "exposeToHomeAssistant": false,
-        "haConfig": [
-            {
-                "property": "name",
-                "value": ""
-            },
-            {
-                "property": "icon",
-                "value": ""
-            }
-        ],
-        "x": 140,
-        "y": 100,
-        "wires": [
-            [
-                "1de77a16.189c66"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "8de0025c.f9ce2",
-        "type": "comment",
-        "z": "c23003c7.1c978",
-        "name": "Set washing machine binary sensor on or off based on power measurements",
-        "info": "",
-        "x": 290,
-        "y": 40,
-        "wires": []
-    },
-    {
-        "id": "4bbf608.80d0ca",
-        "type": "change",
-        "z": "c23003c7.1c978",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "payload",
-                "pt": "msg",
-                "to": "on",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 860,
-        "y": 100,
-        "wires": [
-            [
-                "84dfbc214d4e3a8d"
-            ]
-        ]
-    },
-    {
-        "id": "26d18854.3c6808",
-        "type": "change",
-        "z": "c23003c7.1c978",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "payload",
-                "pt": "msg",
-                "to": "off",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 860,
-        "y": 160,
-        "wires": [
-            [
-                "84dfbc214d4e3a8d"
-            ]
-        ]
-    },
-    {
-        "id": "487d5ed4.e5e61",
-        "type": "api-current-state",
-        "z": "c23003c7.1c978",
-        "name": "state is not on",
-        "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "on",
-        "halt_if_type": "str",
-        "halt_if_compare": "is_not",
-        "entity_id": "binary_sensor.washing_machine",
-        "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": 680,
-        "y": 100,
-        "wires": [
-            [
-                "4bbf608.80d0ca"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "bf29d7a3.4b42e8",
-        "type": "api-current-state",
-        "z": "c23003c7.1c978",
-        "name": "state is not off",
-        "server": "4ba92433.2478cc",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "off",
-        "halt_if_type": "str",
-        "halt_if_compare": "is_not",
-        "entity_id": "binary_sensor.washing_machine",
-        "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": 680,
-        "y": 160,
-        "wires": [
-            [
-                "26d18854.3c6808"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "48fe7380.0c049c",
-        "type": "switch",
-        "z": "c23003c7.1c978",
-        "name": "",
-        "property": "payload",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "eq",
-                "v": "off",
-                "vt": "str"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 1,
-        "x": 1250,
-        "y": 100,
-        "wires": [
-            [
-                "2191e2bfc331009c"
-            ]
-        ]
-    },
-    {
-        "id": "1de77a16.189c66",
-        "type": "stoptimer",
-        "z": "c23003c7.1c978",
-        "duration": "10",
-        "units": "Second",
-        "payloadtype": "num",
-        "payloadval": "0",
-        "name": "",
-        "x": 370,
-        "y": 100,
-        "wires": [
-            [
-                "3e4cd67e.efae1a"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "84dfbc214d4e3a8d",
-        "type": "ha-binary-sensor",
-        "z": "c23003c7.1c978",
-        "name": "sensor washing machine",
-        "entityConfig": "bdbe52c.932a5b",
-        "version": 0,
-        "state": "payload",
-        "stateType": "msg",
-        "attributes": [],
-        "inputOverride": "allow",
-        "outputProperties": [],
-        "x": 1070,
-        "y": 100,
-        "wires": [
-            [
-                "48fe7380.0c049c"
-            ]
-        ]
-    },
-    {
-        "id": "4ba92433.2478cc",
-        "type": "server",
-        "name": "Home Assistant",
-        "version": 5,
-        "addon": false,
-        "rejectUnauthorizedCerts": false,
-        "ha_boolean": "y|yes|true|on|home|open",
-        "connectionDelay": true,
-        "cacheJson": true,
-        "heartbeat": true,
-        "heartbeatInterval": "30",
-        "areaSelector": "id",
-        "deviceSelector": "id",
-        "entitySelector": "id",
-        "statusSeparator": "at: ",
-        "statusYear": "hidden",
-        "statusMonth": "short",
-        "statusDay": "numeric",
-        "statusHourCycle": "h23",
-        "statusTimeFormat": "h:m",
-        "enableGlobalContextStore": true
-    },
-    {
-        "id": "bdbe52c.932a5b",
-        "type": "ha-entity-config",
-        "server": "4ba92433.2478cc",
-        "deviceConfig": "",
-        "name": "washing_machine",
-        "version": "6",
-        "entityType": "binary_sensor",
-        "haConfig": [
-            {
-                "property": "name",
-                "value": "washing_machine"
-            },
-            {
-                "property": "icon",
-                "value": "mdi:washing-machine"
-            },
-            {
-                "property": "entity_category",
-                "value": ""
-            },
-            {
-                "property": "entity_picture",
-                "value": ""
-            },
-            {
-                "property": "device_class",
-                "value": ""
-            }
-        ],
-        "resend": true,
-        "debugEnabled": false
-    }
-]
\ No newline at end of file
diff --git a/src/data/flows/notification_main.json b/src/data/flows/notification_main.json
index f9a7398..92f3af1 100644
--- a/src/data/flows/notification_main.json
+++ b/src/data/flows/notification_main.json
@@ -281,7 +281,10 @@
             "008e4e3d5eb1c73a",
             "6031ed8d02da2add",
             "ce9dcc40d72369f4",
-            "31afe4007c8c4380"
+            "31afe4007c8c4380",
+            "aa6339118c6cf238",
+            "5173344f2bf9202f",
+            "a88aa9f85b115b03"
         ],
         "x": 195,
         "y": 460,
diff --git a/src/data/flows/machine_state_dishwasher.json b/src/data/flows/sensor_dishwasher.json
similarity index 81%
rename from src/data/flows/machine_state_dishwasher.json
rename to src/data/flows/sensor_dishwasher.json
index 31082d5..fe9e362 100644
--- a/src/data/flows/machine_state_dishwasher.json
+++ b/src/data/flows/sensor_dishwasher.json
@@ -2,7 +2,7 @@
     {
         "id": "2437e768.8e34d8",
         "type": "tab",
-        "label": "machine_state_dishwasher",
+        "label": "sensor_dishwasher",
         "disabled": false,
         "info": ""
     },
@@ -24,17 +24,41 @@
             "80b3c96f004d6f8b"
         ],
         "x": 1234,
-        "y": 59,
+        "y": 139,
         "w": 472,
         "h": 202
     },
+    {
+        "id": "b81d6a2bc88d5cab",
+        "type": "group",
+        "z": "2437e768.8e34d8",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "b921556ff12ab156",
+            "1f556a76d7e6f50a",
+            "5173344f2bf9202f",
+            "5da220473ea9a36e"
+        ],
+        "x": 14,
+        "y": 39,
+        "w": 502,
+        "h": 82
+    },
     {
         "id": "ec34cd6ea57b0b7f",
         "type": "junction",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
         "x": 1260,
-        "y": 120,
+        "y": 200,
         "wires": [
             [
                 "64614e79bcb09872",
@@ -49,7 +73,7 @@
         "type": "junction",
         "z": "2437e768.8e34d8",
         "x": 380,
-        "y": 140,
+        "y": 220,
         "wires": [
             [
                 "ce869786.78dec8"
@@ -57,39 +81,63 @@
         ]
     },
     {
-        "id": "80b3c96f004d6f8b",
-        "type": "template",
+        "id": "08bca5ce6d389d48",
+        "type": "join",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
-        "name": "notification id",
-        "field": "notify.notification_id",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "dishwasher",
-        "output": "str",
-        "x": 1390,
+        "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": 1570,
         "y": 220,
         "wires": [
             [
-                "08bca5ce6d389d48"
+                "2c0a57bd6ee87009"
             ]
         ]
     },
     {
-        "id": "71f13b6b1744cf6b",
+        "id": "2c0a57bd6ee87009",
+        "type": "link out",
+        "z": "2437e768.8e34d8",
+        "g": "3bf0bc8959f8a48e",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "a97f87cfab413716"
+        ],
+        "x": 1665,
+        "y": 220,
+        "wires": []
+    },
+    {
+        "id": "2a35d2abfb0850da",
         "type": "template",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
-        "name": "icon",
-        "field": "notify.icon",
+        "name": "message",
+        "field": "notify.message",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "",
+        "template": "De Vaatwasser is klaar",
         "output": "str",
-        "x": 1370,
-        "y": 180,
+        "x": 1380,
+        "y": 220,
         "wires": [
             [
                 "08bca5ce6d389d48"
@@ -109,7 +157,7 @@
         "template": "Vaatwasser",
         "output": "str",
         "x": 1370,
-        "y": 100,
+        "y": 180,
         "wires": [
             [
                 "08bca5ce6d389d48"
@@ -117,19 +165,19 @@
         ]
     },
     {
-        "id": "2a35d2abfb0850da",
+        "id": "71f13b6b1744cf6b",
         "type": "template",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
-        "name": "message",
-        "field": "notify.message",
+        "name": "icon",
+        "field": "notify.icon",
         "fieldType": "msg",
         "format": "handlebars",
         "syntax": "mustache",
-        "template": "De Vaatwasser is klaar",
+        "template": "",
         "output": "str",
-        "x": 1380,
-        "y": 140,
+        "x": 1370,
+        "y": 260,
         "wires": [
             [
                 "08bca5ce6d389d48"
@@ -137,46 +185,22 @@
         ]
     },
     {
-        "id": "2c0a57bd6ee87009",
-        "type": "link out",
-        "z": "2437e768.8e34d8",
-        "g": "3bf0bc8959f8a48e",
-        "name": "link_out_notify_1",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "a97f87cfab413716"
-        ],
-        "x": 1665,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "08bca5ce6d389d48",
-        "type": "join",
+        "id": "80b3c96f004d6f8b",
+        "type": "template",
         "z": "2437e768.8e34d8",
         "g": "3bf0bc8959f8a48e",
-        "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": 1570,
-        "y": 140,
+        "name": "notification id",
+        "field": "notify.notification_id",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "dishwasher",
+        "output": "str",
+        "x": 1390,
+        "y": 300,
         "wires": [
             [
-                "2c0a57bd6ee87009"
+                "08bca5ce6d389d48"
             ]
         ]
     },
@@ -200,7 +224,7 @@
         "to": "",
         "reg": false,
         "x": 820,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "bea742545d56e3a3"
@@ -227,7 +251,7 @@
         "to": "",
         "reg": false,
         "x": 820,
-        "y": 140,
+        "y": 220,
         "wires": [
             [
                 "bea742545d56e3a3"
@@ -266,7 +290,7 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 640,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "36f24fd5.59924"
@@ -306,7 +330,7 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 640,
-        "y": 140,
+        "y": 220,
         "wires": [
             [
                 "54b1f381.39c02c"
@@ -332,7 +356,7 @@
         "repair": false,
         "outputs": 1,
         "x": 1150,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "ec34cd6ea57b0b7f"
@@ -352,7 +376,7 @@
         "inputOverride": "allow",
         "outputProperties": [],
         "x": 1010,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "ef6b748.eeaf388"
@@ -366,7 +390,7 @@
         "name": "Set dishwasher binary sensor on or off based on power measurements",
         "info": "",
         "x": 270,
-        "y": 40,
+        "y": 20,
         "wires": []
     },
     {
@@ -375,11 +399,16 @@
         "z": "2437e768.8e34d8",
         "name": "state dishwasher watt",
         "server": "4ba92433.2478cc",
-        "version": 5,
+        "version": 6,
         "outputs": 1,
         "exposeAsEntityConfig": "",
-        "entityId": "sensor.shellyplugplus_dishwasher_power",
-        "entityIdType": "exact",
+        "entities": {
+            "entity": [
+                "sensor.shellyplugplus_dishwasher_power"
+            ],
+            "substring": [],
+            "regex": []
+        },
         "outputInitially": true,
         "stateType": "str",
         "ifState": "",
@@ -415,7 +444,7 @@
             }
         ],
         "x": 120,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "47f4fb301e391cb8"
@@ -432,7 +461,7 @@
         "payloadval": "0",
         "name": "",
         "x": 460,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "5914d077.55a55"
@@ -463,7 +492,7 @@
         "repair": false,
         "outputs": 2,
         "x": 290,
-        "y": 80,
+        "y": 160,
         "wires": [
             [
                 "036d5a464421fc1b"
@@ -473,6 +502,76 @@
             ]
         ]
     },
+    {
+        "id": "b921556ff12ab156",
+        "type": "catch",
+        "z": "2437e768.8e34d8",
+        "g": "b81d6a2bc88d5cab",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 100,
+        "y": 80,
+        "wires": [
+            [
+                "1f556a76d7e6f50a"
+            ]
+        ]
+    },
+    {
+        "id": "1f556a76d7e6f50a",
+        "type": "template",
+        "z": "2437e768.8e34d8",
+        "g": "b81d6a2bc88d5cab",
+        "name": "messsage",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "message: {{{error.message}}} \\nSource: id: {{error.source.id}} \\ntype: {{error.source.type}} \\nname: {{error.source.name}} \\ncount: {{error.source.count}}",
+        "output": "str",
+        "x": 250,
+        "y": 80,
+        "wires": [
+            [
+                "5da220473ea9a36e"
+            ]
+        ]
+    },
+    {
+        "id": "5173344f2bf9202f",
+        "type": "link out",
+        "z": "2437e768.8e34d8",
+        "g": "b81d6a2bc88d5cab",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "a97f87cfab413716"
+        ],
+        "x": 475,
+        "y": 80,
+        "wires": []
+    },
+    {
+        "id": "5da220473ea9a36e",
+        "type": "template",
+        "z": "2437e768.8e34d8",
+        "g": "b81d6a2bc88d5cab",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Node-RED",
+        "output": "str",
+        "x": 390,
+        "y": 80,
+        "wires": [
+            [
+                "5173344f2bf9202f"
+            ]
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",
diff --git a/src/data/flows/machine_state_thumble_dryer.json b/src/data/flows/sensor_thumble_dryer.json
similarity index 80%
rename from src/data/flows/machine_state_thumble_dryer.json
rename to src/data/flows/sensor_thumble_dryer.json
index 2346655..2bf95bc 100644
--- a/src/data/flows/machine_state_thumble_dryer.json
+++ b/src/data/flows/sensor_thumble_dryer.json
@@ -2,7 +2,7 @@
     {
         "id": "72ef82b8.9d086c",
         "type": "tab",
-        "label": "machine_state_thumble_dryer",
+        "label": "sensor_thumble_dryer",
         "disabled": false,
         "info": ""
     },
@@ -24,17 +24,41 @@
             "95286ff3.9f33d"
         ],
         "x": 1244,
-        "y": 79,
+        "y": 139,
         "w": 472,
         "h": 202
     },
+    {
+        "id": "48945dbb970d3465",
+        "type": "group",
+        "z": "72ef82b8.9d086c",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "95a0ca31cb9f81d2",
+            "d6fdd4c4271165e1",
+            "a88aa9f85b115b03",
+            "2eb8824d45a66c4f"
+        ],
+        "x": 14,
+        "y": 39,
+        "w": 502,
+        "h": 82
+    },
     {
         "id": "df3bd9cee59e687a",
         "type": "junction",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
         "x": 1270,
-        "y": 140,
+        "y": 200,
         "wires": [
             [
                 "70a25e05987238de",
@@ -45,19 +69,19 @@
         ]
     },
     {
-        "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": 260,
         "wires": [
             [
                 "a91faa17c024af1e"
@@ -65,25 +89,50 @@
         ]
     },
     {
-        "id": "f359939883ebec80",
-        "type": "template",
+        "id": "a91faa17c024af1e",
+        "type": "join",
         "z": "72ef82b8.9d086c",
         "g": "677a462e190a4c92",
-        "name": "icon",
-        "field": "notify.icon",
-        "fieldType": "msg",
-        "format": "handlebars",
-        "syntax": "mustache",
-        "template": "",
-        "output": "str",
-        "x": 1380,
-        "y": 160,
+        "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": 240,
         "wires": [
             [
-                "a91faa17c024af1e"
+                "0993d50e3c03d798"
             ]
         ]
     },
+    {
+        "id": "0993d50e3c03d798",
+        "type": "link out",
+        "z": "72ef82b8.9d086c",
+        "g": "677a462e190a4c92",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "8ed3b0974336e55b",
+            "aeee8468f3d1b7ad",
+            "c4660dc11fb0e5b8"
+        ],
+        "x": 1675,
+        "y": 240,
+        "wires": []
+    },
     {
         "id": "70a25e05987238de",
         "type": "template",
@@ -97,7 +146,7 @@
         "template": "Droger",
         "output": "str",
         "x": 1380,
-        "y": 120,
+        "y": 180,
         "wires": [
             [
                 "a91faa17c024af1e"
@@ -105,64 +154,39 @@
         ]
     },
     {
-        "id": "0993d50e3c03d798",
-        "type": "link out",
-        "z": "72ef82b8.9d086c",
-        "g": "677a462e190a4c92",
-        "name": "link_out_notify_1",
-        "mode": "link",
-        "links": [
-            "8ed3b0974336e55b",
-            "aeee8468f3d1b7ad",
-            "c4660dc11fb0e5b8"
-        ],
-        "x": 1675,
-        "y": 180,
-        "wires": []
-    },
-    {
-        "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": 220,
         "wires": [
             [
-                "0993d50e3c03d798"
+                "a91faa17c024af1e"
             ]
         ]
     },
     {
-        "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": 300,
         "wires": [
             [
                 "a91faa17c024af1e"
@@ -192,7 +216,7 @@
         "repair": false,
         "outputs": 2,
         "x": 490,
-        "y": 100,
+        "y": 160,
         "wires": [
             [
                 "78d208e5.9e2828"
@@ -222,7 +246,7 @@
         "to": "",
         "reg": false,
         "x": 820,
-        "y": 100,
+        "y": 160,
         "wires": [
             [
                 "f2f5e3d5cd8dec8d"
@@ -249,7 +273,7 @@
         "to": "",
         "reg": false,
         "x": 820,
-        "y": 160,
+        "y": 220,
         "wires": [
             [
                 "f2f5e3d5cd8dec8d"
@@ -288,7 +312,7 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 640,
-        "y": 100,
+        "y": 160,
         "wires": [
             [
                 "4a449402.69359c"
@@ -328,7 +352,7 @@
         "forType": "num",
         "forUnits": "minutes",
         "x": 640,
-        "y": 160,
+        "y": 220,
         "wires": [
             [
                 "401de4c3.c5e84c"
@@ -342,12 +366,17 @@
         "z": "72ef82b8.9d086c",
         "name": "state tumble dryer watt",
         "server": "4ba92433.2478cc",
-        "version": 4,
+        "version": 5,
         "inputs": 1,
         "outputs": 2,
         "exposeAsEntityConfig": "",
-        "entityId": "sensor.shellyplug_tumble_dryer_power",
-        "entityIdType": "exact",
+        "entities": {
+            "entity": [
+                "sensor.shellyplug_tumble_dryer_power"
+            ],
+            "substring": [],
+            "regex": []
+        },
         "debugEnabled": false,
         "constraints": [],
         "customOutputs": [],
@@ -366,7 +395,7 @@
             }
         ],
         "x": 120,
-        "y": 100,
+        "y": 160,
         "wires": [
             [
                 "bcdcd79d.345708"
@@ -391,8 +420,8 @@
         "checkall": "true",
         "repair": false,
         "outputs": 1,
-        "x": 1130,
-        "y": 100,
+        "x": 1150,
+        "y": 160,
         "wires": [
             [
                 "df3bd9cee59e687a"
@@ -409,7 +438,7 @@
         "payloadval": "0",
         "name": "",
         "x": 330,
-        "y": 100,
+        "y": 160,
         "wires": [
             [
                 "6bda6302.ca5bcc"
@@ -424,7 +453,7 @@
         "name": "Set thumble dryer binary sensor on or off based on power measurements",
         "info": "Set thumble dryer binary sensor on or off based on power measurements`",
         "x": 280,
-        "y": 40,
+        "y": 20,
         "wires": []
     },
     {
@@ -439,14 +468,84 @@
         "attributes": [],
         "inputOverride": "allow",
         "outputProperties": [],
-        "x": 990,
-        "y": 100,
+        "x": 1010,
+        "y": 160,
         "wires": [
             [
                 "e78c18ee.1eb558"
             ]
         ]
     },
+    {
+        "id": "95a0ca31cb9f81d2",
+        "type": "catch",
+        "z": "72ef82b8.9d086c",
+        "g": "48945dbb970d3465",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 100,
+        "y": 80,
+        "wires": [
+            [
+                "d6fdd4c4271165e1"
+            ]
+        ]
+    },
+    {
+        "id": "d6fdd4c4271165e1",
+        "type": "template",
+        "z": "72ef82b8.9d086c",
+        "g": "48945dbb970d3465",
+        "name": "messsage",
+        "field": "notify.message",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "message: {{{error.message}}} \\nSource: id: {{error.source.id}} \\ntype: {{error.source.type}} \\nname: {{error.source.name}} \\ncount: {{error.source.count}}",
+        "output": "str",
+        "x": 250,
+        "y": 80,
+        "wires": [
+            [
+                "2eb8824d45a66c4f"
+            ]
+        ]
+    },
+    {
+        "id": "a88aa9f85b115b03",
+        "type": "link out",
+        "z": "72ef82b8.9d086c",
+        "g": "48945dbb970d3465",
+        "name": "link_out_notify_1",
+        "mode": "link",
+        "links": [
+            "a97f87cfab413716"
+        ],
+        "x": 475,
+        "y": 80,
+        "wires": []
+    },
+    {
+        "id": "2eb8824d45a66c4f",
+        "type": "template",
+        "z": "72ef82b8.9d086c",
+        "g": "48945dbb970d3465",
+        "name": "title",
+        "field": "notify.title",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "mustache",
+        "template": "Node-RED",
+        "output": "str",
+        "x": 390,
+        "y": 80,
+        "wires": [
+            [
+                "a88aa9f85b115b03"
+            ]
+        ]
+    },
     {
         "id": "4ba92433.2478cc",
         "type": "server",