diff --git a/config/script/tweet.yaml b/config/script/tweet.yaml
index 1c4f75b7..abdb2c10 100755
--- a/config/script/tweet.yaml
+++ b/config/script/tweet.yaml
@@ -24,7 +24,6 @@ tweet_engine_setup:
 
               "robot": [
                 "Beep. Bop. Beep. Boop.  I am a #roBOT run by @CCostan",
-                "The #ChevyBolt has been charging for about {{ states.sensor.bolt_charging_time.attributes.value|replace('m', '') }} minutes in the last 7 days.",
                 "I have spoken for about {{ states.sensor.speech_time.attributes.value|replace('m', '') }} minutes in the last 24 hours.",
                 "When you add it all up, I have spoken for about {{ states.sensor.speech_time.attributes.value|replace('m', '') }} minutes in the last 24 hours!",
                 "The #Docker Host has been running for {{ states('sensor.since_last_boot_templated') }} (http://www.vmwareinfo.com/2018/02/journey-to-docker.html)",
@@ -156,7 +155,8 @@ tweet_engine_setup:
                 "/config/www/custom_ui/floorplan/images/branding/tv.png",
                 "/config/www/custom_ui/floorplan/images/branding/tv2.png",
                 "/config/www/custom_ui/floorplan/images/branding/tv3.png",
-                "/config/www/custom_ui/floorplan/images/branding/tv4.png"
+                "/config/www/custom_ui/floorplan/images/branding/tv4.png",
+                "/config/www/custom_ui/floorplan/images/branding/tv5.png"
               ]
             } %}
 
diff --git a/config/www/custom_ui/floorplan/alarm.svg b/config/www/custom_ui/floorplan/alarm.svg
index 18ef8c8b..d07a16e0 100755
--- a/config/www/custom_ui/floorplan/alarm.svg
+++ b/config/www/custom_ui/floorplan/alarm.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1"
 	 id="artboard" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="alarm.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
 	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1024 600"
@@ -421,10 +421,10 @@
 		</g>
 	</g>
 	<g id="Refresh" onclick="location.reload();" transform="translate(4.6672742,34.537829)">
-		<path id="rect267" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M828.8,410.6h147.8c11.5,0,20.8,9.3,20.8,20.9v0.1
-			c0,11.5-9.3,20.9-20.8,20.9H828.8c-11.5,0-21.8-9.3-21.8-20.9v-0.1C806.9,420,817.3,410.6,828.8,410.6z"/>
+		<path id="rect267" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M18.6,524.8h126c9.8,0,17.7,7.9,17.7,17.8v0.1
+			c0,9.8-7.9,17.8-17.7,17.8h-126c-9.8,0-18.6-7.9-18.6-17.8v-0.1C-0.1,532.8,8.8,524.8,18.6,524.8z"/>
 		
-			<text id="text777" transform="matrix(1 0 0 1 847.3339 439.1073)" style="fill:#29D9C2; font-family:'Helvetica'; font-size:22.1617px;">REFRESH</text>
+			<text id="text777" transform="matrix(1 0 0 1 34.3664 549.093)" style="fill:#29D9C2; font-family:'Helvetica'; font-size:18.8936px;">REFRESH</text>
 	</g>
 	<g id="Left_Buttons">
 		<path id="rect320_2_" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M264.5,250.9H37.2c-6.8,0-12.3-5.5-12.3-12.3
@@ -951,11 +951,7 @@
 	<path id="switch.bathroom_Accents-b-9-9" inkscape:connector-curvature="0" style="fill:#BDF271;" d="M370.1,227.2h1.8
 		c0.9,0,1.6,0.3,1.6,0.7l-0.1,27.9c0,0.4-0.7,0.7-1.6,0.7h-1.7c-0.9,0-1.6-0.3-1.6-0.7l0.1-27.9
 		C368.6,227.5,369.3,227.2,370.1,227.2L370.1,227.2z"/>
-	<path id="rect281-8" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M946.6,383.2h40.7c3.2,0,5.7,10.6,5.7,23.9v0.1
-		c0,13.1-2.6,23.9-5.7,23.9h-40.7c-3.2,0-6-10.6-6-23.9v-0.1C940.6,393.9,943.4,383.2,946.6,383.2z"/>
 </g>
-<text id="text4769" transform="matrix(1 0 0 1 844.024 422.7844)" style="fill:#BDF271; font-family:'Helvetica'; font-size:18.64px;">Bathroom</text>
-<text id="text790-7" transform="matrix(1 0 0 1 871.024 401.7844)" style="fill:#BDF271; font-family:'Helvetica'; font-size:18.64px;">Master </text>
 <g>
 	<polygon id="sensor.carlojuice_charging_status" style="fill:#29D9C2;" points="754.9,144.6 760.8,144.6 755.6,153 760.8,153 
 		747.1,168.4 752.9,156.5 748.7,156.5 	"/>
@@ -964,4 +960,16 @@
 		 M744.8,156.5c0-4.8,3.6-8.8,8.2-9.5l1-2c-6.2,0.2-11.1,5.2-11.1,11.5c0,3.9,1.9,7.3,4.8,9.4l0.8-1.7
 		C746.3,162.4,744.8,159.6,744.8,156.5z"/>
 </g>
+<line id="edge_camera_bottom_1_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="810.1" y1="256.5" x2="1000.1" y2="256.5"/>
+<line id="edge_camera_top_1_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="810.1" y1="149.5" x2="1000.1" y2="149.5"/>
+<rect id="camera.camera3" x="809.6" y="150.6" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+</rect>
+<line id="edge_camera_bottom_2_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="809.8" y1="370.1" x2="999.8" y2="370.1"/>
+<line id="edge_camera_top_2_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="809.8" y1="263.1" x2="999.8" y2="263.1"/>
+<rect id="camera.camera2" x="809.3" y="264.2" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+</rect>
+<line id="edge_camera_bottom_3_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="809.6" y1="483.9" x2="999.6" y2="483.9"/>
+<line id="edge_camera_top_3_" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="809.6" y1="376.9" x2="999.6" y2="376.9"/>
+<rect id="camera.camera1" x="809.1" y="378" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+</rect>
 </svg>
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index d0ada43b..788ef3fb 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -284,5 +284,8 @@ rules:
   - name: Camera Images
     entities:
       - camera.stone_door
+      - camera.camera1
+      - camera.camera2
+      - camera.camera3
     image_template: '${entity.attributes.entity_picture}'
     # image_refresh_interval: 20 # in seconds - Future options if needed.
diff --git a/config/www/custom_ui/floorplan/images/branding/tv5.png b/config/www/custom_ui/floorplan/images/branding/tv5.png
new file mode 100755
index 00000000..915125b6
Binary files /dev/null and b/config/www/custom_ui/floorplan/images/branding/tv5.png differ