diff --git a/config/script/skybell_pressed.yaml b/config/script/skybell_pressed.yaml
index 4b9e13af..c0815563 100755
--- a/config/script/skybell_pressed.yaml
+++ b/config/script/skybell_pressed.yaml
@@ -14,8 +14,16 @@ skybell_pressed:
         message: "Someone Pressed the Doorbell."
 
     - service: script.speech_engine
-      data:
-        value1: 'Please check the Front Door.  Someone Pressed the Doorbell.'
+      data_template:
+        value1: >
+          {{ [
+          "Please check the Front Door.  Someone Pressed the Doorbell.",
+          "Quick! Hide! Someone just pressed the Doorbell!",
+          "Someone answer my door.  Someone just pressed the doorbell.",
+          "Ding Dong, get to the door before they run away!",
+          "Did anyone else hear that? Time to go check the door.",
+          "Knock, Knock. Someone just rang the doorbell."
+          ] | random }}
 
     - service: script.notify_engine
       data_template:
@@ -36,12 +44,17 @@ skybell_pressed:
           "Ouch! That hurt. Who touched the SkyBell Doorbell?",
           "Someone just poked me in the @MySkybell!",
           "I see you! You are at the @MySkyBell and you just pressed it.",
+          "Quick!!! Hide!!!!  Someone just pressed the Doorbell!",
           "Someone answer my door.  Someone just pressed the doorbell.",
+          "Ding Dong, get to the door before they run away! #ditch",
+          "The Doorbell was pressed.  Smile - You are on Camera!",
+          "Did anyone else hear that? Time to go check the door.",
           "Knock, Knock.  Housekeeping? Just kidding. Someone just rang the doorbell."
           ] | random + [
           " #Security",
           " (https://github.com/CCOSTAN/Home-AssistantConfig#cameras)",
           " (http://www.vmwareinfo.com/2017/07/my-smart-home-look-at-parts-that-make.html)",
+          " (https://amzn.to/2LeJnyl)",
           " #HomeAutomation"
           ] | random }}
         image: >-
diff --git a/config/www/custom_ui/floorplan/alarm.svg b/config/www/custom_ui/floorplan/alarm.svg
index b29ceb53..5c3bb743 100755
--- a/config/www/custom_ui/floorplan/alarm.svg
+++ b/config/www/custom_ui/floorplan/alarm.svg
@@ -10,11 +10,11 @@
 		<path id="box" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M264.5,111.8H37.2c-6.8,0-12.3-5.9-12.3-13.3V49.2
 			c0-7.3,5.5-13.3,12.3-13.3h227.2c6.8,0,12.3,5.9,12.3,13.3v49.3C276.8,105.9,271.3,111.8,264.5,111.8L264.5,111.8z"/>
 		<g id="sensor.floorplan_date" transform="translate(-4)">
-			
+
 				<text id="text4522" transform="matrix(1 0 0 1 41.3238 63.3948)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:17.93px;">Friday, June 30</text>
 		</g>
 		<g id="sensor.floorplan_time">
-			
+
 				<text id="text4525" transform="matrix(1 0 0 1 35.34 100.4411)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:37.7086px;">9:36 PM</text>
 		</g>
 	</g>
@@ -32,11 +32,11 @@
 				l-30.8,0.2L89,347.7l41.8-0.3l0.3,44.3l29.5-0.2v0.9l9-0.1L169.7,395 M248.1,436.4l0.2,19.9h-3.5l-0.2-16.3l-46.3,0.4l-0.9,0.9
 				l0,0l-1.3-1.2l1.4-1.5l47-0.4l-0.3-40.3h3.6l0.3,38.4 M175.9,456.1l7-0.1v-1.8l-7.1-6.6L175.9,456.1 M247.6,373.5l0.1,6.8h-3.6
 				l-0.1-6.8H247.6 M162.2,374.2l64.2-0.5v3.6l-64.2,0.5V374.2"/>
-			
+
 				<text id="second_floor_text" transform="matrix(1 0 0 1 156.0425 362.0238)" style="fill:#757575; font-family:'Helvetica'; font-size:9.28px;">SECOND FLOOR</text>
-			
+
 				<text id="text743-2" transform="matrix(1 0 0 1 175.5794 405.9195)" style="fill:#757575; font-family:'Helvetica'; font-size:9.28px;">LIVING ROOM</text>
-			
+
 				<text id="text749-3" transform="matrix(1 0 0 1 193.7634 485.1224)" style="fill:#757575; font-family:'Helvetica'; font-size:9.28px;">BEDROOM</text>
 		</g>
 		<g id="Doors">
