diff --git a/flows.json b/flows.json
index 09a2ffa..00b69d5 100644
--- a/flows.json
+++ b/flows.json
@@ -531,7 +531,8 @@
         "y": 420,
         "wires": [
             [
-                "f2a8612d3fe812d6"
+                "f2a8612d3fe812d6",
+                "ba76552822052c47"
             ]
         ]
     },
@@ -583,6 +584,21 @@
             ]
         ]
     },
+    {
+        "id": "abaef0d75a14ac36",
+        "type": "junction",
+        "z": "29da089dbee16ea0",
+        "x": 440,
+        "y": 1500,
+        "wires": [
+            [
+                "124381b35e1ea6ad",
+                "e712905805566737",
+                "71a9e89509bb1ea5",
+                "d657b2e0d3134f23"
+            ]
+        ]
+    },
     {
         "id": "c46833d59903b816",
         "type": "mqtt-broker",
@@ -901,56 +917,6 @@
             "widgetGap": "12px"
         }
     },
-    {
-        "id": "f6d4eacee867782a",
-        "type": "ui-page",
-        "name": "Page 1",
-        "ui": "a8dc70a6237173a2",
-        "path": "/page1",
-        "icon": "home",
-        "layout": "grid",
-        "theme": "bf39f7747c4cb89e",
-        "breakpoints": [
-            {
-                "name": "Default",
-                "px": 0,
-                "cols": 3
-            },
-            {
-                "name": "Tablet",
-                "px": 576,
-                "cols": 6
-            },
-            {
-                "name": "Small Desktop",
-                "px": 768,
-                "cols": 9
-            },
-            {
-                "name": "Desktop",
-                "px": 1024,
-                "cols": 12
-            }
-        ],
-        "order": 2,
-        "className": "",
-        "visible": true,
-        "disabled": false
-    },
-    {
-        "id": "fc870cba84c7ab0b",
-        "type": "ui-group",
-        "name": "Tor",
-        "page": "f6d4eacee867782a",
-        "width": "6",
-        "height": "1",
-        "order": 2,
-        "showTitle": true,
-        "className": "",
-        "visible": "true",
-        "disabled": "false",
-        "groupType": "default"
-    },
     {
         "id": "e3645fc2dca1359f",
         "type": "ui_spacer",
@@ -1123,34 +1089,6 @@
         "collapse": false,
         "className": ""
     },
-    {
-        "id": "e33c07a1b417c92b",
-        "type": "ui-group",
-        "name": "Garage",
-        "page": "",
-        "width": "6",
-        "height": "1",
-        "order": -1,
-        "showTitle": true,
-        "className": "",
-        "visible": "true",
-        "disabled": "false",
-        "groupType": "default"
-    },
-    {
-        "id": "acf7e619a617fc9a",
-        "type": "ui-group",
-        "name": "Computer-Tisch",
-        "page": "f6d4eacee867782a",
-        "width": "6",
-        "height": "1",
-        "order": 1,
-        "showTitle": true,
-        "className": "",
-        "visible": "true",
-        "disabled": "false",
-        "groupType": "default"
-    },
     {
         "id": "bc1acb6b016af1c1",
         "type": "ui_group",
@@ -1162,92 +1100,6 @@
         "collapse": false,
         "className": ""
     },
-    {
-        "id": "8e9c5cd2ce20e067",
-        "type": "ui-group",
-        "name": "Computer_Tisch",
-        "page": "d5934943e3944009",
-        "width": "6",
-        "height": "1",
-        "order": 1,
-        "showTitle": true,
-        "className": "",
-        "visible": "true",
-        "disabled": "false",
-        "groupType": "default"
-    },
-    {
-        "id": "2a373aa10f8ffea7",
-        "type": "ui-page",
-        "name": "Computertisch",
-        "ui": "a8dc70a6237173a2",
-        "path": "/page1",
-        "icon": "home",
-        "layout": "grid",
-        "theme": "bf39f7747c4cb89e",
-        "breakpoints": [
-            {
-                "name": "Default",
-                "px": "0",
-                "cols": "3"
-            },
-            {
-                "name": "Tablet",
-                "px": "576",
-                "cols": "6"
-            },
-            {
-                "name": "Small Desktop",
-                "px": "768",
-                "cols": "9"
-            },
-            {
-                "name": "Desktop",
-                "px": "1024",
-                "cols": "12"
-            }
-        ],
-        "order": 4,
-        "className": "",
-        "visible": "true",
-        "disabled": "false"
-    },
-    {
-        "id": "d5934943e3944009",
-        "type": "ui-page",
-        "name": "Page Name",
-        "ui": "a8dc70a6237173a2",
-        "path": "Switch",
-        "icon": "home",
-        "layout": "grid",
-        "theme": "bf39f7747c4cb89e",
-        "breakpoints": [
-            {
-                "name": "Default",
-                "px": "0",
-                "cols": "3"
-            },
-            {
-                "name": "Tablet",
-                "px": "576",
-                "cols": "6"
-            },
-            {
-                "name": "Small Desktop",
-                "px": "768",
-                "cols": "9"
-            },
-            {
-                "name": "Desktop",
-                "px": "1024",
-                "cols": "12"
-            }
-        ],
-        "order": 3,
-        "className": "",
-        "visible": "true",
-        "disabled": "false"
-    },
     {
         "id": "9a5095b780d6917f",
         "type": "ui-page",
@@ -1284,20 +1136,6 @@
         "visible": "true",
         "disabled": "false"
     },
