diff --git a/bin/validate.js b/bin/validate.js
index 75a674638..f28ecb17a 100755
--- a/bin/validate.js
+++ b/bin/validate.js
@@ -58,6 +58,7 @@ try {
                 }
               })
 
+              // Validate regular expression
               try {
                 // eslint-disable-next-line no-new
                 new RegExp(regex)
@@ -65,6 +66,7 @@ try {
                 throw new Error(`${error.message} (${id})`)
               }
 
+              // Count capture groups
               const groups = new RegExp(`${regex}|`).exec('').length - 1
 
               if (groups > maxGroups) {
diff --git a/package.json b/package.json
index 11b8fbaff..1fb93d26b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "dependencies": {
     "@prantlf/jsonlint": "^10.2.0",
     "adm-zip": "^0.4.14",
-    "convert-svg-to-png": "^0.5.0"
+    "convert-svg-to-png": "^0.5.0",
+    "languagedetect": "^2.0.0"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^1.0.1",
@@ -20,6 +21,7 @@
     "validate": "yarn run lint && jsonlint -qV ./schema.json ./src/apps.json && node ./bin/validate.js",
     "convert": "cd ./src/drivers/webextension/images/icons ; cp *.svg converted ; cd converted ; convert-svg-to-png *.svg --width 32 --height 32 ; rm *.svg",
     "prettify": "jsonlint -si --trim-trailing-commas --enforce-double-quotes ./src/apps.json",
-    "build": "yarn run link && yarn run validate && yarn run prettify && yarn run convert && node ./bin/build.js"
+    "build": "yarn run link && yarn run validate && yarn run prettify && yarn run convert && node ./bin/build.js",
+    "build:safari": "xcrun safari-web-extension-converter --swift --project-location build --force src/drivers/webextension"
   }
 }
diff --git a/run b/run
deleted file mode 100755
index 6e8c89a10..000000000
--- a/run
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-cd "$(dirname $0)"
-
-if [[ -z "$(which docker)" ]]; then
-	echo "Please install Docker from https://www.docker.com"
-
-	exit 1
-fi
-
-cmd="docker run --rm -v "$(pwd):/opt/wappalyzer" -it wappalyzer/dev"
-
-$cmd sh -c "\
-	yarn install; \
-	cd ../npm; \
-	yarn install"
-
-$cmd ./bin/run links
-$cmd ./bin/run $@
diff --git a/src/README.md b/src/README.md
index 3c475aa18..bf37bfeab 100644
--- a/src/README.md
+++ b/src/README.md
@@ -16,7 +16,8 @@ $ npm i wappalyzer-core
 const fs = require('fs')
 const Wappalyzer = require('./wappalyzer')
 
-// See https://www.wappalyzer.com/docs/dev/specification
+// See https://www.wappalyzer.com/docs/dev/specification or use
+// https://raw.githubusercontent.com/AliasIO/wappalyzer/master/src/apps.json
 const { apps: technologies, categories } = JSON.parse(
   fs.readFileSync('./apps.json')
 )
diff --git a/src/apps.json b/src/apps.json
index d777d3938..7ba0682f9 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -39,6 +39,16 @@
       "script": "https\\:\\/\\/track\\.91app\\.io\\/track\\.js\\?",
       "website": "https://www.91app.com/"
     },
+    "@sulu/web": {
+      "cats": [
+        59
+      ],
+      "icon": "Sulu.svg",
+      "js": {
+        "web.startComponents": ""
+      },
+      "website": "https://github.com/sulu/web-js"
+    },
     "A-Frame": {
       "cats": [
         25
@@ -80,7 +90,10 @@
       "cats": [
         12
       ],
-      "html": "<html[^>]* (?:amp|⚡)[^-]",
+      "html": [
+        "<html[^>]* (?:amp|⚡)[^-]",
+        "<link rel=\"amphtml\""
+      ],
       "icon": "Accelerated-Mobile-Pages.svg",
       "website": "https://www.amp.dev"
     },
@@ -141,6 +154,14 @@
       },
       "website": "http://awstats.sourceforge.net"
     },
