diff --git a/config/script/tweet.yaml b/config/script/tweet.yaml
index cfcfef3e..881e6975 100755
--- a/config/script/tweet.yaml
+++ b/config/script/tweet.yaml
@@ -68,7 +68,7 @@ tweet_engine_random:
                 "Quick YouTube cameo on #HomeKit #Geeks channel.  Check it out! (https://youtu.be/3tutxHO0J78?t=872) "
               ],
               "solar": [
-                "I am keeping track of the current #Tesla stock price. It is ${{ states('sensor.tesla')|round }}. #Solar Get your FREE stock here: https://join.robinhood.com/giancac82 ",
+                "I am keeping track of the current #Tesla stock price. It is ${{ states('yahoofinance.tsla')|round }}. #Solar Get your FREE stock here: https://join.robinhood.com/giancac82 ",
                 "Solar panels and #smarthome devices combine to save on your energy bill. (https://www.vcloudinfo.com/2018/01/going-green-to-save-some-green-in-2018.html)",
                 "The #ChevyBolt was charged for about {{ states.sensor.bolt_charging_time.attributes.value|replace('m', '') }} minutes in the last 7 days.",
                 "The Official Diecast P85 Model S Red (https://amzn.to/2Hkkl0S) link - Out of stock like the originals. :)",
@@ -147,11 +147,11 @@ tweet_engine_random:
               ],
 
               "stocks": [
-                "I am keeping track of the current #Tesla stock price. It is ${{ states('sensor.tesla')|round }}. Get your FREE stock here: https://join.robinhood.com/giancac82 #Solar",
+                "I am keeping track of the current #Tesla stock price. It is ${{ states('yahoofinance.tsla')|round }}. Get your FREE stock here: https://join.robinhood.com/giancac82 #Solar",
                 "I am keeping track of the current #Bitcoin prices. It is ${{ states('sensor.bitcoin')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #BTC",
                 "I am keeping track of the current #Ethereum prices. It is ${{ states('sensor.ethereum')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #ETH",
-                "I am keeping track of the current #VMware stock price. It is ${{ states('sensor.vmware')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #vExpert",
-                "I am keeping track of the current #Amazon stock prices. It is ${{ states('sensor.amazon')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #AWS"
+                "I am keeping track of the current #VMware stock price. It is ${{ states('yahoofinance.vmw')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #vExpert",
+                "I am keeping track of the current #Amazon stock prices. It is ${{ states('yahoofinance.amzn')|round }}. Get your FREE stock here:  https://join.robinhood.com/giancac82 #AWS"
               ],
 
               "night": [
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 29cb9e80..818556fd 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