diff --git a/components/packages/keurig.yaml b/components/packages/appliances/keurig.yaml
similarity index 82%
rename from components/packages/keurig.yaml
rename to components/packages/appliances/keurig.yaml
index 898725f..a515976 100644
--- a/components/packages/keurig.yaml
+++ b/components/packages/appliances/keurig.yaml
@@ -40,20 +40,20 @@ binary_sensor:
 
       keurig_on:
         friendly_name: 'Keurig On'
-        value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) < states('input_number.keurig_on') | float(default=0) }}"
+        value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) < states('input_number.keurig_on') | float(default=0) }}"
 
       keurig_warming_water:
         friendly_name: 'Keurig Warming Water'
-        value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_warming_water') | float(default=0) }}"
+        value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_warming_water') | float(default=0) }}"
         delay_off: "00:00:20"
 
       keurig_brewing:
         friendly_name: 'Keurig Brewing'
-        value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_brewing') | float(default=0) }}"
+        value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_brewing') | float(default=0) }}"
 
       keurig_pouring:
         friendly_name: 'Keurig Pouring'
-        value_template: "{{ states('sensor.pm_kitchen_2_w') | float(default=0) > states('input_number.keurig_pouring') | float(default=0) }}"
+        value_template: "{{ states('sensor.shelly_keurig_w') | float(default=0) > states('input_number.keurig_pouring') | float(default=0) }}"
 
       keurig: #This still needs to watch the Shelly sensor, rather than the circuit, so devices plugged into other outlets don't interfere with this sensor.
         unique_id: templatebinarysensor.keurig
diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml
index 0befe5e..b2185ae 100644
--- a/lovelace/view-ha-floorplan.yaml
+++ b/lovelace/view-ha-floorplan.yaml
@@ -643,22 +643,22 @@ cards:
                     - binary_sensor.front_porch_motion
                     - binary_sensor.deck_motion
                     - binary_sensor.entryway_motion
-                    - binary_sensor.frigate_cam01_motion
+                    - binary_sensor.frigate_cam01_person_occupancy
                     #- binary_sensor.frigate_cam02_person_occupancy
-                    - binary_sensor.frigate_cam03_motion
-                    - binary_sensor.frigate_cam04_motion
+                    - binary_sensor.frigate_cam03_person_occupancy
+                    - binary_sensor.frigate_cam04_person_occupancy
                     #- binary_sensor.frigate_cam05_person_occupancy
-                    - binary_sensor.frigate_cam06_motion
-                    - binary_sensor.frigate_cam07_motion
-                    - binary_sensor.frigate_cam08_motion
+                    - binary_sensor.frigate_cam06_person_occupancy
+                    - binary_sensor.frigate_cam07_person_occupancy
+                    - binary_sensor.frigate_cam08_person_occupancy
                     #- binary_sensor.frigate_cam09_person_occupancy
                     #- binary_sensor.frigate_cam10_person_occupancy
                     #- binary_sensor.frigate_cam11_person_occupancy
-                    - binary_sensor.frigate_cam12_motion
-                    - binary_sensor.frigate_cam13_motion
+                    - binary_sensor.frigate_cam12_person_occupancy
+                    - binary_sensor.frigate_cam13_person_occupancy
                     #- binary_sensor.frigate_cam14_motion
-                    - binary_sensor.frigate_cam14_all_occupancy
-                    - binary_sensor.frigate_cam18_motion
+                    - binary_sensor.frigate_cam14_person_occupancy
+                    - binary_sensor.frigate_cam18_person_occupancy
                     #- binary_sensor.frigate_cam19_motion
                     - binary_sensor.frigate_cam19_person_occupancy
                     - binary_sensor.bar_motion
diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml
index 3e35540..a2f18dc 100644
--- a/lovelace/view-overview.yaml
+++ b/lovelace/view-overview.yaml
@@ -1369,6 +1369,10 @@ cards:
         name: Comp. Desk
       - entity: camera.frigate_cam04
         name: Garage
+      - entity: camera.frigate_cam06
+        name: MBR Left
+      - entity: camera.frigate_cam07
+        name: MBR Right
       - entity: camera.frigate_cam08
         name: Nursery
       - entity: camera.frigate_cam12
@@ -1377,6 +1381,8 @@ cards:
         name: Front Room
       - entity: camera.frigate_cam14
         name: Back Yard
+      - entity: camera.frigate_cam18
+        name: Front Yard
       - entity: camera.frigate_cam19
         name: Front Porch
 
@@ -1404,7 +1410,7 @@ cards:
         icon: mdi:cctv
         state_filter:
           - "not_home"
-      - entity: device_tracker.amcrest_technologies_35_5d_c3
+      - entity: device_tracker.amcrest_technologies_22_da_66
         name: Garage
         icon: mdi:cctv
         state_filter:
@@ -1434,6 +1440,16 @@ cards:
         icon: mdi:cctv
         state_filter:
           - "not_home"
+      # - entity: device_tracker.amcrest_technologies_36_22_3a
+      #   name: Back Yard
+      #   icon: mdi:cctv
+      #   state_filter:
+      #     - "not_home"
+      - entity: device_tracker.amcrest_technologies_35_5d_c3
+        name: Front Yard
+        icon: mdi:cctv
+        state_filter:
+          - "not_home"
       - entity: device_tracker.amcrest_technologies_38_66_bc
         name: Front Porch
         icon: mdi:cctv
diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg
index 1907cd6..1f5c214 100644
--- a/www/floorplan/fullsized_floorplan.svg
+++ b/www/floorplan/fullsized_floorplan.svg
@@ -3023,7 +3023,7 @@
 </g>
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam13_motion"
+   id="binary_sensor.frigate_cam13_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="1266.7843"
    sodipodi:cy="-17722.559"
@@ -3032,7 +3032,7 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m 1266.7851,-17712.559 a 9.9992313,10 0 0 1 -10,-9.981 l 9.9992,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam13_motion"
+   inkscape:label="binary_sensor.frigate_cam13_person_occupancy"
    transform="rotate(-2.1544972)"
    sodipodi:arc-type="slice" />
 <g
@@ -3464,7 +3464,7 @@
 </g>
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam12_motion"
+   id="binary_sensor.frigate_cam12_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="13505.34"
    sodipodi:cy="11212.028"
@@ -3473,7 +3473,7 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m 13505.341,11222.028 a 9.9992313,10 0 0 1 -10,-9.981 l 9.999,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam12_motion"
+   inkscape:label="binary_sensor.frigate_cam12_person_occupancy"
    transform="rotate(-128.66031)"
    sodipodi:arc-type="slice" />
 <path
@@ -3513,7 +3513,7 @@
   </g>
   <path
      style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="binary_sensor.frigate_cam01_motion"
+     id="binary_sensor.frigate_cam01_person_occupancy"
      sodipodi:type="arc"
      sodipodi:cx="-17188.795"
      sodipodi:cy="3053.7041"
@@ -3522,7 +3522,7 @@
      sodipodi:start="1.5707178"
      sodipodi:end="3.1397678"
      d="m -17188.794,3063.7041 a 9.9992313,10 0 0 1 -10,-9.9817 l 9.999,-0.018 z"
-     inkscape:label="binary_sensor.frigate_cam01_motion"
+     inkscape:label="binary_sensor.frigate_cam01_person_occupancy"
      transform="rotate(103.07493)"
      sodipodi:arc-type="slice" />
 </g>
@@ -3560,7 +3560,7 @@
    d="m -13182.25,11895.266 a 9.9992313,10 0 0 1 -10,-9.982 l 9.999,-0.02 z" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam03_motion"
+   id="binary_sensor.frigate_cam03_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="-5380.7095"
    sodipodi:cy="-16910.912"
@@ -3569,12 +3569,12 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m -5380.7087,-16900.912 a 9.9992313,10 0 0 1 -10,-9.982 l 9.9992,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam03_motion"
+   inkscape:label="binary_sensor.frigate_cam03_person_occupancy"
    transform="rotate(20.586101)"
    sodipodi:arc-type="slice" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam06_motion"
+   id="binary_sensor.frigate_cam06_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="14732.628"
    sodipodi:cy="-9336.0605"
@@ -3583,12 +3583,12 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m 14732.629,-9326.0605 a 9.9992313,10 0 0 1 -10,-9.9818 l 9.999,-0.018 z"
-   inkscape:label="binary_sensor.frigate_cam06_motion"
+   inkscape:label="binary_sensor.frigate_cam06_person_occupancy"
    transform="rotate(-56.605603)"
    sodipodi:arc-type="slice" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam07_motion"
+   id="binary_sensor.frigate_cam07_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="-5743.2754"
    sodipodi:cy="16333.289"
@@ -3597,12 +3597,12 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m -5743.2746,16343.289 a 9.9992313,10 0 0 1 -10,-9.982 l 9.9992,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam07_motion"
+   inkscape:label="binary_sensor.frigate_cam07_person_occupancy"
    transform="rotate(161.67176)"
    sodipodi:arc-type="slice" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam08_motion"
+   id="binary_sensor.frigate_cam08_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="11920.97"
    sodipodi:cy="12722.876"
@@ -3611,7 +3611,7 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m 11920.971,12732.876 a 9.9992313,10 0 0 1 -10,-9.982 l 9.999,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam08_motion"
+   inkscape:label="binary_sensor.frigate_cam08_person_occupancy"
    transform="rotate(-135.2372)"
    sodipodi:arc-type="slice" />
 <path
@@ -5088,7 +5088,7 @@
    inkscape:transform-center-y="-9.2695059">
   <path
      style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="binary_sensor.frigate_cam14_all_occupancy"
+     id="binary_sensor.frigate_cam14_person_occupancy"
      sodipodi:type="arc"
      sodipodi:cx="448.5463"
      sodipodi:cy="971.28693"
@@ -5096,7 +5096,7 @@
      sodipodi:ry="10"
      sodipodi:start="1.5707178"
      sodipodi:end="3.1397678"
-     inkscape:label="binary_sensor.frigate_cam14_all_occupancy"
+     inkscape:label="binary_sensor.frigate_cam14_person_occupancy"
      transform="rotate(-35.855883)"
      sodipodi:arc-type="slice"
      d="m 448.54708,981.28693 a 9.9992313,10 0 0 1 -10,-9.98176 l 9.99922,-0.0182 z" />
@@ -5698,7 +5698,7 @@
    d="m 17637.001,945.99921 a 9.9992313,10 0 0 1 -10,-9.98175 l 9.999,-0.0183 z" />
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam04_motion"
+   id="binary_sensor.frigate_cam04_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="-10567.206"
    sodipodi:cy="13877.427"
@@ -5707,7 +5707,7 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m -10567.205,13887.427 a 9.9992313,10 0 0 1 -10,-9.982 l 9.999,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam04_motion"
+   inkscape:label="binary_sensor.frigate_cam04_person_occupancy"
    transform="rotate(143.44766,9.917623e-5,-1.1094146e-4)"
    sodipodi:arc-type="slice" />
 <path
@@ -5899,7 +5899,7 @@
 </g>
 <path
    style="display:inline;opacity:0.96;fill:#81c9a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.203567;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-   id="binary_sensor.frigate_cam18_motion"
+   id="binary_sensor.frigate_cam18_person_occupancy"
    sodipodi:type="arc"
    sodipodi:cx="782.23279"
    sodipodi:cy="17775.164"
@@ -5908,7 +5908,7 @@
    sodipodi:start="1.5707178"
    sodipodi:end="3.1397678"
    d="m 782.23357,17785.164 a 9.9992313,10 0 0 1 -10,-9.982 l 9.99922,-0.02 z"
-   inkscape:label="binary_sensor.frigate_cam18_motion"
+   inkscape:label="binary_sensor.frigate_cam18_person_occupancy"
    transform="rotate(-177.27264)"
    sodipodi:arc-type="slice" />
 <g