diff --git a/src/apps.json b/src/apps.json
index 7e5ad9de7..9b8f6880d 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -86,6 +86,26 @@
       ],
       "website": "https://www.adplan7.com/"
     },
+    "Afterpay": {
+      "cats": [
+        41
+      ],
+      "cpe": "cpe:/a:afterpay:afterpay",
+      "icon": "afterpay.png",
+      "script": [
+        "portal\\.afterpay\\.com",
+        "static\\.afterpay\\.com"
+      ],
+      "website": "https://www.afterpay.com/"
+    },
+    "Amex Checkout": {
+      "cats": [
+        41
+      ],
+      "icon": "amex.png",
+      "script": "aexp-static\\.com",
+      "website": "https://www.americanexpress.com/us/express-checkout/"
+    },
     "AMP": {
       "cats": [
         12
@@ -1743,6 +1763,7 @@
         "Braintree": "",
         "Braintree.version": "^(.+)$\\;version:\\1"
       },
+      "script": "js\\.braintreegateway\\.com",
       "website": "https://www.braintreepayments.com"
     },
     "Brightspot": {
@@ -2840,6 +2861,14 @@
       "script": "cufon-yui\\.js",
       "website": "http://cufon.shoqolate.com"
     },
+    "Cybersource": {
+      "cats": [
+        41
+      ],
+      "icon": "cybersource.png",
+      "script": "cybersource\\..+\\.js",
+      "website": "https://www.cybersource.com/"
+    },
     "D3": {
       "cats": [
         25
@@ -3735,6 +3764,15 @@
       ],
       "website": "https://etherpad.org"
     },
