diff --git a/automations.yaml b/automations.yaml
index 061a120..81dc8c2 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -48,19 +48,6 @@
     target:
       entity_id: light.aida_ei
   mode: single
-- id: MultisensorBatteryLowNotification
-  alias: MultisensorBatteryLowNotification
-  trigger:
-  - platform: numeric_state
-    entity_id: sensor.batt_multisensor
-    below: '40'
-  action:
-  - service: notify.pushover
-    data:
-      message: Time to change batteries of MultiSensor
-      title: ''
-  initial_state: true
-  mode: single
 - id: ZwaveTemperatureToHomematicTimed
   alias: 'Timed: Provide Humidity Aussen to Homematic'
   description: ''
@@ -107,16 +94,18 @@
   mode: single
 - id: standlamp_off
   alias: Stehlampe aus
-  trigger:
-    platform: time
-    at: '23:43:11'
-  action:
-    service: light.turn_off
-    entity_id:
-    - light.stehlampe
-    - light.lampe_kuche
+  triggers:
+  - at: '23:13:11'
+    trigger: time
+  actions:
+  - action: light.turn_off
+    metadata: {}
     data:
       transition: 5
+    target:
+      entity_id:
+      - light.wzstehlampe
+      - light.klampekuehlschrank
 - id: HallwayLightSwitchOnSunsetBased
   alias: HallwayLightSwitchOnSunsetBased
   trigger:
@@ -321,25 +310,34 @@
 - id: '1582149264429'
   alias: 'Aus: Lichter beim Verlassen morgens'
   description: ''
-  trigger:
+  triggers:
   - entity_id: group.all_mobile_devices
     from: home
-    platform: state
     to: not_home
+    trigger: state
   - at: '8:45'
-    platform: time
-  condition:
+    trigger: time
+  conditions:
   - condition: time
     before: '9:00'
-  action:
+  actions:
   - device_id: e872770fe15a488c9f5a5604b1ada0eb
     domain: light
     entity_id: light.bodenlampe
     type: turn_off
-  - device_id: 528e131b5e274f58bb37a9d102283acb
-    domain: light
-    entity_id: light.klampekuehlschrank
-    type: turn_off
+  - action: light.turn_off
+    metadata: {}
+    data: {}
+    target:
+      entity_id:
+      - light.klampekuehlschrank
+      - light.klampetisch
+      area_id: 18df026954d241b48e4e78dbd043d9cd
+  - action: switch.turn_off
+    metadata: {}
+    data: {}
+    target:
+      area_id: 18df026954d241b48e4e78dbd043d9cd
   mode: single
 - id: '1590530631139'
   alias: 'Ein: Diskstation fuer Backup (Mittwochs)'
@@ -412,21 +410,6 @@
       message: IP stimmt nicht mehr -> DNS updaten
       title: DNS Check
   mode: single
-- id: '1614029930763'
-  alias: test
-  description: ''
-  trigger:
-  - platform: time_pattern
-    seconds: /30
-  condition:
-  - condition: state
-    entity_id: input_boolean.vacation_mode
-    state: 'off'
-  action:
-  - service: notify.pushover
-    data:
-      message: blub
-  mode: single
 - id: '1619867143833'
   alias: 'TV: VDR bei TV-Aktivierung einschalten wenn aus'
   description: ''
@@ -801,32 +784,6 @@
       - light.0x04cd15fffe78a60e
       - light.stehlampe_studio
   mode: single
-- id: '1679573420341'
-  alias: 'Studio: Licht ein bei Bewegung in Dunkelheit'
-  description: ''
-  trigger:
-  - platform: state
-    entity_id:
-    - binary_sensor.bewegung_studio_occupancy_delayed_off
-    from: 'off'
-    to: 'on'
-  condition:
-  - condition: numeric_state
-    entity_id: sensor.bewegung_studio_illuminance_lux
-    attribute: illuminance_lux
-    below: 50
-  action:
-  - service: light.turn_on
-    data:
-      transition: 20
-      rgb_color:
-      - 0
-      - 189
-      - 22
-      brightness_pct: 24
-    target:
-      entity_id: light.0x04cd15fffe78a60e
-  mode: single
 - id: '1679573943226'
   alias: 'Studio: Home office enabled'
   description: ''
@@ -883,10 +840,10 @@
 - id: '1682840484924'
   alias: 'Alert: Rollos nicht verfügbar'
   description: ''
-  trigger:
-  - platform: time_pattern
-    minutes: /2
-  condition:
+  triggers:
+  - minutes: /2
+    trigger: time_pattern
+  conditions:
   - condition: state
     entity_id: input_boolean.alertingrollos
     state: 'off'
@@ -907,7 +864,7 @@
         minutes: 0
         seconds: 15
     - condition: state
-      entity_id: cover.bedroom_cover_r
+      entity_id: cover.shelly2pmg4_ccba97d54bd4
       state: unavailable
       for:
         hours: 0
@@ -921,27 +878,27 @@
         minutes: 0
         seconds: 15
     - condition: state
