diff --git a/automations.yaml b/automations.yaml
index eeedb7f..2c3c5f1 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -9,3 +9,24 @@
   condition: []
   action: []
   mode: single
+- 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
diff --git a/go2rtc.yaml b/go2rtc.yaml
new file mode 100644
index 0000000..6cbe008
--- /dev/null
+++ b/go2rtc.yaml
@@ -0,0 +1,2 @@
+streams:
+    name: rtsp://hansen:hansen@192.168.2.49:554/stream1
\ No newline at end of file
diff --git a/lovelace/dashboard/harmony/harmony.yaml b/lovelace/dashboard/harmony/harmony.yaml
old mode 100755
new mode 100644
diff --git a/lovelace/dashboard/harmony/volume_control.yaml b/lovelace/dashboard/harmony/volume_control.yaml
old mode 100755
new mode 100644
diff --git a/lovelace/dashboard/hello_world.yaml b/lovelace/dashboard/hello_world.yaml
old mode 100755
new mode 100644
index 9e7826e..5550861
--- a/lovelace/dashboard/hello_world.yaml
+++ b/lovelace/dashboard/hello_world.yaml
@@ -11,21 +11,27 @@
       name: LivingRoom
       color: "blue"
     entity_2:
+      entity_id: switch.nursery
+      icon: "mdi:human-baby-changing-table" #OPTIONAL
+      name: Diaper
+      color: "pink"    
+    entity_3:
       entity_id: script.netflix_and_chill
       icon: "mdi:netflix" #OPTIONAL
       name: Netflix
       color: "red"
-    entity_3:
+    entity_4:
       entity_id: script.denon_listen_music
       icon: "mdi:spotify" #OPTIONAL
       name: Spotify
       color: "green"
-    entity_4:
+    entity_5:
       entity_id: script.denon_tv_turn_off
       icon: "mdi:television-off" #OPTIONAL
       name: TV OFF
       color: "black"
 
+
 - type: horizontal-stack    
   cards:
     - type: 'custom:button-card'
@@ -67,8 +73,73 @@
         ulm_card_person_use_entity_picture: true
         ulm_card_person_icon: mdi:face-woman
 
+- type: "custom:button-card"
+  template: card_title
+  name: Adaptive
+  label: Bulbs
 
-- type: custom:weather-card
-  entity: weather.pirateweather
+- type: horizontal-stack
+  cards:
+    - type: "custom:button-card"
+      template: card_light
+      entity: light.office_bulb
+      variables:
+        ulm_card_light_enable_slider: true
+        ulm_card_light_enable_color: true
+        ulm_card_light_force_background_color: true
+        ulm_card_light_name: Office
+        ulm_card_light_enable_collapse: true
+    - type: "custom:button-card"
+      template: card_light
+      entity: light.bedroom_bulb_light
+      variables:
+        ulm_card_light_enable_slider: true
+        ulm_card_light_enable_color: true
+        ulm_card_light_force_background_color: true
+        ulm_card_light_name: Bedroom
+        ulm_card_light_enable_collapse: true
 
+- type: horizontal-stack
+  cards:
+    - type: "custom:button-card"
+      template: card_light
+      entity: light.bedroom_bulb_toni_light
+      variables:
+        ulm_card_light_enable_slider: true
+        ulm_card_light_enable_color: true
+        ulm_card_light_force_background_color: true
+        ulm_card_light_name: "Bedroom Toni"
+        ulm_card_light_enable_collapse: true
+    - type: "custom:button-card"
+      template: card_light
+      entity: light.bedroom_bulb_philipp_light
+      variables:
+        ulm_card_light_enable_slider: true
+        ulm_card_light_enable_color: true
+        ulm_card_light_force_background_color: true
+        ulm_card_light_name: "Bedroom Philipp"
+        ulm_card_light_enable_collapse: true
 
