diff --git a/alexa.yaml b/alexa.yaml
index 3105e24..1f56b8f 100644
--- a/alexa.yaml
+++ b/alexa.yaml
@@ -8,6 +8,7 @@
         - light.ambilight
         - light.kuchen_theke
         - light.esstisch
+        - light.office
         - switch.livingroom_stimmungslicht
         - switch.livingroom_music
         - switch.livingroom_netflix
@@ -32,7 +33,10 @@
         description: Küche - Theken-Lichter
       light.esstisch:
         name: Esstisch
-        description: Küche - Esstisch-Lampen
+        description: Esstisch-Lichter
+      light.office:
+        name: Büro
+        description: Büro - Deckenlampe
       light.stimmungslicht:
         name: Stimmungslicht
         description: Wohnzimmer - Stimmungslicht
diff --git a/automations/theme-switch.yaml b/automations/theme-switch.yaml
new file mode 100644
index 0000000..7835e37
--- /dev/null
+++ b/automations/theme-switch.yaml
@@ -0,0 +1,28 @@
+# You can replace default by Light - Green, for example
+- alias: 'Set theme at startup'
+  trigger:
+  - platform: homeassistant
+    event: start
+  action:
+  - service: frontend.set_theme
+    data:
+      name: default
+- alias: 'Set HA theme for day and night'
+  trigger:
+  - platform: homeassistant
+    event: start
+  - platform: state
+    entity_id: sun.sun
+    to: above_horizon
+  - platform: state
+    entity_id: sun.sun
+    to: below_horizon
+  action:
+  - service_template: frontend.set_theme
+    data_template:
+      name: >
+        {% if states.sun.sun.state == "above_horizon" %}
+          default
+        {% else %}
+          default
+        {% endif %}
\ No newline at end of file
diff --git a/configuration.yaml b/configuration.yaml
index 9565067..eb7370a 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -7,6 +7,7 @@ homeassistant:
   time_zone: Europe/Berlin
   customize: !include_dir_merge_named customizations/
   auth_providers:
+    - type: homeassistant
     - type: trusted_networks
       trusted_networks:
         - 127.0.0.1
@@ -15,6 +16,7 @@ homeassistant:
         - fd00::/8
 
 frontend:
+  themes: !include_dir_merge_named themes/
 
 http:
   ip_ban_enabled: true
@@ -28,11 +30,16 @@ lovelace:
   mode: yaml
 
 zone:
-  - name: !secret work1_name
-    latitude: !secret work1_lat
-    longitude: !secret work1_long
+  - name: !secret work_name_f
+    latitude: !secret work_lat_f
+    longitude: !secret work_long_f
     radius: 250
     icon: mdi:briefcase
+  - name: !secret work_name_j
+    latitude: !secret work_lat_j
+    longitude: !secret work_long_j
+    radius: 500
+    icon: mdi:briefcase
 
 system_health:
 
@@ -45,7 +52,8 @@ updater:
 conversation:
 
 tts:
-  - platform: google
+  - platform: google_translate
+    service_name: google_say
 
 history:
 
@@ -132,8 +140,8 @@ notify:
   - name: telegram_fb
     platform: telegram
     chat_id: !secret telegram_chat_fb
-  - name: android
-    platform: fcm-android
+#  - name: android
+#    platform: fcm-android
 
 device_tracker:
 
@@ -174,25 +182,11 @@ binary_sensor:
     name: Morning
     after: '05:00'
     before: '11:00'
-  - platform: mqtt
-    state_topic: /home/camera/yihome1/motion/state
-    name: YiHome1 Alarm
-    payload_on: 1
-    payload_off: 0
-  - platform: command_line
-    name: backup_error_occured
-    command: 'if [ `wc -l < /backuplogs/run.err.log` -eq 0 ]; then echo 0; else echo 1; fi'
-    payload_on: 1
-    payload_off: 0
-    scan_interval: 1800
-    device_class: 'problem'
-  - platform: command_line
-    name: backup_sync_error_occured
-    command: 'if [ `wc -l < /backuplogs/sync.err.log` -eq 0 ]; then echo 0; else echo 1; fi'
-    payload_on: 1
-    payload_off: 0
-    scan_interval: 1800
-    device_class: 'problem'
+  - platform: ffmpeg_motion
+    input: '-rtsp_transport udp -i rtsp://192.168.2.31/ch0_0.h264'
+    name: camera_home1_motion
+    changes: 50
+    reset: 20
 
 weather:
   - platform: openweathermap
