diff --git a/docker-compose.yml b/docker-compose.yml
index 258b425..60ee45e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,6 @@ services:
     restart: unless-stopped
     #network_mode: host
     links:
-#      - "raspberrymatic:raspberrymatic"
       - "mqtt:mqtt"
     ports:
       - "8123:8123"
diff --git a/homeassistant/automations.yaml b/homeassistant/automations.yaml
index 9c8db4e..bd4ddcc 100644
--- a/homeassistant/automations.yaml
+++ b/homeassistant/automations.yaml
@@ -86,10 +86,15 @@
       - light.bogenlampe
     data: {}
   - action: light.turn_on
-    metadata: {}
-    data: {}
     target:
-      device_id: 8a71457ca3d2c1be55ea34f0037e8756
+      entity_id: light.lichtschlauch_white
+    data: {}
+  - action: light.turn_off
+    metadata: {}
+    data:
+      transition: 1
+    target:
+      entity_id: light.lichtschlauch_rgb
   mode: single
 - id: '1723274776341'
   alias: Fernbedienung aus
@@ -110,3 +115,107 @@
       - 8a71457ca3d2c1be55ea34f0037e8756
       - 9d7380c58b619962e11dda1d5a060938
   mode: single
+- id: '1725182808963'
+  alias: Flurlampe an
+  description: ''
+  trigger:
+  - platform: sun
+    event: sunset
+    offset: 0
+  condition: []
+  action:
+  - action: light.turn_on
+    metadata: {}
+    data:
+      brightness_pct: 60
+    target:
+      device_id: 31458ee6ea6b3cae1015375c243efffb
+  mode: single
+- id: '1725182915207'
+  alias: Flurlampe aus
+  description: ''
+  trigger:
+  - platform: time
+    at: 01:00:00
+  condition: []
+  action:
+  - action: light.turn_off
+    metadata: {}
+    data: {}
+    target:
+      device_id: 31458ee6ea6b3cae1015375c243efffb
+  mode: single
+- id: '1732045729333'
+  alias: Wasser Spüle
+  description: ''
+  trigger:
+  - type: moist
+    platform: device
+    device_id: ed19b3502ef3dad70cca3de834a993bc
+    entity_id: af627c5df02c10ebfdc7e677b2934f12
+    domain: binary_sensor
+  condition: []
+  action:
+  - action: notify.mobile_app_sm_a536b
+    metadata: {}
+    data:
+      message: Wasser unter der Spüle!
+  - action: notify.mobile_app_sm_s901b
+    metadata: {}
+    data:
+      message: Wasser unter der Spüle!
+  mode: single
+- id: '1732467176209'
+  alias: Controller - Philips 929002398602 Hue Dimmer switch v2
+  description: ''
+  use_blueprint:
+    path: EPMatt/philips_929002398602.yaml
+    input:
+      integration: Zigbee2MQTT
+      controller_entity: sensor.fernbedienung_bad_battery
+      helper_last_controller_event: input_text.last_controller_event2
+      action_button_up_double:
+      - action: light.turn_on
+        metadata: {}
+        data:
+          kelvin: 4222
+        target:
+          device_id: 4a993938cbf7289987eb684f71b00b92
+      action_button_down_double:
+      - action: light.turn_on
+        metadata: {}
+        data:
+          kelvin: 2627
+        target:
+          device_id: 4a993938cbf7289987eb684f71b00b92
+- id: '1732736495026'
+  alias: Lichter aus bei Sonnenaufgang
+  description: ''
+  trigger:
+  - platform: time
+    at: 01:00:00
+  condition: []
+  action:
+  - action: light.turn_off
+    metadata: {}
+    data: {}
+    target:
+      device_id: 03477708398bb2e1ceb3f4a776770a29
+  mode: single
+- id: '1732736623945'
+  alias: Licht an bei Sonnenuntergang
+  description: ''
+  trigger:
+  - platform: sun
+    event: sunset
+    offset: -00:30:00
+  condition: []
+  action:
+  - action: light.turn_on
+    metadata: {}
+    data:
+      kelvin: 2490
+      brightness_pct: 85
+    target:
+      device_id: 03477708398bb2e1ceb3f4a776770a29
+  mode: single
diff --git a/zb2mqttdata/configuration.yaml b/zb2mqttdata/configuration.yaml
index b62df18..5bf088f 100644
--- a/zb2mqttdata/configuration.yaml
+++ b/zb2mqttdata/configuration.yaml
@@ -26,6 +26,20 @@ devices:
     friendly_name: Fernbedienung
   '0x00212effff0cb8b6':
     friendly_name: Lichtschlauch