+- type: "custom:button-card"
+  template: card_light
+  entity: light.nursery_bulb
+  variables:
+    ulm_card_light_enable_slider: true
+    ulm_card_light_enable_color: true
+    ulm_card_light_force_background_color: true
+    ulm_card_light_name: "Jakob"
+    ulm_card_light_enable_collapse: true
+
+- type: "horizontal-stack"
+  cards:
+    - type: "custom:button-card"
+      template: card_input_boolean
+      entity: switch.adaptive_lighting_default
+      variables:
+        ulm_card_input_boolean_name: Adaptive
+
+    - type: "custom:button-card"
+      template: card_input_boolean
+      entity: switch.adaptive_lighting_sleep_mode_default
+      variables:
+        ulm_card_input_boolean_name: Sleep
\ No newline at end of file
diff --git a/lovelace/dashboard/kunibert.yaml b/lovelace/dashboard/kunibert.yaml
old mode 100755
new mode 100644
diff --git a/lovelace/dashboard/laundry.yaml b/lovelace/dashboard/laundry.yaml
old mode 100755
new mode 100644
diff --git a/lovelace/dashboard/lights.yaml b/lovelace/dashboard/lights.yaml
old mode 100755
new mode 100644
index 148928e..42e8869
--- a/lovelace/dashboard/lights.yaml
+++ b/lovelace/dashboard/lights.yaml
@@ -1,64 +1,3 @@
-- type: "custom:button-card"
-  template: card_title
-  name: Adaptive
-  label: Bulbs
-
-- type: horizontal-stack
-  cards:
-    - type: "custom:button-card"
-      template: card_light
-      entity: light.office_bulb
-      variables:
-        ulm_card_light_enable_slider: true
-        ulm_card_light_enable_color: true
-        ulm_card_light_force_background_color: true
-        ulm_card_light_name: Office
-        ulm_card_light_enable_collapse: true
-    - type: "custom:button-card"
-      template: card_light
-      entity: light.bedroom_bulb_light
-      variables:
-        ulm_card_light_enable_slider: true
-        ulm_card_light_enable_color: true
-        ulm_card_light_force_background_color: true
-        ulm_card_light_name: Bedroom
-        ulm_card_light_enable_collapse: true
-
-- type: horizontal-stack
-  cards:
-    - type: "custom:button-card"
-      template: card_light
-      entity: light.bedroom_bulb_toni_light
-      variables:
-        ulm_card_light_enable_slider: true
-        ulm_card_light_enable_color: true
-        ulm_card_light_force_background_color: true
-        ulm_card_light_name: "Bedroom Toni"
-        ulm_card_light_enable_collapse: true
-    - type: "custom:button-card"
-      template: card_light
-      entity: light.bedroom_bulb_philipp_light
-      variables:
-        ulm_card_light_enable_slider: true
-        ulm_card_light_enable_color: true
-        ulm_card_light_force_background_color: true
-        ulm_card_light_name: "Bedroom Philipp"
-        ulm_card_light_enable_collapse: true
-
-- type: "horizontal-stack"
-  cards:
-    - type: "custom:button-card"
-      template: card_input_boolean
-      entity: switch.adaptive_lighting_default
-      variables:
-        ulm_card_input_boolean_name: Adaptive
-
-    - type: "custom:button-card"
-      template: card_input_boolean
-      entity: switch.adaptive_lighting_sleep_mode_default
-      variables:
-        ulm_card_input_boolean_name: Sleep
-
 - type: "custom:button-card"
   template: card_title
   name: Living Room
@@ -91,11 +30,24 @@
         ulm_card_light_name: Sill
     - type: "custom:button-card"
       template: card_light
-      entity: light.livingroom_switch_lamp
+      entity: light.living_room_lights
       variables:
         ulm_card_light_enable_color: true
         ulm_card_light_force_background_color: true
-        ulm_card_light_name: Tanne
+        ulm_card_light_name: All
+
+- type: 'custom:button-card'
+  template: card_title
+  name: Heat Lamp
+  label: Jakob
+
+- type: "custom:button-card"
+  template: card_light
+  entity: switch.nursery
+  variables:
+    ulm_card_light_enable_color: true
+    ulm_card_light_force_background_color: true
+    ulm_card_light_name: Heat Lamp
 
 - type: "custom:button-card"
   template: card_title
diff --git a/lovelace/dashboard/sensors.yaml b/lovelace/dashboard/sensors.yaml
old mode 100755
new mode 100644
index 2114dbd..4a41b42
--- a/lovelace/dashboard/sensors.yaml
+++ b/lovelace/dashboard/sensors.yaml
@@ -52,28 +52,3 @@
         ulm_card_binary_sensor_alert_name : "Mailbox Motion"
       entity: binary_sensor.mailbox_motion_iaszone
 