+    "eWAY Payments": {
+      "cats": [
+        41
+      ],
+      "html": "<img [^>]*src=\"[^/]*//[^/]*eway\\.com",
+      "icon": "eway.png",
+      "script": "secure\\.ewaypayments\\.com",
+      "website": "https://www.eway.com.au/"
+    },
     "Exhibit": {
       "cats": [
         25
@@ -3938,6 +3976,18 @@
       "implies": "PHP",
       "website": "http://fatfreeframework.com"
     },
+    "Fat Zebra": {
+      "cats": [
+        41
+      ],
+      "html": [
+        "<(?:iframe|img|form)[^>]+paynow\\.pmnts\\.io",
+        "<(?:iframe)[^>]+FatZebraFrame"
+      ],
+      "icon": "fatzebra.png",
+      "script": "paynow\\.pmnts\\.io",
+      "website": "https://www.fatzebra.com/"
+    },
     "Fbits": {
       "cats": [
         6
@@ -7846,6 +7896,17 @@
       "icon": "mycashflow.png",
       "website": "https://www.mycashflow.fi/"
     },
+    "My Food Link": {
+      "cats": [
+        6
+      ],
+      "html": [
+        "<div class='mfl-made-by-myfoodlink'>",
+        "<a href=\"https://www.myfoodlink.com.au"
+      ],
+      "icon": "myfoodlink.png",
+      "website": "https://www.myfoodlink.com.au/"
+    },
     "MySQL": {
       "cats": [
         34
@@ -8405,6 +8466,14 @@
       },
       "website": "http://www.opennemas.com"
     },
+    "OpenPay": {
+      "cats": [
+        41
+      ],
+      "icon": "openpay.png",
+      "script": "openpay\\.com.\\au",
+      "website": "https://www.openpay.com.au/"
+    },
     "OpenResty": {
       "cats": [
         22
@@ -8806,12 +8875,17 @@
         41
       ],
       "cpe": "cpe:/a:paypal:paypal",
-      "html": "<input[^>]+_s-xclick",
+      "html": [
+        "<input[^>]+_s-xclick",
+        "<img [^>]*src=\"[^/]*//[^/]*paypal\\.com",
+        "<img [^>]*src=\"[^/]*//[^/]*paypalobjects\\.com"
+      ],
       "icon": "PayPal.svg",
       "js": {
         "PAYPAL": ""
       },
-      "script": "paypalobjects\\.com/js",
+      "script": "paypalobjects\\.com",
+      "url": "paypal\\.com",
       "website": "https://paypal.com"
     },
     "Pelican": {
@@ -8988,6 +9062,14 @@
       },
       "website": "https://www.pingoteam.ir/"
     },
+    "Pin Payments": {
+      "cats": [
+        41
+      ],
+      "icon": "pinpayments.png",
+      "script": "api\\.pinpayments\\.com",
+      "website": "https://www.pinpayments.com/"
+    },
     "Pinterest": {
       "cats": [
         5
@@ -10604,6 +10686,7 @@
         "Shopify": "\\;confidence:25"
       },
       "url": "^https?//.+\\.myshopify\\.com",
+      "script": "sdks\\.shopifycdn\\.com",
       "website": "http://shopify.com"
     },
     "Shopline": {
@@ -11107,6 +11190,14 @@
       "script": "^https:\\/\\/cdn\\.splitbee\\.io\\/sb\\.js",
       "website": "https://splitbee.io"
     },
+    "SplitIt": {
+      "cats": [
+        41
+      ],
+      "icon": "splitit.png",
+      "script": "checkout\\.production\\.splitit\\.com",
+      "website": "https://www.splitit.com/"
+    },
     "Splunk": {
       "cats": [
         19
@@ -11923,6 +12014,14 @@
       },
       "website": "http://titan360.com"
     },
+    "TNS Payments": {
+      "cats": [
+        41
+      ],
+      "icon": "tnsi.png",
+      "script": "secure\\.ap\\.tnspayments\\.com",
+      "website": "https://tnsi.com/products/payments/"
+    },
     "TomatoCart": {
       "cats": [
         6
@@ -12334,6 +12433,14 @@
       "script": "/js/ushahidi\\.js$",
       "website": "http://www.ushahidi.com"
     },
+    "Visa Checkout": {
+      "cats": [
+        41
+      ],
+      "icon": "visa.png",
+      "script": "secure\\.checkout\\.visa\\.com",
+      "website": "https://checkout.visa.com"
+    },
     "VIVVO": {
       "cats": [
         1
@@ -15075,6 +15182,18 @@
         "generator": "xt:Commerce"
       },
       "website": "https://www.xt-commerce.com"
+    },
+    "Zip Pay / Zip Money": {
+      "cats": [
+        41
+      ],
+      "html": "<img [^>]*src=\"[^/]*//[^/]*eway\\.com",
+      "icon": "zip_pay.png",
+      "script": [
+        "static\\.zipmoney\\.com\\.au",
+        "zip\\.co"
+      ],
+      "website": "https://www.zip.co/"
     }
   },
   "categories": {
diff --git a/src/drivers/webextension/images/icons/afterpay.png b/src/drivers/webextension/images/icons/afterpay.png
new file mode 100644
index 000000000..4c8add7d4
Binary files /dev/null and b/src/drivers/webextension/images/icons/afterpay.png differ
diff --git a/src/drivers/webextension/images/icons/amex.png b/src/drivers/webextension/images/icons/amex.png
new file mode 100644
index 000000000..4567329c6
Binary files /dev/null and b/src/drivers/webextension/images/icons/amex.png differ
diff --git a/src/drivers/webextension/images/icons/cybersource.png b/src/drivers/webextension/images/icons/cybersource.png
new file mode 100644
index 000000000..8852f77df
Binary files /dev/null and b/src/drivers/webextension/images/icons/cybersource.png differ
diff --git a/src/drivers/webextension/images/icons/eway.png b/src/drivers/webextension/images/icons/eway.png
new file mode 100644
index 000000000..15966b3a9
Binary files /dev/null and b/src/drivers/webextension/images/icons/eway.png differ
diff --git a/src/drivers/webextension/images/icons/fatzebra.png b/src/drivers/webextension/images/icons/fatzebra.png
new file mode 100644
index 000000000..62a045e43
Binary files /dev/null and b/src/drivers/webextension/images/icons/fatzebra.png differ
diff --git a/src/drivers/webextension/images/icons/myfoodlink.png b/src/drivers/webextension/images/icons/myfoodlink.png
new file mode 100644
index 000000000..76094b00e
Binary files /dev/null and b/src/drivers/webextension/images/icons/myfoodlink.png differ
diff --git a/src/drivers/webextension/images/icons/openpay.png b/src/drivers/webextension/images/icons/openpay.png
new file mode 100644
index 000000000..88417f89f
Binary files /dev/null and b/src/drivers/webextension/images/icons/openpay.png differ
diff --git a/src/drivers/webextension/images/icons/pinpayments.png b/src/drivers/webextension/images/icons/pinpayments.png
new file mode 100644
index 000000000..f66ec715d
Binary files /dev/null and b/src/drivers/webextension/images/icons/pinpayments.png differ
diff --git a/src/drivers/webextension/images/icons/securepay.png b/src/drivers/webextension/images/icons/securepay.png
new file mode 100644
index 000000000..a28f20ecd
Binary files /dev/null and b/src/drivers/webextension/images/icons/securepay.png differ
diff --git a/src/drivers/webextension/images/icons/splitit.png b/src/drivers/webextension/images/icons/splitit.png
new file mode 100644
index 000000000..37a1b259a
Binary files /dev/null and b/src/drivers/webextension/images/icons/splitit.png differ
diff --git a/src/drivers/webextension/images/icons/tnsi.png b/src/drivers/webextension/images/icons/tnsi.png
new file mode 100644
index 000000000..d05a1878d
Binary files /dev/null and b/src/drivers/webextension/images/icons/tnsi.png differ
diff --git a/src/drivers/webextension/images/icons/visa.png b/src/drivers/webextension/images/icons/visa.png
new file mode 100644
index 000000000..5d8698c79
Binary files /dev/null and b/src/drivers/webextension/images/icons/visa.png differ