Change entities for merging dining room into living room

automations.yaml

@@ -86,11 +86,6 @@
     at: 00:00:00
   condition: []
   action:
-  - service: light.turn_off
-    data: {}
-    target:
-      entity_id: light.dining_room_lamp
-    alias: Turn off dining room lamp
   - alias: Prepare affected lighting areas
     service: switch.turn_off
     target:
@@ -203,11 +198,6 @@
     target:
       entity_id: input_select.tina_desk_scenes
     alias: Reset Tina desk scene
-  - service: light.turn_on
-    target:
-      entity_id: light.dining_room_lamp
-    data: {}
-    alias: Turn on dining room lamp
   - service: light.turn_off
     target:
       entity_id: light.downstairs_bathroom_lights
@@ -873,11 +863,6 @@
       alias: Turn off adaptive lighting
     - alias: Start light show
       parallel:
-      - service: light.turn_off
-        target:
-          entity_id: light.dining_room_lamp
-        data: {}
-        alias: Turn off dining room lamp
       - alias: Run effect on Living Room LED Strip
         service: lifx.effect_move
         data:
@@ -977,11 +962,6 @@
         target:
           entity_id: input_select.tina_desk_scenes
         alias: Reset Tina desk scene
-      - service: light.turn_on
-        target:
-          entity_id: light.dining_room_lamp
-        data: {}
-        alias: Turn on dining room lamp
       - service: switch.turn_on
         data: {}
         target:
@@ -1110,7 +1090,6 @@
           target:
             entity_id:
             - light.living_room_lights
-            - light.dining_room_lamp
             - light.tina_desk_lights
             - light.mud_room_overhead
       brightness_up_long_action:
@@ -1138,20 +1117,11 @@
           entity_id: light.living_room_lights
         alias: Brightness Down Large
       off_long_action:
-      - service: light.turn_on
-        data: {}
-        target:
-          entity_id: light.dining_room_lamp
       - service: input_select.select_option
         data:
           option: Reset
         target:
           entity_id: input_select.tina_desk_scenes
-      - service: input_select.select_option
-        data:
-          option: Adaptive
-        target:
-          entity_id: input_select.dining_room_lamp_scenes
       - service: input_select.select_option
         data:
           option: Adaptive
@@ -1329,27 +1299,18 @@
     input:
       dimmer_device: 40c14ccfe958d21d75888a968bbbf908
       on_short_action:
-      - service: light.toggle
-        data: {}
-        target:
-          entity_id: light.dining_room_lamp
-      on_long_action:
-      - service: input_select.select_option
-        data:
-          option: Adaptive
-        target:
-          entity_id: input_select.dining_room_lamp_scenes
-      off_short_action:
       - service: input_boolean.toggle
         data: {}
         target:
           entity_id: input_boolean.tina_desk_lights
-      off_long_action:
+      on_long_action:
       - service: input_select.select_option
         data:
           option: Reset
         target:
           entity_id: input_select.tina_desk_scenes
+      off_short_action: []
+      off_long_action: []
 - id: '1693174941627'
   alias: Presence Disconnect Protection
   description: When the internet drops, sometimes LIfe360 does too. This automation
@@ -1783,16 +1744,9 @@
       - condition: trigger
         id: reset
         alias: Reset
-      - alias: Computer On
-        condition: and
-        conditions:
       - condition: trigger
         id: computer-on
-          alias: Triggered by Computer On
+        alias: Computer On
-        - alias: Light level below threshold
-          condition: numeric_state
-          entity_id: sensor.dining_room_illuminance
-          below: 40
     then:
     - service: input_select.select_option
       target:
@@ -2301,7 +2255,6 @@
           - input_select.basement_studio_scenes
           - input_select.living_room_scenes
           - input_select.downstairs_bathroom_scenes
-          - input_select.dining_room_lamp_scenes
           - input_select.mud_room_scenes
           - input_select.upstairs_hallway_scenes
           - input_select.upstairs_bathroom_scenes
@@ -3680,54 +3633,6 @@
       alias: Night Brightness
   mode: queued
   max: 10