-- type: 'custom:button-card'
-  template: card_graph
-  entity: sensor.livingroom_temp_temperature
-  variables:
-    ulm_card_graph_color: "var(--google-blue)"
-    ulm_card_graph_name: Temperature Livingroom
-    ulm_card_graph_entity: sensor.livingroom_temp_temperature
-    ulm_card_graph_color2: "var(--google-green)"
-    ulm_card_graph_entity2: sensor.livingroom_temp_temperature
-    ulm_card_graph_type: fill
-    ulm_card_graph_hours: 24
-- type: 'custom:button-card'
-  template: card_graph
-  entity: sensor.livingroom_temp_humidity
-  variables:
-    ulm_card_graph_color: "var(--google-blue)"
-    ulm_card_graph_name: Temperature Livingroom
-    ulm_card_graph_entity: sensor.livingroom_temp_humidity
-    ulm_card_graph_color2: "var(--google-green)"
-    ulm_card_graph_entity2: sensor.livingroom_temp_humidity
-    ulm_card_graph_type: fill
-    ulm_card_graph_hours: 24
-
-
-
diff --git a/lovelace/dashboard/temperature.yaml b/lovelace/dashboard/temperature.yaml
new file mode 100644
index 0000000..d9b72f8
--- /dev/null
+++ b/lovelace/dashboard/temperature.yaml
@@ -0,0 +1,15 @@
+- type: custom:weather-card
+  entity: weather.pirateweather
+
+- type: area
+  area: nursery
+  theme: blue
+- type: area
+  area: living_room
+  theme: red
+- type: area
+  area: bedroom
+  theme: green
+- type: area
+  area: office
+  theme: red
diff --git a/packages/door_sensors/door_sensors.yaml b/packages/door_sensors/door_sensors.yaml
old mode 100755
new mode 100644
index 7ac4960..d3ade0e
--- a/packages/door_sensors/door_sensors.yaml
+++ b/packages/door_sensors/door_sensors.yaml
@@ -32,4 +32,67 @@ automation:
       - service: notify.notify
         data:
           message: ist noch offen!
-          title: Freezer
\ No newline at end of file
+          title: Freezer
+
+# Badezimmer oder Gartentüre offen
+  - alias: open_doors_check
+    trigger:
+      - device_id: 95d34c3939ded141bc463c7dbfdeabea
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_on
+    condition:
+      - condition: or
+        conditions:
+          - type: is_open
+            condition: device
+            device_id: 85dbfa4e5a7ad4dcc73d74b8f051647b
+            entity_id: binary_sensor.bathroom_window_iaszone
+            domain: binary_sensor
+          - type: is_open
+            condition: device
+            device_id: b8119ef2d21afde8394d70373bb9621e
+            entity_id: binary_sensor.livingroom_freezer_iaszone
+            domain: binary_sensor
+          - type: is_open
+            condition: device
+            device_id: bb0545a3347e971df3a86ffa24477c12
+            entity_id: binary_sensor.livingroom_door_garden_iaszone
+            domain: binary_sensor
+    action:
+      - service: notify.notify
+        data:
+          message: ist noch was offen.
+          title: Alaaarm
+
+  - alias: turn_off_stuff
+    trigger:
+      - device_id: 95d34c3939ded141bc463c7dbfdeabea
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_off
+    action:
+      - service: light.turn_off
+        target: 
+          entity_id: light.bedroom_lights
+      - service: light.turn_off
+        target: 
+          entity_id: light.living_room_lights
+      - service: light.turn_off
+        target:
+          entity_id: light.office_bulb
+      - service: light.turn_off
+        target:
+          entity_id: light.guestroom_switch_lamp
+      - service: script.turn_on
+        target:
+          entity_id: script.denon_tv_turn_off
+      - service: light.turn_off
+        target:
+          entity_id: light.bedroom_switch_lamp
+      
+      
+      
+        
\ No newline at end of file
diff --git a/packages/harmony/harmony.yaml b/packages/harmony/harmony.yaml
old mode 100755
new mode 100644
diff --git a/packages/harmony/netflix.yaml b/packages/harmony/netflix.yaml
old mode 100755
new mode 100644
diff --git a/packages/harmony/turn_on_tv.yaml b/packages/harmony/turn_on_tv.yaml
old mode 100755
new mode 100644
diff --git a/packages/harmony/volume_control.yaml b/packages/harmony/volume_control.yaml
old mode 100755
new mode 100644
diff --git a/packages/homeassistant/default_theme.yaml b/packages/homeassistant/default_theme.yaml
old mode 100755
new mode 100644
diff --git a/packages/homeassistant/homeassistant.yaml b/packages/homeassistant/homeassistant.yaml
old mode 100755
new mode 100644
diff --git a/packages/homeassistant/recorder.yaml b/packages/homeassistant/recorder.yaml
old mode 100755
new mode 100644
diff --git a/packages/html5_notifications/html5_notification.yaml b/packages/html5_notifications/html5_notification.yaml
old mode 100755
new mode 100644
diff --git a/packages/laundry/laundry_timer.yaml b/packages/laundry/laundry_timer.yaml
old mode 100755
new mode 100644
diff --git a/packages/laundry/timer.yaml b/packages/laundry/timer.yaml
old mode 100755
new mode 100644
index e0fcc48..dd15462
--- a/packages/laundry/timer.yaml
+++ b/packages/laundry/timer.yaml
@@ -1,3 +1,30 @@
 timer:
   laundry:
