diff --git a/configuration/automations/bathroom-door.yaml b/configuration/automations/bathroom-door.yaml
deleted file mode 100644
index 6194578..0000000
--- a/configuration/automations/bathroom-door.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- id: bathroom-door-day
-  alias: '[Bathroom] Door Open Day'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.bathroom_door_open_close
-      to: 'on'
-  condition:
-    - condition: state
-      entity_id: input_select.home_mode
-      state: Day
-  action:
-    - service: light.turn_on
-      entity_id: light.bathroom_lights
-      data:
-        brightness_pct: 100
-        kelvin: 3200
-- id: bathroom-door-night
-  alias: '[Bathroom] Door Night'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.bathroom_door_open_close
-      to: 'on'
-  condition:
-    - condition: state
-      entity_id: input_select.home_mode
-      state: Night
-  action:
-    - service: light.turn_on
-      entity_id: light.bathroom_lights
-      data:
-        brightness_pct: 5
-        kelvin: 2700
diff --git a/configuration/automations/bathroom-lights.yaml b/configuration/automations/bathroom-lights.yaml
new file mode 100644
index 0000000..4ec613b
--- /dev/null
+++ b/configuration/automations/bathroom-lights.yaml
@@ -0,0 +1,65 @@
+- id: button-lights-on
+  alias: '[Bathroom] Lights On'
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.bathroom_motion_occupancy
+      from: 'off'
+      to: 'on'
+    - platform: state
+      entity_id: binary_sensor.bathroom_door_open_close
+      to: 'on'
+  action:
+    - choose:
+      - conditions:
+          - condition: state
+            entity_id: input_select.home_mode
+            state: Day
+        sequence:
+          - 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.toggle
+                  entity_id: light.bathroom_lights
+                  data:
+                    brightness_pct: 100
+                    kelvin: 3200
+    - choose:
+      - conditions:
+          - condition: state
+            entity_id: input_select.home_mode
+            state: Night
+        sequence:
+          - service: light.turn_on
+            entity_id: light.bathroom_lights
+            data:
+              brightness_pct: 5
+              kelvin: 2700
+  mode: single
+
+- id: bathroom-lights-off
+  alias: '[Bathroom] Lights Off'
+  mode: restart
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.bathroom_motion_occupancy
+      for: '0:05:00'
+      from: 'on'
+      to: 'off'
+  action:
+    - service: light.turn_off
+      entity_id:
+        - light.bathroom_lights
+        - light.bathroom_mirror_lights
diff --git a/configuration/automations/bathroom-motion.yaml b/configuration/automations/bathroom-motion.yaml
deleted file mode 100644
index 6828249..0000000
--- a/configuration/automations/bathroom-motion.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-- id: bathroom-motion-day
-  alias: '[Bathroom] Motion Day'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.bathroom_motion_occupancy
-      from: 'off'
-      to: 'on'
-  condition:
-    - condition: state
-      entity_id: input_select.home_mode
-      state: Day
-  action:
-    - service: light.turn_on
-      entity_id: light.bathroom_lights
-      data:
-        brightness_pct: 100
-        kelvin: 3200
-- id: bathroom-motion-night
-  alias: '[Bathroom] Motion Night'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.bathroom_motion_occupancy
-      from: 'off'
-      to: 'on'
-  condition:
-    - condition: state
-      entity_id: input_select.home_mode
-      state: Night
-  action:
-    - service: light.turn_on
-      entity_id: light.bathroom_lights
-      data:
-        brightness_pct: 5
-        kelvin: 2700
-- id: bathroom-motion-off
-  alias: '[Bathroom] Motion Off'
-  mode: restart
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.bathroom_motion_occupancy
-      for: '0:05:00'
-      from: 'on'
-      to: 'off'
-  action:
-    - service: light.turn_off
-      entity_id: 
-        - light.bathroom_lights
-        - light.bathroom_mirror_lights