diff --git a/pfsense_zbx.php b/pfsense_zbx.php
index e754672..dc5b42c 100644
--- a/pfsense_zbx.php
+++ b/pfsense_zbx.php
@@ -756,6 +756,7 @@ function pfz_valuemap($valuename, $value, $default="0"){
           
           case "gateway.status":
                     $valuemap = array(
+                         "online" => "0",
                          "none" => "0",
                          "loss" => "1",
                          "highdelay" => "2",
diff --git a/template_pfsense_active_ipsec.xml b/template_pfsense_active_ipsec.xml
index 30721a1..8ebeafe 100644
--- a/template_pfsense_active_ipsec.xml
+++ b/template_pfsense_active_ipsec.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>4.0</version>
-    <date>2021-01-18T15:02:45Z</date>
+    <date>2021-01-18T21:30:16Z</date>
     <groups>
         <group>
             <name>Templates/Network Devices</name>
@@ -504,188 +504,6 @@ https://github.com/rbicelli/pfsense-zabbix-template</description>
                     <lifetime>30d</lifetime>
                     <description>Discovery of IPsec Phase 2</description>
                     <item_prototypes>
-                        <item_prototype>
-                            <name>IPsec Tunnel  {#IKEID}.{#REQID} {#NAME} Phase 2 Byte Received</name>
-                            <type>7</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>pfsense.value[ipsec_ph2,{#EXTID},status.bytes-in]</key>
-                            <delay>60s</delay>
-                            <history>90d</history>
-                            <trends>365d</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units>b</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>IPsec Tunnel Phase 2 Protocol</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>IPsec</name>
-                                </application>
-                            </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>
-                            <application_prototypes/>
-                            <master_item/>
-                        </item_prototype>
-                        <item_prototype>
-                            <name>IPsec Tunnel  {#IKEID}.{#REQID} {#NAME} Phase 2 Byte Sent</name>
-                            <type>7</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>pfsense.value[ipsec_ph2,{#EXTID},status.bytes-out]</key>
-                            <delay>60s</delay>
-                            <history>90d</history>
-                            <trends>365d</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units>b</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>IPsec Tunnel Phase 2 Protocol</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>IPsec</name>
-                                </application>
-                            </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>
-                            <application_prototypes/>
-                            <master_item/>
-                        </item_prototype>
-                        <item_prototype>
-                            <name>IPsec Tunnel  {#IKEID}.{#REQID} {#NAME} Phase 2 Status</name>
-                            <type>7</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>pfsense.value[ipsec_ph2,{#EXTID},status]</key>
-                            <delay>60s</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>IPsec Tunnel Phase 2 Protocol</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>IPsec</name>
-                                </application>
-                            </applications>
-                            <valuemap>
-                                <name>pfSense IPsec Phase 2 Status</name>
-                            </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>
-                            <application_prototypes/>
-                            <master_item/>
-                        </item_prototype>
                         <item_prototype>
                             <name>IPsec Tunnel  {#IKEID}.{#REQID} {#NAME} Phase 2 Enabled</name>
                             <type>7</type>
@@ -1025,27 +843,6 @@ https://github.com/rbicelli/pfsense-zabbix-template</description>
                 </mapping>
             </mappings>
         </value_map>
-        <value_map>
-            <name>pfSense IPsec Phase 2 Status</name>
-            <mappings>
-                <mapping>
-                    <value>0</value>
-                    <newvalue>Down</newvalue>
-                </mapping>
-                <mapping>
-                    <value>1</value>
-                    <newvalue>Installed</newvalue>
-                </mapping>
-                <mapping>
-                    <value>2</value>
-                    <newvalue>Rekeyed</newvalue>
-                </mapping>
-                <mapping>
-                    <value>10</value>
-                    <newvalue>Down on CARP Secondary</newvalue>
-                </mapping>
-            </mappings>
-        </value_map>
         <value_map>
             <name>pfSense IPsec Protocol</name>
             <mappings>