-    {
-        "id": "2dd3b81710d6bd0a",
-        "type": "ui-group",
-        "name": "Group Name",
-        "page": "9a5095b780d6917f",
-        "width": "6",
-        "height": "1",
-        "order": 1,
-        "showTitle": true,
-        "className": "",
-        "visible": "true",
-        "disabled": "false",
-        "groupType": "default"
-    },
     {
         "id": "group1",
         "type": "ui_group",
@@ -1316,6 +1154,39 @@
         "icon": "dashboard",
         "order": 1
     },
+    {
+        "id": "176338afeb8a7b58",
+        "type": "ui-group",
+        "name": "CL_Heizung_Fenster",
+        "page": "9a5095b780d6917f",
+        "width": "6",
+        "height": "1",
+        "order": 1,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false",
+        "groupType": "default"
+    },
+    {
+        "id": "261c60c1322869d9",
+        "type": "ui_tab",
+        "name": "CL",
+        "icon": "dashboard",
+        "disabled": false,
+        "hidden": false
+    },
+    {
+        "id": "63fd87c9bbd93a47",
+        "type": "ui_group",
+        "name": "CL_Heizung",
+        "tab": "261c60c1322869d9",
+        "order": 1,
+        "disp": true,
+        "width": "6",
+        "collapse": false,
+        "className": ""
+    },
     {
         "id": "4d2812cbd43e95b7",
         "type": "mqtt in",
@@ -12981,8 +12852,7 @@
         "y": 500,
         "wires": [
             [
-                "8c8ca301f85a731f",
-                "e383a56993016920"
+                "8c8ca301f85a731f"
             ]
         ]
     },
@@ -13009,8 +12879,7 @@
         "y": 340,
         "wires": [
             [
-                "8c8ca301f85a731f",
-                "9ad38aa8aa5bdb92"
+                "8c8ca301f85a731f"
             ]
         ]
     },
@@ -13075,7 +12944,7 @@
         "type": "function",
         "z": "29da089dbee16ea0",
         "name": "2-Punkt-Regler (Hysteres = +/- <hysterese>°)",
-        "func": "if (flow.get(\"fenster\") == 'offen') {\n    msg.payload = {\"heizung\":false, \"fenster\": flow.get(\"fenster\")}\n    return msg\n}\nif (flow.get('aussen') > flow.get(\"atschwelle\")) {\n    msg.pyaload = {\"hezung\":false, \"at\": flow.get(\"aussen\")}\n    return msg\n}\n\nlet t = flow.get(\"ist\")\nlet hys = flow.get(\"hysterese\")\nlet soll = flow.get(\"soll\")\nif ( t >= (soll + hys)) {\n    msg.payload = {\"heizung\": false}\n    return msg;\n} else if (t  <= (soll - hys)) {\n    msg.payload = {\"heizung\": true}\n    return msg;\n}\nmsg.payload = {\"wedernoch\": true, \"t\": t, \"hys\": hys, \"soll\": soll}\nreturn msg",
+        "func": "if (flow.get(\"fenster\") == 'AUF') {\n    msg.payload = {\"heizung\":false, \"fenster\": flow.get(\"fenster\")}\n    return msg\n}\nif (flow.get('aussen') > flow.get(\"atschwelle\")) {\n    msg.pyaload = {\"hezung\":false, \"at\": flow.get(\"aussen\")}\n    return msg\n}\n\nlet t = flow.get(\"ist\")\nlet hys = flow.get(\"hysterese\")\nlet soll = flow.get(\"soll\")\nif ( t >= (soll + hys)) {\n    msg.payload = {\"heizung\": false}\n    return msg;\n} else if (t  <= (soll - hys)) {\n    msg.payload = {\"heizung\": true}\n    return msg;\n}\nmsg.payload = {\"wedernoch\": true, \"t\": t, \"hys\": hys, \"soll\": soll}\nreturn msg",
         "outputs": 1,
         "noerr": 0,
         "initialize": "",
