diff --git a/flows.json b/flows.json
index 7d503ee..b7a7c6d 100644
--- a/flows.json
+++ b/flows.json
@@ -1242,7 +1242,9 @@
             "528d5448879fd3db"
         ],
         "x": 54,
-        "y": 19
+        "y": 19,
+        "w": 2092,
+        "h": 282
     },
     {
         "id": "0c81dfaed25d225c",
@@ -7182,8 +7184,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 240,
+        "x": 1160,
+        "y": 200,
         "wires": [
             [
                 "8556daf4bc9df581"
@@ -7207,7 +7209,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 1160,
+        "x": 1400,
         "y": 240,
         "wires": [
             [
@@ -7248,7 +7250,7 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1420,
+        "x": 1640,
         "y": 240,
         "wires": [
             []
@@ -7413,7 +7415,7 @@
         "y": 240,
         "wires": [
             [
-                "1e365f7e5ba78955"
+                "24685bfd0b3069f3"
             ],
             []
         ]
@@ -7566,7 +7568,6 @@
             "switch.adaptive_lighting_dining_room",
             "switch.adaptive_lighting_downstairs_bathroom",
             "switch.adaptive_lighting_emma_bedroom",
-            "switch.adaptive_lighting_front_porch",
             "switch.adaptive_lighting_kallen_bedroom",
             "switch.adaptive_lighting_living_room",
             "switch.adaptive_lighting_master_bedroom",
@@ -7581,8 +7582,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1440,
-        "y": 300,
+        "x": 1660,
+        "y": 360,
         "wires": [
             []
         ]
@@ -7639,7 +7640,7 @@
         "outputProperties": [],
         "queue": "none",
         "x": 740,
-        "y": 300,
+        "y": 320,
         "wires": [
             [
                 "9335700303031f7c"
@@ -7668,7 +7669,7 @@
         "outputProperties": [],
         "queue": "none",
         "x": 940,
-        "y": 300,
+        "y": 320,
         "wires": [
             [
                 "344119e7ca7012d5"
@@ -7706,8 +7707,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1430,
-        "y": 360,
+        "x": 1650,
+        "y": 420,
         "wires": [
             [
                 "8471f96e468c13f7"
@@ -7762,8 +7763,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1650,
-        "y": 360,
+        "x": 1870,
+        "y": 420,
         "wires": [
             [
                 "fc85ca4a4c57b5bf"
@@ -7818,8 +7819,8 @@
         "wires": [
             [
                 "4781b749d186cd7f",
-                "1e365f7e5ba78955",
-                "47862a29a4c2efd1"
+                "47862a29a4c2efd1",
+                "24685bfd0b3069f3"
             ]
         ]
     },
@@ -8153,7 +8154,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 730,
-        "y": 360,
+        "y": 380,
         "wires": [
             [
                 "80a2c88e730484cc"
@@ -8187,7 +8188,7 @@
         "outputProperties": [],
         "queue": "none",
         "x": 980,
-        "y": 360,
+        "y": 380,
         "wires": [
             []
         ]
@@ -8401,11 +8402,10 @@
         "finalize": "",
         "libs": [],
         "x": 740,
-        "y": 420,
+        "y": 440,
         "wires": [
             [
-                "5c7200b067eb96eb",
-                "6987f02f09134764"
+                "fd4f6fac7f649cb3"
             ]
         ],
         "outputLabels": [
@@ -8433,8 +8433,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 960,
-        "y": 420,
+        "x": 1140,
+        "y": 440,
         "wires": [
             []
         ]
@@ -8489,8 +8489,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 940,
-        "y": 480,
+        "x": 1120,
+        "y": 500,
         "wires": [
             []
         ]
@@ -8586,8 +8586,8 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "x": 1870,
-        "y": 360,
+        "x": 2090,
+        "y": 420,
         "wires": [
             []
         ]
@@ -8614,7 +8614,7 @@
         "outputProperties": [],
         "queue": "none",
         "x": 1160,
-        "y": 300,
+        "y": 320,
         "wires": [
             []
         ]
@@ -8685,6 +8685,124 @@
             []
         ]
     },
+    {
+        "id": "fd4f6fac7f649cb3",
+        "type": "api-current-state",
+        "z": "e44b1e7a8ef7ae1d",
+        "name": "Holiday Hold",
+        "server": "9e87348d.9c1c48",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.holiday_mode_hold",
+        "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": 930,
+        "y": 440,
+        "wires": [
+            [
+                "5c7200b067eb96eb",
+                "6987f02f09134764"
+            ],
+            []
+        ],
+        "outputLabels": [
+            "Off",
+            "On"
+        ]
+    },
+    {
+        "id": "24685bfd0b3069f3",
+        "type": "api-current-state",
+        "z": "e44b1e7a8ef7ae1d",
+        "name": "Holiday Hold",
+        "server": "9e87348d.9c1c48",
+        "version": 3,
+        "outputs": 2,
+        "halt_if": "off",
+        "halt_if_type": "str",
+        "halt_if_compare": "is",
+        "entity_id": "input_boolean.holiday_mode_hold",
+        "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": 930,
+        "y": 240,
+        "wires": [
+            [
+                "1e365f7e5ba78955"
+            ],
+            [
+                "ad34a6e7cb0169ad"
+            ]
+        ],
+        "outputLabels": [
+            "Off",
+            "On"
+        ]
+    },
+    {
+        "id": "ad34a6e7cb0169ad",
+        "type": "api-call-service",
+        "z": "e44b1e7a8ef7ae1d",
+        "name": "Turn off night lighting",
+        "server": "9e87348d.9c1c48",
+        "version": 5,
+        "debugenabled": false,
+        "domain": "light",
+        "service": "turn_off",
+        "areaId": [
+            "upstairs_hallway"
+        ],
+        "deviceId": [],
+        "entityId": [],
+        "data": "",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "x": 1160,
+        "y": 260,
+        "wires": [
+            [
+                "8556daf4bc9df581"
+            ]
+        ]
+    },
     {
         "id": "134433d6e21dab5b",
         "type": "server-state-changed",