diff --git a/flows.json b/flows.json
index a27fd1b..5101875 100644
--- a/flows.json
+++ b/flows.json
@@ -846,7 +846,9 @@
         "z": "5e238cbbe6d612c9",
         "name": "Upstairs Bathroom Motion Lights",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "a1ee07ab20229b45",
@@ -873,8 +875,8 @@
             "f70e4a4480d43b2b",
             "5e00ecbccbe51462"
         ],
-        "x": 54,
-        "y": 339,
+        "x": 14,
+        "y": 359,
         "w": 1612,
         "h": 382
     },
@@ -1110,7 +1112,9 @@
         "z": "47f17992fab9b4f5",
         "name": "Front Door Awareness",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#ff0000",
+            "fill": "#ff3f3f"
         },
         "nodes": [
             "97a441f1ac510844",
@@ -1126,8 +1130,8 @@
             "03fad0a960ff39e7",
             "c0933fcc8737bc0b"
         ],
-        "x": 34,
-        "y": 239,
+        "x": 94,
+        "y": 179,
         "w": 1032,
         "h": 322
     },
@@ -1189,7 +1193,9 @@
         "z": "b5717a86ce55bc29",
         "name": "Front Porch Light Timer",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#92d04f",
+            "fill": "#addb7b"
         },
         "nodes": [
             "091390f43bfeddf5",
@@ -1214,7 +1220,7 @@
             "f5fb96bf1a33b3cd"
         ],
         "x": 54,
-        "y": 19,
+        "y": 119,
         "w": 1492,
         "h": 282
     },
@@ -1260,7 +1266,9 @@
         "z": "eff21041cc941fef",
         "name": "Downstairs Bathroom",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "5123a607588fa737",
@@ -1272,7 +1280,7 @@
             "b281061a4b08d2eb"
         ],
         "x": 14,
-        "y": 859,
+        "y": 879,
         "w": 612,
         "h": 262
     },
@@ -1282,7 +1290,9 @@
         "z": "47f17992fab9b4f5",
         "name": "Basement On",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#0070c0",
+            "fill": "#3f93cf"
         },
         "nodes": [
             "1f5808147fa975cf",
@@ -1304,8 +1314,8 @@
             "bd6bdc6ed9aded9d",
             "3bd0a22c66de228a"
         ],
-        "x": 34,
-        "y": 579,
+        "x": 94,
+        "y": 839,
         "w": 992,
         "h": 322
     },
@@ -1597,7 +1607,9 @@
         "z": "eff21041cc941fef",
         "name": "Doorbell Alert",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#92d04f",
+            "fill": "#addb7b"
         },
         "nodes": [
             "c983b44381b46ab5",
@@ -1617,7 +1629,7 @@
             "1e1059008d19c0ee"
         ],
         "x": 14,
-        "y": 339,
+        "y": 359,
         "w": 1532,
         "h": 282
     },
@@ -1876,7 +1888,9 @@
         "z": "5e238cbbe6d612c9",
         "name": "Stairwell",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "f18aab5a5bda9a84",
@@ -1892,8 +1906,8 @@
             "ef677459c795d246",
             "1f1489a0514e233b"
         ],
-        "x": 34,
-        "y": 739,
+        "x": 14,
+        "y": 759,
         "w": 792,
         "h": 382
     },
@@ -1903,7 +1917,9 @@
         "z": "5e238cbbe6d612c9",
         "name": "Emma Bedroom",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "c3f2a4aa281295ce",
@@ -1924,8 +1940,8 @@
             "40dae72402f8cdee",
             "bb3469b3ec117aab"
         ],
-        "x": 34,
-        "y": 1139,
+        "x": 14,
+        "y": 1159,
         "w": 812,
         "h": 502
     },
@@ -1935,7 +1951,9 @@
         "z": "eff21041cc941fef",
         "name": "Living Room",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "87d449113f439710",
@@ -1949,7 +1967,7 @@
             "c96c398bc26cfc26"
         ],
         "x": 14,
-        "y": 639,
+        "y": 659,
         "w": 1132,
         "h": 202
     },
@@ -1959,7 +1977,9 @@
         "z": "eff21041cc941fef",
         "name": "Back Door",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#92d04f",
+            "fill": "#addb7b"
         },
         "nodes": [
             "74f9d2bf4a8c0b53",
@@ -1967,7 +1987,7 @@
             "f0ef9a565f72dcae",
             "1238a342e440e582"
         ],
-        "x": 754,
+        "x": 774,
         "y": 19,
         "w": 812,
         "h": 82
@@ -1978,7 +1998,9 @@
         "z": "47f17992fab9b4f5",
         "name": "Basement Shutdown",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#0070c0",
+            "fill": "#3f93cf"
         },
         "nodes": [
             "56c84e793b8b0d79",
@@ -2002,7 +2024,7 @@
             "d575b0381d31edaa"
         ],
         "x": 94,
-        "y": 919,
+        "y": 1179,
         "w": 1492,
         "h": 382
     },
@@ -2107,7 +2129,9 @@
         "z": "eff21041cc941fef",
         "name": "Mud Room",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "de9fe68a439b4c41",
@@ -2122,7 +2146,7 @@
             "fa7c83f1dece9741"
         ],
         "x": 14,
-        "y": 1139,
+        "y": 1159,
         "w": 792,
         "h": 322
     },
@@ -2132,7 +2156,9 @@
         "z": "5e238cbbe6d612c9",
         "name": "Kallen Bedroom",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "f3824e4c7e202605",
@@ -2144,8 +2170,8 @@
             "0b5424aadc3479f7",
             "5524e8ba9b5545be"
         ],
-        "x": 894,
-        "y": 739,
+        "x": 874,
+        "y": 759,
         "w": 612,
         "h": 262
     },
@@ -2155,7 +2181,9 @@
         "z": "5e238cbbe6d612c9",
         "name": "Master Bedroom",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#001f60",
+            "fill": "#3f5787"
         },
         "nodes": [
             "e270c73896a1a50c",
@@ -2167,8 +2195,8 @@
             "4a431478798a51c8",
             "81129efa6676b58e"
         ],
-        "x": 894,
-        "y": 1019,
+        "x": 874,
+        "y": 1039,
         "w": 612,
         "h": 262
     },
@@ -2178,7 +2206,9 @@
         "z": "47f17992fab9b4f5",
         "name": "Do Not Enter",
         "style": {
-            "label": true
+            "label": true,
+            "stroke": "#ff0000",
+            "fill": "#ff3f3f"
         },
         "nodes": [
             "b62ba31a1b35ef47",
@@ -2197,8 +2227,8 @@
             "195c2b19593434e1",
             "e75fda5ea26d23e5"
         ],
-        "x": 34,
-        "y": 1319,
+        "x": 94,
+        "y": 519,
         "w": 1412,
         "h": 302
     },
@@ -2615,12 +2645,143 @@
         "w": 712,
         "h": 202
     },