@@ -13086,7 +12955,8 @@
         "wires": [
             [
                 "bb991dfd3b1f2673",
-                "5331faac4043a7ab"
+                "5331faac4043a7ab",
+                "dfd0c6ce3bdada9f"
             ]
         ]
     },
@@ -13135,6 +13005,12 @@
                 "pt": "flow",
                 "to": "5",
                 "tot": "num"
+            },
+            {
+                "p": "heizung",
+                "pt": "flow",
+                "to": "AUS",
+                "tot": "str"
             }
         ],
         "active": true,
@@ -13381,33 +13257,6 @@
             ]
         ]
     },
-    {
-        "id": "e383a56993016920",
-        "type": "change",
-        "z": "29da089dbee16ea0",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "fenster",
-                "pt": "flow",
-                "to": "offen",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1100,
-        "y": 520,
-        "wires": [
-            [
-                "55b400ce4088a68f"
-            ]
-        ]
-    },
     {
         "id": "bc9a3d2f86b1148f",
         "type": "debug",
@@ -13494,33 +13343,6 @@
             ]
         ]
     },
-    {
-        "id": "9ad38aa8aa5bdb92",
-        "type": "change",
-        "z": "29da089dbee16ea0",
-        "name": "",
-        "rules": [
-            {
-                "t": "set",
-                "p": "fenster",
-                "pt": "flow",
-                "to": "zu",
-                "tot": "str"
-            }
-        ],
-        "action": "",
-        "property": "",
-        "from": "",
-        "to": "",
-        "reg": false,
-        "x": 1100,
-        "y": 340,
-        "wires": [
-            [
-                "55b400ce4088a68f"
-            ]
-        ]
-    },
     {
         "id": "ffc7701a22a6dcb3",
         "type": "function",
@@ -13579,7 +13401,8 @@
         "name": "link out 6",
         "mode": "link",
         "links": [
-            "b2a0ab967056f2b6"
+            "b2a0ab967056f2b6",
+            "b294115cf35ee7f4"
         ],
         "x": 1185,
         "y": 860,
@@ -13600,5 +13423,354 @@
                 "cc35bf77d41e95d1"
             ]
         ]