@@ -85,7 +85,7 @@
 				c0-1,0.8-1.9,1.9-1.9h15.3c1,0,1.9,0.8,1.9,1.9v0.9C244.7,376.6,243.9,377.4,242.8,377.4z"/>
 		</g>
 		<circle id="light.upstairs_lamp" style="fill:#231F26;" cx="234.6" cy="429.4" r="4.6"/>
-		
+
 			<rect id="sensor.dark_sky_minutely_summary" x="10.3" y="342.4" inkscape:label="#rect395" style="fill:#CCCCCC;" width="74" height="59.3">
 		</rect>
 	</g>
@@ -128,7 +128,7 @@
 		<g id="Doors-2">
 			<g id="Front_Doors">
 				<g id="path13766">
-					
+
 						<rect id="rect66" x="420.8" y="104.6" transform="matrix(1 -3.141335e-03 3.141335e-03 1 -0.3318 1.3232)" style="fill:#00ADEE;" width="0.5" height="3.4"/>
 				</g>
 				<g id="path13768">
@@ -140,11 +140,11 @@
 						v0.5l0,0c-13-0.1-23.4-10.6-23.4-23.6L443.8,84.6z"/>
 				</g>
 				<g id="path13772">
-					
+
 						<rect id="rect77" x="420.8" y="84.7" transform="matrix(1 -3.141335e-03 3.141335e-03 1 -0.2693 1.3231)" style="fill:#00ADEE;" width="0.5" height="3.4"/>
 				</g>
 				<g id="path13774">
-					
+
 						<rect id="rect82" x="465.3" y="104.6" transform="matrix(1 -3.141335e-03 3.141335e-03 1 -0.3316 1.463)" style="fill:#00ADEE;" width="0.5" height="3.4"/>
 				</g>
 				<g id="path13776">
@@ -374,48 +374,48 @@
 				h-1.6C658.5,276.8,657.1,278.2,657.1,280L657.1,280C657.1,279.9,657.1,279.9,657.1,280L657.1,280z"/>
 		</g>
 		<g id="Room_Titles">
-			
+
 				<text id="text741" transform="matrix(1 0 0 1 342.304 459.5171)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">MASTER BEDROOM</text>
-			
+
 				<text id="text743" transform="matrix(1 0 0 1 439.8078 270.2926)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">LIVING ROOM</text>
-			
+
 				<text id="text745" transform="matrix(1 0 0 1 545.5562 363.7995)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">DINING ROOM</text>
-			
+
 				<text id="text747" transform="matrix(1 0 0 1 568.6262 287.4074)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">KITCHEN</text>
-			
+
 				<text id="text749" transform="matrix(1 0 0 1 706.9354 267.2558)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">BEDROOM</text>
-			
+
 				<text id="text751" transform="matrix(1 0 0 1 706.9044 394.0989)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">BEDROOM</text>
-			
+
 				<text id="text753" transform="matrix(1 0 0 1 680.3783 172.646)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">GARAGE</text>
-			
+
 				<text id="text755" transform="matrix(1 0 0 1 489.1469 123.3208)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">DINING ROOM</text>
 			<g id="text253">
-				
+
 					<text id="text757" transform="matrix(1 0 0 1 633.9917 436.3395)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">STUD</text>
-				
+
 					<text id="text759" transform="matrix(1 0 0 1 661.394 436.3395)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">Y</text>
 			</g>
 			<g id="text257">
-				
+
 					<text id="text762" transform="matrix(1 0 0 1 337.1457 125.5865)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">STUD</text>
-				
+
 					<text id="text764" transform="matrix(1 0 0 1 364.5471 125.5865)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">Y</text>
 			</g>
 			<g id="text263" transform="translate(-4,-8)">
-				
+
 					<text id="text767" transform="matrix(1 0 0 1 707.4887 463.5388)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">B</text>
-				
+
 					<text id="text769" transform="matrix(1 0 0 1 714.7524 463.5388)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">A</text>
-				
+
 					<text id="text771" transform="matrix(1 0 0 1 721.2817 463.5388)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">THROOM</text>
 			</g>
 			<g id="text263-2" transform="translate(359.01017,164.15588)">
-				
+
 					<text id="text767-4" transform="matrix(1 0 0 1 -40.817 121.3661)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">B</text>
-				
+
 					<text id="text769-6" transform="matrix(1 0 0 1 -33.5523 121.3661)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">A</text>