-    #duration: "03:20:00"
\ No newline at end of file
+    #duration: "03:20:00"
+
+sensor:
+  - platform: template
+    sensors:
+      laundry_remaining:
+        friendly_name: "Laundry Remaining"
+        value_template: >
+          {% set f = state_attr('timer.laundry', 'finishes_at') %}
+          {{ '00:00:00' if f == None else 
+            (as_datetime(f) - now()).total_seconds() | timestamp_custom('%H:%M:%S', false) }}
+template:
+  - trigger:
+      - platform: state
+        entity_id:
+          - timer.laundry
+        attribute: remaining
+    sensor:
+      # Keep track how many days have past since a date
+      - name: laundry_remaining
+        state: >
+          {% set f = state_attr('timer.laundry', 'finishes_at') %}
+          {% set res = '00:00:00' %}
+          {% if f != None %}
+          {{ (as_datetime(f) - now()).total_seconds() | timestamp_custom('%H:%M:%S', false) }}
+          {% else %}
+          {{ res }}
+          {% endif %}
\ No newline at end of file
diff --git a/packages/light/adaptive.yaml b/packages/light/adaptive.yaml
old mode 100755
new mode 100644
index bec24d4..60c192e
--- a/packages/light/adaptive.yaml
+++ b/packages/light/adaptive.yaml
@@ -7,4 +7,5 @@ adaptive_lighting:
     - light.office_bulb
     - light.bedroom_bulb_light
     - light.bedroom_bulb_toni_light
-    - light.bedroom_bulb_philipp_light
\ No newline at end of file
+    - light.bedroom_bulb_philipp_light
+    - light.nursery_bulb
\ No newline at end of file
diff --git a/packages/light/all_device_group.yaml b/packages/light/all_device_group.yaml
old mode 100755
new mode 100644
diff --git a/packages/light/bedroom_group.yaml b/packages/light/bedroom_group.yaml
old mode 100755
new mode 100644
diff --git a/packages/light/buttons/bedrooms.yaml b/packages/light/buttons/bedrooms.yaml
old mode 100755
new mode 100644
index ec3a59b..0823dc5
--- a/packages/light/buttons/bedrooms.yaml
+++ b/packages/light/buttons/bedrooms.yaml
@@ -1,19 +1,57 @@
 # Guest Room Button Light
 automation:
-  - alias: guestroom_light_button
-    trigger:
-      - device_id: c6b9d0a0f7a56e9f2966cdb8cb312614
-        domain: zha
-        platform: device
-        type: remote_button_short_press
-        subtype: button
-    action:
-      - type: toggle
-        device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
-        entity_id: light.guestroom_switch_lamp
-        domain: light
+  #- alias: guestroom_light_button
+    #trigger:
+      #- device_id: c6b9d0a0f7a56e9f2966cdb8cb312614
+        #domain: zha
+        #platform: device
+        #type: remote_button_short_press
+        #subtype: button
+    #action:
+      #- type: toggle
+        #device_id: 1fcba92f6a53183e10c1dc35a9bb82ce
+        #entity_id: light.guestroom_switch_lamp
+        #domain: light
 
 ###### Bedroom ######
