diff --git a/scripts/cpu-count.trap b/scripts/cpu-count.trap
new file mode 100755
index 0000000..411481c
--- /dev/null
+++ b/scripts/cpu-count.trap
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+#numCPU=$(grep processor /proc/cpuinfo | wc -l)
+numKernelThreads=$(ps aux | awk '{if($11~/^\[/){print $11}}' | wc -l)
+
+#echo "- system.cpucount $numCPU"
+echo "- proc.kernel.num $numKernelThreads"
diff --git a/scripts/proc.kernel.num.trap b/scripts/proc.kernel.num.trap
new file mode 100755
index 0000000..546b54b
--- /dev/null
+++ b/scripts/proc.kernel.num.trap
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+numKernelThreads=$(ps aux | awk '{if($11~/^\[/){print $11}}' | wc -l)
+
+echo "- proc.kernel.num $numKernelThreads"
diff --git a/templates/Template_DomainCheck.xml b/templates/Template_DomainCheck.xml
index 2d53c28..db84abb 100644
--- a/templates/Template_DomainCheck.xml
+++ b/templates/Template_DomainCheck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-06-28T17:36:52Z</date>
+    <date>2013-07-19T12:40:20Z</date>
     <groups>
         <group>
             <name>Templates</name>
@@ -25,7 +25,7 @@
             <discovery_rules>
                 <discovery_rule>
                     <name>Domain Name Discovery</name>
-                    <type>7</type>
+                    <type>0</type>
                     <snmp_community/>
                     <snmp_oid/>
                     <key>domain.check.discovery</key>
@@ -50,12 +50,12 @@
                     <description>Discovery of domain names to check and monitor for expiration.</description>
                     <item_prototypes>
                         <item_prototype>
-                            <name>Days for domain {$DOMAIN} to expire</name>
+                            <name>Days for domain {#DOMAIN} to expire</name>
                             <type>2</type>
                             <snmp_community/>
                             <multiplier>0</multiplier>
                             <snmp_oid/>
-                            <key>domain.daysleft[{$DOMAIN}]</key>
+                            <key>domain.daysleft[{#DOMAIN}]</key>
                             <delay>0</delay>
                             <history>120</history>
                             <trends>365</trends>
@@ -91,20 +91,20 @@
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{Template_DomainCheck:domain.daysleft[{$DOMAIN}].last(0)}&lt;{$EXPIRECRIT}</expression>
+                            <expression>{Template_DomainCheck:domain.daysleft[{#DOMAIN}].last(0)}&lt;{$EXPIRECRIT}</expression>
                             <name>Domain {#DOMAIN} will expire in {ITEM.VALUE1} days</name>
                             <url/>
                             <status>0</status>
-                            <priority>5</priority>
+                            <priority>4</priority>
                             <description/>
                             <type>1</type>
                         </trigger_prototype>
                         <trigger_prototype>
-                            <expression>{Template_DomainCheck:domain.daysleft[{$DOMAIN}].last(0)}&lt;{$EXPIREWARN}</expression>
+                            <expression>{Template_DomainCheck:domain.daysleft[{#DOMAIN}].last(0)}&lt;{$EXPIREWARN}&amp;{Template_DomainCheck:domain.daysleft[{#DOMAIN}].last(0)}&gt;{$EXPIRECRIT}</expression>
                             <name>Domain {#DOMAIN} will expire in {ITEM.VALUE1} days</name>
                             <url/>
                             <status>0</status>
-                            <priority>2</priority>
+                            <priority>3</priority>
                             <description/>
                             <type>0</type>
                         </trigger_prototype>