diff --git a/src/categories.json b/src/categories.json
index 46e8ce7f4..b3cefccf7 100644
--- a/src/categories.json
+++ b/src/categories.json
@@ -1,462 +1,658 @@
 {
   "1": {
+    "groups": [
+      3
+    ],
     "name": "CMS",
-    "groups": [ 3 ],
     "priority": 1
   },
   "2": {
+    "groups": [
+      3,
+      4,
+      18
+    ],
     "name": "Message boards",
-    "groups": [ 3, 4, 18 ],
     "priority": 1
   },
   "3": {
+    "groups": [
+      5
+    ],
     "name": "Database managers",
-    "groups": [ 5 ],
     "priority": 2
   },
   "4": {
+    "groups": [
+      3
+    ],
     "name": "Documentation",
-    "groups": [ 3 ],
     "priority": 2
   },
   "5": {
+    "groups": [
+      6
+    ],
     "name": "Widgets",
-    "groups": [ 6 ],
     "priority": 9
   },
   "6": {
+    "groups": [
+      1
+    ],
     "name": "Ecommerce",
-    "groups": [ 1 ],
     "priority": 1
   },
   "7": {
+    "groups": [
+      3,
+      10
+    ],
     "name": "Photo galleries",
-    "groups": [ 3, 10 ],
     "priority": 1
   },
   "8": {
+    "groups": [
+      3
+    ],
     "name": "Wikis",
-    "groups": [ 3 ],
     "priority": 1
   },
   "9": {
+    "groups": [
+      5,
+      7
+    ],
     "name": "Hosting panels",
-    "groups": [ 5, 7 ],
     "priority": 1
   },
   "10": {
+    "groups": [
+      8
+    ],
     "name": "Analytics",
-    "groups": [ 8 ],
     "priority": 9
   },
   "11": {
+    "groups": [
+      3
+    ],
     "name": "Blogs",
-    "groups": [ 3 ],
     "priority": 1
   },
   "12": {
+    "groups": [
+      9
+    ],
     "name": "JavaScript frameworks",
-    "groups": [ 9 ],
     "priority": 8
   },
   "13": {
+    "groups": [
+      3,
+      18
+    ],
     "name": "Issue trackers",
-    "groups": [ 3, 18 ],
     "priority": 2
   },
   "14": {
+    "groups": [
+      10
+    ],
     "name": "Video players",
-    "groups": [ 10 ],
     "priority": 7
   },
   "15": {
+    "groups": [
+      3,
+      18
+    ],
     "name": "Comment systems",
-    "groups": [ 3, 18 ],
     "priority": 9
   },
   "16": {
+    "groups": [
+      11
+    ],
     "name": "Security",
-    "groups": [ 11 ],
     "priority": 9
   },
   "17": {
+    "groups": [
+      9
+    ],
     "name": "Font scripts",
-    "groups": [ 9 ],
     "priority": 9
   },
   "18": {
+    "groups": [
+      9
+    ],
     "name": "Web frameworks",
-    "groups": [ 9 ],
     "priority": 7
   },
   "19": {
+    "groups": [
+      6
+    ],
     "name": "Miscellaneous",
-    "groups": [ 6 ],
     "priority": 9
   },
   "20": {
+    "groups": [
+      9
+    ],
     "name": "Editors",
-    "groups": [ 9 ],
     "priority": 4
   },
   "21": {
+    "groups": [
+      3
+    ],
     "name": "LMS",
-    "groups": [ 3 ],
     "priority": 1
   },
   "22": {
+    "groups": [
+      7
+    ],
     "name": "Web servers",
-    "groups": [ 7 ],
     "priority": 8
   },
   "23": {
+    "groups": [
+      7
+    ],
     "name": "Caching",
-    "groups": [ 7 ],
     "priority": 7
   },
   "24": {
+    "groups": [
+      3
+    ],
     "name": "Rich text editors",
-    "groups": [ 3 ],
     "priority": 5
   },
   "25": {
+    "groups": [
+      9
+    ],
     "name": "JavaScript graphics",
-    "groups": [ 9 ],
     "priority": 6
   },
   "26": {
+    "groups": [
+      9
+    ],
     "name": "Mobile frameworks",
-    "groups": [ 9 ],
     "priority": 8
   },
   "27": {
+    "groups": [
+      9
+    ],
     "name": "Programming languages",
-    "groups": [ 9 ],
     "priority": 5
   },
   "28": {
+    "groups": [
+      7
+    ],
     "name": "Operating systems",
-    "groups": [ 7 ],
     "priority": 6
   },
   "29": {
+    "groups": [
+      3
+    ],
     "name": "Search engines",
-    "groups": [ 3 ],
     "priority": 4
   },
   "30": {
+    "groups": [
+      4
+    ],
     "name": "Webmail",
-    "groups": [ 4 ],
     "priority": 2
   },
   "31": {
+    "groups": [
+      7
+    ],
     "name": "CDN",
-    "groups": [ 7 ],
     "priority": 9
   },
   "32": {
+    "groups": [
+      2
+    ],
     "name": "Marketing automation",
-    "groups": [ 2 ],
     "priority": 9
   },
   "33": {
+    "groups": [
+      7
+    ],
     "name": "Web server extensions",
-    "groups": [ 7 ],
     "priority": 7
   },
   "34": {
+    "groups": [
+      7
+    ],
     "name": "Databases",
-    "groups": [ 7 ],
     "priority": 5
   },
   "35": {
+    "groups": [
+      17
+    ],
     "name": "Maps",
-    "groups": [ 17 ],
     "priority": 6
   },
   "36": {
+    "groups": [
+      2
+    ],
     "name": "Advertising",
-    "groups": [ 2 ],
     "priority": 9
   },
   "37": {
+    "groups": [
+      7
+    ],
     "name": "Network devices",
-    "groups": [ 7 ],
     "priority": 2
   },
   "38": {
+    "groups": [
+      10,
+      7
+    ],
     "name": "Media servers",
-    "groups": [ 10, 7 ],
     "priority": 1
   },
   "39": {
+    "groups": [
+      4
+    ],
     "name": "Webcams",
-    "groups": [ 4 ],
     "priority": 9
   },
   "41": {
+    "groups": [
+      1
+    ],
     "name": "Payment processors",
-    "groups": [ 1 ],
     "priority": 8
   },
   "42": {
+    "groups": [
+      8
+    ],
     "name": "Tag managers",
-    "groups": [ 8 ],
     "priority": 9
   },
   "44": {
+    "groups": [
+      9
+    ],
     "name": "CI",
-    "groups": [ 9 ],
     "priority": 3
   },
   "45": {
+    "groups": [
+      7
+    ],
     "name": "Control systems",
-    "groups": [ 7 ],
     "priority": 2
   },
   "46": {
+    "groups": [
+      4
+    ],
     "name": "Remote access",
-    "groups": [ 4 ],
     "priority": 1
   },
   "47": {
+    "groups": [
+      9
+    ],
     "name": "Development",
-    "groups": [ 9 ],
     "priority": 2
   },
   "48": {
+    "groups": [
+      10
+    ],
     "name": "Network storage",
-    "groups": [ 10 ],
     "priority": 2
   },
   "49": {
+    "groups": [
+      3
+    ],
     "name": "Feed readers",
-    "groups": [ 3 ],
     "priority": 1
   },
   "50": {
+    "groups": [
+      3
+    ],
     "name": "DMS",
-    "groups": [ 3 ],
     "priority": 1
   },
   "51": {
+    "groups": [
+      9
+    ],
     "name": "Page builders",
-    "groups": [ 9 ],
     "priority": 2
   },
   "52": {
+    "groups": [
+      4,
+      16
+    ],
     "name": "Live chat",
-    "groups": [ 4, 16 ],
     "priority": 9
   },
   "53": {
+    "groups": [
+      2,
+      16
+    ],
     "name": "CRM",
-    "groups": [ 2, 16 ],
     "priority": 5
   },
   "54": {
+    "groups": [
+      2
+    ],
     "name": "SEO",
-    "groups": [ 2 ],
     "priority": 8
   },
   "55": {
+    "groups": [
+      16
+    ],
     "name": "Accounting",
-    "groups": [ 16 ],
     "priority": 1
   },
   "56": {
+    "groups": [
+      5
+    ],
     "name": "Cryptominers",
-    "groups": [ 5 ],
     "priority": 5
   },
   "57": {
+    "groups": [
+      9
+    ],
     "name": "Static site generator",
-    "groups": [ 9 ],
     "priority": 1
   },
   "58": {
+    "groups": [
+      6
+    ],
     "name": "User onboarding",
-    "groups": [ 6 ],
     "priority": 8
   },
   "59": {
+    "groups": [
+      9
+    ],
     "name": "JavaScript libraries",
-    "groups": [ 9 ],
     "priority": 9
   },
   "60": {
+    "groups": [
+      7
+    ],
     "name": "Containers",
-    "groups": [ 7 ],
     "priority": 8
   },
   "62": {
+    "groups": [
+      7
+    ],
     "name": "PaaS",
-    "groups": [ 7 ],
     "priority": 8
   },
   "63": {
+    "groups": [
+      7
+    ],
     "name": "IaaS",
-    "groups": [ 7 ],
     "priority": 8
   },
   "64": {
+    "groups": [
+      7
+    ],
     "name": "Reverse proxies",
-    "groups": [ 7 ],
     "priority": 7
   },
   "65": {
+    "groups": [
+      7
+    ],
     "name": "Load balancers",
-    "groups": [ 7 ],
     "priority": 7
   },
   "66": {
+    "groups": [
+      9
+    ],
     "name": "UI frameworks",
-    "groups": [ 9 ],
     "priority": 7
   },
   "67": {
+    "groups": [
+      13
+    ],
     "name": "Cookie compliance",
-    "groups": [ 13 ],
     "priority": 9
   },
   "68": {
+    "groups": [
+      9
+    ],
     "name": "Accessibility",
-    "groups": [ 9 ],
     "priority": 9
   },
   "69": {
+    "groups": [
+      11
+    ],
     "name": "Authentication",
-    "groups": [ 11 ],
     "priority": 6
   },
   "70": {
+    "groups": [
+      11
+    ],
     "name": "SSL/TLS certificate authorities",
-    "groups": [ 11 ],
     "priority": 9
   },
   "71": {
+    "groups": [
+      2
+    ],
     "name": "Affiliate programs",
-    "groups": [ 2 ],
     "priority": 9
   },
   "72": {
+    "groups": [
+      14
+    ],
     "name": "Appointment scheduling",
-    "groups": [ 14 ],
     "priority": 9
   },
   "73": {
+    "groups": [
+      8
+    ],
     "name": "Surveys",
-    "groups": [ 8 ],
     "priority": 9
   },
   "74": {
+    "groups": [
+      8
+    ],
     "name": "A/B Testing",
-    "groups": [ 8 ],
     "priority": 9
   },
   "75": {
+    "groups": [
+      4,
+      2
+    ],
     "name": "Email",
-    "groups": [ 4, 2 ],
     "priority": 9
   },
   "76": {
+    "groups": [
+      2
+    ],
     "name": "Personalisation",
-    "groups": [ 2 ],
     "priority": 9
   },
   "77": {
+    "groups": [
+      2
+    ],
     "name": "Retargeting",
-    "groups": [ 2 ],
     "priority": 9
   },
   "78": {
+    "groups": [
+      2
+    ],
     "name": "RUM",
-    "groups": [ 2 ],
     "priority": 9
   },
   "79": {
+    "groups": [
+      17
+    ],
     "name": "Geolocation",
-    "groups": [ 17 ],
     "priority": 9
   },
   "80": {
+    "groups": [
+      15
+    ],
     "name": "WordPress themes",
-    "groups": [ 15 ],
     "priority": 9
   },
   "81": {
+    "groups": [
+      15
+    ],
     "name": "Shopify themes",
-    "groups": [ 15 ],
     "priority": 9
   },
   "82": {
+    "groups": [
+      15
+    ],
     "name": "Drupal themes",
-    "groups": [ 15 ],
     "priority": 9
   },
   "83": {
+    "groups": [
+      8
+    ],
     "name": "Browser fingerprinting",
-    "groups": [ 8 ],
     "priority": 9
   },
   "84": {
+    "groups": [
+      1
+    ],
     "name": "Loyalty & rewards",
-    "groups": [ 1 ],
     "priority": 9
   },
   "85": {
+    "groups": [
+      9
+    ],
     "name": "Feature management",
-    "groups": [ 9 ],
     "priority": 9
   },
   "86": {
+    "groups": [
+      2
+    ],
     "name": "Segmentation",
-    "groups": [ 2 ],
     "priority": 9
   },
   "87": {
+    "groups": [
+      15
+    ],
     "name": "WordPress plugins",
-    "groups": [ 15 ],
     "priority": 9
   },
   "88": {
+    "groups": [
+      7
+    ],
     "name": "Hosting",
-    "groups": [ 7 ],
     "priority": 9
   },
   "89": {
+    "groups": [
+      3
+    ],
     "name": "Translation",
-    "groups": [ 3 ],
     "priority": 9
   },
   "90": {
+    "groups": [
+      2,
+      18
+    ],
     "name": "Reviews",
-    "groups": [ 2, 18 ],
     "priority": 9
   },
   "91": {
+    "groups": [
+      1
+    ],
     "name": "Buy now pay later",
-    "groups": [ 1 ],
     "priority": 9
   },
   "92": {
+    "groups": [
+      7
+    ],
     "name": "Performance",
-    "groups": [ 7 ],
     "priority": 9
   },
   "93": {
+    "groups": [
+      14
+    ],
     "name": "Reservations & delivery",
-    "groups": [ 14 ],
     "priority": 9
   },
   "94": {
+    "groups": [
+      2,
+      1
+    ],
     "name": "Referral marketing",
-    "groups": [ 2, 1 ],
     "priority": 9
   },
   "95": {
+    "groups": [
+      10
+    ],
     "name": "Digital asset management",
-    "groups": [ 10 ],
     "priority": 9
   }
-}
+}
\ No newline at end of file
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index dc4667203..e1c84ccd8 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.8.16",
+  "version": "6.8.17",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index 20ef73230..7b7ab6a23 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -240,6 +240,30 @@ const Content = {
         }
       }
 