+  - alias: bedroom_door_light_button_single_press
+    trigger:
+      - device_id: 1c88c2785261b381346bf6ea621d02ea
+        domain: zha 
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_on
+    action:
+      - type: turn_on
+        device_id: e0e71e574631d1fd7ebf960b883d1b6f
+        entity_id: light.bedroom_bulb_light
+        domain: light
+  
+  - alias: bedroom_door_light_button_long_press
+    trigger:
+      - device_id: 1c88c2785261b381346bf6ea621d02ea
+        domain: zha 
+        platform: device
+        type: remote_button_long_press
+        subtype: dim_up
+    action:
+      - type: turn_on
+        device_id: f472f0815009f1343028a8d6a41b34ae
+        entity_id: light.bedroom_lights
+        domain: light
+
+  - alias: bedroom_door_light_button_single_press_down
+    trigger:
+      - device_id: 1c88c2785261b381346bf6ea621d02ea
+        domain: zha 
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_off
+    action:
+      - type: turn_off
+        device_id: f472f0815009f1343028a8d6a41b34ae
+        entity_id: light.bedroom_lights
+        domain: light
 
   # Bedroom Button Philipp Light single press
   - alias: bedroom_light_button_philipp_single_press
diff --git a/packages/light/livingroom_group.yaml b/packages/light/livingroom_group.yaml
old mode 100755
new mode 100644
index f1e6b81..e8fe4fd
--- a/packages/light/livingroom_group.yaml
+++ b/packages/light/livingroom_group.yaml
@@ -4,6 +4,6 @@ light:
     name: "Living Room Lights"
     entities:
       - light.livingroom_switch_lamp_table
-      #- light.livingroom_switch_lamp_couch
-      #- light.living_room_switch_lamp_sill
-      - light.livingroom_switch_lamp
+      - light.livingroom_switch_lamp_couch
+      - light.living_room_switch_lamp_sill
+      #- light.livingroom_switch_lamp
diff --git a/packages/light/motion.yaml b/packages/light/motion.yaml
old mode 100755
new mode 100644
diff --git a/packages/livingroom/button/button.yaml b/packages/livingroom/button/button.yaml
old mode 100755
new mode 100644
diff --git a/packages/livingroom/remote/remote.yaml b/packages/livingroom/remote/remote.yaml
old mode 100755
new mode 100644
index d50e870..a712f37
--- a/packages/livingroom/remote/remote.yaml
+++ b/packages/livingroom/remote/remote.yaml
@@ -10,7 +10,7 @@ automation:
     action:
       - service: light.turn_on
         target: 
-          entity_id: light.living_room_lights
+          entity_id: light.livingroom_switch_lamp_table
   
   # Living Room button turn light off    
   - alias: living_room_light_button_turn_off
@@ -23,7 +23,7 @@ automation:
     action:
       - service: light.turn_off
         target: 
-          entity_id: light.living_room_lights
+          entity_id: light.livingroom_switch_lamp_table
 
   # Living Room button Netflix  
   - alias: living_room_light_button_tv
@@ -51,6 +51,19 @@ automation:
         target:
           entity_id: script.denon_listen_music
 
+  # Living Room button Turn On
+  - alias: living_room_turn_on_all_lights
+    trigger:
+      - device_id: 86384e5da7e890f4a7a84d186383d1c1
+        domain: zha
+        platform: device
+        type: remote_button_long_release
+        subtype: dim_up
+    action:
+      - service: light.turn_on
+        target: 
+          entity_id: light.living_room_lights
+
   # Living Room button Turn Off
   - alias: living_room_turn_off_everything
     trigger:
@@ -60,12 +73,13 @@ automation:
         type: remote_button_long_release
         subtype: dim_down
     action:
-      - service: script.turn_on
-        target:
-          entity_id: script.denon_tv_turn_off
       - service: light.turn_off
         target: 
-          entity_id: light.living_room_lights
+          entity_id: light.living_room_lights     
+      #- service: script.turn_on
+      #  target:
+      #    entity_id: script.denon_tv_turn_off
+
 
 #### Door Button ####
   # Living Room door button turn light on     
