diff --git a/flows.json b/flows.json
index f542007..aab4942 100644
--- a/flows.json
+++ b/flows.json
@@ -626,7 +626,9 @@
             "4888e5649042a6d1"
         ],
         "x": 94,
-        "y": 339
+        "y": 339,
+        "w": 1852,
+        "h": 582
     },
     {
         "id": "39a7ac02f2727f1d",
@@ -660,7 +662,9 @@
             "1ad455bccec8ab46"
         ],
         "x": 14,
-        "y": 699
+        "y": 699,
+        "w": 1192,
+        "h": 362
     },
     {
         "id": "e065b1ed4938b477",
@@ -738,10 +742,14 @@
             "fa78faf38adfa49d",
             "1dfb0bcc98f1457b",
             "096369136e9e607f",
-            "783cfb381b70afc5"
+            "783cfb381b70afc5",
+            "5008caa0192238f7",
+            "d50e0d34df443b50"
         ],
         "x": 14,
-        "y": 59
+        "y": 59,
+        "w": 2812,
+        "h": 622
     },
     {
         "id": "5c50443a84910fb7",
@@ -914,7 +922,9 @@
             "0968727f2138ac62"
         ],
         "x": 34,
-        "y": 779
+        "y": 779,
+        "w": 1432,
+        "h": 422
     },
     {
         "id": "f55a52c40b8b8749",
@@ -959,7 +969,9 @@
             "318bee4424125dd5"
         ],
         "x": 34,
-        "y": 19
+        "y": 19,
+        "w": 832,
+        "h": 742
     },
     {
         "id": "208284848b13b85b",
@@ -986,7 +998,9 @@
             "58b54517ed812db3"
         ],
         "x": 34,
-        "y": 239
+        "y": 239,
+        "w": 832,
+        "h": 382
     },
     {
         "id": "eeafd13be593ae69",
@@ -1015,7 +1029,9 @@
             "b69eeb738bbd4bdb"
         ],
         "x": 34,
-        "y": 539
+        "y": 539,
+        "w": 1592,
+        "h": 282
     },
     {
         "id": "753e14252442d87d",
@@ -7566,11 +7582,11 @@
         "version": 5,
         "debugenabled": false,
         "domain": "script",
-        "service": "text_notify_tina",
+        "service": "text_notify",
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\t    \"title\": \"New Arrival\",\t    \"message\": \"Tony has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
+        "data": "\t{\t    \"who\":\"tina\",\t    \"title\": \"New Arrival\",\t    \"message\": \"Tony has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
         "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
@@ -7627,11 +7643,11 @@
         "version": 5,
         "debugenabled": false,
         "domain": "script",
-        "service": "text_notify_kallen",
+        "service": "text_notify",
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\t    \"title\": \"New Arrival\",\t    \"message\": \"Tony has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
+        "data": "{\t    \"who\":\"kallen\",\t    \"title\": \"New Arrival\",\t    \"message\": \"Tony has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
         "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
@@ -7652,11 +7668,11 @@
         "version": 5,
         "debugenabled": false,
         "domain": "script",
-        "service": "text_notify_kallen",
+        "service": "text_notify",
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\t    \"title\": \"New Arrival\",\t    \"message\": \"Christina has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
+        "data": "{\t    \"who\":\"kallen\",\t    \"title\": \"New Arrival\",\t    \"message\": \"Christina has arrived at home!\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
         "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
@@ -7735,11 +7751,11 @@
         "version": 5,
         "debugenabled": false,
         "domain": "script",
-        "service": "text_notify_tony",
+        "service": "text_notify",
         "areaId": [],
         "deviceId": [],
         "entityId": [],
-        "data": "{\t    \"title\": \"Hey Dummy\",\t    \"message\": \"Your presence flow is a failure and you should be ashamed.\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
+        "data": "{\t    \"who\":\"tony\",\t    \"title\": \"Hey Dummy\",\t    \"message\": \"Your presence flow is a failure and you should be ashamed.\",\t    \"data\": {\t        \"url\": \"/lovelace/mobile-devices\"\t    }\t}",
         "dataType": "jsonata",
         "mergeContext": "",
         "mustacheAltTags": false,
@@ -13438,7 +13454,9 @@
             [
                 "0deeaa74dd6c25c5"
             ],
-            []
+            [
+                "d50e0d34df443b50"
+            ]
         ]
     },
     {
@@ -16467,6 +16485,60 @@
             []
         ]
     },
+    {
+        "id": "5008caa0192238f7",
+        "type": "api-call-service",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Set to Off",
+        "server": "9e87348d.9c1c48",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "climate",
+        "service": "set_hvac_mode",
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "climate.master_bedroom_aircon"
+        ],
+        "data": "{\t    \"hvac_mode\":\"off\"\t}",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 1840,
+        "y": 140,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d50e0d34df443b50",
+        "type": "switch",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Manual?",
+        "property": "topic",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "eq",
+                "v": "manual-night",
+                "vt": "str"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 1,
+        "x": 1680,
+        "y": 140,
+        "wires": [
+            [
+                "5008caa0192238f7"
+            ]
+        ]
+    },
     {
         "id": "105271e0816c6a52",
         "type": "ha-button",