+      // Detect Facebook Ads
+      if (/^(www\.)?facebook\.com$/.test(location.hostname)) {
+        const ads = document.querySelectorAll('a[aria-label="Advertiser"]')
+
+        for (const ad of ads) {
+          const urls = [
+            ...new Set([
+              `https://${decodeURIComponent(
+                ad.href.split(/^.+\?u=https%3A%2F%2F/).pop()
+              )
+                .split('/')
+                .shift()}`,
+
+              // eslint-disable-next-line unicorn/prefer-text-content
+              `https://${ad.innerText.split('\n').pop()}`,
+            ]),
+          ]
+
+          urls.forEach((url) =>
+            Content.driver('detectTechnology', [url, 'Facebook Ads'])
+          )
+        }
+      }
+
       Content.cache = { html, css, scripts, meta, cookies }
 
       await Content.driver('onContentLoad', [
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index d491c90e7..dce8c5429 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -506,6 +506,8 @@ const Driver = {
 
     const { hostname } = new URL(url)
 
+    console.log(hostname, detections)
+
     // Cache detections
     const cache = (Driver.cache.hostnames[hostname] = Driver.cache.hostnames[
       hostname
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 09761d1a2..6027252d7 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -4,7 +4,7 @@
   "author": "Wappalyzer",
   "homepage_url": "https://www.wappalyzer.com/",
   "description": "Identify web technologies",
-  "version": "6.8.16",
+  "version": "6.8.17",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
@@ -77,4 +77,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 b81174d49..2518e2d71 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.8.16",
+  "version": "6.8.17",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/technologies/a.json b/src/technologies/a.json
index 660e95b7d..cdd1aa870 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -1476,13 +1476,13 @@
     ],
     "description": "Allyable is an automated web accessibility solution with an AI engine.",
     "icon": "Allyable.png",
-    "scripts": "portal\\.allyable\\.com/",
-    "saas": true,
     "pricing": [
       "freemium",
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "portal\\.allyable\\.com/",
     "website": "https://allyable.com"
   },
   "Alpine.js": {
@@ -2756,14 +2756,24 @@
       "azure-sitename": "",
       "azure-slotname": "",
       "azure-version": "",
-      "x-ms-gateway-requestid": "",
+      "server": "^Windows-Azure",
       "x-ms-client-request-id": "",
       "x-ms-correlation-request-id": "",
-      "server": "^Windows-Azure"
+      "x-ms-gateway-requestid": ""
     },
     "icon": "azure.svg",
     "website": "https://azure.microsoft.com"
   },
+  "Azure AD B2C": {
+    "cats": [
+      69
+    ],
+    "description": "Azure Active Directory B2C is a customer identity access management (CIAM) solution.",
+    "icon": "AzureADB2C.png",
+    "implies": "Azure",
+    "url": "https.+\\.b2clogin\\.com",
+    "website": "https://azure.microsoft.com/en-us/services/active-directory/external-identities/b2c/"
+  },
   "Azure CDN": {
     "cats": [
       31
@@ -2773,8 +2783,8 @@
       "X-EC-Debug": "",
       "server": "^(?:ECAcc|ECS|ECD)"
     },
-    "implies": "Azure",
     "icon": "azure.svg",
+    "implies": "Azure",
     "website": "https://azure.microsoft.com/en-us/services/cdn/"
   },
   "a-blog cms": {
@@ -2857,15 +2867,5 @@
     "icon": "augmented-ui.png",
     "oss": true,
     "website": "http://augmented-ui.com"
-  },
-  "Azure AD B2C": {
-    "cats": [
-      69
-    ],
-    "description": "Azure Active Directory B2C is a customer identity access management (CIAM) solution.",
-    "icon": "AzureADB2C.png",
-	  "url": "https.+\\.b2clogin\\.com",
-    "implies": "Azure",
-    "website": "https://azure.microsoft.com/en-us/services/active-directory/external-identities/b2c/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/b.json b/src/technologies/b.json
index 873d17d50..9a85691bc 100644
--- a/src/technologies/b.json
+++ b/src/technologies/b.json
@@ -1327,6 +1327,25 @@
     "scripts": "cdn\\.co-buying\\.com/",
     "website": "https://www.buyapowa.com"
   },
+  "BySide": {
+    "cats": [
+      32,
+      76
+    ],
+    "description": "BySide is a personalisation and marketing automation platform.",
+    "icon": "BySide.svg",
+    "js": {
+      "BySide": "",
+      "bysideWebcare_banner": ""
+    },
+    "pricing": [
+      "poa",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "webcare\\.byside\\.com/",
+    "website": "https://byside.com"
+  },
   "Bynder": {
     "cats": [
       95
@@ -1347,25 +1366,6 @@
     "saas": true,
     "website": "https://www.bynder.com"
   },
-  "BySide": {
-    "cats": [
-      32,
-      76
-    ],
-    "description": "BySide is a personalisation and marketing automation platform.",
-    "icon": "BySide.svg",
-    "js": {
-      "BySide": "",
-      "bysideWebcare_banner": ""
-    },
-    "scripts": "webcare\\.byside\\.com/",
-    "saas": true,
-    "pricing": [
-      "poa",
-      "recurring"
-    ],
-    "website": "https://byside.com"
-  },
   "basket.js": {
     "cats": [
       59
diff --git a/src/technologies/c.json b/src/technologies/c.json
index eb79631ad..88346013a 100644
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@@ -7,16 +7,6 @@
     "scripts": "/website/JavaScript/Vertoshop\\.js",
     "website": "https://ccvshop.be"
   },
-  "cdnjs": {
-    "cats": [
-      31
-    ],
-    "description": "cdnjs is a free distributed JS library delivery service.",
-    "icon": "cdnjs.svg",
-    "scripts": "cdnjs\\.cloudflare\\.com",
-    "oss": true,
-    "website": "https://cdnjs.com"
-  },
   "CDN77": {
     "cats": [
       31
@@ -532,30 +522,30 @@
     "scripts": "\\.checkfront\\.com/",
     "website": "https://www.checkfront.com"
   },
-  "Cherokee": {
-    "cats": [
-      22
-    ],
-    "cpe": "cpe:/a:cherokee-project:cherokee",
-    "headers": {
-      "Server": "^Cherokee(?:/([\\d.]+))?\\;version:\\1"
-    },
-    "icon": "Cherokee.png",
-    "website": "http://www.cherokee-project.com"
-  },
   "Checkout.com": {
     "cats": [
       41
     ],
     "description": "Checkout.com is an international payment platform that processes different payment methods across a variety of currencies.",
     "icon": "Checkout.com.svg",
-    "scripts": "cdn\\.checkout\\.com/js/.+js(?:\\?ver=)?([\\d\\.]+)?\\;version:\\1",
-    "saas": true,
     "pricing": [
       "payg"
     ],
+    "saas": true,
+    "scripts": "cdn\\.checkout\\.com/js/.+js(?:\\?ver=)?([\\d\\.]+)?\\;version:\\1",
     "website": "https://www.checkout.com"
   },
+  "Cherokee": {
+    "cats": [
+      22
+    ],
+    "cpe": "cpe:/a:cherokee-project:cherokee",
+    "headers": {
+      "Server": "^Cherokee(?:/([\\d.]+))?\\;version:\\1"
+    },
+    "icon": "Cherokee.png",
+    "website": "http://www.cherokee-project.com"
+  },
   "CherryPy": {
     "cats": [
       22
@@ -1021,6 +1011,22 @@
     "saas": true,
     "website": "https://www.coconstruct.com"
   },
+  "CoRover": {
+    "cats": [
+      52
+    ],
+    "description": "CoRover is a conversational AI chatbot platform with proprietary cognitive AI technology.",
+    "icon": "CoRover.png",
+    "js": {
+      "CoRover_tag": ""
+    },
+    "pricing": [
+      "poa"
+    ],
+    "saas": true,
+    "scripts": "\\.corover\\.mobi/",
+    "website": "https://corover.ai"
+  },
   "Coaster CMS": {
     "cats": [
       1
@@ -1677,22 +1683,6 @@
     ],
     "website": "https://corebine.com"
   },
-  "CoRover": {
-    "cats": [
-      52
-    ],
-    "description": "CoRover is a conversational AI chatbot platform with proprietary cognitive AI technology.",
-    "icon": "CoRover.png",
-    "js": {
-      "CoRover_tag": ""
-    },
-    "scripts": "\\.corover\\.mobi/",
-    "saas": true,
-    "pricing": [
-      "poa"
-    ],
-    "website": "https://corover.ai"
-  },
   "Cosmoshop": {
     "cats": [
       6
@@ -2010,12 +2000,12 @@
     "js": {
       "customily.sticky": ""
     },
-    "scripts": "(?:cdn|app)\\.customily\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "(?:cdn|app)\\.customily\\.com/",
     "website": "https://www.customily.com"
   },
   "Cybersource": {
@@ -2061,6 +2051,16 @@
     "icon": "cPanel.png",
     "website": "http://www.cpanel.net"
   },
+  "cdnjs": {
+    "cats": [
+      31
+    ],
+    "description": "cdnjs is a free distributed JS library delivery service.",
+    "icon": "cdnjs.svg",
+    "oss": true,
+    "scripts": "cdnjs\\.cloudflare\\.com",
+    "website": "https://cdnjs.com"
+  },
   "cgit": {
     "cats": [
       19
diff --git a/src/technologies/d.json b/src/technologies/d.json
index 127638d1e..ced119125 100644
--- a/src/technologies/d.json
+++ b/src/technologies/d.json
@@ -419,22 +419,22 @@
       1
     ],
     "description": "Directus is a free and open-source headless CMS framework for managing custom SQL-based databases.",
-    "icon": "Directus.svg",
     "headers": {
       "x-powered-by": "^Directus$"
     },
+    "icon": "Directus.svg",
     "implies": [
       "Vue.js",
       "TinyMCE",
       "core-js"
     ],
-    "saas": true,
     "oss": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://directus.io"
   },
   "Discourse": {
diff --git a/src/technologies/f.json b/src/technologies/f.json
index 29f5831df..7c220332f 100644
--- a/src/technologies/f.json
+++ b/src/technologies/f.json
@@ -68,6 +68,18 @@
     "scripts": "//connect\\.facebook\\.([a-z]+)/[^/]*/[a-z]*\\.js",
     "website": "http://facebook.com"
   },
+  "Facebook Ads": {
+    "cats": [
+      36
+    ],
+    "description": "Facebook Ads is an online advertising platform developed by Facebook.",
+    "icon": "Facebook.svg",
+    "pricing": [
+      "payg"
+    ],
+    "saas": true,
+    "website": "https://www.facebook.com/business/ads"
+  },
   "Facebook Chat Plugin": {
     "cats": [
       52
@@ -154,17 +166,17 @@
       76
     ],
     "description": "Fanplayr is a real-time insights platform that provides website optimisation and personalisation solutions for businesses.",
-    "icon": "Fanplayr.svg",
     "dom": "link[href*='cdn.fanplayr.com']",
+    "icon": "Fanplayr.svg",
     "js": {
       "fanplayr.platform.version": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "scripts": "cdn\\.fanplayr\\.com/.+/([\\d\\.]+)\\;version:\\1",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "cdn\\.fanplayr\\.com/.+/([\\d\\.]+)\\;version:\\1",
     "website": "https://fanplayr.com"
   },
   "FaraPy": {
@@ -1113,4 +1125,4 @@
     "scripts": "future-shop.*\\.js",
     "website": "https://www.future-shop.jp"
   }
-}
\ No newline at end of file
+}
diff --git a/src/technologies/g.json b/src/technologies/g.json
index dd9e08832..6fb04eddf 100644
--- a/src/technologies/g.json
+++ b/src/technologies/g.json
@@ -591,6 +591,20 @@
     "icon": "GoAhead.png",
     "website": "http://embedthis.com/products/goahead/index.html"
   },
+  "GoAnywhere": {
+    "cats": [
+      19
+    ],
+    "description": "GoAnywhere by HelpSystems is a Managed File Transfer (MFT) system with sharing and collaboration features",
+    "headers": {
+      "Server": "goanywhere"
+    },
+    "icon": "goanywhere.png",
+    "js": {
+      "appContainer": "GoAnywhereWebClientContainer"
+    },
+    "website": "https://www.goanywhere.com/"
+  },
   "GoCache": {
     "cats": [
       31
@@ -1389,19 +1403,5 @@
     },
     "icon": "gunicorn.png",
     "website": "http://gunicorn.org"
-  }  ,
-  "GoAnywhere": {
-    "cats": [
-      19
-    ],
-	"description": "GoAnywhere by HelpSystems is a Managed File Transfer (MFT) system with sharing and collaboration features",
-    "headers": {
-      "Server": "goanywhere"
-    },
-	"js": {
-		"appContainer" : "GoAnywhereWebClientContainer"
-	},
-    "icon": "goanywhere.png",
-    "website": "https://www.goanywhere.com/"
   }
 }
\ No newline at end of file
diff --git a/src/technologies/h.json b/src/technologies/h.json
index 4cc119900..bc17c15e7 100644
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@@ -426,11 +426,11 @@
     "js": {
       "highstreetBanner.config": ""
     },
-    "scripts": "\\.api\\.highstreetapp\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scripts": "\\.api\\.highstreetapp\\.com/",
     "website": "https://www.highstreetmobile.com"
   },
   "HikeOrders": {
diff --git a/src/technologies/i.json b/src/technologies/i.json
index c0844b4ca..6dec4cd5c 100644
--- a/src/technologies/i.json
+++ b/src/technologies/i.json
@@ -235,13 +235,13 @@
     "js": {
       "IMWEB_TEMPLATE": ""
     },
-    "scripts": "vendor-cdn\\.imweb\\.me/",
-    "saas": true,
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "vendor-cdn\\.imweb\\.me/",
     "website": "https://imweb.me"
   },
   "Incapsula": {
@@ -841,4 +841,4 @@
     ],
     "website": "https://www.iubenda.com/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/p.json b/src/technologies/p.json
index 5861b13f8..11bdf1d8f 100644
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@@ -1196,6 +1196,31 @@
     "scripts": "polymer\\.js",
     "website": "http://polymer-project.org"
   },
+  "Popmenu": {
+    "cats": [
+      1,
+      93
+    ],
+    "cookies": {
+      "Popmenu-Token": ""
+    },
+    "description": "Popmenu is a restaurant platform which offers CMS, online menus, ordering and delivery and marketing automation solutions.",
+    "icon": "Popmenu.svg",
+    "implies": [
+      "React",
+      "Apollo"
+    ],
+    "js": {
+      "POPMENU_CLIENT": "",
+      "popmenuHydrated": ""
+    },
+    "pricing": [
+      "recurring",
+      "mid"
+    ],
+    "website": "https://get.popmenu.com",
+    "xhr": "popmenu\\.com"
+  },
   "Popper": {
     "cats": [
       19
@@ -1993,24 +2018,5 @@
       "PUNBB": ""
     },
     "website": "http://punbb.informer.com"
-  },
-  "Popmenu": {
-    "cats": [
-      1,
-      93
-    ],
-    "description": "Popmenu is a restaurant platform which offers CMS, online menus, ordering and delivery and marketing automation solutions.",
-    "pricing": ["recurring", "mid"],
-    "icon": "Popmenu.svg",
-    "cookies": {
-      "Popmenu-Token": ""
-    },
-    "js": {
-      "popmenuHydrated": "",
-      "POPMENU_CLIENT": ""
-    },
-    "xhr": "popmenu\\.com",
-    "implies": ["React", "Apollo"],
-    "website": "https://get.popmenu.com"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/r.json b/src/technologies/r.json
index 133516790..a00f8ff9c 100644
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@@ -1186,13 +1186,13 @@
     },
     "icon": "Ruby on Rails.png",
     "implies": "Ruby",
-    "meta": {
-      "csrf-param": "^authenticity_token$\\;confidence:50"
-    },
     "js": {
       "ReactOnRails": "",
       "__REACT_ON_RAILS_EVENT_HANDLERS_RAN_ONCE__": ""
     },
+    "meta": {
+      "csrf-param": "^authenticity_token$\\;confidence:50"
+    },
     "scripts": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
     "website": "https://rubyonrails.org"
   },
@@ -1262,4 +1262,4 @@
     ],
     "website": "https://www.google.com/recaptcha/"
   }
-}
+}
\ No newline at end of file
diff --git a/src/technologies/s.json b/src/technologies/s.json
index b904f3465..823eb1681 100644
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@@ -555,10 +555,10 @@
     "meta": {
       "generator": "^Saprenco.com Website Builder$"
     },
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
     "website": "https://www.sapren.net"
   },
   "Sarka-SPIP": {
@@ -837,13 +837,13 @@
     "js": {
       "_sellfy.version": "([\\d\\.]+)\\;version:\\1"
     },
-    "scripts": "sellfy\\.com/js/",
-    "saas": true,
     "pricing": [
       "recurring",
       "low",
       "freemium"
     ],
+    "saas": true,
+    "scripts": "sellfy\\.com/js/",
     "website": "https://sellfy.com"
   },
   "Sellingo": {
diff --git a/src/technologies/t.json b/src/technologies/t.json
index dae8cba74..fb11f4d05 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -28,19 +28,19 @@
     "scripts": "secure\\.ap\\.tnspayments\\.com",
     "website": "https://tnsi.com/products/payments/"
   },
