diff --git a/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml b/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
index 4289a55d7..a71da3e90 100644
--- a/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
+++ b/Applications/template_pi-hole_api/6.0/template_pi-hole_api.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-04-02T04:03:09Z'
+  date: '2022-04-21T13:17:42Z'
   groups:
     -
       uuid: 7df96b18c230490a9a0a9e2307226338
@@ -545,8 +545,6 @@ zabbix_export:
           type: DEPENDENT
           key: json.pihole.reply_IP
           delay: '0'
-          trends: '0'
-          value_type: TEXT
           preprocessing:
             -
               type: JSONPATH
@@ -628,13 +626,12 @@ zabbix_export:
               value: DNS
   graphs:
     -
-      uuid: 21618ae02d5141e990b0226ad64a699f
+      uuid: f74d491b474d49bcb9faa24a804be6d9
       name: 'Ads percentage today'
-      ymin_type_1: FIXED
+      type: STACKED
       graph_items:
         -
           color: F63100
-          yaxisside: RIGHT
           item:
             host: 'App Pi-Hole'
             key: json.pihole.ads_percentage_today
@@ -645,9 +642,9 @@ zabbix_export:
             host: 'App Pi-Hole'
             key: json.pihole.domains_being_blocked
     -
-      uuid: c792dafa37204064b9cf1cb062049c46
+      uuid: 21b72525219a4c9885a8438bb17b4a53
       name: Clients
-      ymin_type_1: FIXED
+      type: STACKED
       graph_items:
         -
           color: 199C0D
@@ -661,8 +658,8 @@ zabbix_export:
             host: 'App Pi-Hole'
             key: json.pihole.unique_clients
     -
-      uuid: 455b5d87729c4742810138c802ceb019
-      name: 'DNS queries'
+      uuid: 78b450f0b65b46b596f780f16c0ee1bf
+      name: 'DNS Queries'
       type: STACKED
       graph_items:
         -
@@ -689,8 +686,8 @@ zabbix_export:
             host: 'App Pi-Hole'
             key: json.pihole.unique_domains
     -
-      uuid: 13c54458c01441608c412b262dacf486
-      name: 'DNS replies'
+      uuid: 493567a5e4744805b1bea8e25938c981
+      name: 'DNS Replies'
       type: STACKED
       graph_items:
         -
@@ -717,7 +714,7 @@ zabbix_export:
             host: 'App Pi-Hole'
             key: json.pihole.reply_NXDOMAIN
     -
-      uuid: 57bda25eb5db401b82aef74ee6e22e7e
+      uuid: 1444c879e703464e85ab794ea1f13ca9
       name: 'Query Types'
       type: STACKED
       graph_items:
@@ -740,61 +737,61 @@ zabbix_export:
             key: json.pihole.querytypes.any
         -
           sortorder: '3'
-          color: C7A72D
+          color: F7941D
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.srv
+            key: json.pihole.querytypes.dnskey
         -
           sortorder: '4'
-          color: 6C59DC
+          color: FC6EA3
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.soa
+            key: json.pihole.querytypes.ds
         -
           sortorder: '5'
-          color: FC6EA3
+          color: 6C59DC
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.ptr
+            key: json.pihole.querytypes.mx
         -
           sortorder: '6'
-          color: BA2A5D
+          color: C7A72D
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.txt
+            key: json.pihole.querytypes.naptr
         -
           sortorder: '7'
-          color: F7941D
+          color: BA2A5D
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.naptr
+            key: json.pihole.querytypes.other
         -
           sortorder: '8'
           color: F230E0
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.mx
+            key: json.pihole.querytypes.ptr
         -
           sortorder: '9'
           color: 5CCD18
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.ds
+            key: json.pihole.querytypes.rrsig
         -
           sortorder: '10'
           color: BB2A02
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.rrsig
+            key: json.pihole.querytypes.soa
         -
           sortorder: '11'
           color: AC41A5
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.dnskey
+            key: json.pihole.querytypes.srv
         -
           sortorder: '12'
           color: 89ABF8
           item:
             host: 'App Pi-Hole'
-            key: json.pihole.querytypes.other
+            key: json.pihole.querytypes.txt