diff --git a/config/automation/dark_rainy_day.yaml b/config/automation/dark_rainy_day.yaml
index 705fcc90..8ebb3482 100755
--- a/config/automation/dark_rainy_day.yaml
+++ b/config/automation/dark_rainy_day.yaml
@@ -63,7 +63,7 @@
 
     - service: script.speech_engine
       data_template:
-        value1: "It is getting a little dark inside the house because of the {{trigger.entity_id.split('_')[2]|replace('precip','rain') }} {{trigger.entity_id.split('_')[3]|replace('intensity',' ')}} outside.  I will turn on some extra lights in the living room."
+        value1: "It is getting a little dark inside the house because of the {{trigger.entity_id.split('_')[2]|replace('precip','rain')|replace('counter','lightning') }} {{trigger.entity_id.split('_')[3]|replace('intensity',' ')}} outside.  I will turn on some extra lights in the living room."
         call_window_check: 1
         call_garage_check: 1
 
diff --git a/config/packages/noonhome.yaml b/config/packages/noonhome.yaml
index 3980aafc..dcbdc16f 100755
--- a/config/packages/noonhome.yaml
+++ b/config/packages/noonhome.yaml
@@ -20,7 +20,3 @@ script:
           entity_id: media_player.master_bathroom
           media_content_id: noonoff
           media_content_type: routine
-
-# Previous Method
-# - service: ifttt.trigger
-#   data_template: {"event":"noon_off"}
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 64645281..fb896c4a 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 a7ade60e..7f381b47 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