-				
+
 					<text id="text771-7" transform="matrix(1 0 0 1 -27.025 121.3661)" style="fill:#757575; font-family:'Helvetica'; font-size:10.0628px;">THROOM</text>
 			</g>
 		</g>
@@ -423,7 +423,7 @@
 	<g id="Refresh" onclick="location.reload();" transform="translate(4.6672742,34.537829)">
 		<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 34.3664 549.093)" style="fill:#29D9C2; font-family:'Helvetica'; font-size:18.8936px;">REFRESH</text>
 	</g>
 	<g id="Left_Buttons">
@@ -431,40 +431,40 @@
 			V193c0-6.8,5.5-12.3,12.3-12.3h227.2c6.8,0,12.3,5.5,12.3,12.3v45.7C276.8,245.5,271.3,250.9,264.5,250.9L264.5,250.9z"/>
 		<path id="rect326_1_" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M265.4,329.8H38.1c-6.8,0-12.3-5.5-12.3-12.3
 			v-45.7c0-6.8,5.5-12.3,12.3-12.3h227.2c6.8,0,12.3,5.5,12.3,12.3v45.7C277.6,324.3,272.1,329.8,265.4,329.8L265.4,329.8z"/>
-		
+
 			<text id="text823" transform="matrix(1 0 0 1 34.2526 211.4987)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:30px;">Carlo</text>
-		
+
 			<text id="text825" transform="matrix(1 0 0 1 151.8232 211.4987)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:30px;">Stacey</text>
-		
+
 			<text id="text828" transform="matrix(1 0 0 1 32.4714 304.6942)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:30px;">Alarm</text>
 		<path id="rect339" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M31.7,120.3h109.6c3.7,0,6.7,3.9,6.7,8.8v31.7
 			c0,4.8-3,8.8-6.7,8.8H31.7c-3.7,0-6.7-3.9-6.7-8.8V129C25,124.2,28,120.3,31.7,120.3z"/>
-		
+
 			<text id="text837" transform="matrix(1 0 0 1 33.6064 137.8101)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:17.93px;">First Floor</text>
 		<path id="rect348" inkscape:connector-curvature="0" style="fill:#3D3B3F;" d="M160.5,120.4H270c3.7,0,6.7,4.9,6.7,9.8v31.7
 			c0,4.8-3,7.8-6.7,7.8H160.5c-3.7,0-6.7-3.9-6.7-8.8v-31.7C153.8,124.3,156.8,120.4,160.5,120.4z"/>
-		
+
 			<text id="text843" transform="matrix(1 0 0 1 161.9286 138.2629)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:17.93px;">Second Floor</text>
-		
+
 			<path id="path5264-8" inkscape:connector-curvature="0" inkscape:transform-center-x="-7.873455" inkscape:transform-center-y="-0.27149958" style="fill:#00ADEE;" d="
 			M106.1,397.8c0,0-6.3,6.6-6.3,10.6c0.2,3.5,3.3,6.1,6.7,5.9c3.1-0.2,5.6-2.7,5.9-5.9C112.4,404.5,106.1,397.8,106.1,397.8
 			 M108.7,404.5l1.1,1l-6.4,5.9l-1.1-1 M103.7,404.5c0.7,0,1.3,0.5,1.3,1.2l0,0l0,0c0,0.7-0.6,1.2-1.3,1.2l0,0l0,0
 			c-0.7,0-1.3-0.5-1.3-1.2l0,0l0,0C102.5,405,103.1,404.5,103.7,404.5L103.7,404.5L103.7,404.5 M108.5,409c0.7,0.1,1.1,0.7,1.1,1.3
 			c0,0.6-0.7,1.1-1.3,1.1c-0.7-0.1-1.1-0.6-1.1-1.2l0,0C107.2,409.4,107.7,408.9,108.5,409L108.5,409z"/>
-		
+
 			<path id="path5264-8-6" inkscape:connector-curvature="0" inkscape:transform-center-x="-9.6233928" inkscape:transform-center-y="-0.33184113" style="fill:#00ADEE;" d="
 			M138.5,147.3c0,0-6.3,6.6-6.3,10.5c0.2,3.5,3.3,6.1,6.8,5.9c3.2-0.2,5.7-2.7,5.9-5.9C144.8,153.9,138.5,147.3,138.5,147.3
 			 M141.1,153.9l1.1,1l-6.3,6l-1.1-1 M136.1,154c0.7,0,1.3,0.5,1.3,1.2l0,0l0,0c0,0.7-0.6,1.3-1.3,1.2l0,0l0,0
 			c-0.7,0-1.3-0.5-1.3-1.2l0,0l0,0C134.8,154.5,135.4,154,136.1,154L136.1,154L136.1,154 M140.8,158.4c0.7,0,1.2,0.6,1.1,1.3
 			c-0.1,0.7-0.6,1.2-1.3,1.1c-0.6,0-1.1-0.6-1.1-1.2l0,0C139.5,158.9,140.1,158.4,140.8,158.4L140.8,158.4z"/>
