diff --git a/source/companies.json b/source/companies.json
index d7b89175..0cd9e494 100644
--- a/source/companies.json
+++ b/source/companies.json
@@ -1,46 +1,36 @@
 {
     "timeUpdated": "2022-04-13T08:24:53.623Z",
     "companies": {
-        "nonli": {
-            "name": "Nonli",
-            "websiteUrl": "https://www.nonli.com/",
-            "description": "Nonli is focused on increasing and monetizing social media traffic."
+        "adguard": {
+            "name": "AdGuard",
+            "websiteUrl": "https://adguard.com/",
+            "description": "AdGuard offers apps for Android, iOS, Windows, and Mac. With them, you can block ads in browsers and apps, prevent websites and companies from tracking you, and protect yourself from phishing and malware."
+        },
+        "adobe": {
+            "name": "Adobe Inc.",
+            "websiteUrl": "http://www.adobe.com/",
+            "description": "Adobe provides digital media and digital marketing solutions."
         },
         "admixer": {
             "name": "Admixer",
             "websiteUrl": "https://admixer.com/",
             "description": "A supply-side platform that connects publishers with global advertisers and agencies, supporting all ad formats and offering real-time revenue optimization."
         },
-        "clickaine": {
-            "name": "Clickaine",
-            "websiteUrl": "https://clickaine.com/",
-            "description": "Clickaine is a digital advertising network that provides a wide range of advertising solutions for publishers and advertisers."
-        },
-        "affilbox": {
-            "name": "Affilbox",
-            "websiteUrl": "https://affilbox.com/",
-            "description": "AffilBox is a affiliate software."
-        },
         "adprofex": {
             "name": "AdProfex",
             "websiteUrl": "https://adprofex.com/",
             "description": "AdProfex is a new type of advertising network for news websites and blogs that makes generating revenue a snap."
         },
-        "adguard": {
-            "name": "AdGuard",
-            "websiteUrl": "https://adguard.com/",
-            "description": "AdGuard offers apps for Android, iOS, Windows, and Mac. With them, you can block ads in browsers and apps, prevent websites and companies from tracking you, and protect yourself from phishing and malware."
-        },
-        "adobe": {
-            "name": "Adobe Inc.",
-            "websiteUrl": "http://www.adobe.com/",
-            "description": "Adobe provides digital media and digital marketing solutions."
-        },
         "advance": {
             "name": "Advance Publications, Inc.",
             "websiteUrl": "https://www.advance.com/",
             "description": "Advance Publications is a holding company whose media properties include newspapers, Conde Nast Publications (Vogue, Vanity Fair, GQ, Architectural Digest and other magazines), Parade Publications, Fairchild Publications and American City Business Journals."
         },
+        "affilbox": {
+            "name": "Affilbox",
+            "websiteUrl": "https://affilbox.com/",
+            "description": "AffilBox is a affiliate software."
+        },
         "akamai": {
             "name": "Akamai Technologies",
             "websiteUrl": "https://www.akamai.com/",
@@ -111,6 +101,11 @@
             "websiteUrl": "https://canonical.com/",
             "description": "Canonical makes open source secure, reliable and easy to use, providing support for Ubuntu and a portfolio of enterprise-grade technologies."
         },
+        "clickaine": {
+            "name": "Clickaine",
+            "websiteUrl": "https://clickaine.com/",
+            "description": "Clickaine is a digital advertising network that provides a wide range of advertising solutions for publishers and advertisers."
+        },
         "cloudflare": {
             "name": "Cloudflare, Inc.",
             "websiteUrl": "https://www.cloudflare.com/",
@@ -266,6 +261,11 @@
             "websiteUrl": "https://www.nineforbrands.com.au/",
             "description": "Nine Entertainment is an Australian publicly listed media company with holdings in radio and television broadcasting, newspaper publications and digital media."
         },
+        "nonli": {
+            "name": "Nonli",
+            "websiteUrl": "https://www.nonli.com/",
+            "description": "Nonli is focused on increasing and monetizing social media traffic."
+        },
         "notion": {
             "name": "Notion Labs Inc.",
             "websiteUrl": "https://www.notion.so/",
diff --git a/source/trackers.json b/source/trackers.json
index 599687fc..ece97aa3 100644
--- a/source/trackers.json
+++ b/source/trackers.json
@@ -20,36 +20,6 @@
         "101": "mobile_analytics"
     },
     "trackers": {
-        "nonli": {
-            "name": "Nonli",
-            "categoryId": 4,
-            "url": "https://www.nonli.com/",
-            "companyId": "nonli"
-        },
-        "admixer": {
-            "name": "Admixer",
-            "categoryId": 4,
-            "url": "https://admixer.com/",
-            "companyId": "admixer"
-        },
-        "clickaine": {
-            "name": "Clickaine",
-            "categoryId": 4,
-            "url": "https://clickaine.com/",
-            "companyId": "clickaine"
-        },
-        "affilbox": {
-            "name": "Affilbox",
-            "categoryId": 4,
-            "url": "https://affilbox.com/",
-            "companyId": "affilbox"
-        },
-        "adprofex": {
-            "name": "AdProfex",
-            "categoryId": 4,
-            "url": "https://adprofex.com/",
-            "companyId": "adprofex"
-        },
         "abc": {
             "name": "Australian Broadcasting Corporation",
             "categoryId": 8,
@@ -92,6 +62,12 @@
             "url": "https://www.adjust.com/",
             "companyId": "applovin"
         },
+        "admixer": {
+            "name": "Admixer",
+            "categoryId": 4,
+            "url": "https://admixer.com/",
+            "companyId": "admixer"
+        },
         "adobe_developer": {
             "name": "Adobe Developer",
             "categoryId": 8,
@@ -110,6 +86,18 @@
             "url": "https://experienceleague.adobe.com/",
             "companyId": "adobe"
         },
+        "adprofex": {
+            "name": "AdProfex",
+            "categoryId": 4,
+            "url": "https://adprofex.com/",
+            "companyId": "adprofex"
+        },
+        "affilbox": {
+            "name": "Affilbox",
+            "categoryId": 4,
+            "url": "https://affilbox.com/",
+            "companyId": "affilbox"
+        },
         "akamai_technologies": {
             "name": "Akamai Technologies",
             "categoryId": 9,
@@ -242,6 +230,12 @@
             "url": "http://chartboost.com/",
             "companyId": "take-two"
         },
+        "clickaine": {
+            "name": "Clickaine",
+            "categoryId": 4,
+            "url": "https://clickaine.com/",
+            "companyId": "clickaine"
+        },
         "crashlytics": {
             "name": "Crashlytics",
             "categoryId": 101,
@@ -680,6 +674,12 @@
             "url": "https://ninedigitaldirect.com.au/",
             "companyId": "nine_entertainment"
         },
+        "nonli": {
+            "name": "Nonli",
+            "categoryId": 4,
+            "url": "https://www.nonli.com/",
+            "companyId": "nonli"
+        },
         "notion": {
             "name": "Notion",
             "categoryId": 8,
@@ -1156,16 +1156,6 @@
         }
     },
     "trackerDomains": {
-        "nonli.com": "nonli",
-        "non.li": "nonli",
-        "admixer.com": "admixer",
-        "admixer.net": "admixer",
-        "popcashjs.b-cdn.net": "popcash",
-        "clickaine.com": "clickaine",
-        "adprofex.com" : "adprofex",
-        "ads2.bid" : "adprofex",
-        "cz.affilbox.cz": "affilbox",
-        "affilbox.com": "affilbox",
         "3gpp.org": "3gpp",
         "3gppnetwork.org": "3gpp",
         "swm.digital": "7plus",
@@ -1197,8 +1187,14 @@
         "adjust.net.in": "adjust",
         "adjust.world": "adjust",
         "apptrace.com": "adjust",
+        "admixer.com": "admixer",
+        "admixer.net": "admixer",
         "adobe.io": "adobe_developer",
         "adobedc.net": "adobe_experience_league",
+        "adprofex.com" : "adprofex",
+        "ads2.bid" : "adprofex",
+        "cz.affilbox.cz": "affilbox",
+        "affilbox.com": "affilbox",
         "akadns.net": "akamai_technologies",
         "akamaiedge.net": "akamai_technologies",
         "akaquill.net": "akamai_technologies",
@@ -1276,6 +1272,7 @@
         "bttn.io": "button",
         "canonical.com": "canonical",
         "chartboost.com": "chartboost",
+        "clickaine.com": "clickaine",
         "cloudflare-dm-cmpimg.com": "cloudflare",
         "cloudflare-dns.com": "cloudflare",
         "cloudflare-ipfs.com": "cloudflare",
@@ -1737,6 +1734,8 @@
         "netify.ai": "netify",
         "codestream.com": "new_relic",
         "nineanalytics.io": "nine_direct_digital",
+        "nonli.com": "nonli",
+        "non.li": "nonli",
         "notion.so": "notion",
         "ntp.org": "ntppool",
         "ntppool.org": "ntppool",
@@ -1759,6 +1758,7 @@
         "svc.ms": "outlook",
         "oztam.com.au": "oztam",
         "perfops.io": "perfops",
+        "popcashjs.b-cdn.net": "popcash",
         "plex.bz": "plex",
         "plex.direct": "plex",
         "plex.tv": "plex",