diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index e1c84ccd8..99ecb5041 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.8.17",
+  "version": "6.8.18",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 6027252d7..1a5cac78a 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.8.17",
+  "version": "6.8.18",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
diff --git a/src/package.json b/src/package.json
index 2518e2d71..6981765e0 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.8.17",
+  "version": "6.8.18",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/technologies/a.json b/src/technologies/a.json
index 5a6f0e88e..c33927610 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -27,19 +27,6 @@
     "scripts": "statics\\.a8\\.net",
     "website": "https://www.a8.net"
   },
-  "ABOUT YOU Commerce Suite": {
-    "cats": [
-      6
-    ],
-    "description": "ABOUT YOU Commerce Suite is an enterprise ready infrastructure solution designed for ecommerce companies.",
-    "icon": "ABOUT YOU Commerce Suite.svg",
-    "dom": "link[href*='cdn.aboutyou.de/'], img[src*='cdn.aboutyou.de/']",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://commercesuite.aboutyou.com"
-  },
   "AB Tasty": {
     "cats": [
       74
@@ -58,6 +45,19 @@
     "scripts": "try\\.abtasty\\.com",
     "website": "https://www.abtasty.com"
   },
+  "ABOUT YOU Commerce Suite": {
+    "cats": [
+      6
+    ],
+    "description": "ABOUT YOU Commerce Suite is an enterprise ready infrastructure solution designed for ecommerce companies.",
+    "dom": "link[href*='cdn.aboutyou.de/'], img[src*='cdn.aboutyou.de/']",
+    "icon": "ABOUT YOU Commerce Suite.svg",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://commercesuite.aboutyou.com"
+  },
   "AD EBiS": {
     "cats": [
       36,
@@ -126,11 +126,11 @@
       "AOS.refresh": "\\;confidence:50",
       "AOS.refreshHard": "\\;confidence:50"
     },
+    "oss": true,
     "scripts": [
       "unpkg\\.com/aos@([\\d\\.]+)/dist/aos\\.js\\;version:\\1",
       "/typo3conf/ext/udem_vendor/Resources/Public/aos-([\\d\\.]+)\\;version:\\1"
     ],
-    "oss": true,
     "website": "http://michalsnik.github.io/aos/"
   },
   "AT Internet Analyzer": {
@@ -658,16 +658,16 @@
     "description": "AdScale is a cloud-based, AI-powered performance optimisation platform which utilises machine learning to automate and optimise AdWords campaigns across Google Search, Google Shopping, Google Display, and YouTube.",
     "icon": "AdScale.svg",
     "js": {
+      "_adscale": "",
       "adscaleAddToCart": "",
-      "adscaleViewProduct": "",
-      "_adscale": ""
+      "adscaleViewProduct": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring",
       "payg"
     ],
+    "saas": true,
     "scripts": "\\.adscale\\.com/",
     "website": "https://www.adscale.com"
   },
@@ -1797,33 +1797,33 @@
     "icon": "amber.png",
     "website": "https://amberframework.org"
   },
-  "American Express": {
-    "cats": [
-      41
-    ],
-    "description": "American Express, also known as Amex, facilitates electronic funds transfers throughout the world, most commonly through branded credit cards, debit cards and prepaid cards.",
-    "dom": "[aria-labelledby='pi-american_express']",
-    "icon": "Amex.svg",
-    "website": "https://www.americanexpress.com"
-  },
   "AmeriCommerce": {
     "cats": [
       6
     ],
     "description": "AmeriCommerce is an ecommerce platform built for high volume online stores and complex products with features such as multi-store management.",
-    "icon": "AmeriCommerce.png",
     "dom": "p.AmeriCommerce-powered-by-link > a[href*='.americommerce.com/'][target='_blank']",
+    "icon": "AmeriCommerce.png",
     "js": {
       "AC.storeDomain": ""
     },
-    "scripts": "\\.americommerce\\.com/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.americommerce\\.com/",
     "website": "https://www.americommerce.com"
   },
+  "American Express": {
+    "cats": [
+      41
+    ],
+    "description": "American Express, also known as Amex, facilitates electronic funds transfers throughout the world, most commonly through branded credit cards, debit cards and prepaid cards.",
+    "dom": "[aria-labelledby='pi-american_express']",
+    "icon": "Amex.svg",
+    "website": "https://www.americanexpress.com"
+  },
   "Ametys": {
     "cats": [
       1
@@ -2649,8 +2649,8 @@
       36
     ],
     "description": "Audiohook specializes in programmatic audio advertising.",
-    "icon": "Audiohook.svg",
     "dom": "img[src*='listen.audiohook.com/']",
+    "icon": "Audiohook.svg",
     "website": "https://www.audiohook.com"
   },
   "Aurelia": {
@@ -2677,11 +2677,11 @@
     "js": {
       "aurycJsLibConfig.base.code_version": "([\\d\\.]+)\\;version:\\1"
     },
-    "scripts": "cdn\\.auryc\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scripts": "cdn\\.auryc\\.com/",
     "website": "https://www.auryc.com"
   },
   "Auth0": {
diff --git a/src/technologies/c.json b/src/technologies/c.json
index fb46bf4e5..b09164cba 100644
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@@ -130,11 +130,11 @@
       "caast.open": "",
       "caastInstance": ""
     },