-- id: '1700521116867'
-  alias: Adaptive Lighting Adjustments - Dining Room Lamp
-  description: ''
-  trigger:
-  - platform: homeassistant
-    event: start
-    id: boot
-    alias: On boot
-  - platform: state
-    not_from:
-    - unavailable
-    - unknown
-    entity_id:
-    - input_number.nighttime_brightness_dining_room_lamp
-    id: night-brightness
-    alias: Night Brightness
-  condition:
-  - condition: state
-    entity_id: input_boolean.adaptive_lighting_adjustments
-    state: 'on'
-  action:
-  - choose:
-    - conditions:
-      - condition: trigger
-        id:
-        - boot
-      sequence:
-      - service: adaptive_lighting.change_switch_settings
-        data:
-          use_defaults: configuration
-          entity_id: switch.adaptive_lighting_dining_room_lamp
-          min_brightness: '{{ states(''input_number.nighttime_brightness_dining_room_lamp'')
-            }}'
-      alias: Boot
-    - conditions:
-      - condition: trigger
-        id:
-        - night-brightness
-      sequence:
-      - service: adaptive_lighting.change_switch_settings
-        data:
-          use_defaults: current
-          entity_id: switch.adaptive_lighting_dining_room_lamp
-          min_brightness: '{{ states(''input_number.nighttime_brightness_dining_room_lamp'')
-            }}'
-      alias: Night Brightness
-  mode: queued
-  max: 10
 - id: '1700521158381'
   alias: Adaptive Lighting Adjustments - Mud Room
   description: ''

configuration.yaml

@@ -315,7 +315,6 @@ logbook:
       - media_player
     entity_globs:
       - light.*screen*
-      - light.dining_room_lamp_*
       - binary_sensor.*_motion
 
 prometheus:

packages/announcements.yaml

@@ -270,7 +270,6 @@ script:
             - light.tina_desk_strip
             - light.tina_lamp_side
             - light.tina_lamp_top
-            - light.dining_room_lamp
             - light.mud_room_overhead
             - light.basement_led_strip_1
             - light.basement_tall_lamp
@@ -298,7 +297,6 @@ script:
         service: light.turn_off
         target:
           entity_id:
-            - light.dining_room_lamp
             - light.mud_room_overhead
       - alias: "Set color lights to purple"
         service: light.turn_on

packages/climate.yaml

@@ -19,13 +19,13 @@ template:
     - name: Kallen Fan - Separate Schedule
       unique_id: 3f243861-6a1f-412f-b9e3-933b54793b08
       state: "{{ states('input_datetime.kallen_fan') != states('input_datetime.kallen_bedtime') }}"
-    - name: Living Room Hot
+    - name: Living Room Front Hot
       unique_id: 8fd9db5e-7883-42f3-8918-e78d52c680c6
-      state: "{{ states('sensor.living_room_temperature') | float >= 80 }}"
+      state: "{{ states('sensor.living_room_front_temperature') | float >= 80 }}"
       device_class: heat
-    - name: Living Room Cold
+    - name: Living Room Front Cold
       unique_id: 48494ec8-a63f-4244-b619-ff78c44f28e8
-      state: "{{ states('sensor.living_room_temperature') | float <= 60 }}"
+      state: "{{ states('sensor.living_room_front_temperature') | float <= 60 }}"
       device_class: cold
     - name: Downstairs Bathroom Hot
       unique_id: b68adefa-e30e-4454-be21-2743af0f1674
@@ -67,13 +67,13 @@ template:
       unique_id: 985f4f8c-2297-4d32-ace7-818534c5e4b5
       state: "{{ states('sensor.basement_studio_temperature') | float <= 60 }}"
       device_class: cold
-    - name: Dining Room Hot
+    - name: Living Room Back Hot
-      unique_id: 2d1a67a5-ea39-470c-9a3c-b449e0d90bdb
+      unique_id: 9a2be430-9322-492b-a0c1-bb0f034979f5
-      state: "{{ states('sensor.dining_room_temperature') | float >= 80 }}"
+      state: "{{ states('sensor.living_room_back_temperature') | float >= 80 }}"
       device_class: heat
