diff --git a/config/automation/away.yaml b/config/automation/away.yaml
index 0dbf80e5..5ad40008 100755
--- a/config/automation/away.yaml
+++ b/config/automation/away.yaml
@@ -32,6 +32,10 @@
     - service: switch.turn_off
       entity_id: switch.back_landscaping
 
-      # Arms Alexa Guard.  Disarms in the Announcements.yaml
+    # Arms Alexa Guard unless Guest Mode is on.  Disarms in the Announcements.yaml
+    - condition: template
+      value_template: >
+        {{ states.input_boolean.guest_mode.state != "on" }}
+
     - service: alarm_control_panel.alarm_arm_away
       entity_id: alarm_control_panel.alexa_guard
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 7bcbcb91..5b22ec27 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 5cc721f6..2d100ae9 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