+    "AccessiBe": {
+      "cats": [
+        68
+      ],
+      "icon": "Accessibe.png",
+      "script": "acsbap\\.com/.*/acsb\\.js",
+      "website": "https://accessibe.com/"
+    },
     "Acquia Cloud": {
       "cats": [
         62
@@ -216,6 +237,14 @@
       "script": "(?:a|s)\\.adroll\\.com",
       "website": "http://adroll.com"
     },
+    "Adally": {
+      "cats": [
+        68
+      ],
+      "icon": "Adally.png",
+      "script": "cloudfront\\.net/.*/adally\\.js",
+      "website": "https://adally.com/"
+    },
     "Adcash": {
       "cats": [
         36
@@ -365,6 +394,17 @@
       "script": "(?:wh(?:utils|ver|proxy|lang|topic|msg)|ehlpdhtm)\\.js",
       "website": "http://adobe.com/products/robohelp.html"
     },
+    "AdonisJS": {
+      "cats": [
+        18
+      ],
+      "cookies": {
+        "cookie_name": "adonis-session"
+      },
+      "icon": "AdonisJS.png",
+      "implies": "Node.js",
+      "website": "https://adonisjs.com"
+    },
     "Advanced Web Stats": {
       "cats": [
         10
@@ -504,6 +544,18 @@
       "icon": "akamai.svg",
       "website": "http://akamai.com"
     },
+    "Akamai Bot Manager": {
+      "cats": [
+        16
+      ],
+      "cookies": {
+        "ak_bmsc": "",
+        "bm_sv": "",
+        "bm_sz": ""
+      },
+      "icon": "akamai.svg",
+      "website": "http://akamai.com/bot-manager"
+    },
     "Akaunting": {
       "cats": [
         55
@@ -661,6 +713,18 @@
       "implies": "Amazon Web Services",
       "website": "https://aws.amazon.com/elasticloadbalancing/"
     },
+    "Amazon Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<meta id=\"amazon-payments",
+      "icon": "Amazon Pay.svg",
+      "js": {
+        "AmazonPayments": ""
+      },
+      "script": "/amazonpayments(?:\\.min)?\\.js",
+      "website": "https://pay.amazon.com"
+    },
     "Amazon S3": {
       "cats": [
         19
@@ -690,6 +754,14 @@
       "icon": "amber.png",
       "website": "https://amberframework.org"
     },
+    "American Express": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-american_express",
+      "icon": "Amex.svg",
+      "website": "https://www.americanexpress.com"
+    },
     "Ametys": {
       "cats": [
         1
@@ -942,6 +1014,17 @@
       "script": "adnxs\\.(?:net|com)",
       "website": "http://appnexus.com"
     },
+    "Apple Pay": {
+      "cats": [
+        41
+      ],
+      "html": [
+        "<[^>]+aria-labelledby=\"pi-apple_pay",
+        "<script id=\"apple-pay"
+      ],
+      "icon": "Apple.svg",
+      "website": "https://www.apple.com/apple-pay"
+    },
     "Arastta": {
       "cats": [
         6
@@ -1135,6 +1218,15 @@
       "icon": "Atlassian Statuspage.svg",
       "website": "https://www.statuspage.io/"
     },
+    "AudioEye": {
+      "cats": [
+        68
+      ],
+      "html": "<iframe[^>]*audioeye\\.com/frame/cookieStorage",
+      "icon": "AudioEye.png",
+      "script": "audioeye\\.com/ae\\.js",
+      "website": "https://www.audioeye.com/"
+    },
     "Aurelia": {
       "cats": [
         12
@@ -1787,6 +1879,14 @@
       "icon": "CFML.png",
       "website": "http://adobe.com/products/coldfusion-family.html"
     },
+    "CIVIC": {
+      "cats": [
+        67
+      ],
+      "icon": "civic.png",
+      "script": "cc\\.cdn\\.civiccomputing\\.com",
+      "website": "https://www.civicuk.com/cookie-control"
+    },
     "CKEditor": {
       "cats": [
         24
@@ -1952,6 +2052,21 @@
       "script": "/cargo\\.",
       "website": "http://cargocollective.com"
     },
+    "Cart Functionality": {
+      "cats": [
+        6
+      ],
+      "html": [
+        "<a[^>]*href=[^>]*/Cart",
+        "<a[^>]*href=[^>]*/Basket",
+        "<a[^>]*href=[^>]*/Trolley",
+        "<a[^>]*href=[^>]*/Bag",
+        "<a[^>]*href=[^>]*/ShoppingBag",
+        "<a[^>]*href=[^>]*/Checkout"
+      ],
+      "icon": "Cart-generic.svg",
+      "website": "https://www.wappalyzer.com/technologies/ecommerce/cart-functionality"
+    },
     "Catberry.js": {
       "cats": [
         12,
@@ -1990,6 +2105,21 @@
       "icon": "CentOS.png",
       "website": "http://centos.org"
     },
+    "Centminmod": {
+      "cats": [
+        22
+      ],
+      "headers": {
+        "X-Powered-By": "centminmod"
+      },
+      "icon": "centminmod.png",
+      "implies": [
+        "CentOS",
+        "Nginx",
+        "PHP"
+      ],
+      "website": "https://centminmod.com"
+    },
     "Ceres": {
       "cats": [
         6
@@ -2469,6 +2599,40 @@
       "script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
       "website": "http://www.trackset.it/conversionlab"
     },
+    "Cookie Script": {
+      "cats": [
+        67
+      ],
+      "icon": "CookieScript.png",
+      "script": "//cookie-script\\.com/s/",
+      "website": "https://cookie-script.com/"
+    },
+    "CookieHub": {
+      "cats": [
+        67
+      ],
+      "icon": "CookieHub.png",
+      "script": [
+        "cookiehub\\.net/.*\\.js"
+      ],
+      "website": "https://www.cookiehub.com"
+    },
+    "CookieYes": {
+      "cats": [
+        67
+      ],
+      "icon": "cookieyes.png",
+      "script": "app\\.cookieyes\\.com/client_data/",
+      "website": "https://www.cookieyes.com/"
+    },
+    "Cookiebot": {
+      "cats": [
+        67
+      ],
+      "icon": "Cookiebot.svg",
+      "script": "consent\\.cookiebot\\.com",
+      "website": "http://www.cookiebot.com"
+    },
     "Coppermine": {
       "cats": [
         7
@@ -2615,6 +2779,14 @@
       "icon": "CrossBox.png",
       "website": "https://crossbox.io"
     },
+    "Crownpeak": {
+      "cats": [
+        67
+      ],
+      "icon": "Crownpeak.png",
+      "script": "c\\.evidon\\.com",
+      "website": "http://www.crownpeak.com"
+    },
     "Crypto-Loot": {
       "cats": [
         56
@@ -2836,10 +3008,12 @@
     },
     "Datadome": {
       "cats": [
-        19
+        16
       ],
       "cookies": {
-        "datadome": ""
+        "datadome": "",
+        "datadome-_zldp": "",
+        "datadome-_zldt": ""
       },
       "headers": {
         "Server": "^DataDome$",
@@ -2893,6 +3067,14 @@
       "script": "dedeajax",
       "website": "http://dedecms.com"
     },
+    "Didomi": {
+      "cats": [
+        67
+      ],
+      "icon": "didomi.png",
+      "script": "sdk\\.privacy-center\\.org/.*/loader\\.js",
+      "website": "https://www.didomi.io/en/consent-preference-management"
+    },
     "DirectAdmin": {
       "cats": [
         9
@@ -3494,6 +3676,14 @@
       "url": "^https?://(?:[^/]+\\.)?ad(?:op)?shost1\\.com/",
       "website": "http://epom.com"
     },
+    "EqualWeb": {
+      "cats": [
+        68
+      ],
+      "icon": "EqualWeb.png",
+      "script": "cdn\\.equalweb\\.com.*\\.js",
+      "website": "https://www.equalweb.com/"
+    },
     "Erlang": {
       "cats": [
         27
@@ -3642,6 +3832,14 @@
       "script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js",
       "website": "http://facebook.com"
     },
+    "Facil-iti": {
+      "cats": [
+        68
+      ],
+      "icon": "Facil-iti.png",
+      "script": "ws\\.facil-iti\\.com/tag/faciliti-tag\\.min\\.js",
+      "website": "https://www.facil-iti.com/"
+    },
     "Fact Finder": {
       "cats": [
         29
@@ -3670,6 +3868,7 @@
       ],
       "html": "<!-- Powered by FaraPy.",
       "icon": "FaraPy.png",
+      "implies": "Python",
       "website": "https://faral.tech"
     },
     "Fastcommerce": {
@@ -3845,6 +4044,17 @@
       "script": "/flickity(?:\\.pkgd)?(?:\\.min)?\\.js",
       "website": "https://flickity.metafizzy.co/"
     },
+    "Flow": {
+      "cats": [
+        6
+      ],
+      "icon": "flow.png",
+      "script": [
+        "shopify-cdn\\.flow\\.io",
+        "flow\\.min\\.js"
+      ],
+      "website": "https://www.flow.io/"
+    },
     "FluxBB": {
       "cats": [
         2
@@ -3906,6 +4116,20 @@
       },
       "website": "http://www.fork-cms.com/"
     },
+    "ForoshGostar": {
+      "cats": [
+        6
+      ],
+      "cookies": {
+        "Aws.customer": ""
+      },
+      "icon": "ForoshGostar.svg",
+      "implies": "Microsoft ASP.NET",
+      "meta": {
+        "generator": "^Forosh\\s?Gostar.*|Arsina Webshop.*$"
+      },
+      "website": "https://www.foroshgostar.com"
+    },
     "Fortune3": {
       "cats": [
         6
@@ -4346,6 +4570,16 @@
       "implies": "Java",
       "website": "http://glassfish.java.net"
     },
+    "Global-e": {
+      "cats": [
+        6
+      ],
+      "icon": "Globale.png",
+      "script": [
+        "web\\.global-e\\.com"
+      ],
+      "website": "https://www.global-e.com/"
+    },
     "Glyphicons": {
       "cats": [
         17
@@ -4477,6 +4711,7 @@
     },
     "Google Analytics Enhanced eCommerce": {
       "cats": [
+        6,
         10
       ],
       "icon": "Google Analytics.svg",
@@ -4564,6 +4799,14 @@
       "icon": "Google PageSpeed.png",
       "website": "http://developers.google.com/speed/pagespeed/mod"
     },
+    "Google Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-google_pay",
+      "icon": "Google.svg",
+      "website": "https://pay.google.com"
+    },
     "Google Plus": {
       "cats": [
         5
@@ -4904,12 +5147,13 @@
         62
       ],
       "headers": {
-        "Via": "/[\\d.-]+ vegur$"
+        "Via": "[\\d.-]+ vegur$"
       },
       "icon": "heroku.svg",
       "implies": [
         "Amazon Web Services"
       ],
+      "url": "\\.herokuapp\\.com",
       "website": "https://www.heroku.com/"
     },
     "Hexo": {
@@ -4969,6 +5213,14 @@
       "script": "highstock[.-]?([\\d\\.]*\\d).*\\.js\\;version:\\1",
       "website": "http://highcharts.com/products/highstock"
     },
+    "HikeOrders": {
+      "cats": [
+        68
+      ],
+      "icon": "HikeOrders.png",
+      "script": "hikeorders\\.com/main/assets/js/hko-accessibility\\.min\\.js",
+      "website": "https://hikeorders.com/"
+    },
     "Hinza Advanced CMS": {
       "cats": [
         1,
@@ -5081,7 +5333,7 @@
         6
       ],
       "cpe": "cpe:/a:ibm:websphere_commerce_suite",
-      "html": "href=\"(?:\\/|[^>]+)webapp\\/wcs\\/",
+      "html": "<(?:a|link|script)[^>]*(?:href|src)=\".*(/wcsstore/|webapp\\/wcs)",
       "icon": "IBM.svg",
       "implies": "Java",
       "url": "/wcs/",
@@ -5188,6 +5440,16 @@
       "script": "^immutable\\.(?:min\\.)?js$",
       "website": "https://facebook.github.io/immutable-js/"
     },
+    "Imperva": {
+      "cats": [
+        16
+      ],
+      "icon": "Imperva.svg",
+      "script": [
+        "/_Incapsula_Resource"
+      ],
+      "website": "https://www.imperva.com/"
+    },
     "ImpressCMS": {
       "cats": [
         1
@@ -5421,6 +5683,16 @@
       "icon": "irroba.svg",
       "website": "https://www.irroba.com.br/"
     },
+    "Iubenda": {
+      "cats": [
+        67
+      ],
+      "icon": "iubenda.png",
+      "script": [
+        "iubenda\\.com/cookie-solution/confs/js/"
+      ],
+      "website": "https://www.iubenda.com/"
+    },
     "J2Store": {
       "cats": [
         6
@@ -5483,7 +5755,7 @@
       "js": {
         "JSChart": ""
       },
-      "script": "jscharts.*\\.js",
+      "script": "jscharts.{0,32}\\.js",
       "website": "http://www.jscharts.com"
     },
     "JSEcoin": {
@@ -5824,9 +6096,13 @@
       },
       "cpe": "cpe:/a:kentico:kentico_cms",
       "icon": "Kentico CMS.png",
+      "js": {
+        "CMS.Application": ""
+      },
       "meta": {
         "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1"
       },
+      "script": "/CMSPages/GetResource\\.ashx",
       "website": "http://www.kentico.com"
     },
     "Kestrel": {
@@ -6134,7 +6410,7 @@
         "L.PosAnimation": "",
         "L.version": "^(.+)$\\;version:\\1\\;confidence:0"
       },
-      "script": "leaflet.*\\.js",
+      "script": "leaflet.{0,32}\\.js",
       "website": "http://leafletjs.com"
     },
     "Less": {
@@ -6193,7 +6469,7 @@
       "cpe": "cpe:/a:lightbox_photo_gallery_project:lightbox_photo_gallery",
       "html": "<link [^>]*href=\"[^\"]+lightbox(?:\\.min)?\\.css",
       "icon": "Lightbox.png",
-      "script": "lightbox.*\\.js",
+      "script": "lightbox(?:-plus-jquery)?.{0,32}\\.js",
       "website": "http://lokeshdhakar.com/projects/lightbox2/"
     },
     "Lightspeed eCom": {
@@ -6389,7 +6665,7 @@
         18,
         19
       ],
-      "html": "<[^>]+wire:",
+      "html": "<[^>]{1,512}\\bwire:",
       "icon": "Livewire.png",
       "implies": "Laravel",
       "js": {
@@ -6402,7 +6678,7 @@
       "cats": [
         61
       ],
-      "html": "<iframe[^>]+localfocus",
+      "html": "<iframe[^>]+\\blocalfocus\\b",
       "icon": "LocalFocus.png",
       "implies": [
         "Angular",
@@ -6410,17 +6686,17 @@
       ],
       "website": "https://www.localfocus.nl/en/"
     },
-    "Locomotive": {
+    "LocomotiveCMS": {
       "cats": [
         1
       ],
       "html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets",
-      "icon": "Locomotive.png",
+      "icon": "LocomotiveCMS.png",
       "implies": [
         "Ruby on Rails",
         "MongoDB"
       ],
-      "website": "http://www.locomotivecms.com"
+      "website": "https://www.locomotivecms.com"
     },
     "Lodash": {
       "cats": [
@@ -6589,6 +6865,14 @@
       ],
       "website": "http://mailchimp.com"
     },
+    "Make-Sense": {
+      "cats": [
+        68
+      ],
+      "icon": "Make-Sense.png",
+      "script": "mk-sense\\.com/aweb\\?license",
+      "website": "https://mk-sense.com/"
+    },
     "MakeShopKorea": {
       "cats": [
         6
@@ -6676,6 +6960,14 @@
       "script": "munchkin\\.marketo\\.net/munchkin\\.js",
       "website": "https://www.marketo.com"
     },
+    "Mastercard": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-mastercard",
+      "icon": "Mastercard.svg",
+      "website": "https://www.mastercard.com"
+    },
     "Material Design Lite": {
       "cats": [
         66
@@ -6709,7 +7001,7 @@
       "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1",
       "website": "https://www.mathjax.org"
     },
-    "Matomo": {
+    "Matomo Analytics": {
       "cats": [
         10
       ],
@@ -6731,6 +7023,16 @@
       "script": "piwik\\.js|piwik\\.php",
       "website": "https://matomo.org"
     },
+    "Matomo Tag Manager": {
+      "cats": [
+        42
+      ],
+      "icon": "Matomo.png",
+      "js": {
+        "window.MatomoTagManager": ""
+      },
+      "website": "https://developer.matomo.org/guides/tagmanager/introduction"
+    },
     "Mattermost": {
       "cats": [
         2
@@ -6934,6 +7236,16 @@
       },
       "website": "https://www.eidosmedia.com/"
     },
+    "Metomic": {
+      "cats": [
+        67
+      ],
+      "icon": "metomic.png",
+      "script": [
+        "metomic\\.js"
+      ],
+      "website": "https://metomic.io"
+    },
     "Microsoft ASP.NET": {
       "cats": [
         18
@@ -7141,13 +7453,20 @@
     },
     "Mobify": {
       "cats": [
+        6,
         26
       ],
+      "headers": {
+        "X-Powered-By": "Mobify"
+      },
       "icon": "Mobify.png",
       "js": {
         "Mobify": ""
       },
-      "script": "//cdn\\.mobify\\.com/",
+      "script": [
+        "//cdn\\.mobify\\.com/",
+        "//a\\.mobify\\.com/"
+      ],
       "website": "https://www.mobify.com"
     },
     "Mobirise": {
@@ -7869,6 +8188,23 @@
       },
       "website": "http://www.onestat.com"
     },
+    "OneTrust": {
+      "cats": [
+        67
+      ],
+      "cookies": {
+        "OptanonConsent": ""
+      },
+      "icon": "OneTrust.png",
+      "script": [
+        "cdn\\.cookielaw\\.org",
+        "optanon\\.blob\\.core\\.windows\\.net",
+        "otSDKStub\\.js",
+        "cdn\\.cookielaw\\.org",
+        "optanon\\.blob\\.core\\.windows\\.net"
+      ],
+      "website": "http://www.onetrust.com"
+    },
     "Onshop": {
       "cats": [
         6
@@ -8201,6 +8537,14 @@
       ],
       "website": "https://oroinc.com"
     },
+    "Osano": {
+      "cats": [
+        67
+      ],
+      "icon": "osano.png",
+      "script": "cookieconsent\\.min\\.js",
+      "website": "https://www.osano.com/"
+    },
     "Outbrain": {
       "cats": [
         5
@@ -8473,6 +8817,19 @@
       },
       "website": "http://percussion.com"
     },
+    "PerimeterX": {
+      "cats": [
+        16
+      ],
+      "cookies": {
+        "_px3": "",
+        "_pxff_cc": "",
+        "_pxhd": "",
+        "_pxvid": ""
+      },
+      "icon": "perimeterx.svg",
+      "website": "https://www.perimeterx.com/"
+    },
     "Perl": {
       "cats": [
         27
@@ -8994,7 +9351,18 @@
       "icon": "Python.png",
       "website": "http://python.org"
     },
-    "Quantcast": {
+    "Quantcast Choice": {
+      "cats": [
+        67
+      ],
+      "icon": "Quantcast.png",
+      "js": {
+        "quantserve": ""
+      },
+      "script": "quantcast\\.mgr\\.consensu\\.org",
+      "website": "https://www.quantcast.com/gdpr/consent-management-solution/"
+    },
+    "Quantcast Measure": {
       "cats": [
         10
       ],
@@ -9003,7 +9371,7 @@
         "quantserve": ""
       },
       "script": "\\.quantserve\\.com/quant\\.js",
-      "website": "http://www.quantcast.com"
+      "website": "https://www.quantcast.com/products/measure-audience-insights/"
     },
     "Question2Answer": {
       "cats": [
@@ -9253,6 +9621,14 @@
       "icon": "RebelMouse.svg",
       "website": "https://www.rebelmouse.com/"
     },
+    "Recite Me": {
+      "cats": [
+        68
+      ],
+      "html": "api\\.reciteme\\.com/asset/js",
+      "icon": "Recite Me.png",
+      "website": "https://reciteme.com/"
+    },
     "Red Hat": {
       "cats": [
         28
@@ -9605,7 +9981,10 @@
         "_hybris": ""
       },
       "cpe": "cpe:/a:sap:commerce_cloud",
-      "html": "<[^>]+/(?:sys_master|hybr|_ui/(?:responsive/)?(?:desktop|common(?:/images|/img)?))/",
+      "html": [
+        "<[^>]+/(?:sys_master|hybr|_ui/(?:.*responsive/)?(?:desktop|common(?:/images|/img|/css|ico)?))/",
+        "<script[^>].*hybris.*.js"
+      ],
       "icon": "SAP.png",
       "implies": "Java",
       "website": "https://www.sap.com/products/crm/e-commerce-platforms.html"
@@ -9742,6 +10121,24 @@
       "implies": "Express",
       "website": "http://sailsjs.org"
     },
+    "SaleCycle": {
+      "cats": [
+        6
+      ],
+      "html": "<iframe[^>]+title=\"SaleCycle\"[^>]+src=\"[^>]+salecycle\\.com",
+      "icon": "salecycle.svg",
+      "website": "https://www.salecycle.com/"
+    },
+    "Salesfloor": {
+      "cats": [
+        6
+      ],
+      "icon": "salesfloor.png",
+      "script": [
+        "salesFloor\\.js"
+      ],
+      "website": "https://salesfloor.net/"
+    },
     "Salesforce": {
       "cats": [
         53
@@ -9766,7 +10163,10 @@
       "headers": {
         "Server": "Demandware eCommerce Server"
       },
-      "html": "<[^>]+demandware\\.edgesuite",
+      "html": [
+        "<[^>]+demandware\\.edgesuite",
+        "/demandware\\.static/"
+      ],
       "icon": "Salesforce.svg",
       "js": {
         "dwAnalytics": ""
@@ -9881,6 +10281,16 @@
       "icon": "sectionio.svg",
       "website": "https://www.section.io"
     },
+    "Seers": {
+      "cats": [
+        67
+      ],
+      "icon": "seersco.png",
+      "script": [
+        "seersco.com/script/cb\\.js"
+      ],
+      "website": "http://www.seersco.com"
+    },
     "Segment": {
       "cats": [
         10
@@ -10042,6 +10452,16 @@
       "script": "^https?://codice(?:business|ssl|pro|isp)?\\.shinystat\\.com/cgi-bin/getcod\\.cgi",
       "website": "http://shinystat.com"
     },
+    "Shop Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-shopify_pay",
+      "icon": "Shopify.svg",
+      "implies": "Shopify",
+      "url": "^https://pay.shopify.com",
+      "website": "https://pay.google.com"
+    },
     "Shopatron": {
       "cats": [
         6
@@ -10185,7 +10605,8 @@
     },
     "Signal": {
       "cats": [
-        32
+        32,
+        42
       ],
       "icon": "signal.png",
       "js": {
@@ -10471,7 +10892,7 @@
       "cats": [
         12
       ],
-      "icon": "Socket.io.png",
+      "icon": "Socket.IO.svg",
       "implies": "Node.js",
       "js": {
         "io.Socket": "",
@@ -10490,6 +10911,22 @@
       },
       "website": "http://www.softtr.com"
     },
+    "SolidPixels": {
+      "cats": [
+        1,
+        6,
+        4
+      ],
+      "icon": "SolidPixels.png",
+      "implies": "React",
+      "meta": {
+        "web_author": "^solidpixels"
+      },
+      "script": [
+        "^https?://cdn\\.solidpixels\\.net/"
+      ],
+      "website": "https://www.solidpixels.net"
+    },
     "Solodev": {
       "cats": [
         1
@@ -10809,6 +11246,10 @@
       "cats": [
         41
       ],
+      "cookies": {
+        "__stripe_mid": "",
+        "__stripe_sid": ""
+      },
       "html": "<input[^>]+data-stripe",
       "icon": "Stripe.png",
       "js": {
@@ -11045,15 +11486,6 @@
       },
       "website": "https://github.com/syntaxhighlighter"
     },
-    "Taggbox": {
-      "cats": [
-        5
-      ], 
-      "icon": "Taggbox.svg",
-      "script": "web\\.taggbox\\.com", 
-      "url": "web\\.taggbox\\.com",
-      "website": "https://taggbox.com/" 
-    },
     "T-Soft": {
       "cats": [
         6
@@ -11115,6 +11547,15 @@
       "script": "\\.tagcommander\\.com",
       "website": "https://www.commandersact.com/en/solutions/tagcommander/"
     },
+    "Taggbox": {
+      "cats": [
+        5
+      ],
+      "icon": "Taggbox.svg",
+      "script": "web\\.taggbox\\.com",
+      "url": "web\\.taggbox\\.com",
+      "website": "https://taggbox.com/"
+    },
     "Taiga": {
       "cats": [
         13
@@ -11241,6 +11682,14 @@
       "icon": "Tengine.png",
       "website": "http://tengine.taobao.org"
     },
+    "Termly": {
+      "cats": [
+        67
+      ],
+      "icon": "termly.svg",
+      "script": "app\\.termly\\.io/embed\\.min\\.js",
+      "website": "https://termly.io/"
+    },
     "Tessitura": {
       "cats": [
         53
@@ -11264,6 +11713,14 @@
       },
       "website": "https://www.textalk.se"
     },
+    "Texthelp": {
+      "cats": [
+        68
+      ],
+      "icon": "Texthelp.png",
+      "script": "browsealoud\\.com/.*/browsealoud\\.js",
+      "website": "https://www.texthelp.com/en-gb/products/browsealoud/"
+    },
     "Textpattern CMS": {
       "cats": [
         1
@@ -11278,6 +11735,16 @@
       },
       "website": "http://textpattern.com"
     },
+    "The Hut Group": {
+      "cats": [
+        6
+      ],
+      "icon": "TheHutGroup.png",
+      "script": [
+        "THEHUT-.*\\.js"
+      ],
+      "website": "https://www.thg.com/"
+    },
     "Thelia": {
       "cats": [
         1,
@@ -11483,6 +11950,14 @@
       "script": "tcdn\\.com\\.br",
       "website": "https://www.tray.com.br"
     },
+    "TrustArc": {
+      "cats": [
+        67
+      ],
+      "icon": "TrustArc.svg",
+      "script": "consent\\.trustarc\\.com",
+      "website": "http://trustarc.com"
+    },
     "Tumblr": {
       "cats": [
         11
@@ -11714,6 +12189,14 @@
       "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
       "website": "http://underscorejs.org"
     },
+    "Uniconsent": {
+      "cats": [
+        67
+      ],
+      "icon": "Uniconsent.png",
+      "script": "cmp\\.uniconsent\\.mgr\\.consensu\\.org/dfp\\.js",
+      "website": "https://www.uniconsent.com/"
+    },
     "Usabilla": {
       "cats": [
         13
@@ -11724,6 +12207,15 @@
       },
       "website": "http://usabilla.com"
     },
+    "UsableNet": {
+      "cats": [
+        68
+      ],
+      "html": "<iframe[ˆ>]*\\.usablenet\\.com/pt/",
+      "icon": "UsableNet.png",
+      "script": "\\.usablenet\\.com/pt/",
+      "website": "https://usablenet.com/"
+    },
     "UserLike": {
       "cats": [
         52
@@ -11755,6 +12247,14 @@
       },
       "website": "http://uservoice.com"
     },
+    "UserWay": {
+      "cats": [
+        68
+      ],
+      "icon": "UserWay.png",
+      "script": "cdn\\.userway\\.org/widget.*\\.js",
+      "website": "https://userway.org/"
+    },
     "Ushahidi": {
       "cats": [
         1,
@@ -11865,6 +12365,14 @@
       "icon": "Varnish.svg",
       "website": "http://www.varnish-cache.org"
     },
+    "Venmo": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-venmo",
+      "icon": "Venmo.svg",
+      "website": "https://venmo.com"
+    },
     "Veoxa": {
       "cats": [
         36
@@ -11982,6 +12490,14 @@
       "url": "/sparql",
       "website": "https://virtuoso.openlinksw.com/"
     },
+    "Visa": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-visa",
+      "icon": "Visa.svg",
+      "website": "https://www.visa.com"
+    },
     "Visual Website Optimizer": {
       "cats": [
         10
@@ -12027,7 +12543,7 @@
         12
       ],
       "html": "<[^>]+\\sdata-v(?:ue)?-",
-      "icon": "Vue.js.png",
+      "icon": "vue.svg",
       "js": {
         "Vue.version": "^(.+)$\\;version:\\1"
       },
@@ -12169,6 +12685,16 @@
       "script": "web2py\\.js",
       "website": "http://web2py.com"
     },
+    "WebAR": {
+      "cats": [
+        19
+      ],
+      "html": [
+        "<model-viewer"
+      ],
+      "icon": "webAR.svg",
+      "website": "https://modelviewer.dev/"
+    },
     "WebGUI": {
       "cats": [
         1
@@ -13214,6 +13740,18 @@
       "script": "basket.*\\.js\\;confidence:10",
       "website": "https://addyosmani.github.io/basket.js/"
     },
+    "borderfree": {
+      "cats": [
+        6
+      ],
+      "icon": "borderfree.png",
+      "script": [
+        "global\\.prd\\.borderfree\\.com",
+        "wm\\.prd\\.borderfree\\.com",
+        "bfx\\.js"
+      ],
+      "website": "https://www.borderfree.com/"
+    },
     "cPanel": {
       "cats": [
         9
@@ -13378,6 +13916,14 @@
       "implies": "Node.js",
       "website": "http://endurojs.com"
     },
+    "eucookie.eu": {
+      "cats": [
+        67
+      ],
+      "icon": "eucookie.png",
+      "script": "eucookie\\.eu/public/gdpr-cookie-consent\\.js",
+      "website": "https://www.eucookie.eu/"
+    },
     "experiencedCMS": {
       "cats": [
         1
@@ -13458,7 +14004,6 @@
         "Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "gunicorn.png",
-      "implies": "Python",
       "website": "http://gunicorn.org"
     },
     "hCaptcha": {
@@ -14344,6 +14889,14 @@
       "script": "/media/conv/js/jquery\\.js",
       "website": "https://uknowva.com"
     },
+    "uRemediate": {
+      "cats": [
+        68
+      ],
+      "icon": "User1st.png",
+      "script": "fecdn\\.user1st\\.info/Loader/head",
+      "website": "https://www.user1st.com/uremediate/"
+    },
     "user.com": {
       "cats": [
         10
@@ -14527,7 +15080,7 @@
       "priority": 9
     },
     "16": {
-      "name": "Captchas",
+      "name": "Security",
       "priority": 9
     },
     "17": {
@@ -14721,6 +15274,14 @@
     "66": {
       "name": "UI frameworks",
       "priority": 7
+    },
+    "67": {
+      "name": "Cookie compliance",
+      "priority": 9
+    },
+    "68": {
+      "name": "Accessibility",
+      "priority": 9
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
deleted file mode 100644
index a59699358..000000000
--- a/src/drivers/bookmarklet/driver.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/* eslint-env browser */
-/* globals wappalyzer */
-
-;(function() {
-  wappalyzer.driver.document = document
-
-  const container = document.getElementById('wappalyzer-container')
-  const url = wappalyzer.parseUrl(window.top.location.href)
-  const hasOwn = Object.prototype.hasOwnProperty
-
-  /**
-   * Log messages to console
-   */
-  wappalyzer.driver.log = (message, source, type) => {
-    // eslint-disable-next-line no-console
-    console.log(`[wappalyzer ${type}]`, `[${source}]`, message)
-  }
-
-  function getPageContent() {
-    wappalyzer.log('func: getPageContent', 'driver')
-
-    const scripts = Array.prototype.slice
-      .apply(document.scripts)
-      .filter((s) => s.src)
-      .map((s) => s.src)
-
-    let html = new window.XMLSerializer()
-      .serializeToString(document)
-      .split('\n')
-
-    html = html
-      .slice(0, 1000)
-      .concat(html.slice(html.length - 1000))
-      .map((line) => line.substring(0, 1000))
-      .join('\n')
-
-    wappalyzer.analyze(url, {
-      html,
-      scripts
-    })
-  }
-
-  function getResponseHeaders() {
-    wappalyzer.log('func: getResponseHeaders', 'driver')
-
-    const xhr = new XMLHttpRequest()
-
-    xhr.open('GET', url, true)
-
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState === 4 && xhr.status) {
-        const headers = xhr.getAllResponseHeaders().split('\n')
-
-        if (headers.length > 0 && headers[0] !== '') {
-          wappalyzer.log(
-            `responseHeaders: ${xhr.getAllResponseHeaders()}`,
-            'driver'
-          )
-
-          const responseHeaders = {}
-
-          headers.forEach((line) => {
-            let name, value
-
-            if (line) {
-              name = line.substring(0, line.indexOf(': '))
-              value = line.substring(line.indexOf(': ') + 2, line.length - 1)
-
-              if (!responseHeaders[name.toLowerCase()]) {
-                responseHeaders[name.toLowerCase()] = []
-              }
-              responseHeaders[name.toLowerCase()].push(value)
-            }
-          })
-
-          wappalyzer.analyze(url, {
-            headers: responseHeaders
-          })
-        }
-      }
-    }
-
-    xhr.send()
-  }
-
-  /**
-   * Display apps
-   */
-  wappalyzer.driver.displayApps = (detected) => {
-    wappalyzer.log('func: displayApps', 'driver')
-
-    let first = true
-    let app
-    let category
-    let html
-
-    html =
-      '<a id="wappalyzer-close" href="javascript: document.body.removeChild(document.getElementById(\'wappalyzer-container\')); void(0);">' +
-      'Close' +
-      '</a>' +
-      '<div id="wappalyzer-apps">'
-
-    if (detected != null && Object.keys(detected).length) {
-      for (app in detected) {
-        if (!hasOwn.call(detected, app)) {
-          continue
-        }
-
-        const version = detected[app].version
-        const confidence = detected[app].confidence
-
-        html +=
-          `<div class="wappalyzer-app${first ? ' wappalyzer-first' : ''}">` +
-          `<a target="_blank" class="wappalyzer-application" href="${
-            wappalyzer.config.websiteURL
-          }applications/${app
-            .toLowerCase()
-            .replace(/ /g, '-')
-            .replace(/[^a-z0-9-]/g, '')}">` +
-          '<strong>' +
-          `<img src="${wappalyzer.config.websiteURL}images/icons/${wappalyzer
-            .apps[app].icon ||
-            'default.svg'}" width="16" height="16"/> ${app}</strong>${
-            version ? ` ${version}` : ''
-          }${confidence < 100 ? ` (${confidence}% sure)` : ''}</a>`
-
-        for (const i in wappalyzer.apps[app].cats) {
-          if (!hasOwn.call(wappalyzer.apps[app].cats, i)) {
-            continue
-          }
-
-          category = wappalyzer.categories[wappalyzer.apps[app].cats[i]].name
-
-          html += `<a target="_blank" class="wappalyzer-category" href="${
-            wappalyzer.config.websiteURL
-          }categories/${slugify(category)}">${category}</a>`
-        }
-
-        html += '</div>'
-
-        first = false
-      }
-    } else {
-      html += '<div id="wappalyzer-empty">No applications detected</div>'
-    }
-
-    html += '</div>'
-
-    container.innerHTML = html
-  }
-
-  /**
-   * Open a tab
-   */
-  // function openTab(args) {
-  //  open(args.url)
-  // }
-
-  function slugify(string) {
-    return string
-      .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '-')
-      .replace(/--+/g, '-')
-      .replace(/(?:^-|-$)/, '')
-  }
-
-  getPageContent()
-  getResponseHeaders()
-})()
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 7b7fc079e..ab935d437 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -40,12 +40,6 @@ languageDetect.setLanguageType('iso2')
 
 const extensions = /^([^.]+$|\.(asp|aspx|cgi|htm|html|jsp|php)$)/
 
-const errorTypes = {
-  RESPONSE_NOT_OK: 'Response was not ok',
-  NO_RESPONSE: 'No response from server',
-  NO_HTML_DOCUMENT: 'No HTML document'
-}
-
 const { apps: technologies, categories } = JSON.parse(
   fs.readFileSync(path.resolve(`${__dirname}/apps.json`))
 )
@@ -137,7 +131,7 @@ class Driver {
   }
 
   open(url) {
-    return new Site(url, this)
+    return new Site(url.split('#')[0], this)
   }
 
   log(message, source = 'driver') {
@@ -157,7 +151,7 @@ class Site {
     try {
       this.originalUrl = new URL(url)
     } catch (error) {
-      throw new Error(error.message || error.toString())
+      throw new Error(error.toString())
     }
 
     this.analyzedUrls = {}
@@ -288,7 +282,10 @@ class Site {
       await Promise.race([
         page.goto(url.href, { waitUntil: 'domcontentloaded' }),
         new Promise((resolve, reject) =>
-          setTimeout(() => reject(new Error('Timeout')), this.options.maxWait)
+          setTimeout(
+            () => reject(new Error('The website took too long to respond')),
+            this.options.maxWait
+          )
         )
       ])
     } catch (error) {
@@ -411,7 +408,7 @@ class Site {
 
       this.log('Page closed')
 
-      throw new Error('NO_RESPONSE')
+      throw new Error('No response from server')
     }
 
     if (!this.language) {
@@ -493,21 +490,9 @@ class Site {
         await this.batch(links.slice(0, this.options.maxUrls), depth + 1)
       }
     } 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.analyzedUrls[url.href] = {
         status: 0,
-        error: {
-          type,
-          message
-        }
+        error: error.message || error.toString()
       }
 
       this.error(error)
@@ -515,21 +500,29 @@ class Site {
 
     return {
       urls: this.analyzedUrls,
-      applications: resolve(this.detections).map(
-        ({ name, confidence, version, icon, website, cpe, categories }) => ({
+      technologies: resolve(this.detections).map(
+        ({
+          slug,
           name,
           confidence,
           version,
           icon,
           website,
           cpe,
-          categories: categories.reduce(
-            (categories, { id, name }) => ({
-              ...categories,
-              [id]: name
-            }),
-            {}
-          )
+          categories
+        }) => ({
+          slug,
+          name,
+          confidence,
+          version: version || null,
+          icon,
+          website,
+          cpe,
+          categories: categories.map(({ id, slug, name }) => ({
+            id,
+            slug,
+            name
+          }))
         })
       ),
       meta: {
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index ec68a1286..84fcdcfb9 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com",
-  "version": "6.0.15",
+  "version": "6.1.1",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
@@ -38,4 +38,4 @@
     "languagedetect": "^2.0.0",
     "puppeteer": "^2.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/webextension/_locales/ca/messages.json b/src/drivers/webextension/_locales/ca/messages.json
index 721464c9d..b2532748a 100644
--- a/src/drivers/webextension/_locales/ca/messages.json
+++ b/src/drivers/webextension/_locales/ca/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Rastrejadors d'incidències" },
 	"categoryName14":           { "message": "Reproductors de vídeo" },
 	"categoryName15":           { "message": "Sistemes de comentaris" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font Script" },
 	"categoryName18":           { "message": "Marcs web" },
 	"categoryName19":           { "message": "Miscel·lània" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxys invers" },
 	"categoryName65":           { "message": "Balanceigs de càrrega" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
index 847dbf1fa..bfb0bef7e 100644
--- a/src/drivers/webextension/_locales/de/messages.json
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Fehlertracker" },
 	"categoryName14":           { "message": "Videospieler" },
 	"categoryName15":           { "message": "Kommentarsystem" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Schrift Script" },
 	"categoryName18":           { "message": "Web Framework" },
 	"categoryName19":           { "message": "Sonstiges" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 766f7f9b7..65ed463ae 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -27,7 +27,7 @@
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
 	"categoryName15":           { "message": "Σύστημα Σχολίων" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Script Γραμματοσειράς" },
 	"categoryName18":           { "message": "Framework Διαδικτύου" },
 	"categoryName19":           { "message": "Διάφορα" },
@@ -77,5 +77,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index 9f7b85cc0..efef0fc50 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -11,11 +11,11 @@
 	"optionThemeMode":          { "message": "Enable dark mode compatibility" },
 	"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" },
-  "createAlert":              { "message": "Create an alert for this website" },
+	"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" },
+	"createAlert":              { "message": "Create an alert for this website" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Message boards" },
 	"categoryName3":            { "message": "Database managers" },
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Issue trackers" },
 	"categoryName14":           { "message": "Video players" },
 	"categoryName15":           { "message": "Comment systems" },
-	"categoryName16":           { "message": "Captchas" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font scripts" },
 	"categoryName18":           { "message": "Web frameworks" },
 	"categoryName19":           { "message": "Miscellaneous" },
@@ -67,7 +67,7 @@
 	"categoryName51":           { "message": "Page builder" },
 	"categoryName52":           { "message": "Live chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" },
+  	"categoryName54":           { "message": "SEO" },
 	"categoryName55":           { "message": "Accounting" },
 	"categoryName56":           { "message": "Cryptominers" },
 	"categoryName57":           { "message": "Static site generators" },
@@ -79,5 +79,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse proxies" },
 	"categoryName65":           { "message": "Load balancers" },
-	"categoryName66":           { "message": "UI frameworks" }
+	"categoryName66":           { "message": "UI frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index 14d102648..2e7316047 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Gestor de Incidencias" },
 	"categoryName14":           { "message": "Reproductor de Vídeo" },
 	"categoryName15":           { "message": "Sistema de Comentarios" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Tipografía" },
 	"categoryName18":           { "message": "Framework Web" },
 	"categoryName19":           { "message": "Miscelánea" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json
index adb30b530..1e1c6ca91 100644
--- a/src/drivers/webextension/_locales/fa/messages.json
+++ b/src/drivers/webextension/_locales/fa/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "ردیاب مشکل" },
 	"categoryName14":           { "message": "پخش کننده ویدیویی" },
 	"categoryName15":           { "message": "سیستم نظرسنجی" },
-	"categoryName16":           { "message": "کپچا" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "اسکریپ فونت" },
 	"categoryName18":           { "message": "چارچوب وب" },
 	"categoryName19":           { "message": "متفرقه" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "پروکسی معکوس" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index 37fd1c2ce..f7b5b4f72 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Outil de suivi de problèmes" },
 	"categoryName14":           { "message": "Lecteur de vidéos" },
 	"categoryName15":           { "message": "Système de commentaires" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Script de police" },
 	"categoryName18":           { "message": "Framework web" },
 	"categoryName19":           { "message": "Divers" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/gl_ES/messages.json b/src/drivers/webextension/_locales/gl_ES/messages.json
index 795060901..b6bd40fb3 100644
--- a/src/drivers/webextension/_locales/gl_ES/messages.json
+++ b/src/drivers/webextension/_locales/gl_ES/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Xestor de incidencias" },
 	"categoryName14":           { "message": "Reproductor de vídeo" },
 	"categoryName15":           { "message": "Sistema de comentarios" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font Script" },
 	"categoryName18":           { "message": "Framework Web" },
 	"categoryName19":           { "message": "Diverso" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy inverso" },
 	"categoryName65":           { "message": "Balanceador de carga" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index b631044ee..636b4c659 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -27,7 +27,7 @@
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
 	"categoryName15":           { "message": "Σύστημα Σχολίων" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Script Γραμματοσειράς" },
 	"categoryName18":           { "message": "Framework Διαδικτύου" },
 	"categoryName19":           { "message": "Διάφορα" },
@@ -77,5 +77,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index 11d46d599..bc1dd6387 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Pelacak Masalah" },
 	"categoryName14":           { "message": "Pemutar Video" },
 	"categoryName15":           { "message": "Sistem Komentar" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font Script" },
 	"categoryName18":           { "message": "Bingkai Kerja Web" },
 	"categoryName19":           { "message": "Serba Serbi" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index 27882408a..8ce6f0aac 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Player Video" },
 	"categoryName15":           { "message": "Sistema di commenti" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font Script" },
 	"categoryName18":           { "message": "Framework Web" },
 	"categoryName19":           { "message": "Miscellanea" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/ja/messages.json b/src/drivers/webextension/_locales/ja/messages.json
index 666d4d957..e9dc9a0dd 100644
--- a/src/drivers/webextension/_locales/ja/messages.json
+++ b/src/drivers/webextension/_locales/ja/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "課題管理" },
 	"categoryName14":           { "message": "ビデオプレーヤー" },
 	"categoryName15":           { "message": "コメントシステム" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Font Script" },
 	"categoryName18":           { "message": "Webフレームワーク" },
 	"categoryName19":           { "message": "その他" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "リバースプロキシ" },
 	"categoryName65":           { "message": "ロードバランサー" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index 90e83acfd..80594f226 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Lista problemów" },
 	"categoryName14":           { "message": "Odtwarzacz wideo" },
 	"categoryName15":           { "message": "System komentarzy" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Skrypt czcionek" },
 	"categoryName18":           { "message": "Framework webowy" },
 	"categoryName19":           { "message": "Różne" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy wsteczne" },
 	"categoryName65":           { "message": "Równoważenie obciążenia" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json
index a7fd7a55a..e6ca6d403 100644
--- a/src/drivers/webextension/_locales/pt/messages.json
+++ b/src/drivers/webextension/_locales/pt/messages.json
@@ -31,7 +31,7 @@
   "categoryName13":           { "message": "Localizador de Problemas" },
   "categoryName14":           { "message": "Leitor Vídeo" },
   "categoryName15":           { "message": "Sistema de Comentários" },
-  "categoryName16":           { "message": "Captcha" },
+  "categoryName16":           { "message": "Security" },
   "categoryName17":           { "message": "Tipos de Letra" },
   "categoryName18":           { "message": "Framework Web" },
   "categoryName19":           { "message": "Diversos" },
@@ -79,7 +79,9 @@
   "categoryName61":           { "message": "SaaS" },
   "categoryName62":           { "message": "PaaS" },
   "categoryName63":           { "message": "IaaS" },
-	"categoryName64":           { "message": "Reverse Proxy" },
-	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+  "categoryName64":           { "message": "Reverse Proxy" },
+  "categoryName65":           { "message": "Load Balancer" },
+  "categoryName66":           { "message": "UI Frameworks" },
+  "categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
index e32b108aa..87499d163 100644
--- a/src/drivers/webextension/_locales/pt_BR/messages.json
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Rastreamento de Problemas" },
 	"categoryName14":           { "message": "Reprodutor de Vídeo" },
 	"categoryName15":           { "message": "Sistema de Comentários" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Script de Fonte" },
 	"categoryName18":           { "message": "Framework Web" },
 	"categoryName19":           { "message": "Diversos" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Proxy Reverso" },
 	"categoryName65":           { "message": "Balanceador de Carga" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index a3036e74a..85681ae2b 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -27,7 +27,7 @@
 	"categoryName13":           { "message": "Tracker probleme" },
 	"categoryName14":           { "message": "Player Video" },
 	"categoryName15":           { "message": "Sistem de comentarii" },
-	"categoryName16":           { "message": "Verificare Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Script pentru fonturi" },
 	"categoryName18":           { "message": "Framework Web" },
 	"categoryName19":           { "message": "Divers" },
@@ -77,5 +77,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 55d08dca6..5b40f5451 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Баг-трекер" },
 	"categoryName14":           { "message": "Видео-плеер" },
 	"categoryName15":           { "message": "Система комментариев" },
-	"categoryName16":           { "message": "Капча" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Шрифт" },
 	"categoryName18":           { "message": "Веб-фреймворк" },
 	"categoryName19":           { "message": "Прочее" },
@@ -79,5 +79,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Обратный прокси" },
 	"categoryName65":           { "message": "Балансировка нагрузки" },
-	"categoryName66":           { "message": "UI Фреймворк" }
+	"categoryName66":           { "message": "UI Фреймворк" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index b9ed2ce77..364c900fd 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -31,7 +31,7 @@
   "categoryName13":           { "message": "Issue Tracker" },
   "categoryName14":           { "message": "Video prehrávač" },
   "categoryName15":           { "message": "Systém komentárov" },
-  "categoryName16":           { "message": "Captcha" },
+  "categoryName16":           { "message": "Security" },
   "categoryName17":           { "message": "Font Script" },
   "categoryName18":           { "message": "Web Framework" },
   "categoryName19":           { "message": "Rôzne" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
index 63167726a..b94dc01cc 100644
--- a/src/drivers/webextension/_locales/tr/messages.json
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Hata Takibi" },
 	"categoryName14":           { "message": "Video Oynatıcı" },
 	"categoryName15":           { "message": "Yorum Sistemi" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Yazı Tipi" },
 	"categoryName18":           { "message": "Web Framework" },
 	"categoryName19":           { "message": "Çeşitli" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Yük Dengeleyici" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index c8c28983f..c3c34cdd8 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Багтрекер" },
 	"categoryName14":           { "message": "Відеопрогравач" },
 	"categoryName15":           { "message": "Система коментарів" },
-	"categoryName16":           { "message": "Капча" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Шрифт" },
 	"categoryName18":           { "message": "Веб-фреймворк" },
 	"categoryName19":           { "message": "Інше" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
index b0af1ba9f..e59441aae 100644
--- a/src/drivers/webextension/_locales/uz/messages.json
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -31,7 +31,7 @@
 	"categoryName13":           { "message": "Bag treker" },
 	"categoryName14":           { "message": "Video Player" },
 	"categoryName15":           { "message": "Izohlar tizimi" },
-	"categoryName16":           { "message": "Captcha" },
+	"categoryName16":           { "message": "Security" },
 	"categoryName17":           { "message": "Shrift" },
 	"categoryName18":           { "message": "Veb Freymvork" },
 	"categoryName19":           { "message": "Boshqalar" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "IaaS" },
 	"categoryName64":           { "message": "Reverse Proxy" },
 	"categoryName65":           { "message": "Load Balancer" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "UI Frameworks" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 2aadbda4c..758e423ef 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -31,7 +31,7 @@
   "categoryName13":           { "message": "问题跟踪器" },
   "categoryName14":           { "message": "视频播放器" },
   "categoryName15":           { "message": "评论系统" },
-  "categoryName16":           { "message": "验证码" },
+  "categoryName16":           { "message": "Security" },
   "categoryName17":           { "message": "字体脚本" },
   "categoryName18":           { "message": "Web 框架" },
   "categoryName19":           { "message": "杂项" },
@@ -81,5 +81,7 @@
 	"categoryName63":           { "message": "基础设施即服务（IaaS）" },
 	"categoryName64":           { "message": "反向代理" },
 	"categoryName65":           { "message": "负载均衡" },
-	"categoryName66":           { "message": "用户界面（UI）框架" }
+	"categoryName66":           { "message": "用户界面（UI）框架" },
+	"categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":			      { "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
index 9ca2612f3..606d98c05 100644
--- a/src/drivers/webextension/_locales/zh_TW/messages.json
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -31,7 +31,7 @@
   "categoryName13":           { "message": "問題追蹤" },
   "categoryName14":           { "message": "影音播放器" },
   "categoryName15":           { "message": "評論系統" },
-  "categoryName16":           { "message": "驗證碼" },
+  "categoryName16":           { "message": "Security" },
   "categoryName17":           { "message": "字型" },
   "categoryName18":           { "message": "網頁框架" },
   "categoryName19":           { "message": "其他" },
@@ -81,5 +81,7 @@
   "categoryName63":           { "message": "基礎設施即服務（IaaS）" },
   "categoryName64":           { "message": "反向代理伺服器" },
   "categoryName65":           { "message": "負載平衡器" },
-  "categoryName66":           { "message": "UI 框架" }
+  "categoryName66":           { "message": "UI 框架" },
+  "categoryName67":           { "message": "Cookie compliance" },
+	"categoryName68":		      	{ "message": "Accessibility"}
 }
diff --git a/src/drivers/webextension/css/styles.css b/src/drivers/webextension/css/styles.css
index bab5ea177..700dc92fb 100644
--- a/src/drivers/webextension/css/styles.css
+++ b/src/drivers/webextension/css/styles.css
@@ -68,6 +68,10 @@ a:hover {
   width: 100%;
 }
 
+.alerts--hidden {
+  visibility: hidden;
+}
+
 .alerts__icon {
   color: var(--color-primary);
   height: 1.1rem;
@@ -90,12 +94,20 @@ a:hover {
   padding: 1.5rem 1.5rem .5rem 1.5rem;
 }
 
+.detections--hidden {
+  display: none;
+}
+
 .empty {
   opacity: .3;
   padding: 3rem 1.5rem .5rem 1.5rem;
   text-align: center;
 }
 
+.empty--hidden {
+  display: none;
+}
+
 .category {
   page-break-inside: avoid;
   break-inside: avoid-column;
@@ -177,7 +189,7 @@ a:hover {
 
 .terms {
   align-items: center;
-  display: none;
+  display: flex;
   flex-direction: column;
   justify-content: center;
   padding: 1.5rem 1.5rem 1rem 1.5rem;
@@ -185,6 +197,10 @@ a:hover {
   width: 36rem;
 }
 
+.terms--hidden {
+  display: none;
+}
+
 .terms__wrapper {
   display: none;
   height: 100%;
diff --git a/src/drivers/webextension/html/popup.html b/src/drivers/webextension/html/popup.html
index 4e9798d19..79b8322fc 100644
--- a/src/drivers/webextension/html/popup.html
+++ b/src/drivers/webextension/html/popup.html
@@ -69,7 +69,7 @@
           <path fill="currentColor" d="M12,8H4A2,2 0 0,0 2,10V14A2,2 0 0,0 4,16H5V20A1,1 0 0,0 6,21H8A1,1 0 0,0 9,20V16H12L17,20V4L12,8M21.5,12C21.5,13.71 20.54,15.26 19,16V8C20.53,8.75 21.5,10.3 21.5,12Z" />
         </svg>
 
-        <a class="alerts__link" href="https://www.wappalyzer.com/alerts/manage" data-i18n="createAlert"></a>
+        <a class="alerts__link" href="https://www.wappalyzer.com/alerts" data-i18n="createAlert"></a>
       </div>
 
       <svg class="footer__settings" viewBox="0 0 24 24">
diff --git a/src/drivers/webextension/images/icons/Accessibe.png b/src/drivers/webextension/images/icons/Accessibe.png
new file mode 100644
index 000000000..77614df7d
Binary files /dev/null and b/src/drivers/webextension/images/icons/Accessibe.png differ
diff --git a/src/drivers/webextension/images/icons/Adally.png b/src/drivers/webextension/images/icons/Adally.png
new file mode 100644
index 000000000..f8372798f
Binary files /dev/null and b/src/drivers/webextension/images/icons/Adally.png differ
diff --git a/src/drivers/webextension/images/icons/AdonisJS.png b/src/drivers/webextension/images/icons/AdonisJS.png
new file mode 100644
index 000000000..71b65e892
Binary files /dev/null and b/src/drivers/webextension/images/icons/AdonisJS.png differ
diff --git a/src/drivers/webextension/images/icons/Amazon Pay.svg b/src/drivers/webextension/images/icons/Amazon Pay.svg
new file mode 100644
index 000000000..19f29d4ff
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Amazon Pay.svg	
@@ -0,0 +1,6 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M63.0313 47.9148C55.3966 53.5492 44.329 56.5451 34.7974 56.5451C21.4393 56.5451 9.41057 51.607 0.308754 43.3883C-0.405753 42.7427 0.230775 41.8614 1.09036 42.3619C10.9103 48.0762 23.0551 51.5181 35.5989 51.5181C44.0606 51.5181 53.3619 49.7627 61.9215 46.1321C63.2108 45.5826 64.2935 46.9808 63.0313 47.9148ZM66.2067 44.2878C67.1841 45.5391 65.1204 50.6912 64.1992 52.9925C63.9199 53.6889 64.5183 53.9699 65.1494 53.4422C69.2442 50.0166 70.3033 42.837 69.4655 41.7997C68.6331 40.7715 61.4735 39.8865 57.1031 42.9549C56.4303 43.4264 56.5463 44.0793 57.2917 43.9886C59.7525 43.6948 65.231 43.0365 66.2067 44.2878Z" fill="#FF9900"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.1535 35.0627L63.1002 14.837C63.267 14.4272 63.3522 14.1389 63.3522 13.9702C63.3522 13.6819 63.1836 13.5368 62.8463 13.5368H60.8243C60.438 13.5368 60.175 13.5984 60.0282 13.7181C59.8831 13.8396 59.7398 14.1044 59.5947 14.5142L54.7183 28.5269L49.6624 14.5142C49.5173 14.1044 49.374 13.8396 49.2289 13.7181C49.0839 13.5984 48.8191 13.5368 48.4328 13.5368H46.2657C45.9284 13.5368 45.7598 13.6819 45.7598 13.9702C45.7598 14.1389 45.8432 14.4272 46.0118 14.837L52.9828 32.0288L52.2973 33.8712C51.8875 35.0282 51.4305 35.8225 50.9245 36.256C50.4186 36.6894 49.7077 36.9052 48.7937 36.9052C48.3839 36.9052 48.0592 36.8798 47.8199 36.8326C47.5787 36.7855 47.3973 36.7601 47.2776 36.7601C46.9168 36.7601 46.7354 36.9886 46.7354 37.4456V38.385C46.7354 38.7223 46.7953 38.9689 46.9168 39.1249C47.0364 39.2808 47.2287 39.3969 47.4953 39.4676C48.0955 39.6345 48.7828 39.7215 49.5535 39.7215C50.9263 39.7215 52.0398 39.3606 52.894 38.637C53.7517 37.9171 54.5043 36.7238 55.1535 35.0627Z" fill="#232F3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.4888 18.5075C25.1388 17.3396 24.6401 16.3459 23.9891 15.528C23.3398 14.7101 22.5455 14.0826 21.6062 13.6492C20.6686 13.2158 19.6204 13 18.4634 13C17.3808 13 16.3199 13.2031 15.2862 13.613C14.2507 14.0228 13.2751 14.6249 12.3593 15.4192L12.1797 14.2622C12.1072 13.7816 11.8297 13.5404 11.3473 13.5404H9.75875C9.27818 13.5404 9.03699 13.7816 9.03699 14.2622V38.5699C9.03699 39.0523 9.27818 39.2917 9.75875 39.2917H11.8896C12.372 39.2917 12.6113 39.0505 12.6113 38.5699V30.1192C14.1764 31.5391 16.0424 32.25 18.2095 32.25C19.3883 32.25 20.46 32.0142 21.423 31.5464C22.386 31.0767 23.2038 30.4202 23.8784 29.5769C24.553 28.7355 25.0771 27.7127 25.4489 26.5067C25.8225 25.3026 26.0093 23.9534 26.0093 22.4609C26.0129 20.9938 25.837 19.6754 25.4888 18.5075ZM17.3808 29.3593C15.7414 29.3593 14.1528 28.7826 12.6132 27.6256V17.55C14.1292 16.442 15.7432 15.8889 17.4533 15.8889C20.7284 15.8889 22.366 18.1412 22.366 22.6422C22.3642 27.1215 20.703 29.3593 17.3808 29.3593Z" fill="#232F3E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.7756 14.4181C40.6911 13.4806 39.0064 13.0109 36.7196 13.0109C35.588 13.0109 34.4564 13.1142 33.3248 13.3174C32.1914 13.5223 31.2411 13.7925 30.4704 14.1298C30.1821 14.2513 29.988 14.3764 29.8919 14.5088C29.7958 14.6412 29.7468 14.8769 29.7468 15.2124V16.1863C29.7468 16.6197 29.9028 16.8373 30.2165 16.8373C30.3126 16.8373 30.416 16.8192 30.5248 16.7829C30.6336 16.7466 30.7243 16.7176 30.795 16.6922C32.6502 16.1391 34.4183 15.8617 36.1049 15.8617C37.5484 15.8617 38.5603 16.1264 39.1388 16.6578C39.7173 17.1873 40.0056 18.1013 40.0056 19.4016V21.7845C38.3209 21.3746 36.803 21.1715 35.4538 21.1715C33.3357 21.1715 31.651 21.6956 30.3979 22.742C29.1466 23.7883 28.5191 25.192 28.5191 26.9492C28.5191 28.5886 29.0251 29.8925 30.037 30.8681C31.0471 31.8438 32.4199 32.3298 34.1536 32.3298C35.1891 32.3298 36.23 32.1249 37.2782 31.7168C38.3264 31.3088 39.2821 30.7285 40.1489 29.9832L40.3302 31.1746C40.4028 31.6316 40.6675 31.8601 41.1264 31.8601H42.6787C43.1593 31.8601 43.4023 31.6189 43.4023 31.1383V18.7886C43.4005 16.8137 42.8582 15.3575 41.7756 14.4181ZM40.0056 27.7834C39.2113 28.3855 38.3808 28.8425 37.5139 29.1562C36.6471 29.47 35.8165 29.6259 35.0222 29.6259C34.0828 29.6259 33.3611 29.3793 32.8551 28.886C32.3492 28.3927 32.0971 27.6891 32.0971 26.7733C32.0971 24.6788 33.4572 23.6306 36.1774 23.6306C36.803 23.6306 37.4468 23.6741 38.1087 23.7575C38.7707 23.8427 39.4036 23.957 40.0056 24.1003V27.7834Z" fill="#232F3E"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Amex.svg b/src/drivers/webextension/images/icons/Amex.svg
new file mode 100644
index 000000000..fb04310ac
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Amex.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1000" height="997.51703" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="American_Express_2018.svg">
+  <defs id="defs4"/>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.125" inkscape:cx="850.2929" inkscape:cy="357.59411" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1680" inkscape:window-height="931" inkscape:window-x="0" inkscape:window-y="1" inkscape:window-maximized="1">
+    <inkscape:grid type="xygrid" id="grid2996" empspacing="5" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="-55.5px" originy="947.50002px"/>
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-55.5,-1002.3452)">
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3078" d="m 55.5,1002.3454 997.5168,0 0,538.4893 -49.3744,77.1475 49.3744,68.6613 0,313.2187 -997.5168,0 0,-507.6304 L 86.358989,1456.744 55.5,1422.7991 Z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="cccccccccccccccccccc" inkscape:connector-curvature="0" id="path3082" d="m 249.14015,1697.4441 0,-156.6094 165.82027,0 17.79072,23.1924 18.37901,-23.1924 601.88665,0 0,145.8088 c 0,0 -15.7404,10.644 -33.9449,10.8006 l -333.27706,0 -20.05834,-24.6872 0,24.6872 -65.72965,0 0,-42.1418 c 0,0 -8.97877,5.8825 -28.39026,5.8825 l -22.37277,0 0,36.2593 -99.52024,0 -17.7653,-23.6898 -18.03807,23.6898 z" style="fill:#ffffff;stroke:none"/>
+    <path sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3080" d="m 55.5,1422.7991 37.393125,-87.1766 64.667505,0 21.22103,48.8328 0,-48.8328 80.38767,0 12.63289,35.2949 12.24716,-35.2949 360.8573,0 0,17.7439 c 0,0 18.96995,-17.7439 50.14586,-17.7439 l 117.08499,0.4092 20.85469,48.1937 0,-48.6029 67.27259,0 18.5154,27.6834 0,-27.6834 67.88977,0 0,156.6093 -67.88977,0 -17.74392,-27.7731 0,27.7731 -98.83835,0 -9.93959,-24.6872 -26.57108,0 -9.77781,24.6872 -67.02872,0 c -26.82589,0 -43.97406,-17.3816 -43.97406,-17.3816 l 0,17.3816 -101.06318,0 -20.05835,-24.6872 0,24.6872 -375.80462,0 -9.93274,-24.6872 -26.48635,0 -9.86254,24.6872 -46.1989,0 z" style="fill:#ffffff;stroke:none"/>
+    <path id="path3046" d="m 106.12803,1354.9291 -50.435161,117.2641 32.835892,0 9.305914,-23.4816 54.099665,0 9.2577,23.4816 33.55915,0 -50.38695,-117.2641 -38.23621,0 z m 18.66004,27.2909 16.49028,41.0329 -33.02877,0 16.53849,-41.0329 z" style="fill:#016fd0;fill-opacity:1;stroke:none" inkscape:connector-curvature="0"/>
+    <path sodipodi:nodetypes="cccccccccccccc" inkscape:connector-curvature="0" id="path3048" d="m 198.22282,1472.1735 0,-117.2642 46.66163,0.1733 27.13999,75.6045 26.4901,-75.7778 46.28848,0 0,117.2642 -29.31604,0 0,-86.4052 -31.07562,86.4052 -25.71023,0 -31.16227,-86.4052 0,86.4052 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3050" d="m 364.86136,1472.1735 0,-117.2642 95.66287,0 0,26.2302 -66.03824,0 0,20.0583 64.49529,0 0,24.6872 -64.49529,0 0,20.8298 66.03824,0 0,25.4587 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path id="path3052" d="m 477.49667,1354.9291 0,117.2641 29.31604,0 0,-41.6596 12.34359,0 35.15032,41.6596 35.82536,0 -38.57374,-43.2025 c 15.8309,-1.3359 32.16085,-14.9233 32.16085,-36.0182 0,-24.6765 -19.36827,-38.0434 -40.98459,-38.0434 l -65.23783,0 z m 29.31604,26.2301 33.51093,0 c 8.03881,0 13.88655,6.2882 13.88655,12.3436 0,7.7905 -7.57673,12.3436 -13.45259,12.3436 l -33.94489,0 0,-24.6872 z" style="fill:#016fd0;fill-opacity:1;stroke:none" inkscape:connector-curvature="0"/>
+    <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path3054" d="m 625.61982,1472.1735 -29.93322,0 0,-117.2642 29.93322,0 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3056" d="m 696.59549,1472.1735 -6.4611,0 c -31.26172,0 -50.24229,-24.6292 -50.24229,-58.1499 0,-34.3488 18.76806,-59.1143 58.24634,-59.1143 l 32.40194,0 0,27.7731 -33.58657,0 c -16.026,0 -27.35994,12.5067 -27.35994,31.6305 0,22.7096 12.95987,32.2476 31.63047,32.2476 l 7.71474,0 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path inkscape:connector-curvature="0" style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 760.3868,1354.9291 -50.43515,117.2641 32.83589,0 9.30591,-23.4816 54.09967,0 9.25769,23.4816 33.55915,0 -50.38694,-117.2641 -38.23622,0 z m 18.66005,27.2909 16.49027,41.0329 -33.02876,0 16.53849,-41.0329 z" id="path3058"/>
+    <path sodipodi:nodetypes="ccccccccccc" inkscape:connector-curvature="0" id="path3060" d="m 852.43338,1472.1735 0,-117.2642 37.27187,0 47.59035,73.6759 0,-73.6759 29.31604,0 0,117.2642 -36.06644,0 -48.79578,-75.6045 0,75.6045 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 269.1985,1677.3858 0,-117.2642 95.66286,0 0,26.2302 -66.03823,0 0,20.0583 64.49528,0 0,24.6872 -64.49528,0 0,20.8298 66.03823,0 0,25.4587 z" id="path3062" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3064" d="m 737.94653,1677.3858 0,-117.2642 95.66287,0 0,26.2302 -66.03824,0 0,20.0583 64.1867,0 0,24.6872 -64.1867,0 0,20.8298 66.03824,0 0,25.4587 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccccc" inkscape:connector-curvature="0" id="path3066" d="m 368.57408,1677.3858 46.57779,-57.9089 -47.68678,-59.3553 36.93435,0 28.39991,36.6932 28.49635,-36.6932 35.48784,0 -47.05996,58.6321 46.66353,58.6321 -36.92851,0 -27.57537,-36.1148 -26.90518,36.1148 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 499.86944,1560.1414 0,117.2641 30.08751,0 0,-37.0308 30.85899,0 c 26.11107,0 45.90274,-13.8524 45.90274,-40.7917 0,-22.3164 -15.52271,-39.4416 -42.09358,-39.4416 l -64.75566,0 z m 30.08751,26.5194 32.49837,0 c 8.43546,0 14.46515,5.1701 14.46515,13.5008 0,7.8262 -5.99925,13.5008 -14.56158,13.5008 l -32.40194,0 0,-27.0016 z" id="path3068" inkscape:connector-curvature="0"/>
+    <path inkscape:connector-curvature="0" style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 619.44802,1560.1216 0,117.2642 29.31604,0 0,-41.6597 12.34359,0 35.15032,41.6597 35.82536,0 -38.57374,-43.2026 c 15.83089,-1.3361 32.16085,-14.9233 32.16085,-36.0183 0,-24.6764 -19.36827,-38.0433 -40.98459,-38.0433 l -65.23783,0 z m 29.31604,26.2302 33.51093,0 c 8.03881,0 13.88654,6.2881 13.88654,12.3435 0,7.7906 -7.57673,12.3436 -13.45259,12.3436 l -33.94488,0 0,-24.6871 z" id="path3072"/>
+    <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" id="path3074" d="m 847.18735,1677.3858 0,-25.4587 58.67066,0 c 8.68115,0 12.44003,-4.6912 12.44003,-9.8363 0,-4.9296 -3.74703,-9.9134 -12.44003,-9.9134 l -26.5126,0 c -23.04571,0 -35.88042,-14.0409 -35.88042,-35.1214 0,-18.8023 11.75348,-36.9344 45.99918,-36.9344 l 57.08913,0 -12.3436,26.3844 -49.37438,0 c -9.43821,0 -12.3436,4.9526 -12.3436,9.6821 0,4.8612 3.59036,10.222 10.80065,10.222 l 27.77309,0 c 25.69029,0 36.83792,14.5724 36.83792,33.6556 0,20.5163 -12.42212,37.3201 -38.23646,37.3201 z" style="fill:#016fd0;fill-opacity:1;stroke:none"/>
+    <path style="fill:#016fd0;fill-opacity:1;stroke:none" d="m 954.78398,1677.3858 0,-25.4587 58.67062,0 c 8.6812,0 12.4401,-4.6912 12.4401,-9.8363 0,-4.9296 -3.7471,-9.9134 -12.4401,-9.9134 l -26.51256,0 c -23.04571,0 -35.88043,-14.0409 -35.88043,-35.1214 0,-18.8023 11.75348,-36.9344 45.99918,-36.9344 l 57.08911,0 -12.3436,26.3844 -49.37436,0 c -9.4382,0 -12.34359,4.9526 -12.34359,9.6821 0,4.8612 3.59035,10.222 10.80064,10.222 l 27.77311,0 c 25.6903,0 36.8379,14.5724 36.8379,33.6556 0,20.5163 -12.4221,37.3201 -38.2365,37.3201 z" id="path3076" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Apple.svg b/src/drivers/webextension/images/icons/Apple.svg
index 2954f0f52..d0e888fea 100644
--- a/src/drivers/webextension/images/icons/Apple.svg
+++ b/src/drivers/webextension/images/icons/Apple.svg
@@ -1,23 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="747.63776" height="909.28345" id="svg2811">
-  <defs id="defs2813">
-    <clipPath id="clp12">
-      <path d="M 45.315,71.927 L 58.235,71.927 L 58.235,87.794 L 45.315,87.794 L 45.315,71.927 z " id="path184"/>
-    </clipPath>
-    <clipPath id="clp21">
-      <path d="M 123.91,72.178 L 150.14,72.178 L 150.14,87.472 L 123.91,87.472 L 123.91,72.178 z " id="path592"/>
-    </clipPath>
-    <clipPath id="clp9">
-      <path d="M 413.96,49.857 L 445.72,49.857 L 445.72,58.576 L 413.96,58.576 L 413.96,49.857 z " id="path100"/>
-    </clipPath>
-  </defs>
-  <g transform="translate(-1074.235,-1639.219)" id="layer1">
-    <g transform="translate(19.48863,19.49672)" id="g25472">
-      <g transform="matrix(54.85033,0,0,-54.85033,-1411.313,6454.729)" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" clip-path="url(#clp12)" id="g186">
-        <path d="M 56.105,79.364 C 56.087,81.372 57.745,82.336 57.82,82.383 C 56.887,83.748 55.435,83.935 54.917,83.957 C 53.682,84.082 52.506,83.23 51.88,83.23 C 51.254,83.23 50.286,83.939 49.262,83.919 C 47.914,83.899 46.673,83.136 45.979,81.93 C 44.58,79.503 45.622,75.906 46.984,73.936 C 47.651,72.973 48.445,71.888 49.489,71.928 C 50.495,71.968 50.875,72.578 52.089,72.578 C 53.303,72.578 53.645,71.928 54.708,71.947 C 55.789,71.968 56.475,72.931 57.137,73.897 C 57.901,75.015 58.217,76.097 58.235,76.154 C 58.211,76.164 56.127,76.963 56.105,79.364" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path188"/>
-      </g>
-      <path d="M 1556.5087,1778.2074 C 1586.8952,1741.403 1607.4089,1690.2272 1601.7588,1639.2187 C 1557.9852,1640.9758 1505.0032,1668.3995 1473.5732,1705.2039 C 1445.4359,1737.7314 1420.7536,1789.8374 1427.4422,1839.8074 C 1476.2605,1843.5921 1526.1172,1814.9577 1556.5087,1778.2074" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path190"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+<svg width="1188" height="1188" viewBox="0 0 1188 1188" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M1073.04 925.187C1055.09 966.665 1033.84 1004.84 1009.21 1039.95C975.651 1087.8 948.17 1120.92 926.992 1139.32C894.162 1169.51 858.986 1184.97 821.32 1185.85C794.279 1185.85 761.668 1178.16 723.709 1162.55C685.624 1147.01 650.625 1139.32 618.623 1139.32C585.06 1139.32 549.064 1147.01 510.562 1162.55C472.001 1178.16 440.937 1186.29 417.186 1187.1C381.066 1188.63 345.063 1172.73 309.125 1139.32C286.188 1119.31 257.499 1085.01 223.129 1036.43C186.254 984.545 155.938 924.381 132.187 855.79C106.751 781.702 94 709.959 94 640.503C94 560.941 111.192 492.32 145.627 434.816C172.69 388.627 208.693 352.191 253.754 325.444C298.815 298.696 347.503 285.065 399.936 284.193C428.626 284.193 466.248 293.068 513.002 310.509C559.624 328.008 589.559 336.883 602.684 336.883C612.496 336.883 645.752 326.506 702.127 305.819C755.44 286.634 800.434 278.69 837.295 281.819C937.178 289.88 1012.22 329.254 1062.12 400.191C972.793 454.317 928.604 530.126 929.483 627.378C930.289 703.129 957.77 766.166 1011.78 816.218C1036.25 839.448 1063.59 857.402 1094 870.153C1087.41 889.279 1080.44 907.6 1073.04 925.187V925.187ZM843.964 23.7507C843.964 83.1241 822.272 138.561 779.036 189.873C726.86 250.872 663.75 286.121 595.312 280.559C594.44 273.436 593.934 265.939 593.934 258.061C593.934 201.063 618.747 140.063 662.812 90.1878C684.811 64.9349 712.79 43.9376 746.719 27.1876C780.575 10.6875 812.599 1.5626 842.718 0C843.597 7.9373 843.964 15.8751 843.964 23.7499V23.7507Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="1187.2" height="1187.2" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/drivers/webextension/images/icons/AudioEye.png b/src/drivers/webextension/images/icons/AudioEye.png
new file mode 100644
index 000000000..0708ecf1d
Binary files /dev/null and b/src/drivers/webextension/images/icons/AudioEye.png differ
diff --git a/src/drivers/webextension/images/icons/Cart-generic.svg b/src/drivers/webextension/images/icons/Cart-generic.svg
new file mode 100644
index 000000000..3c3b4ab75
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Cart-generic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"  width="24" height="24" viewBox="0 0 24 24">
+   <path fill="#000000" d="M17,18C15.89,18 15,18.89 15,20A2,2 0 0,0 17,22A2,2 0 0,0 19,20C19,18.89 18.1,18 17,18M1,2V4H3L6.6,11.59L5.24,14.04C5.09,14.32 5,14.65 5,15A2,2 0 0,0 7,17H19V15H7.42A0.25,0.25 0 0,1 7.17,14.75C7.17,14.7 7.18,14.66 7.2,14.63L8.1,13H15.55C16.3,13 16.96,12.58 17.3,11.97L20.88,5.5C20.95,5.34 21,5.17 21,5A1,1 0 0,0 20,4H5.21L4.27,2M7,18C5.89,18 5,18.89 5,20A2,2 0 0,0 7,22A2,2 0 0,0 9,20C9,18.89 8.1,18 7,18Z" />
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/CookieHub.png b/src/drivers/webextension/images/icons/CookieHub.png
new file mode 100644
index 000000000..99c96da7b
Binary files /dev/null and b/src/drivers/webextension/images/icons/CookieHub.png differ
diff --git a/src/drivers/webextension/images/icons/CookieScript.png b/src/drivers/webextension/images/icons/CookieScript.png
new file mode 100644
index 000000000..0c5b0e925
Binary files /dev/null and b/src/drivers/webextension/images/icons/CookieScript.png differ
diff --git a/src/drivers/webextension/images/icons/Cookiebot.svg b/src/drivers/webextension/images/icons/Cookiebot.svg
new file mode 100644
index 000000000..c6acb47bd
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Cookiebot.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="8252 2133 134 27.328">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #39a8ef;
+      }
+    </style>
+  </defs>
+  <g id="Group_1203" data-name="Group 1203" transform="translate(8252 2133)">
+    <path id="Path_1743" data-name="Path 1743" class="cls-1" d="M67.236,21.834l-6.3-8.432,6.1-7.01H62.054L56.264,13.3V.5H52.2V21.834h4.064V17.872l1.829-1.93,4.064,5.892Z" transform="translate(0.831 0.008)"/>
+    <path id="Path_1744" data-name="Path 1744" class="cls-1" d="M69.738,4.876a2.472,2.472,0,0,0,2.438-2.438A2.472,2.472,0,0,0,69.738,0,2.407,2.407,0,0,0,67.3,2.438,2.407,2.407,0,0,0,69.738,4.876Z" transform="translate(1.071)"/>
+    <path id="Path_1745" data-name="Path 1745" class="cls-1" d="M71.562,21.942V6.5H67.6V21.942Z" transform="translate(1.076 0.103)"/>
+    <path id="Path_1746" data-name="Path 1746" class="cls-1" d="M94.164,21.834H90.1V.5h4.064V8.424a6.061,6.061,0,0,1,4.775-2.337c3.861,0,6.807,3.048,6.807,8.127,0,5.181-2.946,8.127-6.807,8.127a6.061,6.061,0,0,1-4.775-2.337Zm0-4.978a4.429,4.429,0,0,0,3.454,1.727c2.337,0,3.861-1.829,3.861-4.47s-1.524-4.47-3.861-4.47a4.525,4.525,0,0,0-3.454,1.829Zm35.049,5.588c-2.845,0-4.368-1.422-4.368-4.267V10.151H122.3V6.6h2.54V2.329h4.064V6.6h3.149v3.556h-3.149v7.01a1.536,1.536,0,0,0,1.422,1.727,2.368,2.368,0,0,0,1.422-.406l.813,3.048A5.749,5.749,0,0,1,129.213,22.444Z" transform="translate(1.435 0.008)"/>
+    <path id="Path_1747" data-name="Path 1747" class="cls-1" d="M84.993,20.635a7.842,7.842,0,0,1-11.175-2.946A7.824,7.824,0,0,1,76.663,6.716c3.962-2.235,8.331-.813,10.87,3.556l.406.813-9.854,5.689a4.14,4.14,0,0,0,5.588.914,6,6,0,0,0,2.743-3.353l2.845,1.422A9.3,9.3,0,0,1,84.993,20.635ZM83.266,10.577a3.572,3.572,0,0,0-4.978-1.118,3.73,3.73,0,0,0-1.524,4.876Z" transform="translate(1.157 0.09)"/>
+    <path id="Path_1748" data-name="Path 1748" class="cls-1" d="M23.061,4.868A13.236,13.236,0,0,0,0,13.91,13.311,13.311,0,0,0,13.309,27.32a13.506,13.506,0,0,0,9.854-4.368,11.424,11.424,0,0,1-3.657-2.946,8.275,8.275,0,0,1-6.1,2.641A8.534,8.534,0,1,1,19.4,8.018,9.936,9.936,0,0,1,23.061,4.868Z" transform="translate(0 0.008)"/>
+    <path id="Path_1749" data-name="Path 1749" class="cls-1" d="M27.026,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,27.026,21.955Zm0-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,27.026,18.094ZM43.89,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,43.89,21.955Zm0-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,43.89,18.094Z" transform="translate(0.303 0.091)"/>
+    <path id="Path_1750" data-name="Path 1750" class="cls-1" d="M114.326,21.955a8.128,8.128,0,1,1,8.026-8.127A8.065,8.065,0,0,1,114.326,21.955Zm.1-3.861a4.267,4.267,0,1,0-4.267-4.267A4.293,4.293,0,0,0,114.427,18.094Z" transform="translate(1.692 0.091)"/>
+  </g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Crownpeak.png b/src/drivers/webextension/images/icons/Crownpeak.png
new file mode 100644
index 000000000..4b80de9df
Binary files /dev/null and b/src/drivers/webextension/images/icons/Crownpeak.png differ
diff --git a/src/drivers/webextension/images/icons/Drupal.svg b/src/drivers/webextension/images/icons/Drupal.svg
index b32678feb..1f2b53388 100644
--- a/src/drivers/webextension/images/icons/Drupal.svg
+++ b/src/drivers/webextension/images/icons/Drupal.svg
@@ -1,34 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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 755 826" enable-background="new 0 0 755 826" xml:space="preserve">
-<path fill="#00598E" d="M539.2,167.8c-39.8-24.8-77.2-34.5-114.8-59.2c-23.2-15.8-55.5-53.2-82.5-85.5c-5.2,51.8-21,72.8-39,87.8
-	c-38.2,30-62.2,39-95.2,57C179.9,182.1,29.2,272.1,29.2,465.6s162.8,336,343.5,336s337.5-131.2,337.5-330S563.2,182.8,539.2,167.8z"
-	/>
-<path fill="#FFFFFF" d="M478.2,633.5c12,0,24.8,0.8,33.8,6.8s14.2,19.5,17.2,27s0,12-6,15c-5.2,3-6,1.5-11.2-8.2s-9.8-19.5-36-19.5
-	s-34.5,9-47.2,19.5s-17.2,14.2-21.8,8.2s-3-12,5.2-19.5s21.8-19.5,34.5-24.8S466.2,633.5,478.2,633.5L478.2,633.5z"/>
-<path fill="#FFFFFF" d="M353.8,719c15,12,37.5,21.8,85.5,21.8S521,727.2,536,716c6.8-5.2,9.8-0.8,10.5,2.2s2.2,7.5-3,12.8
-	c-3.8,3.8-38.2,27.8-78.8,31.5s-95.2,6-128.2-24c-5.2-5.2-3.8-12.8,0-15.8s6.8-5.2,11.2-5.2S351.5,717.5,353.8,719L353.8,719z"/>
-<path fill="#0073BA" d="M170,662c57-0.8,67.5-10.5,117.8-33c271.5-121.5,321.8-232.5,331.5-258s24-66.8,9-112.5
-	c-2.9-8.8-5-15.9-6.5-21.6c-36.1-40.3-71.9-62.4-82.7-69.1c-39-24.8-77.3-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5
-	c-5.2,51.8-20.2,73.5-39,87.8c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8l7.4-0.3
-	C97.2,646.2,122,662.8,170,662z"/>
-<path fill="#004975" d="M539,167.8c-39-24.8-77.2-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5c-5.2,51.8-20.2,73.5-39,87.8
-	c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8c60.7,103.2,175.4,169.2,298.4,169.2
-	c180.8,0,337.5-131.2,337.5-330c0-109.1-44.3-185.5-88.3-234.6C585.6,196.5,549.8,174.5,539,167.8z M630.2,255.5
-	c49.2,61.6,74.2,134.2,74.2,216c0,47.4-9,92.2-26.8,133.2c-16.9,38.8-41.2,73.2-72.3,102.3c-61.5,57.4-144.1,89-232.7,89
-	c-43.8,0-86.8-8.4-127.8-24.9c-40.3-16.2-76.5-39.4-107.8-69C70.9,639.7,34.6,555.7,34.6,465.5c0-80.3,26.1-151.7,77.5-212.2
-	c39.3-46.2,81.7-71.8,98-80.6c8-4.3,15.4-8.2,22.6-11.9c22.6-11.6,44-22.6,73.4-45.6c15.7-11.9,32.4-30.8,39.5-78.7
-	c24.8,29.5,53.5,62.6,75.5,76.8c19.5,12.9,39.5,21.9,58.8,30.6c18.3,8.2,37.2,16.8,55.9,28.7c0,0,0.7,0.4,0.7,0.4
-	C591.4,207.1,620.6,243.6,630.2,255.5z"/>
-<path fill="#93C5E4" d="M345.5,38c10.5,30.8,9,46.5,9,53.2s-3.8,24.8-15.8,33.8c-5.2,3.8-6.8,6.8-6.8,7.5c0,3,6.8,5.2,6.8,12
-	c0,8.2-3.8,24.8-43.5,64.5s-96.8,75-141,96.8S89,326,83,315.5s2.2-33.8,30-64.5s115.5-75,115.5-75L338,99.5l6-29.2"/>
-<path fill="#FFFFFF" d="M345.5,37.2c-6.8,49.5-21.8,64.5-42,80.2c-33.8,25.5-66.8,41.2-74.2,45c-19.5,9.8-90,48.8-126.8,105
-	c-11.2,17.2,0,24,2.2,25.5s27.8,4.5,82.5-28.5S266,212,296.8,179.8c16.5-17.2,18.8-27,18.8-31.5c0-5.2-3.8-7.5-9.8-9
-	c-3-0.8-3.8-2.2,0-4.5S325.2,125,329,122s21.8-15,22.5-34.5S350.8,54.5,345.5,37.2L345.5,37.2z"/>
-<path fill="#FFFFFF" d="M176.8,582.5c0.8-58.5,55.5-113.2,124.5-114c87.8-0.8,148.5,87,192.8,86.2c37.5-0.8,109.5-74.2,144.8-74.2
-	c37.5,0,48,39,48,62.2s-7.5,65.2-25.5,91.5s-29.2,36-50.2,34.5c-27-2.2-81-86.2-115.5-87.8c-43.5-1.5-138,90.8-212.2,90.8
-	c-45,0-58.5-6.8-73.5-16.5C187.2,639.5,176,615.5,176.8,582.5L176.8,582.5z"/>
-<path fill="none" d="M628.2,258.5c15,45.8,0.8,87-9,112.5s-60,136.5-331.5,258c-50.2,22.5-60.8,32.2-117.8,33
-	c-48,0.8-72.8-15.8-88.5-30l-7.4,0.3c60.7,103.2,175.4,169.2,298.4,169.2c180.8,0,337.5-131.2,337.5-330
-	c0-109.1-44.3-185.5-88.3-234.6C623.2,242.6,625.4,249.7,628.2,258.5z"/>
+<svg width="293" height="293" viewBox="0 0 293 293" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M190.297 60.055C170.457 40.2244 151.527 21.3203 145.894 0C140.26 21.3203 121.328 40.2244 101.491 60.055C71.7361 89.7913 38 123.493 38 174.039C38 202.656 49.3677 230.1 69.6023 250.334C89.8369 270.569 117.281 281.937 145.897 281.937C174.513 281.937 201.957 270.569 222.192 250.334C242.426 230.1 253.794 202.656 253.794 174.039C253.794 123.496 220.061 89.7913 190.297 60.055V60.055ZM83.8596 199.181C77.2438 198.957 52.8276 156.872 98.1236 112.062L128.098 144.804C128.355 145.058 128.556 145.364 128.686 145.701C128.817 146.038 128.875 146.399 128.856 146.76C128.837 147.122 128.742 147.475 128.577 147.796C128.412 148.118 128.18 148.401 127.898 148.627C120.745 155.963 90.259 186.534 86.4698 197.105C85.6877 199.287 84.5454 199.205 83.8596 199.181H83.8596ZM145.897 254.648C141.024 254.648 136.199 253.688 131.696 251.823C127.194 249.958 123.103 247.225 119.657 243.779C116.212 240.333 113.478 236.242 111.613 231.74C109.748 227.238 108.789 222.412 108.789 217.539C108.789 208.144 112.524 199.771 118.038 193.028C124.729 184.846 145.892 161.833 145.892 161.833C145.892 161.833 166.731 185.184 173.697 192.95C179.764 199.695 183.085 208.467 183.006 217.539C183.006 227.381 179.096 236.82 172.137 243.779C165.178 250.738 155.739 254.648 145.897 254.648V254.648ZM216.923 194.471C216.123 196.22 214.309 199.14 211.86 199.229C207.495 199.388 207.029 197.152 203.803 192.377C196.72 181.895 134.906 117.293 123.345 104.799C113.175 93.8103 121.913 86.063 125.966 82.0031C131.051 76.9091 145.893 62.0754 145.893 62.0754C145.893 62.0754 190.151 104.067 208.587 132.759C227.023 161.45 220.669 186.278 216.923 194.471" fill="#009CDE"/>
 </svg>
diff --git a/src/drivers/webextension/images/icons/EqualWeb.png b/src/drivers/webextension/images/icons/EqualWeb.png
new file mode 100644
index 000000000..6a942d08c
Binary files /dev/null and b/src/drivers/webextension/images/icons/EqualWeb.png differ
diff --git a/src/drivers/webextension/images/icons/Facil-iti.png b/src/drivers/webextension/images/icons/Facil-iti.png
new file mode 100644
index 000000000..8e1091214
Binary files /dev/null and b/src/drivers/webextension/images/icons/Facil-iti.png differ
diff --git a/src/drivers/webextension/images/icons/ForoshGostar.svg b/src/drivers/webextension/images/icons/ForoshGostar.svg
new file mode 100644
index 000000000..c97a6fa7b
--- /dev/null
+++ b/src/drivers/webextension/images/icons/ForoshGostar.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, 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 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#007BFF;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{display:none;fill:#1D96D3;}
+	.st5{opacity:0.6;fill:url(#SVGID_4_);}
+	.st6{opacity:0.58;fill:url(#SVGID_5_);}
+	.st7{fill:#1D96D3;}
+	.st8{opacity:0.61;fill:url(#SVGID_6_);}
+</style>
+<g>
+	<path class="st0" d="M396.5,307.5L396.5,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9s-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8h-0.1v-37.9h81.2V307.5z"/>
+	<path class="st0" d="M290.2,307.5L290.2,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9c-22.4,0-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8H209v-37.9h81.2V307.5z"/>
+	<path class="st0" d="M184.7,307.5L184.7,307.5c0,0.6,0,1.2,0,1.8c0,19.8-18.2,35.9-40.6,35.9s-40.6-16.1-40.6-35.9
+		c0-0.6,0-1.2,0.1-1.8h-0.1v-37.9h81.2V307.5z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="164.5571" y1="290.7507" x2="222.1396" y2="132.544">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st1" points="238.5,154.8 103.5,268.5 184.7,268.5 283.2,154.8 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="262.5802" y1="277.9882" x2="285.9756" y2="145.3065">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st2" points="294.9,154.8 209,268.5 290.2,268.5 339.6,154.8 	"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="355.8662" y1="268.5396" x2="355.8662" y2="154.7552">
+		<stop  offset="8.108108e-03" style="stop-color:#66B0FF"/>
+		<stop  offset="0.5189" style="stop-color:#007BFF"/>
+		<stop  offset="0.6023" style="stop-color:#067EFF"/>
+		<stop  offset="0.7133" style="stop-color:#1787FF"/>
+		<stop  offset="0.8399" style="stop-color:#3395FF"/>
+		<stop  offset="0.9772" style="stop-color:#59A9FF"/>
+		<stop  offset="1" style="stop-color:#60ADFF"/>
+	</linearGradient>
+	<polygon class="st3" points="395.7,154.8 351,154.8 315.3,268.5 396.5,268.5 	"/>
+</g>
+<g id="_x31_">
+	<path class="st0" d="M108.2,395.5c-71.9-70-82.6-184.5-21-267.1c35.6-47.7,88.3-75.3,143.3-80.6c-1.8-0.8-3.7-1.6-5.5-2.3
+		c-27.4-10.7-56.2-12.6-83.1-7.1c-32,16.3-60.1,39.9-82.2,69.5C21.7,158.8,5.9,221.3,15,284.1c3.4,23.2,10,45.4,19.6,66.1
+		c16,18.1,36.5,32.6,60.8,41.4C99.6,393.1,103.9,394.4,108.2,395.5z"/>
+	<g>
+		<path class="st4" d="M280.7,49.2c32,4.8,63.2,17.3,90.8,38c44.7,33.4,71.8,81.8,79.3,133.1c16,19.2,27.5,41.4,34,65.4
+			c3.4-22.8,3.5-46.3,0.1-69.8c-9.1-62.8-42.1-118.3-93-156.2S278.7,5.9,215.9,15c-1,0.1-2,0.3-3,0.5c7.1,1.8,14.2,4,21.2,6.7
+			C251.2,28.8,266.8,37.9,280.7,49.2z"/>
+		<path class="st0" d="M280.7,49.2c32,4.8,63.2,17.3,90.8,38c44.7,33.4,71.8,81.8,79.3,133.1c16,19.2,27.5,41.4,34,65.4
+			c3.4-22.8,3.5-46.3,0.1-69.8c-9.1-62.8-42.1-118.3-93-156.2S278.7,5.9,215.9,15c-1,0.1-2,0.3-3,0.5c7.1,1.8,14.2,4,21.2,6.7
+			C251.2,28.8,266.8,37.9,280.7,49.2z"/>
+		<path class="st0" d="M284.1,485c62.8-9.1,118.3-42.1,156.2-93c9.4-12.5,17.4-25.8,24-39.6c1.3-9.4,1.8-19,1.3-28.8
+			c-1-19.5-5.7-37.9-13.4-54.6c-3.3,35.9-16.3,71.4-39.4,102.4c-62.4,83.5-177.1,105.4-265.1,54c-20.5,0.2-41-3.3-60.9-10.4
+			c-4.2-1.5-8.2-3.2-12.2-4.9c10,10.9,21.2,21,33.3,30.1C158.8,478.3,221.3,494.1,284.1,485z"/>
+	</g>
+</g>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="280.7048" y1="167.2448" x2="484.9043" y2="167.2448">
+	<stop  offset="0" style="stop-color:#66B0FF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path class="st5" d="M384,86.5c-48.9-36-102.1-40.4-103.3-37.4c0,0,0,0,0,0c87.6,13.4,157.2,83.3,170.2,171c0.1,0.1-0.1-0.1,0,0
+	c28.7,33.6,34,70.1,34,65.4C484.9,281,475.2,153.6,384,86.5z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="133.5635" y1="394.922" x2="133.5635" y2="35.4722">
+	<stop  offset="0" style="stop-color:#66B0FF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path class="st6" d="M46.8,250.2c0-105.4,80.3-192,183-202c0.2-0.1,0.4-0.2,0.7-0.3c-11.3-4.9-28.7-10.8-50.5-12.1
+	c-15.2-0.9-28.2,0.7-38.1,2.7c-18.5,13-70.3,53.3-93.3,126.8c-6.6,21-24.4,81.1,2,148.7c16,40.9,41.5,67.4,56.9,81.1
+	C70,358.1,46.8,306.9,46.8,250.2z"/>
+<path class="st7" d="M284,471.9"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="117.6595" y1="483.7774" x2="459.1477" y2="286.6191">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#66B0FF"/>
+</linearGradient>
+<path class="st8" d="M250.7,453.5c-37.4,0-72.5-10.1-102.6-27.8c-0.1,0-0.2-0.1-0.4-0.1c-9.8,0.1-22.5-0.6-36.9-3.6
+	c-22.2-4.6-35-12-35.3-11.3c-0.7,1.4,55.2,47.1,134.5,57.9c26.4,3.6,81.6,10.4,138.7-20.7c49.9-27.1,73.6-68.2,80-80
+	c20.4-37.8,23.5-73.3,23.6-93.1C440.3,375.4,354.6,453.5,250.7,453.5z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Globale.png b/src/drivers/webextension/images/icons/Globale.png
new file mode 100644
index 000000000..3e6147a8a
Binary files /dev/null and b/src/drivers/webextension/images/icons/Globale.png differ
diff --git a/src/drivers/webextension/images/icons/HikeOrders.png b/src/drivers/webextension/images/icons/HikeOrders.png
new file mode 100644
index 000000000..06550bc0f
Binary files /dev/null and b/src/drivers/webextension/images/icons/HikeOrders.png differ
diff --git a/src/drivers/webextension/images/icons/Imperva.svg b/src/drivers/webextension/images/icons/Imperva.svg
new file mode 100644
index 000000000..d00aa052f
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Imperva.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="140px" height="39px" viewBox="0 0 140 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group</title>
+    <g id="Homepage---Final-Revision---1600" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="imperva_homepage_rebrand_rev4_solution_mb" transform="translate(-112.000000, -120.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="hero">
+                <g id="Top-Menu" transform="translate(0.000000, 81.000000)">
+                    <g id="Group" transform="translate(112.400000, 39.400000)">
+                        <path d="M5.68,0 L2.84,0 L0,0 L0,5.68 L5.68,5.68 L5.68,0 Z M138.52,31.48 L135.68,31.48 L132.84,31.48 L132.84,37.16 L138.52,37.16 L138.52,31.48 L138.52,31.48 Z" id="Shape"></path>
+                        <path d="M5.68,28.8 L0,28.8 L0,8.36 L2.84,8.36 L5.68,8.36 L5.68,28.8 Z M31.88,7.92 C36.08,7.92 38.6,10.84 38.6,15.48 L38.6,28.8 L32.92,28.8 L32.92,16.64 C32.92,14.44 31.96,13 30,13 C28.52,13 27.2,13.92 26.84,15.64 L26.84,28.8 L21.12,28.8 L21.12,16.64 C21.12,14.44 20.2,13 18.24,13 C16.76,13 15.4,13.92 15.04,15.64 L15.04,28.8 L9.4,28.8 L9.4,8.36 L15.08,8.36 L15.08,10.04 C16.08,8.76 17.96,7.88 20.24,7.88 C22.68,7.88 24.6,8.96 25.72,10.48 C27.04,9.04 29,7.92 31.88,7.92 Z M47.92,37.16 L42.24,37.16 L42.24,8.36 L47.92,8.36 L47.92,10.04 C48.84,8.96 50.84,7.88 53.04,7.88 C59,7.88 62.36,12.8 62.36,18.56 C62.36,24.32 58.96,29.2 53.04,29.2 C50.84,29.2 48.84,28.16 47.92,27.04 L47.92,37.16 Z M47.92,21.96 C48.6,23.36 50.12,24.32 51.76,24.32 C54.84,24.32 56.64,21.84 56.64,18.6 C56.64,15.32 54.8,12.84 51.76,12.84 C50.08,12.84 48.6,13.84 47.92,15.2 L47.92,21.96 Z M69.96,19.88 C70.4,23.2 72.84,24.6 75.84,24.6 C78.08,24.6 79.68,24.08 81.68,22.8 L81.68,27.48 C80,28.72 77.72,29.28 74.96,29.28 C68.76,29.28 64.48,25.24 64.48,18.76 C64.48,12.36 68.52,7.92 74.08,7.92 C80.04,7.92 83.08,12.04 83.08,18.08 L83.08,19.92 L69.96,19.92 L69.96,19.88 Z M70.16,16.2 L77.88,16.2 C77.76,14 76.52,12.44 74.28,12.44 C72.4,12.44 70.8,13.64 70.16,16.2 Z M98.56,13.96 C97.8,13.52 96.76,13.28 95.72,13.28 C93.8,13.28 92.24,14.28 91.84,16.16 L91.84,28.8 L86.16,28.8 L86.16,8.36 L91.84,8.36 L91.84,10.36 C92.72,8.88 94.4,7.88 96.4,7.88 C97.36,7.88 98.24,8.08 98.56,8.24 L98.56,13.96 L98.56,13.96 Z M107.4,28.8 L99.68,8.36 L105.6,8.36 L110.32,21.92 L114.92,8.36 L120.64,8.36 L112.88,28.8 L107.4,28.8 Z M132.88,16.04 C132.88,14.08 131.2,12.84 128.32,12.84 C126.28,12.84 124.36,13.44 122.76,14.48 L122.76,9.6 C124.24,8.68 126.88,7.92 129.56,7.92 C135.2,7.92 138.56,10.8 138.56,15.8 L138.56,28.8 L132.88,28.8 L132.88,27.72 C132.2,28.4 130.2,29.2 127.96,29.2 C123.84,29.2 120.4,26.84 120.4,22.56 C120.4,18.68 123.84,16.04 128.32,16.04 C130.12,16.04 132.08,16.64 132.88,17.24 L132.88,16.04 L132.88,16.04 Z M132.88,21.76 C132.36,20.68 130.88,19.96 129.28,19.96 C127.48,19.96 125.68,20.72 125.68,22.48 C125.68,24.28 127.52,25 129.28,25 C130.88,25 132.4,24.32 132.88,23.2 L132.88,21.76 Z" id="Shape"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Locomotive.png b/src/drivers/webextension/images/icons/Locomotive.png
deleted file mode 100644
index 21482d022..000000000
Binary files a/src/drivers/webextension/images/icons/Locomotive.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/LocomotiveCMS.png b/src/drivers/webextension/images/icons/LocomotiveCMS.png
new file mode 100644
index 000000000..3bf4c3f46
Binary files /dev/null and b/src/drivers/webextension/images/icons/LocomotiveCMS.png differ
diff --git a/src/drivers/webextension/images/icons/Make-Sense.png b/src/drivers/webextension/images/icons/Make-Sense.png
new file mode 100644
index 000000000..d2b532e4b
Binary files /dev/null and b/src/drivers/webextension/images/icons/Make-Sense.png differ
diff --git a/src/drivers/webextension/images/icons/Mastercard.svg b/src/drivers/webextension/images/icons/Mastercard.svg
new file mode 100644
index 000000000..70ca0964b
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Mastercard.svg
@@ -0,0 +1,12 @@
+<svg width="1001" height="1001" viewBox="0 0 1001 1001" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M635.199 257.095H364.81V742.936H635.199V257.095Z" fill="#FF5F00"/>
+<path d="M381.977 500.015C381.977 401.302 428.33 313.748 499.575 257.095C447.214 215.893 381.119 191 309.015 191C138.199 191 0 329.199 0 500.015C0 670.832 138.199 809.031 309.015 809.031C381.119 809.031 447.214 784.138 499.575 742.936C428.33 687.142 381.977 598.729 381.977 500.015Z" fill="#EB001B"/>
+<path d="M1000.01 500.015C1000.01 670.832 861.81 809.031 690.993 809.031C618.889 809.031 552.794 784.138 500.433 742.936C572.537 686.283 618.031 598.729 618.031 500.015C618.031 401.302 571.679 313.748 500.433 257.095C552.794 215.893 618.889 191 690.993 191C861.81 191 1000.01 330.057 1000.01 500.015Z" fill="#F79E1B"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="1000.01" height="1000.01" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/drivers/webextension/images/icons/OneTrust.png b/src/drivers/webextension/images/icons/OneTrust.png
new file mode 100644
index 000000000..da57f65e5
Binary files /dev/null and b/src/drivers/webextension/images/icons/OneTrust.png differ
diff --git a/src/drivers/webextension/images/icons/Pushnami.svg b/src/drivers/webextension/images/icons/Pushnami.svg
index 7d6abbf54..88b2ec384 100755
--- a/src/drivers/webextension/images/icons/Pushnami.svg
+++ b/src/drivers/webextension/images/icons/Pushnami.svg
@@ -1,8 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="111" height="111" enable-background="new 0 0 592.7 128" xml:space="preserve">
-	<g class="currentLayer">
-		<title>Pushnami-Logo</title>
-		<polygon id="svg_9" fill="#2f2674" points="55.60000133514404,55.600003242492676 55.60000133514404,0 111.19999980926514,0 "/>
-		<polygon id="svg_10" fill="#2f2674" points="0,111.20000171661377 0,55.600003242492676 55.60000133514404,55.600003242492676 "/>
-		<polygon id="svg_11" fill="#2f2674" points="0,55.600003242492676 0,0 55.60000133514404,0 "/>
-	</g>
-</svg>
\ No newline at end of file
+<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><g><polygon fill="#2f2674" points="128.23063370988174,128.23063810881195 128.23063370988174,0 256.4612608213682,0 "/><polygon fill="#2f2674" points="0,256.4612652202984 0,128.23063810881195 128.23063370988174,128.23063810881195 "/><polygon fill="#2f2674" points="0,128.23063810881195 0,0 128.23063370988174,0 "/></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Quantcast.png b/src/drivers/webextension/images/icons/Quantcast.png
index 9f062ab5d..fdd3c70ad 100644
Binary files a/src/drivers/webextension/images/icons/Quantcast.png and b/src/drivers/webextension/images/icons/Quantcast.png differ
diff --git a/src/drivers/webextension/images/icons/Recite Me.png b/src/drivers/webextension/images/icons/Recite Me.png
new file mode 100644
index 000000000..b6f6aa69d
Binary files /dev/null and b/src/drivers/webextension/images/icons/Recite Me.png differ
diff --git a/src/drivers/webextension/images/icons/Socket.IO.svg b/src/drivers/webextension/images/icons/Socket.IO.svg
new file mode 100644
index 000000000..21d042b6a
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Socket.IO.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="43px" height="43px" viewBox="0 0 43 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.0.2 (7799) - http://www.bohemiancoding.com/sketch -->
+    <title>logo full</title>
+    <description>Created with Sketch.</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="logo" sketch:type="MSLayerGroup">
+            <path d="M0,0 L43,0 L43,43 L0,43 L0,0 L0,0 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.2,1.24 C21.62,-0.15 27.61,0.66 32.39,3.61 C38.41,7.21 42.34,14.02 42.44,21.03 C42.66,28.11 38.97,35.13 33.04,38.98 C26.44,43.42 17.31,43.59 10.57,39.37 C3.7,35.27 -0.31,27 0.72,19.06 C1.55,10.67 8.03,3.27 16.2,1.24 L16.2,1.24 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+            <path d="M15.37,4.67 C25.61,0.57 38.17,8.14 39.23,19.12 C40.88,29 32.68,39.04 22.67,39.33 C13.15,40.28 3.95,32.21 3.68,22.65 C2.97,14.91 8.07,7.23 15.37,4.67 L15.37,4.67 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.4,20.44 C20.99,16.69 25.48,12.81 30.17,9.17 C27.71,12.95 25.18,16.68 22.72,20.46 C20.61,20.47 18.5,20.47 16.4,20.44 L16.4,20.44 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+            <path d="M20.28,22.53 C22.4,22.53 24.51,22.53 26.62,22.56 C22,26.29 17.53,30.2 12.83,33.83 C15.29,30.05 17.82,26.31 20.28,22.53 L20.28,22.53 Z" id="Shape" fill="#010101" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Socket.io.png b/src/drivers/webextension/images/icons/Socket.io.png
deleted file mode 100644
index f381eecf7..000000000
Binary files a/src/drivers/webextension/images/icons/Socket.io.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/SolidPixels.png b/src/drivers/webextension/images/icons/SolidPixels.png
new file mode 100644
index 000000000..b26327541
Binary files /dev/null and b/src/drivers/webextension/images/icons/SolidPixels.png differ
diff --git a/src/drivers/webextension/images/icons/Texthelp.png b/src/drivers/webextension/images/icons/Texthelp.png
new file mode 100644
index 000000000..3232e1d76
Binary files /dev/null and b/src/drivers/webextension/images/icons/Texthelp.png differ
diff --git a/src/drivers/webextension/images/icons/TheHutGroup.png b/src/drivers/webextension/images/icons/TheHutGroup.png
new file mode 100644
index 000000000..9847bb7b7
Binary files /dev/null and b/src/drivers/webextension/images/icons/TheHutGroup.png differ
diff --git a/src/drivers/webextension/images/icons/TrustArc.svg b/src/drivers/webextension/images/icons/TrustArc.svg
new file mode 100644
index 000000000..27f47cfca
--- /dev/null
+++ b/src/drivers/webextension/images/icons/TrustArc.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, 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 300 100" style="enable-background:new 0 0 300 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#004676;}
+	.st2{fill:#5FC323;}
+</style>
+<rect x="-6.89" y="2.28" class="st0" width="314.63" height="132.85"/>
+<path class="st1" d="M80.95,46.68H67.66v-6.61h34.22v6.61H88.58v33.73h-7.63V46.68z M109.01,80.41V58.05
+	c1.29-0.74,3.19-1.17,5.46-1.17c1.53,0,3.01,0.18,4.42,0.55l1.84-6.02c-1.84-0.68-3.93-0.92-6.45-0.92
+	c-5.59,0-10.07,2.21-12.28,4.18v25.74H109.01z M145.36,51.5v22.44c-1.8,0.75-3.73,1.12-6.03,1.12c-5.9,0-7.15-2.67-7.15-7.46V51.5
+	h-7.08v18.15c0,7.15,4.1,11.69,13.3,11.69c6.52,0,11.06-1.68,14.05-3.11V51.5H145.36z M158.36,76.79c0,0,4.08,4.31,11.39,4.31
+	c6.96,0,11.21-3.91,11.21-8.8c0-9.44-14.26-8.92-14.26-13.07c0-1.84,1.84-2.65,3.74-2.65c4.49,0,7.19,2.53,7.19,2.53l2.7-5.41
+	c0,0-3.22-3.34-9.83-3.34c-6.33,0-11.22,3.17-11.22,8.63c0,9.44,14.27,8.86,14.27,13.24c0,1.73-1.78,2.65-3.85,2.65
+	c-4.77,0-7.99-3.22-7.99-3.22L158.36,76.79z M187.06,69.65c0,9.84,8.11,11.05,12.19,11.05c1.38,0,2.24-0.17,2.24-0.17v-6.39
+	c0,0-0.52,0.11-1.32,0.11c-2.01,0-5.81-0.69-5.81-5.52V57.76h6.67v-6.24h-6.67v-8.46h-7.13L187.06,69.65z M252.37,80.41V58.05
+	c1.29-0.74,3.19-1.17,5.47-1.17c1.53,0,3.01,0.18,4.42,0.55l1.84-6.02c-1.84-0.68-3.93-0.92-6.45-0.92
+	c-5.59,0-10.07,2.21-12.28,4.18v25.74H252.37z M280.52,50.89c-9.47,0-15.53,6.84-15.53,14.98c0,8.3,6.05,14.98,15.53,14.98
+	c7.68,0,11.77-4.66,11.77-4.66l-2.75-5.05c0,0-3.59,3.65-8.41,3.65c-5.44,0-8.91-4.15-8.91-8.98c0-4.88,3.42-8.86,8.69-8.86
+	c4.49,0,7.46,3.08,7.46,3.08l3.14-4.88C291.51,55.16,287.98,50.89,280.52,50.89 M230.1,69.94h-13.37l-3.6,10.24h-7.46l14.02-39.83
+	h7.45l14.01,39.83h-7.45L230.1,69.94z M228.03,64.04l-4.61-13.11l-4.61,13.11H228.03z"/>
+<g>
+	<g>
+		<path class="st2" d="M37.78,44.26c12.74-13.67,31.87-17.79,48.47-12.08c-12.2-7.71-28.19-8.42-41.39-0.48
+			C31.41,39.8,24.52,54.64,25.91,69.29C27.15,60.23,31.08,51.46,37.78,44.26"/>
+		<path class="st2" d="M19.81,14.08c3.68-0.13,6.74,1.67,6.85,3.97c0,0,0.45,2.28-3.4,5.45c-1.02,0.91-2.01,1.87-2.96,2.89
+			C3.83,44.06,4.8,71.76,22.47,88.24c0.06,0.06,0.13,0.11,0.19,0.17c-5.22-7.11-8.43-15.81-8.76-25.29
+			c-0.88-25.11,18.75-46.17,43.83-47.04c6.1-0.21,11.96,0.79,17.35,2.79c-9.93-6.08-21.69-7.8-32.64-5.27
+			c-2.84,0.42-5.71-0.4-6.8-0.76C30.64,10.88,24.81,11.19,19.81,14.08"/>
+	</g>
+</g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Uniconsent.png b/src/drivers/webextension/images/icons/Uniconsent.png
new file mode 100644
index 000000000..216bcda63
Binary files /dev/null and b/src/drivers/webextension/images/icons/Uniconsent.png differ
diff --git a/src/drivers/webextension/images/icons/UsableNet.png b/src/drivers/webextension/images/icons/UsableNet.png
new file mode 100644
index 000000000..178b352c8
Binary files /dev/null and b/src/drivers/webextension/images/icons/UsableNet.png differ
diff --git a/src/drivers/webextension/images/icons/User1st.png b/src/drivers/webextension/images/icons/User1st.png
new file mode 100644
index 000000000..35c4c9d4f
Binary files /dev/null and b/src/drivers/webextension/images/icons/User1st.png differ
diff --git a/src/drivers/webextension/images/icons/UserWay.png b/src/drivers/webextension/images/icons/UserWay.png
new file mode 100644
index 000000000..1f36a488c
Binary files /dev/null and b/src/drivers/webextension/images/icons/UserWay.png differ
diff --git a/src/drivers/webextension/images/icons/Venmo.svg b/src/drivers/webextension/images/icons/Venmo.svg
new file mode 100644
index 000000000..b976e6510
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Venmo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1333.33 1333.33" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"><g fill-rule="nonzero"><path d="M157.62 0h1018.09c87.04 0 157.62 70.58 157.62 157.62v1018.09c0 87.04-70.58 157.62-157.62 157.62H157.62C70.58 1333.33 0 1262.74 0 1175.7V157.62C0 70.58 70.59 0 157.63 0z" fill="#3396cd"/><path d="M995.24 271.32c28.68 47.29 41.55 96.05 41.55 157.62 0 196.38-167.62 451.42-303.67 630.49H422.45L297.88 314.34 570 288.5l66.17 530.15c61.5-100.31 137.55-257.93 137.55-365.32 0-58.84-10.08-98.84-25.84-131.78l247.36-50.23z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Visa.svg b/src/drivers/webextension/images/icons/Visa.svg
new file mode 100644
index 000000000..22f76beef
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Visa.svg
@@ -0,0 +1,14 @@
+<svg width="750" height="750" viewBox="0 0 750 750" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M710 -108H40C17.9086 -108 0 -58.4947 0 2.57324V1083.43C0 1144.49 17.9086 1194 40 1194H710C732.091 1194 750 1144.49 750 1083.43V2.57324C750 -58.4947 732.091 -108 710 -108Z" fill="#0E4595"/>
+<path d="M278 473.763L311.36 278.003H364.72L331.33 473.763H278Z" fill="white"/>
+<path d="M524.11 282.223C508.779 276.674 492.584 273.891 476.28 274.003C423.56 274.003 386.42 300.553 386.1 338.603C385.81 366.733 412.62 382.423 432.86 391.783C453.63 401.383 460.61 407.503 460.51 416.073C460.38 429.193 443.93 435.183 428.59 435.183C407.23 435.183 395.89 432.183 378.36 424.913L371.49 421.803L364 465.623C376.46 471.083 399.51 475.823 423.44 476.063C479.52 476.063 515.94 449.823 516.35 409.183C516.55 386.913 502.35 369.973 471.55 355.993C452.9 346.943 441.48 340.903 441.6 331.733C441.6 323.593 451.27 314.893 472.16 314.893C485.847 314.587 499.447 317.141 512.09 322.393L516.87 324.653L524.11 282.223Z" fill="white"/>
+<path d="M661.41 278.003H620.18C607.41 278.003 597.85 281.483 592.24 294.233L513 473.633H569C569 473.633 578.16 449.513 580.23 444.213C586.36 444.213 640.79 444.303 648.57 444.303C650.16 451.153 655.06 473.633 655.06 473.633H704.6L661.41 278.003ZM596 404.403C600.41 393.123 617.26 349.683 617.26 349.683C616.94 350.203 621.64 338.353 624.33 331.003L627.94 347.873C627.94 347.873 638.16 394.603 640.29 404.403H596Z" fill="white"/>
+<path d="M45.68 277.993L45 282.073C64.7017 286.712 83.6819 294.005 101.42 303.753L148.8 473.453L205.26 473.383L289.26 277.993H232.7L180.46 411.533L174.9 384.403C174.64 383.573 174.36 382.743 174.07 381.913L155.91 294.533C152.68 282.143 143.31 278.443 131.72 278.003L45.68 277.993Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="750" height="750" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Vue.js.png b/src/drivers/webextension/images/icons/Vue.js.png
deleted file mode 100644
index 2c33e395f..000000000
Binary files a/src/drivers/webextension/images/icons/Vue.js.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/borderfree.png b/src/drivers/webextension/images/icons/borderfree.png
new file mode 100644
index 000000000..532b684b3
Binary files /dev/null and b/src/drivers/webextension/images/icons/borderfree.png differ
diff --git a/src/drivers/webextension/images/icons/centminmod.png b/src/drivers/webextension/images/icons/centminmod.png
new file mode 100644
index 000000000..988f8230a
Binary files /dev/null and b/src/drivers/webextension/images/icons/centminmod.png differ
diff --git a/src/drivers/webextension/images/icons/civic.png b/src/drivers/webextension/images/icons/civic.png
new file mode 100644
index 000000000..ed3fc1def
Binary files /dev/null and b/src/drivers/webextension/images/icons/civic.png differ
diff --git a/src/drivers/webextension/images/icons/cookieyes.png b/src/drivers/webextension/images/icons/cookieyes.png
new file mode 100644
index 000000000..a4cfda3c8
Binary files /dev/null and b/src/drivers/webextension/images/icons/cookieyes.png differ
diff --git a/src/drivers/webextension/images/icons/didomi.png b/src/drivers/webextension/images/icons/didomi.png
new file mode 100644
index 000000000..4e942c61b
Binary files /dev/null and b/src/drivers/webextension/images/icons/didomi.png differ
diff --git a/src/drivers/webextension/images/icons/eucookie.png b/src/drivers/webextension/images/icons/eucookie.png
new file mode 100644
index 000000000..d495dfbde
Binary files /dev/null and b/src/drivers/webextension/images/icons/eucookie.png differ
diff --git a/src/drivers/webextension/images/icons/flow.png b/src/drivers/webextension/images/icons/flow.png
new file mode 100644
index 000000000..bda3be6cc
Binary files /dev/null and b/src/drivers/webextension/images/icons/flow.png differ
diff --git a/src/drivers/webextension/images/icons/iubenda.png b/src/drivers/webextension/images/icons/iubenda.png
new file mode 100644
index 000000000..f78251670
Binary files /dev/null and b/src/drivers/webextension/images/icons/iubenda.png differ
diff --git a/src/drivers/webextension/images/icons/metomic.png b/src/drivers/webextension/images/icons/metomic.png
new file mode 100644
index 000000000..59e1eff85
Binary files /dev/null and b/src/drivers/webextension/images/icons/metomic.png differ
diff --git a/src/drivers/webextension/images/icons/osano.png b/src/drivers/webextension/images/icons/osano.png
new file mode 100644
index 000000000..4a230890c
Binary files /dev/null and b/src/drivers/webextension/images/icons/osano.png differ
diff --git a/src/drivers/webextension/images/icons/perimeterx.svg b/src/drivers/webextension/images/icons/perimeterx.svg
new file mode 100644
index 000000000..f8c76bb9e
--- /dev/null
+++ b/src/drivers/webextension/images/icons/perimeterx.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="197px" height="40px" viewBox="0 0 197 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60.1 (88133) - https://sketch.com -->
+    <title>PerimeterX</title>
+    <desc>Perimeterx Logo</desc>
+    <defs>
+        <polygon id="path-1" points="0.0475337795 0.0621754386 24.4050263 0.0621754386 24.4050263 25.1709474 0.0475337795 25.1709474"></polygon>
+        <polygon id="path-3" points="0.176573712 0.214502924 4.89637171 0.214502924 4.89637171 4.9274386 0.176573712 4.9274386"></polygon>
+    </defs>
+    <g id="Blog" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Blog-Home-v3" transform="translate(-135.000000, -58.000000)">
+            <g id="PerimeterX" transform="translate(135.000000, 58.000000)">
+                <g id="Group-26">
+                    <g id="Group-25">
+                        <g id="Group-3" transform="translate(172.404155, 7.270877)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="Clip-2"></g>
+                            <path d="M8.28837662,16.3643977 L8.28837662,16.3643977 C9.00399441,16.3646316 9.68705218,16.5477895 10.286953,16.8923509 C10.2874215,16.8925848 10.2874215,16.8932865 10.286953,16.8937544 L5.36265936,22.0860351 C5.24764518,22.2074386 5.05533022,22.2128187 4.93375718,22.0979649 L3.14084766,20.4086082 C3.01927462,20.2937544 3.01365274,20.1021754 3.12913542,19.9810058 L5.39287694,17.5957427 C6.14972181,16.8100117 7.19468776,16.3643977 8.28837662,16.3643977 M5.39287694,7.6371462 L3.12913542,5.25211696 C3.01365274,5.13071345 3.01927462,4.93936842 3.14084766,4.82451462 L4.93375718,3.13515789 C5.05533022,3.02030409 5.24764518,3.02568421 5.36265936,3.14708772 L10.286953,8.3391345 C10.2874215,8.33960234 10.2874215,8.34030409 10.286953,8.34077193 C9.68705218,8.68533333 9.00399441,8.86849123 8.28837662,8.86872515 C7.19468776,8.86872515 6.14972181,8.42287719 5.39287694,7.6371462 M19.089169,22.0804211 L14.057357,16.772117 L14.057357,16.7707135 L16.1697764,14.543345 L16.1711818,14.543345 L21.3231614,19.9753918 C21.3805514,20.0357427 21.407958,20.1138713 21.4056156,20.1912982 C21.4035074,20.2684912 21.3718844,20.3452164 21.3109807,20.4025263 L19.5178369,22.092117 C19.4571676,22.1494269 19.3786956,22.1770292 19.3011605,22.174924 C19.2236255,22.1725848 19.146559,22.1407719 19.089169,22.0804211 M19.5178369,3.14077193 L21.3109807,4.83059649 C21.3718844,4.88790643 21.4035074,4.96439766 21.4056156,5.04182456 C21.407958,5.11901754 21.3805514,5.1971462 21.3231614,5.25796491 L16.1711818,10.6895439 L16.1697764,10.6895439 L14.057357,8.46217544 L14.057357,8.46077193 L19.089169,3.15293567 C19.146559,3.09211696 19.2236255,3.06030409 19.3011605,3.05819883 C19.3786956,3.05609357 19.4571676,3.08346199 19.5178369,3.14077193 M24.4009036,20.2689591 C24.4018405,20.2312982 24.4058227,20.1934035 24.4050274,20.1562105 C24.4027775,20.0787836 24.3950474,20.0022924 24.3845064,19.9265029 C24.3833352,19.9171462 24.3833352,19.9075556 24.3819297,19.8984327 C24.3184494,19.4738713 24.1266029,19.0790175 23.8246614,18.760655 L17.9978226,12.6170292 C17.9975884,12.6167953 17.9975884,12.6163275 17.9978226,12.6158596 L23.8246614,6.47246784 C24.1266029,6.15387135 24.3184494,5.75925146 24.3819297,5.33469006 C24.3833352,5.32673684 24.383101,5.31878363 24.3842722,5.31129825 C24.3948132,5.23387135 24.4025433,5.15574269 24.4050274,5.07691228 C24.4058227,5.03948538 24.4018405,5.00159064 24.4009036,4.96416374 C24.3997323,4.91410526 24.4006693,4.86451462 24.3959844,4.81422222 C24.391768,4.76930994 24.382164,4.72416374 24.3751366,4.67925146 C24.3683435,4.63574269 24.3643614,4.59246784 24.3549916,4.54895906 C24.3549916,4.54872515 24.3549916,4.54872515 24.3547573,4.54849123 L24.3547573,4.54802339 C24.346793,4.51059649 24.3360178,4.47410526 24.325711,4.43761404 C24.3212603,4.42217544 24.3182151,4.40650292 24.3135303,4.39129825 C24.2978359,4.34100585 24.2802675,4.2914152 24.2605909,4.24252632 L24.2591855,4.23878363 C24.1376124,3.93819883 23.9424865,3.66849123 23.7042596,3.44416374 L20.736144,0.64697076 C20.6344818,0.551064327 20.5248552,0.466853801 20.4091383,0.393871345 C20.0624561,0.175157895 19.6593208,0.0621754386 19.2447075,0.0694269006 C19.2353377,0.0694269006 19.2262022,0.0684912281 19.2168324,0.0687251462 C19.0751143,0.0729356725 18.9357387,0.0904795322 18.8003452,0.121356725 C18.665186,0.152 18.5337746,0.19574269 18.4079852,0.251883041 C18.1566406,0.363929825 17.9273149,0.525567251 17.7324233,0.730947368 L17.6502033,0.817730994 L12.2290765,6.53352047 C12.2288422,6.5339883 12.2283738,6.53375439 12.2279053,6.53352047 L6.71917086,0.725333333 C6.3296218,0.314105263 5.80233681,0.0787836257 5.23452747,0.0631111111 C5.21414817,0.0626432749 5.19400312,0.0621754386 5.17362383,0.0621754386 C5.14973086,0.0621754386 5.12583789,0.064748538 5.10171068,0.0654502924 C5.06329454,0.066619883 5.02511264,0.0677894737 4.98716499,0.0708304094 C4.96678569,0.0727017544 4.94687488,0.0755087719 4.92672983,0.0778479532 C4.87636721,0.0834619883 4.82600458,0.0900116959 4.77634469,0.0991345029 C4.76955159,0.100538012 4.76252424,0.102409357 4.75573115,0.103812865 C4.49876463,0.154339181 4.2553843,0.251181287 4.03519421,0.392233918 C4.02816687,0.396678363 4.02137377,0.40205848 4.01458067,0.406736842 C3.96609201,0.438549708 3.91807183,0.471298246 3.87192561,0.507321637 C3.81804931,0.549192982 3.76557848,0.593871345 3.71568434,0.641122807 L0.747334534,3.43854971 C0.745929066,3.4397193 0.744523597,3.44112281 0.743118128,3.44252632 L0.711026594,3.47293567 C0.698845866,3.48416374 0.68877334,3.49726316 0.677061101,3.50895906 C0.650591442,3.53609357 0.624590272,3.56322807 0.59952608,3.59153216 C0.541433376,3.65515789 0.487322833,3.72182456 0.437897185,3.79129825 C0.432978044,3.79854971 0.427590415,3.80533333 0.422671274,3.81235088 C0.397372839,3.84884211 0.373011382,3.88556725 0.350289638,3.92346199 C0.31702688,3.97773099 0.285403835,4.03293567 0.257060218,4.08977778 C0.254483525,4.09515789 0.252375322,4.10053801 0.250032874,4.10591813 C0.182101889,4.2448655 0.129396814,4.39129825 0.096368301,4.54381287 C0.094260098,4.55410526 0.0937916084,4.56439766 0.0916834054,4.57469006 C0.0881697338,4.59083041 0.0869985099,4.60767251 0.0841875726,4.62404678 C0.0720068442,4.69188304 0.0605288502,4.75948538 0.0549069756,4.8268538 C0.052330283,4.85632749 0.0532672621,4.88650292 0.0518617935,4.91644444 C0.0492851009,4.9739883 0.0462399188,5.03153216 0.0481138771,5.08860819 C0.0495193457,5.1248655 0.0549069756,5.16159064 0.0579521577,5.19808187 C0.0621685636,5.24650292 0.0649795009,5.29515789 0.0724753338,5.34264327 C0.0736465577,5.35083041 0.0736465577,5.35854971 0.0748177815,5.36650292 C0.085827286,5.43691228 0.10269291,5.50568421 0.121900982,5.57375439 C0.123540695,5.57983626 0.125414653,5.58591813 0.127054367,5.592 C0.146028194,5.65726316 0.168047203,5.72159064 0.193579883,5.78451462 C0.208337304,5.82147368 0.224968683,5.85749708 0.241600062,5.89375439 C0.256591728,5.9248655 0.270646415,5.95597661 0.287043549,5.98638596 C0.355443024,6.11738012 0.438365674,6.24088889 0.534406033,6.35667836 C0.550334677,6.37609357 0.566497567,6.39527485 0.582660457,6.41422222 C0.598120612,6.43153216 0.611004074,6.4500117 0.626932719,6.46661988 L3.44091522,9.43363743 C3.45684386,9.45047953 3.47394373,9.46615205 3.49034086,9.48299415 L3.49596274,9.48907602 C4.75455992,10.8151579 6.45611398,11.5454503 8.28767388,11.5454503 L8.28861086,11.5454503 C9.70063837,11.5452164 11.0355994,11.1110643 12.1494333,10.3042807 C12.1499018,10.3040468 12.1503702,10.3040468 12.1508387,10.3042807 L14.3433698,12.6158596 C14.3436041,12.6163275 14.3436041,12.6167953 14.3433698,12.6170292 L12.1508387,14.9286082 C12.1503702,14.9288421 12.1499018,14.929076 12.1494333,14.9286082 C11.0355994,14.1220585 9.70063837,13.6879064 8.28861086,13.6876725 L8.28767388,13.6876725 C6.45611398,13.6876725 4.75455992,14.4179649 3.49596274,15.7440468 L3.49010662,15.7503626 C3.47370949,15.7669708 3.45684386,15.7826433 3.44091522,15.7994854 L0.626932719,18.7665029 C0.611004074,18.7831111 0.597886367,18.8018246 0.582660457,18.8189006 C0.566263322,18.837848 0.550334677,18.8567953 0.534406033,18.8762105 C0.438365674,18.992 0.355443024,19.1157427 0.287043549,19.2465029 C0.270646415,19.2769123 0.256591728,19.3082573 0.241600062,19.3393684 C0.224968683,19.3753918 0.208337304,19.4114152 0.193579883,19.4486082 C0.168047203,19.5115322 0.146028194,19.5758596 0.127054367,19.6411228 C0.125414653,19.6472047 0.123540695,19.6532865 0.121900982,19.6593684 C0.10269291,19.7274386 0.085827286,19.7962105 0.0748177815,19.8666199 C0.0736465577,19.8745731 0.0736465577,19.8822924 0.0724753338,19.8902456 C0.0649795009,19.9379649 0.0621685636,19.9866199 0.0579521577,20.0350409 C0.0549069756,20.0715322 0.0495193457,20.1082573 0.0481138771,20.1442807 C0.0462399188,20.2013567 0.0492851009,20.2589006 0.0518617935,20.3166784 C0.0532672621,20.346386 0.052330283,20.3765614 0.0549069756,20.406269 C0.0605288502,20.4734035 0.0720068442,20.5410058 0.0841875726,20.6088421 C0.0869985099,20.6252164 0.0881697338,20.6420585 0.0916834054,20.6581988 C0.0937916084,20.6684912 0.094260098,20.6787836 0.096368301,20.689076 C0.129396814,20.8418246 0.182101889,20.9880234 0.249798629,21.1269708 C0.252375322,21.1323509 0.254483525,21.137731 0.257060218,21.143345 C0.285403835,21.2001871 0.31702688,21.2553918 0.350289638,21.3096608 C0.373011382,21.3475556 0.397372839,21.3842807 0.422671274,21.420538 C0.427590415,21.4277895 0.432978044,21.4345731 0.437897185,21.4413567 C0.487322833,21.5110643 0.541199131,21.577731 0.59952608,21.6418246 C0.624590272,21.6698947 0.650825686,21.6972632 0.677061101,21.7241637 C0.689007585,21.7358596 0.69908011,21.7489591 0.711026594,21.7601871 L0.742883884,21.7903626 C0.744523597,21.7917661 0.745694821,21.7931696 0.747334534,21.7945731 L3.71568434,24.592 C3.76557848,24.6392515 3.81804931,24.6836959 3.87192561,24.7255673 C3.91807183,24.7615906 3.96632625,24.794807 4.01481492,24.8266199 C4.02160802,24.8310643 4.02816687,24.8364444 4.03519421,24.8408889 C4.25561855,24.9821754 4.49923312,25.0790175 4.75643388,25.1295439 C4.76299273,25.1309474 4.76955159,25.1323509 4.77611044,25.1337544 C4.82600458,25.1431111 4.87660145,25.1496608 4.92719832,25.1552749 C4.94710913,25.157614 4.96678569,25.160655 4.98693074,25.1620585 C5.02511264,25.1653333 5.06352878,25.1665029 5.10217917,25.1676725 C5.12607214,25.1683743 5.14973086,25.1709474 5.17362383,25.1709474 C5.19400312,25.1709474 5.21414817,25.1704795 5.23452747,25.1700117 C5.80233681,25.1541053 6.3296218,24.9187836 6.71917086,24.5077895 L12.2279053,18.6993684 C12.2283738,18.6991345 12.2288422,18.6991345 12.2290765,18.6993684 L17.6497349,24.414924 L17.7324233,24.5021754 C17.9273149,24.7075556 18.1566406,24.8689591 18.4079852,24.9812398 C18.5967865,25.0652164 18.7977685,25.1218246 19.0062464,25.1480234 C19.0755828,25.1566784 19.1460905,25.1620585 19.2168324,25.1641637 C19.2262022,25.1643977 19.2353377,25.163462 19.2447075,25.1636959 C19.6593208,25.1709474 20.0624561,25.0579649 20.4091383,24.8392515 C20.5248552,24.766269 20.6344818,24.6820585 20.736144,24.586152 L23.7042596,21.7889591 C23.9424865,21.5643977 24.1376124,21.2946901 24.2591855,20.9943392 C24.259654,20.9929357 24.2601224,20.9917661 24.2605909,20.9903626 C24.2802675,20.9417076 24.2978359,20.892117 24.3135303,20.8418246 C24.3182151,20.8266199 24.3212603,20.8109474 24.325711,20.7955088 C24.3360178,20.7587836 24.346793,20.7222924 24.3547573,20.6850994 L24.3547573,20.6846316 C24.3549916,20.6843977 24.3549916,20.6841637 24.3549916,20.6841637 C24.3643614,20.6404211 24.3683435,20.5973801 24.3751366,20.5538713 C24.382164,20.5089591 24.391768,20.4635789 24.3959844,20.4189006 C24.4006693,20.3686082 24.3997323,20.3187836 24.4009036,20.2689591" id="Fill-1" fill="#CE0E2D" mask="url(#mask-2)"></path>
+                        </g>
+                        <path d="M9.10778827,29.3952749 C5.47441754,29.3952749 3.63184813,27.223345 3.63184813,22.9396023 L3.63184813,16.8181988 C3.63184813,12.4476725 5.37181833,10.412117 9.10778827,10.412117 C12.8097927,10.412117 14.5343028,12.4476725 14.5343028,16.8181988 L14.5343028,22.9396023 C14.5343028,27.3438129 12.8097927,29.3952749 9.10778827,29.3952749 M9.10778827,7.32814035 C3.14930389,7.32814035 0.000117122388,10.4729357 0.000117122388,16.4231111 L0.000117122388,39.0829942 C0.000117122388,39.5426433 0.2432632,39.7854503 0.703554186,39.7854503 L2.92841107,39.7854503 C3.38846781,39.7854503 3.63184813,39.5426433 3.63184813,39.0829942 L3.63184813,30.0107135 L4.08347206,30.0107135 L4.15397974,30.1038129 C5.34956508,31.6799532 7.23242459,32.4792515 9.75055594,32.4792515 C15.2560109,32.4792515 18.1660338,29.3342222 18.1660338,23.3842807 L18.1660338,16.4231111 C18.1660338,10.4729357 15.0337126,7.32814035 9.10778827,7.32814035" id="Fill-4" fill="#CE0E2D"></path>
+                        <path d="M35.2674953,18.1395789 L26.0729193,18.1395789 C25.6379268,18.1395789 25.2853884,17.7875322 25.2853884,17.3531462 L25.2853884,16.8672982 C25.2853884,12.4633216 26.9937356,10.4120936 30.6620088,10.4120936 C34.3305162,10.4120936 36.0390976,12.4633216 36.0390976,16.8672982 L36.0390976,17.3690526 C36.0390976,17.7945497 35.6938208,18.1395789 35.2674953,18.1395789 M30.5633917,7.32811696 C24.7344447,7.32811696 21.6531889,10.4731462 21.6531889,16.4230877 L21.6531889,23.1372398 C21.6531889,29.3360702 24.9171556,32.4792281 31.3542021,32.4792281 C34.1852844,32.4792281 36.6928748,31.4953684 38.6054834,29.6333801 C39.0074474,29.2317427 38.7956901,28.8216842 38.6333585,28.6132632 L37.6464853,27.3816842 C37.5368587,27.2448421 37.3618778,27.0789942 37.151526,27.0672982 C36.9910684,27.0588772 36.8273313,27.1374737 36.6624229,27.302386 C35.0332505,28.7718596 33.4930911,29.3952515 31.5027133,29.3952515 C27.2029161,29.3952515 25.2853884,27.3433216 25.2853884,22.742152 L25.2853884,21.1395789 C25.2853884,21.1040234 25.3142005,21.0752515 25.3498057,21.0752515 L38.1873564,21.0752515 C38.8978208,21.0752515 39.4735945,20.5002807 39.4735945,19.790807 L39.4735945,16.4230877 C39.4735945,10.4731462 36.3923387,7.32811696 30.5633917,7.32811696" id="Fill-6" fill="#CE0E2D"></path>
+                        <path d="M50.952385,7.32804678 C45.6633722,7.32804678 42.9815037,10.2552982 42.9815037,16.0281637 L42.9606559,31.1247719 C42.9606559,31.5844211 43.203802,31.8272281 43.6643273,31.8272281 L45.8889499,31.8272281 C46.3492409,31.8272281 46.592387,31.5844211 46.592387,31.1247719 L46.613469,16.0777544 C46.613469,12.2653567 48.1620612,10.4120234 51.3477902,10.4120234 C52.4843458,10.4120234 53.6063783,10.7390409 54.6824988,11.3834854 C55.142087,11.6749474 55.4344245,11.6251228 55.6972472,11.2120234 L56.5327983,9.78792982 C56.7970264,9.37319298 56.7253475,9.06067836 56.3046439,8.76664327 C54.8720028,7.81295906 53.070192,7.32804678 50.952385,7.32804678" id="Fill-8" fill="#CE0E2D"></path>
+                        <g id="Group-12" transform="translate(59.029684, 0.019415)">
+                            <mask id="mask-4" fill="white">
+                                <use xlink:href="#path-3"></use>
+                            </mask>
+                            <g id="Clip-11"></g>
+                            <path d="M2.51175989,0.21445614 C1.15852781,0.21445614 0.176573712,1.21585965 0.176573712,2.59597661 C0.176573712,3.94708772 1.15852781,4.9274386 2.51175989,4.9274386 C3.89333558,4.9274386 4.89637171,3.94708772 4.89637171,2.59597661 C4.89637171,1.19387135 3.91582308,0.21445614 2.51175989,0.21445614" id="Fill-10" fill="#CE0E2D" mask="url(#mask-4)"></path>
+                        </g>
+                        <path d="M60.4536108,7.96973099 C59.993554,7.96973099 59.7501737,8.21277193 59.7501737,8.67242105 L59.7501737,31.1248187 C59.7501737,31.5844678 59.993554,31.8272749 60.4536108,31.8272749 L62.6782334,31.8272749 C63.1387586,31.8272749 63.3819047,31.5844678 63.3819047,31.1248187 L63.3819047,8.67242105 C63.3819047,8.21277193 63.1387586,7.96973099 62.6782334,7.96973099 L60.4536108,7.96973099 Z" id="Fill-13" fill="#CE0E2D"></path>
+                        <path d="M88.9307014,10.4120468 C92.3291246,10.4120468 93.9121508,12.3692398 93.9121508,16.571345 L93.9121508,31.1247953 C93.9121508,31.5844444 94.1552969,31.8272515 94.6155879,31.8272515 L96.8404447,31.8272515 C97.3007357,31.8272515 97.5438818,31.5844444 97.5438818,31.1247953 L97.5438818,16.1764912 C97.5438818,10.3877193 94.6507246,7.32807018 89.1775954,7.32807018 C85.9883527,7.32807018 83.7105565,8.40315789 82.4076871,10.5236257 L82.3388191,10.6356725 L81.9762082,10.6356725 L81.907106,10.5236257 C80.604705,8.40315789 78.3266746,7.32807018 75.1379005,7.32807018 C69.8064894,7.32807018 66.8704653,10.4705263 66.8704653,16.1764912 L66.8704653,31.1247953 C66.8704653,31.5844444 67.1136114,31.8272515 67.5739024,31.8272515 L69.798525,31.8272515 C70.2590503,31.8272515 70.5024306,31.5844444 70.5024306,31.1247953 L70.5024306,16.571345 C70.5024306,12.4267836 72.0992772,10.4120468 75.3847945,10.4120468 C78.7368372,10.4120468 80.3664781,12.4267836 80.3664781,16.571345 L80.3664781,31.1247953 C80.3664781,31.5844444 80.6098584,31.8272515 81.0699152,31.8272515 L83.2945378,31.8272515 C83.755063,31.8272515 83.9984434,31.5844444 83.9984434,31.1247953 L83.9984434,16.571345 C83.9984434,12.3692398 85.5657752,10.4120468 88.9307014,10.4120468" id="Fill-15" fill="#CE0E2D"></path>
+                        <path d="M114.645343,18.1395789 L105.434839,18.1395789 C105.008513,18.1395789 104.663236,17.7945497 104.663236,17.3690526 L104.663236,16.8672982 C104.663236,12.4633216 106.371584,10.4120936 110.039857,10.4120936 C113.708364,10.4120936 115.416946,12.4633216 115.416946,16.8672982 L115.416946,17.3690526 C115.416946,17.7945497 115.071435,18.1395789 114.645343,18.1395789 M109.94124,7.32811696 C104.112058,7.32811696 101.031037,10.4731462 101.031037,16.4230877 L101.031037,23.1372398 C101.031037,29.3360702 104.295004,32.4792281 110.73205,32.4792281 C113.563835,32.4792281 116.071191,31.4953684 117.982863,29.6333801 C118.385295,29.2317427 118.173538,28.8216842 118.010972,28.6132632 L117.024099,27.3816842 C116.914707,27.2448421 116.739726,27.0789942 116.529374,27.0672982 C116.371962,27.0588772 116.205179,27.1374737 116.040037,27.302386 C114.411099,28.7718596 112.870939,29.3952515 110.880561,29.3952515 C106.580764,29.3952515 104.663236,27.3433216 104.663236,22.742152 L104.663236,21.0752515 L117.565204,21.0752515 C118.275435,21.0752515 118.851208,20.5002807 118.851208,19.790807 L118.851208,16.4230877 C118.851208,10.4731462 115.770187,7.32811696 109.94124,7.32811696" id="Fill-17" fill="#CE0E2D"></path>
+                        <path d="M122.366285,10.4120468 L122.366285,24.914269 C122.366285,29.934152 124.848577,32.4791813 129.743825,32.4791813 C131.448424,32.4791813 132.874038,32.1729825 133.981313,31.5699415 C134.381403,31.3301754 134.471587,31.0939181 134.317688,30.6723977 L134.317688,30.6719298 L133.72458,29.0426901 C133.653136,28.828655 133.552879,28.6974269 133.424279,28.6464327 C133.227279,28.5680702 132.961177,28.6730994 132.772375,28.7748538 C131.97688,29.1982456 131.156086,29.3952047 130.18889,29.3952047 C127.486642,29.3952047 125.998485,27.7687719 125.998485,24.8155556 L125.998485,10.4120468 L132.957429,10.4120468 C133.417954,10.4120468 133.6611,10.1690058 133.6611,9.70959064 L133.6611,8.03122807 C133.6611,7.57134503 133.417954,7.32830409 132.957429,7.32830409 L125.998485,7.32830409 L125.998485,0.970643275 C125.998485,0.510760234 125.75487,0.267953216 125.294579,0.267953216 L123.070191,0.267953216 C122.609666,0.267953216 122.366285,0.510760234 122.366285,0.970643275 L122.366285,7.32830409 L122.366285,10.4120468 Z" id="Fill-19" fill="#CE0E2D"></path>
+                        <path d="M148.66757,18.1395789 L139.457534,18.1395789 C139.031208,18.1395789 138.685932,17.7945497 138.685932,17.3690526 L138.685932,16.8672982 C138.685932,12.4633216 140.394279,10.4120936 144.062552,10.4120936 C147.731059,10.4120936 149.439407,12.4633216 149.439407,16.8672982 L149.439407,17.3690526 C149.439407,17.7945497 149.093895,18.1395789 148.66757,18.1395789 M143.963701,7.32811696 C138.134754,7.32811696 135.053732,10.4731462 135.053732,16.4230877 L135.053732,23.1372398 C135.053732,29.3360702 138.317465,32.4792281 144.754745,32.4792281 C147.585828,32.4792281 150.093418,31.4953684 152.005792,29.6333801 C152.407991,29.2317427 152.195999,28.8216842 152.033667,28.6132632 L151.046794,27.3816842 C150.937168,27.2448421 150.762421,27.0789942 150.552069,27.0672982 C150.396531,27.0579415 150.22764,27.1374737 150.062498,27.302386 C148.433794,28.7718596 146.893634,29.3952515 144.902788,29.3952515 C140.602991,29.3952515 138.685932,27.3433216 138.685932,22.742152 L138.685932,21.0752515 L151.600549,21.0752515 C152.303517,21.0752515 152.873669,20.5058947 152.873669,19.8036725 L152.873669,16.4230877 C152.873669,10.4731462 149.792882,7.32811696 143.963701,7.32811696" id="Fill-21" fill="#CE0E2D"></path>
+                        <path d="M164.331542,7.32804678 C159.042529,7.32804678 156.360895,10.2552982 156.360895,16.0281637 L156.360895,31.1247719 C156.360895,31.5844211 156.604041,31.8272281 157.064566,31.8272281 L159.289189,31.8272281 C159.749245,31.8272281 159.992626,31.5844211 159.992626,31.1247719 L159.992626,16.0777544 C159.992626,12.2653567 161.541218,10.4120234 164.726947,10.4120234 C165.863502,10.4120234 166.985535,10.7390409 168.061655,11.3834854 C168.292387,11.530152 168.487044,11.5886316 168.643285,11.5629006 C168.800932,11.5369357 168.942416,11.4220819 169.07617,11.2120234 L169.911955,9.78792982 C170.175949,9.37319298 170.10427,9.06044444 169.684035,8.76664327 C168.251159,7.81295906 166.449114,7.32804678 164.331542,7.32804678" id="Fill-23" fill="#CE0E2D"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/salecycle.svg b/src/drivers/webextension/images/icons/salecycle.svg
new file mode 100644
index 000000000..c1670dc0e
--- /dev/null
+++ b/src/drivers/webextension/images/icons/salecycle.svg
@@ -0,0 +1 @@
+<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="135.0087260034904" viewBox="0, 0, 400,135.0087260034904"><g id="svgg"><path id="path0" d="M361.514 2.900 C 361.552 2.936,362.371 3.327,363.333 3.769 C 365.764 4.884,370.613 7.812,371.167 8.499 C 371.212 8.556,371.622 8.883,372.077 9.227 C 374.059 10.723,375.994 12.592,378.399 15.334 C 380.188 17.374,383.279 21.754,384.171 23.513 C 384.377 23.918,384.616 24.296,384.703 24.352 C 384.790 24.408,384.844 24.483,384.822 24.519 C 384.764 24.613,386.225 27.565,386.389 27.685 C 386.466 27.741,386.532 27.854,386.537 27.935 C 386.545 28.076,386.629 28.288,387.224 29.667 C 388.005 31.478,389.493 35.844,389.758 37.105 C 389.780 37.208,389.925 37.729,390.080 38.262 C 390.234 38.794,390.427 39.610,390.508 40.074 C 390.588 40.537,390.813 41.667,391.006 42.583 C 391.200 43.500,391.357 44.546,391.356 44.907 C 391.354 45.269,391.392 45.627,391.440 45.705 C 391.488 45.782,391.560 46.274,391.600 46.797 C 391.641 47.321,391.741 48.425,391.824 49.250 C 392.770 58.653,390.436 71.798,386.179 81.057 C 385.077 83.453,384.953 83.706,384.390 84.708 C 384.094 85.235,383.904 85.668,383.967 85.669 C 384.031 85.671,384.000 85.727,383.897 85.794 C 383.795 85.862,383.549 86.217,383.351 86.583 C 383.153 86.950,382.844 87.475,382.664 87.750 C 382.484 88.025,382.279 88.362,382.209 88.500 C 382.060 88.790,380.498 91.170,380.295 91.417 C 380.220 91.508,379.732 92.146,379.211 92.833 C 373.618 100.213,365.904 106.360,358.250 109.537 C 356.572 110.233,352.554 111.560,351.580 111.740 C 351.307 111.791,350.858 111.873,350.583 111.924 C 347.673 112.459,348.759 112.636,352.583 112.249 C 352.950 112.212,353.738 112.139,354.333 112.086 C 354.929 112.033,355.642 111.952,355.917 111.905 C 356.787 111.755,357.734 111.651,358.208 111.652 C 358.460 111.653,358.667 111.592,358.667 111.516 C 358.667 111.441,358.865 111.418,359.108 111.464 C 359.441 111.528,359.517 111.495,359.416 111.332 C 359.331 111.195,359.348 111.156,359.460 111.225 C 359.558 111.286,360.039 111.246,360.528 111.136 C 361.017 111.026,361.473 110.951,361.542 110.968 C 361.610 110.986,361.667 110.920,361.667 110.822 C 361.667 110.723,361.807 110.689,361.982 110.744 C 362.161 110.801,362.406 110.737,362.546 110.597 C 362.682 110.461,362.836 110.391,362.887 110.442 C 362.938 110.493,363.341 110.397,363.782 110.227 C 364.223 110.058,364.640 109.910,364.708 109.897 C 364.777 109.885,364.852 109.860,364.875 109.841 C 364.898 109.823,365.054 109.782,365.221 109.750 C 365.389 109.718,365.785 109.569,366.102 109.419 C 366.420 109.268,366.808 109.119,366.965 109.086 C 367.536 108.968,369.823 107.712,369.705 107.581 C 369.638 107.507,369.675 107.499,369.787 107.564 C 369.899 107.628,370.167 107.565,370.384 107.423 C 370.600 107.281,370.827 107.216,370.888 107.277 C 370.950 107.339,371.000 107.310,371.000 107.213 C 371.000 107.116,371.182 106.990,371.405 106.934 C 371.628 106.879,371.926 106.716,372.069 106.574 C 372.211 106.432,372.492 106.284,372.693 106.245 C 372.894 106.206,373.103 106.104,373.156 106.017 C 373.209 105.931,373.360 105.835,373.490 105.805 C 373.724 105.751,374.167 105.444,374.590 105.042 C 374.711 104.927,374.890 104.833,374.988 104.833 C 375.086 104.833,375.167 104.754,375.167 104.657 C 375.167 104.560,375.235 104.523,375.319 104.575 C 375.403 104.626,375.497 104.609,375.527 104.536 C 375.558 104.463,375.958 104.144,376.417 103.827 C 376.875 103.509,377.311 103.155,377.385 103.038 C 377.460 102.922,377.588 102.868,377.671 102.920 C 377.754 102.971,377.918 102.860,378.035 102.673 C 378.151 102.486,378.333 102.333,378.439 102.333 C 378.545 102.333,378.674 102.221,378.727 102.083 C 378.780 101.946,378.920 101.833,379.038 101.833 C 379.156 101.833,379.347 101.683,379.461 101.500 C 379.576 101.317,379.751 101.167,379.851 101.167 C 380.109 101.167,384.935 96.285,385.895 95.054 C 386.336 94.487,386.807 93.982,386.942 93.930 C 387.077 93.878,387.141 93.760,387.083 93.667 C 387.026 93.574,387.096 93.453,387.239 93.398 C 387.383 93.343,387.500 93.193,387.500 93.066 C 387.500 92.938,387.617 92.833,387.760 92.833 C 387.903 92.833,387.979 92.767,387.928 92.686 C 387.878 92.604,387.948 92.446,388.083 92.333 C 388.219 92.221,388.292 92.068,388.246 91.993 C 388.200 91.918,388.314 91.809,388.500 91.750 C 388.686 91.691,388.802 91.584,388.758 91.513 C 388.714 91.442,388.821 91.230,388.996 91.043 C 389.170 90.856,389.270 90.658,389.216 90.605 C 389.163 90.552,389.242 90.461,389.393 90.403 C 389.543 90.345,389.667 90.221,389.667 90.127 C 389.667 90.033,389.806 89.834,389.976 89.686 C 390.146 89.538,390.336 89.257,390.398 89.062 C 390.459 88.867,390.691 88.497,390.912 88.239 C 391.133 87.982,391.280 87.716,391.239 87.649 C 391.198 87.582,391.272 87.418,391.406 87.285 C 391.698 86.993,392.701 85.167,392.569 85.167 C 392.518 85.167,392.598 85.045,392.746 84.896 C 393.147 84.496,394.360 82.011,394.246 81.826 C 394.191 81.738,394.208 81.666,394.282 81.665 C 394.356 81.664,394.547 81.382,394.707 81.040 C 395.157 80.074,395.557 79.100,395.581 78.917 C 395.609 78.692,395.960 77.819,396.167 77.461 C 396.258 77.301,396.333 77.025,396.333 76.845 C 396.333 76.666,396.413 76.470,396.511 76.410 C 396.609 76.349,396.649 76.195,396.600 76.066 C 396.551 75.938,396.576 75.833,396.656 75.833 C 396.839 75.833,397.167 74.909,397.167 74.392 C 397.167 74.176,397.225 74.000,397.297 74.000 C 397.369 74.000,397.442 73.816,397.461 73.592 C 397.480 73.367,397.643 72.793,397.825 72.316 C 398.006 71.839,398.118 71.390,398.074 71.319 C 398.031 71.248,398.072 71.142,398.167 71.083 C 398.261 71.025,398.304 70.921,398.262 70.852 C 398.219 70.783,398.315 70.207,398.474 69.572 C 398.633 68.937,398.758 68.304,398.751 68.167 C 398.744 68.029,398.803 67.871,398.881 67.816 C 398.959 67.761,399.049 67.386,399.081 66.983 C 399.112 66.580,399.288 65.313,399.471 64.167 C 399.654 63.021,399.822 61.933,399.843 61.750 C 400.018 60.233,399.863 48.167,399.668 48.167 C 399.593 48.167,399.568 48.025,399.614 47.852 C 399.659 47.678,399.577 46.947,399.431 46.227 C 399.285 45.506,399.155 44.692,399.142 44.417 C 399.129 44.142,398.929 43.167,398.699 42.250 C 398.468 41.333,398.287 40.452,398.296 40.292 C 398.305 40.131,398.243 40.000,398.158 40.000 C 398.073 40.000,398.022 39.869,398.043 39.708 C 398.095 39.325,397.222 36.397,396.690 35.167 C 396.551 34.846,396.423 34.527,396.406 34.458 C 396.389 34.390,396.357 34.277,396.334 34.208 C 396.312 34.140,396.302 34.029,396.313 33.962 C 396.323 33.895,396.191 33.589,396.019 33.284 C 395.847 32.978,395.655 32.491,395.591 32.203 C 395.528 31.914,395.293 31.408,395.069 31.077 C 394.844 30.747,394.698 30.418,394.742 30.346 C 394.786 30.274,394.613 29.884,394.356 29.479 C 394.099 29.073,393.838 28.543,393.778 28.300 C 393.717 28.058,393.481 27.639,393.255 27.369 C 393.028 27.100,392.891 26.832,392.949 26.773 C 393.008 26.715,392.964 26.667,392.851 26.667 C 392.739 26.667,392.693 26.592,392.750 26.500 C 392.807 26.408,392.779 26.333,392.688 26.333 C 392.543 26.333,392.282 25.804,392.258 25.465 C 392.246 25.288,391.788 24.649,391.467 24.361 C 391.311 24.221,391.222 24.046,391.268 23.970 C 391.315 23.895,391.269 23.833,391.167 23.833 C 391.064 23.833,391.027 23.758,391.083 23.667 C 391.140 23.575,391.121 23.500,391.041 23.500 C 390.960 23.500,390.726 23.200,390.520 22.833 C 390.314 22.467,390.075 22.167,389.989 22.167 C 389.904 22.167,389.833 22.054,389.833 21.917 C 389.833 21.779,389.754 21.667,389.657 21.667 C 389.560 21.667,389.527 21.591,389.584 21.499 C 389.641 21.407,389.571 21.286,389.427 21.231 C 389.284 21.176,389.167 21.035,389.167 20.917 C 389.167 20.799,389.043 20.655,388.893 20.597 C 388.742 20.539,388.664 20.447,388.719 20.392 C 388.774 20.337,388.560 20.040,388.243 19.732 C 387.926 19.424,387.667 19.098,387.667 19.008 C 387.667 18.917,387.445 18.679,387.173 18.478 C 386.902 18.278,386.712 18.061,386.752 17.996 C 386.792 17.932,386.489 17.598,386.079 17.255 C 385.669 16.913,385.333 16.543,385.333 16.435 C 385.333 16.194,383.765 14.624,383.645 14.744 C 383.598 14.791,383.236 14.452,382.842 13.991 C 382.448 13.530,382.089 13.189,382.045 13.232 C 382.002 13.276,381.676 13.017,381.323 12.656 C 380.969 12.295,380.621 11.999,380.548 11.997 C 380.476 11.996,380.240 11.808,380.024 11.580 C 379.808 11.353,379.531 11.167,379.407 11.167 C 379.284 11.167,379.123 11.071,379.050 10.953 C 378.911 10.731,377.236 9.500,377.072 9.500 C 377.020 9.500,376.732 9.312,376.431 9.083 C 376.131 8.854,375.809 8.667,375.715 8.667 C 375.622 8.667,375.345 8.510,375.102 8.318 C 374.720 8.018,374.457 7.907,373.984 7.846 C 373.929 7.839,373.713 7.685,373.504 7.503 C 373.295 7.322,373.058 7.214,372.977 7.264 C 372.897 7.314,372.786 7.238,372.731 7.095 C 372.677 6.952,372.567 6.875,372.488 6.924 C 372.410 6.973,372.041 6.811,371.669 6.565 C 371.297 6.319,370.950 6.161,370.898 6.214 C 370.845 6.266,370.476 6.127,370.078 5.905 C 369.680 5.683,369.181 5.469,368.969 5.430 C 368.757 5.390,368.583 5.347,368.583 5.333 C 368.583 5.319,368.456 5.283,368.300 5.253 C 368.144 5.223,367.605 5.004,367.102 4.766 C 366.599 4.528,366.039 4.333,365.857 4.333 C 365.676 4.333,365.177 4.183,364.749 3.999 C 364.320 3.816,363.902 3.708,363.818 3.759 C 363.735 3.811,363.667 3.761,363.667 3.649 C 363.667 3.536,363.623 3.488,363.570 3.541 C 363.518 3.594,363.065 3.456,362.566 3.235 C 361.718 2.860,361.350 2.743,361.514 2.900 M339.583 21.750 C 338.942 21.869,338.079 22.052,337.667 22.156 C 337.254 22.260,336.767 22.367,336.583 22.395 C 336.123 22.464,334.224 23.119,333.417 23.486 C 333.050 23.653,332.563 23.848,332.333 23.919 C 332.104 23.990,331.637 24.225,331.295 24.441 C 330.953 24.657,330.603 24.833,330.517 24.833 C 330.431 24.833,330.336 24.890,330.306 24.958 C 330.275 25.027,329.912 25.264,329.500 25.484 C 324.711 28.045,319.411 34.119,316.397 40.500 C 315.633 42.118,314.983 43.833,315.132 43.836 C 315.197 43.837,315.174 43.894,315.082 43.961 C 314.718 44.227,313.011 50.566,313.241 50.797 C 313.290 50.846,313.266 50.968,313.187 51.068 C 313.108 51.168,312.997 51.813,312.942 52.500 C 312.886 53.188,312.725 54.449,312.584 55.303 C 312.443 56.158,312.371 56.926,312.424 57.012 C 312.477 57.097,312.450 57.167,312.364 57.167 C 312.279 57.167,312.164 57.449,312.109 57.794 C 311.730 60.163,310.543 60.759,306.292 60.718 C 304.481 60.700,303.000 60.750,303.000 60.830 C 303.000 60.910,303.469 60.974,304.042 60.973 C 304.615 60.972,305.608 61.059,306.250 61.167 C 307.599 61.392,309.768 61.536,312.514 61.581 C 313.576 61.599,314.533 61.667,314.639 61.733 C 314.749 61.801,314.834 61.758,314.836 61.635 C 314.837 61.502,314.886 61.482,314.961 61.583 C 315.262 61.993,319.328 61.839,320.195 61.386 C 321.017 60.956,321.558 60.396,321.400 60.140 C 321.352 60.063,321.380 60.000,321.461 60.000 C 321.669 60.000,322.402 57.585,322.286 57.283 C 322.233 57.145,322.236 56.986,322.293 56.929 C 322.350 56.872,322.420 56.440,322.448 55.969 C 322.492 55.235,322.627 54.345,323.114 51.583 C 323.162 51.308,323.213 50.915,323.226 50.708 C 323.239 50.502,323.290 50.333,323.339 50.333 C 323.387 50.333,323.444 50.131,323.465 49.884 C 323.485 49.636,323.656 48.999,323.845 48.468 C 324.033 47.937,324.141 47.427,324.084 47.334 C 324.027 47.242,324.060 47.167,324.157 47.167 C 324.254 47.167,324.318 47.110,324.299 47.042 C 324.253 46.874,324.840 45.130,325.021 44.901 C 325.099 44.801,325.123 44.679,325.074 44.629 C 325.024 44.580,325.139 44.263,325.328 43.926 C 325.518 43.588,325.634 43.248,325.585 43.170 C 325.537 43.092,325.556 43.003,325.627 42.973 C 325.866 42.869,327.329 39.794,327.222 39.621 C 327.160 39.521,327.196 39.499,327.308 39.567 C 327.413 39.633,327.500 39.604,327.500 39.503 C 327.500 39.298,328.181 38.281,328.376 38.194 C 328.445 38.163,328.460 38.070,328.408 37.986 C 328.356 37.902,328.401 37.833,328.508 37.833 C 328.615 37.833,328.658 37.717,328.603 37.575 C 328.548 37.432,328.565 37.354,328.639 37.399 C 328.780 37.487,329.355 36.910,329.241 36.796 C 329.205 36.760,329.390 36.496,329.653 36.209 C 329.916 35.921,330.094 35.649,330.049 35.604 C 330.004 35.560,330.125 35.425,330.317 35.305 C 330.509 35.185,330.667 35.019,330.667 34.936 C 330.667 34.776,330.745 34.691,332.417 33.013 C 333.004 32.424,333.446 31.881,333.399 31.805 C 333.352 31.729,333.418 31.667,333.546 31.667 C 333.674 31.667,334.045 31.385,334.372 31.042 C 335.013 30.365,335.524 29.919,335.663 29.913 C 335.711 29.911,335.968 29.704,336.234 29.453 C 336.501 29.202,336.748 29.026,336.785 29.062 C 336.821 29.099,337.118 28.876,337.446 28.567 C 337.773 28.258,338.102 28.043,338.177 28.090 C 338.252 28.136,338.374 28.073,338.448 27.950 C 338.522 27.827,338.958 27.548,339.417 27.330 C 339.875 27.112,340.350 26.836,340.472 26.715 C 340.594 26.595,340.762 26.540,340.847 26.592 C 340.931 26.644,341.000 26.607,341.000 26.510 C 341.000 26.413,341.108 26.333,341.240 26.333 C 341.373 26.333,341.758 26.170,342.096 25.971 C 342.434 25.771,342.832 25.596,342.980 25.581 C 343.129 25.567,343.519 25.439,343.848 25.297 C 344.563 24.989,345.159 24.794,345.500 24.757 C 346.173 24.683,347.000 24.449,347.000 24.332 C 347.000 24.261,347.169 24.205,347.375 24.209 C 347.581 24.213,348.178 24.142,348.701 24.051 C 349.224 23.960,349.880 23.900,350.159 23.916 C 350.438 23.933,350.668 23.865,350.669 23.765 C 350.671 23.665,350.744 23.696,350.833 23.833 C 350.977 24.056,350.995 24.056,351.000 23.833 C 351.003 23.686,351.055 23.652,351.128 23.750 C 351.200 23.848,351.730 23.882,352.417 23.833 C 353.781 23.736,353.684 23.621,351.627 22.900 C 348.137 21.676,342.749 21.162,339.583 21.750 M300.542 60.615 C 300.702 60.657,300.965 60.657,301.125 60.615 C 301.285 60.573,301.154 60.539,300.833 60.539 C 300.512 60.539,300.381 60.573,300.542 60.615 " stroke="none" fill="#a49c9c" fill-rule="evenodd"></path><path id="path1" d="M376.833 13.750 C 377.144 14.071,377.436 14.333,377.482 14.333 C 377.528 14.333,377.311 14.071,377.000 13.750 C 376.689 13.429,376.397 13.167,376.351 13.167 C 376.305 13.167,376.522 13.429,376.833 13.750 M342.000 21.458 C 342.000 21.611,344.459 21.597,344.613 21.443 C 344.673 21.383,344.110 21.333,343.361 21.333 C 342.613 21.333,342.000 21.390,342.000 21.458 M386.512 28.250 C 386.512 28.342,386.619 28.604,386.750 28.833 C 386.881 29.063,386.988 29.175,386.988 29.083 C 386.988 28.992,386.881 28.729,386.750 28.500 C 386.619 28.271,386.512 28.158,386.512 28.250 M324.075 29.542 L 323.417 30.250 324.125 29.591 C 324.515 29.229,324.833 28.910,324.833 28.883 C 324.833 28.757,324.688 28.883,324.075 29.542 M391.167 44.333 C 391.167 44.608,391.229 44.833,391.304 44.833 C 391.380 44.833,391.409 44.608,391.369 44.333 C 391.329 44.058,391.267 43.833,391.231 43.833 C 391.196 43.833,391.167 44.058,391.167 44.333 M391.705 48.833 C 391.705 49.154,391.740 49.285,391.782 49.125 C 391.823 48.965,391.823 48.702,391.782 48.542 C 391.740 48.381,391.705 48.512,391.705 48.833 M391.881 51.583 C 391.882 52.042,391.915 52.209,391.953 51.956 C 391.991 51.703,391.990 51.328,391.951 51.123 C 391.911 50.918,391.880 51.125,391.881 51.583 M391.879 56.000 C 391.879 56.413,391.911 56.581,391.951 56.375 C 391.991 56.169,391.991 55.831,391.951 55.625 C 391.911 55.419,391.879 55.587,391.879 56.000 M391.705 59.000 C 391.705 59.321,391.740 59.452,391.782 59.292 C 391.823 59.131,391.823 58.869,391.782 58.708 C 391.740 58.548,391.705 58.679,391.705 59.000 M301.366 60.588 C 301.520 60.742,302.973 60.786,303.199 60.643 C 303.327 60.562,302.977 60.504,302.347 60.503 C 301.759 60.501,301.317 60.540,301.366 60.588 M307.047 60.789 C 307.485 60.824,308.160 60.823,308.547 60.788 C 308.934 60.754,308.575 60.725,307.750 60.726 C 306.925 60.726,306.609 60.755,307.047 60.789 M391.205 63.500 C 391.205 63.821,391.240 63.952,391.282 63.792 C 391.323 63.631,391.323 63.369,391.282 63.208 C 391.240 63.048,391.205 63.179,391.205 63.500 M375.833 96.750 C 375.428 97.162,375.135 97.500,375.181 97.500 C 375.226 97.500,375.595 97.162,376.000 96.750 C 376.405 96.337,376.699 96.000,376.653 96.000 C 376.607 96.000,376.238 96.337,375.833 96.750 M372.158 100.458 L 371.583 101.083 372.208 100.509 C 372.552 100.193,372.833 99.912,372.833 99.884 C 372.833 99.757,372.692 99.877,372.158 100.458 M370.000 102.347 L 369.250 103.027 370.042 102.410 C 370.736 101.869,370.941 101.665,370.792 101.667 C 370.769 101.667,370.412 101.973,370.000 102.347 M348.667 112.343 C 348.667 112.440,348.580 112.466,348.474 112.401 C 348.352 112.325,348.327 112.355,348.406 112.482 C 348.502 112.637,348.592 112.635,348.807 112.472 C 348.959 112.356,349.115 112.240,349.153 112.214 C 349.191 112.188,349.097 112.167,348.944 112.167 C 348.792 112.167,348.667 112.246,348.667 112.343 M347.233 112.527 C 347.193 112.592,347.366 112.608,347.618 112.563 C 348.236 112.451,348.334 112.323,347.765 112.370 C 347.513 112.391,347.274 112.462,347.233 112.527 " stroke="none" fill="#8c8c8c" fill-rule="evenodd"></path><path id="path2" d="M391.717 50.167 C 391.717 50.671,391.748 50.877,391.786 50.625 C 391.824 50.373,391.824 49.960,391.786 49.708 C 391.748 49.456,391.717 49.663,391.717 50.167 M312.539 54.500 C 312.539 54.821,312.573 54.952,312.615 54.792 C 312.657 54.631,312.657 54.369,312.615 54.208 C 312.573 54.048,312.539 54.179,312.539 54.500 M391.720 57.500 C 391.720 58.096,391.750 58.340,391.787 58.042 C 391.824 57.744,391.824 57.256,391.787 56.958 C 391.750 56.660,391.720 56.904,391.720 57.500 M304.292 60.622 C 304.681 60.657,305.319 60.657,305.708 60.622 C 306.098 60.587,305.779 60.558,305.000 60.558 C 304.221 60.558,303.902 60.587,304.292 60.622 M373.577 99.042 L 372.750 99.917 373.625 99.090 C 374.106 98.635,374.500 98.241,374.500 98.215 C 374.500 98.090,374.346 98.229,373.577 99.042 M346.667 112.500 C 346.667 112.592,346.775 112.667,346.907 112.667 C 347.039 112.667,347.193 112.592,347.250 112.500 C 347.307 112.408,347.199 112.333,347.010 112.333 C 346.821 112.333,346.667 112.408,346.667 112.500 " stroke="none" fill="#545454" fill-rule="evenodd"></path><path id="path3" d="M340.833 0.105 C 336.016 0.957,332.535 1.905,329.917 3.080 C 329.458 3.285,328.903 3.510,328.683 3.579 C 328.241 3.718,324.919 5.415,324.000 5.972 C 323.679 6.166,323.079 6.517,322.667 6.752 C 322.254 6.986,321.617 7.403,321.250 7.677 C 320.883 7.952,320.396 8.303,320.167 8.456 C 319.938 8.610,319.514 8.926,319.226 9.159 C 318.939 9.393,318.505 9.733,318.264 9.917 C 318.023 10.100,317.733 10.330,317.621 10.427 C 317.509 10.525,316.892 11.056,316.250 11.608 C 313.934 13.599,308.833 19.135,308.833 19.658 C 308.833 19.754,308.772 19.833,308.696 19.833 C 308.621 19.833,308.191 20.377,307.742 21.042 C 307.293 21.706,306.878 22.287,306.821 22.333 C 306.618 22.496,305.333 24.622,305.333 24.796 C 305.333 24.893,305.269 24.997,305.191 25.028 C 305.023 25.094,304.328 26.250,303.755 27.417 C 303.530 27.875,303.232 28.438,303.094 28.667 C 302.955 28.896,302.729 29.346,302.591 29.667 C 302.453 29.988,302.271 30.363,302.187 30.500 C 302.103 30.637,301.902 31.069,301.742 31.458 C 301.581 31.848,301.394 32.167,301.327 32.167 C 301.259 32.167,301.157 32.418,301.099 32.725 C 301.042 33.031,300.808 33.669,300.581 34.140 C 300.353 34.612,300.166 35.092,300.166 35.208 C 300.165 35.323,300.068 35.604,299.949 35.833 C 299.562 36.581,297.662 42.812,297.663 43.333 C 297.663 43.471,297.512 44.183,297.327 44.917 C 297.143 45.650,296.920 46.813,296.832 47.500 C 296.744 48.188,296.519 49.762,296.331 51.000 C 295.150 58.807,295.872 60.656,300.015 60.428 C 300.694 60.391,302.885 60.436,304.883 60.528 C 311.244 60.822,312.147 60.068,312.587 54.083 C 314.019 34.617,329.975 19.354,346.583 21.563 C 349.442 21.944,353.824 23.291,353.830 23.792 C 353.832 23.906,353.940 24.000,354.070 24.000 C 354.367 24.000,355.331 24.541,355.332 24.708 C 355.333 24.777,355.416 24.833,355.517 24.833 C 355.776 24.833,357.590 25.973,357.933 26.351 C 358.090 26.525,358.287 26.667,358.371 26.667 C 358.455 26.667,358.622 26.760,358.741 26.875 C 358.861 26.990,359.491 27.523,360.141 28.059 C 362.697 30.169,365.758 34.183,367.404 37.585 C 368.831 40.532,369.517 42.268,369.841 43.750 C 369.921 44.117,370.140 44.942,370.328 45.583 C 370.516 46.225,370.744 47.350,370.834 48.083 C 370.924 48.817,371.077 49.979,371.173 50.667 C 371.401 52.296,371.398 56.885,371.168 58.583 C 371.068 59.317,370.917 60.504,370.833 61.221 C 370.683 62.487,370.080 64.969,369.549 66.500 C 369.407 66.912,369.188 67.620,369.063 68.073 C 368.938 68.525,368.776 68.938,368.703 68.989 C 368.629 69.041,368.465 69.421,368.338 69.833 C 368.211 70.246,367.933 70.920,367.720 71.332 C 367.507 71.744,367.333 72.141,367.333 72.215 C 367.333 72.325,366.611 73.660,365.750 75.143 C 365.285 75.943,364.388 77.288,364.128 77.573 C 363.966 77.751,363.833 77.988,363.833 78.101 C 363.833 78.213,363.774 78.331,363.702 78.361 C 363.629 78.392,363.144 78.942,362.624 79.583 C 360.827 81.799,357.588 84.754,355.683 85.917 C 355.533 86.008,355.175 86.252,354.887 86.458 C 354.600 86.665,354.309 86.833,354.240 86.833 C 354.171 86.833,353.869 87.021,353.569 87.250 C 353.268 87.479,352.935 87.667,352.827 87.667 C 352.720 87.667,352.284 87.852,351.858 88.079 C 350.659 88.717,348.838 89.500,348.554 89.500 C 348.414 89.500,347.688 89.681,346.941 89.902 C 344.973 90.483,342.602 90.744,340.000 90.663 C 332.388 90.427,331.425 91.108,331.158 96.917 C 331.086 98.475,330.902 101.584,330.748 103.826 C 330.329 109.962,330.715 111.179,333.335 111.986 C 335.861 112.764,342.551 113.160,345.250 112.692 C 345.800 112.597,347.188 112.367,348.333 112.181 C 364.290 109.597,379.978 96.448,386.329 80.333 C 386.456 80.012,386.723 79.375,386.924 78.917 C 388.507 75.297,390.429 68.367,390.991 64.250 C 391.091 63.517,391.206 62.729,391.246 62.500 C 392.283 56.578,391.827 46.276,390.230 39.583 C 389.516 36.589,387.970 31.608,387.647 31.258 C 387.566 31.171,387.500 30.995,387.500 30.867 C 387.500 30.419,384.336 23.870,383.610 22.815 C 383.459 22.596,382.694 21.451,381.910 20.271 C 378.411 15.009,373.597 10.152,368.667 6.911 C 366.765 5.660,362.022 3.167,361.546 3.167 C 361.423 3.167,361.283 3.062,361.234 2.935 C 361.181 2.797,360.999 2.735,360.781 2.783 C 360.532 2.837,360.484 2.814,360.629 2.711 C 360.885 2.527,355.887 0.833,355.089 0.833 C 354.893 0.833,354.062 0.673,353.242 0.477 C 351.808 0.134,342.283 -0.151,340.833 0.105 M385.333 16.385 C 385.333 16.414,385.577 16.658,385.875 16.927 L 386.417 17.417 385.927 16.875 C 385.471 16.370,385.333 16.257,385.333 16.385 M102.875 50.370 C 102.669 50.470,102.500 50.614,102.500 50.692 C 102.500 50.770,102.405 50.833,102.289 50.833 C 102.027 50.833,101.500 52.018,101.500 52.609 C 101.500 52.851,101.311 54.070,101.079 55.316 C 100.672 57.510,100.251 59.866,99.395 64.750 C 99.170 66.033,98.769 68.283,98.505 69.750 C 98.240 71.217,97.829 73.542,97.591 74.917 C 97.353 76.292,96.967 78.504,96.733 79.833 C 96.222 82.731,95.672 85.864,95.080 89.250 C 94.840 90.625,94.490 92.537,94.302 93.500 C 94.114 94.462,93.899 95.700,93.823 96.250 C 93.615 97.775,93.525 98.290,93.181 99.917 C 93.007 100.742,92.821 101.792,92.768 102.250 C 92.716 102.708,92.527 103.758,92.348 104.583 C 92.170 105.408,91.980 106.516,91.926 107.045 C 91.872 107.574,91.718 108.474,91.583 109.045 C 91.235 110.520,91.264 111.435,91.678 112.016 L 92.023 112.500 97.698 112.500 L 103.373 112.500 103.997 111.875 C 104.609 111.263,105.000 110.178,105.000 109.093 C 105.000 108.678,105.456 106.254,105.613 105.833 C 105.665 105.696,105.736 105.208,105.772 104.750 C 105.838 103.921,106.267 101.644,106.448 101.167 C 106.500 101.029,106.578 100.467,106.620 99.917 C 106.663 99.367,106.775 98.869,106.870 98.811 C 106.965 98.752,106.995 98.627,106.937 98.533 C 106.839 98.374,107.068 96.913,107.281 96.333 C 107.331 96.196,107.400 95.746,107.433 95.333 C 107.466 94.921,107.677 93.608,107.902 92.417 C 108.127 91.225,108.509 89.087,108.750 87.667 C 108.992 86.246,109.404 83.921,109.668 82.500 C 109.931 81.079,110.273 79.167,110.428 78.250 C 110.583 77.333,110.750 76.514,110.799 76.430 C 110.848 76.346,110.914 75.896,110.946 75.430 C 111.003 74.611,111.423 72.343,111.613 71.833 C 111.664 71.696,111.734 71.246,111.769 70.833 C 111.860 69.755,112.377 67.000,112.489 67.000 C 112.541 67.000,112.604 66.494,112.630 65.875 C 112.656 65.256,112.750 64.725,112.839 64.694 C 112.929 64.663,112.957 64.566,112.903 64.478 C 112.814 64.333,113.056 62.962,113.283 62.333 C 113.332 62.196,113.401 61.746,113.435 61.333 C 113.496 60.609,113.980 57.798,114.668 54.167 C 115.464 49.972,115.748 50.164,108.739 50.178 C 105.157 50.185,103.120 50.252,102.875 50.370 M26.500 51.679 C 22.852 51.925,18.848 52.992,16.119 54.446 C 15.863 54.582,15.488 54.781,15.285 54.889 C 13.797 55.678,11.340 57.950,10.433 59.375 C 10.098 59.902,9.750 60.333,9.662 60.333 C 9.573 60.333,9.500 60.454,9.500 60.602 C 9.500 60.750,9.322 61.219,9.105 61.644 C 6.738 66.270,7.214 74.971,9.997 77.958 C 10.182 78.157,10.333 78.391,10.333 78.480 C 10.333 78.735,13.335 81.667,13.597 81.667 C 13.727 81.667,13.833 81.737,13.833 81.823 C 13.833 81.909,14.208 82.183,14.667 82.433 C 15.125 82.682,15.500 82.944,15.500 83.015 C 15.500 83.086,15.669 83.197,15.875 83.261 C 16.081 83.325,16.513 83.574,16.834 83.814 C 17.435 84.262,17.569 84.351,18.812 85.128 C 19.212 85.379,19.628 85.658,19.735 85.750 C 19.843 85.842,20.078 86.011,20.257 86.127 C 21.770 87.104,23.349 88.122,23.745 88.374 C 24.107 88.605,25.368 89.507,25.963 89.960 C 28.557 91.940,29.388 94.108,28.582 96.795 C 27.639 99.939,24.774 101.175,18.965 100.943 C 11.621 100.650,8.927 100.495,7.196 100.264 C 4.568 99.915,3.500 100.275,3.500 101.510 C 3.500 101.782,3.319 102.848,3.098 103.878 C 2.877 104.908,2.644 106.200,2.580 106.750 C 2.516 107.300,2.356 108.226,2.224 108.808 C 1.794 110.710,2.397 111.427,4.750 111.816 C 5.300 111.906,6.462 112.128,7.333 112.309 C 8.204 112.490,9.592 112.689,10.417 112.753 C 11.242 112.816,11.980 112.906,12.057 112.953 C 12.709 113.350,21.259 113.261,24.417 112.826 C 25.883 112.623,27.252 112.448,27.458 112.437 C 27.665 112.426,27.833 112.366,27.833 112.305 C 27.833 112.244,28.377 112.070,29.042 111.920 C 29.706 111.769,30.468 111.538,30.734 111.407 C 31.000 111.275,31.328 111.167,31.463 111.167 C 31.859 111.167,35.841 109.000,36.750 108.290 C 38.802 106.688,40.693 104.530,41.678 102.667 C 41.992 102.071,42.313 101.537,42.389 101.481 C 42.466 101.425,42.521 101.331,42.512 101.272 C 42.503 101.213,42.610 100.894,42.748 100.562 C 42.887 100.231,43.000 99.895,43.000 99.815 C 43.000 99.736,43.186 99.030,43.413 98.245 C 44.509 94.466,43.971 87.885,42.429 86.180 C 42.285 86.021,42.167 85.794,42.167 85.677 C 42.167 85.560,42.020 85.303,41.841 85.107 C 41.661 84.911,41.137 84.290,40.675 83.727 C 39.962 82.858,36.692 80.000,36.411 80.000 C 36.360 80.000,36.117 79.813,35.869 79.583 C 35.622 79.354,35.351 79.167,35.267 79.167 C 35.183 79.167,34.869 78.979,34.569 78.750 C 34.268 78.521,33.985 78.333,33.938 78.333 C 33.892 78.333,33.381 78.000,32.802 77.593 C 32.224 77.186,31.175 76.508,30.472 76.086 C 29.770 75.664,29.104 75.209,28.994 75.076 C 28.883 74.942,28.737 74.833,28.669 74.833 C 28.477 74.833,24.084 71.886,23.842 71.594 C 23.723 71.451,23.555 71.333,23.469 71.333 C 22.852 71.333,21.999 69.601,22.003 68.356 C 22.008 66.362,22.715 65.204,24.470 64.314 L 25.583 63.750 31.250 63.772 C 34.918 63.785,37.916 63.885,39.750 64.055 C 41.308 64.199,43.568 64.365,44.771 64.424 L 46.959 64.532 47.403 63.949 C 47.694 63.568,47.907 63.001,48.020 62.308 C 48.115 61.726,48.367 60.313,48.580 59.167 C 49.583 53.775,49.566 53.584,48.039 53.138 C 43.796 51.899,33.539 51.204,26.500 51.679 M276.574 51.608 C 275.828 51.768,275.833 51.552,275.834 81.961 C 275.835 111.866,275.832 111.747,276.544 112.245 C 277.144 112.666,282.156 112.614,282.690 112.181 L 283.083 111.863 283.083 81.940 C 283.083 57.640,283.043 51.976,282.867 51.800 C 282.655 51.587,277.419 51.428,276.574 51.608 M176.667 52.011 C 175.887 52.186,174.893 52.403,174.457 52.494 C 173.114 52.773,169.744 54.255,169.337 54.746 C 169.221 54.886,169.052 55.000,168.961 55.000 C 168.278 55.000,165.090 58.290,163.907 60.215 C 163.637 60.654,163.248 61.276,163.042 61.597 C 162.835 61.919,162.666 62.272,162.665 62.382 C 162.664 62.493,162.491 62.883,162.282 63.250 C 161.818 64.062,160.984 66.664,160.467 68.917 C 160.025 70.838,159.773 91.477,160.162 93.833 C 160.810 97.755,162.652 103.089,163.674 104.000 C 163.726 104.046,163.945 104.383,164.161 104.750 C 164.808 105.847,167.015 108.333,167.342 108.333 C 167.425 108.333,167.615 108.521,167.765 108.750 C 167.915 108.979,168.133 109.167,168.249 109.167 C 168.364 109.167,168.557 109.285,168.677 109.429 C 168.796 109.573,169.195 109.844,169.562 110.031 C 169.929 110.219,170.333 110.476,170.460 110.602 C 170.586 110.729,170.891 110.883,171.137 110.944 C 171.382 111.005,171.913 111.231,172.316 111.444 C 172.720 111.658,173.155 111.833,173.284 111.833 C 173.412 111.833,174.170 112.016,174.967 112.239 C 178.611 113.258,187.906 113.293,193.167 112.308 C 196.552 111.673,196.500 111.730,196.500 108.662 C 196.500 105.447,196.436 105.390,193.091 105.652 C 184.236 106.346,178.989 106.236,176.434 105.304 C 173.792 104.340,171.165 102.175,170.202 100.167 C 170.092 99.938,169.931 99.638,169.845 99.500 C 169.211 98.497,168.512 96.404,167.869 93.583 C 167.473 91.847,167.467 72.626,167.862 71.000 C 168.477 68.470,168.893 67.045,169.187 66.465 C 169.359 66.125,169.500 65.766,169.500 65.667 C 169.500 65.109,172.716 61.000,173.152 61.000 C 173.229 61.000,173.387 60.886,173.503 60.746 C 174.031 60.110,178.164 58.548,178.738 58.768 C 178.863 58.817,179.016 58.776,179.076 58.678 C 179.214 58.456,185.199 58.450,187.583 58.670 C 188.500 58.754,189.963 58.864,190.833 58.912 C 191.704 58.961,192.642 59.049,192.917 59.108 C 193.666 59.267,195.952 59.270,196.111 59.112 C 196.275 58.949,196.404 54.303,196.260 53.731 C 196.125 53.192,195.485 52.910,193.917 52.698 C 193.183 52.599,191.646 52.393,190.500 52.241 C 189.354 52.089,187.929 51.900,187.333 51.821 C 185.176 51.535,178.234 51.658,176.667 52.011 M67.500 65.513 C 64.521 66.080,61.800 66.893,60.521 67.598 C 60.120 67.819,59.714 68.000,59.620 68.000 C 59.525 68.000,59.202 68.188,58.902 68.417 C 58.601 68.646,58.274 68.833,58.174 68.833 C 57.900 68.833,55.230 70.939,54.507 71.725 C 53.649 72.660,52.500 74.126,52.500 74.288 C 52.500 74.361,52.313 74.622,52.083 74.869 C 51.854 75.117,51.667 75.405,51.667 75.510 C 51.667 75.615,51.482 76.049,51.256 76.475 C 50.436 78.022,50.052 78.948,49.551 80.583 C 48.925 82.626,48.161 86.053,48.164 86.806 C 48.166 87.112,47.983 88.237,47.760 89.306 C 46.914 93.344,46.462 97.890,46.737 99.583 C 47.294 103.007,47.694 104.547,48.426 106.083 C 49.163 107.629,50.782 109.810,51.361 110.036 C 51.529 110.102,51.667 110.231,51.667 110.323 C 51.667 110.533,53.171 111.501,54.407 112.086 C 56.615 113.131,60.910 113.524,63.667 112.934 C 64.354 112.787,65.054 112.667,65.222 112.667 C 65.920 112.666,69.804 110.935,70.547 110.292 C 70.733 110.131,70.971 110.000,71.077 110.000 C 71.184 110.000,71.421 109.860,71.604 109.689 C 72.703 108.666,72.783 108.790,72.399 110.930 C 72.328 111.327,72.408 111.563,72.752 111.972 L 73.196 112.500 78.191 112.500 L 83.185 112.500 83.669 111.970 C 84.167 111.426,84.238 111.211,84.423 109.708 C 84.483 109.227,84.607 108.833,84.700 108.833 C 84.793 108.833,84.824 108.716,84.769 108.572 C 84.713 108.428,84.781 107.809,84.920 107.197 C 85.058 106.584,85.197 105.783,85.228 105.417 C 85.333 104.187,85.719 102.333,85.870 102.333 C 85.952 102.333,85.979 102.267,85.929 102.186 C 85.799 101.977,86.155 99.299,86.342 99.073 C 86.427 98.970,86.458 98.847,86.410 98.799 C 86.362 98.751,86.470 98.049,86.651 97.239 C 86.831 96.429,86.944 95.711,86.902 95.643 C 86.828 95.523,87.254 93.347,87.452 92.833 C 87.505 92.696,87.568 92.283,87.593 91.917 C 87.692 90.476,87.865 89.500,88.022 89.500 C 88.112 89.500,88.140 89.425,88.084 89.334 C 88.028 89.243,88.135 88.362,88.322 87.376 C 88.509 86.390,88.750 85.040,88.858 84.375 C 88.965 83.710,89.106 83.167,89.169 83.167 C 89.233 83.167,89.284 82.960,89.283 82.708 C 89.279 82.096,89.503 80.313,89.624 80.000 C 89.677 79.862,89.737 79.550,89.757 79.305 C 89.777 79.060,89.912 78.198,90.057 77.388 C 90.203 76.579,90.409 75.392,90.516 74.750 C 90.623 74.108,90.752 73.512,90.802 73.425 C 90.853 73.338,90.910 73.113,90.929 72.925 C 91.125 71.016,91.235 70.333,91.347 70.333 C 91.468 70.333,91.446 69.962,91.241 68.583 C 91.161 68.042,89.913 67.318,88.667 67.089 C 88.346 67.030,87.296 66.803,86.333 66.585 C 84.625 66.198,83.767 66.066,79.833 65.580 C 77.697 65.317,68.786 65.268,67.500 65.513 M134.167 65.448 C 132.531 65.720,129.023 66.661,128.899 66.862 C 128.852 66.938,128.692 67.000,128.544 67.000 C 128.179 67.000,125.956 68.101,124.855 68.827 C 124.363 69.151,123.768 69.544,123.534 69.699 C 123.299 69.854,123.042 70.098,122.962 70.241 C 122.882 70.383,122.746 70.500,122.659 70.500 C 122.444 70.500,120.500 72.429,120.500 72.643 C 120.500 72.737,120.350 72.919,120.167 73.047 C 118.984 73.876,116.181 79.361,115.464 82.250 C 115.373 82.617,115.192 83.287,115.062 83.739 C 114.830 84.546,114.714 85.147,113.916 89.667 C 112.691 96.600,113.056 102.414,114.867 104.814 C 115.032 105.033,115.167 105.303,115.167 105.414 C 115.167 105.526,115.392 105.927,115.667 106.307 C 115.942 106.687,116.167 107.047,116.167 107.108 C 116.167 107.307,119.039 110.000,119.251 110.000 C 119.366 110.000,119.558 110.119,119.679 110.264 C 119.899 110.529,122.361 111.833,122.642 111.833 C 122.724 111.833,123.157 111.999,123.604 112.200 C 124.051 112.402,124.642 112.594,124.917 112.625 C 125.192 112.657,125.942 112.799,126.583 112.942 C 128.025 113.262,133.574 113.293,136.667 112.997 C 137.813 112.888,139.058 112.776,139.434 112.748 C 139.810 112.720,140.560 112.638,141.101 112.567 C 141.641 112.495,142.158 112.429,142.250 112.420 C 142.342 112.411,142.717 112.316,143.083 112.209 C 143.913 111.967,145.956 111.613,146.458 111.623 C 146.665 111.628,146.833 111.572,146.833 111.499 C 146.833 111.426,147.215 111.275,147.681 111.163 C 148.939 110.861,149.281 110.108,149.834 106.417 C 149.944 105.683,150.075 105.016,150.126 104.933 C 150.266 104.704,150.384 103.693,150.401 102.583 L 150.417 101.583 148.333 101.532 C 147.188 101.503,144.487 101.608,142.333 101.764 C 136.439 102.193,131.265 102.180,129.656 101.733 C 126.755 100.928,125.782 98.892,126.243 94.590 L 126.360 93.500 139.474 93.500 C 151.913 93.500,152.618 93.484,153.169 93.192 C 154.102 92.696,154.366 91.889,155.003 87.583 C 155.112 86.850,155.248 86.175,155.305 86.083 C 155.362 85.992,155.415 85.692,155.423 85.417 C 155.431 85.142,155.496 84.242,155.568 83.417 C 155.963 78.886,154.096 72.831,151.549 70.383 C 151.339 70.181,151.167 69.937,151.167 69.841 C 151.167 69.745,151.089 69.667,150.994 69.667 C 150.900 69.667,150.573 69.418,150.269 69.114 C 149.546 68.390,147.896 67.295,146.979 66.928 C 146.578 66.768,146.172 66.573,146.077 66.494 C 145.981 66.415,145.606 66.277,145.243 66.186 C 144.880 66.096,144.021 65.868,143.333 65.680 C 142.143 65.355,135.707 65.192,134.167 65.448 M255.667 67.284 C 251.180 68.057,247.464 70.095,245.194 73.028 C 244.721 73.640,244.333 74.216,244.333 74.308 C 244.333 74.401,244.229 74.581,244.101 74.709 C 243.393 75.416,241.949 79.442,241.485 82.000 C 241.223 83.441,241.087 96.873,241.329 97.325 C 241.408 97.472,241.554 98.179,241.653 98.897 C 241.887 100.578,242.893 103.524,243.680 104.833 C 243.762 104.971,243.990 105.383,244.186 105.750 C 244.738 106.783,247.714 109.887,248.345 110.087 C 248.522 110.143,248.667 110.242,248.667 110.307 C 248.667 110.414,251.112 111.701,251.917 112.019 C 252.949 112.425,254.000 112.690,254.894 112.768 C 255.449 112.817,255.948 112.885,256.003 112.918 C 256.537 113.248,264.458 112.888,267.417 112.399 C 270.302 111.922,270.333 111.884,270.333 108.798 C 270.333 105.805,270.302 105.786,266.101 106.251 C 256.358 107.330,252.376 106.176,250.124 101.621 C 248.813 98.971,248.664 97.799,248.666 90.164 L 248.667 83.410 249.150 81.484 C 249.628 79.577,250.495 77.541,250.937 77.283 C 251.064 77.210,251.167 77.076,251.167 76.986 C 251.167 76.773,252.273 75.667,252.486 75.667 C 252.576 75.667,252.710 75.564,252.783 75.438 C 253.090 74.913,255.413 74.052,257.096 73.840 C 258.786 73.627,267.020 73.885,267.417 74.163 C 267.765 74.407,269.856 74.089,270.101 73.755 C 270.410 73.331,270.424 69.440,270.118 68.833 C 269.799 68.199,268.282 67.867,263.250 67.330 C 261.785 67.173,256.495 67.141,255.667 67.284 M304.833 67.265 C 301.412 67.857,298.172 69.025,296.785 70.165 C 296.674 70.256,296.278 70.577,295.905 70.877 C 295.532 71.178,294.969 71.715,294.655 72.071 C 294.340 72.427,293.915 72.884,293.708 73.087 C 293.502 73.289,293.333 73.515,293.333 73.589 C 293.333 73.663,293.228 73.842,293.100 73.987 C 292.227 74.972,291.164 77.432,290.465 80.083 L 289.938 82.083 289.873 89.250 C 289.805 96.837,289.864 97.771,290.582 100.528 C 290.995 102.114,292.118 104.833,292.360 104.833 C 292.437 104.833,292.500 104.945,292.500 105.081 C 292.500 105.450,294.376 108.000,295.112 108.631 C 296.130 109.505,296.185 109.547,297.243 110.290 C 297.797 110.678,298.351 110.997,298.474 110.998 C 298.598 110.999,298.902 111.145,299.151 111.322 C 299.400 111.499,299.824 111.696,300.093 111.758 C 300.363 111.821,301.033 112.016,301.583 112.192 C 304.840 113.233,313.126 113.286,319.083 112.305 C 320.183 112.123,321.496 111.937,322.000 111.891 C 324.114 111.696,324.494 111.189,324.498 108.553 C 324.501 105.617,324.455 105.576,321.392 105.834 C 320.397 105.918,318.271 106.099,316.667 106.236 C 301.529 107.530,297.873 105.299,297.227 94.375 L 297.116 92.500 310.949 92.500 L 324.781 92.500 325.266 92.083 L 325.750 91.667 325.745 87.875 C 325.733 80.245,324.670 76.545,321.290 72.379 C 320.823 71.804,320.390 71.333,320.328 71.333 C 320.265 71.333,319.952 71.087,319.633 70.786 C 318.899 70.093,317.924 69.547,315.342 68.380 C 313.456 67.527,307.172 66.860,304.833 67.265 M201.081 68.386 L 200.512 68.939 200.505 82.345 C 200.497 97.911,200.563 99.255,201.526 102.917 C 202.244 105.648,204.290 108.436,206.927 110.274 C 207.531 110.695,209.918 111.832,210.212 111.837 C 210.325 111.840,210.867 111.996,211.417 112.184 C 213.370 112.854,218.666 113.205,222.333 112.908 C 224.626 112.722,226.464 112.498,226.999 112.340 C 227.319 112.244,227.600 112.167,227.624 112.167 C 228.113 112.167,227.238 118.057,226.570 119.267 C 224.778 122.507,219.377 123.242,207.817 121.820 C 203.401 121.277,203.330 121.315,203.339 124.248 C 203.346 126.691,203.734 127.127,206.157 127.413 C 206.656 127.472,207.143 127.571,207.240 127.634 C 207.337 127.697,207.567 127.754,207.750 127.762 C 207.933 127.769,208.721 127.862,209.500 127.968 C 217.201 129.018,225.637 128.500,228.417 126.807 C 228.692 126.640,229.029 126.451,229.167 126.388 C 229.982 126.013,232.333 123.927,232.333 123.579 C 232.333 123.524,232.506 123.239,232.717 122.947 C 233.399 122.005,234.071 120.057,234.585 117.527 C 234.798 116.477,234.833 112.931,234.833 92.414 L 234.833 68.524 234.394 68.179 C 233.947 67.827,229.912 67.656,228.563 67.931 C 227.445 68.159,227.500 67.146,227.500 87.484 L 227.500 105.787 226.625 105.888 C 226.144 105.944,225.150 106.110,224.417 106.256 C 221.274 106.881,215.791 106.765,213.582 106.025 C 212.019 105.502,209.834 103.957,209.833 103.375 C 209.833 103.260,209.775 103.167,209.705 103.167 C 209.515 103.167,209.088 102.259,208.568 100.750 L 208.109 99.417 208.040 84.045 L 207.972 68.673 207.473 68.253 C 206.986 67.843,206.914 67.833,204.312 67.833 L 201.650 67.833 201.081 68.386 M309.739 73.847 C 310.570 73.946,311.362 74.069,311.500 74.121 C 311.637 74.172,312.203 74.378,312.757 74.579 C 313.890 74.989,314.192 75.201,315.496 76.500 C 316.409 77.409,317.167 78.577,317.167 79.075 C 317.167 79.217,317.242 79.333,317.333 79.333 C 317.425 79.333,317.500 79.484,317.500 79.669 C 317.500 79.853,317.655 80.547,317.846 81.210 C 318.078 82.022,318.222 83.138,318.286 84.625 L 318.381 86.833 307.749 86.833 L 297.117 86.833 297.222 85.375 C 297.385 83.105,297.788 80.716,298.139 79.948 C 299.154 77.724,299.161 77.712,300.083 76.700 C 301.536 75.105,305.387 73.366,306.300 73.891 C 306.364 73.928,306.567 73.898,306.750 73.824 C 307.223 73.634,308.003 73.640,309.739 73.847 M139.573 76.395 C 140.667 76.693,141.844 77.422,141.962 77.874 C 142.004 78.035,142.094 78.167,142.161 78.167 C 142.721 78.167,143.072 80.443,142.920 83.089 L 142.800 85.167 135.313 85.167 L 127.827 85.167 127.938 84.708 C 128.541 82.215,129.473 80.060,130.371 79.083 C 131.556 77.793,131.874 77.507,132.600 77.075 C 134.191 76.127,137.429 75.812,139.573 76.395 M74.421 76.571 C 76.554 76.670,76.700 76.725,76.585 77.394 C 76.536 77.682,76.467 78.179,76.432 78.500 C 76.397 78.821,76.216 79.908,76.031 80.917 C 75.708 82.675,75.386 84.524,74.419 90.167 C 74.176 91.587,73.793 93.688,73.569 94.833 C 73.345 95.979,73.163 97.082,73.164 97.283 C 73.173 98.708,72.842 99.320,71.777 99.847 C 71.212 100.126,70.679 100.425,70.592 100.511 C 70.505 100.596,70.280 100.667,70.092 100.667 C 69.904 100.668,69.517 100.810,69.233 100.983 C 66.419 102.699,62.015 102.388,60.711 100.382 L 60.083 99.417 60.088 97.000 C 60.093 94.878,60.351 92.583,60.641 92.084 C 60.694 91.992,60.742 91.804,60.748 91.667 C 60.810 90.219,62.057 83.902,62.525 82.667 C 64.414 77.686,66.564 76.223,71.667 76.446 C 72.262 76.472,73.502 76.528,74.421 76.571 " stroke="none" fill="#1c1c1c" fill-rule="evenodd"></path><path id="path4" d="M301.377 60.453 C 301.631 60.491,302.006 60.490,302.211 60.451 C 302.416 60.411,302.208 60.380,301.750 60.381 C 301.292 60.382,301.124 60.415,301.377 60.453 " stroke="none" fill="#3c3460" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/salesfloor.png b/src/drivers/webextension/images/icons/salesfloor.png
new file mode 100644
index 000000000..b0d348562
Binary files /dev/null and b/src/drivers/webextension/images/icons/salesfloor.png differ
diff --git a/src/drivers/webextension/images/icons/seersco.png b/src/drivers/webextension/images/icons/seersco.png
new file mode 100644
index 000000000..d17176314
Binary files /dev/null and b/src/drivers/webextension/images/icons/seersco.png differ
diff --git a/src/drivers/webextension/images/icons/termly.svg b/src/drivers/webextension/images/icons/termly.svg
new file mode 100644
index 000000000..8fabdfc7e
--- /dev/null
+++ b/src/drivers/webextension/images/icons/termly.svg
@@ -0,0 +1,7 @@
+<svg enable-background="new 0 0 72.7 72.7" viewBox="0 0 72.7 72.7" xmlns="http://www.w3.org/2000/svg">
+	<style>
+	    @media (prefers-color-scheme: dark) {
+	      path{fill:#fff;}
+	    }
+	</style>
+	<path clip-rule="evenodd" d="m36.4.9c20.1 0 36.4 15.9 36.4 35.5s-16.4 35.5-36.4 35.5-36.4-15.9-36.4-35.5 16.3-35.5 36.4-35.5zm16 19.1h-21.8v38.4l21-28.8h-6.3z" fill="#4672ff" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/vue.svg b/src/drivers/webextension/images/icons/vue.svg
new file mode 100644
index 000000000..71c1cfb9a
--- /dev/null
+++ b/src/drivers/webextension/images/icons/vue.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 196.32 170.02">
+  <path fill="#42b883" d="M120.83 0L98.16 39.26 75.49 0H0l98.16 170.02L196.32 0h-75.49z"/>
+  <path fill="#35495e" d="M120.83 0L98.16 39.26 75.49 0H39.26l58.9 102.01L157.06 0h-36.23z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/webAR.svg b/src/drivers/webextension/images/icons/webAR.svg
new file mode 100644
index 000000000..7fac0a5af
--- /dev/null
+++ b/src/drivers/webextension/images/icons/webAR.svg
@@ -0,0 +1,4 @@
+<svg width="52" height="59" viewBox="0 0 52 59" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M26 1L51 14.6986M26 1L18.4658 5.12835L8.87671 10.3826L1 14.6986M26 1V10.2466V29.4247M26 29.4247V57.8493M26 29.4247L1 44.1507M26 29.4247L51 14.6986M26 29.4247L51 44.1507M26 29.4247L8.87671 19.3383L1 14.6986M26 57.8493L1 44.1507M26 57.8493L51 44.1507M1 44.1507V24.2877V14.6986M51 44.1507V14.6986" stroke="black"/>
+<path d="M1 44.1506L8.87671 48.4667M1 44.1506L8.87671 39.5109M1 44.1506V34.5616M18.4658 5.12872L26 1.00036M26 1.00036V10.2469M26 1.00036L33.5342 5.12872M1 14.6994L8.87671 10.3834M1 14.6994L8.87671 19.3391M1 14.6994V24.2884M18.4658 53.7408L26 57.8691M26 57.8691V48.6226M26 57.8691L33.5342 53.7408M18.4658 24.9737L26 29.4258M26 29.4258V38.6723M26 29.4258L33.5342 24.9737M51 44.1506L43.1233 48.4667M51 44.1506L43.1233 39.5109M51 44.1506V34.5616M51 14.6994L43.1233 10.3834M51 14.6994L43.1233 19.3391M51 14.6994V24.2884" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index d376f83b2..3b031d84b 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -9,17 +9,6 @@ const Content = {
   async init() {
     await new Promise((resolve) => setTimeout(resolve, 1000))
 
-    // Enable messaging to and from driver.js
-    Content.port = chrome.runtime.connect({ name: 'content.js' })
-
-    Content.port.onMessage.addListener(({ func, args }) => {
-      const onFunc = `on${func.charAt(0).toUpperCase() + func.slice(1)}`
-
-      if (Content[onFunc]) {
-        Content[onFunc](args)
-      }
-    })
-
     try {
       // HTML
       let html = new XMLSerializer().serializeToString(document)
@@ -43,13 +32,15 @@ const Content = {
         document.documentElement.getAttribute('lang') ||
         document.documentElement.getAttribute('xml:lang') ||
         (await new Promise((resolve) =>
-          chrome.i18n.detectLanguage(html, ({ languages }) =>
-            resolve(
-              languages
-                .filter(({ percentage }) => percentage >= 75)
-                .map(({ language: lang }) => lang)[0]
-            )
-          )
+          chrome.i18n.detectLanguage
+            ? chrome.i18n.detectLanguage(html, ({ languages }) =>
+                resolve(
+                  languages
+                    .filter(({ percentage }) => percentage >= 75)
+                    .map(({ language: lang }) => lang)[0]
+                )
+              )
+            : resolve()
         ))
 
       // Script tags
@@ -72,22 +63,40 @@ const Content = {
         {}
       )
 
-      Content.port.postMessage({
-        func: 'onContentLoad',
-        args: [location.href, { html, scripts, meta }, language]
-      })
+      Content.driver('onContentLoad', [
+        location.href,
+        { html, scripts, meta },
+        language
+      ])
 
-      Content.port.postMessage({ func: 'getTechnologies' })
+      Content.onGetTechnologies(await Content.driver('getTechnologies'))
     } catch (error) {
-      Content.port.postMessage({ func: 'error', args: [error, 'content.js'] })
+      Content.driver('error', error)
     }
   },
 
+  driver(func, args, callback) {
+    return new Promise((resolve, reject) => {
+      chrome.runtime.sendMessage(
+        {
+          source: 'content.js',
+          func,
+          args: args ? (Array.isArray(args) ? args : [args]) : []
+        },
+        (response) => {
+          chrome.runtime.lastError
+            ? reject(new Error(chrome.runtime.lastError.message))
+            : resolve(response)
+        }
+      )
+    })
+  },
+
   /**
    * Callback for getTechnologies
-   * @param {Object} technologies
+   * @param {Array} technologies
    */
-  onGetTechnologies(technologies) {
+  onGetTechnologies(technologies = []) {
     // Inject a script tag into the page to access methods of the window object
     const script = document.createElement('script')
 
@@ -99,9 +108,10 @@ const Content = {
 
         window.removeEventListener('message', onMessage)
 
-        Content.port.postMessage({
+        chrome.runtime.sendMessage({
+          source: 'content.js',
           func: 'analyzeJs',
-          args: [location.href, data.wappalyzer.js]
+          args: [location.href.split('#')[0], data.wappalyzer.js]
         })
 
         script.remove()
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index cb418f4b3..1b1c02ff3 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -55,15 +55,18 @@ const Driver = {
       ads: await getOption('ads', [])
     }
 
+    chrome.browserAction.setBadgeBackgroundColor({ color: '#6B39BD' }, () => {})
+
     chrome.webRequest.onCompleted.addListener(
       Driver.onWebRequestComplete,
       { urls: ['http://*/*', 'https://*/*'], types: ['main_frame'] },
       ['responseHeaders']
     )
+
     chrome.tabs.onRemoved.addListener((id) => (Driver.cache.tabs[id] = null))
 
     // Enable messaging between scripts
-    chrome.runtime.onConnect.addListener(Driver.onRuntimeConnect)
+    chrome.runtime.onMessage.addListener(Driver.onMessage)
 
     const { version } = chrome.runtime.getManifest()
     const previous = await getOption('version')
@@ -72,7 +75,7 @@ const Driver = {
     if (previous === null) {
       open('https://www.wappalyzer.com/installed')
     } else if (version !== previous && upgradeMessage) {
-      // open(`https://www.wappalyzer.com/upgraded?v${version}`, false)
+      open(`https://www.wappalyzer.com/upgraded?v${version}`, false)
     }
 
     await setOption('version', version)
@@ -153,29 +156,28 @@ const Driver = {
 
   /**
    * Enable scripts to call Driver functions through messaging
-   * @param {Object} port
+   * @param {Object} message
+   * @param {Object} sender
+   * @param {Function} callback
    */
-  onRuntimeConnect(port) {
-    Driver.log(`Connected to ${port.name}`)
+  onMessage({ source, func, args }, sender, callback) {
+    if (!func) {
+      return
+    }
 
-    port.onMessage.addListener(async ({ func, args }) => {
-      if (!func) {
-        return
-      }
+    Driver.log({ source, func, args })
 
-      Driver.log({ port: port.name, func, args })
+    if (!Driver[func]) {
+      Driver.error(new Error(`Method does not exist: Driver.${func}`))
 
-      if (!Driver[func]) {
-        Driver.error(new Error(`Method does not exist: Driver.${func}`))
+      return
+    }
 
-        return
-      }
+    Promise.resolve(Driver[func].call(Driver[func], ...(args || [])))
+      .then(callback)
+      .catch(Driver.error)
 
-      port.postMessage({
-        func,
-        args: await Driver[func].call(port.sender, ...(args || []))
-      })
-    })
+    return !!callback
   },
 
   /**
@@ -362,7 +364,7 @@ const Driver = {
    * @param {Object} technologies
    */
   async setIcon(url, technologies) {
-    const dynamicIcon = await getOption('dynamicIcon', true)
+    const dynamicIcon = await getOption('dynamicIcon', false)
 
     let icon = 'default.svg'
 
@@ -376,23 +378,30 @@ const Driver = {
       ;({ icon } = pinned || technologies[0] || { icon })
     }
 
-    const tabs = await promisify(chrome.tabs, 'query', { url })
-
-    await Promise.all(
-      tabs.map(async ({ id: tabId }) => {
-        await promisify(chrome.pageAction, 'setIcon', {
-          tabId,
-          path: chrome.extension.getURL(
-            `../images/icons/${
-              /\.svg$/i.test(icon)
-                ? `converted/${icon.replace(/\.svg$/, '.png')}`
-                : icon
-            }`
-          )
-        })
+    ;(await promisify(chrome.tabs, 'query', { url })).forEach(
+      ({ id: tabId }) => {
+        chrome.browserAction.setBadgeText(
+          {
+            tabId,
+            text: technologies.length.toString()
+          },
+          () => {}
+        )
 
-        chrome.pageAction.show(tabId)
-      })
+        chrome.browserAction.setIcon(
+          {
+            tabId,
+            path: chrome.extension.getURL(
+              `../images/icons/${
+                /\.svg$/i.test(icon)
+                  ? `converted/${icon.replace(/\.svg$/, '.png')}`
+                  : icon
+              }`
+            )
+          },
+          () => {}
+        )
+      }
     )
   },
 
@@ -519,7 +528,7 @@ const Driver = {
           ]
 
           if (
-            !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(
+            !/((local|dev(elop(ment)?)?|stag(e|ing)?|preprod|test(ing)?|demo(shop)?|admin|cache)[.-]|localhost|google|\/admin|\.local|\.test|\.dev|127\.|0\.)/.test(
               hostname
             ) &&
             hits >= 3
diff --git a/src/drivers/webextension/js/lib/iframe.js b/src/drivers/webextension/js/lib/iframe.js
index 5fc1ef0ef..d36e22baa 100644
--- a/src/drivers/webextension/js/lib/iframe.js
+++ b/src/drivers/webextension/js/lib/iframe.js
@@ -163,24 +163,15 @@
 			 * @param {String} responseMessage
 			 */
 			sendToBackground: function(message, event, responseMessage) {
-				if (typeof chrome !== 'undefined') {
-					var port = chrome.runtime.connect({ name: 'adparser' })
-
-					port.onMessage.addListener((message) => {
-						if (message && typeof message.tracking_enabled !== 'undefined') {
-							if (message.tracking_enabled) {
-								utilCallback()
-							} else {
-								utilElseCallback()
-							}
-						}
-					})
-
-					port.postMessage(message)
-				} else if (window.self.port) {
-					window.self.port.on(responseMessage, onResponse)
-					window.self.port.emit(event, message)
-				}
+        chrome.runtime.sendMessage(message, (message) => {
+          if (message && typeof message.tracking_enabled !== 'undefined') {
+            if (message.tracking_enabled) {
+              utilCallback()
+            } else {
+              utilElseCallback()
+            }
+          }
+        })
 			},
 
 			/**
@@ -1446,15 +1437,11 @@
 		 * @param {Function} callback
 		 */
 		function addBackgroundListener(event, callback) {
-			if (typeof chrome !== 'undefined') {
-				chrome.runtime.onMessage.addListener(function(msg) {
-					if (msg.event === event) {
-						callback(msg)
-					}
-				})
-			} else if (window.self.port) {
-				window.self.port.on(event, callback)
-			}
+      chrome.runtime.onMessage.addListener(function(msg) {
+        if (msg.event === event) {
+          callback(msg)
+        }
+      })
 		}
 
 		exports.coordinator = {
@@ -1541,7 +1528,7 @@
 ;(function(adparser, pageUrl) {
 	function onAdFound(log) {
 		adparser.sendToBackground(
-			{ func: 'onAd', args: [log] },
+			{ source: 'iframe.js', func: 'onAd', args: [log] },
 			'onAd',
 			'',
 			function() {}
diff --git a/src/drivers/webextension/js/lib/network.js b/src/drivers/webextension/js/lib/network.js
index f9f58d843..3e0c8d46a 100644
--- a/src/drivers/webextension/js/lib/network.js
+++ b/src/drivers/webextension/js/lib/network.js
@@ -730,20 +730,18 @@
     }
   );
 
-	chrome.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;
-		});
-	});
+  chrome.runtime.onMessage.addListener((message, sender, callback) => {
+    if ( message === 'is_tracking_enabled' ) {
+      ifTrackingEnabled(
+        sender.tab,
+        function() {
+          try {callback({'tracking_enabled': true});}
+          catch(err) {} },
+        function() {
+          try {callback({'tracking_enabled': false});}
+          catch(err) {} }
+      );
+    }
+    return true;
+  });
 })();
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index 12d67dcfd..b0ae6127c 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -18,7 +18,7 @@ const Options = {
 
     ;[
       ['upgradeMessage', true],
-      ['dynamicIcon', true],
+      ['dynamicIcon', false],
       ['tracking', true],
       ['themeMode', false]
     ].map(async ([option, defaultValue]) => {
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index 41e1e8cd8..380435d03 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -2,11 +2,17 @@
 /* eslint-env browser */
 /* globals chrome, Utils */
 
-const { agent, open, i18n, getOption, setOption, promisify } = Utils
+const {
+  agent,
+  open,
+  i18n,
+  getOption,
+  setOption,
+  promisify,
+  sendMessage
+} = Utils
 
 const Popup = {
-  port: chrome.runtime.connect({ name: 'popup.js' }),
-
   /**
    * Initialise popup
    */
@@ -34,50 +40,57 @@ const Popup = {
       agent === 'chrome' || (await getOption('termsAccepted', false))
 
     if (termsAccepted) {
-      Popup.driver('getDetections')
+      document.querySelector('.terms').classList.add('terms--hidden')
+      document.querySelector('.empty').classList.remove('empty--hidden')
+
+      Popup.onGetDetections(await Popup.driver('getDetections'))
     } else {
-      document.querySelector('.terms').style.display = 'flex'
-      document.querySelector('.detections').style.display = 'none'
-      document.querySelector('.empty').style.display = 'none'
+      document.querySelector('.terms').classList.remove('terms--hidden')
+      document.querySelector('.detections').classList.add('detections--hidden')
+      document.querySelector('.empty').classList.add('empty--hidden')
 
       document.querySelector('.terms').addEventListener('click', async () => {
         await setOption('termsAccepted', true)
 
-        document.querySelector('.terms').remove()
-        document.querySelector('.detections').style.display = 'block'
-        document.querySelector('.empty').style.display = 'block'
+        document.querySelector('.terms').classList.add('terms--hidden')
+        document.querySelector('.empty').classList.remove('empty--hidden')
 
-        Popup.driver('getDetections')
+        chrome.runtime.sendMessage('getDetections', Popup.onGetDetections)
       })
-
-      // Apply internationalization
-      i18n()
     }
 
     // Alert
-    const [{ url }] = await promisify(chrome.tabs, 'query', {
+    const tabs = await promisify(chrome.tabs, 'query', {
       active: true,
       currentWindow: true
     })
 
-    document.querySelector(
-      '.alerts__link'
-    ).href = `https://www.wappalyzer.com/alerts/manage?url=${encodeURIComponent(
-      `${url}`
-    )}`
+    if (tabs && tabs.length) {
+      const [{ url }] = tabs
+
+      if (url.startsWith('http')) {
+        document.querySelector('.alerts').classList.remove('alerts--hidden')
+
+        document.querySelector(
+          '.alerts__link'
+        ).href = `https://www.wappalyzer.com/alerts?url=${encodeURIComponent(
+          `${url}`
+        )}`
+      } else {
+        document.querySelector('.alerts').classList.add('alerts--hidden')
+      }
+    }
 
     document
       .querySelector('.footer__settings')
       .addEventListener('click', () => chrome.runtime.openOptionsPage())
+
+    // Apply internationalization
+    i18n()
   },
 
-  /**
-   * Call a function on driver.js through messaging
-   * @param {function} func
-   * @param  {...any} args
-   */
-  driver(func, ...args) {
-    Popup.port.postMessage({ func, args })
+  driver(func, args) {
+    return sendMessage('popup.js', func, args)
   },
 
   /**
@@ -85,7 +98,7 @@ const Popup = {
    * @param {String} message
    */
   log(message) {
-    Popup.driver('log', message, 'popup.js')
+    Popup.driver('log', message)
   },
 
   /**
@@ -113,13 +126,16 @@ const Popup = {
    * Callback for getDetection listener
    * @param {Array} detections
    */
-  async onGetDetections(detections) {
-    const pinnedCategory = await getOption('pinnedCategory')
-
-    if (detections.length) {
-      document.querySelector('.empty').remove()
+  async onGetDetections(detections = []) {
+    if (!detections || !detections.length) {
+      return
     }
 
+    document.querySelector('.empty').classList.add('empty--hidden')
+    document.querySelector('.detections').classList.remove('empty--hidden')
+
+    const pinnedCategory = await getOption('pinnedCategory')
+
     const categorised = Popup.categorise(detections)
 
     categorised.forEach(({ id, name, slug: categorySlug, technologies }) => {
@@ -216,15 +232,6 @@ const Popup = {
   }
 }
 
-// Add listener for popup PostMessage API
-Popup.port.onMessage.addListener(({ func, args }) => {
-  const onFunc = `on${func.charAt(0).toUpperCase() + func.slice(1)}`
-
-  if (Popup[onFunc]) {
-    Popup[onFunc](args)
-  }
-})
-
 if (/complete|interactive|loaded/.test(document.readyState)) {
   Popup.init()
 } else {
diff --git a/src/drivers/webextension/js/utils.js b/src/drivers/webextension/js/utils.js
index 773672098..f48e74403 100644
--- a/src/drivers/webextension/js/utils.js
+++ b/src/drivers/webextension/js/utils.js
@@ -75,5 +75,22 @@ const Utils = {
     Array.from(document.querySelectorAll('[data-i18n]')).forEach(
       (node) => (node.innerHTML = chrome.i18n.getMessage(node.dataset.i18n))
     )
+  },
+
+  sendMessage(source, func, args) {
+    return new Promise((resolve, reject) => {
+      chrome.runtime.sendMessage(
+        {
+          source,
+          func,
+          args: args ? (Array.isArray(args) ? args : [args]) : []
+        },
+        (response) => {
+          chrome.runtime.lastError
+            ? reject(new Error(chrome.runtime.lastError.message))
+            : resolve(response)
+        }
+      )
+    })
   }
 }
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index d78581eb6..03c19ec2c 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -4,7 +4,7 @@
   "author": "Wappalyzer",
   "homepage_url": "https://www.wappalyzer.com",
   "description": "Identify web technologies",
-  "version": "6.0.15",
+  "version": "6.0.16",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
@@ -14,7 +14,7 @@
     "38": "images/icon_38.png",
     "128": "images/icon_128.png"
   },
-  "page_action": {
+  "browser_action": {
     "default_icon": {
       "16": "images/icon_16.png",
       "19": "images/icon_19.png",
diff --git a/src/package.json b/src/package.json
index 3e6f7d76a..365faa8de 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com",
-  "version": "6.0.15",
+  "version": "6.1.1",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
@@ -27,4 +27,4 @@
   "files": [
     "wappalyzer.js"
   ]
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index f011f2b21..a83b36b5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1242,6 +1242,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+languagedetect@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/languagedetect/-/languagedetect-2.0.0.tgz#4b8fa2b7593b2a3a02fb1100891041c53238936c"
+  integrity sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"