fixing boys room bright, some views, and a bunch of small fixes

automations/climate/hvac_fan_on.yaml

@@ -48,11 +48,11 @@ condition:
   # Are the internal sensors above 67?
   # This is mainly to ensure those sensors are working
   - condition: numeric_state
-    entity_id: sensor.hvac_multisensor_return
+    entity_id: sensor.hvac_return_temperature
     above: 50
 
   - condition: numeric_state
-    entity_id: sensor.hvac_multisensor_supply
+    entity_id: sensor.hvac_supply_temperature
     above: 50
 
   # Is the fan currently off?

automations/rooms/boys_room/boys_room_lights_to_on.yaml

@@ -11,6 +11,12 @@ triggers:
       - input_select.boys_room_mode
       - input_select.automatic_light_profile
 
+  - trigger: state
+    id: light_level
+    entity_id: binary_sensor.boys_room_naturally_lit
+    from: "on"
+    to: "off"
+
   - trigger: state
     id: occupied
     entity_id:
@@ -18,17 +24,6 @@ triggers:
       - input_boolean.boys_room_occupied
     to: "on"
 
-  # - platform: state
-  #   id: motion
-  #   entity_id: group.boys_room_motion
-  #   to: "on"
-
-  - trigger: state
-    id: light_level
-    entity_id: binary_sensor.boys_room_naturally_lit
-    from: "on"
-    to: "off"
-
 condition:
   - alias: "Home is occupied"
     condition: state

automations/rooms/girls_room/girls_room_lights_to_on.yaml

@@ -24,11 +24,6 @@ trigger:
       - binary_sensor.nursery_occupied
     to: "on"
 
-  # - platform: state
-  #   id: motion
-  #   entity_id: group.nursery_motion
-  #   to: "on"
-
 condition:
   - alias: "Home is occupied"
     condition: state