-    "scripts": "cdn\\.caast\\.tv/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scripts": "cdn\\.caast\\.tv/",
     "website": "https://en.caast.tv"
   },
   "CacheFly": {
@@ -1005,11 +1005,11 @@
     "js": {
       "removeCloverly": ""
     },
-    "scripts": "apps\\.cloverly\\.com/",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scripts": "apps\\.cloverly\\.com/",
     "website": "https://www.cloverly.com"
   },
   "Cluep": {
@@ -1608,19 +1608,36 @@
     "scripts": "cdn\\.conveythis\\.com",
     "website": "https://www.conveythis.com/"
   },
+  "Cookie Information": {
+    "cats": [
+      67
+    ],
+    "description": "Cookie Information is a privacy tech company that develops software that helps making company websites and mobile apps GDPR and ePrivacy compliant.",
+    "icon": "Cookie Information.svg",
+    "js": {
+      "CookieInformation.config.version": "(.+)\\;version:\\1"
+    },
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "\\.app\\.cookieinformation\\.com/",
+    "website": "https://cookieinformation.com"
+  },
   "Cookie Script": {
     "cats": [
       67
     ],
     "description": "Cookie-Script automatically scans, categorizes and adds description to all cookies found on your website.",
     "icon": "CookieScript.svg",
-    "scripts": "\\.cookie-script\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.cookie-script\\.com/",
     "website": "https://cookie-script.com"
   },
   "CookieFirst": {
@@ -1651,23 +1668,6 @@
     ],
     "website": "https://www.cookiehub.com"
   },
