diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml
index 4d854d2c..1878cd9f 100755
--- a/config/templates/speech/briefing.yaml
+++ b/config/templates/speech/briefing.yaml
@@ -161,14 +161,20 @@
       and don't forget, there are {{ states.sensor.fathers_countdown.state }} days until Fathers day!
   {%- elif states('sensor.easter_countdown') | int < 15  -%}
       and don't forget, there are {{ states.sensor.easter_countdown.state }} days until Easter Sunday!
-  {%- elif states('sensor.thanksgiving_day_countdown') | int < 10  -%}
-      and don't forget, there are {{ states.sensor.thanksgiving_day_countdown.state }} days until Thanksgiving!
-  {%- elif states('sensor.halloween_countdown') | int < 30  -%}
+  {%- elif states('sensor.thanksgiving_day_countdown') | int < 10 and states('sensor.thanksgiving_day_countdown') | int > 0  -%}
+      and don't forget, there are {{ states.sensor.thanksgiving_day_countdown.state }} days until Thanksgiving
+  {%- elif states('sensor.thanksgiving_day_countdown') | int < 1  -%}
+      and don't forget, Thanksgiving is tomorrow!
+  {%- elif states('sensor.halloween_countdown') | int < 30 and states('sensor.halloween_countdown') | int > 0 -%}
       and don't forget, there are {{ states.sensor.halloween_countdown.state }} Spooky days until Halloween!
+  {%- elif states('sensor.halloween_countdown') | int < 1  -%}
+      and don't forget, Tomorrow is Halloween!
   {%- elif states('sensor.chanukkah_countdown') | int < 15  -%}
       and don't forget, there are {{ states.sensor.chanukkah_countdown.state }} days until Chanukkah!
-  {%- elif states('sensor.christmas_countdown') | int < 30  -%}
+  {%- elif states('sensor.christmas_countdown') | int < 30 and states('sensor.christmas_countdown') | int > 0  -%}
       and don't forget, there are {{ states.sensor.christmas_countdown.state }} Merry days until Christmas!
+  {%- elif states('sensor.christmas_countdown') | int < 1  -%}
+      and don't forget, Santa Claus is coming tomorrow!
   {% endif %}
   {%- endmacro -%}
 
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 8caa9aaa..27eb5e03 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 b59295a9..cc1c2c10 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