diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 8b65fb4d6..e0da27c0b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 github: AliasIO
-custom: ["https://www.paypal.me/aliasio"]
+custom: ["https://www.paypal.me/elbertalias"]
 
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index 99ecb5041..48eca4ed8 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.18",
+  "version": "6.8.19",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 1a5cac78a..a4b37e298 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.18",
+  "version": "6.8.19",
   "default_locale": "en",
   "manifest_version": 2,
   "icons": {
diff --git a/src/package.json b/src/package.json
index 6981765e0..a6c2c14bc 100644
--- a/src/package.json
+++ b/src/package.json
@@ -13,7 +13,7 @@
     "software"
   ],
   "homepage": "https://www.wappalyzer.com/",
-  "version": "6.8.18",
+  "version": "6.8.19",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
diff --git a/src/technologies/a.json b/src/technologies/a.json
index 787b223b7..2641b416e 100644
--- a/src/technologies/a.json
+++ b/src/technologies/a.json
@@ -2224,9 +2224,9 @@
     "icon": "Apple.svg",
     "js": {
       "ApplePay": "",
+      "checkout.enabledpayments.applepay": "^true$",
       "dw.applepay": "",
-      "enableApplePay": "",
-      "checkout.enabledpayments.applepay": "^true$"
+      "enableApplePay": ""
     },
     "website": "https://www.apple.com/apple-pay"
   },
diff --git a/src/technologies/c.json b/src/technologies/c.json
index 4eee3582a..472b1c958 100644
--- a/src/technologies/c.json
+++ b/src/technologies/c.json
@@ -291,21 +291,6 @@
     ],
     "website": "https://www.wappalyzer.com/technologies/ecommerce/cart-functionality"
   },
