diff --git a/apps/rooms/bathroom.yaml b/apps/rooms/bathroom.yaml
index d46566a..00137ff 100644
--- a/apps/rooms/bathroom.yaml
+++ b/apps/rooms/bathroom.yaml
@@ -1,28 +1,27 @@
 bathroom:
   module: room_control
   class: RoomController
-  ref_entity: light.bathroom
   off_duration: '00:05:00'
   states:
     - time: '05:00:00'
       scene:
         light.bathroom:
-          brightness_pct: 40
+          brightness: 100
           color_temp: 250
     - time: '12:00:00'
       scene:
         light.bathroom:
-          brightness_pct: 70
+          brightness: 175
           color_temp: 300
     - time: sunset
       scene:
         light.bathroom:
-          brightness_pct: 50
+          brightness: 125
           color_temp: 350
     - time: '23:00:00'
       scene:
         light.bathroom:
-          brightness_pct: 20
+          brightness: 50
           color_temp: 350
   sleep: input_boolean.sleeping
   sleep_state:
@@ -37,6 +36,7 @@ bathroom_button:
   class: Button
   app: bathroom
   button: Bathroom Button
+  ref_entity: light.bathroom
 
 bathroom_motion:
   module: motion
diff --git a/apps/rooms/bedroom.yaml b/apps/rooms/bedroom.yaml
index 41b2b33..1f85954 100644
--- a/apps/rooms/bedroom.yaml
+++ b/apps/rooms/bedroom.yaml
@@ -1,7 +1,6 @@
 bedroom:
   module: room_control
   class: RoomController
-  ref_entity: light.bedroom
   off_duration: '00:05:00'
   states:
     - time: 'sunrise - 03:00:00'
@@ -9,11 +8,11 @@ bedroom:
         light.bedroom:
           state: on
           color_temp: 200
-          brightness_pct: 20
+          brightness: 50
         light.globe:
           state: on
           color_temp: 200
-          brightness_pct: 20
+          brightness: 50
         light.overhead:
           state: off
     - time: '06:00:00'
@@ -21,57 +20,57 @@ bedroom:
         light.bedroom:
           state: on
           color_temp: 250
-          brightness_pct: 20
+          brightness: 50
         light.globe:
           state: on
           color_temp: 250
-          brightness_pct: 20
+          brightness: 50
         light.overhead:
           state: on
           color_temp: 250
-          brightness_pct: 15
+          brightness: 40
     - time: '12:00:00'
       scene:
         light.bedroom:
           state: on
           color_temp: 325
-          brightness_pct: 30
+          brightness: 75
         light.globe:
           state: on
           color_temp: 325
-          brightness_pct: 30
+          brightness: 75
         light.overhead:
           state: on
           color_temp: 325
-          brightness_pct: 50
+          brightness: 50
     - time: 'sunset'
       scene:
         light.bedroom:
           state: on
           color_temp: 325
-          brightness_pct: 50
+          brightness: 50
         light.globe:
           state: on
           color_temp: 325
-          brightness_pct: 50
+          brightness: 50
         light.overhead:
           state: on
           color_temp: 350
-          brightness_pct: 10
+          brightness: 65
     - time: '01:00:00'
       scene:
         light.bedroom:
           state: on
           color_name: green
-          brightness_pct: 50
+          brightness: 50
         light.globe:
           state: on
           color_name: blue
-          brightness_pct: 50
+          brightness: 50
         light.overhead:
           state: on
           color_name: blueviolet
-          brightness_pct: 100
+          brightness: 255
   sleep: input_boolean.sleeping
 
 bedroom_buttons:
diff --git a/apps/rooms/closet.yaml b/apps/rooms/closet.yaml
index 5011890..b9ac54a 100644
--- a/apps/rooms/closet.yaml
+++ b/apps/rooms/closet.yaml
@@ -6,22 +6,22 @@ closet:
     - time: 'sunrise - 03:00:00'
       scene:
         light.closet:
-          brightness_pct: 10
+          brightness: 25
           color_temp: 200
     - time: 'sunrise'
       scene:
         light.closet:
