diff --git a/zabbix_template.xml b/zabbix_template.xml
index d1c8dd2..8675c1f 100644
--- a/zabbix_template.xml
+++ b/zabbix_template.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.0</version>
-    <date>2020-07-17T03:56:57Z</date>
+    <date>2020-09-05T12:40:25Z</date>
     <groups>
         <group>
-            <name>Servers</name>
+            <name>Templates</name>
         </group>
     </groups>
     <templates>
@@ -13,7 +13,7 @@
             <name>Unraid server</name>
             <groups>
                 <group>
-                    <name>Servers</name>
+                    <name>Templates</name>
                 </group>
             </groups>
             <applications>
@@ -26,6 +26,9 @@
                 <application>
                     <name>Memory</name>
                 </application>
+                <application>
+                    <name>System</name>
+                </application>
                 <application>
                     <name>VMs</name>
                 </application>
@@ -230,6 +233,63 @@
                         <key>unraid.disks.totals</key>
                     </master_item>
                 </item>
+                <item>
+                    <name>Temperature data</name>
+                    <key>unraid.temperatures</key>
+                    <delay>2m</delay>
+                    <history>1d</history>
+                    <trends>0</trends>
+                    <value_type>TEXT</value_type>
+                    <applications>
+                        <application>
+                            <name>System</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>Temperature CPU</name>
+                    <type>DEPENDENT</type>
+                    <key>unraid.temperatures[cpu]</key>
+                    <delay>0</delay>
+                    <value_type>FLOAT</value_type>
+                    <units>°C</units>
+                    <applications>
+                        <application>
+                            <name>System</name>
+                        </application>
+                    </applications>
+                    <preprocessing>
+                        <step>
+                            <type>JSONPATH</type>
+                            <params>$.cpu</params>
+                        </step>
+                    </preprocessing>
+                    <master_item>
+                        <key>unraid.temperatures</key>
+                    </master_item>
+                </item>
+                <item>
+                    <name>Temperature Mainboard</name>
+                    <type>DEPENDENT</type>
+                    <key>unraid.temperatures[mainboard]</key>
+                    <delay>0</delay>
+                    <value_type>FLOAT</value_type>
+                    <units>°C</units>
+                    <applications>
+                        <application>
+                            <name>System</name>
+                        </application>
+                    </applications>
+                    <preprocessing>
+                        <step>
+                            <type>JSONPATH</type>
+                            <params>$.mainboard</params>
+                        </step>
+                    </preprocessing>
+                    <master_item>
+                        <key>unraid.temperatures</key>
+                    </master_item>
+                </item>
                 <item>
                     <name>Memory available</name>
                     <key>vm.memory.size[available]</key>
@@ -532,6 +592,29 @@
                                 <key>unraid.disk[{#ID}]</key>
                             </master_item>
                         </item_prototype>
+                        <item_prototype>
+                            <name>Disk {#ID} running</name>
+                            <type>DEPENDENT</type>
+                            <key>unraid.disk[{#ID},running]</key>
+                            <delay>0</delay>
+                            <applications>
+                                <application>
+                                    <name>Disks</name>
+                                </application>
+                            </applications>
+                            <valuemap>
+                                <name>Yes/No</name>
+                            </valuemap>
+                            <preprocessing>
+                                <step>
+                                    <type>JSONPATH</type>
+                                    <params>$.running</params>
+                                </step>
+                            </preprocessing>
+                            <master_item>
+                                <key>unraid.disk[{#ID}]</key>
+                            </master_item>
+                        </item_prototype>
                         <item_prototype>
                             <name>Disk {#ID} size</name>
                             <type>DEPENDENT</type>
@@ -843,4 +926,19 @@ return j.cpu_time / j.cpus * 100;</params>
             </discovery_rules>
         </template>
     </templates>
+    <value_maps>
+        <value_map>
+            <name>Yes/No</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>No</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Yes</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>