@@ -79,7 +93,7 @@ automation:
     action:
       - service: light.turn_on
         target: 
-          entity_id: light.living_room_lights
+          entity_id: light.livingroom_switch_lamp_table
   
   - alias: livingroom_button_door_turn_off
     trigger:
@@ -91,7 +105,7 @@ automation:
     action:
       - service: light.turn_off
         target: 
-          entity_id: light.living_room_lights
+          entity_id: light.livingroom_switch_lamp_table
       
   - alias: livingroom_button_door_turn_off_long
     trigger:
diff --git a/packages/mailbox/mailbox_received.yaml b/packages/mailbox/mailbox_received.yaml
old mode 100755
new mode 100644
diff --git a/packages/mailbox/mailbox_taken_out.yaml b/packages/mailbox/mailbox_taken_out.yaml
old mode 100755
new mode 100644
diff --git a/packages/mailbox/switch.yaml b/packages/mailbox/switch.yaml
old mode 100755
new mode 100644
diff --git a/packages/minimalist/minimalist_input.yaml b/packages/minimalist/minimalist_input.yaml
old mode 100755
new mode 100644
diff --git a/packages/nursery/babycrydetection.yaml b/packages/nursery/babycrydetection.yaml
new file mode 100644
index 0000000..4e5d1d8
--- /dev/null
+++ b/packages/nursery/babycrydetection.yaml
@@ -0,0 +1,4 @@
+input_boolean:
+  baby_cry_notification:
+    name: Notify @babycry
+    icon: mdi:baby-face-outline
diff --git a/packages/nursery/nursery.yaml b/packages/nursery/nursery.yaml
new file mode 100644
index 0000000..ac2be79
--- /dev/null
+++ b/packages/nursery/nursery.yaml
@@ -0,0 +1,106 @@
+automation:
+# Nursery heat lamp turn on from bedroom Philipp    
+  - alias: nursery_heat_lamp_bedroom_button_philipp_turn_on
+    trigger:
+      - device_id: 1baf5adc6850ac0413ee80d5ce75f1b8
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_on
+    action:
+      - type: turn_on
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+      - type: turn_on
+        device_id: 8d78194d0cb175221b3b0ffa337a9592
+        entity_id: light.nursery_bulb
+        domain: light
+      - delay:
+          minutes: 15
+      - type: turn_off
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+
+# Nursery heat lamp turn off from bedroom Philipp
+  - alias: nursery_heat_lamp_bedroom_button_philippturn_off
+    trigger:
+      - device_id: 1baf5adc6850ac0413ee80d5ce75f1b8
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_off
+    action:
+      - type: turn_off
+        device_id: 8d78194d0cb175221b3b0ffa337a9592
+        entity_id: light.nursery_bulb
+        domain: light
+      - type: turn_off
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+
+###### Nursery #####
+
+# Nursery heat lamp turn on button door
+  - alias: nursery_heat_lamp_turn_on_nursery_button_door
+    trigger:
+      - device_id: 990a122b3d7c305259f6033660c23e98
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_on
+    action:
+      - type: turn_on
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+      - type: turn_on
+        device_id: 8d78194d0cb175221b3b0ffa337a9592
+        entity_id: light.nursery_bulb
+        domain: light 
+      - delay:
+          minutes: 15
+      - type: turn_off
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+
+# Nursery heat lamp + light turn on button door
+  - alias: nursery_heat_lamp_bulb_turn_on_nursery_button_door
+    trigger:
+      - device_id: 990a122b3d7c305259f6033660c23e98
+        domain: zha
+        platform: device
+        type: remote_button_long_press
+        subtype: dim_up
+    action:
+      - type: turn_on
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch    
+      - delay:
+          minutes: 15
+      - type: turn_off
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+
+# Nursery heat lamp turn off button door
+  - alias: nursery_heat_lamp_turn_off_nursery_button_door
+    trigger:
+      - device_id: 990a122b3d7c305259f6033660c23e98
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_off
+    action:
+      - type: turn_off
+        device_id: f544eb364af0e4c42f36e5479f79e111
+        entity_id: switch.nursery
+        domain: switch
+      - type: turn_off
+        device_id: 8d78194d0cb175221b3b0ffa337a9592
+        entity_id: light.nursery_bulb
+        domain: light
\ No newline at end of file
diff --git a/packages/office/button.yaml b/packages/office/button.yaml
old mode 100755
new mode 100644
index 7a944df..285ec10
--- a/packages/office/button.yaml
+++ b/packages/office/button.yaml
@@ -13,7 +13,7 @@ automation:
         device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
       - type: turn_off