-  "Carts Guru": {
-    "cats": [
-      32,
-      75
-    ],
-    "description": "Carts Guru is the all-in-one marketing automation tool for ecommerce stores.",
-    "icon": "Carts Guru.png",
-    "scripts": "cdn\\.cartsguru\\.io/",
-    "saas": true,
-    "pricing": [
-      "payg",
-      "mid"
-    ],
-    "website": "https://www.carts.guru"
-  },
   "CartStack": {
     "cats": [
       75,
@@ -324,6 +309,21 @@
     "scripts": "api\\.cartstack\\.\\w+",
     "website": "https://www.cartstack.com"
   },
+  "Carts Guru": {
+    "cats": [
+      32,
+      75
+    ],
+    "description": "Carts Guru is the all-in-one marketing automation tool for ecommerce stores.",
+    "icon": "Carts Guru.png",
+    "pricing": [
+      "payg",
+      "mid"
+    ],
+    "saas": true,
+    "scripts": "cdn\\.cartsguru\\.io/",
+    "website": "https://www.carts.guru"
+  },
   "Catberry.js": {
     "cats": [
       12,
@@ -1466,6 +1466,20 @@
     "scripts": "\\.contentsquare\\.net/",
     "website": "https://contentsquare.com"
   },
+  "ContentStudio": {
+    "cats": [
+      96
+    ],
+    "description": "ContentStudio is an integrated cloud-based social media management and content marketing solution.",
+    "dom": "link[href*='/wp-content/plugins/contentstudio']",
+    "icon": "ContentStudio.png",
+    "pricing": [
+      "mid",
+      "recurring"
+    ],
+    "saas": true,
+    "website": "https://contentstudio.io"
+  },
   "Contentful": {
     "cats": [
       1
@@ -1499,20 +1513,6 @@
     "saas": true,
     "website": "https://www.contentstack.com"
   },
-  "ContentStudio": {
-    "cats": [
-      96
-    ],
-    "description": "ContentStudio is an integrated cloud-based social media management and content marketing solution.",
-    "icon": "ContentStudio.png",
-    "dom": "link[href*='/wp-content/plugins/contentstudio']",
-    "pricing": [
-      "mid",
-      "recurring"
-    ],
-    "saas": true,
-    "website": "https://contentstudio.io"
-  },
   "Contlo": {
     "cats": [
       90,
diff --git a/src/technologies/f.json b/src/technologies/f.json
index a4c5b5d0c..239b90f27 100644
--- a/src/technologies/f.json
+++ b/src/technologies/f.json
@@ -885,11 +885,11 @@
     "js": {
       "FoursixtyEmbed": ""
     },
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
     "scripts": "foursixty\\.com",
     "website": "https://foursixty.com/"
   },
diff --git a/src/technologies/h.json b/src/technologies/h.json
index 08a8c1a9e..d6662576d 100644
--- a/src/technologies/h.json
+++ b/src/technologies/h.json
@@ -743,7 +743,7 @@
     "icon": "Humm.svg",
     "js": {
       "checkout.enabledpayments.humm": "^true$"
-    }, 
+    },
     "pricing": [
       "payg"
     ],
diff --git a/src/technologies/l.json b/src/technologies/l.json
index 789057714..16fb40d6f 100644
--- a/src/technologies/l.json
+++ b/src/technologies/l.json
@@ -82,16 +82,16 @@
       91
     ],
     "description": "LatitudePay is an interest-free, buy now, pay later solution.",
-    "icon": "LatitudePay.svg",
     "dom": "a[href*='latitudepay.com/'][target='_blank'], img[src='.latitudepayapps.com/']",
+    "icon": "LatitudePay.svg",
     "js": {
       "checkout.enabledpayments.latitudepay": "^true$"
     },
-    "scripts": "\\.latitudepayapps\\.com/",
-    "saas": true,
     "pricing": [
       "freemium"
     ],
+    "saas": true,
+    "scripts": "\\.latitudepayapps\\.com/",
     "website": "https://www.latitudepay.com"
   },
   "LaunchDarkly": {
@@ -144,16 +144,16 @@
       91
     ],
     "description": "Laybuy is a payment service that lets you receive your purchase now and spread the total cost over 6 weekly automatic payments interest free.",
-    "icon": "LayBuy.svg",
     "dom": "iframe[src='.laybuy.com/']",
+    "icon": "LayBuy.svg",
     "js": {
       "LaybuyHelper": "",
       "checkout.enabledpayments.laybuy": "^true$",
-      "laybuyMoneyOverides": "",
-      "laybuyEnableCart": ""
+      "laybuyEnableCart": "",
+      "laybuyMoneyOverides": ""
     },
     "pricing": [
-     "payg"
+      "payg"
     ],
     "saas": true,
     "scripts": "\\.laybuy\\.com/",
diff --git a/src/technologies/m.json b/src/technologies/m.json
index 2e208d35e..30c5674c9 100644
--- a/src/technologies/m.json
+++ b/src/technologies/m.json
@@ -1659,8 +1659,8 @@
       51
     ],
     "description": "MyWebsite is website builder designed for easy editing and fast results.",
-    "icon": "MyWebsite.svg",
     "excludes": "Jimdo",
+    "icon": "MyWebsite.svg",
     "js": {
       "SystemID": "^.*1AND1.*$\\;version:8"
     },
@@ -1679,9 +1679,9 @@
       51
     ],
     "description": "MyWebsite Creator is website builder designed for easy editing and fast results.",
+    "dom": "body#dmRoot",
     "icon": "MyWebsite.svg",
     "implies": "Duda",
-    "dom": "body#dmRoot",
     "pricing": [
       "low",
       "recurring"
@@ -1698,8 +1698,8 @@
       51
     ],
     "description": "MyWebsite Now is a website builder designed for getting online quickly.",
-    "icon": "MyWebsite.svg",
     "dom": "img[src*='/-_-/res/']",
+    "icon": "MyWebsite.svg",
     "implies": [
       "React",
       "Node.js",
@@ -1914,4 +1914,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 78d663db5..56263b263 100644
--- a/src/technologies/n.json
+++ b/src/technologies/n.json
@@ -383,13 +383,13 @@
     "js": {
       "DO_NORTON_SHOPPING": ""
     },
-    "scripts": "nsg\\.symantec\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring",
       "payg"
     ],