-    - name: Dining Room Cold
+    - name: Living Room Back Cold
-      unique_id: ce183fac-642a-402c-8f43-de82da75f0b0
+      unique_id: 524c2ad1-1f44-42c0-b06b-28a40d439832
-      state: "{{ states('sensor.dining_room_temperature') | float <= 60 }}"
+      state: "{{ states('sensor.living_room_back_temperature') | float <= 60 }}"
       device_class: cold
     - name: Mud Room Hot
       unique_id: 920fa45e-8c6e-4518-9aea-5141e15a4350

packages/lighting_and_scenes.yaml

@@ -98,13 +98,6 @@ input_number:
     step: 1
     unit_of_measurement: minutes
     icon: mdi:timer
-  dining_room_lights_off_delay:
-    name: Dining Room Lights Off Delay
-    min: 0
-    max: 30
-    step: 1
-    unit_of_measurement: minutes
-    icon: mdi:timer
   mud_room_lights_off_delay:
     name: Mud Room Lights Off Delay
     min: 0
@@ -182,13 +175,6 @@ input_number:
     step: 5
     unit_of_measurement: lx
     icon: mdi:sun-wireless
-  dining_room_lux_threshold:
-    name: Dining Room Lux Threshold
-    min: 0
-    max: 100
-    step: 5
-    unit_of_measurement: lx
-    icon: mdi:sun-wireless
   mud_room_lux_threshold:
     name: Mud Room Lux Threshold
     min: 0
@@ -303,13 +289,6 @@ input_number:
     step: 5
     unit_of_measurement: '%'
     icon: mdi:brightness-percent
-  nighttime_brightness_dining_room_lamp:
-    name: Nighttime Brightness Dining Room Lamp
-    min: 0
-    max: 100
-    step: 5
-    unit_of_measurement: '%'
-    icon: mdi:brightness-percent
   nighttime_brightness_tina_lamp:
     name: Nighttime Brightness Tina Lamp
     min: 0
@@ -391,16 +370,6 @@ input_select:
       - Nightlight
     initial: Select
     icon: hue:room-other
-  dining_room_lamp_scenes:
-    name: Dining Room Lamp Scenes
-    options:
-      - Select
-      - Adaptive
-      - Bright
-      - Dimmed
-      - Nightlight
-    initial: Select
-    icon: mdi:floor-lamp-dual
   upstairs_hallway_scenes:
     name: Upstairs Hallway Scenes
     options:
@@ -539,8 +508,6 @@ input_text:
     name: Living Room Selected Scene
   mud_room_selected_scene:
     name: Mud Room Selected Scene
-  dining_room_lamp_selected_scene:
-    name: Dining Room Lamp Selected Scene
   upstairs_hallway_selected_scene:
     name: Upstairs Hallway Selected Scene
   kallen_bedroom_selected_scene:
@@ -950,26 +917,6 @@ scene:
     entities:
       input_select.downstairs_bathroom_scenes:
         state: "Nightlight"
-  - name: Adaptive in Dining Room Lamp
-    icon: mdi:palette
-    entities:
-      input_select.dining_room_lamp_scenes:
-        state: "Adaptive"
-  - name: Bright in Dining Room Lamp
-    icon: mdi:palette
-    entities:
-      input_select.dining_room_lamp_scenes:
-        state: "Bright"
-  - name: Dimmed in Dining Room Lamp
-    icon: mdi:palette
-    entities:
-      input_select.dining_room_lamp_scenes:
-        state: "Dimmed"
-  - name: Nightlight in Dining Room Lamp
-    icon: mdi:palette
-    entities:
-      input_select.dining_room_lamp_scenes:
-        state: "Nightlight"
   - name: Adaptive in Tina Lamp
     icon: mdi:palette
     entities:

packages/presence.yaml

@@ -186,14 +186,7 @@ template:
       unique_id: 25623e3d-d74f-471e-8c2d-abce16646282
       device_class: occupancy
       state: >
