diff --git a/zbx_unifi_switch_16_PoE-150W_temperatur_templates.xml b/zbx_unifi_switch_16_PoE-150W_temperatur_templates.xml
new file mode 100644
index 0000000..4d28e24
--- /dev/null
+++ b/zbx_unifi_switch_16_PoE-150W_temperatur_templates.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<zabbix_export>
+    <version>4.4</version>
+    <date>2019-11-01T20:45:50Z</date>
+    <groups>
+        <group>
+            <name>Templates</name>
+        </group>
+    </groups>
+    <templates>
+        <template>
+            <template>Unifi Switch 16 POE-150W Temperature</template>
+            <name>Unifi Switch 16 POE-150W Temperature</name>
+            <groups>
+                <group>
+                    <name>Templates</name>
+                </group>
+            </groups>
+            <items>
+                <item>
+                    <name>Temperature 1</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.0</snmp_oid>
+                    <key>system.temperature.1</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor TEMP-1</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>Temperatur 1 Information</name>
+                            <priority>INFO</priority>
+                            <manual_close>YES</manual_close>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>Temperatur 1 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+                <item>
+                    <name>Temperature 2</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1</snmp_oid>
+                    <key>system.temperature.2</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor TEMP-2</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>Temperatur 2 Information</name>
+                            <priority>INFO</priority>
+                            <manual_close>YES</manual_close>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>Temperatur 2 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+                <item>
+                    <name>Temperature PoE 1</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.2</snmp_oid>
+                    <key>system.temperature.poe1</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor PoE-01</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>PoE-01 Information</name>
+                            <priority>INFO</priority>
+                            <manual_close>YES</manual_close>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>PoE-01 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+                <item>
+                    <name>Temperature PoE 2</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.3</snmp_oid>
+                    <key>system.temperature.poe2</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor PoE-02</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>PoE-02 Information</name>
+                            <priority>INFO</priority>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>PoE-02 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+                <item>
+                    <name>Temperature PoE 3</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.4</snmp_oid>
+                    <key>system.temperature.poe3</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor PoE-03</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>PoE-03 Information</name>
+                            <priority>INFO</priority>
+                            <manual_close>YES</manual_close>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>PoE-03 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+                <item>
+                    <name>Temperature PoE 4</name>
+                    <type>SNMPV2</type>
+                    <snmp_community>public</snmp_community>
+                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.5</snmp_oid>
+                    <key>system.temperature.poe4</key>
+                    <delay>30s</delay>
+                    <units>°C</units>
+                    <description>Sensor PoE-04</description>
+                    <triggers>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;70</expression>
+                            <name>PoE-04 Information</name>
+                            <priority>INFO</priority>
+                        </trigger>
+                        <trigger>
+                            <expression>{avg(10s)}&gt;90</expression>
+                            <name>PoE-04 Warning</name>
+                            <priority>WARNING</priority>
+                        </trigger>
+                    </triggers>
+                </item>
+            </items>
+            <screens>
+                <screen>
+                    <name>Temperatur</name>
+                    <hsize>1</hsize>
+                    <vsize>1</vsize>
+                    <screen_items>
+                        <screen_item>
+                            <resourcetype>0</resourcetype>
+                            <style>0</style>
+                            <resource>
+                                <name>Temperature</name>
+                                <host>Unifi Switch 16 POE-150W Temperature</host>
+                            </resource>
+                            <width>500</width>
+                            <height>100</height>
+                            <x>0</x>
+                            <y>0</y>
+                            <colspan>1</colspan>
+                            <rowspan>1</rowspan>
+                            <elements>0</elements>
+                            <valign>0</valign>
+                            <halign>0</halign>
+                            <dynamic>0</dynamic>
+                            <sort_triggers>0</sort_triggers>
+                            <url/>
+                            <application/>
+                            <max_columns>3</max_columns>
+                        </screen_item>
+                    </screen_items>
+                </screen>
+            </screens>
+        </template>
+    </templates>
+    <graphs>
+        <graph>
+            <name>PoE Temperature</name>
+            <graph_items>
+                <graph_item>
+                    <color>1A7C11</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.poe1</key>
+                    </item>
+                </graph_item>
+                <graph_item>
+                    <sortorder>1</sortorder>
+                    <color>F63100</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.poe2</key>
+                    </item>
+                </graph_item>
+                <graph_item>
+                    <sortorder>2</sortorder>
+                    <color>2774A4</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.poe3</key>
+                    </item>
+                </graph_item>
+                <graph_item>
+                    <sortorder>3</sortorder>
+                    <color>A54F10</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.poe4</key>
+                    </item>
+                </graph_item>
+            </graph_items>
+        </graph>
+        <graph>
+            <name>Temperature</name>
+            <graph_items>
+                <graph_item>
+                    <color>1565C0</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.1</key>
+                    </item>
+                </graph_item>
+                <graph_item>
+                    <sortorder>1</sortorder>
+                    <color>03A9F4</color>
+                    <item>
+                        <host>Unifi Switch 16 POE-150W Temperature</host>
+                        <key>system.temperature.2</key>
+                    </item>
+                </graph_item>
+            </graph_items>
+        </graph>
+    </graphs>
+</zabbix_export>
diff --git a/zbx_unifi_switch_temperatur_templates.xml b/zbx_unifi_switch_temperatur_templates.xml
deleted file mode 100644
index 76af65c..0000000
--- a/zbx_unifi_switch_temperatur_templates.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<zabbix_export>
-    <version>4.2</version>
-    <date>2019-07-23T07:40:11Z</date>
-    <groups>
-        <group>
-            <name>Templates</name>
-        </group>
-    </groups>
-    <templates>
-        <template>
-            <template>Unifi Switch Temperature</template>
-            <name>Unifi Switch Temperature</name>
-            <description/>
-            <groups>
-                <group>
-                    <name>Templates</name>
-                </group>
-            </groups>
-            <applications/>
-            <items>
-                <item>
-                    <name>Temperature</name>
-                    <type>4</type>
-                    <snmp_community>public</snmp_community>
-                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.0</snmp_oid>
-                    <key>system.temperature</key>
-                    <delay>30s</delay>
-                    <history>90d</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications/>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <timeout>3s</timeout>
-                    <url/>
-                    <query_fields/>
-                    <posts/>
-                    <status_codes>200</status_codes>
-                    <follow_redirects>1</follow_redirects>
-                    <post_type>0</post_type>
-                    <http_proxy/>
-                    <headers/>
-                    <retrieve_mode>0</retrieve_mode>
-                    <request_method>0</request_method>
-                    <output_format>0</output_format>
-                    <allow_traps>0</allow_traps>
-                    <ssl_cert_file/>
-                    <ssl_key_file/>
-                    <ssl_key_password/>
-                    <verify_peer>0</verify_peer>
-                    <verify_host>0</verify_host>
-                    <master_item/>
-                </item>
-                <item>
-                    <name>Temperature 2</name>
-                    <type>4</type>
-                    <snmp_community>public</snmp_community>
-                    <snmp_oid>1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.1</snmp_oid>
-                    <key>system.temperature.2</key>
-                    <delay>30s</delay>
-                    <history>90d</history>
-                    <trends>365d</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units>°C</units>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications/>
-                    <valuemap/>
-                    <logtimefmt/>
-                    <preprocessing/>
-                    <jmx_endpoint/>
-                    <timeout>3s</timeout>
-                    <url/>
-                    <query_fields/>
-                    <posts/>
-                    <status_codes>200</status_codes>
-                    <follow_redirects>1</follow_redirects>
-                    <post_type>0</post_type>
-                    <http_proxy/>
-                    <headers/>
-                    <retrieve_mode>0</retrieve_mode>
-                    <request_method>0</request_method>
-                    <output_format>0</output_format>
-                    <allow_traps>0</allow_traps>
-                    <ssl_cert_file/>
-                    <ssl_key_file/>
-                    <ssl_key_password/>
-                    <verify_peer>0</verify_peer>
-                    <verify_host>0</verify_host>
-                    <master_item/>
-                </item>
-            </items>
-            <discovery_rules/>
-            <httptests/>
-            <macros/>
-            <templates/>
-            <screens/>
-            <tags/>
-        </template>
-    </templates>
-    <triggers>
-        <trigger>
-            <expression>{Unifi Switch Temperature:system.temperature.2.avg(10s)}&gt;70</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Temperature 2 Warning</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>2</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Unifi Switch Temperature:system.temperature.2.avg(10s)}&gt;90</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Temperature 2 Warning</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Unifi Switch Temperature:system.temperature.avg(10s)}&gt;70</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Temperature Warning</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>2</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-        <trigger>
-            <expression>{Unifi Switch Temperature:system.temperature.avg(10s)}&gt;90</expression>
-            <recovery_mode>0</recovery_mode>
-            <recovery_expression/>
-            <name>Temperature Warning</name>
-            <correlation_mode>0</correlation_mode>
-            <correlation_tag/>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <manual_close>0</manual_close>
-            <dependencies/>
-            <tags/>
-        </trigger>
-    </triggers>
-    <graphs>
-        <graph>
-            <name>Temperature</name>
-            <width>900</width>
-            <height>200</height>
-            <yaxismin>0.0000</yaxismin>
-            <yaxismax>100.0000</yaxismax>
-            <show_work_period>1</show_work_period>
-            <show_triggers>1</show_triggers>
-            <type>0</type>
-            <show_legend>1</show_legend>
-            <show_3d>0</show_3d>
-            <percent_left>0.0000</percent_left>
-            <percent_right>0.0000</percent_right>
-            <ymin_type_1>0</ymin_type_1>
-            <ymax_type_1>0</ymax_type_1>
-            <ymin_item_1>0</ymin_item_1>
-            <ymax_item_1>0</ymax_item_1>
-            <graph_items>
-                <graph_item>
-                    <sortorder>0</sortorder>
-                    <drawtype>0</drawtype>
-                    <color>1565C0</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Unifi Switch Temperature</host>
-                        <key>system.temperature</key>
-                    </item>
-                </graph_item>
-                <graph_item>
-                    <sortorder>1</sortorder>
-                    <drawtype>0</drawtype>
-                    <color>03A9F4</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Unifi Switch Temperature</host>
-                        <key>system.temperature.2</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-    </graphs>
-</zabbix_export>