-        entity_id: light.office_switch_socket
+        entity_id: light.guestroom_switch_lamp
         device_id: 343b205f3ed48a715e59c5490050150f
         domain: light
  
@@ -45,6 +45,65 @@ automation:
         device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
       - type: turn_on
-        entity_id: light.office_switch_socket
+        entity_id: light.guestroom_switch_lamp
         device_id: 343b205f3ed48a715e59c5490050150f
+        domain: light
+
+#### Remote ####
+  # Office remote turn light on
+  - alias: office_light_remote_turn_on
+    trigger:
+      - device_id: 8cc9ef0e9155403ae478abf46bd884e4
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_on
+    action:
+      - type: turn_on
+        entity_id: light.office_bulb
+        device_id: ce016fbf6d9602740bbabe1fe9915c88
+        domain: light
+
+  # Office remote turn light off
+  - alias: office_light_remote_turn_off
+    trigger:
+      - device_id: 8cc9ef0e9155403ae478abf46bd884e4
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: turn_off
+    action:
+      - type: turn_off
+        entity_id: light.office_bulb
+        device_id: ce016fbf6d9602740bbabe1fe9915c88
+        domain: light
+
+  # Office remote turn pc on
+  - alias: office_light_remote_turn_on_pc
+    trigger:
+      - device_id: 8cc9ef0e9155403ae478abf46bd884e4
+        domain: zha
+        platform: device
+        type: remote_button_short_press
+        subtype: left
+    action:
+      - type: turn_on
+        entity_id: switch.tower
+      - type: turn_on
+        entity_id: light.guestroom_switch_lamp
+        device_id: 343b205f3ed48a715e59c5490050150f
+        domain: light
+
+  # Office remote turn all off
+  - alias: office_light_remote_turn_off_all
+    trigger:
+      - device_id: 8cc9ef0e9155403ae478abf46bd884e4
+        domain: zha
+        platform: device
+        type: remote_button_long_press
+        subtype: dim_down
+    action:
+      - type: turn_off
+        entity_id: light.office_bulb
+        device_id: ce016fbf6d9602740bbabe1fe9915c88
         domain: light
\ No newline at end of file
diff --git a/packages/office/pc.yaml b/packages/office/pc.yaml
old mode 100755
new mode 100644
diff --git a/packages/pirateweather.yaml b/packages/pirateweather.yaml
deleted file mode 100755
index ca1991b..0000000
--- a/packages/pirateweather.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-weather:
-  - platform: pirateweather
-    api_key: !secret pirate_weather_api
-    mode: daily
\ No newline at end of file
diff --git a/packages/turn_off_everything.txt b/packages/turn_off_everything.txt
old mode 100755
new mode 100644
diff --git a/resources.yaml b/resources.yaml
old mode 100755
new mode 100644
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
old mode 100755
new mode 100644
index e98e910..7bed7e4
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -26,8 +26,16 @@ views:
         cards:
           !include lovelace/dashboard/sensors.yaml
   - type: custom:vertical-layout
-    title: "TV Remote"
+    title: "Temperatures"
     path: 1
+    cards:
+      - type: custom:horizontal-layout
+        type: vertical-stack
+        cards:
+          !include lovelace/dashboard/temperature.yaml
+  - type: custom:vertical-layout
+    title: "TV Remote"
+    path: 2
     cards:
       - type: custom:vertical-layout
         type: vertical-stack
@@ -40,7 +48,7 @@ views:
           !include lovelace/dashboard/harmony/volume_control.yaml
   - type: custom:vertical-layout
     title: "Laundry"
-    path: 2
+    path: 3
     cards:
       - type: custom:vertical-layout
         type: vertical-stack
@@ -48,7 +56,7 @@ views:
           !include lovelace/dashboard/laundry.yaml
   - type: custom:vertical-layout
     title: "Kunibert"
-    path: 3
+    path: 4
     cards:
       - type: custom:vertical-layout
         type: vertical-stack