diff --git a/flows.json b/flows.json
index 8585b9d..a5e9d71 100644
--- a/flows.json
+++ b/flows.json
@@ -968,8 +968,6 @@
             "9014f9e42a6b7c54",
             "abd1783e6054329c",
             "6a731b17c05f0496",
-            "86c9f3a3185215fc",
-            "b7ac7e6a2ad9f5df",
             "92ce51a81f7bc58d",
             "08335765e8c7eac0",
             "b5cfb253dc157cc9",
@@ -978,13 +976,16 @@
             "d6c81a79393be92c",
             "88b10efda9e2c047",
             "5cce5b011ebc5d32",
-            "6f4235c9d4f6a6ea",
             "862666f576addab8",
             "bcef7debc9bda36c",
             "5ee549aa5e97d4a5",
             "b4d619d31ec9121d",
             "d1dd42ebc53343df",
-            "1fc55a133a7d82c4"
+            "1fc55a133a7d82c4",
+            "66af7a9f198d1f85",
+            "86c9f3a3185215fc",
+            "b7ac7e6a2ad9f5df",
+            "ca0cf291c621ebb2"
         ],
         "x": 14,
         "y": 11.5,
@@ -2967,17 +2968,6 @@
             ]
         ]
     },
-    {
-        "id": "6f4235c9d4f6a6ea",
-        "type": "junction",
-        "z": "72f99805df043603",
-        "g": "e065b1ed4938b477",
-        "x": 340,
-        "y": 560,
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "7d50b11bbf5de8fd",
         "type": "junction",
@@ -21694,21 +21684,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "type",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "manual",
-                "valueType": "str"
-            },
-            {
-                "property": "time",
-                "propertyType": "msg",
-                "value": "night",
-                "valueType": "str"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "manual-night",
+                "value": "Night Mode",
                 "valueType": "str"
             }
         ],
@@ -21716,8 +21694,7 @@
         "y": 360,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -21739,21 +21716,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "time",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "day",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "manual",
-                "valueType": "str"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "manual-day",
+                "value": "Day Mode",
                 "valueType": "str"
             }
         ],
@@ -21761,8 +21726,7 @@
         "y": 420,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -21784,21 +21748,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "topic",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "manual-bedtime",
-                "valueType": "str"
-            },
-            {
-                "property": "time",
-                "propertyType": "msg",
-                "value": "bedtime",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "manual",
+                "value": "Bedtime Mode",
                 "valueType": "str"
             }
         ],
@@ -21806,8 +21758,7 @@
         "y": 120,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -21825,8 +21776,7 @@
         "y": 540,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -22566,8 +22516,7 @@
         "y": 720,
         "wires": [
             [
-                "ce5d8005cbf08144",
-                "6f4235c9d4f6a6ea"
+                "ce5d8005cbf08144"
             ]
         ]
     },
@@ -22855,18 +22804,17 @@
                 "valueType": "entityState"
             },
             {
-                "property": "type",
+                "property": "topic",
                 "propertyType": "msg",
                 "value": "sleep",
                 "valueType": "str"
             }
         ],
-        "x": 210,
+        "x": 150,
         "y": 480,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "66af7a9f198d1f85"
             ]
         ]
     },
@@ -23017,59 +22965,6 @@
             ]
         ]
     },
-    {
-        "id": "86c9f3a3185215fc",
-        "type": "ha-button",
-        "z": "72f99805df043603",
-        "g": "e065b1ed4938b477",
-        "name": "Reset",
-        "version": 0,
-        "debugenabled": false,
-        "outputs": 1,
-        "entityConfig": "77c0d6f8dd47a65b",
-        "outputProperties": [
-            {
-                "property": "payload",
-                "propertyType": "msg",
-                "value": "",
-                "valueType": "entityState"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "reset",
-                "valueType": "str"
-            }
-        ],
-        "x": 410,
-        "y": 480,
-        "wires": [
-            [
-                "b7ac7e6a2ad9f5df",
-                "6f4235c9d4f6a6ea"
-            ]
-        ]
-    },
-    {
-        "id": "b7ac7e6a2ad9f5df",
-        "type": "link call",
-        "z": "72f99805df043603",
-        "g": "e065b1ed4938b477",
-        "name": "Reset",
-        "links": [
-            "ade887c45bde00f1"
-        ],
-        "linkType": "static",
-        "timeout": "30",
-        "x": 505,
-        "y": 480,
-        "wires": [
-            [
-                "a10629857d60f774"
-            ]
-        ],
-        "l": false
-    },
     {
         "id": "d6c81a79393be92c",
         "type": "function",
@@ -23133,9 +23028,7 @@
         "x": 415,
         "y": 180,
         "wires": [
-            [
-                "a10629857d60f774"
-            ]
+            []
         ],
         "l": false
     },
