diff --git a/config/group/lights.yaml b/config/group/lights.yaml
index f7d17827..9774d864 100755
--- a/config/group/lights.yaml
+++ b/config/group/lights.yaml
@@ -76,7 +76,7 @@ Outdoor Front Lights:
     - light.led_garage_snip
     - light.led_garage_small
     - light.led_outdoor_den
-    - light.stone_door
+    - light.front_door
 
 Garage lights:
   control: hidden
diff --git a/config/packages/skybellhd.yaml b/config/packages/skybellhd.yaml
index 98d65dcd..38ba6e84 100755
--- a/config/packages/skybellhd.yaml
+++ b/config/packages/skybellhd.yaml
@@ -18,13 +18,13 @@ group:
     name: Skybell HD Front Door
     control: hidden
     entities:
-      - binary_sensor.skybell_stone_door_button
-      - binary_sensor.skybell_stone_door_motion
-      - camera.stone_door
-      - sensor.skybell_stone_door_chime_level
-      - sensor.skybell_stone_door_motion_sensor
-      - switch.skybell_stone_door_do_not_disturb
-      - switch.skybell_stone_door_motion_sensor
+      - binary_sensor.skybell_front_door_button
+      - binary_sensor.skybell_front_door_motion
+      - camera.front_door
+      - sensor.skybell_front_door_chime_level
+      - sensor.skybell_front_door_motion_sensor
+      - switch.skybell_front_door_do_not_disturb
+      - switch.skybell_front_door_motion_sensor
 
 skybell:
   username: !secret skybell_username
@@ -67,7 +67,7 @@ automation:
     trigger:
        - platform: state
          entity_id:
-           - binary_sensor.skybell_stone_door_button
+           - binary_sensor.skybell_front_door_button
          to: 'on'
        - platform: event
          event_type: skybell_pressed
@@ -75,8 +75,8 @@ automation:
     condition:
       - condition: template
         value_template: >
-          {%- if states.binary_sensor.skybell_stone_door_button.attributes.last_triggered -%}
-            {{ (as_timestamp(now()) - as_timestamp(states.binary_sensor.skybell_stone_door_button.attributes.last_triggered)) > 200 }}
+          {%- if states.binary_sensor.skybell_front_door_button.attributes.last_triggered -%}
+            {{ (as_timestamp(now()) - as_timestamp(states.binary_sensor.skybell_front_door_button.attributes.last_triggered)) > 200 }}
           {%- else -%}
             true
           {%- endif -%}
@@ -102,7 +102,7 @@ automation:
     trigger:
       - platform: state
         entity_id:
-          - light.stone_door
+          - light.front_door
           - switch.carloneato_schedule
         to: 'off'
 
diff --git a/config/packages/twitter.yaml b/config/packages/twitter.yaml
index 1df68f6f..ad5eba6d 100755
--- a/config/packages/twitter.yaml
+++ b/config/packages/twitter.yaml
@@ -42,7 +42,7 @@ sensor:
 
   - platform: history_stats
     name: Doorbell Presses
-    entity_id: binary_sensor.skybell_stone_door_button
+    entity_id: binary_sensor.skybell_front_door_button
     state: 'on'
     type: count
     end: '{{ now() }}'
diff --git a/config/recorder.yaml b/config/recorder.yaml
index ee1b5d4b..ef91fc2c 100755
--- a/config/recorder.yaml
+++ b/config/recorder.yaml
@@ -41,7 +41,7 @@ exclude:
     - sensor.pi_hole_dns_queries_today
     - sensor.last_boot
     - sensor.last_boot_templated
-    - sensor.skybell_stone_door_chime_level
+    - sensor.skybell_front_door_chime_level
     - sensor.small_garage_reflection_rate
     - sensor.small_garage_time_in_state
     - sensor.time
