diff --git a/include/automations/doerklokke_bag.yaml b/include/automations/doerklokke_bag.yaml
index 267c525..6feeef2 100644
--- a/include/automations/doerklokke_bag.yaml
+++ b/include/automations/doerklokke_bag.yaml
@@ -18,7 +18,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren
           
@@ -134,7 +134,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - doublepress
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - doublepress
       - choose:
@@ -220,7 +220,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - triple-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - triple-press
       - choose:
@@ -306,7 +306,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - long-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - long-press
       - choose:
diff --git a/include/automations/doerklokke_bag2.yaml b/include/automations/doerklokke_bag2.yaml
index bace48f..19f23cb 100644
--- a/include/automations/doerklokke_bag2.yaml
+++ b/include/automations/doerklokke_bag2.yaml
@@ -30,7 +30,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - doublepress
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - doublepress
       - choose:
@@ -116,7 +116,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - triple-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - triple-press
       - choose:
@@ -202,7 +202,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på bagdøren - long-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på bagdøren - long-press
       - choose:
diff --git a/include/automations/doerklokke_for.yaml b/include/automations/doerklokke_for.yaml
index 6638a85..76a8d8a 100644
--- a/include/automations/doerklokke_for.yaml
+++ b/include/automations/doerklokke_for.yaml
@@ -19,7 +19,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på fordøren
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på fordøren
       - choose:
@@ -134,7 +134,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på fordøren - doublepress
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på fordøren - doublepress
       - choose:
@@ -220,7 +220,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på fordøren - triple-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på fordøren - triple-press
       - choose:
@@ -306,7 +306,7 @@
       - service: notify.mobile_app_clausiphone
         data:
           message: Det ringer på fordøren - long-press
-      - service: notify.mobile_app_annes_iphone_xs
+      - service: notify.mobile_app_annes_iphone_14_pro
         data:
           message: Det ringer på fordøren - long-press
       - choose:
diff --git a/include/automations/kommerhjem.yaml b/include/automations/kommerhjem.yaml
index a64bb0b..81a3744 100644
--- a/include/automations/kommerhjem.yaml
+++ b/include/automations/kommerhjem.yaml
@@ -16,7 +16,7 @@
      to: 'home'  
 
    action:
-     service: notify.mobile_app_annes_iphone_xs
+     service: notify.mobile_app_annes_iphone_14_pro
      data:
        message: 'Daniel kommer hjem'
 
@@ -38,7 +38,7 @@
      to: 'home'  
 
    action:
-     service: notify.mobile_app_annes_iphone_xs
+     service: notify.mobile_app_annes_iphone_14_pro
      data:
        message: 'Andreas kommer hjem'
 
@@ -63,7 +63,7 @@
      to: 'Skole'  
 
    action:
-     service: notify.mobile_app_annes_iphone_xs
+     service: notify.mobile_app_annes_iphone_14_pro
      data:
        message: 'Andreas ankommer til skole'
 
@@ -98,7 +98,7 @@
      to: 'Skole'  
 
    action:
-     service: notify.mobile_app_annes_iphone_xs
+     service: notify.mobile_app_annes_iphone_14_pro
      data:
        message: 'Daniel ankommer til skole'
 
diff --git a/include/automations/lys_andreas.yaml b/include/automations/lys_andreas.yaml
index 5b97b8d..09c366e 100644
--- a/include/automations/lys_andreas.yaml
+++ b/include/automations/lys_andreas.yaml
@@ -24,7 +24,7 @@
         state: 'on'
       - condition: time
         after: '06:30:00'
-        before: '19:30:00'
+        before: '19:45:00'
     action:
       - service: homeassistant.turn_on
         target: 
diff --git a/include/automations/lys_daniel.yaml b/include/automations/lys_daniel.yaml
index 2cc973c..814ed39 100644
--- a/include/automations/lys_daniel.yaml
+++ b/include/automations/lys_daniel.yaml
@@ -46,7 +46,7 @@
         state: 'off'
       - condition: time
         after: '10:00:00'
-        before: '20:30:00'
+        before: '19:45:00'
     action:
       - service: homeassistant.turn_on
         target: 
diff --git a/include/automations/lys_gang.yaml b/include/automations/lys_gang.yaml
index c63813f..528fd45 100644
--- a/include/automations/lys_gang.yaml
+++ b/include/automations/lys_gang.yaml
@@ -11,7 +11,7 @@
         entity_id: sensor.gang_sensor_illuminance
         below: '70'
       - condition: time
-        before: '19:30:00'
+        before: '20:00:00'
       - condition: time
         after: '06:30:00'        
     action:
@@ -35,7 +35,7 @@
       - condition: time
         after: '06:30:10'
       - condition: time
-        before: '19:30:00'
+        before: '20:00:00'
     action:
       service: light.turn_off
       data:
@@ -100,7 +100,7 @@
         below: '70'
       - condition: time
         before: '06:30:00'
-        after: '19:30:00'        
+        after: '20:00:00'        
     action:
     - service: scene.turn_on
       data:
@@ -120,7 +120,7 @@
         entity_id: binary_sensor.arbejdsdag
         state: 'on'
       - condition: time
-        after: '19:30:10'
+        after: '20:00:10'
         before: '06:30:00'
     action:
       service: light.turn_off
diff --git a/include/automations/lys_sauna.yaml b/include/automations/lys_sauna.yaml
index 440d051..e29033d 100644
--- a/include/automations/lys_sauna.yaml
+++ b/include/automations/lys_sauna.yaml
@@ -1,65 +1,13 @@
 
-  - alias: 'Lys sauna dag - arbejdsdag'
+  - alias: 'Lys sauna dag'
     trigger:
       platform: state
       entity_id: binary_sensor.sauna_motion_motion
       to: 'on'
-    condition:
-      - condition: numeric_state
-        entity_id: sensor.sauna_motion_illuminance
-        below: 90
-      - condition: state
-        entity_id: binary_sensor.arbejdsdag
-        state: 'on'
-      - condition: time
-        before: '22:30:00'
-      - condition: time
-        after: '06:00:00'        
     action:
       - service: scene.turn_on
         data:
           entity_id: scene.sauna_klar
-
-  - alias: 'Lys sauna dag - ikke arbejdsdag'
-    trigger:
-      platform: state
-      entity_id: binary_sensor.sauna_motion_motion
-      to: 'on'
-    condition:
-      - condition: numeric_state
-        entity_id: sensor.sauna_motion_illuminance
-        below: 90
-      - condition: state
-        entity_id: binary_sensor.arbejdsdag
-        state: 'off'
-      - condition: time
-        before: '22:30:00'
-      - condition: time
-        after: '06:00:00'        
-    action:
-      - service: scene.turn_on
-        data:
-          entity_id: scene.sauna_klar
-
-
-  - alias: 'Lys i sauna - nat'
-    trigger:
-      platform: state
-      entity_id: binary_sensor.sauna_motion_motion
-      to: 'on'
-    condition:
-      - condition: numeric_state
-        entity_id: sensor.sauna_motion_illuminance
-        below: '70'
-      - condition: time
-        after: '22:30:00'
-      - condition: time
-        before: '06:00:00'        
-    action:
-    - service: scene.turn_on
-      data:
-        entity_id: scene.sauna_daempet
-
           
 
   - alias: 'Sluk lys i sauna'
diff --git a/include/scripts/doorbell.yaml b/include/scripts/doorbell.yaml
index 5267195..e1abdd5 100644
--- a/include/scripts/doorbell.yaml
+++ b/include/scripts/doorbell.yaml
@@ -11,7 +11,7 @@ doorbell:
     - service: notify.mobile_app_clausiphone
       data:
         message: '{{ tekst }}'
-    - service: notify.mobile_app_annes_iphone_xs
+    - service: notify.mobile_app_annes_iphone_14_pro
       data:
         message: '{{ tekst }}'
     - choose:
diff --git a/include/scripts/sunrise.yaml b/include/scripts/sunrise.yaml
index b5b3caf..6231313 100644
--- a/include/scripts/sunrise.yaml
+++ b/include/scripts/sunrise.yaml
@@ -12,21 +12,20 @@ sunrise:
         entity_id: light.sov_midt
         xy_color: [0.65,0.41]
         brightness: 85
-        transition: 600
+        transition: 180
     - delay:
-        seconds: 600
-    - service: light.turn_on
-      data:
-        entity_id: light.sov_midt
-        xy_color: [0.60,0.40]
-        brightness: 170
-        transition: 600
-    - delay:
-        seconds: 600
-    - service: light.turn_on
-      data:
-        entity_id: light.sov_midt
-        xy_color: [0.48,0.40]
-        brightness: 255
-        transition: 600
+        seconds: 180
+    - parallel:
+        - service: light.turn_on
+          data:
+            entity_id: light.sov_dor
+            xy_color: [0.60,0.40]
+            brightness: 100
+            transition: 180
+        - service: light.turn_on
+          data:
+            entity_id: light.sov_vindue
+            xy_color: [0.48,0.40]
+            brightness: 100
+            transition: 180