diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 11e443013..db5a64de6 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -497,11 +497,8 @@ class Site {
 
   async goto(url) {
     // Return when the URL is a duplicate or maxUrls has been reached
-    if (
-      this.analyzedUrls[url.href] ||
-      Object.keys(this.analyzedUrls).length >= this.options.maxUrls
-    ) {
-      return
+    if (this.analyzedUrls[url.href]) {
+      return []
     }
 
     this.log(`Navigate to ${url}`, 'page')
@@ -958,14 +955,23 @@ class Site {
 
       await Promise.all([
         (async () => {
-          const links = await this.goto(url)
+          const links = ((await this.goto(url)) || []).filter(
+            ({ href }) => !this.analyzedUrls[href]
+          )
 
           if (
-            links &&
+            links.length &&
             this.options.recursive &&
+            Object.keys(this.analyzedUrls).length < this.options.maxUrls &&
             depth < this.options.maxDepth
           ) {
-            await this.batch(links.slice(0, this.options.maxUrls), depth + 1)
+            await this.batch(
+              links.slice(
+                0,
+                this.options.maxUrls - Object.keys(this.analyzedUrls).length
+              ),
+              depth + 1
+            )
           }
         })(),
         (async () => {
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index ccdb25e92..c7a76e941 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.9.2",
+  "version": "6.9.5",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/drivers/webextension/images/icons/Remix.png b/src/drivers/webextension/images/icons/Remix.png
deleted file mode 100644
index cb004db69..000000000
Binary files a/src/drivers/webextension/images/icons/Remix.png and /dev/null differ
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 2800c07e7..49a2817d7 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.9.2",
+  "version": "6.9.5",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
@@ -78,4 +78,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 876f3cd90..49cc5ea52 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.9.2",
+  "version": "6.9.5",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/technologies/_.json b/src/technologies/_.json
index 110e6084d..db32c951b 100644
--- a/src/technologies/_.json
+++ b/src/technologies/_.json
@@ -61,10 +61,10 @@
       88
     ],
     "description": "34SP.com specialises in website hosting, discount domain names, low cost VPS servers and dedicated servers.",
-    "icon": "34SP.com.svg",
     "dns": {
       "SOA": "ns(?:\\d+)?\\.34sp\\.com"
     },
+    "icon": "34SP.com.svg",
     "pricing": [
       "recurring",
       "low"
diff --git a/src/technologies/a.json b/src/technologies/a.json
index 0276a9c34..fcb2f5116 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -77,6 +77,21 @@
     "scriptSrc": "\\.ebis\\.ne\\.jp/",
     "website": "http://www.ebis.ne.jp"
   },
+  "ALL-INKL": {
+    "cats": [
+      88
+    ],
+    "description": "ALL-INKL is a German-based web hosting provider that promises to offer high-performance services for fair prices.",
+    "dns": {
+      "SOA": "\\.kasserver\\.com"
+    },
+    "icon": "ALL-INKL.png",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "website": "https://all-inkl.com"
+  },
   "AMP": {
     "cats": [
       12
@@ -96,12 +111,12 @@
       87
     ],
     "description": "AMP for WordPress automatically adds Accelerated Mobile Pages (Google AMP Project) functionality to your WordPress site.",
+    "dom": "link[href*='/wp-content/plugins/amp/']",
     "icon": "Accelerated-Mobile-Pages.svg",
     "implies": "AMP",
     "meta": {
       "generator": "^AMP Plugin v(\\d+\\.\\d+.*)$\\;version:\\1"
     },
-    "dom": "link[href*='/wp-content/plugins/amp/']",
     "requires": "WordPress",
     "website": "https://amp-wp.org"
   },
@@ -144,6 +159,19 @@
     "text": "\\APC\\b",
     "website": "https://www.apc-pli.com"
   },
+  "ARI Network Services": {
+    "cats": [
+      6
+    ],
+    "description": "ARI Network Services provides website, software, and data solutions to help dealers, distributors, and OEMs improve their selling process.",
+    "icon": "ARI Network Services.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.ari-secure\\.com/",
+    "website": "https://arinet.com"
+  },
   "AT Internet Analyzer": {
     "cats": [
       10
@@ -335,12 +363,12 @@
       5
     ],
     "description": "AccuWeather provides weather forecasts and warnings and additional weather products and services.",
-    "icon": "AccuWeather.svg",
     "dom": "a[href*='.accuweather.com'][target='_blank']",
-    "saas": true,
+    "icon": "AccuWeather.svg",
     "pricing": [
       "poa"
     ],
+    "saas": true,
     "website": "https://partners.accuweather.com"
   },
   "Ackee": {
@@ -606,19 +634,6 @@
     "scriptSrc": "\\.adlightning\\.com",
     "website": "https://www.adlightning.com"
   },
-  "Adloox": {
-    "cats": [
-      36
-    ],
-    "description": "Adloox is a European-born buy-side ad verification and insights company.",
-    "icon": "Adloox.png",
-    "pricing": [
-      "poa"
-    ],
-    "saas": true,
-    "scriptSrc": "\\.adlooxtracking\\.com/",
-    "website": "https://www.adloox.com"
-  },
   "AdBridg": {
     "cats": [
       36
@@ -678,8 +693,8 @@
       77
     ],
     "description": "AdRoll is a digital marketing technology platform that specializes in retargeting.",
-    "icon": "AdRoll.svg",
     "dom": "link[href*='.adroll.com']",
+    "icon": "AdRoll.svg",
     "js": {
       "adroll_adv_id": "",
       "adroll_pix_id": ""
@@ -863,28 +878,14 @@
     "description": "AddToAny Share Buttons plugin for WordPress increases traffic and engagement by helping people share your posts and pages to any service.",
     "icon": "AddToAny.svg",
     "implies": "AddToAny",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
-    "oss": true,
     "requires": "WordPress",
     "scriptSrc": "/wp-content/plugins/add-to-any/addtoany\\.min\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://github.com/projectestac/wordpress-add-to-any"
   },
-  "Adform": {
-    "cats": [
-      36
-    ],
-    "description": "Adform is an all-in-one platform for digital advertising.",
-    "icon": "Adform.svg",
-    "dom": "link[href*='.adformdsp.net'], link[href*='.adform.net']",
-    "scriptSrc": "\\.adform\\.net/",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://site.adform.com"
-  },
   "Addi": {
     "cats": [
       91
@@ -908,6 +909,33 @@
     "scriptSrc": "https://addsearch\\.com/js/",
     "website": "https://www.addsearch.com/"
   },
+  "Adform": {
+    "cats": [
+      36
+    ],
+    "description": "Adform is an all-in-one platform for digital advertising.",
+    "dom": "link[href*='.adformdsp.net'], link[href*='.adform.net']",
+    "icon": "Adform.svg",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.adform\\.net/",
+    "website": "https://site.adform.com"
+  },
+  "Adloox": {
+    "cats": [
+      36
+    ],
+    "description": "Adloox is a European-born buy-side ad verification and insights company.",
+    "icon": "Adloox.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.adlooxtracking\\.com/",
+    "website": "https://www.adloox.com"
+  },
   "Adminer": {
     "cats": [
       3
@@ -946,15 +974,15 @@
     "description": "Admixer is an independent adtech company developing an ecosystem of full-stack programmatic solutions.",
     "icon": "Admixer.svg",
     "js": {
-      "admixerML": "",
-      "admixerAds": ""
+      "admixerAds": "",
+      "admixerML": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring",
       "onetime"
     ],
+    "saas": true,
     "scriptSrc": "\\.admixer\\.net/",
     "website": "https://admixer.com"
   },
@@ -963,17 +991,17 @@
       36
     ],
     "description": "Admo.tv is a company developing a TV and radio analytics platform.",
-    "icon": "Admo.tv.svg",
     "dom": "link[href*='.admo.tv'], a[href*='.admo.tv'][target='_blank'], iframe[src*='.admo.tv/']",
+    "icon": "Admo.tv.svg",
     "js": {
-      "ADMO_config": "",
-      "ADMO_TT": ""
+      "ADMO_TT": "",
+      "ADMO_config": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
     "website": "https://www.admo.tv"
   },
   "Adnegah": {
@@ -1199,17 +1227,6 @@
     "scriptSrc": "cdn\\.adligature\\.com/.+/advally-([\\d.]+)\\.js\\;version:\\1",
     "website": "https://www.advally.com"
   },
-  "Advert Stream": {
-    "cats": [
-      36
-    ],
-    "icon": "Advert Stream.png",
-    "js": {
-      "advst_is_above_the_fold": ""
-    },
-    "scriptSrc": "(?:ad\\.advertstream\\.com|adxcore\\.com)",
-    "website": "http://www.advertstream.com"
-  },
   "Advanced Custom Fields": {
     "cats": [
       87
@@ -1229,6 +1246,17 @@
     "scriptSrc": "/wp-content/plugins/advanced-custom-fields(?:-pro)?/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://www.advancedcustomfields.com"
   },
+  "Advert Stream": {
+    "cats": [
+      36
+    ],
+    "icon": "Advert Stream.png",
+    "js": {
+      "advst_is_above_the_fold": ""
+    },
+    "scriptSrc": "(?:ad\\.advertstream\\.com|adxcore\\.com)",
+    "website": "http://www.advertstream.com"
+  },
   "Adverticum": {
     "cats": [
       36
@@ -1318,12 +1346,12 @@
     ],
     "description": "Affiliatly is an affiliate marketing software for ecommerce store owners.",
     "icon": "Affiliatly.png",
-    "scriptSrc": "static\\.affiliatly\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "static\\.affiliatly\\.com/",
     "website": "https://www.affiliatly.com"
   },
   "Affirm": {
@@ -1429,11 +1457,11 @@
     "js": {
       "Air360.SDK_Version": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
     "website": "https://www.air360.io"
   },
   "Aircall": {
@@ -1594,8 +1622,8 @@
       87
     ],
     "description": "Akismet is a service that filters spam from comments, trackbacks, and contact form messages.",
-    "icon": "Akismet.png",
     "dom": "link[href*='/wp-content/plugins/akismet/']",
+    "icon": "Akismet.png",
     "js": {
       "ak_js.checkValidity": ""
     },
@@ -1696,10 +1724,10 @@
       29
     ],
     "description": "Algolia offers a hosted web search product delivering real-time results.",
-    "icon": "Algolia.svg",
     "headers": {
       "Content-Security-Policy": "\\.algolia"
     },
+    "icon": "Algolia.svg",
     "js": {
       "AlgoliaSearch": "",
       "__algolia": "",
@@ -1724,21 +1752,6 @@
     "saas": true,
     "website": "https://apps.shopify.com/ali-reviews"
   },
-  "ALL-INKL": {
-    "cats": [
-      88
-    ],
-    "description": "ALL-INKL is a German-based web hosting provider that promises to offer high-performance services for fair prices.",
-    "icon": "ALL-INKL.png",
-    "dns": {
-      "SOA": "\\.kasserver\\.com"
-    },
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://all-inkl.com"
-  },
   "All in One SEO Pack": {
     "cats": [
       54,
@@ -1748,12 +1761,12 @@
     "description": "All in One SEO plugin optimizes WordPress website and its content for search engines.",
     "html": "<!-- All in One SEO Pack ([\\d.]+) \\;version:\\1",
     "icon": "AIOSEO.svg",
-    "requires": "WordPress",
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "requires": "WordPress",
     "website": "https://aioseo.com"
   },
   "AlloyUI": {
@@ -1786,6 +1799,18 @@
     "scriptSrc": "portal\\.allyable\\.com/",
     "website": "https://allyable.com"
   },
+  "Alpine Linux": {
+    "cats": [
+      28
+    ],
+    "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
+    "headers": {
+      "X-Powered-By": "Alpine"
+    },
+    "icon": "Alpine Linux.svg",
+    "oss": true,
+    "website": "https://www.alpinelinux.org"
+  },
   "Alpine.js": {
     "cats": [
       12
@@ -1806,10 +1831,10 @@
     ],
     "description": "AlternC is a set of software management on Linux shared hosting.",
     "icon": "AlternC.png",
-    "requires": "Debian",
-    "scriptSrc": "js/alternc\\.js",
     "oss": true,
+    "requires": "Debian",
     "saas": false,
+    "scriptSrc": "js/alternc\\.js",
     "website": "https://alternc.com"
   },
   "Amaya": {
@@ -2119,20 +2144,29 @@
     },
     "website": "http://amirocms.com"
   },
+  "Amobee": {
+    "cats": [
+      36
+    ],
+    "description": "Amobee is a cloud-based advertising and data management platform.",
+    "dom": "img[src*='.turn.com/r/beacon']",
+    "icon": "Amobee.png",
+    "website": "https://www.amobee.com"
+  },
   "Amplience": {
     "cats": [
       1
     ],
     "description": "Amplience is an API-first, headless content management platform for enterprise retail.",
-    "icon": "Amplience.png",
     "dom": "link[href*='.amplience.net'], img[src*='.amplience.net']",
+    "icon": "Amplience.png",
     "js": {
       "amplianceTemplates": ""
     },
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
     "website": "https://amplience.com"
   },
   "Amplitude": {
@@ -2575,17 +2609,17 @@
       52
     ],
     "description": "Apple Business Chat is a service from Apple that allows your organization to directly chat with your customers using the Messages app.",
-    "icon": "Apple.svg",
     "dom": "a[href*='bcrw.apple.com/business/api']",
+    "icon": "Apple.svg",
     "js": {
       "appleBusinessChat.version": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "scriptSrc": "/apple_business_chat_commerce/.+/apple_message_button_v([\\d\\.]+)\\.js\\;version:\\1",
     "pricing": [
       "freemium",
       "poa"
     ],
     "saas": true,
+    "scriptSrc": "/apple_business_chat_commerce/.+/apple_message_button_v([\\d\\.]+)\\.js\\;version:\\1",
     "website": "https://developer.apple.com/documentation/businesschat"
   },
   "Apple Pay": {
@@ -2754,19 +2788,6 @@
     ],
     "website": "https://developers.arcgis.com/javascript/"
   },
-  "ARI Network Services": {
-    "cats": [
-      6
-    ],
-    "description": "ARI Network Services provides website, software, and data solutions to help dealers, distributors, and OEMs improve their selling process.",
-    "icon": "ARI Network Services.png",
-    "scriptSrc": "\\.ari-secure\\.com/",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://arinet.com"
-  },
   "Artifactory": {
     "cats": [
       47
@@ -2784,37 +2805,37 @@
     ],
     "website": "http://jfrog.com/open-source/#os-arti"
   },
+  "Artifactory Web Server": {
+    "cats": [
+      22
+    ],
+    "cpe": "cpe:/a:jfrog:artifactory",
+    "headers": {
+      "Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1"
+    },
+    "icon": "Artifactory.svg",
+    "implies": "Artifactory",
+    "website": "http://jfrog.com/open-source/#os-arti"
+  },
   "Aruba.it": {
     "cats": [
       88,
       62
     ],
     "description": "Aruba.it is an Italian company mainly active in the web hosting and domain registration businesses.",
-    "icon": "Aruba.it.svg",
-    "headers": {
-      "x-servername": "\\.aruba\\.it"
-    },
     "dns": {
       "SOA": "\\.technorail\\.com"
     },
+    "headers": {
+      "x-servername": "\\.aruba\\.it"
+    },
+    "icon": "Aruba.it.svg",
     "pricing": [
       "recurring",
       "payg"
     ],
     "website": "https://www.aruba.it"
   },
-  "Artifactory Web Server": {
-    "cats": [
-      22
-    ],
-    "cpe": "cpe:/a:jfrog:artifactory",
-    "headers": {
-      "Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1"
-    },
-    "icon": "Artifactory.svg",
-    "implies": "Artifactory",
-    "website": "http://jfrog.com/open-source/#os-arti"
-  },
   "ArvanCloud": {
     "cats": [
       31
@@ -3138,6 +3159,18 @@
     "scriptSrc": "/lock/([\\d.]+)/lock(?:.min)?\\.js\\;version:\\1",
     "website": "https://auth0.com/docs/libraries/lock"
   },
+  "Automizely": {
+    "cats": [
+      32
+    ],
+    "description": "Automizely creates and manages enterprise-level marketing automation systems including contact and CRM mappings, lead funnels, email nurture, lead-generating pages, and blog posts, and website integrations.",
+    "icon": "Automizely.svg",
+    "pricing": [
+      "freemium"
+    ],
+    "scriptSrc": "\\.automizely\\.com/",
+    "website": "https://www.automizely.com/marketing"
+  },
   "Autopilot": {
     "cats": [
       32,
@@ -3163,8 +3196,8 @@
       92
     ],
     "description": "Autoptimize is a popular performance plugin for WordPress.",
-    "icon": "Autoptimize.png",
     "dom": "link[href*='/wp-content/plugins/autoptimize/']",
+    "icon": "Autoptimize.png",
     "pricing": [
       "freemium",
       "onetime"
@@ -3173,18 +3206,6 @@
     "scriptSrc": "/wp-content/plugins/autoptimize/.+\\.js(?:\\?ao_version=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://autoptimize.com"
   },
-  "Automizely": {
-    "cats": [
-      32
-    ],
-    "description": "Automizely creates and manages enterprise-level marketing automation systems including contact and CRM mappings, lead funnels, email nurture, lead-generating pages, and blog posts, and website integrations.",
-    "icon": "Automizely.svg",
-    "pricing": [
-      "freemium"
-    ],
-    "scriptSrc": "\\.automizely\\.com/",
-    "website": "https://www.automizely.com/marketing"
-  },
   "Avangate": {
     "cats": [
       6
@@ -3211,17 +3232,17 @@
       90
     ],
     "description": "Avis Verifies is a complete solution for managing your customer reviews.",
-    "icon": "Avis Verifies.png",
     "dom": "a[href*='.avis-verifies.com/'][target='_blank'], iframe[src*='.avis-verifies.com/']",
+    "icon": "Avis Verifies.png",
     "js": {
       "avisVerifies": ""
     },
-    "scriptSrc": "\\.avis-verifies\\.com/",
     "pricing": [
       "low",
       "recurring"
     ],
     "saas": true,
+    "scriptSrc": "\\.avis-verifies\\.com/",
     "website": "https://www.netreviews.com"
   },
   "Aweber": {
@@ -3449,15 +3470,6 @@
     "scriptSrc": "amcharts.*\\.js",
     "website": "http://amcharts.com"
   },
-  "Amobee": {
-    "cats": [
-      36
-    ],
-    "description": "Amobee is a cloud-based advertising and data management platform.",
-    "icon": "Amobee.png",
-    "dom": "img[src*='.turn.com/r/beacon']",
-    "website": "https://www.amobee.com"
-  },
   "amoCRM": {
     "cats": [
       53
@@ -3498,17 +3510,5 @@
     "icon": "augmented-ui.png",
     "oss": true,
     "website": "http://augmented-ui.com"
-  },
-  "Alpine Linux": {
-    "cats": [
-      28
-    ],
-    "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
-    "headers": {
-      "X-Powered-By": "Alpine"
-    },
-    "oss": true,
-    "icon": "Alpine Linux.svg",
-    "website": "https://www.alpinelinux.org"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/b.json b/src/technologies/b.json
index e2c2757b3..4584d5ce2 100644
--- a/src/technologies/b.json
+++ b/src/technologies/b.json
@@ -123,11 +123,13 @@
     "cats": [
       19
     ],
-    "js":{
+    "icon": "Bambuser.png",
+    "js": {
       "_bambuser": ""
     },
-    "icon": "Bambuser.png",
-    "pricing": [ "poa" ],
+    "pricing": [
+      "poa"
+    ],
     "scriptSrc": "cdn\\.liveshopping\\.bambuser\\.com",
     "website": "https://bambuser.com/"
   },
@@ -602,24 +604,6 @@
     "scriptSrc": "\\.getblue\\.io",
     "website": "https://web.getblue.io/en/"
   },
-  "BlueConic": {
-    "cats": [
-      97
-    ],
-    "description": "BlueConic is the advanced customer data platform that liberates companies' first-party data from disparate systems.",
-    "icon": "BlueConic.svg",
-    "js": {
-      "blueConicClient": "",
-      "blueConicPreListeners": "",
-      "loadValuesFromBlueConic": "",
-      "BlueConicEngagement": ""
-    },
-    "pricing": [
-      "poa"
-    ],
-    "saas": true,
-    "website": "https://www.blueconic.com"
-  },
   "Blue Triangle": {
     "cats": [
       16,
@@ -640,6 +624,24 @@
     "website": "https://bluetriangle.com",
     "xhr": "\\.btttag\\.com"
   },
+  "BlueConic": {
+    "cats": [
+      97
+    ],
+    "description": "BlueConic is the advanced customer data platform that liberates companies' first-party data from disparate systems.",
+    "icon": "BlueConic.svg",
+    "js": {
+      "BlueConicEngagement": "",
+      "blueConicClient": "",
+      "blueConicPreListeners": "",
+      "loadValuesFromBlueConic": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.blueconic.com"
+  },
   "Bluecore": {
     "cats": [
       32,
@@ -676,11 +678,11 @@
       88
     ],
     "description": "Bluehost is a large web host known for its WordPress expertise, variety of “one-stop-shop” services, and bargain prices.",
-    "icon": "Bluehost.svg",
     "dns": {
       "NS": "\\.bluehost\\.com",
       "SOA": "\\.bluehost\\.com"
     },
+    "icon": "Bluehost.svg",
     "pricing": [
       "payg",
       "recurring"
@@ -713,28 +715,28 @@
     "scriptSrc": "cdn.getblueshift.com/",
     "website": "https://blueshift.com/"
   },
-  "Boba.js": {
-    "cats": [
-      59
-    ],
-    "implies": "Google Analytics",
-    "scriptSrc": "boba(?:\\.min)?\\.js",
-    "website": "http://boba.space150.com"
-  },
   "Boats Group": {
     "cats": [
       51
     ],
     "description": "Boats Group is a website platform for boat dealers and brokers.",
-    "icon": "Boats Group.png",
-    "requires": "WordPress",
     "dom": "a[href*='.boatsgroup.com/'][target='_blank']",
-    "saas": true,
+    "icon": "Boats Group.png",
     "pricing": [
       "poa"
     ],
+    "requires": "WordPress",
+    "saas": true,
     "website": "https://www.boatsgroup.com/websites"
   },
+  "Boba.js": {
+    "cats": [
+      59
+    ],
+    "implies": "Google Analytics",
+    "scriptSrc": "boba(?:\\.min)?\\.js",
+    "website": "http://boba.space150.com"
+  },
   "Bokeh": {
     "cats": [
       25
@@ -887,9 +889,9 @@
       5
     ],
     "description": "Booking.com is one of the largest ecommerce travel companies in the world. As an affiliate member, you can make up to 40% commission.",
+    "dom": "form[action*='.booking.com/'][target='_blank'], img[src*='q-xx.bstatic.com/']",
     "icon": "Booking.com.svg",
     "implies": "Booking.com",
-    "dom": "form[action*='.booking.com/'][target='_blank'], img[src*='q-xx.bstatic.com/']",
     "scriptSrc": "q\\.bstatic\\.com/",
     "website": "https://www.booking.com/affiliate-program/v2/selfmanaged.html"
   },
@@ -1220,13 +1222,13 @@
       87
     ],
     "description": "Breadcrumb NavXT is a WordPress plugin compatible with WordPress versions 4.9 and up.",
-    "icon": "Breadcrumb NavXT.svg",
     "html": "<!-- Breadcrumb NavXT ([\\d\\.]+)\\;version:\\1",
+    "icon": "Breadcrumb NavXT.svg",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
     "requires": "WordPress",
-    "oss": true,
     "website": "https://github.com/mtekk/Breadcrumb-NavXT"
   },
   "Breinify": {
@@ -1244,20 +1246,6 @@
     "saas": true,
     "website": "https://home.breinify.ai"
   },
-  "Brightcove": {
-    "cats": [
-      14
-    ],
-    "description": "Brightcove is a cloud-based online video platform.",
-    "icon": "Brightcove.png",
-    "saas": true,
-    "dom": "iframe[src*='players.brightcove.'], link[href*='players.brightcove.']",
-    "pricing": [
-      "mid",
-      "recurring"
-    ],
-    "website": "https://www.brightcove.com"
-  },
   "BrightInfo": {
     "cats": [
       32,
@@ -1278,6 +1266,20 @@
     "scriptSrc": "app\\.brightinfo\\.com",
     "website": "https://www.brightinfo.com"
   },
+  "Brightcove": {
+    "cats": [
+      14
+    ],
+    "description": "Brightcove is a cloud-based online video platform.",
+    "dom": "iframe[src*='players.brightcove.'], link[href*='players.brightcove.']",
+    "icon": "Brightcove.png",
+    "pricing": [
+      "mid",
+      "recurring"
+    ],
+    "saas": true,
+    "website": "https://www.brightcove.com"
+  },
   "Brightspot": {
     "cats": [
       1
@@ -1353,17 +1355,6 @@
     "scriptSrc": "assets\\.youthsrl\\.com/brownie",
     "website": "https://www.browniesuite.com"
   },
-  "BrowserCMS": {
-    "cats": [
-      1
-    ],
-    "icon": "BrowserCMS.png",
-    "implies": "Ruby",
-    "meta": {
-      "generator": "BrowserCMS ([\\d.]+)\\;version:\\1"
-    },
-    "website": "http://browsercms.org"
-  },
   "Browser-Update.org": {
     "cats": [
       5,
@@ -1377,6 +1368,17 @@
     },
     "website": "https://browser-update.org"
   },
+  "BrowserCMS": {
+    "cats": [
+      1
+    ],
+    "icon": "BrowserCMS.png",
+    "implies": "Ruby",
+    "meta": {
+      "generator": "BrowserCMS ([\\d.]+)\\;version:\\1"
+    },
+    "website": "http://browsercms.org"
+  },
   "Bsale": {
     "cats": [
       6
@@ -1440,6 +1442,23 @@
     ],
     "website": "https://app.budbee.com/"
   },
+  "BugHerd": {
+    "cats": [
+      13
+    ],
+    "description": "BugHerd is a cloud-based feedback collection and bug management tool.",
+    "icon": "BugHerd.svg",
+    "js": {
+      "BugHerdConfig": ""
+    },
+    "pricing": [
+      "recurring",
+      "low"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.bugherd\\.com/",
+    "website": "https://bugherd.com"
+  },
   "BugSnag": {
     "cats": [
       10
@@ -1467,23 +1486,6 @@
     "icon": "Bugcrowd.svg",
     "website": "https://www.bugcrowd.com"
   },
-  "BugHerd": {
-    "cats": [
-      13
-    ],
-    "description": "BugHerd is a cloud-based feedback collection and bug management tool.",
-    "icon": "BugHerd.svg",
-    "js": {
-      "BugHerdConfig": ""
-    },
-    "saas": true,
-    "scriptSrc": "\\.bugherd\\.com/",
-    "pricing": [
-      "recurring",
-      "low"
-    ],
-    "website": "https://bugherd.com"
-  },
   "Bugzilla": {
     "cats": [
       13
@@ -1681,4 +1683,4 @@
     },
     "website": "https://addyosmani.github.io/basket.js/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/c.json b/src/technologies/c.json
index d49417757..8c6873bd8 100644
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@@ -223,6 +223,24 @@
     "scriptSrc": "https://assets\\.calendly\\.com/assets/external/widget\\.js",
     "website": "https://calendly.com/"
   },
+  "CallRail": {
+    "cats": [
+      10
+    ],
+    "description": "CallRail is a service that tracks and manages your phone leads, helping businesses to determine which marketing campaigns are driving quality leads.",
+    "icon": "CallRail.png",
+    "js": {
+      "CallTrk": "",
+      "CallTrkSwap": "",
+      "crwpVer": "^([\\d\\.]+)$\\;version:\\1"
+    },
+    "pricing": [
+      "payg",
+      "recurring"
+    ],
+    "saas": true,
+    "website": "https://www.callrail.com"
+  },
   "Callbell": {
     "cats": [
       52
@@ -242,24 +260,6 @@
     "scriptSrc": "\\.callbell\\.eu/",
     "website": "https://www.callbell.eu"
   },
-  "CallRail": {
-    "cats": [
-      10
-    ],
-    "description": "CallRail is a service that tracks and manages your phone leads, helping businesses to determine which marketing campaigns are driving quality leads.",
-    "icon": "CallRail.png",
-    "js": {
-      "CallTrk": "",
-      "CallTrkSwap": "",
-      "crwpVer": "^([\\d\\.]+)$\\;version:\\1"
-    },
-    "pricing": [
-      "payg",
-      "recurring"
-    ],
-    "saas": true,
-    "website": "https://www.callrail.com"
-  },
   "Campaign Monitor": {
     "cats": [
       32,
@@ -373,7 +373,6 @@
       "[class*='shopping-cart']",
       "[class*='checkout']"
     ],
-    "url": "/(?:cart|order|basket|trolley|bag|shoppingbag|checkout)",
     "icon": "Cart-generic.svg",
     "js": {
       "google_tag_params.ecomm_pagetype": ""
@@ -381,6 +380,7 @@
     "scriptSrc": [
       "googlecommerce\\.com/trustedstores/api/js"
     ],
+    "url": "/(?:cart|order|basket|trolley|bag|shoppingbag|checkout)",
     "website": "https://www.wappalyzer.com/technologies/ecommerce/cart-functionality"
   },
   "CartStack": {
@@ -436,8 +436,8 @@
       80
     ],
     "description": "Catch Box is a lightweight, box shaped, clean responsive WordPress theme by Catch Themes.",
-    "icon": "Catch Themes.png",
     "dom": "link[href*='/wp-content/themes/catch-box/']",
+    "icon": "Catch Themes.png",
     "pricing": [
       "freemium",
       "onetime"
@@ -819,10 +819,12 @@
       41
     ],
     "description": "CitrusPay provides payement gateway and wallet services.",
-    "scriptSrc": "checkout-static\\.citruspay\\.com/",
     "icon": "citruspay.png",
+    "pricing": [
+      "payg"
+    ],
     "saas": true,
-    "pricing": [ "payg" ],
+    "scriptSrc": "checkout-static\\.citruspay\\.com/",
     "website": "https://consumers.citruspay.com/"
   },
   "CityMail": {
@@ -1060,13 +1062,13 @@
     "js": {
       "clicky": ""
     },
-    "scriptSrc": "static\\.getclicky\\.com",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "static\\.getclicky\\.com",
     "website": "http://getclicky.com"
   },
   "ClientJS": {
@@ -1202,10 +1204,10 @@
       62
     ],
     "description": "Cloudways offers managed cloud-hosting services for WordPress sites on a cloud server where multiple copies of your content will be replicated throughout your chosen data center.",
-    "icon": "Cloudways.png",
     "headers": {
       "cache-provider": "CLOUDWAYS-CACHE-DE"
     },
+    "icon": "Cloudways.png",
     "pricing": [
       "payg"
     ],
@@ -1585,14 +1587,14 @@
     "icon": "Comm100.svg",
     "js": {
       "Comm100API": "",
-      "comm100_livechat_open_link": "",
-      "comm100_chatButton": ""
+      "comm100_chatButton": "",
+      "comm100_livechat_open_link": ""
     },
-    "saas": true,
     "pricing": [
       "recurring",
       "payg"
     ],
+    "saas": true,
     "website": "https://www.comm100.com"
   },
   "Commanders Act TagCommander": {
@@ -1752,10 +1754,10 @@
       88
     ],
     "description": "Contabo is a German hosting provider, previously known by the name Giga-International.",
-    "icon": "Contabo.svg",
     "dns": {
       "SOA": "\\.contabo\\.net"
     },
+    "icon": "Contabo.svg",
     "pricing": [
       "recurring",
       "low"
@@ -1767,8 +1769,8 @@
       87
     ],
     "description": "Contact Form 7 is an WordPress plugin which can manage multiple contact forms. The form supports Ajax-powered submitting, CAPTCHA, Akismet spam filtering.",
-    "icon": "Contact Form 7.png",
     "dom": "link[href*='/wp-content/plugins/contact-form-7/']",
+    "icon": "Contact Form 7.png",
     "js": {
       "wpcf7": ""
     },
@@ -2374,8 +2376,8 @@
     ],
     "description": "CreateJS is a suite of modular libraries and tools which work together or independently to enable interactive content on open web technologies via HTML5.",
     "icon": "CreateJS.svg",
-    "scriptSrc": "code\\.createjs\\.com/",
     "saas": true,
+    "scriptSrc": "code\\.createjs\\.com/",
     "website": "https://code.createjs.com"
   },
   "Creativ.eMail": {
@@ -2404,12 +2406,12 @@
       "$crisp": "",
       "CRISP_WEBSITE_ID": ""
     },
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://crisp.chat/"
   },
   "Criteo": {
@@ -2418,8 +2420,8 @@
       77
     ],
     "description": "Criteo provides personalised retargeting that works with Internet retailers to serve personalised online display advertisements to consumers who have previously visited the advertiser's website.",
-    "icon": "Criteo.svg",
     "dom": "link[href*='.criteo.com']",
+    "icon": "Criteo.svg",
     "js": {
       "Criteo": "",
       "criteo_pubtag": "",
@@ -2500,11 +2502,11 @@
       "CrownPeakAutocomplete": "",
       "CrownPeakSearch": ""
     },
-    "scriptSrc": "js/crownpeak\\.",
     "pricing": [
       "poa"
     ],
     "saas": true,
+    "scriptSrc": "js/crownpeak\\.",
     "website": "http://www.crownpeak.com"
   },
   "Cryout Creations Bravada": {
@@ -2672,8 +2674,8 @@
     "description": "Cxense was an AI-powered data management and intelligent personalisation platform.",
     "icon": "Cxense.png",
     "meta": {
-      "cXenseParse:pageclass": "",
       "cXenseParse:itm-meta-keywords": "",
+      "cXenseParse:pageclass": "",
       "cXenseParse:publishtime": "",
       "cXenseParse:url": ""
     },
@@ -2681,8 +2683,8 @@
       "low",
       "recurring"
     ],
-    "scriptSrc": "\\.cxense\\.com/",
     "saas": true,
+    "scriptSrc": "\\.cxense\\.com/",
     "website": "https://www.cxense.com"
   },
   "CyberChimps Responsive": {
@@ -2819,4 +2821,4 @@
     "oss": true,
     "website": "https://github.com/zloirock/core-js"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/d.json b/src/technologies/d.json
index 1fb3145a4..a5024a2f9 100644
--- a/src/technologies/d.json
+++ b/src/technologies/d.json
@@ -102,6 +102,19 @@
     ],
     "website": "https://www.dpd.com"
   },
+  "DTScout": {
+    "cats": [
+      36
+    ],
+    "description": "DTScout is a marketing data intelligence software.",
+    "icon": "DTScout.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.dtscout\\.com/",
+    "website": "https://www.dtscout.com"
+  },
   "DX": {
     "cats": [
       99
@@ -167,11 +180,11 @@
       14
     ],
     "description": "Dailymotion is a French video-sharing technology platform.",
+    "dom": "img[data-src*='.dailymotion.com/'], iframe[scr*='.dailymotion.com/']",
     "icon": "Dailymotion.svg",
     "meta": {
       "name": "dailymotion-domain-verification"
     },
-    "dom": "img[data-src*='.dailymotion.com/'], iframe[scr*='.dailymotion.com/']",
     "website": "https://www.dailymotion.com"
   },
   "Dancer": {
@@ -857,10 +870,10 @@
       88
     ],
     "description": "DomainFactory has been operating as a web hosting company. It is owned by GoDaddy and targets businesses in Austria and Germany.",
-    "icon": "DomainFactory.png",
     "dns": {
       "SOA": "ns(?:\\d+)?\\.namespace4you\\.de"
     },
+    "icon": "DomainFactory.png",
     "pricing": [
       "low",
       "recurring"
@@ -965,8 +978,8 @@
       10
     ],
     "description": "DoubleVerify is a software platform for digital media measurement, data, and analytics.",
-    "icon": "DoubleVerify.svg",
     "dom": "link[href*='.doubleverify.com']",
+    "icon": "DoubleVerify.svg",
     "pricing": [
       "poa"
     ],
@@ -995,37 +1008,16 @@
     "scriptSrc": "draft-js(@|/)([\\d.]+)\\;version:\\2",
     "website": "https://draftjs.org/"
   },
-  "Dreamdata": {
-    "cats": [
-      32,
-      10
-    ],
-    "description": "Dreamdata is a B2B revenue attribution platform.",
-    "icon": "Dreamdata.png",
-    "dom": "link[href*='.bizible.com']",
-    "js": {
-      "Bizible": "",
-      "BizTrackingA": ""
-    },
-    "scriptSrc": "\\.bizible\\.com/",
-    "saas": true,
-    "pricing": [
-      "freemium",
-      "mid",
-      "recurring"
-    ],
-    "website": "https://dreamdata.io"
-  },
   "DreamHost": {
     "cats": [
       88
     ],
     "description": "DreamHost is a Los Angeles-based web hosting provider and domain name registrar.",
-    "icon": "DreamHost.svg",
     "dns": {
       "NS": "ns\\d+\\.dreamhost\\.com",
       "SOA": "ns\\d+\\.dreamhost\\.com"
     },
+    "icon": "DreamHost.svg",
     "pricing": [
       "recurring",
       "low"
@@ -1047,6 +1039,27 @@
     },
     "website": "https://www.adobe.com/products/dreamweaver.html"
   },
+  "Dreamdata": {
+    "cats": [
+      32,
+      10
+    ],
+    "description": "Dreamdata is a B2B revenue attribution platform.",
+    "dom": "link[href*='.bizible.com']",
+    "icon": "Dreamdata.png",
+    "js": {
+      "BizTrackingA": "",
+      "Bizible": ""
+    },
+    "pricing": [
+      "freemium",
+      "mid",
+      "recurring"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.bizible\\.com/",
+    "website": "https://dreamdata.io"
+  },
   "Drift": {
     "cats": [
       52
@@ -1118,19 +1131,6 @@
     ],
     "website": "https://www.drupal.org/docs/multisite-drupal"
   },
-  "DTScout": {
-    "cats": [
-      36
-    ],
-    "description": "DTScout is a marketing data intelligence software.",
-    "icon": "DTScout.png",
-    "pricing": [
-      "poa"
-    ],
-    "saas": true,
-    "scriptSrc": "\\.dtscout\\.com/",
-    "website": "https://www.dtscout.com"
-  },
   "Duda": {
     "cats": [
       1
diff --git a/src/technologies/e.json b/src/technologies/e.json
index 92dca2fd2..6b1e31192 100644
--- a/src/technologies/e.json
+++ b/src/technologies/e.json
@@ -83,6 +83,24 @@
     },
     "website": "http://www.eprints.org"
   },
+  "EWWW Image Optimizer": {
+    "cats": [
+      87,
+      92
+    ],
+    "description": "EWWW Image Optimizer is an image optimisation WordPress plugin designed to improve the performance of your website.",
+    "icon": "EWWW Image Optimizer.png",
+    "js": {
+      "ewww_webp_supported": ""
+    },
+    "oss": true,
+    "pricing": [
+      "freemium"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/ewww-image-optimizer/",
+    "website": "https://github.com/nosilver4u/ewww-image-optimizer"
+  },
   "EX.CO": {
     "cats": [
       5
@@ -104,26 +122,6 @@
     "website": "https://ex.co",
     "xhr": "prd-collector-anon\\.ex\\.co"
   },
-  "ExactMetrics": {
-    "cats": [
-      87,
-      10
-    ],
-    "description": "ExactMetrics (formerly Google Analytics Dashboard for WP) plugin helps you properly setup all the powerful Google Analytics tracking features without writing any code or hiring a developer.",
-    "icon": "ExactMetrics.svg",
-    "js": {
-      "ExactMetrics": "",
-      "exactmetrics_frontend": ""
-    },
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/google-analytics-dashboard-for-wp/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://www.exactmetrics.com"
-  },
   "EasyDigitalDownloads": {
     "cats": [
       6,
@@ -347,9 +345,9 @@
       87
     ],
     "description": "Elementor Header & Footer Builder is a simple yet powerful WordPress plugin that allows you to create a layout with Elementor and set it as.",
+    "dom": "link[href*='/wp-content/plugins/header-footer-elementor/']",
     "icon": "Elementor Header & Footer Builder.svg",
     "implies": "Elementor",
-    "dom": "link[href*='/wp-content/plugins/header-footer-elementor/']",
     "pricing": [
       "freemium"
     ],
@@ -436,23 +434,6 @@
     "scriptSrc": "(?:static|cdn)\\.scarabresearch\\.com",
     "website": "https://emarsys.com/"
   },
-  "Embedly": {
-    "cats": [
-      5
-    ],
-    "description": "Embedly is a service that allows developers to convert URLs into rich previews and embeddable content.",
-    "icon": "Embedly.svg",
-    "js": {
-      "embedly": ""
-    },
-    "scriptSrc": "cdn\\.embedly\\.com/",
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://embed.ly"
-  },
   "EmbedSocial": {
     "cats": [
       5
@@ -482,6 +463,23 @@
     "icon": "Embedthis.png",
     "website": "http://embedthis.com/appweb"
   },
+  "Embedly": {
+    "cats": [
+      5
+    ],
+    "description": "Embedly is a service that allows developers to convert URLs into rich previews and embeddable content.",
+    "icon": "Embedly.svg",
+    "js": {
+      "embedly": ""
+    },
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scriptSrc": "cdn\\.embedly\\.com/",
+    "website": "https://embed.ly"
+  },
   "Ember.js": {
     "cats": [
       12
@@ -738,22 +736,13 @@
     "saas": true,
     "website": "https://www.essent.com/SiteBuilderPro.html"
   },
-  "Essential JS 2": {
-    "cats": [
-      12,
-      59
-    ],
-    "html": "<[^>]+ class ?= ?\"(?:e-control|[^\"]+ e-control)(?: )[^\"]* e-lib\\b",
-    "icon": "syncfusion.svg",
-    "website": "https://www.syncfusion.com/javascript-ui-controls"
-  },
   "Essential Addons for Elementor": {
     "cats": [
       87
     ],
     "description": "Essential Addons for Elementor gives you 70+ creative elements and extensions to help you extend the stock features of Elementor page builder.",
-    "icon": "Essential Addons for Elementor.svg",
     "dom": "link[href*='/wp-content/uploads/essential-addons-elementor/']",
+    "icon": "Essential Addons for Elementor.svg",
     "pricing": [
       "freemium",
       "low",
@@ -763,6 +752,15 @@
     "scriptSrc": "/wp-content/uploads/essential-addons-elementor/",
     "website": "https://essential-addons.com/elementor/"
   },
+  "Essential JS 2": {
+    "cats": [
+      12,
+      59
+    ],
+    "html": "<[^>]+ class ?= ?\"(?:e-control|[^\"]+ e-control)(?: )[^\"]* e-lib\\b",
+    "icon": "syncfusion.svg",
+    "website": "https://www.syncfusion.com/javascript-ui-controls"
+  },
   "Estore Compare": {
     "cats": [
       74
@@ -857,11 +855,11 @@
       67
     ],
     "description": "Evidon is a transparency company that helps organizations educate consumers on how and why data is collected, as well as provide consumers with the ability to give and withdraw consent to their data being used.",
-    "icon": "Evidon.png",
     "dom": "a[href*='info.evidon.com/pub_info/']",
+    "icon": "Evidon.png",
     "js": {
-      "evidon": "",
-      "EB.EvidonConsent": ""
+      "EB.EvidonConsent": "",
+      "evidon": ""
     },
     "pricing": [
       "poa"
@@ -870,6 +868,26 @@
     "scriptSrc": "\\.evidon\\.com/",
     "website": "https://www.evidon.com"
   },
+  "ExactMetrics": {
+    "cats": [
+      87,
+      10
+    ],
+    "description": "ExactMetrics (formerly Google Analytics Dashboard for WP) plugin helps you properly setup all the powerful Google Analytics tracking features without writing any code or hiring a developer.",
+    "icon": "ExactMetrics.svg",
+    "js": {
+      "ExactMetrics": "",
+      "exactmetrics_frontend": ""
+    },
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/google-analytics-dashboard-for-wp/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://www.exactmetrics.com"
+  },
   "Exhibit": {
     "cats": [
       25
@@ -882,22 +900,6 @@
     "scriptSrc": "exhibit.*\\.js",
     "website": "http://simile-widgets.org/exhibit/"
   },
-  "ExoClick": {
-    "cats": [
-      36
-    ],
-    "description": "ExoClick is a Barcelona-based online advertising company, which provides online advertising services to both advertisers and publishers.",
-    "icon": "ExoClick.png",
-    "meta": {
-      "exoclick-site-verification": ""
-    },
-    "scriptSrc": "\\.exoclick\\.com/",
-    "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://www.exoclick.com"
-  },
   "ExitIntel": {
     "cats": [
       32
@@ -918,6 +920,22 @@
     "scriptSrc": "(?:get.)?exitintel\\.com",
     "website": "https://exitintelligence.com"
   },
+  "ExoClick": {
+    "cats": [
+      36
+    ],
+    "description": "ExoClick is a Barcelona-based online advertising company, which provides online advertising services to both advertisers and publishers.",
+    "icon": "ExoClick.png",
+    "meta": {
+      "exoclick-site-verification": ""
+    },
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.exoclick\\.com/",
+    "website": "https://www.exoclick.com"
+  },
   "ExpertRec": {
     "cats": [
       29
@@ -995,23 +1013,6 @@
     "scriptSrc": "ext-base\\.js",
     "website": "https://www.sencha.com"
   },
-  "Extendify": {
-    "cats": [
-      87
-    ],
-    "description": "Extendify (formerly Redux framework) is one of the most popular, advanced, and free to use option panel frameworks for WordPress themes and plugins.",
-    "icon": "Extendify.svg",
-    "meta": {
-      "framework": "^Redux ([\\d\\.]+)\\;version:\\1"
-    },
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "website": "https://extendify.com"
-  },
   "ExtendThemes Calliope": {
     "cats": [
       80
@@ -1104,6 +1105,23 @@
     "scriptSrc": "/wp-content/themes/mesmerize(?:-pro)?/",
     "website": "https://extendthemes.com/mesmerize"
   },
+  "Extendify": {
+    "cats": [
+      87
+    ],
+    "description": "Extendify (formerly Redux framework) is one of the most popular, advanced, and free to use option panel frameworks for WordPress themes and plugins.",
+    "icon": "Extendify.svg",
+    "meta": {
+      "framework": "^Redux ([\\d\\.]+)\\;version:\\1"
+    },
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "website": "https://extendify.com"
+  },
   "Extole": {
     "cats": [
       94,
@@ -1295,24 +1313,6 @@
     "scriptSrc": "secure\\.ewaypayments\\.com",
     "website": "https://www.eway.com.au/"
   },
-  "EWWW Image Optimizer": {
-    "cats": [
-      87,
-      92
-    ],
-    "description": "EWWW Image Optimizer is an image optimisation WordPress plugin designed to improve the performance of your website.",
-    "icon": "EWWW Image Optimizer.png",
-    "js": {
-      "ewww_webp_supported": ""
-    },
-    "pricing": [
-      "freemium"
-    ],
-    "oss": true,
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/ewww-image-optimizer/",
-    "website": "https://github.com/nosilver4u/ewww-image-optimizer"
-  },
   "eZ Platform": {
     "cats": [
       1,
@@ -1422,4 +1422,4 @@
     },
     "website": "https://experiencedcms.berkearas.de"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/f.json b/src/technologies/f.json
index 2b878b42c..e84a021bb 100644
--- a/src/technologies/f.json
+++ b/src/technologies/f.json
@@ -283,10 +283,10 @@
       88
     ],
     "description": "FastComet is a hosting service company from San Francisco, California.",
-    "icon": "FastComet.png",
     "dns": {
       "SOA": "\\.fcomet\\.com"
     },
+    "icon": "FastComet.png",
     "pricing": [
       "recurring",
       "payg"
@@ -433,18 +433,18 @@
       90
     ],
     "description": "Feefo is a cloud-based consumer review and rating management software.",
-    "icon": "Feefo.svg",
     "dom": "a[href*='.feefo.com/'][target='_blank'], link[href*='.feefo.com/'], img[src*='.feefo.com/']",
+    "icon": "Feefo.svg",
     "js": {
       "feefoTracker": "",
       "feefoWidget": ""
     },
-    "scriptSrc": "\\.feefo\\.com/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "\\.feefo\\.com/",
     "website": "https://www.feefo.com"
   },
   "Fera": {
@@ -595,12 +595,12 @@
     ],
     "description": "FirstHive is a full-stack customer data platform that enables consumer marketers and brands to take control of their first-party data from all sources.",
     "icon": "FirstHive.svg",
-    "scriptSrc": "firsthive\\.com/engage/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "firsthive\\.com/engage/",
     "website": "https://firsthive.com"
   },
   "FirstImpression.io": {
@@ -774,12 +774,12 @@
     "description": "Flutter is an open source framework by Google for building beautiful, natively compiled, multi-platform applications from a single codebase.",
     "icon": "Flutter.svg",
     "implies": "Dart",
-    "meta": {
-      "id": "^flutterweb-theme$"
-    },
     "js": {
       "flutterCanvasKit": ""
     },
+    "meta": {
+      "id": "^flutterweb-theme$"
+    },
     "oss": true,
     "website": "https://flutter.dev"
   },
@@ -1058,18 +1058,18 @@
       36
     ],
     "description": "FreakOut is a marketing technology company with programmatic solutions (DSP,SSP) that delivers in-feed display and video formats across global publishers.",
-    "icon": "FreakOut.png",
     "dom": "img[src*='.fout.jp/'], link[href*='.fout.jp']",
+    "icon": "FreakOut.png",
     "js": {
       "FOut": "",
-      "_fout_queue": "",
-      "_fout_jsurl": ""
+      "_fout_jsurl": "",
+      "_fout_queue": ""
     },
-    "scriptSrc": "\\.fout\\.jp/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "\\.fout\\.jp/",
     "website": "https://www.fout.co.jp"
   },
   "FreeBSD": {
diff --git a/src/technologies/g.json b/src/technologies/g.json
index 8f9981f35..6bd66a4c2 100644
--- a/src/technologies/g.json
+++ b/src/technologies/g.json
@@ -294,13 +294,15 @@
       36
     ],
     "description": "Geniee is an ad technology company.",
-    "icon": "Geniee.png",
     "dom": "img[src*='.gssprt.jp/'], link[href*='.gssprt.jp']",
     "scriptSrc": "\\.gsspcln\\.jp/",
     "saas": true,
+    "icon": "Geniee.png",
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "\\.gsspcln\\.jp/",
     "website": "https://geniee.co.jp"
   },
   "Gentoo": {
@@ -396,19 +398,19 @@
       75
     ],
     "description": "GetResponse is an email marketing app that allows you to create a mailing list and capture data onto it.",
-    "icon": "GetResponse.svg",
     "dom": "form[action*='.getresponse.com/']",
+    "icon": "GetResponse.svg",
     "js": {
       "GRAPP": "",
       "GRWF2": ""
     },
-    "scriptSrc": "\\.getresponse\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "recurring",
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.getresponse\\.com/",
     "website": "https://www.getresponse.com"
   },
   "GetSimple CMS": {
@@ -740,14 +742,14 @@
   },
   "GoDaddy": {
     "cats": [
-     88
+      88
     ],
     "description": "GoDaddy is used as a web host and domain registrar.",
-    "icon": "GoDaddy.svg",
     "dns": {
-      "SOA": "\\.domaincontrol\\.com",
-      "NS": "\\.domaincontrol\\.com"
+      "NS": "\\.domaincontrol\\.com",
+      "SOA": "\\.domaincontrol\\.com"
     },
+    "icon": "GoDaddy.svg",
     "pricing": [
       "low",
       "recurring"
@@ -760,13 +762,13 @@
       51
     ],
     "description": "GoDaddy CoBlocks is a suite of professional page building content blocks for the WordPress Gutenberg block editor.",
-    "icon": "GoDaddy.svg",
     "dom": "link[href*='/wp-content/plugins/coblocks/']",
+    "icon": "GoDaddy.svg",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
     "requires": "WordPress",
-    "oss": true,
     "scriptSrc": "/wp-content/plugins/coblocks/",
     "website": "https://github.com/godaddy-wordpress/coblocks"
   },
@@ -1070,8 +1072,8 @@
       31
     ],
     "description": "Google Hosted Libraries is a stable, reliable, high-speed, globally available content distribution network for the most popular, open-source JavaScript libraries.",
-    "icon": "Google Developers.svg",
     "dom": "link[href*='ajax.googleapis.com/ajax/libs']",
+    "icon": "Google Developers.svg",
     "scriptSrc": "ajax\\.googleapis\\.com/ajax/libs/",
     "website": "https://developers.google.com/speed/libraries"
   },
@@ -1175,9 +1177,9 @@
     "cats": [
       1
     ],
+    "dom": "[data-abuse-proto*='https://sites.google.com/']",
     "icon": "Google Sites.png",
     "url": "^https?://sites\\.google\\.com",
-    "dom": "[data-abuse-proto*='https://sites.google.com/']",
     "website": "http://sites.google.com"
   },
   "Google Tag Manager": {
@@ -1203,9 +1205,9 @@
       87
     ],
     "description": "Google Tag Manager for WordPress plugin places the GTM container code snippets onto your wordpress website so that you do not need to add this manually.",
+    "dom": "link[href*='/wp-content/plugins/duracelltomi-google-tag-manager/']",
     "icon": "Google Tag Manager for WordPress.png",
     "implies": "Google Tag Manager",
-    "dom": "link[href*='/wp-content/plugins/duracelltomi-google-tag-manager/']",
     "oss": true,
     "pricing": [
       "freemium"
@@ -1547,13 +1549,13 @@
     ],
     "description": "Growave is the all-in-one app: social login and sharing, reviews, wishlists, instagram feed, automated emails and more.",
     "icon": "Growave.svg",
-    "requires": "Shopify",
-    "saas": true,
-    "scriptSrc": "\\.socialshopwave\\.com/",
     "pricing": [
       "low",
       "recurring"
     ],
+    "requires": "Shopify",
+    "saas": true,
+    "scriptSrc": "\\.socialshopwave\\.com/",
     "website": "https://growave.io"
   },
   "GrowingIO": {
diff --git a/src/technologies/h.json b/src/technologies/h.json
index c7cd4452e..1bc5f9389 100644
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@@ -61,19 +61,6 @@
     "icon": "HP.svg",
     "website": "http://hp.com"
   },
-  "HrFlow.ai": {
-    "cats": [
-      19
-    ],
-    "description": "HrFlow.ai is an HR data automation API platform.",
-    "icon": "HrFlow.ai.svg",
-    "scriptSrc": "\\.hrflow\\.ai",
-    "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://hrflow.ai"
-  },
   "HTTP/2": {
     "cats": [
       19
@@ -287,44 +274,44 @@
     "requires": "WordPress",
     "website": "https://elementor.com/hello-theme/"
   },
-  "HelpDocs": {
+  "Help Scout": {
     "cats": [
-      4,
-      19
+      13,
+      52
     ],
-    "description": "HelpDocs is an knowledge management system.",
-    "icon": "HelpDocs.svg",
+    "description": "Help Scout is a customer service platform including email, a knowledge base tool and live chat.",
+    "icon": "Help Scout.svg",
     "js": {
-      "HDAnalytics": "\\;confidence:25",
-      "HDUtils": "\\;confidence:25",
-      "hd_instant_search": "\\;confidence:50"
+      "__onBeaconDestroy": "\\;confidence:25",
+      "beaconStore": "\\;confidence:25"
     },
     "pricing": [
       "low",
       "recurring"
     ],
     "saas": true,
-    "scriptSrc": "cdn\\.helpdocs\\.io",
-    "website": "https://www.helpdocs.io"
+    "scriptSrc": "\\.helpscout\\.net/",
+    "website": "https://www.helpscout.com"
   },
-  "Help Scout": {
+  "HelpDocs": {
     "cats": [
-      13,
-      52
+      4,
+      19
     ],
-    "description": "Help Scout is a customer service platform including email, a knowledge base tool and live chat.",
-    "icon": "Help Scout.svg",
+    "description": "HelpDocs is an knowledge management system.",
+    "icon": "HelpDocs.svg",
     "js": {
-      "beaconStore": "\\;confidence:25",
-      "__onBeaconDestroy": "\\;confidence:25"
+      "HDAnalytics": "\\;confidence:25",
+      "HDUtils": "\\;confidence:25",
+      "hd_instant_search": "\\;confidence:50"
     },
     "pricing": [
       "low",
       "recurring"
     ],
     "saas": true,
-    "scriptSrc": "\\.helpscout\\.net/",
-    "website": "https://www.helpscout.com"
+    "scriptSrc": "cdn\\.helpdocs\\.io",
+    "website": "https://www.helpdocs.io"
   },
   "Hermes": {
     "cats": [
@@ -370,26 +357,6 @@
     "url": "\\.herokuapp\\.com",
     "website": "https://www.heroku.com/"
   },
-  "Hetzner": {
-    "cats": [
-      88,
-      62
-    ],
-    "description": "Hetzner provides dedicated hosting, shared web hosting, virtual private servers, managed servers, domain names, SSL certificates, storage boxes, and cloud.",
-    "icon": "Hetzner.svg",
-    "headers": {
-      "X-Powered-By": "Hetzner"
-    },
-    "dns": {
-      "SOA": "\\.hetzner\\.com",
-      "NS": "\\.ns\\.hetzner\\.com"
-    },
-    "pricing": [
-      "payg",
-      "recurring"
-    ],
-    "website": "https://www.hetzner.com"
-  },
   "Hestia": {
     "cats": [
       80
@@ -410,6 +377,26 @@
     "scriptSrc": "themes/hestia.*\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
     "website": "https://themeisle.com/themes/hestia/"
   },
+  "Hetzner": {
+    "cats": [
+      88,
+      62
+    ],
+    "description": "Hetzner provides dedicated hosting, shared web hosting, virtual private servers, managed servers, domain names, SSL certificates, storage boxes, and cloud.",
+    "dns": {
+      "NS": "\\.ns\\.hetzner\\.com",
+      "SOA": "\\.hetzner\\.com"
+    },
+    "headers": {
+      "X-Powered-By": "Hetzner"
+    },
+    "icon": "Hetzner.svg",
+    "pricing": [
+      "payg",
+      "recurring"
+    ],
+    "website": "https://www.hetzner.com"
+  },
   "Hexo": {
     "cats": [
       57
@@ -529,15 +516,15 @@
       10
     ],
     "description": "Histats is a simple website visitor analysis and tracking tool.",
-    "icon": "Histats.png",
     "dom": "img[src*='.histats.com/']",
+    "icon": "Histats.png",
     "js": {
       "Histats.ver": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "saas": true,
     "pricing": [
       "freemium"
     ],
+    "saas": true,
     "website": "https://www.histats.com"
   },
   "History": {
@@ -592,95 +579,95 @@
     "saas": true,
     "website": "https://www.homestead.com"
   },
-  "Hostgator": {
+  "HostEurope": {
     "cats": [
       88
     ],
-    "description": "HostGator is a Houston-based provider of shared, reseller, virtual private server, and dedicated web hosting with an additional presence in Austin, Texas.",
-    "icon": "Hostgator.svg",
+    "description": "HostEurope is a European website hosting, email and domain name registrar company headquartered Hayes, West London.",
     "dns": {
-      "SOA": "\\.hostgator\\.com"
+      "SOA": "\\.hosteurope\\.com"
     },
+    "icon": "HostEurope.png",
     "pricing": [
       "low",
       "recurring"
     ],
-    "website": "https://www.hostgator.com"
+    "website": "https://www.hosteurope.de"
   },
-  "Hostinger": {
+  "Hostens": {
     "cats": [
       88
     ],
-    "description": "Hostinger is an employee-owned Web hosting provider and internet domain registrar.",
-    "icon": "Hostinger.svg",
+    "description": "Hostens is a web hosting company specialising in hosting services, virtual private server hosting, and the domain name or transition.",
     "dns": {
-      "SOA": "\\.(?:dns-parking|hostinger)\\.com"
+      "SOA": "\\.hostens\\.com"
     },
+    "icon": "Hostens.svg",
     "pricing": [
       "low",
       "recurring"
     ],
-    "website": "https://www.hostinger.com"
+    "website": "https://www.hostens.com"
   },
-  "HostEurope": {
+  "Hostgator": {
     "cats": [
       88
     ],
-    "description": "HostEurope is a European website hosting, email and domain name registrar company headquartered Hayes, West London.",
-    "icon": "HostEurope.png",
+    "description": "HostGator is a Houston-based provider of shared, reseller, virtual private server, and dedicated web hosting with an additional presence in Austin, Texas.",
     "dns": {
-      "SOA": "\\.hosteurope\\.com"
+      "SOA": "\\.hostgator\\.com"
     },
+    "icon": "Hostgator.svg",
     "pricing": [
       "low",
       "recurring"
-    ],  
-    "website": "https://www.hosteurope.de"
+    ],
+    "website": "https://www.hostgator.com"
   },
   "Hosting Ukraine": {
     "cats": [
       88
     ],
     "description": "Hosting Ukraine is a web hosting provider and internet domain registrar.",
-    "icon": "Hosting Ukraine.png",
     "dns": {
       "SOA": "ns\\d+\\.ukraine\\.com\\.ua"
     },
+    "icon": "Hosting Ukraine.png",
     "pricing": [
       "low",
       "recurring"
     ],
     "website": "https://www.ukraine.com.ua"
   },
-  "Hostiq": {
+  "Hostinger": {
     "cats": [
       88
     ],
-    "description": "Hostiq is a web hosting provider and internet domain registrar.",
-    "icon": "Hostiq.png",
+    "description": "Hostinger is an employee-owned Web hosting provider and internet domain registrar.",
     "dns": {
-      "SOA": "\\.hostiq\\.ua"
+      "SOA": "\\.(?:dns-parking|hostinger)\\.com"
     },
+    "icon": "Hostinger.svg",
     "pricing": [
       "low",
       "recurring"
     ],
-    "website": "https://hostiq.ua"
+    "website": "https://www.hostinger.com"
   },
-  "Hostens": {
+  "Hostiq": {
     "cats": [
       88
     ],
-    "description": "Hostens is a web hosting company specialising in hosting services, virtual private server hosting, and the domain name or transition.",
-    "icon": "Hostens.svg",
+    "description": "Hostiq is a web hosting provider and internet domain registrar.",
     "dns": {
-      "SOA": "\\.hostens\\.com"
+      "SOA": "\\.hostiq\\.ua"
     },
+    "icon": "Hostiq.png",
     "pricing": [
       "low",
       "recurring"
     ],
-    "website": "https://www.hostens.com"
+    "website": "https://hostiq.ua"
   },
   "Hostmeapp": {
     "cats": [
@@ -702,10 +689,10 @@
       88
     ],
     "description": "Hostpoint is a Switzerland-based web hosting company.",
-    "icon": "Hostpoint.svg",
     "dns": {
       "SOA": "\\.hostpoint\\.ch"
     },
+    "icon": "Hostpoint.svg",
     "pricing": [
       "low",
       "recurring"
@@ -737,13 +724,13 @@
       "HotleadController": "",
       "hj.apiUrlBase": ""
     },
-    "scriptSrc": "//static\\.hotjar\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "//static\\.hotjar\\.com/",
     "website": "https://www.hotjar.com"
   },
   "Hotjar Incoming Feedback": {
@@ -751,8 +738,8 @@
       5
     ],
     "description": "Hotjar Incoming Feedback is a widget that sits at the edge of a page.",
-    "icon": "Hotjar.svg",
     "dom": "a[href*='hotjar.com/incoming-feedback'][target='_blank']",
+    "icon": "Hotjar.svg",
     "scriptSrc": "\\.hotjar\\.com/preact-incoming-feedback",
     "website": "https://www.hotjar.com"
   },
@@ -774,6 +761,19 @@
     ],
     "website": "https://howlerjs.com"
   },
+  "HrFlow.ai": {
+    "cats": [
+      19
+    ],
+    "description": "HrFlow.ai is an HR data automation API platform.",
+    "icon": "HrFlow.ai.svg",
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.hrflow\\.ai",
+    "website": "https://hrflow.ai"
+  },
   "HubSpot": {
     "cats": [
       32
@@ -1003,8 +1003,8 @@
       13
     ],
     "description": "Hund.io is an automated status pages with monitoring.",
-    "icon": "Hund.io.svg",
     "dom": "link[href*='hund-client-logos']",
+    "icon": "Hund.io.svg",
     "pricing": [
       "recurring",
       "payg"
@@ -1083,4 +1083,4 @@
     "scriptSrc": "merchant\\.cdn\\.hoolah\\.co/",
     "website": "https://www.hoolah.co"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/i.json b/src/technologies/i.json
index ebadcf911..d3c16af32 100644
--- a/src/technologies/i.json
+++ b/src/technologies/i.json
@@ -1,20 +1,4 @@
 {
-  "Iamport": {
-    "cats": [
-      41
-    ],
-    "description": "Iamport is an information technology company based in South Korea.",
-    "icon": "Iamport.png",
-    "js": {
-      "IMP.request_pay": ""
-    },
-    "scriptSrc": "cdn\\.iamport\\.kr/js/iamport\\.payment-([\\d\\.]+)\\.js\\;version:\\1",
-    "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://www.iamport.kr"
-  },
   "IBM Coremetrics": {
     "cats": [
       10
@@ -72,6 +56,21 @@
     "scriptSrc": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
     "website": "https://www.infonline.de"
   },
+  "IONOS": {
+    "cats": [
+      88
+    ],
+    "description": "IONOS is the web hosting and cloud partner for small and medium-sized businesses.",
+    "dns": {
+      "SOA": "ns1\\d+\\.ui-dns\\.(?:de|org|biz|com)"
+    },
+    "icon": "IONOS.svg",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "website": "https://www.ionos.com"
+  },
   "IPB": {
     "cats": [
       2
@@ -104,6 +103,22 @@
     "website": "https://www.ipinfodb.com/",
     "xhr": "api\\.ipinfodb\\.com"
   },
+  "Iamport": {
+    "cats": [
+      41
+    ],
+    "description": "Iamport is an information technology company based in South Korea.",
+    "icon": "Iamport.png",
+    "js": {
+      "IMP.request_pay": ""
+    },
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scriptSrc": "cdn\\.iamport\\.kr/js/iamport\\.payment-([\\d\\.]+)\\.js\\;version:\\1",
+    "website": "https://www.iamport.kr"
+  },
   "Ideasoft": {
     "cats": [
       6
@@ -158,24 +173,6 @@
     "scriptSrc": "template-assets\\.iluria\\.com/commons/",
     "website": "https://www.iluria.com.br"
   },
-  "Imagely NextGEN Gallery": {
-    "cats": [
-      87,
-      7
-    ],
-    "description": "NextGEN Gallery is a WordPress gallery plugin maintained by Imagely.",
-    "icon": "Imagely.png",
-    "dom": "link[href*='/wp-content/plugins/nextgen-gallery/']",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring",
-      "onetime"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/nextgen-gallery(?:-pro|-plus)?/",
-    "website": "https://www.imagely.com/wordpress-gallery-plugin"
-  },
   "Image Relay": {
     "cats": [
       95
@@ -193,6 +190,24 @@
     "scriptSrc": "static\\.imagerelay\\.com/",
     "website": "https://www.imagerelay.com"
   },
+  "Imagely NextGEN Gallery": {
+    "cats": [
+      87,
+      7
+    ],
+    "description": "NextGEN Gallery is a WordPress gallery plugin maintained by Imagely.",
+    "dom": "link[href*='/wp-content/plugins/nextgen-gallery/']",
+    "icon": "Imagely.png",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring",
+      "onetime"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/nextgen-gallery(?:-pro|-plus)?/",
+    "website": "https://www.imagely.com/wordpress-gallery-plugin"
+  },
   "Immutable.js": {
     "cats": [
       59
@@ -205,20 +220,6 @@
     "scriptSrc": "^immutable\\.(?:min\\.)?js$",
     "website": "https://facebook.github.io/immutable-js/"
   },
-  "i-mobile": {
-    "cats": [
-      36
-    ],
-    "description": "i-mobile is a advertising platform for clients to advertise their product and for publishers to monetize their cyberspace.",
-    "icon": "i-mobile.png",
-    "dom": "img[src*='.i-mobile.co.jp/']",
-    "scriptSrc": "\\.i-mobile\\.co\\.jp/",
-    "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "http://www2.i-mobile.co.jp"
-  },
   "Impact": {
     "cats": [
       71
@@ -274,18 +275,6 @@
     },
     "website": "http://impresspages.org"
   },
-  "i-MSCP": {
-    "cats": [
-      9
-    ],
-    "description": "i-MSCP (internet Multi Server Control Panel) is a software for shared hosting environments management on Linux servers.",
-    "icon": "i-MSCP.png",
-    "meta": {
-      "application-name": "^i-MSCP$"
-    },
-    "oss": true,
-    "website": "https://github.com/i-MSCP/imscp"
-  },
   "Imweb": {
     "cats": [
       6
@@ -411,11 +400,11 @@
       "infolinks_pid": "",
       "infolinks_wsid": ""
     },
-    "saas": true,
     "pricing": [
       "payg",
       "freemium"
     ],
+    "saas": true,
     "website": "https://www.infolinks.com"
   },
   "Infomaniak": {
@@ -423,10 +412,10 @@
       88
     ],
     "description": "Infomaniak is a hosting company based in Geneva, Switzerland.",
-    "icon": "Infomaniak.svg",
     "dns": {
       "SOA": "\\.infomaniak\\.ch"
     },
+    "icon": "Infomaniak.svg",
     "pricing": [
       "low",
       "recurring"
@@ -573,13 +562,13 @@
       36
     ],
     "description": "Integral Ad Science is an American publicly owned technology company that analyses the value of digital advertising placements.",
-    "icon": "Integral Ad Science.svg",
     "dom": "link[href*='.adsafeprotected.com']",
-    "scriptSrc": "\\.adsafeprotected\\.com/",
-    "saas": true,
+    "icon": "Integral Ad Science.svg",
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "\\.adsafeprotected\\.com/",
     "website": "https://integralads.com"
   },
   "Intel Active Management Technology": {
@@ -680,12 +669,12 @@
     "meta": {
       "author": "^Inventrue, LLC.$"
     },
-    "saas": true,
     "pricing": [
       "onetime",
       "recurring",
       "poa"
     ],
+    "saas": true,
     "website": "https://www.inventrue.com"
   },
   "Inveon": {
@@ -725,21 +714,6 @@
     "icon": "Ionicons.png",
     "website": "http://ionicons.com"
   },
-  "IONOS": {
-    "cats": [
-      88
-    ],
-    "description": "IONOS is the web hosting and cloud partner for small and medium-sized businesses.",
-    "icon": "IONOS.svg",
-    "dns": {
-      "SOA": "ns1\\d+\\.ui-dns\\.(?:de|org|biz|com)"
-    },
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://www.ionos.com"
-  },
   "Irroba": {
     "cats": [
       6
@@ -772,18 +746,18 @@
       5
     ],
     "description": "Issuu is a digital discovery and publishing platform.",
-    "icon": "Issuu.svg",
     "dom": "a[href*='issuu.com/'][target='_blank']",
+    "icon": "Issuu.svg",
     "js": {
       "IssuuReaders": "",
       "issuuPanel": ""
     },
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "scriptSrc": "\\.issuu\\.com/",
     "website": "https://issuu.com"
   },
@@ -821,6 +795,32 @@
     "scriptSrc": "cdn\\.izooto\\.\\w+",
     "website": "https://www.izooto.com"
   },
+  "i-MSCP": {
+    "cats": [
+      9
+    ],
+    "description": "i-MSCP (internet Multi Server Control Panel) is a software for shared hosting environments management on Linux servers.",
+    "icon": "i-MSCP.png",
+    "meta": {
+      "application-name": "^i-MSCP$"
+    },
+    "oss": true,
+    "website": "https://github.com/i-MSCP/imscp"
+  },
+  "i-mobile": {
+    "cats": [
+      36
+    ],
+    "description": "i-mobile is a advertising platform for clients to advertise their product and for publishers to monetize their cyberspace.",
+    "dom": "img[src*='.i-mobile.co.jp/']",
+    "icon": "i-mobile.png",
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.i-mobile\\.co\\.jp/",
+    "website": "http://www2.i-mobile.co.jp"
+  },
   "iEXExchanger": {
     "cats": [
       1
@@ -853,6 +853,23 @@
     },
     "website": "http://ipresta.ir"
   },
+  "iThemes Security": {
+    "cats": [
+      87,
+      16
+    ],
+    "description": " iThemes Security(formerly known as Better WP Security) plugin enhances the security and protection of your WordPress website.",
+    "dom": "link[href*='/wp-content/plugins/better-wp-security/']",
+    "icon": "iThemes Security.svg",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/better-wp-security/",
+    "website": "https://ithemes.com/security"
+  },
   "iWeb": {
     "cats": [
       20
@@ -1009,23 +1026,6 @@
     "website": "https://ipstack.com",
     "xhr": "api\\.ipstack\\.com"
   },
-  "iThemes Security": {
-    "cats": [
-      87,
-      16
-    ],
-    "description": " iThemes Security(formerly known as Better WP Security) plugin enhances the security and protection of your WordPress website.",
-    "icon": "iThemes Security.svg",
-    "dom": "link[href*='/wp-content/plugins/better-wp-security/']",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/better-wp-security/",
-    "website": "https://ithemes.com/security"
-  },
   "iubenda": {
     "cats": [
       67
diff --git a/src/technologies/j.json b/src/technologies/j.json
index 7b3dc0958..53dbf4960 100644
--- a/src/technologies/j.json
+++ b/src/technologies/j.json
@@ -467,16 +467,16 @@
     ],
     "description": "JuicyAds is a legitimate advertising network that specializes in adult content.",
     "icon": "JuicyAds.png",
-    "meta": {
-      "juicyads-site-verification": ""
-    },
     "js": {
       "adsbyjuicy": ""
     },
-    "saas": true,
+    "meta": {
+      "juicyads-site-verification": ""
+    },
     "pricing": [
       "payg"
     ],
+    "saas": true,
     "website": "https://www.juicyads.com"
   },
   "Jumbo": {
diff --git a/src/technologies/k.json b/src/technologies/k.json
index ee6ad965a..ca34f9f77 100644
--- a/src/technologies/k.json
+++ b/src/technologies/k.json
@@ -105,8 +105,8 @@
       80
     ],
     "description": "Vogue is a very easy to use multipurpose WordPress theme created by Kaira.",
-    "icon": "Kaira.png",
     "dom": "link#vogue-style-css",
+    "icon": "Kaira.png",
     "pricing": [
       "freemium",
       "onetime"
@@ -137,8 +137,8 @@
       19
     ],
     "description": "Kakao platform provides various services such as Kakao Talk, Kakao Talk Channel, Kakao Story as well as Kakao Pay, Kakao Commerce, Kakao Page provided by the subsidiaries. Users can use all Kakao platform services with a united account called Kakao Account.",
-    "icon": "Kakao.svg",
     "dom": "a[href*='.kakao.com/'][target='_blank']",
+    "icon": "Kakao.svg",
     "js": {
       "Kakao.VERSION": "^([\\d\\.]+)$\\;version:\\1"
     },
@@ -426,8 +426,8 @@
       87
     ],
     "description": "Kirki Customizer Framework is a toolkit allowing WordPress developers to use the Customizer and take advantage of its advanced features and flexibility by abstracting the code.",
-    "icon": "Kirki Customizer Framework.png",
     "dom": "link[href*='/wp-content/plugins/kirki/']",
+    "icon": "Kirki Customizer Framework.png",
     "pricing": [
       "freemium",
       "poa"
@@ -505,16 +505,16 @@
     "description": "Klaro is a simple consent management platform and privacy tool.",
     "icon": "Klaro.png",
     "js": {
-      "klaroConfig": "",
-      "klaro": ""
+      "klaro": "",
+      "klaroConfig": ""
     },
-    "saas": true,
     "oss": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://heyklaro.com"
   },
   "Klasha": {
diff --git a/src/technologies/l.json b/src/technologies/l.json
index 793614178..6bc0dd3c6 100644
--- a/src/technologies/l.json
+++ b/src/technologies/l.json
@@ -11,6 +11,18 @@
     },
     "website": "http://www.lepton-cms.org"
   },
+  "LINE Login": {
+    "cats": [
+      69
+    ],
+    "description": "LINE Login is an API that allows you to implement a login function into your services, regardless of whether they are web apps or native apps.",
+    "dom": "a[href*='access.line.me/']",
+    "icon": "LINE.svg",
+    "js": {
+      "Constants.authorization_request_url": "access\\.line\\.me/oauth2/v([\\d\\.]+)/\\;version:\\1"
+    },
+    "website": "https://developers.line.biz/en/services/line-login/"
+  },
   "LKQD": {
     "cats": [
       36
@@ -185,6 +197,19 @@
     "scriptSrc": "/__layer0__/cache-manifest\\.js",
     "website": "https://www.layer0.co"
   },
+  "LazySizes": {
+    "cats": [
+      59
+    ],
+    "description": "LazySizes is a JavaScript library used to delay the loading of images (iframes, scripts, etc) until they come into view.",
+    "icon": "default.svg",
+    "js": {
+      "lazySizes": "",
+      "lazySizesConfig": ""
+    },
+    "oss": true,
+    "website": "https://github.com/aFarkas/lazysizes"
+  },
   "Leadinfo": {
     "cats": [
       10
@@ -203,19 +228,6 @@
     "scriptSrc": "cdn\\.leadinfo\\.net",
     "website": "https://www.leadinfo.com"
   },
-  "LazySizes": {
-    "cats": [
-      59
-    ],
-    "description": "LazySizes is a JavaScript library used to delay the loading of images (iframes, scripts, etc) until they come into view.",
-    "icon": "default.svg",
-    "js": {
-      "lazySizes": "",
-      "lazySizesConfig": ""
-    },
-    "oss": true,
-    "website": "https://github.com/aFarkas/lazysizes"
-  },
   "Leaflet": {
     "cats": [
       35
@@ -253,10 +265,10 @@
       88
     ],
     "description": "Leaseweb is an Infrastructure-as-a-Service (IaaS) provider offering dedicated servers, CDN, cloud hosting and hybrid cloud on a global network.",
-    "icon": "Leaseweb.svg",
     "dns": {
       "SOA": "\\.leaseweb\\.nl"
     },
+    "icon": "Leaseweb.svg",
     "pricing": [
       "payg",
       "recurring"
@@ -327,14 +339,14 @@
     ],
     "description": "Level 5 is a page builder constructed with WordPress and powered with WP Engine hosting featuring advanced caching and performance optimisation.",
     "icon": "Level 5.png",
-    "requires": "WordPress",
     "js": {
       "l5_inventory_url": ""
     },
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "requires": "WordPress",
+    "saas": true,
     "website": "https://level5advertising.com/websites/"
   },
   "Liferay": {
@@ -439,26 +451,14 @@
     "scriptSrc": "\\.limechat\\.ai/",
     "website": "https://www.limechat.ai"
   },
-  "LINE Login": {
-    "cats": [
-      69
-    ],
-    "description": "LINE Login is an API that allows you to implement a login function into your services, regardless of whether they are web apps or native apps.",
-    "icon": "LINE.svg",
-    "js": {
-      "Constants.authorization_request_url": "access\\.line\\.me/oauth2/v([\\d\\.]+)/\\;version:\\1"
-    },
-    "dom": "a[href*='access.line.me/']",
-    "website": "https://developers.line.biz/en/services/line-login/"
-  },
   "Limit Login Attempts Reloaded": {
     "cats": [
       87,
       16
     ],
     "description": "Limit Login Attempts Reloaded stops brute-force attacks and optimizes your site performance by limiting the number of login attempts that are possible through the normal login as well as XMLRPC, Woocommerce and custom login pages.",
-    "icon": "Limit Login Attempts Reloaded.png",
     "dom": "link#llar-login-page-styles-css",
+    "icon": "Limit Login Attempts Reloaded.png",
     "pricing": [
       "freemium",
       "low",
@@ -511,13 +511,13 @@
       88
     ],
     "description": "Liquid Web is a US-based host offering premium managed web hosting solutions.",
-    "icon": "Liquid Web.svg",
-    "headers": {
-      "x-lw-cache": ""
-    },
     "dns": {
       "SOA": "\\.liquidweb\\.com"
     },
+    "headers": {
+      "x-lw-cache": ""
+    },
+    "icon": "Liquid Web.svg",
     "pricing": [
       "mid",
       "recurring"
@@ -696,9 +696,21 @@
       "payg"
     ],
     "saas": true,
-    "scriptSrc": "\\.(?:liveperson|contactatonce)?\\.(?:com|net|co\\.uk)\/",
+    "scriptSrc": "\\.(?:liveperson|contactatonce)?\\.(?:com|net|co\\.uk)/",
     "website": "https://www.liveperson.com"
   },
+  "LiveRamp DPM": {
+    "cats": [
+      36
+    ],
+    "description": "LiveRamp DPM is a TV advertising metrics and analytics platform.",
+    "icon": "LiveRamp.svg",
+    "js": {
+      "dpmComscoreVars": ""
+    },
+    "scriptSrc": "c\\.tvpixel\\.com/js/current/dpm_pixel_min\\.js",
+    "website": "https://liveramp.com/data-plus-math"
+  },
   "LiveRamp PCM": {
     "cats": [
       67
@@ -712,18 +724,6 @@
     "scriptSrc": "gdpr\\.privacymanager\\.io",
     "website": "https://liveramp.com/our-platform/preference-consent-management"
   },
-  "LiveRamp DPM": {
-    "cats": [
-      36
-    ],
-    "description": "LiveRamp DPM is a TV advertising metrics and analytics platform.",
-    "icon": "LiveRamp.svg",
-    "js": {
-      "dpmComscoreVars": ""
-    },
-    "scriptSrc": "c\\.tvpixel\\.com/js/current/dpm_pixel_min\\.js",
-    "website": "https://liveramp.com/data-plus-math"
-  },
   "LiveStreet CMS": {
     "cats": [
       1
@@ -1155,18 +1155,18 @@
       10
     ],
     "description": "Lucky Orange is a conversion optimisation tool with features including heatmaps, session recording, conversion funnels, form analytics, and chat.",
-    "icon": "Lucky Orange.svg",
     "dom": "link[href*='.luckyorange.com']",
+    "icon": "Lucky Orange.svg",
     "js": {
       "__wtw_lucky_site_id": ""
     },
-    "scriptSrc": "\\.luckyorange\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "\\.luckyorange\\.com/",
     "website": "https://www.luckyorange.com"
   },
   "Luigi’s Box": {
@@ -1236,4 +1236,4 @@
     "icon": "lighttpd.png",
     "website": "http://www.lighttpd.net"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/m.json b/src/technologies/m.json
index a4e3f98cb..175781c72 100644
--- a/src/technologies/m.json
+++ b/src/technologies/m.json
@@ -14,17 +14,6 @@
     "saas": true,
     "website": "https://maak-code.ir"
   },
-  "MainAd": {
-    "cats": [
-      36
-    ],
-    "description": "MainAd is an international advertising technology company specialising in real-time bidding and programmatic ad retargeting.",
-    "icon": "MainAd.svg",
-    "dom": "iframe[src*='.mainadv.com/']",
-    "saas": true,
-    "scriptSrc": "\\.mainadv\\.com/",
-    "website": "https://www.mainad.com"
-  },
   "MAJIN": {
     "cats": [
       32
@@ -155,19 +144,19 @@
     },
     "cpe": "cpe:/a:magento:magento",
     "description": "Magento is an open-source ecommerce platform written in PHP.",
-    "icon": "Magento.svg",
-    "implies": [
-      "PHP",
-      "MySQL"
-    ],
     "dom": {
-      "script[type='text/x-magento-init']": {
-        "exists": ""
-      },
       "script[data-requiremodule*='mage'], script[data-requiremodule*='Magento_'], html[data-image-optimizing-origin]": {
         "exists": "\\;version:2"
+      },
+      "script[type='text/x-magento-init']": {
+        "exists": ""
       }
     },
+    "icon": "Magento.svg",
+    "implies": [
+      "PHP",
+      "MySQL"
+    ],
     "js": {
       "Mage": "",
       "VarienForm": ""
@@ -214,15 +203,29 @@
     ],
     "website": "http://mailchimp.com"
   },
+  "MailChimp for WooCommerce": {
+    "cats": [
+      87
+    ],
+    "description": "MailChimp for WooCommerce gives you the ability to automatically sync customer purchase data to your MailChimp account.",
+    "icon": "mailchimp.svg",
+    "implies": "MailChimp",
+    "pricing": [
+      "freemium"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/mailchimp-for-woocommerce/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://mailchimp.com/integrations/woocommerce"
+  },
   "MailChimp for WordPress": {
     "cats": [
       87,
       32
     ],
     "description": "MailChimp for WordPress is an email marketing plugin that enables you to build subscriber lists.",
+    "dom": "link[href*='/wp-content/plugins/mailchimp-for-wp/']",
     "icon": "MailChimp for WordPress.png",
     "implies": "MailChimp",
-    "dom": "link[href*='/wp-content/plugins/mailchimp-for-wp/']",
     "js": {
       "mc4wp": ""
     },
@@ -235,20 +238,6 @@
     "scriptSrc": "/wp-content/plugins/mailchimp-for-wp/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://www.mc4wp.com"
   },
-  "MailChimp for WooCommerce": {
-    "cats": [
-      87
-    ],
-    "description": "MailChimp for WooCommerce gives you the ability to automatically sync customer purchase data to your MailChimp account.",
-    "icon": "mailchimp.svg",
-    "implies": "MailChimp",
-    "pricing": [
-      "freemium"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/mailchimp-for-woocommerce/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://mailchimp.com/integrations/woocommerce"
-  },
   "Mailgun": {
     "cats": [
       75
@@ -283,17 +272,28 @@
     "description": "Mailmunch is a lead generation tool that combines landing pages, forms, and email marketing.",
     "icon": "Mailmunch.svg",
     "js": {
-      "mailmunch": "",
-      "MailMunchWidgets": ""
+      "MailMunchWidgets": "",
+      "mailmunch": ""
     },
-    "saas": true,
     "pricing": [
       "low",
       "recurring",
       "freemium"
     ],
+    "saas": true,
     "website": "https://www.mailmunch.com"
   },
+  "MainAd": {
+    "cats": [
+      36
+    ],
+    "description": "MainAd is an international advertising technology company specialising in real-time bidding and programmatic ad retargeting.",
+    "dom": "iframe[src*='.mainadv.com/']",
+    "icon": "MainAd.svg",
+    "saas": true,
+    "scriptSrc": "\\.mainadv\\.com/",
+    "website": "https://www.mainad.com"
+  },
   "Make-Sense": {
     "cats": [
       68
@@ -410,14 +410,14 @@
       10
     ],
     "description": "Marchex is a B2B call and conversational analytics company.",
-    "icon": "Marchex.png",
     "dom": "link[href*='.marchex.io']",
-    "scriptSrc": "\\.marchex\\.io/",
-    "saas": true,
+    "icon": "Marchex.png",
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "\\.marchex\\.io/",
     "website": "https://www.marchex.com"
   },
   "MariaDB": {
@@ -710,10 +710,10 @@
       36
     ],
     "description": "Media.net is an advertising company focused on providing monetization products to digital publishers.",
-    "icon": "Media.net.svg",
     "dom": "link[href*='.media.net']",
-    "scriptSrc": "\\.media\\.net/",
+    "icon": "Media.net.svg",
     "saas": true,
+    "scriptSrc": "\\.media\\.net/",
     "website": "https://www.media.net"
   },
   "MediaElement.js": {
@@ -808,11 +808,11 @@
     "js": {
       "megacounter_key": ""
     },
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://megagroup.ru/cms"
   },
   "Melis Platform": {
@@ -941,8 +941,8 @@
       87
     ],
     "description": "MetaSlider is a WordPress plugin for adding responsive sliders and carousels to websites.",
-    "icon": "MetaSlider.svg",
     "dom": "link[href*='/wp-content/plugins/ml-slider/'], link#metaslider-pro-public-css",
+    "icon": "MetaSlider.svg",
     "pricing": [
       "freemium",
       "low",
@@ -1075,8 +1075,8 @@
       "_uetvid": "\\w+"
     },
     "description": "Microsoft Advertising is an online advertising platform developed by Microsoft.",
-    "icon": "Microsoft.svg",
     "dom": "link[href*='.bing.com']",
+    "icon": "Microsoft.svg",
     "js": {
       "UET": "",
       "uetq": ""
@@ -1288,10 +1288,10 @@
       88
     ],
     "description": "Mittwald is a web hosting agency, established in 2003 in Espelkamp, Germany",
-    "icon": "Mittwald.svg",
     "dns": {
       "SOA": "ns\\d+\\.agenturserver\\.(?:de|co|it)"
     },
+    "icon": "Mittwald.svg",
     "pricing": [
       "low",
       "recurring"
@@ -1728,11 +1728,11 @@
     "js": {
       "Pastease": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
     "scriptSrc": "deploy\\.mopinion\\.com/",
     "website": "https://mopinion.com"
   },
@@ -2257,4 +2257,4 @@
     ],
     "website": "https://code.google.com/p/modwsgi"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/n.json b/src/technologies/n.json
index 386b6d588..8087b6c09 100644
--- a/src/technologies/n.json
+++ b/src/technologies/n.json
@@ -118,19 +118,19 @@
       36
     ],
     "description": "Nativo is an advertising technology provider.",
-    "icon": "Nativo.png",
     "dom": "link[href*='.postrelease.com/'], img[src*='.postrelease.com/']",
+    "icon": "Nativo.png",
     "js": {
       "ntvConfig": ""
     },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
     "scriptSrc": [
       "\\.ntv\\.io/",
       "\\.postrelease\\.com/"
     ],
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
     "website": "https://www.nativo.com"
   },
   "Navegg": {
@@ -181,10 +181,10 @@
       88
     ],
     "description": "Nestify is a fully managed WordPress hosting platform that runs on AWS graviton processors.",
-    "icon": "Nestify.png",
     "headers": {
       "x-nestify-cache": ""
     },
+    "icon": "Nestify.png",
     "pricing": [
       "recurring",
       "payg"
@@ -420,8 +420,8 @@
       87
     ],
     "description": "Ninja Forms is the WordPress form builder.",
-    "icon": "Ninja Forms.svg",
     "dom": "link[href*='/wp-content/plugins/ninja-forms/']",
+    "icon": "Ninja Forms.svg",
     "js": {
       "nfForms": ""
     },
@@ -445,6 +445,20 @@
     },
     "website": "https://nitropack.io/"
   },
+  "NoFraud": {
+    "cats": [
+      16
+    ],
+    "description": "NoFraud is a fraud prevention solution for ecommerce businesses.",
+    "icon": "NoFraud.svg",
+    "pricing": [
+      "poa"
+    ],
+    "requiresCategory": 6,
+    "saas": true,
+    "scriptSrc": "services\\.nofraud\\.com/",
+    "website": "https://www.nofraud.com"
+  },
   "Noddus": {
     "cats": [
       10,
@@ -481,20 +495,6 @@
     "scriptSrc": "^/nodebb\\.min\\.js\\?",
     "website": "https://nodebb.org"
   },
-  "NoFraud": {
-    "cats": [
-      16
-    ],
-    "description": "NoFraud is a fraud prevention solution for ecommerce businesses.",
-    "icon": "NoFraud.svg",
-    "scriptSrc": "services\\.nofraud\\.com/",
-    "requiresCategory": 6,
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.nofraud.com"
-  },
   "Norton Shopping Guarantee": {
     "cats": [
       16
diff --git a/src/technologies/o.json b/src/technologies/o.json
index e0a6701c6..8c47525cd 100644
--- a/src/technologies/o.json
+++ b/src/technologies/o.json
@@ -1,4 +1,20 @@
 {
+  "OVHcloud": {
+    "cats": [
+      62,
+      88
+    ],
+    "description": "OVHcloud is a global, cloud provider delivering hosted private cloud, public cloud, and dedicated server solutions.",
+    "dns": {
+      "NS": "\\d+\\.ovh\\.net",
+      "SOA": "\\d+\\.ovh\\.net"
+    },
+    "icon": "OVHcloud.svg",
+    "pricing": [
+      "payg"
+    ],
+    "website": "https://www.ovhcloud.com"
+  },
   "OWL Carousel": {
     "cats": [
       5
@@ -361,10 +377,10 @@
       88
     ],
     "description": "One.com is a Denmark-based company offering bargain-priced WordPress and shared web hosting plans.",
-    "icon": "One.com.svg",
     "dns": {
       "SOA": "ns\\d+\\.one\\.com"
     },
+    "icon": "One.com.svg",
     "pricing": [
       "low",
       "recurring"
@@ -518,24 +534,6 @@
     },
     "website": "http://pkp.sfu.ca/ojs"
   },
-  "OpenWeb": {
-    "cats": [
-      36
-    ],
-    "description": "OpenWeb is a social engagement platform that builds online communities around digital content.",
-    "icon": "OpenWeb.svg",
-    "meta": {
-      "spotim-ads": ""
-    },
-    "js": {
-      "SPOTIM.initConversation": ""
-    },
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.openweb.com"
-  },
   "Open Web Analytics": {
     "cats": [
       10
@@ -703,14 +701,14 @@
       93
     ],
     "description": "OpenTable is an online restaurant-reservation service company founded by Sid Gorham, Eric Moe and Chuck Templeton on 2 July 1998 and is based in San Francisco, California.",
-    "icon": "OpenTable.svg",
     "dom": "iframe[src*='.opentable.com/'], form[action*='.opentable.com/'][target='_blank']",
-    "saas": true,
+    "icon": "OpenTable.svg",
     "pricing": [
       "mid",
       "payg",
       "recurring"
     ],
+    "saas": true,
     "website": "https://restaurant.opentable.com"
   },
   "OpenText Web Solutions": {
@@ -733,6 +731,24 @@
     "scriptSrc": "sap-ui-core\\.js",
     "website": "http://openui5.org/"
   },
+  "OpenWeb": {
+    "cats": [
+      36
+    ],
+    "description": "OpenWeb is a social engagement platform that builds online communities around digital content.",
+    "icon": "OpenWeb.svg",
+    "js": {
+      "SPOTIM.initConversation": ""
+    },
+    "meta": {
+      "spotim-ads": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.openweb.com"
+  },
   "OpenX": {
     "cats": [
       36
@@ -769,6 +785,23 @@
     "scriptSrc": "\\.foresee\\.com/code/([\\d.]+)-oo/oo_engine\\.min\\.js\\;version:\\1",
     "website": "https://www.opinionlab.com"
   },
+  "OptiMonk": {
+    "cats": [
+      98,
+      77
+    ],
+    "description": "OptiMonk is an on-site message toolkit used to improve conversions using action-based popups ad bars.",
+    "dom": "link[href*='.optimonk.com']",
+    "icon": "OptiMonk.svg",
+    "pricing": [
+      "low",
+      "recurring",
+      "freemium"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.optimonk\\.com/",
+    "website": "https://www.optimonk.com"
+  },
   "Optimise": {
     "cats": [
       71,
@@ -802,23 +835,6 @@
     "scriptSrc": "optimizely\\.com.*\\.js",
     "website": "https://www.optimizely.com"
   },
-  "OptiMonk": {
-    "cats": [
-      98,
-      77
-    ],
-    "description": "OptiMonk is an on-site message toolkit used to improve conversions using action-based popups ad bars.",
-    "icon": "OptiMonk.svg",
-    "dom": "link[href*='.optimonk.com']",
-    "scriptSrc": "\\.optimonk\\.com/",
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring",
-      "freemium"
-    ],
-    "website": "https://www.optimonk.com"
-  },
   "Optimove": {
     "cats": [
       97
@@ -1151,8 +1167,8 @@
       80
     ],
     "description": "Panoramic is a fully responsive WordPress theme with a homepage slider by OutTheBoxThemes.",
-    "icon": "OutTheBoxThemes.png",
     "dom": "link#panoramic_customizer_theme_fonts-css",
+    "icon": "OutTheBoxThemes.png",
     "pricing": [
       "freemium",
       "onetime"
@@ -1198,22 +1214,6 @@
     "url": "/owa/auth/log(?:on|off)\\.aspx",
     "website": "http://help.outlook.com"
   },
-  "OVHcloud": {
-    "cats": [
-      62,
-      88
-    ],
-    "description": "OVHcloud is a global, cloud provider delivering hosted private cloud, public cloud, and dedicated server solutions.",
-    "icon": "OVHcloud.svg",
-    "dns": {
-      "SOA": "\\d+\\.ovh\\.net",
-      "NS": "\\d+\\.ovh\\.net"
-    },
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://www.ovhcloud.com"
-  },
   "Oxatis": {
     "cats": [
       6
@@ -1317,4 +1317,4 @@
     },
     "website": "https://owncloud.org"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/p.json b/src/technologies/p.json
index b7ff3d2f6..24e8d483d 100644
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@@ -163,23 +163,6 @@
     "scriptSrc": "\\.pagseguro\\.uol\\.com\\.br/",
     "website": "https://pagseguro.uol.com.br"
   },
-  "Paidy": {
-    "cats": [
-      41,
-      91
-    ],
-    "description": "Paidy is basically a two-sided payments service, acting as a middleman between consumers and merchants in Japan.",
-    "icon": "Paidy.png",
-    "js": {
-      "Constants.paidy": ""
-    },
-    "pricing": [
-      "payg"
-    ],
-    "saas": true,
-    "scriptSrc": "apps\\.paidy\\.com",
-    "website": "https://paidy.com"
-  },
   "Pagar.me": {
     "cats": [
       41
@@ -267,6 +250,23 @@
     },
     "website": "https://www.pagevamp.com"
   },
+  "Paidy": {
+    "cats": [
+      41,
+      91
+    ],
+    "description": "Paidy is basically a two-sided payments service, acting as a middleman between consumers and merchants in Japan.",
+    "icon": "Paidy.png",
+    "js": {
+      "Constants.paidy": ""
+    },
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "scriptSrc": "apps\\.paidy\\.com",
+    "website": "https://paidy.com"
+  },
   "Pantheon": {
     "cats": [
       62
@@ -1319,8 +1319,8 @@
     ],
     "description": "Polyfill is a service which accepts a request for a set of browser features and returns only the polyfills that are needed by the requesting browser.",
     "icon": "polyfill.svg",
-    "scriptSrc": "polyfill\\.io/v([\\d\\.]+)\\;version:\\1",
     "oss": true,
+    "scriptSrc": "polyfill\\.io/v([\\d\\.]+)\\;version:\\1",
     "website": "https://polyfill.io"
   },
   "Polylang": {
@@ -1329,12 +1329,12 @@
       89
     ],
     "description": "Polylang is a WordPress plugin which allows you to create a bilingual or multilingual WordPress site.",
-    "icon": "Polylang.svg",
     "dom": "img[src*='/wp-content/plugins/polylang/']",
+    "icon": "Polylang.svg",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
-    "oss": true,
     "requires": "WordPress",
     "website": "https://github.com/polylang/polylang"
   },
@@ -2021,22 +2021,6 @@
     "icon": "Pure CSS.png",
     "website": "http://purecss.io"
   },
-  "PureCars": {
-    "cats": [
-      6
-    ],
-    "description": "PureCars is an automotive software and managed services company serving dealerships, advertising associations, and OEMs across the North American retail automotive industry.",
-    "icon": "PureCars.png",
-    "dom": "a[href*='app.purecars.com/']",
-    "js": {
-      "_pureCars": ""
-    },
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.purecars.com"
-  },
   "Pure Chat": {
     "cats": [
       52
@@ -2055,6 +2039,22 @@
     "scriptSrc": "app\\.purechat\\.com",
     "website": "https://www.purechat.com"
   },
+  "PureCars": {
+    "cats": [
+      6
+    ],
+    "description": "PureCars is an automotive software and managed services company serving dealerships, advertising associations, and OEMs across the North American retail automotive industry.",
+    "dom": "a[href*='app.purecars.com/']",
+    "icon": "PureCars.png",
+    "js": {
+      "_pureCars": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.purecars.com"
+  },
   "PushEngage": {
     "cats": [
       32
@@ -2090,8 +2090,8 @@
       32
     ],
     "description": "PushPushGo is a GDPR-ready platform which enables startups, SMBs and corporations to create and send automatic web push notification campaigns on desktop and via mobile to manage various scenarios including abandoned carts, segmentation, cross-selling, customer engagement, and return rates.",
-    "icon": "PushPushGo.svg",
     "dom": "link[href*='.pushpushgo.com/']",
+    "icon": "PushPushGo.svg",
     "pricing": [
       "mid",
       "recurring"
@@ -2370,4 +2370,4 @@
     },
     "website": "http://punbb.informer.com"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/q.json b/src/technologies/q.json
index 4dfe680c7..0052d2a39 100644
--- a/src/technologies/q.json
+++ b/src/technologies/q.json
@@ -4,17 +4,17 @@
       73
     ],
     "description": "Qualaroo provides surveys on websites and apps to get user feedback.",
-    "icon": "Qualaroo.svg",
     "dom": "link[href*='.qualaroo.com']",
+    "icon": "Qualaroo.svg",
     "js": {
       "QUALAROO_DNT": ""
     },
-    "saas": true,
-    "pricing": [ 
-      "recurring", 
-      "mid" ,
+    "pricing": [
+      "recurring",
+      "mid",
       "payg"
     ],
+    "saas": true,
     "scriptSrc": "\\.qualaroo\\.com",
     "website": "https://qualaroo.com"
   },
@@ -54,8 +54,8 @@
       10
     ],
     "description": "Quantcast Measure is an audience insights and analytics tool.",
-    "icon": "Quantcast.png",
     "dom": "link[href*='.quantserve.com']",
+    "icon": "Quantcast.png",
     "js": {
       "quantserve": ""
     },
@@ -183,4 +183,4 @@
     "scriptSrc": "\\.quora\\.com/",
     "website": "https://quoraadsupport.zendesk.com/hc/en-us/categories/115001573928-Pixels-Tracking"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/r.json b/src/technologies/r.json
index 2ae412cdb..7233af8b9 100644
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@@ -52,6 +52,21 @@
     },
     "website": "https://github.com/ruby/rdoc"
   },
+  "REG.RU": {
+    "cats": [
+      88
+    ],
+    "description": "REG.RU is a web hosting provider and internet domain registrar.",
+    "dns": {
+      "SOA": "(?:\\.hosting)?\\.reg\\.ru"
+    },
+    "icon": "REG.RU.svg",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "website": "https://www.reg.ru"
+  },
   "RTB House": {
     "cats": [
       77
@@ -158,8 +173,8 @@
       54
     ],
     "description": "RankMath SEO is a search engine optimization plugin for WordPress.",
-    "icon": "RankMath SEO.svg",
     "dom": "link[href*='/wp-content/plugins/seo-by-rank-math/']",
+    "icon": "RankMath SEO.svg",
     "pricing": [
       "freemium",
       "low",
@@ -315,20 +330,6 @@
     "scriptSrc": "checkout\\.razorpay\\.com",
     "website": "https://razorpay.com/"
   },
-  "Really Simple CAPTCHA": {
-    "cats": [
-      87
-    ],
-    "description": "Really Simple CAPTCHA does not work alone and is intended to work with other plugins. It is originally created for Contact Form 7, however, you can use it with your own plugin.",
-    "icon": "Really Simple CAPTCHA.png",
-    "dom": "img[src*='/wp-content/plugins/really-simple-captcha/']",
-    "pricing": [
-      "freemium"
-    ],
-    "oss": true,
-    "requires": "WordPress",
-    "website": "https://wordpress.org/plugins/really-simple-captcha"
-  },
   "Re:amaze": {
     "cats": [
       52
@@ -414,6 +415,20 @@
     ],
     "website": "https://reactrouter.com/"
   },
+  "Really Simple CAPTCHA": {
+    "cats": [
+      87
+    ],
+    "description": "Really Simple CAPTCHA does not work alone and is intended to work with other plugins. It is originally created for Contact Form 7, however, you can use it with your own plugin.",
+    "dom": "img[src*='/wp-content/plugins/really-simple-captcha/']",
+    "icon": "Really Simple CAPTCHA.png",
+    "oss": true,
+    "pricing": [
+      "freemium"
+    ],
+    "requires": "WordPress",
+    "website": "https://wordpress.org/plugins/really-simple-captcha"
+  },
   "RebelMouse": {
     "cats": [
       1
@@ -720,21 +735,6 @@
     "scriptSrc": "\\.cloudfront\\.net/js/reflektion\\.js",
     "website": "https://reflektion.com"
   },
-  "REG.RU": {
-    "cats": [
-      88
-    ],
-    "description": "REG.RU is a web hosting provider and internet domain registrar.",
-    "icon": "REG.RU.svg",
-    "dns": {
-      "SOA": "(?:\\.hosting)?\\.reg\\.ru"
-    },
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://www.reg.ru"
-  },
   "Regiondo": {
     "cats": [
       5,
@@ -948,6 +948,19 @@
     "scriptSrc": "cdn\\.retailrocket\\.net",
     "website": "https://retailrocket.net"
   },
+  "RevJet": {
+    "cats": [
+      36
+    ],
+    "description": "RevJet is the first comprehensive Ad Experience Platform, for every audience, channel, format, inventory, and device.",
+    "dom": "link[href*='.revjet.com']",
+    "icon": "RevJet.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.revjet.com"
+  },
   "RevLifter": {
     "cats": [
       76
@@ -968,19 +981,6 @@
     "scriptSrc": "assets\\.revlifter\\.io",
     "website": "https://www.revlifter.com"
   },
-  "RevJet": {
-    "cats": [
-      36
-    ],
-    "description": "RevJet is the first comprehensive Ad Experience Platform, for every audience, channel, format, inventory, and device.",
-    "icon": "RevJet.png",
-    "dom": "link[href*='.revjet.com']",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.revjet.com"
-  },
   "Reveal.js": {
     "cats": [
       12
@@ -1162,16 +1162,16 @@
     ],
     "description": "Rise.ai is a strategic re-engagement solution that provides brands and retailers with a unique currency of their own.",
     "icon": "Rise.ai.svg",
-    "requires": "Shopify",
     "js": {
       "Rise.shop": "",
       "RiseStoreFront": ""
     },
-    "saas": true,
     "pricing": [
       "payg",
       "recurring"
     ],
+    "requires": "Shopify",
+    "saas": true,
     "scriptSrc": "strn\\.rise-ai\\.com/",
     "website": "https://rise.ai"
   },
@@ -1243,6 +1243,24 @@
     },
     "website": "http://www.robinhq.com"
   },
+  "RockRMS": {
+    "cats": [
+      1,
+      11,
+      32
+    ],
+    "description": "Rock RMS is a free, open-source Relationship Management System (RMS) built for churches and businesses.",
+    "icon": "RockRMS.svg",
+    "implies": [
+      "Windows Server",
+      "IIS",
+      "Microsoft ASP.NET"
+    ],
+    "meta": {
+      "generator": "^Rock v([0-9.]+)\\;version:\\1"
+    },
+    "website": "http://www.rockrms.com"
+  },
   "Rockerbox": {
     "cats": [
       32
@@ -1252,11 +1270,11 @@
     "js": {
       "RB.source": "\\;confidence:50"
     },
-    "scriptSrc": "wxyz\\.rb\\.js",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "wxyz\\.rb\\.js",
     "website": "https://www.rockerbox.com"
   },
   "Rocket.Chat": {
@@ -1268,32 +1286,14 @@
     "js": {
       "RocketChat.livechat": ""
     },
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://rocket.chat"
   },
-  "RockRMS": {
-    "cats": [
-      1,
-      11,
-      32
-    ],
-    "description": "Rock RMS is a free, open-source Relationship Management System (RMS) built for churches and businesses.",
-    "icon": "RockRMS.svg",
-    "implies": [
-      "Windows Server",
-      "IIS",
-      "Microsoft ASP.NET"
-    ],
-    "meta": {
-      "generator": "^Rock v([0-9.]+)\\;version:\\1"
-    },
-    "website": "http://www.rockrms.com"
-  },
   "Rollbar": {
     "cats": [
       13
diff --git a/src/technologies/s.json b/src/technologies/s.json
index dae6a78e4..74d235f35 100644
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@@ -111,22 +111,6 @@
     ],
     "website": "https://www.seur.com"
   },
-  "Simple Analytics": {
-    "cats": [
-      10
-    ],
-    "description": "Simple Analytics is a privacy-friendly Google Analytics alternative.",
-    "icon": "Simple Analytics.svg",
-    "js": {
-      "sa_event": ""
-    },
-    "scriptSrc": [
-      "simpleanalyticscdn\\.com",
-      "simpleanalytics\\.io",
-      "simpleanalytics\\.com"
-    ],
-    "website": "https://simpleanalytics.com"
-  },
   "SIMsite": {
     "cats": [
       1
@@ -261,6 +245,21 @@
     "icon": "SUSE.png",
     "website": "http://suse.com"
   },
+  "SVG Support": {
+    "cats": [
+      87
+    ],
+    "description": "SVG Support is a WordPress plugin which allows you to safely upload SVG files to your media library and use them like any other image.",
+    "dom": "link[href*='/wp-content/plugins/svg-support/']",
+    "icon": "SVG Support.png",
+    "oss": true,
+    "pricing": [
+      "freemium"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/svg-support/",
+    "website": "https://github.com/wp-plugins/svg-support"
+  },
   "SWFObject": {
     "cats": [
       19
@@ -363,11 +362,11 @@
       88
     ],
     "description": "Sakura Internet is a web hosting provider that has been operating for almost 30 years.",
-    "icon": "Sakura Internet.png",
     "dns": {
       "NS": "\\.gslbN\\.sakura\\.ne\\.jp",
       "SOA": "tech\\.sakura\\.ad\\.jp"
     },
+    "icon": "Sakura Internet.png",
     "pricing": [
       "payg"
     ],
@@ -391,19 +390,19 @@
       6
     ],
     "description": "Saleor is a headless, GraphQL ecommerce platform.",
+    "dom": "img[src*='saleor.imgix.net']",
     "icon": "Saleor.svg",
     "implies": "GraphQL",
     "js": {
       "___NEXT_DATA__.runtimeConfig.SALEOR": ""
     },
-    "dom": "img[src*='saleor.imgix.net']",
+    "oss": true,
     "pricing": [
       "freemium",
       "high",
       "recurring"
     ],
     "saas": true,
-    "oss": true,
     "website": "https://saleor.io"
   },
   "SalesFire": {
@@ -737,11 +736,11 @@
     ],
     "description": "Scalefast is an outsourced ecommerce solution designed to build and manage global ecommerce for brands, with customer loyalty programs.",
     "icon": "Scalefast.svg",
-    "scriptSrc": "cdn-prod\\.scalefast\\.com/(?:.+\\.js\\?version=([\\d\\.]+))?\\;version:\\1",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "cdn-prod\\.scalefast\\.com/(?:.+\\.js\\?version=([\\d\\.]+))?\\;version:\\1",
     "website": "https://www.scalefast.com"
   },
   "Schedule Engine": {
@@ -770,8 +769,8 @@
       80
     ],
     "description": "Writee is an elegant free personal WordPress blog theme and well suited for personal, food, travel, fashion, corporate, or any other amazing blog.",
-    "icon": "Scissor Themes.png",
     "dom": "link#WRT-style-css",
+    "icon": "Scissor Themes.png",
     "pricing": [
       "freemium",
       "onetime"
@@ -901,8 +900,8 @@
       51
     ],
     "description": "SeedProd Coming Soon is a page builder allows you to add a new website under construction page to your WordPress site without hiring a developer.",
-    "icon": "SeedProd.svg",
     "dom": "link[href*='/wp-content/plugins/coming-soon/']",
+    "icon": "SeedProd.svg",
     "pricing": [
       "freemium",
       "low",
@@ -1396,10 +1395,10 @@
       "SHARETHIS": "",
       "__sharethis__docReady": ""
     },
-    "scriptSrc": "\\.sharethis\\.com/",
     "pricing": [
       "freemium"
     ],
+    "scriptSrc": "\\.sharethis\\.com/",
     "website": "http://sharethis.com"
   },
   "Sharethrough": {
@@ -1407,12 +1406,12 @@
       36
     ],
     "description": "Sharethrough is a software company that powers in-feed advertising for brands and publishers.",
-    "icon": "Sharethrough.svg",
     "dom": "link[href*='.sharethrough.com']",
-    "scriptSrc": "\\.sharethrough\\.com/",
+    "icon": "Sharethrough.svg",
     "pricing": [
       "poa"
     ],
+    "scriptSrc": "\\.sharethrough\\.com/",
     "website": "https://www.sharethrough.com"
   },
   "SharpSpring": {
@@ -1539,14 +1538,14 @@
     "cookies": {
       "shopaholic_cart_id": ""
     },
+    "description": "Shopaholic is an open-source ecosystem of plugins and themes for rapid ecommerce website development that allows building projects from small to large online shops.",
     "dom": "[class*='_shopaholic']",
+    "icon": "Shopaholic.svg",
     "js": {
       "ShopaholicCart": ""
     },
-    "requires": "October CMS",
-    "description": "Shopaholic is an open-source ecosystem of plugins and themes for rapid ecommerce website development that allows building projects from small to large online shops.",
-    "icon": "Shopaholic.svg",
     "oss": true,
+    "requires": "October CMS",
     "website": "https://shopaholic.one"
   },
   "Shopatron": {
@@ -1783,15 +1782,14 @@
     "description": "ShoppingFeeder is a feed management solution for online retailers.",
     "icon": "ShoppingFeeder.png",
     "js": {
-      "sfdrUniqid": "",
-      "sfdrOrderData": ""
+      "sfdrOrderData": "",
+      "sfdrUniqid": ""
     },
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
-    "saas": true,
     "requires": [
       "Magento",
       "Shopify",
@@ -1799,6 +1797,7 @@
       "PrestaShop",
       "WooCommerce"
     ],
+    "saas": true,
     "website": "https://sfdr.co"
   },
   "Shoppy": {
@@ -1898,8 +1897,8 @@
       87
     ],
     "description": "Shortcodes Ultimate is a comprehensive collection of visual components for WordPress.",
-    "icon": "Shortcodes Ultimate.svg",
     "dom": "link[href*='/wp-content/plugins/shortcodes-ultimate/']",
+    "icon": "Shortcodes Ultimate.svg",
     "pricing": [
       "freemium",
       "low",
@@ -2024,6 +2023,22 @@
     ],
     "website": "https://www.simondata.com/"
   },
+  "Simple Analytics": {
+    "cats": [
+      10
+    ],
+    "description": "Simple Analytics is a privacy-friendly Google Analytics alternative.",
+    "icon": "Simple Analytics.svg",
+    "js": {
+      "sa_event": ""
+    },
+    "scriptSrc": [
+      "simpleanalyticscdn\\.com",
+      "simpleanalytics\\.io",
+      "simpleanalytics\\.com"
+    ],
+    "website": "https://simpleanalytics.com"
+  },
   "SimpleHTTP": {
     "cats": [
       22
@@ -2197,13 +2212,13 @@
       88
     ],
     "description": "SiteGround is a web hosting service.",
+    "dns": {
+      "NS": "ns\\d+\\.c\\d+\\.sgvps\\.net",
+      "SOA": "\\.siteground\\.net"
+    },
     "headers": {
       "host-header": "192fc2e7e50945beb8231a492d6a8024|b7440e60b07ee7b8044761568fab26e8|624d5be7be38418a3e2a818cc8b7029b|6b7412fb82ca5edfd0917e3957f05d89"
     },
-    "dns": {
-      "SOA": "\\.siteground\\.net",
-      "NS": "ns\\d+\\.c\\d+\\.sgvps\\.net"
-    },
     "icon": "siteground.svg",
     "website": "https://www.siteground.com"
   },
@@ -2238,8 +2253,8 @@
       51
     ],
     "description": "Page Builder by SiteOrigin makes it easy to build responsive grid-based page content that adapts to mobile devices with pixel perfect accuracy.",
-    "icon": "SiteOrigin.svg",
     "dom": "link[href*='/wp-content/plugins/siteorigin-panels/']",
+    "icon": "SiteOrigin.svg",
     "pricing": [
       "freemium"
     ],
@@ -2266,8 +2281,8 @@
       87
     ],
     "description": "SiteOrigin Widgets Bundle is a WordPress plugin that gives you all the elements you need to build modern, responsive, and engaging website pages.",
-    "icon": "SiteOrigin.svg",
     "dom": "link[href*='/wp-content/plugins/so-widgets-bundle/']",
+    "icon": "SiteOrigin.svg",
     "pricing": [
       "freemium"
     ],
@@ -2549,33 +2564,31 @@
       36
     ],
     "description": "Smart Ad Server is an adserving and RTB platform.",
-    "icon": "Smart Ad Server.svg",
     "dom": "img[src*='smartadserver.com/'], link[href*='.smartadserver.com']",
+    "icon": "Smart Ad Server.svg",
     "js": {
       "SmartAdServer": ""
     },
-    "scriptSrc": "\\.sascdn\\.com/",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.sascdn\\.com/",
     "website": "http://smartadserver.com"
   },
-  "Smartling": {
+  "Smart Slider 3": {
     "cats": [
-      89
+      87
     ],
-    "description": "Smartling is a cloud-based translation management system.",
-    "icon": "Smartling.svg",
-    "js": {
-      "populateSmartlingDdl": ""
-    },
-    "scriptSrc": "\\.smartling\\.com/",
-    "saas": true,
+    "description": "Smart Slider 3 is a responsive, SEO optimised WordPress plugin.",
+    "icon": "Smart Slider 3.svg",
     "pricing": [
-      "poa"
+      "freemium",
+      "onetime"
     ],
-    "website": "https://www.smartling.com"
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/smart-slider-3(?:-pro)?/",
+    "website": "https://smartslider3.com"
   },
   "SmartSite": {
     "cats": [
@@ -2588,20 +2601,6 @@
     },
     "website": "http://www.seneca.nl/pub/Smartsite/Smartsite-Smartsite-iXperion"
   },
-  "Smart Slider 3": {
-    "cats": [
-      87
-    ],
-    "description": "Smart Slider 3 is a responsive, SEO optimised WordPress plugin.",
-    "icon": "Smart Slider 3.svg",
-    "pricing": [
-      "freemium",
-      "onetime"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/smart-slider-3(?:-pro)?/",
-    "website": "https://smartslider3.com"
-  },
   "Smarter Click": {
     "cats": [
       77
@@ -2621,6 +2620,22 @@
     "scriptSrc": "\\.?smct\\.(?:io|co)/",
     "website": "https://smarterclick.com"
   },
+  "Smartling": {
+    "cats": [
+      89
+    ],
+    "description": "Smartling is a cloud-based translation management system.",
+    "icon": "Smartling.svg",
+    "js": {
+      "populateSmartlingDdl": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "\\.smartling\\.com/",
+    "website": "https://www.smartling.com"
+  },
   "Smartstore": {
     "cats": [
       6
@@ -2683,8 +2698,8 @@
       87
     ],
     "description": "Instagram Feed displays Instagram posts from your Instagram accounts, either in the same single feed or in multiple different ones. Created by Smash Balloon.",
-    "icon": "Smash Balloon.svg",
     "dom": "link[href*='/wp-content/plugins/instagram-feed/']",
+    "icon": "Smash Balloon.svg",
     "pricing": [
       "freemium",
       "low",
@@ -2762,22 +2777,6 @@
     "scriptSrc": "intg\\.snapchat\\.com/",
     "website": "https://businesshelp.snapchat.com/s/article/snap-pixel-about"
   },
-  "SnapWidget": {
-    "cats": [
-      5
-    ],
-    "description": "SnapWidget is a set of interactive Instagram, Twitter and 500px widgets.",
-    "icon": "SnapWidget.svg",
-    "dom": "iframe[src*='snapwidget.com/']",
-    "saas": true,
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "scriptSrc": "snapwidget\\.com/",
-    "website": "https://snapwidget.com"
-  },
   "Snap.svg": {
     "cats": [
       59
@@ -2807,6 +2806,22 @@
     "saas": true,
     "website": "https://snapengage.com/"
   },
+  "SnapWidget": {
+    "cats": [
+      5
+    ],
+    "description": "SnapWidget is a set of interactive Instagram, Twitter and 500px widgets.",
+    "dom": "iframe[src*='snapwidget.com/']",
+    "icon": "SnapWidget.svg",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scriptSrc": "snapwidget\\.com/",
+    "website": "https://snapwidget.com"
+  },
   "Snipcart": {
     "cats": [
       6
@@ -3028,8 +3043,11 @@
     "js": {
       "Solvvy": ""
     },
+    "pricing": [
+      "recurring",
+      "poa"
+    ],
     "saas": true,
-    "pricing": [ "recurring", "poa" ],
     "scriptSrc": "cdn\\.solvvy\\.com/",
     "website": "https://solvvy.com/"
   },
@@ -3073,11 +3091,11 @@
     "js": {
       "deployads": ""
     },
-    "scriptSrc": "\\.deployads\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "\\.deployads\\.com/",
     "website": "https://sortable.com"
   },
   "SoteShop": {
@@ -3125,17 +3143,17 @@
       5
     ],
     "description": "SoundCloud widget gives you the ability to upload, manage and share tracks.",
-    "icon": "SoundCloud.svg",
     "dom": "iframe[src*='.soundcloud.com/'], img[src*='.sndcdn.com/']",
+    "icon": "SoundCloud.svg",
     "js": {
       "SC.Widget.Events.PLAY": ""
     },
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://developers.soundcloud.com/docs/api/html5-widget"
   },
   "SoundManager": {
@@ -3369,35 +3387,6 @@
     "scriptSrc": "static\\.spotapps\\.co/",
     "website": "https://www.spothopperapp.com"
   },
-  "Spotify Widgets": {
-    "cats": [
-      5
-    ],
-    "description": "Spotify Widgets provide an embeddable view of a track, artist, album, user, playlist, podcast or episode for use within your web project.",
-    "icon": "Spotify.svg",
-    "dom": "iframe[src*='open.spotify.com/']",
-    "pricing": [
-      "freemium"
-    ],
-    "website": "https://developer.spotify.com/documentation/widgets"
-  },
-  "Spotify Web API": {
-    "cats": [
-      19
-    ],
-    "description": "Spotify Web API endpoints return JSON metadata about music artists, albums, and tracks, directly from the Spotify Data Catalogue.",
-    "icon": "Spotify.svg",
-    "dom": "link[href*='.spotify.com']",
-    "js": {
-      "getSpotifyData": "",
-      "spotifyme": "",
-      "spotify_tracks": ""
-    },
-    "pricing": [
-      "freemium"
-    ],
-    "website": "https://developer.spotify.com/documentation/web-api"
-  },
   "SpotX": {
     "cats": [
       36
@@ -3419,6 +3408,35 @@
     "website": "https://www.spotx.tv",
     "xhr": "\\.spotx(?:change|cdn)\\.com"
   },
+  "Spotify Web API": {
+    "cats": [
+      19
+    ],
+    "description": "Spotify Web API endpoints return JSON metadata about music artists, albums, and tracks, directly from the Spotify Data Catalogue.",
+    "dom": "link[href*='.spotify.com']",
+    "icon": "Spotify.svg",
+    "js": {
+      "getSpotifyData": "",
+      "spotify_tracks": "",
+      "spotifyme": ""
+    },
+    "pricing": [
+      "freemium"
+    ],
+    "website": "https://developer.spotify.com/documentation/web-api"
+  },
+  "Spotify Widgets": {
+    "cats": [
+      5
+    ],
+    "description": "Spotify Widgets provide an embeddable view of a track, artist, album, user, playlist, podcast or episode for use within your web project.",
+    "dom": "iframe[src*='open.spotify.com/']",
+    "icon": "Spotify.svg",
+    "pricing": [
+      "freemium"
+    ],
+    "website": "https://developer.spotify.com/documentation/widgets"
+  },
   "Spotii": {
     "cats": [
       41,
@@ -4023,10 +4041,10 @@
       62
     ],
     "description": "Strato is an internet hosting service provider headquartered in Berlin, Germany which provide dedicated server hosting, a website builder and a cloud storage services.",
-    "icon": "Strato.svg",
     "dns": {
       "SOA": "\\.strato-rz\\.de"
     },
+    "icon": "Strato.svg",
     "pricing": [
       "recurring",
       "payg"
@@ -4042,11 +4060,11 @@
     "js": {
       "Strftime.configuration": ""
     },
-    "scriptSrc": "strato-editor\\.com/",
     "pricing": [
       "low",
       "recurring"
     ],
+    "scriptSrc": "strato-editor\\.com/",
     "website": "https://www.strato.de/homepage-baukasten"
   },
   "Strikingly": {
@@ -4149,11 +4167,11 @@
     "js": {
       "loadSublimeSkinz": ""
     },
-    "scriptSrc": "\\.ayads\\.co/",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.ayads\\.co/",
     "website": "https://www.sublime.xyz"
   },
   "SublimeVideo": {
@@ -4253,13 +4271,13 @@
       "sumo": "",
       "sumome": ""
     },
-    "scriptSrc": "\\.sumo(?:me)?\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scriptSrc": "\\.sumo(?:me)?\\.com/",
     "website": "http://sumo.com"
   },
   "SunOS": {
@@ -4341,21 +4359,6 @@
     "oss": true,
     "website": "https://kit.svelte.dev"
   },
-  "SVG Support": {
-    "cats": [
-      87
-    ],
-    "description": "SVG Support is a WordPress plugin which allows you to safely upload SVG files to your media library and use them like any other image.",
-    "icon": "SVG Support.png",
-    "dom": "link[href*='/wp-content/plugins/svg-support/']",
-    "pricing": [
-      "freemium"
-    ],
-    "requires": "WordPress",
-    "oss": true,
-    "scriptSrc": "/wp-content/plugins/svg-support/",
-    "website": "https://github.com/wp-plugins/svg-support"
-  },
   "Swagger UI": {
     "cats": [
       4
@@ -4375,12 +4378,12 @@
     "js": {
       "Swagify": ""
     },
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
     "requires": "Shopify",
+    "saas": true,
     "scriptSrc": "api\\.swagifyapp\\.com/",
     "website": "https://swagifyapp.com"
   },
@@ -4697,4 +4700,4 @@
     },
     "website": "https://styled-components.com"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/t.json b/src/technologies/t.json
index 3bb4da9b7..9b53dbf9b 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -63,6 +63,23 @@
     ],
     "website": "https://truendo.com"
   },
+  "TVSquared": {
+    "cats": [
+      36
+    ],
+    "description": "TVSquared is a cross-platform TV ad measurement, analytics and optimisation platform.",
+    "dom": "link[href*='.tvsquared.com']",
+    "icon": "TVSquared.png",
+    "js": {
+      "TV2Track": "",
+      "_tvq": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "website": "https://www.tvsquared.com"
+  },
   "TWiki": {
     "cats": [
       8
@@ -97,24 +114,6 @@
     "url": "/typo3/",
     "website": "https://typo3.org/"
   },
-  "Typof": {
-    "cats": [
-      6
-    ],
-    "description": "Typof is an ecommerce platform for artisans that allows to create a premium website and sell items directly to the consumer.",
-    "icon": "Typof.png",
-    "cookies": {
-      "typof_session": "\\;confidence:50"
-    },
-    "saas": true,
-    "pricing": [
-      "freemium",
-      "recurring",
-      "low"
-    ],
-    "scriptSrc": "portal/js/typof\\.js\\;confidence:50",
-    "website": "https://typof.com"
-  },
   "Tabby": {
     "cats": [
       41,
@@ -172,12 +171,12 @@
       87
     ],
     "description": "TablePress is a free and open source plugin for the WordPress publishing platform. It enables you to create and manage tables on your website, without any coding knowledge.",
-    "icon": "TablePress.png",
     "dom": "link[href*='/wp-content/plugins/tablepress/']",
+    "icon": "TablePress.png",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
-    "oss": true,
     "requires": "WordPress",
     "website": "https://tablepress.org"
   },
@@ -347,17 +346,17 @@
       19
     ],
     "description": "Tapcart is a mobile commerce SaaS platform that integrates directly with Shopify.",
-    "icon": "Tapcart.svg",
-    "requires": "Shopify",
     "dom": "a[href*='tapcart.app'][target='_blank']",
+    "icon": "Tapcart.svg",
     "js": {
       "tapcartwebBanner": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "requires": "Shopify",
+    "saas": true,
     "scriptSrc": "cdn\\.tapcart\\.com/",
     "website": "https://tapcart.com"
   },
@@ -540,10 +539,10 @@
     "meta": {
       "copyright": "^.+Tencent\\sCloud\\.$"
     },
-    "scriptSrc": "\\.tencent-cloud\\.(?:cn|com)/",
     "pricing": [
       "payg"
     ],
+    "scriptSrc": "\\.tencent-cloud\\.(?:cn|com)/",
     "website": "https://intl.cloud.tencent.com"
   },
   "Tencent QQ": {
@@ -551,8 +550,8 @@
       52
     ],
     "description": "Tencent QQ also known as QQ, is an instant messaging software service and web portal developed by the Chinese tech giant Tencent.",
-    "icon": "Tencent QQ.svg",
     "dom": "a[href*='tencent://message/']",
+    "icon": "Tencent QQ.svg",
     "website": "https://im.qq.com"
   },
   "Tencent Waterproof Wall": {
@@ -650,6 +649,34 @@
     },
     "website": "http://textpattern.com"
   },
+  "The Arena Group": {
+    "cats": [
+      36
+    ],
+    "description": "The Arena Group is a media coalition of professional content destinations. It operates on a shared digital publishing, advertising, and distribution platform, providing a major media-scale alternative to news and information distributed on social platforms.",
+    "icon": "The Arena Group.svg",
+    "meta": {
+      "generator": "^Tempest\\s-\\smaven\\.io$"
+    },
+    "saas": true,
+    "website": "https://thearenagroup.net"
+  },
+  "The Events Calendar": {
+    "cats": [
+      87
+    ],
+    "description": "The Events Calendar is a free event management plugin for WordPress.",
+    "dom": "link[href*='/wp-content/plugins/the-events-calendar/']",
+    "icon": "The Events Calendar.png",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/the-events-calendar(?:-pro)?/",
+    "website": "https://theeventscalendar.com"
+  },
   "The Hut Group": {
     "cats": [
       6
@@ -680,34 +707,6 @@
     "scriptSrc": "/wp-content/themes/make(?:-child)?/.+frontend\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://thethemefoundry.com/wordpress-themes/make"
   },
-  "The Arena Group": {
-    "cats": [
-      36
-    ],
-    "description": "The Arena Group is a media coalition of professional content destinations. It operates on a shared digital publishing, advertising, and distribution platform, providing a major media-scale alternative to news and information distributed on social platforms.",
-    "icon": "The Arena Group.svg",
-    "meta": {
-      "generator": "^Tempest\\s-\\smaven\\.io$"
-    },
-    "saas": true,
-    "website": "https://thearenagroup.net"
-  },
-  "The Events Calendar": {
-    "cats": [
-      87
-    ],
-    "description": "The Events Calendar is a free event management plugin for WordPress.",
-    "icon": "The Events Calendar.png",
-    "dom": "link[href*='/wp-content/plugins/the-events-calendar/']",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/the-events-calendar(?:-pro)?/",
-    "website": "https://theeventscalendar.com"
-  },
   "Thefork": {
     "cats": [
       93
@@ -747,6 +746,38 @@
     ],
     "website": "http://thelia.net"
   },
+  "Theme Freesia ShoppingCart": {
+    "cats": [
+      80
+    ],
+    "description": "ShoppingCart is a WordPress theme especially build for store and ecommerce by Theme Freesia.",
+    "icon": "Theme Freesia.png",
+    "js": {
+      "shoppingcart_slider_value": ""
+    },
+    "pricing": [
+      "freemium",
+      "onetime"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/themes/shoppingcart(?:-plus)?/",
+    "website": "https://themefreesia.com/themes/shoppingcart"
+  },
+  "Theme Horse NewsCard": {
+    "cats": [
+      80
+    ],
+    "description": "NewsCard is a multi-purpose magazine/news WordPress theme by Theme Horse.",
+    "dom": "link[href*='/wp-content/themes/newscard-pro/']",
+    "icon": "Theme Horse.png",
+    "pricing": [
+      "freemium",
+      "onetime"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/themes/newscard(?:-pro)?/",
+    "website": "https://www.themehorse.com/themes/newscard"
+  },
   "Theme4Press Evolve": {
     "cats": [
       80
@@ -892,21 +923,6 @@
     "scriptSrc": "/wp-content/themes/e(?:s|S)tore(?:-pro)?/",
     "website": "https://themegrill.com/themes/estore"
   },
-  "Theme Horse NewsCard": {
-    "cats": [
-      80
-    ],
-    "description": "NewsCard is a multi-purpose magazine/news WordPress theme by Theme Horse.",
-    "icon": "Theme Horse.png",
-    "dom": "link[href*='/wp-content/themes/newscard-pro/']",
-    "pricing": [
-      "freemium",
-      "onetime"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/themes/newscard(?:-pro)?/",
-    "website": "https://www.themehorse.com/themes/newscard"
-  },
   "ThemeZee Donovan": {
     "cats": [
       80
@@ -991,23 +1007,6 @@
     "scriptSrc": "/wp-content/themes/graphy(?:-pro)?/",
     "website": "https://themegraphy.com/wordpress-themes/graphy"
   },
-  "Theme Freesia ShoppingCart": {
-    "cats": [
-      80
-    ],
-    "description": "ShoppingCart is a WordPress theme especially build for store and ecommerce by Theme Freesia.",
-    "icon": "Theme Freesia.png",
-    "js": {
-      "shoppingcart_slider_value": ""
-    },
-    "pricing": [
-      "freemium",
-      "onetime"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/themes/shoppingcart(?:-plus)?/",
-    "website": "https://themefreesia.com/themes/shoppingcart"
-  },
   "Themes4Wp Bulk": {
     "cats": [
       80
@@ -1339,15 +1338,15 @@
       71
     ],
     "description": "Tiqets provides a complete overview of a city - museums, attractions, zoos, canal cruises, concerts. Publishers joined to the Tiqets affiliate program can receive 6% commission during our 30-day cookie window from completed total bookings resulting from featuring links to Tiqets products and content across their brand: blog/website, social media, newsletters, etc.",
-    "icon": "Tiqets.svg",
     "dom": "a[href*='.tiqets.com/'][target='_blank'], iframe[src*='.tiqets.com/']",
+    "icon": "Tiqets.svg",
     "js": {
       "__TIQETS_LOADER_REINIT": ""
     },
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
     "website": "https://www.tiqets.com/affiliate"
   },
   "Titan": {
@@ -1503,13 +1502,13 @@
       36
     ],
     "description": "TrafficStars is a self-served ad network and ad exchange that operates mainly in adult-related verticals.",
-    "icon": "TrafficStars.png",
     "dom": "img[src*='tsyndicate.com/'], a[href*='trafficstars.com']",
-    "scriptSrc": "\\.tsyndicate\\.com/",
-    "saas": true,
+    "icon": "TrafficStars.png",
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.tsyndicate\\.com/",
     "website": "https://trafficstars.com"
   },
   "Transifex": {
@@ -1587,8 +1586,8 @@
       97
     ],
     "description": "Treasure Data is the only enterprise customer data platform.",
-    "icon": "Treasure Data.svg",
     "dom": "link[href*='.treasuredata.com']",
+    "icon": "Treasure Data.svg",
     "js": {
       "Treasure.version": "(.+)\\;version:\\1"
     },
@@ -1814,31 +1813,14 @@
     "description": "TurnTo Networks Inc provides customer-generated content solutions platform for large retailers and the global brands that sell through them.",
     "icon": "TurnTo.svg",
     "js": {
-      "turnToConfig": "",
-      "TurnTo": ""
+      "TurnTo": "",
+      "turnToConfig": ""
     },
-    "saas": true,
     "pricing": [
       "poa"
     ],
-    "website": "https://www.turntonetworks.com"
-  },
-  "TVSquared": {
-    "cats": [
-      36
-    ],
-    "description": "TVSquared is a cross-platform TV ad measurement, analytics and optimisation platform.",
-    "icon": "TVSquared.png",
-    "dom": "link[href*='.tvsquared.com']",
-    "js": {
-      "TV2Track": "",
-      "_tvq": ""
-    },
     "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://www.tvsquared.com"
+    "website": "https://www.turntonetworks.com"
   },
   "Twenty Eleven": {
     "cats": [
@@ -2093,8 +2075,8 @@
       14
     ],
     "description": "Twitch is an American video live streaming service that focuses on video game live streaming, including broadcasts of esports competitions.",
-    "icon": "Twitch.svg",
     "dom": "iframe[src*='player\\.twitch\\.tv']",
+    "icon": "Twitch.svg",
     "js": {
       "Twitch.Player": ""
     },
@@ -2237,6 +2219,24 @@
     "scriptSrc": "use\\.typekit\\.com",
     "website": "http://typekit.com"
   },
+  "Typof": {
+    "cats": [
+      6
+    ],
+    "cookies": {
+      "typof_session": "\\;confidence:50"
+    },
+    "description": "Typof is an ecommerce platform for artisans that allows to create a premium website and sell items directly to the consumer.",
+    "icon": "Typof.png",
+    "pricing": [
+      "freemium",
+      "recurring",
+      "low"
+    ],
+    "saas": true,
+    "scriptSrc": "portal/js/typof\\.js\\;confidence:50",
+    "website": "https://typof.com"
+  },
   "theTradeDesk": {
     "cats": [
       36
diff --git a/src/technologies/u.json b/src/technologies/u.json
index 07595816e..6f513c2f3 100644
--- a/src/technologies/u.json
+++ b/src/technologies/u.json
@@ -9,34 +9,34 @@
     "scriptSrc": "uikit.*\\.js",
     "website": "https://getuikit.com"
   },
+  "UK Mail": {
+    "cats": [
+      99
+    ],
+    "description": "UK Mail is a postal service company operating in the United Kingdom.",
+    "icon": "UK Mail.png",
+    "requiresCategory": 6,
+    "text": [
+      "\\bUK Mail\\b"
+    ],
+    "website": "https://www.ukmail.com"
+  },
   "UKFast": {
     "cats": [
       88,
       62
     ],
     "description": "UKFast is a business-to-business internet hosting company based in Manchester, UK.",
-    "icon": "UKFast.png",
     "dns": {
       "SOA": "\\.ukfast\\.net"
     },
+    "icon": "UKFast.png",
     "pricing": [
       "recurring",
       "payg"
     ],
     "website": "https://www.ukfast.co.uk"
   },
-  "UK Mail": {
-    "cats": [
-      99
-    ],
-    "description": "UK Mail is a postal service company operating in the United Kingdom.",
-    "icon": "UK Mail.png",
-    "requiresCategory": 6,
-    "text": [
-      "\\bUK Mail\\b"
-    ],
-    "website": "https://www.ukmail.com"
-  },
   "UMI.CMS": {
     "cats": [
       1
@@ -121,6 +121,22 @@
     "saas": true,
     "website": "https://www.ueeshop.com"
   },
+  "Ultimate GDPR & CCPA": {
+    "cats": [
+      67,
+      87
+    ],
+    "description": "Ultimate GDPR & CCPA is a compliance toolkit for WordPress by createIT",
+    "icon": "Ultimate GDPR & CCPA.png",
+    "js": {
+      "ct_ultimate_gdpr_cookie": ""
+    },
+    "pricing": [
+      "low"
+    ],
+    "requires": "WordPress",
+    "website": "https://www.createit.com/gdpr"
+  },
   "UltraCart": {
     "cats": [
       6
@@ -240,6 +256,22 @@
     "scriptSrc": "unpkg\\.com/",
     "website": "https://unpkg.com"
   },
+  "Unruly": {
+    "cats": [
+      36
+    ],
+    "description": "Unruly is a video advertising platform.",
+    "dom": "link[href*='.unrulymedia.com']",
+    "icon": "Unruly.png",
+    "js": {
+      "unruly.native": ""
+    },
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "website": "https://unruly.co"
+  },
   "UpSellit": {
     "cats": [
       98
@@ -260,6 +292,22 @@
     "scriptSrc": "www\\.upsellit\\.com/",
     "website": "https://us.upsellit.com"
   },
+  "Uploadcare": {
+    "cats": [
+      31
+    ],
+    "description": "Uploadcare is a complete file handling platform for online business. Receive files from you users via File Uploader or File Upload API, implement image optimization and transformations with Image CDN API, and get HIPAA-compliant storage.",
+    "dom": "img[src*='.ucarecdn.com/'], link[href*='ucarecdn.com'], img[data-src*='.ucarecdn.com/']",
+    "icon": "Uploadcare.svg",
+    "js": {
+      "uploadcare.version": "^([\\d\\.]+)$\\;version:\\1"
+    },
+    "pricing": [
+      "freemium",
+      "payg"
+    ],
+    "website": "https://uploadcare.com"
+  },
   "Upserve": {
     "cats": [
       93
@@ -363,14 +411,14 @@
       73
     ],
     "description": "UserReport is an online survey and feedback management platform.",
-    "icon": "UserReport.svg",
     "dom": "a[href*='feedback.userreport.com/'][target='_blank']",
-    "scriptSrc": "\\.userreport\\.com/",
-    "saas": true,
+    "icon": "UserReport.svg",
     "pricing": [
       "freemium",
       "poa"
     ],
+    "saas": true,
+    "scriptSrc": "\\.userreport\\.com/",
     "website": "https://www.userreport.com"
   },
   "UserRules": {
@@ -509,59 +557,11 @@
     "js": {
       "uLogin.version": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "saas": true,
     "pricing": [
       "freemium"
     ],
-    "website": "https://ulogin.ru"
-  },
-  "Ultimate GDPR & CCPA": {
-    "cats": [
-      67,
-      87
-    ],
-    "description": "Ultimate GDPR & CCPA is a compliance toolkit for WordPress by createIT",
-    "icon": "Ultimate GDPR & CCPA.png",
-    "js": {
-      "ct_ultimate_gdpr_cookie": ""
-    },
-    "pricing": [
-      "low"
-    ],
-    "requires": "WordPress",
-    "website": "https://www.createit.com/gdpr"
-  },
-  "Unruly": {
-    "cats": [
-      36
-    ],
-    "description": "Unruly is a video advertising platform.",
-    "icon": "Unruly.png",
-    "dom": "link[href*='.unrulymedia.com']",
-    "js": {
-      "unruly.native": ""
-    },
     "saas": true,
-    "pricing": [
-      "payg"
-    ],
-    "website": "https://unruly.co"
-  },
-  "Uploadcare": {
-    "cats": [
-      31
-    ],
-    "description": "Uploadcare is a complete file handling platform for online business. Receive files from you users via File Uploader or File Upload API, implement image optimization and transformations with Image CDN API, and get HIPAA-compliant storage.",
-    "icon": "Uploadcare.svg",
-    "dom": "img[src*='.ucarecdn.com/'], link[href*='ucarecdn.com'], img[data-src*='.ucarecdn.com/']",
-    "js": {
-      "uploadcare.version": "^([\\d\\.]+)$\\;version:\\1"
-    },
-    "pricing": [
-      "freemium",
-      "payg"
-    ],
-    "website": "https://uploadcare.com"
+    "website": "https://ulogin.ru"
   },
   "uPortal": {
     "cats": [
@@ -599,4 +599,4 @@
     },
     "website": "https://user.com"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/v.json b/src/technologies/v.json
index 80584b6f4..c3bf6fb80 100644
--- a/src/technologies/v.json
+++ b/src/technologies/v.json
@@ -1,4 +1,21 @@
 {
+  "VDX.tv": {
+    "cats": [
+      36
+    ],
+    "description": "VDX.tv (formerly Exponential) is a global advertising technology company that is transforming the way brands connect with relevant audiences in today's converging video landscape.",
+    "dom": "link[href*='.tribalfusion.com'], link[href*='.exponential.com']",
+    "icon": "VDX.tv.png",
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": [
+      "\\.tribalfusion\\.com/",
+      "\\.exponential\\.com"
+    ],
+    "website": "https://vdx.tv"
+  },
   "VIVVO": {
     "cats": [
       1
@@ -186,11 +203,11 @@
       88
     ],
     "description": "VentraIP is the largest privately owned web host and domain name registrar in Australia.",
-    "icon": "VentraIP.svg",
     "dns": {
-      "SOA": "\\.(?:nameserver|hostingplatform)\\.net\\.au",
-      "NS": "\\.(?:nameserver|hostingplatform)\\.net\\.au"
+      "NS": "\\.(?:nameserver|hostingplatform)\\.net\\.au",
+      "SOA": "\\.(?:nameserver|hostingplatform)\\.net\\.au"
     },
+    "icon": "VentraIP.svg",
     "pricing": [
       "recurring",
       "payg"
@@ -655,23 +672,6 @@
     ],
     "website": "https://www.vcita.com"
   },
-  "VDX.tv": {
-    "cats": [
-      36
-    ],
-    "description": "VDX.tv (formerly Exponential) is a global advertising technology company that is transforming the way brands connect with relevant audiences in today's converging video landscape.",
-    "icon": "VDX.tv.png",
-    "dom": "link[href*='.tribalfusion.com'], link[href*='.exponential.com']",
-    "scriptSrc": [
-      "\\.tribalfusion\\.com/",
-      "\\.exponential\\.com"
-    ],
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://vdx.tv"
-  },
   "vibecommerce": {
     "cats": [
       6
@@ -685,4 +685,4 @@
     },
     "website": "http://vibecommerce.com.br"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/w.json b/src/technologies/w.json
index bc67b5962..009ee4a73 100644
--- a/src/technologies/w.json
+++ b/src/technologies/w.json
@@ -80,15 +80,6 @@
     ],
     "website": "http://www.whmcs.com"
   },
-  "WorldShopping": {
-    "cats": [
-      6
-    ],
-    "description": "WorldShopping makes online purchases in Japan easier for international visitors.",
-    "icon": "worldshopping.png",
-    "scriptSrc": "checkout-api\\.worldshopping\\.jp/(v\\d+)?\\;version:\\1",
-    "website": "https://www.worldshopping.global/"
-  },
   "WP Engine": {
     "cats": [
       62,
@@ -105,59 +96,14 @@
     "implies": "WordPress",
     "website": "https://wpengine.com"
   },
-  "WPMU DEV Smush": {
-    "cats": [
-      87
-    ],
-    "description": "WPMU DEV Smush is a WordPress plugin that allows you to optimise images without losing quality.",
-    "icon": "WPMU DEV.png",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",   
-    "scriptSrc": "/wp-content/plugins/wp-smushit(?:-pro)?/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://wpmudev.com/project/wp-smush-pro"    
-  },
-  "WP-Optimize": {
-    "cats": [
-      87,
-      92
-    ],
-    "description": "WP-Optimize is an all-in-one WordPress plugin that cleans your database, compresses your large images and caches your site.",
-    "icon": "WP-Optimize.png",
-    "html": "<!--[^>]+Cached by WP-Optimize",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",    
-    "website": "https://getwpo.com"
-  },
-  "WP-PageNavi": {
-    "cats": [
-      87
-    ],
-    "description": "WP-PageNavi is a WordPress plugin which adds a more advanced paging navigation interface to your WordPress blog.",
-    "icon": "WP-PageNavi.svg",
-    "dom": "link[href*='/wp-content/plugins/wp-pagenavi/']",
-    "oss": true,
-    "pricing": [
-      "freemium"
-    ],
-    "requires": "WordPress",
-    "website": "https://github.com/lesterchan/wp-pagenavi"
-  },
   "WP Fastest Cache": {
     "cats": [
       87,
       92
     ],
     "description": "WP Fastest Cache is one of a number of plugins for WordPress designed to accelerate the performance of your website.",
-    "icon": "WP Fastest Cache.png",
     "dom": "link[href*='/wp-content/cache/wpfc-minified/']",
+    "icon": "WP Fastest Cache.png",
     "js": {
       "Wpfcll": ""
     },
@@ -169,36 +115,17 @@
     "scriptSrc": "/wp-content/cache/wpfc-minified/",
     "website": "https://www.wpfastestcache.com"
   },
-  "WPForms": {
-    "cats": [
-      87
-    ],
-    "description": "WPForms is a drag and drop WordPress form builder.",
-    "icon": "WPForms.svg",
-    "js": {
-      "wpforms": "",
-      "wpforms_settings": ""
-    },
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/wpforms(?:-lite)?/.+(?:frontend\\.min|wpforms)\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://wpforms.com"
-  },
   "WP Maintenance Mode": {
     "cats": [
       87
     ],
     "description": "WP Maintenance Mode is a WordPress plugin which add a maintenance page to your blog.",
     "icon": "WP Maintenance Mode.png",
-    "js":{
+    "js": {
       "wpmm_vars": ""
     },
-    "requires": "WordPress",
     "oss": true,
+    "requires": "WordPress",
     "scriptSrc": "/wp-content/plugins/wp-maintenance-mode/.+wpmm\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
     "website": "https://github.com/andrianvaleanu/WP-Maintenance-Mode"
   },
@@ -231,6 +158,36 @@
     "requires": "WordPress",
     "website": "http://wp-rocket.me"
   },
+  "WP-Optimize": {
+    "cats": [
+      87,
+      92
+    ],
+    "description": "WP-Optimize is an all-in-one WordPress plugin that cleans your database, compresses your large images and caches your site.",
+    "html": "<!--[^>]+Cached by WP-Optimize",
+    "icon": "WP-Optimize.png",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "website": "https://getwpo.com"
+  },
+  "WP-PageNavi": {
+    "cats": [
+      87
+    ],
+    "description": "WP-PageNavi is a WordPress plugin which adds a more advanced paging navigation interface to your WordPress blog.",
+    "dom": "link[href*='/wp-content/plugins/wp-pagenavi/']",
+    "icon": "WP-PageNavi.svg",
+    "oss": true,
+    "pricing": [
+      "freemium"
+    ],
+    "requires": "WordPress",
+    "website": "https://github.com/lesterchan/wp-pagenavi"
+  },
   "WP-Royal Ashe": {
     "cats": [
       80
@@ -271,18 +228,18 @@
       87
     ],
     "description": "WP-Statistics is a WordPress plugin which allows you to know your website statistics.",
-    "icon": "WP-Statistics.svg",
     "dom": "link[href*='/wp-content/plugins/wp-statistics/']",
+    "icon": "WP-Statistics.svg",
     "js": {
       "WP_Statistics_http": "",
       "wps_statistics_object": ""
     },
+    "oss": true,
     "pricing": [
       "freemium",
       "onetime"
     ],
     "requires": "WordPress",
-    "oss": true,
     "website": "https://wp-statistics.com"
   },
   "WPCacheOn": {
@@ -300,6 +257,40 @@
     ],
     "website": "https://wpcacheon.io"
   },
+  "WPForms": {
+    "cats": [
+      87
+    ],
+    "description": "WPForms is a drag and drop WordPress form builder.",
+    "icon": "WPForms.svg",
+    "js": {
+      "wpforms": "",
+      "wpforms_settings": ""
+    },
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/wpforms(?:-lite)?/.+(?:frontend\\.min|wpforms)\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://wpforms.com"
+  },
+  "WPMU DEV Smush": {
+    "cats": [
+      87
+    ],
+    "description": "WPMU DEV Smush is a WordPress plugin that allows you to optimise images without losing quality.",
+    "icon": "WPMU DEV.png",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/wp-smushit(?:-pro)?/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://wpmudev.com/project/wp-smush-pro"
+  },
   "Wagtail": {
     "cats": [
       1
@@ -362,17 +353,17 @@
       58
     ],
     "description": "WalkMe is a cloud-based interactive guidance and engagement platform.",
-    "icon": "WalkMe.svg",
     "dom": "link[href*='.walkme.com']",
+    "icon": "WalkMe.svg",
     "js": {
-      "_walkmeConfig": "",
-      "WalkMeAPI": ""
+      "WalkMeAPI": "",
+      "_walkmeConfig": ""
     },
-    "saas": true,
     "pricing": [
       "high",
       "recurring"
     ],
+    "saas": true,
     "website": "https://www.walkme.com"
   },
   "Wangsu": {
@@ -403,12 +394,12 @@
       80
     ],
     "description": "Weaver Xtreme is the orginal options-based WordPress theme.",
-    "icon": "Weaver Xtreme.png",
     "dom": "link#weaverx-style-sheet-css",
+    "icon": "Weaver Xtreme.png",
     "js": {
       "weaverxBottomFooter": "",
-      "weaverxOnResize": "",
-      "weaverxMonitorContent": ""
+      "weaverxMonitorContent": "",
+      "weaverxOnResize": ""
     },
     "pricing": [
       "freemium",
@@ -476,36 +467,36 @@
     "scriptSrc": "\\.webengage\\.co(?:m)?/",
     "website": "https://webengage.com"
   },
-  "WebFactory Under Construction": {
+  "WebFactory Maintenance": {
     "cats": [
       87
     ],
-    "description": "WebFactory Under Construction is a WordPress plugin which allows you to create an under construction page.",
+    "description": "WebFactory Maintenance is a WordPress plugin which allows you to create an maintenance page.",
+    "dom": "link[href*='/wp-content/plugins/maintenance/']",
     "icon": "WebFactory.png",
-    "dom": "link[href*='/wp-content/plugins/under-construction-page/']",
+    "js": {
+      "mtnc_front_options": ""
+    },
+    "oss": true,
     "pricing": [
       "freemium"
     ],
     "requires": "WordPress",
-    "oss": true,
-    "website": "https://wordpress.org/plugins/under-construction-page"
-  },  
-  "WebFactory Maintenance": {
+    "website": "https://wordpress.org/plugins/maintenance"
+  },
+  "WebFactory Under Construction": {
     "cats": [
       87
     ],
-    "description": "WebFactory Maintenance is a WordPress plugin which allows you to create an maintenance page.",
+    "description": "WebFactory Under Construction is a WordPress plugin which allows you to create an under construction page.",
+    "dom": "link[href*='/wp-content/plugins/under-construction-page/']",
     "icon": "WebFactory.png",
-    "dom": "link[href*='/wp-content/plugins/maintenance/']",
-    "js": {
-      "mtnc_front_options": ""
-    },
+    "oss": true,
     "pricing": [
       "freemium"
     ],
     "requires": "WordPress",
-    "oss": true,
-    "website": "https://wordpress.org/plugins/maintenance"
+    "website": "https://wordpress.org/plugins/under-construction-page"
   },
   "WebGUI": {
     "cats": [
@@ -569,6 +560,24 @@
     },
     "website": "http://websitex5.com"
   },
+  "WebToffee GDPR Cookie Consent": {
+    "cats": [
+      87,
+      67
+    ],
+    "description": "WebToffee GDPR Cookie Consent is a cookie consent and compliance notice WordPress plugin which will assist you in making your website GDPR (RGPD, DSVGO) compliant.",
+    "dom": "link[href*='/wp-content/plugins/cookie-law-info/']",
+    "icon": "WebToffee.svg",
+    "implies": "CookieYes",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/cookie-law-info/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://www.webtoffee.com/product/gdpr-cookie-consent/"
+  },
   "Webflow": {
     "cats": [
       51
@@ -691,24 +700,6 @@
     "icon": "websocket.png",
     "website": "https://en.wikipedia.org/wiki/WebSocket"
   },
-  "WebToffee GDPR Cookie Consent": {
-    "cats": [
-      87,
-      67
-    ],
-    "description": "WebToffee GDPR Cookie Consent is a cookie consent and compliance notice WordPress plugin which will assist you in making your website GDPR (RGPD, DSVGO) compliant.",
-    "icon": "WebToffee.svg",
-    "dom": "link[href*='/wp-content/plugins/cookie-law-info/']",
-    "implies": "CookieYes",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/cookie-law-info/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://www.webtoffee.com/product/gdpr-cookie-consent/"
-  },
   "Webtrekk": {
     "cats": [
       10
@@ -1172,47 +1163,46 @@
     ],
     "website": "https://woocommerce.com"
   },
-
-  "WooCommerce PayPal Payments": {
+  "WooCommerce PayPal Checkout Payment Gateway": {
     "cats": [
       87
     ],
-    "description": "WooCommerce PayPal Payments is a latest WordPress plugin with most complete payment processing solution. Accept PayPal exclusives, credit/debit cards and local payment methods.",
+    "description": "WooCommerce PayPal Checkout Payment Gateway is a WordPress plugin which allows you to securely sell your products and subscriptions online using in-context checkout.",
+    "dom": "link[href*='/wp-content/plugins/woocommerce-gateway-paypal-express-checkout/']",
     "icon": "WooCommerce PayPal.png",
     "implies": "PayPal",
-    "dom": "link[href*='/wp-content/plugins/woocommerce-paypal-payments/']",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
-    "oss": true,
     "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/woocommerce-paypal-payments/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://github.com/woocommerce/woocommerce-paypal-payments"
+    "scriptSrc": "/wp-content/plugins/woocommerce-gateway-paypal-express-checkout/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://github.com/woocommerce/woocommerce-gateway-paypal-express-checkout"
   },
-  "WooCommerce PayPal Checkout Payment Gateway": {
+  "WooCommerce PayPal Payments": {
     "cats": [
       87
     ],
-    "description": "WooCommerce PayPal Checkout Payment Gateway is a WordPress plugin which allows you to securely sell your products and subscriptions online using in-context checkout.",
+    "description": "WooCommerce PayPal Payments is a latest WordPress plugin with most complete payment processing solution. Accept PayPal exclusives, credit/debit cards and local payment methods.",
+    "dom": "link[href*='/wp-content/plugins/woocommerce-paypal-payments/']",
     "icon": "WooCommerce PayPal.png",
     "implies": "PayPal",
-    "dom": "link[href*='/wp-content/plugins/woocommerce-gateway-paypal-express-checkout/']",
+    "oss": true,
     "pricing": [
       "freemium"
     ],
-    "oss": true,
     "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/woocommerce-gateway-paypal-express-checkout/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://github.com/woocommerce/woocommerce-gateway-paypal-express-checkout"
+    "scriptSrc": "/wp-content/plugins/woocommerce-paypal-payments/.+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://github.com/woocommerce/woocommerce-paypal-payments"
   },
   "WooCommerce Stripe Payment Gateway": {
     "cats": [
       87
     ],
     "description": "WooCommerce Stripe Payment Gateway plugin extends WooCommerce allowing you to take payments directly on your store via Stripe’s API.",
+    "dom": "link[href*='/wp-content/plugins/woocommerce-gateway-stripe/']",
     "icon": "WooCommerce Stripe Payment Gateway.png",
     "implies": "Stripe",
-    "dom": "link[href*='/wp-content/plugins/woocommerce-gateway-stripe/']",
     "pricing": [
       "freemium"
     ],
@@ -1234,6 +1224,7 @@
     ],
     "description": "Woostify is fast, lightweight, responsive and flexible WooCommerce theme built with SEO, speed, and usability in mind.",
     "icon": "Woostify.png",
+    "implies": "WooCommerce",
     "js": {
       "woostifyConditionScrolling": "",
       "woostify_woocommerce_general": ""
@@ -1244,7 +1235,6 @@
       "recurring"
     ],
     "requires": "WordPress",
-    "implies": "WooCommerce",
     "scriptSrc": "/wp-content/themes/woostify/",
     "website": "https://woostify.com"
   },
@@ -1269,51 +1259,16 @@
       36
     ],
     "description": "WordAds is an advertising platform run by Automatic that allows bloggers and website owners to place advertisements on their blogs and websites.",
-    "icon": "WordAds.png",
     "dom": "link[href*='.pubmine.com']",
-    "scriptSrc": "\\.pubmine\\.com/",
-    "saas": true,
+    "icon": "WordAds.png",
     "pricing": [
       "freemium",
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.pubmine\\.com/",
     "website": "https://wordads.co"
   },
-  "Wordfence": {
-    "cats": [
-      87,
-      16
-    ],
-    "description": "Wordfence is a security plugin for sites that use WordPress. Wordfence includes an endpoint firewall and malware scanner.",
-    "icon": "Wordfence.svg",
-    "js": {
-      "wordfenceAJAXWatcher": ""
-    },
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/wordfence/.+admin\\.ajaxWatcher\\.\\d+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://www.wordfence.com"
-  },
-  "Wordfence Login Security": {
-    "cats": [
-      87,
-      16
-    ],
-    "description": "Wordfence Login Security contains a subset of the functionality found in the full Wordfence plugin: Two-factor Authentication, XML-RPC Protection and Login Page CAPTCHA.",
-    "icon": "Wordfence.svg",
-    "pricing": [
-      "freemium",
-      "low",
-      "recurring"
-    ],
-    "requires": "WordPress",
-    "scriptSrc": "/wp-content/plugins/wordfence/.+login\\.\\d+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
-    "website": "https://www.wordfence.com"
-  },
   "WordPress": {
     "cats": [
       1,
@@ -1409,6 +1364,41 @@
     ],
     "website": "https://wordpress.com"
   },
+  "Wordfence": {
+    "cats": [
+      87,
+      16
+    ],
+    "description": "Wordfence is a security plugin for sites that use WordPress. Wordfence includes an endpoint firewall and malware scanner.",
+    "icon": "Wordfence.svg",
+    "js": {
+      "wordfenceAJAXWatcher": ""
+    },
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/wordfence/.+admin\\.ajaxWatcher\\.\\d+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://www.wordfence.com"
+  },
+  "Wordfence Login Security": {
+    "cats": [
+      87,
+      16
+    ],
+    "description": "Wordfence Login Security contains a subset of the functionality found in the full Wordfence plugin: Two-factor Authentication, XML-RPC Protection and Login Page CAPTCHA.",
+    "icon": "Wordfence.svg",
+    "pricing": [
+      "freemium",
+      "low",
+      "recurring"
+    ],
+    "requires": "WordPress",
+    "scriptSrc": "/wp-content/plugins/wordfence/.+login\\.\\d+\\.js(?:\\?ver=(\\d+(?:\\.\\d+)+))?\\;version:\\1",
+    "website": "https://www.wordfence.com"
+  },
   "Workarea": {
     "cats": [
       6
@@ -1425,10 +1415,10 @@
       88
     ],
     "description": "World4You operates homepage and domain solutions. World4Youu operates data centers in Austria and provides data protection.",
-    "icon": "World4You.svg",
     "dns": {
       "SOA": "ns\\d+\\.world4you\\.at"
     },
+    "icon": "World4You.svg",
     "pricing": [
       "low",
       "recurring"
@@ -1448,6 +1438,15 @@
     "saas": true,
     "website": "https://online.worldpay.com"
   },
+  "WorldShopping": {
+    "cats": [
+      6
+    ],
+    "description": "WorldShopping makes online purchases in Japan easier for international visitors.",
+    "icon": "worldshopping.png",
+    "scriptSrc": "checkout-api\\.worldshopping\\.jp/(v\\d+)?\\;version:\\1",
+    "website": "https://www.worldshopping.global/"
+  },
   "Wufoo": {
     "cats": [
       73
@@ -1577,4 +1576,4 @@
     "url": "^https?://[^/]+\\.wpcache\\.co",
     "website": "https://wpcache.co"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/x.json b/src/technologies/x.json
index ca0998015..e216c2b1a 100644
--- a/src/technologies/x.json
+++ b/src/technologies/x.json
@@ -88,21 +88,6 @@
     ],
     "website": "http://xregexp.com"
   },
-  "Xserver": {
-    "cats": [
-      88
-    ],
-    "description": "Xserver engages in web hosting, web application and internet-related services.",
-    "icon": "Xserver.png",
-    "dns": {
-      "SOA": "\\.xserver\\.jp"
-    },
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://www.xserver.ne.jp"
-  },
   "XSLT": {
     "cats": [
       27
@@ -237,6 +222,21 @@
     "scriptSrc": "apps\\.xpresslane\\.in/",
     "website": "https://www.xpresslane.in"
   },
+  "Xserver": {
+    "cats": [
+      88
+    ],
+    "description": "Xserver engages in web hosting, web application and internet-related services.",
+    "dns": {
+      "SOA": "\\.xserver\\.jp"
+    },
+    "icon": "Xserver.png",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "website": "https://www.xserver.ne.jp"
+  },
   "Xtremepush": {
     "cats": [
       32
diff --git a/src/technologies/y.json b/src/technologies/y.json
index 60f730711..34874a088 100644
--- a/src/technologies/y.json
+++ b/src/technologies/y.json
@@ -1,18 +1,4 @@
 {
-  "yellow.ai": {
-    "cats": [
-      52
-    ],
-    "description": "yellow.ai provides chatbot and automation services.",
-    "icon": "yellow.ai.svg",
-    "js": {
-      "ymConfig": ""
-    },
-    "saas": true,
-    "pricing": [ "poa" ],
-    "scriptSrc": "cdn\\.yellowmessenger\\.com",
-    "website": "https://yellow.ai/"
-  },
   "YUI": {
     "cats": [
       59
@@ -98,10 +84,10 @@
     ],
     "description": "Yandex.Cloud is a public cloud platform where companies can create and develop projects using Yandex's scalable computing power, advanced technologies, and infrastructure.",
     "icon": "Yandex.Cloud.svg",
-    "saas": false,
     "pricing": [
       "payg"
     ],
+    "saas": false,
     "website": "https://cloud.yandex.com/en/"
   },
   "Yandex.Cloud CDN": {
@@ -109,9 +95,9 @@
       31
     ],
     "description": "Yandex.Cloud CDN helps you streamline static content delivery for your web service.",
+    "dom": "[href*='storage.yandexcloud.net'], [src*='storage.yandexcloud.net']",
     "icon": "Yandex.Cloud.svg",
     "implies": "Yandex.Cloud",
-    "dom": "[href*='storage.yandexcloud.net'], [src*='storage.yandexcloud.net']",
     "website": "https://cloud.yandex.com/en/services/cdn"
   },
   "Yandex.Direct": {
@@ -220,8 +206,8 @@
     "js": {
       "YETT_BLACKLIST": ""
     },
-    "scriptSrc": "/yett@([\\d\\.]+)/dist/yett\\.min\\.js\\;version:\\1",
     "oss": true,
+    "scriptSrc": "/yett@([\\d\\.]+)/dist/yett\\.min\\.js\\;version:\\1",
     "website": "https://github.com/elbywan/yett"
   },
   "Yieldify": {
@@ -275,9 +261,9 @@
       87
     ],
     "description": "Yoast Duplicate Post is a WordPress plugin which allows users to clone posts of any type, or copy them to new drafts for further editing.",
+    "dom": "link[href*='/wp-content/plugins/duplicate-post/']",
     "icon": "Yoast SEO.png",
     "requires": "WordPress",
-    "dom": "link[href*='/wp-content/plugins/duplicate-post/']",
     "website": "https://wordpress.org/plugins/duplicate-post"
   },
   "Yoast SEO": {
@@ -317,9 +303,9 @@
     "description": "Yotpo is a user-generated content marketing platform.",
     "icon": "Yotpo.svg",
     "js": {
-      "yotpo": "",
       "SwellConfig": "",
-      "swellAPI": ""
+      "swellAPI": "",
+      "yotpo": ""
     },
     "pricing": [
       "freemium",
@@ -369,5 +355,21 @@
     "html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)",
     "icon": "YouTube.png",
     "website": "http://www.youtube.com"
+  },
+  "yellow.ai": {
+    "cats": [
+      52
+    ],
+    "description": "yellow.ai provides chatbot and automation services.",
+    "icon": "yellow.ai.svg",
+    "js": {
+      "ymConfig": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scriptSrc": "cdn\\.yellowmessenger\\.com",
+    "website": "https://yellow.ai/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/z.json b/src/technologies/z.json
index 221606712..cde19dc4e 100644
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@@ -391,12 +391,12 @@
       "$pagesense": "",
       "pagesense": ""
     },
-    "scriptSrc": "\\.pagesense\\.(?:cn|io)?",
-    "saas": true,
     "pricing": [
       "recurring",
       "payg"
     ],
+    "saas": true,
+    "scriptSrc": "\\.pagesense\\.(?:cn|io)?",
     "website": "https://www.zoho.com/pagesense/"
   },
   "Zoko": {