diff --git a/config/group/people.yaml b/config/group/people.yaml
index 93253633..c18ed38e 100755
--- a/config/group/people.yaml
+++ b/config/group/people.yaml
@@ -1,7 +1,7 @@
 family:
   entities:
-    - device_tracker.carlo
-    - device_tracker.stacey
+    - person.carlo
+    - person.stacey
 
 arriving:
   name: Arriving
diff --git a/config/script/tweet_youtube.yaml b/config/script/tweet_youtube.yaml
index 88780f73..916c46e7 100755
--- a/config/script/tweet_youtube.yaml
+++ b/config/script/tweet_youtube.yaml
@@ -256,6 +256,9 @@ tweet_youtube_engine_setup:
               ],
               "NoCloudGaradget": [
                 "How to configure Garadget for LOCAL MQTT Only (https://www.vcloudinfo.com/2020/07/how-to-configure-garadget-for-local-mqtt-only.html)"
+              ],
+              "AlexaGuardMediaPlayer": [
+                "How to Enable Alexa Guard Mode via Home Assistant (https://www.vcloudinfo.com/2020/08/how-to-enable-alexa-guard-mode-via-home-assistant-using-presence-detection.html)"
               ]
 
             } %}
diff --git a/config/templates/speech/youtube_picker.yaml b/config/templates/speech/youtube_picker.yaml
index 9c3ef7e3..276d94e5 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"
+    "SolarFountainOKMEE", "NoCloudGaradget", "AlexaGuardMediaPlayer"
   ] %}
   {{ 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 0681ab36..c7d4833f 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 3f9ba5bc..ab735518 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/AlexaGuardMediaPlayer.png b/config/www/custom_ui/floorplan/images/youtube/episodes/AlexaGuardMediaPlayer.png
new file mode 100755
index 00000000..b361fa1b
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/youtube/episodes/AlexaGuardMediaPlayer.png differ