diff --git a/lovelace/dashboard/hello_world.yaml b/lovelace/dashboard/hello_world.yaml
index 5550861..365e91f 100644
--- a/lovelace/dashboard/hello_world.yaml
+++ b/lovelace/dashboard/hello_world.yaml
@@ -4,7 +4,7 @@
   entity: input_boolean.welcome_collapse
   variables:
     ulm_card_welcome_scenes_collapse: input_boolean.welcome_collapse #OPTIONAl --> uncomment also entity or triggers_update
-    ulm_weather: weather.pirateweather
+    ulm_weather: weather.forecast_home
     entity_1:
       entity_id: light.living_room_lights
       icon: "mdi:lightbulb" #OPTIONAL
diff --git a/lovelace/dashboard/lights.yaml b/lovelace/dashboard/lights.yaml
index 42e8869..202e0fb 100644
--- a/lovelace/dashboard/lights.yaml
+++ b/lovelace/dashboard/lights.yaml
@@ -65,7 +65,7 @@
 
 - type: "custom:button-card"
   template: card_light
-  entity: light.bedroom_switch_lamp
+  entity: light.bedroom_switch_tv
   variables:
     ulm_card_light_icon: mdi:television
     ulm_card_light_enable_color: true
diff --git a/lovelace/dashboard/temperature.yaml b/lovelace/dashboard/temperature.yaml
index d9b72f8..4389aa9 100644
--- a/lovelace/dashboard/temperature.yaml
+++ b/lovelace/dashboard/temperature.yaml
@@ -1,5 +1,5 @@
 - type: custom:weather-card
-  entity: weather.pirateweather
+  entity: weather.forecast_home
 
 - type: area
   area: nursery
diff --git a/packages/nursery/nursery.yaml b/packages/nursery/nursery.yaml
index ac2be79..e8ed466 100644
--- a/packages/nursery/nursery.yaml
+++ b/packages/nursery/nursery.yaml
@@ -103,4 +103,26 @@ automation:
       - type: turn_off
         device_id: 8d78194d0cb175221b3b0ffa337a9592
         entity_id: light.nursery_bulb
-        domain: light
\ No newline at end of file
+        domain: light
+
+  - id: '1689371777559'
+  - alias: Baby Notification
+    description: ''
+    trigger:
+    - platform: state
+      entity_id:
+      - binary_sensor.baby_cam_noise
+      to: 'on'
+    condition:
+      - condition: state
+        entity_id: input_boolean.baby_cry_notification
+        state: 'on'
+    action:
+      - service: notify.mobile_app_pixel_7_pro
+        data:
+          message: Baby schreit
+        data:
+          image: /api/camera_proxy/camera.nursery_baby_cam?token={{state_attr('camera.nursery_baby_cam','access_token')}}
+          url: /dashboard-babycam
+          clickAction: /dashboard-babycam/0
+    mode: single
\ No newline at end of file
diff --git a/packages/office/button.yaml b/packages/office/button.yaml
index 285ec10..a76e44a 100644
--- a/packages/office/button.yaml
+++ b/packages/office/button.yaml
@@ -13,8 +13,8 @@ automation:
         device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
       - type: turn_off
-        entity_id: light.guestroom_switch_lamp
-        device_id: 343b205f3ed48a715e59c5490050150f
+        entity_id: light.office_switch_socket
+        device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
         domain: light
  
   # Office button turn light on
@@ -45,8 +45,8 @@ automation:
         device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
       - type: turn_on
-        entity_id: light.guestroom_switch_lamp
-        device_id: 343b205f3ed48a715e59c5490050150f
+        entity_id: light.office_switch_socket
+        device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
         domain: light
 
 #### Remote ####
@@ -77,9 +77,13 @@ automation:
         entity_id: light.office_bulb
         device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
+      - type: turn_off
+        entity_id: light.office_switch_socket
+        device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
+        domain: light
 
   # Office remote turn pc on
-  - alias: office_light_remote_turn_on_pc
+  - alias: office_remote_turn_on_pc
     trigger:
       - device_id: 8cc9ef0e9155403ae478abf46bd884e4
         domain: zha
@@ -88,11 +92,12 @@ automation:
         subtype: left
     action:
       - type: turn_on
-        entity_id: switch.tower
-      - type: turn_on
-        entity_id: light.guestroom_switch_lamp
-        device_id: 343b205f3ed48a715e59c5490050150f
+        entity_id: light.office_switch_socket
+        device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
         domain: light
+      - service: switch.turn_on
+        target:
+          entity_id: switch.tower
 
   # Office remote turn all off
   - alias: office_light_remote_turn_off_all
diff --git a/packages/office/pc.yaml b/packages/office/wol.yaml
similarity index 52%
rename from packages/office/pc.yaml
rename to packages/office/wol.yaml
index b5a2296..a8bdc85 100644
--- a/packages/office/pc.yaml
+++ b/packages/office/wol.yaml
@@ -5,3 +5,7 @@ switch:
     mac: !secret tower_mac
     name: tower
 
+switch:
+  - platform: wake_on_lan
+    mac: !secret nas_mac
+    name: nas
\ No newline at end of file