diff --git a/config/logbook.yaml b/config/logbook.yaml
index 42e292c5..59b27093 100644
--- a/config/logbook.yaml
+++ b/config/logbook.yaml
@@ -6,36 +6,36 @@
 # Original Repo: https://github.com/CCOSTAN/Home-AssistantConfig
 #-------------------------------------------
 
-  exclude:
-    entity_globs:
-      - sensor.*_location
-      - sensor.*_place
-      - sensor.*_geocoded_location  
-      - sensor.pirateweather_*
-      - weather.*
-    entities:
-      - automation.detect_lights_and_adjust_the_brightness_when_turned_on_based_on_time
-      - automation.cuckoo_clock
-      - binary_sensor.office_motion
-      - binary_sensor.refrigerator_door_open
-      - binary_sensor.rheem_wh_running
-      - group.garage_doors
-      - media_player.LivingRoomCC
-      - sensor.small_garage_status
-      - sensor.large_garage_status
-      - sensor.small_garage_time_in_state
-      - sensor.large_garage_time_in_state
-      - sensor.large_garage_wifi_signal_strength
-      - sensor.small_garage_wifi_signal_strength
-      - sensor.small_garage_reflection_rate
-      - sensor.large_garage_reflection_rate
-      - sensor.pi_hole_ads_blocked_today
-      - sensor.pi_hole_ads_percentage_blocked_today
-      - sensor.pi_hole_dns_queries_today
-      - sensor.time
-      - sensor.date
-      - sensor.downstairs_ac_cooling_numeric
-      - sensor.upstairs_ac_cooling_numeric
-      - sensor.ha_uptime
-      - sensor.sleepnumber_carlo_stacey_pressure
-      - sensor.sleepnumber_carlo_carlo_pressure
+exclude:
+  entity_globs:
+    - sensor.*_location
+    - sensor.*_place
+    - sensor.*_geocoded_location  
+    - sensor.pirateweather_*
+    - weather.*
+  entities:
+    - automation.detect_lights_and_adjust_the_brightness_when_turned_on_based_on_time
+    - automation.cuckoo_clock
+    - binary_sensor.office_motion
+    - binary_sensor.refrigerator_door_open
+    - binary_sensor.rheem_wh_running
+    - group.garage_doors
+    - media_player.LivingRoomCC
+    - sensor.small_garage_status
+    - sensor.large_garage_status
+    - sensor.small_garage_time_in_state
+    - sensor.large_garage_time_in_state
+    - sensor.large_garage_wifi_signal_strength
+    - sensor.small_garage_wifi_signal_strength
+    - sensor.small_garage_reflection_rate
+    - sensor.large_garage_reflection_rate
+    - sensor.pi_hole_ads_blocked_today
+    - sensor.pi_hole_ads_percentage_blocked_today
+    - sensor.pi_hole_dns_queries_today
+    - sensor.time
+    - sensor.date
+    - sensor.downstairs_ac_cooling_numeric
+    - sensor.upstairs_ac_cooling_numeric
+    - sensor.ha_uptime
+    - sensor.sleepnumber_carlo_stacey_pressure
+    - sensor.sleepnumber_carlo_carlo_pressure
diff --git a/config/packages/stats.yaml b/config/packages/stats.yaml
index 140efa57..1de8e0c3 100755
--- a/config/packages/stats.yaml
+++ b/config/packages/stats.yaml
@@ -100,11 +100,15 @@ sensor:
         friendly_name: 'Number of Devices'
         value_template: >-
           {{ states.device_tracker| list | count }}
+        unit_of_measurement: 'count'
+        icon_template: mdi:account-group
+
       lights_count:
         friendly_name: 'Number of Lights'
         value_template: >
           {{ states.light | list | count }}
-
+        unit_of_measurement: 'count'
+        icon_template: mdi:lightbulb
       lights_on_count:
         friendly_name: "Number of lights on"
         value_template: >-
@@ -117,7 +121,8 @@ sensor:
            {% else %}
             {{ qty }} {{ p1 }} on.
            {% endif %}
-
+        unit_of_measurement: 'count'
+        icon_template: mdi:binary-sensor
       protect_count:
         friendly_name: 'Number of Smoke Detectors'
         value_template: >
@@ -130,9 +135,12 @@ sensor:
           {% else %}
           0
           {% endif %}
+        unit_of_measurement: 'count'
+        icon_template: mdi:smoke-detector
       camera_count:
         friendly_name: 'Number of online Cameras'
         value_template: >
           {{ states.camera | list | count }}
-
+        unit_of_measurement: 'count'
+        icon_template: mdi:camera
 #############################################################
diff --git a/config/recorder.yaml b/config/recorder.yaml
index 3a7a7e79..daba47d4 100755
--- a/config/recorder.yaml
+++ b/config/recorder.yaml
@@ -33,6 +33,8 @@ exclude:
     - media_player.*echo*
     - select.sleepnumber_*
     - sensor.*_battery
+    - sensor.*_battery_state
+    - sensor.*_bssid
     - sensor.*_first_connection*
     - sensor.*_last_connection*
     - sensor.*_last_update*
@@ -41,6 +43,7 @@ exclude:
     - sensor.*uptime*
     - sensor.vpn_client_*
     - switch.*_do_not_disturb_*
+    - switch.*_repeat_switch
 
   entities:
     - automation.update_garage_get_status
@@ -77,6 +80,7 @@ exclude:
     - sensor.rachio_watering_time
     - sensor.stacey_iphone11_activity
     - sensor.stacey_iphone11_audio_output
+    - sensor.sun_next_dawn
     - sensor.time
     - switch.bear_stone
     - switch.alarm_panel_1_screensaver