-		
+
 			<path id="path5264-8-6-3" inkscape:connector-curvature="0" inkscape:transform-center-x="-9.6233928" inkscape:transform-center-y="-0.33184113" style="fill:#00ADEE;" d="
 			M266.4,148.4c0,0-6.3,6.6-6.3,10.5c0.2,3.5,3.3,6.1,6.8,5.9c3.2-0.2,5.7-2.7,5.9-5.9C272.7,155,266.4,148.4,266.4,148.4 M269,155
 			l1.1,1l-6.3,6l-1.1-1 M264,155.1c0.7,0,1.3,0.5,1.3,1.2l0,0l0,0c0,0.7-0.6,1.3-1.3,1.2l0,0l0,0c-0.7,0-1.3-0.5-1.3-1.2l0,0l0,0
 			C262.7,155.6,263.3,155,264,155.1L264,155.1L264,155.1 M268.8,159.5c0.7,0,1.2,0.6,1.1,1.3s-0.6,1.2-1.3,1.1
 			c-0.6,0-1.1-0.6-1.1-1.2l0,0C267.5,160,268,159.5,268.8,159.5C268.7,159.5,268.7,159.5,268.8,159.5L268.8,159.5z"/>
 	</g>
-	
+
 		<line id="edge_camera_bottom" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="810.3" y1="142.2" x2="1000.3" y2="142.2"/>
 	<line id="edge_camera_top" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="810.3" y1="35.2" x2="1000.3" y2="35.2"/>
 	<rect id="camera.front_door" x="809.8" y="36.3" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
@@ -575,7 +575,7 @@
 	</g>
 </g>
 <g id="Automation">
-	
+
 		<text id="input_boolean.alert_mode" transform="matrix(1 0 0 1 206.4198 305.1656)" style="fill:#BDF271; font-family:'Helvetica'; font-size:35.2242px;">OFF</text>
 	<g id="binary_sensors">
 		<path id="binary_sensor.justins_room_nest_protect_online" inkscape:connector-curvature="0" style="fill:#BDF271;" d="
@@ -584,7 +584,7 @@
 		<path id="binary_sensor.hallway_nest_protect_kids_hallway_online" inkscape:connector-curvature="0" style="fill:#BDF271;" d="
 			M711.2,346.6h-6.7c-0.8,0-1.5-0.7-1.5-1.5v-7.5c0-0.8,0.7-1.5,1.5-1.5h6.7c0.8,0,1.5,0.7,1.5,1.5v7.5
 			C712.7,345.9,712,346.6,711.2,346.6z"/>
-		
+
 			<path id="binary_sensor.paiges_room_nest_protect_paiges_room_online" inkscape:connector-curvature="0" style="fill:#BDF271;" d="
 			M702.2,300.1h-6.7c-0.8,0-1.5-0.7-1.5-1.5v-7.5c0-0.8,0.7-1.5,1.5-1.5h6.7c0.8,0,1.5,0.7,1.5,1.5v7.5
 			C703.7,299.4,703,300.1,702.2,300.1z"/>
@@ -633,7 +633,7 @@
 		<circle id="light.k4" style="fill:#FFFFA6;" cx="577.2" cy="300.5" r="5"/>
 		<circle id="light.k5" style="fill:#FFFFA6;" cx="576.4" cy="271.9" r="5"/>
 		<circle id="light.k6" style="fill:#FFFFA6;" cx="576" cy="245.3" r="5"/>
-		<g id="switch.kitchen_accents">
+		<g id="group.kitchen_accents">
 			<path id="switch.kitchen_Accents-a" inkscape:connector-curvature="0" style="fill:#231F26;" d="M637.6,247.7h1.8
 				c0.9,0,1.6,0.7,1.6,1.6l-0.1,63.4c0,0.9-0.7,1.6-1.6,1.6h-1.8c-0.9,0-1.6-0.7-1.6-1.6l0.1-63.4
 				C636,248.5,636.8,247.7,637.6,247.7L637.6,247.7z"/>
