diff --git a/flows.json b/flows.json
index 833d093..0052cd9 100644
--- a/flows.json
+++ b/flows.json
@@ -86,6 +86,30 @@
         "type": "tab",
         "label": "[Kitchen] Lights"
     },
+    {
+        "id": "b70ee13eafa73823",
+        "type": "tab",
+        "label": "[Living Room] Lights",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "b73eb220c60f9f8b",
+        "type": "tab",
+        "label": "[Kitchen] Espresso Machine",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "c7f876875da48b87",
+        "type": "tab",
+        "label": "[Bathroom] Lights",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "e52c44dc.71cb5",
         "type": "subflow",
@@ -14519,14 +14543,6 @@
             []
         ]
     },
-    {
-        "type": "tab",
-        "label": "[Living Room] Lights",
-        "id": "b70ee13eafa73823",
-        "info": "",
-        "disabled": false,
-        "env": []
-    },
     {
         "id": "tst0000000000003",
         "type": "switch",
@@ -15222,8 +15238,7 @@
             [
                 "8b046197cef5a597"
             ]
-        ],
-        "subflow": "52430f5e9f9ee267"
+        ]
     },
     {
         "id": "fdd0994437d3eb49",
@@ -18513,8 +18528,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "afa6cccb1cfc8ddb",
@@ -18586,8 +18600,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "097585a397ef8e60",
@@ -18659,8 +18672,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "a02362b40496cf27",
@@ -18732,8 +18744,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "613a9be150591ee7",
@@ -19701,6 +19712,7 @@
         "server": "657c7463.48e1e4",
         "version": 7,
         "debugenabled": false,
+        "action": "select.select_option",
         "areaId": [],
         "deviceId": [],
         "entityId": [
@@ -19718,16 +19730,7 @@
         "y": 3900,
         "wires": [
             []
-        ],
-        "action": "select.select_option"
-    },
-    {
-        "type": "tab",
-        "label": "[Kitchen] Espresso Machine",
-        "id": "b73eb220c60f9f8b",
-        "info": "",
-        "disabled": false,
-        "env": []
+        ]
     },
     {
         "id": "b1b0a80b.d1f6cf",
@@ -20277,14 +20280,6 @@
             []
         ]
     },
-    {
-        "type": "tab",
-        "label": "[Bathroom] Lights",
-        "id": "c7f876875da48b87",
-        "info": "",
-        "disabled": false,
-        "env": []
-    },
     {
         "id": "13c933aa7d791e63",
         "type": "subflow:52430f5e9f9ee267",
@@ -20465,8 +20460,8 @@
         "service": "turn_on",
         "output_location": "",
         "output_location_type": "none",
-        "x": 830,
-        "y": 1140,
+        "x": 970,
+        "y": 1200,
         "wires": [
             [
                 "bthrm_audio_acs_01"
@@ -20490,8 +20485,8 @@
         "bytopic": "all",
         "topic": "topic",
         "outputs": 1,
-        "x": 490,
-        "y": 1040,
+        "x": 810,
+        "y": 980,
         "wires": [
             [
                 "82599133dd2b9883"
@@ -20534,8 +20529,8 @@
         "override_payload": "msg",
         "entity_location": "data",
         "override_data": "msg",
-        "x": 750,
-        "y": 1040,
+        "x": 1030,
+        "y": 980,
         "wires": [
             [
                 "d6e7f8a9b0c10002"
@@ -20570,8 +20565,8 @@
         "service": "turn_off",
         "output_location": "",
         "output_location_type": "none",
-        "x": 1310,
-        "y": 1040,
+        "x": 1570,
+        "y": 1120,
         "wires": [
             []
         ]
@@ -21307,7 +21302,7 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 520,
+        "x": 500,
         "y": 1140,
         "wires": [
             [
@@ -21327,8 +21322,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1020,
-        "y": 1040,
+        "x": 1280,
+        "y": 980,
         "wires": [
             [
                 "27d9e5846a679b8b"
@@ -21621,7 +21616,7 @@
         "entity_location": "data",
         "override_data": "msg",
         "x": 620,
-        "y": 1260,
+        "y": 1280,
         "wires": [
             [
                 "bthrm_audio_swt_vol_01"
@@ -21650,7 +21645,7 @@
         "repair": false,
         "outputs": 2,
         "x": 930,
-        "y": 1300,
+        "y": 1320,
         "wires": [
             [
                 "bthrm_audio_swt_fan_01"
@@ -21679,7 +21674,7 @@
         "repair": false,
         "outputs": 2,
         "x": 1140,
-        "y": 1300,
+        "y": 1320,
         "wires": [
             [
                 "bthrm_audio_chg_up_01"
@@ -21709,7 +21704,7 @@
         "to": "",
         "reg": false,
         "x": 1380,
-        "y": 1260,
+        "y": 1280,
         "wires": [
             [
                 "bthrm_audio_svc_01"
@@ -21736,7 +21731,7 @@
         "to": "",
         "reg": false,
         "x": 1370,
-        "y": 1340,
+        "y": 1360,
         "wires": [
             [
                 "bthrm_audio_svc_01"
@@ -21771,7 +21766,7 @@
         "output_location": "",
         "output_location_type": "none",
         "x": 1670,
-        "y": 1300,
+        "y": 1320,
         "wires": [
             []
         ]
@@ -21922,45 +21917,14 @@
         "bytopic": "all",
         "topic": "topic",
         "outputs": 1,
-        "x": 490,
-        "y": 1140,
+        "x": 990,
+        "y": 1120,
         "wires": [
             [
-                "bthrm_fan_hard_off_01"
+                "27d9e5846a679b8b"
             ]
         ]
     },
-    {
-        "id": "bthrm_fan_hard_off_01",
-        "type": "api-call-service",
-        "z": "c7f876875da48b87",
-        "name": "Hard cutoff: turn off fan",
-        "server": "657c7463.48e1e4",
-        "version": 7,
-        "debugenabled": false,
-        "action": "switch.turn_off",
-        "floorId": [],
-        "areaId": [],
-        "deviceId": [],
-        "entityId": [
-            "switch.bathroom_switch_right"
-        ],
-        "labelId": [],
-        "data": "",
-        "dataType": "json",
-        "mergeContext": "",
-        "mustacheAltTags": false,
-        "outputProperties": [],
-        "queue": "none",
-        "blockInputOverrides": false,
-        "domain": "switch",
-        "service": "turn_off",
-        "x": 780,
-        "y": 1140,
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "bthrm_fan_hard_rst_01",
         "type": "change",
@@ -21980,8 +21944,8 @@
         "from": "",
         "to": "",
         "reg": false,
-        "x": 460,
-        "y": 1320,
+        "x": 490,
+        "y": 1200,
         "wires": [
             [
                 "bthrm_fan_hard_01",