diff --git a/.gitignore b/.gitignore
index 8343ce16c..4c54d94c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ Desktop.ini
 ._*
 tags
 tags.*
+.idea
+/nbproject/private/
diff --git a/Dockerfile b/Dockerfile
index d781318ad..e7c9e6806 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine
 
-MAINTAINER Elbert Alias <elbert@alias.io>
+LABEL maintainer="elbert@alias.io"
 
 ENV WAPPALYZER_DIR=/opt/wappalyzer
 
diff --git a/src/apps.json b/src/apps.json
index 7f724d4bd..289825e20 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -15,6 +15,14 @@
       "script": "1c-bitrix",
       "website": "http://www.1c-bitrix.ru"
     },
+    "91App": {
+      "cats": [
+        6
+      ],
+      "icon": "91app.png",
+      "script": "https\\:\\/\\/track\\.91app\\.io\\/track\\.js\\?",
+      "website": "https://www.91app.com/"
+    },
     "3dCart": {
       "cats": [
         1,
@@ -38,7 +46,7 @@
       "icon": "A-Frame.svg",
       "implies": "three.js",
       "js": {
-        "AFRAME.version": "(.*)\\;version:\\1"
+        "AFRAME.version": "^(.+)$\\;version:\\1"
       },
       "script": "/?([\\d.]+)?/aframe(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://aframe.io"
@@ -56,23 +64,6 @@
       "icon": "ebis.png",
       "website": "http://www.ebis.ne.jp"
     },
-    "AMPcms": {
-      "cats": [
-        1
-      ],
-      "cookies": {
-        "AMP": ""
-      },
-      "headers": {
-        "X-AMP-Version": "([\\d.]+)\\;version:\\1"
-      },
-      "icon": "AMPcms.png",
-      "implies": "PHP",
-      "js": {
-        "amp_js_init": ""
-      },
-      "website": "http://www.ampcms.org"
-    },
     "AOLserver": {
       "cats": [
         22
@@ -124,26 +115,48 @@
       "icon": "Accelerated-Mobile-Pages.svg",
       "website": "https://www.ampproject.org"
     },
-    "Accessible Portal": {
+    "Azure": {
       "cats": [
-        1
+        62
       ],
-      "icon": "Accessible Portal.png",
-      "implies": "PHP",
-      "meta": {
-        "generator": "Accessible Portal"
+      "headers": {
+        "azure-regionname": "",
+        "azure-sitename": "",
+        "azure-slotname": "",
+        "azure-version": ""
       },
-      "website": "http://www.accessibleportal.com"
+      "cookies": {
+        "ARRAffinity": "",
+        "TiPMix": ""
+      },
+      "icon": "azure.svg",
+      "website": "https://azure.microsoft.com"
+    },
+    "Azure CDN": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "server": "^(?:ECAcc|ECS|ECD)",
+        "X-EC-Debug": ""
+      },
+      "icon": "azure.svg",
+      "website": "https://azure.microsoft.com/en-us/services/cdn/"
     },
     "Acquia Cloud": {
       "cats": [
-        22
+        62
       ],
       "headers": {
         "X-AH-Environment": "^\\w+$"
       },
       "icon": "acquia-cloud.png",
-      "implies": "Drupal\\;confidence:95",
+      "implies": [
+        "Drupal\\;confidence:95",
+        "Apache",
+        "Percona",
+        "Amazon EC2"
+      ],
       "website": "https://www.acquia.com/"
     },
     "Act-On": {
@@ -373,7 +386,7 @@
       ],
       "icon": "Adyen.svg",
       "js": {
-        "adyen.encrypt.version": "(.*)\\;version:\\1"
+        "adyen.encrypt.version": "^(.+)$\\;version:\\1"
       },
       "website": "https://www.adyen.com"
     },
@@ -425,6 +438,20 @@
       "script": "shop-static\\.afterbuy\\.de",
       "website": "http://www.afterbuy.de"
     },
+    "Ahoy": {
+      "cats": [
+        10
+      ],
+      "js": {
+        "ahoy": ""
+      },
+      "cookies": {
+        "ahoy_track": "",
+        "ahoy_visit": "",
+        "ahoy_visitor": ""
+      },
+      "website": "https://github.com/ankane/ahoy"
+    },
     "Aircall": {
       "cats": [
         52
@@ -486,7 +513,7 @@
       "icon": "Algolia Realtime Search.svg",
       "js": {
         "AlgoliaSearch": "",
-        "algoliasearch.version": "(.*)\\;version:\\1"
+        "algoliasearch.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://www.algolia.com"
     },
@@ -497,7 +524,7 @@
       "html": "<!-- All in One SEO Pack ([\\d.]+) \\;version:\\1",
       "icon": "all-in-One-SEO-Pack.png",
       "implies": "WordPress",
-      "website": "https://www.acquia.com/"
+      "website": "https://wordpress.org/plugins/all-in-one-seo-pack/"
     },
     "Allegro RomPager": {
       "cats": [
@@ -543,6 +570,7 @@
         "X-Amz-Cf-Id": ""
       },
       "icon": "Amazon-Cloudfront.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/cloudfront/"
     },
     "Amazon EC2": {
@@ -553,8 +581,41 @@
         "Server": "\\(Amazon\\)"
       },
       "icon": "aws-ec2.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/ec2/"
     },
+    "Amazon Web Services": {
+      "cats": [
+        62
+      ],
+      "icon": "aws.svg",
+      "website": "https://aws.amazon.com/"
+    },
+    "Amazon ECS": {
+      "cats": [
+        63
+      ],
+      "headers": {
+        "Server": "^ECS"
+      },
+      "icon": "aws.svg",
+      "implies": [
+        "Amazon Web Services",
+        "Docker"
+      ],
+      "website": "https://aws.amazon.com/elasticloadbalancing/"
+    },
+    "Amazon ELB": {
+      "cats": [
+        65
+      ],
+      "cookies": {
+        "AWSELB": ""
+      },
+      "icon": "aws-elb.png",
+      "implies": "Amazon Web Services",
+      "website": "https://aws.amazon.com/elasticloadbalancing/"
+    },
     "Amazon S3": {
       "cats": [
         19
@@ -563,6 +624,7 @@
         "Server": "^AmazonS3$"
       },
       "icon": "aws-s3.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/s3/"
     },
     "Amber": {
@@ -609,6 +671,20 @@
       ],
       "website": "https://amplitude.com/"
     },
+    "Analysys Ark": {
+      "cats": [
+        10
+      ],
+      "js": {
+        "AnalysysAgent": ""
+      },
+      "cookies": {
+        "ARK_ID": ""
+      },
+      "icon": "Analysys Ark.svg",
+      "script": "AnalysysFangzhou_JS_SDK\\.min\\.js\\?v=([\\d.]+)\\;version:\\1",
+      "website": "https://ark.analysys.cn"
+    },
     "Anetwork": {
       "cats": [
         36
@@ -642,10 +718,7 @@
       "js": {
         "ngMaterial": ""
       },
-      "script": [
-        "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
-        "angular-material.*\\.js"
-      ],
+      "script": "/([\\d.rc-]+)?/angular-material(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://material.angularjs.org"
     },
     "AngularDart": {
@@ -672,13 +745,17 @@
         "AngularDart"
       ],
       "icon": "AngularJS.svg",
+      "html": [
+        "<(?:div|html)[^>]+ng-app=",
+        "<ng-app"
+      ],
       "js": {
         "angular": "",
-        "angular.version.full": "(.*)\\;version:\\1"
+        "angular.version.full": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
+        "angular[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "/([\\d.]+(?:-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
         "angular.*\\.js"
       ],
       "website": "https://angularjs.org"
@@ -743,7 +820,7 @@
         22
       ],
       "headers": {
-        "Server": "^Apache-Coyote",
+        "Server": "^Apache-Coyote(?:/([\\d.]+))?\\;version:\\1",
         "X-Powered-By": "\\bTomcat\\b(?:-([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache Tomcat.svg",
@@ -814,7 +891,7 @@
       ],
       "excludes": "OpenCart",
       "headers": {
-        "Arastta": "(.*)\\;version:\\1",
+        "Arastta": "^(.+)$\\;version:\\1",
         "X-Arastta": ""
       },
       "html": "Powered by <a [^>]*href=\"https?://(?:www\\.)?arastta\\.org[^>]+>Arastta",
@@ -823,14 +900,6 @@
       "script": "arastta\\.js",
       "website": "http://arastta.org"
     },
-    "Arc Forum": {
-      "cats": [
-        2
-      ],
-      "html": "ping\\.src = node\\.href;\\s+[^>]+\\s+}\\s+</script>",
-      "icon": "Arc Forum.png",
-      "website": "http://arclanguage.org"
-    },
     "ArcGIS API for JavaScript": {
       "cats": [
         35
@@ -1058,7 +1127,7 @@
       "implies": "Underscore.js",
       "js": {
         "Backbone": "",
-        "Backbone.VERSION": "(.*)\\;version:\\1"
+        "Backbone.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "backbone.*\\.js",
       "website": "http://backbonejs.org"
@@ -1112,6 +1181,16 @@
       "implies": "Python",
       "website": "http://docs.python.org/2/library/basehttpserver.html"
     },
+    "BigBangShop": {
+      "cats": [
+        6
+      ],
+      "headers": {
+        "X-SERVER": "BIGBANGSHOP"
+      },
+      "icon": "bigbangshop.svg",
+      "website": "https://www.bigbangshop.com.br"
+    },
     "BigDump": {
       "cats": [
         3
@@ -1294,12 +1373,12 @@
       ],
       "icon": "Bootstrap.png",
       "js": {
-        "bootstrap.Alert.VERSION": "(.*)\\;version:\\1",
-        "jQuery.fn.tooltip.Constructor.VERSION": "(.*)\\;version:\\1"
+        "bootstrap.Alert.VERSION": "^(.+)$\\;version:\\1",
+        "jQuery.fn.tooltip.Constructor.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": [
         "twitter\\.github\\.com/bootstrap",
-        "bootstrap(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "bootstrap[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "https://getbootstrap.com"
@@ -1321,12 +1400,11 @@
       "cats": [
         32
       ],
-      "html": "<script[^>]*>[^>]+\\.src\\s*=\\s*['\"](?:https?:)?//tag\\.bounceexchange\\.com/",
+      "script": "^https?://tag\\.bounceexchange\\.com/",
       "icon": "Bounce Exchange.svg",
       "js": {
         "bouncex": ""
       },
-      "script": "^https?://tag\\.bounceexchange\\.com/",
       "website": "http://www.bounceexchange.com"
     },
     "Braintree": {
@@ -1336,7 +1414,7 @@
       "icon": "Braintree.svg",
       "js": {
         "Braintree": "",
-        "Braintree.version": "(.*)\\;version:\\1"
+        "Braintree.version": "^(.+)$\\;version:\\1"
       },
       "website": "https://www.braintreepayments.com"
     },
@@ -1376,26 +1454,17 @@
       },
       "website": "http://bubble.is"
     },
-    "BugSense": {
-      "cats": [
-        10
-      ],
-      "icon": "BugSense.png",
-      "js": {
-        "Bugsense": ""
-      },
-      "script": "bugsense\\.js",
-      "website": "http://bugsense.com"
-    },
     "BugSnag": {
       "cats": [
         10
       ],
       "icon": "BugSnag.png",
       "js": {
-        "Bugsnag": ""
+        "Bugsnag": "",
+        "bugsnag": "",
+        "bugsnagClient": ""
       },
-      "script": "bugsnag.*\\.js",
+      "script": "/bugsnag.*\\.js",
       "website": "http://bugsnag.com"
     },
     "Bugzilla": {
@@ -1405,6 +1474,7 @@
       "html": [
         "href=\"enter_bug\\.cgi\">",
         "<main id=\"bugzilla-body\"",
+        "<a href=\"https?://www\\.bugzilla\\.org/docs/([0-9.]+)/[^>]+>Help<\\;version:\\1",
         "<span id=\"information\" class=\"header_addl_info\">version ([\\d.]+)<\\;version:\\1"
       ],
       "cookies": {
@@ -1453,7 +1523,7 @@
       "cats": [
         36
       ],
-      "html": "<script[^>]*>[^<]+?bsa\\.src\\s*=\\s*['\"](?:https?:)?\\/{2}\\w\\d\\.buysellads\\.com\\/[\\w\\d\\/]+?bsa\\.js['\"]",
+      "script": "^https?://s\\d\\.buysellads\\.com/",
       "icon": "BuySellAds.png",
       "js": {
         "_bsa": "",
@@ -1461,16 +1531,8 @@
         "_bsap": "",
         "_bsap_serving_callback": ""
       },
-      "script": "^https?://s\\d\\.buysellads\\.com/",
       "website": "http://buysellads.com"
     },
-    "C++": {
-      "cats": [
-        27
-      ],
-      "icon": "C++.png",
-      "website": "http://isocpp.org"
-    },
     "CDN77": {
       "cats": [
         31
@@ -1495,7 +1557,7 @@
       "icon": "CKEditor.png",
       "js": {
         "CKEDITOR": "",
-        "CKEDITOR.version": "(.*)\\;version:\\1",
+        "CKEDITOR.version": "^(.+)$\\;version:\\1",
         "CKEDITOR_BASEPATH": ""
       },
       "website": "http://ckeditor.com"
@@ -1524,14 +1586,6 @@
       },
       "website": "http://www.cmsimple.org/en"
     },
-    "CO2Stats": {
-      "cats": [
-        10
-      ],
-      "html": "src=[^>]+co2stats\\.com/propres\\.php",
-      "icon": "CO2Stats.png",
-      "website": "http://co2stats.com"
-    },
     "CPG Dragonfly": {
       "cats": [
         1
@@ -1647,7 +1701,7 @@
       "implies": "Node.js",
       "js": {
         "catberry": "",
-        "catberry.version": "(.*)\\;version:\\1"
+        "catberry.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://catberry.org"
     },
@@ -1698,16 +1752,16 @@
       "icon": "Chart.js.svg",
       "js": {
         "Chart": "\\;confidence:50",
+        "Chart.defaults.doughnut": "",
         "chart.ctx.bezierCurveTo": ""
       },
       "script": [
-        "Chart(?:\\.bundle)?(?:\\.min)?\\.js\\;confidence:50",
+        "/Chart(?:\\.bundle)?(?:\\.min)?\\.js\\;confidence:75",
         "chartjs\\.org/dist/([\\d.]+(?:-[^/]+)?|master|latest)/Chart.*\\.js\\;version:\\1",
         "cdnjs\\.cloudflare\\.com/ajax/libs/Chart\\.js/([\\d.]+(?:-[^/]+)?)/Chart.*\\.js\\;version:\\1",
-        "cdn\\.jsdelivr\\.net/npm/chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1",
-        "cdn\\.jsdelivr\\.net/gh/chartjs/Chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1"
+        "cdn\\.jsdelivr\\.net/(?:npm|gh/chartjs)/chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1"
       ],
-      "website": "http://www.chartjs.org"
+      "website": "https://www.chartjs.org"
     },
     "Chartbeat": {
       "cats": [
@@ -1743,6 +1797,19 @@
       "implies": "Python",
       "website": "http://www.cherrypy.org"
     },
+    "Chevereto": {
+      "cats": [
+        7
+      ],
+      "meta": {
+        "generator": "^Chevereto ?([0-9.]+)?$\\;version:\\1"
+      },
+      "script": "/chevereto\\.js",
+      "html": "Powered by <a href=\"https?://chevereto\\.com\">",
+      "icon": "chevereto.png",
+      "implies": "PHP",
+      "website": "https://chevereto.com/"
+    },
     "Chitika": {
       "cats": [
         36
@@ -1771,10 +1838,28 @@
         "PostgreSQL"
       ],
       "meta": {
-        "generator": ".*ckan.*"
+        "generator": "^ckan ?([0-9.]+)$\\;version:\\1"
       },
       "website": "http://ckan.org/"
     },
+    "Clarity": {
+      "cats": [
+        18
+      ],
+      "html": [
+        "<clr-main-container",
+        "<link [^>]*href=\"[^\"]*clr-ui(?:\\.min)?\\.css"
+      ],
+      "js": {
+        "ClarityIcons": ""
+      },
+      "script": "clr-angular(?:\\.umd)?(?:\\.min)?\\.js",
+      "icon": "clarity.svg",
+      "implies": [
+        "Angular"
+      ],
+      "website": "https://clarity.design/"
+    },
     "ClickHeat": {
       "cats": [
         10
@@ -1845,6 +1930,9 @@
         "cf-ray": ""
       },
       "icon": "CloudFlare.svg",
+      "cookies": {
+        "__cfduid": ""
+      },
       "js": {
         "CloudFlare": ""
       },
@@ -1886,7 +1974,7 @@
         18
       ],
       "cookies": {
-        "ci_csrf_token": "(.*)\\;version:\\1?2+:",
+        "ci_csrf_token": "^(.+)$\\;version:\\1?2+:",
         "ci_session": "",
         "exp_last_activity": "",
         "exp_tracker": ""
@@ -1903,7 +1991,7 @@
       "icon": "CodeMirror.png",
       "js": {
         "CodeMirror": "",
-        "CodeMirror.version": "(.*)\\;version:\\1"
+        "CodeMirror.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://codemirror.net"
     },
@@ -1983,6 +2071,14 @@
       },
       "website": "http://comandia.com"
     },
+    "Combeenation": {
+      "cats": [
+        6
+      ],
+      "html": "<iframe[^>]+src=\"[^>]+portal\\.combeenation\\.com",
+      "icon": "Combeenation.png",
+      "website": "https://www.combeenation.com"
+    },
     "Commerce Server": {
       "cats": [
         6
@@ -2013,6 +2109,9 @@
       "js": {
         "CCM_IMAGE_PATH": ""
       },
+      "cookies": {
+        "CONCRETE5": ""
+      },
       "meta": {
         "generator": "^concrete5 - ([\\d.]+)$\\;version:\\1"
       },
@@ -2056,11 +2155,11 @@
       },
       "website": "http://contenido.org/en"
     },
-    "Contens": {
+    "Contensis": {
       "cats": [
         1
       ],
-      "icon": "Contens.png",
+      "icon": "Contensis.png",
       "implies": [
         "Java",
         "CFML"
@@ -2068,7 +2167,7 @@
       "meta": {
         "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1"
       },
-      "website": "http://www.contens.com/en/pub/index.cfm"
+      "website": "https://zengenti.com/en-gb/products/contensis"
     },
     "ContentBox": {
       "cats": [
@@ -2136,6 +2235,16 @@
       "icon": "CouchDB.png",
       "website": "http://couchdb.apache.org"
     },
+    "Countly": {
+      "cats": [
+        10
+      ],
+      "icon": "Countly.png",
+      "js": {
+        "Countly": ""
+      },
+      "website": "https://count.ly"
+    },
     "Cowboy": {
       "cats": [
         18,
@@ -2205,7 +2314,7 @@
         "criteo_pubtag": "",
         "criteo_q": ""
       },
-      "script":[ 
+      "script": [
         "//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
         "//static.criteo.net/js/ld/ld.js"
       ],
@@ -2268,7 +2377,7 @@
       ],
       "icon": "D3.png",
       "js": {
-        "d3.version": "(.*)\\;version:\\1"
+        "d3.version": "^(.+)$\\;version:\\1"
       },
       "script": "/d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
       "website": "http://d3js.org"
@@ -2310,7 +2419,7 @@
       "implies": "Microsoft ASP.NET",
       "js": {
         "DotNetNuke": "",
-        "dnn.apiversion": "(.*)\\;version:\\1"
+        "dnn.apiversion": "^(.+)$\\;version:\\1"
       },
       "meta": {
         "generator": "DotNetNuke"
@@ -2393,6 +2502,22 @@
       "icon": "Apple.svg",
       "website": "https://opensource.apple.com"
     },
+    "Datadome": {
+      "cats": [
+        19
+      ],
+      "cookies": {
+        "datadome": ""
+      },
+      "script": "^https://ct\\.datadome\\.co/[a-z]\\.js$",
+      "headers": {
+        "X-DataDome": "",
+        "Server": "^DataDome$",
+        "X-DataDome-CID": ""
+      },
+      "icon": "datadome.png",
+      "website": "https://datadome.co/"
+    },
     "DataLife Engine": {
       "cats": [
         1
@@ -2419,6 +2544,16 @@
       "script": "dataTables.*\\.js",
       "website": "http://datatables.net"
     },
+    "Day.js": {
+      "cats": [
+        59
+      ],
+      "icon": "Day.js.svg",
+      "js": {
+        "dayjs": ""
+      },
+      "website": "https://github.com/iamkun/dayjs"
+    },
     "Debian": {
       "cats": [
         28
@@ -2479,13 +2614,13 @@
       "implies": "PHP",
       "js": {
         "DISCUZCODE": "",
-        "discuzVersion": "(.*)\\;version:\\1",
+        "discuzVersion": "^(.+)$\\;version:\\1",
         "discuz_uid": ""
       },
       "meta": {
         "generator": "Discuz! X([\\d\\.]+)?\\;version:\\1"
       },
-      "website": "http://discuz.com"
+      "website": "http://www.discuz.net"
     },
     "Disqus": {
       "cats": [
@@ -2531,11 +2666,23 @@
         "React",
         "webpack"
       ],
+      "js": {
+        "search.indexName": ""
+      },
       "meta": {
         "generator": "^Docusaurus$"
       },
       "website": "https://docusaurus.io/"
     },
+    "Docker": {
+      "cats": [
+        60
+      ],
+      "icon": "Docker.svg",
+      "implies": "Linux",
+      "html": "<!-- This comment is expected by the docker HEALTHCHECK  -->",
+      "website": "https://www.docker.com/"
+    },
     "Dojo": {
       "cats": [
         59
@@ -2543,7 +2690,7 @@
       "icon": "Dojo.png",
       "js": {
         "dojo": "",
-        "dojo.version.major": "(.*)\\;version:\\1"
+        "dojo.version.major": "^(.+)$\\;version:\\1"
       },
       "script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
       "website": "https://dojotoolkit.org"
@@ -2575,10 +2722,14 @@
       "cookies": {
         "DokuWiki": ""
       },
+      "html": [
+        "<div[^>]+id=\"dokuwiki__>",
+        "<a[^>]+href=\"#dokuwiki__"
+      ],
       "icon": "DokuWiki.png",
       "implies": "PHP",
       "meta": {
-        "generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
+        "generator": "^DokuWiki( Release [\\d-]+)?\\;version:\\1"
       },
       "website": "https://www.dokuwiki.org"
     },
@@ -2654,9 +2805,14 @@
       "cats": [
         20
       ],
-      "html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1",
+      "html": "<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)\\;version:\\1",
+      "js": {
+        "MM_showMenu": "",
+        "MM_preloadImages": "",
+        "MM_showHideLayers": ""
+      },
       "icon": "DreamWeaver.png",
-      "website": "http://www.adobe.com/products/dreamweaver"
+      "website": "https://www.adobe.com/products/dreamweaver.html"
     },
     "Drupal": {
       "cats": [
@@ -2667,7 +2823,7 @@
         "X-Drupal-Cache": "",
         "X-Generator": "^Drupal(?:\\s([\\d.]+))?\\;version:\\1"
       },
-      "html": "<(?:link|style)[^>]+sites/(?:default|all)/(?:themes|modules)/",
+      "html": "<(?:link|style)[^>]+\"/sites/(?:default|all)/(?:themes|modules)/",
       "icon": "Drupal.svg",
       "implies": "PHP",
       "js": {
@@ -2715,6 +2871,20 @@
       "script": "dtagent.*\\.js",
       "website": "http://dynatrace.com"
     },
+    "EasyEngine": {
+      "cats": [
+        47,
+        9
+      ],
+      "icon": "EasyEngine.png",
+      "implies": [
+        "Docker"
+      ],
+      "headers": {
+        "x-powered-by": "^EasyEngine (.*)$\\;version:\\1"
+      },
+      "website": "https://easyengine.io"
+    },
     "EC-CUBE": {
       "cats": [
         6
@@ -2727,6 +2897,24 @@
       ],
       "website": "http://www.ec-cube.net"
     },
+    "Elementor": {
+      "cats": [
+        51
+      ],
+      "html": [
+        "<div class=(?:\"|')[^\"']*elementor",
+        "<section class=(?:\"|')[^\"']*elementor",
+        "<link [^>]*href=(?:\"|')[^\"']*elementor/assets",
+        "<link [^>]*href=(?:\"|')[^\"']*uploads/elementor/css"
+      ],
+      "js": {
+        "elementorFrontend.getElements": ""
+      },
+      "script": "elementor/assets/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
+      "icon": "Elementor.png",
+      "implies": "WordPress",
+      "website": "https://elementor.com"
+    },
     "ELOG": {
       "cats": [
         19
@@ -2740,7 +2928,7 @@
         22
       ],
       "headers": {
-        "Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1"
+        "Server": "ELOG HTTP ?([\\d.-]+)?\\;version:\\1"
       },
       "icon": "ELOG.png",
       "implies": "ELOG",
@@ -2823,6 +3011,19 @@
       },
       "website": "http://eleanor-cms.ru"
     },
+    "Element UI": {
+      "cats": [
+        12
+      ],
+      "icon": "ElementUI.svg",
+      "implies": [
+        "Vue"
+      ],
+      "html": [
+        "<(?:div|button) class=\"el-(?:table-column|table-filter|popper|pagination|pager|select-group|form|form-item|color-predefine|color-hue-slider|color-svpanel|color-alpha-slider|color-dropdown|color-picker|badge|tree|tree-node|select|message|dialog|checkbox|checkbox-button|checkbox-group|container|steps|carousel|menu|menu-item|submenu|menu-item-group|button|button-group|card|table|select-dropdown|row|tabs|notification|radio|progress|progress-bar|tag|popover|tooltip|cascader|cascader-menus|cascader-menu|time-spinner|spinner|spinner-inner|transfer|transfer-panel|rate|slider|dropdown|dropdown-menu|textarea|input|input-group|popup-parent|radio-group|main|breadcrumb|time-range-picker|date-range-picker|year-table|date-editor|range-editor|time-spinner|date-picker|time-panel|date-table|month-table|picker-panel|collapse|collapse-item|alert|select-dropdown|select-dropdown__empty|select-dropdown__wrap|select-dropdown__list|scrollbar|switch|carousel|upload|upload-dragger|upload-list|upload-cover|aside|input-number|header|message-box|footer|radio-button|step|autocomplete|autocomplete-suggestion|loading-parent|loading-mask|loading-spinner|)"
+      ],
+      "website": "https://element.eleme.io/"
+    },
     "Eloqua": {
       "cats": [
         32
@@ -2855,7 +3056,7 @@
       "implies": "Handlebars",
       "js": {
         "Ember": "",
-        "Ember.VERSION": "(.*)\\;version:\\1"
+        "Ember.VERSION": "^(.+)$\\;version:\\1"
       },
       "website": "http://emberjs.com"
     },
@@ -2867,6 +3068,17 @@
       "icon": "ensighten.png",
       "website": "https://success.ensighten.com/hc/en-us"
     },
+    "Envoy": {
+      "cats": [
+        64
+      ],
+      "icon": "Envoy.png",
+      "headers": {
+        "Server": "^envoy$",
+        "x-envoy-upstream-service-time": ""
+      },
+      "website": "https://www.envoyproxy.io/"
+    },
     "Enyo": {
       "cats": [
         12,
@@ -2904,7 +3116,7 @@
         27
       ],
       "headers": {
-        "Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
+        "Server": "Erlang( OTP/(?:[\\d.ABR-]+))?\\;version:\\1"
       },
       "icon": "Erlang.png",
       "website": "http://www.erlang.org"
@@ -2934,7 +3146,7 @@
       "icon": "Exhibit.png",
       "js": {
         "Exhibit": "",
-        "Exhibit.version": "(.*)\\;version:\\1"
+        "Exhibit.version": "^(.+)$\\;version:\\1"
       },
       "script": "exhibit.*\\.js",
       "website": "http://simile-widgets.org/exhibit/"
@@ -2971,12 +3183,32 @@
       "icon": "ExtJS.png",
       "js": {
         "Ext": "",
-        "Ext.version": "(.*)\\;version:\\1",
-        "Ext.versions.extjs.version": "(.*)\\;version:\\1"
+        "Ext.version": "^(.+)$\\;version:\\1",
+        "Ext.versions.extjs.version": "^(.+)$\\;version:\\1"
       },
       "script": "ext-base\\.js",
       "website": "https://www.sencha.com"
     },
+    "F5 BigIP": {
+      "cats": [
+        64
+      ],
+      "headers": {
+        "server": "^big-?ip$"
+      },
+      "cookies": {
+        "F5_ST": "",
+        "MRHSHint": "",
+        "F5_HT_shrinked": "",
+        "F5_fullWT": "",
+        "MRHSequence": "",
+        "MRHSession": "",
+        "LastMRH_Session": "",
+        "TIN": ""
+      },
+      "icon": "F5.png",
+      "website": "https://www.f5.com/products/big-ip-services"
+    },
     "FAST ESP": {
       "cats": [
         29
@@ -3034,7 +3266,7 @@
       "icon": "FancyBox.png",
       "implies": "jQuery",
       "js": {
-        "$.fancybox.version": "(.*)\\;version:\\1"
+        "$.fancybox.version": "^(.+)$\\;version:\\1"
       },
       "script": "jquery\\.fancybox(?:\\.pack|\\.min)?\\.js(?:\\?v=([\\d.]+))?$\\;version:\\1",
       "website": "http://fancyapps.com/fancybox"
@@ -3056,6 +3288,7 @@
       "headers": {
         "Fastly-Debug-Digest": "",
         "Vary": "Fastly-SSL",
+        "x-via-fastly:": "",
         "X-Fastly-Request-ID": ""
       },
       "icon": "Fastly.svg",
@@ -3099,7 +3332,7 @@
       "js": {
         "Fingerprint": "(\\d)?$\\;version:\\1",
         "Fingerprint2": "",
-        "Fingerprint2.VERSION": "(.*)\\;version:\\1"
+        "Fingerprint2.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "fingerprint(\\d)?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://valve.github.io/fingerprintjs2/"
@@ -3202,10 +3435,10 @@
       "cats": [
         2
       ],
-      "html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb",
+      "html": "<p id=\"poweredby\">[^<]+<a href=\"https?://fluxbb\\.org/\">",
       "icon": "FluxBB.png",
       "implies": "PHP",
-      "website": "http://fluxbb.org"
+      "website": "https://fluxbb.org"
     },
     "Flyspray": {
       "cats": [
@@ -3224,7 +3457,7 @@
         17
       ],
       "html": [
-        "<link[^>]* href=[^>]+font-awesome(?:\\.min)?\\.css",
+        "<link[^>]* href=[^>]+(?:([\\d.]+)/)?(?:css/)?font-awesome(?:\\.min)?\\.css\\;version:\\1",
         "<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
       ],
       "icon": "Font Awesome.png",
@@ -3307,6 +3540,14 @@
       "script": "analytics\\.freespee\\.com/js/external/fs\\.(?:min\\.)?js",
       "website": "https://www.freespee.com"
     },
+    "Freshchat": {
+      "cats": [
+        52
+      ],
+      "icon": "freshchat.png",
+      "script": "wchat\\.freshchat\\.com/js/widget\\.js",
+      "website": "https://www.freshworks.com/live-chat-software/"
+    },
     "Freshmarketer": {
       "cats": [
         10
@@ -3415,6 +3656,9 @@
         "<div id=\"___gatsby\">",
         "<style id=\"gatsby-inlined-css\">"
       ],
+      "meta": {
+        "generator": "^Gatsby(?: ([0-9.]+))?$\\;version:\\1"
+      },
       "icon": "Gatsby.svg",
       "implies": [
         "React",
@@ -3435,19 +3679,6 @@
       },
       "website": "https://get.gaug.es"
     },
-    "Gazelle": {
-      "cats": [
-        29
-      ],
-      "html": [
-        "<!-- Extra divs, for stylesheet developers to add imagery -->",
-        "<link rel=\"alternate\" type=\"application/rss+xml\" href=\"[^\"]+\" title=\"[^\"]+ - Gazelle Change Log\""
-      ],
-      "js": {
-        "GazURL": ""
-      },
-      "website": "https://whatcd.github.io/Gazelle/"
-    },
     "Gentoo": {
       "cats": [
         28
@@ -3640,6 +3871,17 @@
       "icon": "GoAhead.png",
       "website": "http://embedthis.com/products/goahead/index.html"
     },
+    "GoJS": {
+      "cats": [
+        25
+      ],
+      "icon": "GoJS.png",
+      "website": "https://gojs.net/",
+      "js": {
+        "go.version": "(.*)\\;version:\\1",
+        "go.GraphObject": ""
+      }
+    },
     "GoSquared": {
       "cats": [
         10,
@@ -3710,7 +3952,7 @@
         "_gat": ""
       },
       "icon": "Google Analytics.svg",
-			"html": "<amp-analytics [^>]*type=[\"']googleanalytics[\"']",
+      "html": "<amp-analytics [^>]*type=[\"']googleanalytics[\"']",
       "js": {
         "GoogleAnalyticsObject": "",
         "gaGlobal": ""
@@ -3924,16 +4166,6 @@
       "script": "/wp-content/plugins/gravityforms/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
       "website": "http://gravityforms.com"
     },
-    "Gravity Insights": {
-      "cats": [
-        10
-      ],
-      "icon": "Gravity Insights.png",
-      "js": {
-        "gravityInsightsParams": ""
-      },
-      "website": "http://insights.gravity.com"
-    },
     "Green Valley CMS": {
       "cats": [
         1
@@ -3946,6 +4178,32 @@
       },
       "website": "http://www.greenvalley.nl/Public/Producten/Content_Management/CMS"
     },
+    "Gridsome": {
+      "cats": [
+        57
+      ],
+      "icon": "Gridsome.svg",
+      "implies": "Vue.js",
+      "meta": {
+        "generator": "^Gridsome v([\\d.]+)$\\;version:\\1"
+      },
+      "website": "https://gridsome.org"
+    },
+    "GrowingIO": {
+      "cats": [
+        10
+      ],
+      "js": {
+        "gio": ""
+      },
+      "cookies": {
+        "grwng_uid": "",
+        "gr_user_id": ""
+      },
+      "icon": "GrowingIO.png",
+      "script": "assets\\.growingio\\.com/([\\d.]+)/gio.js\\;version:\\1",
+      "website": "https://www.growingio.com/"
+    },
     "HERE": {
       "cats": [
         35
@@ -4038,9 +4296,9 @@
       ],
       "icon": "Hammer.js.png",
       "js": {
-        "Ha.VERSION": "(.*)\\;version:\\1",
+        "Ha.VERSION": "^(.+)$\\;version:\\1",
         "Hammer": "",
-        "Hammer.VERSION": "(.*)\\;version:\\1"
+        "Hammer.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "hammer(?:\\.min)?\\.js",
       "website": "https://hammerjs.github.io"
@@ -4053,7 +4311,7 @@
       "icon": "Handlebars.png",
       "js": {
         "Handlebars": "",
-        "Handlebars.VERSION": "(.*)\\;version:\\1"
+        "Handlebars.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "http://handlebarsjs.com"
@@ -4141,7 +4399,7 @@
       "icon": "Highcharts.png",
       "js": {
         "Highcharts": "",
-        "Highcharts.version": "(.*)\\;version:\\1"
+        "Highcharts.version": "^(.+)$\\;version:\\1"
       },
       "script": "highcharts.*\\.js",
       "website": "https://www.highcharts.com"
@@ -4164,7 +4422,7 @@
       ],
       "html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
       "icon": "Highcharts.png",
-      "script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1",
+      "script": "highstock[.-]?([\\d\\.]*\\d).*\\.js\\;version:\\1",
       "website": "http://highcharts.com/products/highstock"
     },
     "Hinza Advanced CMS": {
@@ -4179,13 +4437,13 @@
       },
       "website": "http://hinzaco.com"
     },
-    "Hippo": {
+    "Bloomreach": {
       "cats": [
         1
       ],
       "html": "<[^>]+/binaries/(?:[^/]+/)*content/gallery/",
-      "icon": "Hippo.png",
-      "website": "http://onehippo.org"
+      "icon": "Bloomreach.png",
+      "website": "https://developers.bloomreach.com"
     },
     "Hogan.js": {
       "cats": [
@@ -4196,7 +4454,7 @@
         "Hogan": ""
       },
       "script": [
-        "hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "hogan-[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "https://twitter.github.io/hogan.js/"
@@ -4283,6 +4541,17 @@
       "script": "cmdatatagutils\\.js",
       "website": "http://ibm.com/software/marketing-solutions/coremetrics"
     },
+    "IBM DataPower": {
+      "cats": [
+        64
+      ],
+      "headers": {
+        "X-Backside-Transport": "",
+        "X-Global-Transaction-ID": ""
+      },
+      "icon": "DataPower.png",
+      "website": "https://www.ibm.com/products/datapower-gateway"
+    },
     "IBM HTTP Server": {
       "cats": [
         22
@@ -4407,7 +4676,7 @@
       "icon": "Immutable.js.png",
       "js": {
         "Immutable": "",
-        "Immutable.version": "(.*)\\;version:\\1"
+        "Immutable.version": "^(.+)$\\;version:\\1"
       },
       "script": "^immutable\\.(?:min\\.)?js$",
       "website": "https://facebook.github.io/immutable-js/"
@@ -4510,7 +4779,7 @@
       "icon": "InfernoJS.png",
       "js": {
         "Inferno": "",
-        "Inferno.version": "(.*)\\;version:\\1"
+        "Inferno.version": "^(.+)$\\;version:\\1"
       },
       "website": "https://infernojs.org"
     },
@@ -4542,6 +4811,21 @@
       ],
       "website": "https://www.inspectlet.com/"
     },
+    "Instabot": {
+      "cats": [
+        5,
+        10,
+        32,
+        52,
+        58
+      ],
+      "icon": "Instabot.png",
+      "js": {
+        "Instabot": ""
+      },
+      "script": "/rokoInstabot\\.js",
+      "website": "https://instabot.io/"
+    },
     "InstantCMS": {
       "cats": [
         1
@@ -4616,6 +4900,18 @@
       "script": "https?://cdn\\.inwemo\\.com/inwemo\\.min\\.js",
       "website": "https://inwemo.com/"
     },
+    "Ionic": {
+      "cats": [
+        18
+      ],
+      "icon": "ionic.png",
+      "implies": "Angular",
+      "js": {
+        "Ionic.config": "",
+        "Ionic.version": "^(.+)$\\;version:\\1"
+      },
+      "website": "https://ionicframework.com"
+    },
     "Ionicons": {
       "cats": [
         17
@@ -4686,7 +4982,7 @@
       "js": {
         "jseMine": ""
       },
-      "script": "^(?:https):?//load\\.jsecoin\\.com/server/load/",
+      "script": "^(?:https):?//load\\.jsecoin\\.com/load/",
       "website": "https://jsecoin.com/"
     },
     "JTL Shop": {
@@ -4747,7 +5043,7 @@
       "icon": "JavaScript Infovis Toolkit.png",
       "js": {
         "$jit": "",
-        "$jit.version": "(.*)\\;version:\\1"
+        "$jit.version": "^(.+)$\\;version:\\1"
       },
       "script": "jit(?:-yc)?\\.js",
       "website": "https://philogb.github.io/jit/"
@@ -4989,7 +5285,7 @@
       "implies": "jQuery",
       "js": {
         "kendo": "",
-        "kendo.version": "(.*)\\;version:\\1"
+        "kendo.version": "^(.+)$\\;version:\\1"
       },
       "website": "https://www.telerik.com/kendo-ui"
     },
@@ -5006,6 +5302,19 @@
       },
       "website": "http://www.kentico.com"
     },
+    "Kestrel": {
+      "cats": [
+        22
+      ],
+      "headers": {
+        "Server": "^Kestrel"
+      },
+      "implies": [
+        "Microsoft ASP.NET"
+      ],
+      "icon": "kestrel.svg",
+      "website": "https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel"
+    },
     "KeyCDN": {
       "cats": [
         31
@@ -5038,7 +5347,7 @@
       "icon": "KineticJS.png",
       "js": {
         "Kinetic": "",
-        "Kinetic.version": "(.*)\\;version:\\1"
+        "Kinetic.version": "^(.+)$\\;version:\\1"
       },
       "script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://github.com/ericdrowell/KineticJS/"
@@ -5061,7 +5370,7 @@
       ],
       "icon": "Knockout.js.png",
       "js": {
-        "ko.version": "(.*)\\;version:\\1"
+        "ko.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://knockoutjs.com"
     },
@@ -5203,7 +5512,7 @@
         1
       ],
       "headers": {
-        "X-KoobooCMS-Version": "(.*)\\;version:\\1"
+        "X-KoobooCMS-Version": "^(.+)$\\;version:\\1"
       },
       "icon": "Kooboo CMS.png",
       "implies": "Microsoft ASP.NET",
@@ -5269,7 +5578,7 @@
       "meta": {
         "laterpay:connector:callbacks:on_user_has_access": "deobfuscateText"
       },
-      "script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z\\-]*/live/[\\w-]+\\.js\\;version:\\1",
+      "script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z-]*/live/[\\w-]+\\.js\\;version:\\1",
       "website": "https://www.laterpay.net/"
     },
     "Lazy.js": {
@@ -5287,7 +5596,7 @@
       "js": {
         "L.DistanceGrid": "",
         "L.PosAnimation": "",
-        "L.version": "(.*)\\;version:\\1\\;confidence:0"
+        "L.version": "^(.+)$\\;version:\\1\\;confidence:0"
       },
       "script": "leaflet.*\\.js",
       "website": "http://leafletjs.com"
@@ -5501,7 +5810,7 @@
       "icon": "Livefyre.png",
       "js": {
         "FyreLoader": "",
-        "L.version": "(.*)\\;confidence:0\\;version:\\1",
+        "L.version": "^(.+)$\\;confidence:0\\;version:\\1",
         "LF.CommentCount": "",
         "fyre": ""
       },
@@ -5522,6 +5831,18 @@
       "script": "/js/al/common\\.js\\?[0-9_]+",
       "website": "http://liveinternet.ru/rating/"
     },
+    "LocalFocus": {
+      "cats": [
+        61
+      ],
+      "html": "<iframe[^>]+localfocus",
+      "icon": "LocalFocus.png",
+      "implies": [
+        "Angular",
+        "D3"
+      ],
+      "website": "https://www.localfocus.nl/en/"
+    },
     "Locomotive": {
       "cats": [
         1
@@ -5541,7 +5862,7 @@
       "excludes": "Underscore.js",
       "icon": "Lo-dash.png",
       "js": {
-        "_.VERSION": "(.*)\\;confidence:0\\;version:\\1",
+        "_.VERSION": "^(.+)$\\;confidence:0\\;version:\\1",
         "_.differenceBy": ""
       },
       "script": "lodash.*\\.js",
@@ -5569,6 +5890,14 @@
       "implies": "Java",
       "website": "http://www-01.ibm.com/software/lotus/products/domino"
     },
+    "LOU": {
+      "cats": [
+        58
+      ],
+      "icon": "LOU.png",
+      "script": "cdn\\.louassist\\.com*",
+      "website": "https://www.louassist.com"
+    },
     "Lua": {
       "cats": [
         27
@@ -5666,12 +5995,30 @@
         6
       ],
       "cookies": {
-        "botble_session": ""
+        "mypage_session": ""
+      },
+      "headers": {
+        "CMS-Version": "^(.+)$\\;version:\\1\\;confidence:0"
       },
       "icon": "mypage-platform.png",
       "implies": "Laravel",
       "website": "https://www.mypage.vn"
     },
+    "Botble CMS": {
+      "cats": [
+        1,
+        6
+      ],
+      "cookies": {
+        "botble_session": ""
+      },
+      "headers": {
+        "CMS-Version": "^(.+)$\\;version:\\1\\;confidence:0"
+      },
+      "icon": "Botble-CMS.png",
+      "implies": "Laravel",
+      "website": "https://botble.com"
+    },
     "MadAdsMedia": {
       "cats": [
         36
@@ -5769,6 +6116,13 @@
       "script": "\\/assets\\/js\\/manycontacts\\.min\\.js",
       "website": "http://www.manycontacts.com"
     },
+    "MariaDB": {
+      "cats": [
+        34
+      ],
+      "icon": "mariadb.svg",
+      "website": "https://mariadb.org"
+    },
     "Marionette.js": {
       "cats": [
         12
@@ -5780,7 +6134,7 @@
       ],
       "js": {
         "Marionette": "",
-        "Marionette.VERSION": "(.*)\\;version:\\1"
+        "Marionette.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "backbone\\.marionette.*\\.js",
       "website": "https://marionettejs.com"
@@ -5836,7 +6190,7 @@
       "icon": "MathJax.png",
       "js": {
         "MathJax": "",
-        "MathJax.version": "(.*)\\;version:\\1"
+        "MathJax.version": "^(.+)$\\;version:\\1"
       },
       "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1",
       "website": "https://www.mathjax.org"
@@ -5935,7 +6289,7 @@
       "icon": "MediaElement.js.png",
       "js": {
         "mejs": "",
-        "mejs.version": "(.*)\\;version:\\1"
+        "mejs.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://www.mediaelementjs.com"
     },
@@ -5953,13 +6307,20 @@
       "cats": [
         8
       ],
-      "html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)",
+      "html": [
+        "<body[^>]+class=\"mediawiki\"",
+        "<(?:a|img)[^>]+>Powered by MediaWiki</a>",
+        "<a[^>]+/Special:WhatLinksHere/"
+      ],
       "icon": "MediaWiki.png",
       "implies": "PHP",
+      "js": {
+        "mw.util.toggleToc": ""
+      },
       "meta": {
         "generator": "^MediaWiki ?(.+)$\\;version:\\1"
       },
-      "website": "http://www.mediawiki.org"
+      "website": "https://www.mediawiki.org"
     },
     "Medium": {
       "cats": [
@@ -6105,7 +6466,7 @@
         1
       ],
       "headers": {
-        "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1",
+        "MicrosoftSharePointTeamServices": "^(.+)$\\;version:\\1",
         "SPRequestGuid": "",
         "SharePointHealthScore": "",
         "X-SharePointHealthScore": ""
@@ -6190,6 +6551,14 @@
       "script": "mint/\\?js",
       "website": "https://haveamint.com"
     },
+    "Mithril": {
+      "cats": [
+        12
+      ],
+      "icon": "Mithril.svg",
+      "script": "mithril/\\?js",
+      "website": "https://mithril.js.org"
+    },
     "Mixpanel": {
       "cats": [
         10
@@ -6242,7 +6611,7 @@
       "icon": "MochiKit.png",
       "js": {
         "MochiKit": "",
-        "MochiKit.MochiKit.VERSION": "(.*)\\;version:\\1"
+        "MochiKit.MochiKit.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "MochiKit(?:\\.min)?\\.js",
       "website": "https://mochi.github.io/mochikit/"
@@ -6262,7 +6631,7 @@
       ],
       "icon": "Modernizr.svg",
       "js": {
-        "Modernizr._version": "(.*)\\;version:\\1"
+        "Modernizr._version": "^(.+)$\\;version:\\1"
       },
       "script": [
         "([\\d.]+)?/modernizr(?:.([\\d.]+))?.*\\.js\\;version:\\1?\\1:\\2"
@@ -6284,10 +6653,11 @@
         1,
         6
       ],
-      "html": "(?:<script|link)[^>]*(?:src=|href=)[\"'][^\"]*mg-(?:core|plugins|templates)",
+      "html": "<link[^>]+href=[\"'][^\"]+mg-(?:core|plugins|templates)/",
+      "script": "mg-(?:core|plugins|templates)/",
       "icon": "Moguta.CMS.png",
       "implies": "PHP",
-      "website": "http://moguta.ru"
+      "website": "https://moguta.ru"
     },
     "MoinMoin": {
       "cats": [
@@ -6331,7 +6701,7 @@
       ],
       "icon": "Moment.js.svg",
       "implies": "Moment.js",
-      "script": "moment-timezone(?:\\-data)?(?:\\.min)?\\.js",
+      "script": "moment-timezone(?:-data)?(?:\\.min)?\\.js",
       "website": "http://momentjs.com/timezone/"
     },
     "Moment.js": {
@@ -6341,7 +6711,7 @@
       "icon": "Moment.js.svg",
       "js": {
         "moment": "",
-        "moment.version": "(.*)\\;version:\\1"
+        "moment.version": "^(.+)$\\;version:\\1"
       },
       "script": "moment(?:\\.min)?\\.js",
       "website": "https://momentjs.com"
@@ -6421,7 +6791,7 @@
       "icon": "MooTools.png",
       "js": {
         "MooTools": "",
-        "MooTools.version": "(.*)\\;version:\\1"
+        "MooTools.version": "^(.+)$\\;version:\\1"
       },
       "script": "mootools.*\\.js",
       "website": "https://mootools.net"
@@ -6491,16 +6861,6 @@
       },
       "website": "http://movabletype.org"
     },
-    "Moxa": {
-      "cats": [
-        37
-      ],
-      "headers": {
-        "Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Moxa.png",
-      "website": "http://moxa.com"
-    },
     "Mozard Suite": {
       "cats": [
         1
@@ -6530,7 +6890,7 @@
       ],
       "icon": "Mustache.png",
       "js": {
-        "Mustache.version": "(.*)\\;version:\\1"
+        "Mustache.version": "^(.+)$\\;version:\\1"
       },
       "script": "mustache(?:\\.min)?\\.js",
       "website": "https://mustache.github.io"
@@ -6585,14 +6945,6 @@
       "icon": "Plataforma NEO.svg",
       "website": "http://www.jetecommerce.com.br/"
     },
-    "NOIX": {
-      "cats": [
-        19
-      ],
-      "html": "(?:<[^>]+(?:src|href)=[^>]*/media/noix|<!-- NOIX)",
-      "icon": "NOIX.png",
-      "website": "http://www.noix.com.br/tecnologias/joomla"
-    },
     "NVD3": {
       "cats": [
         25
@@ -6602,7 +6954,7 @@
       "implies": "D3",
       "js": {
         "nv.addGraph": "",
-        "nv.version": "(.*)\\;confidence:0\\;version:\\1"
+        "nv.version": "^(.+)$\\;confidence:0\\;version:\\1"
       },
       "script": "nv\\.d3(?:\\.min)?\\.js",
       "website": "http://nvd3.org"
@@ -6656,23 +7008,12 @@
         31
       ],
       "headers": {
-        "x-nf-request-id": "",
-        "Server": "Netlify"
+        "X-NF-Request-ID": "",
+        "Server": "^Netlify"
       },
       "icon": "Netlify.svg",
       "website": "https://www.netlify.com/"
     },
-    "Netmonitor": {
-      "cats": [
-        10
-      ],
-      "icon": "Netmonitor.png",
-      "js": {
-        "netmonitor": ""
-      },
-      "script": "netmonitor\\.fi/nmtracker\\.js",
-      "website": "http://netmonitor.fi/en"
-    },
     "Neto": {
       "cats": [
         6
@@ -6713,7 +7054,7 @@
       "implies": "PHP",
       "js": {
         "Nette": "",
-        "Nette.version": "(.*)\\;version:\\1"
+        "Nette.version": "^(.+)$\\;version:\\1"
       },
       "website": "https://nette.org"
     },
@@ -6763,11 +7104,12 @@
     },
     "Nginx": {
       "cats": [
-        22
+        22,
+        64
       ],
       "headers": {
         "Server": "nginx(?:/([\\d.]+))?\\;version:\\1",
-				"X-Fastcgi-Cache": ""
+        "X-Fastcgi-Cache": ""
       },
       "icon": "Nginx.svg",
       "website": "http://nginx.org/en"
@@ -6964,7 +7306,9 @@
       "cats": [
         6
       ],
-      "html": "(?:index\\.php\\?route=[a-z]+/|Powered By <a href=\"[^>]+OpenCart)",
+      "cookies": {
+        "OCSESSID": ""
+      },
       "icon": "OpenCart.png",
       "implies": "PHP",
       "website": "http://www.opencart.com"
@@ -7071,7 +7415,7 @@
       ],
       "icon": "OpenUI5.png",
       "js": {
-        "sap.ui.version": "(.*)\\;version:\\1"
+        "sap.ui.version": "^(.+)$\\;version:\\1"
       },
       "script": "sap-ui-core\\.js",
       "website": "http://openui5.org/"
@@ -7094,12 +7438,12 @@
         18
       ],
       "headers": {
-        "X-Powered-By": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
+        "X-Powered-By": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
       },
       "icon": "Ophal.png",
       "implies": "Lua",
       "meta": {
-        "generator": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
+        "generator": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
       },
       "script": "ophal\\.js",
       "website": "http://ophal.org"
@@ -7141,7 +7485,7 @@
         6
       ],
       "headers": {
-        "OracleCommerceCloud-Version": "(.*)\\;version:\\1"
+        "OracleCommerceCloud-Version": "^(.+)$\\;version:\\1"
       },
       "html": "<[^>]+id=\"oracle-cc\"",
       "icon": "Oracle.png",
@@ -7202,7 +7546,7 @@
       ],
       "icon": "Outbrain.png",
       "js": {
-        "OB_releaseVer": "(.*)\\;version:\\1",
+        "OB_releaseVer": "^(.+)$\\;version:\\1",
         "OutbrainPermaLink": ""
       },
       "script": "widgets\\.outbrain\\.com/outbrain\\.js",
@@ -7239,7 +7583,7 @@
       "icon": "PDF.js.svg",
       "js": {
         "PDFJS": "",
-        "PDFJS.version": "(.*)\\;version:\\1"
+        "PDFJS.version": "^(.+)$\\;version:\\1"
       },
       "url": "/web/viewer\\.html?file=[^&]\\.pdf",
       "website": "https://mozilla.github.io/pdf.js/"
@@ -7264,9 +7608,15 @@
         1
       ],
       "html": "Powered by <a href=\"[^>]+php-fusion",
+      "headers": {
+        "X-Powered-By": "PHP-Fusion (.+)$\\;version:\\1"
+      },
       "icon": "PHP-Fusion.png",
-      "implies": "PHP",
-      "website": "http://www.php-fusion.co.uk"
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "website": "https://www.php-fusion.co.uk"
     },
     "PHP-Nuke": {
       "cats": [
@@ -7294,15 +7644,15 @@
       ],
       "website": "http://phpdebugbar.com/"
     },
-    "PHPoole": {
+    "Cecil": {
       "cats": [
         57
       ],
-      "icon": "PHPoole.png",
+      "icon": "Cecil.png",
       "meta": {
-        "generator": "^PHPoole$"
+        "generator": "^Cecil|PHPoole$"
       },
-      "website": "https://phpoole.org"
+      "website": "https://cecil.app"
     },
     "Pagekit": {
       "cats": [
@@ -7327,13 +7677,29 @@
       },
       "website": "https://www.pagevamp.com"
     },
+    "Pantheon": {
+      "cats": [
+        62
+      ],
+      "headers": {
+        "x-pantheon-styx-hostname": "",
+        "Server": "^Pantheon"
+      },
+      "implies": [
+        "PHP",
+        "Nginx",
+        "MariaDB"
+      ],
+      "icon": "pantheon.svg",
+      "website": "https://pantheon.io/"
+    },
     "Paper.js": {
       "cats": [
         25
       ],
       "icon": "paperjs.png",
       "js": {
-        "paper.version": "(.*)\\;version:\\1"
+        "paper.version": "^(.+)$\\;version:\\1"
       },
       "website": "http://paperjs.org/"
     },
@@ -7435,6 +7801,13 @@
       "script": "cdn\\.pendo\\.io*\\.js",
       "website": "https://pendo.io"
     },
+    "Percona": {
+      "cats": [
+        34
+      ],
+      "icon": "percona.svg",
+      "website": "https://www.percona.com"
+    },
     "Percussion": {
       "cats": [
         1
@@ -7479,7 +7852,7 @@
       "icon": "Phaser.png",
       "js": {
         "Phaser": "",
-        "Phaser.VERSION": "(.*)\\;version:\\1"
+        "Phaser.VERSION": "^(.+)$\\;version:\\1"
       },
       "website": "https://phaser.io"
     },
@@ -7539,6 +7912,30 @@
       },
       "website": "http://planetplanet.org"
     },
+    "PlatformOS": {
+      "cats": [
+        1,
+        62
+      ],
+      "icon": "PlatformOS.svg",
+      "headers": {
+        "x-powered-by": "^platformOS$"
+      },
+      "website": "https://www.platform-os.com"
+    },
+    "Platform.sh": {
+      "cats": [
+        62
+      ],
+      "icon": "platformsh.svg",
+      "headers": {
+        "x-platform-cluster": "",
+        "x-platform-processor": "",
+        "x-platform-router": "",
+        "x-platform-server": ""
+      },
+      "website": "https://platform.sh"
+    },
     "Play": {
       "cats": [
         18
@@ -7637,7 +8034,7 @@
       "html": "(?:<polymer-[^>]+|<link[^>]+rel=\"import\"[^>]+/polymer\\.html\")",
       "icon": "Polymer.png",
       "js": {
-        "Polymer.version": "(.*)\\;version:\\1"
+        "Polymer.version": "^(.+)$\\;version:\\1"
       },
       "script": "polymer\\.js",
       "website": "http://polymer-project.org"
@@ -7778,7 +8175,7 @@
       ],
       "icon": "Prototype.png",
       "js": {
-        "Prototype.Version": "(.*)\\;version:\\1"
+        "Prototype.Version": "^(.+)$\\;version:\\1"
       },
       "script": "(?:prototype|protoaculous)(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
       "website": "http://www.prototypejs.org"
@@ -7837,7 +8234,7 @@
         "PUBLICCMS_USER": ""
       },
       "headers": {
-        "X-Powered-PublicCMS": "(.*)\\;version:\\1"
+        "X-Powered-PublicCMS": "^(.+)$\\;version:\\1"
       },
       "icon": "Public CMS.png",
       "implies": "Java",
@@ -8001,19 +8398,22 @@
         30
       ],
       "headers": {
-        "Server": "RainLoop"
+        "Server": "^RainLoop"
       },
       "html": [
-        "<meta [^>]*(?:content=\"([^\"]+)[^>]+ id=\"rlAppVersion\"|id=\"rlAppVersion\"[^>]+ content=\"([^\"]+))\\;version:\\1?\\1:\\2",
-        "<link[^>]* href=\"[^\"]*rainloop/v/([^/]+)\\;version:\\1"
+        "<link[^>]href=\"rainloop/v/([0-9.]+)/static/apple-touch-icon\\.png/>\\;version:\\1"
       ],
+      "meta": {
+        "rlAppVersion": "^([0-9.]+)$\\;version:\\1"
+      },
       "icon": "RainLoop.png",
       "implies": "PHP",
       "js": {
+        "rainloopI18N": "",
         "rainloop": ""
       },
-      "script": "rainloop/v/([^/]+)\\;version:\\1",
-      "website": "http://rainloop.net"
+      "script": "^rainloop/v/([0-9.]+)/\\;version:\\1",
+      "website": "https://www.rainloop.net/"
     },
     "Rakuten DBCore": {
       "cats": [
@@ -8050,7 +8450,7 @@
       ],
       "icon": "Raphael.png",
       "js": {
-        "Raphael.version": "(.*)\\;version:\\1"
+        "Raphael.version": "^(.+)$\\;version:\\1"
       },
       "script": "raphael(?:-([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://dmitrybaranovskiy.github.io/raphael/"
@@ -8108,7 +8508,7 @@
       "icon": "redoc.png",
       "implies": "React",
       "js": {
-        "Redoc.version": "(.*)\\;version:\\1"
+        "Redoc.version": "^(.+)$\\;version:\\1"
       },
       "script": "/redoc\\.(?:min\\.)?js",
       "website": "https://github.com/Rebilly/ReDoc"
@@ -8120,11 +8520,11 @@
       "html": "<[^>]+data-react",
       "icon": "React.png",
       "js": {
-        "React.version": "(.*)\\;version:\\1",
-        "react.version": "(.*)\\;version:\\1"
+        "React.version": "^(.+)$\\;version:\\1",
+        "react.version": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "react(?:\\-with\\-addons)?(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "react(?:-with-addons)?[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
         "react.*\\.js"
       ],
@@ -8185,7 +8585,7 @@
       ],
       "icon": "RequireJS.png",
       "js": {
-        "requirejs.version": "(.*)\\;version:\\1"
+        "requirejs.version": "^(.+)$\\;version:\\1"
       },
       "script": "require.*\\.js",
       "website": "http://requirejs.org"
@@ -8208,7 +8608,7 @@
       "icon": "Reveal.js.png",
       "implies": "Highlight.js",
       "js": {
-        "Reveal.VERSION": "(.*)\\;version:\\1"
+        "Reveal.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "(?:^|/)reveal(?:\\.min)?\\.js",
       "website": "http://lab.hakim.se/reveal-js"
@@ -8327,7 +8727,7 @@
         "Microsoft ASP.NET"
       ],
       "meta": {
-        "generator": "^Rock v.*"
+        "generator": "^Rock v([0-9.]+)\\;version:\\1"
       },
       "website": "http://www.rockrms.com"
     },
@@ -8375,6 +8775,9 @@
       "meta": {
         "csrf-param": "^authenticity_token$\\;confidence:50"
       },
+      "cookies": {
+        "_session_id": "\\;confidence:75"
+      },
       "script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
       "website": "https://rubyonrails.org"
     },
@@ -8426,6 +8829,22 @@
       "icon": "SDL Tridion.png",
       "website": "http://www.sdl.com/products/tridion"
     },
+    "Sensors Data": {
+      "cats": [
+        10
+      ],
+      "js": {
+        "sa.lib_version": "([\\d.]+)\\;version:\\1",
+        "sensorsdata_app_js_bridge_call_js": ""
+      },
+      "cookies": {
+        "sensorsdata2015session": "",
+        "sensorsdata2015jssdkcross": ""
+      },
+      "icon": "Sensors Data.svg",
+      "script": "sensorsdata",
+      "website": "https://www.sensorsdata.cn"
+    },
     "Sentry": {
       "cats": [
         13
@@ -8656,13 +9075,12 @@
       "cats": [
         10
       ],
-      "html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics\\.js[\\s\\S]*script>",
       "icon": "Segment.png",
       "js": {
         "analytics": ""
       },
       "script": "cdn\\.segment\\.com/analytics\\.js",
-      "website": "http://segment.com"
+      "website": "https://segment.com"
     },
     "Select2": {
       "cats": [
@@ -8761,6 +9179,16 @@
       },
       "website": "http://shellinabox.com"
     },
+    "Shiny": {
+      "cats": [
+        18
+      ],
+      "icon": "Shiny.png",
+      "js": {
+        "Shiny.addCustomMessageHandler": ""
+      },
+      "website": "https://shiny.rstudio.com"
+    },
     "ShinyStat": {
       "cats": [
         10
@@ -8773,17 +9201,6 @@
       "script": "^https?://codice(?:business|ssl|pro|isp)?\\.shinystat\\.com/cgi-bin/getcod\\.cgi",
       "website": "http://shinystat.com"
     },
-    "Shopalize": {
-      "cats": [
-        5,
-        10
-      ],
-      "icon": "Shopalize.png",
-      "js": {
-        "Shopalize": ""
-      },
-      "website": "http://shopalize.com"
-    },
     "Shopatron": {
       "cats": [
         6
@@ -8841,13 +9258,16 @@
       "cats": [
         6
       ],
-      "icon": "Shopfa.svg",
       "js": {
         "shopfa": ""
       },
+      "headers": {
+        "X-Powered-By": "^ShopFA ([\\d.]+)$\\;version:\\1"
+      },
       "meta": {
         "generator": "^ShopFA ([\\d.]+)$\\;version:\\1"
       },
+      "icon": "Shopfa.svg",
       "website": "https://shopfa.com"
     },
     "Shopify": {
@@ -8861,6 +9281,16 @@
       },
       "website": "http://shopify.com"
     },
+    "Shopline": {
+      "cats": [
+        6
+      ],
+      "icon": "shopline.png",
+      "meta": {
+        "og:image": "https\\:\\/\\/img\\.shoplineapp\\.com"
+      },
+      "website": "https://shoplineapp.com/"
+    },
     "Shoptet": {
       "cats": [
         6
@@ -9105,7 +9535,7 @@
       ],
       "icon": "Snap.svg.png",
       "js": {
-        "Snap.version": "(.*)\\;version:\\1"
+        "Snap.version": "^(.+)$\\;version:\\1"
       },
       "script": "snap\\.svg(?:-min)?\\.js",
       "website": "http://snapsvg.io"
@@ -9140,7 +9570,7 @@
       "implies": "Node.js",
       "js": {
         "io.Socket": "",
-        "io.version": "(.*)\\;version:\\1"
+        "io.version": "^(.+)$\\;version:\\1"
       },
       "script": "socket\\.io.*\\.js",
       "website": "https://socket.io"
@@ -9236,19 +9666,12 @@
       },
       "website": "http://www.schillmania.com/projects/soundmanager2"
     },
-    "Sparql": {
-      "cats": [
-        27
-      ],
-      "website": "https://www.w3.org/TR/sparql11-overview/"
-    },
     "Sphinx": {
       "cats": [
         4
       ],
-      "html": "Created using <a href=\"https?://sphinx-doc\\.org/\">Sphinx</a> ([.\\d+])+\\.\\;version:\\1",
+      "html": "Created using <a href=\"https?://sphinx-doc\\.org/\">Sphinx</a> ([0-9.]+)\\.\\;version:\\1",
       "icon": "Sphinx.png",
-      "implies": "Python",
       "js": {
         "DOCUMENTATION_OPTIONS": ""
       },
@@ -9432,6 +9855,16 @@
       "script": "strapdown\\.js",
       "website": "http://strapdownjs.com"
     },
+    "Strapi": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-Powered-By": "^Strapi"
+      },
+      "icon": "Strapi.png",
+      "website": "https://strapi.io"
+    },
     "Strato": {
       "cats": [
         6
@@ -9447,7 +9880,7 @@
       "html": "<input[^>]+data-stripe",
       "icon": "Stripe.png",
       "js": {
-        "Stripe.version": "(.*)\\;version:\\1"
+        "Stripe.version": "^(.+)$\\;version:\\1"
       },
       "script": "js\\.stripe\\.com",
       "website": "http://stripe.com"
@@ -9648,18 +10081,30 @@
       "script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
       "website": "http://twiki.org"
     },
+    "tailwindcss": {
+      "cats": [
+        18
+      ],
+      "html": "<link[^>]+?href=\"[^\"]+tailwindcss(?:\\.min)?\\.css",
+      "icon": "tailwindcss.svg",
+      "website": "https://tailwindcss.com/"
+    },
     "TYPO3 CMS": {
       "cats": [
         1
       ],
-      "html": "<(?:script[^>]+ src|link[^>]+ href)=[^>]+typo3temp/",
+      "html": [
+        "<link[^>]+ href=\"typo3(?:conf|temp)/",
+        "<img[^>]+ src=\"typo3(?:conf|temp)/"
+      ],
       "icon": "TYPO3.svg",
       "implies": "PHP",
+      "script": "^typo3(?:conf|temp)/",
       "meta": {
         "generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1"
       },
       "url": "/typo3/",
-      "website": "http://www.typo3.org"
+      "website": "https://typo3.org/"
     },
     "Taiga": {
       "cats": [
@@ -9702,9 +10147,9 @@
         "TEALIUMENABLED": ""
       },
       "script": [
-        "^//tags\\.tiqcdn\\.com/",
+        "^(?:https?:)?//tags\\.tiqcdn\\.com/",
         "/tealium/utag\\.js$"
-        ],
+      ],
       "website": "http://tealium.com"
     },
     "TeamCity": {
@@ -9741,6 +10186,32 @@
       },
       "website": "http://telescopeapp.org"
     },
+    "TN Express Web": {
+      "cats": [
+        1
+      ],
+      "cookies": {
+        "TNEW": ""
+      },
+      "implies": [
+        "Tessitura"
+      ],
+      "icon": "tessitura.svg",
+      "website": "https://www.tessituranetwork.com"
+    },
+    "Tessitura": {
+      "cats": [
+        53
+      ],
+      "html": "<!--[^>]+Tessitura Version: (\\d*\\.\\d*\\.\\d*)?\\;version:\\1",
+      "implies": [
+        "Microsoft ASP.NET",
+        "IIS",
+        "Windows Server"
+      ],
+      "icon": "tessitura.svg",
+      "website": "https://www.tessituranetwork.com"
+    },
     "Tengine": {
       "cats": [
         22
@@ -9833,7 +10304,7 @@
         "application-name": "^TiddlyWiki$",
         "copyright": "^TiddlyWiki created by Jeremy Ruston",
         "generator": "^TiddlyWiki$",
-        "tiddlywiki-version": "(.*)\\;version:\\1"
+        "tiddlywiki-version": "^(.+)$\\;version:\\1"
       },
       "website": "http://tiddlywiki.com"
     },
@@ -9880,14 +10351,13 @@
       "js": {
         "tinyMCE.majorVersion": "([\\d.]+)\\;version:\\1"
       },
-      "script": "/tinymce(?:\\.min)?\\.js",
+      "script": "/tiny_?mce(?:\\.min)?\\.js",
       "website": "http://tinymce.com"
     },
     "Titan": {
       "cats": [
         36
       ],
-      "html": "<script[^>]+>var titan",
       "icon": "Titan.png",
       "js": {
         "titan": "",
@@ -9978,7 +10448,7 @@
         6
       ],
       "icon": "tray.png",
-      "script": ".+tcdn\\.com\\.br",
+      "script": "tcdn\\.com\\.br",
       "website": "https://www.tray.com.br"
     },
     "Tumblr": {
@@ -9999,7 +10469,7 @@
       ],
       "icon": "TweenMax.png",
       "js": {
-        "TweenMax.version": "(.*)\\;version:\\1"
+        "TweenMax.version": "^(.+)$\\;version:\\1"
       },
       "script": "TweenMax(?:\\.min)?\\.js",
       "website": "http://greensock.com/tweenmax"
@@ -10108,7 +10578,7 @@
       ],
       "icon": "Typekit.png",
       "js": {
-        "Typekit.config.js": "(.*)\\;version:\\1"
+        "Typekit.config.js": "^(.+)$\\;version:\\1"
       },
       "script": "use\\.typekit\\.com",
       "website": "http://typekit.com"
@@ -10172,8 +10642,8 @@
       "js": {
         "ucCatalog": ""
       },
-      "script": "cgi-bin\\/UCJavaScript\\?(?:[^\"]*&)?merchantid=",
-      "url": "/cgi-bin/UCEditor\\?(?:.*&)?merchantid=",
+      "script": "cgi-bin\\/UCJavaScript\\?",
+      "url": "/cgi-bin/UCEditor\\?",
       "website": "http://ultracart.com"
     },
     "Umbraco": {
@@ -10181,7 +10651,7 @@
         1
       ],
       "headers": {
-        "X-Umbraco-Version": "(.*)\\;version:\\1"
+        "X-Umbraco-Version": "^(.+)$\\;version:\\1"
       },
       "html": "powered by <a href=[^>]+umbraco",
       "icon": "Umbraco.png",
@@ -10217,7 +10687,7 @@
       "excludes": "Lodash",
       "icon": "Underscore.js.png",
       "js": {
-        "_.VERSION": "(.*)\\;confidence:0\\;version:\\1",
+        "_.VERSION": "^(.+)$\\;confidence:0\\;version:\\1",
         "_.restArguments": ""
       },
       "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
@@ -10233,16 +10703,16 @@
       },
       "website": "http://usabilla.com"
     },
-    "UserEngage": {
+    "user.com": {
       "cats": [
         10
       ],
       "html": "<div[^>]+/id=\"ue_widget\"",
-      "icon": "UserEngage.png",
+      "icon": "user.com.svg",
       "js": {
         "UserEngage": ""
       },
-      "website": "https://userengage.com"
+      "website": "https://user.com"
     },
     "UserGuiding": {
       "cats": [
@@ -10332,15 +10802,19 @@
       "script": "vs350\\.js",
       "website": "http://www.vpasp.com"
     },
-    "VTEX Enterprise": {
+    "VTEX": {
       "cats": [
         6
       ],
+      "cookies": {
+        "VtexWorkspace": ""
+      },
       "headers": {
+        "Server": "^VTEX IO$",
         "powered": "vtex"
       },
-      "icon": "VTEX Enterprise.png",
-      "website": "http://vtex.com"
+      "icon": "VTEX.svg",
+      "website": "https://vtex.com/"
     },
     "VTEX Integrated Store": {
       "cats": [
@@ -10480,13 +10954,13 @@
         34
       ],
       "headers": {
-        "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1"
+        "Server": "Virtuoso/?([0-9.]+)?\\;version:\\1"
       },
       "meta": {
         "Copyright": "^Copyright &copy; \\d{4} OpenLink Software",
         "Keywords": "^OpenLink Virtuoso Sparql"
       },
-      "url": ".*/sparql\\.*",
+      "url": "/sparql",
       "website": "https://virtuoso.openlinksw.com/"
     },
     "Visual WebGUI": {
@@ -10530,17 +11004,27 @@
       "script": "visualpath[^/]*\\.trackset\\.it/[^/]+/track/include\\.js",
       "website": "http://www.trackset.com/web-analytics-software/visualpath"
     },
-    "Volusion": {
+    "Volusion (V1)": {
       "cats": [
         6
       ],
       "html": "<link [^>]*href=\"[^\"]*/vspfiles/",
-      "icon": "Volusion.png",
+      "icon": "Volusion.svg",
+      "implies": "Microsoft ASP.NET",
       "js": {
         "volusion": ""
       },
       "script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
-      "website": "http://volusion.com"
+      "website": "https://www.volusion.com"
+    },
+    "Volusion (V2)": {
+      "cats": [
+        6
+      ],
+      "html": "<body [^>]*data-vn-page-name",
+      "icon": "Volusion.svg",
+      "implies": "AngularJS",
+      "website": "https://www.volusion.com"
     },
     "Vue.js": {
       "cats": [
@@ -10549,14 +11033,32 @@
       "html": "<[^>]+data-v(?:ue)-",
       "icon": "Vue.js.png",
       "js": {
-        "Vue.version": "(.*)\\;version:\\1"
+        "Vue.version": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "vue[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "(?:/([\\d.]+))?/vue(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "http://vuejs.org"
     },
+    "Nuxt.js": {
+      "cats": [
+        12
+      ],
+      "html": [
+        "<div [^>]*id=\"__nuxt\"",
+        "<script [^>]*>window\\.__NUXT__"
+      ],
+      "icon": "Nuxt.js.svg",
+      "js": {
+        "$nuxt": ""
+      },
+      "script": [
+        "/_nuxt/"
+      ],
+      "implies": "Vue.js",
+      "website": "https://nuxtjs.org"
+    },
     "W3 Total Cache": {
       "cats": [
         23
@@ -10603,13 +11105,25 @@
         23
       ],
       "headers": {
-        "X-Powered-By": "WP Rocket(?:/([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "WP Rocket(?:/([\\d.]+))?\\;version:\\1",
+        "X-Rocket-Nginx-Bypass": ""
       },
       "html": "<!--[^>]+WP Rocket",
       "icon": "WP Rocket.png",
       "implies": "WordPress",
       "website": "http://wp-rocket.me"
     },
+    "WP Engine": {
+      "cats": [
+        62
+      ],
+      "headers": {
+        "wpe-backend": ""
+      },
+      "icon": "wpengine.svg",
+      "implies": "WordPress",
+      "website": "https://wpengine.com"
+    },
     "Warp": {
       "cats": [
         22
@@ -10621,14 +11135,6 @@
       "implies": "Haskell",
       "website": "http://www.stackage.org/package/warp"
     },
-    "Web Optimizer": {
-      "cats": [
-        10
-      ],
-      "html": "<title [^>]*lang=\"wo\">",
-      "icon": "Web Optimizer.png",
-      "website": "http://www.web-optimizer.us"
-    },
     "Web2py": {
       "cats": [
         18
@@ -10724,6 +11230,17 @@
       "icon": "Webs.png",
       "website": "http://webs.com"
     },
+    "Websocket": {
+      "cats": [
+        19
+      ],
+      "html": [
+        "<link[^>]+rel=[\"']web-socket[\"']",
+        "<(?:link|a)[^>]+href=[\"']wss?://"
+      ],
+      "icon": "websocket.png",
+      "website": "https://en.wikipedia.org/wiki/WebSocket"
+    },
     "WebsPlanet": {
       "cats": [
         1
@@ -10742,6 +11259,22 @@
       "url": "/websale7/",
       "website": "http://websale.de"
     },
+    "Website Creator": {
+      "cats": [
+        1
+      ],
+      "icon": "WebsiteCreator.png",
+      "implies": [
+        "PHP",
+        "MySQL",
+        "Vue.js"
+      ],
+      "meta": {
+        "generator": "Website Creator by hosttech",
+        "wsc_rendermode": ""
+      },
+      "website": "https://www.hosttech.ch/websitecreator"
+    },
     "WebsiteBaker": {
       "cats": [
         1
@@ -10793,6 +11326,34 @@
       "script": "cdn\\d+\\.editmysite\\.com",
       "website": "https://www.weebly.com"
     },
+    "Weglot": {
+      "cats": [
+        19
+      ],
+      "headers": {
+        "Weglot-Translated": ""
+      },
+      "icon": "Weglot.png",
+      "script": [
+        "cdn\\.weglot\\.com",
+        "wp-content/plugins/weglot"
+      ],
+      "website": "https://www.weglot.com"
+    },
+    "Webzi": {
+      "cats": [
+        1
+      ],
+      "icon": "Webzi.svg",
+      "js": {
+        "Webzi": ""
+      },
+      "meta": {
+        "generator": "^Webzi"
+      },
+      "script": "cdn\\.6th\\.ir",
+      "website": "https://webzi.ir"
+    },
     "Wikinggruppen": {
       "cats": [
         6
@@ -10803,17 +11364,6 @@
       "icon": "wikinggruppen.png",
       "website": "https://wikinggruppen.se/"
     },
-    "Wikispaces": {
-      "cats": [
-        8
-      ],
-      "html": [
-        "<script[^>]*>[^<]*session_url:\\s*'https://session\\.wikispaces\\.com/",
-        "<\\w+[^>]*\\s+class=\"[^\"]*WikispacesContent\\s+WikispacesBs3[^\"]*\""
-      ],
-      "icon": "Wikispaces.png",
-      "website": "http://www.wikispaces.com"
-    },
     "WikkaWiki": {
       "cats": [
         8
@@ -10852,7 +11402,7 @@
       ],
       "icon": "Wink.png",
       "js": {
-        "wink.version": "(.*)\\;version:\\1"
+        "wink.version": "^(.+)$\\;version:\\1"
       },
       "script": "(?:_base/js/base|wink).*\\.js",
       "website": "http://winktoolkit.org"
@@ -10955,7 +11505,8 @@
         11
       ],
       "html": [
-        "<link rel=[\"']stylesheet[\"'] [^>]+wp-(?:content|includes)",
+        "<link rel=[\"']stylesheet[\"'] [^>]+/wp-(?:content|includes)/",
+        "<div[^>]*class=[\"']amp-wp-",
         "<link[^>]+s\\d+\\.wp\\.com"
       ],
       "icon": "WordPress.svg",
@@ -10963,14 +11514,17 @@
         "PHP",
         "MySQL"
       ],
+      "headers": {
+        "link": "rel=\"https://api\\.w\\.org/\""
+      },
       "js": {
         "wp_username": ""
       },
       "meta": {
-        "generator": "WordPress( [\\d.]+)?\\;version:\\1"
+        "generator": "^WordPress ?([\\d.]+)?\\;version:\\1"
       },
-      "script": "/wp-includes/",
-      "website": "http://wordpress.org"
+      "script": "/wp-(?:content|includes)/",
+      "website": "https://wordpress.org"
     },
     "WordPress Super Cache": {
       "cats": [
@@ -11060,10 +11614,10 @@
       ],
       "icon": "XRegExp.png",
       "js": {
-        "XRegExp.version": "(.*)\\;version:\\1"
+        "XRegExp.version": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "xregexp(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "xregexp[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
         "xregexp.*\\.js"
       ],
@@ -11179,8 +11733,8 @@
       ],
       "icon": "YUI.png",
       "js": {
-        "YAHOO.VERSION": "(.*)\\;version:\\1",
-        "YUI.version": "(.*)\\;version:\\1"
+        "YAHOO.VERSION": "^(.+)$\\;version:\\1",
+        "YUI.version": "^(.+)$\\;version:\\1"
       },
       "script": "(?:/yui/|yui\\.yahooapis\\.com)",
       "website": "http://yuilibrary.com"
@@ -11234,7 +11788,7 @@
       "cats": [
         42
       ],
-      "html":"<!-- (?:End )?Yahoo! Tag Manager -->",
+      "html": "<!-- (?:End )?Yahoo! Tag Manager -->",
       "script": "b\\.yjtag\\.jp/iframe",
       "icon": "yahoo.png",
       "website": "https://tagmanager.yahoo.co.jp/"
@@ -11362,11 +11916,29 @@
       "icon": "YouTube.png",
       "website": "http://www.youtube.com"
     },
+    "iEXExchanger": {
+      "cats": [
+        1
+      ],
+      "implies": [
+        "PHP",
+        "Apache",
+        "Angular"
+      ],
+      "cookies": {
+        "iexexchanger_session": ""
+      },
+      "meta": {
+        "generator": "iEXExchanger"
+      },
+      "icon": "iEXExchanger.png",
+      "website": "https://exchanger.iexbase.com"
+    },
     "ZK": {
       "cats": [
         18
       ],
-      "html": "<!-- ZK [\\.\\d\\s]+-->",
+      "html": "<!-- ZK [.\\d\\s]+-->",
       "icon": "ZK.png",
       "implies": "Java",
       "script": "zkau/",
@@ -11572,6 +12144,10 @@
       "headers": {
         "Server": "cpsrvd/([\\d.]+)\\;version:\\1"
       },
+      "cookies": {
+        "cpsession": "",
+        "cprelogin": ""
+      },
       "html": "<!-- cPanel",
       "icon": "cPanel.png",
       "website": "http://www.cpanel.net"
@@ -11682,7 +12258,7 @@
       ],
       "icon": "ef.js.svg",
       "js": {
-        "ef.version": "(.*)\\;version:\\1",
+        "ef.version": "^(.+)$\\;version:\\1",
         "efCore": ""
       },
       "script": "/ef(?:-core)?(?:\\.min|\\.dev)?\\.js",
@@ -11875,7 +12451,7 @@
         "jQuery.fn.jquery": "([\\d.]+)\\;version:\\1"
       },
       "script": [
-        "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "jquery[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
         "jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1"
       ],
@@ -11902,11 +12478,28 @@
       "icon": "jQuery Mobile.svg",
       "implies": "jQuery",
       "js": {
-        "jQuery.mobile.version": "(.*)\\;version:\\1"
+        "jQuery.mobile.version": "^(.+)$\\;version:\\1"
       },
       "script": "jquery[.-]mobile(?:-([\\d.]))?(?:\\.min)?\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
       "website": "https://jquerymobile.com"
     },
+    "jQuery-pjax": {
+      "cats": [
+        26
+      ],
+      "implies": "jQuery",
+      "meta": {
+        "pjax-timeout": "",
+        "pjax-replace": "",
+        "pjax-push": ""
+      },
+      "js": {
+        "jQuery.pjax": ""
+      },
+      "script": "jquery[.-]pjax(?:-([\\d.]))?(?:\\.min)?\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
+      "html": "<div[^>]+data-pjax-container",
+      "website": "https://github.com/defunkt/jquery-pjax"
+    },
     "jQuery Sparklines": {
       "cats": [
         25
@@ -11922,10 +12515,10 @@
       "icon": "jQuery UI.svg",
       "implies": "jQuery",
       "js": {
-        "jQuery.ui.version": "(.*)\\;version:\\1"
+        "jQuery.ui.version": "^(.+)$\\;version:\\1"
       },
       "script": [
-        "jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "jquery-ui[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
         "jquery-ui.*\\.js"
       ],
@@ -12153,7 +12746,11 @@
       "cookies": {
         "osCsid": ""
       },
-      "html": "(?:<a[^>]*(?:\\?|&)osCsid|Powered by (?:<[^>]+>)?osCommerce</a>|<[^>]+class=\"[^>]*infoBoxHeading)",
+      "html": [
+        "<br />Powered by <a href=\"https?://www\\.oscommerce\\.com",
+        "<(?:input|a)[^>]+name=\"osCsid\"",
+        "<(?:tr|td|table)class=\"[^\"]*infoBoxHeading"
+      ],
       "icon": "osCommerce.png",
       "implies": [
         "PHP",
@@ -12210,13 +12807,29 @@
       "cats": [
         25
       ],
-      "html": "<div id=\"particles\\-js\">",
+      "html": "<div id=\"particles-js\">",
       "js": {
         "particlesJS": ""
       },
       "script": "/particles(?:\\.min)?\\.js",
       "website": "https://vincentgarreau.com/particles.js/"
     },
+    "PhotoShelter": {
+      "cats": [
+        1
+      ],
+      "html": [
+        "<!--\\s+#+ Powered by the PhotoShelter Beam platform",
+        "<link rel=[\"']dns-prefetch[\"'] [^>]+photoshelter.com"
+      ],
+      "implies": [
+        "PHP",
+        "MySQL",
+        "jQuery"
+      ],
+      "icon": "PhotoShelter.png",
+      "website": "https://www.photoshelter.com"
+    },
     "phpAlbum": {
       "cats": [
         7
@@ -12233,7 +12846,13 @@
       "cookies": {
         "phpbb": ""
       },
-      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+      "html": [
+        "Powered by <a[^>]+phpBB",
+        "<div class=phpbb_copyright>",
+        "<[^>]+styles/(?:sub|pro)silver/theme",
+        "<img[^>]+i_icon_mini",
+        "<table class=\"[^\"]*forumline"
+      ],
       "icon": "phpBB.png",
       "implies": "PHP",
       "js": {
@@ -12324,11 +12943,11 @@
         1,
         2
       ],
-      "html": "Powered by <a href=\"[^\"]+phpwind\\.net",
+      "html": "(?:Powered|Code) by <a href=\"[^\"]+phpwind\\.net",
       "icon": "phpwind.png",
       "implies": "PHP",
       "meta": {
-        "generator": "^phpwind"
+        "generator": "^phpwind(?: v([0-9-]+))?\\;version:\\1"
       },
       "website": "https://www.phpwind.net"
     },
@@ -12364,6 +12983,9 @@
       "cats": [
         2
       ],
+      "js": {
+        "PUNBB": ""
+      },
       "html": "Powered by <a href=\"[^>]+punbb",
       "icon": "punBB.png",
       "implies": "PHP",
@@ -12414,7 +13036,7 @@
       ],
       "icon": "script.aculo.us.png",
       "js": {
-        "Scriptaculous.Version": "(.*)\\;version:\\1"
+        "Scriptaculous.Version": "^(.+)$\\;version:\\1"
       },
       "script": "/(?:scriptaculous|protoaculous)(?:\\.js|/)",
       "website": "https://script.aculo.us"
@@ -12426,7 +13048,7 @@
       "icon": "scrollreveal.svg",
       "html": "<[^>]+data-sr(?:-id)",
       "js": {
-        "ScrollReveal().version": "(.*)\\;version:\\1"
+        "ScrollReveal().version": "^(.+)$\\;version:\\1"
       },
       "script": "scrollreveal(?:\\.min)(?:\\.js)",
       "website": "https://scrollrevealjs.org"
@@ -12446,7 +13068,10 @@
         12,
         47
       ],
-      "html": "<style[^>]*data-styled-components",
+      "html": [
+        "<style[^>]*data-styled(?:-components)?[\\s\"]",
+        "<style[^>]+data-styled-version=\"([0-9]+)\"\\;version:\\1"
+      ],
       "icon": "styled-components.png",
       "implies": [
         "React"
@@ -12472,7 +13097,7 @@
       ],
       "icon": "three.js.png",
       "js": {
-        "THREE.REVISION": "(.*)\\;version:\\1"
+        "THREE.REVISION": "^(.+)$\\;version:\\1"
       },
       "script": "three(?:\\.min)?\\.js",
       "website": "https://threejs.org"
@@ -12586,6 +13211,17 @@
       "url": "^https?://(?:www\\.)?virgool\\.io",
       "website": "https://virgool.io"
     },
+    "shoperfa": {
+      "cats": [
+        6
+      ],
+      "headers": {
+        "X-Powered-By": "^Shoperfa$"
+      },
+      "icon": "Shoperfa.png",
+      "url": "^https?://(?:www\\.)?shoperfa\\.com",
+      "website": "https://shoperfa.com"
+    },
     "webEdition": {
       "cats": [
         1
@@ -12605,7 +13241,7 @@
       "js": {
         "webpackJsonp": ""
       },
-      "website": "https://webpack.github.io"
+      "website": "https://webpack.js.org/"
     },
     "parcel": {
       "cats": [
@@ -12659,6 +13295,50 @@
         "generator": "xt:Commerce"
       },
       "website": "https://www.xt-commerce.com"
+    },
+    "Halo": {
+      "cats": [
+        1,
+        11
+      ],
+      "html": [
+        "<link rel=[\"']stylesheet[\"'] [^>]+/halo-(?:backend|frontend|common)/"
+      ],
+      "icon": "Halo.svg",
+      "implies": "Java",
+      "script": "/halo-(?:backend|frontend|common)/",
+      "website": "https://github.com/ruibaby/halo"
+    },
+    "Rocket": {
+      "cats": [
+        1,
+        6
+      ],
+      "headers": {
+        "x-powered-by": "^Rocket=https://rocketcms.io/"
+      },
+      "icon": "Rocket.svg",
+      "implies": [
+        "webpack",
+        "Node.js",
+        "MySQL",
+        "Less"
+      ],
+      "website": "https://rocketcms.io"
+    },
+    "Zipkin": {
+      "cats": [
+        10
+      ],
+      "headers": {
+        "X-B3-TraceId": "",
+        "X-B3-SpanId": "",
+        "X-B3-ParentSpanId": "",
+        "X-B3-Sampled": "",
+        "X-B3-Flags": ""
+      },
+      "icon": "Zipkin.png",
+      "website": "https://zipkin.io/"
     }
   },
   "categories": {
@@ -12889,6 +13569,30 @@
     "59": {
       "name": "JavaScript Libraries",
       "priority": 9
+    },
+    "60": {
+      "name": "Containers",
+      "priority": 8
+    },
+    "61": {
+      "name": "SaaS",
+      "priority": 8
+    },
+    "62": {
+      "name": "PaaS",
+      "priority": 8
+    },
+    "63": {
+      "name": "IaaS",
+      "priority": 8
+    },
+    "64": {
+      "name": "Reverse Proxy",
+      "priority": 7
+    },
+    "65": {
+      "name": "Load Balancer",
+      "priority": 7
     }
   }
 }
diff --git a/src/drivers/npm/README.md b/src/drivers/npm/README.md
index 8d7ea19f8..9858a41eb 100644
--- a/src/drivers/npm/README.md
+++ b/src/drivers/npm/README.md
@@ -14,38 +14,43 @@ technologies used on websites. It detects
 ## Installation
 
 ```shell
-$ npm i wappalyzer
+$ npm i -g wappalyzer      # Globally
+$ npm i wappalyzer --save  # As a dependency
 ```
 
 
 ## Run from the command line
 
 ```
-node index.js [url] [options]
+wappalyzer [url] [options]
 ```
 
 ### Options
 
 ```
-	--password           Password to be used for basic HTTP authentication
-	--proxy              Proxy URL, e.g. 'http://user:pass@proxy:8080'
-	--username           Username to be used for basic HTTP authentication
-  --chunk-size=num     Process links in chunks.
-  --debug=0|1          Output debug messages.
-  --delay=ms           Wait for ms milliseconds between requests.
-  --html-max-cols=num  Limit the number of HTML characters per line processed.
-  --html-max-rows=num  Limit the number of HTML lines processed.
-  --max-depth=num      Don't analyse pages more than num levels deep.
-  --max-urls=num       Exit when num URLs have been analysed.
-  --max-wait=ms        Wait no more than ms milliseconds for page resources to load.
-  --recursive=0|1      Follow links on pages (crawler).
-  --user-agent=str     Set the user agent string.
+--password           Password to be used for basic HTTP authentication
+--proxy              Proxy URL, e.g. 'http://user:pass@proxy:8080'
+--username           Username to be used for basic HTTP authentication
+--chunk-size=num     Process links in chunks.
+--debug=0|1          Output debug messages.
+--delay=ms           Wait for ms milliseconds between requests.
+--html-max-cols=num  Limit the number of HTML characters per line processed.
+--html-max-rows=num  Limit the number of HTML lines processed.
+--max-depth=num      Don't analyse pages more than num levels deep.
+--max-urls=num       Exit when num URLs have been analysed.
+--max-wait=ms        Wait no more than ms milliseconds for page resources to load.
+--recursive=0|1      Follow links on pages (crawler).
+--user-agent=str     Set the user agent string.
 ```
 
 
 ## Run from a script
 
 ```javascript
+const Wappalyzer = require('wappalyzer');
+
+const url = 'https://www.wappalyzer.com';
+
 const options = {
   debug: false,
   delay: 500,
@@ -58,16 +63,29 @@ const options = {
   htmlMaxRows: 2000,
 };
 
-const wappalyzer = new Wappalyzer('https://www.wappalyzer.com', options);
+const wappalyzer = new Wappalyzer(url, options);
+
+// Optional: set the browser to use
+// wappalyzer.browser = Wappalyzer.browsers.zombie;
+
+// Optional: capture log output
+// wappalyzer.on('log', params => {
+//   const { message, source, type } = params;
+// });
+
+// Optional: do something on page visit
+// wappalyzer.on('visit', params => {
+//   const { browser, pageUrl } = params;
+// });
 
 wappalyzer.analyze()
   .then(json => {
-    process.stdout.write(JSON.stringify(json, null, 2) + '\n')
+    process.stdout.write(`${JSON.stringify(json, null, 2)}\n`);
 
     process.exit(0);
   })
   .catch(error => {
-    process.stderr.write(error + '\n')
+    process.stderr.write(`${error}\n`);
 
     process.exit(1);
 });
diff --git a/src/drivers/npm/browser.js b/src/drivers/npm/browser.js
new file mode 100644
index 000000000..532a75aa3
--- /dev/null
+++ b/src/drivers/npm/browser.js
@@ -0,0 +1,20 @@
+class Browser {
+  constructor(options) {
+    this.options = options;
+
+    this.window = null;
+    this.document = null;
+    this.statusCode = null;
+    this.contentType = null;
+    this.headers = null;
+    this.statusCode = null;
+    this.contentType = null;
+    this.html = null;
+    this.js = null;
+    this.links = null;
+    this.scripts = null;
+    this.cookies = null;
+  }
+}
+
+module.exports = Browser;
diff --git a/src/drivers/npm/browsers/zombie.js b/src/drivers/npm/browsers/zombie.js
new file mode 100644
index 000000000..28f6ba3ce
--- /dev/null
+++ b/src/drivers/npm/browsers/zombie.js
@@ -0,0 +1,121 @@
+const Zombie = require('zombie');
+const Browser = require('../browser');
+
+class ZombieBrowser extends Browser {
+  constructor(options) {
+    super(options);
+
+    this.browser = new Zombie({
+      proxy: options.proxy,
+      silent: true,
+      strictSSL: false,
+      userAgent: options.userAgent,
+      waitDuration: options.maxWait,
+    });
+
+    this.browser.on('authenticate', (auth) => {
+      auth.username = this.options.username;
+      auth.password = this.options.password;
+    });
+  }
+
+  visit(url) {
+    return new Promise((resolve) => {
+      this.browser.visit(url, () => {
+        const resource = this.browser.resources.length
+          ? this.browser.resources.filter(_resource => _resource.response).shift() : null;
+
+        this.window = this.browser.window;
+        this.document = this.browser.document;
+        this.headers = this.getHeaders();
+        this.statusCode = resource ? resource.response.status : 0;
+        this.contentType = this.headers['content-type'] ? this.headers['content-type'].shift() : null;
+        this.html = this.getHtml();
+        this.js = this.getJs();
+        this.links = this.getLinks();
+        this.scripts = this.getScripts();
+        this.cookies = this.getCookies();
+
+        resolve();
+      });
+    });
+  }
+
+  getHeaders() {
+    const headers = {};
+
+    const resource = this.browser.resources.length
+      ? this.browser.resources.filter(_resource => _resource.response).shift() : null;
+
+    if (resource) {
+      // eslint-disable-next-line no-underscore-dangle
+      resource.response.headers._headers.forEach((header) => {
+        if (!headers[header[0]]) {
+          headers[header[0]] = [];
+        }
+
+        headers[header[0]].push(header[1]);
+      });
+    }
+
+    return headers;
+  }
+
+  getHtml() {
+    let html = '';
+
+    if (this.browser.document && this.browser.document.documentElement) {
+      try {
+        html = this.browser.html();
+      } catch (error) {
+        this.log(error.message, 'error');
+      }
+    }
+
+    return html;
+  }
+
+  getScripts() {
+    let scripts = [];
+
+    if (this.browser.document && this.browser.document.scripts) {
+      scripts = Array.prototype.slice
+        .apply(this.browser.document.scripts)
+        .filter(script => script.src)
+        .map(script => script.src);
+    }
+
+    return scripts;
+  }
+
+  getJs() {
+    return this.browser.window;
+  }
+
+  getLinks() {
+    let links = [];
+
+    if (this.browser.document) {
+      links = Array.from(this.browser.document.getElementsByTagName('a'));
+    }
+
+    return links;
+  }
+
+  getCookies() {
+    const cookies = [];
+
+    if (this.browser.cookies) {
+      this.browser.cookies.forEach(cookie => cookies.push({
+        name: cookie.key,
+        value: cookie.value,
+        domain: cookie.domain,
+        path: cookie.path,
+      }));
+    }
+
+    return cookies;
+  }
+}
+
+module.exports = ZombieBrowser;
diff --git a/src/drivers/npm/cli.js b/src/drivers/npm/cli.js
new file mode 100755
index 000000000..3ca29287e
--- /dev/null
+++ b/src/drivers/npm/cli.js
@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+
+const Wappalyzer = require('./driver');
+const Browser = require('./browsers/zombie');
+
+const args = process.argv.slice(2);
+
+const url = args.shift() || '';
+
+if (!url) {
+  process.stderr.write('No URL specified\n');
+
+  process.exit(1);
+}
+
+const options = {};
+
+let arg;
+
+do {
+  arg = args.shift();
+
+  const matches = /--([^=]+)=(.+)/.exec(arg);
+
+  if (matches) {
+    const key = matches[1].replace(/-\w/g, _matches => _matches[1].toUpperCase());
+    const value = matches[2];
+
+    options[key] = value;
+  }
+} while (arg);
+
+const wappalyzer = new Wappalyzer(Browser, url, options);
+
+wappalyzer.analyze()
+  .then((json) => {
+    process.stdout.write(`${JSON.stringify(json)}\n`);
+
+    process.exit(0);
+  })
+  .catch((error) => {
+    process.stderr.write(`${error}\n`);
+
+    process.exit(1);
+  });
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index d039c0eed..23e397ce6 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -1,9 +1,6 @@
-
-
 const url = require('url');
 const fs = require('fs');
 const path = require('path');
-const Browser = require('zombie');
 const Wappalyzer = require('./wappalyzer');
 
 const json = JSON.parse(fs.readFileSync(path.resolve(`${__dirname}/apps.json`)));
@@ -20,56 +17,55 @@ function sleep(ms) {
   return ms ? new Promise(resolve => setTimeout(resolve, ms)) : Promise.resolve();
 }
 
-function getHeaders(browser) {
-  const headers = {};
+function processJs(window, patterns) {
+  const js = {};
 
-  const resource = browser.resources.length
-    ? browser.resources.filter(_resource => _resource.response).shift() : null;
+  Object.keys(patterns).forEach((appName) => {
+    js[appName] = {};
 
-  if (resource) {
-    // eslint-disable-next-line no-underscore-dangle
-    resource.response.headers._headers.forEach((header) => {
-      if (!headers[header[0]]) {
-        headers[header[0]] = [];
-      }
+    Object.keys(patterns[appName]).forEach((chain) => {
+      js[appName][chain] = {};
 
-      headers[header[0]].push(header[1]);
-    });
-  }
+      patterns[appName][chain].forEach((pattern, index) => {
+        const properties = chain.split('.');
 
-  return headers;
-}
+        let value = properties
+          .reduce((parent, property) => (parent && parent[property]
+            ? parent[property] : null), window);
 
-function getScripts(browser) {
-  if (!browser.document || !browser.document.scripts) {
-    return [];
-  }
+        value = typeof value === 'string' || typeof value === 'number' ? value : !!value;
 
-  const scripts = Array.prototype.slice
-    .apply(browser.document.scripts)
-    .filter(script => script.src)
-    .map(script => script.src);
+        if (value) {
+          js[appName][chain][index] = value;
+        }
+      });
+    });
+  });
 
-  return scripts;
+  return js;
 }
 
-function getCookies(browser) {
-  const cookies = [];
+function processHtml(html, maxCols, maxRows) {
+  if (maxCols || maxRows) {
+    const chunks = [];
+    const rows = html.length / maxCols;
+
+    let i;
+
+    for (i = 0; i < rows; i += 1) {
+      if (i < maxRows / 2 || i > rows - maxRows / 2) {
+        chunks.push(html.slice(i * maxCols, (i + 1) * maxCols));
+      }
+    }
 
-  if (browser.cookies) {
-    browser.cookies.forEach(cookie => cookies.push({
-      name: cookie.key,
-      value: cookie.value,
-      domain: cookie.domain,
-      path: cookie.path,
-    }));
+    html = chunks.join('\n');
   }
 
-  return cookies;
+  return html;
 }
 
 class Driver {
-  constructor(pageUrl, options) {
+  constructor(Browser, pageUrl, options) {
     this.options = Object.assign({}, {
       password: '',
       proxy: null,
@@ -99,6 +95,9 @@ class Driver {
     this.analyzedPageUrls = {};
     this.apps = [];
     this.meta = {};
+    this.listeners = {};
+
+    this.Browser = Browser;
 
     this.wappalyzer = new Wappalyzer();
 
@@ -108,11 +107,26 @@ class Driver {
     this.wappalyzer.parseJsPatterns();
 
     this.wappalyzer.driver.log = (message, source, type) => this.log(message, source, type);
-    this.wappalyzer.driver.displayApps = (detected, meta, context) => this.displayApps(detected, meta, context);
+    this.wappalyzer.driver
+      .displayApps = (detected, meta, context) => this.displayApps(detected, meta, context);
 
     process.on('uncaughtException', e => this.wappalyzer.log(`Uncaught exception: ${e.message}`, 'driver', 'error'));
   }
 
+  on(event, callback) {
+    if (!this.listeners[event]) {
+      this.listeners[event] = [];
+    }
+
+    this.listeners[event].push(callback);
+  }
+
+  emit(event, params) {
+    if (this.listeners[event]) {
+      this.listeners[event].forEach(listener => listener(params));
+    }
+  }
+
   analyze() {
     this.time = {
       start: new Date().getTime(),
@@ -126,6 +140,8 @@ class Driver {
     if (this.options.debug) {
       console.log(`[wappalyzer ${type}]`, `[${source}]`, message);
     }
+
+    this.emit('log', { message, source, type });
   }
 
   displayApps(detected, meta) {
@@ -176,186 +192,101 @@ class Driver {
 
     this.timer(`fetch; url: ${pageUrl.href}; depth: ${depth}; delay: ${this.options.delay * index}ms`, timerScope);
 
-    return new Promise((resolve, reject) => {
-      sleep(this.options.delay * index)
-        .then(() => this.visit(pageUrl, timerScope, resolve, reject));
-    });
-  }
+    return new Promise(async (resolve, reject) => {
+      await sleep(this.options.delay * index);
 
-  visit(pageUrl, timerScope, resolve, reject) {
-    const browser = new Browser({
-      proxy: this.options.proxy,
-      silent: true,
-      strictSSL: false,
-      userAgent: this.options.userAgent,
-      waitDuration: this.options.maxWait,
+      this.visit(pageUrl, timerScope, resolve, reject);
     });
+  }
 
-    browser.on('authenticate', (auth) => {
-      auth.username = this.options.username;
-      auth.password = this.options.password;
-    });
+  async visit(pageUrl, timerScope, resolve, reject) {
+    const browser = new this.Browser(this.options);
 
-    this.timer(`browser.visit start; url: ${pageUrl.href}`, timerScope);
+    browser.log = (message, type) => this.wappalyzer.log(message, 'browser', type);
 
-    browser.visit(pageUrl.href, () => {
-      this.timer(`browser.visit end; url: ${pageUrl.href}`, timerScope);
+    this.timer(`visit start; url: ${pageUrl.href}`, timerScope);
 
-      try {
-        if (!this.checkResponse(browser, pageUrl)) {
-          resolve();
+    await browser.visit(pageUrl.href);
 
-          return;
-        }
-      } catch (error) {
-        reject(error);
+    this.timer(`visit end; url: ${pageUrl.href}`, timerScope);
 
-        return;
-      }
+    this.analyzedPageUrls[pageUrl.href].status = browser.statusCode;
 
-      const headers = getHeaders(browser);
-      const html = this.getHtml(browser);
-      const scripts = getScripts(browser);
-      const js = this.getJs(browser);
-      const cookies = getCookies(browser);
-
-      this.wappalyzer.analyze(pageUrl, {
-        headers,
-        html,
-        scripts,
-        js,
-        cookies,
-      })
-        .then(() => {
-          const links = Array.prototype.reduce.call(
-            browser.document.getElementsByTagName('a'), (results, link) => {
-              if (link.protocol.match(/https?:/) && link.hostname === this.origPageUrl.hostname && extensions.test(link.pathname)) {
-                link.hash = '';
-
-                results.push(url.parse(link.href));
-              }
-
-              return results;
-            }, [],
-          );
-
-          return resolve(links);
-        });
-    });
-  }
-
-  checkResponse(browser, pageUrl) {
     // Validate response
-    const resource = browser.resources.length
-      ? browser.resources.filter(_resource => _resource.response).shift() : null;
+    if (!browser.statusCode) {
+      return reject(new Error('NO_RESPONSE'));
+    }
 
-    if (!resource) {
-      throw new Error('NO_RESPONSE');
+    if (browser.statusCode !== 200) {
+      return reject(new Error('RESPONSE_NOT_OK'));
     }
 
-    this.analyzedPageUrls[pageUrl.href].status = resource.response.status;
+    if (!browser.contentType || !/\btext\/html\b/.test(browser.contentType)) {
+      this.wappalyzer.log(`Skipping; url: ${pageUrl.href}; content type: ${browser.contentType}`, 'driver');
 
-    if (resource.response.status !== 200) {
-      throw new Error('RESPONSE_NOT_OK');
+      delete this.analyzedPageUrls[pageUrl.href];
     }
 
-    const headers = getHeaders(browser);
-
-    // Validate content type
-    const contentType = headers['content-type'] ? headers['content-type'].shift() : null;
+    const { cookies, headers, scripts } = browser;
 
-    if (!contentType || !/\btext\/html\b/.test(contentType)) {
-      this.wappalyzer.log(`Skipping; url: ${pageUrl.href}; content type: ${contentType}`, 'driver');
+    const html = processHtml(browser.html, this.options.htmlMaxCols, this.options.htmlMaxRows);
+    const js = processJs(browser.js, this.wappalyzer.jsPatterns);
 
-      delete this.analyzedPageUrls[pageUrl.href];
+    await this.wappalyzer.analyze(pageUrl, {
+      cookies,
+      headers,
+      html,
+      js,
+      scripts,
+    });
 
-      return false;
-    }
+    const reducedLinks = Array.prototype.reduce.call(
+      browser.links, (results, link) => {
+        if (link.protocol.match(/https?:/) && link.hostname === this.origPageUrl.hostname && extensions.test(link.pathname)) {
+          link.hash = '';
 
-    // Validate document
-    if (!browser.document || !browser.document.documentElement) {
-      throw new Error('NO_HTML_DOCUMENT');
-    }
+          results.push(url.parse(link.href));
+        }
 
-    return true;
-  }
+        return results;
+      }, [],
+    );
 
-  getHtml(browser) {
-    let html = '';
-
-    try {
-      html = browser.html()
-        .split('\n')
-        .slice(0, this.options.htmlMaxRows / 2)
-        .concat(html.slice(html.length - this.options.htmlMaxRows / 2))
-        .map(line => line.substring(0, this.options.htmlMaxCols))
-        .join('\n');
-    } catch (error) {
-      this.wappalyzer.log(error.message, 'browser', 'error');
-    }
+    this.emit('visit', { browser, pageUrl });
 
-    return html;
+    return resolve(reducedLinks);
   }
 
-  getJs(browser) {
-    const patterns = this.wappalyzer.jsPatterns;
-    const js = {};
+  crawl(pageUrl, index = 1, depth = 1) {
+    pageUrl.canonical = `${pageUrl.protocol}//${pageUrl.host}${pageUrl.pathname}`;
 
-    Object.keys(patterns).forEach((appName) => {
-      js[appName] = {};
+    return new Promise(async (resolve) => {
+      let links;
 
-      Object.keys(patterns[appName]).forEach((chain) => {
-        js[appName][chain] = {};
+      try {
+        links = await this.fetch(pageUrl, index, depth);
+      } catch (error) {
+        const type = error.message && errorTypes[error.message] ? error.message : 'UNKNOWN_ERROR';
+        const message = error.message && errorTypes[error.message] ? errorTypes[error.message] : 'Unknown error';
 
-        patterns[appName][chain].forEach((pattern, index) => {
-          const properties = chain.split('.');
+        this.analyzedPageUrls[pageUrl.href].error = {
+          type,
+          message,
+        };
 
-          let value = properties
-            .reduce((parent, property) => (parent && parent[property]
-              ? parent[property] : null), browser.window);
+        this.wappalyzer.log(`${message}; url: ${pageUrl.href}`, 'driver', 'error');
+      }
 
-          value = typeof value === 'string' || typeof value === 'number' ? value : !!value;
+      if (links && this.options.recursive && depth < this.options.maxDepth) {
+        await this.chunk(links.slice(0, this.options.maxUrls), depth + 1);
+      }
 
-          if (value) {
-            js[appName][chain][index] = value;
-          }
-        });
+      return resolve({
+        urls: this.analyzedPageUrls,
+        applications: this.apps,
+        meta: this.meta,
       });
     });
-
-    return js;
-  }
-
-  crawl(pageUrl, index = 1, depth = 1) {
-    pageUrl.canonical = `${pageUrl.protocol}//${pageUrl.host}${pageUrl.pathname}`;
-
-    return new Promise((resolve) => {
-      this.fetch(pageUrl, index, depth)
-        .catch((error) => {
-          const type = error.message && errorTypes[error.message] ? error.message : 'UNKNOWN_ERROR';
-          const message = error.message && errorTypes[error.message] ? errorTypes[error.message] : 'Unknown error';
-
-          this.analyzedPageUrls[pageUrl.href].error = {
-            type,
-            message,
-          };
-
-          this.wappalyzer.log(`${message}; url: ${pageUrl.href}`, 'driver', 'error');
-        })
-        .then((links) => {
-          if (links && this.options.recursive && depth < this.options.maxDepth) {
-            return this.chunk(links.slice(0, this.options.maxUrls), depth + 1);
-          }
-          return Promise.resolve();
-        })
-        .then(() => {
-          resolve({
-            urls: this.analyzedPageUrls,
-            applications: this.apps,
-            meta: this.meta,
-          });
-        });
-    });
   }
 
   chunk(links, depth, chunk = 0) {
@@ -365,10 +296,12 @@ class Driver {
 
     const chunked = links.splice(0, this.options.chunkSize);
 
-    return new Promise((resolve) => {
-      Promise.all(chunked.map((link, index) => this.crawl(link, index, depth)))
-        .then(() => this.chunk(links, depth, chunk + 1))
-        .then(() => resolve());
+    return new Promise(async (resolve) => {
+      await Promise.all(chunked.map((link, index) => this.crawl(link, index, depth)));
+
+      await this.chunk(links, depth, chunk + 1);
+
+      resolve();
     });
   }
 
@@ -384,3 +317,6 @@ class Driver {
 }
 
 module.exports = Driver;
+
+module.exports.processJs = processJs;
+module.exports.processHtml = processHtml;
diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
index cdff2ba3d..4e97d7ea3 100755
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -1,45 +1,16 @@
-#!/usr/bin/env node
+const Driver = require('./driver');
+const ZombieBrowser = require('./browsers/zombie');
 
+class Wappalyzer {
+  constructor(pageUrl, options) {
+    this.browser = ZombieBrowser;
 
-const Wappalyzer = require('./driver');
-
-const args = process.argv.slice(2);
-
-const url = args.shift() || '';
-
-if (!url) {
-  process.stderr.write('No URL specified\n');
-
-  process.exit(1);
-}
-
-const options = {};
-
-let arg;
-
-do {
-  arg = args.shift();
-
-  const matches = /--([^=]+)=(.+)/.exec(arg);
-
-  if (matches) {
-    const key = matches[1].replace(/-\w/g, _matches => _matches[1].toUpperCase());
-    const value = matches[2];
-
-    options[key] = value;
+    return new Driver(this.browser, pageUrl, options);
   }
-} while (arg);
-
-const wappalyzer = new Wappalyzer(url, options);
-
-wappalyzer.analyze()
-  .then((json) => {
-    process.stdout.write(`${JSON.stringify(json)}\n`);
+}
 
-    process.exit(0);
-  })
-  .catch((error) => {
-    process.stderr.write(`${error}\n`);
+Wappalyzer.browsers = {
+  zombie: ZombieBrowser,
+};
 
-    process.exit(1);
-  });
+module.exports = Wappalyzer;
diff --git a/src/drivers/npm/npm-shrinkwrap.json b/src/drivers/npm/npm-shrinkwrap.json
index 84a0377e5..e7573ca02 100644
--- a/src/drivers/npm/npm-shrinkwrap.json
+++ b/src/drivers/npm/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "wappalyzer",
-  "version": "5.5.3",
+  "version": "5.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index 0ffe06f8a..aeeea530d 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -2,22 +2,25 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.5.4",
+  "version": "5.8.2",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/AliasIO/Wappalyzer"
   },
-  "main": "driver.js",
+  "main": "index.js",
   "files": [
     "apps.json",
-    "index.js",
+    "browser.js",
+    "browsers/zombie.js",
+    "cli.js",
     "driver.js",
+    "index.js",
     "wappalyzer.js"
   ],
   "bin": {
-    "wappalyzer": "./index.js"
+    "wappalyzer": "./cli.js"
   },
   "dependencies": {
     "zombie": "^6.1.2"
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
index 80cbfbecd..a3735830c 100644
--- a/src/drivers/webextension/_locales/de/messages.json
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nichts zu tun." },
 	"noAppsDetected":           { "message": "Keine Applikation entdeckt." },
   "categoryPin":              { "message": "Immer Icon anzeigen" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Nachrichten Board" },
 	"categoryName3":            { "message": "Datenbankverwaltung" },
@@ -68,6 +70,12 @@
 	"categoryName55":           { "message": "Buchhaltung" },
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Statischer Seitengenerator" },
-	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName58":           { "message": "Benutzer-Einbindung" },
+	"categoryName59":           { "message": "JavaScript Bibliotheken" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 72e6d453f..0076ca754 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
@@ -65,5 +67,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index 4739f7678..1490c73d0 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -11,6 +11,9 @@
 	"nothingToDo":              { "message": "Nothing to do here." },
 	"noAppsDetected":           { "message": "No technologies detected." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "privacyPolicy":            { "message": "Privacy policy" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Message Board" },
 	"categoryName3":            { "message": "Database Manager" },
@@ -69,5 +72,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index 4a4238e0f..134f044cb 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nada que hacer aquí." },
 	"noAppsDetected":           { "message": "Aplicaciones no detectadas." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Gestor de Contenido" },
 	"categoryName2":            { "message": "Foro" },
 	"categoryName3":            { "message": "Gestor de Bases de Datos" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json
index 02816f9b7..9553d98f4 100644
--- a/src/drivers/webextension/_locales/fa/messages.json
+++ b/src/drivers/webextension/_locales/fa/messages.json
@@ -10,7 +10,9 @@
 	"optionTracking":           { "message": "ارسال فن آوری های شناسایی شده به صورت ناشناس به wappalyzer.com" },
 	"nothingToDo":              { "message": "هیچ چیز برای انجام اینجا نیست." },
 	"noAppsDetected":           { "message": "هیچ فن آوری شناسایی نشده است." },
-  "categoryPin":              { "message": "همیشه نماد را نشان بده" },
+	"categoryPin":              { "message": "همیشه نماد را نشان بده" },
+	"termsAccept":              { "message": "قبول" },
+	"termsContent":             { "message": "این افزونه اطلاعات وبسایتهای بازدید شده توسط شما را به صورت ناشناس ارسال میکند، مانند آدرس سایت و تکنولوژی های استفاده شده در آن سایت را ارسال می کند. اطلاعات بیشتر در <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. شما میتوانید این افزونه را غیر فعال کنید." },
 	"categoryName1":            { "message": "سیستم مدیریت محتوا" },
 	"categoryName2":            { "message": "انجمن پیام" },
 	"categoryName3":            { "message": "مدیر پایگاه داده" },
@@ -26,7 +28,7 @@
 	"categoryName13":           { "message": "ردیاب مشکل" },
 	"categoryName14":           { "message": "پخش کننده ویدیویی" },
 	"categoryName15":           { "message": "سیستم نظرسنجی" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "کپچا" },
 	"categoryName17":           { "message": "اسکریپ فونت" },
 	"categoryName18":           { "message": "چارچوب وب" },
 	"categoryName19":           { "message": "متفرقه" },
@@ -64,10 +66,16 @@
 	"categoryName51":           { "message": "سازنده صفحات Landing" },
 	"categoryName52":           { "message": "گفتگوی زنده" },
 	"categoryName53":           { "message": "مدیریت ارتباط با مشتری" },
-  "categoryName54":           { "message": "بهینه سازی موتور جستجو" },
+	"categoryName54":           { "message": "بهینه سازی موتور جستجو" },
 	"categoryName55":           { "message": "حسابداری" },
 	"categoryName56":           { "message": "کریپتوماینر" },
 	"categoryName57":           { "message": "تولید کننده سایت ایستا" },
 	"categoryName58":           { "message": "آن بوردینگ کاربر" },
-	"categoryName59":           { "message": "کتابخانه های جاوا اسکریپت" }
+	"categoryName59":           { "message": "کتابخانه های جاوا اسکریپت" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index 81c8c3884..23dcfd19f 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -11,6 +11,8 @@
 	"twitter":                  { "message": "Suivre Wappalyzer sur Twitter" },
 	"website":                  { "message": "Aller sur wappalyzer.com" },
 	"categoryPin":              { "message": " Toujours afficher l'icône" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Gestionnaire de base de données" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Crypto-mineur" },
 	"categoryName57":           { "message": "Générateur de site statique" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index 4caa0b8c6..bb73d8c94 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
@@ -65,5 +67,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index 97b49c72a..1d5f7c2f3 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Tak ada yang dilakukan disini." },
 	"noAppsDetected":           { "message": "Tidak ada aplikasi yang terdeteksi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Sistem Pengelola Konten" },
 	"categoryName2":            { "message": "Papan Pesan" },
 	"categoryName3":            { "message": "Pengelola Basis Data" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index 3057b5205..171cc6c32 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Niente da fare qui." },
 	"noAppsDetected":           { "message": "Nessuna applicazione rilevata." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Gestore di Database" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index 6544df5bf..2e5b0df13 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nic tu nie ma." },
 	"noAppsDetected":           { "message": "Nie wykryto żadnych aplikacji." },
   "categoryPin":              { "message": "Zawsze pokazuj tą ikonę" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "System zarządzania treścią" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Menedżer baz danych" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Koparka kryptowalut" },
 	"categoryName57":           { "message": "Generator stron statycznych" },
 	"categoryName58":           { "message": "Wdrażanie użytkownika" },
-	"categoryName59":           { "message": "Biblioteki JavaScript" }
+	"categoryName59":           { "message": "Biblioteki JavaScript" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json
index c7ace9e31..896b8f91f 100644
--- a/src/drivers/webextension/_locales/pt/messages.json
+++ b/src/drivers/webextension/_locales/pt/messages.json
@@ -1,73 +1,82 @@
 {
-    "github":                   { "message": "Fork Wappalyzer no GitHub!" },
-    "noAppsDetected":           { "message": "Não foi detectada nenhuma tecnologia." },
-    "nothingToDo":              { "message": "Nada a fazer aqui." },
-    "optionDynamicIcon":        { "message": "Utilizar o ícone da tecnologia em vez do logótipo do Wappalyzer" },
-    "optionTracking":           { "message": "Envie anonimamente tecnologias identificadas para wappalyzer.com" },
-    "optionUpgradeMessage":     { "message": "Fale-me sobre actualizações" },
-    "options":                  { "message": "Opções" },
-    "optionsSave":              { "message": "Opções de Guardar" },
-    "optionsSaved":             { "message": "Guardado" },
-    "twitter":                  { "message": "Seguir Wappalyzer no Twitter" },
-    "website":                  { "message": "Ir para wappalyzer.com" },
-    "categoryPin":              { "message": "Mostrar sempre ícone" },
-    "categoryName1":            { "message": "CMS" },
-    "categoryName2":            { "message": "Fórum" },
-    "categoryName3":            { "message": "Gestor de Base de Dados" },
-    "categoryName4":            { "message": "Ferramenta de Documentação" },
-    "categoryName5":            { "message": "Widget" },
-    "categoryName6":            { "message": "Comércio Eletrónico" },
-    "categoryName7":            { "message": "Galeria de Fotos" },
-    "categoryName8":            { "message": "Wikis" },
-    "categoryName9":            { "message": "Painéis de Hospedagem" },
-    "categoryName10":           { "message": "Analítica" },
-    "categoryName11":           { "message": "Blog" },
-    "categoryName12":           { "message": "Framework JavaScript" },
-    "categoryName13":           { "message": "Rastreador de Problemas" },
-    "categoryName14":           { "message": "Leitor Vídeo" },
-    "categoryName15":           { "message": "Sistema de Comentários" },
-    "categoryName16":           { "message": "Captcha" },
-    "categoryName17":           { "message": "Script de Tipos de Letra" },
-    "categoryName18":           { "message": "Framework Web" },
-    "categoryName19":           { "message": "Diversos" },
-    "categoryName20":           { "message": "Editor" },
-    "categoryName21":           { "message": "LMS" },
-    "categoryName22":           { "message": "Servidor Web" },
-    "categoryName23":           { "message": "Ferramenta de Cache" },
-    "categoryName24":           { "message": "Editor WYSIWYG" },
-    "categoryName25":           { "message": "Gráficos JavaScript" },
-    "categoryName26":           { "message": "Framework Mobile" },
-    "categoryName27":           { "message": "Linguagem de Programação" },
-    "categoryName28":           { "message": "Sistema Operativo" },
-    "categoryName29":           { "message": "Motor de Busca" },
-    "categoryName30":           { "message": "Web Mail" },
-    "categoryName31":           { "message": "CDN" },
-    "categoryName32":           { "message": "Automação de Marketing" },
-    "categoryName33":           { "message": "Extensão de Servidor Web" },
-    "categoryName34":           { "message": "Base de Dados" },
-    "categoryName35":           { "message": "Mapa" },
-    "categoryName36":           { "message": "Rede de Publicidade" },
-    "categoryName37":           { "message": "Serviço de Rede" },
-    "categoryName38":           { "message": "Servidor de Média" },
-    "categoryName39":           { "message": "Webcam" },
-    "categoryName40":           { "message": "Impressão" },
-    "categoryName41":           { "message": "Processador de Pagamento" },
-    "categoryName42":           { "message": "Gestor de Etiquetas" },
-    "categoryName43":           { "message": "Sistema de Subscrição Paga" },
-    "categoryName44":           { "message": "Sistema Build/CI" },
-    "categoryName45":           { "message": "Sistema SCADA" },
-    "categoryName46":           { "message": "Acesso Remoto" },
-    "categoryName47":           { "message": "Ferramenta de Desenvolvimento" },
-    "categoryName48":           { "message": "Rede de Armazenamento" },
-    "categoryName49":           { "message": "Leitores de Feed" },
-    "categoryName50":           { "message": "Sistema de Gestão de Documentos" },
-    "categoryName51":           { "message": "Criador de Páginas de Destino" },
-    "categoryName52":           { "message": "Chat ao Vivo" },
-    "categoryName53":           { "message": "CRM" },
-    "categoryName54":           { "message": "SEO" },
-    "categoryName55":           { "message": "Contabilidade" },
-    "categoryName56":           { "message": "Cryptominer" },
-    "categoryName57":           { "message": "Gerador de Site Estático" },
-    "categoryName58":           { "message": "User Onboarding" },
-	  "categoryName59":           { "message": "JavaScript Libraries" }
+  "github":                   { "message": "Fork Wappalyzer no GitHub!" },
+  "noAppsDetected":           { "message": "Não foi detectada nenhuma tecnologia." },
+  "nothingToDo":              { "message": "Nada a fazer aqui." },
+  "optionDynamicIcon":        { "message": "Utilizar o ícone da tecnologia em vez do logótipo do Wappalyzer" },
+  "optionTracking":           { "message": "Envie anonimamente tecnologias identificadas para wappalyzer.com" },
+  "optionUpgradeMessage":     { "message": "Fale-me sobre actualizações" },
+  "options":                  { "message": "Opções" },
+  "optionsSave":              { "message": "Opções de Guardar" },
+  "optionsSaved":             { "message": "Guardado" },
+  "twitter":                  { "message": "Seguir Wappalyzer no Twitter" },
+  "website":                  { "message": "Ir para wappalyzer.com" },
+  "categoryPin":              { "message": "Mostrar sempre ícone" },
+  "termsAccept":              { "message": "Aceitar" },
+  "termsContent":             { "message": "Esta extensão envia informações anónimas sobre os sites que visitas, incluindo o nome de domínio e as tecnologias identificadas, para o <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. Isso pode ser desativado nas configurações." },
+  "privacyPolicy":            { "message": "Políticas de Privacidade" },
+  "categoryName1":            { "message": "CMS" },
+  "categoryName2":            { "message": "Fórum" },
+  "categoryName3":            { "message": "Gestor de Base de Dados" },
+  "categoryName4":            { "message": "Ferramenta de Documentação" },
+  "categoryName5":            { "message": "Widget" },
+  "categoryName6":            { "message": "Ecommerce" },
+  "categoryName7":            { "message": "Galeria de Fotos" },
+  "categoryName8":            { "message": "Wikis" },
+  "categoryName9":            { "message": "Painéis de Hospedagem" },
+  "categoryName10":           { "message": "Analítica" },
+  "categoryName11":           { "message": "Blog" },
+  "categoryName12":           { "message": "Framework JavaScript" },
+  "categoryName13":           { "message": "Localizador de Problemas" },
+  "categoryName14":           { "message": "Leitor Vídeo" },
+  "categoryName15":           { "message": "Sistema de Comentários" },
+  "categoryName16":           { "message": "Captcha" },
+  "categoryName17":           { "message": "Tipos de Letra" },
+  "categoryName18":           { "message": "Framework Web" },
+  "categoryName19":           { "message": "Diversos" },
+  "categoryName20":           { "message": "Editor" },
+  "categoryName21":           { "message": "LMS" },
+  "categoryName22":           { "message": "Servidor Web" },
+  "categoryName23":           { "message": "Ferramenta de Cache" },
+  "categoryName24":           { "message": "Editor WYSIWYG" },
+  "categoryName25":           { "message": "Gráficos JavaScript" },
+  "categoryName26":           { "message": "Framework Mobile" },
+  "categoryName27":           { "message": "Linguagem de Programação" },
+  "categoryName28":           { "message": "Sistema Operativo" },
+  "categoryName29":           { "message": "Motor de Busca" },
+  "categoryName30":           { "message": "WebMail" },
+  "categoryName31":           { "message": "CDN" },
+  "categoryName32":           { "message": "Automação de Marketing" },
+  "categoryName33":           { "message": "Extensão de Servidor Web" },
+  "categoryName34":           { "message": "Base de Dados" },
+  "categoryName35":           { "message": "Mapa" },
+  "categoryName36":           { "message": "Rede de Publicidade" },
+  "categoryName37":           { "message": "Serviço de Rede" },
+  "categoryName38":           { "message": "Servidor de Média" },
+  "categoryName39":           { "message": "Webcam" },
+  "categoryName40":           { "message": "Impressão" },
+  "categoryName41":           { "message": "Processador de Pagamento" },
+  "categoryName42":           { "message": "Gestor de Etiquetas" },
+  "categoryName43":           { "message": "Sistema de Subscrição Paga" },
+  "categoryName44":           { "message": "Sistema Build/CI" },
+  "categoryName45":           { "message": "Sistema SCADA" },
+  "categoryName46":           { "message": "Acesso Remoto" },
+  "categoryName47":           { "message": "Ferramenta de Desenvolvimento" },
+  "categoryName48":           { "message": "Rede de Armazenamento" },
+  "categoryName49":           { "message": "Leitores de Feed" },
+  "categoryName50":           { "message": "Sistema de Gestão de Documentos" },
+  "categoryName51":           { "message": "Criador de Páginas de Destino" },
+  "categoryName52":           { "message": "Chat ao Vivo" },
+  "categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Contabilidade" },
+  "categoryName56":           { "message": "Cryptominer" },
+  "categoryName57":           { "message": "Gerador de Site Estático" },
+  "categoryName58":           { "message": "User Onboarding" },
+  "categoryName59":           { "message": "Bibliotecas de JavaScript" },
+  "categoryName60":           { "message": "Containers" },
+  "categoryName61":           { "message": "SaaS" },
+  "categoryName62":           { "message": "PaaS" },
+  "categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
index 3649f89a3..86402cf1e 100644
--- a/src/drivers/webextension/_locales/pt_BR/messages.json
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nada a fazer aqui." },
 	"noAppsDetected":           { "message": "Nenhuma tecnologia identificada." },
   "categoryPin":              { "message": "Sempre mostrar ícone" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Fórum" },
 	"categoryName3":            { "message": "Gestão de banco de dados" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Minerador de cryptomoedas" },
 	"categoryName57":           { "message": "Gerador de sites estáticos" },
 	"categoryName58":           { "message": "Integração com usuário" },
-	"categoryName59":           { "message": "Biblioteca JavaScript" }
+	"categoryName59":           { "message": "Biblioteca JavaScript" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index 571bdd462..14e832699 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
 	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
   "categoryPin":              { "message": "Afișează icon tot timpul" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum de discuții" },
 	"categoryName3":            { "message": "Manager baze de date" },
@@ -65,5 +67,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 7ee442fd3..9438baef7 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -1,73 +1,81 @@
 {
-  "categoryName1" : { "message" : "CMS" },
-  "categoryName2" : { "message" : "Форум" },
-  "categoryName3" : { "message" : "Менеджер БД" },
-  "categoryName4" : { "message" : "Документация" },
-  "categoryName5" : { "message" : "Виджет" },
-  "categoryName6" : { "message" : "Электронная коммерция" },
-  "categoryName7" : { "message" : "Фотогалерея" },
-  "categoryName8" : { "message" : "Вики" },
-  "categoryName9" : { "message" : "Панель управления хостингом" },
-  "categoryName10" : { "message" : "Аналитика" },
-  "categoryName11" : { "message" : "Блог" },
-  "categoryName12" : { "message" : "JS фреймворк" },
-  "categoryName13" : { "message" : "Баг трекер" },
-  "categoryName14" : { "message" : "Видео плеер" },
-  "categoryName15" : { "message" : "Система комментариев" },
-  "categoryName16" : { "message" : "Капча" },
-  "categoryName17" : { "message" : "Шрифт" },
-  "categoryName18" : { "message" : "Веб фреймворк" },
-  "categoryName19" : { "message" : "Прочее" },
-  "categoryName20" : { "message" : "HTML редактор" },
-  "categoryName21" : { "message" : "LMS" },
-  "categoryName22" : { "message" : "Веб сервер" },
-  "categoryName23" : { "message" : "Кеширование" },
-  "categoryName24" : { "message" : "WYSIWYG редактор" },
-  "categoryName25" : { "message" : "JS графика" },
-  "categoryName26" : { "message" : "Мобильный фреймворк" },
-  "categoryName27" : { "message" : "Язык программирования" },
-  "categoryName28" : { "message" : "Операционная система" },
-  "categoryName29" : { "message" : "Поисковый движок" },
-  "categoryName30" : { "message" : "Веб почта" },
-  "categoryName31" : { "message" : "CDN" },
-  "categoryName32" : { "message" : "Управление маркетингом" },
-  "categoryName33" : { "message" : "Расширение Веб сервера" },
-  "categoryName34" : { "message" : "База данных" },
-  "categoryName35" : { "message" : "Карта" },
-  "categoryName36" : { "message" : "Рекламная сеть" },
-  "categoryName37" : { "message" : "Сетевая служба" },
-  "categoryName38" : { "message" : "Медиа сервер" },
-  "categoryName39" : { "message" : "Вебкамера" },
-  "categoryName40" : { "message" : "Принтер" },
-  "categoryName41" : { "message" : "Платёжная система" },
-  "categoryName42" : { "message" : "Менеджер тэгов" },
-  "categoryName43" : { "message" : "Paywall" },
-  "categoryName44" : { "message" : "Система непрерывной интеграции" },
-  "categoryName45" : { "message" : "Система SCADA" },
-  "categoryName46" : { "message" : "Удаленное управление" },
-  "categoryName47" : { "message" : "Утилита для разработчиков" },
-  "categoryName48" : { "message" : "Сетевое хранилище" },
-  "categoryName49" : { "message" : "Граббер контента" },
-  "categoryName50" : { "message" : "Управление документами" },
-  "categoryName51" : { "message": "Генератор лендингов" },
-  "categoryName52" : { "message": "Live Chat" },
-  "categoryName53" : { "message": "CRM" },
-  "github" : { "message" : "Форкнуть на GitHub!" },
-  "noAppsDetected" : { "message" : "Нет данных о сайте" },
-  "nothingToDo" : { "message" : "Тут нечего искать" },
-  "optionTracking" : { "message" : "Анонимно отправлять статистику распознанных данных на сервер (для исследований)" },
-  "optionDynamicIcon" : { "message": "Использовать значок приложения вместо логотипа Wappalyzer" },
-  "optionUpgradeMessage" : { "message" : "Оповещать меня об обновлениях" },
-  "options" : { "message" : "Настройки" },
-  "optionsSave" : { "message" : "Сохранить" },
-  "optionsSaved" : { "message" : "Успешно сохранено!" },
-  "twitter" : { "message" : "Следите за новостями в Твиттере" },
-  "website" : { "message" : "Перейти на Wappalyzer.com" },
-  "categoryPin":          { "message": "Always show icon" },
+  "categoryName1":            { "message": "CMS" },
+  "categoryName2":            { "message": "Форум" },
+  "categoryName3":            { "message": "Менеджер БД" },
+  "categoryName4":            { "message": "Документация" },
+  "categoryName5":            { "message": "Виджет" },
+  "categoryName6":            { "message": "Электронная коммерция" },
+  "categoryName7":            { "message": "Фотогалерея" },
+  "categoryName8":            { "message": "Вики" },
+  "categoryName9":            { "message": "Панель управления хостингом" },
+  "categoryName10":           { "message": "Аналитика" },
+  "categoryName11":           { "message": "Блог" },
+  "categoryName12":           { "message": "JS фреймворк" },
+  "categoryName13":           { "message": "Баг трекер" },
+  "categoryName14":           { "message": "Видео плеер" },
+  "categoryName15":           { "message": "Система комментариев" },
+  "categoryName16":           { "message": "Капча" },
+  "categoryName17":           { "message": "Шрифт" },
+  "categoryName18":           { "message": "Веб фреймворк" },
+  "categoryName19":           { "message": "Прочее" },
+  "categoryName20":           { "message": "HTML редактор" },
+  "categoryName21":           { "message": "LMS" },
+  "categoryName22":           { "message": "Веб сервер" },
+  "categoryName23":           { "message": "Кеширование" },
+  "categoryName24":           { "message": "WYSIWYG редактор" },
+  "categoryName25":           { "message": "JS графика" },
+  "categoryName26":           { "message": "Мобильный фреймворк" },
+  "categoryName27":           { "message": "Язык программирования" },
+  "categoryName28":           { "message": "Операционная система" },
+  "categoryName29":           { "message": "Поисковый движок" },
+  "categoryName30":           { "message": "Веб почта" },
+  "categoryName31":           { "message": "CDN" },
+  "categoryName32":           { "message": "Управление маркетингом" },
+  "categoryName33":           { "message": "Расширение Веб сервера" },
+  "categoryName34":           { "message": "База данных" },
+  "categoryName35":           { "message": "Карта" },
+  "categoryName36":           { "message": "Рекламная сеть" },
+  "categoryName37":           { "message": "Сетевая служба" },
+  "categoryName38":           { "message": "Медиа сервер" },
+  "categoryName39":           { "message": "Вебкамера" },
+  "categoryName40":           { "message": "Принтер" },
+  "categoryName41":           { "message": "Платёжная система" },
+  "categoryName42":           { "message": "Менеджер тэгов" },
+  "categoryName43":           { "message": "Paywall" },
+  "categoryName44":           { "message": "Система непрерывной интеграции" },
+  "categoryName45":           { "message": "Система SCADA" },
+  "categoryName46":           { "message": "Удаленное управление" },
+  "categoryName47":           { "message": "Утилита для разработчиков" },
+  "categoryName48":           { "message": "Сетевое хранилище" },
+  "categoryName49":           { "message": "Граббер контента" },
+  "categoryName50":           { "message": "Управление документами" },
+  "categoryName51":           { "message": "Генератор лендингов" },
+  "categoryName52":           { "message": "Live Chat" },
+  "categoryName53":           { "message": "CRM" },
+  "github":                   { "message": "Форкнуть на GitHub!" },
+  "noAppsDetected":           { "message": "Нет данных о сайте" },
+  "nothingToDo":              { "message": "Тут нечего искать" },
+  "optionTracking":           { "message": "Анонимно отправлять статистику распознанных данных на сервер (для исследований)" },
+  "optionDynamicIcon":        { "message": "Использовать значок приложения вместо логотипа Wappalyzer" },
+  "optionUpgradeMessage":     { "message": "Оповещать меня об обновлениях" },
+  "options":                  { "message": "Настройки" },
+  "optionsSave":              { "message": "Сохранить" },
+  "optionsSaved":             { "message": "Успешно сохранено!" },
+  "twitter":                  { "message": "Следите за новостями в Твиттере" },
+  "website":                  { "message": "Перейти на Wappalyzer.com" },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName54":           { "message": "SEO" },
   "categoryName55":           { "message": "Бухгалтерский учёт" },
 	"categoryName56":           { "message": "Криптомайнер" },
 	"categoryName57":           { "message": "Генератор статических сайтов" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index 55d251d31..b9ee93169 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -11,6 +11,8 @@
   "nothingToDo":              { "message": "Nie je tu čo robiť." },
   "noAppsDetected":           { "message": "Žiadne aplikácie neboli zistené." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName1":            { "message": "CMS" },
   "categoryName2":            { "message": "Message Board" },
   "categoryName3":            { "message": "Správca databáz" },
@@ -69,5 +71,11 @@
   "categoryName56":           { "message": "Cryptominer" },
   "categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
index 0acc50e22..f7a1c98ec 100644
--- a/src/drivers/webextension/_locales/tr/messages.json
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Burada yapacak birşey yok." },
 	"noAppsDetected":           { "message": "Uygulamalar tespit edilemedi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Mesaj Tahtası" },
 	"categoryName3":            { "message": "Veritabanı Yöneticisi" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "Cryptominer" },
 	"categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index ab1dc4c43..5f6b8089d 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Тут нічого робити." },
 	"noAppsDetected":           { "message": "Нічого не знайдено." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Форум" },
 	"categoryName3":            { "message": "Менеджер БД" },
@@ -69,5 +71,11 @@
   "categoryName56":           { "message": "Cryptominer" },
   "categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
index 6703c3f06..edd7df369 100644
--- a/src/drivers/webextension/_locales/uz/messages.json
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "Bu yerda tekshirib bolmaydi." },
 	"noAppsDetected":           { "message": "Hech qanday dastur aniqlanmadi." },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS (KBT)" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "MB boshqaruvi" },
@@ -69,5 +71,11 @@
   "categoryName56":           { "message": "Cryptominer" },
   "categoryName57":           { "message": "Static Site Generator" },
 	"categoryName58":           { "message": "User Onboarding" },
-	"categoryName59":           { "message": "JavaScript Libraries" }
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 9c0a95cea..de4afab07 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -11,6 +11,8 @@
   "nothingToDo":              { "message": "这儿啥也没有。" },
   "noAppsDetected":           { "message": "未检测到任何应用。" },
   "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
   "categoryName1":            { "message": "内容管理系统（CMS）" },
   "categoryName2":            { "message": "消息板" },
   "categoryName3":            { "message": "数据库管理器" },
@@ -69,5 +71,11 @@
   "categoryName56":           { "message": "加密货币挖矿器" },
   "categoryName57":           { "message": "静态网站生成器" },
 	"categoryName58":           { "message": "用户引导" },
-	"categoryName59":           { "message": "JavaScript 库" }
+	"categoryName59":           { "message": "JavaScript 库" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
index 643f6da7c..b1213d6ef 100644
--- a/src/drivers/webextension/_locales/zh_TW/messages.json
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -11,6 +11,8 @@
 	"nothingToDo":              { "message": "這裡什麼也沒有。" },
 	"noAppsDetected":           { "message": "未識別到技術。" },
 	"categoryPin":              { "message": "永遠顯示圖示" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "內容管理系統（CMS）" },
 	"categoryName2":            { "message": "留言板/討論區" },
 	"categoryName3":            { "message": "資料庫管理" },
@@ -69,5 +71,11 @@
 	"categoryName56":           { "message": "加密貨幣礦工" },
 	"categoryName57":           { "message": "靜態網站產生器" },
 	"categoryName58":           { "message": "使用者指引" },
-	"categoryName59":           { "message": "JavaScript 函式庫" }
+	"categoryName59":           { "message": "JavaScript 函式庫" },
+	"categoryName60":           { "message": "容器" },
+	"categoryName61":           { "message": "軟體即服務（SaaS）" },
+	"categoryName62":           { "message": "平台即服務（PaaS）" },
+	"categoryName63":           { "message": "基礎設施即服務（IaaS）" },
+	"categoryName64":           { "message": "Reverse Proxy" },
+	"categoryName65":           { "message": "Load Balancer" }
 }
diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css
index b9d7c90fb..bd5efa916 100644
--- a/src/drivers/webextension/css/popup.css
+++ b/src/drivers/webextension/css/popup.css
@@ -155,3 +155,48 @@ body {
 
 .empty__text {
 }
+
+.terms {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper {
+  display: none;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper--active {
+  display: block;
+}
+
+.terms__content {
+  font-size: .9rem;
+  line-height: 150%;
+  text-align: center;
+  margin-bottom: 1rem;
+  width: 80%;
+}
+
+.terms__accept {
+  background-color: #4608ad;
+  border: none;
+  border-radius: 3px;
+  color: white;
+  cursor: pointer;
+  font-size: .9rem;
+  padding: .8rem 3rem;
+}
+
+.terms__accept:hover {
+  background-color: #4107a1;
+}
+
+.terms__privacy {
+  margin-top: 1rem;
+}
diff --git a/src/drivers/webextension/html/popup.html b/src/drivers/webextension/html/popup.html
index b453b70c3..2a7d662dc 100644
--- a/src/drivers/webextension/html/popup.html
+++ b/src/drivers/webextension/html/popup.html
@@ -17,6 +17,16 @@
       </a>
     </div>
 
-    <div class="container"></div>
+    <div class="container">
+      <div class="terms__wrapper">
+        <div class="terms">
+          <div class="terms__content" data-i18n="termsContent"></div>
+
+          <button class="terms__accept" data-i18n="termsAccept"></button>
+
+          <a class="terms__privacy" href="https://www.wappalyzer.com/privacy" data-i18n="privacyPolicy"></a>
+        </div>
+      </div>
+    </div>
 	</body>
 </html>
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index 4d29c981a..82713d79b 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -1,17 +1,34 @@
 /** global: browser */
 /** global: XMLSerializer */
 
+/* global browser */
+/* eslint-env browser */
+
+const port = browser.runtime.connect({
+  name: 'content.js',
+});
+
 if (typeof browser !== 'undefined' && typeof document.body !== 'undefined') {
   try {
-    sendMessage('init', {});
+    port.postMessage({ id: 'init' });
 
     // HTML
-    let html = new XMLSerializer().serializeToString(document).split('\n');
+    let html = new XMLSerializer().serializeToString(document);
+
+    const chunks = [];
+    const maxCols = 2000;
+    const maxRows = 3000;
+    const rows = html.length / maxCols;
+
+    let i;
 
-    html = html
-      .slice(0, 1000).concat(html.slice(html.length - 1000))
-      .map(line => line.substring(0, 1000))
-      .join('\n');
+    for (i = 0; i < rows; i += 1) {
+      if (i < maxRows / 2 || i > rows - maxRows / 2) {
+        chunks.push(html.slice(i * maxCols, (i + 1) * maxCols));
+      }
+    }
+
+    html = chunks.join('\n');
 
     // Scripts
     const scripts = Array.prototype.slice
@@ -20,7 +37,7 @@ if (typeof browser !== 'undefined' && typeof document.body !== 'undefined') {
       .map(script => script.src)
       .filter(script => script.indexOf('data:text/javascript;') !== 0);
 
-    sendMessage('analyze', { html, scripts });
+    port.postMessage({ id: 'analyze', subject: { html, scripts } });
 
     // JavaScript variables
     const script = document.createElement('script');
@@ -31,41 +48,40 @@ if (typeof browser !== 'undefined' && typeof document.body !== 'undefined') {
           return;
         }
 
-        removeEventListener('message', onMessage);
+        window.removeEventListener('message', onMessage);
 
-        sendMessage('analyze', { js: event.data.js });
+        port.postMessage({ id: 'analyze', subject: { js: event.data.js } });
 
         script.remove();
       };
 
-      addEventListener('message', onMessage);
+      window.addEventListener('message', onMessage);
 
-      sendMessage('get_js_patterns', {}, (response) => {
-        if (response) {
-          postMessage({
-            id: 'patterns',
-            patterns: response.patterns,
-          }, '*');
-        }
-      });
+      port.postMessage({ id: 'get_js_patterns' });
     };
 
     script.setAttribute('src', browser.extension.getURL('js/inject.js'));
 
     document.body.appendChild(script);
-  } catch (e) {
-    sendMessage('log', e);
+  } catch (error) {
+    port.postMessage({ id: 'log', subject: error });
   }
 }
 
-function sendMessage(id, subject, callback) {
-  (chrome || browser).runtime.sendMessage({
-    id,
-    subject,
-    source: 'content.js',
-  }, callback || (() => {}));
-}
+port.onMessage.addListener((message) => {
+  switch (message.id) {
+    case 'get_js_patterns':
+      postMessage({
+        id: 'patterns',
+        patterns: message.response.patterns,
+      }, window.location.href);
+
+      break;
+    default:
+      // Do nothing
+  }
+});
 
 // https://stackoverflow.com/a/44774834
 // https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/executeScript#Return_value
-undefined;
+undefined; // eslint-disable-line no-unused-expressions
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 6f339da05..327d31717 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -13,32 +13,50 @@
 const wappalyzer = new Wappalyzer();
 
 const tabCache = {};
-let categoryOrder = [];
-const options = {};
 const robotsTxtQueue = {};
 
+let categoryOrder = [];
+
 browser.tabs.onRemoved.addListener((tabId) => {
   tabCache[tabId] = null;
 });
 
+function userAgent() {
+  const url = chrome.extension.getURL('/');
+
+  if (url.match(/^chrome-/)) {
+    return 'chrome';
+  }
+
+  if (url.match(/^moz-/)) {
+    return 'firefox';
+  }
+
+  if (url.match(/^ms-browser-/)) {
+    return 'edge';
+  }
+}
+
 /**
  * Get a value from localStorage
  */
 function getOption(name, defaultValue = null) {
-  return new Promise((resolve, reject) => {
-    const callback = (item) => {
-      options[name] = item[name] ? item[name] : defaultValue;
+  return new Promise(async (resolve, reject) => {
+    let value = defaultValue;
 
-      resolve(options[name]);
-    };
+    try {
+      const option = await browser.storage.local.get(name);
 
-    browser.storage.local.get(name)
-      .then(callback)
-      .catch((error) => {
-        wappalyzer.log(error, 'driver', 'error');
+      if (option[name] !== undefined) {
+        value = option[name];
+      }
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
 
-        reject();
-      });
+      return reject(error.message);
+    }
+
+    return resolve(value);
   });
 }
 
@@ -46,13 +64,17 @@ function getOption(name, defaultValue = null) {
  * Set a value in localStorage
  */
 function setOption(name, value) {
-  const option = {};
-
-  option[name] = value;
+  return new Promise(async (resolve, reject) => {
+    try {
+      await browser.storage.local.set({ [name]: value });
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
 
-  browser.storage.local.set(option);
+      return reject(error.message);
+    }
 
-  options[name] = value;
+    return resolve();
+  });
 }
 
 /**
@@ -68,111 +90,66 @@ function openTab(args) {
 /**
  * Make a POST request
  */
-function post(url, body) {
-  fetch(url, {
-    method: 'POST',
-    body: JSON.stringify(body),
-  })
-    .then(response => wappalyzer.log(`POST ${url}: ${response.status}`, 'driver'))
-    .catch(error => wappalyzer.log(`POST ${url}: ${error}`, 'driver', 'error'));
-}
-
-fetch('../apps.json')
-  .then(response => response.json())
-  .then((json) => {
-    wappalyzer.apps = json.apps;
-    wappalyzer.categories = json.categories;
-
-    wappalyzer.parseJsPatterns();
-
-    categoryOrder = Object.keys(wappalyzer.categories)
-      .map(categoryId => parseInt(categoryId, 10))
-      .sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority);
-  })
-  .catch(error => wappalyzer.log(`GET apps.json: ${error}`, 'driver', 'error'));
-
-// Version check
-const { version } = browser.runtime.getManifest();
-
-getOption('version')
-  .then((previousVersion) => {
-    if (previousVersion === null) {
-      openTab({
-        url: `${wappalyzer.config.websiteURL}installed`,
-      });
-    } else if (version !== previousVersion) {
-      getOption('upgradeMessage', true)
-        .then((upgradeMessage) => {
-          if (upgradeMessage) {
-            openTab({
-              url: `${wappalyzer.config.websiteURL}upgraded?v${version}`,
-              background: true,
-            });
-          }
-        });
-    }
-
-    setOption('version', version);
-  });
-
-getOption('dynamicIcon', true);
-getOption('pinnedCategory');
-
-getOption('hostnameCache', {})
-  .then((hostnameCache) => {
-    wappalyzer.hostnameCache = hostnameCache;
-
-    return hostnameCache;
-  });
-
-// Run content script on all tabs
-browser.tabs.query({ url: ['http://*/*', 'https://*/*'] })
-  .then((tabs) => {
-    tabs.forEach((tab) => {
-      browser.tabs.executeScript(tab.id, {
-        file: '../js/content.js',
-      });
+async function post(url, body) {
+  try {
+    const response = await fetch(url, {
+      method: 'POST',
+      body: JSON.stringify(body),
     });
-  })
-  .catch(error => wappalyzer.log(error, 'driver', 'error'));
+
+    wappalyzer.log(`POST ${url}: ${response.status}`, 'driver');
+  } catch (error) {
+    wappalyzer.log(`POST ${url}: ${error}`, 'driver', 'error');
+  }
+}
 
 // Capture response headers
-browser.webRequest.onCompleted.addListener((request) => {
+browser.webRequest.onCompleted.addListener(async (request) => {
   const headers = {};
 
   if (request.responseHeaders) {
     const url = wappalyzer.parseUrl(request.url);
 
-    browser.tabs.query({ url: [url.href] })
-      .then((tabs) => {
-        const tab = tabs[0] || null;
+    let tab;
 
-        if (tab) {
-          request.responseHeaders.forEach((header) => {
-            const name = header.name.toLowerCase();
+    try {
+      [tab] = await browser.tabs.query({ url: [url.href] });
+    } catch (error) {
+      wappalyzer.log(error, 'driver', 'error');
+    }
 
-            headers[name] = headers[name] || [];
+    if (tab) {
+      request.responseHeaders.forEach((header) => {
+        const name = header.name.toLowerCase();
 
-            headers[name].push((header.value || header.binaryValue || '').toString());
-          });
+        headers[name] = headers[name] || [];
 
-          if (headers['content-type'] && /\/x?html/.test(headers['content-type'][0])) {
-            wappalyzer.analyze(url, { headers }, { tab });
-          }
-        }
-      })
-      .catch(error => wappalyzer.log(error, 'driver', 'error'));
+        headers[name].push((header.value || header.binaryValue || '').toString());
+      });
+
+      if (headers['content-type'] && /\/x?html/.test(headers['content-type'][0])) {
+        wappalyzer.analyze(url, { headers }, { tab });
+      }
+    }
   }
 }, { urls: ['http://*/*', 'https://*/*'], types: ['main_frame'] }, ['responseHeaders']);
 
-// Listen for messages
-(chrome || browser).runtime.onMessage.addListener((message, sender, sendResponse) => {
-  if (typeof message.id !== 'undefined') {
+browser.runtime.onConnect.addListener((port) => {
+  port.onMessage.addListener(async (message) => {
+    if (message.id === undefined) {
+      return;
+    }
+
     if (message.id !== 'log') {
-      wappalyzer.log(`Message${message.source ? ` from ${message.source}` : ''}: ${message.id}`, 'driver');
+      wappalyzer.log(`Message from ${port.name}: ${message.id}`, 'driver');
     }
 
-    const url = wappalyzer.parseUrl(sender.tab ? sender.tab.url : '');
+    const pinnedCategory = await getOption('pinnedCategory');
+
+    const url = wappalyzer.parseUrl(port.sender.tab ? port.sender.tab.url : '');
+
+    const cookies = await browser.cookies.getAll({ domain: `.${url.hostname}` });
+
     let response;
 
     switch (message.id) {
@@ -181,14 +158,13 @@ browser.webRequest.onCompleted.addListener((request) => {
 
         break;
       case 'init':
-        browser.cookies.getAll({ domain: `.${url.hostname}` })
-          .then(cookies => wappalyzer.analyze(url, { cookies }, { tab: sender.tab }));
+        wappalyzer.analyze(url, { cookies }, { tab: port.sender.tab });
 
         break;
       case 'analyze':
-        wappalyzer.analyze(url, message.subject, { tab: sender.tab });
+        wappalyzer.analyze(url, message.subject, { tab: port.sender.tab });
 
-        setOption('hostnameCache', wappalyzer.hostnameCache);
+        await setOption('hostnameCache', wappalyzer.hostnameCache);
 
         break;
       case 'ad_log':
@@ -200,12 +176,13 @@ browser.webRequest.onCompleted.addListener((request) => {
           tabCache: tabCache[message.tab.id],
           apps: wappalyzer.apps,
           categories: wappalyzer.categories,
-          pinnedCategory: options.pinnedCategory,
+          pinnedCategory,
+          termsAccepted: userAgent() === 'chrome' || await getOption('termsAccepted', false),
         };
 
         break;
       case 'set_option':
-        setOption(message.key, message.value);
+        await setOption(message.key, message.value);
 
         break;
       case 'get_js_patterns':
@@ -215,12 +192,16 @@ browser.webRequest.onCompleted.addListener((request) => {
 
         break;
       default:
+        // Do nothing
     }
 
-    sendResponse(response);
-  }
-
-  return true;
+    if (response) {
+      port.postMessage({
+        id: message.id,
+        response,
+      });
+    }
+  });
 });
 
 wappalyzer.driver.document = document;
@@ -229,13 +210,15 @@ wappalyzer.driver.document = document;
  * Log messages to console
  */
 wappalyzer.driver.log = (message, source, type) => {
-  console.log(`[wappalyzer ${type}]`, `[${source}]`, message);
+  const log = ['warn', 'error'].indexOf(type) !== -1 ? type : 'log';
+
+  console[log](`[wappalyzer ${type}]`, `[${source}]`, message); // eslint-disable-line no-console
 };
 
 /**
  * Display apps
  */
-wappalyzer.driver.displayApps = (detected, meta, context) => {
+wappalyzer.driver.displayApps = async (detected, meta, context) => {
   const { tab } = context;
 
   if (tab === undefined) {
@@ -248,20 +231,19 @@ wappalyzer.driver.displayApps = (detected, meta, context) => {
 
   tabCache[tab.id].detected = detected;
 
+  const pinnedCategory = await getOption('pinnedCategory');
+  const dynamicIcon = await getOption('dynamicIcon', true);
+
   let found = false;
 
   // Find the main application to display
-  [options.pinnedCategory].concat(categoryOrder).forEach((match) => {
+  [pinnedCategory].concat(categoryOrder).forEach((match) => {
     Object.keys(detected).forEach((appName) => {
       const app = detected[appName];
 
       app.props.cats.forEach((category) => {
         if (category === match && !found) {
-          let icon = app.props.icon || 'default.svg';
-
-          if (!options.dynamicIcon) {
-            icon = 'default.svg';
-          }
+          let icon = app.props.icon && dynamicIcon ? app.props.icon : 'default.svg';
 
           if (/\.svg$/i.test(icon)) {
             icon = `converted/${icon.replace(/\.svg$/, '.png')}`;
@@ -282,61 +264,53 @@ wappalyzer.driver.displayApps = (detected, meta, context) => {
     });
   });
 
-  if (typeof chrome !== 'undefined') {
-    // Browser polyfill doesn't seem to work here
-    chrome.pageAction.show(tab.id);
-  } else {
-    browser.pageAction.show(tab.id);
-  }
+  browser.pageAction.show(tab.id);
 };
 
 /**
  * Fetch and cache robots.txt for host
  */
-wappalyzer.driver.getRobotsTxt = (host, secure = false) => {
+wappalyzer.driver.getRobotsTxt = async (host, secure = false) => {
   if (robotsTxtQueue[host]) {
     return robotsTxtQueue[host];
   }
 
-  robotsTxtQueue[host] = new Promise((resolve) => {
-    getOption('tracking', true)
-      .then((tracking) => {
-        if (!tracking) {
-          resolve([]);
+  const tracking = await getOption('tracking', true);
+  const robotsTxtCache = await getOption('robotsTxtCache', {});
 
-          return;
-        }
+  robotsTxtQueue[host] = new Promise(async (resolve) => {
+    if (!tracking) {
+      return resolve([]);
+    }
+
+    if (host in robotsTxtCache) {
+      return resolve(robotsTxtCache[host]);
+    }
+
+    const timeout = setTimeout(() => resolve([]), 3000);
 
-        getOption('robotsTxtCache')
-          .then((robotsTxtCache) => {
-            robotsTxtCache = robotsTxtCache || {};
+    let response;
 
-            if (host in robotsTxtCache) {
-              resolve(robotsTxtCache[host]);
+    try {
+      response = await fetch(`http${secure ? 's' : ''}://${host}/robots.txt`, { redirect: 'follow' });
+    } catch (error) {
+      wappalyzer.log(error, 'driver', 'error');
 
-              return;
-            }
+      return resolve([]);
+    }
 
-            const timeout = setTimeout(() => resolve([]), 3000);
+    clearTimeout(timeout);
 
-            fetch(`http${secure ? 's' : ''}://${host}/robots.txt`, { redirect: 'follow' })
-              .then((response) => {
-                clearTimeout(timeout);
+    const robotsTxt = response.ok ? await response.text() : '';
 
-                return response.ok ? response.text() : '';
-              })
-              .then((robotsTxt) => {
-                robotsTxtCache[host] = Wappalyzer.parseRobotsTxt(robotsTxt);
+    robotsTxtCache[host] = Wappalyzer.parseRobotsTxt(robotsTxt);
 
-                setOption('robotsTxtCache', robotsTxtCache);
+    await setOption('robotsTxtCache', robotsTxtCache);
 
-                resolve(robotsTxtCache[host]);
-              })
-              .catch(() => resolve([]));
-          });
-      });
-  })
-    .finally(() => delete robotsTxtQueue[host]);
+    delete robotsTxtQueue[host];
+
+    return resolve(robotsTxtCache[host]);
+  });
 
   return robotsTxtQueue[host];
 };
@@ -344,19 +318,77 @@ wappalyzer.driver.getRobotsTxt = (host, secure = false) => {
 /**
  * Anonymously track detected applications for research purposes
  */
-wappalyzer.driver.ping = (hostnameCache = {}, adCache = []) => {
-  getOption('tracking', true)
-    .then((tracking) => {
-      if (tracking) {
-        if (Object.keys(hostnameCache).length) {
-          post('https://api.wappalyzer.com/ping/v1/', hostnameCache);
-        }
+wappalyzer.driver.ping = async (hostnameCache = {}, adCache = []) => {
+  const tracking = await getOption('tracking', true);
+  const termsAccepted = userAgent() === 'chrome' || await getOption('termsAccepted', false);
 
-        if (adCache.length) {
-          post('https://ad.wappalyzer.com/log/wp/', adCache);
-        }
+  if (tracking && termsAccepted) {
+    if (Object.keys(hostnameCache).length) {
+      post('https://api.wappalyzer.com/ping/v1/', hostnameCache);
+    }
+
+    if (adCache.length) {
+      post('https://ad.wappalyzer.com/log/wp/', adCache);
+    }
+
+    await setOption('robotsTxtCache', {});
+  }
+};
+
+// Init
+(async () => {
+  // Technologies
+  try {
+    const response = await fetch('../apps.json');
+    const json = await response.json();
+
+    wappalyzer.apps = json.apps;
+    wappalyzer.categories = json.categories;
+  } catch (error) {
+    wappalyzer.log(`GET apps.json: ${error.message}`, 'driver', 'error');
+  }
+
+  wappalyzer.parseJsPatterns();
 
-        setOption('robotsTxtCache', {});
+  categoryOrder = Object.keys(wappalyzer.categories)
+    .map(categoryId => parseInt(categoryId, 10))
+    .sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority);
+
+  // Version check
+  const { version } = browser.runtime.getManifest();
+  const previousVersion = await getOption('version');
+  const upgradeMessage = await getOption('upgradeMessage', true);
+
+  if (previousVersion === null) {
+    openTab({
+      url: `${wappalyzer.config.websiteURL}installed`,
+    });
+  } else if (version !== previousVersion && upgradeMessage) {
+    openTab({
+      url: `${wappalyzer.config.websiteURL}upgraded?v${version}`,
+      background: true,
+    });
+  }
+
+  await setOption('version', version);
+
+  // Hostname cache
+  wappalyzer.hostnameCache = await getOption('hostnameCache', {});
+
+  // Run content script on all tabs
+  try {
+    const tabs = await browser.tabs.query({ url: ['http://*/*', 'https://*/*'] });
+
+    tabs.forEach(async (tab) => {
+      try {
+        await browser.tabs.executeScript(tab.id, {
+          file: '../js/content.js',
+        });
+      } catch (error) {
+        //
       }
     });
-};
+  } catch (error) {
+    wappalyzer.log(error, 'driver', 'error');
+  }
+})();
diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js
index a2458e1bd..3e9a6658f 100644
--- a/src/drivers/webextension/js/inject.js
+++ b/src/drivers/webextension/js/inject.js
@@ -1,3 +1,5 @@
+/* eslint-env browser */
+
 (() => {
   try {
     const detectJs = (chain) => {
@@ -51,7 +53,7 @@
         }
       }
 
-      postMessage({ id: 'js', js }, '*');
+      postMessage({ id: 'js', js }, window.location.href);
     };
 
     addEventListener('message', onMessage);
diff --git a/src/drivers/webextension/js/lib/iframe.js b/src/drivers/webextension/js/lib/iframe.js
index 651e9e547..b50e63629 100644
--- a/src/drivers/webextension/js/lib/iframe.js
+++ b/src/drivers/webextension/js/lib/iframe.js
@@ -1,1142 +1,1187 @@
+'use strict';
 
+(function(win) {
 
-(function (win) {
-  const exports = {};
-
-  (function (exports) {
-    const utils = {
-      normalizeUrl(url) {
-        return this.hashUrl(url) || null;
-      },
-
-      getReferrer() {
-        return this.normalizeUrl(document.referrer);
-      },
-
-      getPageUrl() {
-        return this.normalizeUrl(window.location.href);
-      },
-      hashUrl(url) {
-        let a,
-          result;
-
-        if (!url || url.indexOf('http') !== 0) {
-          return null;
-        }
-
-        a = document.createElement('a');
-        a.href = url;
-
-        result = `${a.protocol}//${a.hostname}/`;
-
-        if (a.pathname && a.pathname !== '/') {
-          result += this.hashCode(a.pathname);
-        }
-
-        if (a.search) {
-          result += `?${this.hashCode(a.search)}`;
-        }
-
-        if (a.hash) {
-          result += `#${this.hashCode(a.hash)}`;
-        }
-
-        return result;
-      },
-
-      hashCode(str) {
-        let hash = 0,
-          kar,
-          i;
-
-        if (str.length === 0) {
-          return hash;
-        }
-
-        for (i = 0; i < str.length; i++) {
-          kar = str.charCodeAt(i);
-          hash = ((hash << 5) - hash) + kar;
-          hash &= hash;
-        }
-
-        return hash + Math.pow(2, 32);
-      },
-
-      realArray(a) {
-        return Array.prototype.slice.apply(a);
-      },
-
-      onDocLoaded(doc, callback) {
-        if (doc.readyState === 'loading') {
-          doc.addEventListener('DOMContentLoaded', callback);
-        } else {
-          callback();
-        }
-      },
-
-      SCRIPT_IN_WINDOW_TOP: window === window.top,
-
-      isFriendlyWindow(win) {
-        let href;
-        try {
-          href = win.location.href;
-        } catch (e) {
-          return false;
-        }
-        return true;
-      },
-
-      elementWindow(el) {
-        return el.ownerDocument.defaultView;
-      },
-
-      viewport(win) {
-        return { width: win.innerWidth, height: win.innerHeight };
-      },
-
-      parseQS(qs) {
-        if (qs.indexOf('http') === 0) {
-          qs = qs.split('?')[1];
-        }
-        let i,
-          kvs,
-          key,
-          val;
-        const dict = {};
-        qs = qs.split('&');
-        for (i = 0; i < qs.length; i++) {
-          kvs = qs[i].split('=');
-          key = kvs[0];
-          val = kvs.slice(1).join('=');
-          try {
-            dict[key] = window.decodeURIComponent(val);
-          } catch (e) {
-            continue;
-          }
-        }
-        return dict;
-      },
-      sendToBackground(message, event, responseMessage, onResponse) {
-        if (typeof browser !== 'undefined') {
-          const response = browser.runtime.sendMessage(message);
-          response.then(onResponse);
-        } else if (typeof chrome !== 'undefined') {
-          chrome.runtime.sendMessage(message, onResponse);
-        } else if (window.self.port) {
-          window.self.port.on(responseMessage, onResponse);
-          window.self.port.emit(event, message);
-        }
-      },
-
-      askIfTrackingEnabled(callback, elseCallback) {
-        this.sendToBackground(
-          'is_tracking_enabled',
-          '',
-          'tracking_enabled_response',
-          (message) => {
-            if (message && message.tracking_enabled) {
-              callback();
-            } else {
-              elseCallback();
-            }
-          }
-        );
-      },
-    };
-
-    utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
-    utils.SCRIPT_IN_HOSTILE_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && !utils.SCRIPT_IN_FRIENDLY_IFRAME;
-
-    function LogGenerator() {
-      this.msgNum = 0;
-      this.pageMeta = {
-        url: utils.getPageUrl(),
-        isHP: window.location.pathname === '/',
-        referrer: utils.getReferrer(),
-        rand: Math.floor(Math.random() * 10e12),
-        startTime: new Date().getTime(),
-      };
-    }
-
-    LogGenerator.prototype = {
-      log(event, opt_assets, opt_pageTags) {
-        let opt_video_assets;
-        if (event === 'video' || event === 'invalid-video') {
-          opt_video_assets = opt_assets || [];
-          opt_assets = [];
-        } else {
-          opt_video_assets = [];
-          opt_assets = opt_assets || [];
-        }
-        const result = {
-          doc: this.pageMeta,
-          event,
-          video_assets: opt_video_assets,
-          assets: opt_assets,
-          version: '3',
-          mrev: 'fe20291-c',
-          msgNum: this.msgNum,
-          timestamp: new Date().getTime(),
-          pageVis: document.visibilityState,
-          pageFoc: document.hasFocus(),
-          pageTags: opt_pageTags || [],
-        };
-        this.msgNum++;
-        return result;
-      },
-    };
-
-    utils.LogGenerator = LogGenerator;
-
-    exports.utils = utils;
-  }(exports));
-
-  (function (exports) {
-    const SizeMatcher = {
-      VALID_AD_SIZES: [
-        [300, 50],
-        [320, 50],
-        [160, 600],
-        [300, 250],
-        [300, 600],
-        [300, 1050],
-        [336, 280],
-        [336, 850],
-        [468, 60],
-        [728, 90],
-        [728, 250],
-        [728, 270],
-        [970, 66],
-        [970, 90],
-        [970, 125],
-        [970, 250],
-        [970, 400],
-        [970, 415],
-        [1280, 100],
-      ],
-
-      PX_SIZE_TOL: 10,
-
-      getMatchedAdSize(width, height) {
-        if (!this.set) {
-          this.set = this._makeSizeSet();
-        }
-
-        return this.set[`${Math.round(width)}x${Math.round(height)}`];
-      },
-
-      elementIsAdShaped(el) {
-        return !!this.getMatchedAdSizeForElement(el);
-      },
-
-      getMatchedAdSizeForElement(el) {
-        const rect = el.getBoundingClientRect();
-        return this.getMatchedAdSize(rect.width, rect.height);
-      },
-
-      _makeSizeSet() {
-        const set = {};
-        let i;
-        let xfuz;
-        let yfuz;
-        let size;
-        let width;
-        let height;
-
-        for (i = 0; i < this.VALID_AD_SIZES.length; i++) {
-          for (xfuz = -this.PX_SIZE_TOL; xfuz <= this.PX_SIZE_TOL; xfuz++) {
-            for (yfuz = -this.PX_SIZE_TOL; yfuz <= this.PX_SIZE_TOL; yfuz++) {
-              size = this.VALID_AD_SIZES[i];
-              width = size[0] + xfuz;
-              height = size[1] + yfuz;
-              set[`${width}x${height}`] = size;
-            }
-          }
-        }
-        return set;
-      },
-    };
-
-    const Throttler = {
-      MAX_SEARCHES_PER_WINDOW: 10,
-      MAX_SEARCHES_PER_ELEMENT: 2,
-
-      countSearch(el) {
-        if (typeof el.searches !== 'number') {
-          el.searches = 0;
-        }
-
-        el.searches += 1;
-      },
-
-      throttle(el, max) {
-        if (typeof el.searches === 'number' && el.searches >= max) {
-          return true;
-        }
-        return false;
-      },
-
-      throttleElement(el) {
-        return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
-      },
-
-      throttleWin(win) {
-        return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
-      },
-
-      getCount(el) {
-        return el.searches || 0;
-      },
-    };
-
-    function TopSearcher(win) {
-      this.win = win;
-      this.doc = win.document;
-    }
-
-    TopSearcher.prototype.search = function () {
-      let candidates = exports.utils.realArray(this.doc.querySelectorAll('img, object, embed')),
-        html5Ad,
-        ads = [];
-
-      ads = ads.concat(candidates.filter((el) => {
-        if (!el.mpAdFound && !Throttler.throttleElement(el)) {
-          Throttler.countSearch(el);
-          if ((el.tagName !== 'IMG' || isStandardImage(el)) && SizeMatcher.elementIsAdShaped(el)) {
-            el.mpAdFound = true;
-            return true;
-          }
-        }
-        return false;
-      }));
-
-      html5Ad = this._mainGetHTMLAd();
-      if (html5Ad) {
-        html5Ad.html5 = true;
-        html5Ad.mpAdFound = true;
-        ads.push(html5Ad);
-      }
-
-      return ads;
-    };
-
-    TopSearcher.prototype._mainGetHTMLAd = function () {
-      let styles = this.doc.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
-        i,
-        div;
-      for (i = 0; i < styles.length; i++) {
-        div = styles[i].parentNode;
-        if (!div.mpAdFound && SizeMatcher.elementIsAdShaped(div) && this._jumpedOut(div)) {
-          return div;
-        }
-      }
-    };
-
-    TopSearcher.prototype._jumpedOut = function (el) {
-      let siblings,
-        ifrs;
-      siblings = exports.utils.realArray(el.parentNode.children);
-      ifrs = siblings.filter(el => el.tagName === 'IFRAME' && el.offsetWidth === 0 && el.offsetHeight === 0);
-      return ifrs.length > 0;
-    };
-
-    function IframeSearcher(win) {
-      this.MIN_AD_AREA = 14000;
-      this.MIN_WINDOW_PX = 10;
-
-      this.win = win;
-      this.doc = win.document;
-      this.body = win.document.body;
-      this.winClickTag = win.clickTag;
-      this.adSizeMeta = this._getAdSizeMeta();
-      this.numElementsInBody = (this.body && this.body.querySelectorAll('*').length) || 0;
-
-      this.shouldSearchWindow = false;
-      if (!this.win.mpAdFound && this.body && !Throttler.throttleWin(this.win)) {
-        this.winWidth = this.win.innerWidth;
-        this.winHeight = this.win.innerHeight;
-        if (this._meetsMinAdSize(this.winWidth, this.winHeight) && !this._containsLargeIframes()) {
-          this.shouldSearchWindow = true;
-        }
-      }
-    }
-
-    IframeSearcher.prototype.search = function () {
-      let ad;
-
-      if (this.shouldSearchWindow) {
-        ad = this._search();
-        if (ad) {
-          ad.mpAdFound = true;
-          win.mpAdFound = true;
-          return ad;
-        }
-        Throttler.countSearch(this.win);
-      }
-
-      return null;
-    };
-
-    IframeSearcher.prototype._search = function () {
-      let _this = this,
-        stdCandidates,
-        html5Candidates,
-        stdEl,
-        html5El;
-
-      stdCandidates = this.body.querySelectorAll('img, object, embed');
-
-      stdEl = getFirst(stdCandidates, (el) => {
-        if (!el.mpAdFound
-				&& !Throttler.throttleElement(el)
-				&& (el.tagName !== 'IMG' || isStandardImage(el))
-				&& _this._elementIsAtLeastAsBigAsWindow(el)) {
-          return true;
-        }
-        Throttler.countSearch(el);
-        return false;
-      });
-
-      if (stdEl) {
-        return stdEl;
-      }
-
-      if (this._isHTML5Iframe()) {
-        html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
-        html5El = getFirst(html5Candidates, (el) => {
-          if (_this._elementIsAtLeastAsBigAsWindow(el)) {
-            return true;
-          }
-          Throttler.countSearch(el);
-          return false;
-        });
-      }
-
-      if (html5El) {
-        html5El.html5 = true;
-        html5El.winClickTag = this.winClickTag;
-        html5El.adSizeMeta = this.adSizeMeta;
-        return html5El;
-      }
-
-      return null;
-    };
-
-    IframeSearcher.prototype._isHTML5Iframe = function () {
-      if (this.winClickTag || this.adSizeMeta) {
-        return true;
-      }
-
-      if (this.doc.querySelectorAll('canvas', 'button', 'video', 'svg').length > 0) {
-        return true;
-      }
-
-      if (this.numElementsInBody >= 5 && Throttler.getCount(this.win) > 0 && this.doc.querySelectorAll('div').length > 0) {
-        return true;
-      }
-
-      return false;
-    };
-
-    IframeSearcher.prototype._elementIsAtLeastAsBigAsWindow = function (el) {
-      let rect = el.getBoundingClientRect(),
-        tol = 0.95;
-
-      return rect.width >= (tol * this.winWidth) && rect.height >= (tol * this.winHeight);
-    };
-
-    IframeSearcher.prototype._meetsMinAdSize = function (width, height) {
-      return (width * height) >= this.MIN_AD_AREA;
-    };
-
-    IframeSearcher.prototype._containsLargeIframes = function () {
-      const iframes = this.doc.querySelectorAll('iframe');
-      let rect;
-      let i;
-      for (i = 0; i < iframes.length; i++) {
-        rect = iframes[i].getBoundingClientRect();
-        if (rect.width > this.MIN_WINDOW_PX || rect.height > this.MIN_WINDOW_PX) {
-          return true;
-        }
-      }
-      return false;
-    };
-
-    IframeSearcher.prototype._getAdSizeMeta = function () {
-      const adSizeMeta = this.doc.querySelectorAll('meta[name="ad.size"]');
-      if (adSizeMeta.length > 0) {
-        return adSizeMeta[0].content;
-      }
-      return null;
-    };
-
-    function getFirst(arr, testFn) {
-      let i,
-        el;
-      for (i = 0; i < arr.length; i++) {
-        el = arr[i];
-        if (testFn(el)) {
-          return el;
-        }
-      }
-      return null;
-    }
-
-    function isStandardImage(img) {
-      return img.src && (img.parentNode.tagName === 'A' || img.getAttribute('onclick'));
-    }
-
-    function getFriendlyIframes(win) {
-      let iframes = win.document.querySelectorAll('iframe');
-      iframes = exports.utils.realArray(iframes);
-      const friendlyIframes = iframes.filter(ifr => exports.utils.isFriendlyWindow(ifr.contentWindow));
-      return friendlyIframes;
-    }
-
-    function findAds(win) {
-      let i,
-        iframes,
-        searcher,
-        ad,
-        ads = [];
-
-      if (win === win.top) {
-        searcher = new TopSearcher(win);
-        ads = ads.concat(searcher.search());
-      } else {
-        searcher = new IframeSearcher(win);
-        ad = searcher.search();
-        if (ad) {
-          ads.push(ad);
-        }
-      }
-
-      iframes = getFriendlyIframes(win);
-      for (i = 0; i < iframes.length; i++) {
-        ads = ads.concat(findAds(iframes[i].contentWindow));
-      }
-
-      return ads;
-    }
-
-    exports.adfinder = {
-      getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
-      findAds,
-    };
-  }(exports));
-
-  (function (exports) {
-    const parser = {
-      TAGS_WITH_SRC_ATTR: {
-        IMG: true,
-        SCRIPT: true,
-        IFRAME: true,
-        EMBED: true,
-      },
-
-      MAX_ATTR_LEN: 100,
-
-      getUrl(el, params) {
-        let url;
-
-        if (this.TAGS_WITH_SRC_ATTR.hasOwnProperty(el.tagName)) {
-          url = el.src;
-        } else if (el.tagName === 'OBJECT') {
-          url = el.data || (params && params.movie) || null;
-        } else if (el.tagName === 'A') {
-          url = el.href;
-        }
-
-        if (url && url.indexOf('http') === 0) {
-          return url;
-        }
-        return null;
-      },
-
-      getParams(el) {
-        if (el.tagName !== 'OBJECT') {
-          return null;
-        }
-
-        let i,
-          child;
-        const params = {};
-        const children = el.children;
-        for (i = 0; i < children.length; i++) {
-          child = children[i];
-          if (child.tagName === 'PARAM' && child.name) {
-            params[child.name.toLowerCase()] = child.value;
-          }
-        }
-        return params;
-      },
-
-      getPosition(el) {
-        const rect = el.getBoundingClientRect();
-        const win = exports.utils.elementWindow(el);
-
-        return {
-          width: Math.round(rect.width),
-          height: Math.round(rect.height),
-          left: Math.round(rect.left + win.pageXOffset),
-          top: Math.round(rect.top + win.pageYOffset),
-        };
-      },
-
-      getFlashvars(el, params, url) {
-        let flashvars;
-        const urlQS = url && url.split('?')[1];
-
-        if (el.tagName === 'EMBED') {
-          flashvars = el.getAttribute('flashvars') || urlQS;
-        } else if (el.tagName === 'OBJECT') {
-          flashvars = params.flashvars || el.getAttribute('flashvars') || urlQS;
-        }
-
-        return (flashvars && exports.utils.parseQS(flashvars)) || null;
-      },
-
-      findClickThru(el, flashvars) {
-        let key;
-        if (el.tagName === 'IMG' && el.parentElement.tagName === 'A') {
-          return el.parentElement.href;
-        } if (flashvars) {
-          for (key in flashvars) {
-            if (flashvars.hasOwnProperty(key)) {
-              if (key.toLowerCase().indexOf('clicktag') === 0) {
-                return flashvars[key];
-              }
-            }
-          }
-        }
-        return null;
-      },
-
-      getAttr(el, name) {
-        const val = el.getAttribute(name);
-
-        if (val && val.slice && val.toString) {
-          return val.slice(0, this.MAX_ATTR_LEN).toString();
-        }
-        return null;
-      },
-
-      putPropIfExists(obj, name, val) {
-        if (val) {
-          obj[name] = val;
-        }
-      },
-
-      putAttrIfExists(obj, el, name) {
-        const val = this.getAttr(el, name);
-        this.putPropIfExists(obj, name, val);
-      },
-
-      elementToJSON(el, opt_findClickThru) {
-        const pos = this.getPosition(el);
-        const params = this.getParams(el);
-        const url = this.getUrl(el, params);
-        const flashvars = this.getFlashvars(el, params, url);
-        const clickThru = opt_findClickThru && this.findClickThru(el, flashvars);
-        const json = {
-          tagName: el.tagName,
-          width: pos.width,
-          height: pos.height,
-          left: pos.left,
-          top: pos.top,
-          children: [],
-        };
-
-        if (params) {
-          delete params.flashvars;
-        }
-
-        this.putAttrIfExists(json, el, 'id');
-        this.putAttrIfExists(json, el, 'class');
-        this.putAttrIfExists(json, el, 'name');
-
-        this.putPropIfExists(json, 'flashvars', flashvars);
-        this.putPropIfExists(json, 'url', url);
-        this.putPropIfExists(json, 'params', params);
-        this.putPropIfExists(json, 'clickThru', clickThru);
-
-        return json;
-      },
-    };
-
-    exports.parser = { elementToJSON: parser.elementToJSON.bind(parser) };
-  }(exports));
-
-  (function (exports) {
-    const ContextManager = function (adData) {
-      this.adData = adData;
-    };
-
-    ContextManager.prototype = {
-      CONTAINER_SIZE_TOL: 0.4,
-      ASPECT_RATIO_FOR_LEADERBOARDS: 2,
-
-      isValidContainer(el, opt_curWin) {
-        const cWidth = el.clientWidth;
-        const cHeight = el.clientHeight;
-
-        const adWidth = this.adData.width;
-        const adHeight = this.adData.height;
-
-        const winWidth = opt_curWin && opt_curWin.innerWidth;
-        const winHeight = opt_curWin && opt_curWin.innerHeight;
-        const similarWin = opt_curWin && this.withinTol(adWidth, winWidth) && this.withinTol(adHeight, winHeight);
-
-        const similarSizeX = this.withinTol(adWidth, cWidth);
-        const similarSizeY = this.withinTol(adHeight, cHeight);
-        const adAspect = adWidth / adHeight;
-
-        return similarWin || el.tagName === 'A' || (adAspect >= this.ASPECT_RATIO_FOR_LEADERBOARDS && similarSizeY) || (similarSizeX && similarSizeY);
-      },
-
-      withinTol(adlen, conlen) {
-        const pct = (conlen - adlen) / adlen;
-
-        return pct <= this.CONTAINER_SIZE_TOL;
-      },
-
-      serializeElements(el) {
-        if (!el) {
-          return;
-        }
-        let i;
-        let ifrWin;
-        const adId = this.adData.adId;
-        let elIsAd = false;
-
-        if (adId && el[adId] && el[adId].isAd === true) {
-          elIsAd = true;
-        }
-
-        const json = exports.parser.elementToJSON(el, elIsAd);
-        let childJSON;
-
-        if (elIsAd) {
-          json.adId = adId;
-          this.adData.element = {};
-
-          const keys = Object.keys(json);
-          for (i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            if (key !== 'children' && key !== 'contents') {
-              this.adData.element[key] = json[key];
-            }
-          }
-        }
-
-        const children = exports.utils.realArray(el.children).filter((el) => {
-          const param = el.tagName === 'PARAM';
-          const inlineScript = el.tagName === 'SCRIPT' && !(el.src && el.src.indexOf('http') >= 0);
-          const noScript = el.tagName === 'NOSCRIPT';
-          return !(param || inlineScript || noScript);
-        });
-
-        for (i = 0; i < children.length; i++) {
-          childJSON = this.serializeElements(children[i]);
-          if (childJSON) {
-            json.children.push(childJSON);
-          }
-        }
-
-        if (el.tagName === 'IFRAME') {
-          ifrWin = el.contentWindow;
-
-          if (adId && el[adId] && el[adId].needsWindow) {
-            json.contents = this.adData.serializedIframeContents;
-            el[adId].needsWindow = false;
-            delete this.adData.serializedIframeContents;
-          } else if (exports.utils.isFriendlyWindow(ifrWin)) {
-            childJSON = this.serializeElements(ifrWin.document.documentElement);
-            if (childJSON) {
-              json.contents = childJSON;
-            }
-          }
-        }
-
-        if (json.children.length > 0 || json.adId || json.tagName === 'IFRAME' || json.url) {
-          return json;
-        }
-        return null;
-      },
-
-      captureHTML(containerEl) {
-        this.adData.context = this.serializeElements(containerEl);
-      },
-
-      nodeCount(el) {
-        return el.getElementsByTagName('*').length + 1;
-      },
-
-      highestContainer(curWin, referenceElement) {
-        let curContainer = referenceElement;
-        const docEl = curWin.document.documentElement;
-        let parentContainer;
-
-        if (curWin !== curWin.top && this.isValidContainer(docEl, curWin)) {
-          return docEl;
-        }
-
-        while (true) {
-          parentContainer = curContainer.parentElement;
-          if (parentContainer && this.isValidContainer(parentContainer)) {
-            curContainer = parentContainer;
-          } else {
-            return curContainer;
-          }
-        }
-      },
-    };
-
-    const tagfinder = {
-
-      setPositions(adData, opt_el, opt_winPos) {
-        const el = opt_el || adData.context;
-        const winPos = opt_winPos || { left: 0, top: 0 };
-        let ifrPos;
-
-        el.left += winPos.left;
-        el.top += winPos.top;
-
-        if (el.children) {
-          el.children.forEach(function (child) {
-            this.setPositions(adData, child, winPos);
-          }, this);
-        }
-
-        if (el.contents) {
-          ifrPos = { left: el.left, top: el.top };
-          this.setPositions(adData, el.contents, ifrPos);
-        }
-
-        if (el.adId === adData.adId) {
-          adData.element.left = el.left;
-          adData.element.top = el.top;
-        }
-      },
-
-      appendTags(adData, referenceElement) {
-        const mgr = new ContextManager(adData);
-        let curWin = exports.utils.elementWindow(referenceElement);
-        let highestContainer;
-
-        while (true) {
-          highestContainer = mgr.highestContainer(curWin, referenceElement);
-          mgr.captureHTML(highestContainer);
-          if (curWin === curWin.top) {
-            break;
-          } else {
-            curWin.mpAdFound = true;
-
-            mgr.adData.serializedIframeContents = mgr.adData.context;
-
-            if (exports.utils.isFriendlyWindow(curWin.parent)) {
-              referenceElement = curWin.frameElement;
-              referenceElement[mgr.adData.adId] = { needsWindow: true };
-              curWin = curWin.parent;
-            } else {
-              break;
-            }
-          }
-        }
-        return {
-          referenceElement,
-          highestContainer,
-        };
-      },
-    };
-
-    exports.tagfinder = tagfinder;
-  }(exports));
-
-  (function (exports) {
-    let _onAdFound;
-    const _logGen = new exports.utils.LogGenerator();
-    let _pageTags;
-    const INIT_MS_BW_SEARCHES = 2000;
-    const PAGE_TAG_RE = new RegExp('gpt|oascentral');
-    const POST_MSG_ID = '1532387537-31575-24732-11173-32339';
-    const AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
-
-    function getPageTags(doc) {
-      let scripts = doc.getElementsByTagName('script');
-      const pageTags = [];
-      scripts = exports.utils.realArray(scripts);
-      scripts.forEach((script) => {
-        if (PAGE_TAG_RE.exec(script.src)) {
-          pageTags.push({ tagName: 'SCRIPT', url: script.src });
-        }
-      });
-      return pageTags;
-    }
-
-    function messageAllParentFrames(adData) {
-      adData.postMessageId = POST_MSG_ID;
-
-      adData = JSON.stringify(adData);
-
-      let win = window;
-      while (win !== win.top) {
-        win = win.parent;
-        win.postMessage(adData, '*');
-      }
-    }
-
-    function appendTagsAndSendToParent(adData, referenceElement) {
-      const results = exports.tagfinder.appendTags(adData, referenceElement);
-      if (exports.utils.SCRIPT_IN_HOSTILE_IFRAME) {
-        messageAllParentFrames(adData);
-      } else if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
-        exports.tagfinder.setPositions(adData);
-
-        adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
-        if (!adData.matchedSize) {
-          if (AD_SERVER_RE.exec(results.referenceElement.id)) {
-            adData.matchedSize = [adData.width, adData.height];
-            adData.oddSize = true;
-          } else {
-            return;
-          }
-        }
-        delete adData.width;
-        delete adData.height;
-        adData.curPageUrl = exports.utils.getPageUrl();
-        _pageTags = _pageTags || getPageTags(document);
-        const log = _logGen.log('ad', [adData], _pageTags);
-
-        if (_onAdFound) {
-          _onAdFound(log, results.referenceElement);
-        }
-      }
-    }
-
-    function extractAdsWrapper() {
-      if (exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete') {
-        extractAds();
-      }
-      setTimeout(
-        () => { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES,
-      );
-    }
-
-    function extractAds() {
-      const ads = exports.adfinder.findAds(window);
-      ads.forEach((ad) => {
-        const startTime = new Date().getTime();
-        const adId = `${startTime}-${Math.floor(Math.random() * 10e12)}`;
-
-        const adData = {
-          width: Math.round(ad.offsetWidth),
-          height: Math.round(ad.offsetHeight),
-          startTime,
-          adId,
-          html5: ad.html5 || false,
-        };
-
-        if (ad.html5) {
-          adData.adSizeMeta = ad.adSizeMeta || null;
-          adData.winClickTag = ad.winClickTag || null;
-        }
-
-        ad[adId] = { isAd: true };
-
-        appendTagsAndSendToParent(adData, ad);
-      });
-    }
-
-    function isChildWin(myWin, otherWin) {
-      let parentWin = otherWin.parent;
-      while (parentWin !== otherWin) {
-        if (parentWin === myWin) {
-          return true;
-        }
-        otherWin = parentWin;
-        parentWin = parentWin.parent;
-      }
-      return false;
-    }
-
-    function iframeFromWindow(win, winToMatch) {
-      let i,
-        ifr,
-        ifrWin,
-        iframes = win.document.querySelectorAll('iframe');
-
-      for (i = 0; i < iframes.length; i++) {
-        ifr = iframes[i];
-        if (ifr.contentWindow === winToMatch) {
-          return ifr;
-        }
-      }
-
-      for (i = 0; i < iframes.length; i++) {
-        ifrWin = iframes[i].contentWindow;
-        if (exports.utils.isFriendlyWindow(ifrWin)) {
-          ifr = iframeFromWindow(ifrWin, winToMatch);
-          if (ifr) {
-            return ifr;
-          }
-        }
-      }
-    }
-
-    function onPostMessage(event) {
-      let adData,
-        ifrWin = event.source,
-
-        myWin = window.document.defaultView,
-        ifrTag;
-
-      try {
-        adData = JSON.parse(event.data);
-      } catch (e) {
-        return;
-      }
-
-      if (!adData) return;
-      
-      if (adData.postMessageId === POST_MSG_ID) {
-        delete adData.postMessageId;
-
-        event.stopImmediatePropagation();
-
-        if (isChildWin(myWin, ifrWin)) {
-          if (exports.utils.isFriendlyWindow(ifrWin)) {
-            ifrTag = ifrWin.frameElement;
-          } else {
-            ifrTag = iframeFromWindow(myWin, ifrWin);
-          }
-
-          if (ifrTag) {
-            ifrTag[adData.adId] = { needsWindow: true };
-            appendTagsAndSendToParent(adData, ifrTag);
-          }
-        }
-      }
-    }
-
-    function onVideoMessage(msg, sender, callback) {
-      let log;
-      if (msg.event === 'new-video-ad') {
-        msg.assets.forEach((asset) => {
-
-        });
-        log = _logGen.log('video', msg.assets);
-      } else {
-        log = _logGen.log('invalid-video', msg.assets);
-      }
-
-      msg.assets.forEach((a) => { delete a.isVideo; });
-      log.displayAdFound = msg.displayAdFound;
-      log.requests = msg.requests;
-      log.data = msg.event_data;
-
-      log.doc.finalPageUrl = log.doc.url;
-      log.doc.url = exports.utils.normalizeUrl(msg.origUrl);
-
-      _onAdFound(log);
-    }
-
-    function addBackgroundListener(event, callback) {
-      if (typeof browser !== 'undefined') {
-        browser.runtime.onMessage.addListener((msg) => {
-          if (msg.event === event) {
-            callback(msg);
-          }
-        });
-      } else if (typeof chrome !== 'undefined') {
-        chrome.runtime.onMessage.addListener((msg) => {
-          if (msg.event === event) {
-            callback(msg);
-          }
-        });
-      } else if (window.self.port) {
-        window.self.port.on(event, callback);
-      }
-    }
-
-    exports.coordinator = {
-      addPostMessageListener() {
-        if (!exports.utils.SCRIPT_IN_FRIENDLY_IFRAME) {
-          window.addEventListener('message', onPostMessage, false);
-        }
-      },
-
-      blockedRobotsMsgGen(sendFcn, origUrl) {
-        if (origUrl.indexOf('google.com/_/chrome/newtab') === -1) {
-          const onBlockedRobotsMessage = function () {
-            let log;
-            log = _logGen.log('invalid-robotstxt', []);
-            log.doc.finalPageUrl = log.doc.url;
-            log.doc.url = exports.utils.normalizeUrl(origUrl);
-
-            sendFcn(log);
-          };
-          return onBlockedRobotsMessage;
-        }
-        return function () {};
-      },
-
-      init(onAdFound) {
-        if (exports.utils.SCRIPT_IN_FRIENDLY_IFRAME) {
-          return false;
-        }
-
-        _onAdFound = onAdFound;
-        if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
-          const log = _logGen.log('page');
-          onAdFound(log);
-
-          window.addEventListener('beforeunload', (event) => {
-            const log = _logGen.log('unload');
-            log.timing = window.performance.timing;
-            onAdFound(log);
-          });
-
-          addBackgroundListener('new-video-ad', onVideoMessage);
-          addBackgroundListener('new-invalid-video-ad', onVideoMessage);
-        }
-
-        exports.utils.onDocLoaded(document, extractAdsWrapper);
-      },
-    };
-  }(exports));
-
-  if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
-    window.adparser = {
-      init: exports.coordinator.init,
-      addPostMessageListener: exports.coordinator.addPostMessageListener,
-      askIfTrackingEnabled: exports.utils.askIfTrackingEnabled,
-      blockedRobotsMsgGen: exports.coordinator.blockedRobotsMsgGen,
-      inWindowTop: exports.utils.SCRIPT_IN_WINDOW_TOP,
-      sendToBackground: exports.utils.sendToBackground,
-    };
-  } else {
-    exports.coordinator.addPostMessageListener();
-    exports.utils.askIfTrackingEnabled(
-      () => {
-        exports.coordinator.init(() => {});
-      },
-      () => {},
-    );
-  }
-}(window));
-(function (adparser, pageUrl) {
-  function onAdFound(log) {
-    adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', () => {});
-  }
-
-  if (adparser && adparser.inWindowTop) {
-    adparser.addPostMessageListener();
-    adparser.askIfTrackingEnabled(
-      () => {
-        adparser.init(onAdFound);
-      },
-      adparser.blockedRobotsMsgGen(onAdFound, pageUrl),
-    );
-  }
-}(window.adparser, window.location.href));
+var exports = {};
+
+(function(exports) {
+
+	var port = browser.runtime.connect({name:"adparser"});
+	var utils = {
+		normalizeUrl: function(url) {
+
+			return this.hashUrl(url) || null;
+
+		},
+
+		getReferrer: function() {
+			return this.normalizeUrl(document.referrer);
+		},
+
+		getPageUrl: function() {
+			return this.normalizeUrl(window.location.href);
+		},
+		hashUrl: function(url) {
+			var a,
+				result;
+
+			if ( !url || url.indexOf('http') !== 0 ) {
+				return null;
+			}
+
+			a = document.createElement('a');
+			a.href = url;
+
+			result = a.protocol + '//' + a.hostname + '/';
+
+			if ( a.pathname && a.pathname !== '/' ) {
+				result += this.hashCode(a.pathname);
+			}
+
+			if ( a.search ) {
+				result += '?' + this.hashCode(a.search);
+			}
+
+			if ( a.hash ) {
+				result += '#' + this.hashCode(a.hash);
+			}
+
+			return result;
+		},
+
+		hashCode: function(str) {
+			var hash = 0,
+				kar,
+				i;
+
+			if ( str.length === 0 ) {
+				return hash;
+			}
+
+			for ( i = 0; i < str.length; i++ ) {
+				kar = str.charCodeAt(i);
+				hash = ((hash << 5) - hash) + kar;
+				hash = hash & hash;
+			}
+
+			return hash + Math.pow(2, 32);
+		},
+
+		realArray: function(a) {
+			return Array.prototype.slice.apply(a);
+		},
+
+		onDocLoaded: function(doc, callback) {
+			if ( doc.readyState === 'loading' ) {
+				doc.addEventListener('DOMContentLoaded', callback);
+			} else {
+				callback();
+			}
+		},
+
+		SCRIPT_IN_WINDOW_TOP: window === window.top,
+
+		isFriendlyWindow: function(win) {
+
+			var href;
+			try {
+				href = win.location.href;
+			} catch(e) {
+				return false;
+			}
+			return true;
+		},
+
+		elementWindow: function(el) {
+			return el.ownerDocument.defaultView;
+		},
+
+		viewport: function(win) {
+			return {width: win.innerWidth, height: win.innerHeight};
+		},
+
+		parseQS: function(qs) {
+			if ( qs.indexOf('http') === 0 ) {
+				qs = qs.split('?')[1];
+			}
+			var i, kvs, key, val;
+			var dict = {};
+			qs = qs.split('&');
+			for ( i = 0; i < qs.length; i++ ) {
+				kvs = qs[i].split('=');
+				key = kvs[0];
+				val = kvs.slice(1).join('=');
+				try {
+					dict[key] = window.decodeURIComponent(val);
+				} catch (e) {
+
+					continue;
+				}
+			}
+			return dict;
+		},
+		sendToBackground: function(message, event, responseMessage) {
+			if ( typeof browser !== 'undefined' || typeof chrome !== 'undefined' ) {
+				port.postMessage(message);
+			} else if ( window.self.port ) {
+				window.self.port.on(responseMessage, onResponse);
+				window.self.port.emit(event, message);
+			}
+		},
+
+		askIfTrackingEnabled: function(callback, elseCallback) {
+			utilCallback = callback;
+			utilElseCallback = elseCallback;
+
+			this.sendToBackground(
+				'is_tracking_enabled',
+				'',
+				'tracking_enabled_response'
+			);
+
+		}
+	};
+
+	port.onMessage.addListener((message) => {
+		if ( message && message.tracking_enabled ) {
+
+			utilCallback();
+		} else {
+
+			utilElseCallback();
+		}
+	});
+
+	utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
+	utils.SCRIPT_IN_HOSTILE_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && !utils.SCRIPT_IN_FRIENDLY_IFRAME;
+
+	function LogGenerator() {
+		this.msgNum = 0;
+		this.pageMeta = {
+			'url': utils.getPageUrl(),
+			'isHP': window.location.pathname === '/',
+			'referrer': utils.getReferrer(),
+			'rand': Math.floor(Math.random() * 10e12),
+			'startTime': new Date().getTime()
+		};
+	}
+
+	LogGenerator.prototype = {
+		log: function(event, opt_assets, opt_pageTags) {
+			var opt_video_assets;
+			if ( event === 'video' || event === 'invalid-video' ) {
+				opt_video_assets = opt_assets || [];
+				opt_assets = [];
+			} else {
+				opt_video_assets = [];
+				opt_assets = opt_assets || [];
+			}
+			var result = {
+				doc: this.pageMeta,
+				event: event,
+				video_assets: opt_video_assets,
+				assets: opt_assets,
+				version: '3',
+				mrev: '15a9f21-d',
+				msgNum: this.msgNum,
+				timestamp: new Date().getTime(),
+				pageVis: document.visibilityState,
+				pageFoc: document.hasFocus(),
+				pageTags: opt_pageTags || []
+			};
+			this.msgNum++;
+			return result;
+		}
+	};
+
+	utils.LogGenerator = LogGenerator;
+
+	let utilCallback, utilElseCallback;
+
+	exports.utils = utils;
+})(exports);
+
+(function(exports) {
+
+	var SizeMatcher = {
+		VALID_AD_SIZES: [
+			[300, 50],
+			[320, 50],
+			[160, 600],
+			[300, 250],
+			[300, 600],
+			[300, 1050],
+			[336, 280],
+			[336, 850],
+			[468, 60],
+			[728, 90],
+			[728, 250],
+			[728, 270],
+			[970, 66],
+			[970, 90],
+			[970, 125],
+			[970, 250],
+			[970, 400],
+			[970, 415],
+			[1280, 100]
+		],
+
+		PX_SIZE_TOL: 10,
+
+		getMatchedAdSize: function(width, height) {
+
+			if ( !this.set ) {
+				this.set = this._makeSizeSet();
+			}
+
+			return this.set[Math.round(width) + 'x' + Math.round(height)];
+		},
+
+		elementIsAdShaped: function(el) {
+			return !!this.getMatchedAdSizeForElement(el);
+		},
+
+		getMatchedAdSizeForElement: function(el) {
+			var rect = el.getBoundingClientRect();
+			return this.getMatchedAdSize(rect.width, rect.height);
+		},
+
+		_makeSizeSet: function() {
+			var set = {};
+			var i;
+			var xfuz;
+			var yfuz;
+			var size;
+			var width;
+			var height;
+
+			for ( i = 0; i < this.VALID_AD_SIZES.length; i++ ) {
+				for ( xfuz = -this.PX_SIZE_TOL; xfuz <= this.PX_SIZE_TOL; xfuz++ ) {
+					for ( yfuz = -this.PX_SIZE_TOL; yfuz <= this.PX_SIZE_TOL; yfuz++ ) {
+						size = this.VALID_AD_SIZES[i];
+						width = size[0] + xfuz;
+						height = size[1] + yfuz;
+						set[width + 'x' + height] = size;
+					}
+				}
+			}
+			return set;
+		}
+	};
+
+	var Throttler = {
+		MAX_SEARCHES_PER_WINDOW: 10,
+		MAX_SEARCHES_PER_ELEMENT: 2,
+
+		countSearch: function(el) {
+			if ( typeof el.searches !== 'number' ) {
+				el.searches = 0;
+			}
+
+			el.searches += 1;
+		},
+
+		throttle: function(el, max) {
+			if ( typeof el.searches === 'number' && el.searches >= max ) {
+				return true;
+			}
+			return false;
+		},
+
+		throttleElement: function(el) {
+			return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
+		},
+
+		throttleWin: function(win) {
+			return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
+		},
+
+		getCount: function(el) {
+			return el.searches || 0;
+		}
+	};
+
+	function TopSearcher(win) {
+		this.win = win;
+		this.doc = win.document;
+	}
+
+	TopSearcher.prototype.search = function() {
+		var candidates = exports.utils.realArray(this.doc.querySelectorAll('img, object, embed')),
+			html5Ad,
+			ads = [];
+
+		ads = ads.concat(candidates.filter(function(el) {
+			if ( !el.mpAdFound && !Throttler.throttleElement(el) ) {
+				Throttler.countSearch(el);
+				if ( (el.tagName !== 'IMG' || isStandardImage(el)) && SizeMatcher.elementIsAdShaped(el) ) {
+					el.mpAdFound = true;
+					return true;
+				}
+			}
+			return false;
+		}));
+
+		html5Ad = this._mainGetHTMLAd();
+		if ( html5Ad ) {
+			html5Ad.html5 = true;
+			html5Ad.mpAdFound = true;
+			ads.push(html5Ad);
+		}
+
+		return ads;
+	};
+
+	TopSearcher.prototype._mainGetHTMLAd = function() {
+		var styles = this.doc.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
+			i, div;
+		for ( i = 0; i < styles.length; i++ ) {
+			div = styles[i].parentNode;
+			if ( !div.mpAdFound && SizeMatcher.elementIsAdShaped(div) && this._jumpedOut(div) ) {
+				return div;
+			}
+		}
+	};
+
+	TopSearcher.prototype._jumpedOut = function(el) {
+		var siblings, ifrs;
+		siblings = exports.utils.realArray(el.parentNode.children);
+		ifrs = siblings.filter(function(el) {
+			return el.tagName === 'IFRAME' && el.offsetWidth === 0 && el.offsetHeight === 0;
+		});
+		return ifrs.length > 0;
+	};
+
+	function IframeSearcher(win) {
+		this.MIN_AD_AREA = 14000;
+		this.MIN_WINDOW_PX = 10;
+
+		this.win = win;
+		this.doc = win.document;
+		this.body = win.document.body;
+		this.winClickTag = win.clickTag;
+		this.adSizeMeta = this._getAdSizeMeta();
+		this.numElementsInBody = (this.body && this.body.querySelectorAll('*').length) || 0;
+
+		this.shouldSearchWindow = false;
+		if ( !this.win.mpAdFound && this.body && !Throttler.throttleWin(this.win) ) {
+			this.winWidth = this.win.innerWidth;
+			this.winHeight = this.win.innerHeight;
+			if ( this._meetsMinAdSize(this.winWidth, this.winHeight) && !this._containsLargeIframes() ) {
+				this.shouldSearchWindow = true;
+			}
+		}
+
+	}
+
+	IframeSearcher.prototype.search = function() {
+		var ad;
+
+		if ( this.shouldSearchWindow ) {
+			ad = this._search();
+			if ( ad ) {
+				ad.mpAdFound = true;
+				win.mpAdFound = true;
+				return ad;
+			}
+			Throttler.countSearch(this.win);
+		}
+
+		return null;
+	};
+
+	IframeSearcher.prototype._search = function() {
+		var _this = this,
+			stdCandidates,
+			html5Candidates,
+			stdEl,
+			html5El;
+
+		stdCandidates = this.body.querySelectorAll('img, object, embed');
+
+		stdEl = getFirst(stdCandidates, function(el) {
+			if ( !el.mpAdFound &&
+				!Throttler.throttleElement(el) &&
+				(el.tagName !== 'IMG' || isStandardImage(el)) &&
+				_this._elementIsAtLeastAsBigAsWindow(el))
+			{
+				return true;
+			}
+			Throttler.countSearch(el);
+			return false;
+		});
+
+		if ( stdEl ) {
+			return stdEl;
+		}
+
+		if ( this._isHTML5Iframe() ) {
+			html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
+			html5El = getFirst(html5Candidates, function(el) {
+
+				if ( _this._elementIsAtLeastAsBigAsWindow(el) ) {
+					return true;
+				}
+				Throttler.countSearch(el);
+				return false;
+			});
+		}
+
+		if ( html5El ) {
+			html5El.html5 = true;
+			html5El.winClickTag = this.winClickTag;
+			html5El.adSizeMeta = this.adSizeMeta;
+			return html5El;
+		}
+
+		return null;
+	};
+
+	IframeSearcher.prototype._isHTML5Iframe = function() {
+		if ( this.winClickTag || this.adSizeMeta ) {
+			return true;
+		}
+
+		if ( this.doc.querySelectorAll('canvas', 'button', 'video', 'svg').length > 0 ) {
+			return true;
+		}
+
+		if ( this.numElementsInBody >= 5 && Throttler.getCount(this.win) > 0 && this.doc.querySelectorAll('div').length > 0 ) {
+			return true;
+		}
+
+		return false;
+	};
+
+	IframeSearcher.prototype._elementIsAtLeastAsBigAsWindow = function(el) {
+		var rect = el.getBoundingClientRect(),
+			tol = 0.95;
+
+		return rect.width >= (tol * this.winWidth) && rect.height >= (tol * this.winHeight);
+	};
+
+	IframeSearcher.prototype._meetsMinAdSize = function(width, height) {
+		return (width * height) >= this.MIN_AD_AREA;
+	};
+
+	IframeSearcher.prototype._containsLargeIframes = function() {
+		var iframes = this.doc.querySelectorAll('iframe');
+		var rect;
+		var i;
+		for ( i = 0; i < iframes.length; i++ ) {
+			rect = iframes[i].getBoundingClientRect();
+			if ( rect.width > this.MIN_WINDOW_PX || rect.height > this.MIN_WINDOW_PX ) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	IframeSearcher.prototype._getAdSizeMeta = function() {
+		var adSizeMeta = this.doc.querySelectorAll('meta[name="ad.size"]');
+		if ( adSizeMeta.length > 0 ) {
+			return adSizeMeta[0].content;
+		} else {
+			return null;
+		}
+	};
+
+	function getFirst(arr, testFn) {
+		var i, el;
+		for ( i = 0; i < arr.length; i++ ) {
+			el = arr[i];
+			if ( testFn(el) ) {
+				return el;
+			}
+		}
+		return null;
+	}
+
+	function isStandardImage(img) {
+
+		return img.src && (img.parentNode.tagName === 'A' || img.getAttribute('onclick'));
+	}
+
+	function getFriendlyIframes(win) {
+		var iframes = win.document.querySelectorAll('iframe');
+		iframes = exports.utils.realArray(iframes);
+		var friendlyIframes = iframes.filter(function(ifr) {
+			return exports.utils.isFriendlyWindow(ifr.contentWindow);
+		});
+		return friendlyIframes;
+	}
+
+	function findAds(win) {
+		var i,
+			iframes,
+			searcher,
+			ad,
+			ads = [];
+
+		if ( win === win.top ) {
+			searcher = new TopSearcher(win);
+			ads = ads.concat(searcher.search());
+		} else {
+			searcher = new IframeSearcher(win);
+			ad = searcher.search();
+			if ( ad ) {
+				ads.push(ad);
+			}
+		}
+
+		iframes = getFriendlyIframes(win);
+		for ( i = 0; i < iframes.length; i++ ) {
+			ads = ads.concat(findAds(iframes[i].contentWindow));
+		}
+
+		return ads;
+	}
+
+	exports.adfinder = {
+		getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
+		findAds: findAds
+	};
+})(exports);
+
+(function(exports) {
+
+	var parser = {
+		TAGS_WITH_SRC_ATTR: {
+			'IMG': true,
+			'SCRIPT': true,
+			'IFRAME': true,
+			'EMBED': true
+		},
+
+		MAX_ATTR_LEN: 100,
+
+		getUrl: function(el, params) {
+			var url;
+
+			if ( this.TAGS_WITH_SRC_ATTR.hasOwnProperty(el.tagName) ) {
+				url = el.src;
+
+			} else if ( el.tagName === 'OBJECT' ) {
+				url = el.data || (params && params.movie) || null;
+
+			} else if ( el.tagName === 'A' ) {
+				url = el.href;
+			}
+
+			if ( url && url.indexOf('http') === 0 ) {
+				return url;
+			} else {
+				return null;
+			}
+		},
+
+		getParams: function(el) {
+			if ( el.tagName !== 'OBJECT' ) {
+				return null;
+			}
+
+			var i, child;
+			var params = {};
+			var children = el.children;
+			for ( i = 0; i < children.length; i++ ) {
+				child = children[i];
+				if ( child.tagName === 'PARAM' && child.name ) {
+
+					params[child.name.toLowerCase()] = child.value;
+				}
+			}
+			return params;
+		},
+
+		getPosition: function(el) {
+			var rect = el.getBoundingClientRect();
+			var win = exports.utils.elementWindow(el);
+
+			return {
+				width: Math.round(rect.width),
+				height: Math.round(rect.height),
+				left: Math.round(rect.left + win.pageXOffset),
+				top: Math.round(rect.top + win.pageYOffset)
+			};
+		},
+
+		getFlashvars: function(el, params, url) {
+			var flashvars;
+			var urlQS = url && url.split('?')[1];
+
+			if ( el.tagName === 'EMBED' ) {
+				flashvars = el.getAttribute('flashvars') || urlQS;
+
+			} else if ( el.tagName === 'OBJECT' ) {
+				flashvars = params.flashvars || el.getAttribute('flashvars') || urlQS;
+			}
+
+			return (flashvars && exports.utils.parseQS(flashvars)) || null;
+		},
+
+		findClickThru: function(el, flashvars) {
+			var key;
+			if ( el.tagName === 'IMG' && el.parentElement.tagName === 'A' ) {
+				return el.parentElement.href;
+			} else if ( flashvars ) {
+				for ( key in flashvars ) {
+					if ( flashvars.hasOwnProperty(key) ) {
+
+						if ( key.toLowerCase().indexOf('clicktag') === 0 ) {
+							return flashvars[key];
+						}
+					}
+				}
+			}
+			return null;
+		},
+
+		getAttr: function(el, name) {
+			var val = el.getAttribute(name);
+
+			if ( val && val.slice && val.toString ) {
+
+				return val.slice(0, this.MAX_ATTR_LEN).toString();
+			} else {
+				return null;
+			}
+		},
+
+		putPropIfExists: function(obj, name, val) {
+			if ( val ) {
+				obj[name] = val;
+			}
+		},
+
+		putAttrIfExists: function(obj, el, name) {
+			var val = this.getAttr(el, name);
+			this.putPropIfExists(obj, name, val);
+		},
+
+		elementToJSON: function(el, opt_findClickThru) {
+			var pos = this.getPosition(el);
+			var params = this.getParams(el);
+			var url = this.getUrl(el, params);
+			var flashvars = this.getFlashvars(el, params, url);
+			var clickThru = opt_findClickThru && this.findClickThru(el, flashvars);
+			var json = {
+				tagName: el.tagName,
+				width: pos.width,
+				height: pos.height,
+				left: pos.left,
+				top: pos.top,
+				children: []
+			};
+
+			if ( params ) {
+
+				delete params.flashvars;
+			}
+
+			this.putAttrIfExists(json, el, 'id');
+			this.putAttrIfExists(json, el, 'class');
+			this.putAttrIfExists(json, el, 'name');
+
+			this.putPropIfExists(json, 'flashvars', flashvars);
+			this.putPropIfExists(json, 'url', url);
+			this.putPropIfExists(json, 'params', params);
+			this.putPropIfExists(json, 'clickThru', clickThru);
+
+			return json;
+		}
+	};
+
+	exports.parser = { elementToJSON: parser.elementToJSON.bind(parser) };
+})(exports);
+
+(function(exports) {
+
+	var ContextManager = function(adData) {
+		this.adData = adData;
+	};
+
+	ContextManager.prototype = {
+		CONTAINER_SIZE_TOL: 0.4,
+		ASPECT_RATIO_FOR_LEADERBOARDS: 2,
+
+		isValidContainer: function(el, opt_curWin) {
+
+			var cWidth = el.clientWidth;
+			var cHeight = el.clientHeight;
+
+			var adWidth = this.adData.width;
+			var adHeight = this.adData.height;
+
+			var winWidth = opt_curWin && opt_curWin.innerWidth;
+			var winHeight = opt_curWin && opt_curWin.innerHeight;
+			var similarWin = opt_curWin && this.withinTol(adWidth, winWidth) && this.withinTol(adHeight, winHeight);
+
+			var similarSizeX = this.withinTol(adWidth, cWidth);
+			var similarSizeY = this.withinTol(adHeight, cHeight);
+			var adAspect = adWidth / adHeight;
+
+			return similarWin || el.tagName === 'A' || (adAspect >= this.ASPECT_RATIO_FOR_LEADERBOARDS && similarSizeY) || (similarSizeX && similarSizeY);
+		},
+
+		withinTol: function(adlen, conlen) {
+			var pct = (conlen - adlen) / adlen;
+
+			return pct <= this.CONTAINER_SIZE_TOL;
+		},
+
+		serializeElements: function(el) {
+			if ( !el ) {
+				return;
+			}
+			var i;
+			var ifrWin;
+			var adId = this.adData.adId;
+			var elIsAd = false;
+
+			if ( adId && el[adId] && el[adId].isAd === true ) {
+				elIsAd = true;
+			}
+
+			var json = exports.parser.elementToJSON(el, elIsAd);
+			var childJSON;
+
+			if ( elIsAd ) {
+				json.adId = adId;
+				this.adData.element = {};
+
+				var keys = Object.keys(json);
+				for ( i = 0; i < keys.length; i++ ) {
+					var key = keys[i];
+					if ( key !== 'children' && key !== 'contents' ) {
+						this.adData.element[key] = json[key];
+					}
+				}
+			}
+
+			var children = exports.utils.realArray(el.children).filter(function(el) {
+				var param = el.tagName === 'PARAM';
+				var inlineScript = el.tagName === 'SCRIPT' && !(el.src && el.src.indexOf('http') >= 0);
+				var noScript = el.tagName === 'NOSCRIPT';
+				return !(param || inlineScript || noScript);
+			});
+
+			for ( i = 0; i < children.length; i++ ) {
+				childJSON = this.serializeElements(children[i]);
+				if ( childJSON ) {
+					json.children.push(childJSON);
+				}
+			}
+
+			if ( el.tagName === 'IFRAME' ) {
+				ifrWin = el.contentWindow;
+
+				if ( adId && el[adId] && el[adId].needsWindow ) {
+
+					json.contents = this.adData.serializedIframeContents;
+					el[adId].needsWindow = false;
+					delete this.adData.serializedIframeContents;
+
+				} else if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+
+					childJSON = this.serializeElements(ifrWin.document.documentElement);
+					if ( childJSON ) {
+						json.contents = childJSON;
+					}
+				}
+			}
+
+			if ( json.children.length > 0 || json.adId || json.tagName === 'IFRAME' || json.url ) {
+				return json;
+			} else {
+				return null;
+			}
+		},
+
+		captureHTML: function(containerEl) {
+			this.adData.context = this.serializeElements(containerEl);
+		},
+
+		nodeCount: function(el) {
+			return el.getElementsByTagName('*').length + 1;
+		},
+
+		highestContainer: function(curWin, referenceElement) {
+			var curContainer = referenceElement;
+			var docEl = curWin.document.documentElement;
+			var parentContainer;
+
+			if ( curWin !== curWin.top && this.isValidContainer(docEl, curWin) ) {
+				return docEl;
+			}
+
+			while ( true ) {
+				parentContainer = curContainer.parentElement;
+				if ( parentContainer && this.isValidContainer(parentContainer) ) {
+					curContainer = parentContainer;
+				} else {
+					return curContainer;
+				}
+			}
+		}
+	};
+
+	var tagfinder = {
+
+		setPositions: function(adData, opt_el, opt_winPos) {
+			var el = opt_el || adData.context;
+			var winPos = opt_winPos || {left: 0, top: 0};
+			var ifrPos;
+
+			el.left += winPos.left;
+			el.top += winPos.top;
+
+			if ( el.children ) {
+				el.children.forEach(function(child) {
+					this.setPositions(adData, child, winPos);
+				}, this);
+			}
+
+			if ( el.contents ) {
+				ifrPos = {left: el.left, top: el.top};
+				this.setPositions(adData, el.contents, ifrPos);
+			}
+
+			if ( el.adId === adData.adId ) {
+				adData.element.left = el.left;
+				adData.element.top = el.top;
+			}
+		},
+
+		appendTags: function(adData, referenceElement) {
+			var mgr = new ContextManager(adData);
+			var curWin = exports.utils.elementWindow(referenceElement);
+			var highestContainer;
+
+			while ( true ) {
+				highestContainer = mgr.highestContainer(curWin, referenceElement);
+				mgr.captureHTML(highestContainer);
+				if ( curWin === curWin.top ) {
+					break;
+				} else {
+
+					curWin.mpAdFound = true;
+
+					mgr.adData.serializedIframeContents = mgr.adData.context;
+
+					if ( exports.utils.isFriendlyWindow(curWin.parent) ) {
+						referenceElement = curWin.frameElement;
+						referenceElement[mgr.adData.adId] = {needsWindow: true};
+						curWin = curWin.parent;
+					} else {
+						break;
+					}
+				}
+			}
+			return {
+				referenceElement:referenceElement,
+				highestContainer: highestContainer
+			};
+		}
+	};
+
+	exports.tagfinder = tagfinder;
+})(exports);
+
+(function(exports) {
+	var _onAdFound;
+	var _logGen = new exports.utils.LogGenerator();
+	var _pageTags;
+	var INIT_MS_BW_SEARCHES = 2000;
+	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
+	var POST_MSG_ID = '1554456894-8541-12665-19466-15909';
+	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
+
+	function getPageTags(doc) {
+		var scripts = doc.getElementsByTagName('script');
+		var pageTags = [];
+		scripts = exports.utils.realArray(scripts);
+		scripts.forEach(function(script) {
+			if ( PAGE_TAG_RE.exec(script.src) ) {
+				pageTags.push({'tagName': 'SCRIPT', 'url': script.src});
+			}
+		});
+		return pageTags;
+	}
+
+	function messageAllParentFrames(adData) {
+
+		adData.postMessageId = POST_MSG_ID;
+
+		adData = JSON.stringify(adData);
+
+		var win = window;
+		while ( win !== win.top ) {
+			win = win.parent;
+			win.postMessage(adData, '*');
+		}
+	}
+
+	function appendTagsAndSendToParent(adData, referenceElement) {
+		var results = exports.tagfinder.appendTags(adData, referenceElement);
+		if ( exports.utils.SCRIPT_IN_HOSTILE_IFRAME ) {
+			messageAllParentFrames(adData);
+
+		} else if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+
+			exports.tagfinder.setPositions(adData);
+
+			adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
+			if ( !adData.matchedSize ) {
+
+				if ( AD_SERVER_RE.exec(results.referenceElement.id) ) {
+					adData.matchedSize = [adData.width, adData.height];
+					adData.oddSize = true;
+				} else {
+
+					return;
+				}
+			}
+			delete adData.width;
+			delete adData.height;
+			adData.curPageUrl = exports.utils.getPageUrl();
+			_pageTags = _pageTags || getPageTags(document);
+			var log = _logGen.log('ad', [adData], _pageTags);
+
+			if ( _onAdFound ) {
+
+					_onAdFound(log, results.referenceElement);
+
+			}
+		}
+	}
+
+	function extractAdsWrapper() {
+		if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
+			extractAds();
+		}
+		setTimeout(
+			function() { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES
+		);
+	}
+
+	function extractAds() {
+		var ads = exports.adfinder.findAds(window);
+		ads.forEach(function(ad) {
+
+			var startTime = new Date().getTime();
+			var adId = startTime + '-' + Math.floor(Math.random() * 10e12);
+
+			var adData = {
+				width: Math.round(ad.offsetWidth),
+				height: Math.round(ad.offsetHeight),
+				startTime: startTime,
+				adId: adId,
+				html5: ad.html5 || false
+			};
+
+			if ( ad.html5 ) {
+				adData.adSizeMeta = ad.adSizeMeta || null;
+				adData.winClickTag = ad.winClickTag || null;
+			}
+
+			ad[adId] = { isAd: true };
+
+			appendTagsAndSendToParent(adData, ad);
+		});
+	}
+
+	function isChildWin(myWin, otherWin) {
+		var parentWin = otherWin.parent;
+		while ( parentWin !== otherWin ) {
+			if ( parentWin === myWin ) {
+				return true;
+			}
+			otherWin = parentWin;
+			parentWin = parentWin.parent;
+		}
+		return false;
+	}
+
+	function iframeFromWindow(win, winToMatch) {
+		var i, ifr, ifrWin,
+			iframes = win.document.querySelectorAll('iframe');
+
+		for ( i = 0; i < iframes.length; i++ ) {
+			ifr = iframes[i];
+			if ( ifr.contentWindow === winToMatch ) {
+				return ifr;
+			}
+		}
+
+		for ( i = 0; i < iframes.length; i++ ) {
+			ifrWin = iframes[i].contentWindow;
+			if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+				ifr = iframeFromWindow(ifrWin, winToMatch);
+				if ( ifr ) {
+					return ifr;
+				}
+			}
+		}
+	}
+
+	function onPostMessage(event) {
+		var adData,
+			ifrWin = event.source,
+
+			myWin = window.document.defaultView,
+			ifrTag;
+
+		if ( typeof event.data === "string" && event.data.indexOf(POST_MSG_ID) != -1 ) {
+			try {
+
+				adData = JSON.parse(event.data);
+			} catch (e) {
+
+				return;
+			}
+		}
+		else
+			return;
+
+		if ( adData.postMessageId === POST_MSG_ID ) {
+
+			delete adData.postMessageId;
+
+			event.stopImmediatePropagation();
+
+			if ( isChildWin(myWin, ifrWin) ) {
+				if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+					ifrTag = ifrWin.frameElement;
+				} else {
+					ifrTag = iframeFromWindow(myWin, ifrWin);
+				}
+
+				if ( ifrTag ) {
+					ifrTag[adData.adId] = {needsWindow: true};
+					appendTagsAndSendToParent(adData, ifrTag);
+				}
+			}
+		}
+	}
+
+	function onVideoMessage(msg, sender, callback) {
+		var log;
+		if ( msg.event === 'new-video-ad' ) {
+			msg.assets.forEach(function(asset) {
+
+			});
+			log = _logGen.log('video', msg.assets);
+		} else {
+			log = _logGen.log('invalid-video', msg.assets);
+		}
+
+		msg.assets.forEach(function(a) {delete a.isVideo;});
+		log.displayAdFound = msg.displayAdFound;
+		log.requests = msg.requests;
+		log.data = msg.event_data;
+
+		log.doc.finalPageUrl = log.doc.url;
+		log.doc.url = exports.utils.normalizeUrl(msg.origUrl);
+
+		_onAdFound(log);
+	}
+
+	function addBackgroundListener(event, callback) {
+		if ( typeof browser !== 'undefined' || typeof chrome !== 'undefined' ) {
+			browser.runtime.onMessage.addListener(function(msg) {
+				if ( msg.event === event ) {
+					callback(msg);
+				}
+			});
+		}
+		else if (window.self.port) {
+			window.self.port.on(event, callback);
+		}
+	}
+
+	exports.coordinator = {
+		addPostMessageListener: function() {
+			if ( !exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
+				window.addEventListener('message', onPostMessage, false);
+			}
+		},
+
+		blockedRobotsMsgGen: function(sendFcn, origUrl) {
+
+			if ( origUrl.indexOf('google.com/_/chrome/newtab') === -1 ) {
+				var onBlockedRobotsMessage = function() {
+					var log;
+					log = _logGen.log('invalid-robotstxt', []);
+					log.doc.finalPageUrl = log.doc.url;
+					log.doc.url = exports.utils.normalizeUrl(origUrl);
+
+					sendFcn(log);
+				};
+				return onBlockedRobotsMessage;
+			} else {
+				return function() {};
+			}
+		},
+
+		init: function(onAdFound) {
+
+			if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
+				return false;
+			}
+
+			_onAdFound = onAdFound;
+			if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+				var log = _logGen.log('page');
+				onAdFound(log);
+
+				window.addEventListener('beforeunload', function(event) {
+					var log = _logGen.log('unload');
+					log.timing = window.performance.timing;
+					onAdFound(log);
+				});
+
+				addBackgroundListener('new-video-ad', onVideoMessage);
+				addBackgroundListener('new-invalid-video-ad', onVideoMessage);
+
+			}
+
+			exports.utils.onDocLoaded(document, extractAdsWrapper);
+		}
+	};
+
+})(exports);
+
+if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+	window.adparser = {
+		init: exports.coordinator.init,
+		addPostMessageListener: exports.coordinator.addPostMessageListener,
+		askIfTrackingEnabled: exports.utils.askIfTrackingEnabled,
+		blockedRobotsMsgGen: exports.coordinator.blockedRobotsMsgGen,
+		inWindowTop: exports.utils.SCRIPT_IN_WINDOW_TOP,
+		sendToBackground: exports.utils.sendToBackground
+	};
+} else {
+	exports.coordinator.addPostMessageListener();
+	exports.utils.askIfTrackingEnabled(
+		function() {
+			exports.coordinator.init(function() {});
+		},
+		function() {}
+	);
+}
+})(window);
+(function(adparser, pageUrl) {
+	function onAdFound(log) {
+		adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){});
+	}
+
+	if (  adparser && adparser.inWindowTop  ) {
+		adparser.addPostMessageListener();
+		adparser.askIfTrackingEnabled(
+			function() {
+				adparser.init(onAdFound);
+			},
+			adparser.blockedRobotsMsgGen(onAdFound, pageUrl)
+		)
+	}
+})(window.adparser, window.location.href);
diff --git a/src/drivers/webextension/js/lib/network.js b/src/drivers/webextension/js/lib/network.js
index ddcb6b2d4..7c46fcf9f 100644
--- a/src/drivers/webextension/js/lib/network.js
+++ b/src/drivers/webextension/js/lib/network.js
@@ -1,795 +1,822 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-  'use strict';
-  (function () {
-    function isChrome() {
-      return (typeof chrome !== 'undefined'
-          && window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
-    }
-
-    let browserProxy;
-    if (isChrome()) {
-      browserProxy = chrome;
-    } else {
-      browserProxy = browser;
-    }
-
-    const MIN_FF_MAJOR_VERSION = 51;
-
-    const requiredBrowserApis = [
-      browserProxy.webNavigation,
-      browserProxy.tabs,
-      browserProxy.webRequest,
-      browserProxy.runtime,
-    ];
-    let areListenersRegistered = false;
-    const secBefore = 2000;
-    const secAfter = 5000;
-    const secBetweenDupAssets = 10e3;
-    const minVidSize = 500e3;
-    const maxVidSize = 25e6;
-    const maxContentRange = 25e6;
-    const videoExtensions = [
-      'af', '3gp', 'asf', 'avchd', 'avi', 'cam', 'dsh', 'flv', 'm1v', 'm2v',
-      'fla', 'flr', 'sol', 'm4v', 'mkv', 'wrap', 'mng', 'mov', 'mpeg', 'mpg',
-      'mpe', 'mp4', 'mxf', 'nsv', 'ogg', 'rm', 'svi', 'smi', 'wmv', 'webm',
-    ];
-    const extensionsReg = new RegExp(`\\.${videoExtensions.join('$|\\.')}$`);
-    const videoContentTypesPrefixes = ['binary/octet-stream', 'video/', 'flv-application/', 'media'];
-
-    const bannedContentTypes = ['video/mp2t', 'video/f4m', 'video/f4f'];
-    const bannedFiletypes = ['ts'];
-    const bannedFiletypesReg = new RegExp(`\\.${bannedFiletypes.join('$|\\.')}$`);
-    const whitelistReqTypes = ['object', 'xmlhttprequest', 'other'];
-
-    const topVideoAssetDomains = [
-      '2mdn.net',
-      'adap.tv',
-      'adnxs.com',
-      'adsrvr.org',
-      'btrll.com',
-      'celtra.com',
-      'flashtalking.com',
-      'flite.com',
-      'innovid.com',
-      'jivox.com',
-      'mixpo.com',
-      'nytimes.com',
-      'playwire.com',
-      'selectmedia.asia',
-      'serving-sys.com',
-      'solvemedia.com',
-      'spotible.com',
-      'teads.tv',
-      'tribalfusion.com',
-      'tubemogul.com',
-      'videologygroup.com',
-      'washingtonpost.com',
-    ];
-
-    const robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer);
-    if (!String.prototype.endsWith) {
-      String.prototype.endsWith = function (searchString, position) {
-        const subjectString = this.toString();
-        if (typeof position !== 'number' || !isFinite(position)
-          || Math.floor(position) !== position || position > subjectString.length) {
-          position = subjectString.length;
-        }
-        position -= searchString.length;
-        const lastIndex = subjectString.indexOf(searchString, position);
-        return lastIndex !== -1 && lastIndex === position;
-      };
-    }
-
-    function getFrame(getFrameDetails, callback) {
-      if (typeof chrome !== 'undefined') {
-        chrome.webNavigation.getFrame(getFrameDetails, callback);
-      } else if (typeof browser !== 'undefined') {
-        const gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
-        gettingFrame.then(callback);
-      }
-    }
-
-    function ifBrowserValid(callback, elseCallback) {
-      if (isChrome()) {
-        callback();
-      } else if (typeof browser !== 'undefined') {
-        try {
-          const gettingInfo = browser.runtime.getBrowserInfo();
-          gettingInfo.then((browserInfo) => {
-            const browserVersion = parseInt(browserInfo.version.split('.')[0]);
-
-            if (browserInfo.name === 'Firefox'
-              && browserVersion >= MIN_FF_MAJOR_VERSION) {
-              callback();
-            } else {
-              elseCallback();
-            }
-          });
-        } catch (err) {
-          elseCallback();
-        }
-      } else {
-        elseCallback();
-      }
-    }
-
-    function ifTrackingEnabled(details, ifCallback, elseCallback) {
-      const fullIfCallback = function () {
-        allowedByRobotsTxt(details, ifCallback, elseCallback);
-      };
-
-      browser.storage.local.get('tracking').then((item) => {
-        if (item.hasOwnProperty('tracking')) {
-          if (item.tracking) {
-            fullIfCallback();
-          } else {
-            elseCallback();
-          }
-        } else {
-          fullIfCallback();
-        }
-      });
-    }
-
-    function allowedByRobotsTxt(details, ifCallback, elseCallback) {
-      if (details.url && !details.url.startsWith('chrome://')) {
-        robotsTxtAllows(details.url).then(ifCallback, elseCallback);
-      } else {
-        elseCallback();
-      }
-    }
-
-    function isPixelRequest(request) {
-      return (request.type === 'image' || request.responseStatus === 204)
-          && request.size <= 1000;
-    }
-
-    function isVpaidOrVastRequest(request) {
-      const lowerCaseUrl = request.url.toLowerCase();
-      return lowerCaseUrl.indexOf('vpaid') !== -1 || lowerCaseUrl.indexOf('vast') !== -1;
-    }
-
-    function hasValidRequestType(request) {
-      return whitelistReqTypes.indexOf(request.type) >= 0;
-    }
-
-    function stripQueryParams(url) {
-      return url.split('?', 1)[0];
-    }
-
-    function parseHostnameFromUrl(url) {
-      const parser = document.createElement('a');
-      parser.href = url;
-      return parser.hostname;
-    }
-
-    function hasDomain(url, domain) {
-      return parseHostnameFromUrl(url).endsWith(domain);
-    }
-
-    function findHeader(headers, key) {
-      let header;
-      for (let i = 0; i < headers.length; i += 1) {
-        header = headers[i];
-        if (header.name.toLowerCase() === key) {
-          return header;
-        }
-      }
-      return null;
-    }
-
-    function validVideoType(vtype) {
-      const goodType = videoContentTypesPrefixes.some(prefix => vtype.indexOf(prefix) === 0);
-      return goodType;
-    }
-
-    function assetMsgKey(assetReq) {
-      const url = stripQueryParams(assetReq.url);
-      const key = `${assetReq.frameId}-${url}`;
-      return key;
-    }
-
-    const PageNetworkTrafficCollector = function (tabId) {
-      this.tabId = tabId;
-      this.displayAdFound = false;
-      this.requests = {};
-      this.msgsBeingSent = {};
-      this.assetsSeen = {};
-      this.allRedirects = {};
-    };
-
-    var globalPageContainer = {
-      collectors: {},
-      dyingCollectors: {},
-
-      cleanupCollector(tabId) {
-        if (tabId in this.collectors) {
-          delete globalPageContainer.collectors[tabId];
-        }
-      },
-
-      onNewNavigation(details) {
-        const tabId = details.tabId;
-        this.cleanupCollector(tabId);
-
-        ifTrackingEnabled(
-          details,
-          () => {
-            if (!areListenersRegistered) {
-              registerListeners();
-            }
-            this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
-          },
-          () => {
-            if (areListenersRegistered) {
-              unregisterListeners();
-            }
-          },
-        );
-      },
-
-      onNavigationCommitted(details) {
-
-      },
-
-      onNavigationCompleted(details) {
-
-      },
-
-      onTabClose(tabId, closeInfo) {
-        this.cleanupCollector(tabId);
-        delete this.collectors[tabId];
-      },
-
-      onDisplayAdFound(tabId) {
-        this.collectors[tabId].displayAdFound = true;
-      },
-
-      getRandId() {
-        return String(Math.floor(Math.random() * 1e9));
-      },
-
-      getCollector(tabId) {
-        if (this.collectors.hasOwnProperty(tabId)) {
-          return this.collectors[tabId];
-        }
-        return null;
-      },
-
-      forwardCall(details, collectorMemberFunction) {
-        const collector = this.getCollector(details.tabId);
-        if (collector !== null) {
-          collectorMemberFunction.apply(collector, [details]);
-        }
-      },
-    };
-
-    PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function () {
-      const logMessage = Array.from(arguments).join(' ');
-      const message = { message: logMessage, event: 'console-log-message' };
-      browserProxy.tabs.sendMessage(this.tabId, message);
-    };
-
-    PageNetworkTrafficCollector.prototype.sendToTab = function (assetReq, reqs, curPageUrl, adTrackingEvent) {
-      const msg = {};
-      msg.assets = [];
-      msg.requests = [];
-      msg.event_data = {};
-      msg.event = adTrackingEvent;
-      if (adTrackingEvent === 'new-video-ad') {
-        msg.requests = reqs;
-        msg.requests.sort((reqA, reqB) => reqA.requestTimestamp - reqB.requestTimestamp);
-        if (assetReq) {
-          msg.assets = [assetReq];
-        }
-      } else if (adTrackingEvent === 'new-invalid-video-ad') {
-        msg.requests = reqs.map(request => parseHostnameFromUrl(request.url));
-        msg.assets = [{
-
-          url: parseHostnameFromUrl(assetReq.url),
-
-          contentType: assetReq.contentType,
-          size: assetReq.size,
-        }];
-      }
-      msg.origUrl = curPageUrl;
-      msg.displayAdFound = this.displayAdFound;
-
-      browserProxy.tabs.sendMessage(this.tabId, msg);
-    };
-
-    PageNetworkTrafficCollector.prototype.getRedirKey = function (url, frameId) {
-      return `${url}:${frameId}`;
-    };
-
-    PageNetworkTrafficCollector.prototype.seenBefore = function (request) {
-      const oldTime = this.assetsSeen[assetMsgKey(request)];
-      if (oldTime && (request.requestTimestamp - oldTime < secBetweenDupAssets)) {
-        return true;
-      }
-      return false;
-    };
-
-    PageNetworkTrafficCollector.prototype.recordSeenAsset = function (request) {
-      this.assetsSeen[assetMsgKey(request)] = request.requestTimestamp;
-    };
-
-    PageNetworkTrafficCollector.prototype.onBeforeRequest = function (details) {
-      const req = {
-        url: details.url,
-        type: details.type,
-        httpMethod: details.method,
-        frameId: details.frameId,
-        parentFrameId: details.parentFrameId,
-        requestTimestamp: details.timeStamp,
-      };
-      this.requests[details.requestId] = req;
-    };
-
-    PageNetworkTrafficCollector.prototype.onSendHeaders = function (details) {
-      let request,
-        header;
-      request = this.requests[details.requestId];
-      header = request && findHeader(details.requestHeaders, 'x-requested-with');
-      if (header && header.value.toLowerCase().indexOf('flash') > -1) {
-        request.from_flash = true;
-      }
-    };
-
-    PageNetworkTrafficCollector.prototype.onHeadersReceived = function (details) {
-      const getFrameDetails = {
-        tabId: details.tabId,
-        processId: null,
-        frameId: details.frameId,
-      };
-      const pageNetworkTrafficController = this;
-      getFrame(getFrameDetails, (frameDetails) => {
-        if (frameDetails && frameDetails.url) {
-          pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
-        }
-      });
-    };
-
-    PageNetworkTrafficCollector.prototype._onHeadersReceived = function (details, frameDetails) {
-      let contentSize,
-        contentRange;
-
-      const request = this.requests[details.requestId];
-      if (request) {
-        const redirParent = this.allRedirects[this.getRedirKey(details.url, details.frameId)];
-        let header = request && findHeader(details.responseHeaders, 'content-type');
-        const contentType = header && header.value.toLowerCase();
-
-        if (contentType) {
-          request.contentType = contentType;
-        }
-        header = request && findHeader(details.responseHeaders, 'content-length');
-        contentSize = header && header.value;
-        if (contentSize) {
-          request.size = request.size || 0;
-          request.size += parseInt(contentSize);
-        }
-        header = request && findHeader(details.responseHeaders, 'content-range');
-        contentRange = header && header.value;
-        if (contentRange) {
-          request.contentRange = parseInt(contentRange.split('/')[1]);
-        }
-
-        let frameUrl = null;
-        if (frameDetails && frameDetails.url) {
-          frameUrl = frameDetails.url;
-        }
-        if (!this.bannedRequest(request)
-          && (this.isVideoReq(frameUrl, request) || (redirParent && redirParent.isVideo))) {
-          request.isVideo = true;
-        }
-      }
-    };
-
-    PageNetworkTrafficCollector.prototype.onBeforeRedirect = function (details) {
-      const request = this.requests[details.requestId];
-      if (request) {
-        if (request.redirects) {
-          request.redirects.push(details.redirectUrl);
-        } else {
-          request.redirects = [details.redirectUrl];
-        }
-        this.allRedirects[this.getRedirKey(details.redirectUrl, details.frameId)] = request;
-      }
-    };
-
-    PageNetworkTrafficCollector.prototype.isYoutubeMastheadRequest = function (url) {
-      const re = /video_masthead/;
-      return this.hasYoutubeDomain(url) && re.test(url);
-    };
-    PageNetworkTrafficCollector.prototype.isYoutubeVideoRequest = function (srcUrl, destUrl) {
-      if (!this.hasYoutubeDomain(srcUrl)) {
-        return false;
-      }
-
-      const re = /https?:\/\/r.*?\.googlevideo\.com\/videoplayback\?/;
-      return re.test(destUrl);
-    };
-    PageNetworkTrafficCollector.prototype.processResponse = function (requestDetails, frameDetails) {
-      let request;
-      if (requestDetails) {
-        request = this.requests[requestDetails.requestId];
-        if (request) {
-          request.responseStatus = requestDetails.statusCode;
-          request.responseTimestamp = requestDetails.timeStamp;
-
-          let frameUrl = null;
-          if (frameDetails && frameDetails.url) {
-            frameUrl = frameDetails.url;
-          }
-
-          let requestUrl = null;
-          if (request.url) {
-            requestUrl = request.url;
-          }
-
-          if (this.isYoutubeAdReq(frameUrl, requestUrl)) {
-            const destVideoId = this.parseYoutubeVideoIdFromUrl(requestUrl);
-            const srcVideoId = this.parseYoutubeVideoIdFromUrl(frameUrl);
-            if (srcVideoId && destVideoId) {
-              request.isYoutubeAd = true;
-              request.isVideo = true;
-              request.rawSrcUrl = frameUrl;
-              request.rawDestUrl = requestUrl;
-              request.url = `https://www.youtube.com/watch?v=${this.parseYoutubeVideoIdFromUrl(requestUrl)}`;
-            }
-          } else if (!this.bannedRequest(request)
-              && (this.isVideo || this.isVideoReq(frameUrl, request))) {
-            request.isVideo = true;
-          }
-
-          if (request.isVideo) {
-            const msgKey = assetMsgKey(request);
-            this.msgsBeingSent[msgKey] = request;
-            if (!this.seenBefore(request)) {
-              this.sendMsgWhenQuiet(msgKey);
-            }
-            this.recordSeenAsset(request);
-          }
-        }
-      }
-    };
-
-    PageNetworkTrafficCollector.prototype.onResponseStarted = function (responseDetails) {
-      if (responseDetails.frameId < 0) {
-        responseDetails.frameId = 99999;
-      }
-      const getFrameDetails = {
-        tabId: responseDetails.tabId,
-        processId: null,
-        frameId: responseDetails.frameId,
-      };
-      const pageNetworkTrafficController = this;
-      getFrame(getFrameDetails, (frameDetails) => {
-        if (frameDetails && frameDetails.url) {
-          pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
-        }
-      });
-    };
-
-    PageNetworkTrafficCollector.prototype.hasBannedFiletype = function (request) {
-      const url = stripQueryParams(request.url);
-      if (bannedFiletypesReg.exec(url)) {
-        return true;
-      }
-      return false;
-    };
-
-    PageNetworkTrafficCollector.prototype.checkContentHeaders = function (request) {
-      if (request.contentType && validVideoType(request.contentType)) {
-        return true;
-      }
-      return false;
-    };
-
-    PageNetworkTrafficCollector.prototype.checkUrlExtension = function (request) {
-      const url = stripQueryParams(request.url);
-      if (extensionsReg.exec(url)) {
-        return true;
-      }
-      return false;
-    };
-
-    PageNetworkTrafficCollector.prototype.isVideoReq = function (srcUrl, request) {
-      if (this.isYoutubeVideoRequest(srcUrl, request.url)) {
-        return false;
-      }
-      return this.checkUrlExtension(request) || this.checkContentHeaders(request);
-    };
-    PageNetworkTrafficCollector.prototype.hasYoutubeDomain = function (url) {
-      const hostname = parseHostnameFromUrl(url);
-      if (hostname === 'www.youtube.com') {
-        return true;
-      }
-      return false;
-    };
-    PageNetworkTrafficCollector.prototype.parseYoutubeVideoIdFromUrl = function (url) {
-      let re = /^https?:\/\/www\.youtube\.com\/get_video_info.*(?:\?|&)video_id=(.*?)(?:$|&)/;
-      let match = re.exec(url);
-      if (match && match.length > 1) {
-        return match[1];
-      }
-
-      re = /^https?:\/\/www\.youtube\.com\/embed\/(.*?)(?:$|\?)/;
-      match = re.exec(url);
-      if (match && match.length > 1) {
-        return match[1];
-      }
-
-      re = /^https?:\/\/www\.youtube\.com\/watch.*(\?|&)v=([^&]*)/;
-      match = re.exec(url);
-      if (match && match.length > 1) {
-        return match[1];
-      }
-      return null;
-    };
-
-    PageNetworkTrafficCollector.prototype.isYoutubeGetVideoInfoReq = function (url) {
-      const re = /^https?:\/\/www\.youtube\.com\/get_video_info\?/;
-      return re.test(url);
-    };
-    PageNetworkTrafficCollector.prototype.isYoutubeAdReq = function (srcUrl, destUrl) {
-      if (!this.hasYoutubeDomain(srcUrl)
-        || !this.isYoutubeGetVideoInfoReq(destUrl)) {
-        return false;
-      }
-      if (this.parseYoutubeVideoIdFromUrl(srcUrl)
-        === this.parseYoutubeVideoIdFromUrl(destUrl)
-        && !this.isYoutubeMastheadRequest(destUrl)) {
-        return false;
-      }
-      return true;
-    };
-
-    PageNetworkTrafficCollector.prototype.bannedRequest = function (request) {
-      return this.bannedVideoType(request) || this.hasBannedFiletype(request) || this.bannedVideoSize(request);
-    };
-
-    PageNetworkTrafficCollector.prototype.bannedVideoType = function (request) {
-      let badType = false;
-      if (request.contentType) {
-        badType = bannedContentTypes.some(prefix => request.contentType.indexOf(prefix) >= 0);
-      }
-      return badType;
-    };
-
-    PageNetworkTrafficCollector.prototype.bannedVideoSize = function (request) {
-      if (request.size !== null) {
-        if (request.size < minVidSize || request.size > maxVidSize || request.contentRange > maxContentRange) {
-          return true;
-        }
-      }
-      return false;
-    };
-
-    PageNetworkTrafficCollector.prototype.grabTagReqs = function (tabRequests, assetRequest) {
-      let minTimestamp,
-        maxTimestamp;
-      minTimestamp = assetRequest.requestTimestamp - secBefore;
-      maxTimestamp = assetRequest.requestTimestamp + secAfter;
-
-      const filteredRequests = tabRequests.filter(request => (request.requestTimestamp > minTimestamp
-          && request.requestTimestamp < maxTimestamp
-          && request.frameId === assetRequest.frameId
-          && request.url !== assetRequest.url
-          && (hasValidRequestType(request)
-          || isPixelRequest(request))));
-
-      return filteredRequests;
-    };
-
-    PageNetworkTrafficCollector.prototype.isValidVideoAd = function (assetRequest, tagRequests) {
-      const hasVpaidOrVastRequest = tagRequests.some(tagRequest => isVpaidOrVastRequest(tagRequest));
-
-      if (assetRequest.isYoutubeAd) {
-        return true;
-      }
-      if (hasVpaidOrVastRequest) {
-        return true;
-      }
-      const hasTopVideoAssetDomain = topVideoAssetDomains.some(assetDomain => hasDomain(assetRequest.url, assetDomain));
-
-      return hasTopVideoAssetDomain;
-    };
-
-    PageNetworkTrafficCollector.prototype.sendMsgWhenQuiet = function (msgKey) {
-      let _this = this,
-        origPageUrl,
-        msgAssetReq;
-      msgAssetReq = this.msgsBeingSent[msgKey];
-      browserProxy.tabs.get(this.tabId, (tab) => { origPageUrl = tab.url; });
-
-      setTimeout(() => {
-        const rawRequests = [];
-        if (globalPageContainer.collectors[_this.tabId] === _this) {
-          for (const reqId in _this.requests) {
-            rawRequests.push(_this.requests[reqId]);
-          }
-          const tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
-
-          if (_this.isValidVideoAd(msgAssetReq, tagReqs)) {
-            _this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
-          } else {
-            _this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
-          }
-        } else {
-
-        }
-        delete _this.msgsBeingSent[msgKey];
-      }, secAfter + secBefore);
-    };
-
-    PageNetworkTrafficCollector.prototype.existingMessage = function (candidateRequest) {
-      const frameMsg = this.msgsBeingSent[candidateRequest.frameId];
-      if (frameMsg) {
-        return frameMsg;
-      }
-      return null;
-    };
-
-    function onBeforeRequestListener(details) {
-      globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
-    }
-
-    function onSendHeadersListener(details) {
-      globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
-    }
-
-    function onHeadersReceivedListener(details) {
-      globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
-    }
-
-    function onBeforeRedirectListener(details) {
-      globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
-    }
-
-    function onResponseStartedListener(details) {
-      globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
-    }
-
-    function onCommittedListener(details) {
-      if (details.frameId === 0) {
-        globalPageContainer.onNavigationCommitted(details);
-      }
-    }
-
-    function onCompletedListener(details) {
-      if (details.frameId === 0) {
-        globalPageContainer.onNavigationCompleted(details);
-      }
-    }
-
-    function onRemovedListener(tabId, closeInfo) {
-      globalPageContainer.onTabClose(tabId, closeInfo);
-    }
-
-    function onMessageListener(message, sender, sendResponse) {
-      if (message.event === 'new-ad' && message.data.event === 'ad') {
-        const tabId = sender.tab.id;
-        if (tabId) {
-          globalPageContainer.onDisplayAdFound(tabId);
-        }
-      }
-    }
-
-    function registerListeners() {
-      browserProxy.webRequest.onBeforeRequest.addListener(
-        onBeforeRequestListener,
-        { urls: ['http://*/*', 'https://*/*'] },
-        [],
-      );
-
-      browserProxy.webRequest.onSendHeaders.addListener(
-        onSendHeadersListener,
-        { urls: ['http://*/*', 'https://*/*'] },
-        ['requestHeaders'],
-      );
-
-      browserProxy.webRequest.onHeadersReceived.addListener(
-        onHeadersReceivedListener,
-        { urls: ['http://*/*', 'https://*/*'] },
-        ['responseHeaders'],
-      );
-
-      browserProxy.webRequest.onBeforeRedirect.addListener(
-        onBeforeRedirectListener,
-        { urls: ['http://*/*', 'https://*/*'] },
-        [],
-      );
-
-      browserProxy.webRequest.onResponseStarted.addListener(
-        onResponseStartedListener,
-        { urls: ['http://*/*', 'https://*/*'] },
-        ['responseHeaders'],
-      );
-
-      browserProxy.webNavigation.onCommitted.addListener(onCommittedListener);
-      browserProxy.webNavigation.onCompleted.addListener(onCompletedListener);
-      browserProxy.tabs.onRemoved.addListener(onRemovedListener);
-      browserProxy.runtime.onMessage.addListener(onMessageListener);
-
-      areListenersRegistered = true;
-    }
-
-    function unregisterListeners() {
-      browserProxy.webRequest.onBeforeRequest.removeListener(
-        onBeforeRequestListener,
-      );
-
-      browserProxy.webRequest.onSendHeaders.removeListener(
-        onSendHeadersListener,
-      );
-
-      browserProxy.webRequest.onHeadersReceived.removeListener(
-        onHeadersReceivedListener,
-      );
-
-      browserProxy.webRequest.onBeforeRedirect.removeListener(
-        onBeforeRedirectListener,
-      );
-
-      browserProxy.webRequest.onResponseStarted.removeListener(
-        onResponseStartedListener,
-      );
-
-      browserProxy.webNavigation.onCommitted.removeListener(onCommittedListener);
-      browserProxy.webNavigation.onCompleted.removeListener(onCompletedListener);
-      browserProxy.tabs.onRemoved.removeListener(onRemovedListener);
-      browserProxy.runtime.onMessage.removeListener(onMessageListener);
-
-      areListenersRegistered = false;
-    }
-
-    function areRequiredBrowserApisAvailable() {
-      return requiredBrowserApis.every(api => typeof api !== 'undefined');
-    }
-
-    if (areRequiredBrowserApisAvailable()) {
-      ifBrowserValid(
-        () => {
-          browserProxy.webNavigation.onBeforeNavigate.addListener(
-            (details) => {
-              if (details.frameId === 0) {
-                globalPageContainer.onNewNavigation(details);
-              }
-            },
-            {
-              url: [{ urlMatches: 'http://*/*' }, { urlMatches: 'https://*/*' }],
-            },
-          );
-        }, () => {
-
-        },
-      );
-    }
-
-    browserProxy.runtime.onMessage.addListener((request, sender, sendResponse) => {
-      if (request === 'is_browser_valid') {
-        ifBrowserValid(
-          sendResponse({ browser_valid: true }),
-          sendResponse({ browser_valid: false }),
-        );
-      }
-    });
-
-    browserProxy.runtime.onMessage.addListener((request, sender, sendResponse) => {
-      if (request === 'is_tracking_enabled') {
-        ifTrackingEnabled(
-          sender.tab,
-          () => {
-            try { sendResponse({ tracking_enabled: true }); } catch (err) {}
-          },
-          () => {
-            try { sendResponse({ tracking_enabled: false }); } catch (err) {}
-          },
-        );
-      }
-      return true;
-    });
-  }());
+'use strict';
+(function() {
+
+	function isChrome() {
+		return (typeof chrome !== 'undefined' &&
+				window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
+	}
+
+	var requiredBrowserApis = [
+		browser.webNavigation,
+		browser.tabs,
+		browser.webRequest,
+		browser.runtime
+	];
+
+	var MIN_FF_MAJOR_VERSION = 51;
+
+	var areListenersRegistered = false;
+	var secBefore = 2000;
+	var secAfter = 5000;
+	var secBetweenDupAssets = 10e3;
+	var minVidSize = 500e3;
+	var maxVidSize = 25e6;
+	var maxContentRange = 25e6;
+	var videoExtensions = [
+		'af', '3gp', 'asf', 'avchd', 'avi', 'cam', 'dsh', 'flv', 'm1v', 'm2v',
+		'fla', 'flr', 'sol', 'm4v', 'mkv', 'wrap', 'mng', 'mov', 'mpeg', 'mpg',
+		'mpe', 'mp4', 'mxf', 'nsv', 'ogg', 'rm', 'svi', 'smi', 'wmv', 'webm'
+	];
+	var extensionsReg = new RegExp('\\.' + videoExtensions.join('$|\\.') + '$');
+	var videoContentTypesPrefixes = ['binary/octet-stream', 'video/', 'flv-application/', 'media'];
+
+	var bannedContentTypes = ['video/mp2t','video/f4m','video/f4f'];
+	var bannedFiletypes = ['ts'];
+	var bannedFiletypesReg = new RegExp('\\.' + bannedFiletypes.join('$|\\.') + '$');
+	var whitelistReqTypes = ['object', 'xmlhttprequest', 'other'];
+
+	var topVideoAssetDomains = [
+		'2mdn.net',
+		'adap.tv',
+		'adnxs.com',
+		'adsrvr.org',
+		'btrll.com',
+		'celtra.com',
+		'flashtalking.com',
+		'flite.com',
+		'innovid.com',
+		'jivox.com',
+		'mixpo.com',
+		'nytimes.com',
+		'playwire.com',
+		'selectmedia.asia',
+		'serving-sys.com',
+		'solvemedia.com',
+		'spotible.com',
+		'teads.tv',
+		'tribalfusion.com',
+		'tubemogul.com',
+		'videologygroup.com',
+		'washingtonpost.com'
+	];
+
+	var robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer);
+	if ( !String.prototype.endsWith ) {
+		String.prototype.endsWith = function(searchString, position) {
+			var subjectString = this.toString();
+			if ( typeof position !== 'number' || !isFinite(position) ||
+				Math.floor(position) !== position || position > subjectString.length) {
+				position = subjectString.length;
+			}
+			position -= searchString.length;
+			var lastIndex = subjectString.indexOf(searchString, position);
+			return lastIndex !== -1 && lastIndex === position;
+		};
+	}
+
+	function getFrame(getFrameDetails, callback) {
+		var gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
+		gettingFrame.then(callback);
+	}
+
+	function ifBrowserValid(callback, elseCallback) {
+		if ( isChrome() ) {
+
+			callback();
+		} else if ( typeof browser !== 'undefined' ) {
+			try {
+				var gettingInfo = browser.runtime.getBrowserInfo();
+				gettingInfo.then(function(browserInfo) {
+					var browserVersion = parseInt(browserInfo.version.split('.')[0]);
+
+					if ( browserInfo.name === 'Firefox' &&
+						browserVersion >= MIN_FF_MAJOR_VERSION) {
+						callback();
+					} else {
+						elseCallback();
+					}
+				});
+			} catch (err) {
+
+				elseCallback();
+			}
+		} else {
+			elseCallback();
+		}
+	}
+
+	function ifTrackingEnabled(details, ifCallback, elseCallback) {
+
+		var fullIfCallback = function() {
+			allowedByRobotsTxt(details, ifCallback, elseCallback);
+		};
+
+		browser.storage.local.get('tracking').then(function(item) {
+
+			if ( item.hasOwnProperty('tracking') ) {
+				if ( item.tracking ) {
+					fullIfCallback();
+				} else {
+					elseCallback();
+				}
+			} else {
+				fullIfCallback();
+			}
+		});
+
+	}
+
+	function allowedByRobotsTxt(details, ifCallback, elseCallback) {
+		if (  details.url && !details.url.startsWith('chrome://')  ) {
+			robotsTxtAllows(details.url).then(ifCallback, elseCallback);
+		} else {
+			elseCallback();
+		}
+	}
+
+	function isPixelRequest(request) {
+		return (request.type === 'image' || request.responseStatus === 204) &&
+				request.size <= 1000;
+	}
+
+	function isVpaidOrVastRequest(request) {
+		var lowerCaseUrl = request.url.toLowerCase();
+		return lowerCaseUrl.indexOf('vpaid') !== -1 || lowerCaseUrl.indexOf('vast') !== -1;
+	}
+
+	function hasValidRequestType(request) {
+		return whitelistReqTypes.indexOf(request.type) >= 0;
+	}
+
+	function stripQueryParams(url) {
+		return url.split('?', 1)[0];
+	}
+
+	function parseHostnameFromUrl(url) {
+		var parser = document.createElement('a');
+		parser.href = url;
+		return parser.hostname;
+	}
+
+	function hasDomain(url, domain) {
+		return parseHostnameFromUrl(url).endsWith(domain);
+	}
+
+	function findHeader(headers, key) {
+		var header;
+		for ( var i = 0; i < headers.length; i += 1 ) {
+			header = headers[i];
+			if ( header.name.toLowerCase() === key ) {
+				return header;
+			}
+		}
+		return null;
+	}
+
+	function validVideoType(vtype) {
+		var goodType = videoContentTypesPrefixes.some(function(prefix) {
+			return vtype.indexOf(prefix) === 0;
+		});
+		return goodType;
+	}
+
+	function assetMsgKey(assetReq) {
+		var url = stripQueryParams(assetReq.url);
+		var key = assetReq.frameId + '-' + url;
+		return key;
+	}
+
+	var PageNetworkTrafficCollector = function(tabId) {
+		this.tabId = tabId;
+		this.displayAdFound = false;
+		this.requests = {};
+		this.msgsBeingSent = {};
+		this.assetsSeen = {};
+		this.allRedirects = {};
+	};
+
+	var globalPageContainer = {
+		collectors: {},
+		dyingCollectors: {},
+
+		cleanupCollector: function(tabId) {
+			if ( tabId in this.collectors ) {
+				delete globalPageContainer.collectors[tabId];
+			}
+		},
+
+		onNewNavigation: function(details) {
+			var tabId = details.tabId;
+			this.cleanupCollector(tabId);
+
+			ifTrackingEnabled(
+				details,
+				function() {
+					if ( !areListenersRegistered ) {
+
+						registerListeners();
+					}
+					this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+				}.bind(this),
+				function() {
+					if ( areListenersRegistered ) {
+
+						unregisterListeners();
+					}
+				}
+			);
+		},
+
+		onNavigationCommitted: function(details) {
+
+		},
+
+		onNavigationCompleted: function(details) {
+
+		},
+
+		onTabClose: function(tabId, closeInfo) {
+
+			this.cleanupCollector(tabId);
+			delete this.collectors[tabId];
+		},
+
+		onDisplayAdFound: function(tabId) {
+			this.collectors[tabId].displayAdFound = true;
+		},
+
+		getRandId: function() {
+			return String(Math.floor(Math.random() * 1e9));
+		},
+
+		getCollector: function(tabId) {
+			if ( this.collectors.hasOwnProperty(tabId) ) {
+				return this.collectors[tabId];
+			}
+			return null;
+		},
+
+		forwardCall: function(details, collectorMemberFunction) {
+			var collector = this.getCollector(details.tabId);
+			if ( collector !== null ) {
+				collectorMemberFunction.apply(collector, [details]);
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function() {
+		var logMessage = Array.from(arguments).join(' ');
+		var message = {message: logMessage, event: 'console-log-message'};
+		browser.tabs.sendMessage(this.tabId, message);
+	};
+
+	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, adTrackingEvent) {
+		var msg = {};
+		msg.assets = [];
+		msg.requests = [];
+		msg.event_data = {};
+		msg.event = adTrackingEvent;
+		if ( adTrackingEvent === 'new-video-ad' ) {
+			msg.requests = reqs;
+			msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;});
+			if ( assetReq ) {
+				msg.assets = [assetReq];
+			}
+		} else if ( adTrackingEvent === 'new-invalid-video-ad' ) {
+			msg.requests = reqs.map(function(request) {
+				return parseHostnameFromUrl(request.url);
+			});
+			msg.assets = [{
+
+				url: parseHostnameFromUrl(assetReq.url),
+
+				contentType: assetReq.contentType,
+				size: assetReq.size
+			}];
+		}
+		msg.origUrl = curPageUrl;
+		msg.displayAdFound = this.displayAdFound;
+
+		browser.tabs.sendMessage(this.tabId, msg);
+	};
+
+	PageNetworkTrafficCollector.prototype.getRedirKey = function(url, frameId) {
+		return url + ':' + frameId;
+	};
+
+	PageNetworkTrafficCollector.prototype.seenBefore = function(request) {
+		var oldTime = this.assetsSeen[assetMsgKey(request)];
+		if ( oldTime && (request.requestTimestamp-oldTime < secBetweenDupAssets)){
+
+			return true;
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.recordSeenAsset = function(request) {
+		this.assetsSeen[assetMsgKey(request)] = request.requestTimestamp;
+	};
+
+	PageNetworkTrafficCollector.prototype.onBeforeRequest = function(details) {
+		var req = {
+			url: details.url,
+			type: details.type,
+			httpMethod: details.method,
+			frameId: details.frameId,
+			parentFrameId: details.parentFrameId,
+			requestTimestamp: details.timeStamp,
+		};
+		this.requests[details.requestId] = req;
+	};
+
+	PageNetworkTrafficCollector.prototype.onSendHeaders = function(details) {
+		var request, header;
+		request = this.requests[details.requestId];
+		header = request && findHeader(details.requestHeaders, 'x-requested-with');
+		if ( header && header.value.toLowerCase().indexOf('flash') > -1 ) {
+			request.from_flash = true;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onHeadersReceived = function(details) {
+		var getFrameDetails = {
+			tabId: details.tabId,
+			processId: null,
+			frameId: details.frameId
+		};
+		var pageNetworkTrafficController = this;
+		getFrame(getFrameDetails, function(frameDetails) {
+			if ( frameDetails && frameDetails.url ) {
+				pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
+			}
+		});
+	};
+
+	PageNetworkTrafficCollector.prototype._onHeadersReceived = function(details, frameDetails) {
+		var contentSize, contentRange;
+
+		var request = this.requests[details.requestId];
+		if ( request ) {
+			var redirParent = this.allRedirects[this.getRedirKey(details.url, details.frameId)];
+			var header = request && findHeader(details.responseHeaders, 'content-type');
+			var contentType = header && header.value.toLowerCase();
+
+			if ( contentType){
+				request.contentType = contentType;
+			}
+			header = request && findHeader(details.responseHeaders, 'content-length');
+			contentSize = header && header.value;
+			if ( contentSize ) {
+				request.size = request.size || 0;
+				request.size += parseInt(contentSize);
+			}
+			header = request && findHeader(details.responseHeaders, 'content-range');
+			contentRange = header && header.value;
+			if ( contentRange ) {
+				request.contentRange = parseInt(contentRange.split('/')[1]);
+			}
+
+			var frameUrl = null;
+			if ( frameDetails && frameDetails.url ) {
+				frameUrl = frameDetails.url;
+			}
+			if ( !this.bannedRequest(request) &&
+				(this.isVideoReq(frameUrl, request) || (redirParent && redirParent.isVideo))) {
+				request.isVideo = true;
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onBeforeRedirect = function(details) {
+		var request = this.requests[details.requestId];
+		if ( request ) {
+			if ( request.redirects ) {
+				request.redirects.push(details.redirectUrl);
+			} else {
+				request.redirects = [details.redirectUrl];
+			}
+			this.allRedirects[this.getRedirKey(details.redirectUrl, details.frameId)] = request;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.isYoutubeMastheadRequest = function(url) {
+		var re = /video_masthead/;
+		return this.hasYoutubeDomain(url) && re.test(url);
+	};
+	PageNetworkTrafficCollector.prototype.isYoutubeVideoRequest = function(srcUrl, destUrl) {
+		if ( !this.hasYoutubeDomain(srcUrl) ) {
+			return false;
+		}
+
+		var re = /https?:\/\/r.*?\.googlevideo\.com\/videoplayback\?/;
+		return re.test(destUrl);
+	};
+	PageNetworkTrafficCollector.prototype.processResponse = function(requestDetails, frameDetails) {
+		var request;
+		if ( requestDetails ) {
+			request = this.requests[requestDetails.requestId];
+			if ( request ) {
+				request.responseStatus = requestDetails.statusCode;
+				request.responseTimestamp = requestDetails.timeStamp;
+
+				var frameUrl = null;
+				if ( frameDetails && frameDetails.url ) {
+					frameUrl = frameDetails.url;
+				}
+
+				var requestUrl = null;
+				if ( request.url ) {
+					requestUrl = request.url;
+				}
+
+				if ( this.isYoutubeAdReq(frameUrl, requestUrl) ) {
+					var destVideoId = this.parseYoutubeVideoIdFromUrl(requestUrl);
+					var srcVideoId = this.parseYoutubeVideoIdFromUrl(frameUrl);
+					if ( srcVideoId && destVideoId ) {
+						request.isYoutubeAd = true;
+						request.isVideo = true;
+						request.rawSrcUrl = frameUrl;
+						request.rawDestUrl = requestUrl;
+						request.url = 'https://www.youtube.com/watch?v=' + this.parseYoutubeVideoIdFromUrl(requestUrl);
+					}
+				} else if ( !this.bannedRequest(request) &&
+						(this.isVideo || this.isVideoReq(frameUrl, request))) {
+					request.isVideo = true;
+				}
+
+				if ( request.isVideo ) {
+
+					var msgKey = assetMsgKey(request);
+					this.msgsBeingSent[msgKey] = request;
+					if ( !this.seenBefore(request) ) {
+						this.sendMsgWhenQuiet(msgKey);
+					}
+					this.recordSeenAsset(request);
+				}
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onResponseStarted = function(responseDetails) {
+		if ( responseDetails.frameId < 0 ) {
+			responseDetails.frameId = 99999;
+
+		}
+		var getFrameDetails = {
+			tabId: responseDetails.tabId,
+			processId: null,
+			frameId: responseDetails.frameId
+		};
+		var pageNetworkTrafficController = this;
+		getFrame(getFrameDetails, function(frameDetails) {
+			if ( frameDetails && frameDetails.url ) {
+				pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
+			}
+		});
+	};
+
+	PageNetworkTrafficCollector.prototype.hasBannedFiletype = function(request) {
+		var url = stripQueryParams(request.url);
+		if ( bannedFiletypesReg.exec(url) ) {
+			return true;
+		} else {
+			return false;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.checkContentHeaders = function(request) {
+		if ( request.contentType && validVideoType(request.contentType) ) {
+			return true;
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.checkUrlExtension = function(request) {
+		var url = stripQueryParams(request.url);
+		if ( extensionsReg.exec(url) ) {
+			return true;
+		} else {
+			return false;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.isVideoReq = function(srcUrl, request) {
+		if ( this.isYoutubeVideoRequest(srcUrl, request.url) ) {
+			return false;
+		}
+		return this.checkUrlExtension(request) || this.checkContentHeaders(request);
+	};
+	PageNetworkTrafficCollector.prototype.hasYoutubeDomain = function(url) {
+		var hostname = parseHostnameFromUrl(url) ;
+		if ( hostname === 'www.youtube.com' ) {
+			return true;
+		}
+		return false;
+	};
+	PageNetworkTrafficCollector.prototype.parseYoutubeVideoIdFromUrl = function(url) {
+		var re = /^https?:\/\/www\.youtube\.com\/get_video_info.*(?:\?|&)video_id=(.*?)(?:$|&)/;
+		var match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+
+		re = /^https?:\/\/www\.youtube\.com\/embed\/(.*?)(?:$|\?)/;
+		match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+
+		re = /^https?:\/\/www\.youtube\.com\/watch.*(\?|&)v=([^&]*)/;
+		match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+		return null;
+	};
+
+	PageNetworkTrafficCollector.prototype.isYoutubeGetVideoInfoReq = function(url) {
+		var re = /^https?:\/\/www\.youtube\.com\/get_video_info\?/;
+		return re.test(url);
+	};
+	PageNetworkTrafficCollector.prototype.isYoutubeAdReq = function(srcUrl, destUrl) {
+
+		if ( !this.hasYoutubeDomain(srcUrl) ||
+			!this.isYoutubeGetVideoInfoReq(destUrl)) {
+			return false;
+		}
+		if ( this.parseYoutubeVideoIdFromUrl(srcUrl) ===
+			this.parseYoutubeVideoIdFromUrl(destUrl) &&
+			!this.isYoutubeMastheadRequest(destUrl)) {
+			return false;
+		}
+		return true;
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedRequest = function(request) {
+		return this.bannedVideoType(request) || this.hasBannedFiletype(request) || this.bannedVideoSize(request);
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedVideoType = function(request) {
+		var badType = false;
+		if ( request.contentType ) {
+			badType = bannedContentTypes.some(function(prefix) {
+				return request.contentType.indexOf(prefix) >= 0;
+			});
+		}
+		return badType;
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedVideoSize = function(request) {
+		if ( request.size !== null ) {
+			if ( request.size < minVidSize || request.size > maxVidSize || request.contentRange > maxContentRange ) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.grabTagReqs = function(tabRequests, assetRequest) {
+		var minTimestamp, maxTimestamp;
+		minTimestamp = assetRequest.requestTimestamp - secBefore;
+		maxTimestamp = assetRequest.requestTimestamp + secAfter;
+
+		var filteredRequests = tabRequests.filter(function(request) {
+			return (request.requestTimestamp > minTimestamp &&
+				request.requestTimestamp < maxTimestamp &&
+				request.frameId === assetRequest.frameId &&
+				request.url !== assetRequest.url &&
+				(hasValidRequestType(request) ||
+				isPixelRequest(request)));
+		});
+
+		return filteredRequests;
+	};
+
+	PageNetworkTrafficCollector.prototype.isValidVideoAd = function(assetRequest, tagRequests) {
+		var hasVpaidOrVastRequest = tagRequests.some(function(tagRequest) {
+			return isVpaidOrVastRequest(tagRequest);
+		});
+
+		if ( assetRequest.isYoutubeAd ) {
+			return true;
+		}
+		if ( hasVpaidOrVastRequest ) {
+			return true;
+		}
+		var hasTopVideoAssetDomain = topVideoAssetDomains.some(function(assetDomain) {
+			return hasDomain(assetRequest.url, assetDomain);
+		});
+
+		return hasTopVideoAssetDomain;
+	};
+
+	PageNetworkTrafficCollector.prototype.sendMsgWhenQuiet = function(msgKey) {
+		var _this = this,
+			origPageUrl, msgAssetReq;
+		msgAssetReq = this.msgsBeingSent[msgKey];
+		browser.tabs.get(this.tabId).then(function(tab) {
+			origPageUrl = tab.url;
+		});
+
+		setTimeout(function() {
+			var rawRequests = [];
+			if ( globalPageContainer.collectors[_this.tabId] === _this ) {
+				for ( var reqId in _this.requests ) {
+					rawRequests.push(_this.requests[reqId]);
+				}
+				var tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
+
+				if ( _this.isValidVideoAd(msgAssetReq, tagReqs) ) {
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
+				} else {
+
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
+				}
+
+			} else {
+
+			}
+			delete _this.msgsBeingSent[msgKey];
+		}, secAfter+secBefore);
+	};
+
+	PageNetworkTrafficCollector.prototype.existingMessage = function(candidateRequest) {
+		var frameMsg = this.msgsBeingSent[candidateRequest.frameId];
+		if ( frameMsg ) {
+			return frameMsg;
+		} else {
+			return null;
+		}
+	};
+
+	function onBeforeRequestListener(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
+	}
+
+	function onSendHeadersListener(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
+	}
+
+	function onHeadersReceivedListener(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
+	}
+
+	function onBeforeRedirectListener(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
+	}
+
+	function onResponseStartedListener(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
+	}
+
+	function onCommittedListener(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCommitted(details);
+		}
+	}
+
+	function onCompletedListener(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCompleted(details);
+		}
+	}
+
+	function onRemovedListener(tabId, closeInfo) {
+		globalPageContainer.onTabClose(tabId, closeInfo);
+	}
+
+	function onMessageListener(message, sender, sendResponse) {
+		if ( message.event === 'new-ad' && message.data.event === 'ad' ) {
+			var tabId = sender.tab.id;
+			if ( tabId ) {
+				globalPageContainer.onDisplayAdFound(tabId);
+			}
+		}
+	}
+
+	function registerListeners() {
+
+		browser.webRequest.onBeforeRequest.addListener(
+			onBeforeRequestListener,
+			{urls: ['http://*/*', 'https://*/*']},
+			[]
+		);
+
+		browser.webRequest.onSendHeaders.addListener(
+			onSendHeadersListener,
+			{urls: ['http://*/*', 'https://*/*']},
+			['requestHeaders']
+		);
+
+		browser.webRequest.onHeadersReceived.addListener(
+			onHeadersReceivedListener,
+			{urls: ['http://*/*', 'https://*/*']},
+			['responseHeaders']
+		);
+
+		browser.webRequest.onBeforeRedirect.addListener(
+			onBeforeRedirectListener,
+			{urls: ['http://*/*', 'https://*/*']},
+			[]
+		);
+
+		browser.webRequest.onResponseStarted.addListener(
+			onResponseStartedListener,
+			{urls: ['http://*/*', 'https://*/*']},
+			['responseHeaders']
+		);
+
+		browser.webNavigation.onCommitted.addListener(onCommittedListener);
+		browser.webNavigation.onCompleted.addListener(onCompletedListener);
+		browser.tabs.onRemoved.addListener(onRemovedListener);
+		browser.runtime.onMessage.addListener(onMessageListener);
+
+		areListenersRegistered = true;
+	}
+
+	function unregisterListeners() {
+
+		browser.webRequest.onBeforeRequest.removeListener(
+			onBeforeRequestListener
+		);
+
+		browser.webRequest.onSendHeaders.removeListener(
+			onSendHeadersListener
+		);
+
+		browser.webRequest.onHeadersReceived.removeListener(
+			onHeadersReceivedListener
+		);
+
+		browser.webRequest.onBeforeRedirect.removeListener(
+			onBeforeRedirectListener
+		);
+
+		browser.webRequest.onResponseStarted.removeListener(
+			onResponseStartedListener
+		);
+
+		browser.webNavigation.onCommitted.removeListener(onCommittedListener);
+		browser.webNavigation.onCompleted.removeListener(onCompletedListener);
+		browser.tabs.onRemoved.removeListener(onRemovedListener);
+		browser.runtime.onMessage.removeListener(onMessageListener);
+		areListenersRegistered = false;
+	}
+
+	function areRequiredBrowserApisAvailable() {
+		return requiredBrowserApis.every(function(api) {
+			return typeof api !== 'undefined';
+		});
+	}
+
+	if ( areRequiredBrowserApisAvailable() ) {
+			ifBrowserValid(
+				function() {
+					browser.webNavigation.onBeforeNavigate.addListener(
+						function(details) {
+							if ( details.frameId === 0 ) {
+								globalPageContainer.onNewNavigation(details);
+							}
+						},
+						{
+							url: [{urlMatches: 'http://*/*'}, {urlMatches: 'https://*/*'}]
+						}
+					);
+				}, function() {
+
+				}
+			);
+	}
+
+	browser.runtime.onConnect.addListener((port) => {
+		port.onMessage.addListener((message) => {
+			if ( message === 'is_browser_valid' ) {
+				ifBrowserValid(
+					port.postMessage({'browser_valid': true}),
+					port.postMessage({'browser_valid': false})
+				);
+			}
+		});
+	});
+
+	browser.runtime.onConnect.addListener((port) => {
+		port.onMessage.addListener((message) => {
+			if ( message === 'is_tracking_enabled' ) {
+				ifTrackingEnabled(
+					port.sender.tab,
+					function() {
+						try {port.postMessage({'tracking_enabled': true});}
+						catch(err) {} },
+					function() {
+						try {port.postMessage({'tracking_enabled': false});}
+						catch(err) {} }
+				);
+			}
+			return true;
+		});
+	});
+
+})();
+
 },{}]},{},[1]);
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index 935d11318..4666b0045 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -1,24 +1,51 @@
 /** global: browser */
 /** global: Wappalyzer */
+/* globals browser Wappalyzer */
+/* eslint-env browser */
 
 const wappalyzer = new Wappalyzer();
 
-function getOption(name, defaultValue, callback) {
-  browser.storage.local.get(name)
-    .then((item) => {
-      callback(item.hasOwnProperty(name) ? item[name] : defaultValue);
-    });
+/**
+ * Get a value from localStorage
+ */
+function getOption(name, defaultValue = null) {
+  return new Promise(async (resolve, reject) => {
+    let value = defaultValue;
+
+    try {
+      const option = await browser.storage.local.get(name);
+
+      if (option[name] !== undefined) {
+        value = option[name];
+      }
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
+
+      return reject(error.message);
+    }
+
+    return resolve(value);
+  });
 }
 
+/**
+ * Set a value in localStorage
+ */
 function setOption(name, value) {
-  (chrome || browser).runtime.sendMessage({
-    id: 'set_option',
-    key: name,
-    value,
+  return new Promise(async (resolve, reject) => {
+    try {
+      await browser.storage.local.set({ [name]: value });
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
+
+      return reject(error.message);
+    }
+
+    return resolve();
   });
 }
 
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener('DOMContentLoaded', async () => {
   const nodes = document.querySelectorAll('[data-i18n]');
 
   Array.prototype.forEach.call(nodes, (node) => {
@@ -26,44 +53,44 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   document.querySelector('#github').addEventListener('click', () => {
-    open(wappalyzer.config.githubURL);
+    window.open(wappalyzer.config.githubURL);
   });
 
   document.querySelector('#twitter').addEventListener('click', () => {
-    open(wappalyzer.config.twitterURL);
+    window.open(wappalyzer.config.twitterURL);
   });
 
   document.querySelector('#wappalyzer').addEventListener('click', () => {
-    open(wappalyzer.config.websiteURL);
+    window.open(wappalyzer.config.websiteURL);
   });
 
-  getOption('upgradeMessage', true, (value) => {
-    const el = document.querySelector('#option-upgrade-message');
+  let el;
+  let value;
 
-    el.checked = value;
+  // Upgrade message
+  value = await getOption('upgradeMessage', true);
 
-    el.addEventListener('change', () => {
-      setOption('upgradeMessage', el.checked);
-    });
-  });
+  el = document.querySelector('#option-upgrade-message');
 
-  getOption('dynamicIcon', true, (value) => {
-    const el = document.querySelector('#option-dynamic-icon');
+  el.checked = value;
 
-    el.checked = value;
+  el.addEventListener('change', e => setOption('upgradeMessage', e.target.checked));
 
-    el.addEventListener('change', () => {
-      setOption('dynamicIcon', el.checked);
-    });
-  });
+  // Dynamic icon
+  value = await getOption('dynamicIcon', true);
 
-  getOption('tracking', true, (value) => {
-    const el = document.querySelector('#option-tracking');
+  el = document.querySelector('#option-dynamic-icon');
 
-    el.checked = value;
+  el.checked = value;
 
-    el.addEventListener('change', () => {
-      setOption('tracking', el.checked);
-    });
-  });
+  el.addEventListener('change', e => setOption('dynamicIcon', e.target.checked));
+
+  // Tracking
+  value = await getOption('tracking', true);
+
+  el = document.querySelector('#option-tracking');
+
+  el.checked = value;
+
+  el.addEventListener('change', e => setOption('tracking', e.target.checked));
 });
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index e560162fd..42ed70089 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -1,32 +1,26 @@
-/** global: chrome */
+/* eslint-env browser */
+/* global browser, jsonToDOM */
+
 /** global: browser */
+/** global: jsonToDOM */
 
 let pinnedCategory = null;
+let termsAccepted = false;
 
-const func = (tabs) => {
-  (chrome || browser).runtime.sendMessage({
-    id: 'get_apps',
-    tab: tabs[0],
-    source: 'popup.js',
-  }, (response) => {
-    pinnedCategory = response.pinnedCategory;
+const port = browser.runtime.connect({
+  name: 'popup.js',
+});
 
-    replaceDomWhenReady(appsToDomTemplate(response));
-  });
-};
+function slugify(string) {
+  return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+}
 
-browser.tabs.query({ active: true, currentWindow: true })
-  .then(func)
-  .catch(console.error);
+function i18n() {
+  const nodes = document.querySelectorAll('[data-i18n]');
 
-function replaceDomWhenReady(dom) {
-  if (/complete|interactive|loaded/.test(document.readyState)) {
-    replaceDom(dom);
-  } else {
-    document.addEventListener('DOMContentLoaded', () => {
-      replaceDom(dom);
-    });
-  }
+  Array.prototype.forEach.call(nodes, (node) => {
+    node.innerHTML = browser.i18n.getMessage(node.dataset.i18n);
+  });
 }
 
 function replaceDom(domTemplate) {
@@ -38,11 +32,7 @@ function replaceDom(domTemplate) {
 
   container.appendChild(jsonToDOM(domTemplate, document, {}));
 
-  const nodes = document.querySelectorAll('[data-i18n]');
-
-  Array.prototype.forEach.call(nodes, (node) => {
-    node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n);
-  });
+  i18n();
 
   Array.from(document.querySelectorAll('.detected__category-pin-wrapper')).forEach((pin) => {
     pin.addEventListener('click', () => {
@@ -64,7 +54,7 @@ function replaceDom(domTemplate) {
         pinnedCategory = categoryId;
       }
 
-      (chrome || browser).runtime.sendMessage({
+      port.postMessage({
         id: 'set_option',
         key: 'pinnedCategory',
         value: pinnedCategory,
@@ -73,6 +63,16 @@ function replaceDom(domTemplate) {
   });
 }
 
+function replaceDomWhenReady(dom) {
+  if (/complete|interactive|loaded/.test(document.readyState)) {
+    replaceDom(dom);
+  } else {
+    document.addEventListener('DOMContentLoaded', () => {
+      replaceDom(dom);
+    });
+  }
+}
+
 function appsToDomTemplate(response) {
   let template = [];
 
@@ -92,8 +92,7 @@ function appsToDomTemplate(response) {
       const apps = [];
 
       for (const appName in categories[cat].apps) {
-        const confidence = response.tabCache.detected[appName].confidenceTotal;
-        const version = response.tabCache.detected[appName].version;
+        const { confidence, version } = response.tabCache.detected[appName];
 
         apps.push(
           [
@@ -190,6 +189,58 @@ function appsToDomTemplate(response) {
   return template;
 }
 
-function slugify(string) {
-  return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+async function getApps() {
+  try {
+    const tabs = await browser.tabs.query({
+      active: true,
+      currentWindow: true,
+    });
+
+    port.postMessage({
+      id: 'get_apps',
+      tab: tabs[0],
+    });
+  } catch (error) {
+    console.error(error); // eslint-disable-line no-console
+  }
 }
+
+function displayApps(response) {
+  pinnedCategory = response.pinnedCategory; // eslint-disable-line prefer-destructuring
+  termsAccepted = response.termsAccepted; // eslint-disable-line prefer-destructuring
+
+  if (termsAccepted) {
+    replaceDomWhenReady(appsToDomTemplate(response));
+  } else {
+    i18n();
+
+    const wrapper = document.querySelector('.terms__wrapper');
+
+    document.querySelector('.terms__accept').addEventListener('click', () => {
+      port.postMessage({
+        id: 'set_option',
+        key: 'termsAccepted',
+        value: true,
+      });
+
+      wrapper.classList.remove('terms__wrapper--active');
+
+      getApps();
+    });
+
+    wrapper.classList.add('terms__wrapper--active');
+  }
+}
+
+port.onMessage.addListener((message) => {
+  switch (message.id) {
+    case 'get_apps':
+      displayApps(message.response);
+
+      break;
+    default:
+      // Do nothing
+  }
+});
+
+getApps();
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index ab541bb2d..86f70d9aa 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -1,78 +1,84 @@
 {
-	"name": "Wappalyzer",
-	"short_name": "Wappalyzer",
-	"author": "Elbert Alias",
-	"homepage_url": "https://www.wappalyzer.com",
-	"description": "Identify web technologies",
-	"version": "5.5.4",
-	"default_locale": "en",
-	"manifest_version": 2,
-	"icons": {
-		"16": "images/icon_16.png",
-		"19": "images/icon_19.png",
-		"32": "images/icon_32.png",
-		"38": "images/icon_38.png",
-		"128": "images/icon_128.png"
-	},
-	"page_action": {
-		"default_icon": {
-			"16": "images/icon_16.png",
-			"19": "images/icon_19.png",
-			"32": "images/icon_32.png",
-			"38": "images/icon_38.png",
-			"128": "images/icon_128.png"
-		},
-		"default_title": "Wappalyzer",
-		"default_popup": "html/popup.html"
-	},
-	"background": {
-		"page": "html/background.html"
+  "name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "Elbert Alias",
+  "homepage_url": "https://www.wappalyzer.com",
+  "description": "Identify web technologies",
+  "version": "5.8.2",
+  "default_locale": "en",
+  "manifest_version": 2,
+  "icons": {
+    "16": "images/icon_16.png",
+    "19": "images/icon_19.png",
+    "32": "images/icon_32.png",
+    "38": "images/icon_38.png",
+    "128": "images/icon_128.png"
+  },
+  "page_action": {
+    "default_icon": {
+      "16": "images/icon_16.png",
+      "19": "images/icon_19.png",
+      "32": "images/icon_32.png",
+      "38": "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+    "default_title": "Wappalyzer",
+    "default_popup": "html/popup.html"
+  },
+  "background": {
+    "page": "html/background.html"
 
-	},
-	"content_scripts": [
-		{
-			"matches": [
-				"http://*/*",
-				"https://*/*"
-			],
-			"js": [
-				"node_modules/webextension-polyfill/dist/browser-polyfill.js",
-				"js/content.js"
-			],
-			"run_at": "document_idle"
-		},
-		{
-			"matches": [
+  },
+  "content_scripts": [
+    {
+      "matches": [
         "http://*/*",
-				"https://*/*"
-			],
-			"exclude_matches": [
-				"https://*.modirum.com/*",
-				"https://www.alphaecommerce.gr/*"
-			],
-			"js": [
-				"js/lib/iframe.js"
-			],
-			"run_at": "document_start",
-			"all_frames": true
-		}
-	],
-	"web_accessible_resources": [
-		"js/inject.js"
-	],
-	"options_page": "html/options.html",
-	"options_ui": {
-		"page": "html/options.html",
-		"open_in_tab": false
-	},
-	"permissions": [
+        "https://*/*"
+      ],
+      "js": [
+        "node_modules/webextension-polyfill/dist/browser-polyfill.js",
+        "js/content.js"
+      ],
+      "run_at": "document_idle"
+    },
+    {
+      "matches": [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "exclude_matches": [
+        "https://*.modirum.com/*",
+        "https://www.alphaecommerce.gr/*"
+      ],
+      "js": [
+        "node_modules/webextension-polyfill/dist/browser-polyfill.js",
+        "js/lib/iframe.js"
+      ],
+      "run_at": "document_start",
+      "all_frames": true
+    }
+  ],
+  "web_accessible_resources": [
+    "js/inject.js"
+  ],
+  "options_ui": {
+    "page": "html/options.html",
+    "open_in_tab": false
+  },
+  "permissions": [
     "cookies",
-		"storage",
-		"tabs",
-		"webRequest",
-		"webNavigation",
-		"http://*/*",
-		"https://*/*"
-	],
-	"content_security_policy": "script-src 'self'; object-src 'self'"
+    "storage",
+    "tabs",
+    "webRequest",
+    "webNavigation",
+    "http://*/*",
+    "https://*/*"
+  ],
+  "content_security_policy": "script-src 'self'; object-src 'self'",
+  "applications": {
+    "gecko": {
+      "id": "wappalyzer@crunchlabz.com",
+      "strict_min_version": "60.0"
+    }
+  }
 }
diff --git a/src/drivers/webextension/npm-shrinkwrap.json b/src/drivers/webextension/npm-shrinkwrap.json
index ebcf0d9eb..9934b3a1c 100644
--- a/src/drivers/webextension/npm-shrinkwrap.json
+++ b/src/drivers/webextension/npm-shrinkwrap.json
@@ -3,9 +3,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "webextension-polyfill": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.2.1.tgz",
-      "integrity": "sha1-zfyRJgMwOfFxNVMVfTW+/x1Nb0o="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.4.0.tgz",
+      "integrity": "sha512-oreMp+EoAo1pzRMigx4jB5jInIpx6NTCySPSjGyLLee/dCIPiRqowCEfbFP8o20wz9SOtNwSsfkaJ9D/tRgpag=="
     }
   }
 }
diff --git a/src/drivers/webextension/package.json b/src/drivers/webextension/package.json
index 9b344ae21..837c5acf8 100644
--- a/src/drivers/webextension/package.json
+++ b/src/drivers/webextension/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "webextension-polyfill": "^0.2.1"
+    "webextension-polyfill": "^0.4.0"
   }
 }
diff --git a/src/icons/91app.png b/src/icons/91app.png
new file mode 100644
index 000000000..3963238b1
Binary files /dev/null and b/src/icons/91app.png differ
diff --git a/src/icons/AMPcms.png b/src/icons/AMPcms.png
deleted file mode 100644
index 1d528c84b..000000000
Binary files a/src/icons/AMPcms.png and /dev/null differ
diff --git a/src/icons/Accessible Portal.png b/src/icons/Accessible Portal.png
deleted file mode 100644
index 688c1122e..000000000
Binary files a/src/icons/Accessible Portal.png and /dev/null differ
diff --git a/src/icons/Analysys Ark.svg b/src/icons/Analysys Ark.svg
new file mode 100644
index 000000000..3e8322823
--- /dev/null
+++ b/src/icons/Analysys Ark.svg	
@@ -0,0 +1 @@
+<svg width="204px" height="204px" viewBox="0 0 204 204" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g><circle fill="#235FD3" cx="102" cy="102" r="102"></circle><g transform="translate(83.000000, 38.000000)" fill="#FFFFFF" fill-rule="nonzero"><path d="M88.5,51.3 L88.5,51.3 C90.8,51.3 92.6,49.5 92.6,47.2 L92.6,31.1 C92.6,28.8 90.8,27 88.5,27 L88.5,27 C86.2,27 84.4,28.8 84.4,31.1 L84.4,47.3 C84.4,49.5 86.2,51.3 88.5,51.3 Z"></path><path d="M67.5,51.3 L67.5,51.3 C69.8,51.3 71.6,49.5 71.6,47.2 L71.6,15.6 C71.6,13.3 69.8,11.5 67.5,11.5 L67.5,11.5 C65.2,11.5 63.4,13.3 63.4,15.6 L63.4,47.2 C63.4,49.5 65.2,51.3 67.5,51.3 Z"></path><path d="M46.5,51.3 L46.5,51.3 C48.8,51.3 50.6,49.5 50.6,47.2 L50.6,4.5 C50.6,2.2 48.8,0.4 46.5,0.4 L46.5,0.4 C44.2,0.4 42.4,2.2 42.4,4.5 L42.4,47.3 C42.4,49.5 44.3,51.3 46.5,51.3 Z"></path><path d="M25.5,51.3 L25.5,51.3 C27.8,51.3 29.6,49.5 29.6,47.2 L29.6,31.1 C29.6,28.8 27.8,27 25.5,27 L25.5,27 C23.2,27 21.4,28.8 21.4,31.1 L21.4,47.3 C21.4,49.5 23.3,51.3 25.5,51.3 Z"></path><path d="M4.5,51.3 L4.5,51.3 C6.8,51.3 8.6,49.5 8.6,47.2 L8.6,20.6 C8.6,18.3 6.8,16.5 4.5,16.5 L4.5,16.5 C2.2,16.5 0.4,18.3 0.4,20.6 L0.4,47.2 C0.4,49.5 2.3,51.3 4.5,51.3 Z"></path></g><g transform="translate(29.000000, 40.000000)" fill="#FFFFFF" fill-rule="nonzero"><path d="M2.6,39.7 C0.2,33.3 -0.6,26.2 0.6,19 C1.8,11.8 4.9,5.5 9.2,0.3 C11.7,6.7 12.5,13.7 11.3,21 C10.1,28.2 7,34.5 2.6,39.7 Z"></path><path d="M2.7,39.7 C5.5,33.5 9.9,27.9 15.8,23.6 C21.7,19.4 28.4,17.1 35.1,16.5 C32.4,22.8 28,28.4 22,32.6 C16.1,36.8 9.4,39.2 2.7,39.7 Z"></path></g><path d="M116.6,122.6 L122.1,119.8 L116.7,117.1 C117.7,115.5 119.4,114.4 121.5,114.4 C124.6,114.4 127.1,116.9 127.1,120 C127.1,123.1 124.6,125.6 121.5,125.6 C119.4,125.6 117.6,124.3 116.6,122.6 Z" fill="#FFFFFF" fill-rule="nonzero"></path><path d="M179.6,93.4 L195.5,93.4 C195.5,139.4 158.2,176.7 112.2,176.7 C109.5,176.7 106.9,176.6 104.3,176.3 C146.6,172.3 179.6,136.7 179.6,93.4 Z" fill="#FFFFFF" fill-rule="nonzero" opacity="0.32"></path><path d="M163.8,93.4 L179.7,93.4 C179.7,136.7 146.6,172.3 104.4,176.3 C101.7,176 99.1,175.7 96.5,175.2 C134.8,167.8 163.8,134 163.8,93.4 Z" fill="#FFFFFF" fill-rule="nonzero" opacity="0.56"></path><path d="M147.9,93.4 L163.8,93.4 C163.8,134 134.8,167.8 96.4,175.2 C93.7,174.7 91.1,174 88.5,173.3 C122.8,163 147.9,131.1 147.9,93.4 Z" fill="#FFFFFF" fill-rule="nonzero" opacity="0.8"></path><path d="M94.4,93.4 L65.9,93.4 C51.4,93.4 38.6,86 31.1,74.7 C29.8,80.7 29,87 29,93.4 L29,93.4 C29,114.9 37.1,134.5 50.5,149.2 L33.6,170.6 C43.2,174.5 53.7,176.6 64.7,176.6 C73,176.6 81,175.4 88.5,173.1 C122.9,162.9 148,131 148,93.3 L94.4,93.3 L94.4,93.4 Z M118.5,130 C112.8,130 108.2,125.4 108.2,119.7 C108.2,114 112.8,109.4 118.5,109.4 C124.2,109.4 128.8,114 128.8,119.7 C128.8,125.4 124.2,130 118.5,130 Z" fill="#FFFFFF" fill-rule="nonzero"></path></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Arc Forum.png b/src/icons/Arc Forum.png
deleted file mode 100644
index c01f4e466..000000000
Binary files a/src/icons/Arc Forum.png and /dev/null differ
diff --git a/src/icons/Bloomreach.png b/src/icons/Bloomreach.png
new file mode 100644
index 000000000..25b13e808
Binary files /dev/null and b/src/icons/Bloomreach.png differ
diff --git a/src/icons/Botble-CMS.png b/src/icons/Botble-CMS.png
new file mode 100755
index 000000000..9704f5d7a
Binary files /dev/null and b/src/icons/Botble-CMS.png differ
diff --git a/src/icons/BugSense.png b/src/icons/BugSense.png
deleted file mode 100644
index 13eafe257..000000000
Binary files a/src/icons/BugSense.png and /dev/null differ
diff --git a/src/icons/C++.png b/src/icons/C++.png
deleted file mode 100644
index bfb1f9856..000000000
Binary files a/src/icons/C++.png and /dev/null differ
diff --git a/src/icons/CO2Stats.png b/src/icons/CO2Stats.png
deleted file mode 100644
index 47689c3be..000000000
Binary files a/src/icons/CO2Stats.png and /dev/null differ
diff --git a/src/icons/PHPoole.png b/src/icons/Cecil.png
similarity index 100%
rename from src/icons/PHPoole.png
rename to src/icons/Cecil.png
diff --git a/src/icons/Combeenation.png b/src/icons/Combeenation.png
new file mode 100644
index 000000000..86792253e
Binary files /dev/null and b/src/icons/Combeenation.png differ
diff --git a/src/icons/Contens.png b/src/icons/Contensis.png
similarity index 100%
rename from src/icons/Contens.png
rename to src/icons/Contensis.png
diff --git a/src/icons/Countly.png b/src/icons/Countly.png
new file mode 100644
index 000000000..ae9d8db96
Binary files /dev/null and b/src/icons/Countly.png differ
diff --git a/src/icons/DataPower.png b/src/icons/DataPower.png
new file mode 100644
index 000000000..0cee484aa
Binary files /dev/null and b/src/icons/DataPower.png differ
diff --git a/src/icons/Day.js.svg b/src/icons/Day.js.svg
new file mode 100644
index 000000000..6ceade70d
--- /dev/null
+++ b/src/icons/Day.js.svg
@@ -0,0 +1 @@
+<svg id="svg" version="1.1" width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ><g id="svgg"><path id="path0" d="M23.636 166.547 L 23.636 170.455 37.614 170.462 C 56.645 170.473,60.741 171.473,67.440 177.739 C 79.681 189.190,77.786 215.757,64.102 224.538 C 58.998 227.813,56.092 228.360,43.636 228.386 L 32.500 228.409 32.382 204.886 L 32.265 181.364 27.950 181.364 L 23.636 181.364 23.636 208.907 L 23.636 236.451 39.659 236.252 C 57.898 236.026,59.627 235.766,66.818 232.173 C 91.113 220.032,90.405 178.681,65.695 166.566 C 59.147 163.355,57.081 163.062,39.432 162.839 L 23.636 162.639 23.636 166.547 M119.761 176.932 C 101.953 220.460,96.313 234.362,96.075 235.310 C 95.813 236.356,95.842 236.364,100.068 236.364 L 104.326 236.364 116.800 204.432 C 128.195 175.265,132.727 163.452,132.727 162.924 C 132.727 162.816,131.117 162.727,129.150 162.727 L 125.572 162.727 119.761 176.932 M165.909 162.958 C 165.909 163.102,169.036 168.479,172.858 174.906 C 176.680 181.333,181.633 189.695,183.866 193.488 C 186.099 197.282,188.069 200.297,188.244 200.189 C 188.770 199.864,192.275 193.598,192.249 193.028 C 192.236 192.738,188.394 185.852,183.711 177.727 L 175.196 162.955 170.553 162.825 C 167.999 162.754,165.909 162.814,165.909 162.958 M212.045 177.552 C 207.295 185.691,201.213 196.169,198.528 200.835 L 193.647 209.318 193.642 222.841 L 193.636 236.364 197.955 236.364 L 202.273 236.364 202.273 222.896 L 202.273 209.429 216.355 186.078 L 230.437 162.727 225.559 162.740 L 220.682 162.752 212.045 177.552 M292.592 163.014 C 292.416 163.190,292.267 173.271,292.260 185.417 C 292.242 218.638,291.095 224.471,283.864 228.132 C 279.387 230.398,268.901 229.902,264.147 227.199 C 263.303 226.719,262.564 226.386,262.504 226.459 C 262.445 226.531,261.933 228.002,261.366 229.726 L 260.336 232.861 261.418 233.698 C 268.560 239.222,285.856 238.426,292.872 232.250 C 299.716 226.226,300.682 220.722,300.682 187.727 L 300.682 162.955 296.797 162.825 C 294.660 162.753,292.768 162.838,292.592 163.014 M339.871 163.663 C 328.552 166.445,322.955 173.121,322.955 183.840 C 322.955 195.205,327.009 198.524,347.500 203.931 C 364.158 208.327,368.715 212.471,366.331 221.055 C 363.402 231.603,340.332 232.131,326.800 221.960 C 325.287 220.822,323.986 219.967,323.909 220.059 C 323.833 220.152,322.895 221.740,321.826 223.590 L 319.882 226.952 320.964 227.808 C 340.724 243.430,373.115 238.752,376.054 219.850 C 378.081 206.808,371.838 201.037,349.663 195.454 C 334.781 191.707,331.847 189.576,331.833 182.500 C 331.807 169.658,351.643 165.701,366.296 175.626 C 367.633 176.531,368.786 177.273,368.858 177.273 C 369.023 177.273,372.727 171.048,372.727 170.769 C 372.727 170.272,366.627 166.650,363.790 165.464 C 357.059 162.649,347.060 161.896,339.871 163.663 M136.038 177.095 C 133.217 184.514,132.974 182.398,138.146 195.455 C 140.671 201.830,142.639 207.301,142.519 207.614 C 142.355 208.042,140.068 208.182,133.229 208.182 L 124.156 208.182 123.254 210.568 C 122.757 211.881,122.209 213.313,122.036 213.750 C 121.741 214.495,122.447 214.545,133.123 214.545 C 144.456 214.545,144.528 214.552,145.158 215.568 C 145.507 216.131,147.592 221.040,149.793 226.477 L 153.793 236.364 158.313 236.364 C 162.401 236.364,162.812 236.288,162.608 235.568 C 162.484 235.131,157.113 221.886,150.672 206.136 C 144.232 190.386,138.611 176.602,138.182 175.504 L 137.401 173.508 136.038 177.095 M237.273 230.909 L 237.273 236.364 240.909 236.364 L 244.545 236.364 244.545 230.909 L 244.545 225.455 240.909 225.455 L 237.273 225.455 237.273 230.909 " stroke="none" fill="#ff5f4c" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/Docker.svg b/src/icons/Docker.svg
new file mode 100644
index 000000000..b8b16676e
--- /dev/null
+++ b/src/icons/Docker.svg
@@ -0,0 +1,18 @@
+<svg width="2491" height="1415" viewBox="0 0 2491 1415" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1435.43 446.797V451.68H1440.31H1658.73V675.068V679.951H1663.61H1776.51C1829.22 679.951 1883.37 670.568 1933.23 653.677L1933.23 653.677C1957.71 645.37 1985.28 633.792 2009.61 619.154L2014.29 616.338L2010.97 612.001C1980.15 571.768 1964.28 520.759 1959.61 470.186L1959.61 470.185C1953.22 401.14 1967.29 312.037 2013.21 258.936L2033.6 235.351L2057.9 254.889L2057.9 254.891C2127.76 311.016 2185.96 389.028 2196.19 477.408L2196.86 483.166L2202.42 481.53C2286.19 456.892 2384.32 462.819 2457.7 505.167L2460.14 500.938L2457.7 505.167L2484.34 520.541L2470.32 547.911C2408.38 668.793 2278.67 706.796 2150.35 700.075L2146.87 699.892L2145.57 703.132C1953.12 1182.47 1534.27 1409.57 1025.52 1409.57C763.051 1409.57 523.044 1311.52 386.405 1079.49L386.398 1079.47L384.24 1075.83L364.29 1035.23C318.142 933.144 302.775 821.231 313.192 709.281L315.932 679.951H502.441H507.324V675.068V451.68H725.732H730.615V446.797V228.379H1172.34H1177.23V223.496V5.07812H1435.43V446.797Z" fill="#364548" stroke="black" stroke-width="9.76562"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2163.77 531.25C2178.74 414.883 2091.66 323.486 2037.66 280.088C1975.42 352.041 1965.75 540.615 2063.39 620.01C2008.9 668.408 1894.08 712.275 1776.51 712.275H345.41C333.984 835 355.527 948.018 404.736 1044.75L421.016 1074.53C431.323 1092.01 442.587 1108.91 454.756 1125.16C513.594 1128.94 567.842 1130.23 617.471 1129.14H617.49C715.019 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.144 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 742.705 1157.6 677.002 1161.65C680.908 1161.72 672.939 1162.24 672.92 1162.24C670.684 1162.38 667.871 1162.71 665.625 1162.82C639.766 1164.28 611.855 1164.58 583.32 1164.58C552.109 1164.58 521.377 1163.99 487.012 1162.24L486.133 1162.82C605.371 1296.85 791.816 1377.23 1025.53 1377.23C1520.14 1377.23 1939.67 1157.97 2125.45 665.732C2257.25 679.258 2383.92 645.645 2441.53 533.164C2349.76 480.205 2231.73 497.09 2163.77 531.25" fill="#22A0C8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2163.77 531.25C2178.74 414.883 2091.66 323.486 2037.66 280.088C1975.42 352.041 1965.75 540.615 2063.39 620.01C2008.9 668.408 1894.08 712.275 1776.51 712.275H430.156C424.316 900.225 494.063 1042.89 617.461 1129.14H617.49C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 738.33 1158.77 672.627 1162.82C672.607 1162.82 671.035 1161.31 671.016 1161.31C839.346 1247.66 1083.42 1247.34 1363.25 1139.85C1677.02 1019.31 1969 789.658 2172.72 526.992C2169.66 528.379 2166.67 529.795 2163.77 531.25" fill="#37B1D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M348.096 861.387C356.982 927.129 376.221 988.682 404.736 1044.75L421.016 1074.53C431.322 1092.01 442.586 1108.92 454.756 1125.16C513.604 1128.94 567.852 1130.23 617.49 1129.14C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 738.623 1158.18 672.92 1162.25C670.664 1162.38 666.729 1162.41 664.453 1162.54C638.613 1163.98 610.986 1164.87 582.441 1164.87C551.24 1164.87 519.326 1164.28 484.98 1162.53C604.219 1296.55 791.816 1377.23 1025.53 1377.23C1448.96 1377.23 1817.36 1216.5 2031.18 861.387H348.096Z" fill="#1B81A5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M443.037 861.387C468.35 976.816 529.18 1067.43 617.49 1129.14C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 737.461 1158.18 671.748 1162.25C840.068 1248.57 1083.44 1247.33 1363.25 1139.85C1532.53 1074.81 1695.45 977.998 1841.61 861.387H443.037Z" fill="#1D91B4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M539.648 484.014H733.184V677.549H539.648V484.014ZM555.771 500.146H571.045V661.426H555.771V500.146ZM584.482 500.146H600.371V661.426H584.492V500.146H584.482ZM613.799 500.146H629.688V661.426H613.799V500.146ZM643.135 500.146H659.014V661.426H643.135V500.146ZM672.461 500.146H688.34V661.426H672.461V500.146ZM701.777 500.146H717.061V661.426H701.777V500.146ZM762.949 260.713H956.494V454.238H762.939V260.713H762.949ZM779.082 276.846H794.346V438.115H779.082V276.846ZM807.793 276.846H823.672V438.115H807.803V276.846H807.793ZM837.109 276.846H852.988V438.115H837.109V276.846ZM866.436 276.846H882.314V438.115H866.436V276.846ZM895.762 276.846H911.65V438.115H895.762V276.846ZM925.078 276.846H940.371V438.115H925.078V276.846Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M762.949 486.014H956.494V679.549H762.939V486.014H762.949ZM779.082 502.146H794.346V663.426H779.082V502.146ZM807.793 502.146H823.672V663.426H807.803V502.146H807.793ZM837.109 502.146H852.988V663.426H837.109V502.146ZM866.436 502.146H882.314V663.426H866.436V502.146ZM895.762 502.146H911.65V663.426H895.762V502.146ZM925.078 502.146H940.371V663.426H925.078V502.146Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M986.26 484.014H1179.79V677.549H986.26V484.014ZM1002.38 500.146H1017.65V661.426H1002.38V500.146ZM1031.09 500.146H1046.97V661.426H1031.09V500.146ZM1060.42 500.146H1076.3V661.426H1060.42V500.146ZM1089.75 500.146H1105.63V661.426H1089.75V500.146ZM1119.06 500.146H1134.96V661.426H1119.06V500.146ZM1148.39 500.146H1163.66V661.426H1148.39V500.146V500.146Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M986.26 260.713H1179.79V454.238H986.26V260.713ZM1002.38 276.846H1017.65V438.115H1002.38V276.846ZM1031.09 276.846H1046.97V438.115H1031.09V276.846ZM1060.42 276.846H1076.3V438.115H1060.42V276.846ZM1089.75 276.846H1105.63V438.115H1089.75V276.846ZM1119.06 276.846H1134.96V438.115H1119.06V276.846ZM1148.39 276.846H1163.66V438.115H1148.39V276.846V276.846ZM1209.56 484.014H1403.1V677.549H1209.56V484.014ZM1225.69 500.146H1240.96V661.426H1225.69V500.146ZM1254.4 500.146H1270.28V661.426H1254.4V500.146ZM1283.72 500.146H1299.6V661.426H1283.72V500.146ZM1313.05 500.146H1328.94V661.426H1313.05V500.146ZM1342.37 500.146H1358.26V661.426H1342.37V500.146ZM1371.7 500.146H1386.97V661.426H1371.7V500.146Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1209.56 260.713H1403.1V454.238H1209.56V260.713ZM1225.69 276.846H1240.96V438.115H1225.69V276.846ZM1254.4 276.846H1270.28V438.115H1254.4V276.846ZM1283.72 276.846H1299.6V438.115H1283.72V276.846ZM1313.05 276.846H1328.94V438.115H1313.05V276.846ZM1342.37 276.846H1358.26V438.115H1342.37V276.846ZM1371.7 276.846H1386.97V438.115H1371.7V276.846Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1209.56 37.4023H1403.1V230.957H1209.56V37.4023ZM1225.69 53.5254H1240.96V214.814H1225.69V53.5156V53.5254ZM1254.4 53.5254H1270.28V214.814H1254.4V53.5156V53.5254ZM1283.72 53.5254H1299.6V214.814H1283.72V53.5156V53.5254ZM1313.05 53.5254H1328.94V214.814H1313.05V53.5156V53.5254ZM1342.37 53.5254H1358.26V214.814H1342.37V53.5156V53.5254ZM1371.7 53.5254H1386.97V214.814H1371.7V53.5156V53.5254Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1432.86 484.014H1626.4V677.549H1432.86V484.014ZM1448.97 500.146H1464.26V661.426H1448.98V500.146H1448.97ZM1477.69 500.146H1493.57V661.426H1477.7V500.146H1477.69ZM1507.02 500.146H1522.91V661.426H1507.02V500.146ZM1536.34 500.146H1552.23V661.426H1536.34V500.146ZM1565.67 500.146H1581.55V661.426H1565.67V500.146ZM1594.99 500.146H1610.26V661.426H1594.99V500.146Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M944.375 991.328C951.448 991.234 958.468 992.545 965.03 995.187C971.591 997.829 977.562 1001.75 982.597 1006.72C987.631 1011.68 991.628 1017.6 994.355 1024.13C997.083 1030.66 998.487 1037.66 998.486 1044.73C998.484 1051.8 997.078 1058.81 994.348 1065.33C991.618 1071.86 987.619 1077.77 982.583 1082.74C977.546 1087.71 971.574 1091.62 965.012 1094.26C958.449 1096.9 951.428 1098.21 944.356 1098.12C930.32 1097.92 916.924 1092.21 907.068 1082.22C897.211 1072.22 891.686 1058.75 891.689 1044.71C891.691 1030.67 897.221 1017.2 907.081 1007.21C916.942 997.222 930.339 991.515 944.375 991.328Z" fill="#D3ECEC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M944.375 1006.47C949.258 1006.47 953.916 1007.39 958.213 1009.06C955.248 1010.78 952.932 1013.43 951.624 1016.6C950.315 1019.77 950.087 1023.28 950.973 1026.6C951.86 1029.91 953.813 1032.83 956.53 1034.93C959.247 1037.02 962.577 1038.15 966.006 1038.16C971.914 1038.16 977.041 1034.89 979.697 1030.05C982.842 1037.62 983.467 1046.01 981.48 1053.97C979.492 1061.93 974.998 1069.04 968.66 1074.25C962.323 1079.45 954.478 1082.48 946.285 1082.89C938.092 1083.3 929.986 1081.06 923.163 1076.51C916.34 1071.95 911.162 1065.33 908.395 1057.6C905.628 1049.88 905.418 1041.47 907.796 1033.62C910.174 1025.77 915.013 1018.9 921.6 1014.01C928.187 1009.12 936.172 1006.48 944.375 1006.47V1006.47ZM0 880.684H2483.66C2429.59 866.973 2312.57 848.437 2331.87 777.559C2233.53 891.348 1996.39 857.393 1936.53 801.289C1869.89 897.949 1481.9 861.201 1454.84 785.898C1371.29 883.955 1112.39 883.955 1028.84 785.898C1001.76 861.201 613.779 897.949 547.129 801.279C487.285 857.393 250.156 891.348 151.816 777.568C171.113 848.437 54.0918 866.973 0 880.693" fill="#364548"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1086.3 1376.07C954.072 1313.33 881.504 1228.03 841.123 1134.92C792.002 1148.94 732.969 1157.9 664.365 1161.75C638.525 1163.19 611.338 1163.94 582.822 1163.94C549.932 1163.94 515.273 1162.96 478.887 1161.04C600.146 1282.23 749.316 1375.53 1025.53 1377.23C1045.92 1377.23 1066.15 1376.84 1086.3 1376.07" fill="#BDD9D7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M890.234 1220.84C871.943 1196.01 854.199 1164.79 841.152 1134.9C792.031 1148.94 732.979 1157.9 664.365 1161.76C711.494 1187.33 778.887 1211.04 890.244 1220.84" fill="#D3ECEC"/>
+</svg>
diff --git a/src/icons/EasyEngine.png b/src/icons/EasyEngine.png
new file mode 100644
index 000000000..737ecd1b7
Binary files /dev/null and b/src/icons/EasyEngine.png differ
diff --git a/src/icons/ElementUI.svg b/src/icons/ElementUI.svg
new file mode 100644
index 000000000..4c05f8d2b
--- /dev/null
+++ b/src/icons/ElementUI.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="162px" height="185px" viewBox="0 0 162 185" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>element-logo</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="element-logo" transform="translate(-1.000000, -1.000000)" fill="#409EFF" fill-rule="nonzero">
+            <path d="M156.79,42.9 C160.719111,44.6342514 163.127559,48.6576824 162.8,52.94 C162.8,52.94 162.8,126.2 162.8,133.32 C162.8,140.99 158.8,142.7 158.8,142.7 C158.8,142.7 90.08,182.41 85.61,184.9 C81.22,186.8 78.22,184.9 78.22,184.9 C78.22,184.9 6.31,143.2 3.69,141.36 C2.13506061,140.279463 1.1475571,138.557756 1,136.67 C1,136.67 1.07,54.1 1,50.27 C0.93,46.44 5.7,43.57 5.7,43.57 L77.55,2 C80.3018235,0.643101287 83.5281765,0.643101287 86.28,2 C86.28,2 149.75,38.93 156.79,42.9 Z M144.88,124.64 C144.89,122.91 144.89,116.19 144.89,107.71 L81.36,146.2 L81.36,131.48 C81.36,125.48 86.05,121.48 86.05,121.48 L142.26,87.62 C144.38,85.4 144.81,81.86 144.9,80.52 L144.9,65.61 L81.38,104.09 L81.38,88.7 C81.239749,85.3260948 82.7276345,82.0899436 85.38,80 L134.14,50.44 C119.43,42 84.78,21.89 84.78,21.89 C82.6164152,20.8289683 80.0835848,20.8289683 77.92,21.89 L21.51,54.39 C21.51,54.39 17.76,56.63 17.82,59.63 C17.88,62.63 17.82,127.26 17.82,127.26 C17.9452126,128.735416 18.7179395,130.079448 19.93,130.93 C22,132.36 78.45,164.98 78.45,164.98 C80.2731501,165.903084 82.4268499,165.903084 84.25,164.98 C87.76,163.05 141.71,131.98 141.71,131.98 C141.71,131.98 144.88,130.64 144.88,124.64 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Elementor.png b/src/icons/Elementor.png
new file mode 100644
index 000000000..87fc23e01
Binary files /dev/null and b/src/icons/Elementor.png differ
diff --git a/src/icons/Envoy.png b/src/icons/Envoy.png
new file mode 100644
index 000000000..5d69d481c
Binary files /dev/null and b/src/icons/Envoy.png differ
diff --git a/src/icons/F5.png b/src/icons/F5.png
new file mode 100644
index 000000000..fba894586
Binary files /dev/null and b/src/icons/F5.png differ
diff --git a/src/icons/GoJS.png b/src/icons/GoJS.png
new file mode 100644
index 000000000..5a91ade54
Binary files /dev/null and b/src/icons/GoJS.png differ
diff --git a/src/icons/Gravity Insights.png b/src/icons/Gravity Insights.png
deleted file mode 100644
index 57aeabc13..000000000
Binary files a/src/icons/Gravity Insights.png and /dev/null differ
diff --git a/src/icons/Gridsome.svg b/src/icons/Gridsome.svg
new file mode 100644
index 000000000..8fa8b0d89
--- /dev/null
+++ b/src/icons/Gridsome.svg
@@ -0,0 +1,30 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="512" height="512" rx="256" fill="#0D2538"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M395.449 227.098C411.96 226.303 426.575 239.112 428 255.638C434.176 335.58 362.331 424.985 259.229 427.85C242.706 428.309 228.94 415.249 228.482 398.68C228.025 382.111 241.048 368.307 257.571 367.848C325.97 365.947 369.301 306.869 366.988 258.514C366.196 241.957 378.939 227.892 395.449 227.098Z" fill="url(#paint0_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M115.322 225.395C131.851 225.395 145.251 238.832 145.251 255.408C145.251 324.59 200.878 369.364 256.439 367.993C272.963 367.585 286.689 380.687 287.095 397.258C287.502 413.828 274.436 427.592 257.911 428C171.026 430.144 85.0952 360.584 85.0952 255.408C85.0952 238.832 98.7921 225.395 115.322 225.395Z" fill="url(#paint1_linear)"/>
+<path d="M320.681 257.735C320.681 240.765 334.523 227.008 351.598 227.008H396.655C413.73 227.008 428 240.765 428 257.735C428 274.705 413.73 288.462 396.655 288.462H351.598C334.523 288.462 320.681 274.705 320.681 257.735Z" fill="url(#paint2_linear)"/>
+<path d="M226.142 257.78C226.142 240.785 239.896 227.008 256.844 227.008C273.792 227.008 287.546 240.785 287.546 257.78C287.546 274.775 273.792 288.552 256.844 288.552C239.896 288.552 226.142 274.775 226.142 257.78Z" fill="url(#paint3_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M286.696 114.008C287.382 130.569 274.549 144.552 258.034 145.24C186.74 148.209 143.215 204.243 145.334 257.449C145.993 274.011 133.407 287.974 116.891 288.635C100.374 289.296 85.8498 275.93 85.1903 259.367C81.738 172.664 153.932 86.95 255.55 85.2667C272.066 84.5789 286.01 97.4468 286.696 114.008Z" fill="url(#paint4_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="269.802" y1="499.697" x2="363.377" y2="511.725" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1A7D75"/>
+<stop offset="1" stop-color="#1A8864"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="96.4018" y1="247.925" x2="49.267" y2="371.855" gradientUnits="userSpaceOnUse">
+<stop offset="0.0129262" stop-color="#168A81"/>
+<stop offset="1" stop-color="#31A97F"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="165.819" y1="264.17" x2="245.175" y2="384.491" gradientUnits="userSpaceOnUse">
+<stop stop-color="#27A59B"/>
+<stop offset="1" stop-color="#64D8A2"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="137.536" y1="264.224" x2="223.107" y2="338.352" gradientUnits="userSpaceOnUse">
+<stop stop-color="#27A59B"/>
+<stop offset="1" stop-color="#64D8A2"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="511.85" y1="-203.453" x2="259.997" y2="-288.462" gradientUnits="userSpaceOnUse">
+<stop stop-color="#27A59B"/>
+<stop offset="1" stop-color="#64D8A2"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/icons/GrowingIO.png b/src/icons/GrowingIO.png
new file mode 100644
index 000000000..c96be59fc
Binary files /dev/null and b/src/icons/GrowingIO.png differ
diff --git a/src/icons/Halo.svg b/src/icons/Halo.svg
new file mode 100644
index 000000000..cce2a59db
--- /dev/null
+++ b/src/icons/Halo.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="256.000000pt" height="256.000000pt" viewBox="0 0 256.000000 256.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,256.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1035 2500 c-508 -110 -892 -503 -980 -1005 -23 -130 -21 -330 5
+-454 102 -500 477 -877 977 -980 139 -29 345 -29 484 -1 435 89 783 390 933
+808 87 244 90 554 5 806 -137 409 -471 713 -898 818 -127 31 -401 35 -526 8z
+m-203 -1195 l-57 -190 -62 -3 -61 -3 29 93 c16 50 29 96 29 101 0 4 -19 7 -42
+5 l-41 -3 -30 -97 -30 -98 -59 0 c-52 0 -59 2 -54 18 3 9 15 50 27 90 11 40
+19 76 16 79 -4 3 -23 -4 -43 -16 -20 -12 -38 -21 -39 -19 -8 8 54 85 83 103
+22 14 36 35 50 75 l19 55 56 3 c64 3 66 0 42 -67 l-14 -41 44 0 44 0 16 55 16
+54 57 3 c31 2 58 1 59 -2 2 -3 -23 -90 -55 -195z m418 5 l0 -200 -55 0 -55 0
+0 40 0 40 -60 0 c-59 0 -60 0 -80 -40 l-20 -40 -65 0 -64 0 104 173 c57 94
+114 182 127 194 18 17 38 23 93 26 39 1 71 4 73 5 1 1 2 -88 2 -198z m742 190
+c54 -15 81 -54 72 -105 -23 -140 -64 -237 -112 -267 -30 -18 -51 -22 -131 -22
+-170 -1 -199 29 -163 173 39 163 65 199 157 222 45 11 135 10 177 -1z m-492
+-11 c0 -6 -16 -63 -35 -126 -19 -64 -35 -124 -35 -134 0 -26 37 -33 125 -26
+l73 7 -14 -47 c-8 -25 -17 -49 -20 -52 -3 -3 -56 -6 -118 -6 -188 0 -199 20
+-135 245 l43 150 58 0 c35 0 58 -4 58 -11z"/>
+<path d="M1108 1339 c-21 -36 -38 -69 -38 -72 0 -13 71 -7 76 7 3 7 4 40 2 72
+l-3 59 -37 -66z"/>
+<path d="M1839 1420 c-19 -11 -29 -36 -60 -138 -24 -84 -18 -102 36 -102 48 0
+71 26 100 112 29 88 31 123 9 132 -23 9 -67 7 -85 -4z"/>
+</g>
+</svg>
diff --git a/src/icons/Hippo.png b/src/icons/Hippo.png
deleted file mode 100644
index 3b2b5adbd..000000000
Binary files a/src/icons/Hippo.png and /dev/null differ
diff --git a/src/icons/Instabot.png b/src/icons/Instabot.png
new file mode 100644
index 000000000..3b49095d3
Binary files /dev/null and b/src/icons/Instabot.png differ
diff --git a/src/icons/Ionicons.png b/src/icons/Ionicons.png
index ace620764..67497c434 100644
Binary files a/src/icons/Ionicons.png and b/src/icons/Ionicons.png differ
diff --git a/src/icons/Klarna.svg b/src/icons/Klarna.svg
index 0bb061c85..56524058c 100644
--- a/src/icons/Klarna.svg
+++ b/src/icons/Klarna.svg
@@ -1 +1,15 @@
-<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><title>klarna</title><path d="M50.487 67.747c.197 21.498 12.425 41.418 31.753 52.167 9.467 5.226 20.117 7.987 31.064 8.086-.198-10.453-3.057-20.709-8.481-29.683-11.242-18.637-32.05-30.274-54.336-30.57zm0-7.494c22.286-.296 43.094-11.933 54.336-30.57 5.424-8.974 8.283-19.23 8.48-29.683-10.946.099-21.596 2.958-31.063 8.185-19.328 10.749-31.556 30.669-31.753 52.068zM39.639 0H21.89C17.55 0 14 3.353 14 7.495v117.448c0 1.38 1.282 2.761 3.156 2.761h17.849c4.339 0 7.79-3.353 7.79-7.494V2.564C42.795 1.084 41.513 0 39.64 0z" fill="#0072CC" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 165.9 144.2" style="enable-background:new 0 0 165.9 144.2;" xml:space="preserve">
+<g>
+	<path d="M114,0.6H82.2c0,26.1-12,50.1-33,65.8l-12.6,9.5l48.9,66.7H125h0.7l-45-61.4C102.1,60,114,31.4,114,0.6z"/>
+	<rect y="0.6" width="32.7" height="142"/>
+	<path d="M148.1,108.5c-9.9,0-17.8,8-17.8,17.8c0,9.8,8,17.8,17.8,17.8c9.8,0,17.8-8,17.8-17.8C165.9,116.5,157.9,108.5,148.1,108.5
+		z"/>
+	<path d="M136.1,5.3c0-1.3-1-2.2-2.5-2.2H131v7.2h1.3V7.6h1.4l1,2.7h1.4l-1.3-2.9C135.6,7,136.1,6.3,136.1,5.3z M133.6,6.5h-1.4V4.3
+		h1.4c0.9,0,1.2,0.4,1.2,1.1C134.8,6,134.6,6.5,133.6,6.5z"/>
+	<path d="M140,6.8c0-3.8-3-6.8-6.7-6.8c-3.7,0-6.7,3.1-6.7,6.8c0,3.7,3,6.8,6.7,6.8C137,13.6,140,10.6,140,6.8z M127.8,6.8
+		c0-3,2.4-5.5,5.4-5.5s5.4,2.5,5.4,5.5s-2.4,5.5-5.4,5.5S127.8,9.9,127.8,6.8z"/>
+</g>
+</svg>
diff --git a/src/icons/LOU.png b/src/icons/LOU.png
new file mode 100644
index 000000000..c2836cab4
Binary files /dev/null and b/src/icons/LOU.png differ
diff --git a/src/icons/LocalFocus.png b/src/icons/LocalFocus.png
new file mode 100644
index 000000000..0571a349b
Binary files /dev/null and b/src/icons/LocalFocus.png differ
diff --git a/src/icons/Mithril.svg b/src/icons/Mithril.svg
new file mode 100644
index 000000000..04cb102f1
--- /dev/null
+++ b/src/icons/Mithril.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 38.044 38.044" style="enable-background:new 0 0 38.044 38.044;" xml:space="preserve">
+<g>
+	<g>
+		<path style="fill:#010002;" d="M31.716,13.5C31.699,6.47,25.974,0.755,18.94,0.755c-7.045,0-12.777,5.732-12.777,12.777    c0,0.022,0.004,0.043,0.004,0.065C2.477,15.84,0,19.887,0,24.511c0,7.046,5.731,12.777,12.777,12.777    c2.268,0,4.395-0.601,6.244-1.642c1.849,1.041,3.977,1.642,6.245,1.642c7.046,0,12.777-5.732,12.777-12.777    C38.043,19.82,35.495,15.722,31.716,13.5z M19.021,32.961c-2.312-1.713-3.906-4.341-4.22-7.352c1.3,0.448,2.689,0.702,4.139,0.702    c1.514,0,2.96-0.278,4.307-0.764C22.949,28.584,21.349,31.236,19.021,32.961z M8.517,14.898c1.303-0.579,2.743-0.909,4.26-0.909    c1.475,0,2.879,0.307,4.154,0.858c-2.114,1.826-3.629,4.325-4.195,7.167C10.473,20.352,8.898,17.814,8.517,14.898z M18.94,24.055    c-1.457,0-2.846-0.298-4.109-0.837c0.361-2.928,1.929-5.482,4.19-7.157c2.243,1.662,3.802,4.187,4.18,7.085    C21.897,23.727,20.457,24.055,18.94,24.055z M21.111,14.846c1.275-0.55,2.679-0.858,4.154-0.858c1.457,0,2.846,0.298,4.11,0.837    c-0.356,2.885-1.883,5.404-4.089,7.082C24.704,19.108,23.199,16.65,21.111,14.846z M18.94,3.01c5.432,0,9.915,4.137,10.466,9.425    c-1.3-0.447-2.689-0.702-4.14-0.702c-2.268,0-4.396,0.601-6.245,1.642c-1.848-1.041-3.975-1.642-6.244-1.642    c-1.514,0-2.96,0.278-4.307,0.763C8.993,7.179,13.488,3.01,18.94,3.01z M12.777,35.034c-5.803,0-10.523-4.72-10.523-10.523    c0-3.418,1.645-6.451,4.177-8.375c0.744,3.581,2.999,6.607,6.059,8.408c0.011,3.847,1.735,7.293,4.442,9.631    C15.656,34.727,14.253,35.034,12.777,35.034z M25.266,35.034c-1.475,0-2.879-0.307-4.154-0.858    c2.715-2.345,4.444-5.804,4.444-9.664c0-0.022-0.004-0.044-0.004-0.065c3.007-1.829,5.209-4.852,5.918-8.416    c2.613,1.917,4.319,4.999,4.319,8.48C35.788,30.313,31.068,35.034,25.266,35.034z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Moxa.png b/src/icons/Moxa.png
deleted file mode 100644
index 03a2e6f93..000000000
Binary files a/src/icons/Moxa.png and /dev/null differ
diff --git a/src/icons/NOIX.png b/src/icons/NOIX.png
deleted file mode 100644
index ae6f9fee6..000000000
Binary files a/src/icons/NOIX.png and /dev/null differ
diff --git a/src/icons/Netmonitor.png b/src/icons/Netmonitor.png
deleted file mode 100644
index 45da0d733..000000000
Binary files a/src/icons/Netmonitor.png and /dev/null differ
diff --git a/src/icons/Nuxt.js.svg b/src/icons/Nuxt.js.svg
new file mode 100644
index 000000000..e0bd713f8
--- /dev/null
+++ b/src/icons/Nuxt.js.svg
@@ -0,0 +1,10 @@
+<svg width="486px" height="346px" viewBox="0 0 486 346" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Nuxt Logo</title>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g fill-rule="nonzero">
+            <polygon id="Shape" fill="#42B883" points="200 0 400 346 0 346"></polygon>
+            <polygon id="Shape" fill="#3C8171" points="311 43 486 346 136 346"></polygon>
+            <polygon id="Shape" fill="#35495E" points="267.945522 117 400 345.454247 136 345.454247"></polygon>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/PhotoShelter.png b/src/icons/PhotoShelter.png
new file mode 100644
index 000000000..b8d282d2e
Binary files /dev/null and b/src/icons/PhotoShelter.png differ
diff --git a/src/icons/PlatformOS.svg b/src/icons/PlatformOS.svg
new file mode 100644
index 000000000..d0f4281e2
--- /dev/null
+++ b/src/icons/PlatformOS.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 30.58 26.03" xmlns="http://www.w3.org/2000/svg"><path d="m5.07 0h2.63l-4.14 4.17z" fill="#3cd52e"/><path d="m2.16 11.04-2.16-3.88h2.11z" fill="#d70036"/><path d="m2.11 7.17h4.34l-4.29 3.87z" fill="#ea1d76"/><path d="m6.29 14.44.16-7.27-4.29 3.87z" fill="#ff8300"/><path d="m11.47 10.82-5.19 3.62.17-7.27z" fill="#ffce00"/><path d="m14.7 6.03-8.25 1.14 5.02 3.65z" fill="#3cd52e"/><path d="m12.79 0-3.33 4.09 5.24 1.94z" fill="#d70036"/><path d="m20.61 0h-7.82l1.91 6.03z" fill="#3e8ede"/><path d="m6.45 7.17 8.25-1.14-5.24-1.94z" fill="#ea1d76"/><path d="m22.09 6.03h-7.39l5.91-6.03z" fill="#1d4f90"/><path d="m18.38 12.75-6.91-1.93 3.23-4.79z" fill="#47a141"/><path d="m22.09 6.03-3.71 6.72-3.68-6.72z" fill="#005744"/><path d="m24.69 10.82-6.31 1.93 3.71-6.72z" fill="#47a141"/><path d="m23.54 14.74-5.16-1.99 6.31-1.93z" fill="#3cd52e"/><path d="m20.61 0 5.69 4.69-4.21 1.34z" fill="#3e8ede"/><path d="m22.09 6.03 4.21-1.34-1.61 6.13z" fill="#00953a"/><path d="m24.69 10.82 5.82 1.1-6.97 2.82z" fill="#005744"/><path d="m30.51 11.92.07 5.53-7.04-2.71z" fill="#47a141"/><path d="m23.54 14.74 7.04 2.71-5.32.89z" fill="#1d4f90"/><path d="m30.58 17.45-2.73 6.03-2.59-5.14z" fill="#3cd52e"/><path d="m25.26 18.34 2.59 5.14-3.94-2.19z" fill="#3e8ede"/><path d="m27.85 23.48-3.9 2.55-.04-4.74z" fill="#1d4f90"/><path d="m23.91 21.29.04 4.74-1.96-3.08z" fill="#3e8ede"/><path d="m23.95 26.03h-5.21l3.25-3.08z" fill="#1d4f90"/><path d="m21.99 22.95-3.25 3.08.57-3.08z" fill="#d70036"/><path d="m19.31 22.95-.57 3.08-2.51-3.08z" fill="#ea1d76"/><path d="m19.31 22.95h-3.08l1.83-2.13z" fill="#d70036"/><path d="m16.23 22.95v-4.03l1.83 1.9z" fill="#ff8300"/><path d="m26.3 4.69 4.21 7.23-5.82-1.1z" fill="#3cd52e"/><path d="m19.31 19.02-.42-2.07 3.08 1.39z" fill="#47a141"/><path d="m16.23 18.92 3.08.1-.42-2.07z" fill="#3cd52e"/><path d="m18.06 20.82 1.25-1.8-3.08-.1z" fill="#ffce00"/><path d="m7.17 2.69 2.29 1.4-.11-2.77z" fill="#47a141"/><path d="m7.17 2.69 2.18-1.37-1.65-1.32z" fill="#3cd52e"/><path d="m3.56 4.17 4.14-4.17-.53 2.69z" fill="#00953a"/><path d="m9.46 4.09-2.29-1.4-1.06 1.46z" fill="#005744"/><path d="m3.56 4.17 3.61-1.48-1.06 1.46z" fill="#47a141"/><path d="m2.11 7.17 4-3.02.34 3.02z" fill="#ff8300"/><path d="m6.11 4.15.34 3.02 3.01-3.08z" fill="#d70036"/><path d="m2.11 7.17 1.45-3 2.55-.02z" fill="#ffce00"/><path d="m11.87 14.43-1.25 2.13h3.6z" fill="#47a141"/><path d="m9.16 14.44 1.46 2.12 1.25-2.13z" fill="#3cd52e"/><path d="m11.47 10.82.4 3.61 6.51-1.68z" fill="#005744"/><path d="m14.22 16.56 4.16-3.81-6.51 1.68z" fill="#00953a"/></svg>
diff --git a/src/icons/Rocket.svg b/src/icons/Rocket.svg
new file mode 100644
index 000000000..feadcf82b
--- /dev/null
+++ b/src/icons/Rocket.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="52.2px" height="52.2px" viewBox="0 0 52.2 52.2" style="enable-background:new 0 0 52.2 52.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#EF7B24;}
+</style>
+<g>
+	<g>
+	</g>
+	<path class="st0" d="M44.6,7.6c-10.2-10.2-26.8-10.2-37,0s-10.2,26.8,0,37s26.8,10.2,37,0S54.8,17.8,44.6,7.6z M23.2,46.8
+		c-2.9-1.9-4.6-5.3-4.9-9.4c0-0.4,0-0.9,0-1.3c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0.3,0,0.7-0.1,1-0.1c0.1,0,0.2,0,0.3,0
+		c0.3,0,0.6-0.1,0.8-0.1c0.1,0,0.2,0,0.4-0.1c0.2,0,0.5-0.1,0.7-0.2c0.1,0,0.3-0.1,0.4-0.1c0.2,0,0.4-0.1,0.5-0.1
+		c0.4,1.7,1.1,3.3,2,4.8c0.2,0.3,0.7,0.4,1,0.2c0.6-0.5,1.2-1,1.8-1.6c2.1-2.2,3.4-4.9,4-7.7c0.1-0.1,0.2-0.2,0.3-0.2
+		c0.1-0.1,0.2-0.2,0.4-0.3c0.2-0.2,0.4-0.3,0.6-0.5c0.1-0.1,0.2-0.2,0.3-0.3c0.3-0.3,0.6-0.5,0.8-0.8c4.4-4.4,7-10.2,7.3-16.3
+		c0-0.4-0.1-0.8-0.4-1l0,0c-0.3-0.3-0.7-0.4-1-0.4c-6.2,0.3-11.9,2.9-16.3,7.3c-0.3,0.3-0.5,0.5-0.8,0.8c-0.1,0.1-0.3,0.3-0.4,0.4
+		c-0.1,0.1-0.2,0.3-0.3,0.4c-0.2,0.2-0.4,0.5-0.6,0.7l0,0c-2.8,0.6-5.5,1.9-7.7,4c-0.6,0.6-1.2,1.2-1.6,1.8c-0.2,0.3-0.2,0.7,0.2,1
+		c1.5,1,3.1,1.6,4.8,2c-0.1,0.4-0.2,0.7-0.3,1.1c0,0,0,0,0,0c-0.1,0.3-0.1,0.7-0.2,1c0,0,0,0.1,0,0.1c-0.1,0.3-0.1,0.6-0.1,0.9
+		c0,0.1,0,0.2,0,0.3c0,0.3-0.1,0.5-0.1,0.8c0,0,0,0,0,0c-0.7,0-1.3,0-2-0.1c-3.7-0.3-6.8-2-8.6-4.9c0,0,0,0,0,0
+		c-1-1.5-1.3-3.3-1.1-5c0.6-5.7,3.3-11.2,8.4-15.2c7.9-6.2,19.2-6.1,27,0.1c10.4,8.3,11,23.5,1.9,32.6c-3.9,3.9-8.9,6-14.1,6.3
+		C26,48,24.5,47.7,23.2,46.8C23.2,46.8,23.2,46.8,23.2,46.8z M18.4,33.8c0.5-5.2,2.8-10.1,6.6-13.9c3.7-3.7,8.6-6.1,13.9-6.6
+		c-0.5,5.2-2.8,10.1-6.6,13.9c-0.5,0.5-1,0.9-1.5,1.3c-0.2,0.1-0.3,0.2-0.5,0.4c-0.4,0.3-0.7,0.6-1.1,0.8c-0.2,0.1-0.4,0.3-0.6,0.4
+		c-0.3,0.2-0.7,0.4-1,0.6c-0.3,0.1-0.5,0.3-0.8,0.4c-0.3,0.2-0.6,0.3-1,0.5c-0.3,0.2-0.7,0.3-1.1,0.4c-0.2,0.1-0.5,0.2-0.7,0.3
+		c-0.6,0.2-1.2,0.4-1.8,0.6c0,0-0.1,0-0.1,0C21,33.4,19.7,33.7,18.4,33.8z M5,32c2.2,2.4,5.3,3.8,8.9,4.1c0.7,0.1,1.4,0.1,2.1,0.1
+		l0,0l0,0c0,0.4,0,0.9,0,1.3c0.2,3.9,1.6,7.3,4,9.6c0,0,0,0,0,0c-3.5-1-6.7-2.8-9.4-5.6C7.9,38.8,6,35.5,5,32z"/>
+</g>
+</svg>
diff --git a/src/icons/Sensors Data.svg b/src/icons/Sensors Data.svg
new file mode 100644
index 000000000..7250e013c
--- /dev/null
+++ b/src/icons/Sensors Data.svg	
@@ -0,0 +1 @@
+<svg width="36px" height="45px" viewBox="0 0 36 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g fill="#5ABF9D"><path d="M27.4,39.589 L8.183,39.589 C6.96119557,39.646138 5.99997546,40.6533603 5.99997546,41.8765 C5.99997546,43.0996397 6.96119557,44.106862 8.183,44.164 L27.4,44.164 C28.6218044,44.106862 29.5830245,43.0996397 29.5830245,41.8765 C29.5830245,40.6533603 28.6218044,39.646138 27.4,39.589 L27.4,39.589 Z"></path><path d="M32.781,33.082 L19.681,33.082 C18.4591956,33.139138 17.4979755,34.1463603 17.4979755,35.3695 C17.4979755,36.5926397 18.4591956,37.599862 19.681,37.657 L32.781,37.657 C34.0028044,37.599862 34.9640245,36.5926397 34.9640245,35.3695 C34.9640245,34.1463603 34.0028044,33.139138 32.781,33.082 L32.781,33.082 Z"></path><path d="M32.776,26.575 L24.16,26.575 C22.9424076,26.637386 21.9871793,27.6428104 21.9871793,28.862 C21.9871793,30.0811896 22.9424076,31.086614 24.16,31.149 L32.776,31.149 C33.9935924,31.086614 34.9488207,30.0811896 34.9488207,28.862 C34.9488207,27.6428104 33.9935924,26.637386 32.776,26.575 L32.776,26.575 Z"></path><path d="M2.797,18.13 L11.413,18.13 C12.6348044,18.072862 13.5960245,17.0656397 13.5960245,15.8425 C13.5960245,14.6193603 12.6348044,13.612138 11.413,13.555 L2.797,13.555 C1.57519557,13.612138 0.613975464,14.6193603 0.613975464,15.8425 C0.613975464,17.0656397 1.57519557,18.072862 2.797,18.13 L2.797,18.13 Z"></path><path d="M13.479,20.056 C12.2525592,20.1072913 11.284687,21.1164872 11.284687,22.344 C11.284687,23.5715128 12.2525592,24.5807087 13.479,24.632 L22.094,24.632 C23.3158044,24.574862 24.2770245,23.5676397 24.2770245,22.3445 C24.2770245,21.1213603 23.3158044,20.114138 22.094,20.057 L13.48,20.057 L13.479,20.056 Z"></path><path d="M2.797,11.617 L15.891,11.617 C17.1085924,11.554614 18.0638207,10.5491896 18.0638207,9.33 C18.0638207,8.11081036 17.1085924,7.10538596 15.891,7.043 L2.797,7.043 C1.57940755,7.10538596 0.62417935,8.11081036 0.62417935,9.33 C0.62417935,10.5491896 1.57940755,11.554614 2.797,11.617 L2.797,11.617 Z"></path><path d="M8.173,5.11 L27.39,5.11 C28.6075924,5.04761404 29.5628207,4.04218964 29.5628207,2.823 C29.5628207,1.60381036 28.6075924,0.59838596 27.39,0.536 L8.173,0.536 C6.95540755,0.59838596 6.00017935,1.60381036 6.00017935,2.823 C6.00017935,4.04218964 6.95540755,5.04761404 8.173,5.11 Z"></path><circle cx="32.776" cy="9.333" r="2.285"></circle><circle cx="2.797" cy="35.372" r="2.285"></circle></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Shiny.png b/src/icons/Shiny.png
new file mode 100644
index 000000000..612d350d3
Binary files /dev/null and b/src/icons/Shiny.png differ
diff --git a/src/icons/Shopalize.png b/src/icons/Shopalize.png
deleted file mode 100644
index c73389954..000000000
Binary files a/src/icons/Shopalize.png and /dev/null differ
diff --git a/src/icons/Shoperfa.png b/src/icons/Shoperfa.png
new file mode 100644
index 000000000..b6bc62af8
Binary files /dev/null and b/src/icons/Shoperfa.png differ
diff --git a/src/icons/Strapi.png b/src/icons/Strapi.png
new file mode 100644
index 000000000..065887ab7
Binary files /dev/null and b/src/icons/Strapi.png differ
diff --git a/src/icons/UserEngage.png b/src/icons/UserEngage.png
deleted file mode 100644
index 49f2d16af..000000000
Binary files a/src/icons/UserEngage.png and /dev/null differ
diff --git a/src/icons/VTEX Enterprise.png b/src/icons/VTEX Enterprise.png
deleted file mode 100644
index 767831811..000000000
Binary files a/src/icons/VTEX Enterprise.png and /dev/null differ
diff --git a/src/icons/VTEX.svg b/src/icons/VTEX.svg
new file mode 100644
index 000000000..08a6671cf
--- /dev/null
+++ b/src/icons/VTEX.svg
@@ -0,0 +1,3 @@
+<svg width="62" height="54" viewBox="0 0 31 27" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.1389 0H5.42579C3.66461 0 2.53685 1.94391 3.36096 3.55995L5.63288 8.0266H1.51415C1.25332 8.02668 0.996923 8.0967 0.769805 8.22987C0.542687 8.36304 0.352542 8.55485 0.217788 8.78671C0.0830333 9.01858 0.0082363 9.28265 0.000642202 9.55335C-0.0069519 9.82404 0.0529137 10.0922 0.174441 10.3318L7.48211 24.692C7.61094 24.9446 7.80362 25.1559 8.03945 25.3033C8.27528 25.4507 8.54534 25.5286 8.82061 25.5286C9.09587 25.5286 9.36593 25.4507 9.60176 25.3033C9.83759 25.1559 10.0303 24.9446 10.1591 24.692L12.1438 20.813L14.6337 25.7072C15.51 27.4285 17.884 27.4317 18.7634 25.7122L30.1479 3.46979C30.9525 1.89662 29.8545 0 28.1389 0ZM17.9362 9.50329L13.0274 19.0961C12.9416 19.2641 12.8134 19.4046 12.6565 19.5026C12.4995 19.6006 12.3199 19.6524 12.1368 19.6524C11.9537 19.6524 11.774 19.6006 11.6171 19.5026C11.4602 19.4046 11.332 19.2641 11.2462 19.0961L6.38472 9.54364C6.30346 9.38438 6.2632 9.20602 6.26782 9.02586C6.27244 8.84569 6.32179 8.66982 6.41109 8.51527C6.5004 8.36071 6.62663 8.23272 6.77756 8.14369C6.92849 8.05465 7.099 8.00759 7.27259 8.00705H17.0702C17.2395 8.00706 17.4058 8.05254 17.5531 8.13907C17.7004 8.2256 17.8237 8.35023 17.9108 8.50085C17.998 8.65146 18.0462 8.82294 18.0506 8.9986C18.0551 9.17426 18.0157 9.34813 17.9362 9.50329Z" fill="#F71963"/>
+</svg>
diff --git a/src/icons/Volusion.png b/src/icons/Volusion.png
deleted file mode 100644
index 20e6d109a..000000000
Binary files a/src/icons/Volusion.png and /dev/null differ
diff --git a/src/icons/Volusion.svg b/src/icons/Volusion.svg
new file mode 100644
index 000000000..34dd13831
--- /dev/null
+++ b/src/icons/Volusion.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#8759F2" d="M128.928 163.067L81.066 80.152H32.898c-19.702.055-31.987 21.368-22.187 38.44L82.65 243.22c9.787 16.957 34.5 17.13 44.415-.023l46.277-80.15c-9.912 17.165-34.637 16.953-44.415.02z"/><path fill="#FF3E80" d="M176.806 80.152h-95.75l47.862 82.918c9.788 16.96 34.5 17.13 44.415-.023l25.665-44.422c9.908-17.17-2.642-38.475-22.192-38.473z"/><path fill="#FFC300" d="M223.083 0H79.176C59.473.055 47.188 21.367 56.988 38.44c0 .02 24.078 41.71 24.078 41.71h95.75c19.775 0 32 21.485 22.185 38.475l46.277-80.15C255.101 21.445 242.808 0 223.083 0z"/><path fill="#00D4E6" d="M56.998 38.442a25.638 25.638 0 0 1 .025-25.612L10.748 92.977A25.638 25.638 0 0 1 32.911 80.15h48.165L56.998 38.442z"/></svg>
\ No newline at end of file
diff --git a/src/icons/Web Optimizer.png b/src/icons/Web Optimizer.png
deleted file mode 100644
index 64fe47fae..000000000
Binary files a/src/icons/Web Optimizer.png and /dev/null differ
diff --git a/src/icons/WebsiteCreator.png b/src/icons/WebsiteCreator.png
new file mode 100644
index 000000000..3c25e14aa
Binary files /dev/null and b/src/icons/WebsiteCreator.png differ
diff --git a/src/icons/Webzi.svg b/src/icons/Webzi.svg
new file mode 100644
index 000000000..fe3ed90d6
--- /dev/null
+++ b/src/icons/Webzi.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 254.12 117.33">
+    <defs>
+        <style>.cls-1{fill:#1ab394;}.cls-2{fill:#a7a9ac;}</style>
+    </defs>
+    <title>logo</title>
+    <g id="Layer_2" >
+        <g id="Layer_3" >
+            <path class="cls-1"
+                  d="M95,67a90.66,90.66,0,0,1,10.28,1.69l3.79-1.41c10-3.75,14.25-17.22,9.43-30.11s-16.84-20.3-26.87-16.55l-3.11,1.16c-2.44,2.57-5.76,5.94-7.38,7.49s-6.42-1.85-8.21-6.16L67.42,9.85A13.83,13.83,0,0,0,55.65,2H6C1.32,2-1.15,5.58.52,9.95l37.94,99.44A13.32,13.32,0,0,0,50,117.33h53.63c4.68,0,7-3.53,5.24-7.85l-14-33.7C93,71.46,93.7,67,95,67Z"/>
+            <path class="cls-2"
+                  d="M161.33,42.63l-3-1.51c-3.54-.07-7.91-.1-9.71-.07s-3.08-4.75-1.36-9.1l9.08-23C158.09,4.56,155.66,1,151,1H99.33A15.11,15.11,0,0,0,87,8.61L84,14.73c-2.09,4.18-3.48,8.37-3.08,9.3s1.09,1.27,1.53.75,4-4.7,6.77-7.65l3.58-1.34c11.53-4.31,25.36,4.21,30.9,19s.69,30.32-10.84,34.63A30.42,30.42,0,0,1,108.48,71c-4.6-.83-6.88,2-5.05,6.33l7.38,17.42c1.82,4.31,4.52,7.83,6,7.83s4.08-3.56,5.8-7.91l4-10.17c1.71-4.35,3.3-7.69,3.52-7.41s2.65,4.28,4.93,8.11l3.6,1.84c9.53,4.87,22.33-1.11,28.59-13.36S170.86,47.5,161.33,42.63Z"/>
+            <path class="cls-1"
+                  d="M219.29,49.94c-4.82-12.89-16.84-20.3-26.87-16.55l-3.11,1.16c-2.44,2.57-5.24,5.65-6.22,6.84s-4.72-.92-6.46-5.26l-6-14.9c-1.74-4.34-4.51-7.89-6.16-7.89s-4.42,3.55-6.15,7.9l-3.61,9c-1.73,4.34-2.71,7.87-2.16,7.83s5.5-.21,9.57-.13l3.4,1.74c11,5.6,14,21.56,6.8,35.65s-21.92,21-32.88,15.37l-2.67-1.37c-2.14-2.43-4.58-2.68-5.43-.55s-.1,7.41,1.67,11.74l3.24,7.92A13.72,13.72,0,0,0,148,116.33h46.66c4.68,0,9.25-1.27,10.17-2.83s.24-6.39-1.5-10.73l-6-15.08c-1.74-4.34-2.64-8-2-8a102,102,0,0,1,10.78,1.82l3.79-1.41C219.89,76.31,224.11,62.83,219.29,49.94Z"/>
+            <path class="cls-1"
+                  d="M194.16,0A10,10,0,0,0,186,5.09l-6.32,12.83a14.27,14.27,0,0,0-.33,10.32L181,32.35c1.2,2.88,2.42,4.92,2.72,4.53s2.86-3.43,5-5.69c0,0,1.2-1.26,4.78-2.6,11.53-4.31,25.36,4.21,30.9,19s.69,30.32-10.84,34.63a13.72,13.72,0,0,1-6,1.09c-3.09-.43-4.64,1.58-3.44,4.46l3.53,8.48c1.2,2.88,3.6,5.23,5.34,5.23s4.1-2.38,5.23-5.28l35.54-91c1.13-2.9-.49-5.28-3.61-5.28Z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/Weglot.png b/src/icons/Weglot.png
new file mode 100644
index 000000000..33da33a8a
Binary files /dev/null and b/src/icons/Weglot.png differ
diff --git a/src/icons/Wikispaces.png b/src/icons/Wikispaces.png
deleted file mode 100644
index 91034ccf2..000000000
Binary files a/src/icons/Wikispaces.png and /dev/null differ
diff --git a/src/icons/Zipkin.png b/src/icons/Zipkin.png
new file mode 100644
index 000000000..e783a2ca1
Binary files /dev/null and b/src/icons/Zipkin.png differ
diff --git a/src/icons/aws-elb.png b/src/icons/aws-elb.png
new file mode 100644
index 000000000..8db611796
Binary files /dev/null and b/src/icons/aws-elb.png differ
diff --git a/src/icons/aws.svg b/src/icons/aws.svg
new file mode 100644
index 000000000..48209aef8
--- /dev/null
+++ b/src/icons/aws.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2273" viewBox="0 0 1100 1000"><path d="M2 776c3.333-5.333 8.666-5.667 16-1 166.666 96.667 348 145 544 145 130.666 0 259.666-24.333 387-73 3.333-1.333 8.166-3.333 14.5-6 6.333-2.667 10.833-4.667 13.5-6 10-4 17.833-2 23.5 6 5.666 8 3.833 15.333-5.5 22-12 8.667-27.334 18.667-46 30-57.334 34-121.334 60.333-192 79-70.667 18.667-139.667 28-207 28-104 0-202.334-18.167-295-54.5C162.333 909.167 79.333 858 6 792c-4-3.333-6-6.667-6-10 0-2 .666-4 2-6zm301-285c0-46 11.333-85.333 34-118 22.666-32.667 53.666-57.333 93-74 36-15.333 80.333-26.333 133-33 18-2 47.333-4.667 88-8v-17c0-42.667-4.667-71.333-14-86-14-20-36-30-66-30h-8c-22 2-41 9-57 21s-26.334 28.667-31 50c-2.667 13.333-9.334 21-20 23l-115-14c-11.334-2.667-17-8.667-17-18 0-2 .333-4.333 1-7 11.333-59.333 39.166-103.333 83.5-132C451.833 19.333 503.666 3.333 563 0h25c76 0 135.333 19.667 178 59a190.52 190.52 0 0 1 18.5 21.5c5.666 7.667 10.166 14.5 13.5 20.5 3.333 6 6.333 14.667 9 26 2.666 11.333 4.666 19.167 6 23.5 1.333 4.333 2.333 13.667 3 28 .666 14.333 1 22.833 1 25.5v242c0 17.333 2.5 33.167 7.5 47.5s9.833 24.667 14.5 31c4.666 6.333 12.333 16.5 23 30.5 4 6 6 11.333 6 16 0 5.333-2.667 10-8 14-55.334 48-85.334 74-90 78-8 6-17.667 6.667-29 2-9.334-8-17.5-15.667-24.5-23s-12-12.667-15-16-7.834-9.833-14.5-19.5c-6.667-9.667-11.334-16.167-14-19.5-37.334 40.667-74 66-110 76-22.667 6.667-50.667 10-84 10-51.334 0-93.5-15.833-126.5-47.5S303 549 303 491zm172-20c0 26 6.5 46.833 19.5 62.5S525 557 547 557c2 0 4.833-.333 8.5-1 3.666-.667 6.166-1 7.5-1 28-7.333 49.666-25.333 65-54 7.333-12.667 12.833-26.5 16.5-41.5 3.666-15 5.666-27.167 6-36.5.333-9.333.5-24.667.5-46v-25c-38.667 0-68 2.667-88 8-58.667 16.667-88 53.667-88 111zm420 322c1.333-2.667 3.333-5.333 6-8 16.666-11.333 32.666-19 48-23 25.333-6.667 50-10.333 74-11 6.666-.667 13-.333 19 1 30 2.667 48 7.667 54 15 2.666 4 4 10 4 18v7c0 23.333-6.334 50.833-19 82.5-12.667 31.667-30.334 57.167-53 76.5-3.334 2.667-6.334 4-9 4-1.334 0-2.667-.333-4-1-4-2-5-5.667-3-11 24.666-58 37-98.333 37-121 0-7.333-1.334-12.667-4-16-6.667-8-25.334-12-56-12-11.334 0-24.667.667-40 2-16.667 2-32 4-46 6-4 0-6.667-.667-8-2-1.334-1.333-1.667-2.667-1-4 0-.667.333-1.667 1-3z"/></svg>
\ No newline at end of file
diff --git a/src/icons/azure.svg b/src/icons/azure.svg
new file mode 100644
index 000000000..2ff63c104
--- /dev/null
+++ b/src/icons/azure.svg
@@ -0,0 +1 @@
+<svg height="1995" viewBox="0 0 161.67 129" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="m88.33 0-47.66 41.33-40.67 73h36.67zm6.34 9.67-20.34 57.33 39 49-75.66 13h124z" fill="#0072c6"/></svg>
\ No newline at end of file
diff --git a/src/icons/bigbangshop.svg b/src/icons/bigbangshop.svg
new file mode 100644
index 000000000..cfbeefd7b
--- /dev/null
+++ b/src/icons/bigbangshop.svg
@@ -0,0 +1 @@
+<svg id="690f6765-7a07-4a29-8fe9-8c677c2f4e43" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 935.69 819.11"><title>logo_bbs</title><path d="M36.37,574.42H103c16.32,0,27.82,4.07,35.43,11.67,5.19,5.19,8.35,12,8.35,20.93v0.37c0,15-8.53,23.89-20,28.9,15.77,5.19,25.78,14.08,25.78,31.67v0.37c0,22.23-18.18,35.75-49.16,35.75h-67V574.42Zm57.69,51.68c10.94,0,17.07-3.7,17.07-11.3v-0.37c0-7-5.56-11.11-16.32-11.11H71.43v22.78H94.06Zm5.19,49.08c10.94,0,17.25-4.26,17.25-11.85V663c0-7-5.57-11.67-17.62-11.67H71.43v23.89H99.26Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M169.75,574.42h36.17V704.07H169.75V574.42Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M225.22,639.61v-0.37c0-37.79,29.68-67.42,69.93-67.42,22.82,0,39,7,52.68,18.89l-21.15,25.38c-9.27-7.78-18.55-12.22-31.35-12.22-18.74,0-33.2,15.74-33.2,35.56v0.37c0,20.93,14.65,35.93,35.25,35.93,8.72,0,15.4-1.85,20.78-5.37V654.62h-25.6v-26.3h59.73v58.35a87.87,87.87,0,0,1-56.39,20C255.45,706.67,225.22,678.88,225.22,639.61Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M423.71,574.42h66.6c16.32,0,27.83,4.07,35.43,11.67,5.19,5.19,8.35,12,8.35,20.93v0.37c0,15-8.53,23.89-20,28.9,15.77,5.19,25.78,14.08,25.78,31.67v0.37c0,22.23-18.18,35.75-49.16,35.75h-67V574.42Zm57.69,51.68c10.94,0,17.07-3.7,17.07-11.3v-0.37c0-7-5.56-11.11-16.32-11.11H458.77v22.78H481.4Zm5.19,49.08c10.94,0,17.25-4.26,17.25-11.85V663c0-7-5.56-11.67-17.62-11.67H458.77v23.89h27.83Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M601.24,573.49h34.69l55.28,130.58H652.62l-9.46-23.15H593.08l-9.28,23.15H546ZM632.77,653L618.3,616.09,603.65,653h29.12Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M703.82,574.42H737.4l53.42,68.53V574.42h35.62V704.07H794.91l-55.46-71.13v71.13H703.82V574.42Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M845,639.61v-0.37c0-37.79,29.68-67.42,69.93-67.42,22.82,0,39,7,52.68,18.89l-21.15,25.38c-9.28-7.78-18.55-12.22-31.35-12.22-18.74,0-33.21,15.74-33.21,35.56v0.37c0,20.93,14.65,35.93,35.25,35.93,8.72,0,15.4-1.85,20.78-5.37V654.62h-25.6v-26.3h59.73v58.35a87.87,87.87,0,0,1-56.39,20C875.23,706.67,845,678.88,845,639.61Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M278.46,844.92l14.14-16.86c9,7.19,19.11,11,29.72,11,6.81,0,10.47-2.35,10.47-6.27v-0.26c0-3.79-3-5.88-15.45-8.76-19.5-4.44-34.56-9.93-34.56-28.76v-0.26c0-17,13.48-29.28,35.48-29.28,15.58,0,27.75,4.18,37.7,12.16l-12.7,17.91c-8.38-5.88-17.54-9-25.66-9-6.15,0-9.16,2.61-9.16,5.88v0.26c0,4.18,3.14,6,15.84,8.89,21.08,4.58,34.17,11.37,34.17,28.49v0.26c0,18.69-14.79,29.8-37,29.8C305.16,860.08,289.72,855,278.46,844.92Z" transform="translate(-36.37 -41.23)" style="fill:#3cbfba"/><path d="M388.68,767h25.4v34.25h32.6V767h25.4v91.5h-25.4V823.75h-32.6v34.77h-25.4V767Z" transform="translate(-36.37 -41.23)" style="fill:#3cbfba"/><path d="M503.09,813v-0.26c0-26.27,21.21-47.58,49.48-47.58s49.22,21,49.22,47.32v0.26c0,26.27-21.21,47.58-49.48,47.58S503.09,839.3,503.09,813Zm72.78,0v-0.26c0-13.2-9.56-24.7-23.56-24.7s-23.17,11.24-23.17,24.44v0.26c0,13.2,9.56,24.7,23.43,24.7S575.88,826.23,575.88,813Z" transform="translate(-36.37 -41.23)" style="fill:#3cbfba"/><path d="M633,767h39.27c23.17,0,38.09,11.89,38.09,32.15v0.26c0,21.57-16.62,32.94-39.4,32.94H658.35v26.14H633V767Zm37.44,45.49c9,0,14.53-4.71,14.53-11.89v-0.26c0-7.84-5.5-12-14.66-12H658.35v24.18h12Z" transform="translate(-36.37 -41.23)" style="fill:#3cbfba"/><path d="M739.31,449.39c-6.82-34.95-17.94-85.05-38.13-172.48-3.44-14.52-11.7-20.48-29.69-21.07-23.22-.3-416.76.32-416.76,0.32L186.46,42.41h-1.27L185,41.23H89.89a36.08,36.08,0,0,0-10.63,1.52c-16.81,4.44-27.64,17.13-27.64,32,0,11.56,7.45,22.53,19.38,28.43a22.32,22.32,0,0,0,9.8,3.59,55.17,55.17,0,0,0,9.09,1.2h48.59l5,15.69c0.51,1.49,75.86,241.28,104.68,335.84,2,6.5,10.24,27.56,34.51,27.56h426c9,0,20.87-1.49,27.05-8.89S741.06,458.26,739.31,449.39Z" transform="translate(-36.37 -41.23)" style="fill:#484748"/><path d="M284.79,214.64h366c29.45,0,33-17.79,27.94-38.2-10.31-43.6-18.14-71.78-23-92.24-8.82-35.83-15.89-43-66.29-43H229.48Z" transform="translate(-36.37 -41.23)" style="fill:#3cbfba"/></svg>
diff --git a/src/icons/chevereto.png b/src/icons/chevereto.png
new file mode 100644
index 000000000..81e189814
Binary files /dev/null and b/src/icons/chevereto.png differ
diff --git a/src/icons/clarity.svg b/src/icons/clarity.svg
new file mode 100644
index 000000000..29f217c2d
--- /dev/null
+++ b/src/icons/clarity.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
+    <title>logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo" transform="translate(0.000000, 4.500000)">
+            <g id="large" transform="translate(0.000000, 0.044118)">
+                <polyline id="Fill-3" fill="#0095D3" points="24.7018129 0.0388840336 35.979641 6.71768066 35.9614589 20.2811697 24.7018129 26.9417748 18.0173463 22.9707846 29.6688177 16.4295126 29.6688177 10.5321277 24.9216504 7.92742184 18.0321077 3.99030785"></polyline>
+                <polyline id="Fill-4" fill="#F38B00" points="11.3313965 0.0388840336 0.0535685039 6.71768066 0.0717505512 20.2811697 11.3313965 26.9417748 18.0166889 22.970061 7.35448694 16.4295126 7.35448694 10.5321277 18.0324642 3.98991663"></polyline>
+                <polyline id="Fill-5" fill="#004B70" points="18.017374 22.9708988 11.4990488 18.9719838 18.0212495 15.1272387 24.9510827 19.0786297"></polyline>
+                <polyline id="Fill-6" fill="#98441E" points="18.0314053 3.98921729 11.5267517 7.97364692 18.0439938 11.8578324 24.9058951 7.91831944"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/datadome.png b/src/icons/datadome.png
new file mode 100644
index 000000000..9c19fb1d7
Binary files /dev/null and b/src/icons/datadome.png differ
diff --git a/src/icons/freshchat.png b/src/icons/freshchat.png
new file mode 100644
index 000000000..b79a05767
Binary files /dev/null and b/src/icons/freshchat.png differ
diff --git a/src/icons/iEXExchanger.png b/src/icons/iEXExchanger.png
new file mode 100644
index 000000000..c237a2513
Binary files /dev/null and b/src/icons/iEXExchanger.png differ
diff --git a/src/icons/ionic.png b/src/icons/ionic.png
new file mode 100644
index 000000000..f1b7f2ec5
Binary files /dev/null and b/src/icons/ionic.png differ
diff --git a/src/icons/kestrel.svg b/src/icons/kestrel.svg
new file mode 100644
index 000000000..43a66f8c8
--- /dev/null
+++ b/src/icons/kestrel.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><defs><style>.cls-1{fill:#5c2d91;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.1;}.cls-4{fill:#f2f2f2;}</style></defs><title>logo_NETcore</title><circle class="cls-1" cx="32" cy="32" r="32"/><path class="cls-2" d="M9.82,9A32,32,0,1,0,55,54.18Z"/><path class="cls-3" d="M7.4,37.25a1.35,1.35,0,0,1-1-.42,1.38,1.38,0,0,1-.41-1,1.4,1.4,0,0,1,.41-1,1.34,1.34,0,0,1,1-.43,1.37,1.37,0,0,1,1,.43,1.39,1.39,0,0,1,.42,1,1.37,1.37,0,0,1-.42,1A1.38,1.38,0,0,1,7.4,37.25Z"/><path class="cls-3" d="M27.27,37H24.65L15.28,22.46a6,6,0,0,1-.58-1.14h-.08a18.72,18.72,0,0,1,.1,2.5V37H12.59V18.77h2.77l9.12,14.28q.57.89.74,1.22h.05a19.28,19.28,0,0,1-.13-2.68V18.77h2.13Z"/><path class="cls-3" d="M41.69,37H32V18.77h9.24V20.7H34.18v6.06h6.58v1.92H34.18V35h7.52Z"/><path class="cls-3" d="M56,20.7H50.7V37H48.57V20.7H43.33V18.77H56Z"/><path class="cls-4" d="M26.12,49.4a4.93,4.93,0,0,1-2.32.49,3.74,3.74,0,0,1-2.87-1.15,4.26,4.26,0,0,1-1.08-3,4.46,4.46,0,0,1,1.21-3.26,4.12,4.12,0,0,1,3.08-1.24,4.93,4.93,0,0,1,2,.35v1a4,4,0,0,0-2-.5,3.06,3.06,0,0,0-2.35,1,3.64,3.64,0,0,0-.9,2.58,3.47,3.47,0,0,0,.84,2.45,2.86,2.86,0,0,0,2.21.91,4.14,4.14,0,0,0,2.19-.56Z"/><path class="cls-4" d="M30.21,49.89A2.78,2.78,0,0,1,28.08,49a3.11,3.11,0,0,1-.79-2.23,3.24,3.24,0,0,1,.83-2.36,3,3,0,0,1,2.23-.85,2.69,2.69,0,0,1,2.09.83,3.28,3.28,0,0,1,.75,2.29,3.22,3.22,0,0,1-.81,2.3A2.84,2.84,0,0,1,30.21,49.89Zm.07-5.47a1.83,1.83,0,0,0-1.46.63,2.59,2.59,0,0,0-.54,1.74,2.45,2.45,0,0,0,.54,1.68,1.85,1.85,0,0,0,1.46.62,1.76,1.76,0,0,0,1.43-.6,2.62,2.62,0,0,0,.5-1.72,2.66,2.66,0,0,0-.5-1.73A1.75,1.75,0,0,0,30.28,44.42Z"/><path class="cls-4" d="M37.86,44.72a1.18,1.18,0,0,0-.73-.19,1.23,1.23,0,0,0-1,.58,2.68,2.68,0,0,0-.41,1.58v3.06h-1v-6h1V45h0a2.1,2.1,0,0,1,.63-1,1.43,1.43,0,0,1,.94-.35,1.57,1.57,0,0,1,.57.08Z"/><path class="cls-4" d="M43.72,47H39.49A2.24,2.24,0,0,0,40,48.54a1.86,1.86,0,0,0,1.42.54,3,3,0,0,0,1.86-.67v.9a3.48,3.48,0,0,1-2.09.57,2.54,2.54,0,0,1-2-.82,3.35,3.35,0,0,1-.73-2.3,3.28,3.28,0,0,1,.79-2.28,2.55,2.55,0,0,1,2-.88,2.26,2.26,0,0,1,1.82.76,3.18,3.18,0,0,1,.64,2.12Zm-1-.81a2,2,0,0,0-.4-1.29,1.37,1.37,0,0,0-1.1-.46,1.55,1.55,0,0,0-1.15.49,2.21,2.21,0,0,0-.59,1.27Z"/></svg>
\ No newline at end of file
diff --git a/src/icons/mariadb.svg b/src/icons/mariadb.svg
new file mode 100644
index 000000000..119938104
--- /dev/null
+++ b/src/icons/mariadb.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 270 180" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(1.5,0,0,1.5,0,0)">
+        <g id="g3392" transform="matrix(1,0,0,1,-252.947,-292.656)">
+            <path id="path9" d="M428.822,292.659C426.043,292.748 426.922,293.549 420.917,295.027C414.853,296.519 407.445,296.061 400.915,298.8C381.422,306.975 377.511,334.916 359.79,344.925C346.544,352.407 333.18,353.004 321.165,356.769C313.269,359.245 304.632,364.322 297.478,370.487C291.925,375.274 291.78,379.483 285.978,385.487C279.772,391.909 261.313,385.596 252.947,395.425C255.642,398.15 256.823,398.913 262.134,398.206C261.035,400.29 254.553,402.047 255.822,405.112C257.157,408.338 272.827,410.525 287.072,401.925C293.706,397.92 298.99,392.147 309.322,390.769C322.692,388.987 338.094,391.912 353.572,394.144C351.277,400.987 346.669,405.537 342.978,410.987C341.835,412.218 345.274,412.356 349.197,411.612C356.254,409.867 361.339,408.462 366.665,405.362C373.208,401.553 374.2,391.788 382.228,389.675C386.701,396.55 398.866,398.174 406.415,392.675C399.791,390.8 397.961,376.7 400.197,370.487C402.315,364.606 404.407,355.199 406.54,347.425C408.83,339.076 409.675,328.553 412.447,324.3C416.616,317.901 421.224,315.704 425.224,312.096C429.224,308.488 432.885,304.976 432.765,296.72C432.726,294.061 431.351,292.578 428.822,292.659Z" style="fill:rgb(0,43,100);"/>
+            <path id="path3352" d="M258.701,404.524C268.845,405.977 275.014,404.524 283.16,400.991C290.091,397.985 296.785,391.788 304.97,389.161C316.991,385.304 330.173,389.166 343.023,389.936C346.152,390.124 349.261,390.126 352.33,389.792C357.117,386.85 357.018,375.845 361.677,374.837C361.54,390.277 355.21,399.528 348.59,408.486C362.542,406.022 370.891,397.952 376.53,387.174C378.241,383.906 379.702,380.39 380.994,376.705C382.991,378.238 381.859,382.902 382.863,385.429C392.473,380.076 397.976,367.859 401.62,355.503C405.836,341.203 407.562,326.723 410.281,322.492C412.935,318.362 417.065,315.816 420.835,313.172C425.119,310.166 428.94,307.033 429.6,301.305C425.082,300.887 424.037,299.842 423.369,297.565C421.107,298.84 419.027,299.113 416.677,299.183C414.638,299.245 412.398,299.154 409.662,299.435C387.035,301.759 384.16,326.698 369.657,340.836C368.602,341.864 367.461,342.823 366.255,343.723C361.176,347.508 354.945,350.213 349.215,352.403C339.94,355.947 331.122,356.199 322.42,359.258C316.032,361.503 309.541,364.76 304.294,368.351C302.982,369.248 301.746,370.167 300.609,371.097C297.53,373.616 295.509,376.411 293.554,379.286C291.538,382.249 289.591,385.297 286.623,388.209C281.815,392.93 263.849,389.586 257.524,393.964C256.819,394.451 256.259,395.036 255.878,395.738C259.329,397.306 261.634,396.344 265.604,396.783C266.125,400.55 257.413,402.789 258.701,404.524Z" style="fill:rgb(196,154,108);fill-rule:nonzero;"/>
+            <path id="path3873" d="M395.785,377.384C396.055,381.706 398.564,390.281 400.779,392.365C396.441,393.42 388.968,391.677 387.051,388.617C388.036,384.199 393.162,380.16 395.785,377.384Z" style="fill:rgb(196,154,108);"/>
+            <path id="path3880" d="M402.14,308.792C405.343,311.573 412.064,309.341 410.863,303.808C405.886,303.396 403.003,305.085 402.14,308.792Z" style="fill:rgb(0,43,100);"/>
+            <path id="path3882" d="M424.471,302.326C423.619,304.113 421.988,306.417 421.988,310.966C421.981,311.747 421.395,312.282 421.385,311.078C421.429,306.632 422.606,304.71 423.856,302.184C424.437,301.149 424.787,301.576 424.471,302.326Z" style="fill:rgb(0,43,100);fill-rule:nonzero;"/>
+            <path id="path3884" d="M423.613,301.653C422.608,303.358 420.188,306.468 419.788,311C419.714,311.777 419.082,312.258 419.178,311.057C419.614,306.633 421.548,303.864 423.016,301.457C423.682,300.478 423.995,300.934 423.613,301.653Z" style="fill:rgb(0,43,100);fill-rule:nonzero;"/>
+            <path id="path3886" d="M422.831,300.761C421.686,302.375 417.961,306.11 417.182,310.593C417.042,311.36 416.372,311.788 416.569,310.599C417.375,306.226 420.586,302.789 422.251,300.516C422.997,299.595 423.27,300.076 422.831,300.761Z" style="fill:rgb(0,43,100);fill-rule:nonzero;"/>
+            <path id="path3888" d="M422.133,299.766C420.773,301.203 416.332,305.966 414.932,310.294C414.684,311.034 413.961,311.364 414.324,310.214C415.736,305.998 419.625,301.457 421.593,299.441C422.462,298.634 422.664,299.149 422.133,299.766Z" style="fill:rgb(0,43,100);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/pantheon.svg b/src/icons/pantheon.svg
new file mode 100644
index 000000000..baf01b5f8
--- /dev/null
+++ b/src/icons/pantheon.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="47px" viewBox="0 0 24 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g>
+      <path fill="#000000" d="M20.1256495,30.2792188 C20.1243961,30.0829423 20.1642831,29.8885734 20.2427492,29.7085938 C20.3938483,29.3583157 20.6736104,29.0790904 21.0245619,28.9282813 C21.3892852,28.7732427 21.8015607,28.7732427 22.166284,28.9282813 C22.5172355,29.0790904 22.7969976,29.3583157 22.9480967,29.7085938 C23.1034333,30.0726172 23.1034333,30.4841015 22.9480967,30.848125 C22.7969976,31.1984031 22.5172355,31.4776284 22.166284,31.6284375 C21.8015607,31.7834761 21.3892852,31.7834761 21.0245619,31.6284375 C20.6736104,31.4776284 20.3938483,31.1984031 20.2427492,30.848125 C20.164518,30.6686756 20.124636,30.4749168 20.1256495,30.2792188 Z M20.3856798,30.2792188 C20.3847762,30.4404431 20.4170113,30.6001395 20.4803927,30.7484375 C20.6025865,31.0385288 20.833792,31.2692907 21.1244411,31.39125 C21.4249346,31.5182762 21.7641893,31.5182762 22.0646828,31.39125 C22.3553318,31.2692907 22.5865374,31.0385288 22.7087311,30.7484375 C22.8360015,30.4485206 22.8360015,30.1099169 22.7087311,29.81 C22.5865374,29.5199087 22.3553318,29.2891468 22.0646828,29.1671875 C21.7641893,29.0401613 21.4249346,29.0401613 21.1244411,29.1671875 C20.833792,29.2891468 20.6025865,29.5199087 20.4803927,29.81 C20.4176019,29.9584225 20.3859538,30.1181141 20.3874018,30.2792187 L20.3856798,30.2792188 Z M21.0297281,29.431875 L21.6772205,29.431875 C21.837475,29.4190439 21.9968541,29.4655422 22.1249547,29.5625 C22.2257651,29.6602637 22.2786255,29.7971857 22.2696073,29.9371875 C22.2789826,30.0586481 22.2378808,30.1786091 22.1559517,30.2689062 C22.0783488,30.3436681 21.9775012,30.3897507 21.8700906,30.3995312 L22.3040483,31.109375 L21.9803021,31.109375 L21.5618429,30.421875 L21.3362538,30.421875 L21.3362538,31.109375 L21.028006,31.109375 L21.028006,29.4335938 L21.0297281,29.431875 Z M21.3379758,30.1623438 L21.563565,30.1623438 C21.6106344,30.1623438 21.6582779,30.1623438 21.7064955,30.1623438 C21.7508071,30.159366 21.7943823,30.149508 21.8356495,30.133125 C21.8725153,30.1185568 21.9046768,30.0941848 21.9286405,30.0626562 C21.9758127,29.9825517 21.9758127,29.8832296 21.9286405,29.803125 C21.9046768,29.7715965 21.8725153,29.7472245 21.8356495,29.7326563 C21.7944723,29.7162453 21.7507979,29.706946 21.7064955,29.7051562 L21.563565,29.7051562 L21.3379758,29.7051562 L21.3379758,30.174375 L21.3379758,30.1623438 Z"></path>
+      <polygon fill="#EFD01B" points="2.57986462 0.108891528 6.6460305 9.625 0.977775481 9.625 2.71086857 13.8651563 13.7121764 13.8651563"></polygon>
+      <polygon fill="#EFD01B" points="15.01644 32.5410938 12.3916255 32.5410938 8.63926903 23.7273438 6.65934181 23.7273438 10.4082542 32.5410938 3.83929825 32.5410938 15.1833709 46.3317086 11.1032009 36.78125 16.7686481 36.78125"></polygon>
+      <path fill="#000000" d="M19.2629003,26.9121875 C19.2667018,26.9121875 19.2726091,26.9101209 19.2856265,26.8994615 C19.3172489,26.8735673 19.3527971,26.82107 19.3878562,26.7346645 C19.4918379,26.4783954 19.5539275,26.0185584 19.5539275,25.320625 C19.5539275,24.6230186 19.4912286,24.1629428 19.3862916,23.9061126 C19.350888,23.8194634 19.3149502,23.7666639 19.2828843,23.7404722 C19.269493,23.7295341 19.2632431,23.7273438 19.2594562,23.7273438 L9.87607358,23.7273438 L11.2298642,26.9121875 L19.2629003,26.9121875 Z"></path>
+      <path fill="#000000" d="M18.5585801,31.1420312 C18.5618036,31.1420312 18.5675108,31.1400241 18.5804744,31.1293916 C18.6121617,31.1034024 18.6477946,31.0508142 18.6829396,30.9643867 C18.7872597,30.7078462 18.8496073,30.248008 18.8496073,29.5504688 C18.8496073,28.8536864 18.7864031,28.3939943 18.6808194,28.1371565 C18.6452919,28.0507339 18.6092644,27.9980104 18.5771577,27.9718042 C18.5639046,27.9609868 18.5579952,27.9589062 18.555136,27.9589062 L11.6724593,27.9589062 L13.0292871,31.1420312 L18.5585801,31.1420312 Z"></path>
+      <path fill="#000000" d="M18.555136,18.4507812 C18.5583486,18.4507812 18.5640343,18.4487808 18.5769876,18.4381498 C18.6086798,18.4121394 18.6443223,18.3594954 18.6794755,18.2729712 C18.7838109,18.0161651 18.8461631,17.555829 18.8461631,16.8575 C18.8461631,16.1592181 18.7838206,15.6992625 18.6795155,15.4429868 C18.64441,15.3567331 18.6088474,15.3043459 18.5772446,15.2785109 C18.5643209,15.2679459 18.5585782,15.2659375 18.555136,15.2659375 L10.9093062,15.2659375 L12.2630968,18.4507812 L18.555136,18.4507812 Z"></path>
+      <path fill="#000000" d="M19.2594562,22.680625 C19.2632469,22.680625 19.2691326,22.6785651 19.2821397,22.6679072 C19.3137671,22.6419919 19.3493249,22.5894386 19.3843922,22.5029363 C19.4883892,22.2464019 19.5504834,21.7860672 19.5504834,21.0873437 C19.5504834,20.3890619 19.4881408,19.9291063 19.3838358,19.6728305 C19.3487303,19.5865769 19.3131677,19.5341897 19.2815648,19.5083547 C19.2686411,19.4977897 19.2628984,19.4957813 19.2594562,19.4957813 L12.708853,19.4957813 L14.0626436,22.680625 L19.2594562,22.680625 Z"></path>
+      <path fill="#000000" d="M6.39384963,18.4490625 L7.62902804,18.4490625 L9.42857487,22.680625 L12.8755549,22.680625 L9.71899485,15.2659375 L1.59462236,15.2659375 C0.854058111,15.2659375 0.713236385,15.3458678 0.489789027,16.0632874 C0.185922395,17.0307619 0.115377644,18.5852511 0.115377644,23.203125 C0.115377644,27.8041332 0.186901196,29.3737579 0.48991145,30.3433541 C0.713236385,31.0603822 0.854058111,31.1403125 1.59462236,31.1403125 L8.56756836,31.1403125 L4.98569524,22.6771875 L8.19193461,22.6771875 L6.39384963,18.4490625 Z"></path>
+    </g>
+</svg>
diff --git a/src/icons/percona.svg b/src/icons/percona.svg
new file mode 100644
index 000000000..383ae281d
--- /dev/null
+++ b/src/icons/percona.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 512 500" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(2,0,0,2,0,0)">
+        <g>
+            <path d="M128,0.578C57.308,0.578 0,56.413 0,125.289C0,168.375 22.427,206.355 56.526,228.759L56.526,125.354C56.525,125.196 56.503,125.044 56.503,124.887C56.503,124.729 56.525,124.577 56.526,124.419L56.526,123.542L56.569,123.542C57.27,83.396 88.904,51.061 127.892,51.061C167.319,51.061 199.28,84.114 199.28,124.887C199.28,165.659 167.319,198.712 127.892,198.712C112.536,198.712 98.349,193.65 86.705,185.12L86.705,243.327C99.665,247.631 113.545,250 128,250C198.692,250 256,194.165 256,125.289C256,56.413 198.692,0.578 128,0.578" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
+            <path d="M171.197,127.472C171.197,151.062 152.074,170.185 128.484,170.185C104.894,170.185 85.77,151.062 85.77,127.472C85.77,103.882 104.894,84.759 128.484,84.759C152.074,84.759 171.197,103.882 171.197,127.472" style="fill:rgb(252,180,47);fill-rule:nonzero;"/>
+        </g>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.52727e-14,249.422,-249.422,1.52727e-14,128,0.5784)"><stop offset="0" style="stop-color:rgb(251,179,47);stop-opacity:1"/><stop offset="0.5" style="stop-color:rgb(193,21,17);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(193,20,17);stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>
diff --git a/src/icons/platformsh.svg b/src/icons/platformsh.svg
new file mode 100644
index 000000000..2491fb8c3
--- /dev/null
+++ b/src/icons/platformsh.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 43 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(1.5,0,0,1.5,0,0)">
+        <rect x="0" y="0" width="28.55" height="28.37" style="fill:rgb(33,37,41);"/>
+        <g>
+            <g transform="matrix(0.821308,0,0,0.821308,-115.775,1.83776)">
+                <rect x="144.07" y="0.849" width="28.55" height="11.272" style="fill:white;fill-rule:nonzero;"/>
+            </g>
+            <g transform="matrix(0.821308,0,0,0.821308,-115.775,1.83776)">
+                <rect x="144.07" y="25.379" width="28.55" height="3.84" style="fill:white;fill-rule:nonzero;"/>
+            </g>
+            <g transform="matrix(0.821308,0,0,0.821308,-115.775,1.83776)">
+                <rect x="144.07" y="15.766" width="28.55" height="5.784" style="fill:white;fill-rule:nonzero;"/>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/shopline.png b/src/icons/shopline.png
new file mode 100644
index 000000000..ebdb09d14
Binary files /dev/null and b/src/icons/shopline.png differ
diff --git a/src/icons/tailwindcss.svg b/src/icons/tailwindcss.svg
new file mode 100644
index 000000000..5b0424030
--- /dev/null
+++ b/src/icons/tailwindcss.svg
@@ -0,0 +1 @@
+<svg class="mx-auto block h-24 mb-3" viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><circle id="b" cx="40" cy="40" r="40"></circle><filter x="-8.8%" y="-6.2%" width="117.5%" height="117.5%" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset><feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" in="shadowBlurOuter1"></feColorMatrix></filter><linearGradient x1="0%" y1="0%" y2="100%" id="c"><stop stop-color="#2383AE" offset="0%"></stop><stop stop-color="#6DD7B9" offset="100%"></stop></linearGradient></defs><g fill="none" fill-rule="evenodd"><g transform="translate(5 5)"><use fill="#000" filter="url(#a)" xlink:href="#b"></use><use fill="#FFF" xlink:href="#b"></use></g><path d="M25.6 33.92C27.52 26.24 32.32 22.4 40 22.4c11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32zM11.2 51.2c1.92-7.68 6.72-11.52 14.4-11.52 11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32z" fill="url(#c)" transform="translate(5 5)"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/tessitura.svg b/src/icons/tessitura.svg
new file mode 100644
index 000000000..96be0cdc1
--- /dev/null
+++ b/src/icons/tessitura.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(1.32778,0,0,1.32778,-8.12736,-11.0496)">
+        <circle cx="36.246" cy="38.447" r="30.125" style="fill:rgb(223,75,46);"/>
+    </g>
+    <g id="Shape" transform="matrix(2.95905,0,0,2.95905,25.5783,8.25322)">
+        <path d="M5.487,7.381L9.188,7.381L9.188,6.383L5.487,6.383L5.487,1.954L3.034,3.389L3.034,6.383L0.559,6.383L0.559,7.381L3.013,7.381L3.013,16.072C3.013,18.214 4.198,19.503 6.651,19.503C7.4,19.503 8.252,19.316 8.918,19.087L8.918,17.985C8.544,18.089 7.92,18.172 7.587,18.172C5.799,18.172 5.508,17.195 5.466,15.823L5.487,7.381Z" style="fill:rgb(43,44,43);fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/src/icons/user.com.svg b/src/icons/user.com.svg
new file mode 100644
index 000000000..b6defbe05
--- /dev/null
+++ b/src/icons/user.com.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>logo wap</title>
+    <desc>Created with Sketch.</desc>
+    <g id="logo-wap" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M32,0 L64,0 L64,32 C64,49.673112 49.673112,64 32,64 L32,64 C14.326888,64 2.164332e-15,49.673112 0,32 L0,32 C-2.164332e-15,14.326888 14.326888,3.24649801e-15 32,0 Z" id="Rectangle-4-Copy-11" fill="#315EFB"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/websocket.png b/src/icons/websocket.png
new file mode 100644
index 000000000..7d94f1073
Binary files /dev/null and b/src/icons/websocket.png differ
diff --git a/src/icons/wpengine.svg b/src/icons/wpengine.svg
new file mode 100644
index 000000000..d759de179
--- /dev/null
+++ b/src/icons/wpengine.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><path d="M173.678,512l164.644,0l0,-124.486l-40.157,-40.157l-85.334,0l-39.153,40.157l0,124.486Zm212.832,-338.322l-39.153,39.153l0,86.338l39.153,39.153l125.49,0l0,-164.644l-125.49,0Zm-48.188,-173.678l-164.644,0l0,125.49l39.153,39.153l85.334,0l40.157,-39.153l0,-125.49Zm173.678,512l0,-124.486l-39.153,-40.157l-125.49,0l0,164.643l164.643,0Zm-472.847,-512l-39.153,39.153l0,125.49l164.643,0l0,-164.643l-125.49,0Zm308.204,0l0,125.49l39.153,39.153l125.49,0l0,-164.643l-164.643,0Zm-91.357,280.094c-13.051,0 -23.09,-11.043 -23.09,-23.09c0,-13.051 11.043,-23.09 23.09,-23.09c13.051,0 23.09,11.043 23.09,23.09c0,12.047 -10.039,23.09 -23.09,23.09Zm-91.357,-106.416l-164.643,0l0,164.644l124.486,0l40.157,-39.153l0,-125.491Zm0,213.836l-40.157,-40.157l-124.486,0l0,164.643l124.486,0l40.157,-39.153l0,-85.333Z" style="fill:#40bac8;fill-rule:nonzero;"/></svg>
\ No newline at end of file
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index c8300c916..7a2c3e368 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -160,6 +160,8 @@ class Wappalyzer {
       this.detected[url.canonical] = {};
     }
 
+    const metaTags = [];
+
     // Additional information
     let language = null;
 
@@ -168,9 +170,22 @@ class Wappalyzer {
         html = '';
       }
 
-      const matches = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
+      let matches = data.html.match(new RegExp('<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"', 'i'));
 
       language = matches && matches.length ? matches[1] : null;
+
+      // Meta tags
+      const regex = /<meta[^>]+>/ig;
+
+      do {
+        matches = regex.exec(html);
+
+        if (!matches) {
+          break;
+        }
+
+        metaTags.push(matches[0]);
+      } while (matches);
     }
 
     Object.keys(this.apps).forEach((appName) => {
@@ -184,7 +199,7 @@ class Wappalyzer {
 
       if (html) {
         promises.push(this.analyzeHtml(app, html));
-        promises.push(this.analyzeMeta(app, html));
+        promises.push(this.analyzeMeta(app, metaTags));
       }
 
       if (scripts) {
@@ -208,33 +223,32 @@ class Wappalyzer {
       });
     }
 
-    return new Promise((resolve) => {
-      Promise.all(promises)
-        .then(() => {
-          Object.keys(apps).forEach((appName) => {
-            const app = apps[appName];
+    return new Promise(async (resolve) => {
+      await Promise.all(promises);
 
-            if (!app.detected || !app.getConfidence()) {
-              delete apps[app.name];
-            }
-          });
+      Object.keys(apps).forEach((appName) => {
+        const app = apps[appName];
+
+        if (!app.detected || !app.getConfidence()) {
+          delete apps[app.name];
+        }
+      });
 
-          resolveExcludes(apps, this.detected[url]);
-          this.resolveImplies(apps, url.canonical);
+      resolveExcludes(apps, this.detected[url]);
+      this.resolveImplies(apps, url.canonical);
 
-          this.cacheDetectedApps(apps, url.canonical);
-          this.trackDetectedApps(apps, url, language);
+      this.cacheDetectedApps(apps, url.canonical);
+      this.trackDetectedApps(apps, url, language);
 
-          this.log(`Processing ${Object.keys(data).join(', ')} took ${((new Date() - startTime) / 1000).toFixed(2)}s (${url.hostname})`, 'core');
+      this.log(`Processing ${Object.keys(data).join(', ')} took ${((new Date() - startTime) / 1000).toFixed(2)}s (${url.hostname})`, 'core');
 
-          if (Object.keys(apps).length) {
-            this.log(`Identified ${Object.keys(apps).join(', ')} (${url.hostname})`, 'core');
-          }
+      if (Object.keys(apps).length) {
+        this.log(`Identified ${Object.keys(apps).join(', ')} (${url.hostname})`, 'core');
+      }
 
-          this.driver.displayApps(this.detected[url.canonical], { language }, context);
+      this.driver.displayApps(this.detected[url.canonical], { language }, context);
 
-          return resolve();
-        });
+      return resolve();
     });
   }
 
@@ -249,23 +263,20 @@ class Wappalyzer {
    *
    */
   robotsTxtAllows(url) {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
       const parsed = this.parseUrl(url);
 
       if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
-        reject();
-
-        return;
+        return reject();
       }
 
-      this.driver.getRobotsTxt(parsed.host, parsed.protocol === 'https:')
-        .then((robotsTxt) => {
-          if (robotsTxt.some(disallowedPath => parsed.pathname.indexOf(disallowedPath) === 0)) {
-            return reject();
-          }
+      const robotsTxt = await this.driver.getRobotsTxt(parsed.host, parsed.protocol === 'https:');
+
+      if (robotsTxt.some(disallowedPath => parsed.pathname.indexOf(disallowedPath) === 0)) {
+        return reject();
+      }
 
-          return resolve();
-        }, () => resolve());
+      return resolve();
     });
   }
 
@@ -359,11 +370,11 @@ class Wappalyzer {
             attrs.string = attr;
 
             try {
-              attrs.regex = new RegExp(attr.replace('/', '\\/'), 'i'); // Escape slashes in regular expression
-            } catch (e) {
+              attrs.regex = new RegExp(attr.replace('/', '\/'), 'i'); // Escape slashes in regular expression
+            } catch (error) {
               attrs.regex = new RegExp();
 
-              this.log(`${e}: ${attr}`, 'error', 'core');
+              this.log(`${error.message}: ${attr}`, 'error', 'core');
             }
           }
         });
@@ -556,8 +567,7 @@ class Wappalyzer {
   /**
    * Analyze meta tag
    */
-  analyzeMeta(app, html) {
-    const regex = /<meta[^>]+>/ig;
+  analyzeMeta(app, metaTags) {
     const patterns = this.parsePatterns(app.props.meta);
     const promises = [];
 
@@ -565,17 +575,7 @@ class Wappalyzer {
       return Promise.resolve();
     }
 
-    let matches;
-
-    do {
-      matches = regex.exec(html);
-
-      if (!matches) {
-        break;
-      }
-
-      const [match] = matches;
-
+    metaTags.forEach((match) => {
       Object.keys(patterns).forEach((meta) => {
         const r = new RegExp(`(?:name|property)=["']${meta}["']`, 'i');
 
@@ -589,7 +589,7 @@ class Wappalyzer {
           }));
         }
       });
-    } while (matches);
+    });
 
     return Promise.all(promises);
   }
diff --git a/src/wappalyzer.spec.js b/src/wappalyzer.spec.js
index ea68c22e0..f51d7fb10 100644
--- a/src/wappalyzer.spec.js
+++ b/src/wappalyzer.spec.js
@@ -139,5 +139,140 @@ describe('Wappalyzer', () => {
     it('should return the version number', () => {
       assert.equal(apps.appHtml.version, '1');
     });
+
+    it('should analyze html', async () => {
+      const html = `
+      <!DOCTYPE HTML>
+      <html>
+        <head>
+          <title>Page title | Html detection </title>
+          <meta charset="utf-8" />
+        </head>
+        <body>
+        <h1>Technologies Test Page | Html detection</h1>
+        <!-- Google Tag Manager -->
+          <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KAAOEOE"
+          height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+        <!-- End Google Tag Manager -->
+        </body>
+      </html>
+    `;
+      const wappalyzer = new Wappalyzer();
+      wappalyzer.apps = {
+        "Google Tag Manager": {
+          "html": [
+            "googletagmanager\\.com/ns\\.html[^>]+></iframe>",
+            "<!-- (?:End )?Google Tag Manager -->"
+          ]
+        }
+      };
+      var applications = null;
+      wappalyzer.driver = {
+        log () {},
+        displayApps (detectedMap) {
+          applications = detectedMap;
+        }
+      };
+
+      await wappalyzer.analyze({ canonical: 'example.com' }, { html });
+      assert.equal(applications['Google Tag Manager'].name, 'Google Tag Manager');
+    });
+
+    it('should analyze scripts', async () => {
+      const scripts = [
+        'http://www.google-analytics.com/analytics.js',
+        'http://example.com/assets/js/jquery.min.js'
+      ];
+      const wappalyzer = new Wappalyzer();
+      wappalyzer.apps = {
+        "Google Analytics": {
+          "cats": [
+            10
+          ],
+          "script": "google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:"
+        },
+        "jQuery": {
+          "script": [
+            "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+            "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
+            "jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1"
+          ]
+        }
+      };
+      var applications = null;
+      wappalyzer.driver = {
+        log () {},
+        displayApps (detectedMap) {
+          applications = detectedMap;
+        }
+      };
+
+      await wappalyzer.analyze({ canonical: 'example.com' }, { scripts });
+      assert.equal(applications['Google Analytics'].name, 'Google Analytics');
+      assert.equal(applications['jQuery'].name, 'jQuery');
+    });
+
+    it('should analyze headers', async () => {
+      const headers = {
+        'date': [ 'Thu, 01 Feb 2018 11:34:18 GMT' ],
+        'connection': [ 'keep-alive' ],
+        'x-powered-by': [ 'Express'],
+        'etag': [ 'W/125-1jQLmiya7mfec43xR3Eb3pjdu64s' ],
+        'content-length': [ '293' ],
+        'content-type': [ 'text/html; charset=utf-8' ]
+      };
+      const wappalyzer = new Wappalyzer();
+      wappalyzer.apps = {
+        "Express": {
+          "headers": {
+            "X-Powered-By": "^Express$"
+          }
+        }
+      };
+      var applications = null;
+      wappalyzer.driver = {
+        log () {},
+        displayApps (detectedMap) {
+          applications = detectedMap;
+        }
+      };
+
+      await wappalyzer.analyze({ canonical: 'example.com' }, { headers });
+      assert.equal(applications['Express'].name, 'Express');
+    });
+
+    it('should analyze js globals', async () => {
+      const js = {
+        'Moment.js': { 'moment': { '0': true } },
+        'Google Font API': { 'WebFonts': { '0': true } }
+      };
+      const wappalyzer = new Wappalyzer();
+      wappalyzer.apps = {
+        "Moment.js": {
+          "js": {
+            "moment": "",
+            "moment.version": "(.*)\\;version:\\1"
+          }
+        },
+        "Google Font API": {
+          "js": {
+            "WebFonts": ""
+          }
+        }
+      };
+      var applications = null;
+      wappalyzer.driver = {
+        log () {},
+        displayApps (detectedMap) {
+          applications = detectedMap;
+        }
+      };
+
+      wappalyzer.parseJsPatterns();
+      await wappalyzer.analyze({ canonical: 'example.com' }, { js });
+
+      assert.equal(applications['Google Font API'].name, 'Google Font API');
+      assert.equal(applications['Moment.js'].name, 'Moment.js');
+    });
   });
 });