@@ -671,16 +671,16 @@
 			C537.4,204.3,532.4,199.4,532.4,193.2z"/>
 		<path id="light.outdoor_bathroom" inkscape:connector-curvature="0" style="fill:#FFFFA6;" d="M704,492.2c-2.8,0-5-2.3-5-5l0,0
 			h10.1C709,489.9,706.8,492.2,704,492.2z"/>
-		
+
 			<circle id="switch.pool_deck" inkscape:transform-center-x="23.336371" inkscape:transform-center-y="0.93345484" style="fill:#000080;" cx="590.4" cy="417.6" r="5">
 		</circle>
 		<path id="light.front_door" inkscape:connector-curvature="0" inkscape:label="#light.d1-0" d="M422.6,64.7c0-4.2-3.4-7.6-7.6-7.6
 			l0,0v15.1C419.2,72.2,422.6,68.8,422.6,64.7z"/>
-		
+
 			<path id="switch.foyer_outlet" inkscape:connector-curvature="0" inkscape:label="#switch.foyer_outlet" style="fill:#231F26;" d="
 			M418.5,170h-4.3c-1.2,0-2.1-0.1-2.1-0.2v-7.6c0-0.1,0.9-0.2,2.1-0.2h4.3c1.2,0,2.1,0.1,2.1,0.2v7.6
 			C420.6,169.9,419.7,170,418.5,170z"/>
-		
+
 			<path id="switch.garage_outlet" inkscape:connector-curvature="0" inkscape:label="#switch.garage_outlet" style="fill:#231F26;" d="
 			M585.7,162h-4.3c-1.2,0-2.1-0.1-2.1-0.2v-7.6c0-0.1,0.9-0.2,2.1-0.2h4.3c1.2,0,2.1,0.1,2.1,0.2v7.6C587.8,162,586.9,162,585.7,162
 			z"/>
@@ -724,7 +724,7 @@
 		<path id="binary_sensor.mcu1_gpio4" inkscape:connector-curvature="0" inkscape:label="#rect477" style="fill:#E7376B;" d="
 			M775.4,283.4h-1.7c-1.1,0-2-1.5-2-3.4v-28.8c0-1.9,0.9-3.4,2-3.4h1.7c1.1,0,2,1.5,2,3.4V280C777.4,281.9,776.5,283.4,775.4,283.4z
 			"/>
-		
+
 			<path id="binary_sensor.kitchen_door" inkscape:connector-curvature="0" inkscape:label="#rect449" style="fill:#29D9C2;" d="
 			M647.2,243.6h-1.7c-1.1,0-2-0.7-2-1.5v-13c0-0.8,0.9-1.5,2-1.5h1.7c1.1,0,2,0.7,2,1.5v13C649.2,242.9,648.3,243.6,647.2,243.6z"/>
 		<path id="binary_sensor.mcu1_gpio12" inkscape:connector-curvature="0" inkscape:label="#rect449" style="fill:#29D9C2;" d="
@@ -757,27 +757,27 @@
 	<g id="sensor.dark_sky_humidity" transform="translate(17.850478,-13.186746)">
 		<text id="text960" transform="matrix(1 0 0 1 55.1017 427.5831)" style="font-family:'ArialMT'; font-size:12px;">XX</text>
 	</g>
-	
+
 		<text id="device_tracker.carlo" inkscape:label="#text4437" transform="matrix(1 0 0 1 36.2953 243.6862)" style="fill:#E7376B;enable-background:new    ; font-family:'Helvetica'; font-size:26px;">away</text>
-	
+
 		<text id="device_tracker.stacey" inkscape:label="#text965" transform="matrix(1 0 0 1 161.0093 243.6862)" style="fill:#BDF271;enable-background:new    ; font-family:'Helvetica'; font-size:26px;">home</text>
 	<path id="light.led_outdoor_den" inkscape:connector-curvature="0" d="M389.5,54h-67.1c-1.3,0-2.3-0.7-2.3-1.6v-0.8
 		c0-0.9,1-1.6,2.3-1.6h67.1c1.3,0,2.3,0.7,2.3,1.6v0.8C391.8,53.3,390.8,54,389.5,54z"/>
 	<g id="g378" transform="matrix(1.1743602,0,0,1,-84.987569,-32.010868)">
 		<g id="sensor.last_message" transform="matrix(0.63365866,0,0,0.63365866,-20.720967,359.50527)">