+    },
+    {
+        "id": "068fe209e08113f9",
+        "type": "comment",
+        "z": "29da089dbee16ea0",
+        "name": "Dashboard dazu",
+        "info": "",
+        "x": 200,
+        "y": 1380,
+        "wires": []
+    },
+    {
+        "id": "e712905805566737",
+        "type": "change",
+        "z": "29da089dbee16ea0",
+        "name": "Set AT",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "aussen",
+                "tot": "flow"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 670,
+        "y": 1460,
+        "wires": [
+            [
+                "dfd79f17c33ad29e"
+            ]
+        ]
+    },
+    {
+        "id": "dfd79f17c33ad29e",
+        "type": "ui-gauge",
+        "z": "29da089dbee16ea0",
+        "name": "T_Aussen",
+        "group": "176338afeb8a7b58",
+        "order": 3,
+        "width": 3,
+        "height": 3,
+        "gtype": "gauge-half",
+        "gstyle": "needle",
+        "title": "AT",
+        "units": "°C",
+        "icon": "",
+        "prefix": "",
+        "suffix": "",
+        "segments": [
+            {
+                "from": "-10",
+                "color": "#5cd65c"
+            },
+            {
+                "from": "5",
+                "color": "#ea5353"
+            }
+        ],
+        "min": "-10",
+        "max": "30",
+        "sizeThickness": 16,
+        "sizeGap": 4,
+        "sizeKeyThickness": 8,
+        "styleRounded": true,
+        "styleGlow": false,
+        "className": "",
+        "x": 920,
+        "y": 1460,
+        "wires": []
+    },
+    {
+        "id": "6c6438585834876a",
+        "type": "ui-gauge",
+        "z": "29da089dbee16ea0",
+        "name": "T-Ist",
+        "group": "176338afeb8a7b58",
+        "order": 2,
+        "width": 3,
+        "height": 3,
+        "gtype": "gauge-half",
+        "gstyle": "needle",
+        "title": "Ist",
+        "units": "°C",
+        "icon": "",
+        "prefix": "",
+        "suffix": "",
+        "segments": [
+            {
+                "from": "10",
+                "color": "#ff2600"
+            },
+            {
+                "from": "16.5",
+                "color": "#ffc800"
+            },
+            {
+                "from": "17.5",
+                "color": "#00f900"
+            }
+        ],
+        "min": "10",
+        "max": "25",
+        "sizeThickness": 16,
+        "sizeGap": 4,
+        "sizeKeyThickness": 8,
+        "styleRounded": true,
+        "styleGlow": false,
+        "className": "",
+        "x": 910,
+        "y": 1540,
+        "wires": []
+    },
+    {
+        "id": "eee4f5e11ec716de",
+        "type": "inject",
+        "z": "29da089dbee16ea0",
+        "name": "1min ticks",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "60",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 210,
+        "y": 1500,
+        "wires": [
+            [
+                "abaef0d75a14ac36"
+            ]
+        ]
+    },
+    {
+        "id": "71a9e89509bb1ea5",
+        "type": "function",
+        "z": "29da089dbee16ea0",
+        "name": "function 59",
+        "func": "msg.payload = Math.round(flow.get(\"ist\")*10) / 10\nreturn msg;",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 690,
+        "y": 1540,
+        "wires": [
+            [
+                "6c6438585834876a"
+            ]
+        ]
+    },
+    {
+        "id": "66c8010dcb0ef319",
+        "type": "ui-text",
+        "z": "29da089dbee16ea0",
+        "group": "176338afeb8a7b58",
+        "order": 4,
+        "width": 0,
+        "height": 0,
+        "name": "Heizung",
+        "label": "Heizung",
+        "format": "{{msg.payload}}",
+        "layout": "col-center",
+        "style": false,
+        "font": "",
+        "fontSize": 16,
+        "color": "#717171",
+        "wrapText": false,
+        "className": "",
+        "x": 920,
+        "y": 1400,
+        "wires": []
+    },
+    {
+        "id": "dfd0c6ce3bdada9f",
+        "type": "function",
+        "z": "29da089dbee16ea0",
+        "name": "set flow.heizung",
+        "func": "if (msg.payload.heizung == true) {\n    flow.set(\"heizung\", \"EIN\")\n} else if (msg.payload.heizung == false) {\n        flow.set(\"heizung\", \"AUS\")\n}\nreturn",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 920,
+        "y": 1240,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "124381b35e1ea6ad",
+        "type": "change",
+        "z": "29da089dbee16ea0",
+        "name": "Set Heizung",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "heizung",
+                "tot": "flow"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 690,
+        "y": 1400,
+        "wires": [
+            [
+                "66c8010dcb0ef319"
+            ]
+        ]
+    },
+    {
+        "id": "14c9a4270298f696",
+        "type": "ui-text",
+        "z": "29da089dbee16ea0",
+        "group": "176338afeb8a7b58",
+        "order": 1,
+        "width": 0,
+        "height": 0,
+        "name": "Fenster",
+        "label": "Fenster",
+        "format": "{{msg.payload}}",
+        "layout": "col-center",
+        "style": false,
+        "font": "",
+        "fontSize": 16,
+        "color": "#717171",
+        "wrapText": false,
+        "className": "",
+        "x": 920,
+        "y": 1600,
+        "wires": []
+    },
+    {
+        "id": "d657b2e0d3134f23",
+        "type": "change",
+        "z": "29da089dbee16ea0",
+        "name": "Set Fenster",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "fenster",
+                "tot": "flow"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 690,
+        "y": 1600,
+        "wires": [
+            [
+                "14c9a4270298f696"
+            ]
+        ]
+    },
+    {
+        "id": "2184746d50dadcd4",
+        "type": "ui-switch",
+        "z": "29da089dbee16ea0",
+        "name": "Fenster_AUF/ZU",
+        "label": "Fenster",
+        "group": "176338afeb8a7b58",
+        "order": 0,
+        "width": 0,
+        "height": 0,
+        "passthru": false,
+        "decouple": false,
+        "topic": "topic",
+        "topicType": "msg",
+        "style": "",
+        "className": "",
+        "layout": "row-spread",
+        "clickableArea": "switch",
+        "onvalue": "1",
+        "onvalueType": "num",
+        "onicon": "",
+        "oncolor": "",
+        "offvalue": "0",
+        "offvalueType": "num",
+        "officon": "",
+        "offcolor": "",
+        "x": 790,
+        "y": 220,
+        "wires": [
+            [
+                "8c8ca301f85a731f"
+            ]
+        ]
+    },
+    {
+        "id": "b294115cf35ee7f4",
+        "type": "link in",
+        "z": "29da089dbee16ea0",
+        "name": "link in 7",
+        "links": [
+            "286439aae5fb8e8b"
+        ],
+        "x": 355,
+        "y": 1440,
+        "wires": [
+            [
+                "abaef0d75a14ac36"
+            ]
+        ]
+    },
+    {
+        "id": "ba76552822052c47",
+        "type": "function",
+        "z": "29da089dbee16ea0",
+        "name": "function 60",
+        "func": "if(msg.payload == 1) {\n    flow.set(\"fenster\", \"AUF\")\n} else (flow.set(\"fenster\",\"ZU\"))\nreturn msg;",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 1090,
+        "y": 560,
+        "wires": [
+            [
+                "55b400ce4088a68f"
+            ]
+        ]
     }
 ]
\ No newline at end of file