diff --git a/config/packages/finance.yaml b/config/packages/finance.yaml
index bf92ced2..487f78af 100755
--- a/config/packages/finance.yaml
+++ b/config/packages/finance.yaml
@@ -1,28 +1,44 @@
 #-------------------------------------------
 # @CCOSTAN
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-# Neato Support for D7 Connected Botvac - control my [Neato Vacuum](https://amzn.to/2kqnnqu) with Home Assistant.
+# Tracking stocks with Yahoo Finance Custom Component
+# https://www.vcloudinfo.com/2020/10/how-to-track-stocks-in-home-assistant-using-a-custom-component.html
 #-------------------------------------------
 
 sensor:
-  - platform: alpha_vantage
-    scan_interval: 2400
-    api_key: !secret vantage_api
+  - platform: yahoofinance
+    scan_interval:
+      hours: 4
     symbols:
-      - name: Tesla
-        currency: USD
-        symbol: TSLA
-      - name: VMware
-        currency: USD
-        symbol: VMW
-      - name: Amazon
-        currency: USD
-        symbol: AMZN
+      - TSLA
+      - VMW
+      - AMZN
 
   - platform: coinmarketcap
     currency_id: 1027
   - platform: coinmarketcap
     currency_id: 1
+
+
+# sensor:
+#   - platform: alpha_vantage
+#     scan_interval: 2400
+#     api_key: !secret vantage_api
+#     symbols:
+#       - name: Tesla
+#         currency: USD
+#         symbol: TSLA
+#       - name: VMware
+#         currency: USD
+#         symbol: VMW
+#       - name: Amazon
+#         currency: USD
+#         symbol: AMZN
+#
+#   - platform: coinmarketcap
+#     currency_id: 1027
+#   - platform: coinmarketcap
+#     currency_id: 1
 #-------------------------------------------
 
 ##############################################################################
diff --git a/config/script/tweet_youtube.yaml b/config/script/tweet_youtube.yaml
index 6f8da008..b73424a0 100755
--- a/config/script/tweet_youtube.yaml
+++ b/config/script/tweet_youtube.yaml
@@ -272,6 +272,9 @@ tweet_youtube_engine_setup:
               ],
               "NodeAnchors": [
                 "Simple Example of using YAML Node Anchors in Home Assistant (https://www.vcloudinfo.com/2020/10/simple-example-of-using-yaml-node-anchors-in-home-assistant.html)"
+              ],
+              "yahoostocks": [
+                "Track stocks with Home Assistant using Yahoo Finance! (https://www.vcloudinfo.com/2020/10/how-to-track-stocks-in-home-assistant-using-a-custom-component.html)"
               ]
             } %}
 
diff --git a/config/templates/speech/youtube_picker.yaml b/config/templates/speech/youtube_picker.yaml
index 81d91f5f..bb5cb2cf 100755
--- a/config/templates/speech/youtube_picker.yaml
+++ b/config/templates/speech/youtube_picker.yaml
@@ -7,6 +7,6 @@
     "S02E22", "S02E25", "S02E26", "S02E27", "S02E28", "S02E29", "S02E30", "S02E31", "S02E32", "S02E33", "S02E34",
     "S02E35", "S02E36", "S02E37", "S02E38", "S02E39", "S02E40","S02E41", "Bearnews1", "Bearnews2", "Bearnews3", "Bearnews4",
     "S03E01", "Bearnews5", "Bearnews6", "Bearnews7", "S03E02", "S03E03", "Logger", "SolarPalmLight", "5TipsToLevelUp", "AlexaMusicCommands",
-    "SolarFountainOKMEE", "NoCloudGaradget", "AlexaGuardMediaPlayer", "LightningSensor", "LEDBackboard", "CuckooClock", "NodeAnchors"
+    "SolarFountainOKMEE", "NoCloudGaradget", "AlexaGuardMediaPlayer", "LightningSensor", "LEDBackboard", "CuckooClock", "NodeAnchors", "yahoostocks"
   ] %}
   {{ pick|random }}
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 db5ace62..29cb9e80 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 18a5759a..ae16bb43 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
diff --git a/config/www/custom_ui/floorplan/images/youtube/episodes/yahoostocks.png b/config/www/custom_ui/floorplan/images/youtube/episodes/yahoostocks.png
new file mode 100755
index 00000000..f398e79f
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/youtube/episodes/yahoostocks.png differ