-			
+
 				<text id="text864-0" transform="matrix(1.5781 0 0 1.5781 172.2095 327.8668)" style="fill:#FFFFA6; font-family:'Helvetica'; font-size:15.0304px;">XX</text>
 		</g>
 	</g>
 	<g id="climate.downstairs" transform="translate(21.312394,67.123371)" inkscape:label="#climate.downstairs">
 		<text id="text957-6" transform="matrix(0.7633 0 0 1 13.1832 95.6506)" style="font-family:'ArialMT'; font-size:12px;">XX</text>
 	</g>
-	
+
 		<text id="sensor.downstairs_thermostat_humidity" inkscape:label="#text960-2" transform="matrix(1 0 0 1 95.1238 163.9985)" style="enable-background:new    ; font-family:'ArialMT'; font-size:12px;">XX</text>
 	<g id="climate.upstairs" transform="translate(21.68449,126.0939)" inkscape:label="#climate.upstairs">
 		<text id="text957-6-0" transform="matrix(1 0 0 1 141.943 37.4332)" style="font-family:'ArialMT'; font-size:12px;">XX</text>
 	</g>
-	
+
 		<text id="sensor.upstairs_thermostat_humidity" inkscape:label="#text960-2-4" transform="matrix(1 0 0 1 225.0211 164.3264)" style="enable-background:new    ; font-family:'ArialMT'; font-size:12px;">XX</text>
 	<path id="switch.front_door_outlet" inkscape:connector-curvature="0" style="fill:#BDF271;" d="M468.8,88.2l0,1.8
 		c0,0.9-0.5,1.6-1.2,1.6l-47.9,0c-0.7,0-1.2-0.7-1.2-1.6l0-1.7c0-0.9,0.5-1.6,1.2-1.6l47.9,0C468.2,86.7,468.8,87.4,468.8,88.2
@@ -932,7 +932,7 @@
 </g>
 <g id="switch.printer_outlet" transform="rotate(-179.41243,618.1117,430.6)">
 	<g id="_x33_">
-		
+
 			<rect id="rect4470" x="615.3" y="437.8" transform="matrix(-2.685234e-06 -1 1 -2.685234e-06 175.5519 1060.8516)" style="fill:#DFDEE0;" width="5.9" height="9.8"/>
 		<path id="path4472" inkscape:connector-curvature="0" style="fill:#1E1E1E;" d="M622.3,443v-0.4h-8.1v0.4H622.3z M622.3,444.1
 			v-0.4h-8.1v0.4H622.3z M622.3,442v-0.4h-8.1v0.4H622.3z M622.3,444.1v-0.4h-8.1v0.4H622.3z M622.3,443v-0.4h-8.1v0.4H622.3z
@@ -945,7 +945,7 @@
 			V440.9z"/>
 	</g>
 </g>
-<g id="switch.master_bathroom_accents">
+<g id="group.master_bathroom_accents">
 	<path id="switch.bathroom_Accents-b-9" inkscape:connector-curvature="0" style="fill:#BDF271;" d="M382,315.8h1.8
 		c0.9,0,1.6,0.4,1.6,0.8l-0.1,33c0,0.5-0.7,0.8-1.6,0.8H382c-0.9,0-1.6-0.4-1.6-0.8l0.1-33C380.5,316.2,381.2,315.8,382,315.8z"/>
 	<path id="switch.bathroom_Accents-b-9-9" inkscape:connector-curvature="0" style="fill:#BDF271;" d="M370.1,227.2h1.8
@@ -953,7 +953,7 @@
 		C368.6,227.5,369.3,227.2,370.1,227.2L370.1,227.2z"/>
 </g>
 <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 
+	<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 	"/>
 	<path id="device_tracker.juicebox" style="fill:#29D9C2;" d="M760.2,146.6l-1,1.6c2.9,1.6,4.9,4.8,4.9,8.3c0,5.3-4.3,9.6-9.6,9.6
 		c-1.4,0-2.7-0.3-3.9-0.8l-1.3,1.5c1.6,0.8,3.3,1.2,5.2,1.2c6.3,0,11.5-5.1,11.5-11.5C765.9,152.3,763.6,148.5,760.2,146.6z
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index b4794bc4..a55952c0 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -84,7 +84,7 @@ rules:
       - switch.front_landscaping
       - switch.back_landscaping
       - switch.printer_outlet
-      - group.kitchen_Accents
+      - group.kitchen_accents
       - group.master_bathroom_accents
       - switch.front_door_outlet
       - switch.foyer_outlet
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 05599462..62c2e7e4 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 48a89a91..884c3954 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