diff --git a/flows.json b/flows.json
index 6d223a8..fe52840 100644
--- a/flows.json
+++ b/flows.json
@@ -1,4 +1,12 @@
 [
+    {
+        "id": "ed4ea3c2bc13d1ec",
+        "type": "tab",
+        "label": "Weather",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "91324b2dbbd2a883",
         "type": "tab",
@@ -15,14 +23,6 @@
         "info": "",
         "env": []
     },
-    {
-        "id": "ed4ea3c2bc13d1ec",
-        "type": "tab",
-        "label": "Weather",
-        "disabled": false,
-        "info": "",
-        "env": []
-    },
     {
         "id": "4107976aa434eb03",
         "type": "subflow",
@@ -176,292 +176,6 @@
             []
         ]
     },
-    {
-        "id": "a1c109993f7dd396",
-        "type": "mqtt in",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "topic": "house/time/night_mode",
-        "qos": "2",
-        "datatype": "auto-detect",
-        "broker": "200f284a1171f0a8",
-        "nl": false,
-        "rap": true,
-        "rh": 0,
-        "inputs": 0,
-        "x": 140,
-        "y": 60,
-        "wires": [
-            [
-                "0ea09d79d6de5c53"
-            ]
-        ]
-    },
-    {
-        "id": "0ea09d79d6de5c53",
-        "type": "change",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "night_mode",
-                "pt": "global",
-                "to": "payload",
-                "tot": "msg"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 380,
-        "y": 60,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "395e101ae9c12369",
-        "type": "mqtt in",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "topic": "house/time/give_me_darkness",
-        "qos": "2",
-        "datatype": "auto-detect",
-        "broker": "200f284a1171f0a8",
-        "nl": false,
-        "rap": true,
-        "rh": 0,
-        "inputs": 0,
-        "x": 160,
-        "y": 120,
-        "wires": [
-            [
-                "7e79da9ecd800892"
-            ]
-        ]
-    },
-    {
-        "id": "7e79da9ecd800892",
-        "type": "change",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "give_me_darkness",
-                "pt": "global",
-                "to": "payload",
-                "tot": "msg"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 440,
-        "y": 120,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a67eb32acf21917c",
-        "type": "mqtt in",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "topic": "house/time/early_night_mode",
-        "qos": "2",
-        "datatype": "auto-detect",
-        "broker": "200f284a1171f0a8",
-        "nl": false,
-        "rap": true,
-        "rh": 0,
-        "inputs": 0,
-        "x": 160,
-        "y": 180,
-        "wires": [
-            [
-                "e183038952420a88"
-            ]
-        ]
-    },
-    {
-        "id": "e183038952420a88",
-        "type": "change",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "early_night_mode",
-                "pt": "global",
-                "to": "payload",
-                "tot": "msg"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 440,
-        "y": 180,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "da24109fa6585678",
-        "type": "mqtt in",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "topic": "house/studio/live",
-        "qos": "2",
-        "datatype": "auto-detect",
-        "broker": "200f284a1171f0a8",
-        "nl": false,
-        "rap": true,
-        "rh": 0,
-        "inputs": 0,
-        "x": 120,
-        "y": 240,
-        "wires": [
-            [
-                "f7219402165cd674"
-            ]
-        ]
-    },
-    {
-        "id": "f7219402165cd674",
-        "type": "change",
-        "z": "91324b2dbbd2a883",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "studio_live",
-                "pt": "global",
-                "to": "payload",
-                "tot": "msg"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 340,
-        "y": 240,
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2fe03a09d418699b",
-        "type": "exec",
-        "z": "50d1e20d24132c99",
-        "command": "",
-        "addpay": "",
-        "append": "",
-        "useSpawn": "false",
-        "timer": "",
-        "winHide": false,
-        "oldrc": false,
-        "name": "",
-        "x": 370,
-        "y": 180,
-        "wires": [
-            [
-                "652d9b04c03a88b8"
-            ],
-            [
-                "b784a6fd67e1cac0"
-            ],
-            [
-                "38d4b39d1405b540"
-            ]
-        ]
-    },
-    {
-        "id": "b114d9e490180bbc",
-        "type": "inject",
-        "z": "50d1e20d24132c99",
-        "name": "",
-        "props": [
-            {
-                "p": "payload"
-            }
-        ],
-        "repeat": "",
-        "crontab": "",
-        "once": false,
-        "onceDelay": 0.1,
-        "topic": "",
-        "payload": "",
-        "payloadType": "date",
-        "x": 200,
-        "y": 180,
-        "wires": [
-            [
-                "2fe03a09d418699b"
-            ]
-        ]
-    },
-    {
-        "id": "652d9b04c03a88b8",
-        "type": "debug",
-        "z": "50d1e20d24132c99",
-        "name": "stdout",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 530,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "b784a6fd67e1cac0",
-        "type": "debug",
-        "z": "50d1e20d24132c99",
-        "name": "stderr",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 530,
-        "y": 180,
-        "wires": []
-    },
-    {
-        "id": "38d4b39d1405b540",
-        "type": "debug",
-        "z": "50d1e20d24132c99",
-        "name": "return code",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "true",
-        "targetType": "full",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 550,
-        "y": 240,
-        "wires": []
-    },
     {
         "id": "7d9f24e0a78ec15c",
         "type": "http request",
@@ -947,5 +661,291 @@
         "x": 1100,
         "y": 460,
         "wires": []
+    },
+    {
+        "id": "a1c109993f7dd396",
+        "type": "mqtt in",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "topic": "house/time/night_mode",
+        "qos": "2",
+        "datatype": "auto-detect",
+        "broker": "200f284a1171f0a8",
+        "nl": false,
+        "rap": true,
+        "rh": 0,
+        "inputs": 0,
+        "x": 140,
+        "y": 60,
+        "wires": [
+            [
+                "0ea09d79d6de5c53"
+            ]
+        ]
+    },
+    {
+        "id": "0ea09d79d6de5c53",
+        "type": "change",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "night_mode",
+                "pt": "global",
+                "to": "payload",
+                "tot": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 380,
+        "y": 60,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "395e101ae9c12369",
+        "type": "mqtt in",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "topic": "house/time/give_me_darkness",
+        "qos": "2",
+        "datatype": "auto-detect",
+        "broker": "200f284a1171f0a8",
+        "nl": false,
+        "rap": true,
+        "rh": 0,
+        "inputs": 0,
+        "x": 160,
+        "y": 120,
+        "wires": [
+            [
+                "7e79da9ecd800892"
+            ]
+        ]
+    },
+    {
+        "id": "7e79da9ecd800892",
+        "type": "change",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "give_me_darkness",
+                "pt": "global",
+                "to": "payload",
+                "tot": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 440,
+        "y": 120,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a67eb32acf21917c",
+        "type": "mqtt in",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "topic": "house/time/early_night_mode",
+        "qos": "2",
+        "datatype": "auto-detect",
+        "broker": "200f284a1171f0a8",
+        "nl": false,
+        "rap": true,
+        "rh": 0,
+        "inputs": 0,
+        "x": 160,
+        "y": 180,
+        "wires": [
+            [
+                "e183038952420a88"
+            ]
+        ]
+    },
+    {
+        "id": "e183038952420a88",
+        "type": "change",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "early_night_mode",
+                "pt": "global",
+                "to": "payload",
+                "tot": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 440,
+        "y": 180,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "da24109fa6585678",
+        "type": "mqtt in",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "topic": "house/studio/live",
+        "qos": "2",
+        "datatype": "auto-detect",
+        "broker": "200f284a1171f0a8",
+        "nl": false,
+        "rap": true,
+        "rh": 0,
+        "inputs": 0,
+        "x": 120,
+        "y": 240,
+        "wires": [
+            [
+                "f7219402165cd674"
+            ]
+        ]
+    },
+    {
+        "id": "f7219402165cd674",
+        "type": "change",
+        "z": "91324b2dbbd2a883",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "studio_live",
+                "pt": "global",
+                "to": "payload",
+                "tot": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 340,
+        "y": 240,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2fe03a09d418699b",
+        "type": "exec",
+        "z": "50d1e20d24132c99",
+        "command": "",
+        "addpay": "",
+        "append": "",
+        "useSpawn": "false",
+        "timer": "",
+        "winHide": false,
+        "oldrc": false,
+        "name": "",
+        "x": 370,
+        "y": 180,
+        "wires": [
+            [
+                "652d9b04c03a88b8"
+            ],
+            [
+                "b784a6fd67e1cac0"
+            ],
+            [
+                "38d4b39d1405b540"
+            ]
+        ]
+    },
+    {
+        "id": "b114d9e490180bbc",
+        "type": "inject",
+        "z": "50d1e20d24132c99",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 180,
+        "wires": [
+            [
+                "2fe03a09d418699b"
+            ]
+        ]
+    },
+    {
+        "id": "652d9b04c03a88b8",
+        "type": "debug",
+        "z": "50d1e20d24132c99",
+        "name": "stdout",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 530,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "b784a6fd67e1cac0",
+        "type": "debug",
+        "z": "50d1e20d24132c99",
+        "name": "stderr",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 530,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "38d4b39d1405b540",
+        "type": "debug",
+        "z": "50d1e20d24132c99",
+        "name": "return code",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 550,
+        "y": 240,
+        "wires": []
     }
 ]
\ No newline at end of file