diff --git a/config/uwap-home/index.js b/config/uwap-home/index.js
index 73f94a3..4a283a0 100644
--- a/config/uwap-home/index.js
+++ b/config/uwap-home/index.js
@@ -4,6 +4,7 @@ import * as types from "config/types";
 import { svg, withState } from "config/icon";
 import { hex } from "config/colors";
 import * as icons from "@mdi/js";
+//import { Buffer } from "bl";
 
 const topicBulbHomeRust = (bulb: string, argument: string) => ({
   [`${bulb}${argument}`]: {
@@ -19,52 +20,61 @@ const topicBulbHomeRust = (bulb: string, argument: string) => ({
   }
 });
 
-const topicBulbState = (bulb: string) => ({
-  [`${bulb}State`]: {
+const topicZigbeeState = (topic: string, bulb: string) => ({
+  [`${topic}State`]: {
     state: {
-      name: `zigbee2mqtt/bulb_${bulb}/state`,
+      name: `zigbee2mqtt/${bulb}/state`,
       type: types.option({
         OFF: "off",
         ON: "on"
       })
     },
     command: {
-      name: `zigbee2mqtt/bulb_${bulb}/set/state`,
+      name: `zigbee2mqtt/${bulb}/set/state`,
       type: types.string
     },
     defaultValue: "OFF"
   }
 });
+const topicBulbState = (bulb: string) => topicZigbeeState(bulb, `bulb_${bulb}`);
+const topicGroupState = (bulb: string) => topicZigbeeState(bulb, `group_${bulb}`);
 
-const topicBulbNumber = (bulb: string, parameter: string) => ({
-  [`${bulb}${parameter}`]: {
+const topicZigbeeNumber = (topic: string, bulb: string, parameter: string) => ({
+  [`${topic}${parameter}`]: {
     state: {
-      name: `zigbee2mqtt/bulb_${bulb}/${parameter}`,
+      name: `zigbee2mqtt/${bulb}/${parameter}`,
       type: types.string
     },
     command: {
-      name: `zigbee2mqtt/bulb_${bulb}/set/${parameter}`,
+      name: `zigbee2mqtt/${bulb}/set/${parameter}`,
       type: types.string
     },
     defaultValue: "0"
   }
 });
+const topicBulbNumber = (bulb: string, parameter: string) => topicZigbeeNumber(bulb, `bulb_${bulb}`, parameter);
+const topicGroupNumber = (bulb: string, parameter: string) => topicZigbeeNumber(bulb, `group_${bulb}`, parameter);
 
-const topicHomeBoolean = (name: string, topic: string) => ({
+const topicHomeBoolean = (name: string, topic: string,
+  defaultValue: boolean = false) => topicBoolean(name, `home-rust/${topic}`, defaultValue);
+
+const topicBoolean = (name: string, topic: string,
+  defaultValue: boolean = false) => ({
   [`${name}`]: {
     state: {
-      name: `home-rust/${topic}`,
+      name: `${topic}`,
       type: types.option({ true: "on", false: "off" })
     },
     command: {
-      name: `home-rust/${topic}/set`,
+      name: `${topic}/set`,
       type: types.option({ on: "true", off: "false" })
     },
-    defaultValue: "OFF"
+    defaultValue: defaultValue ? "on" : "off"
   }
 });
 
-const topicHomeNumber = (name: string, topic: string) => ({
+const topicHomeNumber = (name: string, topic: string,
+  defaultValue: number = 0) => ({
   [`${name}`]: {
     state: {
       name: `home-rust/${topic}`,
@@ -74,7 +84,7 @@ const topicHomeNumber = (name: string, topic: string) => ({
       name: `home-rust/${topic}/set`,
       type: types.string
     },
-    defaultValue: 0
+    defaultValue: defaultValue
   }
 });
 
@@ -91,10 +101,76 @@ const topicTasmota = (name: string, topic: string) => ({
       name: `cmnd/${topic}/POWER`,
       type: types.string
     },
-    defaultValue: "OFF"
+    defaultValue: "off"
   }
 });
 
+const topicTasmotaPower = (name: string, topic: string) => ({
+  [`${name}Power`]: {
+    state: {
+      name: `tele/${topic}/SENSOR`,
+      type: types.json("ENERGY.Power")
+    },
+    defaultValue: "no Data"
+  }
+});
+
+const topicHeating = (name: string) => ({
+  [`heater${name}Tsoll`]: {
+    state: {
+      name: `tele/home-rust/fritzbox/device/${name}`,
+      type: (msg) => {
+        const json = JSON.parse(msg.toString());
+        if (!json || !json["tsoll"]) {
+          return "126.5";
+        } else {
+          const tsoll = json["tsoll"] / 2;
+          if (!json["offset"] || tsoll > 50) {
+            return tsoll.toString();
+          } else {
+            return (tsoll - json["offset"]/10).toString();
+          }
+        }
+      }
+    },
+    command: {
+      name: `home-rust/fritzbox/device/${name}/tsoll/set`,
+      //TODO: add offset before writing out new value
+      type: (msg) => (Buffer.from((parseFloat(msg) * 2).toString()))
+    },
+    defaultValue: "126.5"
+  },
+  [`heater${name}WindowEnd`]: {
+    state: {
+      name: `tele/home-rust/fritzbox/device/${name}`,
+      type: (msg) => {
+        const json = JSON.parse(msg.toString());
+        if (!json || !json["windowopenactiveendtime"]) {
+          return "inactive";
+        } else {
+          return new Date(json["windowopenactiveendtime"] * 1000).toLocaleTimeString();
+        }
+      }
+    },
+    defaultValue: "unavailable"
+  },
+  [`heater${name}BoostEnd`]: {
+    state: {
+      name: `tele/home-rust/fritzbox/device/${name}`,
+      type: (msg) => {
+        const json = JSON.parse(msg.toString());
+        if (!json || !json["boostactiveendtime"]) {
+          return "inactive";
+        } else {
+          return new Date(json["boostactiveendtime"] * 1000).toLocaleTimeString();
+        }
+      }
+    },
+    defaultValue: "unavailable"
+  }
+});
+
+
 const sliderRGB = (bulb: string, argument: string) => (
   [{
     type: "slider",
@@ -126,6 +202,50 @@ const sliderSVXY = (bulb: string, argument: string) => (
     topic: `${bulb}${argument}`
   }]
 );
+const radiatorUI = (name: string) => ([
+  {
+    type: "toggle",
+    topic: `heater${name}Tsoll`,
+    text: "Volle Power",
+    icon: svg(icons.mdiRadiator),
+    on: "127",
+    off: "22"
+  },
+  {
+    type: "toggle",
+    topic: `heater${name}Tsoll`,
+    text: "Ausschalten",
+    icon: svg(icons.mdiRadiatorDisabled),
+    on: "126.5",
+    off: "22"
+  },
+  {
+    type: "slider",
+    min: 8,
+    max: 33,
+    step: 0.5,
+    text: "Zieltemperatur",
+    icon: svg(icons.mdiOilTemperature),
+    topic: `heater${name}Tsoll`,
+    marks: [
+      { value: 3, label: "3°C" },
+      { value: 22, label: "22°C" },
+      { value: 33, label: "33°C" }
+    ]
+  },
+  {
+    type: "text",
+    text: "Window open mode till",
+    icon: svg(icons.mdiSortClockAscending),
+    topic: `heater${name}WindowEnd`,
+  },
+  {
+    type: "text",
+    text: "Boost mode till",
+    icon: svg(icons.mdiSortClockDescending),
+    topic: `heater${name}BoostEnd`,
+  }
+]);
 
 const config: Config = {
   space: {
@@ -147,6 +267,119 @@ const config: Config = {
       ...topicBulbHomeRust("livingroom", "mode"),
       ...topicBulbNumber("livingroom", "brightness"),
       ...topicBulbState("livingroom"),
+
+      ...topicBulbHomeRust("ledstrip_livingroom", "r"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "g"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "b"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "h"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "s"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "v"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "x"),
+      ...topicBulbHomeRust("ledstrip_livingroom", "y"),
+      ...topicBulbNumber("ledstrip_livingroom", "brightness"),
+      ...topicBulbState("ledstrip_livingroom"),
+
+      ...topicBulbHomeRust("office", "r"),
+      ...topicBulbHomeRust("office", "g"),
+      ...topicBulbHomeRust("office", "b"),
+      ...topicBulbHomeRust("office", "h"),
+      ...topicBulbHomeRust("office", "s"),
+      ...topicBulbHomeRust("office", "v"),
+      ...topicBulbHomeRust("office", "x"),
+      ...topicBulbHomeRust("office", "y"),
+      ...topicBulbNumber("office", "brightness"),
+      ...topicBulbNumber("office", "color_temp"),
+      ...topicBulbState("office"),
+
+
+      ...topicBulbNumber("bedroom", "brightness"),
+      ...topicBulbNumber("bedroom", "color_temp"),
+      ...topicBulbState("bedroom"),
+
+      ...topicGroupNumber("kitchen", "brightness"),
+      ...topicGroupNumber("kitchen", "color_temp"),
+      ...topicGroupState("kitchen"),
+
+      ...topicBulbNumber("office_window", "brightness"),
+      ...topicBulbNumber("office_window", "color_temp"),
+      ...topicBulbState("office_window"),
+
+      ...topicBulbNumber("3d_printer", "brightness"),
+      ...topicBulbState("3d_printer"),
+
+      ...topicBulbNumber("hallway", "brightness"),
+      ...topicBulbState("hallway"),
+
+      ...topicBulbNumber("hallway2", "brightness"),
+      ...topicBulbState("hallway2"),
+
+      ...topicBulbNumber("ledstrip_storeroom", "brightness"),
+      ...topicBulbState("ledstrip_storeroom"),
+
+      ...topicBulbNumber("diningroom", "brightness"),
+      ...topicBulbState("diningroom"),
+
+      ...topicZigbeeNumber("officeBlindLeft", "blinds_office_left", "position"),
+      ...topicZigbeeNumber("officeBlindRight", "blinds_office_right", "position"),
+      ...topicHomeBoolean("officeBlindsVirtualZero", "office-blinds-virtual-zero-position",
+        true),
+
+      ...topicTasmota("speakerOffice", "sonoff-office-speaker"),
+      ...topicHomeBoolean("officeSwitchPollingActive", "switch/office/polling",
+        true),
+
+      ...topicBoolean("wledOfficeAuto", "wled/office/automatic"),
+
+      ...topicTasmota("fanBedroom", "sonoff-bedroom-fan"),
+      ...topicTasmota("fanOffice", "sonoff-office-fan"),
+      ...topicTasmota("tasmotaProjector", "tasmota-projector"),
+      ...topicTasmota("tasmotaDishwasher", "tasmota-dishwasher"),
+      ...topicTasmotaPower("tasmotaDishwasher", "tasmota-dishwasher"),
+      ...topicHomeBoolean("fanBedroomAuto", "temperature-control/bedroom"),
+      ...topicHomeBoolean("fanOfficeAuto", "temperature-control/office"),
+      ...topicHomeNumber("fanBedroomTarget",
+        "temperature-control/bedroom/target", 21.5),
+      ...topicHomeNumber("fanOfficeTarget",
+        "temperature-control/office/target", 21.5),
+
+      ...topicHomeNumber("heaterOfficeTarget",
+        "temperature-control/office_heating/target", 21.5),
+      ...topicHomeBoolean("heaterOfficeAuto",
+        "temperature-control/office_heating"),
+      ...topicHomeBoolean("heaterOfficeSelfControl",
+        "temperature-control/office_heating/self_control"),
+
+      ...topicHomeNumber("heaterLivingroomTarget",
+        "temperature-control/livingroom_heating/target", 21.5),
+      ...topicHomeBoolean("heaterLivingroomAuto",
+        "temperature-control/livingroom_heating"),
+
+      ...topicHomeBoolean("livingroomKodiControlled",
+        "bulb/livingroom/kodi-controlled"),
+      ...topicHomeBoolean("projectorControlsSoundbar",
+        "projector-controls-soundbar", true),
+      ...topicHomeBoolean("bedroomWakeup", "wakeup"),
+      ...topicHomeBoolean("lueftenHint", "lueften"),
+      ...topicHomeBoolean("windowOpenWarning", "window_open_warning", true),
+      ...topicHomeBoolean("printerLight",
+        "bulb/bulb_3d_printer/auto"),
+      ...topicHomeNumber("temperatureWarningKitchen",
+        "temperature-warning/kitchen/setpoint", 15.0),
+      ...topicHomeNumber("temperatureWarningOffice",
+        "temperature-warning/office/setpoint", 15.0),
+      ...topicHomeNumber("temperatureWarningBedroom",
+        "temperature-warning/bedroom/setpoint", 15.0),
+
+      ...topicZigbeeState("powerFountain", "power_fountain"),
+
+      temperatureKitchen: {
+        state: {
+          name: "tele/sonoff-kittchen/SENSOR",
+          type: types.json("DS18B20-5674FF.Temperature")
+          //type: types.json("$..[?(@.Address==\"28FF7456B5013CBB\")].Temperature")
+        },
+        defaultValue: "0"
+      },
       nasPower: {
         state: {
           name: "nas/online",
@@ -158,6 +391,29 @@ const config: Config = {
         },
         defaultValue: "OFF"
       },
+
+      ...topicHeating("diningroom"),
+      ...topicHeating("bedroom"),
+      ...topicHeating("office"),
+
+      heaterBedroomSummermode: {
+        state: {
+          name: "tele/home-rust/fritzbox/device/bedroom",
+          type: types.json("summeractive")
+        },
+        defaultValue: "1"
+      },
+      heaterOfficeNachtabsenkung: {
+        state: {
+          name: "home-rust/temperature-control/office_heating/heat_request/4",
+          type: types.option({ true: "off", false: "on" })
+        },
+        command: {
+          name: "home-rust/temperature-control/office_heating/heat_request/4",
+          type: types.option({ off: "true", on: "false" })
+        },
+        defaultValue: "on"
+      },
       tucanaPower: {
         state: {
           name: "home-rust/switch/office/8",
@@ -176,30 +432,138 @@ const config: Config = {
         },
         defaultValue: "0"
       },
-      ...topicHomeBoolean("livingroomKodiControlled",
-        "bulb/livingroom/kodi-controlled"),
-      ...topicHomeBoolean("bedroomWakeup", "wakeup"),
-      ...topicBulbNumber("bedroom", "brightness"),
-      ...topicBulbNumber("bedroom", "color_temp"),
-      ...topicBulbNumber("hallway", "brightness"),
-      ...topicBulbState("bedroom"),
-      ...topicTasmota("fanBedroom", "sonoff-bedroom-fan"),
-      ...topicHomeBoolean("fanBedroomAuto", "temperature-control/bedroom"),
-      ...topicHomeNumber("fanBedroomTarget",
-        "temperature-control/bedroom/target"),
-      ...topicTasmota("fanOffice", "sonoff-office-fan"),
-      ...topicHomeBoolean("fanOfficeAuto", "temperature-control/office"),
-      ...topicHomeBoolean("lueftenHint", "lueften"),
-      ...topicHomeNumber("fanOfficeTarget",
-        "temperature-control/office/target"),
-      ...topicBulbNumber("hallway", "brightness"),
-      ...topicBulbState("hallway"),
-      ...topicBulbNumber("hallway2", "brightness"),
-      ...topicBulbState("hallway2"),
-      ...topicBulbState("office"),
-      ...topicBulbNumber("office", "brightness"),
-      ...topicTasmota("speakerOffice", "sonoff-office-speaker"),
-      ...topicHomeBoolean("officeSwitchPollingActive", "switch/office/polling")
+      tasmotaProjectorAutoOff: {
+        state: {
+          name: "tele/tasmota-projector/auto-off",
+          type: types.option({ OFF: "off", ON: "on" })
+        },
+        command: {
+          name: "cmnd/tasmota-projector/backlog",
+          type: types.option({
+            off: "Rule2 off; RuleTimer1 0; Publish2 tele/tasmota-projector/auto-off OFF;",
+            on: "Rule2 on; Publish2 tele/tasmota-projector/auto-off ON;"
+          })
+        },
+        defaultValue: "on"
+      },
+      printer3DProgresss: {
+        state: {
+          name: "tele/octoPrint/progress/printing",
+          type: (msg) => JSON.parse(msg.toString()).printer_data.progress.completion || "0"
+        },
+        defaultValue: "0"
+      },
+      printer3Dremaining: {
+        state: {
+          name: "tele/octoPrint/progress/printing",
+          type: (msg) => {
+            const json = JSON.parse(msg.toString());
+            if (!json) {
+              return "unavailable";
+            }
+            const secondsLeft = json.printer_data.progress.printTimeLeft;
+            return new Date(secondsLeft * 1000).toISOString().substr(11, 8);
+          }
+        },
+        defaultValue: "unavailable"
+      },
+      kodi: {
+        state: {
+          name: "kodi/connected",
+          type: types.string
+        },
+        command: {
+          name: "kodi/command/shutdown",
+          type: types.string
+        },
+        defaultValue: "0"
+      },
+      wled_livingroom_brightness: {
+        state: {
+          name: "wled/livingroom/g",
+          type: types.string
+        },
+        command: {
+          name: "wled/livingroom",
+          type: types.string
+        },
+        defaultValue: "0"
+      },
+      wled_office_brightness: {
+        state: {
+          name: "wled/office/g",
+          type: types.string
+        },
+        command: {
+          name: "wled/office",
+          type: types.string
+        },
+        defaultValue: "0"
+      },
+      wled_office_lwt: {
+        state: {
+          name: "home-rust/led-strip-office/lwt",
+          type: types.string
+        },
+        defaultValue: "unknown"
+      },
+      twitch_status_uwap: {
+        state: {
+          name: "tele/twitch/uwap",
+          type: (msg) => { return msg.toString().endsWith("off") ? "off" : "on"; }
+        },
+        defaultValue: "off"
+      },
+      tadpole_freshness: {
+        state: {
+          name: "stat/tadpole/freshness",
+          type: types.string
+        },
+        defaultValue: "unkown"
+      },
+      tadpole_mic: {
+        state: {
+          name: "stat/tadpole/mic",
+          type: types.string
+        },
+        defaultValue: "unkown"
+      },
+      tadpole_webcam: {
+        state: {
+          name: "stat/tadpole/webcam",
+          type: types.string
+        },
+        defaultValue: "unkown"
+      },
+      livingroomSoundbarPower: {
+        state: {
+          name: "media/cec/5",
+          type: types.option({ off: "off", on: "on" })
+        },
+        command: {
+          name: "media/cec/5/cmd",
+          type: types.option({ off: "off", on: "on" })
+        },
+        defaultValue: "off"
+      },
+      livingroomSoundbarHDMI: {
+        command: {
+          name: "media/cec/tx",
+          type: types.option({ off: "1f:82:11:00", on: "1f:82:11:00" })
+        },
+        defaultValue: "off"
+      },
+      livingroomSoundbarVolume: {
+        state: {
+          name: "media/cec/volume",
+          type: types.string
+        },
+        command: {
+          name: "media/cec/volume/set",
+          type: types.string
+        },
+        defaultValue: "0"
+      }
     }
   ],
   controls: {
@@ -240,11 +604,27 @@ const config: Config = {
       ]
     },
     bedroomFan: {
-      name: "Lüftung Schlafzimmer",
+      name: "Lüftung/Heizung Schlafzimmer",
       position: [140, 25],
-      icon: svg(icons.mdiFan).color(({fanBedroomState}) =>
-        (fanBedroomState === "on" ? hex("#00FF00") : hex("#000000"))),
+      icon: withState((s) => (
+        s["heaterBedroomSummermode"] === "1" ?
+
+          //Sommermodus => Lüftungsstatus anzeigen
+          svg(icons.mdiFan).color(({fanBedroomState}) =>
+            (fanBedroomState === "on" ? hex("#00FF00") : hex("#000000")))
+
+          //Wintermodus => Heizungsstatus anzeigen
+          : s["heaterbedroomTsoll"] === "126.5" ?
+            //Solltemperatur == aus
+            svg(icons.mdiRadiatorDisabled)
+            //Normalbetrieb
+            : svg(icons.mdiRadiator)
+      )),
       ui: [
+        {
+          type: "section",
+          text: "Lüftung"
+        },
         {
           type: "toggle",
           topic: "fanBedroomState",
@@ -257,12 +637,6 @@ const config: Config = {
           text: "Automatik",
           icon: svg(icons.mdiAirConditioner)
         },
-        {
-          type: "text",
-          text: "Zieltemperatur",
-          icon: svg(icons.mdiTemperatureCelsius),
-          topic: "fanBedroomTarget"
-        },
         {
           type: "slider",
           min: 15,
@@ -270,9 +644,17 @@ const config: Config = {
           step: 0.1,
           text: "Zieltemperatur",
           icon: svg(icons.mdiOilTemperature),
-          topic: "fanBedroomTarget"
-        }
-      ]
+          topic: "fanBedroomTarget",
+          marks: [
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" },
+            { value: 25, label: "25°C" }
+          ]
+        },
+        {
+          type: "section",
+          text: "Heizung"
+        }].concat(radiatorUI("bedroom"))
     },
     officeSpeaker: {
       name: "Lautsprecher",
@@ -290,13 +672,70 @@ const config: Config = {
         }
       ]
     },
-    officeFan: {
-      name: "Lüftung Büro",
-      position: [140, 658],
-      icon: svg(icons.mdiFan),
-      iconColor: ({fanOfficeState}) =>
-        (fanOfficeState === "on" ? hex("#00FF00") : hex("#000000")),
+    officeBlinds: {
+      name: "Jalousien Büro",
+      position: [170,658],
+      icon: withState((s) => (
+        (parseInt(s["officeBlindLeftposition"]) <= 9 && 
+        parseInt(s["officeBlindRightposition"]) <= 9) ? 
+        svg(icons.mdiBlindsOpen) :
+        svg(icons.mdiBlinds)
+      )),
       ui: [
+        {
+          type: "slider",
+          min: 0,
+          max: 100,
+          step: 1,
+          text: "Links",
+          icon: svg(icons.mdiArrowUpDown),
+          topic: "officeBlindLeftposition",
+          marks: [
+            { value: 100, label: "Unten" },
+            { value: 0, label: "Oben" },
+            { value: 61, label: "Meow" }
+          ]
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 100,
+          step: 1,
+          text: "Rechts",
+          icon: svg(icons.mdiArrowUpDown),
+          topic: "officeBlindRightposition",
+          marks: [
+            { value: 100, label: "Unten" },
+            { value: 0, label: "Oben" },
+            { value: 69, label: "Meow" }
+          ]
+        },
+        {
+          type: "toggle",
+          topic: "officeBlindsVirtualZero",
+          text: "Hide Holes Mode",
+          icon: svg(icons.mdiBlindsOpen)
+        }
+      ],
+    },
+    officeFan: {
+      name: "Lüftung/Heizung Büro",
+      position: [140, 658],
+      icon: withState(({heaterOfficeAuto}) => (
+
+        heaterOfficeAuto === "on" ?
+
+          svg(icons.mdiRadiator).color(({heaterofficeTsoll}) =>
+            (heaterofficeTsoll === "127" ? hex("#FF0000") : hex("#000000")))
+
+          : svg(icons.mdiFan).color(({fanOfficeState}) =>
+            (fanOfficeState === "on" ? hex("#00FF00") : hex("#000000")))
+      )),
+      ui: [
+        {
+          type: "section",
+          text: "Lüftung"
+        },
         {
           type: "toggle",
           topic: "fanOfficeState",
@@ -310,10 +749,40 @@ const config: Config = {
           icon: svg(icons.mdiAirConditioner)
         },
         {
-          type: "text",
+          type: "slider",
+          min: 15,
+          max: 25,
+          step: 0.1,
           text: "Zieltemperatur",
-          icon: svg(icons.mdiTemperatureCelsius),
-          topic: "fanOfficeTarget"
+          icon: svg(icons.mdiOilTemperature),
+          topic: "fanOfficeTarget",
+          marks: [
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" },
+            { value: 25, label: "25°C" }
+          ]
+        },
+        {
+          type: "section",
+          text: "Heizung (Automatik)"
+        },
+        {
+          type: "toggle",
+          topic: "heaterOfficeAuto",
+          text: "Automatik",
+          icon: svg(icons.mdiRadiator)
+        },
+        {
+          type: "toggle",
+          topic: "heaterOfficeNachtabsenkung",
+          text: "Nachtabsekung",
+          icon: svg(icons.mdiWeatherNight)
+        },
+        {
+          type: "toggle",
+          topic: "heaterOfficeSelfControl",
+          text: "Run control on valve",
+          icon: svg(icons.mdiRadiator)
         },
         {
           type: "slider",
@@ -322,9 +791,17 @@ const config: Config = {
           step: 0.1,
           text: "Zieltemperatur",
           icon: svg(icons.mdiOilTemperature),
-          topic: "fanOfficeTarget"
-        }
-      ]
+          topic: "heaterOfficeTarget",
+          marks: [
+            { value: 15, label: "15°C" },
+            { value: 21.5, label: "21.5°C" },
+            { value: 25, label: "25°C" }
+          ]
+        },
+        {
+          type: "section",
+          text: "Heizung (Manuell)"
+        }].concat(radiatorUI("office"))
     },
     tucana: {
       name: "tucana",
@@ -353,7 +830,7 @@ const config: Config = {
     },
     officeSwitch: {
       name: "Switch Büro",
-      position: [200, 540],
+      position: [280, 658],
       icon: svg(icons.mdiLan),
       ui: [
         {
@@ -376,7 +853,7 @@ const config: Config = {
       position: [210, 570],
       icon: svg(icons.mdiCeilingLight).color(({officeState}) =>
         (officeState === "on" ? hex("#00FF00") : hex("#000000"))),
-      ui: [
+      ui: ([
         {
           type: "toggle",
           topic: "officeState",
@@ -390,8 +867,91 @@ const config: Config = {
           text: "Helligkeit",
           icon: svg(icons.mdiBrightness7),
           topic: "officebrightness"
+        },
+        {
+          type: "slider",
+          min: 250,
+          max: 454,
+          text: "Farbtemperatur",
+          icon: svg(icons.mdiWeatherSunsetDown),
+          topic: "officecolor_temp"
+        },
+        {
+          type: "section",
+          text: "RGB"
         }
-      ]
+      ]).concat(sliderRGB("office", "r"))
+        .concat(sliderRGB("office", "g"))
+        .concat(sliderRGB("office", "b"))
+        .concat([
+          {
+            type: "section",
+            text: "HSV"
+          }
+        ]).concat(sliderH("office", "h"))
+        .concat(sliderSVXY("office", "s"))
+        .concat(sliderSVXY("office", "v"))
+        .concat([
+          {
+            type: "section",
+            text: "XY"
+          }
+        ]).concat(sliderSVXY("office", "x"))
+        .concat(sliderSVXY("office", "y"))
+        .concat([
+        {
+          type: "link",
+          link: "http://192.168.0.12:8080/#/device/0x0c4314fffe9bc8c1/exposes",
+          text: "Open Webinterface",
+          icon: svg(icons.mdiOpenInNew)
+        }
+        ])
+    },
+    officeLedStripWled: {
+      name: "Ledstreifen Büro",
+      position: [316, 570],
+      /* eslint-disable camelcase */
+      icon: svg(icons.mdiWhiteBalanceIridescent).color(
+        ({wled_office_brightness}) =>
+        (wled_office_brightness !== "0" ? hex("#00FF00") : hex("#000000"))),
+      /* eslint-enable camelcase */
+      ui: ([
+        {
+          type: "toggle",
+          topic: "wled_office_brightness",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower),
+          on: "107",
+          off: "0",
+          toggled: (n) => parseInt(n, 10) > 0
+        },
+        {
+          type: "toggle",
+          topic: "wledOfficeAuto",
+          text: "Automatik",
+          icon: svg(icons.mdiAutoDownload)
+        },
+        {
+          type: "slider",
+          min: 1,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "wled_office_brightness"
+        },
+        {
+          type: "text",
+          text: "Status",
+          icon: svg(icons.mdiRefresh),
+          topic: "wled_office_lwt"
+        },
+        {
+          type: "link",
+          link: "http://192.168.0.66/",
+          text: "Open Webinterface",
+          icon: svg(icons.mdiOpenInNew)
+        }
+      ])
     },
     hallwayLight: {
       name: "Flur",
@@ -418,8 +978,13 @@ const config: Config = {
     hallway2Light: {
       name: "Flur",
       position: [250, 370],
-      icon: svg(icons.mdiCeilingLight).color(({hallway2State}) =>
-        (hallway2State === "on" ? hex("#00FF00") : hex("#000000"))),
+      icon: withState((s) => (
+        svg(icons.mdiCeilingLight).color(
+            s["hallway2State"] === "on" ? 
+              (s["tadpole_webcam"] == "on" ? hex("#FF0000") : s["tadpole_mic"] == "on" ? hex("#0000FF") : s["twitch_status_uwap"] === "on" ? hex("#FF00FF") : hex("#00FF00"))
+            : 
+              (s["tadpole_webcam"] == "on" ? hex("#990000") : s["tadpole_mic"] == "on" ? hex("#000099") : s["twitch_status_uwap"] === "on" ? hex("#990099") : hex("#000000"))
+        ))),
       ui: [
         {
           type: "toggle",
@@ -434,9 +999,195 @@ const config: Config = {
           text: "Helligkeit",
           icon: svg(icons.mdiBrightness7),
           topic: "hallway2brightness"
+        },
+        {
+          type: "text",
+          text: "Twitch Uwap",
+          icon: svg(icons.mdiTwitch),
+          topic: "twitch_status_uwap"
+        },
+        {
+          type: "section",
+          text: "Laptop tadpole"
+        },
+        {
+          type: "text",
+          text: "Datenstand",
+          icon: svg(icons.mdiRefresh),
+          topic: "tadpole_freshness"
+        },
+        {
+          type: "text",
+          text: "Mikrofon",
+          icon: svg(icons.mdiMicrophone),
+          topic: "tadpole_mic"
+        },
+        {
+          type: "text",
+          text: "Webcam",
+          icon: svg(icons.mdiVideo),
+          topic: "tadpole_webcam"
         }
       ]
     },
+    dishwasher: {
+      name: "Spülmaschine",
+      position: [575, 449],
+      icon: withState((s) => (
+        ( s["tasmotaDishwasherState"] === "off" )
+          ? svg(icons.mdiDishwasherOff)
+          :
+        ( parseFloat(s["tasmotaDishwasherPower"])
+          < 2
+        )
+          ? svg(icons.mdiDishwasherAlert).color(hex("#FF8700"))
+          : svg(icons.mdiDishwasher).color(hex("#00FF00"))
+      )),
+      ui: [
+        {
+          type: "toggle",
+          topic: "tasmotaDishwasherState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "text",
+          text: "Stromverbrauch (W)",
+          icon: svg(icons.mdiPowerSocketDe),
+          topic: "tasmotaDishwasherPower"
+        },
+      ]
+    },
+    temperatureWarningKitchen: {
+      name: "Untertemperatur-Warnung",
+      position: [625, 660],
+      icon: withState((s) => (
+
+        ( parseFloat(s["temperatureKitchen"])
+          < parseFloat(s["temperatureWarningKitchen"])
+        )
+          ? svg(icons.mdiThermometerAlert).color(hex("#FF0000"))
+          : svg(icons.mdiThermometer)
+      )),
+      ui: [
+        {
+          type: "text",
+          text: "Istwert:",
+          icon: svg(icons.mdiThermometer),
+          topic: "temperatureKitchen"
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 20,
+          step: 1,
+          text: "Schwellwert",
+          icon: svg(icons.mdiThermometerChevronDown),
+          topic: "temperatureWarningKitchen",
+          marks: [
+            { value: 0, label: "0°C" },
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" }
+          ]
+        },
+        {
+          type: "toggle",
+          topic: "windowOpenWarning",
+          text: "Fenster Offen Warnung",
+          icon: svg(icons.mdiWindowOpenVariant)
+        },
+      ]
+    },
+    diningroomLight: {
+      name: "Esszimmer",
+      position: [410, 570],
+      icon: svg(icons.mdiCeilingLight).color(({diningroomState}) =>
+        (diningroomState === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: [
+        {
+          type: "toggle",
+          topic: "diningroomState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "diningroombrightness"
+        }
+      ]
+    },
+    kitchenLight: {
+      name: "Küche",
+      position: [550, 570],
+      icon: svg(icons.mdiCeilingLight).color(({kitchenState}) =>
+        (kitchenState === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: [
+        {
+          type: "toggle",
+          topic: "kitchenState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "kitchenbrightness"
+        },
+        {
+          type: "slider",
+          min: 250,
+          max: 454,
+          text: "Farbtemperatur",
+          icon: svg(icons.mdiWeatherSunsetDown),
+          topic: "kitchencolor_temp"
+        }
+      ]
+    },
+    diningroomHeater: {
+      name: "Heizung Esszimmer",
+      position: [410, 658],
+      icon: withState(({heaterdiningroomTsoll}) => (
+        heaterdiningroomTsoll === "126.5" ?
+          svg(icons.mdiRadiatorDisabled) : svg(icons.mdiRadiator)
+      )),
+      ui: [
+        {
+          type: "section",
+          text: "Heizung (Automatik)"
+        },
+        {
+          type: "toggle",
+          topic: "heaterLivingroomAuto",
+          text: "Automatik",
+          icon: svg(icons.mdiRadiator)
+        },
+        {
+          type: "slider",
+          min: 15,
+          max: 25,
+          step: 0.1,
+          text: "Zieltemperatur",
+          icon: svg(icons.mdiOilTemperature),
+          topic: "heaterLivingroomTarget",
+          marks: [
+            { value: 15, label: "15°C" },
+            { value: 21.5, label: "21.5°C" },
+            { value: 25, label: "25°C" }
+          ]
+        },
+        {
+          type: "section",
+          text: "Heizung (Manuell)"
+        },
+      ] . concat(radiatorUI("diningroom"))
+    },
     pi: {
       name: "Pi",
       position: [550, 75],
@@ -453,12 +1204,70 @@ const config: Config = {
           link: "http://192.168.0.12:3000/",
           text: "Grafana",
           icon: svg(icons.mdiOpenInNew)
-        }
+        },
+        {
+          type: "link",
+          link: "http://192.168.0.12:1780/",
+          text: "Snapcast",
+          icon: svg(icons.mdiOpenInNew)
+        },
+        {
+          type: "link",
+          link: "http://carina.fritz.box:9981/",
+          text: "tvheadend",
+          icon: svg(icons.mdiOpenInNew)
+        },
+        {
+          type: "section",
+          text: "Kälte-Warnung"
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 20,
+          step: 1,
+          text: "Küche",
+          icon: svg(icons.mdiThermometerChevronDown),
+          topic: "temperatureWarningKitchen",
+          marks: [
+            { value: 0, label: "0°C" },
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" }
+          ]
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 20,
+          step: 1,
+          text: "Büro",
+          icon: svg(icons.mdiThermometerChevronDown),
+          topic: "temperatureWarningOffice",
+          marks: [
+            { value: 0, label: "0°C" },
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" }
+          ]
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 20,
+          step: 1,
+          text: "Schlafzimmer",
+          icon: svg(icons.mdiThermometerChevronDown),
+          topic: "temperatureWarningBedroom",
+          marks: [
+            { value: 0, label: "0°C" },
+            { value: 15, label: "15°C" },
+            { value: 20, label: "20°C" }
+          ]
+        },
       ]
     },
     nas: {
       name: "NAS",
-      position: [550, 100],
+      position: [310, 500],
       icon: svg(icons.mdiNas).color(({nasPower}) =>
         (nasPower === "on" ? hex("#00FF00") : hex("#000000"))),
       ui: [
@@ -466,7 +1275,159 @@ const config: Config = {
           type: "toggle",
           topic: "nasPower",
           text: "Einschalten",
+          icon: svg(icons.mdiPower),
+        }
+      ]
+    },
+    officeWindowLight: {
+      name: "Büro Fenster",
+      position: [310, 658],
+      /* eslint-disable camelcase */
+      icon: svg(icons.mdiDeskLamp).color(({office_windowState}) =>
+        (office_windowState === "on" ? hex("#00FF00") : hex("#000000"))),
+      /* eslint-enable camelcase */
+      ui: [
+        {
+          type: "section",
+          text: "Beleuchtung"
+        },
+        {
+          type: "toggle",
+          topic: "office_windowState",
+          text: "Ein/Ausschalten",
           icon: svg(icons.mdiPower)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "office_windowbrightness"
+        },
+        {
+          type: "slider",
+          min: 250,
+          max: 454,
+          text: "Farbtemperatur",
+          icon: svg(icons.mdiWeatherSunsetDown),
+          topic: "office_windowcolor_temp"
+        },
+      ]
+    }, 
+    printer3D: {
+      name: "3D-Drucker",
+      position: [310, 430],
+      icon: svg(icons.mdiPrinter3d),
+      ui: [
+        {
+          type: "link",
+          link: "http://octopi.fritz.box/",
+          text: "Open Webinterface",
+          icon: svg(icons.mdiOpenInNew)
+        },
+        {
+          type: "section",
+          text: "Current Job"
+        },
+        {
+          type: "progress",
+          icon: svg(icons.mdiRotateRight),
+          min: 0,
+          max: 100,
+          text: "Printing Progress",
+          topic: "printer3DProgresss"
+        },
+        {
+          type: "text",
+          text: "Time Left",
+          icon: svg(icons.mdiClock),
+          topic: "printer3Dremaining"
+        },
+        {
+          type: "section",
+          text: "Beleuchtung"
+        },
+        {
+          type: "toggle",
+          topic: "3d_printerState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "toggle",
+          topic: "printerLight",
+          text: "Sync to 3D printer",
+          icon: svg(icons.mdiBrightnessAuto)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "3d_printerbrightness"
+        },
+      ]
+    },
+    storeRoomStrip: {
+      name: "LED-Leisten Lager",
+      position: [310, 465],
+      icon: svg(icons.mdiWhiteBalanceIridescent),
+      icon: svg(icons.mdiWhiteBalanceIridescent).color(({ledstrip_storeroomState}) =>
+        (ledstrip_storeroomState === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: [
+        {
+          type: "toggle",
+          topic: "ledstrip_storeroomState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "ledstrip_storeroombrightness"
+        }
+      ]
+    },
+    projector: {
+      name: "Beamer",
+      position: [410, 230],
+      icon: svg(icons.mdiProjector).color(({tasmotaProjectorState}) =>
+        (tasmotaProjectorState === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: [
+        {
+          type: "toggle",
+          topic: "tasmotaProjectorState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "toggle",
+          topic: "tasmotaProjectorAutoOff",
+          text: "Automatik",
+          icon: svg(icons.mdiAutoDownload)
+        },
+        {
+          type: "section",
+          text: "Kodi"
+        },
+        {
+          type: "toggle",
+          topic: "kodi",
+          text: "Kodi herunterfahren",
+          icon: svg(icons.mdiPower),
+          on: "2",
+          off: "0",
+        },
+        {
+          type: "link",
+          link: "http://192.168.0.10:8080/",
+          text: "Open Webinterface",
+          icon: svg(icons.mdiOpenInNew)
         }
       ]
     },
@@ -520,7 +1481,8 @@ const config: Config = {
             "1": "Kodi",
             "2": "Sleep",
             "3": "RGB Fade",
-            "4": "Work"
+            "4": "Work",
+            "5": "Winter"
           },
           icon: svg(icons.mdiCog)
         },
@@ -546,6 +1508,151 @@ const config: Config = {
           }
         ]).concat(sliderSVXY("livingroom", "x"))
         .concat(sliderSVXY("livingroom", "y"))
+    },
+    livingroomLedStrip: {
+      name: "Ledstreifen Wohnzimmer",
+      position: [450, 73],
+      /* eslint-disable camelcase */
+      icon: svg(icons.mdiWhiteBalanceIridescent).color(
+        ({ledstrip_livingroomState}) =>
+        (ledstrip_livingroomState === "on" ? hex("#00FF00") : hex("#000000"))),
+      /* eslint-enable camelcase */
+      ui: ([
+        {
+          type: "toggle",
+          topic: "ledstrip_livingroomState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "ledstrip_livingroombrightness"
+        },
+        {
+          type: "dropDown",
+          text: "Modus",
+          topic: "livingroommode",
+          options: {
+            "-1": "Cancel Animation",
+            "0": "Pink",
+            "1": "Kodi",
+            "2": "Sleep",
+            "3": "RGB Fade",
+            "4": "Work",
+            "5": "Winter"
+          },
+          icon: svg(icons.mdiCog)
+        },
+        {
+          type: "section",
+          text: "RGB"
+        }
+      ]).concat(sliderRGB("ledstrip_livingroom", "r"))
+        .concat(sliderRGB("ledstrip_livingroom", "g"))
+        .concat(sliderRGB("ledstrip_livingroom", "b"))
+        .concat([
+          {
+            type: "section",
+            text: "HSV"
+          }
+        ]).concat(sliderH("ledstrip_livingroom", "h"))
+        .concat(sliderSVXY("ledstrip_livingroom", "s"))
+        .concat(sliderSVXY("ledstrip_livingroom", "v"))
+        .concat([
+          {
+            type: "section",
+            text: "XY"
+          }
+        ]).concat(sliderSVXY("ledstrip_livingroom", "x"))
+        .concat(sliderSVXY("ledstrip_livingroom", "y"))
+    },
+    livingroomFountain: {
+      name: "Brunnen Wohnzimmer",
+      position: [550, 240],
+      icon: svg(icons.mdiFountain).color(
+        ({powerFountainState}) =>
+        (powerFountainState === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: ([
+        {
+          type: "toggle",
+          topic: "powerFountainState",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+      ]),
+    },
+    livingroomSoundbar: {
+      name: "Soundbar Wohnzimmer",
+      position: [550, 200],
+      icon: svg(icons.mdiSpeaker).color(
+        ({livingroomSoundbarPower}) =>
+        (livingroomSoundbarPower === "on" ? hex("#00FF00") : hex("#000000"))),
+      ui: ([
+        {
+          type: "toggle",
+          topic: "livingroomSoundbarPower",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower)
+        },
+        {
+          type: "toggle",
+          topic: "livingroomSoundbarHDMI",
+          text: "Input: HDMI",
+          icon: svg(icons.mdiVideoInputHdmi)
+        },
+        {
+          type: "slider",
+          min: 0,
+          max: 100,
+          text: "Lautstärke",
+          icon: svg(icons.mdiVolumeHigh),
+          topic: "livingroomSoundbarVolume"
+        },
+        {
+          type: "toggle",
+          topic: "projectorControlsSoundbar",
+          text: "Projector Controlled",
+          icon: svg(icons.mdiProjector)
+        },
+      ])
+    },
+    livingroomLedStripWled: {
+      name: "Ledstreifen Wohnzimmer",
+      position: [550, 160],
+      /* eslint-disable camelcase */
+      icon: svg(icons.mdiWhiteBalanceIridescent).color(
+        ({wled_livingroom_brightness}) =>
+        (wled_livingroom_brightness !== "0" ? hex("#00FF00") : hex("#000000"))),
+      /* eslint-enable camelcase */
+      ui: ([
+        {
+          type: "toggle",
+          topic: "wled_livingroom_brightness",
+          text: "Ein/Ausschalten",
+          icon: svg(icons.mdiPower),
+          on: "107",
+          off: "0",
+          toggled: (n) => parseInt(n, 10) > 0
+        },
+        {
+          type: "slider",
+          min: 1,
+          max: 255,
+          text: "Helligkeit",
+          icon: svg(icons.mdiBrightness7),
+          topic: "wled_livingroom_brightness"
+        },
+        {
+          type: "link",
+          link: "http://192.168.0.61/",
+          text: "Open Webinterface",
+          icon: svg(icons.mdiOpenInNew)
+        }
+      ])
     }
   },
   layers: [