-      entity_id: cover.bedroom_cover_r
+      entity_id: cover.shelly2pmg4_ccba97d54bd4
       state: unknown
       for:
         hours: 0
         minutes: 0
         seconds: 15
-  action:
-  - service: notify.pushover
-    data:
+  actions:
+  - data:
       message: Rollo nicht verfügbar
       title: Alert
       data:
         priority: 1
-  - service: input_boolean.turn_on
-    data: {}
+    action: notify.pushover
+  - data: {}
     target:
       entity_id: input_boolean.alertingrollos
-  - service: notify.persistent_notification
-    data:
+    action: input_boolean.turn_on
+  - data:
       title: Alert
       message: 'Eins der Rollos ist nicht verfügbar '
+    action: notify.persistent_notification
   mode: single
 - id: '1682842740198'
   alias: 'Reset: Inputhelper at midnight'
@@ -1116,8 +1073,8 @@
     target:
       entity_id:
       - cover.bedroom_cover_l
-      - cover.bedroom_cover_r
       - cover.00115a498e0439
+      - cover.shelly2pmg4_ccba97d54bd4
     action: cover.set_cover_position
   mode: single
 - id: '1713246439689'
@@ -1534,6 +1491,9 @@
   - trigger: time_pattern
     minutes: /5
   conditions:
+  - condition: state
+    entity_id: input_boolean.sonnenschutz
+    state: 'on'
   - condition: time
     after: '14:30:00'
     before: '17:30:00'
@@ -1551,6 +1511,10 @@
     entity_id: sensor.daily_forecast
     attribute: temperature
     above: 21
+  - condition: numeric_state
+    entity_id: sensor.daily_forecast
+    attribute: cloud_coverage
+    below: 65
   actions:
   - action: cover.set_cover_position
     metadata: {}
@@ -1594,3 +1558,169 @@
     target:
       entity_id: cover.00115a498e0439
   mode: single
+- id: '1752095551982'
+  alias: 'Anwesenheit: Wohnzimmer alles aus, wenn alle weg'
+  description: ''
+  triggers:
+  - trigger: state
+    entity_id:
+    - binary_sensor.bewegung_wohnzimmer_occupancy_delayed
+    from: 'on'
+    to: 'off'
+  conditions:
+  - condition: time
+    after: '22:00:00'
+    before: 07:00:00
+  actions:
+  - action: light.turn_off
+    metadata: {}
+    data: {}
+    target:
+      area_id: 18df026954d241b48e4e78dbd043d9cd
+    enabled: true
+  - action: switch.turn_off
+    metadata: {}
+    data: {}
+    target:
+      area_id: 18df026954d241b48e4e78dbd043d9cd
+    enabled: true
+  - action: notify.pushover
+    metadata: {}
+    data:
+      message: Wohnzimmer könnte man ausschalten
+      title: Abwesenheit
+  mode: single
+- id: '1752899862524'
+  alias: 'Urlaub: Rollos hoch nach Sonnenaufgang '
+  description: ''
+  triggers:
+  - trigger: sun
+    event: sunrise
+    offset: '+1:00'
+  conditions:
+  - condition: state
+    entity_id: input_boolean.vacation_mode
+    state: 'on'
+  actions:
+  - action: cover.set_cover_position
+    metadata: {}
+    data:
+      position: 35
+    target:
+      entity_id:
+      - cover.00115a498e0439
+      - cover.bedroom_cover_r
+  - action: cover.set_cover_position
+    metadata: {}
+    data:
+      position: 55
+    target:
+      entity_id: cover.bedroom_cover_l
+  mode: single
+- id: '1758736082054'
+  alias: 'Licht: Küche abends'
+  description: ''
+  triggers:
+  - trigger: sun
+    event: sunset
+    offset: 0:10:00
+  - trigger: time_pattern
+    hours: '*'
+    minutes: /15
+  conditions:
+  - condition: time
+    after: '17:30:00'
+  actions:
+  - action: light.turn_on
+    metadata: {}
+    data: {}
+    target:
+      entity_id: light.klampekuehlschrank
+  mode: single
+- id: '1760273725236'
+  alias: 'Bad: Lüftung ein wenn Luftfeuchte über Mittel'
+  description: ''
+  triggers:
+  - trigger: time_pattern
+    minutes: /2
+  conditions:
+  - condition: numeric_state
+    entity_id: sensor.wt_og_bad_001_luftfeuchtigkeit
+    above: sensor.luftfeuchtebadavg
+  actions:
+  - if:
+    - condition: numeric_state
+      entity_id: sensor.wt_eg_wf_001_luftfeuchtigkeit
+      above: sensor.luftfeuchtebadavg
+    then:
+    - action: switch.turn_on
+      metadata: {}
+      data: {}
+      target:
+        entity_id: switch.es_og_bad_001
+    else:
+    - delay:
+        hours: 0
+        minutes: 5
+        seconds: 0
+        milliseconds: 0
+    - action: switch.turn_off
+      metadata: {}
+      data: {}
+      target:
+        entity_id: switch.es_og_bad_001
+  mode: single
+- id: '1760726601116'
+  alias: 'Anwesenheit: Studio Licht'
+  description: ''
+  triggers:
+  - trigger: state
+    entity_id:
+    - binary_sensor.presencestudio_presence
+    - sensor.presencestudio_movement
+  conditions:
+  - condition: numeric_state
+    entity_id: sensor.4in1sensoroutside_illuminance
+    below: 200
+  actions:
+  - choose:
+    - conditions:
+      - condition: state
+        entity_id: binary_sensor.presencestudio_presence
+        state: 'on'
+      sequence:
+      - action: light.turn_on
+        metadata: {}
+        data:
+          rgb_color:
+          - 14
+          - 204
+          - 0
+          brightness_pct: 56
+        target:
+          entity_id: light.stimmungslichtstudio
+      - action: light.turn_on
+        metadata: {}
+        data:
+          brightness_pct: 50
+        target:
+          entity_id: light.stehlampestudio
+    - conditions:
+      - condition: state
+        entity_id: binary_sensor.presencestudio_presence
+        state: 'off'
+      sequence:
+      - delay:
+          hours: 0
+          minutes: 2
+          seconds: 0
+          milliseconds: 0
+      - action: light.turn_off
+        metadata: {}
+        data:
+          transition: 2
+        target:
+          entity_id:
+          - light.stehlampestudio
+          - light.stimmungslichtstudio
+  mode: restart
diff --git a/configuration.yaml b/configuration.yaml
index ee82186..669a48d 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -74,11 +74,6 @@ automation: !include automations.yaml
 script: !include scripts.yaml
 scene: !include scenes.yaml
 