@@ -23302,21 +23195,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "time",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "night",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "auto",
-                "valueType": "str"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "mrbedroom-cooling",
+                "value": "Night Mode",
                 "valueType": "str"
             }
         ],
@@ -23332,8 +23213,7 @@
         "y": 180,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -23361,21 +23241,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "time",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "night",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "auto",
-                "valueType": "str"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "mrbedroom-fan",
+                "value": "Night Mode",
                 "valueType": "str"
             }
         ],
@@ -23391,8 +23259,7 @@
         "y": 240,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -23420,21 +23287,9 @@
                 "valueType": "entityState"
             },
             {
-                "property": "time",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "day",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "auto",
-                "valueType": "str"
-            },
-            {
-                "property": "topic",
-                "propertyType": "msg",
-                "value": "mrbedroom-wakeup",
+                "value": "Day Mode",
                 "valueType": "str"
             }
         ],
@@ -23450,8 +23305,7 @@
         "y": 300,
         "wires": [
             [
-                "a10629857d60f774",
-                "6f4235c9d4f6a6ea"
+                "ca0cf291c621ebb2"
             ]
         ]
     },
@@ -25431,6 +25285,111 @@
             []
         ]
     },
+    {
+        "id": "66af7a9f198d1f85",
+        "type": "function",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Day or Night",
+        "func": "const states = global.get('homeassistant.homeAssistant.states')\nconst earlyNight = states['binary_sensor.early_night_mode'].state\nconst payload = msg.payload\n\nif (payload === 'off') {\n    if (earlyNight === 'on') {\n        msg.mode = 'Night Mode'\n    } else {\n        msg.mode = 'Day Mode'\n    }\n} else if (payload === 'on') {\n    msg.mode = 'Bedtime Mode'\n}\n\nreturn msg",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 265,
+        "y": 480,
+        "wires": [
+            [
+                "ca0cf291c621ebb2"
+            ]
+        ],
+        "icon": "font-awesome/fa-clock-o",
+        "l": false
+    },
+    {
+        "id": "86c9f3a3185215fc",
+        "type": "ha-button",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Reset",
+        "version": 0,
+        "debugenabled": false,
+        "outputs": 1,
+        "entityConfig": "77c0d6f8dd47a65b",
+        "outputProperties": [
+            {
+                "property": "payload",
+                "propertyType": "msg",
+                "value": "",
+                "valueType": "entityState"
+            },
+            {
+                "property": "topic",
+                "propertyType": "msg",
+                "value": "reset",
+                "valueType": "str"
+            }
+        ],
+        "x": 170,
+        "y": 600,
+        "wires": [
+            [
+                "b7ac7e6a2ad9f5df"
+            ]
+        ]
+    },
+    {
+        "id": "b7ac7e6a2ad9f5df",
+        "type": "link call",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Reset",
+        "links": [
+            "ade887c45bde00f1"
+        ],
+        "linkType": "static",
+        "timeout": "30",
+        "x": 265,
+        "y": 600,
+        "wires": [
+            []
+        ],
+        "l": false
+    },
+    {
+        "id": "ca0cf291c621ebb2",
+        "type": "api-call-service",
+        "z": "72f99805df043603",
+        "g": "e065b1ed4938b477",
+        "name": "Set Mode",
+        "server": "9e87348d.9c1c48",
+        "version": 7,
+        "debugenabled": false,
+        "action": "input_select.select_option",
+        "floorId": [],
+        "areaId": [],
+        "deviceId": [],
+        "entityId": [
+            "input_select.current_climate_mode_master_bedroom"
+        ],
+        "labelId": [],
+        "data": "{\t    \"option\": mode\t}",
+        "dataType": "jsonata",
+        "mergeContext": "",
+        "mustacheAltTags": false,
+        "outputProperties": [],
+        "queue": "none",
+        "blockInputOverrides": true,
+        "domain": "input_select",
+        "service": "select_option",
+        "x": 400,
+        "y": 360,
+        "wires": [
+            []
+        ]
+    },
     {
         "id": "48b8af9419ed18d6",
         "type": "subflow:384eaf2f63dcb5db",
@@ -27211,21 +27170,9 @@
                 "valueType": "date"
             },
             {
-                "property": "topic",
+                "property": "mode",
                 "propertyType": "msg",
-                "value": "mrbedroom-bedtime",
-                "valueType": "str"
-            },
-            {
-                "property": "time",
-                "propertyType": "msg",
-                "value": "bedtime",
-                "valueType": "str"
-            },
-            {
-                "property": "type",
-                "propertyType": "msg",
-                "value": "auto",
+                "value": "Bedtime Mode",
                 "valueType": "str"
             }
         ],