-        {{ is_state('binary_sensor.living_room_motion','on') }}
+        {{ is_state('binary_sensor.living_room_front_motion','on') or is_state('binary_sensor.living_room_back_motion','on')}}
-      delay_off: "00:15:00"
-    - name: Dining Room Occupied
-      unique_id: 6ac3017a-98f8-4e84-bcd7-6a9b2ab5b0e2
-      device_class: occupancy
-      state: >
-        {{ is_state('binary_sensor.dining_room_motion','on') or
-            is_state('binary_sensor.tina_desk_occupied','on') }}
       delay_off: "00:15:00"
     - name: "Downstairs Bathroom Occupied"
       unique_id: fad33281-1c1a-4362-93e6-398334358027
@@ -408,7 +401,6 @@ automation:
   #         snapshot_entities:
   #           - light.living_room_overhead
   #           - light.living_room_led_strip
-  #           - light.dining_room_lamp
   #           - light.tina_lamp_top
   #           - light.tina_lamp_side
   #           - light.tina_desk_strip
@@ -425,10 +417,6 @@ automation:
   #         entity_id:
   #           - switch.adaptive_lighting_tina_lamp
   #           - switch.adaptive_lighting_living_room
-  #     - alias: "Turn dining room lamp off"
-  #       service: light.turn_off
-  #       target:
-  #         entity_id: light.dining_room_lamp
   #     - alias: "Turn Lights On"
   #       service: light.turn_on
   #       target:
@@ -738,7 +726,6 @@ script:
           - mud_room
           - emma_bedroom
           - upstairs_hallway
-          - dining_room
           - downstairs_bathroom
           - upstairs_bathroom
           - tina_desk
@@ -780,7 +767,6 @@ script:
           - switch.adaptive_lighting_basement_studio
           - switch.adaptive_lighting_living_room
           - switch.adaptive_lighting_downstairs_bathroom
-          - switch.adaptive_lighting_dining_room_lamp
           - switch.adaptive_lighting_tina_lamp
           - switch.adaptive_lighting_mud_room
           - switch.adaptive_lighting_upstairs_hallway
@@ -801,7 +787,6 @@ script:
           - input_text.master_bedroom_selected_scene
           - input_text.kallen_bedroom_selected_scene
           - input_text.emma_bedroom_selected_scene
-          - input_text.dining_room_lamp_selected_scene
         data:
           value: Adaptive
       - service: media_player.turn_off
@@ -842,7 +827,6 @@ script:
       target:
         area_id:
         - living_room
-        - dining_room
         - tina_desk
         - mud_room
         - furnace_room
@@ -878,7 +862,6 @@ script:
           area_id:
           - front_porch
           - living_room
-          - dining_room
           - mud_room
       - service: input_boolean.turn_on
         target:
@@ -893,7 +876,6 @@ script:
           entity_id:
             - input_select.living_room_scenes
             - input_select.mud_room_scenes
-            - input_select.dining_room_lamp_scenes
         data:
           option: Adaptive
     mode: single
@@ -940,7 +922,6 @@ script:
       target:
         area_id:
         - living_room
-        - dining_room
         - mud_room
     - service: input_boolean.turn_on
       target:
@@ -955,7 +936,6 @@ script:
         entity_id:
           - input_select.living_room_scenes
           - input_select.mud_room_scenes
-          - input_select.dining_room_lamp_scenes
       data:
         option: Adaptive
     - service: script.turn_on

packages/weatheralerts.yaml

@@ -1618,7 +1618,6 @@ script:
   #             - light.tina_lamp_side
   #             - light.tina_lamp_top
   #             - light.tina_desk_strip
-  #             - light.dining_room_lamp
   #             - switch.adaptive_lighting_living_room
   #             - switch.adaptive_lighting_tina_lamp
   #       - service: switch.turn_off
@@ -1635,9 +1634,6 @@ script:
   #             - light.tina_desk_strip
   #         data:
   #           color_name: red
-  #       - service: light.turn_off
-  #         target:
-  #           entity_id: light.dining_room_lamp
   #       - service: script.living_room_lights_alert
   #         data:
   #           type: red

scenes.yaml

@@ -1201,75 +1201,6 @@
       entity_only: false
     light.kallen_bedroom_overhead:
       entity_only: false
