diff --git a/include/automations/der_er_nogen_i_indkorslen.yaml b/include/automations/der_er_nogen_i_indkorslen.yaml
index 1e3ba62..afbfaf2 100644
--- a/include/automations/der_er_nogen_i_indkorslen.yaml
+++ b/include/automations/der_er_nogen_i_indkorslen.yaml
@@ -4,7 +4,7 @@
       entity_id: binary_sensor.indkorsel_sensor_motion
       to: 'on'  
     action:
-    - service: notify.mobile_app_claus_iphone8
+    - service: notify.mobile_app_claus_iphone12
       data:
         message: "Der er nogen i indkørslen"
 #    - service: script.sonos_say
@@ -17,10 +17,10 @@
       data:
         scene_id: before
         snapshot_entities:
-        - light.stol
+        - light.pendle1
     - service: light.turn_on
       data:
-        entity_id: light.stol
+        entity_id: light.pendle1
         brightness: 255
         rgb_color: [255, 0, 0]
         flash: long
diff --git a/include/automations/good_morning.yaml b/include/automations/good_morning.yaml
index 579f68b..7a1c14e 100644
--- a/include/automations/good_morning.yaml
+++ b/include/automations/good_morning.yaml
@@ -14,7 +14,8 @@
   - alias: 'Godmorgen'
     trigger: 
       platform: state
-      entity_id: binary_sensor.stue_motion_sensor
+#      entity_id: binary_sensor.stue_motion_sensor
+      entity_id: binary_sensor.gang_sensor_motion
       to: 'on'
     condition:
       - condition: time
diff --git a/include/automations/groupsonos.yaml b/include/automations/groupsonos.yaml
index 15b542b..d237eb5 100644
--- a/include/automations/groupsonos.yaml
+++ b/include/automations/groupsonos.yaml
@@ -8,10 +8,11 @@
         entity_id: binary_sensor.arbejdsdag
         state: 'on'
     action:
-      - service: sonos.join
+      - service: media_player.join
+        target:
+          entity_id: media_player.kokken
         data:
-          master: media_player.kokken
-        entity_id:
+          group_members:
           - media_player.badevaerelse
           - media_player.sovevaerelse          
           - media_player.stue
diff --git a/include/automations/kommerhjem.yaml b/include/automations/kommerhjem.yaml
index e603294..c3efe0e 100644
--- a/include/automations/kommerhjem.yaml
+++ b/include/automations/kommerhjem.yaml
@@ -5,7 +5,7 @@
      to: 'home'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Mor kommer hjem'
 
@@ -27,7 +27,7 @@
      to: 'home'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Daniel kommer hjem'
 
@@ -50,7 +50,7 @@
      to: 'home'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Andreas kommer hjem'
 
@@ -74,7 +74,7 @@
      to: 'Skole'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Andreas ankommer til skole'
 
@@ -85,7 +85,7 @@
      from: 'Skole'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Andreas tager fra skole'
        
@@ -110,7 +110,7 @@
      to: 'Skole'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Daniel ankommer til skole'
 
@@ -121,7 +121,7 @@
      from: 'Skole'  
 
    action:
-     service: notify.mobile_app_claus_iphone8
+     service: notify.mobile_app_claus_iphone12
      data:
        message: 'Daniel tager fra skole'
        
diff --git a/include/automations/sunset_turn_on.yaml b/include/automations/sunset_turn_on.yaml
index b5cc1d0..9193748 100644
--- a/include/automations/sunset_turn_on.yaml
+++ b/include/automations/sunset_turn_on.yaml
@@ -17,7 +17,8 @@
 - alias: 'Sunset Stuff on'
   trigger:
     platform: state
-    entity_id: binary_sensor.stue_motion_sensor
+#    entity_id: binary_sensor.stue_motion_sensor
+    entity_id: binary_sensor.gang_sensor_motion
     to: 'on'
     
 #    - platform: sun
@@ -43,7 +44,7 @@
     - service: light.turn_on
       entity_id:
         - light.raket        
-        - light.syd
+#        - light.syd
         - light.pendle1
         - light.pendle2
         - light.panton        
