diff --git a/config/packages/alarm.yaml b/config/packages/alarm.yaml
index a465cdab..0379c100 100755
--- a/config/packages/alarm.yaml
+++ b/config/packages/alarm.yaml
@@ -300,19 +300,60 @@ automation:
           entity_id: group.bed
           state: 'off'
 
+#    action:
+      # - choose:
+      #     - conditions:
+      #         - condition: state
+      #           entity_id: group.entry_points
+      #           state: on
+      #
+      #       sequence:
+      #         - service: script.siren
+      #           data:
+      #             duration: 60
+      # - service: light.turn_on
+      #   entity_id: all
+
     action:
-      - service_template: >-
-          {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
-            light.turn_on
-            entity_id:
-              - light.living_room_accents
-            color_name: 'red'
-          {% else %}
-            light.turn_on
-            entity_id:
-              - light.living_room_accents
-            color_name: 'gold'
-          {% endif %}
+      - choose:
+          - conditions: >
+              {{ states.group.entry_points.state == 'on' or
+                 states.group.garage_doors.state != 'closed' }}
+            sequence:
+              - service: scene.turn_on
+                entity_id: scene.Red_living_Room
+        default:
+          - service: scene.turn_on
+            entity_id: scene.tv_time
+
+
+      # - choose:
+      #     - conditions:
+      #         - condition: template
+      #           value_template: "{% states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}"
+      #       sequence:
+      #         - service: light.turn_on
+      #           entity_id: light.living_room_accents
+      #           color_name: 'red'
+      #
+        # default:
+        #   - service: light.turn_on
+        #     entity_id: light.living_room_accents
+        #     color_name: 'gold'
+
+  # - service_template: >-
+  #     {% if states.group.entry_points.state == 'on' or states.group.garage_doors.state != 'closed' -%}
+  #       light.turn_on
+  #       entity_id:
+  #         - light.living_room_accents
+  #       color_name: 'red'
+  #     {% else %}
+  #       light.turn_on
+  #       entity_id:
+  #         - light.living_room_accents
+  #       color_name: 'gold'
+  #     {% endif %}
+
 
 #-------------------------------------------#---
   - alias: "Panel Door opened"
diff --git a/config/scene/tv_time.yaml b/config/scene/tv_time.yaml
index 39694220..12cab9ce 100755
--- a/config/scene/tv_time.yaml
+++ b/config/scene/tv_time.yaml
@@ -34,3 +34,40 @@
            transition: 400
            rgb_color: [255,215,0]   # Gold
            brightness: 255
+
+- name: Red_living_Room
+  entities:
+      light.m1_front_left:
+          state: off
+          transition: 10
+      light.m1_front_right:
+          state: off
+          transition: 10
+      light.m1_slider:
+          state: off
+          transition: 10
+      light.m1_back_right:
+          state: on
+          transition: 10
+          rgb_color: [255,0,0]   # RED
+          brightness: 30
+      light.m1_back_left:
+          state: on
+          transition: 40
+          rgb_color: [255,0,0]   # RED
+          brightness: 30
+      light.tv_stand_light:
+          state: on
+          transition: 400
+          rgb_color: [255,0,0]   # RED
+          brightness: 150
+      light.tv_light:
+          state: on
+          transition: 400
+          rgb_color: [255,0,0]   # RED
+          brightness: 125
+      light.couch_1:
+          state: on
+          transition: 400
+          rgb_color: [255,0,0]   # RED
+          brightness: 255
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index ff22f398..776c7041 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ
diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png
index 7665bd6c..b3031c9c 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