-- id: '1677005075590'
-  name: Dining Room Lamp Bright
-  entities:
-    light.dining_room_lamp:
-      effect_list: []
-      supported_color_modes:
-      - brightness
-      entity_id:
-      - light.dining_room_lamp_blue
-      - light.dining_room_lamp_green
-      - light.dining_room_lamp_purple
-      - light.dining_room_lamp_red
-      - light.dining_room_lamp_white
-      icon: mdi:lightbulb-group
-      friendly_name: Dining Room Lamp
-      supported_features: 4
-      color_mode: brightness
-      brightness: 255
-      state: 'on'
-  icon: mdi:palette
-  metadata:
-    light.dining_room_lamp:
-      entity_only: true
-- id: '1677005153043'
-  name: Dining Room Lamp Dimmed
-  entities:
-    light.dining_room_lamp:
-      effect_list: []
-      supported_color_modes:
-      - brightness
-      entity_id:
-      - light.dining_room_lamp_blue
-      - light.dining_room_lamp_green
-      - light.dining_room_lamp_purple
-      - light.dining_room_lamp_red
-      - light.dining_room_lamp_white
-      icon: mdi:lightbulb-group
-      friendly_name: Dining Room Lamp
-      supported_features: 4
-      color_mode: brightness
-      brightness: 83
-      state: 'on'
-  icon: mdi:palette
-  metadata:
-    light.dining_room_lamp:
-      entity_only: true
-- id: '1677005203818'
-  name: Dining Room Lamp Nightlight
-  entities:
-    light.dining_room_lamp:
-      effect_list: []
-      supported_color_modes:
-      - brightness
-      entity_id:
-      - light.dining_room_lamp_blue
-      - light.dining_room_lamp_green
-      - light.dining_room_lamp_purple
-      - light.dining_room_lamp_red
-      - light.dining_room_lamp_white
-      icon: mdi:lightbulb-group
-      friendly_name: Dining Room Lamp
-      supported_features: 4
-      color_mode: brightness
-      brightness: 3
-      state: 'on'
-  icon: mdi:palette
-  metadata:
-    light.dining_room_lamp:
-      entity_only: true
 - id: '1709873675992'
   name: Basement Studio - Red Angry
   entities:

scripts.yaml

@@ -555,7 +555,6 @@ cleanup_crash:
     target:
       entity_id:
       - switch.adaptive_lighting_basement_studio
-      - switch.adaptive_lighting_dining_room_lamp
       - switch.adaptive_lighting_downstairs_bathroom
       - switch.adaptive_lighting_front_porch
       - switch.adaptive_lighting_kallen_bedroom
@@ -583,7 +582,6 @@ cleanup_crash:
       - input_text.tina_lamp_selected_scene
       - input_text.upstairs_bathroom_selected_scene
       - input_text.upstairs_hallway_selected_scene
-      - input_text.dining_room_lamp_selected_scene
     alias: Reset input texts to adaptive
   - service: script.volume_reset
     data: {}
@@ -721,32 +719,6 @@ adaptive_on_first_floor:
       data:
         value: Adaptive
     alias: If living room lights are on
-  - if:
-    - condition: state
-      entity_id: light.dining_room_lamp
-      state: 'on'
-    then:
-    - service: input_select.select_option
-      target:
-        entity_id: input_select.dining_room_lamp_scenes
-      data:
-        option: Adaptive
-      alias: Set adaptive
-    else:
-    - service: switch.turn_on
-      target:
-        entity_id: switch.adaptive_lighting_dining_room_lamp
-      data: {}
-    - service: switch.turn_off
-      target:
-        entity_id: switch.adaptive_lighting_sleep_mode_dining_room_lamp
-      data: {}
-    - service: input_text.set_value
-      target:
-        entity_id: input_text.dining_room_lamp_selected_scene
-      data:
-        value: Adaptive
-    alias: If dining room lamp is on
   - if:
     - condition: or
       conditions:
@@ -986,7 +958,6 @@ bright_on_first_floor:
       entity_id:
       - light.living_room_lights
       - light.downstairs_bathroom_lights
-      - light.dining_room_lamp
       - light.mud_room_overhead
     data: {}
   - service: input_boolean.turn_on
