diff --git a/flows.json b/flows.json
index 886ebc4..b205494 100644
--- a/flows.json
+++ b/flows.json
@@ -102,6 +102,14 @@
         "type": "tab",
         "label": "[Kitchen] Lights"
     },
+    {
+        "id": "b70ee13eafa73823",
+        "type": "tab",
+        "label": "[Living Room] Lights",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "e52c44dc.71cb5",
         "type": "subflow",
@@ -16547,14 +16555,6 @@
             []
         ]
     },
-    {
-        "type": "tab",
-        "label": "[Living Room] Lights",
-        "id": "b70ee13eafa73823",
-        "info": "",
-        "disabled": false,
-        "env": []
-    },
     {
         "id": "tst0000000000003",
         "type": "switch",
@@ -17250,8 +17250,7 @@
             [
                 "8b046197cef5a597"
             ]
-        ],
-        "subflow": "52430f5e9f9ee267"
+        ]
     },
     {
         "id": "fdd0994437d3eb49",
@@ -20541,8 +20540,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "afa6cccb1cfc8ddb",
@@ -20614,8 +20612,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "097585a397ef8e60",
@@ -20687,8 +20684,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "a02362b40496cf27",
@@ -20760,8 +20756,7 @@
             [
                 "2db649c0455c7a49"
             ]
-        ],
-        "subflow": "be8264a322721305"
+        ]
     },
     {
         "id": "613a9be150591ee7",
@@ -21619,16 +21614,18 @@
         "z": "b70ee13eafa73823",
         "name": "PS4 Auto-Activity Switch",
         "info": "",
-        "x": 190,
-        "y": 3860,
+        "x": 170,
+        "y": 3840,
         "wires": []
     },
     {
         "id": "ps4_ssc_001",
         "type": "server-state-changed",
         "z": "b70ee13eafa73823",
+        "name": "PS4 state change",
         "server": "657c7463.48e1e4",
         "version": 6,
+        "outputs": 2,
         "exposeAsEntityConfig": "",
         "entities": {
             "entity": [
@@ -21671,9 +21668,7 @@
                 "valueType": "triggerId"
             }
         ],
-        "name": "PS4 state change",
-        "outputs": 2,
-        "x": 150,
+        "x": 140,
         "y": 3900,
         "wires": [
             [
@@ -21686,6 +21681,7 @@
         "id": "ps4_acs_001",
         "type": "api-current-state",
         "z": "b70ee13eafa73823",
+        "name": "Already Playstation?",
         "server": "657c7463.48e1e4",
         "version": 3,
         "outputs": 2,
@@ -21709,7 +21705,6 @@
                 "valueType": "entity"
             }
         ],
-        "name": "Already Playstation?",
         "x": 400,
         "y": 3900,
         "wires": [
@@ -21723,11 +21718,10 @@
         "id": "ps4_acs_001_svc",
         "type": "api-call-service",
         "z": "b70ee13eafa73823",
+        "name": "Switch to Playstation",
         "server": "657c7463.48e1e4",
         "version": 7,
         "debugenabled": false,
-        "domain": "select",
-        "service": "select_option",
         "areaId": [],
         "deviceId": [],
         "entityId": [
@@ -21739,8 +21733,9 @@
         "mustacheAltTags": false,
         "outputProperties": [],
         "queue": "none",
-        "name": "Switch to Playstation",
-        "x": 660,
+        "domain": "select",
+        "service": "select_option",
+        "x": 720,
         "y": 3900,
         "wires": [
             []