-  "Cookie Information": {
-    "cats": [
-      67
-    ],
-    "description": "Cookie Information is a privacy tech company that develops software that helps making company websites and mobile apps GDPR and ePrivacy compliant.",
-    "icon": "Cookie Information.svg",
-    "js": {
-      "CookieInformation.config.version": "(.+)\\;version:\\1"
-    },
-    "scripts": "\\.app\\.cookieinformation\\.com/",
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://cookieinformation.com"
-  },
   "CookieYes": {
     "cats": [
       67
diff --git a/src/technologies/d.json b/src/technologies/d.json
index 25bb35fae..c27e3751d 100644
--- a/src/technologies/d.json
+++ b/src/technologies/d.json
@@ -12,23 +12,6 @@
     "scripts": "/d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
     "website": "http://d3js.org"
   },
-  "Daily Deals": {
-    "cats": [
-      5
-    ],
-    "description": "Daily Deals is a flash sale, limited-time discounts, countdown timers, and sales analytics solution.",
-    "icon": "Daily Deals.svg",
-    "js": {
-      "ddAddToCheckout": "\\;confidence:50",
-      "ddAddToOrder": "\\;confidence:50"
-    },
-    "scripts": "assets\\.dailydeals\\.ai/",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://dailydeals.ai"
-  },
   "DERAK.CLOUD": {
     "cats": [
       31
@@ -97,6 +80,23 @@
     ],
     "website": "http://dnnsoftware.com"
   },
+  "Daily Deals": {
+    "cats": [
+      5
+    ],
+    "description": "Daily Deals is a flash sale, limited-time discounts, countdown timers, and sales analytics solution.",
+    "icon": "Daily Deals.svg",
+    "js": {
+      "ddAddToCheckout": "\\;confidence:50",
+      "ddAddToOrder": "\\;confidence:50"
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scripts": "assets\\.dailydeals\\.ai/",
+    "website": "https://dailydeals.ai"
+  },
   "Dancer": {
     "cats": [
       18
@@ -729,13 +729,13 @@
     "js": {
       "doofinder.classic.version": "(.+)\\;version:\\1"
     },
-    "scripts": "cdn\\.doofinder\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "cdn\\.doofinder\\.com/",
     "website": "https://www.doofinder.com"
   },
   "Dotclear": {
diff --git a/src/technologies/e.json b/src/technologies/e.json
index 9be9c791b..69cf2d7e6 100644
--- a/src/technologies/e.json
+++ b/src/technologies/e.json
@@ -353,12 +353,12 @@
       "EMBEDSOCIALHASHTAG": "",
       "EmbedSocialIframeLightbox": ""
     },
-    "scripts": "embedsocial\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "embedsocial\\.com/",
     "website": "https://embedsocial.com"
   },
   "EmbedThis Appweb": {
diff --git a/src/technologies/f.json b/src/technologies/f.json
index 2b2fe71ae..c834eddc2 100644
--- a/src/technologies/f.json
+++ b/src/technologies/f.json
@@ -271,23 +271,6 @@
     "icon": "fastspring.png",
     "website": "https://fastspring.com"
   },
-  "Fathom": {
-    "cats": [
-      10
-    ],
-    "description": "Fathom is easy-yet-powerful website analytics that protects digital privacy.",
-    "icon": "Fathom.svg",
-    "js": {
-      "fathom.blockTrackingForMe": ""
-    },
-    "scripts": "cdn\\.usefathom\\.com/",
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://usefathom.com"
-  },
   "Fat Zebra": {
     "cats": [
       41
@@ -312,6 +295,23 @@
     "implies": "PHP",
     "website": "http://fatfreeframework.com"
   },
+  "Fathom": {
+    "cats": [
+      10
+    ],
+    "description": "Fathom is easy-yet-powerful website analytics that protects digital privacy.",
+    "icon": "Fathom.svg",
+    "js": {
+      "fathom.blockTrackingForMe": ""
+    },
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "cdn\\.usefathom\\.com/",
+    "website": "https://usefathom.com"
+  },
   "Fbits": {
     "cats": [
       6
@@ -1142,4 +1142,4 @@
     "scripts": "future-shop.*\\.js",
     "website": "https://www.future-shop.jp"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/g.json b/src/technologies/g.json
index ddbe69ca3..95ce938e9 100644
--- a/src/technologies/g.json
+++ b/src/technologies/g.json
@@ -321,6 +321,24 @@
     },
     "website": "https://www.getfeedback.com"
   },
+  "GetMeAShop": {
+    "cats": [
+      6
+    ],
+    "description": "GetMeAShop is a cloud-based ecommerce solution for small and midsize businesses across industries such as retail and manufacturing.",
+    "dom": "link[href*='.getmeashop.com']",
+    "icon": "GetMeAShop.png",
+    "js": {
+      "gmas_base_url": "'\\.getmeashop\\.com",
+      "search_api_base_uri": "search\\.getmeashop\\.com"
+    },
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "website": "https://www.getmeashop.com"
+  },
   "GetSimple CMS": {
     "cats": [
       1
@@ -390,24 +408,6 @@
     "website": "https://getintent.com",
     "xhr": "\\.adhigh\\.net"
   },
-  "GetMeAShop": {
-    "cats": [
-      6
-    ],
-    "description": "GetMeAShop is a cloud-based ecommerce solution for small and midsize businesses across industries such as retail and manufacturing.",
-    "icon": "GetMeAShop.png",
-    "dom": "link[href*='.getmeashop.com']",
-    "js": {
-      "gmas_base_url": "'\\.getmeashop\\.com",
-      "search_api_base_uri": "search\\.getmeashop\\.com"
-    },
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://www.getmeashop.com"
-  },
   "Getsitecontrol": {
     "cats": [
       5,
@@ -1290,10 +1290,10 @@
     ],
     "description": "GrocerKey is an ecommerce platform that helps grocery stores build an online store.",
     "icon": "GrocerKey.png",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
     "scripts": [
       "\\.grocerywebsite\\.com/",
       "grocerkey-widget\\.s3\\.amazonaws\\.com/"
diff --git a/src/technologies/h.json b/src/technologies/h.json
index 0138ef9a0..be3d54580 100644
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@@ -221,13 +221,13 @@
       "HelloBar": "",
       "hellobarSiteSettings": ""
     },
-    "scripts": "\\.?hellobar\\.(?:com|js)",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.?hellobar\\.(?:com|js)",
     "website": "http://hellobar.com"
   },
   "Hello Elementor": {
diff --git a/src/technologies/i.json b/src/technologies/i.json
index 571ed9b59..69e9e41b6 100644
--- a/src/technologies/i.json
+++ b/src/technologies/i.json
@@ -525,21 +525,6 @@
     "icon": "Intercom.svg",
     "website": "https://www.intercom.com/articles"
   },
-  "Intershop": {
-    "cats": [
-      6
-    ],
-    "html": "<ish-root",
-    "description": "Intershop is an ecommerce platform, tailored to the needs of complex business processes and major organisations.",
-    "icon": "Intershop.png",
-    "scripts": "(?:is-bin|INTERSHOP)",
-    "saas": true,
-    "pricing": [
-      "onetime",
-      "high"
-    ],
-    "website": "http://intershop.com"
-  },
   "Intersection Observer": {
     "cats": [
       92,
@@ -552,6 +537,21 @@
     ],
     "website": "https://www.w3.org/TR/intersection-observer"
   },
+  "Intershop": {
+    "cats": [
+      6
+    ],
+    "description": "Intershop is an ecommerce platform, tailored to the needs of complex business processes and major organisations.",
+    "html": "<ish-root",
+    "icon": "Intershop.png",
+    "pricing": [
+      "onetime",
+      "high"
+    ],
+    "saas": true,
+    "scripts": "(?:is-bin|INTERSHOP)",
+    "website": "http://intershop.com"
+  },
   "Invenio": {
     "cats": [
       50
diff --git a/src/technologies/k.json b/src/technologies/k.json
index 871d1a4ff..d65dcce93 100644
--- a/src/technologies/k.json
+++ b/src/technologies/k.json
@@ -168,22 +168,6 @@
     "scripts": "app\\.kartra\\.com",
     "website": "https://home.kartra.com"
   },
-  "k-eCommerce": {
-    "cats": [
-      6
-    ],
-    "description": "k-eCommerce is mdf commerce’s platform for SMBs, providing all-in-one ecommerce and digital payment solutions integrated to Microsoft Dynamics and SAP Business One. ",
-    "icon": "k-eCommerce.png",
-    "meta": {
-      "generator": "k-eCommerce"
-    },
-    "dom": "a[href*='.k-ecommerce.com/'][target='_blank']",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.k-ecommerce.com"
-  },
   "Keap": {
     "cats": [
       53
@@ -722,5 +706,21 @@
       "cdn\\.kustomerapp\\.com"
     ],
     "website": "https://www.kustomer.com/"
+  },
+  "k-eCommerce": {
+    "cats": [
+      6
+    ],
+    "description": "k-eCommerce is mdf commerce’s platform for SMBs, providing all-in-one ecommerce and digital payment solutions integrated to Microsoft Dynamics and SAP Business One. ",
+    "dom": "a[href*='.k-ecommerce.com/'][target='_blank']",
+    "icon": "k-eCommerce.png",
+    "meta": {
+      "generator": "k-eCommerce"
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.k-ecommerce.com"
   }
 }
\ No newline at end of file
diff --git a/src/technologies/l.json b/src/technologies/l.json
index 95c3cf274..1e39d2c14 100644
--- a/src/technologies/l.json
+++ b/src/technologies/l.json
@@ -126,23 +126,23 @@
     "cats": [
       92
     ],
-    "description": "Layer0 is an all-in-one Jamstack platform to develop, deploy, preview, split test, and monitor the company's frontend.",
-    "icon": "Layer0.svg",
     "cookies": {
-      "layer0_eid": "",
+      "layer0_bucket": "",
       "layer0_destination": "",
-      "layer0_bucket": ""
+      "layer0_eid": ""
     },
+    "description": "Layer0 is an all-in-one Jamstack platform to develop, deploy, preview, split test, and monitor the company's frontend.",
+    "icon": "Layer0.svg",
     "js": {
       "Layer0.Metrics": ""
     },
-    "scripts": "/__layer0__/cache-manifest\\.js",
-    "saas": true,
     "pricing": [
       "freemium",
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "/__layer0__/cache-manifest\\.js",
     "website": "https://www.layer0.co"
   },
   "Leadinfo": {
@@ -322,6 +322,19 @@
     "url": "seoshop.webshopapp.com",
     "website": "http://www.lightspeedhq.com/products/ecommerce/"
   },
+  "LimeChat": {
+    "cats": [
+      52
+    ],
+    "description": "LimeChat is India's first level-3 AI chatbot company.",
+    "icon": "LimeChat.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scripts": "\\.limechat\\.ai/",
+    "website": "https://www.limechat.ai"
+  },
   "LinkSmart": {
     "cats": [
       36
@@ -335,19 +348,6 @@
     "scripts": "^https?://cdn\\.linksmart\\.com/linksmart_([\\d.]+?)(?:\\.min)?\\.js\\;version:\\1",
     "website": "http://linksmart.com"
   },
-  "LimeChat": {
-    "cats": [
-      52
-    ],
-    "description": "LimeChat is India's first level-3 AI chatbot company.",
-    "icon": "LimeChat.png",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "scripts": "\\.limechat\\.ai/",
-    "website": "https://www.limechat.ai"
-  },
   "Linkedin Insight Tag": {
     "cats": [
       10
diff --git a/src/technologies/m.json b/src/technologies/m.json
index 4f6b24532..6d7cbb7f4 100644
--- a/src/technologies/m.json
+++ b/src/technologies/m.json
@@ -1,4 +1,20 @@
 {
+  "MGID": {
+    "cats": [
+      36
+    ],
+    "description": "MGID is a programmatic advertising platform frequently used by misinformation websites.",
+    "icon": "MGID.png",
+    "js": {
+      "MgSensor.mgqWorker": ""
+    },
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scripts": "\\.mgid\\.com/",
+    "website": "https://www.mgid.com"
+  },
   "MODX": {
     "cats": [
       1
@@ -49,24 +65,6 @@
     "scripts": "service(?:2)?\\.mtcaptcha\\.com/",
     "website": "https://www.mtcaptcha.com"
   },
-  "Mulberry": {
-    "cats": [
-      5
-    ],
-    "description": "Mulberry is a developer of personalised product protection solutions used to help brands unlock additional revenue.",
-    "icon": "Mulberry.svg",
-    "implies": "Cart Functionality",
-    "js": {
-      "mulberryShop": "",
-      "mulberry.cta": ""
-    },
-    "scripts": "\\.getmulberry\\.com/",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.getmulberry.com"
-  },
   "MadAdsMedia": {
     "cats": [
       36
@@ -807,6 +805,16 @@
     },
     "website": "https://www.eidosmedia.com/"
   },
+  "Metomic": {
+    "cats": [
+      67
+    ],
+    "icon": "metomic.png",
+    "scripts": [
+      "metomic\\.js"
+    ],
+    "website": "https://metomic.io"
+  },
   "Metrilo": {
     "cats": [
       10,
@@ -819,39 +827,13 @@
       "metriloBotRegexp": "",
       "metriloCookie": ""
     },
-    "scripts": "\\.metrilo\\.com/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
-    "website": "https://www.metrilo.com"
-  },
-  "Metomic": {
-    "cats": [
-      67
-    ],
-    "icon": "metomic.png",
-    "scripts": [
-      "metomic\\.js"
-    ],
-    "website": "https://metomic.io"
-  },
-  "MGID": {
-    "cats": [
-      36
-    ],
-    "description": "MGID is a programmatic advertising platform frequently used by misinformation websites.",
-    "icon": "MGID.png",
-    "js": {
-      "MgSensor.mgqWorker": ""
-    },
-    "scripts": "\\.mgid\\.com/",
     "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://www.mgid.com"
+    "scripts": "\\.metrilo\\.com/",
+    "website": "https://www.metrilo.com"
   },
   "Microsoft 365": {
     "cats": [
@@ -1547,6 +1529,24 @@
     "url": "/mozard/!suite",
     "website": "http://mozard.nl"
   },
+  "Mulberry": {
+    "cats": [
+      5
+    ],
+    "description": "Mulberry is a developer of personalised product protection solutions used to help brands unlock additional revenue.",
+    "icon": "Mulberry.svg",
+    "implies": "Cart Functionality",
+    "js": {
+      "mulberry.cta": "",
+      "mulberryShop": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scripts": "\\.getmulberry\\.com/",
+    "website": "https://www.getmulberry.com"
+  },
   "Mura CMS": {
     "cats": [
       1,
diff --git a/src/technologies/o.json b/src/technologies/o.json
index e6f463282..9346d32ab 100644
--- a/src/technologies/o.json
+++ b/src/technologies/o.json
@@ -325,6 +325,21 @@
     "scripts": "omnisrc\\.com",
     "website": "https://www.omnisend.com"
   },
+  "OnUniverse": {
+    "cats": [
+      51
+    ],
+    "description": "OnUniverse is the first website builder and commerce platform built for mobile devices.",
+    "dom": "link[href*='onuniverse-assets.imgix.net'], img[src*='onuniverse-assets.imgix.net']",
+    "icon": "OnUniverse.png",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "website": "https://onuniverse.com"
+  },
   "OneAPM": {
     "cats": [
       10
@@ -414,21 +429,6 @@
     "scripts": "/opencart_custom\\.js",
     "website": "https://onshop.asia"
   },
-  "OnUniverse": {
-    "cats": [
-      51
-    ],
-    "description": "OnUniverse is the first website builder and commerce platform built for mobile devices.",
-    "icon": "OnUniverse.png",
-    "dom": "link[href*='onuniverse-assets.imgix.net'], img[src*='onuniverse-assets.imgix.net']",
-    "saas": true,
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "website": "https://onuniverse.com"
-  },
   "Open AdStream": {
     "cats": [
       36
diff --git a/src/technologies/p.json b/src/technologies/p.json
index ba54ad379..7b4cd5d27 100644
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@@ -127,40 +127,58 @@
     "scripts": "pay\\.pacenow\\.co",
     "website": "https://pacenow.co/"
   },
-  "Pagar.me": {
+  "Paddle": {
     "cats": [
       41
     ],
-    "description": "Pagar.me is a Portuguese-language online payments solution for businesses in Brazil.",
-    "icon": "Pagar.me.svg",
+    "description": "Paddle is a billing and payment gateway for B2B SaaS companies.",
+    "icon": "Paddle.svg",
     "js": {
-      "PagarMeCheckout": "",
-      "pagarme.balance": ""
+      "Paddle.Checkout": "",
+      "PaddleScriptLocation": ""
     },
+    "pricing": [
+      "recurring",
+      "poa"
+    ],
     "saas": true,
+    "scripts": "cdn\\.paddle\\.com/paddle/paddle\\.js",
+    "website": "https://paddle.com/"
+  },
+  "PagSeguro": {
+    "cats": [
+      41
+    ],
+    "description": "PagSeguro is an online or mobile payment-based ecommerce service for commercial operations.",
+    "dom": "form[action*='pagseguro.uol.com.br'][target='pagseguro']",
+    "icon": "PagSeguro.svg",
+    "js": {
+      "PagSeguroDirectPayment": "",
+      "_PagSeguroDirectPayment": ""
+    },
     "pricing": [
       "payg"
     ],
-    "scripts": "assets\\.pagar\\.me/",
-    "website": "https://pagar.me"
+    "saas": true,
+    "scripts": "\\.pagseguro\\.uol\\.com\\.br/",
+    "website": "https://pagseguro.uol.com.br"
   },
-  "Paddle": {
+  "Pagar.me": {
     "cats": [
       41
     ],
-    "description": "Paddle is a billing and payment gateway for B2B SaaS companies.",
-    "icon": "Paddle.svg",
+    "description": "Pagar.me is a Portuguese-language online payments solution for businesses in Brazil.",
+    "icon": "Pagar.me.svg",
     "js": {
-      "Paddle.Checkout": "",
-      "PaddleScriptLocation": ""
+      "PagarMeCheckout": "",
+      "pagarme.balance": ""
     },
     "pricing": [
-      "recurring",
-      "poa"
+      "payg"
     ],
     "saas": true,
-    "scripts": "cdn\\.paddle\\.com/paddle/paddle\\.js",
-    "website": "https://paddle.com/"
+    "scripts": "assets\\.pagar\\.me/",
+    "website": "https://pagar.me"
   },
   "PageFly": {
     "cats": [
@@ -210,24 +228,6 @@
     },
     "website": "https://www.pagevamp.com"
   },
-  "PagSeguro": {
-    "cats": [
-      41
-    ],
-    "description": "PagSeguro is an online or mobile payment-based ecommerce service for commercial operations.",
-    "icon": "PagSeguro.svg",
-    "dom": "form[action*='pagseguro.uol.com.br'][target='pagseguro']",
-    "js": {
-      "PagSeguroDirectPayment": "",
-      "_PagSeguroDirectPayment": ""
-    },
-    "scripts": "\\.pagseguro\\.uol\\.com\\.br/",
-    "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://pagseguro.uol.com.br"
-  },
   "Pantheon": {
     "cats": [
       62
diff --git a/src/technologies/r.json b/src/technologies/r.json
index 8cf37a2cf..45aa51adc 100644
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@@ -422,11 +422,11 @@
     ],
     "description": "Recapture is an abandoned cart recovery and email marketing solution.",
     "icon": "Recapture.png",
-    "scripts": "cdn\\.recapture\\.io/.+\\?v=\\d+(?:&ver=([\\d\\.]+)?)?\\;version:\\1",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scripts": "cdn\\.recapture\\.io/.+\\?v=\\d+(?:&ver=([\\d\\.]+)?)?\\;version:\\1",
     "website": "https://recapture.io"
   },
   "Recart": {
@@ -845,22 +845,6 @@
     "scripts": "cdn\\.retailrocket\\.net",
     "website": "https://retailrocket.net"
   },
-  "ReviewSolicitors": {
-    "cats": [
-      90
-    ],
-    "description": "ReviewSolicitors is a free and independent client-led review platform focusing on the UK legal market.",
-    "icon": "ReviewSolicitors.svg",
-    "js": {
-      "rs.getWidgetHtml": ""
-    },
-    "pricing": [
-      "freemium"
-    ],
-    "saas": true,
-    "scripts": "\\.reviewsolicitors\\.co\\.uk/",
-    "website": "https://www.reviewsolicitors.co.uk"
-  },
   "RevLifter": {
     "cats": [
       76
@@ -914,6 +898,22 @@
     "scripts": "admin\\.revenuehunt\\.com/",
     "website": "https://revenuehut.com"
   },
+  "ReviewSolicitors": {
+    "cats": [
+      90
+    ],
+    "description": "ReviewSolicitors is a free and independent client-led review platform focusing on the UK legal market.",
+    "icon": "ReviewSolicitors.svg",
+    "js": {
+      "rs.getWidgetHtml": ""
+    },
+    "pricing": [
+      "freemium"
+    ],
+    "saas": true,
+    "scripts": "\\.reviewsolicitors\\.co\\.uk/",
+    "website": "https://www.reviewsolicitors.co.uk"
+  },
   "RevolverMaps": {
     "cats": [
       35
diff --git a/src/technologies/s.json b/src/technologies/s.json
index 572c55edf..a188f17ce 100644
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@@ -344,6 +344,20 @@
     "scripts": "cdn\\.salesfire\\.co\\.uk/",
     "website": "https://www.salesfire.co.uk"
   },
+  "SalesReps.io": {
+    "cats": [
+      10
+    ],
+    "description": "SalesReps.io is a sales representative performance and commission reporting software provider.",
+    "icon": "SalesReps.io.png",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "api\\.salesreps\\.io/",
+    "website": "https://salesreps.io"
+  },
   "Salesfloor": {
     "cats": [
       5,
@@ -469,20 +483,6 @@
     "scripts": "service\\.force\\.com",
     "website": "https://www.salesforce.com/au/products/service-cloud/"
   },
-  "SalesReps.io": {
-    "cats": [
-      10
-    ],
-    "description": "SalesReps.io is a sales representative performance and commission reporting software provider.",
-    "icon": "SalesReps.io.png",
-    "scripts": "api\\.salesreps\\.io/",
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "saas": true,
-    "website": "https://salesreps.io"
-  },
   "Salsify": {
     "cats": [
       95
@@ -1048,16 +1048,16 @@
       73
     ],
     "description": "Service Management Group offers customer experience measurement, employee engagement, social monitoring, publishing, and brand research services.",
-    "icon": "Service Management Group.png",
     "dom": "link[href*='api.smg.com']",
+    "icon": "Service Management Group.png",
     "js": {
       "smgETrackParams": ""
     },
-    "scripts": "\\.smg\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scripts": "\\.smg\\.com/",
     "website": "https://www.smg.com"
   },
   "Service Provider Pro": {
@@ -1421,27 +1421,27 @@
     "url": "^https?//.+\\.myshopify\\.com",
     "website": "http://shopify.com"
   },
-  "Shopify Consent Management": {
+  "Shopify Chat": {
     "cats": [
-      67
+      52
     ],
-    "description": "Shopify Consent Management let's you create a tracking consent banner for EU customers.",
+    "description": "Shopify Chat is Shopify's native live chat function that allows you to have real-time conversations with customers visiting your Shopify store.",
     "icon": "Shopify.svg",
     "scripts": [
-      "cookie_consent_shopify\\.js"
+      "cdn\\.shopify\\.com/shopifycloud/shopify_chat/"
     ],
-    "website": "https://apps.shopify.com/customer-privacy-banner"
+    "website": "https://www.shopify.com/inbox"
   },
-  "Shopify Chat": {
+  "Shopify Consent Management": {
     "cats": [
-      52
+      67
     ],
-    "description": "Shopify Chat is Shopify's native live chat function that allows you to have real-time conversations with customers visiting your Shopify store.",
+    "description": "Shopify Consent Management let's you create a tracking consent banner for EU customers.",
     "icon": "Shopify.svg",
     "scripts": [
-      "cdn\\.shopify\\.com/shopifycloud/shopify_chat/"
+      "cookie_consent_shopify\\.js"
     ],
-    "website": "https://www.shopify.com/inbox"
+    "website": "https://apps.shopify.com/customer-privacy-banner"
   },
   "Shopify Product Reviews": {
     "cats": [
@@ -1525,13 +1525,13 @@
       6
     ],
     "description": "Shoppiko is an ecommerce platform solution in India, which provides ecommerce website or ecommerce mobile application.",
-    "icon": "Shoppiko.png",
     "dom": "a[href*='shoppiko.com'][target='_blank']",
-    "saas": true,
+    "icon": "Shoppiko.png",
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://shoppiko.com"
   },
   "Shoppy": {
@@ -2845,16 +2845,16 @@
     ],
     "description": "Sprig is a UX analysis and management tool to understand what motivates customers to sign up, engage, and remain loyal to products.",
     "icon": "Sprig.png",
-    "saas": true,
     "js": {
       "UserLeap": ""
     },
-    "scripts": "cdn\\.userleap\\.com/",
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "cdn\\.userleap\\.com/",
     "website": "https://sprig.com"
   },
   "Spring": {
@@ -3200,53 +3200,53 @@
     "oss": true,
     "website": "https://stitches.dev"
   },
+  "Store Systems": {
+    "cats": [
+      6
+    ],
+    "html": "Shopsystem von <a href=[^>]+store-systems\\.de\"",
+    "icon": "Store Systems.png",
+    "website": "http://store-systems.de"
+  },
   "StoreHippo": {
     "cats": [
       6
     ],
     "description": "StoreHippo is a SaaS based ecommerce platform.",
-    "icon": "StoreHippo.png",
     "dom": "link[href*='.storehippo.com'], img[src*='.storehippo.com']",
-    "saas": true,
+    "icon": "StoreHippo.png",
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
     "website": "https://www.storehippo.com"
   },
-  "Store Systems": {
+  "Storeden": {
     "cats": [
       6
     ],
-    "html": "Shopsystem von <a href=[^>]+store-systems\\.de\"",
-    "icon": "Store Systems.png",
-    "website": "http://store-systems.de"
+    "headers": {
+      "X-Powered-By": "Storeden"
+    },
+    "icon": "storeden.svg",
+    "website": "https://www.storeden.com"
   },
   "StorifyMe": {
     "cats": [
       5
     ],
     "description": "StorifyMe is a storytelling platform for creating and distributing web stories on social networks and the open web.",
-    "icon": "StorifyMe.png",
     "dom": "link[href*='cdn.storifyme.com/']",
-    "scripts": "cdn\\.storifyme\\.com/",
-    "saas": true,
+    "icon": "StorifyMe.png",
     "pricing": [
       "freemium",
       "poa"
     ],
+    "saas": true,
+    "scripts": "cdn\\.storifyme\\.com/",
     "website": "https://www.storifyme.com"
   },
-  "Storeden": {
-    "cats": [
-      6
-    ],
-    "headers": {
-      "X-Powered-By": "Storeden"
-    },
-    "icon": "storeden.svg",
-    "website": "https://www.storeden.com"
-  },
   "Storyblok": {
     "cats": [
       1
diff --git a/src/technologies/t.json b/src/technologies/t.json
index e4999a5c8..b866aa6d1 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -511,15 +511,15 @@
     "description": "TestFreaks is an impartial source that provides product and seller review content for ecommerce websites.",
     "icon": "TestFreaks.svg",
     "js": {
-      "testFreaks": "",
-      "applyTestFreaks": ""
+      "applyTestFreaks": "",
+      "testFreaks": ""
     },
-    "scripts": "\\.testfreaks\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.testfreaks\\.com/",
     "website": "https://www.testfreaks.com"
   },
   "Texthelp": {
diff --git a/src/technologies/u.json b/src/technologies/u.json
index 9f8a38204..8ed8855de 100644
--- a/src/technologies/u.json
+++ b/src/technologies/u.json
@@ -308,12 +308,12 @@
     "js": {
       "UserVoice": ""
     },
-    "scripts": "\\.uservoice\\.com/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.uservoice\\.com/",
     "website": "http://uservoice.com"
   },
   "UserWay": {
diff --git a/src/technologies/w.json b/src/technologies/w.json
index 91a2b14b7..8f70e128b 100644
--- a/src/technologies/w.json
+++ b/src/technologies/w.json
@@ -618,13 +618,13 @@
     "js": {
       "wwwa_loaded": ""
     },
-    "scripts": "\\.widgetwhats\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.widgetwhats\\.com/",
     "website": "https://widgetwhats.com"
   },
   "Wigzo": {
@@ -731,11 +731,11 @@
       "WirecardHPP": "",
       "WirecardPaymentPage": ""
     },
-    "scripts": "\\.wirecard\\.com/",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scripts": "\\.wirecard\\.com/",
     "website": "https://www.wirecard.com"
   },
   "Wisepops": {
diff --git a/src/technologies/x.json b/src/technologies/x.json
index ca5cc7486..50184279b 100644
--- a/src/technologies/x.json
+++ b/src/technologies/x.json
@@ -204,7 +204,6 @@
       41
     ],
     "description": "Xpresslane is a checkout platform for ecommerce that focuses on increasing conversion during the checkout process.",
-    "icon": "Xpresslane.png",
     "dom": {
       "link[href*='/assets/xpresslane.css']": {
         "attributes": {
@@ -212,11 +211,12 @@
         }
       }
     },
-    "scripts": "apps\\.xpresslane\\.in/",
-    "saas": true,
+    "icon": "Xpresslane.png",
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scripts": "apps\\.xpresslane\\.in/",
     "website": "https://www.xpresslane.in"
   },
   "Xtremepush": {
diff --git a/src/technologies/z.json b/src/technologies/z.json
index e70616da2..fdc393135 100644
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@@ -149,14 +149,14 @@
     "description": "ZestMoney is a fintech company that uses digital EMI without the need for a credit card or a credit score.",
     "icon": "ZestMoney.png",
     "js": {
-      "zestMerchant": "",
       "ZestMoneyWidget": "",
-      "zestBind": ""
+      "zestBind": "",
+      "zestMerchant": ""
     },
-    "saas": true,
     "pricing": [
       "freemium"
     ],
+    "saas": true,
     "website": "https://www.zestmoney.in"
   },
   "Zimbra": {