-  "True Fit": {
+  "TRISOshop": {
     "cats": [
-      76
+      6
     ],
-    "description": "True Fit is a data-driven personalisation platform for footwear and apparel retailers.",
-    "icon": "True Fit.png",
-    "scripts": "cdn\\.truefitcorp\\.com/(?:.+/([\\d\\.]+))?\\;version:\\1",
-    "saas": true,
+    "description": "TRISOshop is an ecommerce platform.",
+    "dom": "a[href*='www.trisoshop.pl'][target='_blank']",
+    "icon": "TRISOshop.svg",
     "pricing": [
       "low",
       "recurring"
     ],
-    "website": "https://www.truefit.com"
+    "saas": true,
+    "website": "https://www.trisoshop.pl"
   },
   "TRUENDO": {
     "cats": [
@@ -1009,12 +1009,12 @@
     "js": {
       "Trengo.eventBus": ""
     },
-    "scripts": "\\.widget\\.trengo\\.eu/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.widget\\.trengo\\.eu/",
     "website": "https://trengo.com"
   },
   "Tripadviser.Widget": {
@@ -1026,20 +1026,6 @@
     "scripts": "tripadvisor\\.[\\w]+/WidgetEmbed",
     "website": "https://www.tripadvisor.com/Widgets"
   },
-  "TRISOshop": {
-    "cats": [
-      6
-    ],
-    "description": "TRISOshop is an ecommerce platform.",
-    "icon": "TRISOshop.svg",
-    "dom": "a[href*='www.trisoshop.pl'][target='_blank']",
-    "saas": true,
-    "pricing": [
-      "low",
-      "recurring"
-    ],
-    "website": "https://www.trisoshop.pl"
-  },
   "TripleLift": {
     "cats": [
       36
@@ -1078,6 +1064,20 @@
     ],
     "website": "https://www.transunion.com/solution/truvalidate"
   },
+  "True Fit": {
+    "cats": [
+      76
+    ],
+    "description": "True Fit is a data-driven personalisation platform for footwear and apparel retailers.",
+    "icon": "True Fit.png",
+    "pricing": [
+      "low",
+      "recurring"
+    ],
+    "saas": true,
+    "scripts": "cdn\\.truefitcorp\\.com/(?:.+/([\\d\\.]+))?\\;version:\\1",
+    "website": "https://www.truefit.com"
+  },
   "TrueCommerce": {
     "cats": [
       6
diff --git a/src/technologies/u.json b/src/technologies/u.json
index 1717f8ebd..3995a01b4 100644
--- a/src/technologies/u.json
+++ b/src/technologies/u.json
@@ -126,15 +126,15 @@
     "js": {
       "Unbxd.version": "^([\\d\\.]+)$\\;version:\\1"
     },
-    "scripts": [
-      "\\.cloudfront\\.net/unbxdAnalytics\\.js",
-      "unbxd\\.s\\d\\.amazonaws\\.com"
-    ],
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": [
+      "\\.cloudfront\\.net/unbxdAnalytics\\.js",
+      "unbxd\\.s\\d\\.amazonaws\\.com"
+    ],
     "website": "https://unbxd.com"
   },
   "Underscore.js": {
diff --git a/src/technologies/w.json b/src/technologies/w.json
index 409af68c9..47697f371 100644
--- a/src/technologies/w.json
+++ b/src/technologies/w.json
@@ -848,11 +848,11 @@
     "js": {
       "WU._trackProductVTEXField": ""
     },
-    "scripts": "assets-cdn\\.woowup\\.com/",
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
+    "scripts": "assets-cdn\\.woowup\\.com/",
     "website": "https://www.woowup.com"
   },
   "WordPress": {
diff --git a/src/technologies/z.json b/src/technologies/z.json
index 55ec11854..0e76bf767 100644
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@@ -228,12 +228,12 @@
     "js": {
       "__zmags": ""
     },
-    "scripts": "c(?:reator)?\\.zmags\\.com/",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "c(?:reator)?\\.zmags\\.com/",
     "website": "https://www.creatorbyzmags.com"
   },
   "Zocdoc": {