@@ -1001,7 +972,6 @@ bright_on_first_floor:
       - input_select.living_room_scenes
       - input_select.downstairs_bathroom_scenes
       - input_select.mud_room_scenes
-      - input_select.dining_room_lamp_scenes
     data:
       option: Bright
   - service: light.turn_on
@@ -1167,12 +1137,6 @@ evening_on_first_floor:
               - input_select.mud_room_scenes
             data:
               option: Nightlight
-        - service: input_select.select_option
-          target:
-            entity_id:
-            - input_select.dining_room_lamp_scenes
-          data:
-            option: Nightlight
       alias: Give Me Darkness on
     - conditions:
       - condition: state
@@ -1215,11 +1179,6 @@ evening_on_first_floor:
             data:
               option: Nightlight
         else:
-        - service: light.turn_off
-          target:
-            entity_id:
-            - light.dining_room_lamp
-          data: {}
         - service: input_boolean.turn_off
           target:
             entity_id: input_boolean.tina_desk_lights
@@ -1461,7 +1420,6 @@ goodnight_on_first_floor:
     - service: light.turn_off
       target:
         area_id:
-        - dining_room
         - downstairs_bathroom
         - tina_desk
         entity_id: light.living_room_lights
@@ -1475,7 +1433,6 @@ goodnight_on_first_floor:
     - service: light.turn_off
       target:
         area_id:
-        - dining_room
         - downstairs_bathroom
         - mud_room
         - tina_desk

sensors/house_stats.yaml

@@ -63,7 +63,6 @@
         states.light.living_room_color_2,
         states.light.living_room_color_3,
         states.light.living_room_led_strip,
-        states.light.dining_room_lamp,
         states.light.mud_room_overhead,
         states.light.downstairs_bathroom_left,
         states.light.downstairs_bathroom_right,
@@ -99,7 +98,6 @@
         states.light.living_room_color_2,
         states.light.living_room_color_3,
         states.light.living_room_led_strip,
-        states.light.dining_room_lamp,
         states.light.mud_room_overhead,
         states.light.downstairs_bathroom_left,
         states.light.downstairs_bathroom_right,
