diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index 08c425f5..50154cc5 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -30,13 +30,18 @@
           "Life is like a song, you’re back where you belong. Welcome home " ~ person,
           "Hey there " ~ person + " Welcome Home!",
           "Knock Knock. Who is There? "   ~ person +" is!",
+          "The garage door opener just told me that "   ~ person +" is home.",
+          person + " can not hide from the system. Welcome home.",
           person ~ "! You are home!",
           "I know a secret! "  ~ person +" is home!",
+          "Hey "  ~ person +". Your arrival has been recorded by the Smartest house on the block.",
+          "Take note Molly! "  ~ person +" is home.",
           "I am sensing a disturbance in the force. "  ~ person +" must be home!",
           "And the house becomes a home. Welcome back " ~ person,
           person + " is now here.  Hash tag Welcome Home.",
           person + " is now here.  Hash tag Home.",
-          "Just a quick announcement. " ~ person +" hass arrived!",
+          person + " is now here.  Hash tag Smart Home.",
+          "Just a quick announcement. " ~ person +" has arrived!",
           "Pardon the interruption but " ~ person +" is home!",
           "My systems are picking up the presence of additional humans. " ~ person +" has been identified as home."
           ] | random }}
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 6fdefae3..da4675fa 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -71,7 +71,7 @@ cloud:
         display_categories: LIGHT
 http:
   base_url: !secret http_base_url
-  server_port: !secret server_port
+  # server_port: !secret http_port
   api_password: !secret http_api_password
   ssl_certificate: !secret ssl_certificate
   ssl_key: !secret ssl_key
@@ -223,9 +223,9 @@ climate:
   platform: nest
 
 # media_player:
-  # - platform: cast
-    # host: 192.168.10.209 #CCA1
-  # - platform: roku
+#   - platform: cast
+#     host: 192.168.10.209 #CCA1
+#   - platform: roku
 
   # - platform: samsungtv
   #   host: 192.168.10.207
diff --git a/config/script/speech_processing.yaml b/config/script/speech_processing.yaml
index 1b2a052d..2fc0223f 100755
--- a/config/script/speech_processing.yaml
+++ b/config/script/speech_processing.yaml
@@ -12,7 +12,7 @@ speech_processing:
     - service: mqtt.publish
       data_template:
         topic: 'polly/lastmsg'
-        payload: "This message is from {{ now().strftime('%-I') }}:{{ now().strftime('%M') }} {{ now().strftime('%p') }}. {{ speech_message | truncate(254)}}"
+        payload: "This message is from {{ now().strftime('%-I') }}:{{ now().strftime('%M') }} {{ now().strftime('%p') }}. {{ speech_message | truncate(220)}}"
         retain: true
 
     - condition: and
@@ -58,6 +58,17 @@ speech_processing:
             0.3
           {% endif %}
 
+    - service: media_player.alexa_tts
+      data_template:
+        entity_id: >
+          {% if states.group.bed.state == 'off' %}
+          media_player.office
+          {% else %}
+          media_player.office
+          {% endif %}
+        message: >-
+            {{ speech_message }}
+
     - service: tts.amazon_polly_say
       data_template:
         entity_id: >
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 e006da9e..41dba1d0 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