-media_player:
-- platform: vdr
-  host: 192.168.178.200
-  timeout: 2
-
 homematic:
   local_port: 8060
   interfaces:
@@ -151,11 +146,16 @@ emulated_hue:
   exposed_domains:
     - light
     - switch
-#
+
 logbook:
-#
+
 alexa:
-#intent_script: !include_dir_named alexa/
+  smart_home:
+    locale: de-DE
+    filter:
+      include_entities:
+        - light.wzstehlampe
+        - light.kellerlampe
 intent_script: !include alexa.yaml
 
 #
@@ -275,8 +275,6 @@ google_assistant:
     - sensor
     - climate
 
-#shelly:
-
 mqtt:
   sensor:
     - name: shelly_outsid__temp
@@ -295,20 +293,6 @@ mqtt:
     payload_open: "up"
     payload_close: "down"
     payload_stop: "stop"
-  - name: bedroom_cover_r
-    command_topic: "shellies/shellyswitch25-76D19E/roller/0/command"
-    position_topic: "shellies/shellyswitch25-76D19E/roller/0/pos"
-    set_position_topic: "shellies/shellyswitch25-76D19E/roller/0/command/pos"
-    payload_available: "true"
-    payload_not_available: "false"
-    qos: 1
-    retain: false
-    payload_open: "open"
-    payload_close: "close"
-    payload_stop: "stop"
-    position_open: 100
-    position_closed: 0
-    optimistic: false
   - name: bedroom_cover_l
     command_topic: "shellies/shellyswitch25-C4C361/roller/0/command"
     position_topic: "shellies/shellyswitch25-C4C361/roller/0/pos"
@@ -410,7 +394,6 @@ recorder:
       - group.tradfri
       - sensor.dark_sky_icon
 
-
 logger:
   default: warning
   logs:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e180db..f6754d5 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - postgres
 #      - mariadb_1x
       - mosquitto
-      - zigbee2mqtt
+#      - zigbee2mqtt
 
   postgres:
     container_name: ha-postgres-db
@@ -36,6 +36,7 @@ services:
 
   mosquitto:
     container_name: mosquitto
+#    image: eclipse-mosquitto:2.0.21
     image: eclipse-mosquitto:1.6.15
     restart: always
     ports:
@@ -67,22 +68,22 @@ services:
       - homeassistant
 
 
-  zigbee2mqtt:
-    container_name: zigbee2mqtt
-    restart: unless-stopped
-    image: koenkk/zigbee2mqtt:${ZIGBEE2MQTT_TAG}
-    depends_on:
-      - mosquitto
-    devices:
-#      - /dev/ttyACM0
-      - /dev/ttyUSB0
-    volumes:
-      - ./docker-data/z2m:/app/data
-      - /run/udev:/run/udev:ro
-    ports:
-      - 8383:8080
-    environment:
-      - TZ=${TZ}
+#   zigbee2mqtt:
+#     container_name: zigbee2mqtt
+#     restart: unless-stopped
+#     image: koenkk/zigbee2mqtt:${ZIGBEE2MQTT_TAG}
+#     depends_on:
+#       - mosquitto
+#     devices:
+# #      - /dev/ttyACM0
+#       - /dev/ttyUSB0
+#     volumes:
+#       - ./docker-data/z2m:/app/data
+#       - /run/udev:/run/udev:ro
+#     ports:
+#       - 8383:8080
+#     environment:
+#       - TZ=${TZ}
   #   # group_add:
   #   #   - dialout
   #   # user: 1000:1000