@@ -283,13 +281,13 @@
     unit_of_measurement: °F
     state: >
       {% set rooms = [
-        states.sensor.living_room_temperature,
+        states.sensor.living_room_front_temperature,
+        states.sensor.living_room_back_temperature,
         states.sensor.downstairs_bathroom_temperature,
         states.sensor.stairwell_bottom_temperature,
         states.sensor.upstairs_bathroom_temperature,
         states.sensor.emma_bedroom_temperature,
         states.sensor.basement_studio_temperature,
-        states.sensor.dining_room_temperature,
         states.sensor.mud_room_temperature,
         states.sensor.stairwell_top_temperature,
         states.sensor.kallen_bedroom_temperature,
@@ -301,13 +299,13 @@
     unit_of_measurement: °F
     state: >
       {% set rooms = [
-        states.sensor.living_room_temperature,
+        states.sensor.living_room_front_temperature,
+        states.sensor.living_room_back_temperature,
         states.sensor.downstairs_bathroom_temperature,
         states.sensor.stairwell_bottom_temperature,
         states.sensor.upstairs_bathroom_temperature,
         states.sensor.emma_bedroom_temperature,
         states.sensor.basement_studio_temperature,
-        states.sensor.dining_room_temperature,
         states.sensor.mud_room_temperature,
         states.sensor.stairwell_top_temperature,
         states.sensor.kallen_bedroom_temperature,
@@ -317,13 +315,13 @@
     attributes:
       room: >
         {% set rooms = [
-          states.sensor.living_room_temperature,
+          states.sensor.living_room_front_temperature,
+          states.sensor.living_room_back_temperature,
           states.sensor.downstairs_bathroom_temperature,
           states.sensor.stairwell_bottom_temperature,
           states.sensor.upstairs_bathroom_temperature,
           states.sensor.emma_bedroom_temperature,
           states.sensor.basement_studio_temperature,
-          states.sensor.dining_room_temperature,
           states.sensor.mud_room_temperature,
           states.sensor.stairwell_top_temperature,
           states.sensor.kallen_bedroom_temperature,
@@ -335,13 +333,13 @@
     unit_of_measurement: °F
     state: >
       {% set rooms = [
-        states.sensor.living_room_temperature,
+        states.sensor.living_room_front_temperature,
+        states.sensor.living_room_back_temperature,
         states.sensor.downstairs_bathroom_temperature,
         states.sensor.stairwell_bottom_temperature,
         states.sensor.upstairs_bathroom_temperature,
         states.sensor.emma_bedroom_temperature,
         states.sensor.basement_studio_temperature,
-        states.sensor.dining_room_temperature,
         states.sensor.mud_room_temperature,
         states.sensor.stairwell_top_temperature,
         states.sensor.kallen_bedroom_temperature,
@@ -351,13 +349,13 @@
     attributes:
       room: >
         {% set rooms = [
-          states.sensor.living_room_temperature,
+          states.sensor.living_room_front_temperature,
+          states.sensor.living_room_back_temperature,
           states.sensor.downstairs_bathroom_temperature,
           states.sensor.stairwell_bottom_temperature,
           states.sensor.upstairs_bathroom_temperature,
           states.sensor.emma_bedroom_temperature,
           states.sensor.basement_studio_temperature,
-          states.sensor.dining_room_temperature,
           states.sensor.mud_room_temperature,
           states.sensor.stairwell_top_temperature,
           states.sensor.kallen_bedroom_temperature,
@@ -370,13 +368,13 @@
     icon: mdi:brightness-5
     state: >
       {% set entity_list = [
-          {'friendly_name': state_attr('sensor.living_room_illuminance','friendly_name'), 'state': states('sensor.living_room_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_front_illuminance','friendly_name'), 'state': states('sensor.living_room_front_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_back_illuminance','friendly_name'), 'state': states('sensor.living_room_back_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.downstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.downstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_bottom_illuminance','friendly_name'), 'state': states('sensor.stairwell_bottom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.upstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.upstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.emma_bedroom_illuminance','friendly_name'), 'state': states('sensor.emma_bedroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.basement_studio_illuminance','friendly_name'), 'state': states('sensor.basement_studio_illuminance') | default(0) | int },
-          {'friendly_name': state_attr('sensor.dining_room_illuminance','friendly_name'), 'state': states('sensor.dining_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.mud_room_illuminance','friendly_name'), 'state': states('sensor.mud_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_top_illuminance','friendly_name'), 'state': states('sensor.stairwell_top_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.kallen_bedroom_illuminance','friendly_name'), 'state': states('sensor.kallen_bedroom_illuminance') | default(0) | int },
@@ -389,13 +387,13 @@
     icon: mdi:brightness-5
     state: >
       {% set entity_list = [
-          {'friendly_name': state_attr('sensor.living_room_illuminance','friendly_name'), 'state': states('sensor.living_room_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_front_illuminance','friendly_name'), 'state': states('sensor.living_room_front_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_back_illuminance','friendly_name'), 'state': states('sensor.living_room_back_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.downstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.downstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_bottom_illuminance','friendly_name'), 'state': states('sensor.stairwell_bottom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.upstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.upstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.emma_bedroom_illuminance','friendly_name'), 'state': states('sensor.emma_bedroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.basement_studio_illuminance','friendly_name'), 'state': states('sensor.basement_studio_illuminance') | default(0) | int },
-          {'friendly_name': state_attr('sensor.dining_room_illuminance','friendly_name'), 'state': states('sensor.dining_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.mud_room_illuminance','friendly_name'), 'state': states('sensor.mud_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_top_illuminance','friendly_name'), 'state': states('sensor.stairwell_top_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.kallen_bedroom_illuminance','friendly_name'), 'state': states('sensor.kallen_bedroom_illuminance') | default(0) | int },
@@ -405,13 +403,13 @@
     attributes:
       room: >
         {% set entity_list = [
-            {'friendly_name': state_attr('sensor.living_room_illuminance','friendly_name'), 'state': states('sensor.living_room_illuminance') | default(0) | int },
+            {'friendly_name': state_attr('sensor.living_room_front_illuminance','friendly_name'), 'state': states('sensor.living_room_front_illuminance') | default(0) | int },
+            {'friendly_name': state_attr('sensor.living_room_back_illuminance','friendly_name'), 'state': states('sensor.living_room_back_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.downstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.downstairs_bathroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.stairwell_bottom_illuminance','friendly_name'), 'state': states('sensor.stairwell_bottom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.upstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.upstairs_bathroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.emma_bedroom_illuminance','friendly_name'), 'state': states('sensor.emma_bedroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.basement_studio_illuminance','friendly_name'), 'state': states('sensor.basement_studio_illuminance') | default(0) | int },
-            {'friendly_name': state_attr('sensor.dining_room_illuminance','friendly_name'), 'state': states('sensor.dining_room_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.mud_room_illuminance','friendly_name'), 'state': states('sensor.mud_room_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.stairwell_top_illuminance','friendly_name'), 'state': states('sensor.stairwell_top_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.kallen_bedroom_illuminance','friendly_name'), 'state': states('sensor.kallen_bedroom_illuminance') | default(0) | int },
@@ -424,13 +422,13 @@
     icon: mdi:brightness-5
     state: >
       {% set entity_list = [
-          {'friendly_name': state_attr('sensor.living_room_illuminance','friendly_name'), 'state': states('sensor.living_room_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_front_illuminance','friendly_name'), 'state': states('sensor.living_room_front_illuminance') | default(0) | int },
+          {'friendly_name': state_attr('sensor.living_room_back_illuminance','friendly_name'), 'state': states('sensor.living_room_back_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.downstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.downstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_bottom_illuminance','friendly_name'), 'state': states('sensor.stairwell_bottom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.upstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.upstairs_bathroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.emma_bedroom_illuminance','friendly_name'), 'state': states('sensor.emma_bedroom_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.basement_studio_illuminance','friendly_name'), 'state': states('sensor.basement_studio_illuminance') | default(0) | int },
-          {'friendly_name': state_attr('sensor.dining_room_illuminance','friendly_name'), 'state': states('sensor.dining_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.mud_room_illuminance','friendly_name'), 'state': states('sensor.mud_room_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.stairwell_top_illuminance','friendly_name'), 'state': states('sensor.stairwell_top_illuminance') | default(0) | int },
           {'friendly_name': state_attr('sensor.kallen_bedroom_illuminance','friendly_name'), 'state': states('sensor.kallen_bedroom_illuminance') | default(0) | int },
@@ -440,13 +438,13 @@
     attributes:
       room: >
         {% set entity_list = [
-            {'friendly_name': state_attr('sensor.living_room_illuminance','friendly_name'), 'state': states('sensor.living_room_illuminance') | default(0) | int },
+            {'friendly_name': state_attr('sensor.living_room_front_illuminance','friendly_name'), 'state': states('sensor.living_room_front_illuminance') | default(0) | int },
+            {'friendly_name': state_attr('sensor.living_room_back_illuminance','friendly_name'), 'state': states('sensor.living_room_back_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.downstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.downstairs_bathroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.stairwell_bottom_illuminance','friendly_name'), 'state': states('sensor.stairwell_bottom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.upstairs_bathroom_illuminance','friendly_name'), 'state': states('sensor.upstairs_bathroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.emma_bedroom_illuminance','friendly_name'), 'state': states('sensor.emma_bedroom_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.basement_studio_illuminance','friendly_name'), 'state': states('sensor.basement_studio_illuminance') | default(0) | int },
-            {'friendly_name': state_attr('sensor.dining_room_illuminance','friendly_name'), 'state': states('sensor.dining_room_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.mud_room_illuminance','friendly_name'), 'state': states('sensor.mud_room_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.stairwell_top_illuminance','friendly_name'), 'state': states('sensor.stairwell_top_illuminance') | default(0) | int },
             {'friendly_name': state_attr('sensor.kallen_bedroom_illuminance','friendly_name'), 'state': states('sensor.kallen_bedroom_illuminance') | default(0) | int },