diff --git a/include/automations/ungroupsonos.yaml b/include/automations/ungroupsonos.yaml
index 6282a3a..9b4786e 100644
--- a/include/automations/ungroupsonos.yaml
+++ b/include/automations/ungroupsonos.yaml
@@ -8,9 +8,9 @@
         entity_id: binary_sensor.arbejdsdag
         state: 'on'
     action:
-      - service: sonos.unjoin
+      - service: media_player.unjoin
         entity_id: media_player.badevaerelse
-      - service: sonos.unjoin
+      - service: media_player.unjoin
         entity_id: media_player.sovevaerelse
 
   - alias: 'Gruppe køkken uden stue, alrum'
@@ -22,8 +22,10 @@
         entity_id: binary_sensor.arbejdsdag
         state: 'on'
     action:
-      - service: sonos.unjoin
-        entity_id: media_player.kokken
+      - service: media_player.unjoin
+        entity_id: media_player.alrum
+      - service: media_player.unjoin
+        entity_id: media_player.stue
         
 
 
diff --git a/include/binary_sensors/motion_stue.yaml b/include/binary_sensors/motion_stue.yaml
index 3f4eb59..3b3a3df 100644
--- a/include/binary_sensors/motion_stue.yaml
+++ b/include/binary_sensors/motion_stue.yaml
@@ -1,11 +1,11 @@
-  - platform: rest
-    name: "Stue Motion Sensor"
-    resource: !secret stue_url
-    device_class: motion
-    scan_interval: 10
-    value_template: >-
-      {%- if "<motionDetectAlarm>2</motionDetectAlarm>" in value -%}
-        {{ true }}
-      {%- else -%}
-        {{ false }}
-      {%- endif -%}
+#  - platform: rest
+#    name: "Stue Motion Sensor"
+#    resource: !secret stue_url
+#    device_class: motion
+#    scan_interval: 10
+#    value_template: >-
+#      {%- if "<motionDetectAlarm>2</motionDetectAlarm>" in value -%}
+#        {{ true }}
+#      {%- else -%}
+#        {{ false }}
+#      {%- endif -%}
diff --git a/include/binary_sensors/workday.yaml b/include/binary_sensors/workday.yaml
index 32a9469..910a6d9 100644
--- a/include/binary_sensors/workday.yaml
+++ b/include/binary_sensors/workday.yaml
@@ -2,6 +2,11 @@
     name: Arbejdsdag
     country: DK
     add_holidays:
+      - '2022-10-21'
+      - '2022-10-20'
+      - '2022-10-19'
+      - '2022-10-18'
+      - '2022-10-17'
       - '2022-02-22'
       - '2022-02-23'
       - '2022-02-24'
@@ -35,9 +40,3 @@
       - '2022-07-28'
       - '2022-07-29'
       - '2022-08-01'
-      - '2022-08-02'
-      - '2022-08-03'
-      - '2022-08-04'
-      - '2022-08-05'
-      - '2022-08-08'
-      - '2022-08-09'            
diff --git a/include/lights/grupper.yaml b/include/lights/grupper.yaml
index d8f2972..33815f9 100644
--- a/include/lights/grupper.yaml
+++ b/include/lights/grupper.yaml
@@ -72,8 +72,8 @@
   entities:
     - light.indkorsel_plug
     - light.udendors_forgang
-    - light.light.hue_ambiance_lamp_1_2
-    - light.light.hue_ambiance_lamp_1_3
+    - light.hue_ambiance_lamp_1_2
+    - light.hue_ambiance_lamp_1_3
     - light.hue_ambiance_lamp_2
     
 - platform: group
diff --git a/include/scripts/monthly_scene.yaml b/include/scripts/monthly_scene.yaml
index 77ffe46..4d61acb 100644
--- a/include/scripts/monthly_scene.yaml
+++ b/include/scripts/monthly_scene.yaml
@@ -1,4 +1,4 @@
-standard_monthly_colors:
+monthly_standard_colors:
   sequence:
     - service: light.turn_on
       data:
diff --git a/secrets.yaml b/secrets.yaml
index aeeda27..e4c3c37 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -60,6 +60,8 @@ tile_password: Hwli03yitw
 # ########################################
 
 ifttt_key: pnM5Eo1wF2D24EcxTBbLY5xnBL3cbvLmSHlMDbsxVhP
+# password: Hwli03yitw
+# claus.dethlefsen@gmail.com
 
 # ########################################