+  '0x0ceff6fffebf4739':
+    friendly_name: '0x0ceff6fffebf4739'
+  '0xa4c138541ec8ddd2':
+    friendly_name: Flur
+  '0xa4c1384187f0960d':
+    friendly_name: Wasser Sensor Spüle
+  '0x001788010d1c884e':
+    friendly_name: Badlampe
+  '0x001788010e8a8be7':
+    friendly_name: Fernbedienung Bad
+  '0x00158d00053a1aab':
+    friendly_name: Küchentisch
+  '0x00158d00053c6311':
+    friendly_name: Flurlampe
 homeassistant:
   legacy_entity_attributes: false
   legacy_triggers: false
diff --git a/zb2mqttdata/state.json b/zb2mqttdata/state.json
index c5da650..39ff8e8 100644
--- a/zb2mqttdata/state.json
+++ b/zb2mqttdata/state.json
@@ -6,46 +6,113 @@
             "installed_version": 51999504,
             "latest_version": 51999504
         },
-        "brightness": 135,
-        "state": "ON",
+        "brightness": 79,
+        "state": "OFF",
         "color": {
-            "x": 0.4273,
-            "y": 0.4005
+            "x": 0.4599,
+            "y": 0.4106
         },
-        "color_temp": 318,
-        "linkquality": 159
-    },
-    "0xa4c138570b1956d9": {
-        "temperature": 25.87,
-        "humidity": 53.49,
-        "battery": 76,
-        "linkquality": 223
-    },
-    "0xa4c1383ec7aa7d95": {
-        "temperature": 25.86,
-        "humidity": 55.51,
-        "battery": 73,
+        "color_temp": 370,
         "linkquality": 255
     },
+    "0xa4c138570b1956d9": {
+        "temperature": 22.35,
+        "humidity": 64.87,
+        "battery": 20,
+        "linkquality": 7
+    },
+    "0xa4c1383ec7aa7d95": {
+        "temperature": 23.18,
+        "humidity": 54.91,
+        "battery": 36,
+        "linkquality": 111
+    },
     "0xa4c1383db5531833": {
-        "temperature": 24.5,
-        "humidity": 59.9,
-        "battery": 24,
-        "linkquality": 239
+        "temperature": 21.5,
+        "humidity": 71.3,
+        "battery": 21,
+        "linkquality": 95
     },
     "0x000d6f00109eb214": {
-        "linkquality": 151
+        "linkquality": 231,
+        "voltage": 3000,
+        "battery": 100
     },
     "0x00212effff0cb8b6": {
         "color_mode": "xy",
         "state": "OFF",
         "state_rgb": "OFF",
-        "brightness_white": 254,
-        "state_white": "ON",
-        "brightness_rgb": 132,
+        "brightness_white": 125,
+        "state_white": "OFF",
+        "brightness_rgb": 23,
         "color_mode_rgb": "color_temp",
-        "color_temp_rgb": 340,
+        "color_temp_rgb": 199,
         "color_mode_white": "color_temp",
-        "color_temp_white": 500
+        "color_temp_white": 284,
+        "color": {
+            "x": 0.6942,
+            "y": 0.2963
+        },
+        "color_white": {
+            "x": 0.4042,
+            "y": 0.3902
+        },
+        "color_rgb": {
+            "x": 0.3445,
+            "y": 0.3512
+        },
+        "linkquality": 199
+    },
+    "0x0ceff6fffebf4739": {
+        "linkquality": 119
+    },
+    "0xa4c138541ec8ddd2": {
+        "state": "ON",
+        "brightness": 152,
+        "linkquality": 255
+    },
+    "0xa4c1384187f0960d": {
+        "water_leak": false,
+        "tamper": false,
+        "battery_low": false,
+        "battery": 100,
+        "voltage": 2800,
+        "linkquality": 215
+    },
+    "0x001788010d1c884e": {
+        "color_mode": "color_temp",
+        "update": {
+            "state": "available",
+            "installed_version": 16784652,
+            "latest_version": 16786434
+        },
+        "state": "ON",
+        "brightness": 254,
+        "linkquality": 31,
+        "color_temp": 366
+    },
+    "0x001788010e8a8be7": {
+        "battery": 100,
+        "update": {
+            "state": "idle",
+            "installed_version": 33565954,
+            "latest_version": 33565954
+        },
+        "linkquality": 103
+    },
+    "0x00158d00053a1aab": {
+        "color_mode": "color_temp",
+        "state": "OFF",
+        "color_temp": 413,
+        "brightness": 215,
+        "linkquality": 255,
+        "color_temp_startup": 400
+    },
+    "0x00158d00053c6311": {
+        "color_mode": "color_temp",
+        "state": "ON",
+        "color_temp": 401,
+        "brightness": 216,
+        "linkquality": 175
     }
 }
\ No newline at end of file