diff --git a/configuration/automations/bathroom-button.yaml b/configuration/automations/bathroom-button.yaml
index c6ebc3c..3d9d0a8 100644
--- a/configuration/automations/bathroom-button.yaml
+++ b/configuration/automations/bathroom-button.yaml
@@ -19,6 +19,10 @@
               entity_id: light.bathroom_mirror_lights
             - service: light.turn_off
               entity_id: light.shower_lights
+            - service: light.turn_off
+              entity_id: light.bathroom_color_zha_group_0x0007
+            - service: media_player.turn_off
+              entity_id: media_player.bathroom_speaker
         - conditions:
             - condition: state
               entity_id: light.bathroom_lights
@@ -27,22 +31,40 @@
             - choose:
                 - conditions:
                     - condition: state
-                      entity_id: input_boolean.sleep_mode
-                      state: 'on'
+                      entity_id: input_select.home_mode
+                      state: Day
                   sequence:
-                    - service: light.turn_on
-                      entity_id: light.bathroom_lights
-                      data:
-                        brightness_pct: 100
-                        kelvin: 2000
+                    - choose:
+                        - conditions:
+                            - condition: state
+                              entity_id: input_boolean.sleep_mode
+                              state: 'on'
+                          sequence:
+                            - service: light.turn_on
+                              entity_id: light.bathroom_lights
+                              data:
+                                brightness_pct: 100
+                                kelvin: 2000
+                        - conditions:
+                            - condition: state
+                              entity_id: input_boolean.sleep_mode
+                              state: 'off'
+                          sequence:
+                            - service: light.turn_on
+                              entity_id: light.bathroom_lights
+                              data:
+                                brightness_pct: 100
+                                kelvin: 3200
                 - conditions:
                     - condition: state
-                      entity_id: input_boolean.sleep_mode
-                      state: 'off'
+                      entity_id: input_select.home_mode
+                      state: Night
                   sequence:
                     - service: light.turn_on
-                      entity_id: light.bathroom_lights
+                      entity_id: light.bathroom_color_zha_group_0x0007
                       data:
-                        brightness_pct: 100
-                        kelvin: 3200
+                        brightness_pct: 5
+                        hs_color:
+                          - 360
+                          - 100
   mode: single
\ No newline at end of file
diff --git a/configuration/automations/bathroom-lights.yaml b/configuration/automations/bathroom-lights.yaml
index f386ff2..7b04cff 100644
--- a/configuration/automations/bathroom-lights.yaml
+++ b/configuration/automations/bathroom-lights.yaml
@@ -41,10 +41,12 @@
             state: Night
         sequence:
           - service: light.turn_on
-            entity_id: light.bathroom_lights
+            entity_id: light.bathroom_color_zha_group_0x0007
             data:
               brightness_pct: 5
-              kelvin: 2700
+              hs_color:
+                - 360
+                - 100
   mode: single
 
 - id: bathroom-lights-off
@@ -77,3 +79,5 @@
       entity_id: light.bathroom_mirror_lights
     - service: light.turn_off
       entity_id: light.shower_lights
+    - service: light.turn_off
+      entity_id: light.bathroom_color_zha_group_0x0007