diff --git a/automations/files/automations/bedroom-button.yaml b/automations/files/automations/bedroom-button.yaml
index 440753f..2d0429a 100644
--- a/automations/files/automations/bedroom-button.yaml
+++ b/automations/files/automations/bedroom-button.yaml
@@ -7,13 +7,10 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_on
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
-        entity_id:
-          - light.bedroom_1
-          - light.bedroom_2
+        entity_id: light.bedroom_lights
   mode: single
 - id: bedroom-button-turn-off
   alias: '[Bedroom] Button Turn Off'
@@ -23,13 +20,10 @@
       platform: device
       type: remote_button_short_press
       subtype: turn_off
-  condition: [ ]
   action:
     - service: light.turn_off
       data:
-        entity_id:
-          - light.bedroom_1
-          - light.bedroom_2
+        entity_id: light.bedroom_lights
   mode: single
 - id: bedroom-button-dim-up
   alias: '[Bedroom] Button Dim Up'
@@ -39,7 +33,6 @@
       platform: device
       type: remote_button_short_press
       subtype: dim_up
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
@@ -47,7 +40,7 @@
         entity_id: light.bedroom_lights
   mode: single
 - id: bedroom-button-dim-down
-  alias: '[Bedroom] Button Dim Up'
+  alias: '[Bedroom] Button Dim Down'
   trigger:
     - device_id: 15b083b6b5e2acb5d37fbbfbfc76281f
       domain: zha
@@ -63,14 +56,13 @@
   mode: single
 # Double click
 - id: bedroom-button-dim-up-double
-  alias: '[Bedroom] Button Dim Up'
+  alias: '[Bedroom] Button Dim Up Double'
   trigger:
     - device_id: 15b083b6b5e2acb5d37fbbfbfc76281f
       domain: zha
       platform: device
       type: remote_button_double_press
       subtype: dim_up
-  condition: [ ]
   action:
     - service: light.turn_on
       data:
@@ -86,7 +78,6 @@
       platform: device
       type: remote_button_double_press
       subtype: dim_down
-  condition: [ ]
   action:
     - service: light.turn_on
       data: