diff --git a/src/apps.json b/src/apps.json
index 079c10a31..e613e3a7f 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -158,11 +158,10 @@
       "cats": [
         68
       ],
+      "icon": "Accessibe.png",
       "script": "acsbap\\.com/.*/acsb\\.js",
-      "website": "https://accessibe.com/",
-      "icon": "Accessibe.png"
+      "website": "https://accessibe.com/"
     },
-    
     "Acquia Cloud": {
       "cats": [
         62
@@ -242,9 +241,9 @@
       "cats": [
         68
       ],
+      "icon": "Adally.png",
       "script": "cloudfront\\.net/.*/adally\\.js",
-      "website": "https://adally.com/",
-      "icon": "Adally.png"
+      "website": "https://adally.com/"
     },
     "Adcash": {
       "cats": [
@@ -552,11 +551,11 @@
       "cookies": {
         "ak_bmsc": "",
         "bm_sv": "",
-        "bm_sz": ""          
+        "bm_sz": ""
       },
       "icon": "akamai.svg",
       "website": "http://akamai.com/bot-manager"
-    },      
+    },
     "Akaunting": {
       "cats": [
         55
@@ -714,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
@@ -1212,9 +1223,9 @@
         68
       ],
       "html": "<iframe[^>]*audioeye\\.com/frame/cookieStorage",
+      "icon": "AudioEye.png",
       "script": "audioeye\\.com/ae\\.js",
-      "website": "https://www.audioeye.com/",
-      "icon": "AudioEye.png"
+      "website": "https://www.audioeye.com/"
     },
     "Aurelia": {
       "cats": [
@@ -1875,7 +1886,7 @@
       "icon": "civic.png",
       "script": "cc\\.cdn\\.civiccomputing\\.com",
       "website": "https://www.civicuk.com/cookie-control"
-    },      
+    },
     "CKEditor": {
       "cats": [
         24
@@ -2046,16 +2057,16 @@
         6
       ],
       "html": [
-          "<a[^>]*href=[^>]*/Cart",
-          "<a[^>]*href=[^>]*/Basket",
-          "<a[^>]*href=[^>]*/Trolley",
-          "<a[^>]*href=[^>]*/Bag",
-          "<a[^>]*href=[^>]*/ShoppingBag",        
-          "<a[^>]*href=[^>]*/Checkout"
+        "<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,
@@ -2588,31 +2599,23 @@
       "script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
       "website": "http://www.trackset.it/conversionlab"
     },
-    "Cookiebot": {
+    "Cookie Script": {
       "cats": [
         67
       ],
-      "icon": "Cookiebot.svg",
-      "script": "consent\\.cookiebot\\.com",
-      "website": "http://www.cookiebot.com"
-    },      
+      "icon": "CookieScript.png",
+      "script": "//cookie-script\\.com/s/",
+      "website": "https://cookie-script.com/"
+    },
     "CookieHub": {
       "cats": [
         67
       ],
+      "icon": "CookieHub.png",
       "script": [
-          "cookiehub\\.net/.*\\.js"
+        "cookiehub\\.net/.*\\.js"
       ],
-      "icon": "CookieHub.png",
       "website": "https://www.cookiehub.com"
-    },      
-    "Cookie Script": {
-      "cats": [
-        67
-      ],
-      "icon": "CookieScript.png",
-      "script": "//cookie-script\\.com/s/",
-      "website": "https://cookie-script.com/"
     },
     "CookieYes": {
       "cats": [
@@ -2621,7 +2624,15 @@
       "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
@@ -3001,8 +3012,8 @@
       ],
       "cookies": {
         "datadome": "",
-        "datadome-_zldt": "",
-        "datadome-_zldp": ""          
+        "datadome-_zldp": "",
+        "datadome-_zldt": ""
       },
       "headers": {
         "Server": "^DataDome$",
@@ -3063,7 +3074,7 @@
       "icon": "didomi.png",
       "script": "sdk\\.privacy-center\\.org/.*/loader\\.js",
       "website": "https://www.didomi.io/en/consent-preference-management"
-    },       
+    },
     "DirectAdmin": {
       "cats": [
         9
@@ -3669,9 +3680,9 @@
       "cats": [
         68
       ],
+      "icon": "EqualWeb.png",
       "script": "cdn\\.equalweb\\.com.*\\.js",
-      "website": "https://www.equalweb.com/",
-      "icon": "EqualWeb.png"
+      "website": "https://www.equalweb.com/"
     },
     "Erlang": {
       "cats": [
@@ -3712,14 +3723,6 @@
       ],
       "website": "https://etherpad.org"
     },
-    "eucookie.eu": {
-      "cats": [
-        67
-      ],
-      "icon": "eucookie.png",
-      "script": "eucookie\\.eu/public/gdpr-cookie-consent\\.js",
-      "website": "https://www.eucookie.eu/"
-    },      
     "Exhibit": {
       "cats": [
         25
@@ -3833,9 +3836,9 @@
       "cats": [
         68
       ],
+      "icon": "Facil-iti.png",
       "script": "ws\\.facil-iti\\.com/tag/faciliti-tag\\.min\\.js",
-      "website": "https://www.facil-iti.com/",
-      "icon": "Facil-iti.png"
+      "website": "https://www.facil-iti.com/"
     },
     "Fact Finder": {
       "cats": [
@@ -4041,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
@@ -4560,12 +4574,12 @@
       "cats": [
         6
       ],
+      "icon": "Globale.png",
       "script": [
-          "web\\.global-e\\.com"
+        "web\\.global-e\\.com"
       ],
-      "icon": "Globale.png",
       "website": "https://www.global-e.com/"
-    },       
+    },
     "Glyphicons": {
       "cats": [
         17
@@ -5133,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": {
@@ -5202,9 +5217,9 @@
       "cats": [
         68
       ],
+      "icon": "HikeOrders.png",
       "script": "hikeorders\\.com/main/assets/js/hko-accessibility\\.min\\.js",
-      "website": "https://hikeorders.com/",
-      "icon": "HikeOrders.png"
+      "website": "https://hikeorders.com/"
     },
     "Hinza Advanced CMS": {
       "cats": [
@@ -5425,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
@@ -5662,12 +5687,12 @@
       "cats": [
         67
       ],
+      "icon": "iubenda.png",
       "script": [
-          "iubenda\\.com/cookie-solution/confs/js/"
+        "iubenda\\.com/cookie-solution/confs/js/"
       ],
-      "icon": "iubenda.png",
       "website": "https://www.iubenda.com/"
-    },     
+    },
     "J2Store": {
       "cats": [
         6
@@ -6844,9 +6869,9 @@
       "cats": [
         68
       ],
+      "icon": "Make-Sense.png",
       "script": "mk-sense\\.com/aweb\\?license",
-      "website": "https://mk-sense.com/",
-      "icon": "Make-Sense.png"
+      "website": "https://mk-sense.com/"
     },
     "MakeShopKorea": {
       "cats": [
@@ -6976,7 +7001,7 @@
       "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1",
       "website": "https://www.mathjax.org"
     },
-    "Matomo": {
+    "Matomo Analytics": {
       "cats": [
         10
       ],
@@ -6998,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
@@ -7205,12 +7240,12 @@
       "cats": [
         67
       ],
+      "icon": "metomic.png",
       "script": [
-          "metomic\\.js"
+        "metomic\\.js"
       ],
-      "icon": "metomic.png",
       "website": "https://metomic.io"
-    },      
+    },
     "Microsoft ASP.NET": {
       "cats": [
         18
@@ -7423,15 +7458,15 @@
       ],
       "headers": {
         "X-Powered-By": "Mobify"
-      },        
+      },
       "icon": "Mobify.png",
       "js": {
         "Mobify": ""
       },
       "script": [
-          "//cdn\\.mobify\\.com/",
-          "//a\\.mobify\\.com/"
-       ],
+        "//cdn\\.mobify\\.com/",
+        "//a\\.mobify\\.com/"
+      ],
       "website": "https://www.mobify.com"
     },
     "Mobirise": {
@@ -8162,7 +8197,7 @@
       },
       "icon": "OneTrust.png",
       "script": [
-        "cdn\\.cookielaw\\.org", 
+        "cdn\\.cookielaw\\.org",
         "optanon\\.blob\\.core\\.windows\\.net",
         "otSDKStub\\.js",
         "cdn\\.cookielaw\\.org",
@@ -8509,7 +8544,7 @@
       "icon": "osano.png",
       "script": "cookieconsent\\.min\\.js",
       "website": "https://www.osano.com/"
-    },        
+    },
     "Outbrain": {
       "cats": [
         5
@@ -8788,13 +8823,13 @@
       ],
       "cookies": {
         "_px3": "",
-        "_pxvid": "",
         "_pxff_cc": "",
-        "_pxhd": ""          
+        "_pxhd": "",
+        "_pxvid": ""
       },
       "icon": "perimeterx.svg",
       "website": "https://www.perimeterx.com/"
-    },      
+    },
     "Perl": {
       "cats": [
         27
@@ -9326,7 +9361,7 @@
       },
       "script": "quantcast\\.mgr\\.consensu\\.org",
       "website": "https://www.quantcast.com/gdpr/consent-management-solution/"
-    },      
+    },
     "Quantcast Measure": {
       "cats": [
         10
@@ -9543,14 +9578,6 @@
       },
       "website": "http://www.rayo.ir"
     },
-    "Recite Me": {
-      "cats": [
-        68
-      ],
-      "html": "api\\.reciteme\\.com/asset/js",
-      "website": "https://reciteme.com/",
-      "icon": "Recite Me.png"
-    },
     "ReDoc": {
       "cats": [
         4
@@ -9594,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
@@ -10094,6 +10129,16 @@
       "icon": "salecycle.svg",
       "website": "https://www.salecycle.com/"
     },
+    "Salesfloor": {
+      "cats": [
+        6
+      ],
+      "icon": "salesfloor.png",
+      "script": [
+        "salesFloor\\.js"
+      ],
+      "website": "https://salesfloor.net/"
+    },
     "Salesforce": {
       "cats": [
         53
@@ -10240,12 +10285,12 @@
       "cats": [
         67
       ],
+      "icon": "seersco.png",
       "script": [
-          "seersco.com/script/cb\\.js"
+        "seersco.com/script/cb\\.js"
       ],
-      "icon": "seersco.png",
       "website": "http://www.seersco.com"
-    },      
+    },
     "Segment": {
       "cats": [
         10
@@ -10560,7 +10605,8 @@
     },
     "Signal": {
       "cats": [
-        32
+        32,
+        42
       ],
       "icon": "signal.png",
       "js": {
@@ -11643,7 +11689,7 @@
       "icon": "termly.svg",
       "script": "app\\.termly\\.io/embed\\.min\\.js",
       "website": "https://termly.io/"
-    },      
+    },
     "Tessitura": {
       "cats": [
         53
@@ -11671,9 +11717,9 @@
       "cats": [
         68
       ],
+      "icon": "Texthelp.png",
       "script": "browsealoud\\.com/.*/browsealoud\\.js",
-      "website": "https://www.texthelp.com/en-gb/products/browsealoud/",
-      "icon": "Texthelp.png"
+      "website": "https://www.texthelp.com/en-gb/products/browsealoud/"
     },
     "Textpattern CMS": {
       "cats": [
@@ -11698,7 +11744,7 @@
         "THEHUT-.*\\.js"
       ],
       "website": "https://www.thg.com/"
-    },      
+    },
     "Thelia": {
       "cats": [
         1,
@@ -12143,14 +12189,6 @@
       "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
       "website": "http://underscorejs.org"
     },
-    "uRemediate": {
-      "cats": [
-        68
-      ],
-      "script": "fecdn\\.user1st\\.info/Loader/head",
-      "website": "https://www.user1st.com/uremediate/",
-      "icon": "User1st.png"
-    },
     "Uniconsent": {
       "cats": [
         67
@@ -12158,15 +12196,6 @@
       "icon": "Uniconsent.png",
       "script": "cmp\\.uniconsent\\.mgr\\.consensu\\.org/dfp\\.js",
       "website": "https://www.uniconsent.com/"
-    },      
-    "UsableNet": {
-      "cats": [
-        68
-      ],
-      "script": "\\.usablenet\\.com/pt/",
-      "html": "<iframe[ˆ>]*\\.usablenet\\.com/pt/",
-      "website": "https://usablenet.com/",
-      "icon": "UsableNet.png"
     },
     "Usabilla": {
       "cats": [
@@ -12178,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
@@ -12213,9 +12251,9 @@
       "cats": [
         68
       ],
+      "icon": "UserWay.png",
       "script": "cdn\\.userway\\.org/widget.*\\.js",
-      "website": "https://userway.org/",
-      "icon": "UserWay.png"
+      "website": "https://userway.org/"
     },
     "Ushahidi": {
       "cats": [
@@ -12656,8 +12694,7 @@
       ],
       "icon": "webAR.svg",
       "website": "https://modelviewer.dev/"
-    },      
-      
+    },
     "WebGUI": {
       "cats": [
         1
@@ -13703,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
@@ -13867,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
@@ -13947,7 +14004,6 @@
         "Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "gunicorn.png",
-      "implies": "Python",
       "website": "http://gunicorn.org"
     },
     "hCaptcha": {
@@ -14026,16 +14082,6 @@
       "url": "imperia/md/",
       "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms"
     },
-    "Imperva": {
-      "cats": [
-        16
-      ],
-      "script": [
-          "/_Incapsula_Resource"
-      ],
-      "icon": "Imperva.svg",
-      "website": "https://www.imperva.com/"
-    },        
     "io4 CMS": {
       "cats": [
         1
@@ -14843,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
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index bce3bf326..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`))
 )
@@ -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/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/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/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/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/manifest.json b/src/drivers/webextension/manifest.json
index 57c9ade6f..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": {
@@ -68,4 +68,4 @@
     "https://*/*"
   ],
   "content_security_policy": "script-src 'self'; object-src 'self'"
-}
+}
\ No newline at end of file
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
+}