-          brightness_pct: 30
+          brightness: 75
           color_temp: 200
     - time: '12:00:00'
       scene:
         light.closet:
-          brightness_pct: 70
+          brightness: 175
           color_temp: 300
     - time: sunset
       scene:
         light.closet:
-          brightness_pct: 40
+          brightness: 100
           color_temp: 400
 
 closet_motion:
diff --git a/apps/rooms/kitchen.yaml b/apps/rooms/kitchen.yaml
index 638669d..e7bc239 100755
--- a/apps/rooms/kitchen.yaml
+++ b/apps/rooms/kitchen.yaml
@@ -1,7 +1,6 @@
 kitchen:
   module: room_control
   class: RoomController
-  ref_entity: light.kitchen
   off_duration: '00:10:00'
   # ha_button: input_button.activate_kitchen
   sleep: input_boolean.sleeping
@@ -16,32 +15,33 @@ kitchen:
         light.kitchen:
           state: on
           color_temp: 200
-          brightness_pct: 10
+          brightness: 25
     - time: '12:00:00'
       scene:
         light.kitchen:
           state: on
           color_temp: 300
-          brightness_pct: 30
+          brightness: 75
     - time: sunset
       scene:
         light.kitchen:
           state: on
           color_temp: 450
-          brightness_pct: 40
+          brightness: 100
     - time: '22:00:00'
       off_duration: '00:02:00'
       scene:
         light.kitchen:
           state: on
           color_temp: 650
-          brightness_pct: 10
+          brightness: 25
   
 kitchen_button:
   module: button
   class: Button
   app: kitchen
   button: Kitchen Button
+  ref_entity: light.kitchen
 
 kitchen_motion:
   module: motion
diff --git a/apps/rooms/living_room.yaml b/apps/rooms/living_room.yaml
index 38aed73..0a81a83 100644
--- a/apps/rooms/living_room.yaml
+++ b/apps/rooms/living_room.yaml
@@ -1,7 +1,6 @@
 living_room:
   module: room_control
   class: RoomController
-  ref_entity: light.living_room
   off_duration: 00:30:00
   states:
     - time: sunrise
@@ -9,42 +8,42 @@ living_room:
         light.living_room:
           state: on
           color_temp: 200
-          brightness_pct: 30
+          brightness: 75
         light.couch_corner:
           state: on
           color_temp: 200
-          brightness_pct: 7
+          brightness: 20
     - time: '09:00:00'
       scene:
         light.living_room:
           state: on
           color_temp: 250
-          brightness_pct: 50
+          brightness: 130
         light.couch_corner:
           state: on
           color_temp: 250
-          brightness_pct: 25
+          brightness: 65
     - time: '12:00:00'
       scene:
         light.living_room:
           state: on
           color_temp: 300
-          brightness_pct: 100
+          brightness: 255
         light.couch_corner:
           state: on
           color_temp: 450
-          brightness_pct: 50
+          brightness: 125
     - time: sunset
       off_duration: 01:00:00
       scene:
         light.living_room:
           state: on
           color_temp: 350
-          brightness_pct: 70
+          brightness: 175
         light.couch_corner:
           state: on
           color_temp: 650
-          brightness_pct: 10
+          brightness: 25
     - elevation: -20
       direction: setting
       off_duration: 00:30:00
@@ -52,11 +51,11 @@ living_room:
         light.living_room:
           state: on
           color_temp: 350
-          brightness_pct: 50
+          brightness: 125
         light.couch_corner:
           state: on
           color_temp: 650
-          brightness_pct: 5
+          brightness: 5
   sleep: input_boolean.sleeping
   sleep_state:
     # off_duration: '00:02:00'
@@ -64,7 +63,7 @@ living_room:
       light.living_room:
         state: 'on'
         color_name: 'red'
-        brightness_pct: 10
+        brightness: 25
 
 front_door:
   module: door
@@ -77,6 +76,7 @@ living_room_button:
   class: Button
   app: living_room
   button: Living Room Button
+  ref_entity: light.living_room
 
 living_room_motion:
   module: motion