diff --git a/automation/System/device_status.yaml b/automation/System/device_status.yaml
index a0b63756..eded9653 100755
--- a/automation/System/device_status.yaml
+++ b/automation/System/device_status.yaml
@@ -33,6 +33,7 @@
            - sensor.smart_water_meter
            - sensor.sleep_number_bed
            - sensor.nodemcu1
+           - sensor.carlopihole
          to: 'offline'
          for:
            minutes: 5
diff --git a/group/network.yaml b/group/network.yaml
index d8d50ccb..b7e5bb8e 100755
--- a/group/network.yaml
+++ b/group/network.yaml
@@ -35,3 +35,4 @@ Network:
     - sensor.sleep_number_bed
     - sensor.printer
     - sensor.NodeMCU1
+    - sensor.carlopihole
diff --git a/packages/alarm.yaml b/packages/alarm.yaml
index 8e282631..47d9e62f 100755
--- a/packages/alarm.yaml
+++ b/packages/alarm.yaml
@@ -4,11 +4,11 @@
 homeassistant:
   customize:
     binary_sensor.door1:
-      icon: mdi:Door
       friendly_name: Interior Garage Door
       emulated_hue: False
       hidden: False
     device_tracker.NodeMCU1:
+      icon: mdi:chip
       emulated_hue: False
       hidden: True
 #-------------------------------------------
diff --git a/packages/pihole.yaml b/packages/pihole.yaml
new file mode 100755
index 00000000..f1975454
--- /dev/null
+++ b/packages/pihole.yaml
@@ -0,0 +1,27 @@
+#-------------------------------------------
+#  PiHole ad Blocking Related Packages
+#-------------------------------------------
+
+#-------------------------------------------
+sensor:
+  - platform: pi_hole
+    host: 192.168.10.11
+    monitored_conditions:
+      - dns_queries_today
+      - ads_blocked_today
+      - ads_percentage_today
+
+  - platform: template
+    sensors:
+      carlopihole:
+        friendly_name: 'Carlo-PiHole'
+        value_template: "{{ 'Online' if is_state('device_tracker.carlopihole', 'home') else 'Offline' }}"
+
+#-------------------------------------------
+group:
+  Pi-Hole:
+    entities:
+      - sensor.carlopihole
+      - sensor.dns_queries_today
+      - sensor.ads_blocked_today
+      - sensor.ads_percentage_today