diff --git a/config/scene/monthly_colors.yaml b/config/scene/monthly_colors.yaml
index 0df6cc06..eafbed5f 100755
--- a/config/scene/monthly_colors.yaml
+++ b/config/scene/monthly_colors.yaml
@@ -31,7 +31,7 @@
           #color_name: 'Cream'
           rgb_color: [255,253,208]
           brightness: 30
-      light.stone_door:
+      light.front_door:
           state: 'on'
           #color_name: 'Cream'
           rgb_color: [204,0,0]
@@ -73,7 +73,7 @@
        light.outdoor_foyer:
            state: 'on'
            color_name: 'Gold'
-       light.stone_door:
+       light.front_door:
            state: 'on'
            color_name: 'Purple'
        light.outdoor_sconce_1:
@@ -117,7 +117,7 @@
            state: 'on'
            # color_name: 'Lavender'
            rgb_color: [244,187,255]
-       light.stone_door:
+       light.front_door:
            state: 'on'
            color_name: 'yellow'
        light.outdoor_sconce_1:
@@ -151,7 +151,7 @@
            state: 'on'
            # color_name: 'Red'
            rgb_color: [204,0,0]
-       light.stone_door:
+       light.front_door:
            state: 'on'
            color_name: 'yellow'
        light.outdoor_sconce_1:
@@ -189,7 +189,7 @@
            state: 'on'
            # color_name: 'Red'
            rgb_color: [204,0,0]
-       light.stone_door:
+       light.front_door:
            state: 'on'
            # color_name: 'Red'
            rgb_color: [204,0,0]
@@ -230,7 +230,7 @@
       light.outdoor_foyer:
           state: 'on'
           color_name: 'Orange'
-      light.stone_door:
+      light.front_door:
           state: 'on'
           color_name: 'Orange'
       light.outdoor_sconce_1:
@@ -249,7 +249,7 @@
           state: 'on'
           #color_name: 'purple'
           rgb_color: [96,0,128]
-      light.stone_door:
+      light.front_door:
           state: 'on'
           #color_name: 'orange'
           rgb_color: [127,14,0]
@@ -298,7 +298,7 @@
       light.outdoor_foyer:
           state: 'on'
           color_name: 'blue'
-      light.stone_door:
+      light.front_door:
           state: 'on'
           color_name: 'white'
       light.outdoor_sconce_1:
@@ -328,7 +328,7 @@
       light.outdoor_foyer:
           state: 'on'
           color_name: 'red'
-      light.stone_door:
+      light.front_door:
           state: 'on'
           color_name: 'green'
       light.outdoor_sconce_1:
@@ -362,7 +362,7 @@
       light.outdoor_foyer:
           state: 'on'
           color_name: 'red'
-      light.stone_door:
+      light.front_door:
           state: 'on'
           color_name: 'yellow'
       light.outdoor_sconce_1:
diff --git a/config/script/skybell_pressed.yaml b/config/script/skybell_pressed.yaml
index 6795f4fd..4b9e13af 100755
--- a/config/script/skybell_pressed.yaml
+++ b/config/script/skybell_pressed.yaml
@@ -23,7 +23,7 @@ skybell_pressed:
         value1: 'Someone pressed the doorbell'
         who: 'family'
         ios_category: 'camera'
-        camera_entity: 'camera.stone_door_last_activity'
+        camera_entity: 'camera.front_door_last_activity'
         content_type: 'jpeg'
 
     - service: script.flash_notify
diff --git a/config/www/custom_ui/floorplan/alarm.svg b/config/www/custom_ui/floorplan/alarm.svg
index 6824d212..b29ceb53 100755
--- a/config/www/custom_ui/floorplan/alarm.svg
+++ b/config/www/custom_ui/floorplan/alarm.svg
@@ -467,7 +467,7 @@
 	
 		<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.stone_door" x="809.8" y="36.3" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+	<rect id="camera.front_door" x="809.8" y="36.3" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
 	</rect>
 	<g id="poweredby">
 		<g>
@@ -674,7 +674,7 @@
 		
 			<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.stone_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
+		<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="
diff --git a/config/www/custom_ui/floorplan/alarm.yaml b/config/www/custom_ui/floorplan/alarm.yaml
index 3b00dd9f..b177b6ed 100755
--- a/config/www/custom_ui/floorplan/alarm.yaml
+++ b/config/www/custom_ui/floorplan/alarm.yaml
@@ -160,7 +160,7 @@ rules:
       - light.led_garage_large
       - light.led_garage_small
       - light.led_outdoor_den
-      - light.stone_door
+      - light.front_door
     states:
       - state: 'on'
         class: 'light-on'
@@ -283,7 +283,7 @@ rules:
 
   - name: Camera Images
     entities:
-      - camera.stone_door
+      - camera.front_door
       - camera.camera1
       - camera.camera2
       - camera.camera3
diff --git a/config/www/custom_ui/floorplan/clock.svg b/config/www/custom_ui/floorplan/clock.svg
index 7dc97a9d..4633561b 100755
--- a/config/www/custom_ui/floorplan/clock.svg
+++ b/config/www/custom_ui/floorplan/clock.svg
@@ -77,7 +77,7 @@
 	<line id="edge_radio_bottom" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="818.7" y1="556" x2="1008.7" y2="556"/>
 </g>
 <text id="sensor.clock_am_pm" transform="matrix(0.8191 0 0 1 692.0439 150.0801)" style="fill:#00ADEE; font-family:'Helvetica'; font-size:50px;">XX</text>
-<rect id="camera.stone_door" x="819.6" y="122.1" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+<rect id="camera.front_door" x="819.6" y="122.1" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
 </rect>
 <rect id="sensor.dark_sky_minutely_summary_icon" x="23.3" y="15" inkscape:label="#rect395" style="fill:#666666;" width="70.5" height="62.2">
 </rect>
diff --git a/config/www/custom_ui/floorplan/clock.yaml b/config/www/custom_ui/floorplan/clock.yaml
index 98d1aa7e..4e8b1eaa 100755
--- a/config/www/custom_ui/floorplan/clock.yaml
+++ b/config/www/custom_ui/floorplan/clock.yaml
@@ -144,5 +144,5 @@ rules:
 
   - name: Camera Images
     entities:
-      - camera.stone_door
+      - camera.front_door
     image_template: '${entity.attributes.entity_picture}'
diff --git a/config/www/custom_ui/floorplan/clock_config.svg b/config/www/custom_ui/floorplan/clock_config.svg
index 38f004b7..77a00237 100755
--- a/config/www/custom_ui/floorplan/clock_config.svg
+++ b/config/www/custom_ui/floorplan/clock_config.svg
@@ -73,7 +73,7 @@
 	<line id="edge_radio_top" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="818.7" y1="469" x2="1008.7" y2="469"/>
 	<line id="edge_radio_bottom" style="fill:none;stroke:#FFFFFF;stroke-miterlimit:10;" x1="818.7" y1="556" x2="1008.7" y2="556"/>
 </g>
-<rect id="camera.stone_door" x="819.6" y="122.1" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
+<rect id="camera.front_door" x="819.6" y="122.1" inkscape:label="#rect140" style="fill:#333333;" width="190" height="105">
 </rect>
 <rect id="sensor.dark_sky_minutely_summary_icon" x="23.3" y="15" inkscape:label="#rect395" style="fill:#666666;" width="70.5" height="62.2">
 </rect>
diff --git a/config/www/custom_ui/floorplan/clock_config.yaml b/config/www/custom_ui/floorplan/clock_config.yaml
index f84e7db5..7c602c51 100755
--- a/config/www/custom_ui/floorplan/clock_config.yaml
+++ b/config/www/custom_ui/floorplan/clock_config.yaml
@@ -168,5 +168,5 @@ rules:
 
   - name: Camera Images
     entities:
-      - camera.stone_door
+      - camera.front_door
     image_template: '${entity.attributes.entity_picture}'
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 0044fa16..e69de29b 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