+    {
+        "id": "98e38052d1cc2f9b",
+        "type": "group",
+        "z": "eff21041cc941fef",
+        "name": "Room Scenes",
+        "style": {
+            "stroke": "#6f2fa0",
+            "fill": "#9363b7",
+            "label": true
+        },
+        "nodes": [
+            "d95d9964546768a5",
+            "bdab41af28f2c7cd",
+            "7c224927d50a5f97",
+            "e689231430e9c829",
+            "d790134891fedfcc",
+            "5a81041c4a1390b8",
+            "b19f4a996fd4c2ee",
+            "85e820743550308b"
+        ],
+        "x": 14,
+        "y": 19,
+        "w": 742,
+        "h": 322
+    },
+    {
+        "id": "fd15bf62ba5e5171",
+        "type": "group",
+        "z": "5e238cbbe6d612c9",
+        "name": "Room Scenes",
+        "style": {
+            "stroke": "#6f2fa0",
+            "fill": "#9363b7",
+            "label": true
+        },
+        "nodes": [
+            "879ee8903841b8f0",
+            "bc2426cfcd5afbe8",
+            "a5498446c1edffa9",
+            "f28e7fd88f75041e",
+            "e1123236ee16fdaf",
+            "a17d58585048335d",
+            "fba69dfc80829db7"
+        ],
+        "x": 14,
+        "y": 19,
+        "w": 632,
+        "h": 322
+    },
+    {
+        "id": "c1e37f193ee65d73",
+        "type": "group",
+        "z": "5e238cbbe6d612c9",
+        "name": "Auto Shower Mode",
+        "style": {
+            "stroke": "#ffC000",
+            "fill": "#ffcf3f",
+            "label": true
+        },
+        "nodes": [
+            "b26bc471bcac2653",
+            "b51f19fa5b3d1587",
+            "646ac99f62432e22"
+        ],
+        "x": 674,
+        "y": 19,
+        "w": 672,
+        "h": 82
+    },
+    {
+        "id": "a60d1c8190059645",
+        "type": "group",
+        "z": "47f17992fab9b4f5",
+        "name": "Room Scenes",
+        "style": {
+            "stroke": "#6f2fa0",
+            "fill": "#9363b7",
+            "label": true
+        },
+        "nodes": [
+            "07049ae77b6751c6",
+            "31c254f61982f19d"
+        ],
+        "x": 14,
+        "y": 19,
+        "w": 512,
+        "h": 82
+    },
+    {
+        "id": "d00eb21154ac4160",
+        "type": "group",
+        "z": "47f17992fab9b4f5",
+        "name": "Furnace Room Auto Off",
+        "style": {
+            "stroke": "#ffC000",
+            "fill": "#ffcf3f",
+            "label": true
+        },
+        "nodes": [
+            "dd3608c864d7007b",
+            "5e31d6aacad206b8",
+            "18599ab162ab225b",
+            "e79ecc6c79946cc4",
+            "ab01d3d95c7ea717",
+            "8fa363e9e0c1b165"
+        ],
+        "x": 634,
+        "y": 19,
+        "w": 792,
+        "h": 142
+    },
+    {
+        "id": "628bc6d9078cb924",
+        "type": "group",
+        "z": "b5717a86ce55bc29",
+        "name": "Porch Scenes",
+        "style": {
+            "stroke": "#6f2fa0",
+            "fill": "#9363b7",
+            "label": true
+        },
+        "nodes": [
+            "af64b56e28c93907",
+            "3747d0c21057f3a6"
+        ],
+        "x": 54,
+        "y": 19,
+        "w": 472,
+        "h": 82
+    },
     {
         "id": "fba69dfc80829db7",
         "type": "junction",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "x": 320,
-        "y": 40,
+        "y": 60,
         "wires": [
             [
                 "a17d58585048335d"
@@ -2632,8 +2793,8 @@
         "type": "junction",
         "z": "5e238cbbe6d612c9",
         "g": "eccca853a916b662",
-        "x": 1120,
-        "y": 500,
+        "x": 1080,
+        "y": 520,
         "wires": [
             [
                 "5e00ecbccbe51462"
@@ -3894,48 +4055,6 @@
         "resend": false,
         "debugEnabled": false
     },
-    {
-        "id": "6ae4463a9ad1f043",
-        "type": "ha-device-config",
-        "name": "Holiday Mode",
-        "hwVersion": "",
-        "manufacturer": "Node-RED",
-        "model": "",
-        "swVersion": ""
-    },
-    {
-        "id": "d945515487bfbb09",
-        "type": "ha-entity-config",
-        "server": "9e87348d.9c1c48",
-        "deviceConfig": "6ae4463a9ad1f043",
-        "name": "Animated Scene Halloween",
-        "version": "6",
-        "entityType": "switch",
-        "haConfig": [
-            {
-                "property": "name",
-                "value": "Animated Scene Halloween"
-            },
-            {
-                "property": "icon",
-                "value": "mdi:halloween"
-            },
-            {
-                "property": "entity_category",
-                "value": ""
-            },
-            {
-                "property": "entity_picture",
-                "value": ""
-            },
-            {
-                "property": "device_class",
-                "value": ""
-            }
-        ],
-        "resend": false,
-        "debugEnabled": false
-    },
     {
         "id": "7d2b67c31769ed69",
         "type": "ha-entity-config",
@@ -11474,6 +11593,7 @@
         "id": "d95d9964546768a5",
         "type": "server-state-changed",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Downstairs Bathroom Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -11514,8 +11634,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 140,
-        "y": 100,
+        "x": 160,
+        "y": 120,
         "wires": [
             [
                 "d790134891fedfcc"
@@ -11526,6 +11646,7 @@
         "id": "bdab41af28f2c7cd",
         "type": "server-state-changed",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Living Room Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -11566,8 +11687,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 110,
-        "y": 40,
+        "x": 130,
+        "y": 60,
         "wires": [
             [
                 "85e820743550308b"
@@ -11578,6 +11699,7 @@
         "id": "7c224927d50a5f97",
         "type": "server-state-changed",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Mud Room Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -11618,8 +11740,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 110,
-        "y": 160,
+        "x": 130,
+        "y": 180,
         "wires": [
             [
                 "d790134891fedfcc"
@@ -11630,6 +11752,7 @@
         "id": "e689231430e9c829",
         "type": "server-state-changed",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Tina Lamp Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -11670,8 +11793,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 110,
-        "y": 220,
+        "x": 130,
+        "y": 240,
         "wires": [
             [
                 "d790134891fedfcc"
@@ -11707,7 +11830,7 @@
         "output_location": "",
         "output_location_type": "none",
         "x": 530,
-        "y": 1080,
+        "y": 1100,
         "wires": [
             []
         ]
@@ -11716,9 +11839,10 @@
         "id": "d790134891fedfcc",
         "type": "subflow:a4ee891237e460a2",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Main Scenes Handler",
-        "x": 580,
-        "y": 40,
+        "x": 600,
+        "y": 60,
         "wires": []
     },
     {
@@ -11766,7 +11890,7 @@
                 "valueType": "str"
             }
         ],
-        "x": 860,
+        "x": 880,
         "y": 60,
         "wires": [
             [
@@ -11801,7 +11925,7 @@
         "blockInputOverrides": false,
         "domain": "light",
         "service": "turn_on",
-        "x": 1290,
+        "x": 1310,
         "y": 60,
         "wires": [
             [
@@ -11840,7 +11964,7 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 1070,
+        "x": 1090,
         "y": 60,
         "wires": [
             [
@@ -11853,6 +11977,7 @@
         "id": "5a81041c4a1390b8",
         "type": "server-state-changed",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Tina Desk Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -11893,8 +12018,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 110,
-        "y": 280,
+        "x": 130,
+        "y": 300,
         "wires": [
             [
                 "b19f4a996fd4c2ee"
@@ -11905,9 +12030,10 @@
         "id": "b19f4a996fd4c2ee",
         "type": "subflow:85c4f81ca9628aea",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "",
-        "x": 590,
-        "y": 280,
+        "x": 610,
+        "y": 300,
         "wires": []
     },
     {
@@ -11924,7 +12050,7 @@
         "finalize": "",
         "libs": [],
         "x": 270,
-        "y": 960,
+        "y": 980,
         "wires": [
             [
                 "b281061a4b08d2eb"
@@ -11970,7 +12096,7 @@
         "domain": "timer",
         "service": "start",
         "x": 530,
-        "y": 1020,
+        "y": 1040,
         "wires": [
             []
         ]
@@ -12002,7 +12128,7 @@
         "domain": "timer",
         "service": "cancel",
         "x": 530,
-        "y": 960,
+        "y": 980,
         "wires": [
             []
         ]
@@ -12028,7 +12154,7 @@
             }
         ],
         "x": 120,
-        "y": 1080,
+        "y": 1100,
         "wires": [
             [
                 "5123a607588fa737"
@@ -12081,7 +12207,7 @@
             }
         ],
         "x": 110,
-        "y": 960,
+        "y": 980,
         "wires": [
             [
                 "f84e6b5157e857cf"
@@ -12118,7 +12244,7 @@
         "domain": "input_select",
         "service": "select_option",
         "x": 520,
-        "y": 900,
+        "y": 920,
         "wires": [
             []
         ]
@@ -12127,6 +12253,7 @@
         "id": "85e820743550308b",
         "type": "function",
         "z": "eff21041cc941fef",
+        "g": "98e38052d1cc2f9b",
         "name": "Adaptive",
         "func": "const states = global.get('homeassistant.homeAssistant.states')\nconst adaptBrt = states['switch.adaptive_lighting_adapt_brightness_living_room'].state\nconst adaptColor = states['switch.adaptive_lighting_adapt_color_living_room'].state\n\nif (adaptBrt === 'on' && adaptColor === 'off') {\n    msg.brightness = 'true'\n    msg.color = 'false'\n    node.status({fill:\"yellow\",shape:\"dot\",text:\"Brightness Only\"});\n} else if (adaptColor === 'on' && adaptBrt === 'off') {\n    msg.brightness = 'false'\n    msg.color = 'true'\n    node.status({fill:\"yellow\",shape:\"dot\",text:\"Color Only\"});\n} else {\n    msg.brightness = 'true'\n    msg.color = 'true'\n    node.status({fill:\"green\",shape:\"dot\",text:\"Both\"});\n}\n\nreturn msg;",
         "outputs": 1,
@@ -12135,8 +12262,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 300,
-        "y": 40,
+        "x": 320,
+        "y": 60,
         "wires": [
             [
                 "d790134891fedfcc"
@@ -12175,7 +12302,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 300,
-        "y": 380,
+        "y": 400,
         "wires": [
             [
                 "bc3e0a041efec910",
@@ -12209,7 +12336,7 @@
         "domain": "scene",
         "service": "create",
         "x": 180,
-        "y": 460,
+        "y": 480,
         "wires": [
             [
                 "41ababe9cfbe1297"
@@ -12241,7 +12368,7 @@
         "domain": "scene",
         "service": "create",
         "x": 190,
-        "y": 520,
+        "y": 540,
         "wires": [
             [
                 "71e6ae54dc1b958b"
@@ -12276,7 +12403,7 @@
         "domain": "switch",
         "service": "turn_off",
         "x": 390,
-        "y": 520,
+        "y": 540,
         "wires": [
             []
         ]
@@ -12310,7 +12437,7 @@
         "domain": "light",
         "service": "turn_on",
         "x": 550,
-        "y": 460,
+        "y": 480,
         "wires": [
             [
                 "c0ce3c040d25e0a1"
@@ -12344,7 +12471,7 @@
         "domain": "lifx",
         "service": "effect_pulse",
         "x": 740,
-        "y": 460,
+        "y": 480,
         "wires": [
             [
                 "e67a2b594c648ac6"
@@ -12380,7 +12507,7 @@
         "entityLocation": "data",
         "entityLocationType": "none",
         "x": 610,
-        "y": 560,
+        "y": 580,
         "wires": [
             [
                 "45df5f447e52cb0f"
@@ -12417,7 +12544,7 @@
         "domain": "scene",
         "service": "turn_on",
         "x": 980,
-        "y": 560,
+        "y": 580,
         "wires": [
             [
                 "2ebe03f5023de47c"
@@ -12443,7 +12570,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 1105,
-        "y": 560,
+        "y": 580,
         "wires": [
             [
                 "12e827e7416c9dac"
@@ -12478,7 +12605,7 @@
         "domain": "lifx",
         "service": "effect_stop",
         "x": 1230,
-        "y": 560,
+        "y": 580,
         "wires": [
             [
                 "e3ecd23a34c7f82e"
@@ -12512,7 +12639,7 @@
         "domain": "scene",
         "service": "turn_on",
         "x": 1430,
-        "y": 560,
+        "y": 580,
         "wires": [
             []
         ]
@@ -12525,7 +12652,7 @@
         "name": "Still need to add support for returning to living room media scenes",
         "info": "",
         "x": 270,
-        "y": 580,
+        "y": 600,
         "wires": []
     },
     {
@@ -12542,7 +12669,7 @@
         "finalize": "",
         "libs": [],
         "x": 780,
-        "y": 560,
+        "y": 580,
         "wires": [
             [
                 "e23e7b080ee3773f"
@@ -12568,7 +12695,7 @@
             "8146f43fea5aec03"
         ],
         "x": 915,
-        "y": 500,
+        "y": 520,
         "wires": []
     },
     {
@@ -12623,7 +12750,7 @@
             }
         ],
         "x": 120,
-        "y": 380,
+        "y": 400,
         "wires": [
             [
                 "c983b44381b46ab5"
@@ -12677,7 +12804,7 @@
             }
         ],
         "x": 150,
-        "y": 680,
+        "y": 700,
         "wires": [
             [
                 "7305cfffd320c75a"
@@ -12711,7 +12838,7 @@
             }
         ],
         "x": 180,
-        "y": 800,
+        "y": 820,
         "wires": [
             [
                 "7305cfffd320c75a"
@@ -12732,7 +12859,7 @@
         "finalize": "",
         "libs": [],
         "x": 430,
-        "y": 740,
+        "y": 760,
         "wires": [
             [
                 "130c6ac167cd49f0"
@@ -12778,7 +12905,7 @@
         "domain": "light",
         "service": "turn_on",
         "x": 850,
-        "y": 680,
+        "y": 700,
         "wires": [
             [
                 "7c33144c3e356edf"
@@ -12812,7 +12939,7 @@
         "domain": "timer",
         "service": "cancel",
         "x": 650,
-        "y": 680,
+        "y": 700,
         "wires": [
             [
                 "f511cce02d6ad811"
@@ -12846,7 +12973,7 @@
         "domain": "input_select",
         "service": "select_option",
         "x": 1050,
-        "y": 680,
+        "y": 700,
         "wires": [
             []
         ]
@@ -12878,7 +13005,7 @@
         "domain": "timer",
         "service": "start",
         "x": 650,
-        "y": 740,
+        "y": 760,
         "wires": [
             []
         ]
@@ -12910,7 +13037,7 @@
         "domain": "light",
         "service": "turn_off",
         "x": 640,
-        "y": 800,
+        "y": 820,
         "wires": [
             []
         ]
@@ -12961,7 +13088,7 @@
             }
         ],
         "x": 110,
-        "y": 1240,
+        "y": 1260,
         "wires": [
             [
                 "7c4cc52be117251f"
@@ -12985,7 +13112,7 @@
         "finalize": "",
         "libs": [],
         "x": 270,
-        "y": 1240,
+        "y": 1260,
         "wires": [
             [
                 "67d04dc394a23636"
@@ -13031,7 +13158,7 @@
         "domain": "input_select",
         "service": "select_option",
         "x": 700,
-        "y": 1180,
+        "y": 1200,
         "wires": [
             []
         ]
@@ -13063,7 +13190,7 @@
         "domain": "timer",
         "service": "cancel",
         "x": 530,
-        "y": 1240,
+        "y": 1260,
         "wires": [
             []
         ]
@@ -13095,7 +13222,7 @@
         "domain": "timer",
         "service": "start",
         "x": 530,
-        "y": 1300,
+        "y": 1320,
         "wires": [
             []
         ]
@@ -13127,7 +13254,7 @@
         "domain": "light",
         "service": "turn_on",
         "x": 520,
-        "y": 1180,
+        "y": 1200,
         "wires": [
             [
                 "a7cd304d11f25e60"
@@ -13163,7 +13290,7 @@
         "output_location": "",
         "output_location_type": "none",
         "x": 530,
-        "y": 1420,
+        "y": 1440,
         "wires": [
             []
         ]
@@ -13189,7 +13316,7 @@
             }
         ],
         "x": 120,
-        "y": 1360,
+        "y": 1380,
         "wires": [
             [
                 "5d9a85d3534d83e6"
@@ -13228,7 +13355,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 330,
-        "y": 1360,
+        "y": 1380,
         "wires": [
             [
                 "fa7c83f1dece9741"
@@ -13265,7 +13392,7 @@
         "domain": "input_select",
         "service": "select_option",
         "x": 540,
-        "y": 1360,
+        "y": 1380,
         "wires": [
             []
         ]
@@ -13316,7 +13443,7 @@
             }
         ],
         "x": 150,
-        "y": 740,
+        "y": 760,
         "wires": [
             [
                 "7305cfffd320c75a"
@@ -13349,7 +13476,7 @@
         "blockInputOverrides": true,
         "domain": "input_select",
         "service": "select_option",
-        "x": 1480,
+        "x": 1500,
         "y": 60,
         "wires": [
             []
@@ -13359,6 +13486,7 @@
         "id": "879ee8903841b8f0",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "Upstairs Hallway Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -13400,7 +13528,7 @@
             }
         ],
         "x": 150,
-        "y": 280,
+        "y": 300,
         "wires": [
             [
                 "fba69dfc80829db7"
@@ -13411,6 +13539,7 @@
         "id": "bc2426cfcd5afbe8",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "Upstairs Bathroom Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -13452,7 +13581,7 @@
             }
         ],
         "x": 150,
-        "y": 40,
+        "y": 60,
         "wires": [
             [
                 "fba69dfc80829db7"
@@ -13463,6 +13592,7 @@
         "id": "a5498446c1edffa9",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "Kallen Bedroom Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -13504,7 +13634,7 @@
             }
         ],
         "x": 140,
-        "y": 100,
+        "y": 120,
         "wires": [
             [
                 "fba69dfc80829db7"
@@ -13515,6 +13645,7 @@
         "id": "f28e7fd88f75041e",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "Emma Bedroom Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -13556,7 +13687,7 @@
             }
         ],
         "x": 150,
-        "y": 160,
+        "y": 180,
         "wires": [
             [
                 "fba69dfc80829db7"
@@ -13567,6 +13698,7 @@
         "id": "e1123236ee16fdaf",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "Master Bedroom Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -13608,7 +13740,7 @@
             }
         ],
         "x": 150,
-        "y": 220,
+        "y": 240,
         "wires": [
             [
                 "fba69dfc80829db7"
@@ -13654,8 +13786,8 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 160,
-        "y": 440,
+        "x": 120,
+        "y": 460,
         "wires": [
             [
                 "fd33d3e819d8c772"
@@ -13693,8 +13825,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1370,
-        "y": 620,
+        "x": 1330,
+        "y": 640,
         "wires": [
             []
         ]
@@ -13703,9 +13835,10 @@
         "id": "a17d58585048335d",
         "type": "subflow:a4ee891237e460a2",
         "z": "5e238cbbe6d612c9",
+        "g": "fd15bf62ba5e5171",
         "name": "",
         "x": 520,
-        "y": 40,
+        "y": 60,
         "wires": []
     },
     {
@@ -13734,8 +13867,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 610,
-        "y": 380,
+        "x": 570,
+        "y": 400,
         "wires": [
             []
         ]
@@ -13766,8 +13899,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 1370,
-        "y": 560,
+        "x": 1330,
+        "y": 580,
         "wires": [
             []
         ]
@@ -13823,8 +13956,8 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 150,
-        "y": 620,
+        "x": 110,
+        "y": 640,
         "wires": [
             [
                 "f70e4a4480d43b2b"
@@ -13860,8 +13993,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 530,
-        "y": 620,
+        "x": 490,
+        "y": 640,
         "wires": [
             []
         ]
@@ -13892,8 +14025,8 @@
         "blockInputOverrides": false,
         "domain": "light",
         "service": "turn_off",
-        "x": 540,
-        "y": 680,
+        "x": 500,
+        "y": 700,
         "wires": [
             [
                 "8859759915625e2f"
@@ -13918,8 +14051,8 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 665,
-        "y": 680,
+        "x": 625,
+        "y": 700,
         "wires": [
             [
                 "3941b4a5b3493461"
@@ -13953,8 +14086,8 @@
         "blockInputOverrides": false,
         "domain": "switch",
         "service": "turn_on",
-        "x": 790,
-        "y": 680,
+        "x": 750,
+        "y": 700,
         "wires": [
             [
                 "0b122b02cfb10c25"
@@ -13987,8 +14120,8 @@
         "blockInputOverrides": false,
         "domain": "input_text",
         "service": "set_value",
-        "x": 980,
-        "y": 680,
+        "x": 940,
+        "y": 700,
         "wires": [
             []
         ]
@@ -14003,8 +14136,8 @@
         "links": [
             "7a7f626dce181b23"
         ],
-        "x": 585,
-        "y": 560,
+        "x": 545,
+        "y": 580,
         "wires": []
     },
     {
@@ -14016,8 +14149,8 @@
         "links": [
             "60ce44747cf3e507"
         ],
-        "x": 445,
-        "y": 500,
+        "x": 405,
+        "y": 520,
         "wires": [
             [
                 "a1fa2d2d1f55af4b"
@@ -14063,8 +14196,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 1140,
-        "y": 440,
+        "x": 1100,
+        "y": 460,
         "wires": [
             [
                 "5e00ecbccbe51462"
@@ -14086,8 +14219,8 @@
         "payloadtype": "num",
         "payloadval": "0",
         "name": "Wait 2 Minutes",
-        "x": 1380,
-        "y": 440,
+        "x": 1340,
+        "y": 460,
         "wires": [
             [
                 "86922621398f4b79"
@@ -14123,8 +14256,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1570,
-        "y": 440,
+        "x": 1530,
+        "y": 460,
         "wires": [
             []
         ]
@@ -14162,8 +14295,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "cancel",
-        "x": 610,
-        "y": 500,
+        "x": 570,
+        "y": 520,
         "wires": [
             [
                 "34e2055344eea8fe"
@@ -14196,8 +14329,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "start",
-        "x": 610,
-        "y": 440,
+        "x": 570,
+        "y": 460,
         "wires": [
             []
         ]
@@ -14222,8 +14355,8 @@
                 "valueType": "date"
             }
         ],
-        "x": 940,
-        "y": 560,
+        "x": 900,
+        "y": 580,
         "wires": [
             [
                 "b9741e2e2ed0448b"
@@ -14243,8 +14376,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1140,
-        "y": 560,
+        "x": 1100,
+        "y": 580,
         "wires": [
             [
                 "5e00ecbccbe51462"
@@ -14290,8 +14423,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 540,
-        "y": 1020,
+        "x": 520,
+        "y": 1040,
         "wires": [
             []
         ]
@@ -14309,8 +14442,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 310,
-        "y": 860,
+        "x": 290,
+        "y": 880,
         "wires": [
             [
                 "4e3d058c164d6a97"
@@ -14359,8 +14492,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "start",
-        "x": 550,
-        "y": 840,
+        "x": 530,
+        "y": 860,
         "wires": [
             []
         ]
@@ -14391,8 +14524,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "cancel",
-        "x": 730,
-        "y": 780,
+        "x": 710,
+        "y": 800,
         "wires": [
             []
         ]
@@ -14417,8 +14550,8 @@
                 "valueType": "date"
             }
         ],
-        "x": 140,
-        "y": 960,
+        "x": 120,
+        "y": 980,
         "wires": [
             [
                 "76423fc24fedb52c"
@@ -14470,8 +14603,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 860,
+        "x": 110,
+        "y": 880,
         "wires": [
             [
                 "293a957a5c4f79fa"
@@ -14507,8 +14640,8 @@
         "blockInputOverrides": false,
         "domain": "light",
         "service": "turn_on",
-        "x": 540,
-        "y": 780,
+        "x": 520,
+        "y": 800,
         "wires": [
             [
                 "33ba5ffd653f09a1"
@@ -14543,8 +14676,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 550,
-        "y": 1360,
+        "x": 530,
+        "y": 1380,
         "wires": [
             []
         ]
@@ -14562,8 +14695,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 290,
-        "y": 1240,
+        "x": 270,
+        "y": 1260,
         "wires": [
             [
                 "440fc7142e7345d4"
@@ -14608,8 +14741,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "start",
-        "x": 550,
-        "y": 1300,
+        "x": 530,
+        "y": 1320,
         "wires": [
             []
         ]
@@ -14640,8 +14773,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "cancel",
-        "x": 550,
-        "y": 1240,
+        "x": 530,
+        "y": 1260,
         "wires": [
             []
         ]
@@ -14666,8 +14799,8 @@
                 "valueType": "date"
             }
         ],
-        "x": 140,
-        "y": 1360,
+        "x": 120,
+        "y": 1380,
         "wires": [
             [
                 "cef61cdb2808ce5a"
@@ -14719,8 +14852,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 1240,
+        "x": 110,
+        "y": 1260,
         "wires": [
             [
                 "3b698d0a4f2620bd"
@@ -14756,8 +14889,8 @@
         "blockInputOverrides": false,
         "domain": "light",
         "service": "turn_on",
-        "x": 540,
-        "y": 1180,
+        "x": 520,
+        "y": 1200,
         "wires": [
             []
         ]
@@ -14793,8 +14926,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 350,
-        "y": 1360,
+        "x": 330,
+        "y": 1380,
         "wires": [
             [
                 "c3f2a4aa281295ce"
@@ -14815,8 +14948,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 380,
-        "y": 440,
+        "x": 340,
+        "y": 460,
         "wires": [
             [
                 "d2df58b074b9ba08"
@@ -14847,8 +14980,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 340,
-        "y": 620,
+        "x": 300,
+        "y": 640,
         "wires": [
             [
                 "a1fa2d2d1f55af4b"
@@ -14880,8 +15013,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1255,
-        "y": 500,
+        "x": 1215,
+        "y": 520,
         "wires": [
             [
                 "2dc5f9d3e00f4ddc"
@@ -14902,8 +15035,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 320,
-        "y": 960,
+        "x": 300,
+        "y": 980,
         "wires": [
             [
                 "b05b87a1e43f11f9"
@@ -14947,8 +15080,8 @@
         "blockInputOverrides": false,
         "domain": "light",
         "service": "turn_{{hallway}}",
-        "x": 560,
-        "y": 960,
+        "x": 540,
+        "y": 980,
         "wires": [
             []
         ]
@@ -14979,8 +15112,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 560,
-        "y": 900,
+        "x": 540,
+        "y": 920,
         "wires": [
             []
         ]
@@ -15024,8 +15157,8 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 120,
-        "y": 1080,
+        "x": 100,
+        "y": 1100,
         "wires": [
             [
                 "1f1489a0514e233b"
@@ -15058,8 +15191,8 @@
         "blockInputOverrides": false,
         "domain": "switch",
         "service": "turn_{{payload}}",
-        "x": 550,
-        "y": 1080,
+        "x": 530,
+        "y": 1100,
         "wires": [
             []
         ]
@@ -15092,8 +15225,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1410,
-        "y": 960,
+        "x": 1390,
+        "y": 980,
         "wires": [
             []
         ]
@@ -15111,8 +15244,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1150,
-        "y": 840,
+        "x": 1130,
+        "y": 860,
         "wires": [
             [
                 "5524e8ba9b5545be"
@@ -15157,8 +15290,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "start",
-        "x": 1410,
-        "y": 900,
+        "x": 1390,
+        "y": 920,
         "wires": [
             []
         ]
@@ -15189,8 +15322,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "cancel",
-        "x": 1410,
-        "y": 840,
+        "x": 1390,
+        "y": 860,
         "wires": [
             []
         ]
@@ -15215,8 +15348,8 @@
                 "valueType": "date"
             }
         ],
-        "x": 1000,
-        "y": 960,
+        "x": 980,
+        "y": 980,
         "wires": [
             [
                 "0b5424aadc3479f7"
@@ -15268,8 +15401,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 990,
-        "y": 840,
+        "x": 970,
+        "y": 860,
         "wires": [
             [
                 "4954c509d4d697e2"
@@ -15310,8 +15443,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 1210,
-        "y": 960,
+        "x": 1190,
+        "y": 980,
         "wires": [
             [
                 "f3824e4c7e202605"
@@ -15345,8 +15478,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 1400,
-        "y": 780,
+        "x": 1380,
+        "y": 800,
         "wires": [
             []
         ]
@@ -15379,8 +15512,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1410,
-        "y": 1240,
+        "x": 1390,
+        "y": 1260,
         "wires": [
             []
         ]
@@ -15398,8 +15531,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1150,
-        "y": 1120,
+        "x": 1130,
+        "y": 1140,
         "wires": [
             [
                 "81129efa6676b58e"
@@ -15444,8 +15577,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "start",
-        "x": 1410,
-        "y": 1180,
+        "x": 1390,
+        "y": 1200,
         "wires": [
             []
         ]
@@ -15476,8 +15609,8 @@
         "blockInputOverrides": false,
         "domain": "timer",
         "service": "cancel",
-        "x": 1410,
-        "y": 1120,
+        "x": 1390,
+        "y": 1140,
         "wires": [
             []
         ]
@@ -15502,8 +15635,8 @@
                 "valueType": "date"
             }
         ],
-        "x": 1000,
-        "y": 1240,
+        "x": 980,
+        "y": 1260,
         "wires": [
             [
                 "4a431478798a51c8"
@@ -15555,8 +15688,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 990,
-        "y": 1120,
+        "x": 970,
+        "y": 1140,
         "wires": [
             [
                 "3063e6a5b5c3f677"
@@ -15597,8 +15730,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 1210,
-        "y": 1240,
+        "x": 1190,
+        "y": 1260,
         "wires": [
             [
                 "e270c73896a1a50c"
@@ -15632,8 +15765,8 @@
         "blockInputOverrides": false,
         "domain": "input_select",
         "service": "select_option",
-        "x": 1400,
-        "y": 1060,
+        "x": 1380,
+        "y": 1080,
         "wires": [
             []
         ]
@@ -15642,6 +15775,7 @@
         "id": "b26bc471bcac2653",
         "type": "function",
         "z": "5e238cbbe6d612c9",
+        "g": "c1e37f193ee65d73",
         "name": "Auto Shower Mode",
         "func": "const states = global.get('homeassistant.homeAssistant.states')\nconst showerMode = states['input_boolean.shower_mode'].state\nconst tempChange = parseFloat(msg.payload)\n\nlet action = {}\n\nif (tempChange < 0) {\n    action = 'off'\n} else if (tempChange >= 5.0) {\n    action = 'on'\n} else {\n    action = 'none'\n}\n\nlet actionMsg = {\n    'action': 'turn_' + action\n}\n\nif ((action === 'on' && showerMode === 'off') || (action === 'off' && showerMode === 'on')) {\n    node.status({fill:'green',shape:'dot',text:'Shower Mode ' + action})\n    node.send(actionMsg)\n} else {\n    node.status({fill:'red',shape:'ring',text:'No action taken'})\n    return null\n}",
         "outputs": 1,
@@ -15650,8 +15784,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 930,
-        "y": 220,
+        "x": 1030,
+        "y": 60,
         "wires": [
             [
                 "646ac99f62432e22"
@@ -15662,6 +15796,7 @@
         "id": "b51f19fa5b3d1587",
         "type": "server-state-changed",
         "z": "5e238cbbe6d612c9",
+        "g": "c1e37f193ee65d73",
         "name": "Temp Change",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -15702,8 +15837,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 670,
-        "y": 220,
+        "x": 770,
+        "y": 60,
         "wires": [
             [
                 "b26bc471bcac2653"
@@ -15714,6 +15849,7 @@
         "id": "646ac99f62432e22",
         "type": "api-call-service",
         "z": "5e238cbbe6d612c9",
+        "g": "c1e37f193ee65d73",
         "name": "Turn on/off",
         "server": "9e87348d.9c1c48",
         "version": 7,
@@ -15735,8 +15871,8 @@
         "blockInputOverrides": false,
         "domain": "input_boolean",
         "service": "{{action}}",
-        "x": 1150,
-        "y": 220,
+        "x": 1250,
+        "y": 60,
         "wires": [
             []
         ]
@@ -15786,8 +15922,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 110,
-        "y": 1420,
+        "x": 90,
+        "y": 1440,
         "wires": [
             [
                 "03075516f3003707"
@@ -15807,8 +15943,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 340,
-        "y": 1480,
+        "x": 320,
+        "y": 1500,
         "wires": [
             [
                 "2e356bc6f1ad80dc"
@@ -15832,8 +15968,8 @@
         "z": "5e238cbbe6d612c9",
         "g": "ba738e13229c781b",
         "name": "",
-        "x": 560,
-        "y": 1420,
+        "x": 540,
+        "y": 1440,
         "wires": [
             []
         ]
@@ -15864,8 +16000,8 @@
         "blockInputOverrides": true,
         "domain": "timer",
         "service": "start",
-        "x": 550,
-        "y": 1480,
+        "x": 530,
+        "y": 1500,
         "wires": [
             []
         ]
@@ -15896,8 +16032,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 140,
-        "y": 1480,
+        "x": 120,
+        "y": 1500,
         "wires": [
             [
                 "03075516f3003707"
@@ -15930,8 +16066,8 @@
         "blockInputOverrides": true,
         "domain": "timer",
         "service": "cancel",
-        "x": 550,
-        "y": 1540,
+        "x": 530,
+        "y": 1560,
         "wires": [
             [
                 "40dae72402f8cdee"
@@ -15962,8 +16098,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 1540,
+        "x": 110,
+        "y": 1560,
         "wires": [
             [
                 "03075516f3003707"
@@ -15994,8 +16130,8 @@
         "blockInputOverrides": true,
         "domain": "script",
         "service": "volume_reset",
-        "x": 740,
-        "y": 1540,
+        "x": 720,
+        "y": 1560,
         "wires": [
             []
         ]
@@ -16045,8 +16181,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 120,
-        "y": 1600,
+        "x": 100,
+        "y": 1620,
         "wires": [
             [
                 "03075516f3003707"
@@ -16058,6 +16194,7 @@
         "id": "07049ae77b6751c6",
         "type": "server-state-changed",
         "z": "47f17992fab9b4f5",
+        "g": "a60d1c8190059645",
         "name": "Basement Studio Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -16098,8 +16235,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 40,
+        "x": 150,
+        "y": 60,
         "wires": [
             [
                 "31c254f61982f19d"
@@ -16110,6 +16247,7 @@
         "id": "5e31d6aacad206b8",
         "type": "server-state-changed",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "name": "Light turned on",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -16156,8 +16294,8 @@
                 "valueType": "triggerId"
             }
         ],
-        "x": 100,
-        "y": 100,
+        "x": 740,
+        "y": 60,
         "wires": [
             [
                 "dd3608c864d7007b"
@@ -16169,6 +16307,7 @@
         "id": "18599ab162ab225b",
         "type": "change",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "name": "Stop Timer",
         "rules": [
             {
@@ -16184,8 +16323,8 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 290,
-        "y": 160,
+        "x": 930,
+        "y": 120,
         "wires": [
             [
                 "dd3608c864d7007b"
@@ -16196,13 +16335,14 @@
         "id": "dd3608c864d7007b",
         "type": "stoptimer",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "duration": "60",
         "units": "Minute",
         "payloadtype": "num",
         "payloadval": "0",
         "name": "",
-        "x": 500,
-        "y": 100,
+        "x": 1140,
+        "y": 60,
         "wires": [
             [
                 "e79ecc6c79946cc4"
@@ -16214,6 +16354,7 @@
         "id": "e79ecc6c79946cc4",
         "type": "api-call-service",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "name": "Turn off light",
         "server": "9e87348d.9c1c48",
         "version": 7,
@@ -16237,8 +16378,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 690,
-        "y": 100,
+        "x": 1330,
+        "y": 60,
         "wires": [
             []
         ]
@@ -16247,6 +16388,7 @@
         "id": "ab01d3d95c7ea717",
         "type": "server-state-changed",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "name": "Light turned off",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -16293,8 +16435,8 @@
                 "valueType": "triggerId"
             }
         ],
-        "x": 100,
-        "y": 160,
+        "x": 740,
+        "y": 120,
         "wires": [
             [
                 "18599ab162ab225b"
@@ -16306,10 +16448,11 @@
         "id": "8fa363e9e0c1b165",
         "type": "comment",
         "z": "47f17992fab9b4f5",
+        "g": "d00eb21154ac4160",
         "name": "Furnace Room",
         "info": "",
-        "x": 300,
-        "y": 100,
+        "x": 940,
+        "y": 60,
         "wires": []
     },
     {
@@ -16330,8 +16473,8 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 180,
-        "y": 280,
+        "x": 240,
+        "y": 220,
         "wires": [
             [
                 "3c83c0ab0aa96e3d"
@@ -16389,8 +16532,8 @@
                 "valueType": "triggerId"
             }
         ],
-        "x": 150,
-        "y": 340,
+        "x": 210,
+        "y": 280,
         "wires": [
             [
                 "3c83c0ab0aa96e3d"
@@ -16435,8 +16578,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 560,
-        "y": 340,
+        "x": 620,
+        "y": 280,
         "wires": [
             [
                 "981191938ab4ee2f"
@@ -16462,8 +16605,8 @@
         "topic": "",
         "payload": "",
         "payloadType": "date",
-        "x": 180,
-        "y": 460,
+        "x": 240,
+        "y": 400,
         "wires": [
             [
                 "7b71cb1967ec5255"
@@ -16521,8 +16664,8 @@
                 "valueType": "triggerId"
             }
         ],
-        "x": 140,
-        "y": 520,
+        "x": 200,
+        "y": 460,
         "wires": [
             [
                 "7b71cb1967ec5255"
@@ -16567,8 +16710,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 560,
-        "y": 520,
+        "x": 620,
+        "y": 460,
         "wires": [
             [
                 "59af14a564176ce4"
@@ -16613,8 +16756,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 780,
-        "y": 340,
+        "x": 840,
+        "y": 280,
         "wires": [
             [
                 "03fad0a960ff39e7"
@@ -16659,8 +16802,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 780,
-        "y": 520,
+        "x": 840,
+        "y": 460,
         "wires": [
             [
                 "c0933fcc8737bc0b"
@@ -16692,8 +16835,8 @@
         "blockInputOverrides": false,
         "domain": "scene",
         "service": "create",
-        "x": 350,
-        "y": 340,
+        "x": 410,
+        "y": 280,
         "wires": [
             [
                 "ec543bc9adac3d08"
@@ -16724,8 +16867,8 @@
         "blockInputOverrides": false,
         "domain": "scene",
         "service": "create",
-        "x": 350,
-        "y": 520,
+        "x": 410,
+        "y": 460,
         "wires": [
             [
                 "e91c3392b59ff9d1"
@@ -16741,8 +16884,8 @@
         "links": [
             "572b2040be874f4e"
         ],
-        "x": 75,
-        "y": 680,
+        "x": 135,
+        "y": 940,
         "wires": [
             [
                 "ea5306d6f92d9550",
@@ -16797,8 +16940,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 620,
+        "x": 190,
+        "y": 880,
         "wires": [
             [
                 "0c7ef72bd0ef47d4"
@@ -16829,8 +16972,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 860,
+        "x": 190,
+        "y": 1120,
         "wires": [
             [
                 "ea5306d6f92d9550",
@@ -16865,8 +17008,8 @@
         "blockInputOverrides": false,
         "domain": "script",
         "service": "activate_alexa_actionable_notification",
-        "x": 880,
-        "y": 620,
+        "x": 940,
+        "y": 880,
         "wires": [
             []
         ]
@@ -16889,8 +17032,8 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 255,
-        "y": 620,
+        "x": 315,
+        "y": 880,
         "wires": [
             [
                 "2516c6e3146cc851",
@@ -16925,8 +17068,8 @@
         "blockInputOverrides": false,
         "domain": "script",
         "service": "text_notify",
-        "x": 700,
-        "y": 860,
+        "x": 760,
+        "y": 1120,
         "wires": [
             []
         ]
@@ -16955,8 +17098,8 @@
         "blockInputOverrides": false,
         "domain": "script",
         "service": "tony_desktop_wake",
-        "x": 390,
-        "y": 680,
+        "x": 450,
+        "y": 940,
         "wires": [
             [
                 "4829663e9913e2aa"
@@ -16989,8 +17132,8 @@
         "blockInputOverrides": false,
         "domain": "media_player",
         "service": "turn_on",
-        "x": 550,
-        "y": 680,
+        "x": 610,
+        "y": 940,
         "wires": [
             []
         ]
@@ -17016,8 +17159,8 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 650,
-        "y": 620,
+        "x": 710,
+        "y": 880,
         "wires": [
             [
                 "b3bb08ff51e46985"
@@ -17055,8 +17198,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 430,
-        "y": 860,
+        "x": 490,
+        "y": 1120,
         "wires": [
             [],
             [
@@ -17096,8 +17239,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 430,
-        "y": 620,
+        "x": 490,
+        "y": 880,
         "wires": [
             [],
             [
@@ -17129,8 +17272,8 @@
         "blockInputOverrides": false,
         "domain": "script",
         "service": "basement_lights_alert",
-        "x": 960,
-        "y": 340,
+        "x": 1020,
+        "y": 280,
         "wires": [
             []
         ]
@@ -17159,8 +17302,8 @@
         "blockInputOverrides": false,
         "domain": "script",
         "service": "basement_lights_alert",
-        "x": 970,
-        "y": 520,
+        "x": 1030,
+        "y": 460,
         "wires": [
             []
         ]
@@ -17169,9 +17312,10 @@
         "id": "31c254f61982f19d",
         "type": "subflow:a4ee891237e460a2",
         "z": "47f17992fab9b4f5",
+        "g": "a60d1c8190059645",
         "name": "",
-        "x": 380,
-        "y": 40,
+        "x": 400,
+        "y": 60,
         "wires": []
     },
     {
@@ -17203,7 +17347,7 @@
         "domain": "input_boolean",
         "service": "turn_off",
         "x": 290,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "a4490fb4765e1c9c",
@@ -17224,7 +17368,7 @@
             "9d1cf8af02a6c86b"
         ],
         "x": 135,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "56c84e793b8b0d79"
@@ -17263,7 +17407,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 580,
-        "y": 1020,
+        "y": 1280,
         "wires": [
             [
                 "0cfd7edd88cfa0de"
@@ -17302,7 +17446,7 @@
         "domain": "media_player",
         "service": "turn_off",
         "x": 840,
-        "y": 1020,
+        "y": 1280,
         "wires": [
             []
         ]
@@ -17339,7 +17483,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 600,
-        "y": 1080,
+        "y": 1340,
         "wires": [
             [
                 "4681a8b5fa2d942c"
@@ -17378,7 +17522,7 @@
         "domain": "script",
         "service": "kallen_desktop_shutdown",
         "x": 870,
-        "y": 1080,
+        "y": 1340,
         "wires": [
             []
         ]
@@ -17408,7 +17552,7 @@
         "domain": "script",
         "service": "kallen_desktop_lock",
         "x": 850,
-        "y": 1140,
+        "y": 1400,
         "wires": [
             [
                 "bbcf0451ac4c4cd4"
@@ -17442,7 +17586,7 @@
         "domain": "input_boolean",
         "service": "turn_off",
         "x": 1040,
-        "y": 1140,
+        "y": 1400,
         "wires": [
             []
         ]
@@ -17472,7 +17616,7 @@
         "domain": "script",
         "service": "text_notify",
         "x": 570,
-        "y": 1140,
+        "y": 1400,
         "wires": [
             []
         ]
@@ -17506,7 +17650,7 @@
         "entityLocation": "data",
         "entityLocationType": "none",
         "x": 560,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "a9bbf53b9584976a"
@@ -17543,7 +17687,7 @@
         "domain": "fan",
         "service": "turn_off",
         "x": 770,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "cc0407d29b656ca6"
@@ -17577,7 +17721,7 @@
         "domain": "light",
         "service": "turn_off",
         "x": 960,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "fc1ca3e2f921b01e"
@@ -17613,7 +17757,7 @@
         "entityLocation": "data",
         "entityLocationType": "none",
         "x": 1180,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "8851dbeb9b28003a"
@@ -17648,7 +17792,7 @@
         "domain": "timer",
         "service": "cancel",
         "x": 1470,
-        "y": 960,
+        "y": 1220,
         "wires": [
             []
         ]
@@ -17672,7 +17816,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 1325,
-        "y": 960,
+        "y": 1220,
         "wires": [
             [
                 "18cd2aed123cdaa8"
@@ -17690,7 +17834,7 @@
             "c3b3c90a43c4481a"
         ],
         "x": 385,
-        "y": 1020,
+        "y": 1280,
         "wires": [
             [
                 "a4490fb4765e1c9c",
@@ -17725,8 +17869,8 @@
         "blockInputOverrides": false,
         "domain": "input_boolean",
         "service": "turn_off",
-        "x": 430,
-        "y": 740,
+        "x": 490,
+        "y": 1000,
         "wires": [
             []
         ]
@@ -17757,8 +17901,8 @@
         "blockInputOverrides": true,
         "domain": "climate",
         "service": "set_hvac_mode",
-        "x": 580,
-        "y": 800,
+        "x": 640,
+        "y": 1060,
         "wires": [
             [
                 "b7022ac46a70a7d8"
@@ -17779,7 +17923,7 @@
         "finalize": "",
         "libs": [],
         "x": 530,
-        "y": 1200,
+        "y": 1460,
         "wires": [
             [
                 "b947106d8f7b72ed"
@@ -17821,7 +17965,7 @@
         "domain": "climate",
         "service": "set_preset_mode",
         "x": 700,
-        "y": 1200,
+        "y": 1460,
         "wires": [
             []
         ]
@@ -17853,7 +17997,7 @@
         "domain": "climate",
         "service": "set_hvac_mode",
         "x": 720,
-        "y": 1260,
+        "y": 1520,
         "wires": [
             []
         ]
@@ -17884,8 +18028,8 @@
         "blockInputOverrides": true,
         "domain": "climate",
         "service": "set_preset_mode",
-        "x": 780,
-        "y": 800,
+        "x": 840,
+        "y": 1060,
         "wires": [
             []
         ]
@@ -17941,8 +18085,8 @@
                 "valueType": "triggerId"
             }
         ],
-        "x": 140,
-        "y": 800,
+        "x": 200,
+        "y": 1060,
         "wires": [
             [
                 "aecc95a3db3369e2"
@@ -17991,8 +18135,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 265,
-        "y": 800,
+        "x": 325,
+        "y": 1060,
         "wires": [
             [
                 "bd6bdc6ed9aded9d"
@@ -18051,8 +18195,8 @@
                 "valueType": "str"
             }
         ],
-        "x": 130,
-        "y": 1400,
+        "x": 190,
+        "y": 600,
         "wires": [
             [
                 "6e5bbaefb1d2c14e",
@@ -18094,8 +18238,8 @@
         "blockInputOverrides": true,
         "domain": "adaptive_lighting",
         "service": "set_manual_control",
-        "x": 520,
-        "y": 1400,
+        "x": 580,
+        "y": 600,
         "wires": [
             [
                 "d7b73ee4a2387bfa"
@@ -18128,8 +18272,8 @@
         "blockInputOverrides": true,
         "domain": "light",
         "service": "turn_on",
-        "x": 720,
-        "y": 1400,
+        "x": 780,
+        "y": 600,
         "wires": [
             []
         ]
@@ -18154,8 +18298,8 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 510,
-        "y": 1520,
+        "x": 570,
+        "y": 720,
         "wires": [
             []
         ]
@@ -18175,8 +18319,8 @@
         "correl": "",
         "expiry": "",
         "broker": "fd29421fc00140a8",
-        "x": 530,
-        "y": 1580,
+        "x": 590,
+        "y": 780,
         "wires": []
     },
     {
@@ -18203,8 +18347,8 @@
         "blockInputOverrides": true,
         "domain": "adaptive_lighting",
         "service": "set_manual_control",
-        "x": 520,
-        "y": 1460,
+        "x": 580,
+        "y": 660,
         "wires": [
             [
                 "195c2b19593434e1"
@@ -18242,8 +18386,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 920,
-        "y": 1460,
+        "x": 980,
+        "y": 660,
         "wires": [
             [
                 "b8648d760ccc1aa2"
@@ -18281,8 +18425,8 @@
         "blockInputOverrides": true,
         "domain": "adaptive_lighting",
         "service": "apply",
-        "x": 1140,
-        "y": 1440,
+        "x": 1200,
+        "y": 640,
         "wires": [
             []
         ]
@@ -18313,8 +18457,8 @@
         "blockInputOverrides": true,
         "domain": "input_select",
         "service": "select_option",
-        "x": 1340,
-        "y": 1500,
+        "x": 1400,
+        "y": 700,
         "wires": [
             []
         ]
@@ -18343,8 +18487,8 @@
         "blockInputOverrides": true,
         "domain": "adaptive_lighting",
         "service": "apply",
-        "x": 1140,
-        "y": 1500,
+        "x": 1200,
+        "y": 700,
         "wires": [
             [
                 "e8097cd64b17370a"
@@ -18390,8 +18534,8 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 140,
-        "y": 1460,
+        "x": 200,
+        "y": 660,
         "wires": [
             [
                 "be40ebfb2514fdb2"
@@ -18430,8 +18574,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 305,
-        "y": 1360,
+        "x": 365,
+        "y": 560,
         "wires": [
             [
                 "724968ddc9702720"
@@ -18463,8 +18607,8 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 375,
-        "y": 1360,
+        "x": 435,
+        "y": 560,
         "wires": [
             [
                 "e8b5f4ace78d485a"
@@ -18509,8 +18653,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 700,
-        "y": 1460,
+        "x": 760,
+        "y": 660,
         "wires": [
             [
                 "6d1291b96a8c9e83"
@@ -18546,8 +18690,8 @@
         "blockInputOverrides": true,
         "domain": "light",
         "service": "turn_off",
-        "x": 900,
-        "y": 1520,
+        "x": 960,
+        "y": 720,
         "wires": [
             []
         ]
@@ -18565,8 +18709,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 390,
-        "y": 800,
+        "x": 450,
+        "y": 1060,
         "wires": [
             [
                 "4b7ed8ad595ee9cb"
@@ -18580,8 +18724,8 @@
         "z": "47f17992fab9b4f5",
         "g": "550e5b2d99316b12",
         "name": "",
-        "x": 265,
-        "y": 860,
+        "x": 325,
+        "y": 1120,
         "wires": [
             [
                 "73078f818abdc6c2"
@@ -18618,7 +18762,7 @@
         "output_location": "",
         "output_location_type": "none",
         "x": 790,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "3a5bb57569e07beb"
@@ -18654,7 +18798,7 @@
         "output_location": "",
         "output_location_type": "none",
         "x": 1250,
-        "y": 260,
+        "y": 360,
         "wires": [
             []
         ]
@@ -18669,7 +18813,7 @@
             "26f15fc8d75a4020"
         ],
         "x": 125,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "cfdcc7c9c168dc17"
@@ -18704,7 +18848,7 @@
         "domain": "input_boolean",
         "service": "turn_off",
         "x": 1160,
-        "y": 60,
+        "y": 160,
         "wires": [
             []
         ]
@@ -18749,7 +18893,7 @@
             }
         ],
         "x": 180,
-        "y": 60,
+        "y": 160,
         "wires": [
             [
                 "459433738b64d14d"
@@ -18781,7 +18925,7 @@
         "repair": false,
         "outputs": 2,
         "x": 230,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "16029ccf061bdd10",
@@ -18814,7 +18958,7 @@
         "repair": false,
         "outputs": 2,
         "x": 380,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "c7a8df4ebeb3b5c5",
@@ -18852,7 +18996,7 @@
         "domain": "input_select",
         "service": "select_option",
         "x": 1130,
-        "y": 120,
+        "y": 220,
         "wires": [
             []
         ]
@@ -18884,7 +19028,7 @@
         "domain": "switch",
         "service": "turn_on",
         "x": 1440,
-        "y": 200,
+        "y": 300,
         "wires": [
             []
         ]
@@ -18916,7 +19060,7 @@
         "domain": "switch",
         "service": "turn_off",
         "x": 800,
-        "y": 60,
+        "y": 160,
         "wires": [
             []
         ]
@@ -18948,7 +19092,7 @@
         "domain": "switch",
         "service": "turn_off",
         "x": 1250,
-        "y": 200,
+        "y": 300,
         "wires": [
             [
                 "435280acadb9f364"
@@ -18982,7 +19126,7 @@
         "domain": "timer",
         "service": "cancel",
         "x": 390,
-        "y": 60,
+        "y": 160,
         "wires": [
             []
         ]
@@ -19014,7 +19158,7 @@
         "domain": "timer",
         "service": "start",
         "x": 510,
-        "y": 260,
+        "y": 360,
         "wires": [
             []
         ]
@@ -19040,7 +19184,7 @@
             }
         ],
         "x": 860,
-        "y": 260,
+        "y": 360,
         "wires": [
             [
                 "f5fb96bf1a33b3cd"
@@ -19087,7 +19231,7 @@
             }
         ],
         "x": 870,
-        "y": 200,
+        "y": 300,
         "wires": [
             [
                 "f5fb96bf1a33b3cd"
@@ -19114,7 +19258,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 245,
-        "y": 260,
+        "y": 360,
         "wires": [
             [
                 "76815f07ec2f3eef"
@@ -19136,7 +19280,7 @@
         "finalize": "",
         "libs": [],
         "x": 590,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "ec5937bc60874009"
@@ -19165,7 +19309,7 @@
         "finalize": "",
         "libs": [],
         "x": 960,
-        "y": 120,
+        "y": 220,
         "wires": [
             [
                 "bd75b077a1c76fce"
@@ -19194,7 +19338,7 @@
         "finalize": "",
         "libs": [],
         "x": 350,
-        "y": 260,
+        "y": 360,
         "wires": [
             [
                 "a2ec35a79d79bf2f"
@@ -19216,7 +19360,7 @@
         "finalize": "",
         "libs": [],
         "x": 1080,
-        "y": 260,
+        "y": 360,
         "wires": [
             [
                 "defcae57f9916394"
@@ -19235,6 +19379,7 @@
         "id": "af64b56e28c93907",
         "type": "server-state-changed",
         "z": "b5717a86ce55bc29",
+        "g": "628bc6d9078cb924",
         "name": "Front Porch Scenes",
         "server": "9e87348d.9c1c48",
         "version": 6,
@@ -19276,7 +19421,7 @@
             }
         ],
         "x": 170,
-        "y": 360,
+        "y": 60,
         "wires": [
             [
                 "3747d0c21057f3a6"
@@ -19287,189 +19432,10 @@
         "id": "3747d0c21057f3a6",
         "type": "subflow:a4ee891237e460a2",
         "z": "b5717a86ce55bc29",
+        "g": "628bc6d9078cb924",
         "name": "",
         "x": 400,
-        "y": 360,
-        "wires": []
-    },
-    {
-        "id": "54c6775f123e230c",
-        "type": "ha-switch",
-        "z": "b5717a86ce55bc29",
-        "name": "Halloween Switch",
-        "version": 0,
-        "debugenabled": false,
-        "inputs": 0,
-        "outputs": 2,
-        "entityConfig": "d945515487bfbb09",
-        "enableInput": false,
-        "outputOnStateChange": true,
-        "outputProperties": [
-            {
-                "property": "outputType",
-                "propertyType": "msg",
-                "value": "state change",
-                "valueType": "str"
-            },
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "holiday",
-                "propertyType": "msg",
-                "value": "halloween",
-                "valueType": "str"
-            }
-        ],
-        "x": 170,
-        "y": 420,
-        "wires": [
-            [
-                "f8e39e360fbc37d3"
-            ],
-            []
-        ]
-    },
-    {
-        "id": "f8e39e360fbc37d3",
-        "type": "api-call-service",
-        "z": "b5717a86ce55bc29",
-        "name": "Halloween Scene",
-        "server": "9e87348d.9c1c48",
-        "version": 7,
-        "debugenabled": false,
-        "action": "light.turn_on",
-        "floorId": [],
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "light.front_porch_light"
-        ],
-        "labelId": [],
-        "data": "{\t    \"effect\":\"fire\"\t}",
-        "dataType": "jsonata",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "blockInputOverrides": false,
-        "domain": "light",
-        "service": "turn_on",
-        "x": 390,
-        "y": 420,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ec399b3f614c8b17",
-        "type": "api-current-state",
-        "z": "b5717a86ce55bc29",
-        "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": [],
-        "for": "0",
-        "forType": "num",
-        "forUnits": "minutes",
-        "override_topic": false,
-        "state_location": "payload",
-        "override_payload": "msg",
-        "entity_location": "data",
-        "override_data": "msg",
-        "x": 390,
-        "y": 480,
-        "wires": [
-            [
-                "ade9d177f29d4d95"
-            ],
-            [
-                "e0820afc97e33329"
-            ]
-        ]
-    },
-    {
-        "id": "ade9d177f29d4d95",
-        "type": "api-call-service",
-        "z": "b5717a86ce55bc29",
-        "name": "Set Adaptive",
-        "server": "9e87348d.9c1c48",
-        "version": 7,
-        "debugenabled": false,
-        "action": "input_select.select_option",
-        "floorId": [],
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "input_select.front_porch_scenes"
-        ],
-        "labelId": [],
-        "data": "{\t    \"option\":\"Adaptive\"\t}",
-        "dataType": "jsonata",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "blockInputOverrides": false,
-        "domain": "input_select",
-        "service": "select_option",
-        "x": 610,
-        "y": 440,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e0820afc97e33329",
-        "type": "api-call-service",
-        "z": "b5717a86ce55bc29",
-        "name": "Turn off light",
-        "server": "9e87348d.9c1c48",
-        "version": 7,
-        "debugenabled": false,
-        "action": "light.turn_off",
-        "floorId": [],
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "light.front_porch_light"
-        ],
-        "labelId": [],
-        "data": "",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "blockInputOverrides": false,
-        "domain": "light",
-        "service": "turn_off",
-        "output_location": "",
-        "output_location_type": "none",
-        "x": 610,
-        "y": 500,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "513f37de8d51bb2f",
-        "type": "comment",
-        "z": "b5717a86ce55bc29",
-        "name": "Not sure yet if this is how I want to go about this",
-        "info": "",
-        "x": 480,
-        "y": 560,
+        "y": 60,
         "wires": []
     },
     {