diff --git a/flows.json b/flows.json
index dd0c68d..51d5b42 100644
--- a/flows.json
+++ b/flows.json
@@ -1133,16 +1133,18 @@
             "defcae57f9916394",
             "dfa6bff034d7d522",
             "94faa23771cc9cd6",
-            "4f330c52abf707de",
             "459433738b64d14d",
             "cfd6c59d35ffa1dc",
             "a2ec35a79d79bf2f",
             "9a8c39dc1a0c20e6",
             "3e6caa91031ab102",
-            "8c29a2e1a06c5524"
+            "8c29a2e1a06c5524",
+            "c7a8df4ebeb3b5c5"
         ],
         "x": 54,
-        "y": 19
+        "y": 19,
+        "w": 2092,
+        "h": 282
     },
     {
         "id": "0c81dfaed25d225c",
@@ -1374,9 +1376,7 @@
             "8808e39fba362206"
         ],
         "x": 1134,
-        "y": 671.5,
-        "w": 422,
-        "h": 97
+        "y": 671.5
     },
     {
         "id": "19b0e082db0643ac",
@@ -15031,7 +15031,7 @@
         "queue": "none",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1910,
+        "x": 1710,
         "y": 260,
         "wires": [
             []
@@ -15148,11 +15148,11 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 1070,
+        "x": 1090,
         "y": 260,
         "wires": [
             [
-                "4f330c52abf707de"
+                "3e6caa91031ab102"
             ],
             []
         ]
@@ -15464,7 +15464,7 @@
         "wires": [
             [
                 "edef3ad58f6e9bbd",
-                "8f3c66f06ed3f7b2"
+                "c7a8df4ebeb3b5c5"
             ],
             [
                 "edef3ad58f6e9bbd"
@@ -15521,7 +15521,7 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 2100,
+        "x": 1900,
         "y": 200,
         "wires": [
             []
@@ -15577,7 +15577,7 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1910,
+        "x": 1710,
         "y": 200,
         "wires": [
             [
@@ -15597,7 +15597,7 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1700,
+        "x": 1500,
         "y": 260,
         "wires": [
             [
@@ -15640,46 +15640,6 @@
             "Holiday Off"
         ]
     },
-    {
-        "id": "4f330c52abf707de",
-        "type": "api-current-state",
-        "z": "b5717a86ce55bc29",
-        "g": "eeafd13be593ae69",
-        "name": "Early Night Mode",
-        "server": "9e87348d.9c1c48",
-        "version": 3,
-        "outputs": 2,
-        "halt_if": "on",
-        "halt_if_type": "str",
-        "halt_if_compare": "is",
-        "entity_id": "binary_sensor.early_night_mode",
-        "state_type": "str",
-        "blockInputOverrides": false,
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            }
-        ],
-        "for": "0",
-        "forType": "num",
-        "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 1290,
-        "y": 260,
-        "wires": [
-            [
-                "3e6caa91031ab102"
-            ],
-            []
-        ]
-    },
     {
         "id": "459433738b64d14d",
         "type": "api-call-service",
@@ -15787,7 +15747,7 @@
                 "valueType": "date"
             }
         ],
-        "x": 840,
+        "x": 860,
         "y": 260,
         "wires": [
             [
@@ -15826,7 +15786,7 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 1500,
+        "x": 1300,
         "y": 260,
         "wires": [
             [
@@ -15883,7 +15843,7 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 850,
+        "x": 870,
         "y": 200,
         "wires": [
             [
@@ -15892,6 +15852,33 @@
             []
         ]
     },
+    {
+        "id": "c7a8df4ebeb3b5c5",
+        "type": "delay",
+        "z": "b5717a86ce55bc29",
+        "g": "eeafd13be593ae69",
+        "name": "",
+        "pauseType": "delay",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 245,
+        "y": 260,
+        "wires": [
+            [
+                "8f3c66f06ed3f7b2"
+            ]
+        ],
+        "l": false
+    },
     {
         "id": "cd04bdb407311eb5",
         "type": "ha-button",