diff --git a/config/automation/Speech/guest_mode.yaml b/config/automation/Speech/guest_mode.yaml
index e893de99..723b69ab 100755
--- a/config/automation/Speech/guest_mode.yaml
+++ b/config/automation/Speech/guest_mode.yaml
@@ -16,7 +16,8 @@
       data_template:
         value1: >
           {{ [
-          "Guest Mode has been enabled for today."
+          "Guest Mode has been enabled for the rest of the day.",
+          "System Guest Mode has been enabled. I will minimize the amount of automation for today."
           ] | random }}
         call_responsibilities: 1
         call_no_announcement: 1
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 f03cb6ed..35412a4a 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/weather/cloudy-day-1.png b/config/www/custom_ui/floorplan/images/weather/cloudy-day-1.png
new file mode 100755
index 00000000..218abc19
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/cloudy-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/night-1.png b/config/www/custom_ui/floorplan/images/weather/night-1.png
new file mode 100755
index 00000000..b0301f5f
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/night-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/partlycloudy-day-1.png b/config/www/custom_ui/floorplan/images/weather/partlycloudy-day-1.png
new file mode 100755
index 00000000..a924b948
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/partlycloudy-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/partlycloudy-night-1.png b/config/www/custom_ui/floorplan/images/weather/partlycloudy-night-1.png
new file mode 100755
index 00000000..52e92c96
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/partlycloudy-night-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/partlysunny-day-1.png b/config/www/custom_ui/floorplan/images/weather/partlysunny-day-1.png
new file mode 100755
index 00000000..1bd1a09f
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/partlysunny-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/pouring-day-1.png b/config/www/custom_ui/floorplan/images/weather/pouring-day-1.png
new file mode 100755
index 00000000..37335fcd
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/pouring-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/rain-day-1.png b/config/www/custom_ui/floorplan/images/weather/rain-day-1.png
new file mode 100755
index 00000000..f1709db2
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/rain-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/rainbow.png b/config/www/custom_ui/floorplan/images/weather/rainbow.png
new file mode 100755
index 00000000..c730355e
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/rainbow.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/snowy-day-1.png b/config/www/custom_ui/floorplan/images/weather/snowy-day-1.png
new file mode 100755
index 00000000..4fc6957f
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/snowy-day-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/sunny-1.png b/config/www/custom_ui/floorplan/images/weather/sunny-1.png
new file mode 100755
index 00000000..194e28eb
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/sunny-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/sunrise-1.png b/config/www/custom_ui/floorplan/images/weather/sunrise-1.png
new file mode 100755
index 00000000..942f6030
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/sunrise-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/sunset-1.png b/config/www/custom_ui/floorplan/images/weather/sunset-1.png
new file mode 100755
index 00000000..3f410516
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/sunset-1.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/thunder.png b/config/www/custom_ui/floorplan/images/weather/thunder.png
new file mode 100755
index 00000000..67750128
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/thunder.png differ
diff --git a/config/www/custom_ui/floorplan/images/weather/windy.png b/config/www/custom_ui/floorplan/images/weather/windy.png
new file mode 100755
index 00000000..901708cb
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/weather/windy.png differ