+    "saas": true,
+    "scripts": "nsg\\.symantec\\.com/",
     "website": "https://norton.buysafe.com"
   },
   "Nosto": {
diff --git a/src/technologies/o.json b/src/technologies/o.json
index 9b56366f3..c6116fe66 100644
--- a/src/technologies/o.json
+++ b/src/technologies/o.json
@@ -241,10 +241,10 @@
     "js": {
       "olapic.version": "^v([\\d\\.]+)$\\;version:\\1"
     },
-    "saas": true,
     "pricing": [
       "poa"
     ],
+    "saas": true,
     "website": "https://www.olapic.com"
   },
   "Olark": {
diff --git a/src/technologies/p.json b/src/technologies/p.json
index a07158717..26603ec13 100644
--- a/src/technologies/p.json
+++ b/src/technologies/p.json
@@ -414,10 +414,10 @@
     "icon": "PayPal.svg",
     "js": {
       "PAYPAL": "",
+      "checkout.enabledpayments.paypal": "^true$",
       "enablePaypal": "",
       "paypalClientId": "",
-      "paypalJs": "",
-      "checkout.enabledpayments.paypal": "^true$"
+      "paypalJs": ""
     },
     "meta": {
       "id": "in-context-paypal-metadata"
@@ -1044,35 +1044,6 @@
     "implies": "Scala",
     "website": "https://www.playframework.com"
   },
-  "plentymarkets": {
-    "cats": [
-      6
-    ],
-    "description": "plentymarkets is a cloud-based all-in-one ecommerce ERP solution.",
-    "headers": {
-      "X-Plenty-Shop": ""
-    },
-    "icon": "plentymarkets.svg",
-    "meta": {
-      "generator": "plentymarkets"
-    },
-    "scripts": [
-      "plenty\\.shop\\.(?:min\\.)?js"
-    ],
-    "website": "https://www.plentymarkets.com/"
-  },
-  "plentyShop LTS": {
-    "cats": [
-      6
-    ],
-    "description": "The official template plugin developed by plentymarkets. plentyShop LTS is the default template for plentymarkets online stores.",
-    "headers": {
-      "X-Plenty-Shop": "Ceres"
-    },
-    "icon": "plentyShop LTS.svg",
-    "oss": true,
-    "website": "https://www.plentymarkets.com/product/modules/online-shop/"
-  },
   "Pleroma": {
     "cats": [
       2
@@ -2039,6 +2010,35 @@
     "implies": "Java",
     "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
   },
+  "plentyShop LTS": {
+    "cats": [
+      6
+    ],
+    "description": "The official template plugin developed by plentymarkets. plentyShop LTS is the default template for plentymarkets online stores.",
+    "headers": {
+      "X-Plenty-Shop": "Ceres"
+    },
+    "icon": "plentyShop LTS.svg",
+    "oss": true,
+    "website": "https://www.plentymarkets.com/product/modules/online-shop/"
+  },
+  "plentymarkets": {
+    "cats": [
+      6
+    ],
+    "description": "plentymarkets is a cloud-based all-in-one ecommerce ERP solution.",
+    "headers": {
+      "X-Plenty-Shop": ""
+    },
+    "icon": "plentymarkets.svg",
+    "meta": {
+      "generator": "plentymarkets"
+    },
+    "scripts": [
+      "plenty\\.shop\\.(?:min\\.)?js"
+    ],
+    "website": "https://www.plentymarkets.com/"
+  },
   "prettyPhoto": {
     "cats": [
       59
diff --git a/src/technologies/s.json b/src/technologies/s.json
index ab955f7c8..d92eee5ef 100644
--- a/src/technologies/s.json
+++ b/src/technologies/s.json
@@ -644,14 +644,14 @@
       96
     ],
     "description": "Scoop.it is a content marketing software company based in San Francisco which provide content curation platform.",
-    "icon": "Scoop.it.svg",
     "dom": "iframe[src*='.scoop.it/'], a[href*='.scoop.it/'][target='_blank']",
-    "saas": true,
+    "icon": "Scoop.it.svg",
     "pricing": [
       "freemium",
       "low",
       "recurring"
     ],
+    "saas": true,
     "website": "https://www.scoop.it"
   },
   "Scorpion": {
@@ -1941,8 +1941,8 @@
       51
     ],
     "description": "SiteW is a French-based company that offers a website building service.",
-    "icon": "SiteW.svg",
     "dom": "link[href*='.sitew.com']",
+    "icon": "SiteW.svg",
     "pricing": [
       "freemium",
       "low",
@@ -2402,12 +2402,12 @@
     "js": {
       "sniply.create_sniply_bar": ""
     },
-    "scripts": "gosniply\\.com/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "gosniply\\.com/",
     "website": "https://sniply.io"
   },
   "Snoobi": {
@@ -2714,31 +2714,31 @@
     "scripts": "\\.speedcurve\\.com",
     "website": "https://www.speedcurve.com"
   },
+  "SpeedKit": {
+    "cats": [
+      92
+    ],
+    "description": "Baqend develops a performance add-on that uses caching algorithms to minimize loading times of e-commerce websites.",
+    "icon": "Speedkit.svg",
+    "js": {
+      "speedKit": ""
+    },
+    "website": "https://www.baqend.com/"
+  },
   "Speedimize": {
     "cats": [
       92
     ],
     "description": "Speedimize is a Shopify agency that focuses on website speed optimisation and performance issues.",
     "icon": "Speedimize.svg",
-    "scripts": "cdn\\.shopify\\.com/.+/assets/speedimize\\.js",
-    "saas": true,
     "pricing": [
       "mid",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "cdn\\.shopify\\.com/.+/assets/speedimize\\.js",
     "website": "https://speedimize.io"
   },
-  "SpeedKit": {
-    "cats": [
-      92
-    ],
-    "description": "Baqend develops a performance add-on that uses caching algorithms to minimize loading times of e-commerce websites.",
-    "icon": "Speedkit.svg",
-    "js": {
-      "speedKit": ""
-    },
-    "website": "https://www.baqend.com/"
-  },
   "Sphinx": {
     "cats": [
       4
@@ -3123,12 +3123,12 @@
     "js": {
       "Stackla": ""
     },
-    "scripts": "\\.stackla\\.com/",
-    "saas": true,
     "pricing": [
       "high",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.stackla\\.com/",
     "website": "http://stackla.com/"
   },
   "Stamped": {
@@ -3315,30 +3315,30 @@
     "scripts": "cdn\\.storifyme\\.com/",
     "website": "https://www.storifyme.com"
   },
-  "Storyblok": {
-    "cats": [
-      1
-    ],
-    "icon": "storyblok.png",
-    "meta": {
-      "generator": "storyblok"
-    },
-    "website": "https://www.storyblok.com"
-  },
   "StoryStream": {
     "cats": [
       96
     ],
     "description": "StoryStream is a content curation platform that specialises in user generated content.",
     "icon": "StoryStream.png",
-    "scripts": "apps\\.storystream\\.ai/",
-    "saas": true,
     "pricing": [
       "low",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "apps\\.storystream\\.ai/",
     "website": "https://storystream.ai"
   },
+  "Storyblok": {
+    "cats": [
+      1
+    ],
+    "icon": "storyblok.png",
+    "meta": {
+      "generator": "storyblok"
+    },
+    "website": "https://www.storyblok.com"
+  },
   "Strapdown.js": {
     "cats": [
       12
diff --git a/src/technologies/t.json b/src/technologies/t.json
index 743e9c88a..dc6b04558 100644
--- a/src/technologies/t.json
+++ b/src/technologies/t.json
@@ -180,14 +180,14 @@
       96
     ],
     "description": "Tagboard is a platform which allows users to aggregate data from major social networking websites and embed, repost and redisplay it on various media.",
-    "icon": "Tagboard.svg",
     "dom": "iframe[src*='.tagboard.com/']",
-    "scripts": "\\.tagboard\\.com/",
-    "saas": true,
+    "icon": "Tagboard.svg",
     "pricing": [
       "high",
       "recurring"
     ],
+    "saas": true,
+    "scripts": "\\.tagboard\\.com/",
     "website": "https://tagboard.com"
   },
   "Taggbox": {
diff --git a/src/technologies/z.json b/src/technologies/z.json
index 7c8361bbb..e9114f1a5 100644
--- a/src/technologies/z.json
+++ b/src/technologies/z.json
@@ -209,8 +209,8 @@
     "icon": "zip_pay.svg",
     "js": {
       "QuadPayShopify": "",
-      "quadpayID": "",
-      "checkout.enabledpayments.zip": "^true$"
+      "checkout.enabledpayments.zip": "^true$",
+      "quadpayID": ""
     },
     "pricing": [
       "payg"