@@ -204,25 +198,15 @@ weather:
 #  bed: true
 #  number_of_tools: 1
 
-#ffmpeg:
-#  ffmpeg_bin: /usr/bin/ffmpeg
+ffmpeg:
+  ffmpeg_bin: /usr/bin/ffmpeg
+
+stream:
 
 camera:
-#  - platform: yi
-#    name: YiHome1
-#    host: !secret yihome1
-#    password: !secret yihome1_password
-#    ffmpeg_arguments: '-pred 1 -vf scale=800:450'
-#  - platform: mqtt
-#    name: YiHome1-Mqtt
-#    topic: /home/camera/yihome1/motion/photo
-    #  - platform: mjpeg
-    #    name: octoprint_webcam
-    #    mjpeg_url: !secret octoprint_cam_url
-    #  - platform: local_file
-    #name: elisey_shocked
-    #friendly_name: Schlechtes Wetter
-    #file_path: /local/elisey_shocked.png
+  - platform: ffmpeg
+    name: home1
+    input: '-rtsp_transport tcp -i rtsp://192.168.2.31/ch0_0.h264'
 
 input_datetime:
     bedroom_alarm_clock_time:
@@ -231,19 +215,23 @@ input_datetime:
         has_time: true
 
 panel_iframe:
-  deconz:
-    title: 'Deconz'
-    url: !secret url_deconz
-    icon: mdi:gate-and
   chronograf:
     title: 'Chronograf'
     url: !secret url_chronograf
     icon: mdi:monitor-dashboard
+  deconz:
+    title: 'Deconz'
+    url: !secret url_deconz
+    icon: mdi:gate-and
+  esphome:
+    title: 'ESPHome'
+    url: !secret url_esphome
+    icon: mdi:chip
 
-#alert: !include alerts.yaml
+alert: !include_dir_merge_list alerts/
 alexa: !include alexa.yaml
 automation: !include_dir_merge_list automations/
 #scene: !include scenes.yaml
 script: !include scripts.yaml
 sensor: !include_dir_merge_list sensors/
-switch: !include switches.yaml
\ No newline at end of file
+switch: !include switches.yaml
diff --git a/lovelace-views/cctv.yaml b/lovelace-views/cctv.yaml
index fc80e3e..9c2d63f 100644
--- a/lovelace-views/cctv.yaml
+++ b/lovelace-views/cctv.yaml
@@ -2,9 +2,5 @@ icon: mdi:cctv
 path: cctv
 cards:
     - type: picture-entity
-      name: Haustür
-      entity: camera.yihome1
-    - type: picture-entity
-      name: Haustür Alarm Image
-      entity: binary_sensor.yihome1_alarm
-      camera_image: camera.yihome1_alarm
+      name: Büro
+      entity: camera.home1
diff --git a/lovelace-views/devices.yaml b/lovelace-views/devices.yaml
index 15aba8f..40f5ad7 100644
--- a/lovelace-views/devices.yaml
+++ b/lovelace-views/devices.yaml
@@ -6,22 +6,23 @@ cards:
       - entity: sensor.myip
         name: Öffentliche IP
         icon: mdi:earth
-  - type: entities
-    title: Florian
-    show_header_toggle: false
-    entities:
-      - entity: device_tracker.mobile_fb
-        name: Standort
-      - entity: sensor.device_mobile_fb_battery
-        name: Handy-Akku
-        icon: mdi:battery
-  - type: entities
-    title: Jenny
-    show_header_toggle: false
-    entities:
-      - entity: device_tracker.mobile_fb
-        name: Standort
-      - entity: sensor.device_mobile_fb_battery
-        name: Handy-Akku
-        icon: mdi:battery
-
+  - type: horizontal-stack
+    cards:
+    - type: entities
+      title: Florian
+      show_header_toggle: false
+      entities:
+        - entity: device_tracker.mobile_fb
+          name: Standort
+        - entity: sensor.device_mobile_fb_battery
+          name: Handy-Akku
+          icon: mdi:battery
+    - type: entities
+      title: Jenny
+      show_header_toggle: false
+      entities:
+        - entity: device_tracker.mobile_fb
+          name: Standort
+        - entity: sensor.device_mobile_fb_battery
+          name: Handy-Akku
+          icon: mdi:battery
diff --git a/lovelace-views/humidity.yaml b/lovelace-views/humidity.yaml
index 913417d..5afe270 100644
--- a/lovelace-views/humidity.yaml
+++ b/lovelace-views/humidity.yaml
@@ -1,21 +1,151 @@
 icon: mdi:water-percent
 path: humidity
 cards:
-  - type: history-graph
-    title: 'Badezimmer'
-    refresh_interval: 30
-    entities:
-      - entity: sensor.bathroom_hygrometer_temperature
-        name: Temperatur
-      - entity: sensor.bathroom_hygrometer_humidity
-        name: Luftfeuchtigkeit
-  - type: history-graph
-    title: 'Dachboden'
-    refresh_interval: 30
-    entities:
-      - entity: sensor.attic_temperature
-        name: Temperatur
-      - entity: sensor.attic_heatIndex
-        name: Gefühlt
-      - entity: sensor.attic_humidity
-        name: Luftfeuchtigkeit
\ No newline at end of file
+  - type: vertical-stack
+    cards:
+      - type: markdown
+        content: "### Elternbad"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.parents_bathroom_hygrometer_humidity
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.parents_bathroom_hygrometer_temperature
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### \"Kinderbad\""
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.kids_bathroom_hygrometer_humidity
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.kids_bathroom_hygrometer_temperature
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### Schlafzimmer"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.humidity_12
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.temperature_11
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### Gästezimmer"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.humidity_18
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.temperature_17
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+  - type: vertical-stack
+    cards:
+      - type: markdown
+        content: "### Wohnzimmer"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.humidity_4
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.temperature_3
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### Hauswirtschaftsraum"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.hwr_hygrometer_humidity
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.hwr_hygrometer_temperature
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### Büro"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.humidity_15
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.temperature_14
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
+      - type: markdown
+        content: "### Dachboden"
+      - type: horizontal-stack
+        cards:
+          - type: sensor
+            entity: sensor.attic_humidity_2
+            name: Luftfeuchtigkeit
+            graph: line
+            unit: "%"
+            detail: 2
+            hours_to_show: 12
+          - type: sensor
+            entity: sensor.attic_temperature_2
+            name: Temperatur
+            graph: line
+            unit: °C
+            detail: 2
+            hours_to_show: 12
diff --git a/lovelace-views/kitchen.yaml b/lovelace-views/kitchen.yaml
deleted file mode 100644
index 87c91dc..0000000
--- a/lovelace-views/kitchen.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-title: Küche
-path: kitchen
-cards:
-  # Lights
-  - type: entities
-    entities:
-      - entity: light.kuchen_theke
-        name: Küchen-Theke
-      - entity: light.esstisch
-        name: Esstisch
\ No newline at end of file
diff --git a/lovelace-views/lights.yaml b/lovelace-views/lights.yaml
new file mode 100644
index 0000000..ffe3586
--- /dev/null
+++ b/lovelace-views/lights.yaml
@@ -0,0 +1,18 @@
+title: Lichter
+path: lights
+cards:
+  - type: light
+    entity: light.kuchen_theke
+    name: Küchen-Theke
+  - type: light
+    entity: light.office 
+    name: Büro  
+  - type: light
+    entity: light.stimmungslicht
+    name: Stimmungslicht
+  - type: light
+    entity: light.ambilight
+    name: Ambilight
+  - type: light
+    entity: light.esstisch
+    name: Esstisch
\ No newline at end of file
diff --git a/lovelace-views/overview.yaml b/lovelace-views/overview.yaml
index 0362cfe..acf004b 100644
--- a/lovelace-views/overview.yaml
+++ b/lovelace-views/overview.yaml
@@ -3,14 +3,15 @@ path: overview
 cards:
   - type: vertical-stack
     cards:
-    - type: weather-forecast
+    - type: custom:weather-card
       entity: weather.openweathermap
