diff --git a/config/packages/conico.yaml b/config/packages/conico.yaml
index ec4d10a5..381b1533 100755
--- a/config/packages/conico.yaml
+++ b/config/packages/conico.yaml
@@ -10,12 +10,13 @@
 
 ######################################################################
 ##  Show Camera on Echo Shows for 20 minutes after garage door opens.
+##  Show Image based on where Home Assistant thinks we are.
 ######################################################################
 
 automation:
   - alias: 'Garage Camera on Alexa Shows'
     id: 4373df2a-77f2-4e19-be7c-46c7b27ca583
-    mode: restart
+    mode: single
     trigger:
       - platform: state
         entity_id:
@@ -30,14 +31,8 @@ automation:
         to: 'on'
 
     action:
-      - service: media_player.play_media
-        data:
-          entity_id: media_player.kitchen_show
-          media_content_id: 'show garage camera'
-          media_content_type: custom
-
       - choose:
-          - conditions: "{{ binary_sensor.sleepnumber_carlo_stacey_is_in_bed == 'on' }}"
+          - conditions: "{{ is_state('binary_sensor.sleepnumber_carlo_stacey_is_in_bed','on') }}"
             sequence:
               - service: media_player.play_media
                 data:
@@ -45,22 +40,33 @@ automation:
                     - media_player.stacey_bedroom
                   media_content_id: 'show garage camera'
                   media_content_type: custom
+              - delay: '00:10:00'
+              - service: media_player.play_media
+                data:
+                  entity_id:
+                    - media_player.stacey_bedroom
+                  media_content_id: 'hide garage camera'
+                  media_content_type: custom
+
+          - conditions: "{{ is_state('switch.kitchen_accent_1','on') }}"
+            sequence:
+              - service: media_player.play_media
+                data:
+                  entity_id:
+                    - media_player.alarm_panel_1
+                  media_content_id: 'show garage camera'
+                  media_content_type: custom
 
         default:
-        - service: media_player.play_media
-          data:
-            entity_id: media_player.alarm_panel_1
-            media_content_id: 'show garage camera'
-            media_content_type: custom
-
-      - delay: '00:20:00'
-
-      - service: media_player.play_media
-        data:
-          entity_id:
-            - media_player.kitchen_show
-            - media_player.upstairs
-            - media_player.stacey_bedroom
-            - media_player.alarm_panel_1
-          media_content_id: 'hide garage camera'
-          media_content_type: custom
+          - service: media_player.play_media
+            data:
+              entity_id: media_player.kitchen_show
+              media_content_id: 'show garage camera'
+              media_content_type: custom
+          - delay: '00:20:00'
+          - service: media_player.play_media
+            data:
+              entity_id:
+                - media_player.stacey_bedroom
+              media_content_id: 'hide garage camera'
+              media_content_type: custom
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 9a6780bd..b25830e9 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