-#    - type: iframe
-#      url: !secret iframe_windy
-#      aspect_ratio: 75%
+      name: Wetter
     - type: iframe
-      url: !secret iframe_earth
+      url: !secret iframe_windy
       aspect_ratio: 75%
+#    - type: iframe
+#      url: !secret iframe_earth
+#      aspect_ratio: 75%
   - type: conditional
     conditions:
       - entity: binary_sensor.workday_sensor
@@ -24,36 +25,6 @@ cards:
       entities:
         - entity: sensor.salzbergen_to_munster_hbf
           name: Abfahrt
-  - type: vertical-stack
-    cards:
-    - type: glance
-      title: Temperatur
-      show_name: true
-      show_state: true
-      entities:
-        - entity: sensor.bathroom_hygrometer_temperature
-          name: Badezimmer
-          icon: mdi:thermometer
-        - entity: sensor.temperature_3
-          name: Wohnzimmer
-          icon: mdi:thermometer
-        - entity: sensor.attic_temperature
-          name: Dachboden
-          icon: mdi:thermometer
-    - type: glance
-      title: Luftfeuchtigkeit
-      show_name: true
-      show_state: true
-      entities:
-        - entity: sensor.bathroom_hygrometer_humidity
-          name: Badezimmer
-          icon: mdi:water-percent
-        - entity: sensor.humidity_4
-          name: Wohnzimmer
-          icon: mdi:water-percent
-        - entity: sensor.attic_humidity
-          name: Dachboden
-          icon: mdi:water-percent
   - type: vertical-stack
     cards:
       - type: glance
@@ -64,4 +35,4 @@ cards:
         aspect_ratio: 75%
         default_zoom: 15
         entities:
-          - zone.home
\ No newline at end of file
+          - zone.home
diff --git a/sensors/mqtt.yaml b/sensors/mqtt.yaml
index 93f1808..e3eecbc 100644
--- a/sensors/mqtt.yaml
+++ b/sensors/mqtt.yaml
@@ -9,20 +9,4 @@
   name: "mobile_fb_callstate"
   state_topic: "homeassistant/sensor/android_mobile_fb_callstate/state"
   value_template: "{{ value_json.state }}"
-  json_attributes_topic: "homeassistant/sensor/android_mobile_fb_callstate/state"
-
-- platform: mqtt
-  name: "Attic Humidity"
-  state_topic: "home/attic/homenodeTiny1/humidity"
-  force_update: true
-  unit_of_measurement: "%"
-- platform: mqtt
-  name: "Attic Temperature"
-  state_topic: "home/attic/homenodeTiny1/temperature"
-  force_update: true
-  unit_of_measurement: "°C"
-- platform: mqtt
-  name: "Attic HeatIndex"
-  state_topic: "home/attic/homenodeTiny1/heatIndex"
-  force_update: true
-  unit_of_measurement: "°C"
+  json_attributes_topic: "homeassistant/sensor/android_mobile_fb_callstate/state"
\ No newline at end of file
diff --git a/switches.yaml b/switches.yaml
index 6c1f241..654cc6f 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -1,3 +1,8 @@
+- platform: wake_on_lan
+  name: Computer
+  mac_address: "50-E5-49-C4-DF-B4"
+  host: "192.168.2.168"
+
 - platform: template
   switches:
     harmony_music_bt:
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 46fdbf2..6a3f37a 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -1,11 +1,16 @@
 # Icons @ https://materialdesignicons.com/
 title: Making Home Great Again
+
 views:
   - !include lovelace-views/overview.yaml
-  - !include lovelace-views/kitchen.yaml
+  - !include lovelace-views/lights.yaml
   - !include lovelace-views/livingroom.yaml
   - !include lovelace-views/humidity.yaml
   - !include lovelace-views/spotify.yaml
   - !include lovelace-views/instagram.yaml
   - !include lovelace-views/devices.yaml
-#  - !include lovelace-views/cctv.yaml
\ No newline at end of file
+  - !include lovelace-views/cctv.yaml
+
+resources:
+  - url: https://cdn.jsdelivr.net/gh/bramkragten/custom-ui@master/weather-card/weather-card.min.js
+    type: module