diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..63190aca9
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+**/lib/*
+node_modules
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..d262d9909
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+    "extends": "airbnb-base",
+    "rules": {
+      "no-param-reassign": 0
+    }
+};
diff --git a/.gitignore b/.gitignore
index 9e926bfbc..4c54d94c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 /npm-debug.log
 /npm-debug.log
 
+package-lock.json
+
 !.gitkeep
 
 # Junk files
@@ -13,3 +15,5 @@ Desktop.ini
 ._*
 tags
 tags.*
+.idea
+/nbproject/private/
diff --git a/.travis.yml b/.travis.yml
index 2b27a8fa7..b39d23df3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: required
 services:
   - docker
 
+before_install: npm install -g npm@latest
+install: npm ci
+
 after_success:
   - sha256sum build/* > build/SHA256SUMS
   - cat build/SHA256SUMS
diff --git a/Dockerfile b/Dockerfile
index f2a28e638..e7c9e6806 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine
 
-MAINTAINER Elbert Alias <elbert@alias.io>
+LABEL maintainer="elbert@alias.io"
 
 ENV WAPPALYZER_DIR=/opt/wappalyzer
 
@@ -8,7 +8,6 @@ RUN apk update && apk add --no-cache \
 	bash \
 	curl \
 	fontconfig \
-	nodejs \
 	nodejs-npm \
 	optipng \
 	zip
@@ -17,14 +16,15 @@ RUN apk update && apk add --no-cache \
 # https://github.com/dustinblackman/phantomized
 RUN curl -Ls "https://github.com/dustinblackman/phantomized/releases/download/2.1.1a/dockerized-phantomjs.tar.gz" | tar xz -C /
 
-RUN apk del \
-	curl
+RUN apk del curl
 
-RUN npm i -g \
+RUN npm i -g n npm@latest
+
+RUN n stable
+
+RUN npm i --unsafe-perm --silent -g \
 	jsonlint-cli \
-	manifoldjs \
-	svg2png-many \
-	yarn
+	svg2png-many
 
 RUN mkdir -p $WAPPALYZER_DIR
 
diff --git a/README.md b/README.md
index 79b36246e..29e837b4b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Wappalyzer [![Travis](https://img.shields.io/travis/AliasIO/Wappalyzer.svg)](https://travis-ci.org/AliasIO/Wappalyzer/) [![Scrutinizer](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/?branch=master)
+# Wappalyzer [![Travis](https://travis-ci.org/AliasIO/Wappalyzer.svg?branch=master)](https://travis-ci.org/AliasIO/Wappalyzer/) [![Scrutinizer](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/?branch=master)
 
 [Wappalyzer](https://www.wappalyzer.com/) is a
 [cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
diff --git a/bin/build b/bin/build
index 2bdd89fa1..e39752ccc 100755
--- a/bin/build
+++ b/bin/build
@@ -22,7 +22,7 @@ find . -name ".DS_Store" -exec rm {} \;
 
 echo "Prettifying apps.json..."
 
-jsonlint-cli -ist $'\t' src/apps.json
+sed -e 's/\\\\/{{ESCAPE}}/g' src/apps.json | jsonlint-cli -ps | sed -e 's/{{ESCAPE}}/\\\\/g' > /tmp/apps.json && cat /tmp/apps.json > src/apps.json
 
 echo "Converting SVG icons to PNG..."
 
@@ -60,6 +60,7 @@ zip -qr ../../../build/wappalyzer_webextension.zip . \
   -x \*.gitkeep \
   -x \*.js.map \
   -x \*.min.js \
+  -x \*.spec.js \
   -x \*.yarn-integrity \
   -x \*package.json \
   -x \*LICENSE \
diff --git a/bin/validate b/bin/validate
index dd9b12729..2c60e5b90 100755
--- a/bin/validate
+++ b/bin/validate
@@ -6,7 +6,7 @@ set -eu
 
 echo "Validating apps.json..."
 
-jsonlint-cli -tps schema.json src/apps.json > /tmp/apps.json && mv /tmp/apps.json src/apps.json
+jsonlint-cli -s schema.json src/apps.json
 
 echo "Validating regular expressions..."
 
@@ -15,3 +15,7 @@ echo "Validating regular expressions..."
 echo "Validating icons..."
 
 ./bin/validate-icons
+
+echo "Running tests..."
+
+npm run test
diff --git a/bin/validate-icons b/bin/validate-icons
index 8a6913a46..e64efac02 100755
--- a/bin/validate-icons
+++ b/bin/validate-icons
@@ -16,7 +16,7 @@ var
 for (app in json.apps) {
 	(function(app) {
 		var
-			iconPath = json.apps[app].icon || 'default.svg';
+			iconPath = json.apps[app].icon || 'default.svg',
 			path     = basePath + iconPath,
 			ext      = iconPath.substr(iconPath.length - 4);
 
diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 000000000..4e55ba0c4
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,16 @@
+<!--
+If you need technical help please read https://www.wappalyzer.com/docs before opening an issue.
+It also explains well how to add a new application detection.
+-->
+
+**Do you want to request a *feature*, a *new application detection* or report a *bug*?**
+
+**Is your issue about WebExtension driver (Chrome & Firefox), the website, the NPM driver or the bookmarklet ?**
+
+**What is the current behavior ?**
+
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a demo of the problem.**
+
+**What is the expected behavior ?**
+
+**Which versions of Wappalyzer, and which browser / OS are affected by this issue ? Did this work in previous versions ?**
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
new file mode 100644
index 000000000..221001f31
--- /dev/null
+++ b/npm-shrinkwrap.json
@@ -0,0 +1,1781 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "acorn": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "chai": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
+      "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.0.1",
+        "check-error": "^1.0.1",
+        "deep-eql": "^3.0.0",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.0.0",
+        "type-detect": "^4.0.0"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "color-convert": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.1"
+      }
+    },
+    "color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint": {
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.3.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.1.0",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^3.1.0",
+        "doctrine": "^2.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.4",
+        "esquery": "^1.0.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.0.1",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^7.0.0",
+        "progress": "^2.0.0",
+        "regexpp": "^1.0.1",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "4.0.2",
+        "text-table": "~0.2.0"
+      }
+    },
+    "eslint-config-airbnb-base": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.0.0.tgz",
+      "integrity": "sha512-hUFXRlE6AY84z0qYh4wKdtSF4EqDnyT8sxrvTpcXCV4ENSLF8li5yNA1yDM26iinH8Ierbpc4lv8Rp62uX6VSQ==",
+      "dev": true,
+      "requires": {
+        "eslint-restricted-globals": "^0.1.1",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.0.4"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
+      "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.8",
+        "pkg-dir": "^1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.13.0.tgz",
+      "integrity": "sha512-t6hGKQDMIt9N8R7vLepsYXgDfeuhp6ZJSgtrLEDxonpSubyxUZHjhm6LsAaZX8q6GYVxkbT3kTsV9G5mBCFR6A==",
+      "dev": true,
+      "requires": {
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.1",
+        "eslint-module-utils": "^2.2.0",
+        "has": "^1.0.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.3",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.6.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-restricted-globals": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz",
+      "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "file-type": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.4.0.tgz",
+      "integrity": "sha1-KnyU9ioAMBULt9m2xwz6HT51nIY="
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "globals": {
+      "version": "11.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+      "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "html-comment-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
+      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4="
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-svg": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
+      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.1",
+        "commander": "2.15.1",
+        "debug": "3.1.0",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.2",
+        "growl": "1.10.5",
+        "he": "1.1.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "supports-color": "5.4.0"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.entries": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
+      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.6.1",
+        "function-bind": "^1.1.0",
+        "has": "^1.0.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "requires": {
+        "pify": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0"
+      }
+    },
+    "pluralize": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "read-chunk": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz",
+      "integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=",
+      "requires": {
+        "pify": "^3.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "dev": true
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "resolve": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+      "dev": true
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "dev": true,
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "spdx-correct": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "table": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^5.2.3",
+        "ajv-keywords": "^2.1.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index 2148f0f67..e7bee5930 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,19 @@
 {
   "dependencies": {
-    "file-type": "3.8.*",
-    "is-svg": "2.0.*",
-    "read-chunk": "2.0.*"
+    "file-type": "7.4.*",
+    "is-svg": "2.1.*",
+    "read-chunk": "2.1.*"
+  },
+  "devDependencies": {
+    "chai": "^4.1.2",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb-base": "^13.0.0",
+    "eslint-plugin-import": "^2.13.0",
+    "mocha": "^5.2.0"
+  },
+  "scripts": {
+    "test": "mocha -R spec src",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
   }
 }
-
diff --git a/patches/zombie-vm-timeout.patch b/patches/zombie-vm-timeout.patch
new file mode 100644
index 000000000..dcc62d7d4
--- /dev/null
+++ b/patches/zombie-vm-timeout.patch
@@ -0,0 +1,11 @@
+--- src/drivers/npm/node_modules/zombie/lib/document.js	2018-04-20 14:36:04.097829977 +1000
++++ src/drivers/npm/node_modules/zombie/lib/document.js	2018-04-20 14:34:25.699317000 +1000
+@@ -281,7 +281,7 @@
+       // The current window, postMessage and window.close need this
+       browser._windowInScope = window;
+       var result = undefined;
+-      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename });else if (code) result = code.call(window);
++      if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename, timeout: 1000 });else if (code) result = code.call(window);
+       browser.emit('evaluated', code, result, filename);
+       return result;
+     } catch (error) {
diff --git a/run b/run
index 102fc812d..06556bb07 100755
--- a/run
+++ b/run
@@ -10,7 +10,17 @@ fi
 
 cmd="docker run --rm -v "$(pwd):/opt/wappalyzer" -it wappalyzer/dev"
 
-$cmd sh -c "yarn install; cd src/drivers/webextension; yarn install"
+$cmd sh -c "\
+	npm i; \
+	npm shrinkwrap; \
+	cd src/drivers/webextension; \
+	npm i; \
+	npm shrinkwrap; \
+	cd ../npm; \
+	npm i; \
+	npm shrinkwrap"
+
+$cmd sh -c "cat patches/*.patch | patch -p0"
 
 $cmd ./bin/run links
 $cmd ./bin/run $@
diff --git a/schema.json b/schema.json
index 0f161fbeb..1d4ddb67d 100644
--- a/schema.json
+++ b/schema.json
@@ -3,6 +3,9 @@
 	"type": "object",
 	"additionalProperties": false,
 	"properties": {
+		"$schema": {
+			"type": "string"
+		},
 		"categories": {
 			"type": "object",
 			"required": true,
@@ -13,7 +16,7 @@
 					"required": true,
 					"properties": {
 						"priority": {
-							"type": "string"
+							"type": "number"
 						},
 						"name": {
 							"type": "string"
@@ -31,10 +34,16 @@
 					"cats": {
 						"type": "array",
 						"items": {
-							"type": "string"
+							"type": "number"
 						},
 						"required": true
 					},
+					"cookies": {
+						"type": "object",
+						"additionalProperties": {
+							"type": "string"
+						}
+					},
 					"js": {
 						"type": "object",
 						"additionalProperties": {
@@ -48,19 +57,28 @@
 						}
 					},
 					"html": {
-						"type": [ "string", "array" ],
+						"type": [
+							"string",
+							"array"
+						],
 						"items": {
 							"type": "string"
 						}
 					},
 					"excludes": {
-						"type": [ "string", "array" ],
+						"type": [
+							"string",
+							"array"
+						],
 						"items": {
 							"type": "string"
 						}
 					},
 					"implies": {
-						"type": [ "string", "array" ],
+						"type": [
+							"string",
+							"array"
+						],
 						"items": {
 							"type": "string"
 						}
@@ -72,7 +90,10 @@
 						}
 					},
 					"script": {
-						"type": [ "string", "array" ],
+						"type": [
+							"string",
+							"array"
+						],
 						"items": {
 							"type": "string"
 						}
diff --git a/src/apps.json b/src/apps.json
index 23350f68f..8dd80a215 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1,32 +1,13 @@
 {
+  "$schema": "../schema.json",
   "apps": {
-    "1&1": {
-      "cats": [
-        "6"
-      ],
-      "icon": "1and1.svg",
-      "implies": "PHP",
-      "url": "/shop/catalog/browse\\?sessid=",
-      "website": "http://1and1.com"
-    },
-    "Google Analytics Enhanced eCommerce": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "gaplugins.EC": ""
-      },
-      "icon": "Google Analytics.svg",
-      "script": "google-analytics\\.com\\/plugins\\/ua\\/ec\\.js",
-      "website": "https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce"
-    },
     "1C-Bitrix": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
-        "Set-Cookie": "^BITRIX_",
-        "X-Powered-CMS": "^Bitrix Site Manager"
+        "Set-Cookie": "BITRIX_",
+        "X-Powered-CMS": "Bitrix Site Manager"
       },
       "html": "(?:<link[^>]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))",
       "icon": "1C-Bitrix.png",
@@ -34,60 +15,45 @@
       "script": "1c-bitrix",
       "website": "http://www.1c-bitrix.ru"
     },
-    "animate.css": {
-      "cats": [
-        "18"
-      ],
-      "html": [
-        "<link [^>]+(?:/([\\d.]+)/)?animate\\.(?:min\\.)?css\\;version:\\1"
-      ],
-      "website": "https://daneden.github.io/animate.css/"
-    },
-    "2z Project": {
-      "cats": [
-        "1"
-      ],
-      "icon": "2z Project.png",
-      "meta": {
-        "generator": "2z project ([\\d.]+)\\;version:\\1"
-      },
-      "website": "http://2zproject-cms.ru"
-    },
-    "3DM": {
+    "91App": {
       "cats": [
-        "19"
+        6
       ],
-      "html": "<title>3ware 3DM([\\d\\.]+)?\\;version:\\1",
-      "icon": "3DM.png",
-      "implies": "3ware",
-      "website": "http://www.3ware.com"
+      "icon": "91app.png",
+      "script": "https\\:\\/\\/track\\.91app\\.io\\/track\\.js\\?",
+      "website": "https://www.91app.com/"
     },
     "3dCart": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
+      "cookies": {
+        "3dvisit": ""
+      },
       "headers": {
-        "Set-Cookie": "3dvisit",
         "X-Powered-By": "3DCART"
       },
       "icon": "3dCart.png",
       "script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)",
       "website": "http://www.3dcart.com"
     },
-    "3ware": {
+    "A-Frame": {
       "cats": [
-        "22"
+        25
       ],
-      "headers": {
-        "Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1"
+      "html": "<a-scene[^<>]*>",
+      "icon": "A-Frame.svg",
+      "implies": "three.js",
+      "js": {
+        "AFRAME.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "3ware.png",
-      "website": "http://www.3ware.com"
+      "script": "/?([\\d.]+)?/aframe(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://aframe.io"
     },
     "AD EBiS": {
       "cats": [
-        "10"
+        10
       ],
       "html": [
         "<!-- EBiS contents tag",
@@ -98,35 +64,9 @@
       "icon": "ebis.png",
       "website": "http://www.ebis.ne.jp"
     },
-    "Amber": {
-      "cats": [
-        "18",
-        "22"
-      ],
-      "headers": {
-        "X-Powered-By": "^Amber$"
-      },
-      "icon": "amber.png",
-      "website": "https://amberframework.org"
-    },
-    "AMPcms": {
-      "cats": [
-        "1"
-      ],
-      "js": {
-        "amp_js_init": ""
-      },
-      "headers": {
-        "Set-Cookie": "^AMP=",
-        "X-AMP-Version": "([\\d.]+)\\;version:\\1"
-      },
-      "icon": "AMPcms.png",
-      "implies": "PHP",
-      "website": "http://www.ampcms.org"
-    },
     "AOLserver": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "AOLserver/?([\\d.]+)?\\;version:\\1"
@@ -136,39 +76,29 @@
     },
     "AT Internet Analyzer": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "AT Internet.png",
       "js": {
-        "xtsite": "",
-        "ATInternet": ""
+        "ATInternet": "",
+        "xtsite": ""
       },
-      "icon": "AT Internet.png",
       "website": "http://atinternet.com/en"
     },
     "AT Internet XiTi": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "AT Internet.png",
       "js": {
         "xt_click": ""
       },
-      "icon": "AT Internet.png",
       "script": "xiti\\.com/hit\\.xiti",
       "website": "http://atinternet.com/en"
     },
-    "ATEN": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "ATEN HTTP Server(?:\\(?V?([\\d\\.]+)\\)?)?\\;version:\\1"
-      },
-      "icon": "ATEN.png",
-      "website": "http://www.aten.com"
-    },
     "AWStats": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "AWStats.png",
       "implies": "Perl",
@@ -177,45 +107,38 @@
       },
       "website": "http://awstats.sourceforge.net"
     },
-    "Accessible Portal": {
+    "Accelerated Mobile Pages": {
       "cats": [
-        "1"
+        12
       ],
-      "icon": "Accessible Portal.png",
-      "implies": "PHP",
-      "meta": {
-        "generator": "Accessible Portal"
-      },
-      "website": "http://www.accessibleportal.com"
+      "html": "<html[^>]* (?:amp|⚡)",
+      "icon": "Accelerated-Mobile-Pages.svg",
+      "website": "https://www.ampproject.org"
     },
-    "Act-On": {
+    "Acquia Cloud": {
       "cats": [
-        "32"
+        22
       ],
-      "js": {
-        "ActOn": ""
+      "headers": {
+        "X-AH-Environment": "^\\w+$"
       },
-      "icon": "ActOn.png",
-      "website": "http://act-on.com"
+      "icon": "acquia-cloud.png",
+      "implies": "Drupal\\;confidence:95",
+      "website": "https://www.acquia.com/"
     },
-    "Prebid": {
+    "Act-On": {
       "cats": [
-        "36"
+        32
       ],
-      "icon": "Prebid.png",
+      "icon": "ActOn.png",
       "js": {
-        "pbjs": "",
-        "PREBID_TIMEOUT": ""
+        "ActOn": ""
       },
-      "script": [
-        "/prebid\\.js",
-        "adnxs\\.com/[^\"]*(?:prebid|/pb\\.js)"
-      ],
-      "website": "http://prebid.org"
+      "website": "http://act-on.com"
     },
     "AdInfinity": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "AdInfinity.png",
       "script": "adinfinity\\.com\\.au",
@@ -223,49 +146,49 @@
     },
     "AdRiver": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "(?:<embed[^>]+(?:src=\"https?://mh\\d?\\.adriver\\.ru/|flashvars=\"[^\"]*(?:http:%3A//(?:ad|mh\\d?)\\.adriver\\.ru/|adriver_banner))|<(?:(?:iframe|img)[^>]+src|a[^>]+href)=\"https?://ad\\.adriver\\.ru/)",
+      "icon": "AdRiver.png",
       "js": {
         "adriver": ""
       },
-      "html": "(?:<embed[^>]+(?:src=\"https?://mh\\d?\\.adriver\\.ru/|flashvars=\"[^\"]*(?:http:%3A//(?:ad|mh\\d?)\\.adriver\\.ru/|adriver_banner))|<(?:(?:iframe|img)[^>]+src|a[^>]+href)=\"https?://ad\\.adriver\\.ru/)",
-      "icon": "AdRiver.png",
       "script": "(?:adriver\\.core\\.\\d\\.js|https?://(?:content|ad|masterh\\d)\\.adriver\\.ru/)",
       "website": "http://adriver.ru"
     },
     "AdRoll": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "AdRoll.svg",
       "js": {
         "adroll_adv_id": "",
         "adroll_pix_id": ""
       },
-      "icon": "AdRoll.svg",
       "script": "(?:a|s)\\.adroll\\.com",
       "website": "http://adroll.com"
     },
     "Adcash": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Adcash.svg",
       "js": {
+        "SuLoaded": "",
+        "SuUrl": "",
         "ac_bgclick_URL": "",
-        "ct_siteunder": "",
-        "ct_tag": "",
-        "ct_nSuUrl": "",
         "ct_nOpp": "",
-        "SuLoaded": "",
-        "SuUrl": ""
+        "ct_nSuUrl": "",
+        "ct_siteunder": "",
+        "ct_tag": ""
       },
-      "icon": "Adcash.svg",
       "script": "^[^\\/]*//(?:[^\\/]+\\.)?adcash\\.com/(?:script|ad)/",
       "url": "^https?://(?:[^\\/]+\\.)?adcash\\.com/script/pop_",
       "website": "http://adcash.com"
     },
     "AddShoppers": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "AddShoppers.png",
       "script": "cdn\\.shop\\.pe/widget/",
@@ -273,29 +196,29 @@
     },
     "AddThis": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "AddThis.svg",
       "js": {
         "addthis": ""
       },
-      "icon": "AddThis.svg",
       "script": "addthis\\.com/js/",
       "website": "http://www.addthis.com"
     },
     "AddToAny": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "AddToAny.png",
       "js": {
         "a2apage_init": ""
       },
-      "icon": "AddToAny.png",
       "script": "addtoany\\.com/menu/page\\.js",
       "website": "http://www.addtoany.com"
     },
     "Adminer": {
       "cats": [
-        "3"
+        3
       ],
       "html": [
         "Adminer</a> <span class=\"version\">([\\d.]+)</span>\\;version:\\1",
@@ -307,7 +230,7 @@
     },
     "Adnegah": {
       "cats": [
-        "36"
+        36
       ],
       "headers": {
         "X-Advertising-By": "adnegah\\.net"
@@ -319,24 +242,32 @@
     },
     "Adobe ColdFusion": {
       "cats": [
-        "18"
+        18
       ],
-      "js": {
-        "_cfEmails": ""
-      },
       "headers": {
         "Cookie": "CFTOKEN="
       },
       "html": "<!-- START headerTags\\.cfm",
       "icon": "Adobe ColdFusion.svg",
       "implies": "CFML",
+      "js": {
+        "_cfEmails": ""
+      },
       "script": "/cfajax/",
       "url": "\\.cfm(?:$|\\?)",
       "website": "http://adobe.com/products/coldfusion-family.html"
     },
+    "Adobe DTM": {
+      "cats": [
+        42
+      ],
+      "script": "//assets.adobedtm.com/",
+      "icon": "adobedmt.png",
+      "website": "https://marketing.adobe.com/resources/help/en_US/dtm/c_overview.html"
+    },
     "Adobe Experience Manager": {
       "cats": [
-        "1"
+        1
       ],
       "html": [
         "<div class=\"[^\"]*parbase",
@@ -349,7 +280,7 @@
     },
     "Adobe GoLive": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "Adobe GoLive.png",
       "meta": {
@@ -359,7 +290,7 @@
     },
     "Adobe Muse": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "Adobe Muse.svg",
       "meta": {
@@ -369,25 +300,36 @@
     },
     "Adobe RoboHelp": {
       "cats": [
-        "4"
+        4
       ],
+      "icon": "Adobe RoboHelp.svg",
       "js": {
-        "gbWhVer": "",
         "gbWhLang": "",
         "gbWhMsg": "",
+        "gbWhProxy": "",
         "gbWhUtil": "",
-        "gbWhProxy": ""
+        "gbWhVer": ""
       },
-      "icon": "Adobe RoboHelp.svg",
       "meta": {
         "generator": "^Adobe RoboHelp(?: ([\\d]+))?\\;version:\\1"
       },
       "script": "(?:wh(?:utils|ver|proxy|lang|topic|msg)|ehlpdhtm)\\.js",
       "website": "http://adobe.com/products/robohelp.html"
     },
+    "ADPLAN": {
+      "cats": [
+        10
+      ],
+      "icon": "ADPLAN.png",
+      "script": [
+        "^https?://[^.]+\\.adplan7\\.com/\\;version:7",
+        "^https?://(?!o\\.)\\w+\\.advg\\.jp/"
+      ],
+      "website": "https://www.adplan7.com/"
+    },
     "Advanced Web Stats": {
       "cats": [
-        "10"
+        10
       ],
       "html": "aws\\.src = [^<]+caphyon-analytics",
       "icon": "Advanced Web Stats.png",
@@ -396,31 +338,41 @@
     },
     "Advert Stream": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Advert Stream.png",
       "js": {
         "advst_is_above_the_fold": ""
       },
-      "icon": "Advert Stream.png",
       "script": "(?:ad\\.advertstream\\.com|adxcore\\.com)",
       "website": "http://www.advertstream.com"
     },
+    "Adyen": {
+      "cats": [
+        41
+      ],
+      "icon": "Adyen.svg",
+      "js": {
+        "adyen.encrypt.version": "^(.+)$\\;version:\\1"
+      },
+      "website": "https://www.adyen.com"
+    },
     "Adzerk": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net",
+      "icon": "Adzerk.png",
       "js": {
         "ados": "",
         "adosResults": ""
       },
-      "html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net",
-      "icon": "Adzerk.png",
       "script": "adzerk\\.net/ados\\.js",
       "website": "http://adzerk.com"
     },
     "Aegea": {
       "cats": [
-        "11"
+        11
       ],
       "headers": {
         "X-Powered-By": "^E2 Aegea v(\\d+)$\\;version:\\1"
@@ -432,9 +384,19 @@
       ],
       "website": "http://blogengine.ru"
     },
+    "Afosto": {
+      "cats": [
+        6
+      ],
+      "headers": {
+        "X-Powered-By": "Afosto SaaS BV"
+      },
+      "icon": "Afosto.svg",
+      "website": "http://afosto.com"
+    },
     "AfterBuy": {
       "cats": [
-        "6"
+        6
       ],
       "html": [
         "<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy\\. Information and contribution at https://www\\.afterbuy\\.de</dd>"
@@ -443,19 +405,23 @@
       "script": "shop-static\\.afterbuy\\.de",
       "website": "http://www.afterbuy.de"
     },
-    "Afosto": {
+    "Ahoy": {
       "cats": [
-        "6"
+        10
       ],
-      "headers": {
-        "X-Powered-By": "Afosto SaaS BV"
+      "js": {
+        "ahoy": ""
       },
-      "icon": "Afosto.svg",
-      "website": "http://afosto.com"
+      "cookies": {
+        "ahoy_track": "",
+        "ahoy_visit": "",
+        "ahoy_visitor": ""
+      },
+      "website": "https://github.com/ankane/ahoy"
     },
     "Aircall": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "aircall.png",
       "script": "^https?://cdn\\.aircall\\.io/",
@@ -463,17 +429,17 @@
     },
     "Airee": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
-        "Server": "Airee"
+        "Server": "^Airee"
       },
       "icon": "Airee.png",
       "website": "http://xn--80aqc2a.xn--p1ai"
     },
     "Akamai": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "X-Akamai-Transformed": ""
@@ -481,10 +447,25 @@
       "icon": "akamai.svg",
       "website": "http://akamai.com"
     },
+    "Akaunting": {
+      "cats": [
+        55
+      ],
+      "headers": {
+        "X-Akaunting": "^Free Accounting Software$"
+      },
+      "html": [
+        "<link[^>]+akaunting-green\\.css",
+        "Powered By Akaunting: <a [^>]*href=\"https?://(?:www\\.)?akaunting\\.com[^>]+>"
+      ],
+      "icon": "akaunting.svg",
+      "implies": "Laravel",
+      "website": "https://akaunting.com"
+    },
     "Akka HTTP": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "Server": "akka-http(?:/([\\d.]+))?\\;version:\\1"
@@ -494,17 +475,27 @@
     },
     "Algolia Realtime Search": {
       "cats": [
-        "29"
+        29
       ],
+      "icon": "Algolia Realtime Search.svg",
       "js": {
-        "AlgoliaSearch": ""
+        "AlgoliaSearch": "",
+        "algoliasearch.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Algolia Realtime Search.svg",
       "website": "http://www.algolia.com"
     },
+    "All in One SEO Pack": {
+      "cats": [
+        54
+      ],
+      "html": "<!-- All in One SEO Pack ([\\d.]+) \\;version:\\1",
+      "icon": "all-in-One-SEO-Pack.png",
+      "implies": "WordPress",
+      "website": "https://www.acquia.com/"
+    },
     "Allegro RomPager": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Allegro-Software-RomPager(?:/([\\d.]+))?\\;version:\\1"
@@ -514,22 +505,22 @@
     },
     "AlloyUI": {
       "cats": [
-        "12"
+        12
       ],
-      "js": {
-        "AUI": ""
-      },
       "icon": "AlloyUI.png",
       "implies": [
         "Bootstrap",
         "YUI"
       ],
+      "js": {
+        "AUI": ""
+      },
       "script": "^https?://cdn\\.alloyui\\.com/",
       "website": "http://www.alloyui.com"
     },
     "Amaya": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "Amaya.png",
       "meta": {
@@ -539,37 +530,84 @@
     },
     "Amazon Cloudfront": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
+        "Via": "\\(CloudFront\\)$",
         "X-Amz-Cf-Id": ""
       },
       "icon": "Amazon-Cloudfront.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/cloudfront/"
     },
     "Amazon EC2": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "\\(Amazon\\)"
       },
       "icon": "aws-ec2.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/ec2/"
     },
+    "Amazon Web Services": {
+      "cats": [
+        62
+      ],
+      "icon": "aws.svg",
+      "website": "https://aws.amazon.com/"
+    },
+    "Amazon ECS": {
+      "cats": [
+        63
+      ],
+      "headers": {
+        "Server": "^ECS"
+      },
+      "icon": "aws.svg",
+      "implies": [
+        "Amazon Web Services",
+        "Docker"
+      ],
+      "website": "https://aws.amazon.com/elasticloadbalancing/"
+    },
+    "Amazon ELB": {
+      "cats": [
+        63
+      ],
+      "cookies": {
+        "AWSELB": ""
+      },
+      "icon": "aws-elb.png",
+      "implies": "Amazon Web Services",
+      "website": "https://aws.amazon.com/elasticloadbalancing/"
+    },
     "Amazon S3": {
       "cats": [
-        "19"
+        19
       ],
       "headers": {
-        "Server": "AmazonS3"
+        "Server": "^AmazonS3$"
       },
       "icon": "aws-s3.svg",
+      "implies": "Amazon Web Services",
       "website": "http://aws.amazon.com/s3/"
     },
+    "Amber": {
+      "cats": [
+        18,
+        22
+      ],
+      "headers": {
+        "X-Powered-By": "^Amber$"
+      },
+      "icon": "amber.png",
+      "website": "https://amberframework.org"
+    },
     "Ametys": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Ametys.png",
       "implies": "Java",
@@ -581,7 +619,7 @@
     },
     "Amiro.CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Amiro.CMS.png",
       "implies": "PHP",
@@ -590,51 +628,121 @@
       },
       "website": "http://amirocms.com"
     },
+    "Amplitude": {
+      "cats": [
+        10
+      ],
+      "icon": "amplitude.png",
+      "script": [
+        "cdn\\.amplitude\\.com"
+      ],
+      "website": "https://amplitude.com/"
+    },
+    "Anetwork": {
+      "cats": [
+        36
+      ],
+      "icon": "Anetwork.png",
+      "script": "static-cdn\\.anetwork\\.ir/",
+      "website": "https://www.anetwork.ir"
+    },
+    "Angular": {
+      "cats": [
+        12
+      ],
+      "excludes": [
+        "AngularDart",
+        "AngularJS"
+      ],
+      "html": "<[^>]+ ng-version=\"([\\d.]+)\"\\;version:\\1",
+      "icon": "Angular.svg",
+      "js": {
+        "ng.coreTokens": "",
+        "ng.probe": ""
+      },
+      "website": "https://angular.io"
+    },
     "Angular Material": {
       "cats": [
-        "18"
+        18
       ],
+      "icon": "AngularJS.svg",
+      "implies": "AngularJS",
       "js": {
         "ngMaterial": ""
       },
-      "icon": "Angular.svg",
-      "implies": "AngularJS",
-      "script": [
-        "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
-        "angular-material.*\\.js"
+      "script": "/([\\d.rc-]+)?/angular-material(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://material.angularjs.org"
+    },
+    "AngularDart": {
+      "cats": [
+        18
       ],
-      "website": "http://material.angularjs.org"
+      "excludes": [
+        "Angular",
+        "AngularJS"
+      ],
+      "icon": "AngularDart.svg",
+      "implies": "Dart",
+      "js": {
+        "ngTestabilityRegistries": ""
+      },
+      "website": "https://webdev.dartlang.org/angular/"
     },
-    "Angular": {
+    "AngularJS": {
       "cats": [
-        "12"
+        12
+      ],
+      "excludes": [
+        "Angular",
+        "AngularDart"
+      ],
+      "icon": "AngularJS.svg",
+      "html": [
+        "<(?:div|html)[^>]+ng-app=",
+        "<ng-app"
       ],
       "js": {
         "angular": "",
-        "angular.version.full": "(.*)\\;version:\\1"
+        "angular.version.full": "^(.+)$\\;version:\\1"
       },
-      "html": "<app[^>]+ng-version=\"([\\d.]+)\">\\;version:\\1",
-      "icon": "Angular.svg",
       "script": [
-        "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
+        "angular[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "/([\\d.]+(?:-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
         "angular.*\\.js"
       ],
-      "website": "http://angular.io"
+      "website": "https://angularjs.org"
+    },
+    "Ant Design": {
+      "cats": [
+        12
+      ],
+      "html": [
+        "<[^>]*class=\"ant-(?:btn|col|row|layout|breadcrumb|menu|pagination|steps|select|cascader|checkbox|calendar|form|input-number|input|mention|rate|radio|slider|switch|tree-select|time-picker|transfer|upload|avatar|badge|card|carousel|collapse|list|popover|tooltip|table|tabs|tag|timeline|tree|alert|modal|message|notification|progress|popconfirm|spin|anchor|back-top|divider|drawer)",
+        "<i class=\"anticon anticon-"
+      ],
+      "icon": "Ant Design.svg",
+      "implies": [
+        "React"
+      ],
+      "js": {
+        "antd": ""
+      },
+      "website": "https://ant.design"
     },
     "Apache": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
+        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1"
       },
       "icon": "Apache.svg",
       "website": "http://apache.org"
     },
     "Apache HBase": {
       "cats": [
-        "34"
+        34
       ],
       "html": "<style[^>]+static/hbase",
       "icon": "Apache HBase.png",
@@ -643,7 +751,7 @@
     },
     "Apache Hadoop": {
       "cats": [
-        "34"
+        34
       ],
       "html": "<style[^>]+static/hadoop",
       "icon": "Apache Hadoop.svg",
@@ -651,7 +759,7 @@
     },
     "Apache JSPWiki": {
       "cats": [
-        "8"
+        8
       ],
       "html": "<html[^>]* xmlns:jspwiki=",
       "icon": "Apache JSPWiki.png",
@@ -662,11 +770,11 @@
     },
     "Apache Tomcat": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "^Apache-Coyote(/1\\.1)?$\\;version:\\1?4.1+:",
-        "X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
+        "Server": "^Apache-Coyote(?:/([\\d.]+))?\\;version:\\1",
+        "X-Powered-By": "\\bTomcat\\b(?:-([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache Tomcat.svg",
       "implies": "Java",
@@ -674,7 +782,7 @@
     },
     "Apache Traffic Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "ATS/?([\\d.]+)?\\;version:\\1"
@@ -684,18 +792,18 @@
     },
     "Apache Wicket": {
       "cats": [
-        "18"
+        18
       ],
+      "icon": "Apache Wicket.svg",
+      "implies": "Java",
       "js": {
         "Wicket": ""
       },
-      "icon": "Apache Wicket.svg",
-      "implies": "Java",
       "website": "http://wicket.apache.org"
     },
     "ApexPages": {
       "cats": [
-        "51"
+        51
       ],
       "headers": {
         "X-Powered-By": "Salesforce\\.com ApexPages"
@@ -706,7 +814,7 @@
     },
     "Apostrophe CMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+data-apos-refreshable[^>]",
       "icon": "apostrophecms.svg",
@@ -715,20 +823,28 @@
     },
     "AppNexus": {
       "cats": [
-        "36"
+        36
       ],
       "html": "<(?:iframe|img)[^>]+adnxs\\.(?:net|com)",
       "icon": "AppNexus.svg",
       "script": "adnxs\\.(?:net|com)",
       "website": "http://appnexus.com"
     },
+    "Appcues": {
+      "cats": [
+        58
+      ],
+      "icon": "Appcues.svg",
+      "script": "fast\\.appcues.com*\\.js",
+      "website": "https://appcues.com"
+    },
     "Arastta": {
       "cats": [
-        "6"
+        6
       ],
       "excludes": "OpenCart",
       "headers": {
-        "Arastta": "(.*)\\;version:\\1",
+        "Arastta": "^(.+)$\\;version:\\1",
         "X-Arastta": ""
       },
       "html": "Powered by <a [^>]*href=\"https?://(?:www\\.)?arastta\\.org[^>]+>Arastta",
@@ -737,44 +853,36 @@
       "script": "arastta\\.js",
       "website": "http://arastta.org"
     },
-    "Arc Forum": {
-      "cats": [
-        "2"
-      ],
-      "html": "ping\\.src = node\\.href;\\s+[^>]+\\s+}\\s+</script>",
-      "icon": "Arc Forum.png",
-      "website": "http://arclanguage.org"
-    },
     "ArcGIS API for JavaScript": {
       "cats": [
-        "35"
+        35
       ],
+      "icon": "arcgis_icon.png",
       "script": [
         "js\\.arcgis\\.com",
         "basemaps\\.arcgis\\.com"
       ],
-      "icon": "arcgis_icon.png",
       "website": "https://developers.arcgis.com/javascript/"
     },
     "Artifactory": {
       "cats": [
-        "47"
+        47
       ],
-      "js": {
-        "ArtifactoryUpdates": ""
-      },
       "html": [
         "<span class=\"version\">Artifactory(?: Pro)?(?: Power Pack)?(?: ([\\d.]+))?\\;version:\\1"
       ],
       "icon": "Artifactory.svg",
-      "script": [
+      "js": {
+        "ArtifactoryUpdates": ""
+      },
+      "script": [
         "wicket/resource/org\\.artifactory\\."
       ],
       "website": "http://jfrog.com/open-source/#os-arti"
     },
     "Artifactory Web Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1"
@@ -787,27 +895,27 @@
     },
     "ArvanCloud": {
       "cats": [
-        "31"
+        31
       ],
-      "js": {
-        "ArvanCloud": ""
-      },
       "headers": {
         "AR-PoweredBy": "Arvan Cloud \\(arvancloud\\.com\\)"
       },
       "icon": "ArvanCloud.png",
+      "js": {
+        "ArvanCloud": ""
+      },
       "website": "http://www.ArvanCloud.com"
     },
     "AsciiDoc": {
       "cats": [
-        "1",
-        "20",
-        "27"
+        1,
+        20,
+        27
       ],
+      "icon": "AsciiDoc.png",
       "js": {
         "asciidoc": ""
       },
-      "icon": "AsciiDoc.png",
       "meta": {
         "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1"
       },
@@ -815,26 +923,26 @@
     },
     "Asciinema": {
       "cats": [
-        "14"
+        14
       ],
+      "html": "<asciinema-player",
+      "icon": "asciinema.png",
       "js": {
         "asciinema": ""
       },
       "script": "asciinema\\.org/",
-      "icon": "asciinema.png",
-      "html": "<asciinema-player",
       "website": "https://asciinema.org/"
     },
     "Atlassian Bitbucket": {
       "cats": [
-        "47"
+        47
       ],
+      "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9]+\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1",
+      "icon": "Atlassian Bitbucket.svg",
+      "implies": "Python",
       "js": {
         "bitbucket": ""
       },
-      "icon": "Atlassian Bitbucket.svg",
-      "implies": "Python",
-      "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9]+\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1",
       "meta": {
         "application-name": "Bitbucket"
       },
@@ -842,7 +950,7 @@
     },
     "Atlassian Confluence": {
       "cats": [
-        "8"
+        8
       ],
       "headers": {
         "X-Confluence-Request-Time": ""
@@ -857,10 +965,10 @@
     },
     "Atlassian FishEye": {
       "cats": [
-        "47"
+        47
       ],
-      "headers": {
-        "Set-cookie": "FESESSIONID"
+      "cookies": {
+        "FESESSIONID": ""
       },
       "html": "<title>(?:Log in to )?FishEye (?:and Crucible )?([\\d.]+)?</title>\\;version:\\1",
       "icon": "Atlassian FishEye.svg",
@@ -868,24 +976,24 @@
     },
     "Atlassian Jira": {
       "cats": [
-        "13"
+        13
       ],
-      "js": {
-        "jira": ""
-      },
       "html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
       "icon": "Atlassian Jira.svg",
       "implies": "Java",
+      "js": {
+        "jira": ""
+      },
       "meta": {
-        "ajs-version-number": "([\\d\\.]+)\\;version:\\1",
+        "ajs-version-number": "^(.+)$\\;version:\\1",
         "application-name": "JIRA"
       },
       "website": "http://www.atlassian.com/software/jira/overview/"
     },
     "Atlassian Jira Issue Collector": {
       "cats": [
-        "13",
-        "47"
+        13,
+        47
       ],
       "icon": "Atlassian Jira.svg",
       "script": [
@@ -896,7 +1004,7 @@
     },
     "Aurelia": {
       "cats": [
-        "12"
+        12
       ],
       "html": [
         "<[^>]+aurelia-app=[^>]",
@@ -911,20 +1019,31 @@
     },
     "Avangate": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "avng8_": "",
-        "__avng8_": ""
-      },
       "html": "<link[^>]* href=\"^https?://edge\\.avangate\\.net/",
       "icon": "Avangate.svg",
+      "js": {
+        "__avng8_": "",
+        "avng8_": ""
+      },
       "script": "^https?://edge\\.avangate\\.net/",
       "website": "http://avangate.com"
     },
+    "Awesomplete": {
+      "cats": [
+        29
+      ],
+      "html": "<link[^>]+href=\"[^>]*awesomplete(?:\\.min)?\\.css",
+      "js": {
+        "awesomplete": ""
+      },
+      "script": "/awesomplete\\.js(?:$|\\?)",
+      "website": "https://leaverou.github.io/awesomplete/"
+    },
     "BEM": {
       "cats": [
-        "12"
+        12
       ],
       "html": "<[^>]+data-bem",
       "icon": "BEM.png",
@@ -932,7 +1051,7 @@
     },
     "BIGACE": {
       "cats": [
-        "1"
+        1
       ],
       "html": "(?:Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
       "icon": "BIGACE.png",
@@ -944,47 +1063,57 @@
     },
     "Bablic": {
       "cats": [
-        "3",
-        "9"
+        3,
+        9
       ],
-      "website": "https://www.bablic.com/",
+      "icon": "bablic.png",
       "js": {
         "bablic": ""
       },
-      "icon": "bablic.png"
+      "website": "https://www.bablic.com/"
     },
     "Backbone.js": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Backbone.js.png",
+      "implies": "Underscore.js",
       "js": {
         "Backbone": "",
-        "Backbone.VERSION": "(.*)\\;version:\\1"
+        "Backbone.VERSION": "^(.+)$\\;version:\\1"
       },
-      "icon": "Backbone.js.png",
-      "implies": "Underscore.js",
       "script": "backbone.*\\.js",
       "website": "http://backbonejs.org"
     },
     "Backdrop": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "Backdrop": ""
-      },
       "excludes": "Drupal",
       "icon": "Backdrop.png",
       "implies": "PHP",
+      "js": {
+        "Backdrop": ""
+      },
       "meta": {
         "generator": "Backdrop CMS(?: (\\d))?\\;version:\\1"
       },
       "website": "http://backdropcms.org"
     },
+    "Backtory": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "X-Powered-By": "Backtory"
+      },
+      "icon": "Backtory.svg",
+      "website": "https://backtory.com"
+    },
     "Banshee": {
       "cats": [
-        "1",
-        "18"
+        1,
+        18
       ],
       "html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(?:v([\\d.]+))?\\;version:\\1",
       "icon": "Banshee.png",
@@ -996,7 +1125,7 @@
     },
     "BaseHTTP": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "BaseHTTP\\/?([\\d\\.]+)?\\;version:\\1"
@@ -1007,7 +1136,7 @@
     },
     "BigDump": {
       "cats": [
-        "3"
+        3
       ],
       "html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\\. ([\\d.b]+)\\;version:\\1",
       "implies": [
@@ -1018,7 +1147,7 @@
     },
     "Bigcommerce": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<link href=[^>]+cdn\\d+\\.bigcommerce\\.com/",
       "icon": "Bigcommerce.png",
@@ -1028,10 +1157,11 @@
     },
     "Bigware": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "(?:bigwareCsid|bigWAdminID)"
+      "cookies": {
+        "bigWAdminID": "",
+        "bigwareCsid": ""
       },
       "html": "(?:Diese <a href=[^>]+bigware\\.de|<a href=[^>]+/main_bigware_\\d+\\.php)",
       "icon": "Bigware.png",
@@ -1041,29 +1171,29 @@
     },
     "BittAds": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "BittAds.png",
       "js": {
         "bitt": ""
       },
-      "icon": "BittAds.png",
       "script": "bittads\\.com/js/bitt\\.js$",
       "website": "http://bittads.com"
     },
     "Bizweb": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "bizweb.png",
       "js": {
         "Bizweb": ""
       },
-      "icon": "bizweb.png",
       "website": "https://www.bizweb.vn"
     },
     "Blade": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "X-Powered-By": "blade-([\\w.]+)?\\;version:\\1"
@@ -1074,17 +1204,17 @@
     },
     "Blesta": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "blesta_sid"
+      "cookies": {
+        "blesta_sid": ""
       },
       "icon": "Blesta.png",
       "website": "http://www.blesta.com"
     },
     "Blip.tv": {
       "cats": [
-        "14"
+        14
       ],
       "html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play",
       "icon": "Blip.tv.png",
@@ -1092,9 +1222,10 @@
     },
     "Blogger": {
       "cats": [
-        "11"
+        11
       ],
       "icon": "Blogger.png",
+      "implies": "Python",
       "meta": {
         "generator": "^Blogger$"
       },
@@ -1103,7 +1234,7 @@
     },
     "Bluefish": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "Bluefish.png",
       "meta": {
@@ -1113,7 +1244,7 @@
     },
     "Boa": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1"
@@ -1122,7 +1253,7 @@
     },
     "Boba.js": {
       "cats": [
-        "12"
+        59
       ],
       "implies": "Google Analytics",
       "script": "boba(?:\\.min)?\\.js",
@@ -1130,15 +1261,29 @@
     },
     "Bold Chat": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "BoldChat.png",
       "script": "^https?://vmss\\.boldchat\\.com/aid/\\d{18}/bc\\.vms4/vms\\.js",
       "website": "https://www.boldchat.com/"
     },
+    "BoldGrid": {
+      "cats": [
+        1,
+        11
+      ],
+      "html": [
+        "<link rel=[\"']stylesheet[\"'] [^>]+boldgrid",
+        "<link rel=[\"']stylesheet[\"'] [^>]+post-and-page-builder",
+        "<link[^>]+s\\d+\\.boldgrid\\.com"
+      ],
+      "script": "/wp-content/plugins/post-and-page-builder",
+      "implies": "WordPress",
+      "website": "https://boldgrid.com"
+    },
     "Bolt": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Bolt.png",
       "implies": "PHP",
@@ -1149,19 +1294,41 @@
     },
     "Bonfire": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "bf_session="
+      "cookies": {
+        "bf_session": ""
       },
       "html": "Powered by <a[^>]+href=\"https?://(?:www\\.)?cibonfire\\.com[^>]*>Bonfire v([^<]+)\\;version:\\1",
       "icon": "Bonfire.png",
       "implies": "CodeIgniter",
       "website": "http://cibonfire.com"
     },
+    "Bootstrap": {
+      "cats": [
+        18
+      ],
+      "html": [
+        "<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
+        "<link[^>]+?href=[^\"]/css/([\\d.]+)/bootstrap\\.(?:min\\.)?css\\;version:\\1",
+        "<link[^>]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css",
+        "<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
+      ],
+      "icon": "Bootstrap.png",
+      "js": {
+        "bootstrap.Alert.VERSION": "^(.+)$\\;version:\\1",
+        "jQuery.fn.tooltip.Constructor.VERSION": "^(.+)$\\;version:\\1"
+      },
+      "script": [
+        "twitter\\.github\\.com/bootstrap",
+        "bootstrap[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1"
+      ],
+      "website": "https://getbootstrap.com"
+    },
     "Bootstrap Table": {
       "cats": [
-        "12"
+        59
       ],
       "html": "<link[^>]+href=\"[^>]*bootstrap-table(?:\\.min)?\\.css",
       "icon": "Bootstrap Table.svg",
@@ -1174,30 +1341,40 @@
     },
     "Bounce Exchange": {
       "cats": [
-        "32"
+        32
       ],
+      "script": "^https?://tag\\.bounceexchange\\.com/",
+      "icon": "Bounce Exchange.svg",
       "js": {
         "bouncex": ""
       },
-      "html": "<script[^>]*>[^>]+\\.src\\s*=\\s*['\"](?:https?:)?//tag\\.bounceexchange\\.com/",
-      "icon": "Bounce Exchange.svg",
-      "script": "^https?://tag\\.bounceexchange\\.com/",
       "website": "http://www.bounceexchange.com"
     },
-    "Brother": {
+    "Braintree": {
       "cats": [
-        "40"
+        41
       ],
-      "html": [
-        "(?:<!--|<BR>)Copyright\\(C\\) [\\d-]+ Brother Industries",
-        "<TITLE>\n\\s*BROTHER "
+      "icon": "Braintree.svg",
+      "js": {
+        "Braintree": "",
+        "Braintree.version": "^(.+)$\\;version:\\1"
+      },
+      "website": "https://www.braintreepayments.com"
+    },
+    "Brightspot": {
+      "cats": [
+        1
       ],
-      "icon": "Brother.png",
-      "website": "http://www.brother.com"
+      "headers": {
+        "X-Powered-By": "^Brightspot$"
+      },
+      "icon": "Brightspot.svg",
+      "implies": "Java",
+      "website": "https://www.brightspot.com"
     },
     "BrowserCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "BrowserCMS.png",
       "implies": "Ruby",
@@ -1208,52 +1385,57 @@
     },
     "Bubble": {
       "cats": [
-        "1",
-        "3",
-        "18",
-        "22"
+        1,
+        3,
+        18,
+        22
       ],
-      "js": {
-        "appquery": ""
-      },
       "icon": "bubble.png",
       "implies": "Node.js",
-      "website": "http://bubble.is"
-    },
-    "BugSense": {
-      "cats": [
-        "10"
-      ],
       "js": {
-        "Bugsense": ""
+        "appquery": ""
       },
-      "icon": "BugSense.png",
-      "script": "bugsense\\.js",
-      "website": "http://bugsense.com"
+      "website": "http://bubble.is"
     },
     "BugSnag": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "BugSnag.png",
       "js": {
-        "Bugsnag": ""
+        "Bugsnag": "",
+        "bugsnag": "",
+        "bugsnagClient": ""
       },
-      "icon": "BugSnag.png",
-      "script": "bugsnag.*\\.js",
+      "script": "/bugsnag.*\\.js",
       "website": "http://bugsnag.com"
     },
     "Bugzilla": {
       "cats": [
-        "13"
+        13
       ],
-      "html": "href=\"enter_bug\\.cgi\">",
+      "html": [
+        "href=\"enter_bug\\.cgi\">",
+        "<main id=\"bugzilla-body\"",
+        "<a href=\"https?://www\\.bugzilla\\.org/docs/([0-9.]+)/[^>]+>Help<\\;version:\\1",
+        "<span id=\"information\" class=\"header_addl_info\">version ([\\d.]+)<\\;version:\\1"
+      ],
+      "cookies": {
+        "Bugzilla_login_request_cookie": ""
+      },
       "icon": "Bugzilla.png",
       "implies": "Perl",
+      "js": {
+        "BUGZILLA": ""
+      },
+      "meta": {
+        "generator": "Bugzilla ?([\\d.]+)?\\;version:\\1"
+      },
       "website": "http://www.bugzilla.org"
     },
     "Bulma": {
       "cats": [
-        "18"
+        18
       ],
       "html": "<link[^>]+?href=\"[^\"]+bulma(?:\\.min)?\\.css",
       "icon": "Bulma.png",
@@ -1261,7 +1443,7 @@
     },
     "Burning Board": {
       "cats": [
-        "2"
+        2
       ],
       "html": "<a href=\"[^>]+woltlab\\.com[^<]+<strong>Burning Board",
       "icon": "Burning Board.png",
@@ -1273,7 +1455,7 @@
     },
     "Business Catalyst": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<!-- BC_OBNW -->",
       "icon": "Business Catalyst.png",
@@ -1282,50 +1464,53 @@
     },
     "BuySellAds": {
       "cats": [
-        "36"
+        36
       ],
+      "script": "^https?://s\\d\\.buysellads\\.com/",
+      "icon": "BuySellAds.png",
       "js": {
         "_bsa": "",
-        "_bsap": "",
         "_bsaPRO": "",
+        "_bsap": "",
         "_bsap_serving_callback": ""
       },
-      "html": "<script[^>]*>[^<]+?bsa\\.src\\s*=\\s*['\"](?:https?:)?\\/{2}\\w\\d\\.buysellads\\.com\\/[\\w\\d\\/]+?bsa\\.js['\"]",
-      "icon": "BuySellAds.png",
-      "script": "^https?://s\\d\\.buysellads\\.com/",
       "website": "http://buysellads.com"
     },
-    "C++": {
+    "CDN77": {
       "cats": [
-        "27"
+        31
       ],
-      "icon": "C++.png",
-      "website": "http://isocpp.org"
+      "headers": {
+        "Server": "^CDN77-Turbo$"
+      },
+      "icon": "CDN77.png",
+      "website": "https://www.cdn77.com"
     },
     "CFML": {
       "cats": [
-        "27"
+        27
       ],
       "icon": "CFML.png",
       "website": "http://adobe.com/products/coldfusion-family.html"
     },
     "CKEditor": {
       "cats": [
-        "24"
+        24
       ],
+      "icon": "CKEditor.png",
       "js": {
         "CKEDITOR": "",
-        "CKEDITOR.version": "(.*)\\;version:\\1"
+        "CKEDITOR.version": "^(.+)$\\;version:\\1",
+        "CKEDITOR_BASEPATH": ""
       },
-      "icon": "CKEditor.png",
       "website": "http://ckeditor.com"
     },
     "CMS Made Simple": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "^CMSSESSID"
+      "cookies": {
+        "CMSSESSID": ""
       },
       "icon": "CMS Made Simple.png",
       "implies": "PHP",
@@ -1336,7 +1521,7 @@
     },
     "CMSimple": {
       "cats": [
-        "1"
+        1
       ],
       "implies": "PHP",
       "meta": {
@@ -1344,17 +1529,9 @@
       },
       "website": "http://www.cmsimple.org/en"
     },
-    "CO2Stats": {
-      "cats": [
-        "10"
-      ],
-      "html": "src=[^>]+co2stats\\.com/propres\\.php",
-      "icon": "CO2Stats.png",
-      "website": "http://co2stats.com"
-    },
     "CPG Dragonfly": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "^Dragonfly CMS"
@@ -1368,22 +1545,22 @@
     },
     "CS Cart": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "fn_compare_strings": ""
-      },
       "html": [
         "&nbsp;Powered by (?:<a href=[^>]+cs-cart\\.com|CS-Cart)",
         "\\.cm-noscript[^>]+</style>"
       ],
       "icon": "CS Cart.png",
       "implies": "PHP",
+      "js": {
+        "fn_compare_strings": ""
+      },
       "website": "http://www.cs-cart.com"
     },
     "CacheFly": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Server": "^CFS ",
@@ -1395,7 +1572,7 @@
     },
     "Caddy": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^Caddy$"
@@ -1406,10 +1583,10 @@
     },
     "CakePHP": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "cakephp="
+      "cookies": {
+        "cakephp": ""
       },
       "icon": "CakePHP.png",
       "implies": "PHP",
@@ -1418,51 +1595,33 @@
       },
       "website": "http://cakephp.org"
     },
-    "Canon": {
-      "cats": [
-        "40"
-      ],
-      "icon": "Canon.png",
-      "website": "http://www.canon.com"
-    },
-    "Canon HTTP Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Canon.png",
-      "implies": "Canon",
-      "website": "http://www.canon.com"
-    },
     "Captch Me": {
       "cats": [
-        "16",
-        "36"
+        16,
+        36
       ],
+      "icon": "Captch Me.svg",
       "js": {
         "Captchme": ""
       },
-      "icon": "Captch Me.svg",
       "script": "^https?://api\\.captchme\\.net/",
       "website": "http://captchme.com"
     },
     "Carbon Ads": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<[a-z]+ [^>]*id=\"carbonads-container\"",
+      "icon": "Carbon Ads.png",
       "js": {
         "_carbonads": ""
       },
-      "html": "<[a-z]+ [^>]*id=\"carbonads-container\"",
-      "icon": "Carbon Ads.png",
-      "script": "[^\\/]*\\/\\/(?:engine|srv)\\.carbonads\\.com\\/",
+      "script": "//(?:engine|srv)\\.carbonads\\.com\\/",
       "website": "http://carbonads.net"
     },
     "Cargo": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<link [^>]+Cargo feed",
       "icon": "Cargo.png",
@@ -1475,34 +1634,23 @@
     },
     "Catberry.js": {
       "cats": [
-        "12",
-        "18"
+        12,
+        18
       ],
-      "js": {
-        "catberry": "",
-        "catberry.version": "(.*)\\;version:\\1"
-      },
       "headers": {
         "X-Powered-By": "Catberry"
       },
       "icon": "Catberry.js.png",
       "implies": "Node.js",
-      "website": "http://catberry.org"
-    },
-    "Catwalk": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Catwalk\\/?([\\d\\.]+)?\\;version:\\1"
+      "js": {
+        "catberry": "",
+        "catberry.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Catwalk.png",
-      "implies": "Canon",
-      "website": "http://www.canon.com"
+      "website": "http://catberry.org"
     },
     "CentOS": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "CentOS",
@@ -1511,19 +1659,9 @@
       "icon": "CentOS.png",
       "website": "http://centos.org"
     },
-    "CenteHTTPd": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "CenteHTTPd(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "CenteHTTPd.png",
-      "website": "http://cente.jp/cente/app/HTTPdc.html"
-    },
     "Chameleon": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Chameleon.png",
       "implies": [
@@ -1537,7 +1675,7 @@
     },
     "Chamilo": {
       "cats": [
-        "21"
+        21
       ],
       "headers": {
         "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1"
@@ -1552,48 +1690,48 @@
     },
     "Chart.js": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "Chart.js.svg",
       "js": {
         "Chart": "\\;confidence:50",
+        "Chart.defaults.doughnut": "",
         "chart.ctx.bezierCurveTo": ""
       },
-      "icon": "Chart.js.svg",
       "script": [
-        "Chart(?:\\.bundle)?(?:\\.min)?\\.js\\;confidence:50",
+        "/Chart(?:\\.bundle)?(?:\\.min)?\\.js\\;confidence:75",
         "chartjs\\.org/dist/([\\d.]+(?:-[^/]+)?|master|latest)/Chart.*\\.js\\;version:\\1",
         "cdnjs\\.cloudflare\\.com/ajax/libs/Chart\\.js/([\\d.]+(?:-[^/]+)?)/Chart.*\\.js\\;version:\\1",
-        "cdn\\.jsdelivr\\.net/npm/chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1",
-        "cdn\\.jsdelivr\\.net/gh/chartjs/Chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1"
+        "cdn\\.jsdelivr\\.net/(?:npm|gh/chartjs)/chart\\.js@([\\d.]+(?:-[^/]+)?|latest)/dist/Chart.*\\.js\\;version:\\1"
       ],
-      "website": "http://www.chartjs.org"
+      "website": "https://www.chartjs.org"
     },
     "Chartbeat": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Chartbeat.png",
       "js": {
-        "_sf_endpt": "",
-        "_sf_async_config": ""
+        "_sf_async_config": "",
+        "_sf_endpt": ""
       },
-      "icon": "Chartbeat.png",
       "script": "chartbeat\\.js",
       "website": "http://chartbeat.com"
     },
     "Cherokee": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "Cherokee(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "^Cherokee(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "Cherokee.png",
       "website": "http://www.cherokee-project.com"
     },
     "CherryPy": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "Server": "CherryPy\\/?([\\d\\.]+)?\\;version:\\1"
@@ -1602,21 +1740,34 @@
       "implies": "Python",
       "website": "http://www.cherrypy.org"
     },
+    "Chevereto": {
+      "cats": [
+        7
+      ],
+      "meta": {
+        "generator": "^Chevereto ?([0-9.]+)?$\\;version:\\1"
+      },
+      "script": "/chevereto\\.js",
+      "html": "Powered by <a href=\"https?://chevereto\\.com\">",
+      "icon": "chevereto.png",
+      "implies": "PHP",
+      "website": "https://chevereto.com/"
+    },
     "Chitika": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Chitika.png",
       "js": {
         "ch_client": "",
         "ch_color_site_link": ""
       },
-      "icon": "Chitika.png",
       "script": "scripts\\.chitika\\.net/",
       "website": "http://chitika.com"
     },
     "Ckan": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "Access-Control-Allow-Headers": "X-CKAN-API-KEY",
@@ -1630,46 +1781,46 @@
         "PostgreSQL"
       ],
       "meta": {
-        "generator": ".*ckan.*"
+        "generator": "^ckan ?([0-9.]+)$\\;version:\\1"
       },
       "website": "http://ckan.org/"
     },
     "ClickHeat": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "ClickHeat.png",
+      "implies": "PHP",
       "js": {
         "clickHeatServer": ""
       },
-      "icon": "ClickHeat.png",
-      "implies": "PHP",
       "script": "clickheat.*\\.js",
       "website": "http://www.labsmedia.com/clickheat/index.html"
     },
     "ClickTale": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "ClickTale.png",
       "js": {
         "clickTaleStartEventSignal": ""
       },
-      "icon": "ClickTale.png",
       "website": "http://www.clicktale.com"
     },
     "Clicky": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Clicky.png",
       "js": {
         "clicky": ""
       },
-      "icon": "Clicky.png",
       "script": "static\\.getclicky\\.com",
       "website": "http://getclicky.com"
     },
     "Clientexec": {
       "cats": [
-        "6"
+        6
       ],
       "html": "clientexec\\.[^>]*\\s?=\\s?[^>]*;",
       "icon": "Clientexec.png",
@@ -1677,15 +1828,15 @@
     },
     "Clipboard.js": {
       "cats": [
-        "19"
+        19
       ],
       "icon": "Clipboard.js.svg",
-      "script": "clipboard(?:\\.min)?\\.js",
+      "script": "clipboard(?:-([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://clipboardjs.com/"
     },
     "CloudCart": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "cloudcart.svg",
       "meta": {
@@ -1694,32 +1845,37 @@
       "script": "/cloudcart-(?:assets|storage)/",
       "website": "http://cloudcart.com"
     },
-    "Cloudcoins": {
+    "CloudFlare": {
       "cats": [
-        "56"
+        31
       ],
+      "headers": {
+        "Server": "^cloudflare$",
+        "cf-cache-status": "",
+        "cf-ray": ""
+      },
+      "icon": "CloudFlare.svg",
+      "cookies": {
+        "__cfduid": ""
+      },
       "js": {
-        "CLOUDCOINS": ""
+        "CloudFlare": ""
       },
-      "script": "https?://cdn\\.cloudcoins\\.co/javascript/cloudcoins\\.min\\.js",
-      "website": "https://cloudcoins.co"
+      "website": "http://www.cloudflare.com"
     },
-    "CloudFlare": {
+    "Cloudcoins": {
       "cats": [
-        "31"
+        56
       ],
       "js": {
-        "CloudFlare": ""
-      },
-      "headers": {
-        "Server": "cloudflare"
+        "CLOUDCOINS": ""
       },
-      "icon": "CloudFlare.svg",
-      "website": "http://www.cloudflare.com"
+      "script": "https?://cdn\\.cloudcoins\\.co/javascript/cloudcoins\\.min\\.js",
+      "website": "https://cloudcoins.co"
     },
     "Cloudera": {
       "cats": [
-        "34"
+        34
       ],
       "headers": {
         "Server": "cloudera"
@@ -1727,12 +1883,26 @@
       "icon": "Cloudera.png",
       "website": "http://www.cloudera.com"
     },
+    "Coaster CMS": {
+      "cats": [
+        1
+      ],
+      "icon": "coaster-cms.png",
+      "implies": "Laravel",
+      "meta": {
+        "generator": "^Coaster CMS v([\\d.]+)$\\;version:\\1"
+      },
+      "website": "https://www.coastercms.org"
+    },
     "CodeIgniter": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_(?:session|(csrf_token)))\\;version:\\1?2+:"
+      "cookies": {
+        "ci_csrf_token": "^(.+)$\\;version:\\1?2+:",
+        "ci_session": "",
+        "exp_last_activity": "",
+        "exp_tracker": ""
       },
       "html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
       "icon": "CodeIgniter.png",
@@ -1741,70 +1911,94 @@
     },
     "CodeMirror": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "CodeMirror.png",
       "js": {
         "CodeMirror": "",
-        "CodeMirror.version": "(.*)\\;version:\\1"
+        "CodeMirror.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "CodeMirror.png",
       "website": "http://codemirror.net"
     },
     "CoinHive": {
       "cats": [
-        "56"
+        56
       ],
+      "icon": "CoinHive.svg",
       "js": {
         "CoinHive": ""
       },
-      "script": "\\/(?:coinhive|(authedmine))(?:\\.min)?\\.js\\;version:\\1?opt-in:",
+      "script": [
+        "\\/(?:coinhive|(authedmine))(?:\\.min)?\\.js\\;version:\\1?opt-in:",
+        "coinhive\\.com/lib"
+      ],
       "url": "https?://cnhv\\.co/",
-      "icon": "CoinHive.svg",
       "website": "https://coinhive.com"
     },
     "CoinHive Captcha": {
       "cats": [
-        "16",
-        "56"
+        16,
+        56
       ],
       "html": "(?:<div[^>]+class=\"coinhive-captcha[^>]+data-key|<div[^>]+data-key[^>]+class=\"coinhive-captcha)",
-      "script": "https?://authedmine\\.com/(?:lib/captcha|captcha)",
       "icon": "CoinHive.svg",
+      "script": "https?://authedmine\\.com/(?:lib/captcha|captcha)",
       "website": "https://coinhive.com"
     },
+    "Coinhave": {
+      "cats": [
+        56
+      ],
+      "icon": "coinhave.png",
+      "script": "https?://coin-have\\.com/c/[0-9a-zA-Z]{4}\\.js",
+      "website": "https://coin-have.com/"
+    },
     "Coinimp": {
       "cats": [
-        "56"
+        56
       ],
-      "script": "https?://www\\.hashing\\.win/scripts/min\\.js",
       "icon": "coinimp.png",
+      "js": {
+        "Client.Anonymous": "\\;confidence:50"
+      },
+      "script": "https?://www\\.hashing\\.win/scripts/min\\.js",
       "website": "https://www.coinimp.com"
     },
     "Coinlab": {
       "cats": [
-        "56"
+        56
       ],
+      "icon": "coinlab.png",
       "js": {
         "Coinlab": ""
       },
       "script": "https?://coinlab\\.biz/lib/coinlab\\.js\\?id=",
-      "icon": "coinlab.png",
       "website": "https://coinlab.biz/en"
     },
-    "Comandia": {
+    "ColorMeShop": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "colormeshop.png",
       "js": {
-        "Comandia": ""
+        "Colorme": ""
       },
+      "website": "https://shop-pro.jp"
+    },
+    "Comandia": {
+      "cats": [
+        6
+      ],
       "html": "<link[^>]+=['\"]//cdn\\.mycomandia\\.com",
       "icon": "Comandia.svg",
+      "js": {
+        "Comandia": ""
+      },
       "website": "http://comandia.com"
     },
     "Commerce Server": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "COMMERCE-SERVER-SOFTWARE": ""
@@ -1815,7 +2009,7 @@
     },
     "CompaqHTTPServer": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1"
@@ -1825,22 +2019,25 @@
     },
     "Concrete5": {
       "cats": [
-        "1"
+        1
       ],
+      "icon": "Concrete5.png",
+      "implies": "PHP",
       "js": {
         "CCM_IMAGE_PATH": ""
       },
-      "icon": "Concrete5.png",
-      "implies": "PHP",
+      "cookies": {
+        "CONCRETE5": ""
+      },
       "meta": {
-        "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1"
+        "generator": "^concrete5 - ([\\d.]+)$\\;version:\\1"
       },
-      "script": "concrete/js/",
-      "website": "http://concrete5.org"
+      "script": "/concrete/js/",
+      "website": "https://concrete5.org"
     },
     "Connect": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "^Connect$"
@@ -1851,7 +2048,7 @@
     },
     "Contao": {
       "cats": [
-        "1"
+        1
       ],
       "html": [
         "<!--[^>]+powered by (?:TYPOlight|Contao)[^>]*-->",
@@ -1866,7 +2063,7 @@
     },
     "Contenido": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Contenido.png",
       "implies": "PHP",
@@ -1875,11 +2072,11 @@
       },
       "website": "http://contenido.org/en"
     },
-    "Contens": {
+    "Contensis": {
       "cats": [
-        "1"
+        1
       ],
-      "icon": "Contens.png",
+      "icon": "Contensis.png",
       "implies": [
         "Java",
         "CFML"
@@ -1887,12 +2084,12 @@
       "meta": {
         "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1"
       },
-      "website": "http://www.contens.com/en/pub/index.cfm"
+      "website": "https://zengenti.com/en-gb/products/contensis"
     },
     "ContentBox": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
       "icon": "ContentBox.png",
       "implies": "Adobe ColdFusion",
@@ -1903,15 +2100,15 @@
     },
     "Contentful": {
       "cats": [
-        "1"
+        1
       ],
-      "html": "<[^>]+(?:https?:)?//(?:assets|downloads|images|videos)\\.contentful\\.com",
+      "html": "<[^>]+(?:https?:)?//(?:assets|downloads|images|videos)\\.(?:ct?fassets\\.net|contentful\\.com)",
       "icon": "Contentful.svg",
       "website": "http://www.contentful.com"
     },
     "ConversionLab": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "ConversionLab.png",
       "script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
@@ -1919,7 +2116,7 @@
     },
     "Coppermine": {
       "cats": [
-        "7"
+        7
       ],
       "html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
       "icon": "Coppermine.png",
@@ -1928,7 +2125,7 @@
     },
     "Cosmoshop": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Cosmoshop.png",
       "script": "cosmoshop_functions\\.js",
@@ -1936,7 +2133,7 @@
     },
     "Cotonti": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Cotonti.png",
       "implies": "PHP",
@@ -1947,7 +2144,7 @@
     },
     "CouchDB": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "CouchDB/([\\d.]+)\\;version:\\1"
@@ -1957,11 +2154,11 @@
     },
     "Cowboy": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
-        "Server": "Cowboy"
+        "Server": "^Cowboy$"
       },
       "icon": "Cowboy.png",
       "implies": "Erlang",
@@ -1969,7 +2166,7 @@
     },
     "CppCMS": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "^CppCMS/([\\d.]+)$\\;version:\\1"
@@ -1980,66 +2177,87 @@
     },
     "Craft CMS": {
       "cats": [
-        "1"
+        1
       ],
+      "cookies": {
+        "CraftSessionId": ""
+      },
       "headers": {
-        "Set-Cookie": "^CraftSessionId=",
-        "X-Powered-By": "^Craft CMS$"
+        "X-Powered-By": "\\bCraft CMS\\b"
       },
       "icon": "Craft CMS.svg",
       "implies": "Yii",
       "website": "https://craftcms.com"
     },
+    "Craft Commerce": {
+      "cats": [
+        6
+      ],
+      "headers": {
+        "X-Powered-By": "\\bCraft Commerce\\b"
+      },
+      "icon": "Craft CMS.svg",
+      "implies": "Craft CMS",
+      "website": "https://craftcommerce.com"
+    },
     "Crazy Egg": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Crazy Egg.png",
       "js": {
         "CE2": ""
       },
-      "icon": "Crazy Egg.png",
       "script": "script\\.crazyegg\\.com/pages/scripts/\\d+/\\d+\\.js",
       "website": "http://crazyegg.com"
     },
     "Criteo": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Criteo.svg",
       "js": {
         "Criteo": "",
         "criteo_pubtag": "",
         "criteo_q": ""
       },
-      "icon": "Criteo.svg",
-      "script": "[^/]*//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
+      "script": [
+        "//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
+        "//static.criteo.net/js/ld/ld.js"
+      ],
       "website": "http://criteo.com"
     },
     "Cross Pixel": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Cross Pixel.png",
       "js": {
         "cp_C4w1ldN2d9PmVrkN": ""
       },
-      "icon": "Cross Pixel.png",
       "script": "tag\\.crsspxl\\.com/s1\\.js",
       "website": "http://datadesk.crsspxl.com"
     },
     "Crypto-Loot": {
       "cats": [
-        "56"
+        56
       ],
+      "icon": "Crypto-Loot.png",
       "js": {
-        "CryptoLoot": "",
-        "CRLT.CONFIG.ASMJS_NAME": ""
+        "CRLT.CONFIG.ASMJS_NAME": "",
+        "CryptoLoot": ""
       },
-      "script": "^(?:https):?//crypto-loot\\.com/lib/",
-      "icon": "Crypto-Loot.png",
+      "script": [
+        "^/crypto-loot\\.com/lib/",
+        "^/webmine\\.pro/",
+        "^/cryptoloot\\.pro/",
+        "/crlt\\.js\\;confidence:75"
+      ],
       "website": "https://crypto-loot.com/"
     },
     "CubeCart": {
       "cats": [
-        "6"
+        6
       ],
       "html": "(?:Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
       "icon": "CubeCart.png",
@@ -2051,30 +2269,29 @@
     },
     "Cufon": {
       "cats": [
-        "17"
+        17
       ],
+      "icon": "Cufon.png",
       "js": {
         "Cufon": ""
       },
-      "icon": "Cufon.png",
       "script": "cufon-yui\\.js",
       "website": "http://cufon.shoqolate.com"
     },
     "D3": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "D3.png",
       "js": {
-        "d3": "\\;confidence:20",
-        "d3.version": "(.*)\\;version:\\1"
+        "d3.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "D3.png",
       "script": "/d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
       "website": "http://d3js.org"
     },
     "DHTMLX": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "DHTMLX.png",
       "script": "dhtmlxcommon\\.js",
@@ -2082,7 +2299,7 @@
     },
     "DM Polopoly": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<(?:link [^>]*href|img [^>]*src)=\"/polopoly_fs/",
       "icon": "DM Polopoly.png",
@@ -2091,16 +2308,14 @@
     },
     "DNN": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "DotNetNuke": "",
-        "dnn.apiversion": "(.*)\\;version:\\1"
+      "cookies": {
+        "DotNetNukeAnonymous": ""
       },
       "headers": {
         "Cookie": "dnn_IsMobile=",
         "DNNOutputCache": "",
-        "Set-Cookie": "DotNetNukeAnonymous=",
         "X-Compressed-By": "DotNetNuke"
       },
       "html": [
@@ -2109,6 +2324,10 @@
       ],
       "icon": "DNN.png",
       "implies": "Microsoft ASP.NET",
+      "js": {
+        "DotNetNuke": "",
+        "dnn.apiversion": "^(.+)$\\;version:\\1"
+      },
       "meta": {
         "generator": "DotNetNuke"
       },
@@ -2120,18 +2339,18 @@
     },
     "DTG": {
       "cats": [
-        "1"
+        1
       ],
       "html": [
         "<a[^>]+Site Powered by DTG"
       ],
       "icon": "DTG.png",
       "implies": "Mono.net",
-      "website": "http://www.dtg.nl"
+      "website": "https://www.dtg.nl"
     },
     "Dancer": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "Server": "Perl Dancer ([\\d.]+)\\;version:\\1",
@@ -2143,7 +2362,7 @@
     },
     "Danneo CMS": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1"
@@ -2158,131 +2377,116 @@
       },
       "website": "http://danneo.com"
     },
+    "Dart": {
+      "cats": [
+        27
+      ],
+      "excludes": [
+        "Angular",
+        "AngularJS"
+      ],
+      "html": "/(?:<script)[^>]+(?:type=\"application/dart\")/",
+      "icon": "Dart.svg",
+      "implies": "AngularDart",
+      "js": {
+        "___dart__$dart_dartObject_ZxYxX_0_": "",
+        "___dart_dispatch_record_ZxYxX_0_": ""
+      },
+      "script": [
+        "/(?:\\.)?(?:dart)(?:\\.js)?/",
+        "packages/browser/dart\\.js"
+      ],
+      "website": "https://www.dartlang.org"
+    },
     "Darwin": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Darwin",
         "X-Powered-By": "Darwin"
       },
       "icon": "Apple.svg",
-      "website": "http://opensource.apple.com"
+      "website": "https://opensource.apple.com"
     },
-    "DataLife Engine": {
+    "Datadome": {
       "cats": [
-        "1"
+        19
       ],
-      "js": {
-        "dle_root": ""
+      "cookies": {
+        "datadome": ""
       },
+      "script": "^https://ct\\.datadome\\.co/[a-z]\\.js$",
+      "headers": {
+        "X-DataDome": "",
+        "Server": "^DataDome$",
+        "X-DataDome-CID": ""
+      },
+      "icon": "datadome.png",
+      "website": "https://datadome.co/"
+    },
+    "DataLife Engine": {
+      "cats": [
+        1
+      ],
       "icon": "DataLife Engine.png",
       "implies": [
         "PHP",
         "Apache"
       ],
+      "js": {
+        "dle_root": ""
+      },
       "meta": {
         "generator": "DataLife Engine"
       },
-      "website": "http://dle-news.ru"
+      "website": "https://dle-news.ru"
     },
     "DataTables": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "DataTables.png",
       "implies": "jQuery",
       "script": "dataTables.*\\.js",
       "website": "http://datatables.net"
     },
-    "David Webbox": {
+    "Day.js": {
       "cats": [
-        "22"
+        59
       ],
-      "headers": {
-        "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1"
+      "icon": "Day.js.svg",
+      "js": {
+        "dayjs": ""
       },
-      "icon": "David Webbox.png",
-      "website": "http://www.tobit.com"
+      "website": "https://github.com/iamkun/dayjs"
     },
     "Debian": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Debian",
-        "X-Powered-By": "(?:Debian|dotdeb|(potato|woody|sarge|etch|lenny|squeeze|wheezy|jessie|stretch|sid))\\;version:\\1"
+        "X-Powered-By": "(?:Debian|dotdeb|(potato|woody|sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster|sid))\\;version:\\1"
       },
       "icon": "Debian.png",
-      "website": "http://debian.org"
-    },
-    "PHPDebugBar": {
-      "cats": [
-        "47"
-      ],
-      "js": {
-        "phpdebugbar": "",
-        "PhpDebugBar": ""
-      },
-      "script": [
-        "debugbar.*\\.js"
-      ],
-      "icon": "phpdebugbar.png",
-      "website": "http://phpdebugbar.com/"
-    },
-    "Decorum": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
+      "website": "https://debian.org"
     },
     "DedeCMS": {
       "cats": [
-        "1"
+        1
       ],
+      "icon": "DedeCMS.png",
+      "implies": "PHP",
       "js": {
         "DedeContainer": ""
       },
-      "icon": "DedeCMS.png",
-      "implies": "PHP",
       "script": "dedeajax",
       "website": "http://dedecms.com"
     },
-    "deepMiner": {
-      "cats": [
-        "56"
-      ],
-      "js": {
-        "deepMiner": ""
-      },
-      "script": "deepMiner\\.js",
-      "icon": "deepminer.png",
-      "website": "https://github.com/deepwn/deepMiner"
-    },
-    "Dell": {
-      "cats": [
-        "40"
-      ],
-      "icon": "Dell.svg",
-      "website": "http://dell.com"
-    },
-    "Deployd": {
-      "cats": [
-        "12"
-      ],
-      "js": {
-        "dpd": ""
-      },
-      "icon": "Deployd.png",
-      "script": "dpd\\.js",
-      "website": "http://deployd.com"
-    },
     "DirectAdmin": {
       "cats": [
-        "9"
+        9
       ],
       "headers": {
         "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1"
@@ -2293,87 +2497,114 @@
         "PHP",
         "Apache"
       ],
-      "website": "http://www.directadmin.com"
+      "website": "https://www.directadmin.com"
     },
     "Discourse": {
       "cats": [
-        "2"
+        2
       ],
+      "icon": "Discourse.png",
+      "implies": "Ruby on Rails",
       "js": {
         "Discourse": ""
       },
-      "icon": "Discourse.png",
-      "implies": "Ruby on Rails",
       "meta": {
         "generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1"
       },
-      "website": "http://discourse.org"
+      "website": "https://discourse.org"
     },
     "Discuz! X": {
       "cats": [
-        "2"
+        2
       ],
-      "js": {
-        "discuz_uid": "",
-        "discuzVersion": "(.*)\\;version:\\1",
-        "DISCUZCODE": ""
-      },
       "icon": "Discuz X.png",
       "implies": "PHP",
+      "js": {
+        "DISCUZCODE": "",
+        "discuzVersion": "^(.+)$\\;version:\\1",
+        "discuz_uid": ""
+      },
       "meta": {
         "generator": "Discuz! X([\\d\\.]+)?\\;version:\\1"
       },
-      "website": "http://discuz.com"
+      "website": "http://www.discuz.net"
     },
     "Disqus": {
       "cats": [
-        "15"
+        15
       ],
+      "html": "<div[^>]+id=\"disqus_thread\"",
+      "icon": "Disqus.svg",
       "js": {
         "DISQUS": "",
+        "disqus_shortname": "",
         "disqus_url": ""
       },
-      "html": "<div[^>]+id=\"disqus_thread\"",
-      "icon": "Disqus.svg",
       "script": "disqus_url",
-      "website": "http://disqus.com"
+      "website": "https://disqus.com"
     },
     "Django": {
       "cats": [
-        "18"
+        18
       ],
-      "js": {
-        "django": "",
-        "__admin_media_prefix__": ""
-      },
-      "html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?|<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>)\\;version:\\1",
+      "html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?<\\/a>|<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>)\\;version:\\1",
       "icon": "Django.png",
       "implies": "Python",
-      "website": "http://djangoproject.com"
+      "js": {
+        "__admin_media_prefix__": "",
+        "django": ""
+      },
+      "website": "https://djangoproject.com"
     },
     "Django CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Django CMS.png",
       "implies": "Django",
-      "website": "http://django-cms.org"
+      "website": "https://django-cms.org"
+    },
+    "Docusaurus": {
+      "cats": [
+        4
+      ],
+      "icon": "docusaurus.svg",
+      "implies": [
+        "React",
+        "webpack"
+      ],
+      "js": {
+        "search.indexName": ""
+      },
+      "meta": {
+        "generator": "^Docusaurus$"
+      },
+      "website": "https://docusaurus.io/"
+    },
+    "Docker": {
+      "cats": [
+        60
+      ],
+      "icon": "Docker.svg",
+      "implies": "Linux",
+      "html": "<!-- This comment is expected by the docker HEALTHCHECK  -->",
+      "website": "https://www.docker.com/"
     },
     "Dojo": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Dojo.png",
       "js": {
         "dojo": "",
-        "dojo.version.major": "(.*)\\;version:\\1"
+        "dojo.version.major": "^(.+)$\\;version:\\1"
       },
-      "icon": "Dojo.png",
       "script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
-      "website": "http://dojotoolkit.org"
+      "website": "https://dojotoolkit.org"
     },
     "Dokeos": {
       "cats": [
-        "21"
+        21
       ],
       "headers": {
         "X-Powered-By": "Dokeos"
@@ -2389,25 +2620,29 @@
       "meta": {
         "generator": "Dokeos"
       },
-      "website": "http://dokeos.com"
+      "website": "https://dokeos.com"
     },
     "DokuWiki": {
       "cats": [
-        "8"
+        8
       ],
-      "headers": {
-        "Set-Cookie": "^DokuWiki="
+      "cookies": {
+        "DokuWiki": ""
       },
+      "html": [
+        "<div[^>]+id=\"dokuwiki__>",
+        "<a[^>]+href=\"#dokuwiki__"
+      ],
       "icon": "DokuWiki.png",
       "implies": "PHP",
       "meta": {
-        "generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
+        "generator": "^DokuWiki( Release [\\d-]+)?\\;version:\\1"
       },
-      "website": "http://www.dokuwiki.org"
+      "website": "https://www.dokuwiki.org"
     },
     "Dotclear": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Dotclear-Static-Cache": ""
@@ -2418,7 +2653,7 @@
     },
     "DoubleClick Ad Exchange (AdX)": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "DoubleClick.svg",
       "script": [
@@ -2430,7 +2665,7 @@
     },
     "DoubleClick Campaign Manager (DCM)": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "DoubleClick.svg",
       "script": "2mdn\\.net",
@@ -2438,7 +2673,7 @@
     },
     "DoubleClick Floodlight": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "DoubleClick.svg",
       "script": "https?://fls\\.doubleclick\\.net",
@@ -2446,7 +2681,7 @@
     },
     "DoubleClick for Publishers (DFP)": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "DoubleClick.svg",
       "script": "googletagservices\\.com/tag/js/gpt(?:_mobile)?\\.js",
@@ -2454,7 +2689,7 @@
     },
     "DovetailWRP": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<link[^>]* href=\"\\/DovetailWRP\\/",
       "icon": "DovetailWRP.png",
@@ -2464,7 +2699,7 @@
     },
     "Doxygen": {
       "cats": [
-        "4"
+        4
       ],
       "html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen\\.css)\\;version:\\1",
       "icon": "Doxygen.png",
@@ -2475,36 +2710,41 @@
     },
     "DreamWeaver": {
       "cats": [
-        "20"
+        20
       ],
-      "html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1",
+      "html": "<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)\\;version:\\1",
+      "js": {
+        "MM_showMenu": "",
+        "MM_preloadImages": "",
+        "MM_showHideLayers": ""
+      },
       "icon": "DreamWeaver.png",
-      "website": "http://www.adobe.com/products/dreamweaver"
+      "website": "https://www.adobe.com/products/dreamweaver.html"
     },
     "Drupal": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "Drupal": ""
-      },
       "headers": {
         "Expires": "19 Nov 1978",
         "X-Drupal-Cache": "",
-        "X-Generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1"
+        "X-Generator": "^Drupal(?:\\s([\\d.]+))?\\;version:\\1"
       },
-      "html": "<(?:link|style)[^>]+sites/(?:default|all)/(?:themes|modules)/",
-      "icon": "Drupal.png",
+      "html": "<(?:link|style)[^>]+\"/sites/(?:default|all)/(?:themes|modules)/",
+      "icon": "Drupal.svg",
       "implies": "PHP",
+      "js": {
+        "Drupal": ""
+      },
       "meta": {
-        "generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1"
+        "generator": "^Drupal(?:\\s([\\d.]+))?\\;version:\\1"
       },
       "script": "drupal\\.js",
-      "website": "http://drupal.org"
+      "website": "https://drupal.org"
     },
     "Drupal Commerce": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<[^>]+(?:id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
       "icon": "Drupal Commerce.png",
@@ -2513,12 +2753,12 @@
     },
     "Dynamicweb": {
       "cats": [
-        "1",
-        "6",
-        "10"
+        1,
+        6,
+        10
       ],
-      "headers": {
-        "Set-Cookie": "Dynamicweb="
+      "cookies": {
+        "Dynamicweb": ""
       },
       "icon": "Dynamicweb.png",
       "implies": "Microsoft ASP.NET",
@@ -2529,31 +2769,32 @@
     },
     "Dynatrace": {
       "cats": [
-        "10"
+        10
       ],
+      "headers": {
+        "X-dynaTrace-JS-Agent": ""
+      },
       "icon": "Dynatrace.png",
       "script": "dtagent.*\\.js",
       "website": "http://dynatrace.com"
     },
-    "E-Commerce Paraguay": {
+    "EasyEngine": {
       "cats": [
-        "6"
+        47,
+        9
       ],
-      "icon": "eCommercePy.png",
-      "script": "cdn\\.e-commerceparaguay\\.com",
-      "website": "http://e-commerceparaguay.com"
-    },
-    "E-Merchant": {
-      "cats": [
-        "6"
+      "icon": "EasyEngine.png",
+      "implies": [
+        "Docker"
       ],
-      "icon": "E-Merchant.png",
-      "script": "cdn\\.e-merchant\\.com",
-      "website": "http://e-merchant.com"
+      "headers": {
+        "x-powered-by": "^EasyEngine (.*)$\\;version:\\1"
+      },
+      "website": "https://easyengine.io"
     },
     "EC-CUBE": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "ec-cube.png",
       "implies": "PHP",
@@ -2563,22 +2804,29 @@
       ],
       "website": "http://www.ec-cube.net"
     },
-    "ef.js": {
+    "Elementor": {
       "cats": [
-        "12"
+        1,
+        11,
+        51
+      ],
+      "html": [
+        "<div class=(?:\"|')[^\"']*elementor",
+        "<section class=(?:\"|')[^\"']*elementor",
+        "<link [^>]*href=(?:\"|')[^\"']*elementor/assets",
+        "<link [^>]*href=(?:\"|')[^\"']*uploads/elementor/css"
       ],
-      "icon": "ef.js.svg",
       "js": {
-        "ef": "\\;confidence:20",
-        "ef.version": "(.*)\\;version:\\1",
-        "efCore": ""
+        "elementorFrontend.getElements": ""
       },
-      "script": "/ef(?:-core)?(?:\\.min|\\.dev)?\\.js",
-      "website": "http://ef.js.org"
+      "script": "elementor/assets/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
+      "icon": "Elementor.png",
+      "implies": "WordPress",
+      "website": "https://elementor.com"
     },
     "ELOG": {
       "cats": [
-        "19"
+        19
       ],
       "html": "<title>ELOG Logbook Selection</title>",
       "icon": "ELOG.png",
@@ -2586,10 +2834,10 @@
     },
     "ELOG HTTP": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1"
+        "Server": "ELOG HTTP ?([\\d.-]+)?\\;version:\\1"
       },
       "icon": "ELOG.png",
       "implies": "ELOG",
@@ -2597,7 +2845,7 @@
     },
     "EPages": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Powered-By": "epages 6"
@@ -2608,10 +2856,11 @@
     },
     "EPiServer": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "EPi(?:Trace|Server)[^;]*="
+      "cookies": {
+        "EPiServer": "",
+        "EPiTrace": ""
       },
       "icon": "EPiServer.png",
       "implies": "Microsoft ASP.NET",
@@ -2622,43 +2871,22 @@
     },
     "EPrints": {
       "cats": [
-        "19"
+        19
       ],
-      "js": {
-        "EPrints": "",
-        "EPJS_menu_template": ""
-      },
       "icon": "EPrints.png",
       "implies": "Perl",
+      "js": {
+        "EPJS_menu_template": "",
+        "EPrints": ""
+      },
       "meta": {
         "generator": "EPrints ([\\d.]+)\\;version:\\1"
       },
       "website": "http://www.eprints.org"
     },
-    "ESERV-10": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "ESERV-10(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "ESERV-10.png",
-      "website": "http://www.violasystems.com"
-    },
-    "EWS-NIC4": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "EWS-NIC4(?:\\/([\\d\\.a-z]+))?\\;version:\\1"
-      },
-      "icon": "EWS-NIC4.png",
-      "implies": "Dell",
-      "website": "http://dell.com"
-    },
     "EdgeCast": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Server": "^ECD\\s\\(\\S+\\)"
@@ -2669,7 +2897,7 @@
     },
     "Elcodi": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Elcodi": ""
@@ -2683,7 +2911,7 @@
     },
     "Eleanor CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Eleanor CMS.png",
       "implies": "PHP",
@@ -2692,23 +2920,36 @@
       },
       "website": "http://eleanor-cms.ru"
     },
+    "Element UI": {
+      "cats": [
+        12
+      ],
+      "icon": "ElementUI.svg",
+      "implies": [
+				"Vue"
+			],
+			"html": [
+				"<(?:div|button) class=\"el-(?:table-column|table-filter|popper|pagination|pager|select-group|form|form-item|color-predefine|color-hue-slider|color-svpanel|color-alpha-slider|color-dropdown|color-picker|badge|tree|tree-node|select|message|dialog|checkbox|checkbox-button|checkbox-group|container|steps|carousel|menu|menu-item|submenu|menu-item-group|button|button-group|card|table|select-dropdown|row|tabs|notification|radio|progress|progress-bar|tag|popover|tooltip|cascader|cascader-menus|cascader-menu|time-spinner|spinner|spinner-inner|transfer|transfer-panel|rate|slider|dropdown|dropdown-menu|textarea|input|input-group|popup-parent|radio-group|main|breadcrumb|time-range-picker|date-range-picker|year-table|date-editor|range-editor|time-spinner|date-picker|time-panel|date-table|month-table|picker-panel|collapse|collapse-item|alert|select-dropdown|select-dropdown__empty|select-dropdown__wrap|select-dropdown__list|scrollbar|switch|carousel|upload|upload-dragger|upload-list|upload-cover|aside|input-number|header|message-box|footer|radio-button|step|autocomplete|autocomplete-suggestion|loading-parent|loading-mask|loading-spinner|)"
+			],
+      "website": "https://element.eleme.io/"
+    },
     "Eloqua": {
       "cats": [
-        "32"
+        32
       ],
+      "icon": "Oracle.png",
       "js": {
-        "elqSiteID": "",
-        "elqLoad": "",
         "elqCurESite": "",
+        "elqLoad": "",
+        "elqSiteID": "",
         "elq_global": ""
       },
-      "icon": "Oracle.png",
       "script": "elqCfg\\.js",
       "website": "http://eloqua.com"
     },
     "EmbedThis Appweb": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Mbedthis-Appweb(?:/([\\d.]+))?\\;version:\\1"
@@ -2716,114 +2957,113 @@
       "icon": "Embedthis.png",
       "website": "http://embedthis.com/appweb"
     },
-    "Embedthis-http": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Embedthis-http(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Embedthis.png",
-      "website": "http://github.com/embedthis/http"
-    },
     "Ember.js": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Ember.js.png",
+      "implies": "Handlebars",
       "js": {
         "Ember": "",
-        "Ember.VERSION": "(.*)\\;version:\\1"
+        "Ember.VERSION": "^(.+)$\\;version:\\1"
       },
-      "icon": "Ember.js.png",
-      "implies": "Handlebars",
       "website": "http://emberjs.com"
     },
+    "Ensighten": {
+      "cats": [
+        42
+      ],
+      "script": "//nexus\\.ensighten\\.com/",
+      "icon": "ensighten.png",
+      "website": "https://success.ensighten.com/hc/en-us"
+    },
+    "Envoy": {
+      "cats": [
+        22
+      ],
+      "icon": "Envoy.png",
+      "headers": {
+        "Server": "^envoy$",
+        "x-envoy-upstream-service-time" : ""
+      },
+      "website": "https://www.envoyproxy.io/"
+    },
     "Enyo": {
       "cats": [
-        "12",
-        "26"
+        12,
+        26
       ],
+      "icon": "Enyo.png",
       "js": {
         "enyo": ""
       },
-      "icon": "Enyo.png",
       "script": "enyo\\.js",
       "website": "http://enyojs.com"
     },
     "Epoch": {
       "cats": [
-        "25"
+        25
       ],
       "html": "<link[^>]+?href=\"[^\"]+epoch(?:\\.min)?\\.css",
       "implies": "D3",
       "script": "epoch(?:\\.min)?\\.js",
-      "website": "http://fastly.github.io/epoch"
+      "website": "https://fastly.github.io/epoch"
     },
     "Epom": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Epom.png",
       "js": {
         "epomCustomParams": ""
       },
-      "icon": "Epom.png",
       "url": "^https?://(?:[^/]+\\.)?ad(?:op)?shost1\\.com/",
       "website": "http://epom.com"
     },
     "Erlang": {
       "cats": [
-        "27"
+        27
       ],
       "headers": {
-        "Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
+        "Server": "Erlang( OTP/(?:[\\d.ABR-]+))?\\;version:\\1"
       },
       "icon": "Erlang.png",
       "website": "http://www.erlang.org"
     },
     "Etherpad": {
       "cats": [
-        "24"
+        24
       ],
-      "js": {
-        "padeditbar": "",
-        "padimpexp": ""
-      },
       "headers": {
         "Server": "^Etherpad"
       },
       "icon": "etherpad.png",
       "implies": "Node.js",
+      "js": {
+        "padeditbar": "",
+        "padimpexp": ""
+      },
       "script": [
         "/ep_etherpad-lite/"
       ],
       "website": "https://etherpad.org"
     },
-    "Exagon Concept": {
-      "cats": [
-        "1"
-      ],
-      "headers": {
-        "Server": "Exagon Server"
-      },
-      "icon": "ExagonConcept.svg",
-      "website": "http://www.exagon-concept.com"
-    },
     "Exhibit": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "Exhibit.png",
       "js": {
         "Exhibit": "",
-        "Exhibit.version": "(.*)\\;version:\\1"
+        "Exhibit.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Exhibit.png",
       "script": "exhibit.*\\.js",
       "website": "http://simile-widgets.org/exhibit/"
     },
     "Express": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "X-Powered-By": "^Express$"
@@ -2834,10 +3074,12 @@
     },
     "ExpressionEngine": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "(?:exp_last_activity|exp_tracker)"
+      "cookies": {
+        "exp_csrf_token": "",
+        "exp_last_activity": "",
+        "exp_tracker": ""
       },
       "icon": "ExpressionEngine.png",
       "implies": "PHP",
@@ -2845,19 +3087,20 @@
     },
     "ExtJS": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "ExtJS.png",
       "js": {
         "Ext": "",
-        "Ext.versions.extjs.version": "(.*)\\;version:\\1"
+        "Ext.version": "^(.+)$\\;version:\\1",
+        "Ext.versions.extjs.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "ExtJS.png",
       "script": "ext-base\\.js",
-      "website": "http://www.extjs.com"
+      "website": "https://www.sencha.com"
     },
     "FAST ESP": {
       "cats": [
-        "29"
+        29
       ],
       "html": "<form[^>]+id=\"fastsearch\"",
       "icon": "FAST ESP.png",
@@ -2865,7 +3108,7 @@
     },
     "FAST Search for SharePoint": {
       "cats": [
-        "29"
+        29
       ],
       "html": "<input[^>]+ name=\"ParametricSearch",
       "icon": "FAST Search for SharePoint.png",
@@ -2878,7 +3121,7 @@
     },
     "FWP": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<!--\\s+FwP Systems",
       "icon": "FWP.png",
@@ -2889,7 +3132,7 @@
     },
     "Facebook": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Facebook.svg",
       "script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js",
@@ -2897,7 +3140,7 @@
     },
     "Fact Finder": {
       "cats": [
-        "29"
+        29
       ],
       "html": "<!-- Factfinder",
       "icon": "Fact Finder.png",
@@ -2907,19 +3150,34 @@
     },
     "FancyBox": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "FancyBox.png",
       "implies": "jQuery",
+      "js": {
+        "$.fancybox.version": "^(.+)$\\;version:\\1"
+      },
       "script": "jquery\\.fancybox(?:\\.pack|\\.min)?\\.js(?:\\?v=([\\d.]+))?$\\;version:\\1",
       "website": "http://fancyapps.com/fancybox"
     },
+    "Fastcommerce": {
+      "cats": [
+        6
+      ],
+      "icon": "Fastcommerce.png",
+      "meta": {
+        "generator": "^Fastcommerce"
+      },
+      "website": "https://www.fastcommerce.com.br"
+    },
     "Fastly": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Fastly-Debug-Digest": "",
+        "Vary": "Fastly-SSL",
+        "x-via-fastly:": "",
         "X-Fastly-Request-ID": ""
       },
       "icon": "Fastly.svg",
@@ -2927,7 +3185,7 @@
     },
     "Fat-Free Framework": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "^Fat-Free Framework$"
@@ -2936,9 +3194,19 @@
       "implies": "PHP",
       "website": "http://fatfreeframework.com"
     },
+    "Fbits": {
+      "cats": [
+        6
+      ],
+      "icon": "Fbits.png",
+      "js": {
+        "fbits": ""
+      },
+      "website": "https://www.traycorp.com.br"
+    },
     "Fedora": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Fedora"
@@ -2948,26 +3216,30 @@
     },
     "Fingerprintjs": {
       "cats": [
-        "12"
+        59
       ],
       "js": {
         "Fingerprint": "(\\d)?$\\;version:\\1",
-        "Fingerprint2": ""
+        "Fingerprint2": "",
+        "Fingerprint2.VERSION": "^(.+)$\\;version:\\1"
       },
       "script": "fingerprint(\\d)?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://valve.github.io/fingerprintjs2/"
     },
     "Firebase": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "Firebase.png",
-      "script": "firebase.*\\.js",
-      "website": "http://firebase.com"
+      "js": {
+        "firebase.SDK_VERSION": "([\\d.]+)$\\;version:\\1"
+      },
+      "script": "/(?:([\\d.]+)/)?firebase(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://firebase.com"
     },
     "Fireblade": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Server": "fbs"
@@ -2975,19 +3247,26 @@
       "icon": "Fireblade.png",
       "website": "http://fireblade.com"
     },
-    "FlashCom": {
+    "Flarum": {
       "cats": [
-        "22"
+        2
       ],
-      "headers": {
-        "Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
+      "html": "<div id=\"flarum-loading\"",
+      "icon": "flarum.png",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "js": {
+        "app.cache.discussionList": "",
+        "app.forum.freshness": ""
       },
-      "website": "http://example.com"
+      "website": "http://flarum.org/"
     },
     "Flask": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "Server": "Werkzeug/?([\\d\\.]+)?\\;version:\\1"
@@ -2998,16 +3277,16 @@
     },
     "Flat UI": {
       "cats": [
-        "18"
+        18
       ],
+      "html": "<link[^>]* href=[^>]+flat-ui(?:\\.min)?\\.css",
       "icon": "Flat UI.png",
       "implies": "Bootstrap",
-      "html": "<link[^>]* href=[^>]+flat-ui(?:\\.min)?\\.css",
       "website": "https://designmodo.github.io/Flat-UI/"
     },
     "FlexCMP": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Flex-Lang": "",
@@ -3022,7 +3301,7 @@
     },
     "FlexSlider": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "FlexSlider.png",
       "implies": "jQuery",
@@ -3031,21 +3310,31 @@
       ],
       "website": "https://woocommerce.com/flexslider/"
     },
+    "Flickity": {
+      "cats": [
+        59
+      ],
+      "js": {
+        "Flickity": ""
+      },
+      "script": "/flickity(?:\\.pkgd)?(?:\\.min)?\\.js",
+      "website": "https://flickity.metafizzy.co/"
+    },
     "FluxBB": {
       "cats": [
-        "2"
+        2
       ],
-      "html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb",
+      "html": "<p id=\"poweredby\">[^<]+<a href=\"https?://fluxbb\\.org/\">",
       "icon": "FluxBB.png",
       "implies": "PHP",
-      "website": "http://fluxbb.org"
+      "website": "https://fluxbb.org"
     },
     "Flyspray": {
       "cats": [
-        "13"
+        13
       ],
-      "headers": {
-        "Set-Cookie": "flyspray_project="
+      "cookies": {
+        "flyspray_project": ""
       },
       "html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
       "icon": "Flyspray.png",
@@ -3054,10 +3343,10 @@
     },
     "Font Awesome": {
       "cats": [
-        "17"
+        17
       ],
       "html": [
-        "<link[^>]* href=[^>]+font-awesome(?:\\.min)?\\.css",
+        "<link[^>]* href=[^>]+(?:([\\d.]+)/)?(?:css/)?font-awesome(?:\\.min)?\\.css\\;version:\\1",
         "<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
       ],
       "icon": "Font Awesome.png",
@@ -3065,7 +3354,7 @@
     },
     "Fork CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "ForkCMS.png",
       "implies": "Symfony",
@@ -3076,7 +3365,7 @@
     },
     "Fortune3": {
       "cats": [
-        "6"
+        6
       ],
       "html": "(?:<link [^>]*href=\"[^\\/]*\\/\\/www\\.fortune3\\.com\\/[^\"]*siterate\\/rate\\.css|Powered by <a [^>]*href=\"[^\"]+fortune3\\.com)",
       "icon": "Fortune3.png",
@@ -3085,13 +3374,13 @@
     },
     "Foswiki": {
       "cats": [
-        "8"
+        8
       ],
-      "js": {
-        "foswiki": ""
+      "cookies": {
+        "FOSWIKISTRIKEONE": "",
+        "SFOSWIKISID": ""
       },
       "headers": {
-        "Set-Cookie": "^(?:FOSWIKISTRIKEONE|SFOSWIKISID)",
         "X-Foswikiaction": "",
         "X-Foswikiuri": ""
       },
@@ -3100,6 +3389,9 @@
       ],
       "icon": "foswiki.png",
       "implies": "Perl",
+      "js": {
+        "foswiki": ""
+      },
       "meta": {
         "foswiki.SERVERTIME": "",
         "foswiki.WIKINAME": ""
@@ -3108,7 +3400,7 @@
     },
     "FreeBSD": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1"
@@ -3116,30 +3408,46 @@
       "icon": "FreeBSD.png",
       "website": "http://freebsd.org"
     },
-    "Freespee": {
-      "cats": [
-        "10"
-      ],
-      "script": "analytics\\.freespee\\.com/js/external/fs\\.(?:min\\.)?js",
-      "icon": "Freespee.svg",
-      "website": "https://www.freespee.com"
-    },
     "FreeTextBox": {
       "cats": [
-        "24"
+        24
       ],
+      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
+      "icon": "FreeTextBox.png",
+      "implies": "Microsoft ASP.NET",
       "js": {
         "FTB_API": "",
         "FTB_AddEvent": ""
       },
-      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
-      "icon": "FreeTextBox.png",
-      "implies": "Microsoft ASP.NET",
       "website": "http://freetextbox.com"
     },
+    "Freespee": {
+      "cats": [
+        10
+      ],
+      "icon": "Freespee.svg",
+      "script": "analytics\\.freespee\\.com/js/external/fs\\.(?:min\\.)?js",
+      "website": "https://www.freespee.com"
+    },
+    "Freshchat": {
+      "cats": [
+        52
+      ],
+      "icon": "freshchat.png",
+      "script": "wchat\\.freshchat\\.com/js/widget\\.js",
+      "website": "https://www.freshworks.com/live-chat-software/"
+    },
+    "Freshmarketer": {
+      "cats": [
+        10
+      ],
+      "icon": "freshmarketer.png",
+      "script": "cdn\\.freshmarketer\\.com",
+      "website": "https://www.freshworks.com/marketing-automation/conversion-rate-optimization/"
+    },
     "Froala Editor": {
       "cats": [
-        "24"
+        24
       ],
       "html": "<[^>]+class=\"[^\"]*(?:fr-view|fr-box)",
       "icon": "Froala.svg",
@@ -3151,29 +3459,37 @@
     },
     "FrontPage": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "FrontPage.png",
       "meta": {
-        "generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1",
-        "ProgId": "^FrontPage\\."
+        "ProgId": "^FrontPage\\.",
+        "generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
       },
       "website": "http://office.microsoft.com/frontpage"
     },
     "Fusion Ads": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Fusion Ads.png",
       "js": {
         "_fusion": ""
       },
-      "icon": "Fusion Ads.png",
       "script": "^[^\\/]*//[ac]dn\\.fusionads\\.net/(?:api/([\\d.]+)/)?\\;version:\\1",
       "website": "http://fusionads.net"
     },
+    "Future Shop": {
+      "cats": [
+        6
+      ],
+      "icon": "futureshop.png",
+      "script": "future-shop.*\\.js",
+      "website": "https://www.future-shop.jp"
+    },
     "G-WAN": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "G-WAN"
@@ -3183,7 +3499,7 @@
     },
     "GX WebManager": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<!--\\s+Powered by GX",
       "icon": "GX WebManager.png",
@@ -3194,63 +3510,67 @@
     },
     "Gallery": {
       "cats": [
-        "7"
+        7
       ],
-      "js": {
-        "galleryAuthToken": "",
-        "$.fn.gallery_valign": ""
-      },
       "html": [
         "<div id=\"gsNavBar\" class=\"gcBorder1\">",
         "<a href=\"http://gallery\\.sourceforge\\.net\"><img[^>]+Powered by Gallery\\s*(?:(?:v|Version)\\s*([0-9.]+))?\\;version:\\1"
       ],
       "icon": "Gallery.png",
+      "js": {
+        "$.fn.gallery_valign": "",
+        "galleryAuthToken": ""
+      },
       "website": "http://galleryproject.org/"
     },
     "Gambio": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "gambio": ""
-      },
       "html": "(?:<link[^>]* href=\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->|<!--[\\s=]+Shopsoftware by Gambio GmbH \\(c\\))",
       "icon": "Gambio.png",
       "implies": "PHP",
+      "js": {
+        "gambio": ""
+      },
       "script": "gm_javascript\\.js\\.php",
       "website": "http://gambio.de"
     },
     "Gatsby": {
       "cats": [
-        "12"
+        57,
+        12
       ],
       "html": [
         "<div id=\"___gatsby\">",
         "<style id=\"gatsby-inlined-css\">"
       ],
+      "meta": {
+        "generator": "^Gatsby(?: ([0-9.]+))?$\\;version:\\1"
+      },
       "icon": "Gatsby.svg",
       "implies": [
         "React",
-        "Webpack"
+        "webpack"
       ],
       "website": "https://www.gatsbyjs.org/"
     },
     "Gauges": {
       "cats": [
-        "10"
+        10
       ],
+      "cookies": {
+        "_gauges_": ""
+      },
+      "icon": "Gauges.png",
       "js": {
         "_gauges": ""
       },
-      "headers": {
-        "Set-Cookie": "_gauges_[^;]+="
-      },
-      "icon": "Gauges.png",
       "website": "https://get.gaug.es"
     },
     "Gentoo": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "X-Powered-By": "gentoo"
@@ -3260,12 +3580,8 @@
     },
     "Gerrit": {
       "cats": [
-        "47"
+        47
       ],
-      "js": {
-        "gerrit_ui": "",
-        "Gerrit": ""
-      },
       "html": [
         ">Gerrit Code Review</a>\\s*\"\\s*\\(([0-9.]+)\\)\\;version:\\1",
         "<(?:div|style) id=\"gerrit_"
@@ -3275,6 +3591,10 @@
         "Java",
         "git"
       ],
+      "js": {
+        "Gerrit": "",
+        "gerrit_ui": ""
+      },
       "meta": {
         "title": "^Gerrit Code Review$"
       },
@@ -3283,17 +3603,17 @@
     },
     "Get Satisfaction": {
       "cats": [
-        "13"
+        13
       ],
+      "icon": "Get Satisfaction.png",
       "js": {
         "GSFN": ""
       },
-      "icon": "Get Satisfaction.png",
       "website": "https://getsatisfaction.com/corp/"
     },
     "GetSimple CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "GetSimple CMS.png",
       "implies": "PHP",
@@ -3304,7 +3624,7 @@
     },
     "Ghost": {
       "cats": [
-        "11"
+        11
       ],
       "headers": {
         "X-Ghost-Cache-Status": ""
@@ -3318,38 +3638,35 @@
     },
     "GitBook": {
       "cats": [
-        "4"
+        4
       ],
       "icon": "GitBook.png",
       "meta": {
         "generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
       },
-      "website": "http://gitbook.io"
+      "url": "^https?://[^/]+\\.gitbook\\.com/",
+      "website": "https://www.gitbook.com"
     },
     "GitHub Pages": {
       "cats": [
-        "11",
-        "31"
+        31
       ],
-      "url": "^https?://[^/]+\\.github\\.io/",
       "headers": {
         "Server": "^GitHub\\.com$",
         "X-GitHub-Request-Id": ""
       },
       "icon": "GitHub.svg",
       "implies": "Ruby on Rails",
+      "url": "^https?://[^/]+\\.github\\.io/",
       "website": "https://pages.github.com/"
     },
     "GitLab": {
       "cats": [
-        "13",
-        "47"
+        13,
+        47
       ],
-      "js": {
-        "GitLab": ""
-      },
-      "headers": {
-        "Set-cookie": "_gitlab_session"
+      "cookies": {
+        "_gitlab_session": ""
       },
       "html": [
         "<meta content=\"https?://[^/]+/assets/gitlab_logo-",
@@ -3357,16 +3674,19 @@
       ],
       "icon": "GitLab.svg",
       "implies": "Ruby on Rails",
+      "js": {
+        "GitLab": "",
+        "gl.dashboardOptions": ""
+      },
       "meta": {
-        "description": "^GitLab",
         "og:site_name": "^GitLab$"
       },
       "website": "https://about.gitlab.com"
     },
     "GitLab CI": {
       "cats": [
-        "44",
-        "47"
+        44,
+        47
       ],
       "icon": "GitLab CI.png",
       "implies": "Ruby on Rails",
@@ -3375,20 +3695,25 @@
       },
       "website": "http://about.gitlab.com/gitlab-ci"
     },
-    "GitPHP": {
+    "Gitea": {
       "cats": [
-        "47"
+        47
       ],
+      "cookies": {
+        "i_like_gitea": ""
+      },
       "html": [
-        "<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
-        "<a href=\"http://www\\.gitphp\\.org/\" target=\"_blank\">GitPHP by Chris Han"
+        "<div class=\"ui left\">\\n\\s+© Gitea Version: ([\\d.]+)\\;version:\\1"
       ],
-      "implies": "PHP",
-      "website": "http://gitphp.org"
+      "icon": "gitea.svg",
+      "meta": {
+        "keywords": "^go,git,self-hosted,gitea$"
+      },
+      "website": "https://gitea.io"
     },
     "Gitiles": {
       "cats": [
-        "47"
+        47
       ],
       "html": "Powered by <a href=\"https://gerrit\\.googlesource\\.com/gitiles/\">Gitiles<",
       "implies": [
@@ -3399,7 +3724,7 @@
     },
     "GlassFish": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "GlassFish(?: Server)?(?: Open Source Edition)?(?: ?/?([\\d.]+))?\\;version:\\1"
@@ -3412,7 +3737,7 @@
     },
     "Glyphicons": {
       "cats": [
-        "17"
+        17
       ],
       "html": "(?:<link[^>]* href=[^>]+glyphicons(?:\\.min)?\\.css|<img[^>]* src=[^>]+glyphicons)",
       "icon": "Glyphicons.png",
@@ -3420,14 +3745,14 @@
     },
     "Go": {
       "cats": [
-        "27"
+        27
       ],
       "icon": "Go.svg",
       "website": "https://golang.org"
     },
     "GoAhead": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "GoAhead"
@@ -3435,27 +3760,50 @@
       "icon": "GoAhead.png",
       "website": "http://embedthis.com/products/goahead/index.html"
     },
+    "GoJS": {
+      "cats": [
+        25
+      ],
+      "icon": "GoJS.png",
+      "website": "https://gojs.net/",
+      "js": {
+        "go.version": "(.*)\\;version:\\1",
+        "go.GraphObject": ""
+      }
+    },
+    "GoSquared": {
+      "cats": [
+        10,
+        52,
+        53
+      ],
+      "icon": "gosquared.png",
+      "js": {
+        "_gs": "\\;confidence:30"
+      },
+      "website": "https://www.gosquared.com/"
+    },
     "GoStats": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "GoStats.png",
       "js": {
         "_goStatsRun": "",
         "_go_track_src": "",
         "go_msie": ""
       },
-      "icon": "GoStats.png",
       "website": "http://gostats.com/"
     },
     "Gogs": {
       "cats": [
-        "47"
+        47
       ],
-      "headers": {
-        "Set-Cookie": "i_like_gogits="
+      "cookies": {
+        "i_like_gogits": ""
       },
       "html": [
-        "<div class=\"ui left\">\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
+        "<div class=\"ui left\">\\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
         "<button class=\"ui basic clone button\" id=\"repo-clone-ssh\" data-link=\"gogs@"
       ],
       "icon": "gogs.png",
@@ -3467,14 +3815,14 @@
     },
     "Google AdSense": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Google AdSense.svg",
       "js": {
-        "google_ad_": "",
+        "Goog_AdSense_": "",
         "__google_ad_urls": "",
-        "Goog_AdSense_": ""
+        "google_ad_": ""
       },
-      "icon": "Google AdSense.svg",
       "script": [
         "googlesyndication\\.com/",
         "ad\\.ca\\.doubleclick\\.net",
@@ -3485,22 +3833,37 @@
     },
     "Google Analytics": {
       "cats": [
-        "10"
+        10
       ],
-      "js": {
-        "gaGlobal": "",
-        "GoogleAnalyticsObject": ""
-      },
-      "headers": {
-        "Set-Cookie": "__utma"
+      "cookies": {
+        "__utma": "",
+        "_ga": "",
+        "_gat": ""
       },
       "icon": "Google Analytics.svg",
-      "script": "google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:",
+      "html": "<amp-analytics [^>]*type=[\"']googleanalytics[\"']",
+      "js": {
+        "GoogleAnalyticsObject": "",
+        "gaGlobal": ""
+      },
+      "script": "google-analytics\\.com\\/(?:ga|urchin|analytics)\\.js",
       "website": "http://google.com/analytics"
     },
+    "Google Analytics Enhanced eCommerce": {
+      "cats": [
+        10
+      ],
+      "icon": "Google Analytics.svg",
+      "implies": "Google Analytics",
+      "js": {
+        "gaplugins.EC": ""
+      },
+      "script": "google-analytics\\.com\\/plugins\\/ua\\/(?:ec|ecommerce)\\.js",
+      "website": "https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce"
+    },
     "Google App Engine": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Google Frontend"
@@ -3510,40 +3873,50 @@
     },
     "Google Charts": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "Google Charts.png",
       "js": {
         "__googleVisualizationAbstractRendererElementsCount__": "",
         "__gvizguard__": ""
       },
-      "icon": "Google Charts.png",
       "website": "http://developers.google.com/chart/"
     },
+    "Google Cloud": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "Via": "^1\\.1 google$"
+      },
+      "icon": "google_cloud.svg",
+      "website": "https://cloud.google.com"
+    },
     "Google Code Prettify": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "Google.svg",
       "js": {
         "prettyPrint": ""
       },
-      "icon": "Google.svg",
       "website": "http://code.google.com/p/google-code-prettify"
     },
     "Google Font API": {
       "cats": [
-        "17"
+        17
       ],
+      "html": "<link[^>]* href=[^>]+fonts\\.(?:googleapis|google)\\.com",
+      "icon": "Google Font API.png",
       "js": {
         "WebFonts": ""
       },
-      "html": "<link[^>]* href=[^>]+fonts\\.(?:googleapis|google)\\.com",
-      "icon": "Google Font API.png",
       "script": "googleapis\\.com/.+webfont",
       "website": "http://google.com/fonts"
     },
     "Google Maps": {
       "cats": [
-        "35"
+        35
       ],
       "icon": "Google Maps.png",
       "script": [
@@ -3554,8 +3927,8 @@
     },
     "Google PageSpeed": {
       "cats": [
-        "23",
-        "33"
+        23,
+        33
       ],
       "headers": {
         "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1",
@@ -3566,60 +3939,38 @@
     },
     "Google Plus": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Google Plus.svg",
       "script": "apis\\.google\\.com/js/[a-z]*\\.js",
       "website": "http://plus.google.com"
     },
-    "Google Search Appliance": {
-      "cats": [
-        "22",
-        "29"
-      ],
-      "headers": {
-        "Server": "^Google\\sSearch\\sAppliance$"
-      },
-      "icon": "Google Search Appliance.png",
-      "website": "https://enterprise.google.com/search"
-    },
     "Google Sites": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Google Sites.png",
       "url": "^https?://sites\\.google\\.com",
       "website": "http://sites.google.com"
     },
-    "CNV Platform": {
-      "cats": [
-        "1"
-      ],
-      "headers": {
-        "Set-Cookie": "cnv_session"
-      },
-      "icon": "CNV.png",
-      "implies": "laravel",
-      "website": "https://cnv.vn"
-    },
     "Google Tag Manager": {
       "cats": [
-        "42"
+        42
       ],
-      "js": {
-        "googletag": "",
-        "google_tag_manager": ""
-      },
       "html": [
         "googletagmanager\\.com/ns\\.html[^>]+></iframe>",
         "<!-- (?:End )?Google Tag Manager -->"
       ],
       "icon": "Google Tag Manager.png",
+      "js": {
+        "google_tag_manager": "",
+        "googletag": ""
+      },
       "website": "http://www.google.com/tagmanager"
     },
     "Google Wallet": {
       "cats": [
-        "41"
+        41
       ],
       "icon": "Google Wallet.png",
       "script": [
@@ -3630,7 +3981,7 @@
     },
     "Google Web Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "gws"
@@ -3640,13 +3991,13 @@
     },
     "Google Web Toolkit": {
       "cats": [
-        "18"
+        18
       ],
+      "icon": "Google Web Toolkit.png",
+      "implies": "Java",
       "js": {
         "__gwt_": ""
       },
-      "icon": "Google Web Toolkit.png",
-      "implies": "Java",
       "meta": {
         "gwt:property": ""
       },
@@ -3654,10 +4005,10 @@
     },
     "Graffiti CMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "graffitibot[^;]="
+      "cookies": {
+        "graffitibot": ""
       },
       "icon": "Graffiti CMS.png",
       "implies": "Microsoft ASP.NET",
@@ -3667,20 +4018,9 @@
       "script": "/graffiti\\.js",
       "website": "http://graffiticms.codeplex.com"
     },
-    "Grandstream": {
-      "cats": [
-        "22",
-        "39"
-      ],
-      "headers": {
-        "Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "Grandstream.png",
-      "website": "http://www.grandstream.com"
-    },
     "Grav": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Grav.png",
       "implies": "PHP",
@@ -3691,18 +4031,18 @@
     },
     "Gravatar": {
       "cats": [
-        "19"
+        19
       ],
+      "html": "<[^>]+gravatar\\.com/avatar/",
+      "icon": "Gravatar.png",
       "js": {
         "Gravatar": ""
       },
-      "html": "<[^>]+gravatar\\.com/avatar/",
-      "icon": "Gravatar.png",
       "website": "http://gravatar.com"
     },
     "Gravity Forms": {
       "cats": [
-        "19"
+        19
       ],
       "html": [
         "<div class=(?:\"|')[^>]*gform_wrapper",
@@ -3710,24 +4050,14 @@
         "<ul [^>]*class=(?:\"|')[^>]*gform_fields",
         "<link [^>]*href=(?:\"|')[^>]*wp-content/plugins/gravityforms/css/"
       ],
-      "script": "/wp-content/plugins/gravityforms/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
       "icon": "gravityforms.svg",
       "implies": "WordPress",
+      "script": "/wp-content/plugins/gravityforms/js/[^/]+\\.js\\?ver=([\\d.]+)$\\;version:\\1",
       "website": "http://gravityforms.com"
     },
-    "Gravity Insights": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "gravityInsightsParams": ""
-      },
-      "icon": "Gravity Insights.png",
-      "website": "http://insights.gravity.com"
-    },
     "Green Valley CMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<img[^>]+/dsresource\\?objectid=",
       "icon": "Green Valley CMS.png",
@@ -3739,7 +4069,7 @@
     },
     "HERE": {
       "cats": [
-        "35"
+        35
       ],
       "icon": "HERE.png",
       "script": "https?://js\\.cit\\.api\\.here\\.com/se/([\\d.]+)\\/\\;version:\\1",
@@ -3747,7 +4077,7 @@
     },
     "HHVM": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "X-Powered-By": "HHVM/?([\\d.]+)?\\;version:\\1"
@@ -3756,27 +4086,19 @@
       "implies": "PHP\\;confidence:75",
       "website": "http://hhvm.com"
     },
-    "HP": {
-      "cats": [
-        "40"
-      ],
-      "icon": "HP.svg",
-      "website": "http://hp.com"
-    },
     "HP ChaiServer": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "HP-Chai(?:Server|SOE)(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "HP.svg",
-      "implies": "HP",
       "website": "http://hp.com"
     },
     "HP Compact Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "HP_Compact_Server(?:/([\\d.]+))?\\;version:\\1"
@@ -3786,14 +4108,14 @@
     },
     "HP ProCurve": {
       "cats": [
-        "37"
+        37
       ],
       "icon": "HP.svg",
       "website": "http://hp.com/networking"
     },
     "HP System Management": {
       "cats": [
-        "46"
+        46
       ],
       "headers": {
         "Server": "HP System Management"
@@ -3803,8 +4125,8 @@
     },
     "HP iLO": {
       "cats": [
-        "22",
-        "46"
+        22,
+        46
       ],
       "headers": {
         "Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1"
@@ -3812,39 +4134,20 @@
       "icon": "HP.svg",
       "website": "http://hp.com"
     },
-    "HTTP Kit": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "^http-kit"
-      },
-      "implies": "Java",
-      "website": "http://http-kit.org"
-    },
-    "HTTP-Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "HTTP/2": {
       "cats": [
-        "19"
+        19
       ],
       "excludes": "SPDY",
       "headers": {
         "X-Firefox-Spdy": "h2"
       },
       "icon": "http2.png",
-      "website": "http://http2.github.io"
+      "website": "https://http2.github.io"
     },
     "Haddock": {
       "cats": [
-        "4"
+        4
       ],
       "html": "<p>Produced by <a href=\"http://www\\.haskell\\.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
       "script": "haddock-util\\.js",
@@ -3852,100 +4155,90 @@
     },
     "Hammer.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Hammer.js.png",
       "js": {
+        "Ha.VERSION": "^(.+)$\\;version:\\1",
         "Hammer": "",
-        "Hammer.VERSION": "(.*)\\;version:\\1",
-        "Ha.VERSION": "(.*)\\;version:\\1"
+        "Hammer.VERSION": "^(.+)$\\;version:\\1"
       },
-      "icon": "Hammer.js.png",
       "script": "hammer(?:\\.min)?\\.js",
       "website": "https://hammerjs.github.io"
     },
     "Handlebars": {
       "cats": [
-        "12"
+        12
       ],
+      "html": "<[^>]*type=[^>]text\\/x-handlebars-template",
+      "icon": "Handlebars.png",
       "js": {
         "Handlebars": "",
-        "Handlebars.VERSION": "(.*)\\;version:\\1"
+        "Handlebars.VERSION": "^(.+)$\\;version:\\1"
       },
-      "html": "<[^>]*type=[^>]text\\/x-handlebars-template",
-      "icon": "Handlebars.png",
       "script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "http://handlebarsjs.com"
     },
-    "Happy ICS Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "implies": "OmniTouch 8660 My Teamwork",
-      "website": "http://example.com"
-    },
     "Haravan": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Haravan.png",
       "js": {
         "Haravan": ""
       },
-      "icon": "Haravan.png",
       "script": "haravan.*\\.js",
       "website": "https://www.haravan.com"
     },
     "Haskell": {
       "cats": [
-        "27"
+        27
       ],
       "icon": "Haskell.png",
       "website": "http://wiki.haskell.org/Haskell"
     },
     "HeadJS": {
       "cats": [
-        "12"
+        59
       ],
+      "html": "<[^>]*data-headjs-load",
+      "icon": "HeadJS.png",
       "js": {
         "head.browser.name": ""
       },
-      "html": "<[^>]*data-headjs-load",
-      "icon": "HeadJS.png",
       "script": "head\\.(?:core|load)(?:\\.min)?\\.js",
       "website": "http://headjs.com"
     },
     "Heap": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Heap.png",
       "js": {
         "heap": ""
       },
-      "icon": "Heap.png",
       "script": "heap-\\d+\\.js",
       "website": "http://heapanalytics.com"
     },
     "Hello Bar": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "Hello Bar.png",
       "js": {
         "HelloBar": ""
       },
-      "icon": "Hello Bar.png",
       "script": "hellobar\\.js",
       "website": "http://hellobar.com"
     },
     "Hexo": {
       "cats": [
-        "11"
+        57
       ],
-      "icon": "Hexo.png",
       "html": [
         "Powered by <a href=\"https?://hexo\\.io/?\"[^>]*>Hexo</"
       ],
+      "icon": "Hexo.png",
       "meta": {
         "generator": "Hexo(?: v?([\\d.]+))?\\;version:\\1"
       },
@@ -3953,7 +4246,7 @@
     },
     "Hiawatha": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Hiawatha v([\\d.]+)\\;version:\\1"
@@ -3963,37 +4256,53 @@
     },
     "Highcharts": {
       "cats": [
-        "25"
+        25
       ],
+      "html": "<svg[^>]*><desc>Created with Highcharts ([\\d.]*)\\;version:\\1",
+      "icon": "Highcharts.png",
       "js": {
         "Highcharts": "",
-        "Highcharts.version": "(.*)\\;version:\\1"
+        "Highcharts.version": "^(.+)$\\;version:\\1"
       },
-      "html": "<svg[^>]*><desc>Created with Highcharts ([\\d.]*)\\;version:\\1",
-      "icon": "Highcharts.png",
       "script": "highcharts.*\\.js",
       "website": "https://www.highcharts.com"
     },
     "Highlight.js": {
       "cats": [
-        "19"
+        19
       ],
       "icon": "Highlight.js.png",
-      "script": "/highlight\\.js/[\\d.]+?/highlight\\.min\\.js",
+      "js": {
+        "hljs.highlightBlock": "",
+        "hljs.listLanguages": ""
+      },
+      "script": "/(?:([\\d.])+/)?highlight(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://highlightjs.org/"
     },
     "Highstock": {
       "cats": [
-        "25"
+        25
       ],
       "html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
       "icon": "Highcharts.png",
-      "script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1",
+      "script": "highstock[.-]?([\\d\\.]*\\d).*\\.js\\;version:\\1",
       "website": "http://highcharts.com/products/highstock"
     },
+    "Hinza Advanced CMS": {
+      "cats": [
+        1,
+        6
+      ],
+      "icon": "hinza_advanced_cms.svg",
+      "implies": "Laravel",
+      "meta": {
+        "generator": "hinzacms"
+      },
+      "website": "http://hinzaco.com"
+    },
     "Hippo": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+/binaries/(?:[^/]+/)*content/gallery/",
       "icon": "Hippo.png",
@@ -4001,25 +4310,25 @@
     },
     "Hogan.js": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Hogan.js.png",
       "js": {
         "Hogan": ""
       },
-      "icon": "Hogan.js.png",
       "script": [
-        "hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "hogan-[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "https://twitter.github.io/hogan.js/"
     },
     "Homeland": {
       "cats": [
-        "1",
-        "2"
+        1,
+        2
       ],
-      "headers": {
-        "Set-Cookie:": "_homeland_"
+      "cookies": {
+        "_homeland_": ""
       },
       "icon": "Homeland.png",
       "implies": "Ruby on Rails",
@@ -4027,10 +4336,10 @@
     },
     "Hotaru CMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "hotaru_mobile="
+      "cookies": {
+        "hotaru_mobile": ""
       },
       "icon": "Hotaru CMS.png",
       "implies": "PHP",
@@ -4041,34 +4350,34 @@
     },
     "Hotjar": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Hotjar.png",
       "js": {
         "HotLeadfactory": "",
         "HotleadController": "",
         "hj.apiUrlBase": ""
       },
-      "icon": "Hotjar.png",
       "script": "^//static\\.hotjar\\.com/c/hotjar-",
       "website": "https://www.hotjar.com"
     },
     "HubSpot": {
       "cats": [
-        "32"
+        32
       ],
+      "html": "<!-- Start of Async HubSpot",
+      "icon": "HubSpot.png",
       "js": {
         "_hsq": "",
         "hubspot": ""
       },
-      "html": "<!-- Start of Async HubSpot",
-      "icon": "HubSpot.png",
       "website": "https://www.hubspot.com"
     },
     "Hugo": {
       "cats": [
-        "1",
-        "11"
+        57
       ],
+      "html": "powered by <a [^>]*href=\"http://hugo.spf13.com",
       "icon": "Hugo.png",
       "meta": {
         "generator": "Hugo ([\\d.]+)?\\;version:\\1"
@@ -4077,19 +4386,19 @@
     },
     "Hybris": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "_hybris"
+      "cookies": {
+        "_hybris": ""
       },
-      "html": "<[^>]+/(?:sys_master|hybr|_ui/(?:desktop|common/img/webicons))/",
+      "html": "<[^>]+/(?:sys_master|hybr|_ui/(?:responsive/)?(?:desktop|common(?:/images|/img)?))/",
       "icon": "Hybris.png",
       "implies": "Java",
       "website": "https://hybris.com"
     },
     "IBM Coremetrics": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "IBM.svg",
       "script": "cmdatatagutils\\.js",
@@ -4097,7 +4406,7 @@
     },
     "IBM HTTP Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1"
@@ -4107,7 +4416,7 @@
     },
     "IBM Tivoli Storage Manager": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "TSM_HTTP(?:/([\\d.]+))?\\;version:\\1"
@@ -4117,7 +4426,7 @@
     },
     "IBM WebSphere Commerce": {
       "cats": [
-        "6"
+        6
       ],
       "html": "href=\"(?:\\/|[^>]+)webapp\\/wcs\\/",
       "icon": "IBM.svg",
@@ -4127,7 +4436,7 @@
     },
     "IBM WebSphere Portal": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "IBM-Web2-Location": "",
@@ -4138,57 +4447,45 @@
       "url": "/wps/",
       "website": "http://ibm.com/software/websphere/portal"
     },
-    "Ideasoft": {
-      "cats": [
-        "6"
-      ],
-      "icon": "Ideasoft.png",
-      "script": [
-        "\\.myideasoft\\.com/"
-      ],
-      "website": "https://www.ideasoft.com"
-    },
     "IIS": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "IIS(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "^(?:Microsoft-)?IIS(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "IIS.png",
       "implies": "Windows Server",
       "website": "http://www.iis.net"
     },
-    "Includable": {
-      "cats": [
-        "18"
-      ],
-      "headers": {
-        "X-Includable-Version": ""
-      },
-      "icon": "Includable.svg",
-      "website": "http://includable.com"
-    },
     "INFOnline": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "INFOnline.png",
       "js": {
-        "szmvars": "",
-        "iam_data": ""
+        "iam_data": "",
+        "szmvars": ""
       },
-      "icon": "INFOnline.png",
       "script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
       "website": "https://www.infonline.de"
     },
+    "INTI": {
+      "cats": [
+        6,
+        53
+      ],
+      "icon": "byINTI.svg",
+      "url": "\\.byinti\\.com",
+      "website": "https://byinti.com"
+    },
     "IPB": {
       "cats": [
-        "2"
+        2
       ],
-      "js": {
-        "IPBoard": "",
-        "ipb_var": "",
-        "ipsSettings": ""
+      "cookies": {
+        "ipbWWLmodpids": "",
+        "ipbWWLsession_id": ""
       },
       "html": "<link[^>]+ipb_[^>]+\\.css",
       "icon": "IPB.png",
@@ -4196,42 +4493,53 @@
         "PHP",
         "MySQL"
       ],
+      "js": {
+        "IPBoard": "",
+        "ipb_var": "",
+        "ipsSettings": ""
+      },
       "script": "jscripts/ips_",
       "website": "https://invisioncommunity.com/"
     },
-    "Immutable.js": {
+    "Ideasoft": {
+      "cats": [
+        6
+      ],
+      "icon": "Ideasoft.png",
+      "script": [
+        "\\.myideasoft\\.com/"
+      ],
+      "website": "https://www.ideasoft.com"
+    },
+    "IdoSell Shop": {
       "cats": [
-        "12"
+        6
       ],
+      "icon": "idosellshop.png",
       "js": {
-        "Immutable": "",
-        "Immutable.version": "(.*)\\;version:\\1"
+        "IAI_Ajax": ""
       },
-      "icon": "Immutable.js.png",
-      "script": "^immutable\\.(?:min\\.)?js$",
-      "website": "https://facebook.github.io/immutable-js/"
+      "website": "https://www.idosell.com"
     },
-    "imperia CMS": {
+    "Immutable.js": {
       "cats": [
-        "1"
+        59
       ],
-      "meta": {
-        "X-Imperia-Live-Info": "",
-        "GENERATOR": "^IMPERIA ([0-9.]{2,})+$\\;version:\\1"
+      "icon": "Immutable.js.png",
+      "js": {
+        "Immutable": "",
+        "Immutable.version": "^(.+)$\\;version:\\1"
       },
-      "html": "<imp:live-info sysid=\"[0-9a-f-]+\"(?: node_id=\"[0-9/]*\")? *\\/>",
-      "icon": "imperiaCMS.svg",
-      "implies": "Perl",
-      "url": "imperia/md/",
-      "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms"
+      "script": "^immutable\\.(?:min\\.)?js$",
+      "website": "https://facebook.github.io/immutable-js/"
     },
     "ImpressCMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "^ICMSSession[^;]*=",
-        "X-Powered-By": "ImpressCMS"
+      "cookies": {
+        "ICMSSession": "",
+        "ImpressCMS": ""
       },
       "icon": "ImpressCMS.png",
       "implies": "PHP",
@@ -4243,18 +4551,18 @@
     },
     "ImpressPages": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "ImpressPages.png",
       "implies": "PHP",
       "meta": {
-        "generator": "ImpressPages(?: CMS)?( [\\d.]*)\\;version:\\1"
+        "generator": "ImpressPages(?: CMS)?( [\\d.]*)?\\;version:\\1"
       },
       "website": "http://impresspages.org"
     },
     "InProces": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<!-- CSS InProces Portaal default -->",
       "icon": "InProces.png",
@@ -4263,7 +4571,7 @@
     },
     "Incapsula": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "X-CDN": "Incapsula"
@@ -4271,9 +4579,19 @@
       "icon": "Incapsula.png",
       "website": "http://www.incapsula.com"
     },
+    "Includable": {
+      "cats": [
+        18
+      ],
+      "headers": {
+        "X-Includable-Version": ""
+      },
+      "icon": "Includable.svg",
+      "website": "http://includable.com"
+    },
     "Indexhibit": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<(?:link|a href) [^>]+ndxz-studio",
       "implies": [
@@ -4288,10 +4606,10 @@
     },
     "Indico": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-cookie": "MAKACSESSION"
+      "cookies": {
+        "MAKACSESSION": ""
       },
       "html": "Powered by\\s+(?:CERN )?<a href=\"http://(?:cdsware\\.cern\\.ch/indico/|indico-software\\.org|cern\\.ch/indico)\">(?:CDS )?Indico( [\\d\\.]+)?\\;version:\\1",
       "icon": "Indico.png",
@@ -4299,7 +4617,7 @@
     },
     "Indy": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Indy(?:/([\\d.]+))?\\;version:\\1"
@@ -4308,18 +4626,18 @@
     },
     "InfernoJS": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "InfernoJS.png",
       "js": {
         "Inferno": "",
-        "Inferno.version": "(.*)\\;version:\\1"
+        "Inferno.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "InfernoJS.png",
       "website": "https://infernojs.org"
     },
     "Infusionsoft": {
       "cats": [
-        "32"
+        32
       ],
       "html": [
         "<input [^>]*name=\"infusionsoft_version\" [^>]*value=\"([^>]*)\" [^>]*\\/>\\;version:\\1",
@@ -4328,12 +4646,44 @@
       "icon": "infusionsoft.svg",
       "website": "http://infusionsoft.com"
     },
+    "Inspectlet": {
+      "cats": [
+        10
+      ],
+      "html": [
+        "<!-- (?:Begin|End) Inspectlet Embed Code -->"
+      ],
+      "icon": "inspectlet.png",
+      "js": {
+        "__insp": "",
+        "__inspld": ""
+      },
+      "script": [
+        "cdn\\.inspectlet\\.com"
+      ],
+      "website": "https://www.inspectlet.com/"
+    },
+		"Instabot": {
+		  "cats": [ 
+				5,
+				10,
+				32,
+				52,
+				58
+			 ],
+			 "icon": "Instabot.png",
+			 "js": { 
+				 "Instabot": ""
+			 },
+			 "script": "/rokoInstabot\\.js",
+			 "website": "https://instabot.io/"
+		},
     "InstantCMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "InstantCMS\\[logdate\\]="
+      "cookies": {
+        "InstantCMS[logdate]": ""
       },
       "icon": "InstantCMS.png",
       "implies": "PHP",
@@ -4344,8 +4694,8 @@
     },
     "Intel Active Management Technology": {
       "cats": [
-        "22",
-        "46"
+        22,
+        46
       ],
       "headers": {
         "Server": "Intel\\(R\\) Active Management Technology(?: ([\\d.]+))?\\;version:\\1"
@@ -4355,7 +4705,7 @@
     },
     "IntenseDebate": {
       "cats": [
-        "15"
+        15
       ],
       "icon": "IntenseDebate.png",
       "script": "intensedebate\\.com",
@@ -4363,18 +4713,18 @@
     },
     "Intercom": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Intercom.png",
       "js": {
         "Intercom": ""
       },
-      "icon": "Intercom.png",
       "script": "(?:api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
       "website": "https://www.intercom.com"
     },
     "Intershop": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Intershop.png",
       "script": "(?:is-bin|INTERSHOP)",
@@ -4382,10 +4732,10 @@
     },
     "Invenio": {
       "cats": [
-        "50"
+        50
       ],
-      "headers": {
-        "Set-cookie": "INVENIOSESSION"
+      "cookies": {
+        "INVENIOSESSION": ""
       },
       "html": "(?:Powered by|System)\\s+(?:CERN )?<a (?:class=\"footer\" )?href=\"http://(?:cdsware\\.cern\\.ch(?:/invenio)?|invenio-software\\.org|cern\\.ch/invenio)(?:/)?\">(?:CDS )?Invenio</a>\\s*v?([\\d\\.]+)?\\;version:\\1",
       "icon": "Invenio.png",
@@ -4393,18 +4743,30 @@
     },
     "Inwemo": {
       "cats": [
-        "56"
+        56
       ],
+      "icon": "inwemo.png",
       "js": {
         "Inwemo": ""
       },
       "script": "https?://cdn\\.inwemo\\.com/inwemo\\.min\\.js",
-      "icon": "inwemo.png",
       "website": "https://inwemo.com/"
     },
+    "Ionic": {
+      "cats": [
+        18
+      ],
+      "icon": "ionic.png",
+      "implies": "Angular",
+      "js": {
+        "Ionic.config": "",
+        "Ionic.version": "^(.+)$\\;version:\\1"
+      },
+      "website": "https://ionicframework.com"
+    },
     "Ionicons": {
       "cats": [
-        "17"
+        17
       ],
       "html": "<link[^>]* href=[^>]+ionicons(?:\\.min)?\\.css",
       "icon": "Ionicons.png",
@@ -4412,7 +4774,7 @@
     },
     "JAlbum": {
       "cats": [
-        "7"
+        7
       ],
       "icon": "JAlbum.png",
       "implies": "Java",
@@ -4423,7 +4785,7 @@
     },
     "JBoss Application Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "X-Powered-By": "JBoss(?:-([\\d.]+))?\\;version:\\1"
@@ -4433,7 +4795,7 @@
     },
     "JBoss Web": {
       "cats": [
-        "22"
+        22
       ],
       "excludes": "Apache Tomcat",
       "headers": {
@@ -4443,21 +4805,9 @@
       "implies": "JBoss Application Server",
       "website": "http://jboss.org/jbossweb"
     },
-    "JC-HTTPD": {
-      "cats": [
-        "22"
-      ],
-      "excludes": "Apache",
-      "headers": {
-        "Server": "JC-HTTPD(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "JC-HTTPD.png",
-      "implies": "Canon",
-      "website": "http://canon.com"
-    },
     "JET Enterprise": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "powered": "jet-enterprise"
@@ -4467,29 +4817,49 @@
     },
     "JS Charts": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "JS Charts.png",
       "js": {
         "JSChart": ""
       },
-      "icon": "JS Charts.png",
       "script": "jscharts.*\\.js",
       "website": "http://www.jscharts.com"
     },
+    "JSEcoin": {
+      "cats": [
+        56
+      ],
+      "icon": "JSEcoin.png",
+      "js": {
+        "jseMine": ""
+      },
+      "script": "^(?:https):?//load\\.jsecoin\\.com/load/",
+      "website": "https://jsecoin.com/"
+    },
     "JTL Shop": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "JTLSHOP="
+      "cookies": {
+        "JTLSHOP": ""
       },
       "html": "(?:<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
       "icon": "JTL Shop.png",
       "website": "http://www.jtl-software.de/produkte/jtl-shop3"
     },
+    "Jahia DX": {
+      "cats": [
+        1,
+        47
+      ],
+      "html": "<script id=\"staticAssetAggregatedJavascrip",
+      "icon": "JahiaDX.svg",
+      "website": "http://www.jahia.com/dx"
+    },
     "Jalios": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Jalios.png",
       "meta": {
@@ -4497,28 +4867,19 @@
       },
       "website": "http://www.jalios.com"
     },
-    "Jahia DX": {
-      "cats": [
-        "1",
-        "47"
-      ],
-      "html": "<script id=\"staticAssetAggregatedJavascrip",
-      "icon": "JahiaDX.svg",
-      "website": "http://www.jahia.com/dx"
-    },
     "Java": {
       "cats": [
-        "27"
+        27
       ],
-      "headers": {
-        "Set-Cookie": "JSESSIONID"
+      "cookies": {
+        "JSESSIONID": ""
       },
       "icon": "Java.png",
       "website": "http://java.com"
     },
     "Java Servlet": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "Servlet(?:.([\\d.]+))?\\;version:\\1"
@@ -4529,19 +4890,19 @@
     },
     "JavaScript Infovis Toolkit": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "JavaScript Infovis Toolkit.png",
       "js": {
         "$jit": "",
-        "$jit.version": "(.*)\\;version:\\1"
+        "$jit.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "JavaScript Infovis Toolkit.png",
       "script": "jit(?:-yc)?\\.js",
       "website": "https://philogb.github.io/jit/"
     },
     "JavaServer Faces": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "JSF(?:/([\\d.]+))?\\;version:\\1"
@@ -4552,7 +4913,7 @@
     },
     "JavaServer Pages": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "JSP(?:/([\\d.]+))?\\;version:\\1"
@@ -4563,15 +4924,14 @@
     },
     "Jekyll": {
       "cats": [
-        "1",
-        "11"
+        57
       ],
-      "icon": "Jekyll.png",
       "html": [
         "Powered by <a href=\"https?://jekyllrb\\.com\"[^>]*>Jekyll</",
         "<!-- Created with Jekyll Now -",
         "<!-- Begin Jekyll SEO tag"
       ],
+      "icon": "Jekyll.png",
       "meta": {
         "generator": "Jekyll (v[\\d.]+)?\\;version:\\1"
       },
@@ -4579,18 +4939,34 @@
     },
     "Jenkins": {
       "cats": [
-        "44"
+        44
       ],
       "headers": {
-        "X-Jenkins": "([\\d\\.]+)\\;version:\\1"
+        "X-Jenkins": "([\\d.]+)\\;version:\\1"
       },
+      "html": "<span class=\"jenkins_ver\"><a href=\"https://jenkins\\.io/\">Jenkins ver\\. ([\\d.]+)\\;version:\\1",
       "icon": "Jenkins.png",
       "implies": "Java",
-      "website": "http://jenkins-ci.org"
+      "js": {
+        "jenkinsCIGlobal": "",
+        "jenkinsRules": ""
+      },
+      "website": "https://jenkins.io/"
+    },
+    "Jetshop": {
+      "cats": [
+        6
+      ],
+      "html": "<(?:div|aside) id=\"jetshop-branding\">",
+      "icon": "Jetshop.png",
+      "js": {
+        "JetshopData": ""
+      },
+      "website": "http://jetshop.se"
     },
     "Jetty": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Jetty(?:\\(([\\d\\.]*\\d+))?\\;version:\\1"
@@ -4601,34 +4977,35 @@
     },
     "Jimdo": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "jimdo_Data": "",
-        "jimdoData": ""
-      },
       "headers": {
         "X-Jimdo-Instance": "",
         "X-Jimdo-Wid": ""
       },
       "icon": "jimdo.png",
+      "url": "\\.jimdo\\.com/",
+      "js": {
+        "jimdoData": "",
+        "jimdo_Data": ""
+      },
       "website": "https://www.jimdo.com"
     },
     "Jirafe": {
       "cats": [
-        "10",
-        "32"
+        10,
+        32
       ],
+      "icon": "Jirafe.png",
       "js": {
         "jirafe": ""
       },
-      "icon": "Jirafe.png",
       "script": "/jirafe\\.js",
       "website": "https://docs.jirafe.com"
     },
     "Jive": {
       "cats": [
-        "19"
+        19
       ],
       "headers": {
         "X-JIVE-USER-ID": "",
@@ -4642,13 +5019,13 @@
     },
     "JobberBase": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "JobberBase.png",
+      "implies": "PHP",
       "js": {
         "Jobber": ""
       },
-      "icon": "JobberBase.png",
-      "implies": "PHP",
       "meta": {
         "generator": "Jobberbase"
       },
@@ -4656,130 +5033,120 @@
     },
     "Joomla": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "jcomments": "",
-        "Joomla": ""
-      },
       "headers": {
         "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1"
       },
-      "html": "(?:<div[^>]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
+      "html": "(?:<div[^>]+id=\"wrapper_r\"|<(?:link|script)[^>]+(?:feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
       "icon": "Joomla.svg",
       "implies": "PHP",
+      "js": {
+        "Joomla": "",
+        "jcomments": ""
+      },
       "meta": {
         "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
       },
       "url": "option=com_",
       "website": "https://www.joomla.org"
     },
-    "JSEcoin": {
-      "cats": [
-        "56"
-      ],
-      "js": {
-        "jseMine": ""
-      },
-      "script": "^(?:https):?//load\\.jsecoin\\.com/server/load/",
-      "icon": "JSEcoin.png",
-      "website": "https://jsecoin.com/"
-    },
     "K2": {
       "cats": [
-        "19"
+        19
       ],
-      "js": {
-        "K2RatingURL": ""
-      },
       "html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
       "icon": "K2.png",
       "implies": "Joomla",
+      "js": {
+        "K2RatingURL": ""
+      },
       "website": "https://getk2.org"
     },
     "KISSmetrics": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "KISSmetrics.png",
       "js": {
         "KM_COOKIE_DOMAIN": ""
       },
-      "icon": "KISSmetrics.png",
       "website": "https://www.kissmetrics.com"
     },
-    "KS_HTTP": {
+    "Kajabi": {
       "cats": [
-        "22"
+        6
       ],
-      "headers": {
-        "Server": "KS_HTTP\\/?([\\d\\.]+)?\\;version:\\1"
+      "cookies": {
+        "_kjb_session": ""
+      },
+      "icon": "Kajabi.svg",
+      "js": {
+        "Kajabi": ""
       },
-      "icon": "KS_HTTP.png",
-      "implies": "Canon",
-      "website": "http://www.canon.com"
+      "website": "https://newkajabi.com"
     },
     "Kampyle": {
       "cats": [
-        "10",
-        "13"
+        10,
+        13
       ],
+      "cookies": {
+        "k_visit": ""
+      },
+      "icon": "Kampyle.png",
       "js": {
-        "kampyle": "",
+        "KAMPYLE_COMMON": "",
         "k_track": "",
-        "KAMPYLE_COMMON": ""
-      },
-      "headers": {
-        "Set-Cookie": "k_visit"
+        "kampyle": ""
       },
-      "icon": "Kampyle.png",
       "script": "cf\\.kampyle\\.com/k_button\\.js",
       "website": "http://www.kampyle.com"
     },
     "Kamva": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Kamva.svg",
       "js": {
         "Kamva": ""
       },
-      "icon": "Kamva.svg",
       "meta": {
         "generator": "[CK]amva"
       },
       "script": "cdn\\.mykamva\\.ir",
       "website": "https://kamva.ir"
     },
-    "Hinza Advanced CMS": {
+    "Kemal": {
       "cats": [
-        "1",
-        "6"
+        18,
+        22
       ],
-      "icon": "hinza_advanced_cms.svg",
-      "meta": {
-        "generator": "hinzacms"
+      "headers": {
+        "X-Powered-By": "Kemal"
       },
-      "implies": "Laravel",
-      "website": "http://hinzaco.com"
+      "icon": "kemalcr.png",
+      "website": "http://kemalcr.com"
     },
     "Kendo UI": {
       "cats": [
-        "18"
+        18
       ],
-      "js": {
-        "kendo": "",
-        "kendo.version": "(.*)\\;version:\\1"
-      },
       "html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
       "icon": "Kendo UI.png",
       "implies": "jQuery",
+      "js": {
+        "kendo": "",
+        "kendo.version": "^(.+)$\\;version:\\1"
+      },
       "website": "https://www.telerik.com/kendo-ui"
     },
     "Kentico CMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "CMSPreferredCulture="
+      "cookies": {
+        "CMSPreferredCulture": ""
       },
       "icon": "Kentico CMS.png",
       "meta": {
@@ -4789,7 +5156,7 @@
     },
     "KeyCDN": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Server": "^keycdn-engine$"
@@ -4797,21 +5164,10 @@
       "icon": "KeyCDN.png",
       "website": "http://www.keycdn.com"
     },
-    "Kemal": {
-      "cats": [
-        "18",
-        "22"
-      ],
-      "headers": {
-        "X-Powered-By": "Kemal"
-      },
-      "icon": "kemalcr.png",
-      "website": "http://kemalcr.com"
-    },
     "Kibana": {
       "cats": [
-        "29",
-        "25"
+        29,
+        25
       ],
       "headers": {
         "kbn-name": "kibana",
@@ -4825,43 +5181,42 @@
     },
     "KineticJS": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "KineticJS.png",
       "js": {
         "Kinetic": "",
-        "Kinetic.version": "(.*)\\;version:\\1"
+        "Kinetic.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "KineticJS.png",
       "script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://github.com/ericdrowell/KineticJS/"
     },
     "Klarna Checkout": {
       "cats": [
-        "41",
-        "6",
-        "5"
+        41,
+        6,
+        5
       ],
+      "icon": "Klarna.svg",
       "js": {
         "_klarnaCheckout": ""
       },
-      "icon": "Klarna.svg",
       "website": "https://www.klarna.com/international/"
     },
     "Knockout.js": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Knockout.js.png",
       "js": {
-        "ko": "\\;confidence:20",
-        "ko.version": "(.*)\\;version:\\1"
+        "ko.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Knockout.js.png",
       "website": "http://knockoutjs.com"
     },
     "Koa": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "X-Powered-By": "^koa$"
@@ -4872,8 +5227,8 @@
     },
     "Koala Framework": {
       "cats": [
-        "1",
-        "18"
+        1,
+        18
       ],
       "html": "<!--[^>]+This website is powered by Koala Web Framework CMS",
       "icon": "Koala Framework.png",
@@ -4885,22 +5240,42 @@
     },
     "KobiMaster": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Kobimaster.png",
       "implies": "Microsoft ASP.NET",
       "js": {
-        "kmPageInfo": "",
-        "kmGetSession": ""
+        "kmGetSession": "",
+        "kmPageInfo": ""
       },
       "website": "https://www.kobimaster.com.tr"
     },
+    "Koha": {
+      "cats": [
+        21
+      ],
+      "html": [
+        "<input name=\"koha_login_context\" value=\"intranet\" type=\"hidden\">",
+        "<a href=\"/cgi-bin/koha/"
+      ],
+      "icon": "koha.png",
+      "implies": "Perl",
+      "js": {
+        "KOHA": ""
+      },
+      "meta": {
+        "generator": "^Koha ([\\d.]+)$\\;version:\\1"
+      },
+      "website": "https://koha-community.org/"
+    },
     "Kohana": {
       "cats": [
-        "18"
+        18
       ],
+      "cookies": {
+        "kohanasession": ""
+      },
       "headers": {
-        "Set-Cookie": "kohanasession",
         "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1"
       },
       "icon": "Kohana.png",
@@ -4909,10 +5284,10 @@
     },
     "Koken": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "koken_referrer="
+      "cookies": {
+        "koken_referrer": ""
       },
       "html": [
         "<html lang=\"en\" class=\"k-source-essays k-lens-essays\">",
@@ -4931,7 +5306,7 @@
     },
     "Kolibri CMS": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "Kolibri"
@@ -4943,7 +5318,7 @@
     },
     "Komodo CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Komodo CMS.png",
       "implies": "PHP",
@@ -4954,7 +5329,7 @@
     },
     "Kontaktify": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Kontaktify.png",
       "script": "//(?:www\\.)?kontaktify\\.com/embed\\.js",
@@ -4962,7 +5337,7 @@
     },
     "Koobi": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1",
       "icon": "Koobi.png",
@@ -4973,10 +5348,10 @@
     },
     "Kooboo CMS": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
-        "X-KoobooCMS-Version": "(.*)\\;version:\\1"
+        "X-KoobooCMS-Version": "^(.+)$\\;version:\\1"
       },
       "icon": "Kooboo CMS.png",
       "implies": "Microsoft ASP.NET",
@@ -4985,19 +5360,24 @@
     },
     "Kotisivukone": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Kotisivukone.png",
       "script": "kotisivukone(?:\\.min)?\\.js",
       "website": "http://www.kotisivukone.fi"
     },
+    "Kubernetes Dashboard": {
+      "cats": [
+        47
+      ],
+      "html": "<html ng-app=\"kubernetesDashboard\">",
+      "icon": "Kubernetes.svg",
+      "website": "https://kubernetes.io/"
+    },
     "LEPTON": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "lep\\d+sessionid="
-      },
       "icon": "LEPTON.png",
       "implies": "PHP",
       "meta": {
@@ -5007,7 +5387,7 @@
     },
     "LabVIEW": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "LabVIEW(?:/([\\d\\.]+))?\\;version:\\1"
@@ -5017,45 +5397,52 @@
     },
     "Laravel": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "laravel_session"
+      "cookies": {
+        "laravel_session": ""
       },
       "icon": "Laravel.png",
       "implies": "PHP",
-      "website": "http://laravel.com"
+      "js": {
+        "Laravel": ""
+      },
+      "website": "https://laravel.com"
     },
-    "MYPAGE Platform": {
+    "Laterpay": {
       "cats": [
-        "1",
-        "6"
+        41
       ],
-      "headers": {
-        "Set-Cookie": "botble_session"
+      "icon": "laterpay.png",
+      "meta": {
+        "laterpay:connector:callbacks:on_user_has_access": "deobfuscateText"
       },
-      "icon": "mypage-platform.png",
-      "implies": "laravel",
-      "website": "https://www.mypage.vn"
+      "script": "https?://connectormwi\\.laterpay\\.net/([0-9.]+)[a-zA-z-]*/live/[\\w-]+\\.js\\;version:\\1",
+      "website": "https://www.laterpay.net/"
     },
     "Lazy.js": {
       "cats": [
-        "12"
+        59
       ],
       "script": "lazy(?:\\.browser)?(?:\\.min)?\\.js",
       "website": "http://danieltao.com/lazy.js"
     },
     "Leaflet": {
       "cats": [
-        "35"
+        35
       ],
       "icon": "Leaflet.png",
+      "js": {
+        "L.DistanceGrid": "",
+        "L.PosAnimation": "",
+        "L.version": "^(.+)$\\;version:\\1\\;confidence:0"
+      },
       "script": "leaflet.*\\.js",
       "website": "http://leafletjs.com"
     },
     "Less": {
       "cats": [
-        "19"
+        19
       ],
       "html": "<link[^>]+ rel=\"stylesheet/less\"",
       "icon": "Less.png",
@@ -5063,20 +5450,20 @@
     },
     "Liferay": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "Liferay": ""
-      },
       "headers": {
         "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
       },
       "icon": "Liferay.png",
+      "js": {
+        "Liferay": ""
+      },
       "website": "https://www.liferay.com"
     },
     "Lift": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Lift-Version": "(.+)\\;version:\\1"
@@ -5087,10 +5474,10 @@
     },
     "LightMon Engine": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "lm_online"
+      "cookies": {
+        "lm_online": ""
       },
       "html": "<!-- Lightmon Engine Copyright Lightmon",
       "icon": "LightMon Engine.png",
@@ -5102,7 +5489,7 @@
     },
     "Lightbox": {
       "cats": [
-        "12"
+        59
       ],
       "html": "<link [^>]*href=\"[^\"]+lightbox(?:\\.min)?\\.css",
       "icon": "Lightbox.png",
@@ -5111,7 +5498,7 @@
     },
     "Lightspeed eCom": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<!-- \\[START\\] 'blocks/head\\.rain' -->",
       "icon": "Lightspeed.svg",
@@ -5121,18 +5508,18 @@
     },
     "Lighty": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "lighty_version"
+      "cookies": {
+        "lighty_version": ""
       },
       "icon": "Lighty.png",
       "implies": "PHP",
-      "website": "http://gitlab.com/lighty/framework"
+      "website": "https://gitlab.com/lighty/framework"
     },
     "LimeSurvey": {
       "cats": [
-        "19"
+        19
       ],
       "headers": {
         "generator": "LimeSurvey"
@@ -5142,20 +5529,20 @@
     },
     "LinkSmart": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "LinkSmart.png",
       "js": {
-        "_mb_site_guid": "",
         "LS_JSON": "",
-        "LinkSmart": ""
+        "LinkSmart": "",
+        "_mb_site_guid": ""
       },
-      "icon": "LinkSmart.png",
       "script": "^https?://cdn\\.linksmart\\.com/linksmart_([\\d.]+?)(?:\\.min)?\\.js\\;version:\\1",
       "website": "http://linksmart.com"
     },
     "Linkedin": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Linkedin.svg",
       "script": "//platform\\.linkedin\\.com/in\\.js",
@@ -5163,18 +5550,18 @@
     },
     "List.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "List.js.png",
       "js": {
         "List": ""
       },
-      "icon": "List.js.png",
       "script": "^list\\.(?:min\\.)?js$",
       "website": "http://listjs.com"
     },
     "LiteSpeed": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^LiteSpeed$"
@@ -5184,48 +5571,57 @@
     },
     "Lithium": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "LITHIUM": ""
-      },
-      "headers": {
-        "Set-Cookie": "LithiumVisitor="
+      "cookies": {
+        "LithiumVisitor": ""
       },
       "html": " <a [^>]+Powered by Lithium",
       "icon": "Lithium.png",
       "implies": "PHP",
+      "js": {
+        "LITHIUM": ""
+      },
       "website": "https://www.lithium.com"
     },
     "LiveAgent": {
       "cats": [
-        "52"
+        52
       ],
+      "icon": "LiveAgent.png",
       "js": {
         "LiveAgent": ""
       },
-      "icon": "LiveAgent.png",
       "website": "https://www.ladesk.com"
     },
     "LiveChat": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "LiveChat.png",
       "script": "cdn\\.livechatinc\\.com/.*tracking\\.js",
       "website": "http://livechatinc.com"
     },
-    "LiveJournal": {
+    "LiveHelp": {
       "cats": [
-        "11"
+        52,
+        53
       ],
-      "icon": "LiveJournal.png",
-      "url": "\\.livejournal\\.com",
-      "website": "http://www.livejournal.com"
-    },
+      "icon": "LiveHelp.png",
+      "script": "^https?://server\\.livehelp\\.it/widgetjs/[0-9]{5}/[0-9]{1,3}\\.js",
+      "website": "http://www.livehelp.it"
+    },
+    "LiveJournal": {
+      "cats": [
+        11
+      ],
+      "icon": "LiveJournal.png",
+      "url": "\\.livejournal\\.com",
+      "website": "http://www.livejournal.com"
+    },
     "LivePerson": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "LivePerson.png",
       "script": "^https?://lptag\\.liveperson\\.net/tag/tag\\.js",
@@ -5233,36 +5629,36 @@
     },
     "LiveStreet CMS": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "LIVESTREET_SECURITY_KEY": ""
-      },
       "headers": {
         "X-Powered-By": "LiveStreet CMS"
       },
       "icon": "LiveStreet CMS.png",
       "implies": "PHP",
+      "js": {
+        "LIVESTREET_SECURITY_KEY": ""
+      },
       "website": "http://livestreetcms.com"
     },
     "Livefyre": {
       "cats": [
-        "15"
+        15
       ],
+      "html": "<[^>]+(?:id|class)=\"livefyre",
+      "icon": "Livefyre.png",
       "js": {
-        "fyre": "",
         "FyreLoader": "",
+        "L.version": "^(.+)$\\;confidence:0\\;version:\\1",
         "LF.CommentCount": "",
-        "L.version": "(.*)\\;confidence:0\\;version:\\1"
+        "fyre": ""
       },
-      "html": "<[^>]+(?:id|class)=\"livefyre",
-      "icon": "Livefyre.png",
       "script": "livefyre_init\\.js",
       "website": "http://livefyre.com"
     },
     "Liveinternet": {
       "cats": [
-        "10"
+        10
       ],
       "html": [
         "<script[^<>]*>[^]{0,128}?src\\s*=\\s*['\"]//counter\\.yadro\\.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
@@ -5274,17 +5670,9 @@
       "script": "/js/al/common\\.js\\?[0-9_]+",
       "website": "http://liveinternet.ru/rating/"
     },
-    "Lo-dash": {
-      "cats": [
-        "12"
-      ],
-      "icon": "Lo-dash.png",
-      "script": "lodash.*\\.js",
-      "website": "http://www.lodash.com"
-    },
     "Locomotive": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets",
       "icon": "Locomotive.png",
@@ -5294,10 +5682,23 @@
       ],
       "website": "http://www.locomotivecms.com"
     },
+    "Lodash": {
+      "cats": [
+        59
+      ],
+      "excludes": "Underscore.js",
+      "icon": "Lo-dash.png",
+      "js": {
+        "_.VERSION": "^(.+)$\\;confidence:0\\;version:\\1",
+        "_.differenceBy": ""
+      },
+      "script": "lodash.*\\.js",
+      "website": "http://www.lodash.com"
+    },
     "Logitech Media Server": {
       "cats": [
-        "22",
-        "38"
+        22,
+        38
       ],
       "headers": {
         "Server": "Logitech Media Server(?: \\(([\\d\\.]+))?\\;version:\\1"
@@ -5307,7 +5708,7 @@
     },
     "Lotus Domino": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Lotus-Domino"
@@ -5316,19 +5717,27 @@
       "implies": "Java",
       "website": "http://www-01.ibm.com/software/lotus/products/domino"
     },
+    "LOU": {
+      "cats": [
+        58
+      ],
+      "icon": "LOU.png",
+      "script": "cdn\\.louassist\\.com*",
+      "website": "https://www.louassist.com"
+    },
     "Lua": {
       "cats": [
-        "27"
+        27
       ],
       "headers": {
-        "X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1"
       },
       "icon": "Lua.png",
       "website": "http://www.lua.org"
     },
     "Lucene": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "Lucene.png",
       "implies": "Java",
@@ -5336,25 +5745,25 @@
     },
     "Luigi’s Box": {
       "cats": [
-        "10",
-        "29"
+        10,
+        29
       ],
+      "icon": "Luigisbox.svg",
       "js": {
         "Luigis": ""
       },
-      "icon": "Luigisbox.svg",
       "website": "https://www.luigisbox.com"
     },
     "M.R. Inc BoxyOS": {
       "cats": [
-        "28"
+        28
       ],
       "icon": "M.R. Inc.png",
       "website": "http://mrincworld.com"
     },
     "M.R. Inc SiteFrame": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "Powered-By": "M\\.R\\. Inc SiteFrame"
@@ -5364,7 +5773,7 @@
     },
     "M.R. Inc Webserver": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "M\\.R\\. Inc Webserver"
@@ -5377,35 +5786,17 @@
     },
     "MHonArc": {
       "cats": [
-        "50"
+        50
       ],
       "html": "<!-- MHonArc v([0-9.]+) -->\\;version:\\1",
       "icon": "mhonarc.png",
       "website": "http://www.mhonarc.at"
     },
-    "MOBOTIX": {
-      "cats": [
-        "39"
-      ],
-      "icon": "MOBOTIX.png",
-      "meta": {
-        "author": "MOBOTIX AG\\;confidence:40",
-        "copyright": "MOBOTIX AG\\;confidence:40",
-        "publisher": "MOBOTIX AG\\;confidence:40"
-      },
-      "url": "control/userimage\\.html\\;confidence:70",
-      "website": "http://mobotix.com"
-    },
     "MODX": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "MODX": "",
-        "MODX_MEDIA_PATH": ""
-      },
       "headers": {
-        "Set-Cookie": "SN5[a-f\\d]{12}",
         "X-Powered-By": "^MODX"
       },
       "html": [
@@ -5416,33 +5807,48 @@
       ],
       "icon": "MODX.png",
       "implies": "PHP",
+      "js": {
+        "MODX": "",
+        "MODX_MEDIA_PATH": ""
+      },
       "meta": {
         "generator": "MODX[^\\d.]*([\\d.]+)?\\;version:\\1"
       },
       "website": "http://modx.com"
     },
+    "MYPAGE Platform": {
+      "cats": [
+        1,
+        6
+      ],
+      "cookies": {
+        "botble_session": ""
+      },
+      "headers": {
+        "CMS-Version": "^(.+)$\\;version:\\1;confidence:0"
+      },
+      "icon": "mypage-platform.png",
+      "implies": "Laravel",
+      "website": "https://www.mypage.vn"
+    },
     "MadAdsMedia": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "MadAdsMedia.png",
       "js": {
         "setMIframe": "",
         "setMRefURL": ""
       },
-      "icon": "MadAdsMedia.png",
       "script": "^https?://(?:ads-by|pixel)\\.madadsmedia\\.com/",
       "website": "http://madadsmedia.com"
     },
     "Magento": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "Mage": "",
-        "VarienForm": ""
-      },
-      "headers": {
-        "Set-Cookie": "frontend=\\;confidence:50"
+      "cookies": {
+        "frontend": "\\;confidence:50"
       },
       "html": [
         "<script [^>]+data-requiremodule=\"mage/\\;version:2",
@@ -5450,18 +5856,24 @@
         "<script type=\"text/x-magento-init\">"
       ],
       "icon": "Magento.png",
-      "implies": "PHP",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "js": {
+        "Mage": "",
+        "VarienForm": ""
+      },
       "script": [
         "js/mage",
         "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
-        "static/_requirejs\\;confidence:50\\;version:2",
-        "static/frontend\\;confidence:20\\;version:2"
+        "static/_requirejs\\;confidence:50\\;version:2"
       ],
       "website": "https://magento.com"
     },
     "MailChimp": {
       "cats": [
-        "32"
+        32
       ],
       "html": [
         "<form [^>]*data-mailchimp-url",
@@ -5477,9 +5889,20 @@
       ],
       "website": "http://mailchimp.com"
     },
+    "MakeShopKorea": {
+      "cats": [
+        6
+      ],
+      "icon": "MakeShopKorea.png",
+      "js": {
+        "Makeshop": "",
+        "MakeshopLogUniqueId": ""
+      },
+      "website": "https://www.makeshop.co.kr"
+    },
     "Mambo": {
       "cats": [
-        "1"
+        1
       ],
       "excludes": "Joomla",
       "icon": "Mambo.png",
@@ -5490,7 +5913,7 @@
     },
     "MantisBT": {
       "cats": [
-        "13"
+        13
       ],
       "html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker",
       "icon": "MantisBT.png",
@@ -5499,7 +5922,7 @@
     },
     "ManyContacts": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "ManyContacts.png",
       "script": "\\/assets\\/js\\/manycontacts\\.min\\.js",
@@ -5507,43 +5930,57 @@
     },
     "Marionette.js": {
       "cats": [
-        "12"
+        12
       ],
-      "js": {
-        "Marionette": "",
-        "Marionette.VERSION": "(.*)\\;version:\\1"
-      },
       "icon": "Marionette.js.svg",
       "implies": [
         "Underscore.js",
         "Backbone.js"
       ],
+      "js": {
+        "Marionette": "",
+        "Marionette.VERSION": "^(.+)$\\;version:\\1"
+      },
       "script": "backbone\\.marionette.*\\.js",
       "website": "https://marionettejs.com"
     },
+    "Marked": {
+      "cats": [
+        59
+      ],
+      "icon": "marked.svg",
+      "js": {
+        "marked": ""
+      },
+      "script": "/marked(?:\\.min)?\\.js",
+      "website": "https://marked.js.org"
+    },
     "Marketo": {
       "cats": [
-        "32"
+        32
       ],
+      "icon": "Marketo.png",
       "js": {
         "Munchkin": ""
       },
-      "icon": "Marketo.png",
       "script": "munchkin\\.marketo\\.net/munchkin\\.js",
       "website": "https://www.marketo.com"
     },
     "Material Design Lite": {
       "cats": [
-        "18"
+        18
       ],
       "html": "<link[^>]* href=\"[^\"]*material(?:\\.[\\w]+-[\\w]+)?(?:\\.min)?\\.css",
       "icon": "Material Design Lite.png",
-      "script": "material(?:\\.min)?\\.js",
+      "js": {
+        "MaterialIconToggle": ""
+      },
+      "script": "(?:/([\\d.]+))?/material(?:\\.min)?\\.js\\;version:\\1",
       "website": "https://getmdl.io"
     },
     "Materialize CSS": {
       "cats": [
-        "18"
+        18
       ],
       "html": "<link[^>]* href=\"[^\"]*materialize(?:\\.min)?\\.css",
       "icon": "Materialize CSS.png",
@@ -5553,37 +5990,69 @@
     },
     "MathJax": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "MathJax.png",
       "js": {
         "MathJax": "",
-        "MathJax.version": "(.*)\\;version:\\1"
+        "MathJax.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "MathJax.png",
       "script": "([\\d.]+)?/mathjax\\.js\\;version:\\1",
       "website": "https://www.mathjax.org"
     },
-    "Mattermost": {
+    "Matomo": {
       "cats": [
-        "2"
+        10
       ],
+      "cookies": {
+        "PIWIK_SESSID": ""
+      },
+      "icon": "Piwik.png",
       "js": {
-        "mm_config": "",
-        "mm_license": "",
-        "mm_user": "",
-        "mm_current_user_id": ""
+        "Matomo": "",
+        "Piwik": "",
+        "_paq": ""
+      },
+      "meta": {
+        "apple-itunes-app": "app-id=737216887",
+        "generator": "(?:Matomo|Piwik) - Open Source Web Analytics",
+        "google-play-app": "app-id=org\\.piwik\\.mobile2"
       },
+      "script": "piwik\\.js|piwik\\.php",
+      "website": "http://piwik.org"
+    },
+    "Mattermost": {
+      "cats": [
+        2
+      ],
       "html": "<noscript> To use Mattermost, please enable JavaScript\\. </noscript>",
       "icon": "mattermost.png",
       "implies": [
         "Go",
         "React"
       ],
+      "js": {
+        "mm_config": "",
+        "mm_current_user_id": "",
+        "mm_license": "",
+        "mm_user": ""
+      },
       "website": "https://about.mattermost.com"
     },
+    "Mautic": {
+      "cats": [
+        32
+      ],
+      "icon": "mautic.svg",
+      "js": {
+        "MauticTrackingObject": ""
+      },
+      "script": "[^a-z]mtc.*\\.js",
+      "website": "https://www.mautic.org/"
+    },
     "MaxCDN": {
       "cats": [
-        "31"
+        31
       ],
       "headers": {
         "Server": "^NetDNA",
@@ -5594,7 +6063,7 @@
     },
     "MaxSite CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "MaxSite CMS.png",
       "implies": "PHP",
@@ -5605,7 +6074,7 @@
     },
     "Mean.io": {
       "cats": [
-        "12"
+        12
       ],
       "headers": {
         "X-Powered-CMS": "Mean\\.io"
@@ -5614,24 +6083,24 @@
       "implies": [
         "MongoDB",
         "Express",
-        "AngularJS"
+        "Angular"
       ],
       "website": "http://mean.io"
     },
     "MediaElement.js": {
       "cats": [
-        "14"
+        14
       ],
+      "icon": "MediaElement.js.png",
       "js": {
         "mejs": "",
-        "mejs.version": "(.*)\\;version:\\1"
+        "mejs.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "MediaElement.js.png",
       "website": "http://www.mediaelementjs.com"
     },
     "MediaTomb": {
       "cats": [
-        "38"
+        38
       ],
       "headers": {
         "Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1"
@@ -5641,31 +6110,39 @@
     },
     "MediaWiki": {
       "cats": [
-        "8"
+        8
+      ],
+      "html": [
+        "<body[^>]+class=\"mediawiki\"",
+        "<(?:a|img)[^>]+>Powered by MediaWiki</a>",
+        "<a[^>]+/Special:WhatLinksHere/"
       ],
-      "html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)",
       "icon": "MediaWiki.png",
       "implies": "PHP",
+      "js": {
+        "mw.util.toggleToc": ""
+      },
       "meta": {
-        "generator": "^MediaWiki ?([\\d.]+)$\\;version:\\1"
+        "generator": "^MediaWiki ?(.+)$\\;version:\\1"
       },
-      "website": "http://www.mediawiki.org"
+      "website": "https://www.mediawiki.org"
     },
     "Medium": {
       "cats": [
-        "1"
+        11
       ],
       "headers": {
         "X-Powered-By": "^Medium$"
       },
       "icon": "Medium.svg",
+      "implies": "Node.js",
       "script": "medium\\.com",
       "url": "^https?://(?:www\\.)?medium\\.com",
       "website": "https://medium.com"
     },
     "Meebo": {
       "cats": [
-        "5"
+        5
       ],
       "html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\('domReady'\\))",
       "icon": "Meebo.png",
@@ -5673,8 +6150,8 @@
     },
     "Melis CMS V2": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
       "html": "<!-- Rendered with Melis CMS V2",
       "icon": "meliscmsv2.png",
@@ -5683,29 +6160,37 @@
       },
       "website": "http://www.melistechnology.com/"
     },
-    "Meteor": {
+    "Mermaid": {
       "cats": [
-        "12"
+        25
       ],
+      "html": "<div [^>]*class=[\"']mermaid[\"']>\\;confidence:90",
       "js": {
-        "Meteor": "",
-        "METEOR_VERSION": ""
+        "mermaid": ""
       },
+      "script": "/mermaid(?:\\.min)?\\.js",
+      "website": "https://mermaidjs.github.io/"
+    },
+    "Meteor": {
+      "cats": [
+        12
+      ],
       "html": "<link[^>]+__meteor-css__",
       "icon": "Meteor.png",
       "implies": [
         "MongoDB",
         "Node.js"
       ],
-      "website": "http://meteor.com"
+      "js": {
+        "Meteor": "",
+        "Meteor.release": "^METEOR@([\\d.]+)\\;version:\\1"
+      },
+      "website": "https://www.meteor.com"
     },
     "Methode": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "eidosBase": ""
-      },
       "html": "<!-- Methode uuid: \"[a-f\\d]+\" ?-->",
       "icon": "Methode.png",
       "meta": {
@@ -5715,103 +6200,107 @@
         "eomportal-loid": "[\\d.]+",
         "eomportal-uuid": "[a-f\\d]+"
       },
-      "website": "http://www.eidosmedia.com/solutions"
+      "website": "https://www.eidosmedia.com/"
     },
     "Microsoft ASP.NET": {
       "cats": [
-        "18"
+        18
       ],
+      "cookies": {
+        "ASP.NET_SessionId": "",
+        "ASPSESSION": ""
+      },
       "headers": {
-        "Set-Cookie": "ASPSESSION|ASP\\.NET_SessionId",
         "X-AspNet-Version": "(.+)\\;version:\\1",
-        "X-Powered-By": "ASP\\.NET\\;confidence:50"
+        "X-Powered-By": "^ASP\\.NET"
       },
       "html": "<input[^>]+name=\"__VIEWSTATE",
       "icon": "Microsoft ASP.NET.png",
       "implies": "IIS\\;confidence:50",
-      "url": "\\.aspx(?:$|\\?)",
-      "website": "http://www.asp.net"
-    },
-    "Microsoft HTTPAPI": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Microsoft.svg",
-      "website": "http://microsoft.com"
+      "url": "\\.aspx?(?:$|\\?)",
+      "website": "https://www.asp.net"
     },
     "Microsoft Excel": {
       "cats": [
-        "20"
+        20
       ],
-      "icon": "Microsoft Excel.svg",
       "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:excel\"|<!--\\s*(?:START|END) OF OUTPUT FROM EXCEL PUBLISH AS WEB PAGE WIZARD\\s*-->|<div [^>]*x:publishsource=\"?Excel\"?)",
+      "icon": "Microsoft Excel.svg",
       "meta": {
-        "generator": "Microsoft Excel( [\\d.]+)?\\;version:\\1",
-        "ProgId": "^Excel\\."
+        "ProgId": "^Excel\\.",
+        "generator": "Microsoft Excel( [\\d.]+)?\\;version:\\1"
       },
       "website": "https://office.microsoft.com/excel"
     },
+    "Microsoft HTTPAPI": {
+      "cats": [
+        22
+      ],
+      "headers": {
+        "Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
+      },
+      "icon": "Microsoft.png",
+      "website": "http://microsoft.com"
+    },
     "Microsoft PowerPoint": {
       "cats": [
-        "20"
+        20
       ],
-      "icon": "Microsoft PowerPoint.svg",
       "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:powerpoint\"|<link rel=\"?Presentation-XML\"? href=\"?[^\"]+\\.xml\"?>|<o:PresentationFormat>[^<]+</o:PresentationFormat>[^!]+<o:Slides>\\d+</o:Slides>(?:[^!]+<o:Version>([\\d.]+)</o:Version>)?)\\;version:\\1",
+      "icon": "Microsoft PowerPoint.svg",
       "meta": {
-        "generator": "Microsoft PowerPoint ( [\\d.]+)?\\;version:\\1",
-        "ProgId": "^PowerPoint\\."
+        "ProgId": "^PowerPoint\\.",
+        "generator": "Microsoft PowerPoint ( [\\d.]+)?\\;version:\\1"
       },
       "website": "https://office.microsoft.com/powerpoint"
     },
     "Microsoft Publisher": {
       "cats": [
-        "20"
+        20
       ],
-      "icon": "Microsoft Publisher.svg",
       "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:publisher\"|<!--[if pub]><xml>)",
+      "icon": "Microsoft Publisher.svg",
       "meta": {
-        "generator": "Microsoft Publisher( [\\d.]+)?\\;version:\\1",
-        "ProgId": "^Publisher\\."
+        "ProgId": "^Publisher\\.",
+        "generator": "Microsoft Publisher( [\\d.]+)?\\;version:\\1"
       },
       "website": "https://office.microsoft.com/publisher"
     },
     "Microsoft SharePoint": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "_spBodyOnLoadCalled": ""
-      },
       "headers": {
-        "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1",
+        "MicrosoftSharePointTeamServices": "^(.+)$\\;version:\\1",
         "SPRequestGuid": "",
         "SharePointHealthScore": "",
         "X-SharePointHealthScore": ""
       },
       "icon": "Microsoft SharePoint.png",
+      "js": {
+        "SPDesignerProgID": "",
+        "_spBodyOnLoadCalled": ""
+      },
       "meta": {
         "generator": "Microsoft SharePoint"
       },
-      "website": "http://sharepoint.microsoft.com"
+      "website": "https://sharepoint.microsoft.com"
     },
     "Microsoft Word": {
       "cats": [
-        "20"
+        20
       ],
-      "icon": "Microsoft Word.svg",
       "html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:word\"|<w:WordDocument>|<div [^>]*class=\"?WordSection1[\" >]|<style[^>]*>[^>]*@page WordSection1)",
+      "icon": "Microsoft Word.svg",
       "meta": {
-        "generator": "Microsoft Word( [\\d.]+)?\\;version:\\1",
-        "ProgId": "^Word\\."
+        "ProgId": "^Word\\.",
+        "generator": "Microsoft Word( [\\d.]+)?\\;version:\\1"
       },
       "website": "https://office.microsoft.com/word"
     },
     "Mietshop": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<a href=\"https://ssl\\.mietshop\\.d",
       "icon": "mietshop.png",
@@ -5822,25 +6311,34 @@
     },
     "Milligram": {
       "cats": [
-        "18"
+        18
       ],
       "html": [
         "<link[^>]+?href=\"[^\"]+milligram(?:\\.min)?\\.css"
       ],
       "icon": "Milligram.png",
-      "website": "http://milligram.github.io"
+      "website": "https://milligram.github.io"
+    },
+    "Minero.cc": {
+      "cats": [
+        56
+      ],
+      "script": [
+        "//minero\\.cc/lib/minero(?:-miner|-hidden)?\\.min\\.js"
+      ],
+      "website": "http://minero.cc/"
     },
     "MiniBB": {
       "cats": [
-        "2"
+        2
       ],
-      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\n<!--End of copyright link",
+      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\\n<!--End of copyright link",
       "icon": "MiniBB.png",
       "website": "http://www.minibb.com"
     },
     "MiniServ": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "MiniServ\\/?([\\d\\.]+)?\\;version:\\1"
@@ -5849,74 +6347,105 @@
     },
     "Mint": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Mint.png",
       "js": {
         "Mint": ""
       },
-      "icon": "Mint.png",
       "script": "mint/\\?js",
-      "website": "http://haveamint.com"
+      "website": "https://haveamint.com"
+    },
+    "Mithril": {
+      "cats": [
+        12
+      ],
+      "icon": "Mithril.svg",
+      "script": "mithril/\\?js",
+      "website": "https://mithril.js.org"
     },
     "Mixpanel": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Mixpanel.png",
       "js": {
-        "Mixpanel": ""
+        "mixpanel": ""
       },
-      "icon": "Mixpanel.png",
       "script": "api\\.mixpanel\\.com/track",
-      "website": "http://mixpanel.com"
+      "website": "https://mixpanel.com"
+    },
+    "MkDocs": {
+      "cats": [
+        4
+      ],
+      "icon": "mkdocs.png",
+      "meta": {
+        "generator": "^mkdocs-([\\d.]+)\\;version:\\1"
+      },
+      "website": "http://www.mkdocs.org/"
     },
     "Mobify": {
       "cats": [
-        "26"
+        26
       ],
+      "icon": "Mobify.png",
       "js": {
         "Mobify": ""
       },
-      "icon": "Mobify.png",
-      "script": "mobify\\.com",
-      "website": "http://www.mobify.com"
+      "script": "//cdn\\.mobify\\.com/",
+      "website": "https://www.mobify.com"
+    },
+    "Mobirise": {
+      "cats": [
+        51
+      ],
+      "html": [
+        "<!-- Site made with Mobirise Website Builder v([\\d.]+)\\;version:\\1"
+      ],
+      "icon": "mobirise.png",
+      "meta": {
+        "generator": "^Mobirise v([\\d.]+)\\;version:\\1"
+      },
+      "website": "https://mobirise.com"
     },
     "MochiKit": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "MochiKit.png",
       "js": {
-        "MochiKit": ""
+        "MochiKit": "",
+        "MochiKit.MochiKit.VERSION": "^(.+)$\\;version:\\1"
       },
-      "icon": "MochiKit.png",
       "script": "MochiKit(?:\\.min)?\\.js",
-      "website": "http://mochikit.com"
+      "website": "https://mochi.github.io/mochikit/"
     },
     "MochiWeb": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "MochiWeb(?:/([\\d.]+))?\\;version:\\1"
       },
-      "website": "http://github.com/mochi/mochiweb"
+      "website": "https://github.com/mochi/mochiweb"
     },
     "Modernizr": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Modernizr.svg",
       "js": {
-        "Modernizr": ""
+        "Modernizr._version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Modernizr.svg",
       "script": [
-        "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-        "/([\\d.]+)/modernizr(?:\\.min)?\\.js\\;version:\\1"
+        "([\\d.]+)?/modernizr(?:.([\\d.]+))?.*\\.js\\;version:\\1?\\1:\\2"
       ],
-      "website": "http://www.modernizr.com"
+      "website": "https://modernizr.com"
     },
     "Modified": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "modified.png",
       "meta": {
@@ -5926,33 +6455,37 @@
     },
     "Moguta.CMS": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
-      "html": "(?:<script|link)[^>]*(?:src=|href=)[\"'][^\"]*mg-(?:core|plugins|templates)",
+      "html": "<link[^>]+href=[\"'][^\"]+mg-(?:core|plugins|templates)/",
+      "script": "mg-(?:core|plugins|templates)/",
       "icon": "Moguta.CMS.png",
       "implies": "PHP",
-      "website": "http://moguta.ru"
+      "website": "https://moguta.ru"
     },
     "MoinMoin": {
       "cats": [
-        "8"
+        8
       ],
-      "js": {
-        "show_switch2gui": ""
+      "cookies": {
+        "MOIN_SESSION": ""
       },
       "icon": "MoinMoin.png",
       "implies": "Python",
+      "js": {
+        "show_switch2gui": ""
+      },
       "script": "moin(?:_static(\\d)(\\d)(\\d)|.+)/common/js/common\\.js\\;version:\\1.\\2.\\3",
-      "website": "http://moinmo.in"
+      "website": "https://moinmo.in"
     },
     "Mojolicious": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
-        "x-powered-by": "mojolicious",
-        "server": "^mojolicious"
+        "server": "^mojolicious",
+        "x-powered-by": "mojolicious"
       },
       "icon": "Mojolicious.png",
       "implies": "Perl",
@@ -5960,7 +6493,7 @@
     },
     "Mollom": {
       "cats": [
-        "16"
+        16
       ],
       "html": "<img[^>]+\\.mollom\\.com",
       "icon": "Mollom.png",
@@ -5969,27 +6502,28 @@
     },
     "Moment Timezone": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "Moment.js.svg",
       "implies": "Moment.js",
-      "script": "moment-timezone(?:\\-data)?(?:\\.min)?\\.js",
+      "script": "moment-timezone(?:-data)?(?:\\.min)?\\.js",
       "website": "http://momentjs.com/timezone/"
     },
     "Moment.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Moment.js.svg",
       "js": {
-        "moment": ""
+        "moment": "",
+        "moment.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Moment.js.svg",
       "script": "moment(?:\\.min)?\\.js",
-      "website": "http://momentjs.com"
+      "website": "https://momentjs.com"
     },
     "Mondo Media": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Mondo Media.png",
       "meta": {
@@ -5997,16 +6531,24 @@
       },
       "website": "http://mondo-media.de"
     },
+    "Monerominer": {
+      "cats": [
+        56
+      ],
+      "html": "<iframe[^>]+src=[\\'\"]https?://monerominer\\.rocks/miner\\.php\\?siteid=",
+      "icon": "monerominer.png",
+      "website": "https://monerominer.rocks/"
+    },
     "MongoDB": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "MongoDB.png",
       "website": "http://www.mongodb.org"
     },
     "Mongrel": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Mongrel"
@@ -6017,7 +6559,7 @@
     },
     "Monkey HTTP Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Monkey/?([\\d.]+)?\\;version:\\1"
@@ -6025,17 +6567,9 @@
       "icon": "Monkey HTTP Server.png",
       "website": "http://monkey-project.com"
     },
-    "Monerominer": {
-      "cats": [
-        "56"
-      ],
-      "html": "<iframe[^>]+src=[\\'\"]https?://monerominer\\.rocks/miner\\.php\\?siteid=",
-      "icon": "monerominer.png",
-      "website": "https://monerominer.rocks/"
-    },
     "Mono": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "Mono"
@@ -6045,40 +6579,43 @@
     },
     "Mono.net": {
       "cats": [
-        "1"
+        1
       ],
+      "icon": "Mono.net.png",
+      "implies": "Matomo",
       "js": {
         "_monoTracker": ""
       },
-      "icon": "Mono.net.png",
-      "implies": "Piwik",
       "script": "monotracker(?:\\.min)?\\.js",
-      "website": "http://www.mono.net"
+      "website": "https://www.mono.net/en"
     },
     "MooTools": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "MooTools.png",
       "js": {
-        "MooTools": ""
+        "MooTools": "",
+        "MooTools.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "MooTools.png",
       "script": "mootools.*\\.js",
-      "website": "http://mootools.net"
+      "website": "https://mootools.net"
     },
     "Moodle": {
       "cats": [
-        "21"
+        21
       ],
-      "js": {
-        "moodle": ""
-      },
-      "headers": {
-        "Set-Cookie": "(?:MoodleSession|MOODLEID_)"
+      "cookies": {
+        "MOODLEID_": "",
+        "MoodleSession": ""
       },
       "html": "<img[^>]+moodlelogo",
       "icon": "Moodle.png",
       "implies": "PHP",
+      "js": {
+        "M.core": "",
+        "Y.Moodle": ""
+      },
       "meta": {
         "keywords": "^moodle"
       },
@@ -6086,25 +6623,15 @@
     },
     "Moon": {
       "cats": [
-        "12"
+        12
       ],
       "icon": "moon.svg",
       "script": "/moon(?:\\.min)?\\.js$",
-      "website": "http://moonjs.ga/"
-    },
-    "Motion-httpd": {
-      "cats": [
-        "22"
-      ],
-      "excludes": "Apache",
-      "headers": {
-        "Server": "Motion-httpd(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://lavrsen.dk/foswiki/bin/view/Motion"
+      "website": "https://kbrsh.github.io/moon/"
     },
     "MotoCMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<link [^>]*href=\"[^>]*\\/mt-content\\/[^>]*\\.css",
       "icon": "MotoCMS.svg",
@@ -6113,12 +6640,25 @@
         "AngularJS",
         "jQuery"
       ],
-      "script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
+      "script": "/mt-includes/js/website(?:assets)?\\.(?:min)?\\.js",
       "website": "http://motocms.com"
     },
+    "Mouse Flow": {
+      "cats": [
+        10
+      ],
+      "icon": "mouseflow.png",
+      "js": {
+        "_mfq": ""
+      },
+      "script": [
+        "cdn\\.mouseflow\\.com"
+      ],
+      "website": "https://mouseflow.com/"
+    },
     "Movable Type": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Movable Type.png",
       "meta": {
@@ -6126,19 +6666,9 @@
       },
       "website": "http://movabletype.org"
     },
-    "Moxa": {
-      "cats": [
-        "37"
-      ],
-      "headers": {
-        "Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Moxa.png",
-      "website": "http://moxa.com"
-    },
     "Mozard Suite": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Mozard Suite.png",
       "meta": {
@@ -6149,8 +6679,8 @@
     },
     "Mura CMS": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
       "icon": "Mura CMS.png",
       "implies": "Adobe ColdFusion",
@@ -6161,33 +6691,33 @@
     },
     "Mustache": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Mustache.png",
       "js": {
-        "Mustache": ""
+        "Mustache.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Mustache.png",
       "script": "mustache(?:\\.min)?\\.js",
-      "website": "http://mustache.github.com"
+      "website": "https://mustache.github.io"
     },
     "MyBB": {
       "cats": [
-        "2"
+        2
       ],
-      "js": {
-        "MyBB": ""
-      },
       "html": "(?:<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
       "icon": "MyBB.png",
       "implies": [
         "PHP",
         "MySQL"
       ],
-      "website": "http://www.mybb.com"
+      "js": {
+        "MyBB": ""
+      },
+      "website": "https://mybb.com"
     },
     "MyBlogLog": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "MyBlogLog.png",
       "script": "pub\\.mybloglog\\.com",
@@ -6195,14 +6725,14 @@
     },
     "MySQL": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "MySQL.svg",
       "website": "http://mysql.com"
     },
     "Mynetcap": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Mynetcap.png",
       "meta": {
@@ -6210,69 +6740,41 @@
       },
       "website": "http://www.netcap-creation.fr"
     },
-    "NOIX": {
+    "NEO - Omnichannel Commerce Platform": {
       "cats": [
-        "19"
+        6
       ],
-      "html": "(?:<[^>]+(?:src|href)=[^>]*/media/noix|<!-- NOIX)",
-      "icon": "NOIX.png",
-      "website": "http://www.noix.com.br/tecnologias/joomla"
+      "headers": {
+        "powered": "jet-neo"
+      },
+      "icon": "Plataforma NEO.svg",
+      "website": "http://www.jetecommerce.com.br/"
     },
     "NVD3": {
       "cats": [
-        "25"
+        25
       ],
-      "js": {
-        "nv": "\\;confidence:20"
-      },
       "html": "<link[^>]* href=[^>]+nv\\.d3(?:\\.min)?\\.css",
       "icon": "NVD3.png",
       "implies": "D3",
+      "js": {
+        "nv.addGraph": "",
+        "nv.version": "^(.+)$\\;confidence:0\\;version:\\1"
+      },
       "script": "nv\\.d3(?:\\.min)?\\.js",
       "website": "http://nvd3.org"
     },
     "Navegg": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "Navegg.png",
       "script": "tag\\.navdmp\\.com",
       "website": "https://www.navegg.com/"
     },
-    "Nedstat": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "sitestat": ""
-      },
-      "icon": "Nedstat.png",
-      "website": "http://www.nedstat.com"
-    },
-    "NEO - Omnichannel Commerce Platform": {
-      "cats": [
-        "6"
-      ],
-      "headers": {
-        "powered": "jet-neo"
-      },
-      "icon": "Plataforma NEO.svg",
-      "website": "http://www.jetecommerce.com.br/"
-    },
-    "Neonclear": {
-      "cats": [
-        "12"
-      ],
-      "icon": "Neonclear.png",
-      "js": {
-        "neon": ""
-      },
-      "script": "/neonclear(?:\\.min|\\.dev)?\\.js",
-      "website": "http://neon.atm.re"
-    },
     "Neos CMS": {
       "cats": [
-        "1"
+        1
       ],
       "excludes": "TYPO3 CMS",
       "headers": {
@@ -6281,11 +6783,11 @@
       "icon": "Neos.svg",
       "implies": "Neos Flow",
       "url": "/neos/",
-      "website": "http://neos.io"
+      "website": "https://neos.io"
     },
     "Neos Flow": {
       "cats": [
-        "18"
+        18
       ],
       "excludes": "TYPO3 CMS",
       "headers": {
@@ -6293,11 +6795,11 @@
       },
       "icon": "Neos.svg",
       "implies": "PHP",
-      "website": "http://flow.neos.io"
+      "website": "https://flow.neos.io"
     },
     "Nepso": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-CMS": "Nepso"
@@ -6307,56 +6809,45 @@
     },
     "Netlify": {
       "cats": [
-        "22",
-        "31"
+        22,
+        31
       ],
       "headers": {
-        "Server": "Netlify"
+        "X-NF-Request-ID": "",
+        "Server": "^Netlify"
       },
       "icon": "Netlify.svg",
       "website": "https://www.netlify.com/"
     },
-    "Netmonitor": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "netmonitor": ""
-      },
-      "icon": "Netmonitor.png",
-      "script": "netmonitor\\.fi/nmtracker\\.js",
-      "website": "http://netmonitor.fi/en"
-    },
     "Neto": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Neto.svg",
       "js": {
         "NETO": ""
       },
-      "icon": "Neto.svg",
       "script": "jquery\\.neto.*\\.js",
-      "website": "http://www.neto.com.au"
+      "website": "https://www.neto.com.au"
     },
     "Netsuite": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "NS_VER="
+      "cookies": {
+        "NS_VER": ""
       },
       "icon": "Netsuite.png",
       "website": "http://netsuite.com"
     },
     "Nette Framework": {
       "cats": [
-        "18"
+        18
       ],
-      "js": {
-        "Nette": ""
+      "cookies": {
+        "nette-browser": ""
       },
       "headers": {
-        "Set-Cookie": "nette-browser=",
         "X-Powered-By": "^Nette Framework"
       },
       "html": [
@@ -6366,71 +6857,77 @@
       ],
       "icon": "Nette Framework.png",
       "implies": "PHP",
-      "website": "http://nette.org"
+      "js": {
+        "Nette": "",
+        "Nette.version": "^(.+)$\\;version:\\1"
+      },
+      "website": "https://nette.org"
     },
     "New Relic": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "New Relic.png",
       "js": {
-        "NREUM": ""
+        "NREUM": "",
+        "newrelic": ""
       },
-      "icon": "New Relic.png",
-      "website": "http://newrelic.com"
-    },
-    "NextGEN Gallery": {
-      "cats": [
-        "7"
-      ],
-      "icon": "NextGEN Gallery.png",
-      "html": [
-        "<!-- <meta name=\"NextGEN\" version=\"([\\d.]+)\" /> -->\\;version:\\1"
-      ],
-      "script": "/nextgen-gallery/js/",
-      "implies": [
-        "WordPress"
-      ],
-      "website": "https://www.imagely.com/wordpress-gallery-plugin"
+      "website": "https://newrelic.com"
     },
     "Next.js": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "x-powered-by": "^Next\\.js ?([0-9.]+)?\\;version:\\1"
       },
-      "js": {
-        "__NEXT_DATA__": ""
-      },
       "icon": "zeit.svg",
       "implies": [
         "React",
         "webpack",
         "Node.js"
       ],
-      "website": "https://zeit.co/next"
+      "js": {
+        "__NEXT_DATA__": ""
+      },
+      "website": "https://github.com/zeit/next.js"
+    },
+    "NextGEN Gallery": {
+      "cats": [
+        7
+      ],
+      "html": [
+        "<!-- <meta name=\"NextGEN\" version=\"([\\d.]+)\" /> -->\\;version:\\1"
+      ],
+      "icon": "NextGEN Gallery.png",
+      "implies": [
+        "WordPress"
+      ],
+      "script": "/nextgen-gallery/js/",
+      "website": "https://www.imagely.com/wordpress-gallery-plugin"
     },
     "Nginx": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "nginx(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "nginx(?:/([\\d.]+))?\\;version:\\1",
+        "X-Fastcgi-Cache": ""
       },
       "icon": "Nginx.svg",
       "website": "http://nginx.org/en"
     },
     "Node.js": {
       "cats": [
-        "27"
+        27
       ],
       "icon": "node.js.png",
       "website": "http://nodejs.org"
     },
     "NodeBB": {
       "cats": [
-        "2"
+        2
       ],
       "headers": {
         "X-Powered-By": "^NodeBB$"
@@ -6442,17 +6939,20 @@
     },
     "Now": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "server": "^now$"
+        "server": "^now$",
+        "x-now-trace": "",
+        "x-now-id": "",
+        "x-now-cache": ""
       },
       "icon": "zeit.svg",
       "website": "https://zeit.co/now"
     },
     "OWL Carousel": {
       "cats": [
-        "5"
+        5
       ],
       "html": "<link [^>]*href=\"[^\"]+owl\\.carousel(?:\\.min)?\\.css",
       "icon": "OWL Carousel.png",
@@ -6462,24 +6962,25 @@
     },
     "OXID eShop": {
       "cats": [
-        "6"
+        6
       ],
+      "html": "<!--[^-]*OXID eShop",
+      "icon": "OXID eShop.png",
       "js": {
-        "oxTopMenu": "",
-        "oxModalPopup": "",
+        "oxCookieNote": "",
+        "oxInputValidator": "",
         "oxLoginBox": "",
-        "oxInputValidator": ""
+        "oxModalPopup": "",
+        "oxTopMenu": ""
       },
-      "html": "<!--[^-]*OXID eShop",
-      "icon": "OXID eShop.png",
-      "website": "http://oxid-esales.com"
+      "website": "https://en.oxid-esales.com/en/home.html"
     },
     "October CMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "october_session="
+      "cookies": {
+        "october_session=": ""
       },
       "icon": "October CMS.png",
       "implies": "Laravel",
@@ -6487,8 +6988,7 @@
     },
     "Octopress": {
       "cats": [
-        "1",
-        "11"
+        57
       ],
       "html": "Powered by <a href=\"http://octopress\\.org\">",
       "icon": "octopress.png",
@@ -6496,12 +6996,13 @@
       "meta": {
         "generator": "Octopress"
       },
+      "script": "/octopress\\.js",
       "website": "http://octopress.org"
     },
     "Odoo": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
       "html": "<link[^>]* href=[^>]+/web/css/(?:web\\.assets_common/|website\\.assets_frontend/)\\;confidence:25",
       "icon": "Odoo.png",
@@ -6519,52 +7020,45 @@
     },
     "Olark": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "Olark.png",
       "script": "^https?:\\/\\/static\\.olark\\.com\\/jsclient\\/loader1\\.js",
       "website": "https://www.olark.com/"
     },
-    "OmniTouch 8660 My Teamwork": {
-      "cats": [
-        "19"
-      ],
-      "icon": "OmniTouch 8660 My Teamwork.png",
-      "website": "http://enterprise.alcatel-lucent.com"
-    },
     "OneAPM": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "OneAPM.png",
       "js": {
         "BWEUM": ""
       },
-      "icon": "OneAPM.png",
       "website": "http://www.oneapm.com"
     },
     "OneStat": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "OneStat.png",
       "js": {
-        "OneStat": ""
+        "OneStat_Pageview": ""
       },
-      "icon": "OneStat.png",
       "website": "http://www.onestat.com"
     },
     "Open AdStream": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Open AdStream.png",
       "js": {
         "OAS_AD": ""
       },
-      "icon": "Open AdStream.png",
-      "website": "http://xaxis.com"
+      "website": "https://www.xaxis.com"
     },
     "Open Classifieds": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Open Classifieds.png",
       "meta": {
@@ -6575,10 +7069,10 @@
     },
     "Open Journal Systems": {
       "cats": [
-        "50"
+        50
       ],
-      "headers": {
-        "Set-Cookie": "\bOJSSID\b"
+      "cookies": {
+        "OJSSID": ""
       },
       "icon": "Open Journal Systems.png",
       "implies": "PHP",
@@ -6589,19 +7083,20 @@
     },
     "Open Web Analytics": {
       "cats": [
-        "10"
+        10
       ],
-      "js": {
-        "owa_": "",
-        "_owa_": ""
-      },
       "html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
       "icon": "Open Web Analytics.png",
-      "website": "http://openwebanalytics.com"
+      "js": {
+        "OWA.config.baseUrl": "",
+        "owa_baseUrl": "",
+        "owa_cmds": ""
+      },
+      "website": "http://www.openwebanalytics.com"
     },
     "Open eShop": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Open eShop.png",
       "implies": "PHP",
@@ -6613,7 +7108,7 @@
     },
     "OpenCart": {
       "cats": [
-        "6"
+        6
       ],
       "html": "(?:index\\.php\\?route=[a-z]+/|Powered By <a href=\"[^>]+OpenCart)",
       "icon": "OpenCart.png",
@@ -6622,7 +7117,7 @@
     },
     "OpenCms": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "Server": "OpenCms"
@@ -6635,7 +7130,7 @@
     },
     "OpenGSE": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "GSE"
@@ -6646,10 +7141,10 @@
     },
     "OpenGrok": {
       "cats": [
-        "19"
+        19
       ],
-      "headers": {
-        "Set-Cookie": "OpenGrok"
+      "cookies": {
+        "OpenGrok": ""
       },
       "icon": "OpenGrok.png",
       "implies": "Java",
@@ -6660,18 +7155,19 @@
     },
     "OpenLayers": {
       "cats": [
-        "35"
+        35
       ],
+      "icon": "OpenLayers.png",
       "js": {
-        "OpenLayers": ""
+        "OpenLayers.VERSION_NUMBER": "([\\d.]+)\\;version:\\1",
+        "ol.CanvasMap": ""
       },
-      "icon": "OpenLayers.png",
       "script": "openlayers",
-      "website": "http://openlayers.org"
+      "website": "https://openlayers.org"
     },
     "OpenNemas": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "OpenNemas"
@@ -6684,7 +7180,7 @@
     },
     "OpenResty": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "openresty(?:/([\\d.]+))?\\;version:\\1"
@@ -6698,7 +7194,7 @@
     },
     "OpenSSL": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1"
@@ -6708,7 +7204,7 @@
     },
     "OpenText Web Solutions": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<!--[^>]+published by Open Text Web Solutions",
       "icon": "OpenText Web Solutions.png",
@@ -6717,47 +7213,18 @@
     },
     "OpenUI5": {
       "cats": [
-        "12"
+        12
       ],
       "icon": "OpenUI5.png",
       "js": {
-        "sap.ui": ""
+        "sap.ui.version": "^(.+)$\\;version:\\1"
       },
       "script": "sap-ui-core\\.js",
       "website": "http://openui5.org/"
     },
-    "Minero.cc": {
-      "cats": [
-        "56"
-      ],
-      "script": [
-        "//minero\\.cc/lib/minero(?:-miner|-hidden)?\\.min\\.js"
-      ],
-      "website": "http://minero.cc/"
-    },
-    "Coinhave": {
-      "cats": [
-        "56"
-      ],
-      "script": "https?://coin-have\\.com/c/[0-9a-zA-Z]{4}\\.js",
-      "icon": "coinhave.png",
-      "website": "https://coin-have.com/"
-    },
-    "Revslider": {
-      "cats": [
-        "19"
-      ],
-      "icon": "revslider.png",
-      "html": [
-        "<link[^>]* href=[\\'\"][^']+revslider[/\\w-]+\\.css\\?ver=([0-9.]+)[\\'\"]\\;version:\\1"
-      ],
-      "script": "/revslider/[/\\w-]+/js",
-      "implies": "WordPress",
-      "website": "https://revolution.themepunch.com/"
-    },
     "OpenX": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "OpenX.png",
       "script": [
@@ -6768,35 +7235,35 @@
     },
     "Ophal": {
       "cats": [
-        "1",
-        "11",
-        "18"
+        1,
+        11,
+        18
       ],
       "headers": {
-        "X-Powered-By": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
+        "X-Powered-By": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
       },
       "icon": "Ophal.png",
       "implies": "Lua",
       "meta": {
-        "generator": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
+        "generator": "Ophal(?: (.+))? \\(ophal\\.org\\)\\;version:\\1"
       },
       "script": "ophal\\.js",
       "website": "http://ophal.org"
     },
     "Optimizely": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Optimizely.png",
       "js": {
         "optimizely": ""
       },
-      "icon": "Optimizely.png",
       "script": "optimizely\\.com.*\\.js",
-      "website": "http://optimizely.com"
+      "website": "https://www.optimizely.com"
     },
     "Oracle Application Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Oracle[- ]Application[- ]Server(?: Containers for J2EE)?(?:[- ](\\d[\\da-z./]+))?\\;version:\\1"
@@ -6806,7 +7273,7 @@
     },
     "Oracle Commerce": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1"
@@ -6817,10 +7284,10 @@
     },
     "Oracle Commerce Cloud": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
-        "OracleCommerceCloud-Version": "(.*)\\;version:\\1"
+        "OracleCommerceCloud-Version": "^(.+)$\\;version:\\1"
       },
       "html": "<[^>]+id=\"oracle-cc\"",
       "icon": "Oracle.png",
@@ -6828,7 +7295,7 @@
     },
     "Oracle Dynamic Monitoring Service": {
       "cats": [
-        "19"
+        19
       ],
       "headers": {
         "x-oracle-dms-ecid": ""
@@ -6838,7 +7305,7 @@
     },
     "Oracle HTTP Server": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1"
@@ -6848,7 +7315,7 @@
     },
     "Oracle Recommendations On Demand": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "Oracle.png",
       "script": "atgsvcs.+atgsvcs\\.js",
@@ -6856,7 +7323,7 @@
     },
     "Oracle Web Cache": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "Server": "Oracle(?:AS)?[- ]Web[- ]Cache(?:[- /]([\\da-z./]+))?\\;version:\\1"
@@ -6866,7 +7333,7 @@
     },
     "Orchard CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Orchard CMS.png",
       "implies": "Microsoft ASP.NET",
@@ -6877,32 +7344,32 @@
     },
     "Outbrain": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "Outbrain.png",
       "js": {
-        "OutbrainPermaLink": "",
-        "OB_releaseVer": ""
+        "OB_releaseVer": "^(.+)$\\;version:\\1",
+        "OutbrainPermaLink": ""
       },
-      "icon": "Outbrain.png",
       "script": "widgets\\.outbrain\\.com/outbrain\\.js",
-      "website": "http://outbrain.com"
+      "website": "https://www.outbrain.com"
     },
     "Outlook Web App": {
       "cats": [
-        "30"
+        30
       ],
-      "js": {
-        "IsOwaPremiumBrowser": ""
-      },
       "html": "<link\\s[^>]*href=\"[^\"]*?([\\d.]+)/themes/resources/owafont\\.css\\;version:\\1",
       "icon": "Outlook.svg",
       "implies": "Microsoft ASP.NET",
+      "js": {
+        "IsOwaPremiumBrowser": ""
+      },
       "url": "/owa/auth/log(?:on|off)\\.aspx",
       "website": "http://help.outlook.com"
     },
     "PANSITE": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "PANSITE.png",
       "meta": {
@@ -6912,23 +7379,26 @@
     },
     "PDF.js": {
       "cats": [
-        "19"
+        19
       ],
-      "js": {
-        "PDFJS": ""
-      },
       "html": "<\\/div>\\s*<!-- outerContainer -->\\s*<div\\s*id=\"printContainer\"><\\/div>",
       "icon": "PDF.js.svg",
+      "js": {
+        "PDFJS": "",
+        "PDFJS.version": "^(.+)$\\;version:\\1"
+      },
       "url": "/web/viewer\\.html?file=[^&]\\.pdf",
-      "website": "http://mozilla.github.io/pdf.js/"
+      "website": "https://mozilla.github.io/pdf.js/"
     },
     "PHP": {
       "cats": [
-        "27"
+        27
       ],
+      "cookies": {
+        "PHPSESSID": ""
+      },
       "headers": {
         "Server": "php/?([\\d.]+)?\\;version:\\1",
-        "Set-Cookie": "^PHPSESSID",
         "X-Powered-By": "^php/?([\\d.]+)?\\;version:\\1"
       },
       "icon": "PHP.svg",
@@ -6937,16 +7407,22 @@
     },
     "PHP-Fusion": {
       "cats": [
-        "1"
+        1
       ],
       "html": "Powered by <a href=\"[^>]+php-fusion",
+      "headers": {
+        "X-Powered-By": "PHP-Fusion (.+)$\\;version:\\1"
+      },
       "icon": "PHP-Fusion.png",
-      "implies": "PHP",
-      "website": "http://www.php-fusion.co.uk"
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "website": "https://www.php-fusion.co.uk"
     },
     "PHP-Nuke": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+Powered by PHP-Nuke",
       "icon": "PHP-Nuke.png",
@@ -6956,9 +7432,33 @@
       },
       "website": "http://phpnuke.org"
     },
+    "PHPDebugBar": {
+      "cats": [
+        47
+      ],
+      "icon": "phpdebugbar.png",
+      "js": {
+        "PhpDebugBar": "",
+        "phpdebugbar": ""
+      },
+      "script": [
+        "debugbar.*\\.js"
+      ],
+      "website": "http://phpdebugbar.com/"
+    },
+    "Cecil": {
+      "cats": [
+        57
+      ],
+      "icon": "Cecil.png",
+      "meta": {
+        "generator": "^Cecil|PHPoole$"
+      },
+      "website": "https://cecil.app"
+    },
     "Pagekit": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Pagekit.png",
       "meta": {
@@ -6966,68 +7466,111 @@
       },
       "website": "http://pagekit.com"
     },
-    "Pardot": {
+    "Pagevamp": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-ServedBy": "pagevamp"
+      },
+      "icon": "Pagevamp.png",
+      "js": {
+        "Pagevamp": ""
+      },
+      "website": "https://www.pagevamp.com"
+    },
+    "Paper.js": {
       "cats": [
-        "32"
+        25
       ],
+      "icon": "paperjs.png",
       "js": {
-        "piTracker": "",
-        "piHostname": "",
-        "piProtocol": "",
-        "piCId": "",
-        "piAId": ""
+        "paper.version": "^(.+)$\\;version:\\1"
       },
+      "website": "http://paperjs.org/"
+    },
+    "Pardot": {
+      "cats": [
+        32
+      ],
       "headers": {
         "X-Pardot-LB": "",
         "X-Pardot-Route": "",
         "X-Pardot-Rsp": ""
       },
       "icon": "Pardot.png",
-      "website": "http://pardot.com"
+      "js": {
+        "piAId": "",
+        "piCId": "",
+        "piHostname": "",
+        "piProtocol": "",
+        "piTracker": ""
+      },
+      "website": "https://www.pardot.com"
+    },
+    "Pars Elecom Portal": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-Powered-By": "Pars Elecom Portal"
+      },
+      "icon": "parselecom.png",
+      "implies": [
+        "Microsoft ASP.NET",
+        "IIS",
+        "Windows Server"
+      ],
+      "meta": {
+        "copyright": "Pars Elecom Portal"
+      },
+      "website": "http://parselecom.net"
     },
     "Parse.ly": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Parse.ly.png",
       "js": {
         "PARSELY": ""
       },
-      "icon": "Parse.ly.png",
-      "website": "http://parse.ly"
+      "website": "https://www.parse.ly"
     },
     "Paths.js": {
       "cats": [
-        "25"
+        25
       ],
       "script": "paths(?:\\.min)?\\.js",
-      "website": "http://github.com/andreaferretti/paths-js"
-    },
-    "Braintree": {
-      "cats": [
-        "41"
-      ],
-      "js": {
-        "braintree": ""
-      },
-      "icon": "Braintree.svg",
-      "website": "https://www.braintreepayments.com"
+      "website": "https://github.com/andreaferretti/paths-js"
     },
     "PayPal": {
       "cats": [
-        "41"
+        41
       ],
+      "html": "<input[^>]+_s-xclick",
+      "icon": "PayPal.svg",
       "js": {
         "PAYPAL": ""
       },
-      "html": "<input[^>]+_s-xclick",
-      "icon": "PayPal.svg",
       "script": "paypalobjects\\.com/js",
-      "website": "http://paypal.com"
+      "website": "https://paypal.com"
+    },
+    "Pelican": {
+      "cats": [
+        57
+      ],
+      "html": [
+        "powered by <a href=\"[^>]+getpelican\\.com",
+        "powered by <a href=\"https?://pelican\\.notmyidea\\.org"
+      ],
+      "icon": "pelican.png",
+      "implies": "Python",
+      "website": "https://blog.getpelican.com/"
     },
     "PencilBlue": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
       "headers": {
         "X-Powered-By": "PencilBlue"
@@ -7036,21 +7579,17 @@
       "implies": "Node.js",
       "website": "http://pencilblue.org"
     },
-    "Penguin": {
+    "Pendo": {
       "cats": [
-        "18"
+        58
       ],
-      "js": {
-        "penguin": ""
-      },
-      "html": "<link[^>]+?href=\"[^\"]+penguin(?:\\.min)?\\.css",
-      "icon": "Penguin.svg",
-      "script": "penguin(?:\\.min)?\\.js",
-      "website": "http://penguin.docs.bqws.io"
+      "icon": "Pendo.svg",
+      "script": "cdn\\.pendo\\.io*\\.js",
+      "website": "https://pendo.io"
     },
     "Percussion": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+class=\"perc-region\"",
       "icon": "Percussion.png",
@@ -7059,47 +7598,23 @@
       },
       "website": "http://percussion.com"
     },
-    "PerfSONAR-PS": {
-      "cats": [
-        "19"
-      ],
-      "headers": {
-        "User-agent": "perfSONAR-PS/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "PerfSONAR-PS.png",
-      "website": "http://psps.perfsonar.net"
-    },
     "Perl": {
       "cats": [
-        "27"
+        27
       ],
       "headers": {
-        "Server": "\bPerl\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
+        "Server": "\\bPerl\\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
       },
       "icon": "Perl.png",
       "website": "http://perl.org"
     },
-    "Petrojs": {
+    "Phabricator": {
       "cats": [
-        "12"
+        13,
+        47
       ],
-      "js": {
-        "petrojs": ""
-      },
-      "icon": "Petrojs.png",
-      "script": [
-        "petrojs(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "(?:/([\\d.]+)/)?petrojs(?:\\.min)?\\.js\\;version:\\1"
-      ],
-      "website": "http://petrojs.thepetronics.com"
-    },
-    "Phabricator": {
-      "cats": [
-        "13",
-        "47"
-      ],
-      "headers": {
-        "Set-Cookie": "phsid="
+      "cookies": {
+        "phsid": ""
       },
       "html": "<[^>]+(?:class|id)=\"phabricator-",
       "icon": "Phabricator.png",
@@ -7111,18 +7626,18 @@
     },
     "Phaser": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Phaser.png",
       "js": {
-        "Phaser": ""
+        "Phaser": "",
+        "Phaser.VERSION": "^(.+)$\\;version:\\1"
       },
-      "icon": "Phaser.png",
-      "website": "http://phaser.io"
+      "website": "https://phaser.io"
     },
     "Phenomic": {
       "cats": [
-        "1",
-        "11"
+        57
       ],
       "html": [
         "<[^>]+id=\"phenomic(?:root)?\""
@@ -7134,46 +7649,22 @@
       "script": "/phenomic\\.browser\\.[a-f0-9]+\\.js",
       "website": "https://phenomic.io/"
     },
-    "PHPoole": {
-      "cats": [
-        "1",
-        "11"
-      ],
-      "icon": "PHPoole.png",
-      "meta": {
-        "generator": "^PHPoole$"
-      },
-      "website": "https://phpoole.org"
-    },
     "Phusion Passenger": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "X-Powered-By": "^Phusion Passenger ?([\\d.]+)?\\;version:\\1",
-        "Server": "Phusion Passenger ([\\d.]+)\\;version:\\1"
+        "Server": "Phusion Passenger ([\\d.]+)\\;version:\\1",
+        "X-Powered-By": "Phusion Passenger ?([\\d.]+)?\\;version:\\1"
       },
       "icon": "Phusion Passenger.png",
-      "website": "http://phusionpassenger.com"
-    },
-    "Piano Solo": {
-      "cats": [
-        "43"
-      ],
-      "js": {
-        "PianoMedia": ""
-      },
-      "headers": {
-        "Set-Cookie": "pianovisitkey"
-      },
-      "icon": "Piano Solo.png",
-      "website": "http://www.pianomedia.com/products"
+      "website": "https://phusionpassenger.com"
     },
     "Pimcore": {
       "cats": [
-        "1",
-        "6",
-        "18"
+        1,
+        6,
+        18
       ],
       "headers": {
         "X-Powered-By": "^pimcore$"
@@ -7184,47 +7675,15 @@
     },
     "Pinterest": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Pinterest.svg",
       "script": "//assets\\.pinterest\\.com/js/pinit\\.js",
       "website": "http://pinterest.com"
     },
-    "pirobase CMS": {
-      "cats": [
-        "1"
-      ],
-      "html": [
-        "<(?:script|link)[^>]/site/[a-z0-9/._-]+/resourceCached/[a-z0-9/._-]+",
-        "<input[^>]+cbi:///cms/"
-      ],
-      "icon": "pirobaseCMS.svg",
-      "implies": "Java",
-      "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
-    },
-    "Piwik": {
-      "cats": [
-        "10"
-      ],
-      "js": {
-        "Piwik": "",
-        "_paq": ""
-      },
-      "headers": {
-        "Set-Cookie": "PIWIK_SESSID="
-      },
-      "icon": "Piwik.png",
-      "meta": {
-        "apple-itunes-app": "app-id=737216887",
-        "generator": "Piwik - Open Source Web Analytics",
-        "google-play-app": "app-id=org\\.piwik\\.mobile2"
-      },
-      "script": "piwik\\.js|piwik\\.php",
-      "website": "http://piwik.org"
-    },
     "Planet": {
       "cats": [
-        "49"
+        49
       ],
       "icon": "Planet.png",
       "meta": {
@@ -7232,12 +7691,23 @@
       },
       "website": "http://planetplanet.org"
     },
-    "Play": {
+    "PlatformOS": {
       "cats": [
-        "18"
+        1,
+        62
       ],
+      "icon": "PlatformOS.svg",
       "headers": {
-        "Set-Cookie": "PLAY_SESSION"
+        "x-powered-by": "^platformOS$"
+      },
+      "website": "https://www.platform-os.com"
+    },
+    "Play": {
+      "cats": [
+        18
+      ],
+      "cookies": {
+        "PLAY_SESSION": ""
       },
       "icon": "Play.svg",
       "implies": "Scala",
@@ -7245,7 +7715,7 @@
     },
     "Plentymarkets": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Plentymarkets.png",
       "meta": {
@@ -7255,25 +7725,25 @@
     },
     "Plesk": {
       "cats": [
-        "9"
+        9
       ],
       "headers": {
-        "X-Powered-By": "PleskLin",
-        "X-Powered-By-Plesk": "Plesk"
+        "X-Powered-By": "^Plesk(?:L|W)in",
+        "X-Powered-By-Plesk": "^Plesk"
       },
       "icon": "Plesk.png",
       "script": "common\\.js\\?plesk",
-      "website": "http://plesk.com"
+      "website": "https://www.plesk.com/"
     },
     "Pligg": {
       "cats": [
-        "1"
+        1
       ],
+      "html": "<span[^>]+id=\"xvotes-0",
+      "icon": "Pligg.png",
       "js": {
         "pligg_": ""
       },
-      "html": "<span[^>]+id=\"xvotes-0",
-      "icon": "Pligg.png",
       "meta": {
         "generator": "Pligg"
       },
@@ -7281,7 +7751,7 @@
     },
     "Plone": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Plone.png",
       "implies": "Python",
@@ -7292,68 +7762,71 @@
     },
     "Plotly": {
       "cats": [
-        "25"
+        25
       ],
-      "js": {
-        "Plotly": ""
-      },
       "icon": "Plotly.png",
       "implies": "D3",
+      "js": {
+        "Plotly.version": "([\\d.])\\;version:\\1"
+      },
       "script": "https?://cdn\\.plot\\.ly/plotly",
-      "website": "http://plot.ly/javascript/"
-    },
-    "Plura": {
-      "cats": [
-        "19"
-      ],
-      "html": "<iframe src=\"[^>]+pluraserver\\.com",
-      "icon": "Plura.png",
-      "website": "http://www.pluraprocessing.com"
+      "website": "https://plot.ly/javascript/"
     },
     "Po.st": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "Po.st.png",
       "js": {
         "pwidget_config": ""
       },
-      "icon": "Po.st.png",
       "website": "http://www.po.st/"
     },
+    "Polyfill": {
+      "cats": [
+        59
+      ],
+      "icon": "polyfill.svg",
+      "script": [
+        "^https?://cdn\\.polyfill\\.io/",
+        "/polyfill\\.min\\.js"
+      ],
+      "website": "https://polyfill.io"
+    },
     "Polymer": {
       "cats": [
-        "12"
+        12
       ],
-      "js": {
-        "Polymer": ""
-      },
       "html": "(?:<polymer-[^>]+|<link[^>]+rel=\"import\"[^>]+/polymer\\.html\")",
       "icon": "Polymer.png",
+      "js": {
+        "Polymer.version": "^(.+)$\\;version:\\1"
+      },
       "script": "polymer\\.js",
       "website": "http://polymer-project.org"
     },
     "Posterous": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
+      "html": "<div class=\"posterous",
+      "icon": "Posterous.png",
       "js": {
         "Posterous": ""
       },
-      "html": "<div class=\"posterous",
-      "icon": "Posterous.png",
       "website": "http://posterous.com"
     },
     "PostgreSQL": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "PostgreSQL.png",
       "website": "http://www.postgresql.org/"
     },
     "Powergap": {
       "cats": [
-        "6"
+        6
       ],
       "html": [
         "<a[^>]+title=\"POWERGAP",
@@ -7362,29 +7835,41 @@
       "icon": "Powergap.png",
       "website": "http://powergap.de"
     },
+    "Prebid": {
+      "cats": [
+        36
+      ],
+      "icon": "Prebid.png",
+      "js": {
+        "PREBID_TIMEOUT": "",
+        "pbjs": ""
+      },
+      "script": [
+        "/prebid\\.js",
+        "adnxs\\.com/[^\"]*(?:prebid|/pb\\.js)"
+      ],
+      "website": "http://prebid.org"
+    },
     "Prefix-Free": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "Prefix-Free.png",
       "js": {
         "PrefixFree": ""
       },
-      "icon": "Prefix-Free.png",
       "script": "prefixfree\\.js",
-      "website": "http://leaverou.github.io/prefixfree/"
+      "website": "https://leaverou.github.io/prefixfree/"
     },
     "PrestaShop": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "freeProductTranslation": "\\;confidence:25",
-        "priceDisplayMethod": "\\;confidence:25",
-        "priceDisplayPrecision": "\\;confidence:25"
+      "cookies": {
+        "PrestaShop": ""
       },
       "headers": {
-        "Powered-By": "^Prestashop$",
-        "Set-Cookie": "^PrestaShop"
+        "Powered-By": "^Prestashop$"
       },
       "html": [
         "Powered by <a\\s+[^>]+>PrestaShop",
@@ -7392,7 +7877,15 @@
         "<!-- /Module Block [a-z ]+ -->"
       ],
       "icon": "PrestaShop.svg",
-      "implies": "PHP",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "js": {
+        "freeProductTranslation": "\\;confidence:25",
+        "priceDisplayMethod": "\\;confidence:25",
+        "priceDisplayPrecision": "\\;confidence:25"
+      },
       "meta": {
         "generator": "PrestaShop"
       },
@@ -7400,82 +7893,83 @@
     },
     "Prism": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "Prism.svg",
       "js": {
         "Prism": ""
       },
-      "icon": "Prism.svg",
       "script": "prism\\.js",
       "website": "http://prismjs.com"
     },
     "Project Wonderful": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<div[^>]+id=\"pw_adbox_",
+      "icon": "Project Wonderful.png",
       "js": {
         "pw_adloader": ""
       },
-      "html": "<div[^>]+id=\"pw_adbox_",
-      "icon": "Project Wonderful.png",
       "script": "^https?://(?:www\\.)?projectwonderful\\.com/(?:pwa\\.js|gen\\.php)",
       "website": "http://projectwonderful.com"
     },
     "ProjectPoi": {
       "cats": [
-        "56"
+        56
       ],
+      "icon": "ProjectPoi.png",
       "js": {
         "ProjectPoi": ""
       },
       "script": "^(?:https):?//ppoi\\.org/lib/",
-      "icon": "ProjectPoi.png",
       "website": "https://ppoi.org/"
     },
-    "Prospector": {
+    "Projesoft": {
       "cats": [
-        "36"
+        6
+      ],
+      "icon": "projesoft.png",
+      "script": [
+        "projesoft\\.js"
       ],
-      "html": "<[^>]+data-name=['\"]prospectscript",
-      "icon": "Prospector.png",
-      "script": "processprospector\\.js",
-      "website": "http://prospector.io"
+      "website": "https://www.projesoft.com.tr"
     },
     "Prototype": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Prototype.png",
       "js": {
-        "Prototype": ""
+        "Prototype.Version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Prototype.png",
       "script": "(?:prototype|protoaculous)(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
       "website": "http://www.prototypejs.org"
     },
     "Protovis": {
       "cats": [
-        "25"
+        25
       ],
       "js": {
         "protovis": ""
       },
       "script": "protovis.*\\.js",
-      "website": "http://mbostock.github.com/protovis"
+      "website": "http://mbostock.github.io/protovis"
     },
     "Proximis Omnichannel": {
       "cats": [
-        "6",
-        "1"
+        6,
+        1
       ],
-      "js": {
-        "__change": ""
-      },
       "html": "<html[^>]+data-ng-app=\"RbsChangeApp\"",
       "icon": "Proximis Omnichannel.png",
       "implies": [
         "PHP",
         "AngularJS"
       ],
+      "js": {
+        "__change": ""
+      },
       "meta": {
         "generator": "Proximis Omnichannel"
       },
@@ -7483,8 +7977,8 @@
     },
     "Proximis Web to Store": {
       "cats": [
-        "5",
-        "6"
+        5,
+        6
       ],
       "icon": "Proximis Omnichannel.png",
       "script": "widget-commerce(?:\\.min)?\\.js",
@@ -7492,7 +7986,7 @@
     },
     "PubMatic": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "PubMatic.png",
       "script": "https?://[^/]*\\.pubmatic\\.com",
@@ -7500,11 +7994,13 @@
     },
     "Public CMS": {
       "cats": [
-        "1"
+        1
       ],
+      "cookies": {
+        "PUBLICCMS_USER": ""
+      },
       "headers": {
-        "Set-Cookie": "PUBLICCMS_USER",
-        "X-Powered-PublicCMS": "(.*)\\;version:\\1"
+        "X-Powered-PublicCMS": "^(.+)$\\;version:\\1"
       },
       "icon": "Public CMS.png",
       "implies": "Java",
@@ -7512,7 +8008,7 @@
     },
     "Pure CSS": {
       "cats": [
-        "18"
+        18
       ],
       "html": [
         "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
@@ -7523,7 +8019,7 @@
     },
     "Pygments": {
       "cats": [
-        "19"
+        19
       ],
       "html": "<link[^>]+pygments\\.css[\"']",
       "icon": "pygments.png",
@@ -7531,10 +8027,12 @@
     },
     "PyroCMS": {
       "cats": [
-        "1"
+        1
       ],
+      "cookies": {
+        "pyrocms": ""
+      },
       "headers": {
-        "Set-Cookie": "pyrocms",
         "X-Streams-Distribution": "PyroCMS"
       },
       "icon": "PyroCMS.png",
@@ -7543,7 +8041,7 @@
     },
     "Python": {
       "cats": [
-        "27"
+        27
       ],
       "headers": {
         "Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;version:\\1"
@@ -7553,18 +8051,18 @@
     },
     "Quantcast": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Quantcast.png",
       "js": {
         "quantserve": ""
       },
-      "icon": "Quantcast.png",
-      "script": "edge\\.quantserve\\.com/quant\\.js",
+      "script": "\\.quantserve\\.com/quant\\.js",
       "website": "http://www.quantcast.com"
     },
     "Question2Answer": {
       "cats": [
-        "15"
+        15
       ],
       "html": "<!-- Powered by Question2Answer",
       "icon": "question2answer.png",
@@ -7574,7 +8072,7 @@
     },
     "Quick.CMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<a href=\"[^>]+opensolution\\.org/\">CMS by",
       "icon": "Quick.CMS.png",
@@ -7585,7 +8083,7 @@
     },
     "Quick.Cart": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<a href=\"[^>]+opensolution\\.org/\">(?:Shopping cart by|Sklep internetowy)",
       "icon": "Quick.Cart.png",
@@ -7596,27 +8094,18 @@
     },
     "Quill": {
       "cats": [
-        "24"
+        24
       ],
+      "icon": "Quill.png",
       "js": {
         "Quill": ""
       },
-      "icon": "Quill.png",
       "website": "http://quilljs.com"
     },
-    "RAID HTTPServer": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
-    },
     "RBS Change": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
       "html": "<html[^>]+xmlns:change=",
       "icon": "RBS Change.png",
@@ -7628,7 +8117,7 @@
     },
     "RCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "RCMS.png",
       "meta": {
@@ -7638,18 +8127,18 @@
     },
     "RD Station": {
       "cats": [
-        "32"
+        32
       ],
+      "icon": "RD Station.png",
       "js": {
         "RDStation": ""
       },
-      "icon": "RD Station.png",
       "script": "d335luupugsy2\\.cloudfront\\.net/js/loader-scripts/.*-loader\\.js",
       "website": "http://rdstation.com.br"
     },
     "RDoc": {
       "cats": [
-        "4"
+        4
       ],
       "html": [
         "<link[^>]+href=\"[^\"]*rdoc-style\\.css",
@@ -7657,41 +8146,44 @@
       ],
       "icon": "RDoc.png",
       "implies": "Ruby",
-      "website": "http://github.com/RDoc/RDoc"
+      "website": "https://github.com/RDoc/RDoc"
     },
     "RackCache": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "X-Rack-Cache": ""
       },
       "icon": "RackCache.png",
       "implies": "Ruby",
-      "website": "http://github.com/rtomayko/rack-cache"
+      "website": "https://github.com/rtomayko/rack-cache"
     },
     "RainLoop": {
       "cats": [
-        "30"
+        30
       ],
-      "js": {
-        "rainloop": ""
-      },
       "headers": {
-        "Server": "RainLoop"
+        "Server": "^RainLoop"
       },
       "html": [
-        "<meta [^>]*(?:content=\"([^\"]+)[^>]+ id=\"rlAppVersion\"|id=\"rlAppVersion\"[^>]+ content=\"([^\"]+))\\;version:\\1?\\1:\\2",
-        "<link[^>]* href=\"[^\"]*rainloop/v/([^/]+)\\;version:\\1"
+        "<link[^>]href=\"rainloop/v/([0-9.]+)/static/apple-touch-icon\\.png/>\\;version:\\1"
       ],
+      "meta": {
+        "rlAppVersion": "^([0-9.]+)$\\;version:\\1"
+      },
       "icon": "RainLoop.png",
       "implies": "PHP",
-      "script": "rainloop/v/([^/]+)\\;version:\\1",
-      "website": "http://rainloop.net"
+      "js": {
+        "rainloopI18N": "",
+        "rainloop": ""
+      },
+      "script": "^rainloop/v/([0-9.]+)/\\;version:\\1",
+      "website": "https://www.rainloop.net/"
     },
     "Rakuten DBCore": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Rakuten DBCore.png",
       "meta": {
@@ -7700,9 +8192,19 @@
       },
       "website": "http://ecservice.rakuten.com.br"
     },
+    "Rakuten Digital Commerce": {
+      "cats": [
+        6
+      ],
+      "icon": "RakutenDigitalCommerce.png",
+      "js": {
+        "RakutenApplication": ""
+      },
+      "website": "https://digitalcommerce.rakuten.com.br"
+    },
     "Ramda": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "Ramda.png",
       "script": "ramda.*\\.js",
@@ -7710,27 +8212,18 @@
     },
     "Raphael": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "Raphael.png",
       "js": {
-        "Raphael": ""
+        "Raphael.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Raphael.png",
       "script": "raphael(?:-([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
-      "website": "http://dmitrybaranovskiy.github.io/raphael/"
-    },
-    "Rapid Logic": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
-      },
-      "website": "http://example.com"
+      "website": "https://dmitrybaranovskiy.github.io/raphael/"
     },
     "Raspbian": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Raspbian",
@@ -7739,18 +8232,29 @@
       "icon": "Raspbian.svg",
       "website": "https://www.raspbian.org/"
     },
-    "Rayo": {
+    "Raychat": {
       "cats": [
-        "1"
+        52
       ],
+      "icon": "raychat.png",
       "js": {
-        "Rayo": ""
+        "Raychat": ""
       },
+      "script": "app\\.raychat\\.io/scripts/js",
+      "website": "https://raychat.io"
+    },
+    "Rayo": {
+      "cats": [
+        1
+      ],
       "icon": "Rayo.png",
       "implies": [
         "AngularJS",
         "Microsoft ASP.NET"
       ],
+      "js": {
+        "Rayo": ""
+      },
       "meta": {
         "generator": "^Rayo"
       },
@@ -7758,29 +8262,43 @@
     },
     "Rdf": {
       "cats": [
-        "27"
+        27
       ],
       "website": "https://www.w3.org/RDF/"
     },
-    "React": {
+    "ReDoc": {
       "cats": [
-        "12"
+        4
       ],
+      "html": "<redoc ",
+      "icon": "redoc.png",
+      "implies": "React",
       "js": {
-        "React": ""
+        "Redoc.version": "^(.+)$\\;version:\\1"
       },
+      "script": "/redoc\\.(?:min\\.)?js",
+      "website": "https://github.com/Rebilly/ReDoc"
+    },
+    "React": {
+      "cats": [
+        12
+      ],
       "html": "<[^>]+data-react",
       "icon": "React.png",
+      "js": {
+        "React.version": "^(.+)$\\;version:\\1",
+        "react.version": "^(.+)$\\;version:\\1"
+      },
       "script": [
-        "react(?:\\-with\\-addons)?(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "react(?:-with-addons)?[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
         "react.*\\.js"
       ],
-      "website": "http://facebook.github.io/react"
+      "website": "https://reactjs.org"
     },
     "Red Hat": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Red Hat",
@@ -7791,21 +8309,24 @@
     },
     "Reddit": {
       "cats": [
-        "2"
+        2
       ],
-      "js": {
-        "reddit": ""
-      },
       "html": "(?:<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)",
       "icon": "Reddit.png",
       "implies": "Python",
+      "js": {
+        "reddit": ""
+      },
       "url": "^https?://(?:www\\.)?reddit\\.com",
       "website": "http://code.reddit.com"
     },
     "Redmine": {
       "cats": [
-        "13"
+        13
       ],
+      "cookies": {
+        "_redmine_session": ""
+      },
       "html": "Powered by <a href=\"[^>]+Redmine",
       "icon": "Redmine.png",
       "implies": "Ruby on Rails",
@@ -7816,28 +8337,28 @@
     },
     "Reinvigorate": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Reinvigorate.png",
       "js": {
         "reinvigorate": ""
       },
-      "icon": "Reinvigorate.png",
       "website": "http://www.reinvigorate.net"
     },
     "RequireJS": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "RequireJS.png",
       "js": {
-        "requirejs": ""
+        "requirejs.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "RequireJS.png",
       "script": "require.*\\.js",
       "website": "http://requirejs.org"
     },
     "Resin": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^Resin(?:/(\\S*))?\\;version:\\1"
@@ -7848,63 +8369,76 @@
     },
     "Reveal.js": {
       "cats": [
-        "12"
+        12
       ],
-      "js": {
-        "Reveal": ""
-      },
       "icon": "Reveal.js.png",
       "implies": "Highlight.js",
+      "js": {
+        "Reveal.VERSION": "^(.+)$\\;version:\\1"
+      },
       "script": "(?:^|/)reveal(?:\\.min)?\\.js",
       "website": "http://lab.hakim.se/reveal-js"
     },
     "Revel": {
       "cats": [
-        "18"
+        18
       ],
-      "headers": {
-        "Set-Cookie": "^REVEL_(?:FLASH|SESSION)="
+      "cookies": {
+        "REVEL_FLASH": "",
+        "REVEL_SESSION": ""
       },
       "icon": "Revel.png",
       "implies": "Go",
-      "website": "http://revel.github.io"
+      "website": "https://revel.github.io"
+    },
+    "Revslider": {
+      "cats": [
+        19
+      ],
+      "html": [
+        "<link[^>]* href=[\\'\"][^']+revslider[/\\w-]+\\.css\\?ver=([0-9.]+)[\\'\"]\\;version:\\1"
+      ],
+      "icon": "revslider.png",
+      "implies": "WordPress",
+      "script": "/revslider/[/\\w-]+/js",
+      "website": "https://revolution.themepunch.com/"
     },
     "Rickshaw": {
       "cats": [
-        "25"
+        25
       ],
+      "implies": "D3",
       "js": {
         "Rickshaw": ""
       },
-      "implies": "D3",
       "script": "rickshaw(?:\\.min)?\\.js",
       "website": "http://code.shutterstock.com/rickshaw/"
     },
     "RightJS": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "RightJS.png",
       "js": {
         "RightJS": ""
       },
-      "icon": "RightJS.png",
       "script": "right\\.js",
       "website": "http://rightjs.org"
     },
     "Riot": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Riot.png",
       "js": {
         "riot": ""
       },
-      "icon": "Riot.png",
       "script": "riot(?:\\+compiler)?(?:\\.min)?\\.js",
-      "website": "http://muut.com/riotjs"
+      "website": "https://riot.js.org/"
     },
     "RiteCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "RiteCMS.png",
       "implies": [
@@ -7918,8 +8452,8 @@
     },
     "Roadiz CMS": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
       "headers": {
         "X-Powered-By": "Roadiz CMS"
@@ -7936,21 +8470,21 @@
     },
     "Robin": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Robin.png",
       "js": {
         "_robin_getRobinJs": "",
         "robin_settings": "",
         "robin_storage_settings": ""
       },
-      "icon": "Robin.png",
       "website": "http://www.robinhq.com"
     },
     "RockRMS": {
       "cats": [
-        "1",
-        "11",
-        "32"
+        1,
+        11,
+        32
       ],
       "icon": "RockRMS.svg",
       "implies": [
@@ -7959,26 +8493,26 @@
         "Microsoft ASP.NET"
       ],
       "meta": {
-        "generator": "^Rock v.*"
+        "generator": "^Rock v([0-9.]+)\\;version:\\1"
       },
       "website": "http://www.rockrms.com"
     },
     "RoundCube": {
       "cats": [
-        "30"
+        30
       ],
+      "html": "<title>RoundCube",
+      "icon": "RoundCube.png",
+      "implies": "PHP",
       "js": {
         "rcmail": "",
         "roundcube": ""
       },
-      "html": "<title>RoundCube",
-      "icon": "RoundCube.png",
-      "implies": "PHP",
       "website": "http://roundcube.net"
     },
     "Rubicon Project": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "Rubicon Project.png",
       "script": "https?://[^/]*\\.rubiconproject\\.com",
@@ -7986,7 +8520,7 @@
     },
     "Ruby": {
       "cats": [
-        "27"
+        27
       ],
       "headers": {
         "Server": "(?:Mongrel|WEBrick|Ruby)"
@@ -7996,23 +8530,26 @@
     },
     "Ruby on Rails": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
-        "Server": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50",
-        "X-Powered-By": "(?:mod_rails|mod_rack|Phusion[\\._ ]Passenger)(?: \\(mod_rails/mod_rack\\))?\\;confidence:50"
+        "Server": "mod_(?:rails|rack)",
+        "X-Powered-By": "mod_(?:rails|rack)"
       },
       "icon": "Ruby on Rails.png",
       "implies": "Ruby",
       "meta": {
         "csrf-param": "^authenticity_token$\\;confidence:50"
       },
+      "cookies": {
+        "_session_id": "\\;confidence:75"
+      },
       "script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
-      "website": "http://rubyonrails.org"
+      "website": "https://rubyonrails.org"
     },
     "Ruxit": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "Ruxit.png",
       "script": "ruxitagentjs",
@@ -8020,18 +8557,19 @@
     },
     "RxJS": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "RxJS.png",
       "js": {
-        "Rx": "\\;confidence:20"
+        "Rx.CompositeDisposable": "",
+        "Rx.Symbol": ""
       },
-      "icon": "RxJS.png",
-      "script": "rx(?:\\.\\w+)?(?:\\.compat)?(?:\\.min)?\\.js",
+      "script": "rx(?:\\.\\w+)?(?:\\.compat|\\.global)?(?:\\.min)?\\.js",
       "website": "http://reactivex.io"
     },
     "S.Builder": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "S.Builder.png",
       "meta": {
@@ -8041,7 +8579,7 @@
     },
     "SAP": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "SAP NetWeaver Application Server"
@@ -8051,15 +8589,27 @@
     },
     "SDL Tridion": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<img[^>]+_tcm\\d{2,3}-\\d{6}\\.",
       "icon": "SDL Tridion.png",
       "website": "http://www.sdl.com/products/tridion"
     },
+    "Sentry": {
+      "cats": [
+        13
+      ],
+      "html": "<script[^>]*>\\s*Raven\\.config\\('[^']*', {\\s+release: '([0-9\\.]+)'\\;version:\\1",
+      "js": {
+        "Raven.config": "",
+        "ravenOptions.whitelistUrls": ""
+      },
+      "icon": "Sentry.svg",
+      "website": "https://sentry.io/"
+    },
     "SIMsite": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "SIMsite.png",
       "meta": {
@@ -8070,19 +8620,19 @@
     },
     "SMF": {
       "cats": [
-        "2"
+        2
       ],
+      "html": "credits/?\" title=\"Simple Machines Forum\" target=\"_blank\" class=\"new_win\">SMF ([0-9.]+)</a>\\;version:\\1",
+      "icon": "SMF.png",
+      "implies": "PHP",
       "js": {
         "smf_": ""
       },
-      "icon": "SMF.png",
-      "implies": "PHP",
-      "html": "credits/?\" title=\"Simple Machines Forum\" target=\"_blank\" class=\"new_win\">SMF ([0-9.]+)</a>\\;version:\\1",
       "website": "http://www.simplemachines.org"
     },
     "SOBI 2": {
       "cats": [
-        "19"
+        19
       ],
       "html": "(?:<!-- start of Sigsiu Online Business Index|<div[^>]* class=\"sobi2)",
       "icon": "SOBI 2.png",
@@ -8091,7 +8641,7 @@
     },
     "SPDY": {
       "cats": [
-        "19"
+        19
       ],
       "excludes": "HTTP/2",
       "headers": {
@@ -8102,12 +8652,13 @@
     },
     "SPIP": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
+        "Composed-By": "SPIP ([\\d.]+) @\\;version:\\1",
         "X-Spip-Cache": ""
       },
-      "icon": "SPIP.png",
+      "icon": "spip.svg",
       "implies": "PHP",
       "meta": {
         "generator": "(?:^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1"
@@ -8116,7 +8667,7 @@
     },
     "SQL Buddy": {
       "cats": [
-        "3"
+        3
       ],
       "html": "(?:<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)",
       "icon": "SQL Buddy.png",
@@ -8125,14 +8676,14 @@
     },
     "SQLite": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "SQLite.png",
       "website": "http://www.sqlite.org"
     },
     "SUSE": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1",
@@ -8143,18 +8694,18 @@
     },
     "SWFObject": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "SWFObject.png",
       "js": {
         "SWFObject": ""
       },
-      "icon": "SWFObject.png",
       "script": "swfobject.*\\.js",
-      "website": "http://github.com/swfobject/swfobject"
+      "website": "https://github.com/swfobject/swfobject"
     },
     "Saia PCD": {
       "cats": [
-        "45"
+        45
       ],
       "headers": {
         "Server": "Saia PCD(?:([/a-z\\d.]+))?\\;version:\\1"
@@ -8164,10 +8715,12 @@
     },
     "Sails.js": {
       "cats": [
-        "18"
+        18
       ],
+      "cookies": {
+        "sails.sid": ""
+      },
       "headers": {
-        "Set-Cookie": "^sails\\.sid$",
         "X-Powered-By": "^Sails(?:$|[^a-z0-9])"
       },
       "icon": "Sails.js.svg",
@@ -8176,39 +8729,39 @@
     },
     "Salesforce": {
       "cats": [
-        "53"
+        53
       ],
+      "cookies": {
+        "com.salesforce": ""
+      },
+      "html": "<[^>]+=\"brandQuaternaryFgrs\"",
+      "icon": "Salesforce.svg",
       "js": {
         "SFDCApp": "",
         "SFDCCmp": "",
         "SFDCPage": "",
         "SFDCSessionVars": ""
       },
-      "headers": {
-        "Set-Cookie": "com\\.salesforce\\."
-      },
-      "html": "<[^>]+=\"brandQuaternaryFgrs\"",
-      "icon": "Salesforce.svg",
       "website": "https://www.salesforce.com"
     },
     "Salesforce Commerce Cloud": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "dwAnalytics": ""
-      },
       "headers": {
         "Server": "Demandware eCommerce Server"
       },
       "html": "<[^>]+demandware\\.edgesuite",
-      "script": "/demandware\\.static/",
       "icon": "Salesforce.svg",
+      "js": {
+        "dwAnalytics": ""
+      },
+      "script": "/demandware\\.static/",
       "website": "http://demandware.com"
     },
     "Sarka-SPIP": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Sarka-SPIP.png",
       "implies": "SPIP",
@@ -8219,12 +8772,12 @@
     },
     "Sazito": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Sazito.svg",
       "js": {
         "Sazito": ""
       },
-      "icon": "Sazito.svg",
       "meta": {
         "generator": "^Sazito"
       },
@@ -8232,14 +8785,14 @@
     },
     "Scala": {
       "cats": [
-        "27"
+        27
       ],
       "icon": "Scala.png",
       "website": "http://www.scala-lang.org"
     },
     "Scholica": {
       "cats": [
-        "21"
+        21
       ],
       "headers": {
         "X-Scholica-Version": ""
@@ -8249,7 +8802,7 @@
     },
     "Scientific Linux": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Scientific Linux",
@@ -8260,7 +8813,7 @@
     },
     "SeamlessCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "SeamlessCMS.png",
       "meta": {
@@ -8270,78 +8823,51 @@
     },
     "Segment": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Segment.png",
       "js": {
         "analytics": ""
       },
-      "html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics\\.js[\\s\\S]*script>",
-      "icon": "Segment.png",
       "script": "cdn\\.segment\\.com/analytics\\.js",
-      "website": "http://segment.com"
+      "website": "https://segment.com"
     },
     "Select2": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "Select2.png",
       "implies": "jQuery",
-      "script": "select2.*\\.js",
-      "website": "http://select2.github.io"
+      "js": {
+        "jQuery.fn.select2": ""
+      },
+      "script": "select2(?:\\.min|\\.full)?\\.js",
+      "website": "https://select2.org/"
     },
     "Semantic-ui": {
       "cats": [
-        "18"
+        18
       ],
       "html": [
-        "(?:<div class=\"ui\\s[^>]+\">)\\;confidence:30",
-        "(?:<link[^>]+semantic(?:\\.css|\\.min\\.css)\">)"
+        "<link[^>]+semantic(?:\\.min)\\.css\""
       ],
       "icon": "Semantic-ui.png",
-      "script": "(?:semantic(?:\\.js|\\.min\\.js))",
-      "website": "http://semantic-ui.com"
+      "script": "/semantic(?:-([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://semantic-ui.com"
     },
     "Sencha Touch": {
       "cats": [
-        "12",
-        "26"
+        12,
+        26
       ],
       "icon": "Sencha Touch.png",
       "script": "sencha-touch.*\\.js",
       "website": "http://sencha.com/products/touch"
     },
-    "Sentinel Keys Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "SentinelKeysServer\\/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "Sentinel.png",
-      "website": "http://www.safenet-inc.com/software-monetization/sentinel-rms"
-    },
-    "Sentinel License Monitor": {
-      "cats": [
-        "19"
-      ],
-      "html": "<title>Sentinel (?:Keys )?License Monitor</title>",
-      "icon": "Sentinel.png",
-      "website": "http://www.safenet-inc.com/software-monetization/sentinel-rms/"
-    },
-    "Sentinel Protection Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "SentinelProtectionServer\\/?([\\d\\.]+)?\\;version:\\1"
-      },
-      "icon": "Sentinel.png",
-      "website": "http://www.safenet-inc.com/software-monetization/sentinel-rms/"
-    },
     "Serendipity": {
       "cats": [
-        "1",
-        "11"
+        1,
+        11
       ],
       "icon": "Serendipity.png",
       "implies": "PHP",
@@ -8353,7 +8879,7 @@
     },
     "Shadow": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "ShadowFramework"
@@ -8364,13 +8890,13 @@
     },
     "Shapecss": {
       "cats": [
-        "18"
+        18
       ],
+      "html": "<link[^>]* href=\"[^\"]*shapecss(?:\\.min)?\\.css",
+      "icon": "Shapecss.svg",
       "js": {
         "Shapecss": ""
       },
-      "html": "<link[^>]* href=\"[^\"]*shapecss(?:\\.min)?\\.css",
-      "icon": "Shapecss.svg",
       "script": [
         "shapecss[-.]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/shapecss(?:\\.min)?\\.js\\;version:\\1",
@@ -8380,83 +8906,82 @@
     },
     "ShareThis": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "ShareThis.png",
       "js": {
         "SHARETHIS": ""
       },
-      "icon": "ShareThis.png",
       "script": "w\\.sharethis\\.com/",
       "website": "http://sharethis.com"
     },
     "ShellInABox": {
       "cats": [
-        "46"
+        46
       ],
-      "js": {
-        "ShellInABox": ""
-      },
       "html": [
         "<title>Shell In A Box</title>",
         "must be enabled for ShellInABox</noscript>"
       ],
       "icon": "ShellInABox.png",
+      "js": {
+        "ShellInABox": ""
+      },
       "website": "http://shellinabox.com"
     },
     "ShinyStat": {
       "cats": [
-        "10"
+        10
       ],
+      "html": "<img[^>]*\\s+src=['\"]?https?://www\\.shinystat\\.com/cgi-bin/shinystat\\.cgi\\?[^'\"\\s>]*['\"\\s/>]",
+      "icon": "ShinyStat.png",
       "js": {
         "SSsdk": ""
       },
-      "html": "<img[^>]*\\s+src=['\"]?https?://www\\.shinystat\\.com/cgi-bin/shinystat\\.cgi\\?[^'\"\\s>]*['\"\\s/>]",
-      "icon": "ShinyStat.png",
       "script": "^https?://codice(?:business|ssl|pro|isp)?\\.shinystat\\.com/cgi-bin/getcod\\.cgi",
       "website": "http://shinystat.com"
     },
-    "Shopalize": {
-      "cats": [
-        "5",
-        "10"
-      ],
-      "js": {
-        "Shopalize": ""
-      },
-      "icon": "Shopalize.png",
-      "website": "http://shopalize.com"
-    },
     "Shopatron": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "shptUrl": ""
-      },
       "html": [
         "<body class=\"shopatron",
         "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50"
       ],
       "icon": "Shopatron.png",
+      "js": {
+        "shptUrl": ""
+      },
       "meta": {
         "keywords": "Shopatron"
       },
       "script": "mediacdn\\.shopatron\\.com",
       "website": "http://ecommerce.shopatron.com"
     },
+    "Shopcada": {
+      "cats": [
+        6
+      ],
+      "icon": "Shopcada.png",
+      "js": {
+        "Shopcada": ""
+      },
+      "website": "http://shopcada.com"
+    },
     "Shoper": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Shoper.svg",
       "js": {
         "shoper": ""
       },
-      "icon": "Shoper.svg",
       "website": "https://www.shoper.pl"
     },
     "Shopery": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Shopery": ""
@@ -8487,25 +9012,48 @@
     },
     "Shopify": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "Shopfa.svg",
       "js": {
-        "Shopify": ""
+        "shopfa": ""
+      },
+      "meta": {
+        "generator": "^ShopFA ([\\d.]+)$\\;version:\\1"
       },
+      "website": "https://shopfa.com"
+    },
+    "Shopify": {
+      "cats": [
+        6
+      ],
       "html": "<link[^>]+=['\"]//cdn\\.shopify\\.com",
       "icon": "Shopify.svg",
+      "js": {
+        "Shopify": ""
+      },
       "website": "http://shopify.com"
     },
-    "Shoptet": {
+    "Shopline": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "shoptet": ""
+      "icon": "shopline.png",
+      "meta": {
+        "og:image": "https\\:\\/\\/img\\.shoplineapp\\.com"
       },
+      "website": "https://shoplineapp.com/"
+    },
+    "Shoptet": {
+      "cats": [
+        6
+      ],
       "html": "<link [^>]*href=\"https?://cdn\\.myshoptet\\.com/",
       "icon": "Shoptet.svg",
       "implies": "PHP",
+      "js": {
+        "shoptet": ""
+      },
       "meta": {
         "web_author": "^Shoptet"
       },
@@ -8516,7 +9064,7 @@
     },
     "Shopware": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1",
       "icon": "Shopware.png",
@@ -8535,9 +9083,23 @@
       ],
       "website": "http://shopware.com"
     },
+    "Signal": {
+      "cats": [
+        32
+      ],
+      "script": [
+        "//s\\.btstatic\\.com/tag\\.js",
+        "//s\\.thebrighttag\\.com/iframe\\?"
+      ],
+      "js": {
+        "signalData": ""
+      },
+      "icon": "signal.png",
+      "website": "https://www.signal.co/"
+    },
     "Silva": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "SilvaCMS"
@@ -8547,37 +9109,38 @@
     },
     "SilverStripe": {
       "cats": [
-        "1"
+        1
       ],
       "html": "Powered by <a href=\"[^>]+SilverStripe",
       "icon": "SilverStripe.svg",
       "meta": {
-        "generator": "SilverStripe"
+        "generator": "^SilverStripe"
       },
-      "website": "http://www.silverstripe.org"
+      "implies": "PHP",
+      "website": "https://www.silverstripe.org"
     },
-    "Simplébo": {
+    "SimpleHTTP": {
       "cats": [
-        "1"
+        22
       ],
       "headers": {
-        "X-ServedBy": "simplebo"
+        "Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
       },
-      "icon": "Simplebo.png",
-      "website": "https://www.simplebo.fr"
+      "website": "http://example.com"
     },
-    "SimpleHTTP": {
+    "Simplébo": {
       "cats": [
-        "22"
+        1
       ],
       "headers": {
-        "Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
+        "X-ServedBy": "simplebo"
       },
-      "website": "http://example.com"
+      "icon": "Simplebo.png",
+      "website": "https://www.simplebo.fr"
     },
     "Site Meter": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "Site Meter.png",
       "script": "sitemeter\\.com/js/counter\\.js\\?site=",
@@ -8585,21 +9148,21 @@
     },
     "SiteCatalyst": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "SiteCatalyst.png",
       "js": {
+        "s_INST": "",
         "s_account": "",
-        "s_objectID": "",
         "s_code": "",
-        "s_INST": ""
+        "s_objectID": ""
       },
-      "icon": "SiteCatalyst.png",
       "script": "/s[_-]code.*\\.js",
       "website": "http://www.adobe.com/solutions/digital-marketing.html"
     },
     "SiteEdit": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "SiteEdit.png",
       "meta": {
@@ -8609,10 +9172,10 @@
     },
     "Sitecore": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-cookie": "SC_ANALYTICS_GLOBAL_COOKIE"
+      "cookies": {
+        "SC_ANALYTICS_GLOBAL_COOKIE": ""
       },
       "html": "<img[^>]+src=\"[^>]*/~/media/[^>]+\\.ashx",
       "icon": "Sitecore.png",
@@ -8620,7 +9183,7 @@
     },
     "Sitefinity": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Sitefinity.svg",
       "implies": "Microsoft ASP.NET",
@@ -8631,7 +9194,7 @@
     },
     "Sivuviidakko": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Sivuviidakko.png",
       "meta": {
@@ -8641,16 +9204,25 @@
     },
     "Sizmek": {
       "cats": [
-        "36"
+        36
       ],
       "html": "(?:<a [^>]*href=\"[^/]*//[^/]*serving-sys\\.com/|<img [^>]*src=\"[^/]*//[^/]*serving-sys\\.com/)",
       "icon": "Sizmek.png",
-      "script": "[^/]*//[^/]*serving-sys\\.com/",
+      "script": "serving-sys\\.com/",
       "website": "http://sizmek.com"
     },
+    "Slick": {
+      "cats": [
+        59
+      ],
+      "html": "<link [^>]+(?:/([\\d.]+)/)?slick-theme\\.css\\;version:\\1",
+      "implies": "jQuery",
+      "script": "(?:/([\\d.]+))?/slick(?:\\.min)?\\.js\\;version:\\1",
+      "website": "https://kenwheeler.github.io/slick"
+    },
     "Slimbox": {
       "cats": [
-        "12"
+        59
       ],
       "html": "<link [^>]*href=\"[^/]*slimbox(?:-rtl)?\\.css",
       "icon": "Slimbox.png",
@@ -8660,7 +9232,7 @@
     },
     "Slimbox 2": {
       "cats": [
-        "12"
+        59
       ],
       "html": "<link [^>]*href=\"[^/]*slimbox2(?:-rtl)?\\.css",
       "icon": "Slimbox 2.png",
@@ -8670,18 +9242,18 @@
     },
     "Smart Ad Server": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<img[^>]+smartadserver\\.com\\/call",
+      "icon": "Smart Ad Server.png",
       "js": {
         "SmartAdServer": ""
       },
-      "html": "<img[^>]+smartadserver\\.com\\/call",
-      "icon": "Smart Ad Server.png",
       "website": "http://smartadserver.com"
     },
     "SmartSite": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+/smartsite\\.(?:dws|shtml)\\?id=",
       "icon": "SmartSite.png",
@@ -8692,7 +9264,7 @@
     },
     "Smartstore": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Smartstore.png",
       "script": "smjslib\\.js",
@@ -8700,8 +9272,8 @@
     },
     "Snap": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
       "headers": {
         "Server": "Snap/([.\\d]+)\\;version:\\1"
@@ -8712,52 +9284,63 @@
     },
     "Snap.svg": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Snap.svg.png",
       "js": {
-        "Snap": ""
+        "Snap.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Snap.svg.png",
       "script": "snap\\.svg(?:-min)?\\.js",
       "website": "http://snapsvg.io"
     },
     "Snoobi": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Snoobi.png",
       "js": {
         "snoobi": ""
       },
-      "icon": "Snoobi.png",
       "script": "snoobi\\.com/snoop\\.php",
       "website": "http://www.snoobi.com"
     },
     "SobiPro": {
       "cats": [
-        "19"
+        19
       ],
+      "icon": "SobiPro.png",
+      "implies": "Joomla",
       "js": {
         "SobiProUrl": ""
       },
-      "icon": "SobiPro.png",
-      "implies": "Joomla",
       "website": "http://sigsiu.net/sobipro.html"
     },
     "Socket.io": {
       "cats": [
-        "12"
+        12
       ],
-      "js": {
-        "io": "\\;confidence:20"
-      },
       "icon": "Socket.io.png",
       "implies": "Node.js",
+      "js": {
+        "io.Socket": "",
+        "io.version": "^(.+)$\\;version:\\1"
+      },
       "script": "socket\\.io.*\\.js",
-      "website": "http://socket.io"
+      "website": "https://socket.io"
+    },
+    "SoftTr": {
+      "cats": [
+        6
+      ],
+      "icon": "softtr.png",
+      "meta": {
+        "author": "SoftTr E-Ticaret Sitesi Yazılımı"
+      },
+      "website": "http://www.softtr.com"
     },
     "Solodev": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "solodev_session": ""
@@ -8769,7 +9352,7 @@
     },
     "Solr": {
       "cats": [
-        "34"
+        34
       ],
       "icon": "Solr.png",
       "implies": "Lucene",
@@ -8777,47 +9360,47 @@
     },
     "Solusquare OmniCommerce Cloud": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "_solusquare="
+      "cookies": {
+        "_solusquare": ""
       },
+      "icon": "Solusquare.png",
+      "implies": "Adobe ColdFusion",
       "meta": {
         "generator": "^Solusquare$"
       },
-      "icon": "Solusquare.png",
-      "implies": "Adobe ColdFusion",
       "website": "https://www.solusquare.com"
     },
     "Solve Media": {
       "cats": [
-        "16",
-        "36"
+        16,
+        36
       ],
+      "icon": "Solve Media.png",
       "js": {
-        "_ACPuzzle": "",
         "ACPuzzle": "",
+        "_ACPuzzle": "",
         "_adcopy-puzzle-image-image": "",
         "adcopy-puzzle-image-image": ""
       },
-      "icon": "Solve Media.png",
       "script": "^https?://api\\.solvemedia\\.com/",
       "website": "http://solvemedia.com"
     },
     "SonarQubes": {
       "cats": [
-        "47"
+        47
       ],
-      "js": {
-        "SonarMeasures": "",
-        "SonarRequest": ""
-      },
       "html": [
         "<link href=\"/css/sonar\\.css\\?v=([\\d.]+)\\;version:\\1",
         "<title>SonarQube</title>"
       ],
       "icon": "sonar.png",
       "implies": "Java",
+      "js": {
+        "SonarMeasures": "",
+        "SonarRequest": ""
+      },
       "meta": {
         "application-name": "^SonarQubes$"
       },
@@ -8826,36 +9409,30 @@
     },
     "SoundManager": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "SoundManager.png",
       "js": {
+        "BaconPlayer": "",
         "SoundManager": "",
-        "BaconPlayer": ""
+        "soundManager.version": "V(.+) \\;version:\\1"
       },
-      "icon": "SoundManager.png",
       "website": "http://www.schillmania.com/projects/soundmanager2"
     },
-    "Sparql": {
-      "cats": [
-        "27"
-      ],
-      "website": "https://www.w3.org/TR/sparql11-overview/"
-    },
     "Sphinx": {
       "cats": [
-        "4"
+        4
       ],
+      "html": "Created using <a href=\"https?://sphinx-doc\\.org/\">Sphinx</a> ([0-9.]+)\\.\\;version:\\1",
+      "icon": "Sphinx.png",
       "js": {
         "DOCUMENTATION_OPTIONS": ""
       },
-      "html": "Created using <a href=\"https?://sphinx-doc\\.org/\">Sphinx</a> ([.\\d+])+\\.\\;version:\\1",
-      "icon": "Sphinx.png",
-      "implies": "Python",
       "website": "http://sphinx.pocoo.org"
     },
     "SpiderControl iniNet": {
       "cats": [
-        "45"
+        45
       ],
       "icon": "SpiderControl iniNet.png",
       "meta": {
@@ -8865,10 +9442,10 @@
     },
     "SpinCMS": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "spincms_session"
+      "cookies": {
+        "spincms_session": ""
       },
       "icon": "SpinCMS.png",
       "implies": "PHP",
@@ -8876,7 +9453,7 @@
     },
     "Splunk": {
       "cats": [
-        "19"
+        19
       ],
       "html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+(?: build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1",
       "icon": "Splunk.png",
@@ -8887,7 +9464,7 @@
     },
     "Splunkd": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Splunkd"
@@ -8897,42 +9474,53 @@
     },
     "Spree": {
       "cats": [
-        "6"
+        6
       ],
       "html": "(?:<link[^>]*/assets/store/all-[a-z\\d]{32}\\.css[^>]+>|<script>\\s*Spree\\.(?:routes|translations|api_key))",
       "icon": "Spree.png",
       "implies": "Ruby on Rails",
       "website": "http://spreecommerce.com"
     },
-    "Squarespace": {
+    "Sqreen": {
       "cats": [
-        "1"
+        19
       ],
-      "js": {
-        "Squarespace": ""
+      "headers": {
+        "X-Protected-By": "^Sqreen$"
       },
+      "icon": "Sqreen.png",
+      "website": "https://sqreen.io"
+    },
+    "Squarespace": {
+      "cats": [
+        1
+      ],
       "headers": {
         "X-ServedBy": "squarespace"
       },
+      "html": "<!-- This is Squarespace\\. -->",
       "icon": "Squarespace.png",
+      "js": {
+        "Squarespace": ""
+      },
       "website": "http://www.squarespace.com"
     },
     "SquirrelMail": {
       "cats": [
-        "30"
+        30
       ],
-      "js": {
-        "squirrelmail_loginpage_onload": ""
-      },
       "html": "<small>SquirrelMail version ([.\\d]+)[^<]*<br \\;version:\\1",
       "icon": "SquirrelMail.png",
       "implies": "PHP",
+      "js": {
+        "squirrelmail_loginpage_onload": ""
+      },
       "url": "/src/webmail\\.php(?:$|\\?)",
       "website": "http://squirrelmail.org"
     },
     "Squiz Matrix": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "Squiz Matrix"
@@ -8947,40 +9535,18 @@
     },
     "Stackla": {
       "cats": [
-        "5"
+        5
       ],
+      "icon": "Stackla.png",
       "js": {
         "Stackla": ""
       },
-      "icon": "Stackla.png",
       "script": "assetscdn\\.stackla\\.com\\/media\\/js\\/widget\\/(?:[a-zA-Z0-9.]+)?\\.js",
       "website": "http://stackla.com/"
     },
-    "Stackla Social Hub": {
-      "cats": [
-        "1"
-      ],
-      "js": {
-        "stacklaSocialHub": ""
-      },
-      "icon": "Stackla.png",
-      "website": "http://stackla.com/"
-    },
-    "Stamplay": {
-      "cats": [
-        "34",
-        "47"
-      ],
-      "headers": {
-        "Server": "Stamplay"
-      },
-      "icon": "Stamplay.png",
-      "script": "stamplay.*\\.js",
-      "website": "http://stamplay.com"
-    },
     "Starlet": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^Plack::Handler::Starlet"
@@ -8989,17 +9555,30 @@
       "implies": "Perl",
       "website": "http://metacpan.org/pod/Starlet"
     },
-    "StatCounter": {
+    "Statcounter": {
       "cats": [
-        "10"
+        10
       ],
-      "icon": "StatCounter.png",
+      "icon": "Statcounter.svg",
+      "js": {
+        "_statcounter": "\\;confidence:100",
+        "sc_project": "\\;confidence:50",
+        "sc_security": "\\;confidence:50"
+      },
       "script": "statcounter\\.com/counter/counter",
       "website": "http://www.statcounter.com"
     },
+    "Store Systems": {
+      "cats": [
+        6
+      ],
+      "html": "Shopsystem von <a href=[^>]+store-systems\\.de\"|\\.mws_boxTop",
+      "icon": "Store Systems.png",
+      "website": "http://store-systems.de"
+    },
     "Storeden": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Powered-By": "Storeden"
@@ -9007,17 +9586,9 @@
       "icon": "storeden.svg",
       "website": "https://www.storeden.com"
     },
-    "Store Systems": {
-      "cats": [
-        "6"
-      ],
-      "html": "Shopsystem von <a href=[^>]+store-systems\\.de\"|\\.mws_boxTop",
-      "icon": "Store Systems.png",
-      "website": "http://store-systems.de"
-    },
     "Storyblok": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "storyblok.png",
       "meta": {
@@ -9027,7 +9598,7 @@
     },
     "Strapdown.js": {
       "cats": [
-        "12"
+        12
       ],
       "icon": "strapdown.js.png",
       "implies": [
@@ -9037,9 +9608,19 @@
       "script": "strapdown\\.js",
       "website": "http://strapdownjs.com"
     },
+    "Strapi": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-Powered-By": "^Strapi"
+      },
+      "icon": "Strapi.png",
+      "website": "https://strapi.io"
+    },
     "Strato": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<a href=\"http://www\\.strato\\.de/\" target=\"_blank\">",
       "icon": "strato.png",
@@ -9047,45 +9628,30 @@
     },
     "Stripe": {
       "cats": [
-        "41"
+        41
       ],
-      "js": {
-        "Stripe": ""
-      },
       "html": "<input[^>]+data-stripe",
       "icon": "Stripe.png",
+      "js": {
+        "Stripe.version": "^(.+)$\\;version:\\1"
+      },
       "script": "js\\.stripe\\.com",
       "website": "http://stripe.com"
     },
-    "styled-components": {
-      "cats": [
-        "12",
-        "47"
-      ],
-      "implies": [
-        "React"
-      ],
-      "icon": "styled-components.png",
-      "website": "https://styled-components.com",
-      "html": "<style[^>]*data-styled-components",
-      "js": {
-        "styled": ""
-      }
-    },
     "SublimeVideo": {
       "cats": [
-        "14"
+        14
       ],
+      "icon": "SublimeVideo.png",
       "js": {
         "sublimevideo": ""
       },
-      "icon": "SublimeVideo.png",
       "script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
       "website": "http://sublimevideo.net"
     },
     "Subrion": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-CMS": "Subrion CMS"
@@ -9097,9 +9663,20 @@
       },
       "website": "http://subrion.com"
     },
+    "Sucuri": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "x-sucuri-cache:": "",
+        "x-sucuri-id": ""
+      },
+      "icon": "sucuri.png",
+      "website": "https://sucuri.net/"
+    },
     "Sulu": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Generator": "Sulu/?(.+)?$\\;version:\\1"
@@ -9110,8 +9687,8 @@
     },
     "SumoMe": {
       "cats": [
-        "5",
-        "32"
+        5,
+        32
       ],
       "icon": "SumoMe.png",
       "script": "load\\.sumome\\.com",
@@ -9119,7 +9696,7 @@
     },
     "SunOS": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "SunOS( [\\d\\.]+)?\\;version:\\1",
@@ -9130,7 +9707,7 @@
     },
     "Supersized": {
       "cats": [
-        "25"
+        25
       ],
       "icon": "Supersized.png",
       "script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
@@ -9138,7 +9715,7 @@
     },
     "Svbtle": {
       "cats": [
-        "11"
+        11
       ],
       "icon": "svbtle.png",
       "meta": {
@@ -9149,29 +9726,32 @@
     },
     "SweetAlert": {
       "cats": [
-        "12"
+        59
       ],
+      "html": "<link[^>]+?href=\"[^\"]+sweet-alert(?:\\.min)?\\.css",
+      "icon": "SweetAlert.png",
       "js": {
         "swal": ""
       },
-      "html": "<link[^>]+?href=\"[^\"]+sweet-alert(?:\\.min)?\\.css",
-      "icon": "SweetAlert.png",
       "script": "sweet-alert(?:\\.min)?\\.js",
-      "website": "http://t4t5.github.io/sweetalert/"
+      "website": "https://t4t5.github.io/sweetalert/"
     },
     "SweetAlert2": {
       "cats": [
-        "12"
+        59
       ],
       "excludes": "SweetAlert",
       "html": "<link[^>]+?href=\"[^\"]+sweetalert2(?:\\.min)?\\.css",
       "icon": "SweetAlert2.png",
-      "script": "sweetalert2(?:\\.min)?\\.js",
-      "website": "https://limonte.github.io/sweetalert2"
+      "js": {
+        "Sweetalert2": ""
+      },
+      "script": "sweetalert2(?:\\.all)?(?:\\.min)?\\.js",
+      "website": "https://sweetalert2.github.io/"
     },
     "Swiftlet": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Generator": "Swiftlet",
@@ -9188,26 +9768,38 @@
     },
     "Swiftype": {
       "cats": [
-        "29"
+        29
       ],
+      "icon": "swiftype.png",
       "js": {
         "Swiftype": ""
       },
-      "icon": "swiftype.png",
       "script": "swiftype\\.com/embed\\.js$",
       "website": "http://swiftype.com"
     },
     "Symfony": {
       "cats": [
-        "18"
+        18
       ],
       "icon": "Symfony.png",
       "implies": "PHP",
       "website": "http://symfony.com"
     },
+    "Sympa": {
+      "cats": [
+        30
+      ],
+      "meta": {
+        "generator": "^Sympa$"
+      },
+      "html": "<a href=\"https?://www\\.sympa\\.org\">\\s*Powered by Sympa\\s*</a>",
+      "icon": "sympa.png",
+      "implies": "Perl",
+      "website": "https://www.sympa.org/"
+    },
     "Synology DiskStation": {
       "cats": [
-        "48"
+        48
       ],
       "html": "<noscript><div class='syno-no-script'",
       "icon": "Synology DiskStation.png",
@@ -9220,21 +9812,21 @@
     },
     "SyntaxHighlighter": {
       "cats": [
-        "19"
+        19
       ],
+      "html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
+      "icon": "SyntaxHighlighter.png",
       "js": {
         "SyntaxHighlighter": ""
       },
-      "html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
-      "icon": "SyntaxHighlighter.png",
-      "website": "http://github.com/syntaxhighlighter"
+      "website": "https://github.com/syntaxhighlighter"
     },
     "TWiki": {
       "cats": [
-        "8"
+        8
       ],
-      "headers": {
-        "Set-cookie": "TWIKISID"
+      "cookies": {
+        "TWIKISID": ""
       },
       "html": "<img [^>]*(?:title|alt)=\"This site is powered by the TWiki collaboration platform",
       "icon": "TWiki.png",
@@ -9242,36 +9834,48 @@
       "script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
       "website": "http://twiki.org"
     },
+    "tailwindcss": {
+      "cats": [
+        18
+      ],
+      "html": "<link[^>]+?href=\"[^\"]+tailwindcss(?:\\.min)?\\.css",
+      "icon": "tailwindcss.svg",
+      "website": "https://tailwindcss.com/"
+    },
     "TYPO3 CMS": {
       "cats": [
-        "1"
+        1
+      ],
+      "html": [
+        "<link[^>]+ href=\"typo3(?:conf|temp)/",
+        "<img[^>]+ src=\"typo3(?:conf|temp)/"
       ],
-      "html": "<(?:script[^>]+ src|link[^>]+ href)=[^>]+typo3temp/",
       "icon": "TYPO3.svg",
       "implies": "PHP",
+      "script": "^typo3(?:conf|temp)/",
       "meta": {
         "generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1"
       },
       "url": "/typo3/",
-      "website": "http://www.typo3.org"
+      "website": "https://typo3.org/"
     },
     "Taiga": {
       "cats": [
-        "13"
+        13
       ],
-      "js": {
-        "taigaConfig": ""
-      },
       "icon": "Taiga.png",
       "implies": [
         "Django",
         "AngularJS"
       ],
+      "js": {
+        "taigaConfig": ""
+      },
       "website": "http://taiga.io"
     },
     "Tawk.to": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "TawkTo.png",
       "script": "//embed\\.tawk\\.to",
@@ -9279,60 +9883,65 @@
     },
     "Tealeaf": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Tealeaf.png",
       "js": {
         "TeaLeaf": ""
       },
-      "icon": "Tealeaf.png",
       "website": "http://www.tealeaf.com"
     },
     "Tealium": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Tealium.png",
       "js": {
         "TEALIUMENABLED": ""
       },
-      "icon": "Tealium.png",
       "script": [
-        "^//tags\\.tiqcdn\\.com/",
+        "^(?:https?:)?//tags\\.tiqcdn\\.com/",
         "/tealium/utag\\.js$"
       ],
       "website": "http://tealium.com"
     },
     "TeamCity": {
       "cats": [
-        "44"
+        44
       ],
       "html": "<span class=\"versionTag\"><span class=\"vWord\">Version</span> ([\\d\\.]+)\\;version:\\1",
-      "icon": "TeamCity.png",
+      "icon": "TeamCity.svg",
       "implies": [
+        "Apache Tomcat",
+        "Java",
         "jQuery",
-        "Prototype"
+        "Moment.js",
+        "Prototype",
+        "React",
+        "Underscore.js"
       ],
       "meta": {
         "application-name": "TeamCity"
       },
-      "website": "http://jetbrains.com/teamcity"
+      "website": "https://www.jetbrains.com/teamcity/"
     },
     "Telescope": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "Telescope": ""
-      },
       "icon": "Telescope.png",
       "implies": [
         "Meteor",
         "React"
       ],
+      "js": {
+        "Telescope": ""
+      },
       "website": "http://telescopeapp.org"
     },
     "Tengine": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Tengine"
@@ -9342,17 +9951,17 @@
     },
     "Textalk": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "textalk.png",
       "meta": {
         "generator": "Textalk Webshop"
       },
-      "icon": "textalk.png",
       "website": "https://www.textalk.se"
     },
     "Textpattern CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "Textpattern CMS.png",
       "implies": [
@@ -9366,8 +9975,8 @@
     },
     "Thelia": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
       "html": "<(?:link|style|script)[^>]+/assets/frontOffice/",
       "icon": "Thelia.png",
@@ -9379,7 +9988,7 @@
     },
     "ThinkPHP": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "ThinkPHP"
@@ -9390,7 +9999,7 @@
     },
     "Ticimax": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Ticimax.png",
       "script": [
@@ -9400,7 +10009,7 @@
     },
     "Tictail": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<link[^>]*tictail\\.com",
       "icon": "tictail.png",
@@ -9408,31 +10017,31 @@
     },
     "TiddlyWiki": {
       "cats": [
-        "1",
-        "2",
-        "4",
-        "8"
+        1,
+        2,
+        4,
+        8
       ],
+      "html": "<[^>]*type=[^>]text\\/vnd\\.tiddlywiki",
+      "icon": "TiddlyWiki.png",
       "js": {
         "tiddler": ""
       },
-      "html": "<[^>]*type=[^>]text\\/vnd\\.tiddlywiki",
-      "icon": "TiddlyWiki.png",
       "meta": {
         "application-name": "^TiddlyWiki$",
         "copyright": "^TiddlyWiki created by Jeremy Ruston",
         "generator": "^TiddlyWiki$",
-        "tiddlywiki-version": "(.*)\\;version:\\1"
+        "tiddlywiki-version": "^(.+)$\\;version:\\1"
       },
       "website": "http://tiddlywiki.com"
     },
     "Tiki Wiki CMS Groupware": {
       "cats": [
-        "1",
-        "2",
-        "8",
-        "11",
-        "13"
+        1,
+        2,
+        8,
+        11,
+        13
       ],
       "icon": "Tiki Wiki CMS Groupware.png",
       "meta": {
@@ -9443,54 +10052,54 @@
     },
     "Tilda": {
       "cats": [
-        "1"
+        1
       ],
-      "icon": "tilda.png",
       "html": "<link[^>]* href=[^>]+tilda(?:cdn|\\.ws|-blocks)",
+      "icon": "Tilda.svg",
       "script": "tilda(?:cdn|\\.ws|-blocks)",
       "website": "https://tilda.cc"
     },
     "Timeplot": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "Timeplot.png",
       "js": {
         "Timeplot": ""
       },
-      "icon": "Timeplot.png",
       "script": "timeplot.*\\.js",
       "website": "http://www.simile-widgets.org/timeplot/"
     },
     "TinyMCE": {
       "cats": [
-        "24"
+        24
       ],
+      "icon": "TinyMCE.png",
       "js": {
-        "tinyMCE": ""
+        "tinyMCE.majorVersion": "([\\d.]+)\\;version:\\1"
       },
-      "icon": "TinyMCE.png",
+      "script": "/tiny_?mce(?:\\.min)?\\.js",
       "website": "http://tinymce.com"
     },
     "Titan": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "Titan.png",
       "js": {
         "titan": "",
         "titanEnabled": ""
       },
-      "html": "<script[^>]+>var titan",
-      "icon": "Titan.png",
       "website": "http://titan360.com"
     },
     "TomatoCart": {
       "cats": [
-        "6"
+        6
       ],
+      "icon": "TomatoCart.png",
       "js": {
         "AjaxShoppingCart": ""
       },
-      "icon": "TomatoCart.png",
       "meta": {
         "generator": "TomatoCart"
       },
@@ -9498,7 +10107,7 @@
     },
     "TornadoServer": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "TornadoServer(?:/([\\d.]+))?\\;version:\\1"
@@ -9508,7 +10117,7 @@
     },
     "TotalCode": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Powered-By": "^TotalCode$"
@@ -9518,7 +10127,7 @@
     },
     "Trac": {
       "cats": [
-        "13"
+        13
       ],
       "html": [
         "<a id=\"tracpowered",
@@ -9530,18 +10139,28 @@
     },
     "TrackJs": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "TrackJs.png",
       "js": {
         "TrackJs": ""
       },
-      "icon": "TrackJs.png",
       "script": "tracker\\.js",
       "website": "http://trackjs.com"
     },
+    "Transifex": {
+      "cats": [
+        12
+      ],
+      "icon": "transifex.png",
+      "js": {
+        "Transifex.live.lib_version": "(.+)\\;version:\\1"
+      },
+      "website": "https://www.transifex.com"
+    },
     "Translucide": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "translucide.svg",
       "implies": [
@@ -9551,19 +10170,17 @@
       "script": "lucide\\.init(?:\\.min)?\\.js",
       "website": "http://www.translucide.net"
     },
-    "T-Soft": {
+    "Tray": {
       "cats": [
-        "6"
+        6
       ],
-      "icon": "Tsoft.png",
-      "meta": {
-        "copyright": "T-Soft E-Ticaret Sistemleri"
-      },
-      "website": "http://www.tsoft.com.tr/"
+      "icon": "tray.png",
+      "script": "tcdn\\.com\\.br",
+      "website": "https://www.tray.com.br"
     },
     "Tumblr": {
       "cats": [
-        "11"
+        11
       ],
       "headers": {
         "X-Tumblr-User": ""
@@ -9575,18 +10192,18 @@
     },
     "TweenMax": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "TweenMax.png",
       "js": {
-        "TweenMax": ""
+        "TweenMax.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "TweenMax.png",
       "script": "TweenMax(?:\\.min)?\\.js",
       "website": "http://greensock.com/tweenmax"
     },
     "Twilight CMS": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-CMS": "Twilight CMS"
@@ -9596,7 +10213,7 @@
     },
     "TwistPHP": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "TwistPHP"
@@ -9607,7 +10224,7 @@
     },
     "TwistedWeb": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "TwistedWeb(?:/([\\d.]+))?\\;version:\\1"
@@ -9617,66 +10234,48 @@
     },
     "Twitter": {
       "cats": [
-        "5"
+        5
       ],
       "icon": "Twitter.svg",
       "script": "//platform\\.twitter\\.com/widgets\\.js",
       "website": "http://twitter.com"
     },
-    "Bootstrap": {
-      "cats": [
-        "18"
-      ],
-      "html": [
-        "<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
-        "<link[^>]+?href=[^\"]/css/([\\d.]+)/bootstrap\\.(?:min\\.)?css\\;version:\\1",
-        "<link[^>]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css",
-        "<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
-      ],
-      "icon": "Bootstrap.svg",
-      "script": [
-        "twitter\\.github\\.com/bootstrap",
-        "bootstrap(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "(?:/([\\d.]+))?(?:/js)?/bootstrap(?:\\.min)?\\.js\\;version:\\1"
-      ],
-      "website": "https://getbootstrap.com"
-    },
     "Twitter Emoji (Twemoji)": {
       "cats": [
-        "25"
+        19
       ],
       "js": {
         "twemoji": ""
       },
       "script": "twemoji(?:\\.min)?\\.js",
-      "website": "http://twitter.github.io/twemoji/"
+      "website": "https://twitter.github.io/twemoji/"
     },
     "Twitter Flight": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Twitter Flight.png",
+      "implies": "jQuery",
       "js": {
         "flight": ""
       },
-      "icon": "Twitter Flight.png",
-      "implies": "jQuery",
-      "website": "http://flightjs.github.io/"
+      "website": "https://flightjs.github.io/"
     },
     "Twitter typeahead.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Twitter typeahead.js.png",
+      "implies": "jQuery",
       "js": {
         "typeahead": ""
       },
-      "icon": "Twitter typeahead.js.png",
-      "implies": "jQuery",
       "script": "(?:typeahead|bloodhound)\\.(?:jquery|bundle)?(?:\\.min)?\\.js",
-      "website": "http://twitter.github.io/typeahead.js"
+      "website": "https://twitter.github.io/typeahead.js"
     },
     "TypePad": {
       "cats": [
-        "11"
+        11
       ],
       "icon": "TypePad.png",
       "meta": {
@@ -9687,7 +10286,7 @@
     },
     "Typecho": {
       "cats": [
-        "11"
+        11
       ],
       "icon": "typecho.svg",
       "implies": "PHP",
@@ -9702,37 +10301,38 @@
     },
     "Typekit": {
       "cats": [
-        "17"
+        17
       ],
+      "icon": "Typekit.png",
       "js": {
-        "Typekit": ""
+        "Typekit.config.js": "^(.+)$\\;version:\\1"
       },
-      "icon": "Typekit.png",
       "script": "use\\.typekit\\.com",
       "website": "http://typekit.com"
     },
-    "uCoz": {
-      "cats": [
-        "1"
-      ],
-      "headers": {
-        "Set-Cookie": "uCoz="
-      },
-      "icon": "uCoz.svg",
-      "website": "https://ucoz.ru"
-    },
     "UIKit": {
       "cats": [
-        "18"
+        18
       ],
-      "icon": "UIKit.png",
       "html": "<[^>]+class=\"[^\"]*(?:uk-container|uk-section)",
+      "icon": "UIKit.png",
       "script": "uikit.*\\.js",
       "website": "https://getuikit.com"
     },
+    "UMI.CMS": {
+      "cats": [
+        1
+      ],
+      "headers": {
+        "X-Generated-By": "UMI\\.CMS"
+      },
+      "icon": "UMI.CMS.png",
+      "implies": "PHP",
+      "website": "https://www.umi-cms.ru"
+    },
     "UNIX": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Unix"
@@ -9742,7 +10342,7 @@
     },
     "Ubercart": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Ubercart.png",
       "implies": "Drupal",
@@ -9751,7 +10351,7 @@
     },
     "Ubuntu": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Ubuntu",
@@ -9762,54 +10362,43 @@
     },
     "UltraCart": {
       "cats": [
-        "6"
+        6
       ],
+      "html": "<form [^>]*action=\"[^\"]*\\/cgi-bin\\/UCEditor\\?(?:[^\"]*&)?merchantId=[^\"]",
+      "icon": "UltraCart.png",
       "js": {
         "ucCatalog": ""
       },
-      "html": "<form [^>]*action=\"[^\"]*\\/cgi-bin\\/UCEditor\\?(?:[^\"]*&)?merchantId=[^\"]",
-      "icon": "UltraCart.png",
-      "script": "cgi-bin\\/UCJavaScript\\?(?:[^\"]*&)?merchantid=",
-      "url": "/cgi-bin/UCEditor\\?(?:.*&)?merchantid=",
+      "script": "cgi-bin\\/UCJavaScript\\?",
+      "url": "/cgi-bin/UCEditor\\?",
       "website": "http://ultracart.com"
     },
     "Umbraco": {
       "cats": [
-        "1"
+        1
       ],
+      "headers": {
+        "X-Umbraco-Version": "^(.+)$\\;version:\\1"
+      },
+      "html": "powered by <a href=[^>]+umbraco",
+      "icon": "Umbraco.png",
+      "implies": "Microsoft ASP.NET",
       "js": {
         "UC_IMAGE_SERVICE|ITEM_INFO_SERVICE": "",
         "UC_ITEM_INFO_SERVICE": "",
         "UC_SETTINGS": "",
         "Umbraco": ""
       },
-      "headers": {
-        "X-Umbraco-Version": "(.*)\\;version:\\1"
-      },
-      "html": "powered by <a href=[^>]+umbraco",
-      "icon": "Umbraco.png",
-      "implies": "Microsoft ASP.NET",
       "meta": {
         "generator": "umbraco"
       },
       "url": "/umbraco/login\\.aspx(?:$|\\?)",
       "website": "http://umbraco.com"
     },
-    "UMI.CMS": {
-      "cats": [
-        "1"
-      ],
-      "headers": {
-        "X-Generated-By": "UMI\\.CMS"
-      },
-      "icon": "UMI.CMS.png",
-      "implies": "PHP",
-      "website": "https://www.umi-cms.ru"
-    },
     "Unbounce": {
       "cats": [
-        "20",
-        "51"
+        20,
+        51
       ],
       "headers": {
         "X-Unbounce-PageId": ""
@@ -9820,36 +10409,55 @@
     },
     "Underscore.js": {
       "cats": [
-        "12"
+        59
       ],
+      "excludes": "Lodash",
       "icon": "Underscore.js.png",
+      "js": {
+        "_.VERSION": "^(.+)$\\;confidence:0\\;version:\\1",
+        "_.restArguments": ""
+      },
       "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
       "website": "http://underscorejs.org"
     },
     "Usabilla": {
       "cats": [
-        "13"
+        13
       ],
+      "icon": "Usabilla.svg",
       "js": {
         "usabilla_live": ""
       },
-      "icon": "Usabilla.svg",
       "website": "http://usabilla.com"
     },
     "UserEngage": {
       "cats": [
-        "10"
+        10
       ],
+      "html": "<div[^>]+/id=\"ue_widget\"",
+      "icon": "UserEngage.png",
       "js": {
         "UserEngage": ""
       },
-      "icon": "UserEngage.png",
-      "html": "<div[^>]+/id=\"ue_widget\"",
       "website": "https://userengage.com"
     },
+    "UserGuiding": {
+      "cats": [
+        58,
+        10
+      ],
+      "icon": "UserGuiding.svg",
+      "implies": [
+        "React",
+        "webpack",
+        "Node.js"
+      ],
+      "script": "static\\.userguiding*\\.js",
+      "website": "https://userguiding.com"
+    },
     "UserLike": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "UserLike.svg",
       "script": [
@@ -9860,34 +10468,31 @@
     },
     "UserRules": {
       "cats": [
-        "13"
+        13
       ],
+      "icon": "UserRules.png",
       "js": {
         "_usrp": ""
       },
-      "icon": "UserRules.png",
       "website": "http://www.userrules.com"
     },
     "UserVoice": {
       "cats": [
-        "13"
+        13
       ],
+      "icon": "UserVoice.png",
       "js": {
         "UserVoice": ""
       },
-      "icon": "UserVoice.png",
       "website": "http://uservoice.com"
     },
     "Ushahidi": {
       "cats": [
-        "1",
-        "35"
+        1,
+        35
       ],
-      "js": {
-        "Ushahidi": ""
-      },
-      "headers": {
-        "Set-Cookie": "^ushahidi="
+      "cookies": {
+        "ushahidi": ""
       },
       "icon": "Ushahidi.png",
       "implies": [
@@ -9895,25 +10500,28 @@
         "MySQL",
         "OpenLayers"
       ],
+      "js": {
+        "Ushahidi": ""
+      },
       "script": "/js/ushahidi\\.js$",
       "website": "http://www.ushahidi.com"
     },
     "VIVVO": {
       "cats": [
-        "1"
+        1
       ],
+      "cookies": {
+        "VivvoSessionId": ""
+      },
+      "icon": "VIVVO.png",
       "js": {
         "vivvo": ""
       },
-      "headers": {
-        "Set-Cookie": "VivvoSessionId"
-      },
-      "icon": "VIVVO.png",
       "website": "http://vivvo.net"
     },
     "VP-ASP": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<a[^>]+>Powered By VP-ASP Shopping Cart</a>",
       "icon": "VP-ASP.png",
@@ -9923,7 +10531,7 @@
     },
     "VTEX Enterprise": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "powered": "vtex"
@@ -9933,7 +10541,7 @@
     },
     "VTEX Integrated Store": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-Powered-By": "vtex-integrated-store"
@@ -9941,9 +10549,21 @@
       "icon": "VTEX Integrated Store.png",
       "website": "http://lojaintegrada.com.br"
     },
+    "Vaadin": {
+      "cats": [
+        18
+      ],
+      "icon": "Vaadin.svg",
+      "implies": "Java",
+      "js": {
+        "vaadin": ""
+      },
+      "script": "vaadinBootstrap\\.js(?:\\?v=([\\d.]+))?\\;version:\\1",
+      "website": "https://vaadin.com"
+    },
     "Vanilla": {
       "cats": [
-        "2"
+        2
       ],
       "headers": {
         "X-Powered-By": "Vanilla"
@@ -9955,10 +10575,10 @@
     },
     "Varnish": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
-        "Via": ".*Varnish",
+        "Via": "varnish(?: \\(Varnish/([\\d.]+)\\))?\\;version:\\1",
         "X-Varnish": "",
         "X-Varnish-Action": "",
         "X-Varnish-Age": "",
@@ -9970,7 +10590,7 @@
     },
     "Venda": {
       "cats": [
-        "6"
+        6
       ],
       "headers": {
         "X-venda-hitid": ""
@@ -9980,56 +10600,56 @@
     },
     "Veoxa": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<img [^>]*src=\"[^\"]+tracking\\.veoxa\\.com",
+      "icon": "Veoxa.png",
       "js": {
         "VuVeoxaContent": ""
       },
-      "html": "<img [^>]*src=\"[^\"]+tracking\\.veoxa\\.com",
-      "icon": "Veoxa.png",
       "script": "tracking\\.veoxa\\.com",
       "website": "http://veoxa.com"
     },
     "VideoJS": {
       "cats": [
-        "14"
+        14
       ],
+      "html": "<div[^>]+class=\"video-js+\">",
+      "icon": "VideoJS.png",
       "js": {
         "VideoJS": ""
       },
-      "html": "<div[^>]+class=\"video-js+\">",
-      "icon": "VideoJS.png",
       "script": "zencdn\\.net/c/video\\.js",
       "website": "http://videojs.com"
     },
-    "Vigbo": {
-      "cats": [
-        "1"
-      ],
-      "headers": {
-        "Set-Cookie": "_gphw_mode="
-      },
-      "icon": "vigbo.png",
-      "html": "<link[^>]* href=[^>]+(?:\\.vigbo\\.com|\\.gophotoweb\\.com)",
-      "script": "(?:\\.vigbo\\.com|\\.gophotoweb\\.com)",
-      "website": "https://vigbo.com"
-    },
     "VigLink": {
       "cats": [
-        "36"
+        36
       ],
+      "icon": "VigLink.png",
       "js": {
         "vglnk": "",
         "vl_cB": "",
         "vl_disable": ""
       },
-      "icon": "VigLink.png",
       "script": "(?:^[^/]*//[^/]*viglink\\.com/api/|vglnk\\.js)",
       "website": "http://viglink.com"
     },
+    "Vigbo": {
+      "cats": [
+        1
+      ],
+      "cookies": {
+        "_gphw_mode": ""
+      },
+      "html": "<link[^>]* href=[^>]+(?:\\.vigbo\\.com|\\.gophotoweb\\.com)",
+      "icon": "vigbo.png",
+      "script": "(?:\\.vigbo\\.com|\\.gophotoweb\\.com)",
+      "website": "https://vigbo.com"
+    },
     "Vignette": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<[^>]+=\"vgn-?ext",
       "icon": "Vignette.png",
@@ -10037,27 +10657,15 @@
     },
     "Vimeo": {
       "cats": [
-        "14"
+        14
       ],
       "html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)",
       "icon": "Vimeo.png",
       "website": "http://vimeo.com"
     },
-    "Virata EmWeb": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
-      },
-      "implies": [
-        "HP"
-      ],
-      "website": "http://example.com"
-    },
     "VirtueMart": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<div id=\"vmMainPage",
       "icon": "VirtueMart.png",
@@ -10066,27 +10674,27 @@
     },
     "Virtuoso": {
       "cats": [
-        "34"
+        34
       ],
-      "website": "https://virtuoso.openlinksw.com/",
+      "headers": {
+        "Server": "Virtuoso/?([0-9.]+)?\\;version:\\1"
+      },
       "meta": {
-        "Keywords": "^OpenLink Virtuoso Sparql",
-        "Copyright": "^Copyright &copy; \\d{4} OpenLink Software"
+        "Copyright": "^Copyright &copy; \\d{4} OpenLink Software",
+        "Keywords": "^OpenLink Virtuoso Sparql"
       },
-      "url": ".*/sparql\\.*",
-      "headers": {
-        "Server": "Virtuoso\\/?(\\d{2}\\.\\d{2}\\.\\d{4})?\\;version:\\1"
-      }
+      "url": "/sparql",
+      "website": "https://virtuoso.openlinksw.com/"
     },
     "Visual WebGUI": {
       "cats": [
-        "18"
+        18
       ],
+      "icon": "Visual WebGUI.png",
+      "implies": "Microsoft ASP.NET",
       "js": {
         "VWGEventArgs": ""
       },
-      "icon": "Visual WebGUI.png",
-      "implies": "Microsoft ASP.NET",
       "meta": {
         "generator": "^Visual WebGUI"
       },
@@ -10094,52 +10702,89 @@
       "url": "\\.wgx$",
       "website": "http://www.gizmox.com/products/visual-web-gui/"
     },
+    "Visual Website Optimizer": {
+      "cats": [
+        10
+      ],
+      "html": [
+        "<!-- (?:Start|End) Visual Website Optimizer A?Synchronous Code -->"
+      ],
+      "icon": "vwo.svg",
+      "js": {
+        "VWO": "",
+        "__vwo": ""
+      },
+      "script": [
+        "dev\\.visualwebsiteoptimizer\\.com"
+      ],
+      "website": "https://vwo.com/"
+    },
     "VisualPath": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "VisualPath.png",
       "script": "visualpath[^/]*\\.trackset\\.it/[^/]+/track/include\\.js",
       "website": "http://www.trackset.com/web-analytics-software/visualpath"
     },
-    "Volusion": {
+    "Volusion (V1)": {
       "cats": [
-        "6"
+        6
       ],
+      "html": "<link [^>]*href=\"[^\"]*/vspfiles/",
+      "icon": "Volusion.svg",
+      "implies": "Microsoft ASP.NET",
       "js": {
         "volusion": ""
       },
-      "html": "<link [^>]*href=\"[^\"]*/vspfiles/",
-      "icon": "Volusion.png",
       "script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
-      "website": "http://volusion.com"
+      "website": "https://www.volusion.com"
     },
-    "Vox": {
+    "Volusion (V2)": {
       "cats": [
-        "11"
+        6
       ],
-      "icon": "Vox.png",
-      "url": "\\.vox\\.com",
-      "website": "http://www.vox.com"
+      "html": "<body [^>]*data-vn-page-name",
+      "icon": "Volusion.svg",
+      "implies": "AngularJS",
+      "website": "https://www.volusion.com"
     },
     "Vue.js": {
       "cats": [
-        "12"
+        12
       ],
+      "html": "<[^>]+data-v(?:ue)-",
+      "icon": "Vue.js.png",
       "js": {
-        "Vue": ""
+        "Vue.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Vue.js.png",
       "script": [
-        "vue(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
-        "/([\\d.]+)/vue(?:\\.min)?\\.js\\;version:\\1",
-        "vue.*\\.js\\;confidence:20"
+        "vue[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "(?:/([\\d.]+))?/vue(?:\\.min)?\\.js\\;version:\\1"
       ],
       "website": "http://vuejs.org"
     },
+    "Nuxt.js": {
+      "cats": [
+        12
+      ],
+      "html": [
+        "<div [^>]*id=\"__nuxt\"",
+        "<script [^>]*>window\\.__NUXT__"
+      ],
+      "icon": "Nuxt.js.svg",
+      "js": {
+        "$nuxt": ""
+      },
+      "script": [
+        "/_nuxt/"
+      ],
+      "implies": "Vue.js",
+      "website": "https://nuxtjs.org"
+    },
     "W3 Total Cache": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "X-Powered-By": "W3 Total Cache(?:/([\\d.]+))?\\;version:\\1"
@@ -10151,7 +10796,7 @@
     },
     "W3Counter": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "W3Counter.png",
       "script": "w3counter\\.com/tracker\\.js",
@@ -10159,28 +10804,28 @@
     },
     "WEBXPAY": {
       "cats": [
-        "6"
+        6
       ],
+      "html": "Powered by <a href=\"https://www\\.webxpay\\.com\">WEBXPAY<",
+      "icon": "WEBXPAY.png",
       "js": {
         "WEBXPAY": ""
       },
-      "html": "Powered by <a href=\"https://www\\.webxpay\\.com\">WEBXPAY<",
-      "icon": "WEBXPAY.png",
       "website": "https://webxpay.com"
     },
     "WHMCS": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "^WHMCS.*"
+      "cookies": {
+        "WHMCS": ""
       },
       "icon": "WHMCS.png",
       "website": "http://www.whmcs.com"
     },
     "WP Rocket": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "X-Powered-By": "WP Rocket(?:/([\\d.]+))?\\;version:\\1"
@@ -10192,7 +10837,7 @@
     },
     "Warp": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^Warp/(\\d+(?:\\.\\d+)+)?$\\;version:\\1"
@@ -10201,17 +10846,9 @@
       "implies": "Haskell",
       "website": "http://www.stackage.org/package/warp"
     },
-    "Web Optimizer": {
-      "cats": [
-        "10"
-      ],
-      "html": "<title [^>]*lang=\"wo\">",
-      "icon": "Web Optimizer.png",
-      "website": "http://www.web-optimizer.us"
-    },
     "Web2py": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "web2py"
@@ -10229,10 +10866,10 @@
     },
     "WebGUI": {
       "cats": [
-        "1"
+        1
       ],
-      "headers": {
-        "Set-Cookie": "^wgSession="
+      "cookies": {
+        "wgSession": ""
       },
       "icon": "WebGUI.png",
       "implies": "Perl",
@@ -10243,7 +10880,7 @@
     },
     "WebPublisher": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "WebPublisher.png",
       "meta": {
@@ -10251,20 +10888,52 @@
       },
       "website": "http://scannet.dk"
     },
+    "WebSite X5": {
+      "cats": [
+        20
+      ],
+      "icon": "WebSite X5.png",
+      "meta": {
+        "generator": "Incomedia WebSite X5 (\\w+ [\\d.]+)\\;version:\\1"
+      },
+      "website": "http://websitex5.com"
+    },
+    "Webdev": {
+      "cats": [
+        20
+      ],
+      "headers": {
+        "WebDevSrc": ""
+      },
+      "html": "<!-- [a-zA-Z0-9_]+ [\\d/]+ [\\d:]+ WebDev \\d\\d ([\\d.]+) -->\\;version:\\1",
+      "icon": "webdev.png",
+      "meta": {
+        "generator": "^WEBDEV$"
+      },
+      "website": "https://www.windev.com/webdev/index.html"
+    },
     "Webix": {
       "cats": [
-        "12"
+        12
       ],
+      "icon": "Webix.png",
       "js": {
         "webix": ""
       },
-      "icon": "Webix.png",
-      "script": "\bwebix\\.js",
+      "script": "\\bwebix\\.js",
       "website": "http://webix.com"
     },
+    "Webmine": {
+      "cats": [
+        56
+      ],
+      "html": "<iframe[^>]+src=[\\'\"]https://webmine\\.cz/miner\\?key=",
+      "icon": "webmine.png",
+      "website": "https://webmine.cz/"
+    },
     "Webs": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "Server": "Webs\\.com/?([\\d\\.]+)?\\;version:\\1"
@@ -10272,9 +10941,20 @@
       "icon": "Webs.png",
       "website": "http://webs.com"
     },
+    "Websocket": {
+      "cats": [
+        19
+      ],
+      "html": [
+        "<link[^>]+rel=[\"']web-socket[\"']",
+        "<(?:link|a)[^>]+href=[\"']wss?://"
+      ],
+      "icon": "websocket.png",
+      "website": "https://en.wikipedia.org/wiki/WebSocket"
+    },
     "WebsPlanet": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "WebsPlanet.png",
       "meta": {
@@ -10284,25 +10964,31 @@
     },
     "Websale": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Websale.png",
       "url": "/websale7/",
       "website": "http://websale.de"
     },
-    "WebSite X5": {
+    "Website Creator": {
       "cats": [
-        "20"
+        1
+      ],
+      "icon": "WebsiteCreator.png",
+      "implies": [
+        "PHP",
+        "MySQL",
+        "Vue.js"
       ],
       "meta": {
-        "generator": "Incomedia WebSite X5 (\\w+ [\\d.]+)\\;version:\\1"
+        "generator": "Website Creator by hosttech",
+        "wsc_rendermode": ""
       },
-      "icon": "WebSite X5.png",
-      "website": "http://websitex5.com"
+      "website": "https://www.hosttech.ch/websitecreator"
     },
     "WebsiteBaker": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "WebsiteBaker.png",
       "implies": [
@@ -10316,37 +11002,58 @@
     },
     "Webtrekk": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Webtrekk.png",
       "js": {
         "webtrekk": ""
       },
-      "icon": "Webtrekk.png",
       "website": "http://www.webtrekk.com"
     },
     "Webtrends": {
       "cats": [
-        "10"
+        10
       ],
+      "html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
+      "icon": "Webtrends.png",
       "js": {
         "WTOptimize": "",
         "WebTrends": ""
       },
-      "html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
-      "icon": "Webtrends.png",
       "website": "http://worldwide.webtrends.com"
     },
-    "Weebly": {
+    "Weebly": {
+      "cats": [
+        1
+      ],
+      "icon": "Weebly.png",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "js": {
+        "_W.configDomain": ""
+      },
+      "script": "cdn\\d+\\.editmysite\\.com",
+      "website": "https://www.weebly.com"
+    },
+    "Weglot": {
       "cats": [
-        "1"
+        19
       ],
-      "icon": "Weebly.png",
-      "script": "cdn\\d+\\.editmysite\\.com",
-      "website": "http://www.weebly.com"
+      "headers": {
+        "Weglot-Translated": ""
+      },
+      "icon": "Weglot.png",
+      "script": [
+        "cdn\\.weglot\\.com",
+        "wp-content/plugins/weglot"
+      ],
+      "website": "https://www.weglot.com"
     },
     "Wikinggruppen": {
       "cats": [
-        "6"
+        6
       ],
       "html": [
         "<!-- WIKINGGRUPPEN"
@@ -10354,20 +11061,9 @@
       "icon": "wikinggruppen.png",
       "website": "https://wikinggruppen.se/"
     },
-    "Wikispaces": {
-      "cats": [
-        "8"
-      ],
-      "html": [
-        "<script[^>]*>[^<]*session_url:\\s*'https://session\\.wikispaces\\.com/",
-        "<\\w+[^>]*\\s+class=\"[^\"]*WikispacesContent\\s+WikispacesBs3[^\"]*\""
-      ],
-      "icon": "Wikispaces.png",
-      "website": "http://www.wikispaces.com"
-    },
     "WikkaWiki": {
       "cats": [
-        "8"
+        8
       ],
       "html": "Powered by <a href=\"[^>]+WikkaWiki",
       "icon": "WikkaWiki.png",
@@ -10378,39 +11074,39 @@
     },
     "Windows CE": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
-        "Server": "\bWinCE\b"
+        "Server": "\\bWinCE\\b"
       },
-      "icon": "Microsoft.svg",
+      "icon": "Microsoft.png",
       "website": "http://microsoft.com"
     },
     "Windows Server": {
       "cats": [
-        "28"
+        28
       ],
       "headers": {
         "Server": "Win32|Win64"
       },
-      "icon": "Microsoft.svg",
+      "icon": "WindowsServer.png",
       "website": "http://microsoft.com/windowsserver"
     },
     "Wink": {
       "cats": [
-        "26",
-        "12"
+        26,
+        12
       ],
+      "icon": "Wink.png",
       "js": {
-        "wink": ""
+        "wink.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "Wink.png",
       "script": "(?:_base/js/base|wink).*\\.js",
       "website": "http://winktoolkit.org"
     },
     "Winstone Servlet Container": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1",
@@ -10420,24 +11116,28 @@
     },
     "Wix": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "wixEvents": "",
-        "wixData": "",
-        "wixErrors": ""
+      "cookies": {
+        "Domain": "\\.wix\\.com"
       },
       "headers": {
-        "Set-Cookie": "Domain=\\.wix\\.com",
-        "X-Wix-Renderer-Server": ""
+        "X-Wix-Renderer-Server": "",
+        "X-Wix-Request-Id": "",
+        "X-Wix-Server-Artifact-Id": ""
       },
       "icon": "Wix.png",
+      "js": {
+        "wixData": "",
+        "wixErrors": "",
+        "wixEvents": ""
+      },
       "script": "static\\.wixstatic\\.com",
       "website": "http://wix.com"
     },
     "Wolf CMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "(?:<a href=\"[^>]+wolfcms\\.org[^>]+>Wolf CMS(?:</a>)? inside|Thank you for using <a[^>]+>Wolf CMS)",
       "icon": "Wolf CMS.png",
@@ -10446,7 +11146,7 @@
     },
     "Woltlab Community Framework": {
       "cats": [
-        "18"
+        18
       ],
       "html": "var WCF_PATH[^>]+",
       "icon": "Woltlab Community Framework.png",
@@ -10456,51 +11156,76 @@
     },
     "WooCommerce": {
       "cats": [
-        "6"
+        6
+      ],
+      "html": [
+        "<!-- WooCommerce",
+        "<link rel='[^']+' id='woocommerce-(?:layout|smallscreen|general)-css'  href='https?://[^/]+/wp-content/plugins/woocommerce/assets/css/woocommerce(?:-layout|-smallscreen)?\\.css?ver=([\\d.]+)'\\;version:\\1"
       ],
+      "icon": "WooCommerce.png",
+      "implies": "WordPress",
       "js": {
         "woocommerce_params": ""
       },
-      "html": "<!-- WooCommerce",
-      "icon": "WooCommerce.png",
-      "implies": "WordPress",
       "meta": {
         "generator": "WooCommerce ([\\d.]+)\\;version:\\1"
       },
-      "script": "woocommerce(?:\\.min)?\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
+      "script": "/woocommerce(?:\\.min)?\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
       "website": "http://www.woothemes.com/woocommerce"
     },
     "Woopra": {
       "cats": [
-        "10"
+        10
       ],
       "icon": "Woopra.png",
       "script": "static\\.woopra\\.com",
       "website": "http://www.woopra.com"
     },
-    "WordPress": {
+    "Woosa": {
       "cats": [
-        "1",
-        "11"
+        1,
+        6
       ],
-      "js": {
-        "wp_username": ""
+      "excludes": [
+        "WordPress",
+        "WooCommerce"
+      ],
+      "icon": "Woosa.png",
+      "meta": {
+        "generator": "^Woosa$"
       },
+      "website": "https://woosa.nl"
+    },
+    "WordPress": {
+      "cats": [
+        1,
+        11
+      ],
       "html": [
-        "<link rel=[\"']stylesheet[\"'] [^>]+wp-(?:content|includes)",
+        "<link rel=[\"']stylesheet[\"'] [^>]+/wp-(?:content|includes)/",
+        "<div[^>]*class=[\"']amp-wp-",
         "<link[^>]+s\\d+\\.wp\\.com"
       ],
       "icon": "WordPress.svg",
-      "implies": "PHP",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "headers": {
+        "link": "rel=\"https://api\\.w\\.org/\""
+      },
+      "js": {
+        "wp_username": ""
+      },
       "meta": {
-        "generator": "WordPress( [\\d.]+)?\\;version:\\1"
+        "generator": "^WordPress ?([\\d.]+)?\\;version:\\1"
       },
-      "script": "/wp-includes/",
-      "website": "http://wordpress.org"
+      "script": "/wp-(?:content|includes)/",
+      "website": "https://wordpress.org"
     },
     "WordPress Super Cache": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "WP-Super-Cache": ""
@@ -10512,7 +11237,7 @@
     },
     "Wowza Media Server": {
       "cats": [
-        "38"
+        38
       ],
       "html": "<title>Wowza Media Server \\d+ ((?:\\w+ Edition )?\\d+\\.[\\d\\.]+(?: build\\d+)?)?\\;version:\\1",
       "icon": "Wowza Media Server.png",
@@ -10520,14 +11245,10 @@
     },
     "X-Cart": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "xcart_web_dir": "",
-        "xliteConfig": ""
-      },
-      "headers": {
-        "Set-Cookie": "xid=[a-z\\d]{32}(?:;|$)"
+      "cookies": {
+        "xid": "[a-z\\d]{32}(?:;|$)"
       },
       "html": [
         "Powered by X-Cart(?: (\\d+))? <a[^>]+href=\"http://www\\.x-cart\\.com/\"[^>]*>\\;version:\\1",
@@ -10535,6 +11256,10 @@
       ],
       "icon": "X-Cart.png",
       "implies": "PHP",
+      "js": {
+        "xcart_web_dir": "",
+        "xliteConfig": ""
+      },
       "meta": {
         "generator": "X-Cart(?: (\\d+))?\\;version:\\1"
       },
@@ -10543,7 +11268,7 @@
     },
     "XAMPP": {
       "cats": [
-        "22"
+        22
       ],
       "html": "<title>XAMPP(?: Version ([\\d\\.]+))?</title>\\;version:\\1",
       "icon": "XAMPP.png",
@@ -10560,7 +11285,7 @@
     },
     "XMB": {
       "cats": [
-        "2"
+        2
       ],
       "html": "<!-- Powered by XMB",
       "icon": "XMB.png",
@@ -10568,13 +11293,13 @@
     },
     "XOOPS": {
       "cats": [
-        "1"
+        1
       ],
+      "icon": "XOOPS.png",
+      "implies": "PHP",
       "js": {
         "xoops": ""
       },
-      "icon": "XOOPS.png",
-      "implies": "PHP",
       "meta": {
         "generator": "XOOPS"
       },
@@ -10582,22 +11307,37 @@
     },
     "XRegExp": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "XRegExp.png",
       "js": {
-        "XRegExp": ""
+        "XRegExp.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "XRegExp.png",
       "script": [
-        "xregexp(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "xregexp[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
         "xregexp.*\\.js"
       ],
       "website": "http://xregexp.com"
     },
+    "XWiki": {
+      "cats": [
+        8
+      ],
+      "excludes": "MediaWiki",
+      "html": [
+        "<html[^>]data-xwiki-[^>]>"
+      ],
+      "icon": "xwiki.png",
+      "implies": "Java\\;confidence:99",
+      "meta": {
+        "wiki": "xwiki"
+      },
+      "website": "http://www.xwiki.org"
+    },
     "Xajax": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "Xajax.png",
       "script": "xajax_core.*\\.js",
@@ -10605,7 +11345,7 @@
     },
     "Xanario": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Xanario.png",
       "meta": {
@@ -10615,30 +11355,44 @@
     },
     "XenForo": {
       "cats": [
-        "2"
+        2
+      ],
+      "cookies": {
+        "xf_csrf": "",
+        "xf_session": ""
+      },
+      "html": [
+        "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo™|<!--XF:branding|<html[^>]+id=\"XenForo\")",
+        "<html id=\"XF\" "
       ],
-      "html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo™|<!--XF:branding|<html[^>]+id=\"XenForo\")",
       "icon": "XenForo.png",
+      "implies": [
+        "PHP",
+        "MySQL"
+      ],
+      "js": {
+        "XF.GuestUsername": ""
+      },
       "website": "http://xenforo.com"
     },
     "Xeora": {
       "cats": [
-        "18",
-        "22",
-        "27"
+        18,
+        22,
+        27
       ],
-      "html": "<input type=\"hidden\" name=\"_sys_bind_\\d+\" id=\"_sys_bind_\\d+\" />",
       "headers": {
         "Server": "XeoraEngine",
         "X-Powered-By": "XeoraCube"
       },
+      "html": "<input type=\"hidden\" name=\"_sys_bind_\\d+\" id=\"_sys_bind_\\d+\" />",
       "icon": "xeora.png",
       "script": "/_bi_sps_v.+\\.js",
       "website": "http://www.xeora.org"
     },
     "Xitami": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Xitami(?:/([\\d.]+))?\\;version:\\1"
@@ -10648,7 +11402,7 @@
     },
     "Xonic": {
       "cats": [
-        "6"
+        6
       ],
       "html": [
         "Powered by <a href=\"http://www\\.xonic-solutions\\.de/index\\.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"
@@ -10662,7 +11416,7 @@
     },
     "XpressEngine": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "XpressEngine.png",
       "meta": {
@@ -10672,18 +11426,19 @@
     },
     "YUI": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "YUI.png",
       "js": {
-        "YAHOO": ""
+        "YAHOO.VERSION": "^(.+)$\\;version:\\1",
+        "YUI.version": "^(.+)$\\;version:\\1"
       },
-      "icon": "YUI.png",
       "script": "(?:/yui/|yui\\.yahooapis\\.com)",
       "website": "http://yuilibrary.com"
     },
     "YUI Doc": {
       "cats": [
-        "4"
+        4
       ],
       "html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)",
       "icon": "yahoo.png",
@@ -10691,7 +11446,7 @@
     },
     "YaBB": {
       "cats": [
-        "2"
+        2
       ],
       "html": "Powered by <a href=\"[^>]+yabbforum",
       "icon": "YaBB.png",
@@ -10699,71 +11454,83 @@
     },
     "Yahoo Advertising": {
       "cats": [
-        "36"
+        36
       ],
-      "js": {
-        "adxinserthtml": ""
-      },
       "html": [
         "<iframe[^>]+adserver\\.yahoo\\.com",
         "<img[^>]+clicks\\.beap\\.bc\\.yahoo\\.com"
       ],
       "icon": "yahoo.png",
+      "js": {
+        "adxinserthtml": ""
+      },
       "script": "adinterax\\.com",
       "website": "http://advertising.yahoo.com"
     },
     "Yahoo! Ecommerce": {
       "cats": [
-        "6"
+        6
       ],
-      "js": {
-        "YStore": ""
-      },
       "headers": {
         "X-XRDS-Location": "/ystore/"
       },
       "html": "<link[^>]+store\\.yahoo\\.net",
       "icon": "yahoo.png",
+      "js": {
+        "YStore": ""
+      },
       "website": "http://smallbusiness.yahoo.com/ecommerce"
     },
+    "Yahoo! Tag Manager": {
+      "cats": [
+        42
+      ],
+      "html": "<!-- (?:End )?Yahoo! Tag Manager -->",
+      "script": "b\\.yjtag\\.jp/iframe",
+      "icon": "yahoo.png",
+      "website": "https://tagmanager.yahoo.co.jp/"
+    },
     "Yahoo! Web Analytics": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "yahoo.png",
       "js": {
         "YWA": ""
       },
-      "icon": "yahoo.png",
       "script": "d\\.yimg\\.com/mi/ywa\\.js",
       "website": "http://web.analytics.yahoo.com"
     },
     "Yandex.Direct": {
       "cats": [
-        "36"
+        36
       ],
-      "js": {
-        "yandex_partner_id": "",
-        "yandex_ad_format": ""
-      },
       "html": "<yatag class=\"ya-partner__ads\">",
       "icon": "Yandex.Direct.png",
+      "js": {
+        "yandex_ad_format": "",
+        "yandex_partner_id": ""
+      },
       "script": "https?://an\\.yandex\\.ru/",
       "website": "http://partner.yandex.com"
     },
     "Yandex.Metrika": {
       "cats": [
-        "10"
+        10
       ],
+      "icon": "Yandex.Metrika.png",
       "js": {
         "yandex_metrika": ""
       },
-      "icon": "Yandex.Metrika.png",
-      "script": "mc\\.yandex\\.ru\\/metrika\\/watch\\.js",
+      "script": [
+        "mc\\.yandex\\.ru\\/metrika\\/watch\\.js",
+        "cdn\\.jsdelivr\\.net\\/npm\\/yandex-metrica-watch\\/watch\\.js"
+      ],
       "website": "http://metrika.yandex.com"
     },
     "Yaws": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "Yaws(?: ([\\d.]+))?\\;version:\\1"
@@ -10776,7 +11543,7 @@
     },
     "Yieldlab": {
       "cats": [
-        "36"
+        36
       ],
       "icon": "Yieldlab.png",
       "script": "^https?://(?:[^/]+\\.)?yieldlab\\.net/",
@@ -10784,37 +11551,51 @@
     },
     "Yii": {
       "cats": [
-        "18"
+        18
       ],
-      "js": {
-        "yii": ""
+      "cookies": {
+        "YII_CSRF_TOKEN": ""
       },
       "html": [
         "Powered by <a href=\"http://www\\.yiiframework\\.com/\" rel=\"external\">Yii Framework</a>",
         "<input type=\"hidden\" value=\"[a-zA-Z0-9]{40}\" name=\"YII_CSRF_TOKEN\" \\/>",
         "<!\\[CDATA\\[YII-BLOCK-(?:HEAD|BODY-BEGIN|BODY-END)\\]"
       ],
-      "script": "yii.*\\.js",
       "icon": "Yii.png",
       "implies": [
         "PHP"
       ],
-      "website": "http://yiiframework.com"
+      "script": [
+        "/assets/[a-zA-Z0-9]{8}\\/yii\\.js$",
+        "/yii\\.(?:validation|activeForm)\\.js"
+      ],
+      "website": "https://www.yiiframework.com"
     },
     "Yoast SEO": {
       "cats": [
-        "54"
+        54
       ],
       "html": [
-        "<!-- This site is optimized with the Yoast SEO plugin v([\\d.]+) -\\;version:\\1"
+        "<!-- This site is optimized with the Yoast (?:WordPress )?SEO plugin v([\\d.]+) -\\;version:\\1"
       ],
       "icon": "Yoast SEO.png",
       "implies": "WordPress",
       "website": "http://yoast.com"
     },
+    "WP-Statistics": {
+      "cats": [
+        59
+      ],
+      "html": [
+        "<!-- Analytics by WP-Statistics v([\\d.]+) -\\;version:\\1"
+      ],
+      "icon": "WP-Statistics.png",
+      "implies": "WordPress",
+      "website": "https://wp-statistics.com"
+    },
     "YouTrack": {
       "cats": [
-        "13"
+        13
       ],
       "html": [
         "no-title=\"YouTrack\">",
@@ -10826,7 +11607,7 @@
     },
     "YouTube": {
       "cats": [
-        "14"
+        14
       ],
       "html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)",
       "icon": "YouTube.png",
@@ -10834,9 +11615,9 @@
     },
     "ZK": {
       "cats": [
-        "18"
+        18
       ],
-      "html": "<!-- ZK [\\.\\d\\s]+-->",
+      "html": "<!-- ZK [.\\d\\s]+-->",
       "icon": "ZK.png",
       "implies": "Java",
       "script": "zkau/",
@@ -10844,25 +11625,28 @@
     },
     "ZURB Foundation": {
       "cats": [
-        "18"
+        18
       ],
       "html": [
         "<link[^>]+foundation[^>\"]+css",
         "<div [^>]*class=\"[^\"]*(?:small|medium|large)-\\d{1,2} columns"
       ],
       "icon": "ZURB Foundation.png",
+      "js": {
+        "Foundation.version": "([\\d.]+)\\;version:\\1"
+      },
       "website": "http://foundation.zurb.com"
     },
     "Zabbix": {
       "cats": [
-        "19"
+        19
       ],
-      "js": {
-        "zbxCallPostScripts": ""
-      },
       "html": "<body[^>]+zbxCallPostScripts",
       "icon": "Zabbix.png",
       "implies": "PHP",
+      "js": {
+        "zbxCallPostScripts": ""
+      },
       "meta": {
         "Author": "ZABBIX SIA\\;confidence:70"
       },
@@ -10871,19 +11655,19 @@
     },
     "Zanox": {
       "cats": [
-        "36"
+        36
       ],
+      "html": "<img [^>]*src=\"[^\"]+ad\\.zanox\\.com",
+      "icon": "Zanox.png",
       "js": {
         "zanox": ""
       },
-      "html": "<img [^>]*src=\"[^\"]+ad\\.zanox\\.com",
-      "icon": "Zanox.png",
       "script": "zanox\\.com/scripts/zanox\\.js$",
       "website": "http://zanox.com"
     },
     "Zen Cart": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Zen Cart.png",
       "meta": {
@@ -10893,37 +11677,49 @@
     },
     "Zend": {
       "cats": [
-        "22"
+        22
       ],
+      "cookies": {
+        "ZENDSERVERSESSID": ""
+      },
       "headers": {
-        "Set-Cookie": "ZENDSERVERSESSID",
-        "X-Powered-By": "Zend"
+        "X-Powered-By": "Zend(?:Server)?(?:[\\s/]?([0-9.]+))?\\;version:\\1"
       },
       "icon": "Zend.png",
       "website": "http://zend.com"
     },
     "Zendesk Chat": {
       "cats": [
-        "52"
+        52
       ],
       "icon": "Zendesk Chat.png",
       "script": "v2\\.zopim\\.com",
       "website": "http://zopim.com"
     },
+    "Zenfolio": {
+      "cats": [
+        7
+      ],
+      "icon": "Zenfolio.png",
+      "js": {
+        "Zenfolio": ""
+      },
+      "website": "https://zenfolio.com"
+    },
     "Zepto": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "Zepto.png",
       "js": {
         "Zepto": ""
       },
-      "icon": "Zepto.png",
       "script": "zepto.*\\.js",
       "website": "http://zeptojs.com"
     },
     "Zeuscart": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<form name=\"product\" method=\"post\" action=\"[^\"]+\\?do=addtocart&prodid=\\d+\"(?!<\\/form>.)+<input type=\"hidden\" name=\"addtocart\" value=\"\\d+\">",
       "icon": "Zeuscart.png",
@@ -10933,7 +11729,7 @@
     },
     "Zinnia": {
       "cats": [
-        "11"
+        11
       ],
       "icon": "Zinnia.png",
       "implies": "Django",
@@ -10942,9 +11738,18 @@
       },
       "website": "http://django-blog-zinnia.com"
     },
+    "Zone.js": {
+      "cats": [
+        12
+      ],
+      "js": {
+        "Zone.root": ""
+      },
+      "website": "https://github.com/angular/zone.js/"
+    },
     "Zope": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "^Zope/"
@@ -10954,7 +11759,7 @@
     },
     "a-blog cms": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "a-blog cms.svg",
       "implies": "PHP",
@@ -10965,57 +11770,70 @@
     },
     "actionhero.js": {
       "cats": [
-        "1",
-        "18",
-        "22"
+        1,
+        18,
+        22
       ],
-      "js": {
-        "actionheroClient": ""
-      },
       "headers": {
         "X-Powered-By": "actionhero API"
       },
       "icon": "actionhero.js.png",
       "implies": "Node.js",
+      "js": {
+        "actionheroClient": ""
+      },
       "script": "actionheroClient\\.js",
       "website": "http://www.actionherojs.com"
     },
     "amCharts": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "amCharts.png",
       "js": {
         "AmCharts": ""
       },
-      "icon": "amCharts.png",
       "script": "amcharts.*\\.js",
       "website": "http://amcharts.com"
     },
+    "animate.css": {
+      "cats": [
+        18
+      ],
+      "html": [
+        "<link [^>]+(?:/([\\d.]+)/)?animate\\.(?:min\\.)?css\\;version:\\1"
+      ],
+      "website": "https://daneden.github.io/animate.css/"
+    },
     "basket.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "basket.js.png",
       "js": {
-        "basket": "\\;confidence:20"
+        "basket.isValidItem": ""
       },
-      "icon": "basket.js.png",
       "script": "basket.*\\.js\\;confidence:10",
-      "website": "http://addyosmani.github.io/basket.js/"
+      "website": "https://addyosmani.github.io/basket.js/"
     },
     "cPanel": {
       "cats": [
-        "9"
+        9
       ],
       "headers": {
         "Server": "cpsrvd/([\\d.]+)\\;version:\\1"
       },
+      "cookies": {
+        "cpsession": "",
+        "cprelogin": ""
+      },
       "html": "<!-- cPanel",
       "icon": "cPanel.png",
       "website": "http://www.cpanel.net"
     },
     "cgit": {
       "cats": [
-        "19"
+        19
       ],
       "html": [
         "<[^>]+id='cgit'",
@@ -11030,20 +11848,20 @@
     },
     "comScore": {
       "cats": [
-        "10"
+        10
       ],
+      "html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)|\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
+      "icon": "comScore.png",
       "js": {
         "COMSCORE": "",
         "_COMSCORE": ""
       },
-      "html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)|\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
-      "icon": "comScore.png",
       "script": "\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
       "website": "http://comscore.com"
     },
     "debut": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "debut\\/?([\\d\\.]+)?\\;version:\\1"
@@ -11052,21 +11870,25 @@
       "implies": "Brother",
       "website": "http://www.brother.com"
     },
-    "dwhttpd": {
+    "deepMiner": {
       "cats": [
-        "22"
+        56
       ],
-      "headers": {
-        "Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
+      "icon": "deepminer.png",
+      "js": {
+        "deepMiner": ""
       },
-      "website": "http://example.com"
+      "script": "deepMiner\\.js",
+      "website": "https://github.com/deepwn/deepMiner"
     },
     "e107": {
       "cats": [
-        "1"
+        1
       ],
+      "cookies": {
+        "e107_tz": ""
+      },
       "headers": {
-        "Set-Cookie": "e107_tz[^;]+=",
         "X-Powered-By": "e107"
       },
       "icon": "e107.png",
@@ -11074,38 +11896,18 @@
       "script": "[^a-z\\d]e107\\.js",
       "website": "http://e107.org"
     },
-    "eDevice SmartStack": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "eDevice SmartStack(?: ?/?([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "eDevice SmartStack.png",
-      "website": "http://edevice.com"
-    },
-    "eHTTP": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
-      },
-      "implies": "HP ProCurve",
-      "website": "http://example.com"
-    },
     "eSyndiCat": {
       "cats": [
-        "1"
+        1
       ],
-      "js": {
-        "esyndicat": ""
-      },
       "headers": {
         "X-Drectory-Script": "^eSyndiCat"
       },
       "icon": "eSyndiCat.png",
       "implies": "PHP",
+      "js": {
+        "esyndicat": ""
+      },
       "meta": {
         "generator": "^eSyndiCat "
       },
@@ -11113,12 +11915,14 @@
     },
     "eZ Publish": {
       "cats": [
-        "1",
-        "6"
+        1,
+        6
       ],
+      "cookies": {
+        "eZSESSID": ""
+      },
       "headers": {
-        "X-Powered-By": "^eZ Publish",
-        "Set-Cookie": "^eZSESSID="
+        "X-Powered-By": "^eZ Publish"
       },
       "icon": "eZ Publish.png",
       "implies": "PHP",
@@ -11127,11 +11931,23 @@
       },
       "website": "http://ez.no"
     },
+    "ef.js": {
+      "cats": [
+        12
+      ],
+      "icon": "ef.js.svg",
+      "js": {
+        "ef.version": "^(.+)$\\;version:\\1",
+        "efCore": ""
+      },
+      "script": "/ef(?:-core)?(?:\\.min|\\.dev)?\\.js",
+      "website": "http://ef.js.org"
+    },
     "enduro.js": {
       "cats": [
-        "1",
-        "18",
-        "47"
+        1,
+        18,
+        47
       ],
       "headers": {
         "X-Powered-By": "^enduro\\.js$"
@@ -11142,17 +11958,17 @@
     },
     "git": {
       "cats": [
-        "47"
+        47
       ],
       "icon": "git.svg",
       "meta": {
-        "generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
+        "generator": "\\bgit/([\\d.]+\\d)\\;version:\\1"
       },
       "website": "http://git-scm.com"
     },
     "gitlist": {
       "cats": [
-        "47"
+        47
       ],
       "html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
       "implies": [
@@ -11163,7 +11979,7 @@
     },
     "gitweb": {
       "cats": [
-        "47"
+        47
       ],
       "html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
       "icon": "git.svg",
@@ -11179,7 +11995,7 @@
     },
     "govCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "govCMS.svg",
       "implies": [
@@ -11192,7 +12008,7 @@
     },
     "gunicorn": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1"
@@ -11203,11 +12019,11 @@
     },
     "hapi.js": {
       "cats": [
-        "18",
-        "22"
+        18,
+        22
       ],
-      "headers": {
-        "Set-Cookie": "Fe26\\.2\\*\\*\\;confidence:50"
+      "cookies": {
+        "Fe26.2**": "\\;confidence:50"
       },
       "icon": "hapi.js.png",
       "implies": "Node.js",
@@ -11215,7 +12031,7 @@
     },
     "iCongo": {
       "cats": [
-        "6"
+        6
       ],
       "icon": "Hybris.png",
       "implies": "Adobe ColdFusion",
@@ -11226,11 +12042,13 @@
     },
     "iPresta": {
       "cats": [
-        "6"
+        6
       ],
-      "excludes": "PrestaShop",
       "icon": "iPresta.png",
-      "implies": "PHP",
+      "implies": [
+        "PHP",
+        "PrestaShop"
+      ],
       "meta": {
         "designer": "iPresta"
       },
@@ -11238,7 +12056,7 @@
     },
     "iWeb": {
       "cats": [
-        "20"
+        20
       ],
       "icon": "iWeb.png",
       "meta": {
@@ -11248,7 +12066,7 @@
     },
     "ikiwiki": {
       "cats": [
-        "8"
+        8
       ],
       "html": [
         "<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" href=\"[^\"]*/ikiwiki\\.cgi",
@@ -11257,9 +12075,23 @@
       "icon": "ikiwiki.png",
       "website": "http://ikiwiki.info"
     },
+    "imperia CMS": {
+      "cats": [
+        1
+      ],
+      "html": "<imp:live-info sysid=\"[0-9a-f-]+\"(?: node_id=\"[0-9/]*\")? *\\/>",
+      "icon": "imperiaCMS.svg",
+      "implies": "Perl",
+      "meta": {
+        "GENERATOR": "^IMPERIA ([0-9.]{2,})+$\\;version:\\1",
+        "X-Imperia-Live-Info": ""
+      },
+      "url": "imperia/md/",
+      "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms"
+    },
     "io4 CMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "io4 CMS.png",
       "meta": {
@@ -11267,38 +12099,38 @@
       },
       "website": "http://notenbomer.nl/Producten/Content_management/io4_|_cms"
     },
-    "Jetshop": {
+    "ip-label": {
       "cats": [
-        "6"
+        10
       ],
+      "icon": "iplabel.svg",
       "js": {
-        "JetshopData": ""
+        "clobs": ""
       },
-      "html": "<(?:div|aside) id=\"jetshop-branding\">",
-      "icon": "Jetshop.png",
-      "website": "http://jetshop.se"
+      "script": "clobs\\.js",
+      "website": "http://www.ip-label.com"
     },
     "jQTouch": {
       "cats": [
-        "26"
+        26
       ],
+      "icon": "jQTouch.png",
       "js": {
         "jQT": ""
       },
-      "icon": "jQTouch.png",
       "script": "jqtouch.*\\.js",
       "website": "http://jqtouch.com"
     },
     "jQuery": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "jQuery.svg",
       "js": {
         "jQuery.fn.jquery": "([\\d.]+)\\;version:\\1"
       },
-      "icon": "jQuery.svg",
       "script": [
-        "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "jquery[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
         "jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1"
       ],
@@ -11306,25 +12138,50 @@
     },
     "jQuery Migrate": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "jQuery.svg",
       "implies": "jQuery",
-      "script": "jquery.migrate(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
+      "js": {
+        "jQuery.migrateVersion": "([\\d.]+)\\;version:\\1",
+        "jQuery.migrateWarnings": "",
+        "jqueryMigrate": ""
+      },
+      "script": "jquery[.-]migrate(?:-([\\d.]+))?(?:\\.min)?\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
       "website": "https://github.com/jquery/jquery-migrate"
     },
     "jQuery Mobile": {
       "cats": [
-        "26"
+        26
       ],
       "icon": "jQuery Mobile.svg",
       "implies": "jQuery",
-      "script": "jquery\\.mobile(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
+      "js": {
+        "jQuery.mobile.version": "^(.+)$\\;version:\\1"
+      },
+      "script": "jquery[.-]mobile(?:-([\\d.]))?(?:\\.min)?\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
       "website": "https://jquerymobile.com"
     },
+    "jQuery-pjax": {
+      "cats": [
+        26
+      ],
+      "implies": "jQuery",
+      "meta": {
+        "pjax-timeout": "",
+        "pjax-replace": "",
+        "pjax-push": ""
+      },
+      "js": {
+        "jQuery.pjax": ""
+      },
+      "script": "jquery[.-]pjax(?:-([\\d.]))?(?:\\.min)?\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
+      "html": "<div[^>]+data-pjax-container",
+      "website": "https://github.com/defunkt/jquery-pjax"
+    },
     "jQuery Sparklines": {
       "cats": [
-        "25"
+        25
       ],
       "implies": "jQuery",
       "script": "jquery\\.sparkline.*\\.js",
@@ -11332,12 +12189,15 @@
     },
     "jQuery UI": {
       "cats": [
-        "12"
+        59
       ],
       "icon": "jQuery UI.svg",
       "implies": "jQuery",
+      "js": {
+        "jQuery.ui.version": "^(.+)$\\;version:\\1"
+      },
       "script": [
-        "jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
+        "jquery-ui[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
         "jquery-ui.*\\.js"
       ],
@@ -11345,7 +12205,7 @@
     },
     "jqPlot": {
       "cats": [
-        "25"
+        25
       ],
       "icon": "jqPlot.png",
       "implies": "jQuery",
@@ -11354,7 +12214,7 @@
     },
     "libwww-perl-daemon": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "libwww-perl-daemon(?:/([\\d\\.]+))?\\;version:\\1"
@@ -11365,7 +12225,7 @@
     },
     "lighttpd": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1"
@@ -11373,29 +12233,20 @@
       "icon": "lighttpd.png",
       "website": "http://www.lighttpd.net"
     },
-    "LiveHelp": {
-      "cats": [
-        "52",
-        "53"
-      ],
-      "script": "^https?://server\\.livehelp\\.it/widgetjs/[0-9]{5}/[0-9]{1,3}\\.js",
-      "icon": "LiveHelp.png",
-      "website": "http://www.livehelp.it"
-    },
     "math.js": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "math.js.png",
       "js": {
         "mathjs": ""
       },
-      "icon": "math.js.png",
       "script": "math(?:\\.min)?\\.js",
       "website": "http://mathjs.org"
     },
     "mini_httpd": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
         "Server": "mini_httpd(?:/([\\d.]+))?\\;version:\\1"
@@ -11405,7 +12256,7 @@
     },
     "mod_auth_pam": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_auth_pam(?:/([\\d\\.]+))?\\;version:\\1"
@@ -11416,10 +12267,10 @@
     },
     "mod_dav": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
-        "Server": "\b(?:mod_)?DAV\b(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\\b(?:mod_)?DAV\\b(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache.svg",
       "implies": "Apache",
@@ -11427,7 +12278,7 @@
     },
     "mod_fastcgi": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_fastcgi(?:/([\\d.]+))?\\;version:\\1"
@@ -11438,7 +12289,7 @@
     },
     "mod_jk": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_jk(?:/([\\d\\.]+))?\\;version:\\1"
@@ -11452,7 +12303,7 @@
     },
     "mod_perl": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1"
@@ -11466,7 +12317,7 @@
     },
     "mod_python": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_python(?:/([\\d.]+))?\\;version:\\1"
@@ -11480,7 +12331,7 @@
     },
     "mod_rack": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_rack(?:/([\\d.]+))?\\;version:\\1",
@@ -11495,7 +12346,7 @@
     },
     "mod_rails": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_rails(?:/([\\d.]+))?\\;version:\\1",
@@ -11510,7 +12361,7 @@
     },
     "mod_ssl": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_ssl(?:/([\\d.]+))?\\;version:\\1"
@@ -11521,7 +12372,7 @@
     },
     "mod_wsgi": {
       "cats": [
-        "33"
+        33
       ],
       "headers": {
         "Server": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1",
@@ -11532,14 +12383,14 @@
         "Python\\;confidence:50",
         "Apache"
       ],
-      "website": "http://code.google.com/p/modwsgi"
+      "website": "https://code.google.com/p/modwsgi"
     },
     "nopCommerce": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "Nop\\.customer="
+      "cookies": {
+        "Nop.customer": ""
       },
       "html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)",
       "icon": "nopCommerce.png",
@@ -11551,7 +12402,7 @@
     },
     "openEngine": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "openEngine.png",
       "meta": {
@@ -11561,7 +12412,7 @@
     },
     "osCSS": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<body onload=\"window\\.defaultStatus='oscss templates';\"",
       "icon": "osCSS.png",
@@ -11569,25 +12420,29 @@
     },
     "osCommerce": {
       "cats": [
-        "6"
+        6
       ],
-      "headers": {
-        "Set-Cookie": "osCsid="
+      "cookies": {
+        "osCsid": ""
       },
-      "html": "(?:<a[^>]*(?:\\?|&)osCsid|Powered by (?:<[^>]+>)?osCommerce</a>|<[^>]+class=\"[^>]*infoBoxHeading)",
+      "html": [
+        "<br />Powered by <a href=\"https?://www\\.oscommerce\\.com",
+        "<(?:input|a)[^>]+name=\"osCsid\"",
+        "<(?:tr|td|table)class=\"[^\"]*infoBoxHeading"
+      ],
       "icon": "osCommerce.png",
       "implies": [
         "PHP",
         "MySQL"
       ],
-      "website": "http://www.oscommerce.com"
+      "website": "https://www.oscommerce.com"
     },
     "osTicket": {
       "cats": [
-        "13"
+        13
       ],
-      "headers": {
-        "Set-Cookie": "OSTSESSID"
+      "cookies": {
+        "OSTSESSID": ""
       },
       "icon": "osTicket.png",
       "implies": [
@@ -11598,17 +12453,17 @@
     },
     "otrs": {
       "cats": [
-        "13"
+        13
       ],
       "html": "<!--\\s+OTRS: Copyright \\d+-\\d+, OTRS AG",
-      "script": "^/otrs-web/js/",
       "icon": "otrs.png",
-      "implies": "perl",
+      "implies": "Perl",
+      "script": "^/otrs-web/js/",
       "website": "https://www.otrs.com"
     },
     "ownCloud": {
       "cats": [
-        "19"
+        19
       ],
       "html": "<a href=\"https://owncloud\\.com\" target=\"_blank\">ownCloud Inc\\.</a><br/>Your Cloud, Your Data, Your Way!",
       "icon": "ownCloud.png",
@@ -11616,20 +12471,31 @@
       "meta": {
         "apple-itunes-app": "app-id=543672169"
       },
-      "website": "http://owncloud.org"
+      "website": "https://owncloud.org"
     },
     "papaya CMS": {
       "cats": [
-        "1"
+        1
       ],
       "html": "<link[^>]*/papaya-themes/",
       "icon": "papaya CMS.png",
       "implies": "PHP",
-      "website": "http://papaya-cms.com"
+      "website": "https://papaya-cms.com"
+    },
+    "particles.js": {
+      "cats": [
+        25
+      ],
+      "html": "<div id=\"particles-js\">",
+      "js": {
+        "particlesJS": ""
+      },
+      "script": "/particles(?:\\.min)?\\.js",
+      "website": "https://vincentgarreau.com/particles.js/"
     },
     "phpAlbum": {
       "cats": [
-        "7"
+        7
       ],
       "html": "<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
       "icon": "phpAlbum.png",
@@ -11638,61 +12504,67 @@
     },
     "phpBB": {
       "cats": [
-        "2"
+        2
       ],
-      "js": {
-        "style_cookie_settings": "",
+      "cookies": {
         "phpbb": ""
       },
-      "headers": {
-        "Set-Cookie": "^phpbb"
-      },
-      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+      "html": [
+        "Powered by <a[^>]+phpBB",
+        "<div class=phpbb_copyright>",
+        "<[^>]+styles/(?:sub|pro)silver/theme",
+        "<img[^>]+i_icon_mini",
+        "<table class=\"[^\"]*forumline"
+      ],
       "icon": "phpBB.png",
       "implies": "PHP",
+      "js": {
+        "phpbb": "",
+        "style_cookie_settings": ""
+      },
       "meta": {
         "copyright": "phpBB Group"
       },
-      "website": "http://phpbb.com"
+      "website": "https://phpbb.com"
     },
     "phpCMS": {
       "cats": [
-        "1"
+        1
       ],
+      "icon": "phpCMS.png",
+      "implies": "PHP",
       "js": {
         "phpcms": ""
       },
-      "icon": "phpCMS.png",
-      "implies": "PHP",
       "website": "http://phpcms.de"
     },
     "phpDocumentor": {
       "cats": [
-        "4"
+        4
       ],
       "html": "<!-- Generated by phpDocumentor",
       "icon": "phpDocumentor.png",
       "implies": "PHP",
-      "website": "http://www.phpdoc.org"
+      "website": "https://www.phpdoc.org"
     },
     "phpMyAdmin": {
       "cats": [
-        "3"
+        3
       ],
-      "js": {
-        "pma_absolute_uri": ""
-      },
       "html": "(?: \\| phpMyAdmin ([\\d.]+)<\\/title>|PMA_sendHeaderLocation\\(|<link [^>]*href=\"[^\"]*phpmyadmin\\.css\\.php)\\;version:\\1",
       "icon": "phpMyAdmin.png",
       "implies": [
         "PHP",
         "MySQL"
       ],
-      "website": "http://www.phpmyadmin.net"
+      "js": {
+        "pma_absolute_uri": ""
+      },
+      "website": "https://www.phpmyadmin.net"
     },
     "phpPgAdmin": {
       "cats": [
-        "3"
+        3
       ],
       "html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
       "icon": "phpPgAdmin.png",
@@ -11701,7 +12573,7 @@
     },
     "phpSQLiteCMS": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "phpSQLiteCMS.png",
       "implies": [
@@ -11715,53 +12587,68 @@
     },
     "phpliteadmin": {
       "cats": [
-        "3"
+        3
       ],
       "html": [
         "<span id='logo'>phpLiteAdmin</span> <span id='version'>v([0-9.]+)<\\;version:\\1",
-        "<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www\\.phpliteadmin\\.org/) -->",
-        "Powered by <a href='http://www\\.phpliteadmin\\.org/'"
+        "<!-- Copyright [0-9]+ phpLiteAdmin (?:https?://www\\.phpliteadmin\\.org/) -->",
+        "Powered by <a href='https?://www\\.phpliteadmin\\.org/'"
       ],
       "icon": "phpliteadmin.png",
       "implies": [
         "PHP",
         "SQLite"
       ],
-      "website": "http://www.phpliteadmin.org/"
+      "website": "https://www.phpliteadmin.org/"
     },
     "phpwind": {
       "cats": [
-        "1",
-        "2"
+        1,
+        2
       ],
-      "html": "Powered by <a href=\"[^\"]+phpwind\\.net",
+      "html": "(?:Powered|Code) by <a href=\"[^\"]+phpwind\\.net",
       "icon": "phpwind.png",
       "implies": "PHP",
       "meta": {
-        "generator": "^phpwind"
+        "generator": "^phpwind(?: v([0-9-]+))?\\;version:\\1"
       },
-      "website": "http://www.phpwind.net"
+      "website": "https://www.phpwind.net"
+    },
+    "pirobase CMS": {
+      "cats": [
+        1
+      ],
+      "html": [
+        "<(?:script|link)[^>]/site/[a-z0-9/._-]+/resourceCached/[a-z0-9/._-]+",
+        "<input[^>]+cbi:///cms/"
+      ],
+      "icon": "pirobaseCMS.svg",
+      "implies": "Java",
+      "website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
     },
     "prettyPhoto": {
       "cats": [
-        "12"
+        59
       ],
+      "html": "(?:<link [^>]*href=\"[^\"]*prettyPhoto(?:\\.min)?\\.css|<a [^>]*rel=\"prettyPhoto)",
+      "icon": "prettyPhoto.png",
+      "implies": "jQuery",
       "js": {
         "pp_alreadyInitialized": "",
         "pp_descriptions": "",
         "pp_images": "",
         "pp_titles": ""
       },
-      "html": "(?:<link [^>]*href=\"[^\"]*prettyPhoto(?:\\.min)?\\.css|<a [^>]*rel=\"prettyPhoto)",
-      "icon": "prettyPhoto.png",
-      "implies": "jQuery",
       "script": "jquery\\.prettyPhoto\\.js",
       "website": "http://no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/"
     },
     "punBB": {
       "cats": [
-        "2"
+        2
       ],
+      "js": {
+        "PUNBB": ""
+      },
       "html": "Powered by <a href=\"[^>]+punbb",
       "icon": "punBB.png",
       "implies": "PHP",
@@ -11769,58 +12656,97 @@
     },
     "reCAPTCHA": {
       "cats": [
-        "16"
+        16
+      ],
+      "html": [
+        "<div[^>]+id=\"recaptcha_image",
+        "<link[^>]+recaptcha",
+        "<div[^>]+class=\"g-recaptcha\""
       ],
+      "icon": "reCAPTCHA.png",
       "js": {
-        "Recaptcha": ""
+        "Recaptcha": "",
+        "recaptcha": ""
       },
-      "html": "(?:<div[^>]+id=\"recaptcha_image|<link[^>]+recaptcha|document\\.getElementById\\('recaptcha')",
-      "icon": "reCAPTCHA.png",
-      "script": "(?:api-secure\\.recaptcha\\.net|recaptcha_ajax\\.js)",
+      "script": [
+        "api-secure\\.recaptcha\\.net",
+        "recaptcha_ajax\\.js",
+        "/recaptcha/api\\.js"
+      ],
       "website": "https://www.google.com/recaptcha/"
     },
     "sIFR": {
       "cats": [
-        "17"
+        17
       ],
       "icon": "sIFR.png",
       "script": "sifr\\.js",
-      "website": "http://www.mikeindustries.com/blog/sifr"
+      "website": "https://www.mikeindustries.com/blog/sifr"
     },
     "sNews": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "sNews.png",
       "meta": {
         "generator": "sNews"
       },
-      "website": "http://snewscms.com"
+      "website": "https://snewscms.com"
     },
     "script.aculo.us": {
       "cats": [
-        "12"
+        59
       ],
+      "icon": "script.aculo.us.png",
       "js": {
-        "Scriptaculous": ""
+        "Scriptaculous.Version": "^(.+)$\\;version:\\1"
       },
-      "icon": "script.aculo.us.png",
-      "script": "(?:scriptaculous|protoaculous)\\.js",
-      "website": "http://script.aculo.us"
+      "script": "/(?:scriptaculous|protoaculous)(?:\\.js|/)",
+      "website": "https://script.aculo.us"
+    },
+    "scrollreveal": {
+      "cats": [
+        59
+      ],
+      "icon": "scrollreveal.svg",
+      "html": "<[^>]+data-sr(?:-id)",
+      "js": {
+        "ScrollReveal().version": "^(.+)$\\;version:\\1"
+      },
+      "script": "scrollreveal(?:\\.min)(?:\\.js)",
+      "website": "https://scrollrevealjs.org"
     },
     "shine.js": {
       "cats": [
-        "25"
+        25
       ],
       "js": {
         "Shine": ""
       },
       "script": "shine(?:\\.min)?\\.js",
-      "website": "http://bigspaceship.github.io/shine.js/"
+      "website": "https://bigspaceship.github.io/shine.js/"
+    },
+    "styled-components": {
+      "cats": [
+        12,
+        47
+      ],
+      "html": [
+        "<style[^>]*data-styled(?:-components)?[\\s\"]",
+        "<style[^>]+data-styled-version=\"([0-9]+)\"\\;version:\\1"
+      ],
+      "icon": "styled-components.png",
+      "implies": [
+        "React"
+      ],
+      "js": {
+        "styled": ""
+      },
+      "website": "https://styled-components.com"
     },
     "swift.engine": {
       "cats": [
-        "1"
+        1
       ],
       "headers": {
         "X-Powered-By": "swift\\.engine"
@@ -11830,43 +12756,43 @@
     },
     "three.js": {
       "cats": [
-        "25"
+        25
       ],
+      "icon": "three.js.png",
       "js": {
-        "THREE": ""
+        "THREE.REVISION": "^(.+)$\\;version:\\1"
       },
-      "icon": "three.js.png",
       "script": "three(?:\\.min)?\\.js",
-      "website": "http://threejs.org"
+      "website": "https://threejs.org"
     },
     "thttpd": {
       "cats": [
-        "22"
+        22
       ],
       "headers": {
-        "Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\\bthttpd(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "thttpd.png",
-      "website": "http://acme.com/software/thttpd"
+      "website": "https://acme.com/software/thttpd"
     },
     "total.js": {
       "cats": [
-        "18"
+        18
       ],
       "headers": {
         "X-Powered-By": "^total\\.js"
       },
       "icon": "total.js.png",
       "implies": "Node.js",
-      "website": "http://totaljs.com"
+      "website": "https://totaljs.com"
     },
     "uCore": {
       "cats": [
-        "1",
-        "18"
+        1,
+        18
       ],
-      "headers": {
-        "Set-Cookie": "ucore"
+      "cookies": {
+        "ucore": ""
       },
       "icon": "uCore.png",
       "implies": "PHP",
@@ -11875,12 +12801,22 @@
       },
       "website": "http://ucore.io"
     },
+    "uCoz": {
+      "cats": [
+        1
+      ],
+      "cookies": {
+        "uCoz": ""
+      },
+      "icon": "uCoz.svg",
+      "website": "https://ucoz.ru"
+    },
     "uKnowva": {
       "cats": [
-        "1",
-        "2",
-        "18",
-        "50"
+        1,
+        2,
+        18,
+        50
       ],
       "headers": {
         "X-Content-Encoded-By": "uKnowva ([\\d.]+)\\;version:\\1"
@@ -11892,25 +12828,31 @@
         "generator": "uKnowva (?: ([\\d.]+))?\\;version:\\1"
       },
       "script": "/media/conv/js/jquery\\.js",
-      "website": "http://uknowva.com"
+      "website": "https://uknowva.com"
     },
     "vBulletin": {
       "cats": [
-        "2"
+        2
       ],
+      "html": "<div id=\"copyright\">Powered by vBulletin",
+      "icon": "vBulletin.png",
+      "implies": "PHP",
       "js": {
         "vBulletin": ""
       },
-      "icon": "vBulletin.png",
-      "implies": "PHP",
+      "cookies": {
+        "bbsessionhash": "",
+        "bblastactivity": "",
+        "bblastvisit": ""
+      },
       "meta": {
-        "generator": "vBulletin"
+        "generator": "vBulletin ?([\\d.]+)?\\;version:\\1"
       },
-      "website": "http://www.vbulletin.com"
+      "website": "https://www.vbulletin.com"
     },
     "vibecommerce": {
       "cats": [
-        "6"
+        6
       ],
       "excludes": "PrestaShop",
       "icon": "vibecommerce.png",
@@ -11921,16 +12863,31 @@
       },
       "website": "http://vibecommerce.com.br"
     },
-    "viennaCMS": {
+    "Virgool": {
+      "cats": [
+        11
+      ],
+      "headers": {
+        "X-Powered-By": "^Virgool$"
+      },
+      "icon": "Virgool.svg",
+      "url": "^https?://(?:www\\.)?virgool\\.io",
+      "website": "https://virgool.io"
+    },
+    "shoperfa": {
       "cats": [
-        "1"
+        6
       ],
-      "html": "powered by <a href=\"[^>]+viennacms",
-      "website": "http://www.viennacms.nl"
+      "headers": {
+        "X-Powered-By": "^Shoperfa$"
+      },
+      "icon": "Shoperfa.png",
+      "url": "^https?://(?:www\\.)?shoperfa\\.com",
+      "website": "https://shoperfa.com"
     },
     "webEdition": {
       "cats": [
-        "1"
+        1
       ],
       "icon": "webEdition.png",
       "meta": {
@@ -11939,425 +12896,339 @@
       },
       "website": "http://webedition.de/en"
     },
-    "Webmine": {
+    "webpack": {
       "cats": [
-        "56"
+        19
       ],
-      "html": "<iframe[^>]+src=[\\'\"]https://webmine\\.cz/miner\\?key=",
-      "icon": "webmine.png",
-      "website": "https://webmine.cz/"
+      "icon": "webpack.svg",
+      "js": {
+        "webpackJsonp": ""
+      },
+      "website": "https://webpack.js.org/"
     },
-    "webpack": {
+    "parcel": {
       "cats": [
-        "44"
+        19
       ],
+      "icon": "Parcel.png",
       "js": {
-        "webpackJsonp": ""
+        "parcelRequire": ""
       },
-      "icon": "webpack.svg",
-      "website": "http://webpack.github.io"
+      "website": "https://parceljs.org/"
     },
     "wpCache": {
       "cats": [
-        "23"
+        23
       ],
       "headers": {
         "X-Powered-By": "wpCache(?:/([\\d.]+))?\\;version:\\1"
       },
       "html": "<!--[^>]+wpCache",
       "icon": "wpCache.png",
-      "implies": "PHP",
+      "implies": [
+        "WordPress",
+        "PHP"
+      ],
       "meta": {
         "generator": "wpCache",
         "keywords": "wpCache"
       },
-      "website": "http://wpcache.co"
+      "url": "^https?://[^/]+\\.wpcache\\.co",
+      "website": "https://wpcache.co"
     },
     "xCharts": {
       "cats": [
-        "25"
+        25
       ],
+      "html": "<link[^>]* href=\"[^\"]*xcharts(?:\\.min)?\\.css",
+      "implies": "D3",
       "js": {
         "xChart": ""
       },
-      "html": "<link[^>]* href=\"[^\"]*xcharts(?:\\.min)?\\.css",
-      "implies": "D3",
       "script": "xcharts\\.js",
-      "website": "http://tenxer.github.io/xcharts/"
+      "website": "https://tenxer.github.io/xcharts/"
     },
     "xtCommerce": {
       "cats": [
-        "6"
+        6
       ],
       "html": "<div class=\"copyright\">[^<]+<a[^>]+>xt:Commerce",
       "icon": "xtCommerce.png",
       "meta": {
         "generator": "xt:Commerce"
       },
-      "website": "http://www.xt-commerce.com"
-    },
-    "Raychat": {
-      "cats": [
-        "52"
-      ],
-      "js": {
-        "Raychat": ""
-      },
-      "icon": "raychat.svg",
-      "script": "app\\.raychat\\.io/scripts/js",
-      "website": "https://raychat.io"
-    },
-    "Mautic": {
-      "cats": [
-        "32"
-      ],
-      "js": {
-        "MauticTrackingObject": ""
-      },
-      "icon": "mautic.svg",
-      "script": "[^a-z]mtc.*\\.js",
-      "website": "https://www.mautic.org/"
-    },
-    "Anetwork": {
-      "cats": [
-        "36"
-      ],
-      "icon": "Anetwork.png",
-      "script": "static-cdn\\.anetwork\\.ir/",
-      "website": "https://www.anetwork.ir"
-    },
-    "Akaunting": {
-      "cats": [
-        "55"
-      ],
-      "html": [
-        "<link[^>]+akaunting-green\\.css",
-        "Powered By Akaunting: <a [^>]*href=\"https?://(?:www\\.)?akaunting\\.com[^>]+>"
-      ],
-      "headers": {
-        "X-Akaunting": "^Free Accounting Software$"
-      },
-      "implies": "Laravel",
-      "icon": "akaunting.svg",
-      "website": "https://akaunting.com"
-    },
-    "Freshmarketer": {
-      "cats": [
-        "10"
-      ],
-      "script": "cdn\\.freshmarketer\\.com",
-      "icon": "freshmarketer.png",
-      "website": "https://www.freshworks.com/marketing-automation/conversion-rate-optimization/"
-    },
-    "GoSquared": {
-      "cats": [
-        "10",
-        "52",
-        "53"
-      ],
-      "js": {
-        "_gs": "\\;confidence:30"
-      },
-      "icon": "gosquared.png",
-      "website": "https://www.gosquared.com/"
-    },
-    "Amplitude": {
-      "cats": [
-        "10"
-      ],
-      "script": [
-        "cdn\\.amplitude\\.com"
-      ],
-      "icon": "amplitude.png",
-      "website": "https://amplitude.com/"
-    },
-    "Inspectlet": {
-      "cats": [
-        "10"
-      ],
-      "html": [
-        "<!-- (?:Begin|End) Inspectlet Embed Code -->"
-      ],
-      "script": [
-        "cdn\\.inspectlet\\.com"
-      ],
-      "js": {
-        "__insp": "",
-        "__inspld": ""
-      },
-      "icon": "inspectlet.png",
-      "website": "https://www.inspectlet.com/"
-    },
-    "Mouse Flow": {
-      "cats": [
-        "10"
-      ],
-      "script": [
-        "cdn\\.mouseflow\\.com"
-      ],
-      "js": {
-        "_mfq": ""
-      },
-      "icon": "mouseflow.png",
-      "website": "https://mouseflow.com/"
+      "website": "https://www.xt-commerce.com"
     },
-    "Visual Website Optimizer": {
+    "Halo": {
       "cats": [
-        "10"
+        1,
+        11
       ],
       "html": [
-        "<!-- (?:Start|End) Visual Website Optimizer A?Synchronous Code -->"
+        "<link rel=[\"']stylesheet[\"'] [^>]+/halo-(?:backend|frontend|common)/"
       ],
-      "script": [
-        "dev\\.visualwebsiteoptimizer\\.com"
-      ],
-      "js": {
-        "VWO": "",
-        "__vwo": ""
-      },
-      "icon": "vwo.svg",
-      "website": "https://vwo.com/"
+      "icon": "Halo.svg",
+      "implies": "Java",
+      "script": "/halo-(?:backend|frontend|common)/",
+      "website": "https://github.com/ruibaby/halo"
     },
-    "XWiki": {
+    "Rocket": {
       "cats": [
-        "8"
-      ],
-      "html": [
-        "<html[^>]data-xwiki-[^>]>"
+        1,
+        6
       ],
-      "meta": {
-        "wiki": "xwiki"
+      "headers": {
+        "x-powered-by": "^Rocket=https://rocketcms.io/"
       },
-      "implies": "Java\\;confidence:99",
-      "excludes": "MediaWiki",
-      "website": "http://www.xwiki.org",
-      "icon": "xwiki.png"
+      "icon": "Rocket.svg",
+      "implies": ["webpack", "Node.js", "MySQL", "Less"],
+      "website": "https://rocketcms.io"
     }
   },
   "categories": {
     "1": {
       "name": "CMS",
-      "priority": "1"
+      "priority": 1
     },
     "2": {
       "name": "Message Boards",
-      "priority": "1"
+      "priority": 1
     },
     "3": {
       "name": "Database Managers",
-      "priority": "4"
+      "priority": 2
     },
     "4": {
       "name": "Documentation Tools",
-      "priority": "2"
+      "priority": 2
     },
     "5": {
       "name": "Widgets",
-      "priority": "9"
+      "priority": 9
     },
     "6": {
       "name": "Ecommerce",
-      "priority": "1"
+      "priority": 1
     },
     "7": {
       "name": "Photo Galleries",
-      "priority": "1"
+      "priority": 1
     },
     "8": {
       "name": "Wikis",
-      "priority": "1"
+      "priority": 1
     },
     "9": {
       "name": "Hosting Panels",
-      "priority": "1"
+      "priority": 1
     },
     "10": {
       "name": "Analytics",
-      "priority": "9"
+      "priority": 9
     },
     "11": {
       "name": "Blogs",
-      "priority": "1"
+      "priority": 1
     },
     "12": {
       "name": "JavaScript Frameworks",
-      "priority": "3"
+      "priority": 8
     },
     "13": {
       "name": "Issue Trackers",
-      "priority": "2"
+      "priority": 2
     },
     "14": {
       "name": "Video Players",
-      "priority": "9"
+      "priority": 7
     },
     "15": {
       "name": "Comment Systems",
-      "priority": "9"
+      "priority": 9
     },
     "16": {
       "name": "Captchas",
-      "priority": "9"
+      "priority": 9
     },
     "17": {
       "name": "Font Scripts",
-      "priority": "9"
+      "priority": 9
     },
     "18": {
       "name": "Web Frameworks",
-      "priority": "2"
+      "priority": 7
     },
     "19": {
       "name": "Miscellaneous",
-      "priority": "9"
+      "priority": 9
     },
     "20": {
       "name": "Editors",
-      "priority": "9"
+      "priority": 4
     },
     "21": {
       "name": "LMS",
-      "priority": "1"
+      "priority": 1
     },
     "22": {
       "name": "Web Servers",
-      "priority": "9"
+      "priority": 8
     },
     "23": {
       "name": "Cache Tools",
-      "priority": "9"
+      "priority": 7
     },
     "24": {
       "name": "Rich Text Editors",
-      "priority": "9"
+      "priority": 5
     },
     "25": {
       "name": "JavaScript Graphics",
-      "priority": "3"
+      "priority": 6
     },
     "26": {
       "name": "Mobile Frameworks",
-      "priority": "3"
+      "priority": 8
     },
     "27": {
       "name": "Programming Languages",
-      "priority": "4"
+      "priority": 5
     },
     "28": {
       "name": "Operating Systems",
-      "priority": "5"
+      "priority": 6
     },
     "29": {
       "name": "Search Engines",
-      "priority": "9"
+      "priority": 4
     },
     "30": {
       "name": "Web Mail",
-      "priority": "9"
+      "priority": 2
     },
     "31": {
       "name": "CDN",
-      "priority": "9"
+      "priority": 9
     },
     "32": {
       "name": "Marketing Automation",
-      "priority": "9"
+      "priority": 9
     },
     "33": {
       "name": "Web Server Extensions",
-      "priority": "9"
+      "priority": 7
     },
     "34": {
       "name": "Databases",
-      "priority": "9"
+      "priority": 5
     },
     "35": {
       "name": "Maps",
-      "priority": "9"
+      "priority": 6
     },
     "36": {
       "name": "Advertising Networks",
-      "priority": "9"
+      "priority": 9
     },
     "37": {
       "name": "Network Devices",
-      "priority": "9"
+      "priority": 2
     },
     "38": {
       "name": "Media Servers",
-      "priority": "1"
+      "priority": 1
     },
     "39": {
       "name": "Webcams",
-      "priority": "9"
-    },
-    "40": {
-      "name": "Printers",
-      "priority": "9"
+      "priority": 9
     },
     "41": {
       "name": "Payment Processors",
-      "priority": "9"
+      "priority": 8
     },
     "42": {
       "name": "Tag Managers",
-      "priority": "9"
-    },
-    "43": {
-      "name": "Paywalls",
-      "priority": "9"
+      "priority": 9
     },
     "44": {
       "name": "Build CI Systems",
-      "priority": "9"
+      "priority": 3
     },
     "45": {
       "name": "Control Systems",
-      "priority": "9"
+      "priority": 2
     },
     "46": {
       "name": "Remote Access",
-      "priority": "9"
+      "priority": 1
     },
     "47": {
       "name": "Dev Tools",
-      "priority": "9"
+      "priority": 2
     },
     "48": {
       "name": "Network Storage",
-      "priority": "9"
+      "priority": 2
     },
     "49": {
       "name": "Feed Readers",
-      "priority": "1"
+      "priority": 1
     },
     "50": {
       "name": "Document Management Systems",
-      "priority": "1"
+      "priority": 1
     },
     "51": {
       "name": "Landing Page Builders",
-      "priority": "2"
+      "priority": 2
     },
     "52": {
       "name": "Live Chat",
-      "priority": "9"
+      "priority": 8
     },
     "53": {
       "name": "CRM",
-      "priority": "9"
+      "priority": 5
     },
     "54": {
       "name": "SEO",
-      "priority": "9"
+      "priority": 8
     },
     "55": {
       "name": "Accounting",
-      "priority": "1"
+      "priority": 1
     },
     "56": {
       "name": "Cryptominer",
-      "priority": "8"
+      "priority": 5
+    },
+    "57": {
+      "name": "Static Site Generator",
+      "priority": 1
+    },
+    "58": {
+      "name": "User Onboarding",
+      "priority": 8
+    },
+    "59": {
+      "name": "JavaScript Libraries",
+      "priority": 9
+    },
+    "60": {
+      "name": "Containers",
+      "priority": 8
+    },
+    "61": {
+      "name": "SaaS",
+      "priority": 8
+    },
+    "62": {
+      "name": "PaaS",
+      "priority": 8
+    },
+    "63": {
+      "name": "IaaS",
+      "priority": 8
     }
   }
 }
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 1bcb3783c..cd2b2af37 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -5,76 +5,78 @@
 /** global: wappalyzer */
 /** global: XMLHttpRequest */
 
-(function() {
-	const container = document.getElementById('wappalyzer-container');
-	const domain = top.location.host;
-	const url = top.location.href.replace(/#.*$/, '');
-	const hasOwn = Object.prototype.hasOwnProperty;
+(function () {
+  wappalyzer.driver.document = document;
+
+  const container = document.getElementById('wappalyzer-container');
+  const url = wappalyzer.parseUrl(window.top.location.href);
+  const hasOwn = Object.prototype.hasOwnProperty;
 
   /**
    * Log messages to console
    */
   wappalyzer.driver.log = (message, source, type) => {
-    console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
+    console.log(`[wappalyzer ${type}]`, `[${source}]`, message);
   };
 
   function getPageContent() {
-    wappalyzer.log('func: getPageContent');
-
-    var env = [];
+    wappalyzer.log('func: getPageContent', 'driver');
 
-    for ( let i in window ) {
-      env.push(i);
-    }
-
-    var scripts = Array.prototype.slice
+    const scripts = Array.prototype.slice
       .apply(document.scripts)
       .filter(s => s.src)
       .map(s => s.src);
 
-    wappalyzer.analyze(domain, url, {
-      html: document.documentElement.innerHTML,
-      env: env,
-      scripts: scripts
+    let html = new window.XMLSerializer().serializeToString(document).split('\n');
+
+    html = html
+      .slice(0, 1000).concat(html.slice(html.length - 1000))
+      .map(line => line.substring(0, 1000))
+      .join('\n');
+
+    wappalyzer.analyze(url, {
+      html,
+      scripts,
     });
   }
 
-	function getResponseHeaders() {
-    wappalyzer.log('func: getResponseHeaders');
+  function getResponseHeaders() {
+    wappalyzer.log('func: getResponseHeaders', 'driver');
 
-    var xhr = new XMLHttpRequest();
+    const xhr = new XMLHttpRequest();
 
     xhr.open('GET', url, true);
 
     xhr.onreadystatechange = () => {
-      if ( xhr.readyState === 4 && xhr.status ) {
-        var headers = xhr.getAllResponseHeaders().split("\n");
+      if (xhr.readyState === 4 && xhr.status) {
+        const headers = xhr.getAllResponseHeaders().split('\n');
 
-        if ( headers.length > 0 && headers[0] != '' ) {
-          wappalyzer.log('responseHeaders: ' + xhr.getAllResponseHeaders());
+        if (headers.length > 0 && headers[0] != '') {
+          wappalyzer.log(`responseHeaders: ${xhr.getAllResponseHeaders()}`, 'driver');
 
-          var responseHeaders = {};
+          const responseHeaders = {};
 
-          headers.forEach(line => {
-            var name, value;
+          headers.forEach((line) => {
+            let name,
+              value;
 
-            if ( line ) {
-              name  = line.substring(0, line.indexOf(': '));
+            if (line) {
+              name = line.substring(0, line.indexOf(': '));
               value = line.substring(line.indexOf(': ') + 2, line.length - 1);
 
-              if ( !responseHeaders[name.toLowerCase()] ){
-                responseHeaders[name.toLowerCase()] = []
+              if (!responseHeaders[name.toLowerCase()]) {
+                responseHeaders[name.toLowerCase()] = [];
               }
               responseHeaders[name.toLowerCase()].push(value);
             }
           });
 
-          wappalyzer.analyze(domain, url, {
-            headers: responseHeaders
+          wappalyzer.analyze(url, {
+            headers: responseHeaders,
           });
         }
       }
-    }
+    };
 
     xhr.send();
   }
@@ -82,46 +84,45 @@
   /**
    * Display apps
    */
-  wappalyzer.driver.displayApps = detected => {
-    wappalyzer.log('func: diplayApps');
-
-    var first = true;
-    var app;
-    var category;
-    var html;
-
-    html =
-      '<a id="wappalyzer-close" href="javascript: document.body.removeChild(document.getElementById(\'wappalyzer-container\')); void(0);">' +
-        'Close' +
-      '</a>' +
-      '<div id="wappalyzer-apps">';
-
-    if ( detected != null && Object.keys(detected).length ) {
-      for ( app in detected ) {
-        if ( !hasOwn.call(detected, app) ) {
+  wappalyzer.driver.displayApps = (detected) => {
+    wappalyzer.log('func: diplayApps', 'driver');
+
+    let first = true;
+    let app;
+    let category;
+    let html;
+
+    html = '<a id="wappalyzer-close" href="javascript: document.body.removeChild(document.getElementById(\'wappalyzer-container\')); void(0);">'
+        + 'Close'
+      + '</a>'
+      + '<div id="wappalyzer-apps">';
+
+    if (detected != null && Object.keys(detected).length) {
+      for (app in detected) {
+        if (!hasOwn.call(detected, app)) {
           continue;
         }
 
-        var version = detected[app].version,
+        let version = detected[app].version,
           confidence = detected[app].confidence;
-        
-        html +=
-          '<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
-            '<a target="_blank" class="wappalyzer-application" href="' + wappalyzer.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
-              '<strong>' +
-                '<img src="' + wappalyzer.config.websiteURL + 'images/icons/' + (wappalyzer.apps[app].icon || 'default.svg') + '" width="16" height="16"/> ' + app +
-              '</strong>' +
-              ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + 
-            '</a>';
-
-        for ( let i in wappalyzer.apps[app].cats ) {
-          if ( !hasOwn.call(wappalyzer.apps[app].cats, i) ) {
+
+        html
+          += `<div class="wappalyzer-app${first ? ' wappalyzer-first' : ''}">`
+            + `<a target="_blank" class="wappalyzer-application" href="${wappalyzer.config.websiteURL}applications/${app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '')}">`
+              + '<strong>'
+                + `<img src="${wappalyzer.config.websiteURL}images/icons/${wappalyzer.apps[app].icon || 'default.svg'}" width="16" height="16"/> ${app
+                }</strong>${
+                  version ? ` ${version}` : ''}${confidence < 100 ? ` (${confidence}% sure)` : ''
+                }</a>`;
+
+        for (const i in wappalyzer.apps[app].cats) {
+          if (!hasOwn.call(wappalyzer.apps[app].cats, i)) {
             continue;
           }
 
           category = wappalyzer.categories[wappalyzer.apps[app].cats[i]].name;
 
-          html += '<a target="_blank" class="wappalyzer-category" href="' + wappalyzer.config.websiteURL + 'categories/' + slugify(category) + '">' + category + '</a>';
+          html += `<a target="_blank" class="wappalyzer-category" href="${wappalyzer.config.websiteURL}categories/${slugify(category)}">${category}</a>`;
         }
 
         html += '</div>';
@@ -142,7 +143,7 @@
    */
   function openTab(args) {
     open(args.url);
-  }
+  };
 
   function slugify(string) {
     return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
@@ -150,4 +151,4 @@
 
   getPageContent();
   getResponseHeaders();
-})();
+}());
diff --git a/src/drivers/npm/README.md b/src/drivers/npm/README.md
index f84b76bec..964d008c3 100644
--- a/src/drivers/npm/README.md
+++ b/src/drivers/npm/README.md
@@ -27,19 +27,30 @@ node index.js [url] [options]
 ### Options
 
 ```
-  --debug=0|1        Output debug messages.
-  --delay=ms         Wait for ms milliseconds between requests.
-  --max-depth=num    Don't analyze pages more than num levels deep.
-  --max-urls=num     Exit when num URLs have been analyzed.
-  --max-wait=ms      Wait no more than ms milliseconds for page resources to load.
-  --recursive=0|1    Follow links on pages (crawler).
-  --user-agent=str   Set the user agent string.
+  --password           Password to be used for basic HTTP authentication
+  --proxy              Proxy URL, e.g. 'http://user:pass@proxy:8080'
+  --username           Username to be used for basic HTTP authentication
+  --chunk-size=num     Process links in chunks.
+  --debug=0|1          Output debug messages.
+  --delay=ms           Wait for ms milliseconds between requests.
+  --html-max-cols=num  Limit the number of HTML characters per line processed.
+  --html-max-rows=num  Limit the number of HTML lines processed.
+  --max-depth=num      Don't analyse pages more than num levels deep.
+  --max-urls=num       Exit when num URLs have been analysed.
+  --max-wait=ms        Wait no more than ms milliseconds for page resources to load.
+  --recursive=0|1      Follow links on pages (crawler).
+  --user-agent=str     Set the user agent string.
 ```
 
 
 ## Run from a script
 
 ```javascript
+const Wappalyzer = require('./driver');
+const Browser = require('./browsers/zombie');
+
+const url = 'https://www.wappalyzer.com';
+
 const options = {
   debug: false,
   delay: 500,
@@ -48,18 +59,30 @@ const options = {
   maxWait: 5000,
   recursive: true,
   userAgent: 'Wappalyzer',
+  htmlMaxCols: 2000,
+  htmlMaxRows: 2000,
 };
 
-const wappalyzer = new Wappalyzer('https://www.wappalyzer.com', options);
+const wappalyzer = new Wappalyzer(Browser, url, options);
+
+// Optional: capture log output
+// wappalyzer.on('log', params => {
+//   const { message, source, type } = params;
+// });
+
+// Optional: do something on page visit
+// wappalyzer.on('visit', params => {
+//   const { browser, pageUrl } = params;
+// });
 
 wappalyzer.analyze()
   .then(json => {
-    process.stdout.write(JSON.stringify(json, null, 2) + '\n')
+    process.stdout.write(`${JSON.stringify(json, null, 2)}\n`);
 
     process.exit(0);
   })
   .catch(error => {
-    process.stderr.write(error + '\n')
+    process.stderr.write(`${error}\n`);
 
     process.exit(1);
 });
diff --git a/src/drivers/npm/browser.js b/src/drivers/npm/browser.js
new file mode 100644
index 000000000..532a75aa3
--- /dev/null
+++ b/src/drivers/npm/browser.js
@@ -0,0 +1,20 @@
+class Browser {
+  constructor(options) {
+    this.options = options;
+
+    this.window = null;
+    this.document = null;
+    this.statusCode = null;
+    this.contentType = null;
+    this.headers = null;
+    this.statusCode = null;
+    this.contentType = null;
+    this.html = null;
+    this.js = null;
+    this.links = null;
+    this.scripts = null;
+    this.cookies = null;
+  }
+}
+
+module.exports = Browser;
diff --git a/src/drivers/npm/browsers/zombie.js b/src/drivers/npm/browsers/zombie.js
new file mode 100644
index 000000000..28f6ba3ce
--- /dev/null
+++ b/src/drivers/npm/browsers/zombie.js
@@ -0,0 +1,121 @@
+const Zombie = require('zombie');
+const Browser = require('../browser');
+
+class ZombieBrowser extends Browser {
+  constructor(options) {
+    super(options);
+
+    this.browser = new Zombie({
+      proxy: options.proxy,
+      silent: true,
+      strictSSL: false,
+      userAgent: options.userAgent,
+      waitDuration: options.maxWait,
+    });
+
+    this.browser.on('authenticate', (auth) => {
+      auth.username = this.options.username;
+      auth.password = this.options.password;
+    });
+  }
+
+  visit(url) {
+    return new Promise((resolve) => {
+      this.browser.visit(url, () => {
+        const resource = this.browser.resources.length
+          ? this.browser.resources.filter(_resource => _resource.response).shift() : null;
+
+        this.window = this.browser.window;
+        this.document = this.browser.document;
+        this.headers = this.getHeaders();
+        this.statusCode = resource ? resource.response.status : 0;
+        this.contentType = this.headers['content-type'] ? this.headers['content-type'].shift() : null;
+        this.html = this.getHtml();
+        this.js = this.getJs();
+        this.links = this.getLinks();
+        this.scripts = this.getScripts();
+        this.cookies = this.getCookies();
+
+        resolve();
+      });
+    });
+  }
+
+  getHeaders() {
+    const headers = {};
+
+    const resource = this.browser.resources.length
+      ? this.browser.resources.filter(_resource => _resource.response).shift() : null;
+
+    if (resource) {
+      // eslint-disable-next-line no-underscore-dangle
+      resource.response.headers._headers.forEach((header) => {
+        if (!headers[header[0]]) {
+          headers[header[0]] = [];
+        }
+
+        headers[header[0]].push(header[1]);
+      });
+    }
+
+    return headers;
+  }
+
+  getHtml() {
+    let html = '';
+
+    if (this.browser.document && this.browser.document.documentElement) {
+      try {
+        html = this.browser.html();
+      } catch (error) {
+        this.log(error.message, 'error');
+      }
+    }
+
+    return html;
+  }
+
+  getScripts() {
+    let scripts = [];
+
+    if (this.browser.document && this.browser.document.scripts) {
+      scripts = Array.prototype.slice
+        .apply(this.browser.document.scripts)
+        .filter(script => script.src)
+        .map(script => script.src);
+    }
+
+    return scripts;
+  }
+
+  getJs() {
+    return this.browser.window;
+  }
+
+  getLinks() {
+    let links = [];
+
+    if (this.browser.document) {
+      links = Array.from(this.browser.document.getElementsByTagName('a'));
+    }
+
+    return links;
+  }
+
+  getCookies() {
+    const cookies = [];
+
+    if (this.browser.cookies) {
+      this.browser.cookies.forEach(cookie => cookies.push({
+        name: cookie.key,
+        value: cookie.value,
+        domain: cookie.domain,
+        path: cookie.path,
+      }));
+    }
+
+    return cookies;
+  }
+}
+
+module.exports = ZombieBrowser;
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 6b6df682b..df75a60fa 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -1,20 +1,80 @@
-'use strict';
-
-const Wappalyzer = require('./wappalyzer');
-const request = require('request');
 const url = require('url');
 const fs = require('fs');
-const Browser = require('zombie');
+const path = require('path');
+const Wappalyzer = require('./wappalyzer');
 
-const json = JSON.parse(fs.readFileSync(__dirname + '/apps.json'));
+const json = JSON.parse(fs.readFileSync(path.resolve(`${__dirname}/apps.json`)));
 
 const extensions = /^([^.]+$|\.(asp|aspx|cgi|htm|html|jsp|php)$)/;
 
+const errorTypes = {
+  RESPONSE_NOT_OK: 'Response was not ok',
+  NO_RESPONSE: 'No response from server',
+  NO_HTML_DOCUMENT: 'No HTML document',
+};
+
+function sleep(ms) {
+  return ms ? new Promise(resolve => setTimeout(resolve, ms)) : Promise.resolve();
+}
+
+function processJs(window, patterns) {
+  const js = {};
+
+  Object.keys(patterns).forEach((appName) => {
+    js[appName] = {};
+
+    Object.keys(patterns[appName]).forEach((chain) => {
+      js[appName][chain] = {};
+
+      patterns[appName][chain].forEach((pattern, index) => {
+        const properties = chain.split('.');
+
+        let value = properties
+          .reduce((parent, property) => (parent && parent[property]
+            ? parent[property] : null), window);
+
+        value = typeof value === 'string' || typeof value === 'number' ? value : !!value;
+
+        if (value) {
+          js[appName][chain][index] = value;
+        }
+      });
+    });
+  });
+
+  return js;
+}
+
+function processHtml(html, maxCols, maxRows) {
+  if (maxCols || maxRows) {
+    const chunks = [];
+    const rows = html.length / maxCols;
+
+    let i;
+
+    for (i = 0; i < rows; i += 1) {
+      if (i < maxRows / 2 || i > rows - maxRows / 2) {
+        chunks.push(html.slice(i * maxCols, (i + 1) * maxCols));
+      }
+    }
+
+    html = chunks.join('\n');
+  }
+
+  return html;
+}
+
 class Driver {
-  constructor(pageUrl, options) {
+  constructor(Browser, pageUrl, options) {
     this.options = Object.assign({}, {
+      password: '',
+      proxy: null,
+      username: '',
+      chunkSize: 5,
       debug: false,
       delay: 500,
+      htmlMaxCols: 2000,
+      htmlMaxRows: 3000,
       maxDepth: 3,
       maxUrls: 10,
       maxWait: 5000,
@@ -22,17 +82,22 @@ class Driver {
       userAgent: 'Mozilla/5.0 (compatible; Wappalyzer)',
     }, options || {});
 
-    this.options.debug = Boolean(this.options.debug);
+    this.options.debug = Boolean(+this.options.debug);
+    this.options.recursive = Boolean(+this.options.recursive);
     this.options.delay = this.options.recursive ? parseInt(this.options.delay, 10) : 0;
     this.options.maxDepth = parseInt(this.options.maxDepth, 10);
     this.options.maxUrls = parseInt(this.options.maxUrls, 10);
     this.options.maxWait = parseInt(this.options.maxWait, 10);
-    this.options.recursive = Boolean(this.options.recursive);
+    this.options.htmlMaxCols = parseInt(this.options.htmlMaxCols, 10);
+    this.options.htmlMaxRows = parseInt(this.options.htmlMaxRows, 10);
 
     this.origPageUrl = url.parse(pageUrl);
-    this.analyzedPageUrls = [];
+    this.analyzedPageUrls = {};
     this.apps = [];
     this.meta = {};
+    this.listeners = {};
+
+    this.Browser = Browser;
 
     this.wappalyzer = new Wappalyzer();
 
@@ -42,46 +107,67 @@ class Driver {
     this.wappalyzer.parseJsPatterns();
 
     this.wappalyzer.driver.log = (message, source, type) => this.log(message, source, type);
-    this.wappalyzer.driver.displayApps = (detected, meta, context) => this.displayApps(detected, meta, context);
+    this.wappalyzer.driver
+      .displayApps = (detected, meta, context) => this.displayApps(detected, meta, context);
+
+    process.on('uncaughtException', e => this.wappalyzer.log(`Uncaught exception: ${e.message}`, 'driver', 'error'));
+  }
+
+  on(event, callback) {
+    if (!this.listeners[event]) {
+      this.listeners[event] = [];
+    }
+
+    this.listeners[event].push(callback);
+  }
+
+  emit(event, params) {
+    if (this.listeners[event]) {
+      this.listeners[event].forEach(listener => listener(params));
+    }
   }
 
   analyze() {
     this.time = {
       start: new Date().getTime(),
       last: new Date().getTime(),
-    }
+    };
 
     return this.crawl(this.origPageUrl);
   }
 
   log(message, source, type) {
-    this.options.debug && console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
+    if (this.options.debug) {
+      console.log(`[wappalyzer ${type}]`, `[${source}]`, message);
+    }
+
+    this.emit('log', { message, source, type });
   }
 
   displayApps(detected, meta) {
     this.meta = meta;
 
-    Object.keys(detected).forEach(appName => {
+    Object.keys(detected).forEach((appName) => {
       const app = detected[appName];
 
-      var categories = [];
+      const categories = [];
 
-      app.props.cats.forEach(id => {
-        var category = {};
+      app.props.cats.forEach((id) => {
+        const category = {};
 
         category[id] = json.categories[id].name;
 
-        categories.push(category)
+        categories.push(category);
       });
 
-      if ( !this.apps.some(detectedApp => detectedApp.name === app.name) ) {
+      if (!this.apps.some(detectedApp => detectedApp.name === app.name)) {
         this.apps.push({
           name: app.name,
           confidence: app.confidenceTotal.toString(),
-          version: app.version,
+          version: app.version || null,
           icon: app.props.icon || 'default.svg',
           website: app.props.website,
-          categories
+          categories,
         });
       }
     });
@@ -89,209 +175,147 @@ class Driver {
 
   fetch(pageUrl, index, depth) {
     // Return when the URL is a duplicate or maxUrls has been reached
-    if ( this.analyzedPageUrls.indexOf(pageUrl.href) !== -1 || this.analyzedPageUrls.length >= this.options.maxUrls ) {
+    if (
+      this.analyzedPageUrls[pageUrl.href]
+      || this.analyzedPageUrls.length >= this.options.maxUrls
+    ) {
       return Promise.resolve();
     }
 
-    this.analyzedPageUrls.push(pageUrl.href);
+    this.analyzedPageUrls[pageUrl.href] = {
+      status: 0,
+    };
 
     const timerScope = {
-      last: new Date().getTime()
+      last: new Date().getTime(),
     };
 
-    this.timer('fetch; url: ' + pageUrl.href + '; depth: ' + depth + '; delay: ' + ( this.options.delay * index ) + 'ms', timerScope);
+    this.timer(`fetch; url: ${pageUrl.href}; depth: ${depth}; delay: ${this.options.delay * index}ms`, timerScope);
 
-    return new Promise(resolve => this.sleep(this.options.delay * index).then(() => this.visit(pageUrl, timerScope, resolve)));
-  }
+    return new Promise(async (resolve, reject) => {
+      await sleep(this.options.delay * index);
 
-  visit(pageUrl, timerScope, resolve) {
-    const browser = new Browser({
-      silent: true,
-      userAgent: this.options.userAgent,
-      waitDuration: this.options.maxWait,
+      this.visit(pageUrl, timerScope, resolve, reject);
     });
+  }
 
-    this.timer('browser.visit start; url: ' + pageUrl.href, timerScope);
-
-    browser.visit(pageUrl.href, () => {
-      this.timer('browser.visit end; url: ' + pageUrl.href, timerScope);
+  async visit(pageUrl, timerScope, resolve, reject) {
+    const browser = new this.Browser(this.options);
 
-      if ( !this.responseOk(browser, pageUrl) ) {
-        return resolve();
-      }
+    browser.log = (message, type) => this.wappalyzer.log(message, 'browser', type);
 
-      const headers = this.getHeaders(browser);
-      const html = this.getHtml(browser);
-      const scripts = this.getScripts(browser);
-      const js = this.getJs(browser);
+    this.timer(`visit start; url: ${pageUrl.href}`, timerScope);
 
-      this.wappalyzer.analyze(pageUrl, {
-        headers,
-        html,
-        scripts,
-        js
-      });
+    await browser.visit(pageUrl.href);
 
-      const links = Array.from(browser.document.getElementsByTagName('a'))
-        .filter(link => link.hostname === this.origPageUrl.hostname)
-        .filter(link => extensions.test(link.pathname))
-        .map(link => { link.hash = ''; return url.parse(link.href) });
+    this.timer(`visit end; url: ${pageUrl.href}`, timerScope);
 
-      return resolve(links);
-    });
-  }
+    this.analyzedPageUrls[pageUrl.href].status = browser.statusCode;
 
-  responseOk(browser, pageUrl) {
     // Validate response
-    const resource = browser.resources.length ? browser.resources.filter(resource => resource.response).shift() : null;
-
-    if ( !resource ) {
-      this.wappalyzer.log('No response from server; url: ' + pageUrl.href, 'driver', 'error');
+    if (!browser.statusCode) {
+      return reject(new Error('NO_RESPONSE'));
+    }
 
-      return false;
+    if (browser.statusCode !== 200) {
+      return reject(new Error('RESPONSE_NOT_OK'));
     }
 
-    if ( resource.response.status !== 200 ) {
-      this.wappalyzer.log('Response was not OK; status: ' + resource.response.status + ' ' + resource.response.statusText + '; url: ' + pageUrl.href, 'driver', 'error');
+    if (!browser.contentType || !/\btext\/html\b/.test(browser.contentType)) {
+      this.wappalyzer.log(`Skipping; url: ${pageUrl.href}; content type: ${browser.contentType}`, 'driver');
 
-      return false;
+      delete this.analyzedPageUrls[pageUrl.href];
     }
 
-    const headers = this.getHeaders(browser);
+    const { cookies, headers, scripts } = browser;
 
-    // Validate content type
-    const contentType = headers.hasOwnProperty('content-type') ? headers['content-type'].shift() : null;
+    const html = processHtml(browser.html, this.options.htmlMaxCols, this.options.htmlMaxRows);
+    const js = processJs(browser.js, this.wappalyzer.jsPatterns);
 
-    if ( !contentType || !/\btext\/html\b/.test(contentType) ) {
-      this.wappalyzer.log('Skipping; url: ' + pageUrl.href + '; content type: ' + contentType, 'driver');
+    await this.wappalyzer.analyze(pageUrl, {
+      cookies,
+      headers,
+      html,
+      js,
+      scripts,
+    });
 
-      this.analyzedPageUrls.splice(this.analyzedPageUrls.indexOf(pageUrl.href), 1);
+    const reducedLinks = Array.prototype.reduce.call(
+      browser.links, (results, link) => {
+        if (link.protocol.match(/https?:/) && link.hostname === this.origPageUrl.hostname && extensions.test(link.pathname)) {
+          link.hash = '';
 
-      return false;
-    }
+          results.push(url.parse(link.href));
+        }
 
-    // Validate document
-    if ( !browser.document || !browser.document.documentElement ) {
-      this.wappalyzer.log('No HTML document; url: ' + pageUrl.href, 'driver', 'error');
+        return results;
+      }, [],
+    );
 
-      return false;
-    }
+    this.emit('visit', { browser, pageUrl });
 
-    return true;
+    return resolve(reducedLinks);
   }
 
-  getHeaders(browser) {
-    const headers = {};
-
-    const resource = browser.resources.length ? browser.resources.filter(resource => resource.response).shift() : null;
-
-    if ( resource ) {
-      resource.response.headers._headers.forEach(header => {
-        if ( !headers[header[0]] ){
-          headers[header[0]] = [];
-        }
+  crawl(pageUrl, index = 1, depth = 1) {
+    pageUrl.canonical = `${pageUrl.protocol}//${pageUrl.host}${pageUrl.pathname}`;
 
-        headers[header[0]].push(header[1]);
-      });
-    }
+    return new Promise(async (resolve) => {
+      let links;
 
-    return headers;
-  }
+      try {
+        links = await this.fetch(pageUrl, index, depth);
+      } catch (error) {
+        const type = error.message && errorTypes[error.message] ? error.message : 'UNKNOWN_ERROR';
+        const message = error.message && errorTypes[error.message] ? errorTypes[error.message] : 'Unknown error';
 
-  getHtml(browser) {
-    let html = '';
+        this.analyzedPageUrls[pageUrl.href].error = {
+          type,
+          message,
+        };
 
-    try {
-      html = browser.html();
+        this.wappalyzer.log(`${message}; url: ${pageUrl.href}`, 'driver', 'error');
+      }
 
-      if ( html.length > 50000 ) {
-        html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+      if (links && this.options.recursive && depth < this.options.maxDepth) {
+        await this.chunk(links.slice(0, this.options.maxUrls), depth + 1);
       }
-    } catch ( error ) {
-      this.wappalyzer.log(error.message, 'browser', 'error');
-    }
 
-    return html;
+      return resolve({
+        urls: this.analyzedPageUrls,
+        applications: this.apps,
+        meta: this.meta,
+      });
+    });
   }
 
-  getScripts(browser) {
-    if ( !browser.document || !browser.document.scripts ) {
-      return [];
+  chunk(links, depth, chunk = 0) {
+    if (links.length === 0) {
+      return Promise.resolve();
     }
 
-    const scripts = Array.prototype.slice
-      .apply(browser.document.scripts)
-      .filter(script => script.src)
-      .map(script => script.src);
-
-    return scripts;
-  }
-
-  getJs(browser) {
-    const patterns = this.wappalyzer.jsPatterns;
-    const js = {};
-
-    Object.keys(patterns).forEach(appName => {
-      js[appName] = {};
-
-      Object.keys(patterns[appName]).forEach(chain => {
-        js[appName][chain] = {};
-
-        patterns[appName][chain].forEach((pattern, index) => {
-          const properties = chain.split('.');
-
-          let value = properties.reduce((parent, property) => {
-            return parent && parent.hasOwnProperty(property) ? parent[property] : null;
-          }, browser.window);
+    const chunked = links.splice(0, this.options.chunkSize);
 
-          value = typeof value === 'string' ? value : !!value;
+    return new Promise(async (resolve) => {
+      await Promise.all(chunked.map((link, index) => this.crawl(link, index, depth)));
 
-          if ( value ) {
-            js[appName][chain][index] = value;
-          }
-        });
-      });
-    });
-
-    return js;
-  }
+      await this.chunk(links, depth, chunk + 1);
 
-  crawl(pageUrl, index = 1, depth = 1) {
-    pageUrl.canonical = pageUrl.protocol + '//' + pageUrl.host + pageUrl.pathname;
-
-    return new Promise(resolve => {
-      this.fetch(pageUrl, index, depth)
-        .catch(() => {})
-        .then(links => {
-          if ( links && Boolean(this.options.recursive) && depth < this.options.maxDepth ) {
-            return Promise.all(links.map((link, index) => this.crawl(link, index + 1, depth + 1)));
-          } else {
-            return Promise.resolve();
-          }
-        })
-        .then(() => {
-          resolve({
-            urls: this.analyzedPageUrls,
-            applications: this.apps,
-            meta: this.meta
-          });
-        });
+      resolve();
     });
   }
 
-  sleep(ms) {
-    return ms ? new Promise(resolve => setTimeout(resolve, ms)) : Promise.resolve();
-  }
-
   timer(message, scope) {
     const time = new Date().getTime();
-    const sinceStart = ( Math.round(( time - this.time.start ) / 10) / 100) + 's';
-    const sinceLast = ( Math.round(( time - scope.last ) / 10) / 100) + 's';
+    const sinceStart = `${Math.round((time - this.time.start) / 10) / 100}s`;
+    const sinceLast = `${Math.round((time - scope.last) / 10) / 100}s`;
 
-    this.wappalyzer.log('[timer] ' + message + '; lapsed: ' + sinceLast + ' / ' + sinceStart, 'driver');
+    this.wappalyzer.log(`[timer] ${message}; lapsed: ${sinceLast} / ${sinceStart}`, 'driver');
 
     scope.last = time;
   }
-};
+}
 
 module.exports = Driver;
+module.exports.processJs = processJs;
+module.exports.processHtml = processHtml;
diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
old mode 100644
new mode 100755
index c8c254850..3ca29287e
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -1,41 +1,45 @@
-'use strict';
+#!/usr/bin/env node
 
 const Wappalyzer = require('./driver');
+const Browser = require('./browsers/zombie');
 
 const args = process.argv.slice(2);
 
 const url = args.shift() || '';
 
-if ( !url ) {
+if (!url) {
   process.stderr.write('No URL specified\n');
 
   process.exit(1);
 }
 
-var options = {};
-var arg;
+const options = {};
 
-while ( arg = args.shift() ) {
-  var matches = /--([^=]+)=(.+)/.exec(arg);
+let arg;
 
-  if ( matches ) {
-    var key = matches[1].replace(/-\w/g, matches => matches[1].toUpperCase());
-    var value = matches[2];
+do {
+  arg = args.shift();
+
+  const matches = /--([^=]+)=(.+)/.exec(arg);
+
+  if (matches) {
+    const key = matches[1].replace(/-\w/g, _matches => _matches[1].toUpperCase());
+    const value = matches[2];
 
     options[key] = value;
   }
-}
+} while (arg);
 
-const wappalyzer = new Wappalyzer(url, options);
+const wappalyzer = new Wappalyzer(Browser, url, options);
 
 wappalyzer.analyze()
-  .then(json => {
-    process.stdout.write(JSON.stringify(json) + '\n')
+  .then((json) => {
+    process.stdout.write(`${JSON.stringify(json)}\n`);
 
     process.exit(0);
   })
-  .catch(error => {
-    process.stderr.write(error + '\n')
+  .catch((error) => {
+    process.stderr.write(`${error}\n`);
 
     process.exit(1);
   });
diff --git a/src/drivers/npm/npm-shrinkwrap.json b/src/drivers/npm/npm-shrinkwrap.json
new file mode 100644
index 000000000..591fba283
--- /dev/null
+++ b/src/drivers/npm/npm-shrinkwrap.json
@@ -0,0 +1,767 @@
+{
+  "name": "wappalyzer",
+  "version": "5.7.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "10.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz",
+      "integrity": "sha512-VkKcfuitP+Nc/TaTFH0B8qNmn+6NbI6crLkQonbedViVz7O2w8QV/GERPlkJ4bg42VGHiEWa31CoTOPs1q6z1w=="
+    },
+    "abab": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
+    },
+    "acorn": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="
+    },
+    "acorn-globals": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz",
+      "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==",
+      "requires": {
+        "acorn": "^5.0.0"
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+    },
+    "browser-process-hrtime": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz",
+      "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "content-type-parser": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
+      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ=="
+    },
+    "core-js": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cssom": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.3.tgz",
+      "integrity": "sha512-pjE/I/NSp3iyeoxXN5QaoJpgzYUMj2dJHx9OSufoTliJLDx+kuOQaMCJW8OwvrKJswhXUHnHN6eUmUSETN0msg=="
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "requires": {
+        "ms": "2.0.0"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "requires": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "~0.1.0"
+      }
+    },
+    "escodegen": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz",
+      "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==",
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      }
+    },
+    "esprima": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "eventsource": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.5.tgz",
+      "integrity": "sha512-IzjLaND9GBK3+fBPhmvG/Yq3FhSDGHnucJCDWhNsneLlN+HX5jeaSpl3Folr2PipGmyUsd/T2Vrua+s6I2aTgQ==",
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "requires": {
+        "ajv": "^5.1.0",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "jsdom": {
+      "version": "11.5.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.5.1.tgz",
+      "integrity": "sha512-89ztIZ03aYK9f1uUrLXLsZndRge/JnZjzjpaN+lrse3coqz+8PR/dX4WLHpbF5fIKTXhDjFODOJw2328lPJ90g==",
+      "requires": {
+        "abab": "^1.0.3",
+        "acorn": "^5.1.2",
+        "acorn-globals": "^4.0.0",
+        "array-equal": "^1.0.0",
+        "browser-process-hrtime": "^0.1.2",
+        "content-type-parser": "^1.0.1",
+        "cssom": ">= 0.3.2 < 0.4.0",
+        "cssstyle": ">= 0.2.37 < 0.3.0",
+        "domexception": "^1.0.0",
+        "escodegen": "^1.9.0",
+        "html-encoding-sniffer": "^1.0.1",
+        "left-pad": "^1.2.0",
+        "nwmatcher": "^1.4.3",
+        "parse5": "^3.0.2",
+        "pn": "^1.0.0",
+        "request": "^2.83.0",
+        "request-promise-native": "^1.0.3",
+        "sax": "^1.2.1",
+        "symbol-tree": "^3.2.1",
+        "tough-cookie": "^2.3.3",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.1",
+        "whatwg-url": "^6.3.0",
+        "xml-name-validator": "^2.0.1"
+      }
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "mime": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+      "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
+    },
+    "mime-db": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+    },
+    "mime-types": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "requires": {
+        "mime-db": "~1.33.0"
+      }
+    },
+    "ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+    },
+    "nwmatcher": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
+      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "original": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.1.tgz",
+      "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==",
+      "requires": {
+        "url-parse": "~1.4.0"
+      }
+    },
+    "parse5": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+      "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "psl": {
+      "version": "1.1.28",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz",
+      "integrity": "sha512-+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
+      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw=="
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
+    "request": {
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.6.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.5",
+        "extend": "~3.0.1",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.1",
+        "har-validator": "~5.0.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.17",
+        "oauth-sign": "~0.8.2",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.1",
+        "safe-buffer": "^5.1.1",
+        "tough-cookie": "~2.3.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.1.0"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+          "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+          "requires": {
+            "punycode": "^1.4.1"
+          }
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
+      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "requires": {
+        "lodash": "^4.13.1"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
+      "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
+      "requires": {
+        "request-promise-core": "1.1.1",
+        "stealthy-require": "^1.1.0",
+        "tough-cookie": ">=2.3.3"
+      }
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true
+    },
+    "sshpk": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
+      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "symbol-tree": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      }
+    },
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "url-parse": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
+      "requires": {
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "whatwg-encoding": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
+      "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==",
+      "requires": {
+        "iconv-lite": "0.4.19"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+        }
+      }
+    },
+    "whatwg-url": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "ws": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xml-name-validator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
+      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
+    },
+    "zombie": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/zombie/-/zombie-6.1.2.tgz",
+      "integrity": "sha512-p2KZ1ThrORbOUpEjf9zV4gpcyzwAu1zDrrKF7O2PmeYIsAdh7PjUoKaqJnxLj9FDOyUGPAPxZCrYf54pQM9y7w==",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "bluebird": "^3.5.1",
+        "debug": "^3.1.0",
+        "eventsource": "^1.0.5",
+        "iconv-lite": "^0.4.21",
+        "jsdom": "11.5.1",
+        "lodash": "^4.17.10",
+        "mime": "^2.3.1",
+        "ms": "^2.1.1",
+        "request": "^2.85.0",
+        "tough-cookie": "^2.3.4",
+        "ws": "^5.1.1"
+      }
+    }
+  }
+}
diff --git a/src/drivers/npm/package-lock.json b/src/drivers/npm/package-lock.json
deleted file mode 100644
index de031cfc5..000000000
--- a/src/drivers/npm/package-lock.json
+++ /dev/null
@@ -1,686 +0,0 @@
-{
-  "name": "wappalyzer",
-  "version": "5.3.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
-    },
-    "acorn": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
-    },
-    "acorn-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
-      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
-      "requires": {
-        "acorn": "2.7.0"
-      }
-    },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
-      }
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-    },
-    "babel-runtime": {
-      "version": "5.8.29",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.29.tgz",
-      "integrity": "sha1-SiBSy8/1MXiNOp1rA81/RIKF+CU=",
-      "requires": {
-        "core-js": "1.2.7"
-      }
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs="
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "requires": {
-        "cssom": "0.3.2"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
-    },
-    "escodegen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
-      "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
-      }
-    },
-    "esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
-    },
-    "eventsource": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
-      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
-      "requires": {
-        "original": "1.0.0"
-      }
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
-      }
-    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
-        "sntp": "2.1.0"
-      }
-    },
-    "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "jsdom": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz",
-      "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=",
-      "requires": {
-        "abab": "1.0.4",
-        "acorn": "2.7.0",
-        "acorn-globals": "1.0.9",
-        "cssom": "0.3.2",
-        "cssstyle": "0.2.37",
-        "escodegen": "1.9.0",
-        "nwmatcher": "1.4.3",
-        "parse5": "1.5.1",
-        "request": "2.83.0",
-        "sax": "1.2.4",
-        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.3",
-        "webidl-conversions": "2.0.1",
-        "whatwg-url-compat": "0.6.5",
-        "xml-name-validator": "2.0.1"
-      }
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
-      }
-    },
-    "lodash": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "requires": {
-        "mime-db": "1.30.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "nwmatcher": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz",
-      "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw=="
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
-      }
-    },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
-    },
-    "original": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
-      "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
-      "requires": {
-        "url-parse": "1.0.5"
-      }
-    },
-    "parse5": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "querystringify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz",
-      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw="
-    },
-    "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-      "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.1",
-        "har-validator": "5.0.3",
-        "hawk": "6.0.2",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.1",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.1.0"
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "optional": true
-    },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
-    "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
-    },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "requires": {
-        "prelude-ls": "1.1.2"
-      }
-    },
-    "url-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz",
-      "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
-      "requires": {
-        "querystringify": "0.0.4",
-        "requires-port": "1.0.0"
-      }
-    },
-    "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz",
-      "integrity": "sha1-O/glj30xjHRDw28uFpQCoaZwNQY="
-    },
-    "whatwg-url-compat": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz",
-      "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=",
-      "requires": {
-        "tr46": "0.0.3"
-      }
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-    },
-    "xml-name-validator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
-      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
-    },
-    "zombie": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/zombie/-/zombie-5.0.7.tgz",
-      "integrity": "sha512-zrYFTD5iWxI3EJohmZ8F2sNafo44F/132wLj5WHLSHmytds60s+JiXLomflQ8sbNuWCZJAuszvf6+eUiVsUqPQ==",
-      "requires": {
-        "babel-runtime": "5.8.29",
-        "bluebird": "3.5.1",
-        "debug": "2.6.9",
-        "eventsource": "0.1.6",
-        "iconv-lite": "0.4.19",
-        "jsdom": "7.2.2",
-        "lodash": "3.10.1",
-        "mime": "1.6.0",
-        "ms": "0.7.3",
-        "request": "2.83.0",
-        "tough-cookie": "2.3.3",
-        "ws": "1.1.5"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8="
-        },
-        "ultron": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-          "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
-        },
-        "ws": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-          "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-          "requires": {
-            "options": "0.0.6",
-            "ultron": "1.0.2"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index f69102b7e..58c102d85 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.4.3",
+  "version": "5.7.2",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
@@ -12,12 +12,16 @@
   "main": "driver.js",
   "files": [
     "apps.json",
-    "index.js",
+    "browser.js",
+    "browsers/zombie.js",
     "driver.js",
+    "index.js",
     "wappalyzer.js"
   ],
+  "bin": {
+    "wappalyzer": "./index.js"
+  },
   "dependencies": {
-    "request": "^2.81.0",
-    "zombie": "^5.0.7"
+    "zombie": "^6.1.2"
   }
 }
diff --git a/src/drivers/npm/yarn.lock b/src/drivers/npm/yarn.lock
deleted file mode 100644
index a00c71191..000000000
--- a/src/drivers/npm/yarn.lock
+++ /dev/null
@@ -1,542 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-abab@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
-  dependencies:
-    acorn "^2.1.0"
-
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-babel-runtime@5.8.29:
-  version "5.8.29"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-5.8.29.tgz#4a2052cbcff531788d3a9d6b03cd7f448285f825"
-  dependencies:
-    core-js "^1.0.0"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-bluebird@^3.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-
-"cssstyle@>= 0.2.29 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  dependencies:
-    cssom "0.3.x"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@^2.2:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-escodegen@^1.6.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
-  dependencies:
-    esprima "^3.1.3"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.5.6"
-
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
-estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-eventsource@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  dependencies:
-    original ">=0.0.5"
-
-extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extsprintf@1.3.0, extsprintf@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-iconv-lite@^0.4.13:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsdom@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
-  dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.29 < 0.3.0"
-    escodegen "^1.6.1"
-    nwmatcher ">= 1.3.7 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.2.0"
-    webidl-conversions "^2.0.0"
-    whatwg-url-compat "~0.6.5"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lodash@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.12, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-mime@^1.3.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-ms@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
-"nwmatcher@>= 1.3.7 < 2.0.0":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
-
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
-original@>=0.0.5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
-  dependencies:
-    url-parse "1.0.x"
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-querystringify@0.0.x:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
-
-request@^2.55.0, request@^2.65.0, request@^2.81.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-requires-port@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-sax@^1.1.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
-source-map@~0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-"symbol-tree@>= 3.1.0 < 4.0.0":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-
-tough-cookie@^2.2.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
-
-tr46@~0.0.1:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-
-url-parse@1.0.x:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
-  dependencies:
-    querystringify "0.0.x"
-    requires-port "1.0.x"
-
-uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-webidl-conversions@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
-
-whatwg-url-compat@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf"
-  dependencies:
-    tr46 "~0.0.1"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
-ws@^1.0.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-"xml-name-validator@>= 2.0.1 < 3.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-
-zombie@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/zombie/-/zombie-5.0.7.tgz#215ba90b4b97f75b796c935affcc63d68cbac772"
-  dependencies:
-    babel-runtime "5.8.29"
-    bluebird "^3.0"
-    debug "^2.2"
-    eventsource "^0.1.6"
-    iconv-lite "^0.4.13"
-    jsdom "^7.2.2"
-    lodash "^3.10.1"
-    mime "^1.3.4"
-    ms "^0.7.1"
-    request "^2.65.0"
-    tough-cookie "^2.2.0"
-    ws "^1.0.1"
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
index 698326cd4..c8b72145d 100644
--- a/src/drivers/webextension/_locales/de/messages.json
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Anonyme Statistiken an wappalyzer.com übermitteln" },
 	"nothingToDo":              { "message": "Nichts zu tun." },
 	"noAppsDetected":           { "message": "Keine Applikation entdeckt." },
+  "categoryPin":              { "message": "Immer Icon anzeigen" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Nachrichten Board" },
 	"categoryName3":            { "message": "Datenbankverwaltung" },
@@ -64,5 +67,13 @@
 	"categoryName52":           { "message": "Live-Chat" },
 	"categoryName53":           { "message": "CRM" },
   "categoryName54":           { "message": "SEO" },
-	"categoryName55":           { "message": "Buchhaltung" }
+	"categoryName55":           { "message": "Buchhaltung" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Statischer Seitengenerator" },
+	"categoryName58":           { "message": "Benutzer-Einbindung" },
+	"categoryName59":           { "message": "JavaScript Bibliotheken" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 2330f652e..f336695de 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
@@ -59,5 +62,14 @@
 	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index bac2a4731..df884a399 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -6,10 +6,14 @@
 	"optionsSave":              { "message": "Save options" },
 	"optionsSaved":             { "message": "Saved" },
 	"optionUpgradeMessage":     { "message": "Tell me about upgrades" },
-	"optionDynamicIcon":        { "message": "Use application icon instead of Wappalyzer logo" },
-	"optionTracking":           { "message": "Anonymously send reports on detected applications to wappalyzer.com for research" },
+	"optionDynamicIcon":        { "message": "Use technology icon instead of Wappalyzer logo" },
+	"optionTracking":           { "message": "Anonymously send identified technologies to wappalyzer.com" },
 	"nothingToDo":              { "message": "Nothing to do here." },
-	"noAppsDetected":           { "message": "No applications detected." },
+	"noAppsDetected":           { "message": "No technologies detected." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "privacyPolicy":            { "message": "Privacy policy" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Message Board" },
 	"categoryName3":            { "message": "Database Manager" },
@@ -64,5 +68,13 @@
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
   "categoryName54":           { "message": "SEO" },
-	"categoryName55":           { "message": "Accounting" }
+	"categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index bd183d439..741b88c9a 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis" },
 	"nothingToDo":              { "message": "Nada que hacer aquí." },
 	"noAppsDetected":           { "message": "Aplicaciones no detectadas." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Gestor de Contenido" },
 	"categoryName2":            { "message": "Foro" },
 	"categoryName3":            { "message": "Gestor de Bases de Datos" },
@@ -63,5 +66,14 @@
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json
new file mode 100644
index 000000000..c5b190c30
--- /dev/null
+++ b/src/drivers/webextension/_locales/fa/messages.json
@@ -0,0 +1,79 @@
+{
+	"github":                   { "message": "چنگال زدن Wappalyzer در GitHub!" },
+	"twitter":                  { "message": "دنبال کردن Wappalyzer در Twitter" },
+	"website":                  { "message": "رفتن به wappalyzer.com" },
+	"options":                  { "message": "گزینه ها" },
+	"optionsSave":              { "message": "گزینه های ذخیره" },
+	"optionsSaved":             { "message": "ذخیره شده" },
+	"optionUpgradeMessage":     { "message": "درباره ارتقا به من بگویید" },
+	"optionDynamicIcon":        { "message": "از نماد فن آوری به جای علامت Wappalyzer استفاده شود" },
+	"optionTracking":           { "message": "ارسال فن آوری های شناسایی شده به صورت ناشناس به wappalyzer.com" },
+	"nothingToDo":              { "message": "هیچ چیز برای انجام اینجا نیست." },
+	"noAppsDetected":           { "message": "هیچ فن آوری شناسایی نشده است." },
+  "categoryPin":              { "message": "همیشه نماد را نشان بده" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+	"categoryName1":            { "message": "سیستم مدیریت محتوا" },
+	"categoryName2":            { "message": "انجمن پیام" },
+	"categoryName3":            { "message": "مدیر پایگاه داده" },
+	"categoryName4":            { "message": "ابزار مستند سازی" },
+	"categoryName5":            { "message": "ابزارک" },
+	"categoryName6":            { "message": "تجارت الکترونیک" },
+	"categoryName7":            { "message": "گالری تصویر" },
+	"categoryName8":            { "message": "ویکی ها" },
+	"categoryName9":            { "message": "پنل های میزبانی" },
+	"categoryName10":           { "message": "تجزیه و تحلیل ها" },
+	"categoryName11":           { "message": "بلاگ" },
+	"categoryName12":           { "message": "چارچوب جاوا اسکریپت" },
+	"categoryName13":           { "message": "ردیاب مشکل" },
+	"categoryName14":           { "message": "پخش کننده ویدیویی" },
+	"categoryName15":           { "message": "سیستم نظرسنجی" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "اسکریپ فونت" },
+	"categoryName18":           { "message": "چارچوب وب" },
+	"categoryName19":           { "message": "متفرقه" },
+	"categoryName20":           { "message": "ویرایشگر" },
+	"categoryName21":           { "message": "سامانه مدیریت آموزشی" },
+	"categoryName22":           { "message": "وب سرور" },
+	"categoryName23":           { "message": "ابزار کش" },
+	"categoryName24":           { "message": "ویرایشگر متن توانمند" },
+	"categoryName25":           { "message": "گرافیک های جاوا اسکریپت" },
+	"categoryName26":           { "message": "چارچوب موبایل" },
+	"categoryName27":           { "message": "زبان برنامه نویسی" },
+	"categoryName28":           { "message": "سیستم عامل" },
+	"categoryName29":           { "message": "موتور جستجو" },
+	"categoryName30":           { "message": "پست الکترونیکی تحت وب" },
+	"categoryName31":           { "message": "شبکه تحویل محتوا" },
+	"categoryName32":           { "message": "اتوماسیون بازاریابی" },
+	"categoryName33":           { "message": "افزودنی وب سرور" },
+	"categoryName34":           { "message": "پایگاه داده" },
+	"categoryName35":           { "message": "نقشه" },
+	"categoryName36":           { "message": "شبکه تبلیغاتی" },
+	"categoryName37":           { "message": "خدمات شبکه" },
+	"categoryName38":           { "message": "سرور رسانه" },
+	"categoryName39":           { "message": "وبکم" },
+	"categoryName40":           { "message": "پرینتر" },
+	"categoryName41":           { "message": "پردازنده پرداخت" },
+	"categoryName42":           { "message": "مدیر برچسب" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "سیستم ساخت/CI" },
+	"categoryName45":           { "message": "سیستم SCADA" },
+	"categoryName46":           { "message": "دسترسی از راه دور" },
+	"categoryName47":           { "message": "ابزار توسعه" },
+	"categoryName48":           { "message": "ذخیره سازی شبکه" },
+	"categoryName49":           { "message": "خواننده های خوراک" },
+	"categoryName50":           { "message": "سیستم مدیریت سند" },
+	"categoryName51":           { "message": "سازنده صفحات Landing" },
+	"categoryName52":           { "message": "گفتگوی زنده" },
+	"categoryName53":           { "message": "مدیریت ارتباط با مشتری" },
+  "categoryName54":           { "message": "بهینه سازی موتور جستجو" },
+	"categoryName55":           { "message": "حسابداری" },
+	"categoryName56":           { "message": "کریپتوماینر" },
+	"categoryName57":           { "message": "تولید کننده سایت ایستا" },
+	"categoryName58":           { "message": "آن بوردینگ کاربر" },
+	"categoryName59":           { "message": "کتابخانه های جاوا اسکریپت" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
+}
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index 9195ed1ea..a0f34b1ed 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -1,67 +1,79 @@
 {
-	"github":               { "message": "Forker Wappalyzer sur GitHub!" },
-	"noAppsDetected":       { "message": "Pas d'applications détectées." },
-	"nothingToDo":          { "message": "Rien à faire ici." },
-	"optionTracking":       { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" },
-	"optionUpgradeMessage": { "message": "M'afficher les mises à jour" },
-	"optionDynamicIcon":    { "message": "Utiliser l'icône de l'application au lieu du logo Wappalyzer" },
-	"options":              { "message": "Options" },
-	"optionsSave":          { "message": "Sauvegarder les options" },
-	"optionsSaved":         { "message": "Sauvegardé" },
-	"twitter":              { "message": "Suivre Wappalyzer sur Twitter" },
-	"website":              { "message": "Aller sur wappalyzer.com" },
-	"categoryName1":        { "message": "CMS" },
-	"categoryName2":        { "message": "Forum" },
-	"categoryName3":        { "message": "Gestionnaire de base de données" },
-	"categoryName4":        { "message": "Outil de documentation" },
-	"categoryName5":        { "message": "Widget" },
-	"categoryName6":        { "message": "Boutique en ligne" },
-	"categoryName7":        { "message": "Galerie photo" },
-	"categoryName8":        { "message": "Wiki" },
-	"categoryName9":        { "message": "Gestionnaires de serveur" },
-	"categoryName10":       { "message": "Outil de statistiques" },
-	"categoryName11":       { "message": "Blog" },
-	"categoryName12":       { "message": "Framework JavaScript" },
-	"categoryName13":       { "message": "Outil de suivi de problèmes" },
-	"categoryName14":       { "message": "Lecteur de vidéos" },
-	"categoryName15":       { "message": "Système de commentaires" },
-	"categoryName16":       { "message": "Captcha" },
-	"categoryName17":       { "message": "Script de police" },
-	"categoryName18":       { "message": "Framework web" },
-	"categoryName19":       { "message": "Divers" },
-	"categoryName20":       { "message": "Editeur" },
-	"categoryName21":       { "message": "LMS" },
-	"categoryName22":       { "message": "Serveur web" },
-	"categoryName23":       { "message": "Outil de cache" },
-	"categoryName24":       { "message": "Editeur WYSIWYG" },
-	"categoryName25":       { "message": "Graphismes JavaScript" },
-	"categoryName26":       { "message": "Framework pour mobiles" },
-	"categoryName27":       { "message": "Langage de programmation" },
-	"categoryName28":       { "message": "Système d'exploitation" },
-	"categoryName29":       { "message": "Moteur de recherche" },
-	"categoryName30":       { "message": "Web Mail" },
-	"categoryName31":       { "message": "CDN" },
-	"categoryName32":       { "message": "Logiciel de marketing" },
-	"categoryName33":       { "message": "Extension de serveur web" },
-	"categoryName34":       { "message": "Base de données" },
-	"categoryName35":       { "message": "Carte" },
-	"categoryName36":       { "message": "Régie publicitaire" },
-	"categoryName37":       { "message": "Périphérique réseau" },
-	"categoryName38":       { "message": "Serveur multimédia" },
-	"categoryName39":       { "message": "Webcam" },
-	"categoryName40":       { "message": "Imprimante" },
-	"categoryName41":       { "message": "Service de paiement" },
-	"categoryName42":       { "message": "Tag Manager" },
-	"categoryName43":       { "message": "Paywall" },
-	"categoryName44":       { "message": "Système CI" },
-	"categoryName45":       { "message": "Système SCADA" },
-	"categoryName46":       { "message": "Accès à distance" },
-	"categoryName47":       { "message": "Outil de développement" },
-	"categoryName48":       { "message": "Stockage réseau" },
-	"categoryName49":       { "message": "Lecteur RSS" },
-	"categoryName50":       { "message": "Système de gestion de documents" },
-	"categoryName51":       { "message": "Landing Page Builder" },
-	"categoryName52":       { "message": "Chat en direct" },
-	"categoryName53":       { "message": "CRM" },
-  "categoryName54":       { "message": "SEO" }
+	"github":                   { "message": "Forker Wappalyzer sur GitHub!" },
+	"noAppsDetected":           { "message": "Pas d'applications détectées." },
+	"nothingToDo":              { "message": "Rien à faire ici." },
+	"optionTracking":           { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" },
+	"optionUpgradeMessage":     { "message": "M'afficher les mises à jour" },
+	"optionDynamicIcon":        { "message": "Utiliser l'icône de l'application au lieu du logo Wappalyzer" },
+	"options":                  { "message": "Options" },
+	"optionsSave":              { "message": "Sauvegarder les options" },
+	"optionsSaved":             { "message": "Sauvegardé" },
+	"twitter":                  { "message": "Suivre Wappalyzer sur Twitter" },
+	"website":                  { "message": "Aller sur wappalyzer.com" },
+	"categoryPin":              { "message": " Toujours afficher l'icône" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Forum" },
+	"categoryName3":            { "message": "Gestionnaire de base de données" },
+	"categoryName4":            { "message": "Outil de documentation" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "Boutique en ligne" },
+	"categoryName7":            { "message": "Galerie photo" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Gestionnaires de serveur" },
+	"categoryName10":           { "message": "Outil de statistiques" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework JavaScript" },
+	"categoryName13":           { "message": "Outil de suivi de problèmes" },
+	"categoryName14":           { "message": "Lecteur de vidéos" },
+	"categoryName15":           { "message": "Système de commentaires" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Script de police" },
+	"categoryName18":           { "message": "Framework web" },
+	"categoryName19":           { "message": "Divers" },
+	"categoryName20":           { "message": "Éditeur" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Serveur web" },
+	"categoryName23":           { "message": "Outil de cache" },
+	"categoryName24":           { "message": "Éditeur WYSIWYG" },
+	"categoryName25":           { "message": "Graphismes JavaScript" },
+	"categoryName26":           { "message": "Framework pour mobiles" },
+	"categoryName27":           { "message": "Langage de programmation" },
+	"categoryName28":           { "message": "Système d'exploitation" },
+	"categoryName29":           { "message": "Moteur de recherche" },
+	"categoryName30":           { "message": "Webmail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Logiciel de marketing" },
+	"categoryName33":           { "message": "Extension de serveur web" },
+	"categoryName34":           { "message": "Base de données" },
+	"categoryName35":           { "message": "Carte" },
+	"categoryName36":           { "message": "Régie publicitaire" },
+	"categoryName37":           { "message": "Périphérique réseau" },
+	"categoryName38":           { "message": "Serveur multimédia" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Imprimante" },
+	"categoryName41":           { "message": "Service de paiement" },
+	"categoryName42":           { "message": "Gestionnaire de balises" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Système CI" },
+	"categoryName45":           { "message": "Système SCADA" },
+	"categoryName46":           { "message": "Accès à distance" },
+	"categoryName47":           { "message": "Outil de développement" },
+	"categoryName48":           { "message": "Stockage réseau" },
+	"categoryName49":           { "message": "Lecteur de flux RSS" },
+	"categoryName51":           { "message": "Créateur de Landing Page" },
+	"categoryName50":           { "message": "Système de gestion de documents" },
+	"categoryName52":           { "message": "Chat en direct" },
+	"categoryName53":           { "message": "CRM" },
+	"categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Comptabilité" },
+	"categoryName56":           { "message": "Crypto-mineur" },
+	"categoryName57":           { "message": "Générateur de site statique" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index 94f09b33c..4ea87768e 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
 	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
 	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
@@ -59,5 +62,14 @@
 	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index dbd63b630..e0b350859 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Secara anonim kirimkan laporan tentang aplikasi yang terdeteksi ke wappalyzer.com untuk penelitian" },
 	"nothingToDo":              { "message": "Tak ada yang dilakukan disini." },
 	"noAppsDetected":           { "message": "Tidak ada aplikasi yang terdeteksi." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "Sistem Pengelola Konten" },
 	"categoryName2":            { "message": "Papan Pesan" },
 	"categoryName3":            { "message": "Pengelola Basis Data" },
@@ -63,5 +66,14 @@
 	"categoryName51":           { "message": "Pembuat Laman Landas" },
 	"categoryName52":           { "message": "Chat Langsung" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index ac5aef344..7fba4c39d 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Inviare anonimamente un report sulle applicazioni rilevate a wappalyzer.com per l'analisi" },
 	"nothingToDo":              { "message": "Niente da fare qui." },
 	"noAppsDetected":           { "message": "Nessuna applicazione rilevata." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Gestore di Database" },
@@ -63,6 +66,14 @@
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
-
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index 4a8586c40..e6eb2720f 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Przesyłaj anonimowe statystyki aplikacji wykrytych przez Wappalyzer do twórców" },
 	"nothingToDo":              { "message": "Nic tu nie ma." },
 	"noAppsDetected":           { "message": "Nie wykryto żadnych aplikacji." },
+  "categoryPin":              { "message": "Zawsze pokazuj tą ikonę" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "System zarządzania treścią" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "Menedżer baz danych" },
@@ -64,5 +67,13 @@
 	"categoryName52":           { "message": "Czat na żywo" },
 	"categoryName53":           { "message": "Zarządzanie relacjami z klientami" },
 	"categoryName54":           { "message": "SEO" },
-	"categoryName55":           { "message": "Księgowość" }
+	"categoryName55":           { "message": "Księgowość" },
+	"categoryName56":           { "message": "Koparka kryptowalut" },
+	"categoryName57":           { "message": "Generator stron statycznych" },
+	"categoryName58":           { "message": "Wdrażanie użytkownika" },
+	"categoryName59":           { "message": "Biblioteki JavaScript" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json
index 3ae506ade..e4ab9fb3c 100644
--- a/src/drivers/webextension/_locales/pt/messages.json
+++ b/src/drivers/webextension/_locales/pt/messages.json
@@ -1,67 +1,79 @@
 {
-	"github":               { "message": "Fork Wappalyzer no GitHub!" },
-	"noAppsDetected":       { "message": "Não foi detetada nenhuma apliação." },
-	"nothingToDo":          { "message": "Nada a fazer aqui." },
-	"optionTracking":       { "message": "Enviar anonimamente relatorios sobre as apliações detetadas ao wappalyzer.com para investigação" },
-	"optionUpgradeMessage": { "message": "Atualizações automaticas" },
-	"optionDynamicIcon":    { "message": "Utilizar o icone da aplicação em vez do logotido do Wappalyzer" },
-	"options":              { "message": "Definições" },
-	"optionsSave":          { "message": "Guardar as opções" },
-	"optionsSaved":         { "message": "Guardado" },
-	"twitter":              { "message": "Seguir o Wappalyzer no Twitter" },
-	"website":              { "message": "Ir para wappalyzer.com" },
-	"categoryName1":        { "message": "Sistema de gerenciamento de conteudo(CMS)" },
-	"categoryName2":        { "message": "Forum" },
-	"categoryName3":        { "message": "Gestor de base de dados" },
-	"categoryName4":        { "message": "Ferramenta de documentação" },
-	"categoryName5":        { "message": "Widget" },
-	"categoryName6":        { "message": "Loja online" },
-	"categoryName7":        { "message": "Galeria de fotografias" },
-	"categoryName8":        { "message": "Wiki" },
-	"categoryName9":        { "message": "Gestor de servidores" },
-	"categoryName10":       { "message": "Ferramenta de estatisticas" },
-	"categoryName11":       { "message": "Blog" },
-	"categoryName12":       { "message": "Framework JavaScript" },
-	"categoryName13":       { "message": "Ferramenta de seguimento de problemas" },
-	"categoryName14":       { "message": "Leitor de videos" },
-	"categoryName15":       { "message": "Sistemas de comentários" },
-	"categoryName16":       { "message": "Captcha" },
-	"categoryName17":       { "message": "Script de policia" },
-	"categoryName18":       { "message": "Framework WEB" },
-	"categoryName19":       { "message": "Diversos" },
-	"categoryName20":       { "message": "Editor" },
-	"categoryName21":       { "message": "Sistema de gestão de Aprendizagem(LMS)" },
-	"categoryName22":       { "message": "Servidor WEB" },
-	"categoryName23":       { "message": "Ferramenta de cache" },
-	"categoryName24":       { "message": "Editor WYSIWYG" },
-	"categoryName25":       { "message": "Grafismo JavaScript" },
-	"categoryName26":       { "message": "Framework para dispositivos mobile" },
-	"categoryName27":       { "message": "Linguagem de programação" },
-	"categoryName28":       { "message": "Sistema Operativo" },
-	"categoryName29":       { "message": "Motor de pesquisa" },
-	"categoryName30":       { "message": "WebMail" },
-	"categoryName31":       { "message": "Rede de distribuição de conteudo(CDN)" },
-	"categoryName32":       { "message": "Sistema de vendas" },
-	"categoryName33":       { "message": "Extensão do servidor WEB" },
-	"categoryName34":       { "message": "Base de dados" },
-	"categoryName35":       { "message": "Mapa" },
-	"categoryName36":       { "message": "Rede de publicidade" },
-	"categoryName37":       { "message": "Dispositivo de rede" },
-	"categoryName38":       { "message": "Servidor multimédia" },
-	"categoryName39":       { "message": "Webcam" },
-	"categoryName40":       { "message": "Impressora" },
-	"categoryName41":       { "message": "Serviço de pagamento" },
-	"categoryName42":       { "message": "Gestor de Tags" },
-	"categoryName43":       { "message": "Sistema de assinaturas paga(Paywall)" },
-	"categoryName44":       { "message": "Sistema CI" },
-	"categoryName45":       { "message": "Sistema SCADA" },
-	"categoryName46":       { "message": "Acesso à distancia" },
-	"categoryName47":       { "message": "Ferramenta de desenvolvimento" },
-	"categoryName48":       { "message": "Rede de armazenamento" },
-	"categoryName49":       { "message": "Leitor RSS" },
-	"categoryName50":       { "message": "Sistema de gestão de documentos" },
-	"categoryName51":       { "message": "Landing Page Builder" },
-	"categoryName52":       { "message": "Chat em direto" },
-	"categoryName53":       { "message": "Sistemas de relação com o cliente(CRM)" },
-  "categoryName54":       { "message": "Otimização para motores de pesquisa(SEO)" }
+  "github":                   { "message": "Fork Wappalyzer no GitHub!" },
+  "noAppsDetected":           { "message": "Não foi detectada nenhuma tecnologia." },
+  "nothingToDo":              { "message": "Nada a fazer aqui." },
+  "optionDynamicIcon":        { "message": "Utilizar o ícone da tecnologia em vez do logótipo do Wappalyzer" },
+  "optionTracking":           { "message": "Envie anonimamente tecnologias identificadas para wappalyzer.com" },
+  "optionUpgradeMessage":     { "message": "Fale-me sobre actualizações" },
+  "options":                  { "message": "Opções" },
+  "optionsSave":              { "message": "Opções de Guardar" },
+  "optionsSaved":             { "message": "Guardado" },
+  "twitter":                  { "message": "Seguir Wappalyzer no Twitter" },
+  "website":                  { "message": "Ir para wappalyzer.com" },
+  "categoryPin":              { "message": "Mostrar sempre ícone" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "categoryName1":            { "message": "CMS" },
+  "categoryName2":            { "message": "Fórum" },
+  "categoryName3":            { "message": "Gestor de Base de Dados" },
+  "categoryName4":            { "message": "Ferramenta de Documentação" },
+  "categoryName5":            { "message": "Widget" },
+  "categoryName6":            { "message": "Comércio Eletrónico" },
+  "categoryName7":            { "message": "Galeria de Fotos" },
+  "categoryName8":            { "message": "Wikis" },
+  "categoryName9":            { "message": "Painéis de Hospedagem" },
+  "categoryName10":           { "message": "Analítica" },
+  "categoryName11":           { "message": "Blog" },
+  "categoryName12":           { "message": "Framework JavaScript" },
+  "categoryName13":           { "message": "Rastreador de Problemas" },
+  "categoryName14":           { "message": "Leitor Vídeo" },
+  "categoryName15":           { "message": "Sistema de Comentários" },
+  "categoryName16":           { "message": "Captcha" },
+  "categoryName17":           { "message": "Script de Tipos de Letra" },
+  "categoryName18":           { "message": "Framework Web" },
+  "categoryName19":           { "message": "Diversos" },
+  "categoryName20":           { "message": "Editor" },
+  "categoryName21":           { "message": "LMS" },
+  "categoryName22":           { "message": "Servidor Web" },
+  "categoryName23":           { "message": "Ferramenta de Cache" },
+  "categoryName24":           { "message": "Editor WYSIWYG" },
+  "categoryName25":           { "message": "Gráficos JavaScript" },
+  "categoryName26":           { "message": "Framework Mobile" },
+  "categoryName27":           { "message": "Linguagem de Programação" },
+  "categoryName28":           { "message": "Sistema Operativo" },
+  "categoryName29":           { "message": "Motor de Busca" },
+  "categoryName30":           { "message": "Web Mail" },
+  "categoryName31":           { "message": "CDN" },
+  "categoryName32":           { "message": "Automação de Marketing" },
+  "categoryName33":           { "message": "Extensão de Servidor Web" },
+  "categoryName34":           { "message": "Base de Dados" },
+  "categoryName35":           { "message": "Mapa" },
+  "categoryName36":           { "message": "Rede de Publicidade" },
+  "categoryName37":           { "message": "Serviço de Rede" },
+  "categoryName38":           { "message": "Servidor de Média" },
+  "categoryName39":           { "message": "Webcam" },
+  "categoryName40":           { "message": "Impressão" },
+  "categoryName41":           { "message": "Processador de Pagamento" },
+  "categoryName42":           { "message": "Gestor de Etiquetas" },
+  "categoryName43":           { "message": "Sistema de Subscrição Paga" },
+  "categoryName44":           { "message": "Sistema Build/CI" },
+  "categoryName45":           { "message": "Sistema SCADA" },
+  "categoryName46":           { "message": "Acesso Remoto" },
+  "categoryName47":           { "message": "Ferramenta de Desenvolvimento" },
+  "categoryName48":           { "message": "Rede de Armazenamento" },
+  "categoryName49":           { "message": "Leitores de Feed" },
+  "categoryName50":           { "message": "Sistema de Gestão de Documentos" },
+  "categoryName51":           { "message": "Criador de Páginas de Destino" },
+  "categoryName52":           { "message": "Chat ao Vivo" },
+  "categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Contabilidade" },
+  "categoryName56":           { "message": "Cryptominer" },
+  "categoryName57":           { "message": "Gerador de Site Estático" },
+  "categoryName58":           { "message": "User Onboarding" },
+  "categoryName59":           { "message": "JavaScript Libraries" },
+  "categoryName60":           { "message": "Containers" },
+  "categoryName61":           { "message": "SaaS" },
+  "categoryName62":           { "message": "PaaS" },
+  "categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
new file mode 100644
index 000000000..085701851
--- /dev/null
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -0,0 +1,79 @@
+{
+	"github":                   { "message": "Fork Wappalyzer no GitHub!" },
+	"twitter":                  { "message": "Seguir o Wappalyzer no Twitter" },
+	"website":                  { "message": "Ir para wappalyzer.com" },
+	"options":                  { "message": "Configurações" },
+	"optionsSave":              { "message": "Salvar configurações" },
+	"optionsSaved":             { "message": "Salvo" },
+	"optionUpgradeMessage":     { "message": "Atualizações automáticas" },
+	"optionDynamicIcon":        { "message": "Utilizar o ícone da tecnologia ao invés da logo do Wappalyzer" },
+	"optionTracking":           { "message": "Enviar relatórios anônimos para wappalyzer.com sobre tecnologias identificadas" },
+	"nothingToDo":              { "message": "Nada a fazer aqui." },
+	"noAppsDetected":           { "message": "Nenhuma tecnologia identificada." },
+  "categoryPin":              { "message": "Sempre mostrar ícone" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Fórum" },
+	"categoryName3":            { "message": "Gestão de banco de dados" },
+	"categoryName4":            { "message": "Ferramenta de documentação" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "Ecommerce" },
+	"categoryName7":            { "message": "Galeria de fotografias" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Gestão de servidores" },
+	"categoryName10":           { "message": "Ferramenta estatística" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework JavaScript" },
+	"categoryName13":           { "message": "Rastreamento de problemas" },
+	"categoryName14":           { "message": "Reprodutor de vídeo" },
+	"categoryName15":           { "message": "Sistema de comentários" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Script de fonte" },
+	"categoryName18":           { "message": "Framework web" },
+	"categoryName19":           { "message": "Diversos" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Servidor web" },
+	"categoryName23":           { "message": "Ferramenta de cache" },
+	"categoryName24":           { "message": "Editor WYSIWYG" },
+	"categoryName25":           { "message": "Gráfico JavaScript" },
+	"categoryName26":           { "message": "Framework mobile" },
+	"categoryName27":           { "message": "Linguagem de programação" },
+	"categoryName28":           { "message": "Sistema Operacional" },
+	"categoryName29":           { "message": "Motor de pesquisa" },
+	"categoryName30":           { "message": "Web Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Automação de marketing" },
+	"categoryName33":           { "message": "Extensão de servidor web" },
+	"categoryName34":           { "message": "Banco de dados" },
+	"categoryName35":           { "message": "Mapa" },
+	"categoryName36":           { "message": "Rede de publicidade" },
+	"categoryName37":           { "message": "Serviço de rede" },
+	"categoryName38":           { "message": "Servidor de mídia" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Impressora" },
+	"categoryName41":           { "message": "Serviço de pagamento" },
+	"categoryName42":           { "message": "Gestor de Tags" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Sistema de Build/CI" },
+	"categoryName45":           { "message": "Sistema SCADA" },
+	"categoryName46":           { "message": "Acesso remoto" },
+	"categoryName47":           { "message": "Ferramenta de desenvolvimento" },
+	"categoryName48":           { "message": "Armazenamento na rede" },
+	"categoryName49":           { "message": "Leitor de feed" },
+	"categoryName50":           { "message": "Sistema de gestão de documentos" },
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Chat direto" },
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Contabilidade" },
+	"categoryName56":           { "message": "Minerador de cryptomoedas" },
+	"categoryName57":           { "message": "Gerador de sites estáticos" },
+	"categoryName58":           { "message": "Integração com usuário" },
+	"categoryName59":           { "message": "Biblioteca JavaScript" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
+}
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index 4723810c0..09ef0b8b5 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare" },
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
 	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
+  "categoryPin":              { "message": "Afișează icon tot timpul" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Forum de discuții" },
 	"categoryName3":            { "message": "Manager baze de date" },
@@ -60,5 +63,13 @@
 	"categoryName52":           { "message": "Chat Live" },
 	"categoryName53":           { "message": "CRM" },
   "categoryName54":           { "message": "SEO" },
-  "categoryName55":           { "message": "Contabilitate" }
+  "categoryName55":           { "message": "Accounting" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 8f22b3a5b..5e165a189 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -1,67 +1,79 @@
 {
-  "categoryName1" : { "message" : "CMS" },
-  "categoryName2" : { "message" : "Форум" },
-  "categoryName3" : { "message" : "Менеджер БД" },
-  "categoryName4" : { "message" : "Документация" },
-  "categoryName5" : { "message" : "Виджет" },
-  "categoryName6" : { "message" : "Электронная коммерция" },
-  "categoryName7" : { "message" : "Фотогалерея" },
-  "categoryName8" : { "message" : "Вики" },
-  "categoryName9" : { "message" : "Панель управления хостингом" },
-  "categoryName10" : { "message" : "Аналитика" },
-  "categoryName11" : { "message" : "Блог" },
-  "categoryName12" : { "message" : "JS фреймворк" },
-  "categoryName13" : { "message" : "Баг трекер" },
-  "categoryName14" : { "message" : "Видео плеер" },
-  "categoryName15" : { "message" : "Система комментариев" },
-  "categoryName16" : { "message" : "Капча" },
-  "categoryName17" : { "message" : "Шрифт" },
-  "categoryName18" : { "message" : "Веб фреймворк" },
-  "categoryName19" : { "message" : "Прочее" },
-  "categoryName20" : { "message" : "HTML редактор" },
-  "categoryName21" : { "message" : "LMS" },
-  "categoryName22" : { "message" : "Веб сервер" },
-  "categoryName23" : { "message" : "Кеширование" },
-  "categoryName24" : { "message" : "WYSIWYG редактор" },
-  "categoryName25" : { "message" : "JS графика" },
-  "categoryName26" : { "message" : "Мобильный фреймворк" },
-  "categoryName27" : { "message" : "Язык программирования" },
-  "categoryName28" : { "message" : "Операционная система" },
-  "categoryName29" : { "message" : "Поисковый движок" },
-  "categoryName30" : { "message" : "Веб почта" },
-  "categoryName31" : { "message" : "CDN" },
-  "categoryName32" : { "message" : "Управление маркетингом" },
-  "categoryName33" : { "message" : "Расширение Веб сервера" },
-  "categoryName34" : { "message" : "База данных" },
-  "categoryName35" : { "message" : "Карта" },
-  "categoryName36" : { "message" : "Рекламная сеть" },
-  "categoryName37" : { "message" : "Сетевая служба" },
-  "categoryName38" : { "message" : "Медиа сервер" },
-  "categoryName39" : { "message" : "Вебкамера" },
-  "categoryName40" : { "message" : "Принтер" },
-  "categoryName41" : { "message" : "Платёжная система" },
-  "categoryName42" : { "message" : "Менеджер тэгов" },
-  "categoryName43" : { "message" : "Paywall" },
-  "categoryName44" : { "message" : "Система непрерывной интеграции" },
-  "categoryName45" : { "message" : "Система SCADA" },
-  "categoryName46" : { "message" : "Удаленное управление" },
-  "categoryName47" : { "message" : "Утилита для разработчиков" },
-  "categoryName48" : { "message" : "Сетевое хранилище" },
-  "categoryName49" : { "message" : "Граббер контента" },
-  "categoryName50" : { "message" : "Управление документами" },
-  "categoryName51" : { "message": "Генератор лендингов" },
-  "categoryName52" : { "message": "Live Chat" },
-  "categoryName53" : { "message": "CRM" },
-  "github" : { "message" : "Форкнуть на GitHub!" },
-  "noAppsDetected" : { "message" : "Нет данных о сайте" },
-  "nothingToDo" : { "message" : "Тут нечего искать" },
-  "optionTracking" : { "message" : "Анонимно отправлять статистику распознанных данных на сервер (для исследований)" },
-  "optionDynamicIcon" : { "message": "Использовать значок приложения вместо логотипа Wappalyzer" },
-  "optionUpgradeMessage" : { "message" : "Оповещать меня об обновлениях" },
-  "options" : { "message" : "Настройки" },
-  "optionsSave" : { "message" : "Сохранить" },
-  "optionsSaved" : { "message" : "Успешно сохранено!" },
-  "twitter" : { "message" : "Следите за новостями в Твиттере" },
-  "website" : { "message" : "Перейти на Wappalyzer.com" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName1":            { "message": "CMS" },
+  "categoryName2":            { "message": "Форум" },
+  "categoryName3":            { "message": "Менеджер БД" },
+  "categoryName4":            { "message": "Документация" },
+  "categoryName5":            { "message": "Виджет" },
+  "categoryName6":            { "message": "Электронная коммерция" },
+  "categoryName7":            { "message": "Фотогалерея" },
+  "categoryName8":            { "message": "Вики" },
+  "categoryName9":            { "message": "Панель управления хостингом" },
+  "categoryName10":           { "message": "Аналитика" },
+  "categoryName11":           { "message": "Блог" },
+  "categoryName12":           { "message": "JS фреймворк" },
+  "categoryName13":           { "message": "Баг трекер" },
+  "categoryName14":           { "message": "Видео плеер" },
+  "categoryName15":           { "message": "Система комментариев" },
+  "categoryName16":           { "message": "Капча" },
+  "categoryName17":           { "message": "Шрифт" },
+  "categoryName18":           { "message": "Веб фреймворк" },
+  "categoryName19":           { "message": "Прочее" },
+  "categoryName20":           { "message": "HTML редактор" },
+  "categoryName21":           { "message": "LMS" },
+  "categoryName22":           { "message": "Веб сервер" },
+  "categoryName23":           { "message": "Кеширование" },
+  "categoryName24":           { "message": "WYSIWYG редактор" },
+  "categoryName25":           { "message": "JS графика" },
+  "categoryName26":           { "message": "Мобильный фреймворк" },
+  "categoryName27":           { "message": "Язык программирования" },
+  "categoryName28":           { "message": "Операционная система" },
+  "categoryName29":           { "message": "Поисковый движок" },
+  "categoryName30":           { "message": "Веб почта" },
+  "categoryName31":           { "message": "CDN" },
+  "categoryName32":           { "message": "Управление маркетингом" },
+  "categoryName33":           { "message": "Расширение Веб сервера" },
+  "categoryName34":           { "message": "База данных" },
+  "categoryName35":           { "message": "Карта" },
+  "categoryName36":           { "message": "Рекламная сеть" },
+  "categoryName37":           { "message": "Сетевая служба" },
+  "categoryName38":           { "message": "Медиа сервер" },
+  "categoryName39":           { "message": "Вебкамера" },
+  "categoryName40":           { "message": "Принтер" },
+  "categoryName41":           { "message": "Платёжная система" },
+  "categoryName42":           { "message": "Менеджер тэгов" },
+  "categoryName43":           { "message": "Paywall" },
+  "categoryName44":           { "message": "Система непрерывной интеграции" },
+  "categoryName45":           { "message": "Система SCADA" },
+  "categoryName46":           { "message": "Удаленное управление" },
+  "categoryName47":           { "message": "Утилита для разработчиков" },
+  "categoryName48":           { "message": "Сетевое хранилище" },
+  "categoryName49":           { "message": "Граббер контента" },
+  "categoryName50":           { "message": "Управление документами" },
+  "categoryName51":           { "message": "Генератор лендингов" },
+  "categoryName52":           { "message": "Live Chat" },
+  "categoryName53":           { "message": "CRM" },
+  "github":                   { "message": "Форкнуть на GitHub!" },
+  "noAppsDetected":           { "message": "Нет данных о сайте" },
+  "nothingToDo":              { "message": "Тут нечего искать" },
+  "optionTracking":           { "message": "Анонимно отправлять статистику распознанных данных на сервер (для исследований)" },
+  "optionDynamicIcon":        { "message": "Использовать значок приложения вместо логотипа Wappalyzer" },
+  "optionUpgradeMessage":     { "message": "Оповещать меня об обновлениях" },
+  "options":                  { "message": "Настройки" },
+  "optionsSave":              { "message": "Сохранить" },
+  "optionsSaved":             { "message": "Успешно сохранено!" },
+  "twitter":                  { "message": "Следите за новостями в Твиттере" },
+  "website":                  { "message": "Перейти на Wappalyzer.com" },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Бухгалтерский учёт" },
+	"categoryName56":           { "message": "Криптомайнер" },
+	"categoryName57":           { "message": "Генератор статических сайтов" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index 4168472d7..96eec610c 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -1,67 +1,79 @@
 {
-    "github":                   { "message": "Forknite Wappalyzer na GitHube!" },
-    "twitter":                  { "message": "Sledujte Wappalyzer na Twitteri" },
-    "website":                  { "message": "Prejdite na adresu wappalyzer.com" },
-    "options":                  { "message": "Možnosti" },
-    "optionsSave":              { "message": "Uložiť možnosti" },
-    "optionsSaved":             { "message": "Uložené" },
-    "optionUpgradeMessage":     { "message": "Povedzte mi o upgradoch" },
-    "optionDynamicIcon":        { "message": "Použiť ikonu aplikácie namiesto loga Wappalyzer" },
-    "optionTracking":           { "message": "Anonymne posielať správy o zistených aplikáciách na wappalyzer.com pre výskum" },
-    "nothingToDo":              { "message": "Nie je tu čo robiť." },
-    "noAppsDetected":           { "message": "Žiadne aplikácie neboli zistené." },
-    "categoryName1":            { "message": "CMS" },
-    "categoryName2":            { "message": "Message Board" },
-    "categoryName3":            { "message": "Správca databáz" },
-    "categoryName4":            { "message": "Dokumentačný nástroj" },
-    "categoryName5":            { "message": "Widget" },
-    "categoryName6":            { "message": "E-commerce" },
-    "categoryName7":            { "message": "Fotogalérie" },
-    "categoryName8":            { "message": "Wiki" },
-    "categoryName9":            { "message": "Hosting panely" },
-    "categoryName10":           { "message": "Analytika" },
-    "categoryName11":           { "message": "Blog" },
-    "categoryName12":           { "message": "JavaScript Framework" },
-    "categoryName13":           { "message": "Issue Tracker" },
-    "categoryName14":           { "message": "Video prehrávač" },
-    "categoryName15":           { "message": "Systém komentárov" },
-    "categoryName16":           { "message": "Captcha" },
-    "categoryName17":           { "message": "Font Script" },
-    "categoryName18":           { "message": "Web Framework" },
-    "categoryName19":           { "message": "Rôzne" },
-    "categoryName20":           { "message": "Editor" },
-    "categoryName21":           { "message": "LMS" },
-    "categoryName22":           { "message": "Webový server" },
-    "categoryName23":           { "message": "Cache nástroj" },
-    "categoryName24":           { "message": "Rich Text editor" },
-    "categoryName25":           { "message": "JavaScript Grafika" },
-    "categoryName26":           { "message": "Mobile Framework" },
-    "categoryName27":           { "message": "Programovací jazyk" },
-    "categoryName28":           { "message": "Operačný systém" },
-    "categoryName29":           { "message": "Vyhľadávač" },
-    "categoryName30":           { "message": "Webmail" },
-    "categoryName31":           { "message": "CDN" },
-    "categoryName32":           { "message": "Marketingová automatizácia" },
-    "categoryName33":           { "message": "Rozšírenie webového servera" },
-    "categoryName34":           { "message": "Databáza" },
-    "categoryName35":           { "message": "Mapa" },
-    "categoryName36":           { "message": "Reklamná sieť" },
-    "categoryName37":           { "message": "Sieťová služba" },
-    "categoryName38":           { "message": "Media Server" },
-    "categoryName39":           { "message": "Webkamera" },
-    "categoryName40":           { "message": "Tlačiareň" },
-    "categoryName41":           { "message": "Platobný procesor" },
-    "categoryName42":           { "message": "Správca tagov" },
-    "categoryName43":           { "message": "Platobná brána" },
-    "categoryName44":           { "message": "Build/CI systém" },
-    "categoryName45":           { "message": "SCADA systém" },
-    "categoryName46":           { "message": "Vzdialený prístup" },
-    "categoryName47":           { "message": "Vývojový nástroj" },
-    "categoryName48":           { "message": "Sieťové úložisko" },
-    "categoryName49":           { "message": "Čítačky feedu" },
-    "categoryName50":           { "message": "Systémy správy dokumentov" },
-    "categoryName51":           { "message": "Nástroj na tvorbu vstupnej stránky" },
-    "categoryName52":           { "message": "Živý chat" },
-    "categoryName53":           { "message": "CRM" },
-    "categoryName54":           { "message": "SEO" }
+  "github":                   { "message": "Forknite Wappalyzer na GitHube!" },
+  "twitter":                  { "message": "Sledujte Wappalyzer na Twitteri" },
+  "website":                  { "message": "Prejdite na adresu wappalyzer.com" },
+  "options":                  { "message": "Možnosti" },
+  "optionsSave":              { "message": "Uložiť možnosti" },
+  "optionsSaved":             { "message": "Uložené" },
+  "optionUpgradeMessage":     { "message": "Povedzte mi o upgradoch" },
+  "optionDynamicIcon":        { "message": "Použiť ikonu aplikácie namiesto loga Wappalyzer" },
+  "optionTracking":           { "message": "Anonymne posielať správy o zistených aplikáciách na wappalyzer.com pre výskum" },
+  "nothingToDo":              { "message": "Nie je tu čo robiť." },
+  "noAppsDetected":           { "message": "Žiadne aplikácie neboli zistené." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "categoryName1":            { "message": "CMS" },
+  "categoryName2":            { "message": "Message Board" },
+  "categoryName3":            { "message": "Správca databáz" },
+  "categoryName4":            { "message": "Dokumentačný nástroj" },
+  "categoryName5":            { "message": "Widget" },
+  "categoryName6":            { "message": "E-commerce" },
+  "categoryName7":            { "message": "Fotogalérie" },
+  "categoryName8":            { "message": "Wiki" },
+  "categoryName9":            { "message": "Hosting panely" },
+  "categoryName10":           { "message": "Analytika" },
+  "categoryName11":           { "message": "Blog" },
+  "categoryName12":           { "message": "JavaScript Framework" },
+  "categoryName13":           { "message": "Issue Tracker" },
+  "categoryName14":           { "message": "Video prehrávač" },
+  "categoryName15":           { "message": "Systém komentárov" },
+  "categoryName16":           { "message": "Captcha" },
+  "categoryName17":           { "message": "Font Script" },
+  "categoryName18":           { "message": "Web Framework" },
+  "categoryName19":           { "message": "Rôzne" },
+  "categoryName20":           { "message": "Editor" },
+  "categoryName21":           { "message": "LMS" },
+  "categoryName22":           { "message": "Webový server" },
+  "categoryName23":           { "message": "Cache nástroj" },
+  "categoryName24":           { "message": "Rich Text editor" },
+  "categoryName25":           { "message": "JavaScript Grafika" },
+  "categoryName26":           { "message": "Mobile Framework" },
+  "categoryName27":           { "message": "Programovací jazyk" },
+  "categoryName28":           { "message": "Operačný systém" },
+  "categoryName29":           { "message": "Vyhľadávač" },
+  "categoryName30":           { "message": "Webmail" },
+  "categoryName31":           { "message": "CDN" },
+  "categoryName32":           { "message": "Marketingová automatizácia" },
+  "categoryName33":           { "message": "Rozšírenie webového servera" },
+  "categoryName34":           { "message": "Databáza" },
+  "categoryName35":           { "message": "Mapa" },
+  "categoryName36":           { "message": "Reklamná sieť" },
+  "categoryName37":           { "message": "Sieťová služba" },
+  "categoryName38":           { "message": "Media Server" },
+  "categoryName39":           { "message": "Webkamera" },
+  "categoryName40":           { "message": "Tlačiareň" },
+  "categoryName41":           { "message": "Platobný procesor" },
+  "categoryName42":           { "message": "Správca tagov" },
+  "categoryName43":           { "message": "Platobná brána" },
+  "categoryName44":           { "message": "Build/CI systém" },
+  "categoryName45":           { "message": "SCADA systém" },
+  "categoryName46":           { "message": "Vzdialený prístup" },
+  "categoryName47":           { "message": "Vývojový nástroj" },
+  "categoryName48":           { "message": "Sieťové úložisko" },
+  "categoryName49":           { "message": "Čítačky feedu" },
+  "categoryName50":           { "message": "Systémy správy dokumentov" },
+  "categoryName51":           { "message": "Nástroj na tvorbu vstupnej stránky" },
+  "categoryName52":           { "message": "Živý chat" },
+  "categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+  "categoryName56":           { "message": "Cryptominer" },
+  "categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
index ffcaeebec..1c886d971 100644
--- a/src/drivers/webextension/_locales/tr/messages.json
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Anonim olarak tespit edilen uygulamalar hakkında wappalyzer.com'a araştırma raporları gönderin" },
 	"nothingToDo":              { "message": "Burada yapacak birşey yok." },
 	"noAppsDetected":           { "message": "Uygulamalar tespit edilemedi." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Mesaj Tahtası" },
 	"categoryName3":            { "message": "Veritabanı Yöneticisi" },
@@ -64,5 +67,13 @@
 	"categoryName52":           { "message": "Canlı Sohbet" },
 	"categoryName53":           { "message": "CRM" },
 	"categoryName54":           { "message": "SEO" },
-	"categoryName55":           { "message": "Muhasebe" }
+	"categoryName55":           { "message": "Muhasebe" },
+	"categoryName56":           { "message": "Cryptominer" },
+	"categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index 243915b3d..2f99dbb8c 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Анонімно надсилати статистику розпізнавань на сервер для досліджень" },
 	"nothingToDo":              { "message": "Тут нічого робити." },
 	"noAppsDetected":           { "message": "Нічого не знайдено." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Форум" },
 	"categoryName3":            { "message": "Менеджер БД" },
@@ -63,5 +66,14 @@
 	"categoryName51":           { "message": "Генератор лендінгів" },
 	"categoryName52":           { "message": "Чат реального часу" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+  "categoryName56":           { "message": "Cryptominer" },
+  "categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
index 1604da917..ae5e62cdb 100644
--- a/src/drivers/webextension/_locales/uz/messages.json
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -10,6 +10,9 @@
 	"optionTracking":           { "message": "Wappalyzer takomillashtirish uchun hisobotlarni maxfiy ravishda serverga jo'natish" },
 	"nothingToDo":              { "message": "Bu yerda tekshirib bolmaydi." },
 	"noAppsDetected":           { "message": "Hech qanday dastur aniqlanmadi." },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
 	"categoryName1":            { "message": "CMS (KBT)" },
 	"categoryName2":            { "message": "Forum" },
 	"categoryName3":            { "message": "MB boshqaruvi" },
@@ -63,5 +66,14 @@
 	"categoryName51":           { "message": "Sahifa generatorlari" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-	"categoryName54":           { "message": "SEO" }
+	"categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Accounting" },
+  "categoryName56":           { "message": "Cryptominer" },
+  "categoryName57":           { "message": "Static Site Generator" },
+	"categoryName58":           { "message": "User Onboarding" },
+	"categoryName59":           { "message": "JavaScript Libraries" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 83e4cafa8..86ba50ca1 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -1,68 +1,79 @@
 {
-    "github":                   { "message": "查看 GitHub 上的 Wappalyzer" },
-    "twitter":                  { "message": "关注 Twitter 上的 Wappalyzer" },
-    "website":                  { "message": "访问 wappalyzer.com" },
-    "options":                  { "message": "选项" },
-    "optionsSave":              { "message": "保存选项" },
-    "optionsSaved":             { "message": "已保存" },
-    "optionUpgradeMessage":     { "message": "通知我更新详情" },
-    "optionDynamicIcon":        { "message": "使用应用程序而非 Wappalyzer 的标志" },
-    "optionTracking":           { "message": "发送匿名的应用报告到 wappalyzer.com 供研究使用" },
-    "nothingToDo":              { "message": "这儿啥也没有。" },
-    "noAppsDetected":           { "message": "未检测到任何应用。" },
-    "categoryName1":            { "message": "内容管理系统（CMS）" },
-    "categoryName2":            { "message": "消息板" },
-    "categoryName3":            { "message": "数据库管理器" },
-    "categoryName4":            { "message": "文档工具" },
-    "categoryName5":            { "message": "插件" },
-    "categoryName6":            { "message": "电子商务" },
-    "categoryName7":            { "message": "照片相册" },
-    "categoryName8":            { "message": "维基" },
-    "categoryName9":            { "message": "主机面板" },
-    "categoryName10":           { "message": "分析" },
-    "categoryName11":           { "message": "博客" },
-    "categoryName12":           { "message": "JavaScript 框架" },
-    "categoryName13":           { "message": "问题跟踪器" },
-    "categoryName14":           { "message": "视频播放器" },
-    "categoryName15":           { "message": "评论系统" },
-    "categoryName16":           { "message": "验证码" },
-    "categoryName17":           { "message": "字体脚本" },
-    "categoryName18":           { "message": "Web 框架" },
-    "categoryName19":           { "message": "杂项" },
-    "categoryName20":           { "message": "编辑器" },
-    "categoryName21":           { "message": "学习管理系统（LMS）" },
-    "categoryName22":           { "message": "Web 服务器" },
-    "categoryName23":           { "message": "缓存工具" },
-    "categoryName24":           { "message": "富文本编辑器" },
-    "categoryName25":           { "message": "JavaScript 图形库" },
-    "categoryName26":           { "message": "移动框架" },
-    "categoryName27":           { "message": "编程语言" },
-    "categoryName28":           { "message": "操作系统" },
-    "categoryName29":           { "message": "搜索引擎" },
-    "categoryName30":           { "message": "网页邮箱" },
-    "categoryName31":           { "message": "内容分发网络（CDN）" },
-    "categoryName32":           { "message": "营销自动化" },
-    "categoryName33":           { "message": "Web 服务器扩展" },
-    "categoryName34":           { "message": "数据库" },
-    "categoryName35":           { "message": "地图" },
-    "categoryName36":           { "message": "广告网络" },
-    "categoryName37":           { "message": "网络服务" },
-    "categoryName38":           { "message": "媒体服务器" },
-    "categoryName39":           { "message": "网络摄像头" },
-    "categoryName40":           { "message": "打印机" },
-    "categoryName41":           { "message": "支付处理器" },
-    "categoryName42":           { "message": "标签管理器" },
-    "categoryName43":           { "message": "付费壁障（Paywall）" },
-    "categoryName44":           { "message": "构建/持续集成系统" },
-    "categoryName45":           { "message": "数据采集与监控系统" },
-    "categoryName46":           { "message": "远程访问" },
-    "categoryName47":           { "message": "开发工具" },
-    "categoryName48":           { "message": "网络存储" },
-    "categoryName49":           { "message": "信息流（Feed）阅读器" },
-    "categoryName50":           { "message": "文档管理系统" },
-    "categoryName51":           { "message": "着陆页构建器" },
-    "categoryName52":           { "message": "在线聊天" },
-    "categoryName53":           { "message": "客户关系管理（CRM）" },
-    "categoryName54":           { "message": "搜索引擎优化（SEO）" },
-    "categoryName55":           { "message": "财务" }
+  "github":                   { "message": "查看 GitHub 上的 Wappalyzer" },
+  "twitter":                  { "message": "关注 Twitter 上的 Wappalyzer" },
+  "website":                  { "message": "访问 wappalyzer.com" },
+  "options":                  { "message": "选项" },
+  "optionsSave":              { "message": "保存选项" },
+  "optionsSaved":             { "message": "已保存" },
+  "optionUpgradeMessage":     { "message": "通知我更新详情" },
+  "optionDynamicIcon":        { "message": "使用应用程序而非 Wappalyzer 的标志" },
+  "optionTracking":           { "message": "发送匿名的应用报告到 wappalyzer.com 供研究使用" },
+  "nothingToDo":              { "message": "这儿啥也没有。" },
+  "noAppsDetected":           { "message": "未检测到任何应用。" },
+  "categoryPin":              { "message": "Always show icon" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+  "categoryName1":            { "message": "内容管理系统（CMS）" },
+  "categoryName2":            { "message": "消息板" },
+  "categoryName3":            { "message": "数据库管理器" },
+  "categoryName4":            { "message": "文档工具" },
+  "categoryName5":            { "message": "插件" },
+  "categoryName6":            { "message": "电子商务" },
+  "categoryName7":            { "message": "照片相册" },
+  "categoryName8":            { "message": "维基" },
+  "categoryName9":            { "message": "主机面板" },
+  "categoryName10":           { "message": "分析" },
+  "categoryName11":           { "message": "博客" },
+  "categoryName12":           { "message": "JavaScript 框架" },
+  "categoryName13":           { "message": "问题跟踪器" },
+  "categoryName14":           { "message": "视频播放器" },
+  "categoryName15":           { "message": "评论系统" },
+  "categoryName16":           { "message": "验证码" },
+  "categoryName17":           { "message": "字体脚本" },
+  "categoryName18":           { "message": "Web 框架" },
+  "categoryName19":           { "message": "杂项" },
+  "categoryName20":           { "message": "编辑器" },
+  "categoryName21":           { "message": "学习管理系统（LMS）" },
+  "categoryName22":           { "message": "Web 服务器" },
+  "categoryName23":           { "message": "缓存工具" },
+  "categoryName24":           { "message": "富文本编辑器" },
+  "categoryName25":           { "message": "JavaScript 图形库" },
+  "categoryName26":           { "message": "移动框架" },
+  "categoryName27":           { "message": "编程语言" },
+  "categoryName28":           { "message": "操作系统" },
+  "categoryName29":           { "message": "搜索引擎" },
+  "categoryName30":           { "message": "网页邮箱" },
+  "categoryName31":           { "message": "内容分发网络（CDN）" },
+  "categoryName32":           { "message": "营销自动化" },
+  "categoryName33":           { "message": "Web 服务器扩展" },
+  "categoryName34":           { "message": "数据库" },
+  "categoryName35":           { "message": "地图" },
+  "categoryName36":           { "message": "广告网络" },
+  "categoryName37":           { "message": "网络服务" },
+  "categoryName38":           { "message": "媒体服务器" },
+  "categoryName39":           { "message": "网络摄像头" },
+  "categoryName40":           { "message": "打印机" },
+  "categoryName41":           { "message": "支付处理器" },
+  "categoryName42":           { "message": "标签管理器" },
+  "categoryName43":           { "message": "付费壁障（Paywall）" },
+  "categoryName44":           { "message": "构建/持续集成系统" },
+  "categoryName45":           { "message": "数据采集与监控系统" },
+  "categoryName46":           { "message": "远程访问" },
+  "categoryName47":           { "message": "开发工具" },
+  "categoryName48":           { "message": "网络存储" },
+  "categoryName49":           { "message": "信息流（Feed）阅读器" },
+  "categoryName50":           { "message": "文档管理系统" },
+  "categoryName51":           { "message": "着陆页构建器" },
+  "categoryName52":           { "message": "在线聊天" },
+  "categoryName53":           { "message": "客户关系管理（CRM）" },
+  "categoryName54":           { "message": "搜索引擎优化（SEO）" },
+  "categoryName55":           { "message": "财务" },
+  "categoryName56":           { "message": "加密货币挖矿器" },
+  "categoryName57":           { "message": "静态网站生成器" },
+	"categoryName58":           { "message": "用户引导" },
+	"categoryName59":           { "message": "JavaScript 库" },
+	"categoryName60":           { "message": "Containers" },
+	"categoryName61":           { "message": "SaaS" },
+	"categoryName62":           { "message": "PaaS" },
+	"categoryName63":           { "message": "IaaS" }
 }
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
index 7c49d5249..de64b78fc 100644
--- a/src/drivers/webextension/_locales/zh_TW/messages.json
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -1,67 +1,79 @@
 {
-  "github":                   { "message": "在 GitHub 上 fork Wappalyzer！" },
-  "twitter":                  { "message": "追隨 Wappalyzer 的 Twitter" },
-  "website":                  { "message": "前往 wappalyzer.com" },
-  "options":                  { "message": "選項" },
-  "optionsSave":              { "message": "保存選項" },
-  "optionsSaved":             { "message": "選項已保存" },
-  "optionUpgradeMessage":     { "message": "通知我更新內容" },
-  "optionDynamicIcon":        { "message": "使用應用程式圖示取代 Wappalyzer 的 logo" },
-  "optionTracking":           { "message": "匿名傳送應用程式偵測報告至 wappalyzer.com 作為研究用途" },
-  "nothingToDo":              { "message": "這裡什麼也沒有。" },
-  "noAppsDetected":           { "message": "未偵測到應用程式。" },
-  "categoryName1":            { "message": "內容管理系統（CMS）" },
-  "categoryName2":            { "message": "留言板/討論區" },
-  "categoryName3":            { "message": "資料庫管理" },
-  "categoryName4":            { "message": "文書處理工具" },
-  "categoryName5":            { "message": "外掛/小工具" },
-  "categoryName6":            { "message": "電子商務" },
-  "categoryName7":            { "message": "相簿" },
-  "categoryName8":            { "message": "維基" },
-  "categoryName9":            { "message": "伺服器控制面板" },
-  "categoryName10":           { "message": "分析" },
-  "categoryName11":           { "message": "部落格" },
-  "categoryName12":           { "message": "JavaScript 框架" },
-  "categoryName13":           { "message": "Issue 追蹤" },
-  "categoryName14":           { "message": "影音撥放器" },
-  "categoryName15":           { "message": "評論系統" },
-  "categoryName16":           { "message": "驗證碼" },
-  "categoryName17":           { "message": "字型" },
-  "categoryName18":           { "message": "網頁框架" },
-  "categoryName19":           { "message": "其他" },
-  "categoryName20":           { "message": "編輯器" },
-  "categoryName21":           { "message": "學習管理系統（LMS）" },
-  "categoryName22":           { "message": "網頁伺服器" },
-  "categoryName23":           { "message": "快取工具" },
-  "categoryName24":           { "message": "高級文字編輯器" },
-  "categoryName25":           { "message": "JavaScript 圖形庫" },
-  "categoryName26":           { "message": "行動框架" },
-  "categoryName27":           { "message": "程式語言" },
-  "categoryName28":           { "message": "作業系統" },
-  "categoryName29":           { "message": "搜尋引擎" },
-  "categoryName30":           { "message": "網路信箱" },
-  "categoryName31":           { "message": "內容傳遞網路（CDN）" },
-  "categoryName32":           { "message": "行銷自動化" },
-  "categoryName33":           { "message": "網頁伺服器擴充功能" },
-  "categoryName34":           { "message": "資料庫" },
-  "categoryName35":           { "message": "地圖" },
-  "categoryName36":           { "message": "廣告聯播" },
-  "categoryName37":           { "message": "網路服務" },
-  "categoryName38":           { "message": "媒體伺服器" },
-  "categoryName39":           { "message": "網路攝影機" },
-  "categoryName40":           { "message": "印表機" },
-  "categoryName41":           { "message": "付款處理" },
-  "categoryName42":           { "message": "標籤管理" },
-  "categoryName43":           { "message": "付費牆" },
-  "categoryName44":           { "message": "建立/整合系統" },
-  "categoryName45":           { "message": "監控與資料擷取系統（SCADA）" },
-  "categoryName46":           { "message": "遠端" },
-  "categoryName47":           { "message": "開發工具" },
-  "categoryName48":           { "message": "網路儲存設備" },
-  "categoryName49":           { "message": "Feed 閱讀器" },
-  "categoryName50":           { "message": "文件管理系統" },
-  "categoryName51":           { "message": "著陸頁產生器" },
-  "categoryName52":           { "message": "線上聊天" },
-  "categoryName53":           { "message": "客戶關係管理系統（CRM）" },
-  "categoryName54":           { "message": "SEO" }
+	"github":                   { "message": "在 GitHub 上 fork Wappalyzer！" },
+	"twitter":                  { "message": "在 Twitter 上追隨 Wappalyzer" },
+	"website":                  { "message": "前往 wappalyzer.com" },
+	"options":                  { "message": "選項" },
+	"optionsSave":              { "message": "保存選項" },
+	"optionsSaved":             { "message": "選項已保存" },
+	"optionUpgradeMessage":     { "message": "通知我更新內容" },
+	"optionDynamicIcon":        { "message": "使用網頁中使用技術的圖示取代 Wappalyzer 的標誌" },
+	"optionTracking":           { "message": "匿名傳送已識別的技術至 wappalyzer.com" },
+	"nothingToDo":              { "message": "這裡什麼也沒有。" },
+	"noAppsDetected":           { "message": "未識別到技術。" },
+	"categoryPin":              { "message": "永遠顯示圖示" },
+  "termsAccept":              { "message": "Accept" },
+  "termsContent":             { "message": "This extension sends anonymous information about websites you visit, including domain name and identified technologies, to <a href='https://www.wappalyzer.com'>wappalyzer.com</a>. This can be disabled in the settings." },
+	"categoryName1":            { "message": "內容管理系統（CMS）" },
+	"categoryName2":            { "message": "留言板/討論區" },
+	"categoryName3":            { "message": "資料庫管理" },
+	"categoryName4":            { "message": "文書處理工具" },
+	"categoryName5":            { "message": "外掛/小工具" },
+	"categoryName6":            { "message": "電子商務" },
+	"categoryName7":            { "message": "相簿" },
+	"categoryName8":            { "message": "維基" },
+	"categoryName9":            { "message": "伺服器控制面板" },
+	"categoryName10":           { "message": "分析" },
+	"categoryName11":           { "message": "部落格" },
+	"categoryName12":           { "message": "JavaScript 框架" },
+	"categoryName13":           { "message": "問題追蹤" },
+	"categoryName14":           { "message": "影音撥放器" },
+	"categoryName15":           { "message": "評論系統" },
+	"categoryName16":           { "message": "驗證碼" },
+	"categoryName17":           { "message": "字型" },
+	"categoryName18":           { "message": "網頁框架" },
+	"categoryName19":           { "message": "其他" },
+	"categoryName20":           { "message": "編輯器" },
+	"categoryName21":           { "message": "學習管理系統（LMS）" },
+	"categoryName22":           { "message": "網頁伺服器" },
+	"categoryName23":           { "message": "快取工具" },
+	"categoryName24":           { "message": "高級文字編輯器" },
+	"categoryName25":           { "message": "JavaScript 圖形庫" },
+	"categoryName26":           { "message": "行動框架" },
+	"categoryName27":           { "message": "程式語言" },
+	"categoryName28":           { "message": "作業系統" },
+	"categoryName29":           { "message": "搜尋引擎" },
+	"categoryName30":           { "message": "網路信箱" },
+	"categoryName31":           { "message": "內容傳遞網路（CDN）" },
+	"categoryName32":           { "message": "行銷自動化" },
+	"categoryName33":           { "message": "網頁伺服器擴充功能" },
+	"categoryName34":           { "message": "資料庫" },
+	"categoryName35":           { "message": "地圖" },
+	"categoryName36":           { "message": "廣告聯播" },
+	"categoryName37":           { "message": "網路服務" },
+	"categoryName38":           { "message": "媒體伺服器" },
+	"categoryName39":           { "message": "網路攝影機" },
+	"categoryName40":           { "message": "印表機" },
+	"categoryName41":           { "message": "付款處理" },
+	"categoryName42":           { "message": "標籤管理" },
+	"categoryName43":           { "message": "付費牆" },
+	"categoryName44":           { "message": "建立/整合系統" },
+	"categoryName45":           { "message": "監控與資料擷取系統（SCADA）" },
+	"categoryName46":           { "message": "遠端" },
+	"categoryName47":           { "message": "開發工具" },
+	"categoryName48":           { "message": "網路儲存設備" },
+	"categoryName49":           { "message": "Feed 閱讀器" },
+	"categoryName50":           { "message": "文件管理系統" },
+	"categoryName51":           { "message": "著陸頁產生器" },
+	"categoryName52":           { "message": "線上聊天" },
+	"categoryName53":           { "message": "客戶關係管理系統（CRM）" },
+	"categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "帳務" },
+	"categoryName56":           { "message": "加密貨幣礦工" },
+	"categoryName57":           { "message": "靜態網站產生器" },
+	"categoryName58":           { "message": "使用者指引" },
+	"categoryName59":           { "message": "JavaScript 函式庫" },
+	"categoryName60":           { "message": "容器" },
+	"categoryName61":           { "message": "軟體即服務（SaaS）" },
+	"categoryName62":           { "message": "平台即服務（PaaS）" },
+	"categoryName63":           { "message": "基礎設施即服務（IaaS）" }
 }
diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css
index 4a86fde55..bd5efa916 100644
--- a/src/drivers/webextension/css/popup.css
+++ b/src/drivers/webextension/css/popup.css
@@ -46,25 +46,52 @@ body {
   padding-bottom: 1rem;
 }
 
-.detected__category-link {
+.detected__category-name {
   border-bottom: 1px solid #dbdbdb;
   display: block;
   margin-bottom: .5rem;
-  text-decoration: none;
 }
 
-.detected__category-name {
+.detected__category-link {
   color: #4608ad;
-  display: block;
   font-weight: bold;
   line-height: 2rem;
+  text-decoration: none;
 }
 
-.detected__category-link:hover .detected__category-name {
+.detected__category-link:hover {
   color: #4a4a4a;
 }
 
+.detected__category-pin-wrapper {
+  margin-left: .2rem;
+}
+
+.detected__category-pin {
+  cursor: pointer;
+  display: none;
+  height: 16px;
+  margin-left: .2rem;
+  width: 16px;
+  vertical-align: middle;
+}
+
+.detected__category:hover .detected__category-pin--inactive {
+  display: inline-block;
+}
+
+.detected__category-pin-wrapper--active .detected__category-pin--inactive,
+.detected__category-pin-wrapper:hover .detected__category-pin--inactive {
+  display: none !important;
+}
+
+.detected__category-pin-wrapper--active .detected__category-pin--active,
+.detected__category-pin-wrapper:hover .detected__category-pin--active {
+  display: inline-block;
+}
+
 .detected__app {
+  color: #4a4a4a;
   display: block;
   line-height: 1.7rem;
   text-decoration: none;
@@ -84,13 +111,28 @@ body {
 }
 
 .detected__app-name {
-  color: #4a4a4a;
+}
+
+.detected__app-version, .detected__app-confidence {
+  background: #eee;
+  border-radius: 3px;
+  font-size: .7rem;
+  margin-left: .3rem;
+  padding: .1rem .2rem;
 }
 
 .detected__app:hover .detected__app-name {
   border-bottom: 1px solid #4a4a4a;
 }
 
+.detected__app:hover .detected__app-version {
+  border-bottom: 1px solid white;
+}
+
+.detected__app:hover .detected__app-confidence {
+  border-bottom: 1px solid white;
+}
+
 .detected-app {
 	padding: 7px 0;
 }
@@ -106,10 +148,55 @@ body {
 
 .empty {
   display: flex;
-  height: 16rem;
+  height: 14.5rem;
   align-items: center;
   justify-content: center;
 }
 
 .empty__text {
 }
+
+.terms {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper {
+  display: none;
+  height: 100%;
+  width: 100%;
+}
+
+.terms__wrapper--active {
+  display: block;
+}
+
+.terms__content {
+  font-size: .9rem;
+  line-height: 150%;
+  text-align: center;
+  margin-bottom: 1rem;
+  width: 80%;
+}
+
+.terms__accept {
+  background-color: #4608ad;
+  border: none;
+  border-radius: 3px;
+  color: white;
+  cursor: pointer;
+  font-size: .9rem;
+  padding: .8rem 3rem;
+}
+
+.terms__accept:hover {
+  background-color: #4107a1;
+}
+
+.terms__privacy {
+  margin-top: 1rem;
+}
diff --git a/src/drivers/webextension/html/background.html b/src/drivers/webextension/html/background.html
index 1c31887fc..8a03c7a9d 100644
--- a/src/drivers/webextension/html/background.html
+++ b/src/drivers/webextension/html/background.html
@@ -7,7 +7,7 @@
 		<script src="../node_modules/webextension-polyfill/dist/browser-polyfill.js"></script>
 		<script src="../js/wappalyzer.js"></script>
 		<script src="../js/driver.js"></script>
-		<script src="../js/network.js"></script>
+		<script src="../js/lib/network.js"></script>
 	</head>
 	<body>
 	</body>
diff --git a/src/drivers/webextension/html/popup.html b/src/drivers/webextension/html/popup.html
index 9fc0278ad..2a7d662dc 100644
--- a/src/drivers/webextension/html/popup.html
+++ b/src/drivers/webextension/html/popup.html
@@ -7,7 +7,7 @@
 		<link rel="stylesheet" href="../css/popup.css">
 
 		<script src="../node_modules/webextension-polyfill/dist/browser-polyfill.js"></script>
-		<script src="../js/jsontodom.js"></script>
+		<script src="../js/lib/jsontodom.js"></script>
 		<script src="../js/popup.js"></script>
 	</head>
 	<body>
@@ -17,6 +17,16 @@
       </a>
     </div>
 
-    <div class="container"></div>
+    <div class="container">
+      <div class="terms__wrapper">
+        <div class="terms">
+          <div class="terms__content" data-i18n="termsContent"></div>
+
+          <button class="terms__accept" data-i18n="termsAccept"></button>
+
+          <a class="terms__privacy" href="https://www.wappalyzer.com/privacy" data-i18n="privacyPolicy"></a>
+        </div>
+      </div>
+    </div>
 	</body>
 </html>
diff --git a/src/drivers/webextension/images/pin-active.svg b/src/drivers/webextension/images/pin-active.svg
new file mode 100644
index 000000000..12462f304
--- /dev/null
+++ b/src/drivers/webextension/images/pin-active.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 193.826 193.826" style="enable-background:new 0 0 193.826 193.826;" xml:space="preserve">
+  <path fill="#4608ad" d="M191.495,55.511L137.449,1.465c-1.951-1.953-5.119-1.953-7.07,0l-0.229,0.229c-3.314,3.313-5.14,7.72-5.14,12.406
+  c0,3.019,0.767,5.916,2.192,8.485l-56.55,48.533c-4.328-3.868-9.852-5.985-15.703-5.985c-6.305,0-12.232,2.455-16.689,6.913
+  l-0.339,0.339c-1.953,1.952-1.953,5.118,0,7.07l32.378,32.378l-31.534,31.533c-0.631,0.649-15.557,16.03-25.37,28.27
+  c-9.345,11.653-11.193,13.788-11.289,13.898c-1.735,1.976-1.639,4.956,0.218,6.822c0.973,0.977,2.256,1.471,3.543,1.471
+  c1.173,0,2.349-0.41,3.295-1.237c0.083-0.072,2.169-1.885,13.898-11.289c12.238-9.813,27.619-24.74,28.318-25.421l31.483-31.483
+  l30.644,30.644c0.976,0.977,2.256,1.465,3.535,1.465s2.56-0.488,3.535-1.465l0.339-0.339c4.458-4.457,6.913-10.385,6.913-16.689
+  c0-5.851-2.118-11.375-5.985-15.703l48.533-56.55c2.569,1.425,5.466,2.192,8.485,2.192c4.687,0,9.093-1.825,12.406-5.14l0.229-0.229
+  C193.448,60.629,193.448,57.463,191.495,55.511z"/>
+</svg>
diff --git a/src/drivers/webextension/images/pin.svg b/src/drivers/webextension/images/pin.svg
new file mode 100644
index 000000000..20e42e6d0
--- /dev/null
+++ b/src/drivers/webextension/images/pin.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 193.826 193.826" style="enable-background:new 0 0 193.826 193.826;" xml:space="preserve">
+  <path fill="#dbdbdb" d="M191.495,55.511L137.449,1.465c-1.951-1.953-5.119-1.953-7.07,0l-0.229,0.229c-3.314,3.313-5.14,7.72-5.14,12.406
+  c0,3.019,0.767,5.916,2.192,8.485l-56.55,48.533c-4.328-3.868-9.852-5.985-15.703-5.985c-6.305,0-12.232,2.455-16.689,6.913
+  l-0.339,0.339c-1.953,1.952-1.953,5.118,0,7.07l32.378,32.378l-31.534,31.533c-0.631,0.649-15.557,16.03-25.37,28.27
+  c-9.345,11.653-11.193,13.788-11.289,13.898c-1.735,1.976-1.639,4.956,0.218,6.822c0.973,0.977,2.256,1.471,3.543,1.471
+  c1.173,0,2.349-0.41,3.295-1.237c0.083-0.072,2.169-1.885,13.898-11.289c12.238-9.813,27.619-24.74,28.318-25.421l31.483-31.483
+  l30.644,30.644c0.976,0.977,2.256,1.465,3.535,1.465s2.56-0.488,3.535-1.465l0.339-0.339c4.458-4.457,6.913-10.385,6.913-16.689
+  c0-5.851-2.118-11.375-5.985-15.703l48.533-56.55c2.569,1.425,5.466,2.192,8.485,2.192c4.687,0,9.093-1.825,12.406-5.14l0.229-0.229
+  C193.448,60.629,193.448,57.463,191.495,55.511z"/>
+</svg>
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index 7ffb4ba12..6111d1830 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -1,69 +1,84 @@
 /** global: browser */
 /** global: XMLSerializer */
 
-if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
+/* global browser, chrome */
+/* eslint-env browser */
+
+function sendMessage(id, subject, callback) {
+  (chrome || browser).runtime.sendMessage({
+    id,
+    subject,
+    source: 'content.js',
+  }, callback || (() => {}));
+}
+
+if (typeof browser !== 'undefined' && typeof document.body !== 'undefined') {
   try {
-    var html = new XMLSerializer().serializeToString(document);
+    sendMessage('init', {});
+
+    // HTML
+    let html = new XMLSerializer().serializeToString(document);
+
+    const chunks = [];
+    const maxCols = 2000;
+    const maxRows = 3000;
+    const rows = html.length / maxCols;
+
+    let i;
 
-    if ( html.length > 50000 ) {
-      html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+    for (i = 0; i < rows; i += 1) {
+      if (i < maxRows / 2 || i > rows - maxRows / 2) {
+        chunks.push(html.slice(i * maxCols, (i + 1) * maxCols));
+      }
     }
 
+    html = chunks.join('\n');
+
+    // Scripts
     const scripts = Array.prototype.slice
       .apply(document.scripts)
       .filter(script => script.src)
-      .map(script => script.src);
+      .map(script => script.src)
+      .filter(script => script.indexOf('data:text/javascript;') !== 0);
 
-    browser.runtime.sendMessage({
-      id: 'analyze',
-      subject: { html, scripts },
-      source: 'content.js'
-    });
+    sendMessage('analyze', { html, scripts });
 
+    // JavaScript variables
     const script = document.createElement('script');
 
     script.onload = () => {
-      addEventListener('message', event => {
-        if ( event.data.id !== 'js' ) {
+      const onMessage = (event) => {
+        if (event.data.id !== 'js') {
           return;
         }
 
-        browser.runtime.sendMessage({
-          id: 'analyze',
-          subject: {
-            js: event.data.js
-          },
-          source: 'content.js'
-        });
-      }, true);
-
-      ( chrome || browser ).runtime.sendMessage({
-        id: 'init_js',
-        subject: {},
-        source: 'content.js'
-      }, response => {
-        if ( response ) {
+        window.removeEventListener('message', onMessage);
+
+        sendMessage('analyze', { js: event.data.js });
+
+        script.remove();
+      };
+
+      window.addEventListener('message', onMessage);
+
+      sendMessage('get_js_patterns', {}, (response) => {
+        if (response) {
           postMessage({
             id: 'patterns',
-            patterns: response.patterns
-          }, '*');
+            patterns: response.patterns,
+          }, window.location.href);
         }
       });
     };
 
-    script.setAttribute('id', 'wappalyzer');
     script.setAttribute('src', browser.extension.getURL('js/inject.js'));
 
     document.body.appendChild(script);
   } catch (e) {
-    log(e);
+    sendMessage('log', e);
   }
 }
 
-function log(message) {
-  browser.runtime.sendMessage({
-    id: 'log',
-    message,
-    source: 'content.js'
-  });
-}
+// https://stackoverflow.com/a/44774834
+// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/executeScript#Return_value
+undefined; // eslint-disable-line no-unused-expressions
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 61ce7c1a1..5d8962f17 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -2,31 +2,61 @@
  * WebExtension driver
  */
 
+/* eslint-env browser */
+/* global browser, chrome, fetch, Wappalyzer */
+
 /** global: browser */
+/** global: chrome */
+/** global: fetch */
 /** global: Wappalyzer */
 
 const wappalyzer = new Wappalyzer();
 
-var tabCache = {};
-var headersCache = {};
-var categoryOrder = [];
+const tabCache = {};
+const robotsTxtQueue = {};
+
+let categoryOrder = [];
 
-browser.tabs.onRemoved.addListener(tabId => {
+browser.tabs.onRemoved.addListener((tabId) => {
   tabCache[tabId] = null;
 });
 
+function userAgent() {
+  const url = chrome.extension.getURL('/');
+
+  if (url.match(/^chrome-/)) {
+    return 'chrome';
+  }
+
+  if (url.match(/^moz-/)) {
+    return 'firefox';
+  }
+
+  if (url.match(/^ms-browser-/)) {
+    return 'edge';
+  }
+}
+
 /**
  * Get a value from localStorage
  */
-function getOption(name, defaultValue) {
-  return new Promise((resolve, reject) => {
-    const callback = item => {
-      resolve(item.hasOwnProperty(name) ? item[name] : defaultValue);
-    };
-
-    browser.storage.local.get(name)
-      .then(callback)
-      .catch(error => wappalyzer.log(error, 'driver', 'error'));
+function getOption(name, defaultValue = null) {
+  return new Promise(async (resolve, reject) => {
+    let value = defaultValue;
+
+    try {
+      const option = await browser.storage.local.get(name);
+
+      if (option[name] !== undefined) {
+        value = option[name];
+      }
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
+
+      return reject(error.message);
+    }
+
+    return resolve(value);
   });
 }
 
@@ -34,11 +64,17 @@ function getOption(name, defaultValue) {
  * Set a value in localStorage
  */
 function setOption(name, value) {
-  var option = {};
+  return new Promise(async (resolve, reject) => {
+    try {
+      await browser.storage.local.set({ [name]: value });
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
 
-  option[name] = value;
+      return reject(error.message);
+    }
 
-  browser.storage.local.set(option);
+    return resolve();
+  });
 }
 
 /**
@@ -47,160 +83,118 @@ function setOption(name, value) {
 function openTab(args) {
   browser.tabs.create({
     url: args.url,
-    active: args.background === undefined || !args.background
+    active: args.background === undefined || !args.background,
   });
 }
 
 /**
  * Make a POST request
  */
-function post(url, body) {
-  fetch(url, {
-    method: 'POST',
-    body: JSON.stringify(body)
-  })
-    .then(response => {
-      wappalyzer.log('POST ' + url + ': ' + response.status, 'driver');
-    })
-    .catch(error => {
-      wappalyzer.log('POST ' + url + ': ' + error, 'driver', 'error');
+async function post(url, body) {
+  try {
+    const response = await fetch(url, {
+      method: 'POST',
+      body: JSON.stringify(body),
     });
-}
 
-fetch('../apps.json')
-  .then(response => {
-    return response.json();
-  })
-  .then(json => {
-    wappalyzer.apps = json.apps;
-    wappalyzer.categories = json.categories;
+    wappalyzer.log(`POST ${url}: ${response.status}`, 'driver');
+  } catch (error) {
+    wappalyzer.log(`POST ${url}: ${error}`, 'driver', 'error');
+  }
+}
 
-    categoryOrder = Object.keys(wappalyzer.categories).sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority);
+// Capture response headers
+browser.webRequest.onCompleted.addListener(async (request) => {
+  const headers = {};
 
-    wappalyzer.parseJsPatterns();
-  })
-  .catch(error => {
-    wappalyzer.log('GET apps.json: ' + error, 'driver', 'error');
-  });
+  if (request.responseHeaders) {
+    const url = wappalyzer.parseUrl(request.url);
 
-// Version check
-var version = browser.runtime.getManifest().version;
+    let tab;
 
-getOption('version')
-  .then(previousVersion => {
-    if ( previousVersion === null ) {
-      openTab({
-        url: wappalyzer.config.websiteURL + 'installed'
-      });
-    } else if ( version !== previousVersion ) {
-      getOption('upgradeMessage', true)
-        .then(upgradeMessage => {
-          if ( upgradeMessage ) {
-            openTab({
-              url: wappalyzer.config.websiteURL + 'upgraded?v' + version,
-              background: true
-            });
-          }
-        });
+    try {
+      [tab] = await browser.tabs.query({ url: [url.href] });
+    } catch (error) {
+      wappalyzer.log(error, 'driver', 'error');
     }
 
-    setOption('version', version);
-  });
+    if (tab) {
+      request.responseHeaders.forEach((header) => {
+        const name = header.name.toLowerCase();
 
-// Run content script
-var callback = tabs => {
-  tabs.forEach(tab => {
-    if ( tab.url.match(/^https?:\/\//) ) {
-      browser.tabs.executeScript(tab.id, {
-        file: 'js/content.js'
+        headers[name] = headers[name] || [];
+
+        headers[name].push((header.value || header.binaryValue || '').toString());
       });
+
+      if (headers['content-type'] && /\/x?html/.test(headers['content-type'][0])) {
+        wappalyzer.analyze(url, { headers }, { tab });
+      }
     }
-  })
-};
+  }
+}, { urls: ['http://*/*', 'https://*/*'], types: ['main_frame'] }, ['responseHeaders']);
 
-browser.tabs.query({})
-  .then(callback)
-  .catch(error => wappalyzer.log(error, 'driver', 'error'));
+// Listen for messages
+browser.runtime.onMessage.addListener(async (message, sender) => {
+  if (message.id === undefined) {
+    return Promise.resolve();
+  }
 
-// Capture response headers
-browser.webRequest.onCompleted.addListener(request => {
-  var responseHeaders = {};
+  if (message.id !== 'log') {
+    wappalyzer.log(`Message${message.source ? ` from ${message.source}` : ''}: ${message.id}`, 'driver');
+  }
 
-  if ( request.responseHeaders ) {
-    var url = wappalyzer.parseUrl(request.url);
+  const pinnedCategory = await getOption('pinnedCategory');
 
-    request.responseHeaders.forEach(function(header) {
-      if ( !responseHeaders[header.name.toLowerCase()] ) {
-        responseHeaders[header.name.toLowerCase()] = []
-      }
-      responseHeaders[header.name.toLowerCase()].push(header.value || '' + header.binaryValue);
-    });
+  const url = wappalyzer.parseUrl(sender.tab ? sender.tab.url : '');
 
-    if ( headersCache.length > 50 ) {
-      headersCache = {};
-    }
+  const cookies = await browser.cookies.getAll({ domain: `.${url.hostname}` });
 
-    if ( /text\/html/.test(responseHeaders['content-type'][0]) ) {
-      if ( headersCache[url.canonical] === undefined ) {
-        headersCache[url.canonical] = {};
-      }
+  let response;
 
-      Object.keys(responseHeaders).forEach(header => {
-        headersCache[url.canonical][header] = responseHeaders[header].slice();
-      });
-    }
-  }
-}, { urls: [ 'http://*/*', 'https://*/*' ], types: [ 'main_frame' ] }, [ 'responseHeaders' ]);
+  switch (message.id) {
+    case 'log':
+      wappalyzer.log(message.subject, message.source);
 
-// Listen for messages
-( chrome || browser ).runtime.onMessage.addListener((message, sender, sendResponse) => {
-  if ( typeof message.id != 'undefined' ) {
-    if ( message.id !== 'log' ) {
-      wappalyzer.log('Message received' + ( message.source ? ' from ' + message.source : '' ) + ': ' + message.id, 'driver');
-    }
+      break;
+    case 'init':
+      wappalyzer.analyze(url, { cookies }, { tab: sender.tab });
 
-    var response;
+      break;
+    case 'analyze':
+      wappalyzer.analyze(url, message.subject, { tab: sender.tab });
 
-    switch ( message.id ) {
-      case 'log':
-        wappalyzer.log(message.message, message.source);
+      await setOption('hostnameCache', wappalyzer.hostnameCache);
 
-        break;
-      case 'analyze':
-        var url = wappalyzer.parseUrl(sender.tab.url);
+      break;
+    case 'ad_log':
+      wappalyzer.cacheDetectedAds(message.subject);
 
-        if ( headersCache[url.canonical] !== undefined ) {
-          message.subject.headers = headersCache[url.canonical];
-        }
+      break;
+    case 'get_apps':
+      response = {
+        tabCache: tabCache[message.tab.id],
+        apps: wappalyzer.apps,
+        categories: wappalyzer.categories,
+        pinnedCategory,
+        termsAccepted: userAgent() === 'chrome' || await getOption('termsAccepted', false),
+      };
 
-        wappalyzer.analyze(url, message.subject, {
-          tab: sender.tab
-        });
-
-        break;
-      case 'ad_log':
-        wappalyzer.cacheDetectedAds(message.subject);
-
-        break;
-      case 'get_apps':
-        response = {
-          tabCache:   tabCache[message.tab.id],
-          apps:       wappalyzer.apps,
-          categories: wappalyzer.categories
-        };
-
-        break;
-      case 'init_js':
-        response = {
-          patterns: wappalyzer.jsPatterns
-        };
-
-        break;
-      default:
-    }
+      break;
+    case 'set_option':
+      await setOption(message.key, message.value);
 
-    sendResponse(response);
+      break;
+    case 'get_js_patterns':
+      response = {
+        patterns: wappalyzer.jsPatterns,
+      };
+
+      break;
+    default:
   }
+
+  return Promise.resolve(response);
 });
 
 wappalyzer.driver.document = document;
@@ -209,128 +203,181 @@ wappalyzer.driver.document = document;
  * Log messages to console
  */
 wappalyzer.driver.log = (message, source, type) => {
-  console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
+  const log = ['warn', 'error'].indexOf(type) !== -1 ? type : 'log';
+
+  console[log](`[wappalyzer ${type}]`, `[${source}]`, message);
 };
 
 /**
  * Display apps
  */
-wappalyzer.driver.displayApps = (detected, meta, context) => {
-  var tab = context.tab;
+wappalyzer.driver.displayApps = async (detected, meta, context) => {
+  const { tab } = context;
 
-  tabCache[tab.id] = tabCache[tab.id] || { detected: [] };
+  if (tab === undefined) {
+    return;
+  }
+
+  tabCache[tab.id] = tabCache[tab.id] || {
+    detected: [],
+  };
 
   tabCache[tab.id].detected = detected;
 
-  if ( Object.keys(detected).length ) {
-    getOption('dynamicIcon', true)
-      .then(dynamicIcon => {
-        var appName, found = false;
-
-        // Find the main application to display
-        categoryOrder.forEach(match => {
-          Object.keys(detected).forEach(appName => {
-            var app = detected[appName];
-
-            app.props.cats.forEach(category => {
-              if ( category === match && !found ) {
-                var icon = app.props.icon || 'default.svg';
-
-                if ( !dynamicIcon ) {
-                  icon = 'default.svg';
-                }
-
-                if ( /\.svg$/i.test(icon) ) {
-                  icon = 'converted/' + icon.replace(/\.svg$/, '.png');
-                }
-
-                try {
-                	browser.pageAction.setIcon({
-                    tabId: tab.id,
-                    path: '../images/icons/' + icon
-                  });
-                } catch(e) {
-                  // Firefox for Android does not support setIcon see https://bugzilla.mozilla.org/show_bug.cgi?id=1331746
-                }
-
-                found = true;
-              }
+  const pinnedCategory = await getOption('pinnedCategory');
+  const dynamicIcon = await getOption('dynamicIcon', true);
+
+  let found = false;
+
+  // Find the main application to display
+  [pinnedCategory].concat(categoryOrder).forEach((match) => {
+    Object.keys(detected).forEach((appName) => {
+      const app = detected[appName];
+
+      app.props.cats.forEach((category) => {
+        if (category === match && !found) {
+          let icon = app.props.icon && dynamicIcon ? app.props.icon : 'default.svg';
+
+          if (/\.svg$/i.test(icon)) {
+            icon = `converted/${icon.replace(/\.svg$/, '.png')}`;
+          }
+
+          try {
+            browser.pageAction.setIcon({
+              tabId: tab.id,
+              path: `../images/icons/${icon}`,
             });
-          });
-        });
-
-        if ( typeof chrome !== 'undefined' ) {
-          // Browser polyfill doesn't seem to work here
-          chrome.pageAction.show(tab.id);
-        } else {
-          browser.pageAction.show(tab.id);
+          } catch (e) {
+            // Firefox for Android does not support setIcon see https://bugzilla.mozilla.org/show_bug.cgi?id=1331746
+          }
+
+          found = true;
         }
       });
-  }
+    });
+  });
+
+  browser.pageAction.show(tab.id);
 };
 
 /**
  * Fetch and cache robots.txt for host
  */
-wappalyzer.driver.getRobotsTxt = (host, secure = false) => {
-  return new Promise((resolve, reject) => {
-    getOption('tracking', true)
-      .then(tracking => {
-        if ( !tracking ) {
-          return resolve([]);
-        }
+wappalyzer.driver.getRobotsTxt = async (host, secure = false) => {
+  if (robotsTxtQueue[host]) {
+    return robotsTxtQueue[host];
+  }
 
-        getOption('robotsTxtCache')
-          .then(robotsTxtCache => {
-            robotsTxtCache = robotsTxtCache || {};
-
-            if ( host in robotsTxtCache ) {
-              resolve(robotsTxtCache[host]);
-            } else {
-              const url = 'http' + ( secure ? 's' : '' ) + '://' + host + '/robots.txt';
-
-              fetch('http' + ( secure ? 's' : '' ) + '://' + host + '/robots.txt')
-                .then(response => {
-                  if ( !response.ok ) {
-                    if ( response.status === 404 ) {
-                      return '';
-                    } else {
-                      throw 'GET ' + response.url + ' was not ok';
-                    }
-                  }
-
-                  return response.text();
-                })
-                .then(robotsTxt => {
-                  robotsTxtCache[host] = wappalyzer.parseRobotsTxt(robotsTxt);
-
-                  setOption('robotsTxtCache', robotsTxtCache);
-
-                  resolve(robotsTxtCache[host]);
-                })
-                .catch(reject);
-            }
-          });
-      });
+  const tracking = await getOption('tracking', true);
+  const robotsTxtCache = await getOption('robotsTxtCache', {});
+
+  robotsTxtQueue[host] = new Promise(async (resolve) => {
+    if (!tracking) {
+      return resolve([]);
+    }
+
+    if (host in robotsTxtCache) {
+      return resolve(robotsTxtCache[host]);
+    }
+
+    const timeout = setTimeout(() => resolve([]), 3000);
+
+    let response;
+
+    try {
+      response = await fetch(`http${secure ? 's' : ''}://${host}/robots.txt`, { redirect: 'follow' });
+    } catch (error) {
+      wappalyzer.log(error, 'driver', 'error');
+
+      return resolve([]);
+    }
+
+    clearTimeout(timeout);
+
+    const robotsTxt = response.ok ? await response.text() : '';
+
+    robotsTxtCache[host] = Wappalyzer.parseRobotsTxt(robotsTxt);
+
+    await setOption('robotsTxtCache', robotsTxtCache);
+
+    delete robotsTxtQueue[host];
+
+    return resolve(robotsTxtCache[host]);
   });
+
+  return robotsTxtQueue[host];
 };
 
 /**
  * Anonymously track detected applications for research purposes
  */
-wappalyzer.driver.ping = (hostnameCache, adCache) => {
-  getOption('tracking', true)
-    .then(tracking => {
-      if ( tracking ) {
-        if ( Object.keys(hostnameCache).length ) {
-          post('https://api.wappalyzer.com/ping/v1/', hostnameCache);
-        }
+wappalyzer.driver.ping = async (hostnameCache = {}, adCache = []) => {
+  const tracking = await getOption('tracking', true);
+  const termsAccepted = userAgent() === 'chrome' || await getOption('termsAccepted', false);
 
-        if ( adCache.length ) {
-          post('https://ad.wappalyzer.com/log/wp/', adCache);
-        }
+  if (tracking && termsAccepted) {
+    if (Object.keys(hostnameCache).length) {
+      post('https://api.wappalyzer.com/ping/v1/', hostnameCache);
+    }
 
-        setOption('robotsTxtCache', {});
-      }
-    });
+    if (adCache.length) {
+      post('https://ad.wappalyzer.com/log/wp/', adCache);
+    }
+
+    await setOption('robotsTxtCache', {});
+  }
 };
+
+// Init
+(async () => {
+  // Technologies
+  try {
+    const response = await fetch('../apps.json');
+    const json = await response.json();
+
+    wappalyzer.apps = json.apps;
+    wappalyzer.categories = json.categories;
+  } catch (error) {
+    wappalyzer.log(`GET apps.json: ${error.message}`, 'driver', 'error');
+  }
+
+  wappalyzer.parseJsPatterns();
+
+  categoryOrder = Object.keys(wappalyzer.categories)
+    .map(categoryId => parseInt(categoryId, 10))
+    .sort((a, b) => wappalyzer.categories[a].priority - wappalyzer.categories[b].priority);
+
+  // Version check
+  const { version } = browser.runtime.getManifest();
+  const previousVersion = await getOption('version');
+  const upgradeMessage = await getOption('upgradeMessage', true);
+
+  if (previousVersion === null) {
+    openTab({
+      url: `${wappalyzer.config.websiteURL}installed`,
+    });
+  } else if (version !== previousVersion && upgradeMessage) {
+    openTab({
+      url: `${wappalyzer.config.websiteURL}upgraded?v${version}`,
+      background: true,
+    });
+  }
+
+  await setOption('version', version);
+
+  // Hostname cache
+  wappalyzer.hostnameCache = await getOption('hostnameCache', {});
+
+  // Run content script on all tabs
+  try {
+    const tabs = await browser.tabs.query({ url: ['http://*/*', 'https://*/*'] });
+
+    tabs.forEach((tab) => {
+      browser.tabs.executeScript(tab.id, {
+        file: '../js/content.js',
+      });
+    });
+  } catch (error) {
+    wappalyzer.log(error, 'driver', 'error');
+  }
+})();
diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js
deleted file mode 100644
index 2370a3eda..000000000
--- a/src/drivers/webextension/js/iframe.js
+++ /dev/null
@@ -1,1185 +0,0 @@
-'use strict';
-
-(function(win) {
-
-var exports = {};
-
-(function(exports) {
-
-	var utils = {
-		normalizeUrl: function(url) {
-
-			return this.hashUrl(url) || null;
-
-		},
-
-		getReferrer: function() {
-			return this.normalizeUrl(document.referrer);
-		},
-
-		getPageUrl: function() {
-			return this.normalizeUrl(window.location.href);
-		},
-		hashUrl: function(url) {
-			var a,
-				result;
-
-			if ( !url || url.indexOf('http') !== 0 ) {
-				return null;
-			}
-
-			a = document.createElement('a');
-			a.href = url;
-
-			result = a.protocol + '//' + a.hostname + '/';
-
-			if ( a.pathname && a.pathname !== '/' ) {
-				result += this.hashCode(a.pathname);
-			}
-
-			if ( a.search ) {
-				result += '?' + this.hashCode(a.search);
-			}
-
-			if ( a.hash ) {
-				result += '#' + this.hashCode(a.hash);
-			}
-
-			return result;
-		},
-
-		hashCode: function(str) {
-			var hash = 0,
-				kar,
-				i;
-
-			if ( str.length === 0 ) {
-				return hash;
-			}
-
-			for ( i = 0; i < str.length; i++ ) {
-				kar = str.charCodeAt(i);
-				hash = ((hash << 5) - hash) + kar;
-				hash = hash & hash;
-			}
-
-			return hash + Math.pow(2, 32);
-		},
-
-		realArray: function(a) {
-			return Array.prototype.slice.apply(a);
-		},
-
-		onDocLoaded: function(doc, callback) {
-			if ( doc.readyState === 'loading' ) {
-				doc.addEventListener('DOMContentLoaded', callback);
-			} else {
-				callback();
-			}
-		},
-
-		SCRIPT_IN_WINDOW_TOP: window === window.top,
-
-		isFriendlyWindow: function(win) {
-
-			var href;
-			try {
-				href = win.location.href;
-			} catch(e) {
-				return false;
-			}
-			return true;
-		},
-
-		elementWindow: function(el) {
-			return el.ownerDocument.defaultView;
-		},
-
-		viewport: function(win) {
-			return {width: win.innerWidth, height: win.innerHeight};
-		},
-
-		parseQS: function(qs) {
-			if ( qs.indexOf('http') === 0 ) {
-				qs = qs.split('?')[1];
-			}
-			var i, kvs, key, val;
-			var dict = {};
-			qs = qs.split('&');
-			for ( i = 0; i < qs.length; i++ ) {
-				kvs = qs[i].split('=');
-				key = kvs[0];
-				val = kvs.slice(1).join('=');
-				try {
-					dict[key] = window.decodeURIComponent(val);
-				} catch (e) {
-
-					continue;
-				}
-			}
-			return dict;
-		},
-		sendToBackground: function(message, event, responseMessage, onResponse) {
-			if ( typeof browser !== 'undefined' ) {
-				var response = browser.runtime.sendMessage(message);
-				response.then(onResponse);
-			} else if ( typeof chrome !== 'undefined' ) {
-				chrome.runtime.sendMessage(message, onResponse);
-			} else if ( window.self.port ) {
-				window.self.port.on(responseMessage, onResponse);
-				window.self.port.emit(event, message);
-			}
-		},
-
-		askIfTrackingEnabled: function(callback, elseCallback) {
-
-			this.sendToBackground(
-				'is_tracking_enabled',
-				'',
-				'tracking_enabled_response',
-				function(message) {
-					if ( message && message.tracking_enabled ) {
-
-						callback();
-					} else {
-
-						elseCallback();
-					}
-				}
-			);
-
-		}
-	};
-
-	utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
-	utils.SCRIPT_IN_HOSTILE_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && !utils.SCRIPT_IN_FRIENDLY_IFRAME;
-
-	function LogGenerator() {
-		this.msgNum = 0;
-		this.pageMeta = {
-			'url': utils.getPageUrl(),
-			'isHP': window.location.pathname === '/',
-			'referrer': utils.getReferrer(),
-			'rand': Math.floor(Math.random() * 10e12),
-			'startTime': new Date().getTime()
-		};
-	}
-
-	LogGenerator.prototype = {
-		log: function(event, opt_assets, opt_pageTags) {
-			var opt_video_assets;
-			if ( event === 'video' || event === 'invalid-video' ) {
-				opt_video_assets = opt_assets || [];
-				opt_assets = [];
-			} else {
-				opt_video_assets = [];
-				opt_assets = opt_assets || [];
-			}
-			var result = {
-				doc: this.pageMeta,
-				event: event,
-				video_assets: opt_video_assets,
-				assets: opt_assets,
-				version: '3',
-				mrev: '4aeaa5a-c',
-				msgNum: this.msgNum,
-				timestamp: new Date().getTime(),
-				pageVis: document.visibilityState,
-				pageFoc: document.hasFocus(),
-				pageTags: opt_pageTags || []
-			};
-			this.msgNum++;
-			return result;
-		}
-	};
-
-	utils.LogGenerator = LogGenerator;
-
-	exports.utils = utils;
-})(exports);
-
-(function(exports) {
-
-	var SizeMatcher = {
-		VALID_AD_SIZES: [
-			[300, 50],
-			[320, 50],
-			[160, 600],
-			[300, 250],
-			[300, 600],
-			[300, 1050],
-			[336, 280],
-			[336, 850],
-			[468, 60],
-			[728, 90],
-			[728, 250],
-			[728, 270],
-			[970, 66],
-			[970, 90],
-			[970, 125],
-			[970, 250],
-			[970, 400],
-			[970, 415],
-			[1280, 100]
-		],
-
-		PX_SIZE_TOL: 10,
-
-		getMatchedAdSize: function(width, height) {
-
-			if ( !this.set ) {
-				this.set = this._makeSizeSet();
-			}
-
-			return this.set[Math.round(width) + 'x' + Math.round(height)];
-		},
-
-		elementIsAdShaped: function(el) {
-			return !!this.getMatchedAdSizeForElement(el);
-		},
-
-		getMatchedAdSizeForElement: function(el) {
-			var rect = el.getBoundingClientRect();
-			return this.getMatchedAdSize(rect.width, rect.height);
-		},
-
-		_makeSizeSet: function() {
-			var set = {};
-			var i;
-			var xfuz;
-			var yfuz;
-			var size;
-			var width;
-			var height;
-
-			for ( i = 0; i < this.VALID_AD_SIZES.length; i++ ) {
-				for ( xfuz = -this.PX_SIZE_TOL; xfuz <= this.PX_SIZE_TOL; xfuz++ ) {
-					for ( yfuz = -this.PX_SIZE_TOL; yfuz <= this.PX_SIZE_TOL; yfuz++ ) {
-						size = this.VALID_AD_SIZES[i];
-						width = size[0] + xfuz;
-						height = size[1] + yfuz;
-						set[width + 'x' + height] = size;
-					}
-				}
-			}
-			return set;
-		}
-	};
-
-	var Throttler = {
-		MAX_SEARCHES_PER_WINDOW: 10,
-		MAX_SEARCHES_PER_ELEMENT: 2,
-
-		countSearch: function(el) {
-			if ( typeof el.searches !== 'number' ) {
-				el.searches = 0;
-			}
-
-			el.searches += 1;
-		},
-
-		throttle: function(el, max) {
-			if ( typeof el.searches === 'number' && el.searches >= max ) {
-				return true;
-			}
-			return false;
-		},
-
-		throttleElement: function(el) {
-			return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
-		},
-
-		throttleWin: function(win) {
-			return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
-		},
-
-		getCount: function(el) {
-			return el.searches || 0;
-		}
-	};
-
-	function TopSearcher(win) {
-		this.win = win;
-		this.doc = win.document;
-	}
-
-	TopSearcher.prototype.search = function() {
-		var candidates = exports.utils.realArray(this.doc.querySelectorAll('img, object, embed')),
-			html5Ad,
-			ads = [];
-
-		ads = ads.concat(candidates.filter(function(el) {
-			if ( !el.mpAdFound && !Throttler.throttleElement(el) ) {
-				Throttler.countSearch(el);
-				if ( (el.tagName !== 'IMG' || isStandardImage(el)) && SizeMatcher.elementIsAdShaped(el) ) {
-					el.mpAdFound = true;
-					return true;
-				}
-			}
-			return false;
-		}));
-
-		html5Ad = this._mainGetHTMLAd();
-		if ( html5Ad ) {
-			html5Ad.html5 = true;
-			html5Ad.mpAdFound = true;
-			ads.push(html5Ad);
-		}
-
-		return ads;
-	};
-
-	TopSearcher.prototype._mainGetHTMLAd = function() {
-		var styles = this.doc.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
-			i, div;
-		for ( i = 0; i < styles.length; i++ ) {
-			div = styles[i].parentNode;
-			if ( !div.mpAdFound && SizeMatcher.elementIsAdShaped(div) && this._jumpedOut(div) ) {
-				return div;
-			}
-		}
-	};
-
-	TopSearcher.prototype._jumpedOut = function(el) {
-		var siblings, ifrs;
-		siblings = exports.utils.realArray(el.parentNode.children);
-		ifrs = siblings.filter(function(el) {
-			return el.tagName === 'IFRAME' && el.offsetWidth === 0 && el.offsetHeight === 0;
-		});
-		return ifrs.length > 0;
-	};
-
-	function IframeSearcher(win) {
-		this.MIN_AD_AREA = 14000;
-		this.MIN_WINDOW_PX = 10;
-
-		this.win = win;
-		this.doc = win.document;
-		this.body = win.document.body;
-		this.winClickTag = win.clickTag;
-		this.adSizeMeta = this._getAdSizeMeta();
-		this.numElementsInBody = (this.body && this.body.querySelectorAll('*').length) || 0;
-
-		this.shouldSearchWindow = false;
-		if ( !this.win.mpAdFound && this.body && !Throttler.throttleWin(this.win) ) {
-			this.winWidth = this.win.innerWidth;
-			this.winHeight = this.win.innerHeight;
-			if ( this._meetsMinAdSize(this.winWidth, this.winHeight) && !this._containsLargeIframes() ) {
-				this.shouldSearchWindow = true;
-			}
-		}
-
-	}
-
-	IframeSearcher.prototype.search = function() {
-		var ad;
-
-		if ( this.shouldSearchWindow ) {
-			ad = this._search();
-			if ( ad ) {
-				ad.mpAdFound = true;
-				win.mpAdFound = true;
-				return ad;
-			}
-			Throttler.countSearch(this.win);
-		}
-
-		return null;
-	};
-
-	IframeSearcher.prototype._search = function() {
-		var _this = this,
-			stdCandidates,
-			html5Candidates,
-			stdEl,
-			html5El;
-
-		stdCandidates = this.body.querySelectorAll('img, object, embed');
-
-		stdEl = getFirst(stdCandidates, function(el) {
-			if ( !el.mpAdFound &&
-				!Throttler.throttleElement(el) &&
-				(el.tagName !== 'IMG' || isStandardImage(el)) &&
-				_this._elementIsAtLeastAsBigAsWindow(el))
-			{
-				return true;
-			}
-			Throttler.countSearch(el);
-			return false;
-		});
-
-		if ( stdEl ) {
-			return stdEl;
-		}
-
-		if ( this._isHTML5Iframe() ) {
-			html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
-			html5El = getFirst(html5Candidates, function(el) {
-
-				if ( _this._elementIsAtLeastAsBigAsWindow(el) ) {
-					return true;
-				}
-				Throttler.countSearch(el);
-				return false;
-			});
-		}
-
-		if ( html5El ) {
-			html5El.html5 = true;
-			html5El.winClickTag = this.winClickTag;
-			html5El.adSizeMeta = this.adSizeMeta;
-			return html5El;
-		}
-
-		return null;
-	};
-
-	IframeSearcher.prototype._isHTML5Iframe = function() {
-		if ( this.winClickTag || this.adSizeMeta ) {
-			return true;
-		}
-
-		if ( this.doc.querySelectorAll('canvas', 'button', 'video', 'svg').length > 0 ) {
-			return true;
-		}
-
-		if ( this.numElementsInBody >= 5 && Throttler.getCount(this.win) > 0 && this.doc.querySelectorAll('div').length > 0 ) {
-			return true;
-		}
-
-		return false;
-	};
-
-	IframeSearcher.prototype._elementIsAtLeastAsBigAsWindow = function(el) {
-		var rect = el.getBoundingClientRect(),
-			tol = 0.95;
-
-		return rect.width >= (tol * this.winWidth) && rect.height >= (tol * this.winHeight);
-	};
-
-	IframeSearcher.prototype._meetsMinAdSize = function(width, height) {
-		return (width * height) >= this.MIN_AD_AREA;
-	};
-
-	IframeSearcher.prototype._containsLargeIframes = function() {
-		var iframes = this.doc.querySelectorAll('iframe');
-		var rect;
-		var i;
-		for ( i = 0; i < iframes.length; i++ ) {
-			rect = iframes[i].getBoundingClientRect();
-			if ( rect.width > this.MIN_WINDOW_PX || rect.height > this.MIN_WINDOW_PX ) {
-				return true;
-			}
-		}
-		return false;
-	};
-
-	IframeSearcher.prototype._getAdSizeMeta = function() {
-		var adSizeMeta = this.doc.querySelectorAll('meta[name="ad.size"]');
-		if ( adSizeMeta.length > 0 ) {
-			return adSizeMeta[0].content;
-		} else {
-			return null;
-		}
-	};
-
-	function getFirst(arr, testFn) {
-		var i, el;
-		for ( i = 0; i < arr.length; i++ ) {
-			el = arr[i];
-			if ( testFn(el) ) {
-				return el;
-			}
-		}
-		return null;
-	}
-
-	function isStandardImage(img) {
-
-		return img.src && (img.parentNode.tagName === 'A' || img.getAttribute('onclick'));
-	}
-
-	function getFriendlyIframes(win) {
-		var iframes = win.document.querySelectorAll('iframe');
-		iframes = exports.utils.realArray(iframes);
-		var friendlyIframes = iframes.filter(function(ifr) {
-			return exports.utils.isFriendlyWindow(ifr.contentWindow);
-		});
-		return friendlyIframes;
-	}
-
-	function findAds(win) {
-		var i,
-			iframes,
-			searcher,
-			ad,
-			ads = [];
-
-		if ( win === win.top ) {
-			searcher = new TopSearcher(win);
-			ads = ads.concat(searcher.search());
-		} else {
-			searcher = new IframeSearcher(win);
-			ad = searcher.search();
-			if ( ad ) {
-				ads.push(ad);
-			}
-		}
-
-		iframes = getFriendlyIframes(win);
-		for ( i = 0; i < iframes.length; i++ ) {
-			ads = ads.concat(findAds(iframes[i].contentWindow));
-		}
-
-		return ads;
-	}
-
-	exports.adfinder = {
-		getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
-		findAds: findAds
-	};
-})(exports);
-
-(function(exports) {
-
-	var parser = {
-		TAGS_WITH_SRC_ATTR: {
-			'IMG': true,
-			'SCRIPT': true,
-			'IFRAME': true,
-			'EMBED': true
-		},
-
-		MAX_ATTR_LEN: 100,
-
-		getUrl: function(el, params) {
-			var url;
-
-			if ( this.TAGS_WITH_SRC_ATTR.hasOwnProperty(el.tagName) ) {
-				url = el.src;
-
-			} else if ( el.tagName === 'OBJECT' ) {
-				url = el.data || (params && params.movie) || null;
-
-			} else if ( el.tagName === 'A' ) {
-				url = el.href;
-			}
-
-			if ( url && url.indexOf('http') === 0 ) {
-				return url;
-			} else {
-				return null;
-			}
-		},
-
-		getParams: function(el) {
-			if ( el.tagName !== 'OBJECT' ) {
-				return null;
-			}
-
-			var i, child;
-			var params = {};
-			var children = el.children;
-			for ( i = 0; i < children.length; i++ ) {
-				child = children[i];
-				if ( child.tagName === 'PARAM' && child.name ) {
-
-					params[child.name.toLowerCase()] = child.value;
-				}
-			}
-			return params;
-		},
-
-		getPosition: function(el) {
-			var rect = el.getBoundingClientRect();
-			var win = exports.utils.elementWindow(el);
-
-			return {
-				width: Math.round(rect.width),
-				height: Math.round(rect.height),
-				left: Math.round(rect.left + win.pageXOffset),
-				top: Math.round(rect.top + win.pageYOffset)
-			};
-		},
-
-		getFlashvars: function(el, params, url) {
-			var flashvars;
-			var urlQS = url && url.split('?')[1];
-
-			if ( el.tagName === 'EMBED' ) {
-				flashvars = el.getAttribute('flashvars') || urlQS;
-
-			} else if ( el.tagName === 'OBJECT' ) {
-				flashvars = params.flashvars || el.getAttribute('flashvars') || urlQS;
-			}
-
-			return (flashvars && exports.utils.parseQS(flashvars)) || null;
-		},
-
-		findClickThru: function(el, flashvars) {
-			var key;
-			if ( el.tagName === 'IMG' && el.parentElement.tagName === 'A' ) {
-				return el.parentElement.href;
-			} else if ( flashvars ) {
-				for ( key in flashvars ) {
-					if ( flashvars.hasOwnProperty(key) ) {
-
-						if ( key.toLowerCase().indexOf('clicktag') === 0 ) {
-							return flashvars[key];
-						}
-					}
-				}
-			}
-			return null;
-		},
-
-		getAttr: function(el, name) {
-			var val = el.getAttribute(name);
-
-			if ( val && val.slice && val.toString ) {
-
-				return val.slice(0, this.MAX_ATTR_LEN).toString();
-			} else {
-				return null;
-			}
-		},
-
-		putPropIfExists: function(obj, name, val) {
-			if ( val ) {
-				obj[name] = val;
-			}
-		},
-
-		putAttrIfExists: function(obj, el, name) {
-			var val = this.getAttr(el, name);
-			this.putPropIfExists(obj, name, val);
-		},
-
-		elementToJSON: function(el, opt_findClickThru) {
-			var pos = this.getPosition(el);
-			var params = this.getParams(el);
-			var url = this.getUrl(el, params);
-			var flashvars = this.getFlashvars(el, params, url);
-			var clickThru = opt_findClickThru && this.findClickThru(el, flashvars);
-			var json = {
-				tagName: el.tagName,
-				width: pos.width,
-				height: pos.height,
-				left: pos.left,
-				top: pos.top,
-				children: []
-			};
-
-			if ( params ) {
-
-				delete params.flashvars;
-			}
-
-			this.putAttrIfExists(json, el, 'id');
-			this.putAttrIfExists(json, el, 'class');
-			this.putAttrIfExists(json, el, 'name');
-
-			this.putPropIfExists(json, 'flashvars', flashvars);
-			this.putPropIfExists(json, 'url', url);
-			this.putPropIfExists(json, 'params', params);
-			this.putPropIfExists(json, 'clickThru', clickThru);
-
-			return json;
-		}
-	};
-
-	exports.parser = { elementToJSON: parser.elementToJSON.bind(parser) };
-})(exports);
-
-(function(exports) {
-
-	var ContextManager = function(adData) {
-		this.adData = adData;
-	};
-
-	ContextManager.prototype = {
-		CONTAINER_SIZE_TOL: 0.4,
-		ASPECT_RATIO_FOR_LEADERBOARDS: 2,
-
-		isValidContainer: function(el, opt_curWin) {
-
-			var cWidth = el.clientWidth;
-			var cHeight = el.clientHeight;
-
-			var adWidth = this.adData.width;
-			var adHeight = this.adData.height;
-
-			var winWidth = opt_curWin && opt_curWin.innerWidth;
-			var winHeight = opt_curWin && opt_curWin.innerHeight;
-			var similarWin = opt_curWin && this.withinTol(adWidth, winWidth) && this.withinTol(adHeight, winHeight);
-
-			var similarSizeX = this.withinTol(adWidth, cWidth);
-			var similarSizeY = this.withinTol(adHeight, cHeight);
-			var adAspect = adWidth / adHeight;
-
-			return similarWin || el.tagName === 'A' || (adAspect >= this.ASPECT_RATIO_FOR_LEADERBOARDS && similarSizeY) || (similarSizeX && similarSizeY);
-		},
-
-		withinTol: function(adlen, conlen) {
-			var pct = (conlen - adlen) / adlen;
-
-			return pct <= this.CONTAINER_SIZE_TOL;
-		},
-
-		serializeElements: function(el) {
-			if ( !el ) {
-				return;
-			}
-			var i;
-			var ifrWin;
-			var adId = this.adData.adId;
-			var elIsAd = false;
-
-			if ( adId && el[adId] && el[adId].isAd === true ) {
-				elIsAd = true;
-			}
-
-			var json = exports.parser.elementToJSON(el, elIsAd);
-			var childJSON;
-
-			if ( elIsAd ) {
-				json.adId = adId;
-				this.adData.element = {};
-
-				var keys = Object.keys(json);
-				for ( i = 0; i < keys.length; i++ ) {
-					var key = keys[i];
-					if ( key !== 'children' && key !== 'contents' ) {
-						this.adData.element[key] = json[key];
-					}
-				}
-			}
-
-			var children = exports.utils.realArray(el.children).filter(function(el) {
-				var param = el.tagName === 'PARAM';
-				var inlineScript = el.tagName === 'SCRIPT' && !(el.src && el.src.indexOf('http') >= 0);
-				var noScript = el.tagName === 'NOSCRIPT';
-				return !(param || inlineScript || noScript);
-			});
-
-			for ( i = 0; i < children.length; i++ ) {
-				childJSON = this.serializeElements(children[i]);
-				if ( childJSON ) {
-					json.children.push(childJSON);
-				}
-			}
-
-			if ( el.tagName === 'IFRAME' ) {
-				ifrWin = el.contentWindow;
-
-				if ( adId && el[adId] && el[adId].needsWindow ) {
-
-					json.contents = this.adData.serializedIframeContents;
-					el[adId].needsWindow = false;
-					delete this.adData.serializedIframeContents;
-
-				} else if ( exports.utils.isFriendlyWindow(ifrWin) ) {
-
-					childJSON = this.serializeElements(ifrWin.document.documentElement);
-					if ( childJSON ) {
-						json.contents = childJSON;
-					}
-				}
-			}
-
-			if ( json.children.length > 0 || json.adId || json.tagName === 'IFRAME' || json.url ) {
-				return json;
-			} else {
-				return null;
-			}
-		},
-
-		captureHTML: function(containerEl) {
-			this.adData.context = this.serializeElements(containerEl);
-		},
-
-		nodeCount: function(el) {
-			return el.getElementsByTagName('*').length + 1;
-		},
-
-		highestContainer: function(curWin, referenceElement) {
-			var curContainer = referenceElement;
-			var docEl = curWin.document.documentElement;
-			var parentContainer;
-
-			if ( curWin !== curWin.top && this.isValidContainer(docEl, curWin) ) {
-				return docEl;
-			}
-
-			while ( true ) {
-				parentContainer = curContainer.parentElement;
-				if ( parentContainer && this.isValidContainer(parentContainer) ) {
-					curContainer = parentContainer;
-				} else {
-					return curContainer;
-				}
-			}
-		}
-	};
-
-	var tagfinder = {
-
-		setPositions: function(adData, opt_el, opt_winPos) {
-			var el = opt_el || adData.context;
-			var winPos = opt_winPos || {left: 0, top: 0};
-			var ifrPos;
-
-			el.left += winPos.left;
-			el.top += winPos.top;
-
-			if ( el.children ) {
-				el.children.forEach(function(child) {
-					this.setPositions(adData, child, winPos);
-				}, this);
-			}
-
-			if ( el.contents ) {
-				ifrPos = {left: el.left, top: el.top};
-				this.setPositions(adData, el.contents, ifrPos);
-			}
-
-			if ( el.adId === adData.adId ) {
-				adData.element.left = el.left;
-				adData.element.top = el.top;
-			}
-		},
-
-		appendTags: function(adData, referenceElement) {
-			var mgr = new ContextManager(adData);
-			var curWin = exports.utils.elementWindow(referenceElement);
-			var highestContainer;
-
-			while ( true ) {
-				highestContainer = mgr.highestContainer(curWin, referenceElement);
-				mgr.captureHTML(highestContainer);
-				if ( curWin === curWin.top ) {
-					break;
-				} else {
-
-					curWin.mpAdFound = true;
-
-					mgr.adData.serializedIframeContents = mgr.adData.context;
-
-					if ( exports.utils.isFriendlyWindow(curWin.parent) ) {
-						referenceElement = curWin.frameElement;
-						referenceElement[mgr.adData.adId] = {needsWindow: true};
-						curWin = curWin.parent;
-					} else {
-						break;
-					}
-				}
-			}
-			return {
-				referenceElement:referenceElement,
-				highestContainer: highestContainer
-			};
-		}
-	};
-
-	exports.tagfinder = tagfinder;
-})(exports);
-
-(function(exports) {
-	var _onAdFound;
-	var _logGen = new exports.utils.LogGenerator();
-	var _pageTags;
-	var INIT_MS_BW_SEARCHES = 2000;
-	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
-	var POST_MSG_ID = '1511804838-25881-9878-26947-14879';
-	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
-
-	function getPageTags(doc) {
-		var scripts = doc.getElementsByTagName('script');
-		var pageTags = [];
-		scripts = exports.utils.realArray(scripts);
-		scripts.forEach(function(script) {
-			if ( PAGE_TAG_RE.exec(script.src) ) {
-				pageTags.push({'tagName': 'SCRIPT', 'url': script.src});
-			}
-		});
-		return pageTags;
-	}
-
-	function messageAllParentFrames(adData) {
-
-		adData.postMessageId = POST_MSG_ID;
-
-		adData = JSON.stringify(adData);
-
-		var win = window;
-		while ( win !== win.top ) {
-			win = win.parent;
-			win.postMessage(adData, '*');
-		}
-	}
-
-	function appendTagsAndSendToParent(adData, referenceElement) {
-		var results = exports.tagfinder.appendTags(adData, referenceElement);
-		if ( exports.utils.SCRIPT_IN_HOSTILE_IFRAME ) {
-			messageAllParentFrames(adData);
-
-		} else if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
-
-			exports.tagfinder.setPositions(adData);
-
-			adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
-			if ( !adData.matchedSize ) {
-
-				if ( AD_SERVER_RE.exec(results.referenceElement.id) ) {
-					adData.matchedSize = [adData.width, adData.height];
-					adData.oddSize = true;
-				} else {
-
-					return;
-				}
-			}
-			delete adData.width;
-			delete adData.height;
-			adData.curPageUrl = exports.utils.getPageUrl();
-			_pageTags = _pageTags || getPageTags(document);
-			var log = _logGen.log('ad', [adData], _pageTags);
-
-			if ( _onAdFound ) {
-
-					_onAdFound(log, results.referenceElement);
-
-			}
-		}
-	}
-
-	function extractAdsWrapper() {
-		if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
-			extractAds();
-		}
-		setTimeout(
-			function() { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES
-		);
-	}
-
-	function extractAds() {
-		var ads = exports.adfinder.findAds(window);
-		ads.forEach(function(ad) {
-
-			var startTime = new Date().getTime();
-			var adId = startTime + '-' + Math.floor(Math.random() * 10e12);
-
-			var adData = {
-				width: Math.round(ad.offsetWidth),
-				height: Math.round(ad.offsetHeight),
-				startTime: startTime,
-				adId: adId,
-				html5: ad.html5 || false
-			};
-
-			if ( ad.html5 ) {
-				adData.adSizeMeta = ad.adSizeMeta || null;
-				adData.winClickTag = ad.winClickTag || null;
-			}
-
-			ad[adId] = { isAd: true };
-
-			appendTagsAndSendToParent(adData, ad);
-		});
-	}
-
-	function isChildWin(myWin, otherWin) {
-		var parentWin = otherWin.parent;
-		while ( parentWin !== otherWin ) {
-			if ( parentWin === myWin ) {
-				return true;
-			}
-			otherWin = parentWin;
-			parentWin = parentWin.parent;
-		}
-		return false;
-	}
-
-	function iframeFromWindow(win, winToMatch) {
-		var i, ifr, ifrWin,
-			iframes = win.document.querySelectorAll('iframe');
-
-		for ( i = 0; i < iframes.length; i++ ) {
-			ifr = iframes[i];
-			if ( ifr.contentWindow === winToMatch ) {
-				return ifr;
-			}
-		}
-
-		for ( i = 0; i < iframes.length; i++ ) {
-			ifrWin = iframes[i].contentWindow;
-			if ( exports.utils.isFriendlyWindow(ifrWin) ) {
-				ifr = iframeFromWindow(ifrWin, winToMatch);
-				if ( ifr ) {
-					return ifr;
-				}
-			}
-		}
-	}
-
-	function onPostMessage(event) {
-		var adData,
-			ifrWin = event.source,
-
-			myWin = window.document.defaultView,
-			ifrTag;
-
-		try {
-
-			adData = JSON.parse(event.data);
-		} catch(e) {
-
-			return;
-		}
-
-		if ( adData.postMessageId === POST_MSG_ID ) {
-
-			delete adData.postMessageId;
-
-			event.stopImmediatePropagation();
-
-			if ( isChildWin(myWin, ifrWin) ) {
-				if ( exports.utils.isFriendlyWindow(ifrWin) ) {
-					ifrTag = ifrWin.frameElement;
-				} else {
-					ifrTag = iframeFromWindow(myWin, ifrWin);
-				}
-
-				if ( ifrTag ) {
-					ifrTag[adData.adId] = {needsWindow: true};
-					appendTagsAndSendToParent(adData, ifrTag);
-				}
-			}
-		}
-	}
-
-	function onVideoMessage(msg, sender, callback) {
-		var log;
-		if ( msg.event === 'new-video-ad' ) {
-			msg.assets.forEach(function(asset) {
-
-			});
-			log = _logGen.log('video', msg.assets);
-		} else {
-			log = _logGen.log('invalid-video', msg.assets);
-		}
-
-		msg.assets.forEach(function(a) {delete a.isVideo;});
-		log.displayAdFound = msg.displayAdFound;
-		log.requests = msg.requests;
-		log.data = msg.event_data;
-
-		log.doc.finalPageUrl = log.doc.url;
-		log.doc.url = exports.utils.normalizeUrl(msg.origUrl);
-
-		_onAdFound(log);
-	}
-
-	function addBackgroundListener(event, callback) {
-		if ( typeof browser !== 'undefined' ) {
-			browser.runtime.onMessage.addListener(function(msg) {
-				if ( msg.event === event ) {
-					callback(msg);
-				}
-			});
-		} else if ( typeof chrome !== 'undefined' ) {
-			chrome.runtime.onMessage.addListener(function(msg) {
-				if ( msg.event === event ) {
-					callback(msg);
-				}
-			});
-		} else if ( window.self.port ) {
-			window.self.port.on(event, callback);
-		}
-	}
-
-	exports.coordinator = {
-		addPostMessageListener: function() {
-			if ( !exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
-				window.addEventListener('message', onPostMessage, false);
-			}
-		},
-
-		blockedRobotsMsgGen: function(sendFcn, origUrl) {
-
-			if ( origUrl.indexOf('google.com/_/chrome/newtab') === -1 ) {
-				var onBlockedRobotsMessage = function() {
-					var log;
-					log = _logGen.log('invalid-robotstxt', []);
-					log.doc.finalPageUrl = log.doc.url;
-					log.doc.url = exports.utils.normalizeUrl(origUrl);
-
-					sendFcn(log);
-				};
-				return onBlockedRobotsMessage;
-			} else {
-				return function() {};
-			}
-		},
-
-		init: function(onAdFound) {
-
-			if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
-				return false;
-			}
-
-			_onAdFound = onAdFound;
-			if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
-				var log = _logGen.log('page');
-				onAdFound(log);
-
-				window.addEventListener('beforeunload', function(event) {
-					var log = _logGen.log('unload');
-					log.timing = window.performance.timing;
-					onAdFound(log);
-				});
-
-				addBackgroundListener('new-video-ad', onVideoMessage);
-				addBackgroundListener('new-invalid-video-ad', onVideoMessage);
-
-			}
-
-			exports.utils.onDocLoaded(document, extractAdsWrapper);
-		}
-	};
-
-})(exports);
-
-if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
-	window.adparser = {
-		init: exports.coordinator.init,
-		addPostMessageListener: exports.coordinator.addPostMessageListener,
-		askIfTrackingEnabled: exports.utils.askIfTrackingEnabled,
-		blockedRobotsMsgGen: exports.coordinator.blockedRobotsMsgGen,
-		inWindowTop: exports.utils.SCRIPT_IN_WINDOW_TOP,
-		sendToBackground: exports.utils.sendToBackground
-	};
-} else {
-	exports.coordinator.addPostMessageListener();
-	exports.utils.askIfTrackingEnabled(
-		function() {
-			exports.coordinator.init(function() {});
-		},
-		function() {}
-	);
-}
-})(window);
-(function(adparser, pageUrl) {
-	function onAdFound(log) {
-		adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', function(){});
-	}
-
-	if (  adparser && adparser.inWindowTop  ) {
-		adparser.addPostMessageListener();
-		adparser.askIfTrackingEnabled(
-			function() {
-				adparser.init(onAdFound);
-			},
-			adparser.blockedRobotsMsgGen(onAdFound, pageUrl)
-		)
-	}
-})(window.adparser, window.location.href);
diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js
index ac3938f2a..3e9a6658f 100644
--- a/src/drivers/webextension/js/inject.js
+++ b/src/drivers/webextension/js/inject.js
@@ -1,26 +1,50 @@
-(function() {
-	try {
-    addEventListener('message', (event => {
-      if ( event.data.id !== 'patterns' ) {
+/* eslint-env browser */
+
+(() => {
+  try {
+    const detectJs = (chain) => {
+      const properties = chain.split('.');
+
+      let value = properties.length ? window : null;
+
+      for (let i = 0; i < properties.length; i++) {
+        const property = properties[i];
+
+        if (value && value.hasOwnProperty(property)) {
+          value = value[property];
+        } else {
+          value = null;
+
+          break;
+        }
+      }
+
+      return typeof value === 'string' || typeof value === 'number' ? value : !!value;
+    };
+
+    const onMessage = (event) => {
+      if (event.data.id !== 'patterns') {
         return;
       }
 
+      removeEventListener('message', onMessage);
+
       const patterns = event.data.patterns || {};
 
       const js = {};
 
-      for ( let appName in patterns ) {
-        if ( patterns.hasOwnProperty(appName) ) {
+      for (const appName in patterns) {
+        if (patterns.hasOwnProperty(appName)) {
           js[appName] = {};
 
-          for ( let chain in patterns[appName] ) {
-            if ( patterns[appName].hasOwnProperty(chain) ) {
+          for (const chain in patterns[appName]) {
+            if (patterns[appName].hasOwnProperty(chain)) {
               js[appName][chain] = {};
 
-              for ( let index in patterns[appName][chain] ) {
+              for (const index in patterns[appName][chain]) {
                 const value = detectJs(chain);
 
-                if ( value ) {
+                if (value && patterns[appName][chain].hasOwnProperty(index)) {
                   js[appName][chain][index] = value;
                 }
               }
@@ -29,33 +53,11 @@
         }
       }
 
-      postMessage({ id: 'js', js }, '*');
-    }), false);
-  } catch(e) {
-    // Fail quietly
-  }
-
-  function detectJs(chain) {
-    try {
-      const properties = chain.split('.');
+      postMessage({ id: 'js', js }, window.location.href);
+    };
 
-      var value = properties.length ? window : null;
-
-      for ( let i = 0; i < properties.length; i ++ ) {
-        var property = properties[i];
-
-        if ( value.hasOwnProperty(property) ) {
-          value = value[property];
-        } else {
-          value = null;
-
-          break;
-        }
-      }
-
-      return typeof value === 'string' ? value : !!value;
-    } catch(e) {
-      // Fail quietly
-    }
+    addEventListener('message', onMessage);
+  } catch (e) {
+    // Fail quietly
   }
-}());
+})();
diff --git a/src/drivers/webextension/js/jsontodom.js b/src/drivers/webextension/js/jsontodom.js
deleted file mode 100644
index c6506c4fb..000000000
--- a/src/drivers/webextension/js/jsontodom.js
+++ /dev/null
@@ -1,63 +0,0 @@
-jsonToDOM.namespaces = {
-	html: "http://www.w3.org/1999/xhtml",
-	xul: "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-};
-
-jsonToDOM.defaultNamespace = jsonToDOM.namespaces.html;
-
-function jsonToDOM(jsonTemplate, doc, nodes) {
-	function namespace(name) {
-		var reElemNameParts = /^(?:(.*):)?(.*)$/.exec(name);
-		return { namespace: jsonToDOM.namespaces[reElemNameParts[1]], shortName: reElemNameParts[2] };
-	}
-
-	// Note that 'elemNameOrArray' is: either the full element name (eg. [html:]div) or an array of elements in JSON notation
-	function tag(elemNameOrArray, elemAttr) {
-		// Array of elements?  Parse each one...
-		if (Array.isArray(elemNameOrArray)) {
-			var frag = doc.createDocumentFragment();
-			Array.prototype.forEach.call(arguments, function(thisElem) {
-				frag.appendChild(tag.apply(null, thisElem));
-			});
-			return frag;
-		}
-
-		// Single element? Parse element namespace prefix (if none exists, default to defaultNamespace), and create element
-		var elemNs = namespace(elemNameOrArray);
-		var elem = doc.createElementNS(elemNs.namespace || jsonToDOM.defaultNamespace, elemNs.shortName);
-
-		// Set element's attributes and/or callback functions (eg. onclick)
-		for (var key in elemAttr) {
-			var val = elemAttr[key];
-			if (nodes && key == "key") {
-				nodes[val] = elem;
-				continue;
-			}
-
-			var attrNs = namespace(key);
-			if (typeof val == "function") {
-				// Special case for function attributes; don't just add them as 'on...' attributes, but as events, using addEventListener
-				elem.addEventListener(key.replace(/^on/, ""), val, false);
-			}
-			else {
-				// Note that the default namespace for XML attributes is, and should be, blank (ie. they're not in any namespace)
-				elem.setAttributeNS(attrNs.namespace || "", attrNs.shortName, val);
-			}
-		}
-
-		// Create and append this element's children
-		var childElems = Array.prototype.slice.call(arguments, 2);
-		childElems.forEach(function(childElem) {
-			if (childElem != null) {
-				elem.appendChild(
-					childElem instanceof doc.defaultView.Node ? childElem :
-						Array.isArray(childElem) ? tag.apply(null, childElem) :
-						doc.createTextNode(childElem));
-			}
-		});
-
-		return elem;
-	}
-
-	return tag.apply(null, jsonTemplate);
-}
diff --git a/src/drivers/webextension/js/lib/iframe.js b/src/drivers/webextension/js/lib/iframe.js
new file mode 100644
index 000000000..491d26257
--- /dev/null
+++ b/src/drivers/webextension/js/lib/iframe.js
@@ -0,0 +1,1142 @@
+
+
+(function (win) {
+  const exports = {};
+
+  (function (exports) {
+    const utils = {
+      normalizeUrl(url) {
+        return this.hashUrl(url) || null;
+      },
+
+      getReferrer() {
+        return this.normalizeUrl(document.referrer);
+      },
+
+      getPageUrl() {
+        return this.normalizeUrl(window.location.href);
+      },
+      hashUrl(url) {
+        let a,
+          result;
+
+        if (!url || url.indexOf('http') !== 0) {
+          return null;
+        }
+
+        a = document.createElement('a');
+        a.href = url;
+
+        result = `${a.protocol}//${a.hostname}/`;
+
+        if (a.pathname && a.pathname !== '/') {
+          result += this.hashCode(a.pathname);
+        }
+
+        if (a.search) {
+          result += `?${this.hashCode(a.search)}`;
+        }
+
+        if (a.hash) {
+          result += `#${this.hashCode(a.hash)}`;
+        }
+
+        return result;
+      },
+
+      hashCode(str) {
+        let hash = 0,
+          kar,
+          i;
+
+        if (str.length === 0) {
+          return hash;
+        }
+
+        for (i = 0; i < str.length; i++) {
+          kar = str.charCodeAt(i);
+          hash = ((hash << 5) - hash) + kar;
+          hash &= hash;
+        }
+
+        return hash + Math.pow(2, 32);
+      },
+
+      realArray(a) {
+        return Array.prototype.slice.apply(a);
+      },
+
+      onDocLoaded(doc, callback) {
+        if (doc.readyState === 'loading') {
+          doc.addEventListener('DOMContentLoaded', callback);
+        } else {
+          callback();
+        }
+      },
+
+      SCRIPT_IN_WINDOW_TOP: window === window.top,
+
+      isFriendlyWindow(win) {
+        let href;
+        try {
+          href = win.location.href;
+        } catch (e) {
+          return false;
+        }
+        return true;
+      },
+
+      elementWindow(el) {
+        return el.ownerDocument.defaultView;
+      },
+
+      viewport(win) {
+        return { width: win.innerWidth, height: win.innerHeight };
+      },
+
+      parseQS(qs) {
+        if (qs.indexOf('http') === 0) {
+          qs = qs.split('?')[1];
+        }
+        let i,
+          kvs,
+          key,
+          val;
+        const dict = {};
+        qs = qs.split('&');
+        for (i = 0; i < qs.length; i++) {
+          kvs = qs[i].split('=');
+          key = kvs[0];
+          val = kvs.slice(1).join('=');
+          try {
+            dict[key] = window.decodeURIComponent(val);
+          } catch (e) {
+            continue;
+          }
+        }
+        return dict;
+      },
+      sendToBackground(message, event, responseMessage, onResponse) {
+        if (typeof browser !== 'undefined') {
+          const response = browser.runtime.sendMessage(message);
+          response.then(onResponse);
+        } else if (typeof chrome !== 'undefined') {
+          chrome.runtime.sendMessage(message, onResponse);
+        } else if (window.self.port) {
+          window.self.port.on(responseMessage, onResponse);
+          window.self.port.emit(event, message);
+        }
+      },
+
+      askIfTrackingEnabled(callback, elseCallback) {
+        this.sendToBackground(
+          'is_tracking_enabled',
+          '',
+          'tracking_enabled_response',
+          (message) => {
+            if (message && message.tracking_enabled) {
+              callback();
+            } else {
+              elseCallback();
+            }
+          }
+        );
+      },
+    };
+
+    utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
+    utils.SCRIPT_IN_HOSTILE_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && !utils.SCRIPT_IN_FRIENDLY_IFRAME;
+
+    function LogGenerator() {
+      this.msgNum = 0;
+      this.pageMeta = {
+        url: utils.getPageUrl(),
+        isHP: window.location.pathname === '/',
+        referrer: utils.getReferrer(),
+        rand: Math.floor(Math.random() * 10e12),
+        startTime: new Date().getTime(),
+      };
+    }
+
+    LogGenerator.prototype = {
+      log(event, opt_assets, opt_pageTags) {
+        let opt_video_assets;
+        if (event === 'video' || event === 'invalid-video') {
+          opt_video_assets = opt_assets || [];
+          opt_assets = [];
+        } else {
+          opt_video_assets = [];
+          opt_assets = opt_assets || [];
+        }
+        const result = {
+          doc: this.pageMeta,
+          event,
+          video_assets: opt_video_assets,
+          assets: opt_assets,
+          version: '3',
+          mrev: 'fe20291-c',
+          msgNum: this.msgNum,
+          timestamp: new Date().getTime(),
+          pageVis: document.visibilityState,
+          pageFoc: document.hasFocus(),
+          pageTags: opt_pageTags || [],
+        };
+        this.msgNum++;
+        return result;
+      },
+    };
+
+    utils.LogGenerator = LogGenerator;
+
+    exports.utils = utils;
+  }(exports));
+
+  (function (exports) {
+    const SizeMatcher = {
+      VALID_AD_SIZES: [
+        [300, 50],
+        [320, 50],
+        [160, 600],
+        [300, 250],
+        [300, 600],
+        [300, 1050],
+        [336, 280],
+        [336, 850],
+        [468, 60],
+        [728, 90],
+        [728, 250],
+        [728, 270],
+        [970, 66],
+        [970, 90],
+        [970, 125],
+        [970, 250],
+        [970, 400],
+        [970, 415],
+        [1280, 100],
+      ],
+
+      PX_SIZE_TOL: 10,
+
+      getMatchedAdSize(width, height) {
+        if (!this.set) {
+          this.set = this._makeSizeSet();
+        }
+
+        return this.set[`${Math.round(width)}x${Math.round(height)}`];
+      },
+
+      elementIsAdShaped(el) {
+        return !!this.getMatchedAdSizeForElement(el);
+      },
+
+      getMatchedAdSizeForElement(el) {
+        const rect = el.getBoundingClientRect();
+        return this.getMatchedAdSize(rect.width, rect.height);
+      },
+
+      _makeSizeSet() {
+        const set = {};
+        let i;
+        let xfuz;
+        let yfuz;
+        let size;
+        let width;
+        let height;
+
+        for (i = 0; i < this.VALID_AD_SIZES.length; i++) {
+          for (xfuz = -this.PX_SIZE_TOL; xfuz <= this.PX_SIZE_TOL; xfuz++) {
+            for (yfuz = -this.PX_SIZE_TOL; yfuz <= this.PX_SIZE_TOL; yfuz++) {
+              size = this.VALID_AD_SIZES[i];
+              width = size[0] + xfuz;
+              height = size[1] + yfuz;
+              set[`${width}x${height}`] = size;
+            }
+          }
+        }
+        return set;
+      },
+    };
+
+    const Throttler = {
+      MAX_SEARCHES_PER_WINDOW: 10,
+      MAX_SEARCHES_PER_ELEMENT: 2,
+
+      countSearch(el) {
+        if (typeof el.searches !== 'number') {
+          el.searches = 0;
+        }
+
+        el.searches += 1;
+      },
+
+      throttle(el, max) {
+        if (typeof el.searches === 'number' && el.searches >= max) {
+          return true;
+        }
+        return false;
+      },
+
+      throttleElement(el) {
+        return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
+      },
+
+      throttleWin(win) {
+        return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
+      },
+
+      getCount(el) {
+        return el.searches || 0;
+      },
+    };
+
+    function TopSearcher(win) {
+      this.win = win;
+      this.doc = win.document;
+    }
+
+    TopSearcher.prototype.search = function () {
+      let candidates = exports.utils.realArray(this.doc.querySelectorAll('img, object, embed')),
+        html5Ad,
+        ads = [];
+
+      ads = ads.concat(candidates.filter((el) => {
+        if (!el.mpAdFound && !Throttler.throttleElement(el)) {
+          Throttler.countSearch(el);
+          if ((el.tagName !== 'IMG' || isStandardImage(el)) && SizeMatcher.elementIsAdShaped(el)) {
+            el.mpAdFound = true;
+            return true;
+          }
+        }
+        return false;
+      }));
+
+      html5Ad = this._mainGetHTMLAd();
+      if (html5Ad) {
+        html5Ad.html5 = true;
+        html5Ad.mpAdFound = true;
+        ads.push(html5Ad);
+      }
+
+      return ads;
+    };
+
+    TopSearcher.prototype._mainGetHTMLAd = function () {
+      let styles = this.doc.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
+        i,
+        div;
+      for (i = 0; i < styles.length; i++) {
+        div = styles[i].parentNode;
+        if (!div.mpAdFound && SizeMatcher.elementIsAdShaped(div) && this._jumpedOut(div)) {
+          return div;
+        }
+      }
+    };
+
+    TopSearcher.prototype._jumpedOut = function (el) {
+      let siblings,
+        ifrs;
+      siblings = exports.utils.realArray(el.parentNode.children);
+      ifrs = siblings.filter(el => el.tagName === 'IFRAME' && el.offsetWidth === 0 && el.offsetHeight === 0);
+      return ifrs.length > 0;
+    };
+
+    function IframeSearcher(win) {
+      this.MIN_AD_AREA = 14000;
+      this.MIN_WINDOW_PX = 10;
+
+      this.win = win;
+      this.doc = win.document;
+      this.body = win.document.body;
+      this.winClickTag = win.clickTag;
+      this.adSizeMeta = this._getAdSizeMeta();
+      this.numElementsInBody = (this.body && this.body.querySelectorAll('*').length) || 0;
+
+      this.shouldSearchWindow = false;
+      if (!this.win.mpAdFound && this.body && !Throttler.throttleWin(this.win)) {
+        this.winWidth = this.win.innerWidth;
+        this.winHeight = this.win.innerHeight;
+        if (this._meetsMinAdSize(this.winWidth, this.winHeight) && !this._containsLargeIframes()) {
+          this.shouldSearchWindow = true;
+        }
+      }
+    }
+
+    IframeSearcher.prototype.search = function () {
+      let ad;
+
+      if (this.shouldSearchWindow) {
+        ad = this._search();
+        if (ad) {
+          ad.mpAdFound = true;
+          win.mpAdFound = true;
+          return ad;
+        }
+        Throttler.countSearch(this.win);
+      }
+
+      return null;
+    };
+
+    IframeSearcher.prototype._search = function () {
+      let _this = this,
+        stdCandidates,
+        html5Candidates,
+        stdEl,
+        html5El;
+
+      stdCandidates = this.body.querySelectorAll('img, object, embed');
+
+      stdEl = getFirst(stdCandidates, (el) => {
+        if (!el.mpAdFound
+				&& !Throttler.throttleElement(el)
+				&& (el.tagName !== 'IMG' || isStandardImage(el))
+				&& _this._elementIsAtLeastAsBigAsWindow(el)) {
+          return true;
+        }
+        Throttler.countSearch(el);
+        return false;
+      });
+
+      if (stdEl) {
+        return stdEl;
+      }
+
+      if (this._isHTML5Iframe()) {
+        html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
+        html5El = getFirst(html5Candidates, (el) => {
+          if (_this._elementIsAtLeastAsBigAsWindow(el)) {
+            return true;
+          }
+          Throttler.countSearch(el);
+          return false;
+        });
+      }
+
+      if (html5El) {
+        html5El.html5 = true;
+        html5El.winClickTag = this.winClickTag;
+        html5El.adSizeMeta = this.adSizeMeta;
+        return html5El;
+      }
+
+      return null;
+    };
+
+    IframeSearcher.prototype._isHTML5Iframe = function () {
+      if (this.winClickTag || this.adSizeMeta) {
+        return true;
+      }
+
+      if (this.doc.querySelectorAll('canvas', 'button', 'video', 'svg').length > 0) {
+        return true;
+      }
+
+      if (this.numElementsInBody >= 5 && Throttler.getCount(this.win) > 0 && this.doc.querySelectorAll('div').length > 0) {
+        return true;
+      }
+
+      return false;
+    };
+
+    IframeSearcher.prototype._elementIsAtLeastAsBigAsWindow = function (el) {
+      let rect = el.getBoundingClientRect(),
+        tol = 0.95;
+
+      return rect.width >= (tol * this.winWidth) && rect.height >= (tol * this.winHeight);
+    };
+
+    IframeSearcher.prototype._meetsMinAdSize = function (width, height) {
+      return (width * height) >= this.MIN_AD_AREA;
+    };
+
+    IframeSearcher.prototype._containsLargeIframes = function () {
+      const iframes = this.doc.querySelectorAll('iframe');
+      let rect;
+      let i;
+      for (i = 0; i < iframes.length; i++) {
+        rect = iframes[i].getBoundingClientRect();
+        if (rect.width > this.MIN_WINDOW_PX || rect.height > this.MIN_WINDOW_PX) {
+          return true;
+        }
+      }
+      return false;
+    };
+
+    IframeSearcher.prototype._getAdSizeMeta = function () {
+      const adSizeMeta = this.doc.querySelectorAll('meta[name="ad.size"]');
+      if (adSizeMeta.length > 0) {
+        return adSizeMeta[0].content;
+      }
+      return null;
+    };
+
+    function getFirst(arr, testFn) {
+      let i,
+        el;
+      for (i = 0; i < arr.length; i++) {
+        el = arr[i];
+        if (testFn(el)) {
+          return el;
+        }
+      }
+      return null;
+    }
+
+    function isStandardImage(img) {
+      return img.src && (img.parentNode.tagName === 'A' || img.getAttribute('onclick'));
+    }
+
+    function getFriendlyIframes(win) {
+      let iframes = win.document.querySelectorAll('iframe');
+      iframes = exports.utils.realArray(iframes);
+      const friendlyIframes = iframes.filter(ifr => exports.utils.isFriendlyWindow(ifr.contentWindow));
+      return friendlyIframes;
+    }
+
+    function findAds(win) {
+      let i,
+        iframes,
+        searcher,
+        ad,
+        ads = [];
+
+      if (win === win.top) {
+        searcher = new TopSearcher(win);
+        ads = ads.concat(searcher.search());
+      } else {
+        searcher = new IframeSearcher(win);
+        ad = searcher.search();
+        if (ad) {
+          ads.push(ad);
+        }
+      }
+
+      iframes = getFriendlyIframes(win);
+      for (i = 0; i < iframes.length; i++) {
+        ads = ads.concat(findAds(iframes[i].contentWindow));
+      }
+
+      return ads;
+    }
+
+    exports.adfinder = {
+      getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
+      findAds,
+    };
+  }(exports));
+
+  (function (exports) {
+    const parser = {
+      TAGS_WITH_SRC_ATTR: {
+        IMG: true,
+        SCRIPT: true,
+        IFRAME: true,
+        EMBED: true,
+      },
+
+      MAX_ATTR_LEN: 100,
+
+      getUrl(el, params) {
+        let url;
+
+        if (this.TAGS_WITH_SRC_ATTR.hasOwnProperty(el.tagName)) {
+          url = el.src;
+        } else if (el.tagName === 'OBJECT') {
+          url = el.data || (params && params.movie) || null;
+        } else if (el.tagName === 'A') {
+          url = el.href;
+        }
+
+        if (url && url.indexOf('http') === 0) {
+          return url;
+        }
+        return null;
+      },
+
+      getParams(el) {
+        if (el.tagName !== 'OBJECT') {
+          return null;
+        }
+
+        let i,
+          child;
+        const params = {};
+        const children = el.children;
+        for (i = 0; i < children.length; i++) {
+          child = children[i];
+          if (child.tagName === 'PARAM' && child.name) {
+            params[child.name.toLowerCase()] = child.value;
+          }
+        }
+        return params;
+      },
+
+      getPosition(el) {
+        const rect = el.getBoundingClientRect();
+        const win = exports.utils.elementWindow(el);
+
+        return {
+          width: Math.round(rect.width),
+          height: Math.round(rect.height),
+          left: Math.round(rect.left + win.pageXOffset),
+          top: Math.round(rect.top + win.pageYOffset),
+        };
+      },
+
+      getFlashvars(el, params, url) {
+        let flashvars;
+        const urlQS = url && url.split('?')[1];
+
+        if (el.tagName === 'EMBED') {
+          flashvars = el.getAttribute('flashvars') || urlQS;
+        } else if (el.tagName === 'OBJECT') {
+          flashvars = params.flashvars || el.getAttribute('flashvars') || urlQS;
+        }
+
+        return (flashvars && exports.utils.parseQS(flashvars)) || null;
+      },
+
+      findClickThru(el, flashvars) {
+        let key;
+        if (el.tagName === 'IMG' && el.parentElement.tagName === 'A') {
+          return el.parentElement.href;
+        } if (flashvars) {
+          for (key in flashvars) {
+            if (flashvars.hasOwnProperty(key)) {
+              if (key.toLowerCase().indexOf('clicktag') === 0) {
+                return flashvars[key];
+              }
+            }
+          }
+        }
+        return null;
+      },
+
+      getAttr(el, name) {
+        const val = el.getAttribute(name);
+
+        if (val && val.slice && val.toString) {
+          return val.slice(0, this.MAX_ATTR_LEN).toString();
+        }
+        return null;
+      },
+
+      putPropIfExists(obj, name, val) {
+        if (val) {
+          obj[name] = val;
+        }
+      },
+
+      putAttrIfExists(obj, el, name) {
+        const val = this.getAttr(el, name);
+        this.putPropIfExists(obj, name, val);
+      },
+
+      elementToJSON(el, opt_findClickThru) {
+        const pos = this.getPosition(el);
+        const params = this.getParams(el);
+        const url = this.getUrl(el, params);
+        const flashvars = this.getFlashvars(el, params, url);
+        const clickThru = opt_findClickThru && this.findClickThru(el, flashvars);
+        const json = {
+          tagName: el.tagName,
+          width: pos.width,
+          height: pos.height,
+          left: pos.left,
+          top: pos.top,
+          children: [],
+        };
+
+        if (params) {
+          delete params.flashvars;
+        }
+
+        this.putAttrIfExists(json, el, 'id');
+        this.putAttrIfExists(json, el, 'class');
+        this.putAttrIfExists(json, el, 'name');
+
+        this.putPropIfExists(json, 'flashvars', flashvars);
+        this.putPropIfExists(json, 'url', url);
+        this.putPropIfExists(json, 'params', params);
+        this.putPropIfExists(json, 'clickThru', clickThru);
+
+        return json;
+      },
+    };
+
+    exports.parser = { elementToJSON: parser.elementToJSON.bind(parser) };
+  }(exports));
+
+  (function (exports) {
+    const ContextManager = function (adData) {
+      this.adData = adData;
+    };
+
+    ContextManager.prototype = {
+      CONTAINER_SIZE_TOL: 0.4,
+      ASPECT_RATIO_FOR_LEADERBOARDS: 2,
+
+      isValidContainer(el, opt_curWin) {
+        const cWidth = el.clientWidth;
+        const cHeight = el.clientHeight;
+
+        const adWidth = this.adData.width;
+        const adHeight = this.adData.height;
+
+        const winWidth = opt_curWin && opt_curWin.innerWidth;
+        const winHeight = opt_curWin && opt_curWin.innerHeight;
+        const similarWin = opt_curWin && this.withinTol(adWidth, winWidth) && this.withinTol(adHeight, winHeight);
+
+        const similarSizeX = this.withinTol(adWidth, cWidth);
+        const similarSizeY = this.withinTol(adHeight, cHeight);
+        const adAspect = adWidth / adHeight;
+
+        return similarWin || el.tagName === 'A' || (adAspect >= this.ASPECT_RATIO_FOR_LEADERBOARDS && similarSizeY) || (similarSizeX && similarSizeY);
+      },
+
+      withinTol(adlen, conlen) {
+        const pct = (conlen - adlen) / adlen;
+
+        return pct <= this.CONTAINER_SIZE_TOL;
+      },
+
+      serializeElements(el) {
+        if (!el) {
+          return;
+        }
+        let i;
+        let ifrWin;
+        const adId = this.adData.adId;
+        let elIsAd = false;
+
+        if (adId && el[adId] && el[adId].isAd === true) {
+          elIsAd = true;
+        }
+
+        const json = exports.parser.elementToJSON(el, elIsAd);
+        let childJSON;
+
+        if (elIsAd) {
+          json.adId = adId;
+          this.adData.element = {};
+
+          const keys = Object.keys(json);
+          for (i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            if (key !== 'children' && key !== 'contents') {
+              this.adData.element[key] = json[key];
+            }
+          }
+        }
+
+        const children = exports.utils.realArray(el.children).filter((el) => {
+          const param = el.tagName === 'PARAM';
+          const inlineScript = el.tagName === 'SCRIPT' && !(el.src && el.src.indexOf('http') >= 0);
+          const noScript = el.tagName === 'NOSCRIPT';
+          return !(param || inlineScript || noScript);
+        });
+
+        for (i = 0; i < children.length; i++) {
+          childJSON = this.serializeElements(children[i]);
+          if (childJSON) {
+            json.children.push(childJSON);
+          }
+        }
+
+        if (el.tagName === 'IFRAME') {
+          ifrWin = el.contentWindow;
+
+          if (adId && el[adId] && el[adId].needsWindow) {
+            json.contents = this.adData.serializedIframeContents;
+            el[adId].needsWindow = false;
+            delete this.adData.serializedIframeContents;
+          } else if (exports.utils.isFriendlyWindow(ifrWin)) {
+            childJSON = this.serializeElements(ifrWin.document.documentElement);
+            if (childJSON) {
+              json.contents = childJSON;
+            }
+          }
+        }
+
+        if (json.children.length > 0 || json.adId || json.tagName === 'IFRAME' || json.url) {
+          return json;
+        }
+        return null;
+      },
+
+      captureHTML(containerEl) {
+        this.adData.context = this.serializeElements(containerEl);
+      },
+
+      nodeCount(el) {
+        return el.getElementsByTagName('*').length + 1;
+      },
+
+      highestContainer(curWin, referenceElement) {
+        let curContainer = referenceElement;
+        const docEl = curWin.document.documentElement;
+        let parentContainer;
+
+        if (curWin !== curWin.top && this.isValidContainer(docEl, curWin)) {
+          return docEl;
+        }
+
+        while (true) {
+          parentContainer = curContainer.parentElement;
+          if (parentContainer && this.isValidContainer(parentContainer)) {
+            curContainer = parentContainer;
+          } else {
+            return curContainer;
+          }
+        }
+      },
+    };
+
+    const tagfinder = {
+
+      setPositions(adData, opt_el, opt_winPos) {
+        const el = opt_el || adData.context;
+        const winPos = opt_winPos || { left: 0, top: 0 };
+        let ifrPos;
+
+        el.left += winPos.left;
+        el.top += winPos.top;
+
+        if (el.children) {
+          el.children.forEach(function (child) {
+            this.setPositions(adData, child, winPos);
+          }, this);
+        }
+
+        if (el.contents) {
+          ifrPos = { left: el.left, top: el.top };
+          this.setPositions(adData, el.contents, ifrPos);
+        }
+
+        if (el.adId === adData.adId) {
+          adData.element.left = el.left;
+          adData.element.top = el.top;
+        }
+      },
+
+      appendTags(adData, referenceElement) {
+        const mgr = new ContextManager(adData);
+        let curWin = exports.utils.elementWindow(referenceElement);
+        let highestContainer;
+
+        while (true) {
+          highestContainer = mgr.highestContainer(curWin, referenceElement);
+          mgr.captureHTML(highestContainer);
+          if (curWin === curWin.top) {
+            break;
+          } else {
+            curWin.mpAdFound = true;
+
+            mgr.adData.serializedIframeContents = mgr.adData.context;
+
+            if (exports.utils.isFriendlyWindow(curWin.parent)) {
+              referenceElement = curWin.frameElement;
+              referenceElement[mgr.adData.adId] = { needsWindow: true };
+              curWin = curWin.parent;
+            } else {
+              break;
+            }
+          }
+        }
+        return {
+          referenceElement,
+          highestContainer,
+        };
+      },
+    };
+
+    exports.tagfinder = tagfinder;
+  }(exports));
+
+  (function (exports) {
+    let _onAdFound;
+    const _logGen = new exports.utils.LogGenerator();
+    let _pageTags;
+    const INIT_MS_BW_SEARCHES = 2000;
+    const PAGE_TAG_RE = new RegExp('gpt|oascentral');
+    const POST_MSG_ID = '1532387537-31575-24732-11173-32339';
+    const AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
+
+    function getPageTags(doc) {
+      let scripts = doc.getElementsByTagName('script');
+      const pageTags = [];
+      scripts = exports.utils.realArray(scripts);
+      scripts.forEach((script) => {
+        if (PAGE_TAG_RE.exec(script.src)) {
+          pageTags.push({ tagName: 'SCRIPT', url: script.src });
+        }
+      });
+      return pageTags;
+    }
+
+    function messageAllParentFrames(adData) {
+      adData.postMessageId = POST_MSG_ID;
+
+      adData = JSON.stringify(adData);
+
+      let win = window;
+      while (win !== win.top) {
+        win = win.parent;
+        win.postMessage(adData, win.location.href);
+      }
+    }
+
+    function appendTagsAndSendToParent(adData, referenceElement) {
+      const results = exports.tagfinder.appendTags(adData, referenceElement);
+      if (exports.utils.SCRIPT_IN_HOSTILE_IFRAME) {
+        messageAllParentFrames(adData);
+      } else if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
+        exports.tagfinder.setPositions(adData);
+
+        adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
+        if (!adData.matchedSize) {
+          if (AD_SERVER_RE.exec(results.referenceElement.id)) {
+            adData.matchedSize = [adData.width, adData.height];
+            adData.oddSize = true;
+          } else {
+            return;
+          }
+        }
+        delete adData.width;
+        delete adData.height;
+        adData.curPageUrl = exports.utils.getPageUrl();
+        _pageTags = _pageTags || getPageTags(document);
+        const log = _logGen.log('ad', [adData], _pageTags);
+
+        if (_onAdFound) {
+          _onAdFound(log, results.referenceElement);
+        }
+      }
+    }
+
+    function extractAdsWrapper() {
+      if (exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete') {
+        extractAds();
+      }
+      setTimeout(
+        () => { extractAdsWrapper(); }, INIT_MS_BW_SEARCHES,
+      );
+    }
+
+    function extractAds() {
+      const ads = exports.adfinder.findAds(window);
+      ads.forEach((ad) => {
+        const startTime = new Date().getTime();
+        const adId = `${startTime}-${Math.floor(Math.random() * 10e12)}`;
+
+        const adData = {
+          width: Math.round(ad.offsetWidth),
+          height: Math.round(ad.offsetHeight),
+          startTime,
+          adId,
+          html5: ad.html5 || false,
+        };
+
+        if (ad.html5) {
+          adData.adSizeMeta = ad.adSizeMeta || null;
+          adData.winClickTag = ad.winClickTag || null;
+        }
+
+        ad[adId] = { isAd: true };
+
+        appendTagsAndSendToParent(adData, ad);
+      });
+    }
+
+    function isChildWin(myWin, otherWin) {
+      let parentWin = otherWin.parent;
+      while (parentWin !== otherWin) {
+        if (parentWin === myWin) {
+          return true;
+        }
+        otherWin = parentWin;
+        parentWin = parentWin.parent;
+      }
+      return false;
+    }
+
+    function iframeFromWindow(win, winToMatch) {
+      let i,
+        ifr,
+        ifrWin,
+        iframes = win.document.querySelectorAll('iframe');
+
+      for (i = 0; i < iframes.length; i++) {
+        ifr = iframes[i];
+        if (ifr.contentWindow === winToMatch) {
+          return ifr;
+        }
+      }
+
+      for (i = 0; i < iframes.length; i++) {
+        ifrWin = iframes[i].contentWindow;
+        if (exports.utils.isFriendlyWindow(ifrWin)) {
+          ifr = iframeFromWindow(ifrWin, winToMatch);
+          if (ifr) {
+            return ifr;
+          }
+        }
+      }
+    }
+
+    function onPostMessage(event) {
+      let adData,
+        ifrWin = event.source,
+
+        myWin = window.document.defaultView,
+        ifrTag;
+
+      try {
+        adData = JSON.parse(event.data);
+      } catch (e) {
+        return;
+      }
+
+      if (!adData) return;
+
+      if (adData.postMessageId === POST_MSG_ID) {
+        delete adData.postMessageId;
+
+        event.stopImmediatePropagation();
+
+        if (isChildWin(myWin, ifrWin)) {
+          if (exports.utils.isFriendlyWindow(ifrWin)) {
+            ifrTag = ifrWin.frameElement;
+          } else {
+            ifrTag = iframeFromWindow(myWin, ifrWin);
+          }
+
+          if (ifrTag) {
+            ifrTag[adData.adId] = { needsWindow: true };
+            appendTagsAndSendToParent(adData, ifrTag);
+          }
+        }
+      }
+    }
+
+    function onVideoMessage(msg, sender, callback) {
+      let log;
+      if (msg.event === 'new-video-ad') {
+        msg.assets.forEach((asset) => {
+
+        });
+        log = _logGen.log('video', msg.assets);
+      } else {
+        log = _logGen.log('invalid-video', msg.assets);
+      }
+
+      msg.assets.forEach((a) => { delete a.isVideo; });
+      log.displayAdFound = msg.displayAdFound;
+      log.requests = msg.requests;
+      log.data = msg.event_data;
+
+      log.doc.finalPageUrl = log.doc.url;
+      log.doc.url = exports.utils.normalizeUrl(msg.origUrl);
+
+      _onAdFound(log);
+    }
+
+    function addBackgroundListener(event, callback) {
+      if (typeof browser !== 'undefined') {
+        browser.runtime.onMessage.addListener((msg) => {
+          if (msg.event === event) {
+            callback(msg);
+          }
+        });
+      } else if (typeof chrome !== 'undefined') {
+        chrome.runtime.onMessage.addListener((msg) => {
+          if (msg.event === event) {
+            callback(msg);
+          }
+        });
+      } else if (window.self.port) {
+        window.self.port.on(event, callback);
+      }
+    }
+
+    exports.coordinator = {
+      addPostMessageListener() {
+        if (!exports.utils.SCRIPT_IN_FRIENDLY_IFRAME) {
+          window.addEventListener('message', onPostMessage, false);
+        }
+      },
+
+      blockedRobotsMsgGen(sendFcn, origUrl) {
+        if (origUrl.indexOf('google.com/_/chrome/newtab') === -1) {
+          const onBlockedRobotsMessage = function () {
+            let log;
+            log = _logGen.log('invalid-robotstxt', []);
+            log.doc.finalPageUrl = log.doc.url;
+            log.doc.url = exports.utils.normalizeUrl(origUrl);
+
+            sendFcn(log);
+          };
+          return onBlockedRobotsMessage;
+        }
+        return function () {};
+      },
+
+      init(onAdFound) {
+        if (exports.utils.SCRIPT_IN_FRIENDLY_IFRAME) {
+          return false;
+        }
+
+        _onAdFound = onAdFound;
+        if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
+          const log = _logGen.log('page');
+          onAdFound(log);
+
+          window.addEventListener('beforeunload', (event) => {
+            const log = _logGen.log('unload');
+            log.timing = window.performance.timing;
+            onAdFound(log);
+          });
+
+          addBackgroundListener('new-video-ad', onVideoMessage);
+          addBackgroundListener('new-invalid-video-ad', onVideoMessage);
+        }
+
+        exports.utils.onDocLoaded(document, extractAdsWrapper);
+      },
+    };
+  }(exports));
+
+  if (exports.utils.SCRIPT_IN_WINDOW_TOP) {
+    window.adparser = {
+      init: exports.coordinator.init,
+      addPostMessageListener: exports.coordinator.addPostMessageListener,
+      askIfTrackingEnabled: exports.utils.askIfTrackingEnabled,
+      blockedRobotsMsgGen: exports.coordinator.blockedRobotsMsgGen,
+      inWindowTop: exports.utils.SCRIPT_IN_WINDOW_TOP,
+      sendToBackground: exports.utils.sendToBackground,
+    };
+  } else {
+    exports.coordinator.addPostMessageListener();
+    exports.utils.askIfTrackingEnabled(
+      () => {
+        exports.coordinator.init(() => {});
+      },
+      () => {},
+    );
+  }
+}(window));
+(function (adparser, pageUrl) {
+  function onAdFound(log) {
+    adparser.sendToBackground({ id: 'ad_log', subject: log }, 'ad_log', '', () => {});
+  }
+
+  if (adparser && adparser.inWindowTop) {
+    adparser.addPostMessageListener();
+    adparser.askIfTrackingEnabled(
+      () => {
+        adparser.init(onAdFound);
+      },
+      adparser.blockedRobotsMsgGen(onAdFound, pageUrl),
+    );
+  }
+}(window.adparser, window.location.href));
diff --git a/src/drivers/webextension/js/lib/jsontodom.js b/src/drivers/webextension/js/lib/jsontodom.js
new file mode 100644
index 000000000..24d9e4c29
--- /dev/null
+++ b/src/drivers/webextension/js/lib/jsontodom.js
@@ -0,0 +1,63 @@
+jsonToDOM.namespaces = {
+  html: 'http://www.w3.org/1999/xhtml',
+  xul: 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul',
+};
+
+jsonToDOM.defaultNamespace = jsonToDOM.namespaces.html;
+
+function jsonToDOM(jsonTemplate, doc, nodes) {
+  function namespace(name) {
+    const reElemNameParts = /^(?:(.*):)?(.*)$/.exec(name);
+    return { namespace: jsonToDOM.namespaces[reElemNameParts[1]], shortName: reElemNameParts[2] };
+  }
+
+  // Note that 'elemNameOrArray' is: either the full element name (eg. [html:]div) or an array of elements in JSON notation
+  function tag(elemNameOrArray, elemAttr) {
+    // Array of elements?  Parse each one...
+    if (Array.isArray(elemNameOrArray)) {
+      const frag = doc.createDocumentFragment();
+      Array.prototype.forEach.call(arguments, (thisElem) => {
+        frag.appendChild(tag(...thisElem));
+      });
+      return frag;
+    }
+
+    // Single element? Parse element namespace prefix (if none exists, default to defaultNamespace), and create element
+    const elemNs = namespace(elemNameOrArray);
+    const elem = doc.createElementNS(elemNs.namespace || jsonToDOM.defaultNamespace, elemNs.shortName);
+
+    // Set element's attributes and/or callback functions (eg. onclick)
+    for (const key in elemAttr) {
+      const val = elemAttr[key];
+      if (nodes && key == 'key') {
+        nodes[val] = elem;
+        continue;
+      }
+
+      const attrNs = namespace(key);
+      if (typeof val === 'function') {
+        // Special case for function attributes; don't just add them as 'on...' attributes, but as events, using addEventListener
+        elem.addEventListener(key.replace(/^on/, ''), val, false);
+      } else {
+        // Note that the default namespace for XML attributes is, and should be, blank (ie. they're not in any namespace)
+        elem.setAttributeNS(attrNs.namespace || '', attrNs.shortName, val);
+      }
+    }
+
+    // Create and append this element's children
+    const childElems = Array.prototype.slice.call(arguments, 2);
+    childElems.forEach((childElem) => {
+      if (childElem != null) {
+        elem.appendChild(
+          childElem instanceof doc.defaultView.Node ? childElem
+            : Array.isArray(childElem) ? tag(...childElem)
+              : doc.createTextNode(childElem),
+        );
+      }
+    });
+
+    return elem;
+  }
+
+  return tag(...jsonTemplate);
+}
diff --git a/src/drivers/webextension/js/lib/network.js b/src/drivers/webextension/js/lib/network.js
new file mode 100644
index 000000000..ebae3bc7a
--- /dev/null
+++ b/src/drivers/webextension/js/lib/network.js
@@ -0,0 +1,792 @@
+(function () {
+  function isChrome() {
+    return (typeof chrome !== 'undefined'
+        && window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
+  }
+
+  let browserProxy;
+  if (isChrome()) {
+    browserProxy = chrome;
+  } else {
+    browserProxy = browser;
+  }
+
+  const MIN_FF_MAJOR_VERSION = 51;
+
+  const requiredBrowserApis = [
+    browserProxy.webNavigation,
+    browserProxy.tabs,
+    browserProxy.webRequest,
+    browserProxy.runtime,
+  ];
+  let areListenersRegistered = false;
+  const secBefore = 2000;
+  const secAfter = 5000;
+  const secBetweenDupAssets = 10e3;
+  const minVidSize = 500e3;
+  const maxVidSize = 25e6;
+  const maxContentRange = 25e6;
+  const videoExtensions = [
+    'af', '3gp', 'asf', 'avchd', 'avi', 'cam', 'dsh', 'flv', 'm1v', 'm2v',
+    'fla', 'flr', 'sol', 'm4v', 'mkv', 'wrap', 'mng', 'mov', 'mpeg', 'mpg',
+    'mpe', 'mp4', 'mxf', 'nsv', 'ogg', 'rm', 'svi', 'smi', 'wmv', 'webm',
+  ];
+  const extensionsReg = new RegExp(`\\.${videoExtensions.join('$|\\.')}$`);
+  const videoContentTypesPrefixes = ['binary/octet-stream', 'video/', 'flv-application/', 'media'];
+
+  const bannedContentTypes = ['video/mp2t', 'video/f4m', 'video/f4f'];
+  const bannedFiletypes = ['ts'];
+  const bannedFiletypesReg = new RegExp(`\\.${bannedFiletypes.join('$|\\.')}$`);
+  const whitelistReqTypes = ['object', 'xmlhttprequest', 'other'];
+
+  const topVideoAssetDomains = [
+    '2mdn.net',
+    'adap.tv',
+    'adnxs.com',
+    'adsrvr.org',
+    'btrll.com',
+    'celtra.com',
+    'flashtalking.com',
+    'flite.com',
+    'innovid.com',
+    'jivox.com',
+    'mixpo.com',
+    'nytimes.com',
+    'playwire.com',
+    'selectmedia.asia',
+    'serving-sys.com',
+    'solvemedia.com',
+    'spotible.com',
+    'teads.tv',
+    'tribalfusion.com',
+    'tubemogul.com',
+    'videologygroup.com',
+    'washingtonpost.com',
+  ];
+
+  const robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer);
+  if (!String.prototype.endsWith) {
+    String.prototype.endsWith = function (searchString, position) {
+      const subjectString = this.toString();
+      if (typeof position !== 'number' || !isFinite(position)
+        || Math.floor(position) !== position || position > subjectString.length) {
+        position = subjectString.length;
+      }
+      position -= searchString.length;
+      const lastIndex = subjectString.indexOf(searchString, position);
+      return lastIndex !== -1 && lastIndex === position;
+    };
+  }
+
+  function getFrame(getFrameDetails, callback) {
+    if (isChrome()) {
+      chrome.webNavigation.getFrame(getFrameDetails, callback);
+    } else if (typeof browser !== 'undefined') {
+      const gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
+      gettingFrame.then(callback);
+    }
+  }
+
+  function ifBrowserValid(callback, elseCallback) {
+    if (isChrome()) {
+      callback();
+    } else if (typeof browser !== 'undefined') {
+      try {
+        const gettingInfo = browser.runtime.getBrowserInfo();
+        gettingInfo.then((browserInfo) => {
+          const browserVersion = parseInt(browserInfo.version.split('.')[0]);
+
+          if (browserInfo.name === 'Firefox'
+            && browserVersion >= MIN_FF_MAJOR_VERSION) {
+            callback();
+          } else {
+            elseCallback();
+          }
+        });
+      } catch (err) {
+        elseCallback();
+      }
+    } else {
+      elseCallback();
+    }
+  }
+
+  function ifTrackingEnabled(details, ifCallback, elseCallback) {
+    const fullIfCallback = function () {
+      allowedByRobotsTxt(details, ifCallback, elseCallback);
+    };
+
+    browser.storage.local.get('tracking').then((item) => {
+      if (item.hasOwnProperty('tracking')) {
+        if (item.tracking) {
+          fullIfCallback();
+        } else {
+          elseCallback();
+        }
+      } else {
+        fullIfCallback();
+      }
+    });
+  }
+
+  function allowedByRobotsTxt(details, ifCallback, elseCallback) {
+    if (details.url && !details.url.startsWith('chrome://')) {
+      robotsTxtAllows(details.url).then(ifCallback, elseCallback);
+    } else {
+      elseCallback();
+    }
+  }
+
+  function isPixelRequest(request) {
+    return (request.type === 'image' || request.responseStatus === 204)
+        && request.size <= 1000;
+  }
+
+  function isVpaidOrVastRequest(request) {
+    const lowerCaseUrl = request.url.toLowerCase();
+    return lowerCaseUrl.indexOf('vpaid') !== -1 || lowerCaseUrl.indexOf('vast') !== -1;
+  }
+
+  function hasValidRequestType(request) {
+    return whitelistReqTypes.indexOf(request.type) >= 0;
+  }
+
+  function stripQueryParams(url) {
+    return url.split('?', 1)[0];
+  }
+
+  function parseHostnameFromUrl(url) {
+    const parser = document.createElement('a');
+    parser.href = url;
+    return parser.hostname;
+  }
+
+  function hasDomain(url, domain) {
+    return parseHostnameFromUrl(url).endsWith(domain);
+  }
+
+  function findHeader(headers, key) {
+    let header;
+    for (let i = 0; i < headers.length; i += 1) {
+      header = headers[i];
+      if (header.name.toLowerCase() === key) {
+        return header;
+      }
+    }
+    return null;
+  }
+
+  function validVideoType(vtype) {
+    const goodType = videoContentTypesPrefixes.some(prefix => vtype.indexOf(prefix) === 0);
+    return goodType;
+  }
+
+  function assetMsgKey(assetReq) {
+    const url = stripQueryParams(assetReq.url);
+    const key = `${assetReq.frameId}-${url}`;
+    return key;
+  }
+
+  const PageNetworkTrafficCollector = function (tabId) {
+    this.tabId = tabId;
+    this.displayAdFound = false;
+    this.requests = {};
+    this.msgsBeingSent = {};
+    this.assetsSeen = {};
+    this.allRedirects = {};
+  };
+
+  var globalPageContainer = {
+    collectors: {},
+    dyingCollectors: {},
+
+    cleanupCollector(tabId) {
+      if (tabId in this.collectors) {
+        delete globalPageContainer.collectors[tabId];
+      }
+    },
+
+    onNewNavigation(details) {
+      const tabId = details.tabId;
+      this.cleanupCollector(tabId);
+
+      ifTrackingEnabled(
+        details,
+        () => {
+          if (!areListenersRegistered) {
+            registerListeners();
+          }
+          this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+        },
+        () => {
+          if (areListenersRegistered) {
+            unregisterListeners();
+          }
+        },
+      );
+    },
+
+    onNavigationCommitted(details) {
+
+    },
+
+    onNavigationCompleted(details) {
+
+    },
+
+    onTabClose(tabId, closeInfo) {
+      this.cleanupCollector(tabId);
+      delete this.collectors[tabId];
+    },
+
+    onDisplayAdFound(tabId) {
+      this.collectors[tabId].displayAdFound = true;
+    },
+
+    getRandId() {
+      return String(Math.floor(Math.random() * 1e9));
+    },
+
+    getCollector(tabId) {
+      if (this.collectors.hasOwnProperty(tabId)) {
+        return this.collectors[tabId];
+      }
+      return null;
+    },
+
+    forwardCall(details, collectorMemberFunction) {
+      const collector = this.getCollector(details.tabId);
+      if (collector !== null) {
+        collectorMemberFunction.apply(collector, [details]);
+      }
+    },
+  };
+
+  PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function () {
+    const logMessage = Array.from(arguments).join(' ');
+    const message = { message: logMessage, event: 'console-log-message' };
+    browserProxy.tabs.sendMessage(this.tabId, message);
+  };
+
+  PageNetworkTrafficCollector.prototype.sendToTab = function (assetReq, reqs, curPageUrl, adTrackingEvent) {
+    const msg = {};
+    msg.assets = [];
+    msg.requests = [];
+    msg.event_data = {};
+    msg.event = adTrackingEvent;
+    if (adTrackingEvent === 'new-video-ad') {
+      msg.requests = reqs;
+      msg.requests.sort((reqA, reqB) => reqA.requestTimestamp - reqB.requestTimestamp);
+      if (assetReq) {
+        msg.assets = [assetReq];
+      }
+    } else if (adTrackingEvent === 'new-invalid-video-ad') {
+      msg.requests = reqs.map(request => parseHostnameFromUrl(request.url));
+      msg.assets = [{
+
+        url: parseHostnameFromUrl(assetReq.url),
+
+        contentType: assetReq.contentType,
+        size: assetReq.size,
+      }];
+    }
+    msg.origUrl = curPageUrl;
+    msg.displayAdFound = this.displayAdFound;
+
+    browserProxy.tabs.sendMessage(this.tabId, msg);
+  };
+
+  PageNetworkTrafficCollector.prototype.getRedirKey = function (url, frameId) {
+    return `${url}:${frameId}`;
+  };
+
+  PageNetworkTrafficCollector.prototype.seenBefore = function (request) {
+    const oldTime = this.assetsSeen[assetMsgKey(request)];
+    if (oldTime && (request.requestTimestamp - oldTime < secBetweenDupAssets)) {
+      return true;
+    }
+    return false;
+  };
+
+  PageNetworkTrafficCollector.prototype.recordSeenAsset = function (request) {
+    this.assetsSeen[assetMsgKey(request)] = request.requestTimestamp;
+  };
+
+  PageNetworkTrafficCollector.prototype.onBeforeRequest = function (details) {
+    const req = {
+      url: details.url,
+      type: details.type,
+      httpMethod: details.method,
+      frameId: details.frameId,
+      parentFrameId: details.parentFrameId,
+      requestTimestamp: details.timeStamp,
+    };
+    this.requests[details.requestId] = req;
+  };
+
+  PageNetworkTrafficCollector.prototype.onSendHeaders = function (details) {
+    let request,
+      header;
+    request = this.requests[details.requestId];
+    header = request && findHeader(details.requestHeaders, 'x-requested-with');
+    if (header && header.value.toLowerCase().indexOf('flash') > -1) {
+      request.from_flash = true;
+    }
+  };
+
+  PageNetworkTrafficCollector.prototype.onHeadersReceived = function (details) {
+    const getFrameDetails = {
+      tabId: details.tabId,
+      processId: null,
+      frameId: details.frameId,
+    };
+    const pageNetworkTrafficController = this;
+    getFrame(getFrameDetails, (frameDetails) => {
+      if (frameDetails && frameDetails.url) {
+        pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
+      }
+    });
+  };
+
+  PageNetworkTrafficCollector.prototype._onHeadersReceived = function (details, frameDetails) {
+    let contentSize,
+      contentRange;
+
+    const request = this.requests[details.requestId];
+    if (request) {
+      const redirParent = this.allRedirects[this.getRedirKey(details.url, details.frameId)];
+      let header = request && findHeader(details.responseHeaders, 'content-type');
+      const contentType = header && header.value.toLowerCase();
+
+      if (contentType) {
+        request.contentType = contentType;
+      }
+      header = request && findHeader(details.responseHeaders, 'content-length');
+      contentSize = header && header.value;
+      if (contentSize) {
+        request.size = request.size || 0;
+        request.size += parseInt(contentSize);
+      }
+      header = request && findHeader(details.responseHeaders, 'content-range');
+      contentRange = header && header.value;
+      if (contentRange) {
+        request.contentRange = parseInt(contentRange.split('/')[1]);
+      }
+
+      let frameUrl = null;
+      if (frameDetails && frameDetails.url) {
+        frameUrl = frameDetails.url;
+      }
+      if (!this.bannedRequest(request)
+        && (this.isVideoReq(frameUrl, request) || (redirParent && redirParent.isVideo))) {
+        request.isVideo = true;
+      }
+    }
+  };
+
+  PageNetworkTrafficCollector.prototype.onBeforeRedirect = function (details) {
+    const request = this.requests[details.requestId];
+    if (request) {
+      if (request.redirects) {
+        request.redirects.push(details.redirectUrl);
+      } else {
+        request.redirects = [details.redirectUrl];
+      }
+      this.allRedirects[this.getRedirKey(details.redirectUrl, details.frameId)] = request;
+    }
+  };
+
+  PageNetworkTrafficCollector.prototype.isYoutubeMastheadRequest = function (url) {
+    const re = /video_masthead/;
+    return this.hasYoutubeDomain(url) && re.test(url);
+  };
+  PageNetworkTrafficCollector.prototype.isYoutubeVideoRequest = function (srcUrl, destUrl) {
+    if (!this.hasYoutubeDomain(srcUrl)) {
+      return false;
+    }
+
+    const re = /https?:\/\/r.*?\.googlevideo\.com\/videoplayback\?/;
+    return re.test(destUrl);
+  };
+  PageNetworkTrafficCollector.prototype.processResponse = function (requestDetails, frameDetails) {
+    let request;
+    if (requestDetails) {
+      request = this.requests[requestDetails.requestId];
+      if (request) {
+        request.responseStatus = requestDetails.statusCode;
+        request.responseTimestamp = requestDetails.timeStamp;
+
+        let frameUrl = null;
+        if (frameDetails && frameDetails.url) {
+          frameUrl = frameDetails.url;
+        }
+
+        let requestUrl = null;
+        if (request.url) {
+          requestUrl = request.url;
+        }
+
+        if (this.isYoutubeAdReq(frameUrl, requestUrl)) {
+          const destVideoId = this.parseYoutubeVideoIdFromUrl(requestUrl);
+          const srcVideoId = this.parseYoutubeVideoIdFromUrl(frameUrl);
+          if (srcVideoId && destVideoId) {
+            request.isYoutubeAd = true;
+            request.isVideo = true;
+            request.rawSrcUrl = frameUrl;
+            request.rawDestUrl = requestUrl;
+            request.url = `https://www.youtube.com/watch?v=${this.parseYoutubeVideoIdFromUrl(requestUrl)}`;
+          }
+        } else if (!this.bannedRequest(request)
+            && (this.isVideo || this.isVideoReq(frameUrl, request))) {
+          request.isVideo = true;
+        }
+
+        if (request.isVideo) {
+          const msgKey = assetMsgKey(request);
+          this.msgsBeingSent[msgKey] = request;
+          if (!this.seenBefore(request)) {
+            this.sendMsgWhenQuiet(msgKey);
+          }
+          this.recordSeenAsset(request);
+        }
+      }
+    }
+  };
+
+  PageNetworkTrafficCollector.prototype.onResponseStarted = function (responseDetails) {
+    if (responseDetails.frameId < 0) {
+      responseDetails.frameId = 99999;
+    }
+    const getFrameDetails = {
+      tabId: responseDetails.tabId,
+      processId: null,
+      frameId: responseDetails.frameId,
+    };
+    const pageNetworkTrafficController = this;
+    getFrame(getFrameDetails, (frameDetails) => {
+      if (frameDetails && frameDetails.url) {
+        pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
+      }
+    });
+  };
+
+  PageNetworkTrafficCollector.prototype.hasBannedFiletype = function (request) {
+    const url = stripQueryParams(request.url);
+    if (bannedFiletypesReg.exec(url)) {
+      return true;
+    }
+    return false;
+  };
+
+  PageNetworkTrafficCollector.prototype.checkContentHeaders = function (request) {
+    if (request.contentType && validVideoType(request.contentType)) {
+      return true;
+    }
+    return false;
+  };
+
+  PageNetworkTrafficCollector.prototype.checkUrlExtension = function (request) {
+    const url = stripQueryParams(request.url);
+    if (extensionsReg.exec(url)) {
+      return true;
+    }
+    return false;
+  };
+
+  PageNetworkTrafficCollector.prototype.isVideoReq = function (srcUrl, request) {
+    if (this.isYoutubeVideoRequest(srcUrl, request.url)) {
+      return false;
+    }
+    return this.checkUrlExtension(request) || this.checkContentHeaders(request);
+  };
+  PageNetworkTrafficCollector.prototype.hasYoutubeDomain = function (url) {
+    const hostname = parseHostnameFromUrl(url);
+    if (hostname === 'www.youtube.com') {
+      return true;
+    }
+    return false;
+  };
+  PageNetworkTrafficCollector.prototype.parseYoutubeVideoIdFromUrl = function (url) {
+    let re = /^https?:\/\/www\.youtube\.com\/get_video_info.*(?:\?|&)video_id=(.*?)(?:$|&)/;
+    let match = re.exec(url);
+    if (match && match.length > 1) {
+      return match[1];
+    }
+
+    re = /^https?:\/\/www\.youtube\.com\/embed\/(.*?)(?:$|\?)/;
+    match = re.exec(url);
+    if (match && match.length > 1) {
+      return match[1];
+    }
+
+    re = /^https?:\/\/www\.youtube\.com\/watch.*(\?|&)v=([^&]*)/;
+    match = re.exec(url);
+    if (match && match.length > 1) {
+      return match[1];
+    }
+    return null;
+  };
+
+  PageNetworkTrafficCollector.prototype.isYoutubeGetVideoInfoReq = function (url) {
+    const re = /^https?:\/\/www\.youtube\.com\/get_video_info\?/;
+    return re.test(url);
+  };
+  PageNetworkTrafficCollector.prototype.isYoutubeAdReq = function (srcUrl, destUrl) {
+    if (!this.hasYoutubeDomain(srcUrl)
+      || !this.isYoutubeGetVideoInfoReq(destUrl)) {
+      return false;
+    }
+    if (this.parseYoutubeVideoIdFromUrl(srcUrl)
+      === this.parseYoutubeVideoIdFromUrl(destUrl)
+      && !this.isYoutubeMastheadRequest(destUrl)) {
+      return false;
+    }
+    return true;
+  };
+
+  PageNetworkTrafficCollector.prototype.bannedRequest = function (request) {
+    return this.bannedVideoType(request) || this.hasBannedFiletype(request) || this.bannedVideoSize(request);
+  };
+
+  PageNetworkTrafficCollector.prototype.bannedVideoType = function (request) {
+    let badType = false;
+    if (request.contentType) {
+      badType = bannedContentTypes.some(prefix => request.contentType.indexOf(prefix) >= 0);
+    }
+    return badType;
+  };
+
+  PageNetworkTrafficCollector.prototype.bannedVideoSize = function (request) {
+    if (request.size !== null) {
+      if (request.size < minVidSize || request.size > maxVidSize || request.contentRange > maxContentRange) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  PageNetworkTrafficCollector.prototype.grabTagReqs = function (tabRequests, assetRequest) {
+    let minTimestamp,
+      maxTimestamp;
+    minTimestamp = assetRequest.requestTimestamp - secBefore;
+    maxTimestamp = assetRequest.requestTimestamp + secAfter;
+
+    const filteredRequests = tabRequests.filter(request => (request.requestTimestamp > minTimestamp
+        && request.requestTimestamp < maxTimestamp
+        && request.frameId === assetRequest.frameId
+        && request.url !== assetRequest.url
+        && (hasValidRequestType(request)
+        || isPixelRequest(request))));
+
+    return filteredRequests;
+  };
+
+  PageNetworkTrafficCollector.prototype.isValidVideoAd = function (assetRequest, tagRequests) {
+    const hasVpaidOrVastRequest = tagRequests.some(tagRequest => isVpaidOrVastRequest(tagRequest));
+
+    if (assetRequest.isYoutubeAd) {
+      return true;
+    }
+    if (hasVpaidOrVastRequest) {
+      return true;
+    }
+    const hasTopVideoAssetDomain = topVideoAssetDomains.some(assetDomain => hasDomain(assetRequest.url, assetDomain));
+
+    return hasTopVideoAssetDomain;
+  };
+
+  PageNetworkTrafficCollector.prototype.sendMsgWhenQuiet = function (msgKey) {
+    let _this = this,
+      origPageUrl,
+      msgAssetReq;
+    msgAssetReq = this.msgsBeingSent[msgKey];
+    browserProxy.tabs.get(this.tabId, (tab) => { origPageUrl = tab.url; });
+
+    setTimeout(() => {
+      const rawRequests = [];
+      if (globalPageContainer.collectors[_this.tabId] === _this) {
+        for (const reqId in _this.requests) {
+          rawRequests.push(_this.requests[reqId]);
+        }
+        const tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
+
+        if (_this.isValidVideoAd(msgAssetReq, tagReqs)) {
+          _this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
+        } else {
+          _this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
+        }
+      } else {
+
+      }
+      delete _this.msgsBeingSent[msgKey];
+    }, secAfter + secBefore);
+  };
+
+  PageNetworkTrafficCollector.prototype.existingMessage = function (candidateRequest) {
+    const frameMsg = this.msgsBeingSent[candidateRequest.frameId];
+    if (frameMsg) {
+      return frameMsg;
+    }
+    return null;
+  };
+
+  function onBeforeRequestListener(details) {
+    globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
+  }
+
+  function onSendHeadersListener(details) {
+    globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
+  }
+
+  function onHeadersReceivedListener(details) {
+    globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
+  }
+
+  function onBeforeRedirectListener(details) {
+    globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
+  }
+
+  function onResponseStartedListener(details) {
+    globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
+  }
+
+  function onCommittedListener(details) {
+    if (details.frameId === 0) {
+      globalPageContainer.onNavigationCommitted(details);
+    }
+  }
+
+  function onCompletedListener(details) {
+    if (details.frameId === 0) {
+      globalPageContainer.onNavigationCompleted(details);
+    }
+  }
+
+  function onRemovedListener(tabId, closeInfo) {
+    globalPageContainer.onTabClose(tabId, closeInfo);
+  }
+
+  function onMessageListener(message, sender, sendResponse) {
+    if (message.event === 'new-ad' && message.data.event === 'ad') {
+      const tabId = sender.tab.id;
+      if (tabId) {
+        globalPageContainer.onDisplayAdFound(tabId);
+      }
+    }
+  }
+
+  function registerListeners() {
+    browserProxy.webRequest.onBeforeRequest.addListener(
+      onBeforeRequestListener,
+      { urls: ['http://*/*', 'https://*/*'] },
+      [],
+    );
+
+    browserProxy.webRequest.onSendHeaders.addListener(
+      onSendHeadersListener,
+      { urls: ['http://*/*', 'https://*/*'] },
+      ['requestHeaders'],
+    );
+
+    browserProxy.webRequest.onHeadersReceived.addListener(
+      onHeadersReceivedListener,
+      { urls: ['http://*/*', 'https://*/*'] },
+      ['responseHeaders'],
+    );
+
+    browserProxy.webRequest.onBeforeRedirect.addListener(
+      onBeforeRedirectListener,
+      { urls: ['http://*/*', 'https://*/*'] },
+      [],
+    );
+
+    browserProxy.webRequest.onResponseStarted.addListener(
+      onResponseStartedListener,
+      { urls: ['http://*/*', 'https://*/*'] },
+      ['responseHeaders'],
+    );
+
+    browserProxy.webNavigation.onCommitted.addListener(onCommittedListener);
+    browserProxy.webNavigation.onCompleted.addListener(onCompletedListener);
+    browserProxy.tabs.onRemoved.addListener(onRemovedListener);
+    browserProxy.runtime.onMessage.addListener(onMessageListener);
+
+    areListenersRegistered = true;
+  }
+
+  function unregisterListeners() {
+    browserProxy.webRequest.onBeforeRequest.removeListener(
+      onBeforeRequestListener,
+    );
+
+    browserProxy.webRequest.onSendHeaders.removeListener(
+      onSendHeadersListener,
+    );
+
+    browserProxy.webRequest.onHeadersReceived.removeListener(
+      onHeadersReceivedListener,
+    );
+
+    browserProxy.webRequest.onBeforeRedirect.removeListener(
+      onBeforeRedirectListener,
+    );
+
+    browserProxy.webRequest.onResponseStarted.removeListener(
+      onResponseStartedListener,
+    );
+
+    browserProxy.webNavigation.onCommitted.removeListener(onCommittedListener);
+    browserProxy.webNavigation.onCompleted.removeListener(onCompletedListener);
+    browserProxy.tabs.onRemoved.removeListener(onRemovedListener);
+    browserProxy.runtime.onMessage.removeListener(onMessageListener);
+
+    areListenersRegistered = false;
+  }
+
+  function areRequiredBrowserApisAvailable() {
+    return requiredBrowserApis.every(api => typeof api !== 'undefined');
+  }
+
+  if (areRequiredBrowserApisAvailable()) {
+    ifBrowserValid(
+      () => {
+        browserProxy.webNavigation.onBeforeNavigate.addListener(
+          (details) => {
+            if (details.frameId === 0) {
+              globalPageContainer.onNewNavigation(details);
+            }
+          },
+          {
+            url: [{ urlMatches: 'http://*/*' }, { urlMatches: 'https://*/*' }],
+          },
+        );
+      }, () => {
+
+      },
+    );
+  }
+
+  browserProxy.runtime.onMessage.addListener((request, sender, sendResponse) => {
+    if (request === 'is_browser_valid') {
+      ifBrowserValid(
+        sendResponse({ browser_valid: true }),
+        sendResponse({ browser_valid: false }),
+      );
+    }
+  });
+
+  browserProxy.runtime.onMessage.addListener((request, sender, sendResponse) => {
+    if (request === 'is_tracking_enabled') {
+      ifTrackingEnabled(
+        sender.tab,
+        () => {
+          try { sendResponse({ tracking_enabled: true }); } catch (err) {}
+        },
+        () => {
+          try { sendResponse({ tracking_enabled: false }); } catch (err) {}
+        },
+      );
+    }
+    return true;
+  });
+}());
diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js
deleted file mode 100644
index 6df8237ca..000000000
--- a/src/drivers/webextension/js/network.js
+++ /dev/null
@@ -1,824 +0,0 @@
-'use strict';
-(function() {
-
-	function isChrome() {
-		return (typeof chrome !== 'undefined' &&
-				window.navigator.userAgent.match(/Chrom(?:e|ium)\/([0-9\.]+)/));
-	}
-
-	var browserProxy;
-	if ( isChrome() ) {
-		browserProxy = chrome;
-	} else {
-		browserProxy = browser;
-	}
-
-	var MIN_FF_MAJOR_VERSION = 51;
-
-	var requiredBrowserApis = [
-		browserProxy.webNavigation,
-		browserProxy.tabs,
-		browserProxy.webRequest,
-		browserProxy.runtime
-	];
-	var areListenersRegistered = false;
-	var secBefore = 2000;
-	var secAfter = 5000;
-	var secBetweenDupAssets = 10e3;
-	var minVidSize = 500e3;
-	var maxVidSize = 25e6;
-	var maxContentRange = 25e6;
-	var videoExtensions = [
-		'af', '3gp', 'asf', 'avchd', 'avi', 'cam', 'dsh', 'flv', 'm1v', 'm2v',
-		'fla', 'flr', 'sol', 'm4v', 'mkv', 'wrap', 'mng', 'mov', 'mpeg', 'mpg',
-		'mpe', 'mp4', 'mxf', 'nsv', 'ogg', 'rm', 'svi', 'smi', 'wmv', 'webm'
-	];
-	var extensionsReg = new RegExp('\\.' + videoExtensions.join('$|\\.') + '$');
-	var videoContentTypesPrefixes = ['binary/octet-stream', 'video/', 'flv-application/', 'media'];
-
-	var bannedContentTypes = ['video/mp2t','video/f4m','video/f4f'];
-	var bannedFiletypes = ['ts'];
-	var bannedFiletypesReg = new RegExp('\\.' + bannedFiletypes.join('$|\\.') + '$');
-	var whitelistReqTypes = ['object', 'xmlhttprequest', 'other'];
-
-	var topVideoAssetDomains = [
-		'2mdn.net',
-		'adap.tv',
-		'adnxs.com',
-		'adsrvr.org',
-		'btrll.com',
-		'celtra.com',
-		'flashtalking.com',
-		'flite.com',
-		'innovid.com',
-		'jivox.com',
-		'mixpo.com',
-		'nytimes.com',
-		'playwire.com',
-		'selectmedia.asia',
-		'serving-sys.com',
-		'solvemedia.com',
-		'spotible.com',
-		'teads.tv',
-		'tribalfusion.com',
-		'tubemogul.com',
-		'videologygroup.com',
-		'washingtonpost.com'
-	];
-
-	var robotsTxtAllows = wappalyzer.robotsTxtAllows.bind(wappalyzer);
-	if ( !String.prototype.endsWith ) {
-		String.prototype.endsWith = function(searchString, position) {
-			var subjectString = this.toString();
-			if ( typeof position !== 'number' || !isFinite(position) ||
-				Math.floor(position) !== position || position > subjectString.length) {
-				position = subjectString.length;
-			}
-			position -= searchString.length;
-			var lastIndex = subjectString.indexOf(searchString, position);
-			return lastIndex !== -1 && lastIndex === position;
-		};
-	}
-
-	function getFrame(getFrameDetails, callback) {
-		if ( typeof chrome !== 'undefined' ) {
-			chrome.webNavigation.getFrame(getFrameDetails, callback);
-		} else if ( typeof browser !== 'undefined' ) {
-			var gettingFrame = browser.webNavigation.getFrame(getFrameDetails);
-			gettingFrame.then(callback);
-		}
-	}
-
-	function ifBrowserValid(callback, elseCallback) {
-		if ( isChrome() ) {
-
-			callback();
-		} else if ( typeof browser !== 'undefined' ) {
-			try {
-				var gettingInfo = browser.runtime.getBrowserInfo();
-				gettingInfo.then(function(browserInfo) {
-					var browserVersion = parseInt(browserInfo.version.split('.')[0]);
-
-					if ( browserInfo.name === 'Firefox' &&
-						browserVersion >= MIN_FF_MAJOR_VERSION) {
-						callback();
-					} else {
-						elseCallback();
-					}
-				});
-			} catch (err) {
-
-				elseCallback();
-			}
-		} else {
-			elseCallback();
-		}
-	}
-
-	function ifTrackingEnabled(details, ifCallback, elseCallback) {
-
-		var fullIfCallback = function() {
-			allowedByRobotsTxt(details, ifCallback, elseCallback);
-		};
-
-		browser.storage.local.get('tracking').then(function(item) {
-
-			if ( item.hasOwnProperty('tracking') ) {
-				if ( item.tracking ) {
-					fullIfCallback();
-				} else {
-					elseCallback();
-				}
-			} else {
-				fullIfCallback();
-			}
-		});
-
-	}
-
-	function allowedByRobotsTxt(details, ifCallback, elseCallback) {
-		if (  details.url && !details.url.startsWith('chrome://')  ) {
-			robotsTxtAllows(details.url).then(ifCallback, elseCallback);
-		} else {
-			elseCallback();
-		}
-	}
-
-	function isPixelRequest(request) {
-		return (request.type === 'image' || request.responseStatus === 204) &&
-				request.size <= 1000;
-	}
-
-	function isVpaidOrVastRequest(request) {
-		var lowerCaseUrl = request.url.toLowerCase();
-		return lowerCaseUrl.indexOf('vpaid') !== -1 || lowerCaseUrl.indexOf('vast') !== -1;
-	}
-
-	function hasValidRequestType(request) {
-		return whitelistReqTypes.indexOf(request.type) >= 0;
-	}
-
-	function stripQueryParams(url) {
-		return url.split('?', 1)[0];
-	}
-
-	function parseHostnameFromUrl(url) {
-		var parser = document.createElement('a');
-		parser.href = url;
-		return parser.hostname;
-	}
-
-	function hasDomain(url, domain) {
-		return parseHostnameFromUrl(url).endsWith(domain);
-	}
-
-	function findHeader(headers, key) {
-		var header;
-		for ( var i = 0; i < headers.length; i += 1 ) {
-			header = headers[i];
-			if ( header.name.toLowerCase() === key ) {
-				return header;
-			}
-		}
-		return null;
-	}
-
-	function validVideoType(vtype) {
-		var goodType = videoContentTypesPrefixes.some(function(prefix) {
-			return vtype.indexOf(prefix) === 0;
-		});
-		return goodType;
-	}
-
-	function assetMsgKey(assetReq) {
-		var url = stripQueryParams(assetReq.url);
-		var key = assetReq.frameId + '-' + url;
-		return key;
-	}
-
-	var PageNetworkTrafficCollector = function(tabId) {
-		this.tabId = tabId;
-		this.displayAdFound = false;
-		this.requests = {};
-		this.msgsBeingSent = {};
-		this.assetsSeen = {};
-		this.allRedirects = {};
-	};
-
-	var globalPageContainer = {
-		collectors: {},
-		dyingCollectors: {},
-
-		cleanupCollector: function(tabId) {
-			if ( tabId in this.collectors ) {
-				delete globalPageContainer.collectors[tabId];
-			}
-		},
-
-		onNewNavigation: function(details) {
-			var tabId = details.tabId;
-			this.cleanupCollector(tabId);
-
-			ifTrackingEnabled(
-				details,
-				function() {
-					if ( !areListenersRegistered ) {
-
-						registerListeners();
-					}
-					this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
-				}.bind(this),
-				function() {
-					if ( areListenersRegistered ) {
-
-						unregisterListeners();
-					}
-				}
-			);
-		},
-
-		onNavigationCommitted: function(details) {
-
-		},
-
-		onNavigationCompleted: function(details) {
-
-		},
-
-		onTabClose: function(tabId, closeInfo) {
-
-			this.cleanupCollector(tabId);
-			delete this.collectors[tabId];
-		},
-
-		onDisplayAdFound: function(tabId) {
-			this.collectors[tabId].displayAdFound = true;
-		},
-
-		getRandId: function() {
-			return String(Math.floor(Math.random() * 1e9));
-		},
-
-		getCollector: function(tabId) {
-			if ( this.collectors.hasOwnProperty(tabId) ) {
-				return this.collectors[tabId];
-			}
-			return null;
-		},
-
-		forwardCall: function(details, collectorMemberFunction) {
-			var collector = this.getCollector(details.tabId);
-			if ( collector !== null ) {
-				collectorMemberFunction.apply(collector, [details]);
-			}
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function() {
-		var logMessage = Array.from(arguments).join(' ');
-		var message = {message: logMessage, event: 'console-log-message'};
-		browserProxy.tabs.sendMessage(this.tabId, message);
-	};
-
-	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, adTrackingEvent) {
-		var msg = {};
-		msg.assets = [];
-		msg.requests = [];
-		msg.event_data = {};
-		msg.event = adTrackingEvent;
-		if ( adTrackingEvent === 'new-video-ad' ) {
-			msg.requests = reqs;
-			msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;});
-			if ( assetReq ) {
-				msg.assets = [assetReq];
-			}
-		} else if ( adTrackingEvent === 'new-invalid-video-ad' ) {
-			msg.requests = reqs.map(function(request) {
-				return parseHostnameFromUrl(request.url);
-			});
-			msg.assets = [{
-
-				url: parseHostnameFromUrl(assetReq.url),
-
-				contentType: assetReq.contentType,
-				size: assetReq.size
-			}];
-		}
-		msg.origUrl = curPageUrl;
-		msg.displayAdFound = this.displayAdFound;
-
-		browserProxy.tabs.sendMessage(this.tabId, msg);
-	};
-
-	PageNetworkTrafficCollector.prototype.getRedirKey = function(url, frameId) {
-		return url + ':' + frameId;
-	};
-
-	PageNetworkTrafficCollector.prototype.seenBefore = function(request) {
-		var oldTime = this.assetsSeen[assetMsgKey(request)];
-		if ( oldTime && (request.requestTimestamp-oldTime < secBetweenDupAssets)){
-
-			return true;
-		}
-		return false;
-	};
-
-	PageNetworkTrafficCollector.prototype.recordSeenAsset = function(request) {
-		this.assetsSeen[assetMsgKey(request)] = request.requestTimestamp;
-	};
-
-	PageNetworkTrafficCollector.prototype.onBeforeRequest = function(details) {
-		var req = {
-			url: details.url,
-			type: details.type,
-			httpMethod: details.method,
-			frameId: details.frameId,
-			parentFrameId: details.parentFrameId,
-			requestTimestamp: details.timeStamp,
-		};
-		this.requests[details.requestId] = req;
-	};
-
-	PageNetworkTrafficCollector.prototype.onSendHeaders = function(details) {
-		var request, header;
-		request = this.requests[details.requestId];
-		header = request && findHeader(details.requestHeaders, 'x-requested-with');
-		if ( header && header.value.toLowerCase().indexOf('flash') > -1 ) {
-			request.from_flash = true;
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.onHeadersReceived = function(details) {
-		var getFrameDetails = {
-			tabId: details.tabId,
-			processId: null,
-			frameId: details.frameId
-		};
-		var pageNetworkTrafficController = this;
-		getFrame(getFrameDetails, function(frameDetails) {
-			if ( frameDetails && frameDetails.url ) {
-				pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
-			}
-		});
-	};
-
-	PageNetworkTrafficCollector.prototype._onHeadersReceived = function(details, frameDetails) {
-		var contentSize, contentRange;
-
-		var request = this.requests[details.requestId];
-		if ( request ) {
-			var redirParent = this.allRedirects[this.getRedirKey(details.url, details.frameId)];
-			var header = request && findHeader(details.responseHeaders, 'content-type');
-			var contentType = header && header.value.toLowerCase();
-
-			if ( contentType){
-				request.contentType = contentType;
-			}
-			header = request && findHeader(details.responseHeaders, 'content-length');
-			contentSize = header && header.value;
-			if ( contentSize ) {
-				request.size = request.size || 0;
-				request.size += parseInt(contentSize);
-			}
-			header = request && findHeader(details.responseHeaders, 'content-range');
-			contentRange = header && header.value;
-			if ( contentRange ) {
-				request.contentRange = parseInt(contentRange.split('/')[1]);
-			}
-
-			var frameUrl = null;
-			if ( frameDetails && frameDetails.url ) {
-				frameUrl = frameDetails.url;
-			}
-			if ( !this.bannedRequest(request) &&
-				(this.isVideoReq(frameUrl, request) || (redirParent && redirParent.isVideo))) {
-				request.isVideo = true;
-			}
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.onBeforeRedirect = function(details) {
-		var request = this.requests[details.requestId];
-		if ( request ) {
-			if ( request.redirects ) {
-				request.redirects.push(details.redirectUrl);
-			} else {
-				request.redirects = [details.redirectUrl];
-			}
-			this.allRedirects[this.getRedirKey(details.redirectUrl, details.frameId)] = request;
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.isYoutubeMastheadRequest = function(url) {
-		var re = /video_masthead/;
-		return this.hasYoutubeDomain(url) && re.test(url);
-	};
-	PageNetworkTrafficCollector.prototype.isYoutubeVideoRequest = function(srcUrl, destUrl) {
-		if ( !this.hasYoutubeDomain(srcUrl) ) {
-			return false;
-		}
-
-		var re = /https?:\/\/r.*?\.googlevideo\.com\/videoplayback\?/;
-		return re.test(destUrl);
-	};
-	PageNetworkTrafficCollector.prototype.processResponse = function(requestDetails, frameDetails) {
-		var request;
-		if ( requestDetails ) {
-			request = this.requests[requestDetails.requestId];
-			if ( request ) {
-				request.responseStatus = requestDetails.statusCode;
-				request.responseTimestamp = requestDetails.timeStamp;
-
-				var frameUrl = null;
-				if ( frameDetails && frameDetails.url ) {
-					frameUrl = frameDetails.url;
-				}
-
-				var requestUrl = null;
-				if ( request.url ) {
-					requestUrl = request.url;
-				}
-
-				if ( this.isYoutubeAdReq(frameUrl, requestUrl) ) {
-					var destVideoId = this.parseYoutubeVideoIdFromUrl(requestUrl);
-					var srcVideoId = this.parseYoutubeVideoIdFromUrl(frameUrl);
-					if ( srcVideoId && destVideoId ) {
-						request.isYoutubeAd = true;
-						request.isVideo = true;
-						request.rawSrcUrl = frameUrl;
-						request.rawDestUrl = requestUrl;
-						request.url = 'https://www.youtube.com/watch?v=' + this.parseYoutubeVideoIdFromUrl(requestUrl);
-					}
-				} else if ( !this.bannedRequest(request) &&
-						(this.isVideo || this.isVideoReq(frameUrl, request))) {
-					request.isVideo = true;
-				}
-
-				if ( request.isVideo ) {
-
-					var msgKey = assetMsgKey(request);
-					this.msgsBeingSent[msgKey] = request;
-					if ( !this.seenBefore(request) ) {
-						this.sendMsgWhenQuiet(msgKey);
-					}
-					this.recordSeenAsset(request);
-				}
-			}
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.onResponseStarted = function(responseDetails) {
-		if ( responseDetails.frameId < 0 ) {
-			responseDetails.frameId = 99999;
-
-		}
-		var getFrameDetails = {
-			tabId: responseDetails.tabId,
-			processId: null,
-			frameId: responseDetails.frameId
-		};
-		var pageNetworkTrafficController = this;
-		getFrame(getFrameDetails, function(frameDetails) {
-			if ( frameDetails && frameDetails.url ) {
-				pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
-			}
-		});
-	};
-
-	PageNetworkTrafficCollector.prototype.hasBannedFiletype = function(request) {
-		var url = stripQueryParams(request.url);
-		if ( bannedFiletypesReg.exec(url) ) {
-			return true;
-		} else {
-			return false;
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.checkContentHeaders = function(request) {
-		if ( request.contentType && validVideoType(request.contentType) ) {
-			return true;
-		}
-		return false;
-	};
-
-	PageNetworkTrafficCollector.prototype.checkUrlExtension = function(request) {
-		var url = stripQueryParams(request.url);
-		if ( extensionsReg.exec(url) ) {
-			return true;
-		} else {
-			return false;
-		}
-	};
-
-	PageNetworkTrafficCollector.prototype.isVideoReq = function(srcUrl, request) {
-		if ( this.isYoutubeVideoRequest(srcUrl, request.url) ) {
-			return false;
-		}
-		return this.checkUrlExtension(request) || this.checkContentHeaders(request);
-	};
-	PageNetworkTrafficCollector.prototype.hasYoutubeDomain = function(url) {
-		var hostname = parseHostnameFromUrl(url) ;
-		if ( hostname === 'www.youtube.com' ) {
-			return true;
-		}
-		return false;
-	};
-	PageNetworkTrafficCollector.prototype.parseYoutubeVideoIdFromUrl = function(url) {
-		var re = /^https?:\/\/www\.youtube\.com\/get_video_info.*(?:\?|&)video_id=(.*?)(?:$|&)/;
-		var match = re.exec(url);
-		if ( match && match.length > 1 ) {
-			return match[1];
-		}
-
-		re = /^https?:\/\/www\.youtube\.com\/embed\/(.*?)(?:$|\?)/;
-		match = re.exec(url);
-		if ( match && match.length > 1 ) {
-			return match[1];
-		}
-
-		re = /^https?:\/\/www\.youtube\.com\/watch.*(\?|&)v=([^&]*)/;
-		match = re.exec(url);
-		if ( match && match.length > 1 ) {
-			return match[1];
-		}
-		return null;
-	};
-
-	PageNetworkTrafficCollector.prototype.isYoutubeGetVideoInfoReq = function(url) {
-		var re = /^https?:\/\/www\.youtube\.com\/get_video_info\?/;
-		return re.test(url);
-	};
-	PageNetworkTrafficCollector.prototype.isYoutubeAdReq = function(srcUrl, destUrl) {
-
-		if ( !this.hasYoutubeDomain(srcUrl) ||
-			!this.isYoutubeGetVideoInfoReq(destUrl)) {
-			return false;
-		}
-		if ( this.parseYoutubeVideoIdFromUrl(srcUrl) ===
-			this.parseYoutubeVideoIdFromUrl(destUrl) &&
-			!this.isYoutubeMastheadRequest(destUrl)) {
-			return false;
-		}
-		return true;
-	};
-
-	PageNetworkTrafficCollector.prototype.bannedRequest = function(request) {
-		return this.bannedVideoType(request) || this.hasBannedFiletype(request) || this.bannedVideoSize(request);
-	};
-
-	PageNetworkTrafficCollector.prototype.bannedVideoType = function(request) {
-		var badType = false;
-		if ( request.contentType ) {
-			badType = bannedContentTypes.some(function(prefix) {
-				return request.contentType.indexOf(prefix) >= 0;
-			});
-		}
-		return badType;
-	};
-
-	PageNetworkTrafficCollector.prototype.bannedVideoSize = function(request) {
-		if ( request.size !== null ) {
-			if ( request.size < minVidSize || request.size > maxVidSize || request.contentRange > maxContentRange ) {
-				return true;
-			}
-		}
-		return false;
-	};
-
-	PageNetworkTrafficCollector.prototype.grabTagReqs = function(tabRequests, assetRequest) {
-		var minTimestamp, maxTimestamp;
-		minTimestamp = assetRequest.requestTimestamp - secBefore;
-		maxTimestamp = assetRequest.requestTimestamp + secAfter;
-
-		var filteredRequests = tabRequests.filter(function(request) {
-			return (request.requestTimestamp > minTimestamp &&
-				request.requestTimestamp < maxTimestamp &&
-				request.frameId === assetRequest.frameId &&
-				request.url !== assetRequest.url &&
-				(hasValidRequestType(request) ||
-				isPixelRequest(request)));
-		});
-
-		return filteredRequests;
-	};
-
-	PageNetworkTrafficCollector.prototype.isValidVideoAd = function(assetRequest, tagRequests) {
-		var hasVpaidOrVastRequest = tagRequests.some(function(tagRequest) {
-			return isVpaidOrVastRequest(tagRequest);
-		});
-
-		if ( assetRequest.isYoutubeAd ) {
-			return true;
-		}
-		if ( hasVpaidOrVastRequest ) {
-			return true;
-		}
-		var hasTopVideoAssetDomain = topVideoAssetDomains.some(function(assetDomain) {
-			return hasDomain(assetRequest.url, assetDomain);
-		});
-
-		return hasTopVideoAssetDomain;
-	};
-
-	PageNetworkTrafficCollector.prototype.sendMsgWhenQuiet = function(msgKey) {
-		var _this = this,
-			origPageUrl, msgAssetReq;
-		msgAssetReq = this.msgsBeingSent[msgKey];
-		browserProxy.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
-
-		setTimeout(function() {
-			var rawRequests = [];
-			if ( globalPageContainer.collectors[_this.tabId] === _this ) {
-				for ( var reqId in _this.requests ) {
-					rawRequests.push(_this.requests[reqId]);
-				}
-				var tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
-
-				if ( _this.isValidVideoAd(msgAssetReq, tagReqs) ) {
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
-				} else {
-
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
-				}
-
-			} else {
-
-			}
-			delete _this.msgsBeingSent[msgKey];
-		}, secAfter+secBefore);
-	};
-
-	PageNetworkTrafficCollector.prototype.existingMessage = function(candidateRequest) {
-		var frameMsg = this.msgsBeingSent[candidateRequest.frameId];
-		if ( frameMsg ) {
-			return frameMsg;
-		} else {
-			return null;
-		}
-	};
-
-	function onBeforeRequestListener(details) {
-		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
-	}
-
-	function onSendHeadersListener(details) {
-		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
-	}
-
-	function onHeadersReceivedListener(details) {
-		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
-	}
-
-	function onBeforeRedirectListener(details) {
-		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
-	}
-
-	function onResponseStartedListener(details) {
-		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
-	}
-
-	function onCommittedListener(details) {
-		if ( details.frameId === 0 ) {
-			globalPageContainer.onNavigationCommitted(details);
-		}
-	}
-
-	function onCompletedListener(details) {
-		if ( details.frameId === 0 ) {
-			globalPageContainer.onNavigationCompleted(details);
-		}
-	}
-
-	function onRemovedListener(tabId, closeInfo) {
-		globalPageContainer.onTabClose(tabId, closeInfo);
-	}
-
-	function onMessageListener(message, sender, sendResponse) {
-		if ( message.event === 'new-ad' && message.data.event === 'ad' ) {
-			var tabId = sender.tab.id;
-			if ( tabId ) {
-				globalPageContainer.onDisplayAdFound(tabId);
-			}
-		}
-	}
-
-	function registerListeners() {
-
-		browserProxy.webRequest.onBeforeRequest.addListener(
-			onBeforeRequestListener,
-			{urls: ['http://*/*', 'https://*/*']},
-			[]
-		);
-
-		browserProxy.webRequest.onSendHeaders.addListener(
-			onSendHeadersListener,
-			{urls: ['http://*/*', 'https://*/*']},
-			['requestHeaders']
-		);
-
-		browserProxy.webRequest.onHeadersReceived.addListener(
-			onHeadersReceivedListener,
-			{urls: ['http://*/*', 'https://*/*']},
-			['responseHeaders']
-		);
-
-		browserProxy.webRequest.onBeforeRedirect.addListener(
-			onBeforeRedirectListener,
-			{urls: ['http://*/*', 'https://*/*']},
-			[]
-		);
-
-		browserProxy.webRequest.onResponseStarted.addListener(
-			onResponseStartedListener,
-			{urls: ['http://*/*', 'https://*/*']},
-			['responseHeaders']
-		);
-
-		browserProxy.webNavigation.onCommitted.addListener(onCommittedListener);
-		browserProxy.webNavigation.onCompleted.addListener(onCompletedListener);
-		browserProxy.tabs.onRemoved.addListener(onRemovedListener);
-		browserProxy.runtime.onMessage.addListener(onMessageListener);
-
-		areListenersRegistered = true;
-	}
-
-	function unregisterListeners() {
-
-		browserProxy.webRequest.onBeforeRequest.removeListener(
-			onBeforeRequestListener
-		);
-
-		browserProxy.webRequest.onSendHeaders.removeListener(
-			onSendHeadersListener
-		);
-
-		browserProxy.webRequest.onHeadersReceived.removeListener(
-			onHeadersReceivedListener
-		);
-
-		browserProxy.webRequest.onBeforeRedirect.removeListener(
-			onBeforeRedirectListener
-		);
-
-		browserProxy.webRequest.onResponseStarted.removeListener(
-			onResponseStartedListener
-		);
-
-		browserProxy.webNavigation.onCommitted.removeListener(onCommittedListener);
-		browserProxy.webNavigation.onCompleted.removeListener(onCompletedListener);
-		browserProxy.tabs.onRemoved.removeListener(onRemovedListener);
-		browserProxy.runtime.onMessage.removeListener(onMessageListener);
-
-		areListenersRegistered = false;
-	}
-
-	function areRequiredBrowserApisAvailable() {
-		return requiredBrowserApis.every(function(api) {
-			return typeof api !== 'undefined';
-		});
-	}
-
-	if ( areRequiredBrowserApisAvailable() ) {
-			ifBrowserValid(
-				function() {
-					browserProxy.webNavigation.onBeforeNavigate.addListener(
-						function(details) {
-							if ( details.frameId === 0 ) {
-								globalPageContainer.onNewNavigation(details);
-							}
-						},
-						{
-							url: [{urlMatches: 'http://*/*'}, {urlMatches: 'https://*/*'}]
-						}
-					);
-				}, function() {
-
-				}
-			);
-	}
-
-	browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
-		if ( request === 'is_browser_valid' ) {
-			ifBrowserValid(
-				sendResponse({'browser_valid': true}),
-				sendResponse({'browser_valid': false})
-			);
-		}
-	});
-
-	browserProxy.runtime.onMessage.addListener(function(request, sender, sendResponse) {
-		if ( request === 'is_tracking_enabled' ) {
-			ifTrackingEnabled(
-				sender.tab,
-				function() {
-					try {sendResponse({'tracking_enabled': true});}
-					catch(err) {} },
-				function() {
-					try {sendResponse({'tracking_enabled': false});}
-					catch(err) {}}
-			);
-		}
-		return true;
-	});
-
-})();
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index fc69619f8..4666b0045 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -1,69 +1,96 @@
 /** global: browser */
 /** global: Wappalyzer */
+/* globals browser Wappalyzer */
+/* eslint-env browser */
 
 const wappalyzer = new Wappalyzer();
 
-function getOption(name, defaultValue, callback) {
-  browser.storage.local.get(name)
-    .then(item => {
-      callback(item.hasOwnProperty(name) ? item[name] : defaultValue);
-    });
+/**
+ * Get a value from localStorage
+ */
+function getOption(name, defaultValue = null) {
+  return new Promise(async (resolve, reject) => {
+    let value = defaultValue;
+
+    try {
+      const option = await browser.storage.local.get(name);
+
+      if (option[name] !== undefined) {
+        value = option[name];
+      }
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
+
+      return reject(error.message);
+    }
+
+    return resolve(value);
+  });
 }
 
+/**
+ * Set a value in localStorage
+ */
 function setOption(name, value) {
-  var option = {};
+  return new Promise(async (resolve, reject) => {
+    try {
+      await browser.storage.local.set({ [name]: value });
+    } catch (error) {
+      wappalyzer.log(error.message, 'driver', 'error');
 
-  option[name] = value;
+      return reject(error.message);
+    }
 
-  browser.storage.local.set(option);
+    return resolve();
+  });
 }
 
-document.addEventListener('DOMContentLoaded', () => {
-  var nodes = document.querySelectorAll('[data-i18n]');
+document.addEventListener('DOMContentLoaded', async () => {
+  const nodes = document.querySelectorAll('[data-i18n]');
 
-  Array.prototype.forEach.call(nodes, node => {
+  Array.prototype.forEach.call(nodes, (node) => {
     node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n);
   });
 
   document.querySelector('#github').addEventListener('click', () => {
-    open(wappalyzer.config.githubURL);
+    window.open(wappalyzer.config.githubURL);
   });
 
   document.querySelector('#twitter').addEventListener('click', () => {
-    open(wappalyzer.config.twitterURL);
+    window.open(wappalyzer.config.twitterURL);
   });
 
   document.querySelector('#wappalyzer').addEventListener('click', () => {
-    open(wappalyzer.config.websiteURL);
+    window.open(wappalyzer.config.websiteURL);
   });
 
-  getOption('upgradeMessage', true, value => {
-    const el = document.querySelector('#option-upgrade-message');
+  let el;
+  let value;
 
-    el.checked = value;
+  // Upgrade message
+  value = await getOption('upgradeMessage', true);
 
-    el.addEventListener('change', () => {
-      setOption('upgradeMessage', el.checked);
-    });
-  });
+  el = document.querySelector('#option-upgrade-message');
 
-  getOption('dynamicIcon', true, value => {
-    const el = document.querySelector('#option-dynamic-icon');
+  el.checked = value;
 
-    el.checked = value;
+  el.addEventListener('change', e => setOption('upgradeMessage', e.target.checked));
 
-    el.addEventListener('change', () => {
-      setOption('dynamicIcon', el.checked);
-    });
-  });
+  // Dynamic icon
+  value = await getOption('dynamicIcon', true);
 
-  getOption('tracking', true, value => {
-    const el = document.querySelector('#option-tracking');
+  el = document.querySelector('#option-dynamic-icon');
 
-    el.checked = value;
+  el.checked = value;
 
-    el.addEventListener('change', () => {
-      setOption('tracking', el.checked);
-    });
-  });
+  el.addEventListener('change', e => setOption('dynamicIcon', e.target.checked));
+
+  // Tracking
+  value = await getOption('tracking', true);
+
+  el = document.querySelector('#option-tracking');
+
+  el.checked = value;
+
+  el.addEventListener('change', e => setOption('tracking', e.target.checked));
 });
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index 377934f97..58d14867e 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -1,132 +1,184 @@
+/* eslint-env browser */
+/* global browser, chrome, jsonToDOM */
+
 /** global: chrome */
 /** global: browser */
+/** global: jsonToDOM */
 
-var func = tabs => {
-  ( chrome || browser ).runtime.sendMessage({
-    id: 'get_apps',
-    tab: tabs[0],
-    source: 'popup.js'
-  }, response => {
-    replaceDomWhenReady(appsToDomTemplate(response));
-  });
-};
+let pinnedCategory = null;
+let termsAccepted = false;
 
-browser.tabs.query({ active: true, currentWindow: true })
-  .then(func)
-  .catch(console.error);
+function slugify(string) {
+  return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+}
 
-function replaceDomWhenReady(dom) {
-  if ( /complete|interactive|loaded/.test(document.readyState) ) {
-    replaceDom(dom);
-  } else {
-    document.addEventListener('DOMContentLoaded', () => {
-      replaceDom(dom);
-    });
-  }
+function i18n() {
+  const nodes = document.querySelectorAll('[data-i18n]');
+
+  Array.prototype.forEach.call(nodes, (node) => {
+    node.innerHTML = browser.i18n.getMessage(node.dataset.i18n);
+  });
 }
 
 function replaceDom(domTemplate) {
-  var container = document.getElementsByClassName('container')[0];
+  const container = document.getElementsByClassName('container')[0];
 
-  while ( container.firstChild ) {
+  while (container.firstChild) {
     container.removeChild(container.firstChild);
   }
 
   container.appendChild(jsonToDOM(domTemplate, document, {}));
 
-  var nodes = document.querySelectorAll('[data-i18n]');
+  i18n();
+
+  Array.from(document.querySelectorAll('.detected__category-pin-wrapper')).forEach((pin) => {
+    pin.addEventListener('click', () => {
+      const categoryId = parseInt(pin.dataset.categoryId, 10);
+
+      if (categoryId === pinnedCategory) {
+        pin.className = 'detected__category-pin-wrapper';
 
-  Array.prototype.forEach.call(nodes, node => {
-    node.childNodes[0].nodeValue = browser.i18n.getMessage(node.dataset.i18n);
+        pinnedCategory = null;
+      } else {
+        const active = document.querySelector('.detected__category-pin-wrapper--active');
+
+        if (active) {
+          active.className = 'detected__category-pin-wrapper';
+        }
+
+        pin.className = 'detected__category-pin-wrapper detected__category-pin-wrapper--active';
+
+        pinnedCategory = categoryId;
+      }
+
+      (chrome || browser).runtime.sendMessage({
+        id: 'set_option',
+        key: 'pinnedCategory',
+        value: pinnedCategory,
+      });
+    });
   });
 }
 
+function replaceDomWhenReady(dom) {
+  if (/complete|interactive|loaded/.test(document.readyState)) {
+    replaceDom(dom);
+  } else {
+    document.addEventListener('DOMContentLoaded', () => {
+      replaceDom(dom);
+    });
+  }
+}
+
 function appsToDomTemplate(response) {
-  var
-    appName, confidence, version, categories,
-    template = [];
+  let template = [];
 
-  if ( response.tabCache && Object.keys(response.tabCache.detected).length > 0 ) {
+  if (response.tabCache && Object.keys(response.tabCache.detected).length > 0) {
     const categories = {};
 
     // Group apps by category
-    for ( appName in response.tabCache.detected ) {
-      response.apps[appName].cats.forEach(cat => {
+    for (const appName in response.tabCache.detected) {
+      response.apps[appName].cats.forEach((cat) => {
         categories[cat] = categories[cat] || { apps: [] };
 
         categories[cat].apps[appName] = appName;
       });
     }
 
-    for ( cat in categories ) {
+    for (const cat in categories) {
       const apps = [];
 
-      for ( appName in categories[cat].apps ) {
-        confidence = response.tabCache.detected[appName].confidenceTotal;
-        version    = response.tabCache.detected[appName].version;
+      for (const appName in categories[cat].apps) {
+        const { confidence, version } = response.tabCache.detected[appName];
 
         apps.push(
           [
             'a', {
               class: 'detected__app',
               target: '_blank',
-              href: 'https://www.wappalyzer.com/applications/' + slugify(appName)
+              href: `https://www.wappalyzer.com/technologies/${slugify(appName)}`,
             }, [
               'img', {
                 class: 'detected__app-icon',
-                src: '../images/icons/' + ( response.apps[appName].icon || 'default.svg' )
+                src: `../images/icons/${response.apps[appName].icon || 'default.svg'}`,
               },
             ], [
               'span', {
-                class: 'detected__app-name'
+                class: 'detected__app-name',
               },
-              appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' )
-            ]
-          ]
+              appName,
+            ], version ? [
+              'span', {
+                class: 'detected__app-version',
+              },
+              version,
+            ] : null, confidence < 100 ? [
+              'span', {
+                class: 'detected__app-confidence',
+              },
+              `${confidence}% sure`,
+            ] : null,
+          ],
         );
       }
 
       template.push(
         [
           'div', {
-            class: 'detected__category'
+            class: 'detected__category',
           }, [
-            'a', {
-              class: 'detected__category-link',
-              target: '_blank',
-              href: 'https://www.wappalyzer.com/categories/' + slugify(response.categories[cat].name)
+            'div', {
+              class: 'detected__category-name',
             }, [
-              'span', {
-                class: 'detected__category-name'
+              'a', {
+                class: 'detected__category-link',
+                target: '_blank',
+                href: `https://www.wappalyzer.com/categories/${slugify(response.categories[cat].name)}`,
               },
-              browser.i18n.getMessage('categoryName' + cat)
-            ]
+              browser.i18n.getMessage(`categoryName${cat}`),
+            ], [
+              'span', {
+                class: `detected__category-pin-wrapper${pinnedCategory == cat ? ' detected__category-pin-wrapper--active' : ''}`,
+                'data-category-id': cat,
+                title: browser.i18n.getMessage('categoryPin'),
+              }, [
+                'img', {
+                  class: 'detected__category-pin detected__category-pin--active',
+                  src: '../images/pin-active.svg',
+                },
+              ], [
+                'img', {
+                  class: 'detected__category-pin detected__category-pin--inactive',
+                  src: '../images/pin.svg',
+                },
+              ],
+            ],
           ], [
             'div', {
-              class: 'detected__apps'
+              class: 'detected__apps',
             },
-            apps
-          ]
-        ]
+            apps,
+          ],
+        ],
       );
     }
 
     template = [
       'div', {
-        class: 'detected'
+        class: 'detected',
       },
-      template
+      template,
     ];
   } else {
     template = [
       'div', {
-        class: 'empty'
+        class: 'empty',
       },
       [
         'span', {
-          class: 'empty__text'
+          class: 'empty__text',
         },
-        browser.i18n.getMessage('noAppsDetected')
+        browser.i18n.getMessage('noAppsDetected'),
       ],
     ];
   }
@@ -134,6 +186,39 @@ function appsToDomTemplate(response) {
   return template;
 }
 
-function slugify(string) {
-  return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
-}
+const func = (tabs) => {
+  (chrome || browser).runtime.sendMessage({
+    id: 'get_apps',
+    tab: tabs[0],
+    source: 'popup.js',
+  }, (response) => {
+    pinnedCategory = response.pinnedCategory;
+    termsAccepted = response.termsAccepted;
+
+    if (termsAccepted) {
+      replaceDomWhenReady(appsToDomTemplate(response));
+    } else {
+      i18n();
+
+      const wrapper = document.querySelector('.terms__wrapper');
+
+      document.querySelector('.terms__accept').addEventListener('click', () => {
+        (chrome || browser).runtime.sendMessage({
+          id: 'set_option',
+          key: 'termsAccepted',
+          value: true,
+        });
+
+        wrapper.classList.remove('terms__wrapper--active');
+
+        func(tabs);
+      });
+
+      wrapper.classList.add('terms__wrapper--active');
+    }
+  });
+};
+
+browser.tabs.query({ active: true, currentWindow: true })
+  .then(func)
+  .catch(console.error);
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 28cc5d124..d946555f6 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -1,75 +1,83 @@
 {
-	"name": "Wappalyzer",
-	"short_name": "Wappalyzer",
-	"author": "Elbert Alias",
-	"homepage_url": "https://www.wappalyzer.com",
-	"description": "Identify web technologies",
-	"version": "5.4.3",
-	"default_locale": "en",
-	"manifest_version": 2,
-	"icons": {
-		"16": "images/icon_16.png",
-		"19": "images/icon_19.png",
-		"32": "images/icon_32.png",
-		"38": "images/icon_38.png",
-		"128": "images/icon_128.png"
-	},
-	"page_action": {
-		"default_icon": {
-			"16": "images/icon_16.png",
-			"19": "images/icon_19.png",
-			"32": "images/icon_32.png",
-			"38": "images/icon_38.png",
-			"128": "images/icon_128.png"
-		},
-		"default_title": "Wappalyzer",
-		"default_popup": "html/popup.html"
-	},
-	"background": {
-		"page": "html/background.html"
+  "name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "Elbert Alias",
+  "homepage_url": "https://www.wappalyzer.com",
+  "description": "Identify web technologies",
+  "version": "5.7.2",
+  "default_locale": "en",
+  "manifest_version": 2,
+  "icons": {
+    "16": "images/icon_16.png",
+    "19": "images/icon_19.png",
+    "32": "images/icon_32.png",
+    "38": "images/icon_38.png",
+    "128": "images/icon_128.png"
+  },
+  "page_action": {
+    "default_icon": {
+      "16": "images/icon_16.png",
+      "19": "images/icon_19.png",
+      "32": "images/icon_32.png",
+      "38": "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+    "default_title": "Wappalyzer",
+    "default_popup": "html/popup.html"
+  },
+  "background": {
+    "page": "html/background.html"
 
-	},
-	"content_scripts": [
-		{
-			"matches": [
-				"http://*/*",
-				"https://*/*"
-			],
-			"js": [
-				"node_modules/webextension-polyfill/dist/browser-polyfill.js",
-				"js/content.js"
-			],
-			"run_at": "document_idle"
-		},
-		{
-			"matches": [
+  },
+  "content_scripts": [
+    {
+      "matches": [
         "http://*/*",
-				"https://*/*"
-			],
-			"js": [
-				"js/iframe.js"
-			],
-			"run_at": "document_start",
-			"all_frames": true
-		}
-	],
-	"web_accessible_resources": [
-		"js/inject.js"
-	],
-	"options_page": "html/options.html",
-	"options_ui": {
-		"page": "html/options.html",
-		"open_in_tab": false
-	},
-	"permissions": [
-		"storage",
-		"tabs",
-		"webRequest",
-		"webNavigation",
-		"http://*/*",
-		"https://*/*"
-	],
-	"content_security_policy": "script-src 'self'; object-src 'self'"
+        "https://*/*"
+      ],
+      "js": [
+        "node_modules/webextension-polyfill/dist/browser-polyfill.js",
+        "js/content.js"
+      ],
+      "run_at": "document_idle"
+    },
+    {
+      "matches": [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "exclude_matches": [
+        "https://*.modirum.com/*",
+        "https://www.alphaecommerce.gr/*"
+      ],
+      "js": [
+        "js/lib/iframe.js"
+      ],
+      "run_at": "document_start",
+      "all_frames": true
+    }
+  ],
+  "web_accessible_resources": [
+    "js/inject.js"
+  ],
+  "options_ui": {
+    "page": "html/options.html",
+    "open_in_tab": false
+  },
+  "permissions": [
+    "cookies",
+    "storage",
+    "tabs",
+    "webRequest",
+    "webNavigation",
+    "http://*/*",
+    "https://*/*"
+  ],
+  "content_security_policy": "script-src 'self'; object-src 'self'",
+  "applications": {
+    "gecko": {
+      "id": "wappalyzer@crunchlabz.com",
+      "strict_min_version": "60.0"
+    }
+  }
 }
-
-
diff --git a/src/drivers/webextension/npm-shrinkwrap.json b/src/drivers/webextension/npm-shrinkwrap.json
new file mode 100644
index 000000000..7dfcf7d96
--- /dev/null
+++ b/src/drivers/webextension/npm-shrinkwrap.json
@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "webextension-polyfill": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/webextension-polyfill/-/webextension-polyfill-0.3.1.tgz",
+      "integrity": "sha512-ISB42vlgMyM7xE1u6pREeCqmmXjLsYu/nqAR8Dl/gIAnylb+KpRpvKbVkUYNFePhhXn0Obkkc3jasOII9ztUtg=="
+    }
+  }
+}
diff --git a/src/drivers/webextension/package.json b/src/drivers/webextension/package.json
index f27b81af6..19c18bd9a 100644
--- a/src/drivers/webextension/package.json
+++ b/src/drivers/webextension/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "webextension-polyfill": "^0.1.1"
+    "webextension-polyfill": "^0.3.1"
   }
 }
diff --git a/src/drivers/webextension/yarn.lock b/src/drivers/webextension/yarn.lock
index 955172b78..e2e1d507d 100644
--- a/src/drivers/webextension/yarn.lock
+++ b/src/drivers/webextension/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-webextension-polyfill@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.1.1.tgz#1d172e59b9ee8706d5ce2c55eebfe0cf23972d70"
+webextension-polyfill@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.2.1.tgz#cdfc9126033039f1713553157d35beff1d4d6f4a"
diff --git a/src/icons/1C-Bitrix.png b/src/icons/1C-Bitrix.png
index 0d9b16acf..d0236f87f 100644
Binary files a/src/icons/1C-Bitrix.png and b/src/icons/1C-Bitrix.png differ
diff --git a/src/icons/1and1.svg b/src/icons/1and1.svg
deleted file mode 100644
index 7fc5b1ed7..000000000
--- a/src/icons/1and1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 719.58002 655.81" height="655.81" width="719.58"><g transform="translate(48.361 -198.743)"><rect width="708.66" height="644.89" ry=".153" x="-42.901" y="204.203" fill="#002276" stroke="#fff" stroke-width="10.92" stroke-linecap="square"/><path d="M64.408 392.813v42.42h42.42v234.58h54.9v-277h-97.32zm354.36 0v42.42h44.92v234.58h54.9v-277h-99.82zm-130.54-5.91c-45.86 1.05-83 46.73-54.12 95.75l.03.03 19.72 26.4c-33.67 18.57-58.1 42.49-56.53 83.38 4.04 61.15 48.1 80.06 96.65 82.34 25.16-1.46 50.09-3.41 68.16-20.72l11.72 15.72h54.91c-11.18-14.9-22.68-30.27-34.22-45.72 23.1-25.95 22.49-62.49 21.72-96.5h-44.91c-.81 19.03 2.25 53.15-6.28 57.07a38974.36 38974.36 0 0 0-47.28-63.13c22.32-17.68 41.96-37.01 41.09-68.81 3.12-45.42-23.83-63.09-63.84-65.63-2.29-.17-4.56-.24-6.82-.18zm5.75 42.09c7.95.26 22.07-.75 22.47 21.22-1.59 16.95-12.89 26.19-24.43 37.06-3.75-4.97-7.53-9.99-11.16-14.78-3.01-3.97-6.38-7.7-8.94-11.72-.99-3.94-.79-7.13-.84-11.03-.17-3.97 4.19-18.89 22.9-20.75zm-13 116.44l52.5 70.28c-5.53 9.06-19.45 14.34-39.5 15.28-17.22-.4-44.37-5.61-47.4-36.03-.25-21.34 19.47-39.27 34.4-49.53z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/2z Project.png b/src/icons/2z Project.png
deleted file mode 100644
index edc1f21e2..000000000
Binary files a/src/icons/2z Project.png and /dev/null differ
diff --git a/src/icons/3DM.png b/src/icons/3DM.png
deleted file mode 100644
index f3115c788..000000000
Binary files a/src/icons/3DM.png and /dev/null differ
diff --git a/src/icons/3ware.png b/src/icons/3ware.png
deleted file mode 100644
index f3115c788..000000000
Binary files a/src/icons/3ware.png and /dev/null differ
diff --git a/src/icons/91app.png b/src/icons/91app.png
new file mode 100644
index 000000000..3963238b1
Binary files /dev/null and b/src/icons/91app.png differ
diff --git a/src/icons/A-Frame.svg b/src/icons/A-Frame.svg
new file mode 100644
index 000000000..7ff8039aa
--- /dev/null
+++ b/src/icons/A-Frame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1" viewBox="0 0 64 480"><g fill="#EE295F"><path d="M-192 240v240h480V0h-480v240zm312.7-1.5c32.6 97.9 59.3 178.3 59.3 178.8 0 .4-7.5.6-16.7.5l-16.8-.3-15.5-48.3-15.5-48.2-75 .2-74.9.3-15.6 48.2-15.5 48.3h-16.3c-12.7 0-16.3-.3-16-1.3.3-.6 27.2-81.2 59.9-179L21.5 60l19.9.2 19.9.3 59.4 178z"/><path d="M40.4 89.5c-.4 1.1-15.5 47.4-33.4 103l-32.7 101 66 .3c36.3.1 66.1.1 66.3-.1.2-.2-62.9-199.6-64.9-204.8-.3-1-.7-.8-1.3.6z"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/ADPLAN.png b/src/icons/ADPLAN.png
new file mode 100644
index 000000000..2252edbb8
Binary files /dev/null and b/src/icons/ADPLAN.png differ
diff --git a/src/icons/AMPcms.png b/src/icons/AMPcms.png
deleted file mode 100644
index 1d528c84b..000000000
Binary files a/src/icons/AMPcms.png and /dev/null differ
diff --git a/src/icons/ATEN.png b/src/icons/ATEN.png
deleted file mode 100644
index 512bd415f..000000000
Binary files a/src/icons/ATEN.png and /dev/null differ
diff --git a/src/icons/Accelerated-Mobile-Pages.svg b/src/icons/Accelerated-Mobile-Pages.svg
new file mode 100644
index 000000000..23bcd2654
--- /dev/null
+++ b/src/icons/Accelerated-Mobile-Pages.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="62px" height="62px" viewBox="0 0 62 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>AMP-Brand-Blue-Icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="amp-logo-internal-site" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AMP-Brand-Blue-Icon" fill="#0379C4">
+            <path d="M41.6288667,28.1614333 L28.6243667,49.8035667 L26.2683667,49.8035667 L28.5975,35.7016667 L21.3838,35.7109667 C21.3838,35.7109667 21.3156,35.7130333 21.2835667,35.7130333 C20.6336,35.7130333 20.1076333,35.1870667 20.1076333,34.5371 C20.1076333,34.2581 20.367,33.7858667 20.367,33.7858667 L33.3291333,12.1695667 L35.7244,12.1799 L33.3363667,26.3035 L40.5872667,26.2942 C40.5872667,26.2942 40.6647667,26.2931667 40.7019667,26.2931667 C41.3519333,26.2931667 41.8779,26.8191333 41.8779,27.4691 C41.8779,27.7326 41.7745667,27.9640667 41.6278333,28.1604 L41.6288667,28.1614333 Z M31,0 C13.8787,0 0,13.8797333 0,31 C0,48.1213 13.8787,62 31,62 C48.1202667,62 62,48.1213 62,31 C62,13.8797333 48.1202667,0 31,0 L31,0 Z" id="Fill-1"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Accessible Portal.png b/src/icons/Accessible Portal.png
deleted file mode 100644
index 688c1122e..000000000
Binary files a/src/icons/Accessible Portal.png and /dev/null differ
diff --git a/src/icons/Adyen.svg b/src/icons/Adyen.svg
new file mode 100644
index 000000000..96d26b546
--- /dev/null
+++ b/src/icons/Adyen.svg
@@ -0,0 +1,9 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="" xml:space="preserve" width="18" height="18"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/>
+
+<style type="text/css">
+.st0{fill:#35B454;}
+</style>
+
+
+<path class="st0" d="M14.300000190734863,0 H0.30000001192092896 V4.5 l9.199999809265137,0 c0.6000000238418579,0 1,0.5 1,1 v7.900000095367432 h-2 c-0.6000000238418579,0 -1,-0.5 -1,-1 v-5.699999809265137 H3.5999999046325684 c-2,0 -3.5999999046325684,1.600000023841858 -3.5999999046325684,3.5999999046325684 v4 c0,2 1.600000023841858,3.5999999046325684 3.5999999046325684,3.5999999046325684 h14.300000190734863 V3.6000003814697266 C17.899999618530273,1.6000003814697266 16.299999237060547,0 14.300000190734863,0 z" id="svg_2"/>
+</svg>
diff --git a/src/icons/AngularDart.svg b/src/icons/AngularDart.svg
new file mode 100644
index 000000000..78c49125a
--- /dev/null
+++ b/src/icons/AngularDart.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240">
+  <path fill="#00A5E9" d="M120 28.8l-89.4 32 13.7 118 75.7 42 75.7-42 13.7-118"/>
+  <path fill="#018BD1" d="M120 28.8V221l75.7-42 13.7-118"/>
+  <path fill="#FFF" d="M120 50L64 175.3h21l11.2-28h47.4l11.2 28h20.8L120 50zm16.3 80h-32.6L120 90.7l16.3 39.3z"/>
+</svg>
diff --git a/src/icons/AngularJS.svg b/src/icons/AngularJS.svg
new file mode 100644
index 000000000..d0fd45bd8
--- /dev/null
+++ b/src/icons/AngularJS.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="355.809" height="355.809" viewBox="0 0 355.809 355.809"><path d="M177.367 0L9.964 58.913 36.416 278.24l141.129 77.568 141.856-78.619 26.444-219.32L177.367 0z" fill="#b3b3b3"/><path d="M329.149 70.545L176.976 18.654v318.622L304.504 266.7l24.645-196.154z" fill="#af2b2d"/><path d="M28.749 71.482l22.667 196.153 125.559 69.641V18.647L28.749 71.482z" fill="#df2e31"/><path d="M212.249 177.131l-34.995-73.08-30.808 73.08h65.803zm13.342 30.729h-92.764l-20.752 51.907-38.603.714L176.977 30.224 284.09 260.48h-35.779l-22.72-52.621z" fill="#f2f2f2"/><path d="M176.976 30.224l.276 73.827 34.96 73.136h-35.157l-.079 30.625 48.613.048 22.721 52.63 36.936.685-108.27-230.951z" fill="#b3b3b3"/></svg>
\ No newline at end of file
diff --git a/src/icons/Ant Design.svg b/src/icons/Ant Design.svg
new file mode 100644
index 000000000..e9f8c2a9d
--- /dev/null
+++ b/src/icons/Ant Design.svg	
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+    <title>Group 28 Copy 5</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="62.1023273%" y1="0%" x2="108.19718%" y2="37.8635764%" id="linearGradient-1">
+            <stop stop-color="#4285EB" offset="0%"></stop>
+            <stop stop-color="#2EC7FF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="69.644116%" y1="0%" x2="54.0428975%" y2="108.456714%" id="linearGradient-2">
+            <stop stop-color="#29CDFF" offset="0%"></stop>
+            <stop stop-color="#148EFF" offset="37.8600687%"></stop>
+            <stop stop-color="#0A60FF" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="69.6908165%" y1="-12.9743587%" x2="16.7228981%" y2="117.391248%" id="linearGradient-3">
+            <stop stop-color="#FA816E" offset="0%"></stop>
+            <stop stop-color="#F74A5C" offset="41.472606%"></stop>
+            <stop stop-color="#F51D2C" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="68.1279872%" y1="-35.6905737%" x2="30.4400914%" y2="114.942679%" id="linearGradient-4">
+            <stop stop-color="#FA8E7D" offset="0%"></stop>
+            <stop stop-color="#F74A5C" offset="51.2635191%"></stop>
+            <stop stop-color="#F51D2C" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo" transform="translate(-20.000000, -20.000000)">
+            <g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)">
+                <g id="Group-27-Copy-3">
+                    <g id="Group-25" fill-rule="nonzero">
+                        <g id="2">
+                            <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z" id="Shape" fill="url(#linearGradient-1)"></path>
+                            <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z" id="Shape" fill="url(#linearGradient-2)"></path>
+                        </g>
+                        <path d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z" id="Shape" fill="url(#linearGradient-3)"></path>
+                    </g>
+                    <ellipse id="Combined-Shape" fill="url(#linearGradient-4)" cx="100.519339" cy="100.436681" rx="23.6001926" ry="23.580786"></ellipse>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Appcues.svg b/src/icons/Appcues.svg
new file mode 100644
index 000000000..20a1a545e
--- /dev/null
+++ b/src/icons/Appcues.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="213px" height="213px" viewBox="0 0 213 213" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+    <title>Group</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group">
+            <rect id="Rectangle" fill="#FFFFFF" x="0" y="0" width="213" height="213"></rect>
+            <path d="M174.043015,18.98918 C174.865266,17.9533389 176.532105,18.5340801 176.532105,19.8574997 L176.532105,193.145888 C176.532105,193.917884 175.908088,194.541901 175.136093,194.541901 L150.012062,194.541901 C149.054397,194.541901 148.162345,194.050504 147.651405,193.239423 L127.728915,161.67419 L99.1343972,116.365218 C98.5006076,115.361486 98.5704083,114.067382 99.3075028,113.139034 L174.043015,18.98918 Z M82.3247353,134.859448 C83.1469864,133.823607 84.815221,134.405744 84.815221,135.727768 L84.815221,193.14575 C84.815221,193.917744 84.1898074,194.541761 83.4192087,194.541761 L37.865935,194.541761 C36.6988688,194.541761 36.0469311,193.193213 36.7728573,192.278825 L82.3247353,134.859448 Z" id="Mark" fill="#EF4546" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Arc Forum.png b/src/icons/Arc Forum.png
deleted file mode 100644
index c01f4e466..000000000
Binary files a/src/icons/Arc Forum.png and /dev/null differ
diff --git a/src/icons/Backtory.svg b/src/icons/Backtory.svg
new file mode 100644
index 000000000..9fb2e0c57
--- /dev/null
+++ b/src/icons/Backtory.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 1423.3867 867.05603"
+   height="867.05603"
+   width="1423.3867"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path16"
+         d="M 0,650.292 H 1067.54 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,867.056)"
+     id="g10"><g
+       id="g12"><g
+         clip-path="url(#clipPath18)"
+         id="g14"><g
+           transform="translate(321.5199,376.8768)"
+           id="g20"><path
+             id="path22"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -19.417,43.75 -56.917,76.25 -111.875,95.208 3.293,105.443 119.212,164.151 230.523,104.237 5.182,8.536 10.12,17.324 15.673,25.704 24.62,37.152 70.92,55.856 111.8,45.381 46.247,-11.851 84.023,-49.071 84.584,-94.011 l 0.013,-425.419 c -22.768,0 -53.205,-0.038 -78.47,0.007 -135.065,0.24 -270.144,-0.609 -405.191,1.127 -97.922,1.259 -170.073,77.053 -168.553,173.063 1.09,68.862 45.743,129.853 112.195,153.245 66.395,23.372 145.569,-0.596 189.707,-53.182" /></g><g
+           transform="translate(679.7488,549.7274)"
+           id="g24"><path
+             id="path26"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 107.306,0 214.612,-0.1 321.918,0.111 15.531,0.031 29.755,-2.911 42.227,-12.489 21.864,-16.791 28.329,-45.437 20.376,-67.146 -9.026,-24.64 -29.931,-40.704 -56.956,-40.852 -56.475,-0.309 -112.953,-0.107 -169.43,-0.11 C 105.424,-120.489 52.712,-120.487 0,-120.487 Z" /></g><g
+           transform="translate(679.7488,399.1187)"
+           id="g28"><path
+             id="path30"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 107.306,0 214.612,-0.1 321.918,0.111 15.531,0.031 29.755,-2.911 42.227,-12.489 21.864,-16.791 28.329,-45.437 20.376,-67.146 -9.026,-24.64 -29.931,-40.704 -56.956,-40.852 -56.475,-0.31 -112.953,-0.107 -169.43,-0.11 C 105.424,-120.489 52.712,-120.487 0,-120.487 Z" /></g><g
+           transform="translate(679.7488,248.5099)"
+           id="g32"><path
+             id="path34"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 107.306,0 214.612,-0.1 321.918,0.111 15.531,0.031 29.755,-2.911 42.227,-12.489 21.864,-16.791 28.329,-45.436 20.376,-67.146 -9.026,-24.64 -29.931,-40.704 -56.956,-40.852 -56.475,-0.309 -112.953,-0.107 -169.43,-0.11 C 105.424,-120.489 52.712,-120.487 0,-120.487 Z" /></g><g
+           transform="translate(379.3446,14.7246)"
+           id="g36"><path
+             id="path38"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 1.562,-0.828 4.112,-1.239 7.653,-1.239 h 18.43 c 7.496,0 11.245,2.685 11.245,8.059 v 13.175 c 0,5.166 -3.177,8.061 -9.527,8.681 H 6.091 C -0.366,27.951 -3.592,25.057 -3.592,19.995 V 6.82 C -3.592,3.512 -2.396,1.24 0,0 m -17.077,7.131 v 9.765 c 0,7.335 1.606,13.225 4.82,17.669 3.625,5.062 8.963,7.595 16.011,7.595 h 33.574 v 5.503 c 0,1.468 -0.518,2.751 -1.555,3.851 -1.036,1.099 -2.228,1.651 -3.574,1.651 H -17.077 V 66.65 h 48.205 c 10.642,0 17.101,-5.013 19.375,-15.035 0.206,-1.654 0.31,-2.893 0.31,-3.719 V 6.045 c 0,-3.72 -0.983,-7.183 -2.945,-10.385 -4.34,-6.924 -9.973,-10.385 -16.895,-10.385 H 3.848 c -4.03,0 -7.958,1.395 -11.78,4.185 -3.824,2.79 -6.459,6.097 -7.905,9.921 -0.828,2.271 -1.24,4.855 -1.24,7.75" /></g><g
+           transform="translate(440.096,20.6152)"
+           id="g40"><path
+             id="path42"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 v 40.3 c 0,6.716 2.51,11.882 7.537,15.5 4.655,3.305 11.028,4.96 19.117,4.96 H 63.601 V 47.274 H 26.51 c -7.014,0 -10.518,-2.901 -10.518,-8.704 V 3.129 c 0,-2.8 1.014,-5.21 3.045,-7.23 2.027,-2.019 4.704,-3.029 8.027,-3.029 H 63.785 V -20.615 H 27.021 c -5.393,0 -10.05,0.929 -13.97,2.79 C 4.348,-13.693 0,-7.75 0,0" /></g><g
+           transform="translate(527.9857,42.0049)"
+           id="g44"><path
+             id="path46"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-2.274 1.085,-4.548 3.255,-6.82 l 33.79,-35.185 H 55.743 L 15.243,0.165 54.067,39.37 H 34.875 L 3.255,7.44 C 1.085,5.271 0,2.79 0,0 m -14.26,66.495 h 13.64 v -108.5 h -13.64 z" /></g><g
+           transform="translate(593.7211)"
+           id="g48"><path
+             id="path50"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="M 0,0 V 108.5 H 13.485 V 81.375 H 27.59 V 67.89 H 13.485 V 0 Z" /></g><g
+           transform="translate(654.8765,13.4854)"
+           id="g52"><path
+             id="path54"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 h 22.022 c 6.351,0 9.526,3.47 9.526,10.414 V 44.61 c 0,6.53 -3.175,9.794 -9.526,9.794 L 0,54.404 c -6.559,0 -9.837,-3.264 -9.837,-9.794 V 10.881 C -9.837,3.625 -6.559,0 0,0 m -23.322,6.51 v 42.314 c 0,11.16 6.045,17.462 18.135,18.91 0.412,0 1.032,0.051 1.86,0.156 h 26.66 c 0.722,0 1.807,-0.105 3.255,-0.31 12.296,-1.759 18.444,-8.01 18.444,-18.756 V 6.51 c 0,-7.441 -3.719,-13.28 -11.159,-17.515 -2.894,-1.654 -6.408,-2.48 -10.54,-2.48 h -25.42 c -10.335,0 -17.103,4.906 -20.306,14.724 -1.137,3.307 -1.448,5.063 -0.929,5.271" /></g><g
+           transform="translate(709.9087)"
+           id="g56"><path
+             id="path58"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 v 59.83 c 0,1.342 0.102,2.892 0.31,4.65 0.62,5.372 2.143,9.273 4.573,11.703 2.427,2.426 6.328,4.053 11.702,4.882 1.342,0.206 2.531,0.31 3.565,0.31 h 7.595 V 67.89 h -6.738 c -5.016,0 -7.522,-2.746 -7.522,-8.235 L 13.485,0 Z" /></g><g
+           transform="translate(747.6742,0.4951)"
+           id="g60"><path
+             id="path62"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 v 13.485 h 47.101 c 4.456,0.724 6.684,3.619 6.684,8.68 v 4.34 H 19.74 C 14.146,26.505 9.457,28.416 5.675,32.24 1.892,36.062 0,40.765 0,46.345 V 80.88 H 13.485 V 50.064 c 0,-6.717 3.228,-10.074 9.685,-10.074 h 21.242 c 6.249,0 9.373,2.892 9.373,8.68 V 80.88 H 67.27 V 22.939 C 67.27,15.914 65.512,10.385 62,6.354 58.176,2.119 52.802,0 45.88,0 Z" /></g><g
+           transform="translate(307.8782,13.4588)"
+           id="g64"><path
+             id="path66"
+             style="fill:#0054a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 h 23.853 c 0.728,0 1.196,0.051 1.404,0.155 3.22,0.723 5.195,3.256 5.925,7.602 0,0.102 0.05,0.258 0.154,0.467 V 45.3 c 0,6.001 -3.014,9 -9.042,9 H -1.559 c -4.885,0 -7.327,-2.896 -7.327,-8.687 V 9.775 c 0,-2.69 0.832,-4.992 2.495,-6.905 C -4.728,0.955 -2.599,0 0,0 M -22.345,9.437 V 94.831 H -8.886 V 67.759 H 22.61 c 12.514,0 19.754,-5.569 21.719,-16.707 0.309,-1.755 0.466,-2.993 0.466,-3.714 V 7.735 c 0,-9.181 -4.075,-15.574 -12.221,-19.183 -2.992,-1.341 -5.673,-2.011 -8.045,-2.011 H -2.079 c -5.777,0 -10.623,2.422 -14.542,7.271 -3.817,4.537 -5.724,9.746 -5.724,15.625" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Bootstrap.png b/src/icons/Bootstrap.png
new file mode 100644
index 000000000..44230c442
Binary files /dev/null and b/src/icons/Bootstrap.png differ
diff --git a/src/icons/Bootstrap.svg b/src/icons/Bootstrap.svg
deleted file mode 100644
index 2ee62447c..000000000
--- a/src/icons/Bootstrap.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612">
-  <g sodipodi:docname="twitter_bootstrap_logo.svg" inkscape:version="0.48.1 r9760" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
-    <path fill="#563D7C" d="M612 510c0 56.1-45.9 102-102 102H102C45.9 612 0 566.1 0 510V102C0 45.9 45.9 0 102 0h408c56.1 0 102 45.9 102 102v408z"/>
-    <path fill="#FFF" d="M166.3 133h173.5c32 0 57.7 7.3 77 22s29 36.8 29 66.5c0 18-4.4 33.4-13.2 46.2-8.8 12.8-21.4 22.8-37.8 29.8v1c22 4.7 38.7 15.1 50 31.2 11.3 16.2 17 36.4 17 60.8 0 14-2.5 27.1-7.5 39.2-5 12.2-12.8 22.7-23.5 31.5s-24.3 15.8-41 21-36.5 7.8-59.5 7.8h-164V133zm62.5 149.5h102c15 0 27.5-4.2 37.5-12.8s15-20.8 15-36.8c0-18-4.5-30.7-13.5-38s-22-11-39-11h-102v98.6zm0 156.5h110.5c19 0 33.8-4.9 44.2-14.8 10.5-9.8 15.8-23.8 15.8-41.8 0-17.7-5.2-31.2-15.8-40.8s-25.2-14.2-44.2-14.2H228.8V439z"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/src/icons/Brightspot.svg b/src/icons/Brightspot.svg
new file mode 100644
index 000000000..2720d780d
--- /dev/null
+++ b/src/icons/Brightspot.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="39px" height="40px" viewBox="0 0 39 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Brightspot-Logo" transform="translate(-239.000000, -2.000000)" fill="#EE2C42" fill-rule="nonzero">
+            <path d="M258.7,8.3 C266.3,8.3 272.5,14.5 272.5,22.1 C272.5,29.7 266.3,35.9 258.7,35.9 C251.1,35.9 244.9,29.7 244.9,22.1 C244.9,14.5 251.1,8.3 258.7,8.3 Z M258.7,2.8 C248,2.8 239.4,11.4 239.4,22.1 C239.4,32.8 248,41.4 258.7,41.4 C269.4,41.4 278,32.8 278,22.1 C278,11.5 269.4,2.8 258.7,2.8 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Brother.png b/src/icons/Brother.png
deleted file mode 100644
index 737a03288..000000000
Binary files a/src/icons/Brother.png and /dev/null differ
diff --git a/src/icons/BugSense.png b/src/icons/BugSense.png
deleted file mode 100644
index 13eafe257..000000000
Binary files a/src/icons/BugSense.png and /dev/null differ
diff --git a/src/icons/C++.png b/src/icons/C++.png
deleted file mode 100644
index bfb1f9856..000000000
Binary files a/src/icons/C++.png and /dev/null differ
diff --git a/src/icons/CDN77.png b/src/icons/CDN77.png
new file mode 100644
index 000000000..7300be9d5
Binary files /dev/null and b/src/icons/CDN77.png differ
diff --git a/src/icons/CNV.png b/src/icons/CNV.png
deleted file mode 100644
index d7e259224..000000000
Binary files a/src/icons/CNV.png and /dev/null differ
diff --git a/src/icons/CO2Stats.png b/src/icons/CO2Stats.png
deleted file mode 100644
index 47689c3be..000000000
Binary files a/src/icons/CO2Stats.png and /dev/null differ
diff --git a/src/icons/CakePHP.png b/src/icons/CakePHP.png
index baece763b..a3f838b9b 100644
Binary files a/src/icons/CakePHP.png and b/src/icons/CakePHP.png differ
diff --git a/src/icons/Canon.png b/src/icons/Canon.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/Canon.png and /dev/null differ
diff --git a/src/icons/Catwalk.png b/src/icons/Catwalk.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/Catwalk.png and /dev/null differ
diff --git a/src/icons/PHPoole.png b/src/icons/Cecil.png
similarity index 100%
rename from src/icons/PHPoole.png
rename to src/icons/Cecil.png
diff --git a/src/icons/CenteHTTPd.png b/src/icons/CenteHTTPd.png
deleted file mode 100644
index 4bf3a2707..000000000
Binary files a/src/icons/CenteHTTPd.png and /dev/null differ
diff --git a/src/icons/Contens.png b/src/icons/Contensis.png
similarity index 100%
rename from src/icons/Contens.png
rename to src/icons/Contensis.png
diff --git a/src/icons/Dart.svg b/src/icons/Dart.svg
new file mode 100644
index 000000000..ca5dcdad7
--- /dev/null
+++ b/src/icons/Dart.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 114 112" style="enable-background:new 0 0 114 112;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#00C4B3;}
+	.st1{fill:#22D3C5;}
+	.st2{fill:#0075C9;}
+	.st3{fill:#00A8E1;}
+</style>
+<path class="st0" d="M30.1,30.6L23,23.5v51.2l0.1,2.4c0,1.1,0.2,2.4,0.6,3.7l56.2,19.8l14-6.2l0,0L30.1,30.6z"/>
+<path class="st1" d="M23.7,80.8L23.7,80.8L23.7,80.8L23.7,80.8z M93.9,94.4l-14,6.2L23.8,80.8c1.1,4.1,3.4,8.7,6,11.3l18.3,18.2
+	l40.8,0.1L93.9,94.4L93.9,94.4z"/>
+<path class="st2" d="M23.2,23.5l-21.8,33c-1.8,1.9-0.9,5.9,2,8.9L16,78.1l7.9,2.8c-0.3-1.3-0.6-2.6-0.6-3.7l-0.1-2.4L23.2,23.5
+	L23.2,23.5z"/>
+<path class="st2" d="M80.3,24.1c-1.3-0.3-2.6-0.5-3.7-0.6l-2.5-0.1H23l70.9,70.9l0,0l6.2-14L80.3,24.1z"/>
+<path class="st3" d="M80.2,24.1C80.3,24.1,80.3,24.1,80.2,24.1L80.2,24.1C80.3,24.1,80.3,24.1,80.2,24.1z M91.6,30.1
+	c-2.6-2.6-7.1-5-11.3-6l19.8,56.2l-6.2,14l0,0l15.2-4.9V47.7L91.6,30.1z"/>
+<path class="st0" d="M77.5,16.3L64.8,3.7c-2.9-2.9-6.9-3.8-8.9-2l-33,21.8H74l2.5,0.1c1.1,0,2.4,0.2,3.7,0.6L77.5,16.3z"/>
+</svg>
diff --git a/src/icons/David Webbox.png b/src/icons/David Webbox.png
deleted file mode 100644
index 16e72fa12..000000000
Binary files a/src/icons/David Webbox.png and /dev/null differ
diff --git a/src/icons/Day.js.svg b/src/icons/Day.js.svg
new file mode 100644
index 000000000..6ceade70d
--- /dev/null
+++ b/src/icons/Day.js.svg
@@ -0,0 +1 @@
+<svg id="svg" version="1.1" width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ><g id="svgg"><path id="path0" d="M23.636 166.547 L 23.636 170.455 37.614 170.462 C 56.645 170.473,60.741 171.473,67.440 177.739 C 79.681 189.190,77.786 215.757,64.102 224.538 C 58.998 227.813,56.092 228.360,43.636 228.386 L 32.500 228.409 32.382 204.886 L 32.265 181.364 27.950 181.364 L 23.636 181.364 23.636 208.907 L 23.636 236.451 39.659 236.252 C 57.898 236.026,59.627 235.766,66.818 232.173 C 91.113 220.032,90.405 178.681,65.695 166.566 C 59.147 163.355,57.081 163.062,39.432 162.839 L 23.636 162.639 23.636 166.547 M119.761 176.932 C 101.953 220.460,96.313 234.362,96.075 235.310 C 95.813 236.356,95.842 236.364,100.068 236.364 L 104.326 236.364 116.800 204.432 C 128.195 175.265,132.727 163.452,132.727 162.924 C 132.727 162.816,131.117 162.727,129.150 162.727 L 125.572 162.727 119.761 176.932 M165.909 162.958 C 165.909 163.102,169.036 168.479,172.858 174.906 C 176.680 181.333,181.633 189.695,183.866 193.488 C 186.099 197.282,188.069 200.297,188.244 200.189 C 188.770 199.864,192.275 193.598,192.249 193.028 C 192.236 192.738,188.394 185.852,183.711 177.727 L 175.196 162.955 170.553 162.825 C 167.999 162.754,165.909 162.814,165.909 162.958 M212.045 177.552 C 207.295 185.691,201.213 196.169,198.528 200.835 L 193.647 209.318 193.642 222.841 L 193.636 236.364 197.955 236.364 L 202.273 236.364 202.273 222.896 L 202.273 209.429 216.355 186.078 L 230.437 162.727 225.559 162.740 L 220.682 162.752 212.045 177.552 M292.592 163.014 C 292.416 163.190,292.267 173.271,292.260 185.417 C 292.242 218.638,291.095 224.471,283.864 228.132 C 279.387 230.398,268.901 229.902,264.147 227.199 C 263.303 226.719,262.564 226.386,262.504 226.459 C 262.445 226.531,261.933 228.002,261.366 229.726 L 260.336 232.861 261.418 233.698 C 268.560 239.222,285.856 238.426,292.872 232.250 C 299.716 226.226,300.682 220.722,300.682 187.727 L 300.682 162.955 296.797 162.825 C 294.660 162.753,292.768 162.838,292.592 163.014 M339.871 163.663 C 328.552 166.445,322.955 173.121,322.955 183.840 C 322.955 195.205,327.009 198.524,347.500 203.931 C 364.158 208.327,368.715 212.471,366.331 221.055 C 363.402 231.603,340.332 232.131,326.800 221.960 C 325.287 220.822,323.986 219.967,323.909 220.059 C 323.833 220.152,322.895 221.740,321.826 223.590 L 319.882 226.952 320.964 227.808 C 340.724 243.430,373.115 238.752,376.054 219.850 C 378.081 206.808,371.838 201.037,349.663 195.454 C 334.781 191.707,331.847 189.576,331.833 182.500 C 331.807 169.658,351.643 165.701,366.296 175.626 C 367.633 176.531,368.786 177.273,368.858 177.273 C 369.023 177.273,372.727 171.048,372.727 170.769 C 372.727 170.272,366.627 166.650,363.790 165.464 C 357.059 162.649,347.060 161.896,339.871 163.663 M136.038 177.095 C 133.217 184.514,132.974 182.398,138.146 195.455 C 140.671 201.830,142.639 207.301,142.519 207.614 C 142.355 208.042,140.068 208.182,133.229 208.182 L 124.156 208.182 123.254 210.568 C 122.757 211.881,122.209 213.313,122.036 213.750 C 121.741 214.495,122.447 214.545,133.123 214.545 C 144.456 214.545,144.528 214.552,145.158 215.568 C 145.507 216.131,147.592 221.040,149.793 226.477 L 153.793 236.364 158.313 236.364 C 162.401 236.364,162.812 236.288,162.608 235.568 C 162.484 235.131,157.113 221.886,150.672 206.136 C 144.232 190.386,138.611 176.602,138.182 175.504 L 137.401 173.508 136.038 177.095 M237.273 230.909 L 237.273 236.364 240.909 236.364 L 244.545 236.364 244.545 230.909 L 244.545 225.455 240.909 225.455 L 237.273 225.455 237.273 230.909 " stroke="none" fill="#ff5f4c" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/Dell.svg b/src/icons/Dell.svg
deleted file mode 100644
index a6863301c..000000000
--- a/src/icons/Dell.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg height="72" version="1.1" width="72" xmlns="http://www.w3.org/2000/svg">
-  <path d="m33.479 27.059-8.942 6.879c-0.917-3.44-3.899-5.963-7.568-5.963h-6.4199v15.822h6.4199c3.6688 0 6.8785-2.5234 7.5664-5.9629l8.9434 6.8789 8.9434-6.8789v5.9629h10.088v-3.2109h-6.6484v-12.611h-3.6699v5.9609l-8.4844 6.8809-1.835-1.606 4.129-3.211 4.3555-3.4395-2.5215-2.0625-8.4844 6.6484-1.834-1.6055 8.4844-6.4199-2.5234-2.0625zm-19.49 4.125h2.752c0.57325 0 1.1325 0.13072 1.6484 0.36719 0.51592 0.23647 0.9874 0.57983 1.3887 1.0098 0.40128 0.42994 0.73164 0.94498 0.96094 1.5254s0.35742 1.2262 0.35742 1.9141c0 0.63058-0.11479 1.2467-0.32617 1.8164-0.21139 0.56967-0.51931 1.0928-0.90625 1.5371-0.38694 0.44427-0.85223 0.81007-1.3789 1.0645-0.52667 0.25438-1.1136 0.39648-1.7441 0.39648h-2.752v-9.6309zm49.987 9.4031v3.2102h-10.089v-15.822h3.6688v12.611h6.4204zm-27.976-40.587c-19.72 0-36 16.28-36 36s16.051 36 36 36 36-16.051 36-36-16.28-36-36-36zm0 3.6699c2.2356-0.000025 4.4168 0.22437 6.5234 0.6543 2.1067 0.42993 4.1395 1.064 6.0742 1.8809 1.9347 0.81688 3.7725 1.8177 5.4922 2.9785s3.3214 2.4816 4.7832 3.9434 2.7825 3.0635 3.9434 4.7832c1.1608 1.7197 2.1616 3.5575 2.9785 5.4922 0.81688 1.9347 1.4509 3.9676 1.8809 6.0742 0.42994 2.1067 0.6543 4.2878 0.6543 6.5234s-0.22436 4.4168-0.6543 6.5234c-0.42994 2.1067-1.064 4.1395-1.8809 6.0742-0.81688 1.9347-1.8177 3.7725-2.9785 5.4922s-2.4816 3.3214-3.9434 4.7832-3.0635 2.7825-4.7832 3.9434c-1.7197 1.1608-3.5575 2.1616-5.4922 2.9785-1.9347 0.81688-3.9676 1.4509-6.0742 1.8809-2.1067 0.42994-4.2878 0.6543-6.5234 0.6543s-4.4168-0.22436-6.5234-0.6543c-2.107-0.427-4.14-1.061-6.075-1.878-1.934-0.817-3.772-1.818-5.492-2.979-1.72-1.16-3.321-2.481-4.783-3.943s-2.783-3.063-3.9434-4.783c-1.1608-1.72-2.1616-3.558-2.9785-5.492-0.8169-1.935-1.4509-3.968-1.8809-6.075-0.4299-2.106-0.6543-4.287-0.6543-6.523s0.2244-4.417 0.6543-6.523c0.4299-2.107 1.064-4.14 1.8809-6.075 0.8169-1.934 1.8177-3.772 2.9785-5.492 1.1604-1.72 2.4814-3.321 3.9434-4.783s3.063-2.783 4.783-3.9434c1.72-1.1608 3.558-2.1616 5.492-2.9785 1.935-0.8169 3.968-1.4509 6.075-1.8809 2.106-0.4299 4.287-0.6543 6.523-0.6543z" fill="#007db8" />
-</svg>
diff --git a/src/icons/Deployd.png b/src/icons/Deployd.png
deleted file mode 100644
index f715e47b4..000000000
Binary files a/src/icons/Deployd.png and /dev/null differ
diff --git a/src/icons/Docker.svg b/src/icons/Docker.svg
new file mode 100644
index 000000000..b8b16676e
--- /dev/null
+++ b/src/icons/Docker.svg
@@ -0,0 +1,18 @@
+<svg width="2491" height="1415" viewBox="0 0 2491 1415" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1435.43 446.797V451.68H1440.31H1658.73V675.068V679.951H1663.61H1776.51C1829.22 679.951 1883.37 670.568 1933.23 653.677L1933.23 653.677C1957.71 645.37 1985.28 633.792 2009.61 619.154L2014.29 616.338L2010.97 612.001C1980.15 571.768 1964.28 520.759 1959.61 470.186L1959.61 470.185C1953.22 401.14 1967.29 312.037 2013.21 258.936L2033.6 235.351L2057.9 254.889L2057.9 254.891C2127.76 311.016 2185.96 389.028 2196.19 477.408L2196.86 483.166L2202.42 481.53C2286.19 456.892 2384.32 462.819 2457.7 505.167L2460.14 500.938L2457.7 505.167L2484.34 520.541L2470.32 547.911C2408.38 668.793 2278.67 706.796 2150.35 700.075L2146.87 699.892L2145.57 703.132C1953.12 1182.47 1534.27 1409.57 1025.52 1409.57C763.051 1409.57 523.044 1311.52 386.405 1079.49L386.398 1079.47L384.24 1075.83L364.29 1035.23C318.142 933.144 302.775 821.231 313.192 709.281L315.932 679.951H502.441H507.324V675.068V451.68H725.732H730.615V446.797V228.379H1172.34H1177.23V223.496V5.07812H1435.43V446.797Z" fill="#364548" stroke="black" stroke-width="9.76562"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2163.77 531.25C2178.74 414.883 2091.66 323.486 2037.66 280.088C1975.42 352.041 1965.75 540.615 2063.39 620.01C2008.9 668.408 1894.08 712.275 1776.51 712.275H345.41C333.984 835 355.527 948.018 404.736 1044.75L421.016 1074.53C431.323 1092.01 442.587 1108.91 454.756 1125.16C513.594 1128.94 567.842 1130.23 617.471 1129.14H617.49C715.019 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.144 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 742.705 1157.6 677.002 1161.65C680.908 1161.72 672.939 1162.24 672.92 1162.24C670.684 1162.38 667.871 1162.71 665.625 1162.82C639.766 1164.28 611.855 1164.58 583.32 1164.58C552.109 1164.58 521.377 1163.99 487.012 1162.24L486.133 1162.82C605.371 1296.85 791.816 1377.23 1025.53 1377.23C1520.14 1377.23 1939.67 1157.97 2125.45 665.732C2257.25 679.258 2383.92 645.645 2441.53 533.164C2349.76 480.205 2231.73 497.09 2163.77 531.25" fill="#22A0C8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2163.77 531.25C2178.74 414.883 2091.66 323.486 2037.66 280.088C1975.42 352.041 1965.75 540.615 2063.39 620.01C2008.9 668.408 1894.08 712.275 1776.51 712.275H430.156C424.316 900.225 494.063 1042.89 617.461 1129.14H617.49C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 738.33 1158.77 672.627 1162.82C672.607 1162.82 671.035 1161.31 671.016 1161.31C839.346 1247.66 1083.42 1247.34 1363.25 1139.85C1677.02 1019.31 1969 789.658 2172.72 526.992C2169.66 528.379 2166.67 529.795 2163.77 531.25" fill="#37B1D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M348.096 861.387C356.982 927.129 376.221 988.682 404.736 1044.75L421.016 1074.53C431.322 1092.01 442.586 1108.92 454.756 1125.16C513.604 1128.94 567.852 1130.23 617.49 1129.14C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 738.623 1158.18 672.92 1162.25C670.664 1162.38 666.729 1162.41 664.453 1162.54C638.613 1163.98 610.986 1164.87 582.441 1164.87C551.24 1164.87 519.326 1164.28 484.98 1162.53C604.219 1296.55 791.816 1377.23 1025.53 1377.23C1448.96 1377.23 1817.36 1216.5 2031.18 861.387H348.096Z" fill="#1B81A5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M443.037 861.387C468.35 976.816 529.18 1067.43 617.49 1129.14C715.02 1126.99 794.6 1115.47 854.912 1094.57C859.176 1093.24 863.788 1093.63 867.774 1095.64C871.76 1097.65 874.806 1101.14 876.269 1105.36C877.731 1109.58 877.495 1114.2 875.611 1118.25C873.727 1122.3 870.342 1125.45 866.172 1127.05C858.145 1129.84 849.785 1132.44 841.152 1134.91H841.123C793.633 1148.48 737.461 1158.18 671.748 1162.25C840.068 1248.57 1083.44 1247.33 1363.25 1139.85C1532.53 1074.81 1695.45 977.998 1841.61 861.387H443.037Z" fill="#1D91B4"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M539.648 484.014H733.184V677.549H539.648V484.014ZM555.771 500.146H571.045V661.426H555.771V500.146ZM584.482 500.146H600.371V661.426H584.492V500.146H584.482ZM613.799 500.146H629.688V661.426H613.799V500.146ZM643.135 500.146H659.014V661.426H643.135V500.146ZM672.461 500.146H688.34V661.426H672.461V500.146ZM701.777 500.146H717.061V661.426H701.777V500.146ZM762.949 260.713H956.494V454.238H762.939V260.713H762.949ZM779.082 276.846H794.346V438.115H779.082V276.846ZM807.793 276.846H823.672V438.115H807.803V276.846H807.793ZM837.109 276.846H852.988V438.115H837.109V276.846ZM866.436 276.846H882.314V438.115H866.436V276.846ZM895.762 276.846H911.65V438.115H895.762V276.846ZM925.078 276.846H940.371V438.115H925.078V276.846Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M762.949 486.014H956.494V679.549H762.939V486.014H762.949ZM779.082 502.146H794.346V663.426H779.082V502.146ZM807.793 502.146H823.672V663.426H807.803V502.146H807.793ZM837.109 502.146H852.988V663.426H837.109V502.146ZM866.436 502.146H882.314V663.426H866.436V502.146ZM895.762 502.146H911.65V663.426H895.762V502.146ZM925.078 502.146H940.371V663.426H925.078V502.146Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M986.26 484.014H1179.79V677.549H986.26V484.014ZM1002.38 500.146H1017.65V661.426H1002.38V500.146ZM1031.09 500.146H1046.97V661.426H1031.09V500.146ZM1060.42 500.146H1076.3V661.426H1060.42V500.146ZM1089.75 500.146H1105.63V661.426H1089.75V500.146ZM1119.06 500.146H1134.96V661.426H1119.06V500.146ZM1148.39 500.146H1163.66V661.426H1148.39V500.146V500.146Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M986.26 260.713H1179.79V454.238H986.26V260.713ZM1002.38 276.846H1017.65V438.115H1002.38V276.846ZM1031.09 276.846H1046.97V438.115H1031.09V276.846ZM1060.42 276.846H1076.3V438.115H1060.42V276.846ZM1089.75 276.846H1105.63V438.115H1089.75V276.846ZM1119.06 276.846H1134.96V438.115H1119.06V276.846ZM1148.39 276.846H1163.66V438.115H1148.39V276.846V276.846ZM1209.56 484.014H1403.1V677.549H1209.56V484.014ZM1225.69 500.146H1240.96V661.426H1225.69V500.146ZM1254.4 500.146H1270.28V661.426H1254.4V500.146ZM1283.72 500.146H1299.6V661.426H1283.72V500.146ZM1313.05 500.146H1328.94V661.426H1313.05V500.146ZM1342.37 500.146H1358.26V661.426H1342.37V500.146ZM1371.7 500.146H1386.97V661.426H1371.7V500.146Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1209.56 260.713H1403.1V454.238H1209.56V260.713ZM1225.69 276.846H1240.96V438.115H1225.69V276.846ZM1254.4 276.846H1270.28V438.115H1254.4V276.846ZM1283.72 276.846H1299.6V438.115H1283.72V276.846ZM1313.05 276.846H1328.94V438.115H1313.05V276.846ZM1342.37 276.846H1358.26V438.115H1342.37V276.846ZM1371.7 276.846H1386.97V438.115H1371.7V276.846Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1209.56 37.4023H1403.1V230.957H1209.56V37.4023ZM1225.69 53.5254H1240.96V214.814H1225.69V53.5156V53.5254ZM1254.4 53.5254H1270.28V214.814H1254.4V53.5156V53.5254ZM1283.72 53.5254H1299.6V214.814H1283.72V53.5156V53.5254ZM1313.05 53.5254H1328.94V214.814H1313.05V53.5156V53.5254ZM1342.37 53.5254H1358.26V214.814H1342.37V53.5156V53.5254ZM1371.7 53.5254H1386.97V214.814H1371.7V53.5156V53.5254Z" fill="#34BBDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1432.86 484.014H1626.4V677.549H1432.86V484.014ZM1448.97 500.146H1464.26V661.426H1448.98V500.146H1448.97ZM1477.69 500.146H1493.57V661.426H1477.7V500.146H1477.69ZM1507.02 500.146H1522.91V661.426H1507.02V500.146ZM1536.34 500.146H1552.23V661.426H1536.34V500.146ZM1565.67 500.146H1581.55V661.426H1565.67V500.146ZM1594.99 500.146H1610.26V661.426H1594.99V500.146Z" fill="#23A3C2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M944.375 991.328C951.448 991.234 958.468 992.545 965.03 995.187C971.591 997.829 977.562 1001.75 982.597 1006.72C987.631 1011.68 991.628 1017.6 994.355 1024.13C997.083 1030.66 998.487 1037.66 998.486 1044.73C998.484 1051.8 997.078 1058.81 994.348 1065.33C991.618 1071.86 987.619 1077.77 982.583 1082.74C977.546 1087.71 971.574 1091.62 965.012 1094.26C958.449 1096.9 951.428 1098.21 944.356 1098.12C930.32 1097.92 916.924 1092.21 907.068 1082.22C897.211 1072.22 891.686 1058.75 891.689 1044.71C891.691 1030.67 897.221 1017.2 907.081 1007.21C916.942 997.222 930.339 991.515 944.375 991.328Z" fill="#D3ECEC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M944.375 1006.47C949.258 1006.47 953.916 1007.39 958.213 1009.06C955.248 1010.78 952.932 1013.43 951.624 1016.6C950.315 1019.77 950.087 1023.28 950.973 1026.6C951.86 1029.91 953.813 1032.83 956.53 1034.93C959.247 1037.02 962.577 1038.15 966.006 1038.16C971.914 1038.16 977.041 1034.89 979.697 1030.05C982.842 1037.62 983.467 1046.01 981.48 1053.97C979.492 1061.93 974.998 1069.04 968.66 1074.25C962.323 1079.45 954.478 1082.48 946.285 1082.89C938.092 1083.3 929.986 1081.06 923.163 1076.51C916.34 1071.95 911.162 1065.33 908.395 1057.6C905.628 1049.88 905.418 1041.47 907.796 1033.62C910.174 1025.77 915.013 1018.9 921.6 1014.01C928.187 1009.12 936.172 1006.48 944.375 1006.47V1006.47ZM0 880.684H2483.66C2429.59 866.973 2312.57 848.437 2331.87 777.559C2233.53 891.348 1996.39 857.393 1936.53 801.289C1869.89 897.949 1481.9 861.201 1454.84 785.898C1371.29 883.955 1112.39 883.955 1028.84 785.898C1001.76 861.201 613.779 897.949 547.129 801.279C487.285 857.393 250.156 891.348 151.816 777.568C171.113 848.437 54.0918 866.973 0 880.693" fill="#364548"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1086.3 1376.07C954.072 1313.33 881.504 1228.03 841.123 1134.92C792.002 1148.94 732.969 1157.9 664.365 1161.75C638.525 1163.19 611.338 1163.94 582.822 1163.94C549.932 1163.94 515.273 1162.96 478.887 1161.04C600.146 1282.23 749.316 1375.53 1025.53 1377.23C1045.92 1377.23 1066.15 1376.84 1086.3 1376.07" fill="#BDD9D7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M890.234 1220.84C871.943 1196.01 854.199 1164.79 841.152 1134.9C792.031 1148.94 732.979 1157.9 664.365 1161.76C711.494 1187.33 778.887 1211.04 890.244 1220.84" fill="#D3ECEC"/>
+</svg>
diff --git a/src/icons/Drupal.png b/src/icons/Drupal.png
deleted file mode 100644
index b9b13f84f..000000000
Binary files a/src/icons/Drupal.png and /dev/null differ
diff --git a/src/icons/Drupal.svg b/src/icons/Drupal.svg
new file mode 100644
index 000000000..b32678feb
--- /dev/null
+++ b/src/icons/Drupal.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 755 826" enable-background="new 0 0 755 826" xml:space="preserve">
+<path fill="#00598E" d="M539.2,167.8c-39.8-24.8-77.2-34.5-114.8-59.2c-23.2-15.8-55.5-53.2-82.5-85.5c-5.2,51.8-21,72.8-39,87.8
+	c-38.2,30-62.2,39-95.2,57C179.9,182.1,29.2,272.1,29.2,465.6s162.8,336,343.5,336s337.5-131.2,337.5-330S563.2,182.8,539.2,167.8z"
+	/>
+<path fill="#FFFFFF" d="M478.2,633.5c12,0,24.8,0.8,33.8,6.8s14.2,19.5,17.2,27s0,12-6,15c-5.2,3-6,1.5-11.2-8.2s-9.8-19.5-36-19.5
+	s-34.5,9-47.2,19.5s-17.2,14.2-21.8,8.2s-3-12,5.2-19.5s21.8-19.5,34.5-24.8S466.2,633.5,478.2,633.5L478.2,633.5z"/>
+<path fill="#FFFFFF" d="M353.8,719c15,12,37.5,21.8,85.5,21.8S521,727.2,536,716c6.8-5.2,9.8-0.8,10.5,2.2s2.2,7.5-3,12.8
+	c-3.8,3.8-38.2,27.8-78.8,31.5s-95.2,6-128.2-24c-5.2-5.2-3.8-12.8,0-15.8s6.8-5.2,11.2-5.2S351.5,717.5,353.8,719L353.8,719z"/>
+<path fill="#0073BA" d="M170,662c57-0.8,67.5-10.5,117.8-33c271.5-121.5,321.8-232.5,331.5-258s24-66.8,9-112.5
+	c-2.9-8.8-5-15.9-6.5-21.6c-36.1-40.3-71.9-62.4-82.7-69.1c-39-24.8-77.3-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5
+	c-5.2,51.8-20.2,73.5-39,87.8c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8l7.4-0.3
+	C97.2,646.2,122,662.8,170,662z"/>
+<path fill="#004975" d="M539,167.8c-39-24.8-77.2-34.5-114.8-59.2c-23.2-15-55.5-53.2-82.5-85.5c-5.2,51.8-20.2,73.5-39,87.8
+	c-38.2,30-62.2,39-95.2,57C179.8,182.8,29,272,29,465.5c0,61.8,16.6,118.4,45.1,166.8c60.7,103.2,175.4,169.2,298.4,169.2
+	c180.8,0,337.5-131.2,337.5-330c0-109.1-44.3-185.5-88.3-234.6C585.6,196.5,549.8,174.5,539,167.8z M630.2,255.5
+	c49.2,61.6,74.2,134.2,74.2,216c0,47.4-9,92.2-26.8,133.2c-16.9,38.8-41.2,73.2-72.3,102.3c-61.5,57.4-144.1,89-232.7,89
+	c-43.8,0-86.8-8.4-127.8-24.9c-40.3-16.2-76.5-39.4-107.8-69C70.9,639.7,34.6,555.7,34.6,465.5c0-80.3,26.1-151.7,77.5-212.2
+	c39.3-46.2,81.7-71.8,98-80.6c8-4.3,15.4-8.2,22.6-11.9c22.6-11.6,44-22.6,73.4-45.6c15.7-11.9,32.4-30.8,39.5-78.7
+	c24.8,29.5,53.5,62.6,75.5,76.8c19.5,12.9,39.5,21.9,58.8,30.6c18.3,8.2,37.2,16.8,55.9,28.7c0,0,0.7,0.4,0.7,0.4
+	C591.4,207.1,620.6,243.6,630.2,255.5z"/>
+<path fill="#93C5E4" d="M345.5,38c10.5,30.8,9,46.5,9,53.2s-3.8,24.8-15.8,33.8c-5.2,3.8-6.8,6.8-6.8,7.5c0,3,6.8,5.2,6.8,12
+	c0,8.2-3.8,24.8-43.5,64.5s-96.8,75-141,96.8S89,326,83,315.5s2.2-33.8,30-64.5s115.5-75,115.5-75L338,99.5l6-29.2"/>
+<path fill="#FFFFFF" d="M345.5,37.2c-6.8,49.5-21.8,64.5-42,80.2c-33.8,25.5-66.8,41.2-74.2,45c-19.5,9.8-90,48.8-126.8,105
+	c-11.2,17.2,0,24,2.2,25.5s27.8,4.5,82.5-28.5S266,212,296.8,179.8c16.5-17.2,18.8-27,18.8-31.5c0-5.2-3.8-7.5-9.8-9
+	c-3-0.8-3.8-2.2,0-4.5S325.2,125,329,122s21.8-15,22.5-34.5S350.8,54.5,345.5,37.2L345.5,37.2z"/>
+<path fill="#FFFFFF" d="M176.8,582.5c0.8-58.5,55.5-113.2,124.5-114c87.8-0.8,148.5,87,192.8,86.2c37.5-0.8,109.5-74.2,144.8-74.2
+	c37.5,0,48,39,48,62.2s-7.5,65.2-25.5,91.5s-29.2,36-50.2,34.5c-27-2.2-81-86.2-115.5-87.8c-43.5-1.5-138,90.8-212.2,90.8
+	c-45,0-58.5-6.8-73.5-16.5C187.2,639.5,176,615.5,176.8,582.5L176.8,582.5z"/>
+<path fill="none" d="M628.2,258.5c15,45.8,0.8,87-9,112.5s-60,136.5-331.5,258c-50.2,22.5-60.8,32.2-117.8,33
+	c-48,0.8-72.8-15.8-88.5-30l-7.4,0.3c60.7,103.2,175.4,169.2,298.4,169.2c180.8,0,337.5-131.2,337.5-330
+	c0-109.1-44.3-185.5-88.3-234.6C623.2,242.6,625.4,249.7,628.2,258.5z"/>
+</svg>
diff --git a/src/icons/E-Merchant.png b/src/icons/E-Merchant.png
deleted file mode 100644
index 6c49851af..000000000
Binary files a/src/icons/E-Merchant.png and /dev/null differ
diff --git a/src/icons/ESERV-10.png b/src/icons/ESERV-10.png
deleted file mode 100644
index 3e2c434ef..000000000
Binary files a/src/icons/ESERV-10.png and /dev/null differ
diff --git a/src/icons/EWS-NIC4.png b/src/icons/EWS-NIC4.png
deleted file mode 100644
index 5803d6385..000000000
Binary files a/src/icons/EWS-NIC4.png and /dev/null differ
diff --git a/src/icons/EasyEngine.png b/src/icons/EasyEngine.png
new file mode 100644
index 000000000..737ecd1b7
Binary files /dev/null and b/src/icons/EasyEngine.png differ
diff --git a/src/icons/ElementUI.svg b/src/icons/ElementUI.svg
new file mode 100644
index 000000000..4c05f8d2b
--- /dev/null
+++ b/src/icons/ElementUI.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="162px" height="185px" viewBox="0 0 162 185" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>element-logo</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="element-logo" transform="translate(-1.000000, -1.000000)" fill="#409EFF" fill-rule="nonzero">
+            <path d="M156.79,42.9 C160.719111,44.6342514 163.127559,48.6576824 162.8,52.94 C162.8,52.94 162.8,126.2 162.8,133.32 C162.8,140.99 158.8,142.7 158.8,142.7 C158.8,142.7 90.08,182.41 85.61,184.9 C81.22,186.8 78.22,184.9 78.22,184.9 C78.22,184.9 6.31,143.2 3.69,141.36 C2.13506061,140.279463 1.1475571,138.557756 1,136.67 C1,136.67 1.07,54.1 1,50.27 C0.93,46.44 5.7,43.57 5.7,43.57 L77.55,2 C80.3018235,0.643101287 83.5281765,0.643101287 86.28,2 C86.28,2 149.75,38.93 156.79,42.9 Z M144.88,124.64 C144.89,122.91 144.89,116.19 144.89,107.71 L81.36,146.2 L81.36,131.48 C81.36,125.48 86.05,121.48 86.05,121.48 L142.26,87.62 C144.38,85.4 144.81,81.86 144.9,80.52 L144.9,65.61 L81.38,104.09 L81.38,88.7 C81.239749,85.3260948 82.7276345,82.0899436 85.38,80 L134.14,50.44 C119.43,42 84.78,21.89 84.78,21.89 C82.6164152,20.8289683 80.0835848,20.8289683 77.92,21.89 L21.51,54.39 C21.51,54.39 17.76,56.63 17.82,59.63 C17.88,62.63 17.82,127.26 17.82,127.26 C17.9452126,128.735416 18.7179395,130.079448 19.93,130.93 C22,132.36 78.45,164.98 78.45,164.98 C80.2731501,165.903084 82.4268499,165.903084 84.25,164.98 C87.76,163.05 141.71,131.98 141.71,131.98 C141.71,131.98 144.88,130.64 144.88,124.64 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Elementor.png b/src/icons/Elementor.png
new file mode 100644
index 000000000..87fc23e01
Binary files /dev/null and b/src/icons/Elementor.png differ
diff --git a/src/icons/Envoy.png b/src/icons/Envoy.png
new file mode 100644
index 000000000..5d69d481c
Binary files /dev/null and b/src/icons/Envoy.png differ
diff --git a/src/icons/ExagonConcept.svg b/src/icons/ExagonConcept.svg
deleted file mode 100644
index baaae65d8..000000000
--- a/src/icons/ExagonConcept.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path fill="#3DA8CC" d="M28.012 27.998H.004v8h28.008v-8zm3.988-20H.004v8h32.01l-.014-8zm20.02 0H40.016L51.309 30.31 40.016 47.998H.004L0 56.002h48.879L64 30.311 52.02 7.998z"/></svg>
\ No newline at end of file
diff --git a/src/icons/Fastcommerce.png b/src/icons/Fastcommerce.png
new file mode 100644
index 000000000..6ba20a3f3
Binary files /dev/null and b/src/icons/Fastcommerce.png differ
diff --git a/src/icons/Fbits.png b/src/icons/Fbits.png
new file mode 100644
index 000000000..f5253019e
Binary files /dev/null and b/src/icons/Fbits.png differ
diff --git a/src/icons/GoJS.png b/src/icons/GoJS.png
new file mode 100644
index 000000000..5a91ade54
Binary files /dev/null and b/src/icons/GoJS.png differ
diff --git a/src/icons/Google Maps.png b/src/icons/Google Maps.png
index 1f90c694b..ecf471ef0 100644
Binary files a/src/icons/Google Maps.png and b/src/icons/Google Maps.png differ
diff --git a/src/icons/Google Search Appliance.png b/src/icons/Google Search Appliance.png
deleted file mode 100644
index 71bb47077..000000000
Binary files a/src/icons/Google Search Appliance.png and /dev/null differ
diff --git a/src/icons/Google Sites.png b/src/icons/Google Sites.png
index 6f74a7a75..3bcb4f4cc 100644
Binary files a/src/icons/Google Sites.png and b/src/icons/Google Sites.png differ
diff --git a/src/icons/Grandstream.png b/src/icons/Grandstream.png
deleted file mode 100644
index a347c58c9..000000000
Binary files a/src/icons/Grandstream.png and /dev/null differ
diff --git a/src/icons/Gravity Insights.png b/src/icons/Gravity Insights.png
deleted file mode 100644
index 57aeabc13..000000000
Binary files a/src/icons/Gravity Insights.png and /dev/null differ
diff --git a/src/icons/Halo.svg b/src/icons/Halo.svg
new file mode 100644
index 000000000..cce2a59db
--- /dev/null
+++ b/src/icons/Halo.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="256.000000pt" height="256.000000pt" viewBox="0 0 256.000000 256.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,256.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1035 2500 c-508 -110 -892 -503 -980 -1005 -23 -130 -21 -330 5
+-454 102 -500 477 -877 977 -980 139 -29 345 -29 484 -1 435 89 783 390 933
+808 87 244 90 554 5 806 -137 409 -471 713 -898 818 -127 31 -401 35 -526 8z
+m-203 -1195 l-57 -190 -62 -3 -61 -3 29 93 c16 50 29 96 29 101 0 4 -19 7 -42
+5 l-41 -3 -30 -97 -30 -98 -59 0 c-52 0 -59 2 -54 18 3 9 15 50 27 90 11 40
+19 76 16 79 -4 3 -23 -4 -43 -16 -20 -12 -38 -21 -39 -19 -8 8 54 85 83 103
+22 14 36 35 50 75 l19 55 56 3 c64 3 66 0 42 -67 l-14 -41 44 0 44 0 16 55 16
+54 57 3 c31 2 58 1 59 -2 2 -3 -23 -90 -55 -195z m418 5 l0 -200 -55 0 -55 0
+0 40 0 40 -60 0 c-59 0 -60 0 -80 -40 l-20 -40 -65 0 -64 0 104 173 c57 94
+114 182 127 194 18 17 38 23 93 26 39 1 71 4 73 5 1 1 2 -88 2 -198z m742 190
+c54 -15 81 -54 72 -105 -23 -140 -64 -237 -112 -267 -30 -18 -51 -22 -131 -22
+-170 -1 -199 29 -163 173 39 163 65 199 157 222 45 11 135 10 177 -1z m-492
+-11 c0 -6 -16 -63 -35 -126 -19 -64 -35 -124 -35 -134 0 -26 37 -33 125 -26
+l73 7 -14 -47 c-8 -25 -17 -49 -20 -52 -3 -3 -56 -6 -118 -6 -188 0 -199 20
+-135 245 l43 150 58 0 c35 0 58 -4 58 -11z"/>
+<path d="M1108 1339 c-21 -36 -38 -69 -38 -72 0 -13 71 -7 76 7 3 7 4 40 2 72
+l-3 59 -37 -66z"/>
+<path d="M1839 1420 c-19 -11 -29 -36 -60 -138 -24 -84 -18 -102 36 -102 48 0
+71 26 100 112 29 88 31 123 9 132 -23 9 -67 7 -85 -4z"/>
+</g>
+</svg>
diff --git a/src/icons/Instabot.png b/src/icons/Instabot.png
new file mode 100644
index 000000000..3b49095d3
Binary files /dev/null and b/src/icons/Instabot.png differ
diff --git a/src/icons/Ionicons.png b/src/icons/Ionicons.png
index ace620764..67497c434 100644
Binary files a/src/icons/Ionicons.png and b/src/icons/Ionicons.png differ
diff --git a/src/icons/JC-HTTPD.png b/src/icons/JC-HTTPD.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/JC-HTTPD.png and /dev/null differ
diff --git a/src/icons/KS_HTTP.png b/src/icons/KS_HTTP.png
deleted file mode 100644
index 1f55e03b3..000000000
Binary files a/src/icons/KS_HTTP.png and /dev/null differ
diff --git a/src/icons/Kajabi.svg b/src/icons/Kajabi.svg
new file mode 100644
index 000000000..dd6f7cd66
--- /dev/null
+++ b/src/icons/Kajabi.svg
@@ -0,0 +1 @@
+<svg width="26" height="26" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg"><title>Kajabi</title><desc>Kajabi Logo</desc><g fill="#2E91FC" fill-rule="nonzero"><path d="M0 26v-26h26zM5.2 26l10.4-10.4 10.4 10.4z"/></g></svg>
diff --git a/src/icons/Klarna.svg b/src/icons/Klarna.svg
index 0bb061c85..56524058c 100644
--- a/src/icons/Klarna.svg
+++ b/src/icons/Klarna.svg
@@ -1 +1,15 @@
-<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><title>klarna</title><path d="M50.487 67.747c.197 21.498 12.425 41.418 31.753 52.167 9.467 5.226 20.117 7.987 31.064 8.086-.198-10.453-3.057-20.709-8.481-29.683-11.242-18.637-32.05-30.274-54.336-30.57zm0-7.494c22.286-.296 43.094-11.933 54.336-30.57 5.424-8.974 8.283-19.23 8.48-29.683-10.946.099-21.596 2.958-31.063 8.185-19.328 10.749-31.556 30.669-31.753 52.068zM39.639 0H21.89C17.55 0 14 3.353 14 7.495v117.448c0 1.38 1.282 2.761 3.156 2.761h17.849c4.339 0 7.79-3.353 7.79-7.494V2.564C42.795 1.084 41.513 0 39.64 0z" fill="#0072CC" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 165.9 144.2" style="enable-background:new 0 0 165.9 144.2;" xml:space="preserve">
+<g>
+	<path d="M114,0.6H82.2c0,26.1-12,50.1-33,65.8l-12.6,9.5l48.9,66.7H125h0.7l-45-61.4C102.1,60,114,31.4,114,0.6z"/>
+	<rect y="0.6" width="32.7" height="142"/>
+	<path d="M148.1,108.5c-9.9,0-17.8,8-17.8,17.8c0,9.8,8,17.8,17.8,17.8c9.8,0,17.8-8,17.8-17.8C165.9,116.5,157.9,108.5,148.1,108.5
+		z"/>
+	<path d="M136.1,5.3c0-1.3-1-2.2-2.5-2.2H131v7.2h1.3V7.6h1.4l1,2.7h1.4l-1.3-2.9C135.6,7,136.1,6.3,136.1,5.3z M133.6,6.5h-1.4V4.3
+		h1.4c0.9,0,1.2,0.4,1.2,1.1C134.8,6,134.6,6.5,133.6,6.5z"/>
+	<path d="M140,6.8c0-3.8-3-6.8-6.7-6.8c-3.7,0-6.7,3.1-6.7,6.8c0,3.7,3,6.8,6.7,6.8C137,13.6,140,10.6,140,6.8z M127.8,6.8
+		c0-3,2.4-5.5,5.4-5.5s5.4,2.5,5.4,5.5s-2.4,5.5-5.4,5.5S127.8,9.9,127.8,6.8z"/>
+</g>
+</svg>
diff --git a/src/icons/Kubernetes.svg b/src/icons/Kubernetes.svg
new file mode 100644
index 000000000..bedd3b88e
--- /dev/null
+++ b/src/icons/Kubernetes.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="722.8457"
+   height="701.96637"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/thockin/src/kubernetes/new.png"
+   inkscape:export-xdpi="460.95001"
+   inkscape:export-ydpi="460.95001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.190509"
+     inkscape:cx="277.56851"
+     inkscape:cy="157.54494"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3052"
+     showgrid="false"
+     inkscape:window-width="1519"
+     inkscape:window-height="822"
+     inkscape:window-x="51"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-6.3260942,-174.7524)">
+    <g
+       id="g3052">
+      <path
+         style="fill:#326ce5;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 365.3125,184.8125 a 46.724621,46.342246 0 0 0 -17.90625,4.53125 l -244.34375,116.75 a 46.724621,46.342246 0 0 0 -25.28125,31.4375 L 17.5,599.78125 A 46.724621,46.342246 0 0 0 23.84375,635.3125 46.724621,46.342246 0 0 0 26.5,639 l 169.125,210.28125 a 46.724621,46.342246 0 0 0 36.53125,17.4375 L 503.375,866.65625 A 46.724621,46.342246 0 0 0 539.90625,849.25 L 708.96875,638.9375 A 46.724621,46.342246 0 0 0 718,599.71875 l -60.375,-262.25 a 46.724621,46.342246 0 0 0 -25.28125,-31.4375 l -244.375,-116.6875 A 46.724621,46.342246 0 0 0 365.3125,184.8125 z"
+         id="path3055"
+         inkscape:connector-curvature="0"
+         inkscape:export-filename="new.png"
+         inkscape:export-xdpi="250.55"
+         inkscape:export-ydpi="250.55" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3059"
+         d="m 367.73366,274.05962 c -8.07696,8.2e-4 -14.62596,7.27591 -14.625,16.25 1e-5,0.13773 0.0282,0.26934 0.0312,0.40625 -0.0119,1.21936 -0.0708,2.68836 -0.0312,3.75 0.19262,5.176 1.3209,9.13749 2,13.90625 1.23028,10.20666 2.26117,18.66736 1.625,26.53125 -0.61869,2.9654 -2.80288,5.67741 -4.75,7.5625 l -0.34375,6.1875 c -8.77682,0.72717 -17.61235,2.05874 -26.4375,4.0625 -37.97461,8.62218 -70.67008,28.18307 -95.5625,54.59375 -1.61522,-1.10193 -4.44103,-3.12914 -5.2813,-3.75 -2.61117,0.35262 -5.25021,1.15829 -8.6875,-0.84375 -6.54491,-4.40563 -12.50587,-10.48693 -19.71875,-17.8125 -3.30498,-3.50419 -5.69832,-6.84101 -9.625,-10.21875 -0.89172,-0.76707 -2.25258,-1.80455 -3.25,-2.59375 -3.06988,-2.44757 -6.6907,-3.72402 -10.1875,-3.84375 -4.49589,-0.15394 -8.82394,1.60385 -11.65625,5.15625 -5.03521,6.31538 -3.42312,15.96805 3.59375,21.5625 0.0712,0.0567 0.14702,0.10078 0.21875,0.15625 0.96422,0.78162 2.14496,1.78313 3.03125,2.4375 4.16687,3.07655 7.9732,4.65145 12.125,7.09375 8.747,5.40181 15.99837,9.88086 21.75,15.28125 2.24602,2.39417 2.63858,6.61292 2.9375,8.4375 l 4.6875,4.1875 c -25.09342,37.76368 -36.70686,84.40946 -29.8437,131.9375 l -6.125,1.78125 c -1.6143,2.08461 -3.89541,5.36474 -6.2813,6.34375 -7.52513,2.37021 -15.99424,3.24059 -26.21875,4.3125 -4.80031,0.39915 -8.94218,0.16095 -14.03125,1.125 -1.12008,0.21218 -2.68072,0.61877 -3.90625,0.90625 -0.0426,0.009 -0.0824,0.0216 -0.125,0.0312 -0.0668,0.0155 -0.15456,0.0479 -0.21875,0.0625 -8.62014,2.08279 -14.15774,10.006 -12.375,17.8125 1.78316,7.80833 10.20314,12.55677 18.875,10.6875 0.0626,-0.0143 0.1535,-0.0167 0.21875,-0.0312 0.0979,-0.0224 0.18409,-0.0699 0.28125,-0.0937 1.20885,-0.26536 2.72377,-0.5606 3.78125,-0.84375 5.00334,-1.33963 8.62694,-3.30796 13.125,-5.03125 9.67694,-3.47077 17.69173,-6.37022 25.5,-7.5 3.26118,-0.25542 6.69711,2.01216 8.40625,2.96875 l 6.375,-1.09375 c 14.67018,45.48282 45.41416,82.24502 84.34375,105.3125 l -2.65625,6.375 c 0.95742,2.47542 2.01341,5.8247 1.30022,8.26932 -2.83868,7.3612 -7.70097,15.13097 -13.23772,23.79318 -2.68085,4.00192 -5.42453,7.10761 -7.84375,11.6875 -0.5789,1.09589 -1.31618,2.77932 -1.875,3.9375 -3.75884,8.04236 -1.00164,17.3052 6.21875,20.78125 7.26575,3.49788 16.28447,-0.19134 20.1875,-8.25 0.006,-0.0114 0.0257,-0.0198 0.0312,-0.0312 0.004,-0.009 -0.004,-0.0225 0,-0.0312 0.55593,-1.14255 1.34353,-2.64437 1.8125,-3.71875 2.07213,-4.74702 2.76161,-8.81506 4.21875,-13.40625 3.86962,-9.72014 5.99567,-19.91903 11.32258,-26.27411 1.45868,-1.74023 3.83681,-2.4095 6.30242,-3.06964 l 3.3125,-6 c 33.93824,13.0268 71.92666,16.52246 109.875,7.90625 8.65697,-1.96557 17.01444,-4.50945 25.09375,-7.5625 0.93098,1.65133 2.66113,4.8257 3.125,5.625 2.50559,0.81518 5.24044,1.23614 7.46875,4.53125 3.98539,6.80898 6.7109,14.86416 10.03125,24.59375 1.45738,4.59111 2.17762,8.65933 4.25,13.40625 0.47234,1.08195 1.256,2.60486 1.8125,3.75 3.89482,8.08484 12.94212,11.78667 20.21875,8.28125 7.2195,-3.4779 9.97974,-12.7399 6.21875,-20.78125 -0.55889,-1.15814 -1.3273,-2.84164 -1.90625,-3.9375 -2.41946,-4.57976 -5.1627,-7.65448 -7.84375,-11.65625 -5.53721,-8.66192 -10.12968,-15.8577 -12.96875,-23.21875 -1.18711,-3.79657 0.20028,-6.15774 1.125,-8.625 -0.55378,-0.63477 -1.73881,-4.22009 -2.4375,-5.90625 40.4574,-23.88816 70.29856,-62.02129 84.3125,-106.0625 1.8924,0.29742 5.18154,0.87936 6.25,1.09375 2.19954,-1.4507 4.22194,-3.34352 8.1875,-3.03125 7.80832,1.12937 15.82288,4.02973 25.5,7.5 4.49815,1.72306 8.1216,3.72313 13.125,5.0625 1.05749,0.28309 2.57238,0.5472 3.78125,0.8125 0.0972,0.0238 0.1833,0.0714 0.28125,0.0937 0.0653,0.0146 0.15615,0.0169 0.21875,0.0312 8.67236,1.86695 17.09384,-2.87871 18.875,-10.6875 1.78074,-7.80696 -3.7543,-15.73201 -12.375,-17.8125 -1.25393,-0.28513 -3.03225,-0.76938 -4.25,-1 -5.08912,-0.96378 -9.23092,-0.7261 -14.03125,-1.125 -10.22456,-1.07138 -18.6935,-1.94269 -26.21875,-4.3125 -3.06826,-1.19028 -5.25103,-4.84124 -6.31255,-6.34375 l -5.90625,-1.71875 c 3.06226,-22.15442 2.23655,-45.21134 -3.0625,-68.28125 -5.34839,-23.28471 -14.80037,-44.58084 -27.40625,-63.34375 1.51505,-1.37729 4.37619,-3.91091 5.1875,-4.65625 0.23716,-2.62417 0.0334,-5.37553 2.75,-8.28125 5.75134,-5.40069 13.00329,-9.87898 21.75,-15.28125 4.15167,-2.44252 7.98954,-4.01698 12.15625,-7.09375 0.94225,-0.69576 2.2289,-1.79759 3.21875,-2.59375 7.01538,-5.59633 8.63058,-15.24842 3.59375,-21.5625 -5.03683,-6.31408 -14.79712,-6.90883 -21.8125,-1.3125 -0.99856,0.79085 -2.35353,1.82252 -3.25,2.59375 -3.9265,3.37796 -6.35145,6.71439 -9.65625,10.21875 -7.21249,7.32595 -13.17407,13.43777 -19.71875,17.84375 -2.83601,1.65106 -6.98996,1.07978 -8.87505,0.96875 l -5.5625,3.96875 c -31.7188,-33.26057 -74.90466,-54.52546 -121.40605,-58.6563 -0.13006,-1.94872 -0.30045,-5.47117 -0.34375,-6.53125 -1.90371,-1.82165 -4.20342,-3.37686 -4.78125,-7.3125 -0.63617,-7.86389 0.42597,-16.32459 1.65625,-26.53125 0.6791,-4.76876 1.80738,-8.73025 2,-13.90625 0.0438,-1.17663 -0.0265,-2.88401 -0.0312,-4.15625 -9.6e-4,-8.97409 -6.54804,-16.25082 -14.625,-16.25 z m -18.3125,113.4375 -4.34375,76.71875 -0.3125,0.15625 c -0.29134,6.86335 -5.93996,12.34375 -12.875,12.34375 -2.84081,0 -5.46294,-0.91229 -7.59375,-2.46875 l -0.125,0.0625 -62.90625,-44.59375 c 19.33365,-19.01115 44.06291,-33.06039 72.5625,-39.53125 5.20599,-1.18203 10.40966,-2.0591 15.59375,-2.6875 z m 36.65625,0 c 33.27347,4.09232 64.04501,19.15882 87.625,42.25 l -62.5,44.3125 -0.21875,-0.0937 c -5.54745,4.05169 -13.36343,3.04639 -17.6875,-2.375 -1.77132,-2.22096 -2.70072,-4.83239 -2.8125,-7.46875 l -0.0625,-0.0312 z m -147.625,70.875 57.4375,51.375 -0.0625,0.3125 c 5.18437,4.50697 5.94888,12.32794 1.625,17.75 -1.7712,2.22105 -4.14208,3.71074 -6.6875,4.40625 l -0.0625,0.25 -73.625,21.25 c -3.74728,-34.26517 4.32855,-67.57364 21.375,-95.34375 z m 258.15625,0.0312 c 8.5341,13.83256 14.99655,29.28214 18.84375,46.03125 3.80106,16.54828 4.75499,33.06697 3.1875,49.03125 l -74,-21.3125 -0.0625,-0.3125 c -6.6265,-1.81104 -10.69893,-8.55162 -9.15625,-15.3125 0.63203,-2.76962 2.10222,-5.11264 4.09375,-6.84375 l -0.0312,-0.15625 57.125,-51.125 z m -140.65625,55.3125 23.53125,0 14.625,18.28125 -5.25,22.8125 -21.125,10.15625 -21.1875,-10.1875 -5.25,-22.8125 z m 75.4375,62.5625 c 0.99997,-0.0505 1.99558,0.0396 2.96875,0.21875 l 0.125,-0.15625 76.15625,12.875 c -11.1455,31.3131 -32.47281,58.44018 -60.96875,76.59375 l -29.5625,-71.40625 0.0937,-0.125 c -2.71561,-6.30999 0.002,-13.70956 6.25,-16.71875 1.59965,-0.77041 3.27089,-1.19701 4.9375,-1.28125 z m -127.90625,0.3125 c 5.81174,0.0815 11.02462,4.11525 12.375,10.03125 0.63219,2.76958 0.3245,5.51375 -0.71875,7.9375 l 0.21875,0.28125 -29.25,70.6875 c -27.34716,-17.5486 -49.12927,-43.82403 -60.78125,-76.06245 l 75.5,-12.8125 0.125,0.15625 c 0.84451,-0.15541 1.701,-0.2304 2.53125,-0.21875 z m 63.78125,30.9688 c 2.02445,-0.0744 4.07865,0.34098 6.03125,1.28125 2.55951,1.23253 4.53673,3.17319 5.78125,5.5 l 0.28125,0 37.21875,67.25 c -4.83029,1.61923 -9.79609,3.00308 -14.875,4.15625 -28.46453,6.4629 -56.83862,4.50467 -82.53125,-4.25 l 37.125,-67.125 0.0625,0 c 2.22767,-4.16441 6.45247,-6.64887 10.90625,-6.8125 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         sodipodi:nodetypes="ccccccccsccccscssccsccccccccscccsccccccccccccccscccscsccsccccscscsccccccccscccscsccccsccccscscscccccccccccccccscccsccccccccccccscccccscccccccccccccccccccccccscccscccccccccscccscccc"
+         inkscape:export-filename="./path3059.png"
+         inkscape:export-xdpi="250.55"
+         inkscape:export-ydpi="250.55" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/LOU.png b/src/icons/LOU.png
new file mode 100644
index 000000000..c2836cab4
Binary files /dev/null and b/src/icons/LOU.png differ
diff --git a/src/icons/MOBOTIX.png b/src/icons/MOBOTIX.png
deleted file mode 100644
index a4574629c..000000000
Binary files a/src/icons/MOBOTIX.png and /dev/null differ
diff --git a/src/icons/MakeShopKorea.png b/src/icons/MakeShopKorea.png
new file mode 100644
index 000000000..5cf20bd0a
Binary files /dev/null and b/src/icons/MakeShopKorea.png differ
diff --git a/src/icons/Medium.svg b/src/icons/Medium.svg
old mode 100644
new mode 100755
index afaa40a70..c8b251dde
--- a/src/icons/Medium.svg
+++ b/src/icons/Medium.svg
@@ -1 +1,13 @@
-<svg width="256" height="208" viewBox="0 0 256 208" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M177.735 1.676c-3.897-1.858-7.084.017-7.084 4.178v165.507l71.143 33.961c7.828 3.799 14.178 1.156 14.178-5.78V40.18c0-.66-.413-1.238-1.024-1.569L177.743 1.784V1.7l-.008-.025z" fill="#32FC8D"/><path d="M85.321 130.636L166.49 4.74c2.295-3.551 7.349-4.955 11.23-3.138l77.32 36.91c.495.247.677.825.388 1.238l-84.785 131.627-85.32-40.724v-.017z" fill="#0BE370"/><path d="M11.808 3.922C5.318.826 3.113 3.13 6.919 9.042l78.402 121.594 85.321 40.725-85.13-132.057a1.285 1.285 0 0 0-.496-.446L11.808 3.93v-.008z" fill="#14C767"/><path d="M85.321 199.476c0 6.936-5.31 10.074-11.808 6.97L7.085 174.737C3.187 172.888 0 167.967 0 163.798V8.38C0 2.832 4.252.322 9.454 2.807L84.867 38.81c.28.123.454.396.454.693v159.974z" fill="#00AB6C"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="195px" height="195px" viewBox="0 0 195 195" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Monogram</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Monogram" fill-rule="nonzero">
+            <rect id="Rectangle-path" fill="#12100E" x="0" y="0" width="195" height="195"></rect>
+            <path d="M46.5340803,65.2157554 C46.6968378,63.6076572 46.0836,62.018231 44.8828198,60.93592 L32.6512605,46.2010582 L32.6512605,44 L70.6302521,44 L99.9859944,108.380952 L125.794585,44 L162,44 L162,46.2010582 L151.542017,56.2281011 C150.640424,56.9153477 150.193188,58.0448862 150.380019,59.1628454 L150.380019,132.837155 C150.193188,133.955114 150.640424,135.084652 151.542017,135.771899 L161.755369,145.798942 L161.755369,148 L110.38282,148 L110.38282,145.798942 L120.963119,135.527337 C122.002801,134.487948 122.002801,134.182246 122.002801,132.592593 L122.002801,73.0417402 L92.585901,147.755438 L88.6106443,147.755438 L54.3622782,73.0417402 L54.3622782,123.115814 C54.0767278,125.221069 54.7759199,127.3406 56.2581699,128.863022 L70.0186741,145.55438 L70.0186741,147.755438 L31,147.755438 L31,145.55438 L44.7605042,128.863022 C46.2319621,127.338076 46.8903838,125.204485 46.5340803,123.115814 L46.5340803,65.2157554 Z" id="Shape" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Microsoft.png b/src/icons/Microsoft.png
new file mode 100644
index 000000000..d6c37c10f
Binary files /dev/null and b/src/icons/Microsoft.png differ
diff --git a/src/icons/Microsoft.svg b/src/icons/Microsoft.svg
deleted file mode 100644
index ecb0ac592..000000000
--- a/src/icons/Microsoft.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="439" width="439"><path fill="#f3f3f3" d="M0 0h439v439H0z"/><path fill="#f8682c" d="M17 17h194v194H17z"/><path fill="#91c300" d="M228 17h194v194H228z"/><path fill="#00b4f1" d="M17 228h194v194H17z"/><path fill="#ffc300" d="M228 228h194v194H228z"/></svg>
\ No newline at end of file
diff --git a/src/icons/Mithril.svg b/src/icons/Mithril.svg
new file mode 100644
index 000000000..04cb102f1
--- /dev/null
+++ b/src/icons/Mithril.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 38.044 38.044" style="enable-background:new 0 0 38.044 38.044;" xml:space="preserve">
+<g>
+	<g>
+		<path style="fill:#010002;" d="M31.716,13.5C31.699,6.47,25.974,0.755,18.94,0.755c-7.045,0-12.777,5.732-12.777,12.777    c0,0.022,0.004,0.043,0.004,0.065C2.477,15.84,0,19.887,0,24.511c0,7.046,5.731,12.777,12.777,12.777    c2.268,0,4.395-0.601,6.244-1.642c1.849,1.041,3.977,1.642,6.245,1.642c7.046,0,12.777-5.732,12.777-12.777    C38.043,19.82,35.495,15.722,31.716,13.5z M19.021,32.961c-2.312-1.713-3.906-4.341-4.22-7.352c1.3,0.448,2.689,0.702,4.139,0.702    c1.514,0,2.96-0.278,4.307-0.764C22.949,28.584,21.349,31.236,19.021,32.961z M8.517,14.898c1.303-0.579,2.743-0.909,4.26-0.909    c1.475,0,2.879,0.307,4.154,0.858c-2.114,1.826-3.629,4.325-4.195,7.167C10.473,20.352,8.898,17.814,8.517,14.898z M18.94,24.055    c-1.457,0-2.846-0.298-4.109-0.837c0.361-2.928,1.929-5.482,4.19-7.157c2.243,1.662,3.802,4.187,4.18,7.085    C21.897,23.727,20.457,24.055,18.94,24.055z M21.111,14.846c1.275-0.55,2.679-0.858,4.154-0.858c1.457,0,2.846,0.298,4.11,0.837    c-0.356,2.885-1.883,5.404-4.089,7.082C24.704,19.108,23.199,16.65,21.111,14.846z M18.94,3.01c5.432,0,9.915,4.137,10.466,9.425    c-1.3-0.447-2.689-0.702-4.14-0.702c-2.268,0-4.396,0.601-6.245,1.642c-1.848-1.041-3.975-1.642-6.244-1.642    c-1.514,0-2.96,0.278-4.307,0.763C8.993,7.179,13.488,3.01,18.94,3.01z M12.777,35.034c-5.803,0-10.523-4.72-10.523-10.523    c0-3.418,1.645-6.451,4.177-8.375c0.744,3.581,2.999,6.607,6.059,8.408c0.011,3.847,1.735,7.293,4.442,9.631    C15.656,34.727,14.253,35.034,12.777,35.034z M25.266,35.034c-1.475,0-2.879-0.307-4.154-0.858    c2.715-2.345,4.444-5.804,4.444-9.664c0-0.022-0.004-0.044-0.004-0.065c3.007-1.829,5.209-4.852,5.918-8.416    c2.613,1.917,4.319,4.999,4.319,8.48C35.788,30.313,31.068,35.034,25.266,35.034z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Moxa.png b/src/icons/Moxa.png
deleted file mode 100644
index 03a2e6f93..000000000
Binary files a/src/icons/Moxa.png and /dev/null differ
diff --git a/src/icons/NOIX.png b/src/icons/NOIX.png
deleted file mode 100644
index ae6f9fee6..000000000
Binary files a/src/icons/NOIX.png and /dev/null differ
diff --git a/src/icons/Nedstat.png b/src/icons/Nedstat.png
deleted file mode 100644
index 2ffb430b5..000000000
Binary files a/src/icons/Nedstat.png and /dev/null differ
diff --git a/src/icons/Neonclear.png b/src/icons/Neonclear.png
deleted file mode 100644
index 0e0dcc59c..000000000
Binary files a/src/icons/Neonclear.png and /dev/null differ
diff --git a/src/icons/Netmonitor.png b/src/icons/Netmonitor.png
deleted file mode 100644
index 45da0d733..000000000
Binary files a/src/icons/Netmonitor.png and /dev/null differ
diff --git a/src/icons/Nuxt.js.svg b/src/icons/Nuxt.js.svg
new file mode 100644
index 000000000..e0bd713f8
--- /dev/null
+++ b/src/icons/Nuxt.js.svg
@@ -0,0 +1,10 @@
+<svg width="486px" height="346px" viewBox="0 0 486 346" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Nuxt Logo</title>
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g fill-rule="nonzero">
+            <polygon id="Shape" fill="#42B883" points="200 0 400 346 0 346"></polygon>
+            <polygon id="Shape" fill="#3C8171" points="311 43 486 346 136 346"></polygon>
+            <polygon id="Shape" fill="#35495E" points="267.945522 117 400 345.454247 136 345.454247"></polygon>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/OmniTouch 8660 My Teamwork.png b/src/icons/OmniTouch 8660 My Teamwork.png
deleted file mode 100644
index 012c09d7d..000000000
Binary files a/src/icons/OmniTouch 8660 My Teamwork.png and /dev/null differ
diff --git a/src/icons/OpenUI5.png b/src/icons/OpenUI5.png
index 1a3703019..17a2b943e 100644
Binary files a/src/icons/OpenUI5.png and b/src/icons/OpenUI5.png differ
diff --git a/src/icons/Pagevamp.png b/src/icons/Pagevamp.png
new file mode 100644
index 000000000..246558737
Binary files /dev/null and b/src/icons/Pagevamp.png differ
diff --git a/src/icons/Parcel.png b/src/icons/Parcel.png
new file mode 100644
index 000000000..f3028060f
Binary files /dev/null and b/src/icons/Parcel.png differ
diff --git a/src/icons/Pendo.svg b/src/icons/Pendo.svg
new file mode 100644
index 000000000..fe7d070c0
--- /dev/null
+++ b/src/icons/Pendo.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
+fill="#ec2059" stroke="none">
+<path d="M0 2560 l0 -2560 2560 0 2560 0 0 2560 0 2560 -2560 0 -2560 0 0
+-2560z m3800 672 l0 -697 -697 -698 -698 -697 -3 695 -2 695 -695 0 c-382 0
+-695 2 -695 5 0 3 313 318 695 700 l695 695 700 0 700 0 0 -698z"/>
+</g>
+</svg>
diff --git a/src/icons/Penguin.svg b/src/icons/Penguin.svg
deleted file mode 100644
index edf330b32..000000000
--- a/src/icons/Penguin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 70 70" xmlns="http://www.w3.org/2000/svg"><title>penguin 2</title><path d="M52.65 61.364h2.767a2.81 2.81 0 0 1 2.803 2.803 2.81 2.81 0 0 1-2.803 2.803h-.024c0 .04.024.073.024.113 0 1.613-1.3 2.917-2.917 2.917-7.578 0-13.04-.543-16.234-1.61-.476-.157-.89-.33-1.266-.51-.373.18-.79.353-1.266.51C30.534 69.457 25.072 70 17.5 70a2.916 2.916 0 0 1-2.917-2.917c0-.04.02-.073.024-.113h-.024a2.806 2.806 0 0 1-2.803-2.803 2.806 2.806 0 0 1 2.803-2.803h2.768c-3.97-3.42-6.582-8.25-8-14.166-.88.545-5.54 3.138-9.34.393-.214-2.78 5.526-7.04 8.34-14.52 0 .01.003.017.003.026.74-2.856 2.518-7.62 2.69-9.025C11.04 7.488 24.206 0 35 0c10.795 0 23.96 7.487 23.96 24.068.175 1.406 1.95 6.172 2.692 9.03.006-.008.006-.017.006-.03 2.815 7.48 8.552 11.735 8.336 14.523-3.806 2.75-8.46.15-9.342-.39-1.41 5.918-4.028 10.748-8.003 14.167z" fill="#303048"/><path d="M51.19 29.517S56.365 10.1 41.75 10.1c-3.116 0-5.528 3.46-6.744 3.46-1.216 0-3.11-3.46-6.746-3.46-14.62 0-9.445 19.417-9.445 19.417s-2.698 3.433-2.698 10.59c0 14.893 10.38 18.926 18.89 18.926 8.507 0 18.887-4.033 18.887-18.926 0-7.157-2.704-10.59-2.704-10.59z" fill="#FFF"/><path d="M32.083 23.333a2.918 2.918 0 0 0-5.833 0 2.918 2.918 0 0 0 5.833 0zm11.667 0c0 1.61-1.3 2.917-2.917 2.917a2.916 2.916 0 0 1 0-5.833 2.914 2.914 0 0 1 2.917 2.916z" fill="#303048"/><path d="M29.588 28.853c1.692 4.42 5.717 5.452 5.717 5.452s4.025-1.032 5.718-5.452c-3.282-.95-5.718-2.724-5.718-2.724s-2.433 1.77-5.717 2.72z" fill="#F15A40"/></svg>
\ No newline at end of file
diff --git a/src/icons/PerfSONAR-PS.png b/src/icons/PerfSONAR-PS.png
deleted file mode 100644
index f5e1402ff..000000000
Binary files a/src/icons/PerfSONAR-PS.png and /dev/null differ
diff --git a/src/icons/Petrojs.png b/src/icons/Petrojs.png
deleted file mode 100644
index a44eaa35c..000000000
Binary files a/src/icons/Petrojs.png and /dev/null differ
diff --git a/src/icons/Piano Solo.png b/src/icons/Piano Solo.png
deleted file mode 100644
index 1d4be842c..000000000
Binary files a/src/icons/Piano Solo.png and /dev/null differ
diff --git a/src/icons/PlatformOS.svg b/src/icons/PlatformOS.svg
new file mode 100644
index 000000000..d0f4281e2
--- /dev/null
+++ b/src/icons/PlatformOS.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 30.58 26.03" xmlns="http://www.w3.org/2000/svg"><path d="m5.07 0h2.63l-4.14 4.17z" fill="#3cd52e"/><path d="m2.16 11.04-2.16-3.88h2.11z" fill="#d70036"/><path d="m2.11 7.17h4.34l-4.29 3.87z" fill="#ea1d76"/><path d="m6.29 14.44.16-7.27-4.29 3.87z" fill="#ff8300"/><path d="m11.47 10.82-5.19 3.62.17-7.27z" fill="#ffce00"/><path d="m14.7 6.03-8.25 1.14 5.02 3.65z" fill="#3cd52e"/><path d="m12.79 0-3.33 4.09 5.24 1.94z" fill="#d70036"/><path d="m20.61 0h-7.82l1.91 6.03z" fill="#3e8ede"/><path d="m6.45 7.17 8.25-1.14-5.24-1.94z" fill="#ea1d76"/><path d="m22.09 6.03h-7.39l5.91-6.03z" fill="#1d4f90"/><path d="m18.38 12.75-6.91-1.93 3.23-4.79z" fill="#47a141"/><path d="m22.09 6.03-3.71 6.72-3.68-6.72z" fill="#005744"/><path d="m24.69 10.82-6.31 1.93 3.71-6.72z" fill="#47a141"/><path d="m23.54 14.74-5.16-1.99 6.31-1.93z" fill="#3cd52e"/><path d="m20.61 0 5.69 4.69-4.21 1.34z" fill="#3e8ede"/><path d="m22.09 6.03 4.21-1.34-1.61 6.13z" fill="#00953a"/><path d="m24.69 10.82 5.82 1.1-6.97 2.82z" fill="#005744"/><path d="m30.51 11.92.07 5.53-7.04-2.71z" fill="#47a141"/><path d="m23.54 14.74 7.04 2.71-5.32.89z" fill="#1d4f90"/><path d="m30.58 17.45-2.73 6.03-2.59-5.14z" fill="#3cd52e"/><path d="m25.26 18.34 2.59 5.14-3.94-2.19z" fill="#3e8ede"/><path d="m27.85 23.48-3.9 2.55-.04-4.74z" fill="#1d4f90"/><path d="m23.91 21.29.04 4.74-1.96-3.08z" fill="#3e8ede"/><path d="m23.95 26.03h-5.21l3.25-3.08z" fill="#1d4f90"/><path d="m21.99 22.95-3.25 3.08.57-3.08z" fill="#d70036"/><path d="m19.31 22.95-.57 3.08-2.51-3.08z" fill="#ea1d76"/><path d="m19.31 22.95h-3.08l1.83-2.13z" fill="#d70036"/><path d="m16.23 22.95v-4.03l1.83 1.9z" fill="#ff8300"/><path d="m26.3 4.69 4.21 7.23-5.82-1.1z" fill="#3cd52e"/><path d="m19.31 19.02-.42-2.07 3.08 1.39z" fill="#47a141"/><path d="m16.23 18.92 3.08.1-.42-2.07z" fill="#3cd52e"/><path d="m18.06 20.82 1.25-1.8-3.08-.1z" fill="#ffce00"/><path d="m7.17 2.69 2.29 1.4-.11-2.77z" fill="#47a141"/><path d="m7.17 2.69 2.18-1.37-1.65-1.32z" fill="#3cd52e"/><path d="m3.56 4.17 4.14-4.17-.53 2.69z" fill="#00953a"/><path d="m9.46 4.09-2.29-1.4-1.06 1.46z" fill="#005744"/><path d="m3.56 4.17 3.61-1.48-1.06 1.46z" fill="#47a141"/><path d="m2.11 7.17 4-3.02.34 3.02z" fill="#ff8300"/><path d="m6.11 4.15.34 3.02 3.01-3.08z" fill="#d70036"/><path d="m2.11 7.17 1.45-3 2.55-.02z" fill="#ffce00"/><path d="m11.87 14.43-1.25 2.13h3.6z" fill="#47a141"/><path d="m9.16 14.44 1.46 2.12 1.25-2.13z" fill="#3cd52e"/><path d="m11.47 10.82.4 3.61 6.51-1.68z" fill="#005744"/><path d="m14.22 16.56 4.16-3.81-6.51 1.68z" fill="#00953a"/></svg>
diff --git a/src/icons/Plura.png b/src/icons/Plura.png
deleted file mode 100644
index de3113639..000000000
Binary files a/src/icons/Plura.png and /dev/null differ
diff --git a/src/icons/Prospector.png b/src/icons/Prospector.png
deleted file mode 100644
index 2a694ae38..000000000
Binary files a/src/icons/Prospector.png and /dev/null differ
diff --git a/src/icons/Public CMS.png b/src/icons/Public CMS.png
index 9a8e084ed..e5e51c364 100644
Binary files a/src/icons/Public CMS.png and b/src/icons/Public CMS.png differ
diff --git a/src/icons/RakutenDigitalCommerce.png b/src/icons/RakutenDigitalCommerce.png
new file mode 100644
index 000000000..8784b5b3c
Binary files /dev/null and b/src/icons/RakutenDigitalCommerce.png differ
diff --git a/src/icons/Rocket.svg b/src/icons/Rocket.svg
new file mode 100644
index 000000000..feadcf82b
--- /dev/null
+++ b/src/icons/Rocket.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="52.2px" height="52.2px" viewBox="0 0 52.2 52.2" style="enable-background:new 0 0 52.2 52.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#EF7B24;}
+</style>
+<g>
+	<g>
+	</g>
+	<path class="st0" d="M44.6,7.6c-10.2-10.2-26.8-10.2-37,0s-10.2,26.8,0,37s26.8,10.2,37,0S54.8,17.8,44.6,7.6z M23.2,46.8
+		c-2.9-1.9-4.6-5.3-4.9-9.4c0-0.4,0-0.9,0-1.3c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0c0.3,0,0.7-0.1,1-0.1c0.1,0,0.2,0,0.3,0
+		c0.3,0,0.6-0.1,0.8-0.1c0.1,0,0.2,0,0.4-0.1c0.2,0,0.5-0.1,0.7-0.2c0.1,0,0.3-0.1,0.4-0.1c0.2,0,0.4-0.1,0.5-0.1
+		c0.4,1.7,1.1,3.3,2,4.8c0.2,0.3,0.7,0.4,1,0.2c0.6-0.5,1.2-1,1.8-1.6c2.1-2.2,3.4-4.9,4-7.7c0.1-0.1,0.2-0.2,0.3-0.2
+		c0.1-0.1,0.2-0.2,0.4-0.3c0.2-0.2,0.4-0.3,0.6-0.5c0.1-0.1,0.2-0.2,0.3-0.3c0.3-0.3,0.6-0.5,0.8-0.8c4.4-4.4,7-10.2,7.3-16.3
+		c0-0.4-0.1-0.8-0.4-1l0,0c-0.3-0.3-0.7-0.4-1-0.4c-6.2,0.3-11.9,2.9-16.3,7.3c-0.3,0.3-0.5,0.5-0.8,0.8c-0.1,0.1-0.3,0.3-0.4,0.4
+		c-0.1,0.1-0.2,0.3-0.3,0.4c-0.2,0.2-0.4,0.5-0.6,0.7l0,0c-2.8,0.6-5.5,1.9-7.7,4c-0.6,0.6-1.2,1.2-1.6,1.8c-0.2,0.3-0.2,0.7,0.2,1
+		c1.5,1,3.1,1.6,4.8,2c-0.1,0.4-0.2,0.7-0.3,1.1c0,0,0,0,0,0c-0.1,0.3-0.1,0.7-0.2,1c0,0,0,0.1,0,0.1c-0.1,0.3-0.1,0.6-0.1,0.9
+		c0,0.1,0,0.2,0,0.3c0,0.3-0.1,0.5-0.1,0.8c0,0,0,0,0,0c-0.7,0-1.3,0-2-0.1c-3.7-0.3-6.8-2-8.6-4.9c0,0,0,0,0,0
+		c-1-1.5-1.3-3.3-1.1-5c0.6-5.7,3.3-11.2,8.4-15.2c7.9-6.2,19.2-6.1,27,0.1c10.4,8.3,11,23.5,1.9,32.6c-3.9,3.9-8.9,6-14.1,6.3
+		C26,48,24.5,47.7,23.2,46.8C23.2,46.8,23.2,46.8,23.2,46.8z M18.4,33.8c0.5-5.2,2.8-10.1,6.6-13.9c3.7-3.7,8.6-6.1,13.9-6.6
+		c-0.5,5.2-2.8,10.1-6.6,13.9c-0.5,0.5-1,0.9-1.5,1.3c-0.2,0.1-0.3,0.2-0.5,0.4c-0.4,0.3-0.7,0.6-1.1,0.8c-0.2,0.1-0.4,0.3-0.6,0.4
+		c-0.3,0.2-0.7,0.4-1,0.6c-0.3,0.1-0.5,0.3-0.8,0.4c-0.3,0.2-0.6,0.3-1,0.5c-0.3,0.2-0.7,0.3-1.1,0.4c-0.2,0.1-0.5,0.2-0.7,0.3
+		c-0.6,0.2-1.2,0.4-1.8,0.6c0,0-0.1,0-0.1,0C21,33.4,19.7,33.7,18.4,33.8z M5,32c2.2,2.4,5.3,3.8,8.9,4.1c0.7,0.1,1.4,0.1,2.1,0.1
+		l0,0l0,0c0,0.4,0,0.9,0,1.3c0.2,3.9,1.6,7.3,4,9.6c0,0,0,0,0,0c-3.5-1-6.7-2.8-9.4-5.6C7.9,38.8,6,35.5,5,32z"/>
+</g>
+</svg>
diff --git a/src/icons/SPIP.png b/src/icons/SPIP.png
deleted file mode 100644
index 6054c483d..000000000
Binary files a/src/icons/SPIP.png and /dev/null differ
diff --git a/src/icons/Sentinel.png b/src/icons/Sentinel.png
deleted file mode 100644
index 9fa007fc2..000000000
Binary files a/src/icons/Sentinel.png and /dev/null differ
diff --git a/src/icons/Sentry.svg b/src/icons/Sentry.svg
new file mode 100644
index 000000000..53b613be4
--- /dev/null
+++ b/src/icons/Sentry.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 265.98 249.68"><title>sentry-glyph-black</title><path d="M144.9,65.43a13.75,13.75,0,0,0-23.81,0l-19.6,33.95,5,2.87a96.14,96.14,0,0,1,47.83,77.4H140.56a82.4,82.4,0,0,0-41-65.54l-5-2.86L76.3,143l5,2.87a46.35,46.35,0,0,1,22.46,33.78H72.33a2.27,2.27,0,0,1-2-3.41l8.76-15.17a31.87,31.87,0,0,0-10-5.71L60.42,170.5a13.75,13.75,0,0,0,11.91,20.62h43.25v-5.73A57.16,57.16,0,0,0,91.84,139l6.88-11.92a70.93,70.93,0,0,1,30.56,58.26v5.74h36.65v-5.73A107.62,107.62,0,0,0,117.09,95.3L131,71.17a2.27,2.27,0,0,1,3.93,0l60.66,105.07a2.27,2.27,0,0,1-2,3.41H179.4c.18,3.83.2,7.66,0,11.48h14.24a13.75,13.75,0,0,0,11.91-20.62Z" style="fill:#221f20"/></svg>
\ No newline at end of file
diff --git a/src/icons/Shopalize.png b/src/icons/Shopalize.png
deleted file mode 100644
index c73389954..000000000
Binary files a/src/icons/Shopalize.png and /dev/null differ
diff --git a/src/icons/Shopcada.png b/src/icons/Shopcada.png
new file mode 100644
index 000000000..c27bef7d1
Binary files /dev/null and b/src/icons/Shopcada.png differ
diff --git a/src/icons/Shoperfa.png b/src/icons/Shoperfa.png
new file mode 100644
index 000000000..b6bc62af8
Binary files /dev/null and b/src/icons/Shoperfa.png differ
diff --git a/src/icons/Sqreen.png b/src/icons/Sqreen.png
new file mode 100644
index 000000000..c4e1000e6
Binary files /dev/null and b/src/icons/Sqreen.png differ
diff --git a/src/icons/Stamplay.png b/src/icons/Stamplay.png
deleted file mode 100644
index 8f5b25759..000000000
Binary files a/src/icons/Stamplay.png and /dev/null differ
diff --git a/src/icons/StatCounter.png b/src/icons/StatCounter.png
deleted file mode 100644
index e3d2bcc3d..000000000
Binary files a/src/icons/StatCounter.png and /dev/null differ
diff --git a/src/icons/Statcounter.svg b/src/icons/Statcounter.svg
new file mode 100644
index 000000000..9f91885fe
--- /dev/null
+++ b/src/icons/Statcounter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="94" width="94" version="1.1" y="0px" x="0px" viewBox="0 0 93.999999 94"><defs><clipPath id="clipPath5011" clipPathUnits="userSpaceOnUse"><path d="m39.867-0.011719a47.764 47.764 0 0 0 -47.764 47.764 47.764 47.764 0 0 0 47.764 47.764 47.764 47.764 0 0 0 47.764 -47.764 47.764 47.764 0 0 0 -47.764 -47.764zm0 34.812a12.952 12.952 0 0 1 12.951 12.952 12.952 12.952 0 0 1 -12.951 12.953 12.952 12.952 0 0 1 -12.951 -12.953 12.952 12.952 0 0 1 12.951 -12.951z" fill="#000000"/></clipPath></defs><g transform="translate(7.203 -0.823)" clip-path="url(#clipPath5011)"><path fill="#76c349" d="m72.623 54.124a33.37 33.37 0 0 1 -18.887 23.98l-13.869-30.351z"/><path d="m57.718 81.944a38.57 38.57 0 0 1 -45.9 -7.716 38.57 38.57 0 0 1 -5.055 -46.269 38.57 38.57 0 0 1 43.15 -17.445l-10.046 37.239z" fill="#0078d3"/><path d="m39.867 5.8728a41.88 41.88 0 0 1 33.442 16.669 41.88 41.88 0 0 1 6.8202 36.738l-40.262-11.527z" fill="#d6e142"/><path fill="#12bdef" d="m39.867 1.0923a46.66 46.66 0 0 1 44.897 33.952l-44.897 12.709z"/></g></svg>
diff --git a/src/icons/Strapi.png b/src/icons/Strapi.png
new file mode 100644
index 000000000..065887ab7
Binary files /dev/null and b/src/icons/Strapi.png differ
diff --git a/src/icons/TeamCity.png b/src/icons/TeamCity.png
deleted file mode 100644
index 405f3f779..000000000
Binary files a/src/icons/TeamCity.png and /dev/null differ
diff --git a/src/icons/TeamCity.svg b/src/icons/TeamCity.svg
new file mode 100644
index 000000000..6083e574b
--- /dev/null
+++ b/src/icons/TeamCity.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1.7738" y1="31.2729" x2="40.1662" y2="31.2729">
+			<stop  offset="0" style="stop-color:#905CFB"/>
+			<stop  offset="6.772543e-002" style="stop-color:#776CF9"/>
+			<stop  offset="0.1729" style="stop-color:#5681F7"/>
+			<stop  offset="0.2865" style="stop-color:#3B92F5"/>
+			<stop  offset="0.4097" style="stop-color:#269FF4"/>
+			<stop  offset="0.5474" style="stop-color:#17A9F3"/>
+			<stop  offset="0.7111" style="stop-color:#0FAEF2"/>
+			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_1_);" d="M39.7,47.9l-6.1-34c-0.4-2.4-1.2-4.8-2.7-7.1c-2-3.2-5.2-5.4-8.8-6.3
+			C7.9-2.9-2.6,11.3,3.6,23.9c0,0,0,0,0,0l14.8,31.7c0.4,1,1,2,1.7,2.9c1.2,1.6,2.8,2.8,4.7,3.4C34.4,64.9,42.1,56.4,39.7,47.9z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="5.3113" y1="9.6691" x2="69.2278" y2="43.8664">
+			<stop  offset="0" style="stop-color:#905CFB"/>
+			<stop  offset="6.772543e-002" style="stop-color:#776CF9"/>
+			<stop  offset="0.1729" style="stop-color:#5681F7"/>
+			<stop  offset="0.2865" style="stop-color:#3B92F5"/>
+			<stop  offset="0.4097" style="stop-color:#269FF4"/>
+			<stop  offset="0.5474" style="stop-color:#17A9F3"/>
+			<stop  offset="0.7111" style="stop-color:#0FAEF2"/>
+			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_2_);" d="M67.4,26.5c-1.4-2.2-3.4-3.9-5.7-4.9L25.5,1.7l0,0c-1-0.5-2.1-1-3.3-1.3
+			C6.7-3.2-4.4,13.8,5.5,27c1.5,2,3.6,3.6,6,4.5L48,47.9c0.8,0.5,1.6,0.8,2.5,1.1C64.5,53.4,75.1,38.6,67.4,26.5z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-19.2836" y1="70.8198" x2="55.9833" y2="33.1863">
+			<stop  offset="0" style="stop-color:#3BEA62"/>
+			<stop  offset="0.117" style="stop-color:#31DE80"/>
+			<stop  offset="0.3025" style="stop-color:#24CEA8"/>
+			<stop  offset="0.4844" style="stop-color:#1AC1C9"/>
+			<stop  offset="0.6592" style="stop-color:#12B7DF"/>
+			<stop  offset="0.8238" style="stop-color:#0EB2ED"/>
+			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_3_);" d="M67.4,26.5c-1.8-2.8-4.6-4.8-7.9-5.6c-3.5-0.8-6.8-0.5-9.6,0.7L11.4,36.1
+			c0,0-0.2,0.1-0.6,0.4C0.9,40.4-4,53.3,4,64c1.8,2.4,4.3,4.2,7.1,5c5.3,1.6,10.1,1,14-1.1c0,0,0.1,0,0.1,0l37.6-20.1
+			c0,0,0,0,0.1-0.1C69.5,43.9,72.6,34.6,67.4,26.5z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="38.9439" y1="5.8503" x2="5.4232" y2="77.5093">
+			<stop  offset="0" style="stop-color:#3BEA62"/>
+			<stop  offset="9.397750e-002" style="stop-color:#2FDB87"/>
+			<stop  offset="0.196" style="stop-color:#24CEA8"/>
+			<stop  offset="0.3063" style="stop-color:#1BC3C3"/>
+			<stop  offset="0.4259" style="stop-color:#14BAD8"/>
+			<stop  offset="0.5596" style="stop-color:#10B5E7"/>
+			<stop  offset="0.7185" style="stop-color:#0DB1EF"/>
+			<stop  offset="0.9677" style="stop-color:#0CB0F2"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_4_);" d="M50.3,12.8c1.2-2.7,1.1-6-0.9-9c-1.1-1.8-2.9-3-4.9-3.5c-4.5-1.1-8.3,1-10.1,4.2L3.5,42
+			c0,0,0,0,0,0.1C-0.9,47.9-1.6,56.5,4,64c1.8,2.4,4.3,4.2,7.1,5c10.5,3.3,19.3-2.5,22.1-10.8L50.3,12.8z"/>
+	</g>
+	<g>
+		<rect x="13.4" y="13.4" style="fill:#000000;" width="43.2" height="43.2"/>
+		<rect x="17.5" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+		<polygon style="fill:#FFFFFF;" points="22.9,22.7 17.5,22.7 17.5,19.1 32.3,19.1 32.3,22.7 26.8,22.7 26.8,37 22.9,37 		"/>
+		<path style="fill:#FFFFFF;" d="M32.5,28.1L32.5,28.1c0-5.1,3.8-9.3,9.3-9.3c3.4,0,5.4,1.1,7.1,2.8l-2.5,2.9c-1.4-1.3-2.8-2-4.6-2
+			c-3,0-5.2,2.5-5.2,5.6V28c0,3.1,2.1,5.6,5.2,5.6c2,0,3.3-0.8,4.7-2.1l2.5,2.5c-1.8,2-3.9,3.2-7.3,3.2
+			C36.4,37.3,32.5,33.2,32.5,28.1"/>
+	</g>
+</g>
+</svg>
diff --git a/src/icons/Tilda.svg b/src/icons/Tilda.svg
new file mode 100644
index 000000000..d3c193bcb
--- /dev/null
+++ b/src/icons/Tilda.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="124px" height="124px" viewBox="0 0 124 124" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.8.1 (29687) - http://www.bohemiancoding.com/sketch -->
+    <title>Page 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-1" transform="translate(-13.000000, -14.000000)">
+            <g id="Page-1" transform="translate(15.000000, 15.000000)">
+                <polygon id="Fill-1" fill="#000000" points="63.4941 53.9491 63.4941 97.0171 55.0341 97.0171 55.0341 50.9491"></polygon>
+                <g id="Group-6" transform="translate(0.000000, 0.831000)">
+                    <path d="M31.04,49.3213 C30.704,38.0813 36.636,32.3493 44.356,32.3493 C49.057,32.3493 52.638,33.8103 60.247,37.4073 C65.843,40.1043 69.983,42.1283 74.124,42.1283 C78.153,42.1283 80.056,38.8683 80.167,32.6863 L86.77,32.6863 C87.329,45.1633 80.95,49.6593 74.013,49.6593 C69.536,49.6593 65.507,48.3113 57.786,44.7143 C52.526,42.1283 48.386,39.7683 44.356,39.7683 C40.328,39.7683 37.866,42.5783 37.754,49.3213 L31.04,49.3213 Z" id="Fill-2" fill="#000000"></path>
+                    <path d="M119.83,60.0849 C119.83,93.1749 93.007,119.9999 59.915,119.9999 C26.825,119.9999 0,93.1749 0,60.0849 C0,26.9939 26.825,0.1689 59.915,0.1689 C93.007,0.1689 119.83,26.9939 119.83,60.0849 L119.83,60.0849 Z" id="Stroke-4" stroke="#000000" stroke-width="4"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Tsoft.png b/src/icons/Tsoft.png
deleted file mode 100644
index 04cc84c96..000000000
Binary files a/src/icons/Tsoft.png and /dev/null differ
diff --git a/src/icons/UserGuiding.svg b/src/icons/UserGuiding.svg
new file mode 100644
index 000000000..f01fa5fbc
--- /dev/null
+++ b/src/icons/UserGuiding.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+        "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+     width="790.000000pt" height="763.000000pt" viewBox="0 0 790.000000 763.000000"
+     preserveAspectRatio="xMidYMid meet">
+    <metadata>
+        UserGuiding .svg logo icon
+    </metadata>
+    <g transform="translate(0.000000,763.000000) scale(0.100000,-0.100000)"
+       fill="#F75C3D" stroke="none">
+        <path d="M3700 7609 c-110 -23 -266 -83 -354 -136 -34 -20 -700 -500 -1481
+-1067 -1301 -944 -1429 -1039 -1525 -1136 -157 -159 -250 -321 -307 -537 -35
+-132 -44 -382 -18 -518 26 -140 1095 -3426 1155 -3551 60 -125 142 -235 251
+-340 132 -126 276 -213 445 -270 170 -57 70 -54 2089 -54 1629 0 1873 2 1937
+15 417 87 757 383 897 780 85 244 1083 3337 1095 3397 21 100 22 367 2 470
+-30 158 -102 326 -198 466 -106 152 -154 190 -1190 943 -541 393 -1185 861
+-1433 1041 -247 180 -483 346 -524 369 -98 57 -224 103 -348 128 -137 28 -358
+28 -493 0z m339 -753 l36 -36 3 -103 4 -104 51 -13 c28 -7 91 -33 141 -58 160
+-80 298 -242 349 -409 l22 -73 130 0 c145 0 180 -11 210 -69 34 -67 11 -143
+-55 -180 -32 -18 -55 -21 -154 -21 l-116 0 0 -290 0 -290 -104 0 -105 0 -3
+213 c-3 204 -4 213 -26 245 -37 51 -88 72 -177 72 -118 0 -177 -40 -204 -135
+-6 -22 -11 -119 -11 -217 l0 -178 -90 0 -90 0 0 194 c0 207 -5 233 -48 280
+-39 41 -82 56 -161 56 -107 0 -156 -26 -192 -105 -16 -34 -19 -67 -19 -232 l0
+-193 -100 0 -100 0 0 290 0 290 -110 0 c-125 0 -162 11 -203 59 -49 59 -28
+159 42 196 22 11 62 15 155 15 l124 0 27 80 c73 219 299 426 508 465 l37 7 0
+92 c0 73 4 97 20 124 50 81 143 94 209 28z m889 -1827 c59 -29 90 -92 73 -150
+-6 -20 -27 -51 -46 -68 l-36 -31 -125 0 -125 0 6 -47 c5 -45 385 -4233 385
+-4247 0 -3 -202 -6 -450 -6 l-450 0 0 236 c0 271 -5 300 -65 359 -80 80 -198
+85 -281 13 -71 -63 -74 -77 -74 -358 l0 -250 -450 0 -450 0 1 43 c0 23 15 197
+32 387 l32 345 125 5 c74 3 134 10 147 18 49 27 67 106 38 162 -25 48 -61 60
+-180 60 -102 0 -105 1 -105 23 0 12 9 117 20 232 11 116 20 216 20 223 0 9 41
+12 171 12 134 0 178 3 204 16 73 34 87 142 25 197 l-30 27 -175 0 -174 0 4 28
+c3 15 11 108 20 207 8 99 18 199 21 223 l5 42 241 0 240 0 34 34 c28 28 34 42
+34 75 0 56 -22 95 -64 115 -28 13 -71 16 -251 16 l-218 0 6 38 c3 20 14 130
+23 245 l18 207 288 0 c317 0 333 3 363 60 8 16 15 48 15 71 0 33 -6 47 -34 75
+l-34 34 -286 0 -286 0 0 23 c0 12 9 117 20 232 11 116 20 215 20 222 0 9 86
+13 353 15 317 3 355 5 378 21 67 45 65 162 -5 208 -17 11 -88 15 -361 17
+l-341 3 13 127 c6 70 12 146 12 170 l1 42 -115 0 c-131 0 -163 11 -195 63 -45
+73 -6 172 76 197 16 4 449 9 963 9 l935 1 44 -21z"/>
+    </g>
+</svg>
diff --git a/src/icons/Vaadin.svg b/src/icons/Vaadin.svg
new file mode 100644
index 000000000..6ebe998ee
--- /dev/null
+++ b/src/icons/Vaadin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="235.45" height="225.24" viewBox="0 0 235.45 225.24001"><defs><clipPath><path d="M0 250h250V0H0z"/></clipPath><clipPath id="a"><path d="M0 250h250V0H0z"/></clipPath></defs><g><g><g clip-path="url(#a)" transform="matrix(1.25 0 0 -1.25 -38.922 268.364)"><g><path fill="#00b4f0" d="M135.2 150.52c.05.5.1.94.1 1.47 0 5.22 1.24 10.6 13.98 10.6h42.6c19.23 0 27.62 9.08 27.62 27.25v15.46c0 5.2-4.1 9.4-9.3 9.4-5.17 0-9.32-4.2-9.32-9.4l-.03-5.36c0-5.85-3.74-9.96-12.5-9.96h-41.8c-19 0-20.46-14.1-21.08-21.58h-.42c-.63 7.47-2.1 21.58-21.1 21.58H62.18c-8.78 0-12.8 4.26-12.8 10.1v5.23c0 5.2-3.9 9.4-9.1 9.4-5.17 0-9.14-4.2-9.14-9.4v-15.45c0-18.17 8.27-27.26 27.5-27.26h42.6c12.74 0 14-5.38 14-10.6 0-.54.03-1.02.1-1.5.3-5.24 4.62-9.37 9.92-9.37s9.63 4.16 9.93 9.4"/></g><g><path fill="#00b4f0" d="M124.78 34.5c4.5 0 8.36 2.68 10.1 6.52.1.15.18.3.27.46l38.8 71.76c1.1 1.9 1.65 4.02 1.65 6.17 0 6.87-5.58 12.46-12.44 12.46-5.52 0-9.26-2.7-11.8-8.5L124.8 73.83l-26.55 49.5c-2.56 5.84-6.3 8.54-11.83 8.54-6.86 0-12.44-5.6-12.44-12.45 0-2.14.57-4.27 1.64-6.15l38.8-71.76c.07-.12.13-.22.18-.32 1.72-3.93 5.63-6.68 10.2-6.68"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Virgool.svg b/src/icons/Virgool.svg
new file mode 100644
index 000000000..40367e96c
--- /dev/null
+++ b/src/icons/Virgool.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Group 2</title>
+  <desc>Created with Sketch.</desc>
+  <defs>
+    <style>.cls-1{fill:url(#linear-gradient);}.cls-2{fill:#fff;}</style>
+    <linearGradient id="linear-gradient" x1="-1822.87" y1="-81.34" x2="-1822.46" y2="-81.45" gradientTransform="translate(370240.8 22506.21) scale(203.1 275.68)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#107abd"/><stop offset="1" stop-color="#0658a5"/></linearGradient>
+  </defs>
+  <path id="Shape" class="cls-1" d="M62.46,124.71c-6.59-4.52-13.07-9-19.74-13.51,4-5.66,8-11.15,11.8-16.44-4.11-1.71-8.34-2.93-12-5.17-14.29-8.75-22-21.41-20.76-38.42,1.26-17.67,10.7-30.08,27.07-36,27.6-9.93,50.88,9.4,54.71,30.73,1.67,9.28.77,18.4-4.23,26.5s-10.66,16-16.2,23.89c-6.35,9-12.9,17.79-19.33,26.66C63.43,123.45,63.07,123.94,62.46,124.71Z"/>
+  <g id="Fill-1">
+    <path id="path-2" d="M66.2,2.63l11.6,6.7c-2,3.31-10.13,17.23-12,20.32A51.6,51.6,0,0,1,72.68,32c8.35,4.26,13.14,11,13.19,20.54.06,9.91-4.7,17.26-13.56,21.21A22.91,22.91,0,0,1,40.48,59c-1.34-5.09-1.23-10.25,1.26-15s5.27-9.37,8-14"/>
+    <path id="path-2-2" data-name="path-2" class="cls-2" d="M65.4,2.64,77,9.33c-2,3.31-10.13,17.23-12,20.32A51.6,51.6,0,0,1,71.87,32c8.35,4.26,13.14,11,13.19,20.54.06,9.91-4.7,17.26-13.56,21.21A22.91,22.91,0,0,1,39.68,59c-1.34-5.09-1.23-10.25,1.26-15s5.27-9.37,8-14"/>
+  </g>
+</svg>
diff --git a/src/icons/Volusion.png b/src/icons/Volusion.png
deleted file mode 100644
index 20e6d109a..000000000
Binary files a/src/icons/Volusion.png and /dev/null differ
diff --git a/src/icons/Volusion.svg b/src/icons/Volusion.svg
new file mode 100644
index 000000000..34dd13831
--- /dev/null
+++ b/src/icons/Volusion.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#8759F2" d="M128.928 163.067L81.066 80.152H32.898c-19.702.055-31.987 21.368-22.187 38.44L82.65 243.22c9.787 16.957 34.5 17.13 44.415-.023l46.277-80.15c-9.912 17.165-34.637 16.953-44.415.02z"/><path fill="#FF3E80" d="M176.806 80.152h-95.75l47.862 82.918c9.788 16.96 34.5 17.13 44.415-.023l25.665-44.422c9.908-17.17-2.642-38.475-22.192-38.473z"/><path fill="#FFC300" d="M223.083 0H79.176C59.473.055 47.188 21.367 56.988 38.44c0 .02 24.078 41.71 24.078 41.71h95.75c19.775 0 32 21.485 22.185 38.475l46.277-80.15C255.101 21.445 242.808 0 223.083 0z"/><path fill="#00D4E6" d="M56.998 38.442a25.638 25.638 0 0 1 .025-25.612L10.748 92.977A25.638 25.638 0 0 1 32.911 80.15h48.165L56.998 38.442z"/></svg>
\ No newline at end of file
diff --git a/src/icons/Vox.png b/src/icons/Vox.png
deleted file mode 100644
index 8644dd574..000000000
Binary files a/src/icons/Vox.png and /dev/null differ
diff --git a/src/icons/WP-Statistics.png b/src/icons/WP-Statistics.png
new file mode 100644
index 000000000..22d1c580f
Binary files /dev/null and b/src/icons/WP-Statistics.png differ
diff --git a/src/icons/Web Optimizer.png b/src/icons/Web Optimizer.png
deleted file mode 100644
index 64fe47fae..000000000
Binary files a/src/icons/Web Optimizer.png and /dev/null differ
diff --git a/src/icons/WebsiteCreator.png b/src/icons/WebsiteCreator.png
new file mode 100644
index 000000000..3c25e14aa
Binary files /dev/null and b/src/icons/WebsiteCreator.png differ
diff --git a/src/icons/Weglot.png b/src/icons/Weglot.png
new file mode 100644
index 000000000..33da33a8a
Binary files /dev/null and b/src/icons/Weglot.png differ
diff --git a/src/icons/Wikispaces.png b/src/icons/Wikispaces.png
deleted file mode 100644
index 91034ccf2..000000000
Binary files a/src/icons/Wikispaces.png and /dev/null differ
diff --git a/src/icons/WindowsServer.png b/src/icons/WindowsServer.png
new file mode 100644
index 000000000..31f92d9e8
Binary files /dev/null and b/src/icons/WindowsServer.png differ
diff --git a/src/icons/Woosa.png b/src/icons/Woosa.png
new file mode 100644
index 000000000..fbb0baaaa
Binary files /dev/null and b/src/icons/Woosa.png differ
diff --git a/src/icons/ZURB Foundation.png b/src/icons/ZURB Foundation.png
index 994035248..2e8240fbc 100644
Binary files a/src/icons/ZURB Foundation.png and b/src/icons/ZURB Foundation.png differ
diff --git a/src/icons/Zenfolio.png b/src/icons/Zenfolio.png
new file mode 100644
index 000000000..56867d629
Binary files /dev/null and b/src/icons/Zenfolio.png differ
diff --git a/src/icons/acquia-cloud.png b/src/icons/acquia-cloud.png
new file mode 100644
index 000000000..d85843e9a
Binary files /dev/null and b/src/icons/acquia-cloud.png differ
diff --git a/src/icons/adobedmt.png b/src/icons/adobedmt.png
new file mode 100644
index 000000000..0a74d4d36
Binary files /dev/null and b/src/icons/adobedmt.png differ
diff --git a/src/icons/all-in-One-SEO-Pack.png b/src/icons/all-in-One-SEO-Pack.png
new file mode 100644
index 000000000..16afdfa1b
Binary files /dev/null and b/src/icons/all-in-One-SEO-Pack.png differ
diff --git a/src/icons/aws-elb.png b/src/icons/aws-elb.png
new file mode 100644
index 000000000..8db611796
Binary files /dev/null and b/src/icons/aws-elb.png differ
diff --git a/src/icons/aws.svg b/src/icons/aws.svg
new file mode 100644
index 000000000..48209aef8
--- /dev/null
+++ b/src/icons/aws.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2273" viewBox="0 0 1100 1000"><path d="M2 776c3.333-5.333 8.666-5.667 16-1 166.666 96.667 348 145 544 145 130.666 0 259.666-24.333 387-73 3.333-1.333 8.166-3.333 14.5-6 6.333-2.667 10.833-4.667 13.5-6 10-4 17.833-2 23.5 6 5.666 8 3.833 15.333-5.5 22-12 8.667-27.334 18.667-46 30-57.334 34-121.334 60.333-192 79-70.667 18.667-139.667 28-207 28-104 0-202.334-18.167-295-54.5C162.333 909.167 79.333 858 6 792c-4-3.333-6-6.667-6-10 0-2 .666-4 2-6zm301-285c0-46 11.333-85.333 34-118 22.666-32.667 53.666-57.333 93-74 36-15.333 80.333-26.333 133-33 18-2 47.333-4.667 88-8v-17c0-42.667-4.667-71.333-14-86-14-20-36-30-66-30h-8c-22 2-41 9-57 21s-26.334 28.667-31 50c-2.667 13.333-9.334 21-20 23l-115-14c-11.334-2.667-17-8.667-17-18 0-2 .333-4.333 1-7 11.333-59.333 39.166-103.333 83.5-132C451.833 19.333 503.666 3.333 563 0h25c76 0 135.333 19.667 178 59a190.52 190.52 0 0 1 18.5 21.5c5.666 7.667 10.166 14.5 13.5 20.5 3.333 6 6.333 14.667 9 26 2.666 11.333 4.666 19.167 6 23.5 1.333 4.333 2.333 13.667 3 28 .666 14.333 1 22.833 1 25.5v242c0 17.333 2.5 33.167 7.5 47.5s9.833 24.667 14.5 31c4.666 6.333 12.333 16.5 23 30.5 4 6 6 11.333 6 16 0 5.333-2.667 10-8 14-55.334 48-85.334 74-90 78-8 6-17.667 6.667-29 2-9.334-8-17.5-15.667-24.5-23s-12-12.667-15-16-7.834-9.833-14.5-19.5c-6.667-9.667-11.334-16.167-14-19.5-37.334 40.667-74 66-110 76-22.667 6.667-50.667 10-84 10-51.334 0-93.5-15.833-126.5-47.5S303 549 303 491zm172-20c0 26 6.5 46.833 19.5 62.5S525 557 547 557c2 0 4.833-.333 8.5-1 3.666-.667 6.166-1 7.5-1 28-7.333 49.666-25.333 65-54 7.333-12.667 12.833-26.5 16.5-41.5 3.666-15 5.666-27.167 6-36.5.333-9.333.5-24.667.5-46v-25c-38.667 0-68 2.667-88 8-58.667 16.667-88 53.667-88 111zm420 322c1.333-2.667 3.333-5.333 6-8 16.666-11.333 32.666-19 48-23 25.333-6.667 50-10.333 74-11 6.666-.667 13-.333 19 1 30 2.667 48 7.667 54 15 2.666 4 4 10 4 18v7c0 23.333-6.334 50.833-19 82.5-12.667 31.667-30.334 57.167-53 76.5-3.334 2.667-6.334 4-9 4-1.334 0-2.667-.333-4-1-4-2-5-5.667-3-11 24.666-58 37-98.333 37-121 0-7.333-1.334-12.667-4-16-6.667-8-25.334-12-56-12-11.334 0-24.667.667-40 2-16.667 2-32 4-46 6-4 0-6.667-.667-8-2-1.334-1.333-1.667-2.667-1-4 0-.667.333-1.667 1-3z"/></svg>
\ No newline at end of file
diff --git a/src/icons/bubble.png b/src/icons/bubble.png
index 16ec01d91..a5d9479eb 100644
Binary files a/src/icons/bubble.png and b/src/icons/bubble.png differ
diff --git a/src/icons/byINTI.svg b/src/icons/byINTI.svg
new file mode 100644
index 000000000..98f626891
--- /dev/null
+++ b/src/icons/byINTI.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 600 600" xml:space="preserve">
+<g>
+	<path fill="#F26722" d="M595,299.9C595,137,462.9,5,300,5C137.1,5,5,137.1,5,300c0,162.9,132.1,295,295,295h0.1
+		c162.9,0,294.9-132.1,295-294.9V299.9z M112.8,419.8H80.3v-211h32.6V419.8z M469.5,239h-54.7v180.8h-32.6V239h-53.2l-0.3,180.8
+		h-32.3L172,271.1v148.7h-32.9V209.1H172l124.6,153.7V208.8h32.6v0h140.4V239z M487.2,419.8v-211h32.6v211H487.2z"/>
+	<rect x="80.3" y="208.8" fill="#FFFFFF" width="32.6" height="211"/>
+	<polygon fill="#FFFFFF" points="329.1,239 382.3,239 382.3,419.8 414.9,419.8 414.9,239 469.5,239 469.5,208.8 329.1,208.8 	"/>
+	<rect x="487.2" y="208.8" fill="#FFFFFF" width="32.6" height="211"/>
+	<polygon fill="#FFFFFF" points="329.1,208.8 296.6,208.8 296.6,362.8 172,209.1 139.1,209.1 139.1,419.8 172,419.8 172,271.1 
+		296.6,419.8 328.8,419.8 329.1,239 329.1,208.8 	"/>
+</g>
+</svg>
diff --git a/src/icons/chevereto.png b/src/icons/chevereto.png
new file mode 100644
index 000000000..81e189814
Binary files /dev/null and b/src/icons/chevereto.png differ
diff --git a/src/icons/coaster-cms.png b/src/icons/coaster-cms.png
new file mode 100644
index 000000000..9ec4dcf1a
Binary files /dev/null and b/src/icons/coaster-cms.png differ
diff --git a/src/icons/colormeshop.png b/src/icons/colormeshop.png
new file mode 100644
index 000000000..af70496d8
Binary files /dev/null and b/src/icons/colormeshop.png differ
diff --git a/src/icons/datadome.png b/src/icons/datadome.png
new file mode 100644
index 000000000..9c19fb1d7
Binary files /dev/null and b/src/icons/datadome.png differ
diff --git a/src/icons/docusaurus.svg b/src/icons/docusaurus.svg
new file mode 100644
index 000000000..81b7405ed
--- /dev/null
+++ b/src/icons/docusaurus.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.1 (44463) - http://www.bohemiancoding.com/sketch -->
+    <title>docusaurus</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="docusaurus">
+            <rect id="Rectangle" fill="#FFFFFF" x="99" y="52" width="84" height="34"></rect>
+            <g id="Group-2" transform="translate(3.000000, 17.000000)">
+                <path d="M20,146 C12.602,146 6.157,141.973 2.697,136 C0.992,138.944 0,142.353 0,146 C0,157.046 8.954,166 20,166 L40,166 L40,146 L20,146 Z" id="Fill-1" fill="#3ECC5F"></path>
+                <path d="M109.9805,40.376 L180.0005,36 L180.0005,26 C180.0005,14.954 171.0455,6 160.0005,6 L70.0005,6 L67.5005,1.67 C66.3885,-0.255 63.6115,-0.255 62.5005,1.67 L60.0005,6 L57.5005,1.67 C56.3885,-0.255 53.6115,-0.255 52.5005,1.67 L50.0005,6 L47.5005,1.67 C46.3885,-0.255 43.6115,-0.255 42.5005,1.67 L40.0005,6 C39.9785,6 39.9575,6.003 39.9355,6.003 L35.7935,1.862 C34.2225,0.291 31.5405,1.009 30.9645,3.156 L29.5965,8.26 L24.4035,6.868 C22.2565,6.293 20.2925,8.257 20.8685,10.404 L22.2595,15.597 L17.1565,16.964 C15.0095,17.54 14.2905,20.223 15.8615,21.794 L20.0025,25.936 C20.0025,25.957 20.0005,25.978 20.0005,26 L15.6695,28.5 C13.7455,29.611 13.7455,32.389 15.6695,33.5 L20.0005,36 L15.6695,38.5 C13.7455,39.611 13.7455,42.389 15.6695,43.5 L20.0005,46 L15.6695,48.5 C13.7455,49.611 13.7455,52.389 15.6695,53.5 L20.0005,56 L15.6695,58.5 C13.7455,59.611 13.7455,62.389 15.6695,63.5 L20.0005,66 L15.6695,68.5 C13.7455,69.611 13.7455,72.389 15.6695,73.5 L20.0005,76 L15.6695,78.5 C13.7455,79.611 13.7455,82.389 15.6695,83.5 L20.0005,86 L15.6695,88.5 C13.7455,89.611 13.7455,92.389 15.6695,93.5 L20.0005,96 L15.6695,98.5 C13.7455,99.611 13.7455,102.389 15.6695,103.5 L20.0005,106 L15.6695,108.5 C13.7455,109.611 13.7455,112.389 15.6695,113.5 L20.0005,116 L15.6695,118.5 C13.7455,119.611 13.7455,122.389 15.6695,123.5 L20.0005,126 L15.6695,128.5 C13.7455,129.611 13.7455,132.389 15.6695,133.5 L20.0005,136 L15.6695,138.5 C13.7455,139.611 13.7455,142.389 15.6695,143.5 L20.0005,146 C20.0005,157.046 28.9545,166 40.0005,166 L160.0005,166 C171.0455,166 180.0005,157.046 180.0005,146 L180.0005,66 L109.9805,61.624 C104.3705,61.273 100.0005,56.621 100.0005,51 C100.0005,45.379 104.3705,40.727 109.9805,40.376" id="Fill-3" fill="#3ECC5F"></path>
+                <polygon id="Fill-5" fill="#3ECC5F" points="140 166 170 166 170 126 140 126"></polygon>
+                <path d="M190,141 C189.781,141 189.572,141.037 189.361,141.064 C189.323,140.914 189.287,140.763 189.245,140.613 C191.051,139.859 192.32,138.079 192.32,136 C192.32,133.238 190.082,131 187.32,131 C186.182,131 185.145,131.396 184.304,132.036 C184.193,131.923 184.082,131.811 183.969,131.7 C184.596,130.864 184.98,129.838 184.98,128.713 C184.98,125.951 182.742,123.713 179.98,123.713 C177.915,123.713 176.143,124.966 175.381,126.754 C175.233,126.712 175.084,126.677 174.936,126.639 C174.963,126.428 175,126.219 175,126 C175,123.238 172.762,121 170,121 C167.238,121 165,123.238 165,126 C165,126.219 165.037,126.428 165.064,126.639 C164.916,126.677 164.767,126.712 164.619,126.754 C163.857,124.966 162.085,123.713 160.02,123.713 C157.258,123.713 155.02,125.951 155.02,128.713 C155.02,129.838 155.404,130.864 156.031,131.7 C152.314,135.332 150,140.393 150,146 C150,157.046 158.954,166 170,166 C179.339,166 187.16,159.59 189.361,150.936 C189.572,150.963 189.781,151 190,151 C192.762,151 195,148.762 195,146 C195,143.238 192.762,141 190,141" id="Fill-7" fill="#44D860"></path>
+                <polygon id="Fill-8" fill="#3ECC5F" points="150 106 180 106 180 86 150 86"></polygon>
+                <path d="M190,98.5 C191.381,98.5 192.5,97.381 192.5,96 C192.5,94.619 191.381,93.5 190,93.5 C189.891,93.5 189.786,93.519 189.681,93.532 C189.661,93.457 189.644,93.382 189.623,93.307 C190.525,92.93 191.16,92.039 191.16,91 C191.16,89.619 190.041,88.5 188.66,88.5 C188.091,88.5 187.572,88.697 187.152,89.018 C187.097,88.961 187.041,88.905 186.984,88.85 C187.298,88.433 187.49,87.919 187.49,87.356 C187.49,85.976 186.371,84.856 184.99,84.856 C183.957,84.856 183.071,85.483 182.69,86.377 C181.833,86.138 180.934,86 180,86 C174.478,86 170,90.478 170,96 C170,101.522 174.478,106 180,106 C180.934,106 181.833,105.862 182.69,105.623 C183.071,106.517 183.957,107.144 184.99,107.144 C186.371,107.144 187.49,106.024 187.49,104.644 C187.49,104.081 187.298,103.567 186.984,103.15 C187.041,103.095 187.097,103.039 187.152,102.982 C187.572,103.303 188.091,103.5 188.66,103.5 C190.041,103.5 191.16,102.381 191.16,101 C191.16,99.961 190.525,99.07 189.623,98.693 C189.644,98.619 189.661,98.543 189.681,98.468 C189.786,98.481 189.891,98.5 190,98.5" id="Fill-9" fill="#44D860"></path>
+                <path d="M60,38.5 C58.619,38.5 57.5,37.381 57.5,36 C57.5,31.864 54.136,28.5 50,28.5 C45.864,28.5 42.5,31.864 42.5,36 C42.5,37.381 41.381,38.5 40,38.5 C38.619,38.5 37.5,37.381 37.5,36 C37.5,29.107 43.107,23.5 50,23.5 C56.893,23.5 62.5,29.107 62.5,36 C62.5,37.381 61.381,38.5 60,38.5" id="Fill-10" fill="#000000"></path>
+                <path d="M100,166 L160,166 C171.046,166 180,157.046 180,146 L180,76 L120,76 C108.954,76 100,84.954 100,96 L100,166 Z" id="Fill-11" fill="#FFFF50"></path>
+                <path d="M165.0195,107 L114.9805,107 C114.4275,107 113.9805,106.553 113.9805,106 C113.9805,105.447 114.4275,105 114.9805,105 L165.0195,105 C165.5725,105 166.0195,105.447 166.0195,106 C166.0195,106.553 165.5725,107 165.0195,107" id="Fill-12" fill="#000000"></path>
+                <path d="M165.0195,127 L114.9805,127 C114.4275,127 113.9805,126.553 113.9805,126 C113.9805,125.447 114.4275,125 114.9805,125 L165.0195,125 C165.5725,125 166.0195,125.447 166.0195,126 C166.0195,126.553 165.5725,127 165.0195,127" id="Fill-13" fill="#000000"></path>
+                <path d="M165.0195,147 L114.9805,147 C114.4275,147 113.9805,146.553 113.9805,146 C113.9805,145.447 114.4275,145 114.9805,145 L165.0195,145 C165.5725,145 166.0195,145.447 166.0195,146 C166.0195,146.553 165.5725,147 165.0195,147" id="Fill-14" fill="#000000"></path>
+                <path d="M165.0195,97.1855 L114.9805,97.1855 C114.4275,97.1855 113.9805,96.7375 113.9805,96.1855 C113.9805,95.6325 114.4275,95.1855 114.9805,95.1855 L165.0195,95.1855 C165.5725,95.1855 166.0195,95.6325 166.0195,96.1855 C166.0195,96.7375 165.5725,97.1855 165.0195,97.1855" id="Fill-15" fill="#000000"></path>
+                <path d="M165.0195,117 L114.9805,117 C114.4275,117 113.9805,116.553 113.9805,116 C113.9805,115.447 114.4275,115 114.9805,115 L165.0195,115 C165.5725,115 166.0195,115.447 166.0195,116 C166.0195,116.553 165.5725,117 165.0195,117" id="Fill-16" fill="#000000"></path>
+                <path d="M165.0195,137 L114.9805,137 C114.4275,137 113.9805,136.553 113.9805,136 C113.9805,135.447 114.4275,135 114.9805,135 L165.0195,135 C165.5725,135 166.0195,135.447 166.0195,136 C166.0195,136.553 165.5725,137 165.0195,137" id="Fill-17" fill="#000000"></path>
+                <path d="M180,44.6113 C179.988,44.6113 179.978,44.6053 179.966,44.6063 C176.876,44.7113 175.414,47.8023 174.124,50.5293 C172.778,53.3783 171.737,55.2323 170.031,55.1763 C168.142,55.1083 167.062,52.9743 165.918,50.7153 C164.604,48.1223 163.104,45.1803 159.955,45.2903 C156.909,45.3943 155.442,48.0843 154.148,50.4573 C152.771,52.9853 151.834,54.5223 150.027,54.4513 C148.1,54.3813 147.076,52.6463 145.891,50.6383 C144.57,48.4023 143.043,45.8883 139.955,45.9743 C136.961,46.0773 135.49,48.3593 134.192,50.3743 C132.819,52.5043 131.857,53.8023 130.027,53.7253 C128.054,53.6543 127.035,52.2153 125.856,50.5483 C124.532,48.6753 123.04,46.5553 119.961,46.6583 C117.033,46.7583 115.562,48.6273 114.265,50.2763 C113.033,51.8403 112.071,53.0783 110.036,53.0003 C109.484,52.9783 109.021,53.4113 109.001,53.9643 C108.98,54.5153 109.412,54.9793 109.964,55.0003 C112.981,55.1013 114.509,53.1993 115.836,51.5133 C117.013,50.0173 118.029,48.7263 120.029,48.6583 C121.955,48.5763 122.858,49.7733 124.224,51.7033 C125.521,53.5373 126.993,55.6173 129.955,55.7243 C133.058,55.8283 134.551,53.5093 135.873,51.4573 C137.055,49.6233 138.075,48.0403 140.023,47.9733 C141.816,47.9063 142.792,49.3233 144.168,51.6543 C145.465,53.8513 146.934,56.3403 149.955,56.4503 C153.08,56.5583 154.589,53.8293 155.904,51.4153 C157.043,49.3273 158.118,47.3543 160.023,47.2893 C161.816,47.2473 162.751,48.8843 164.134,51.6193 C165.426,54.1723 166.891,57.0643 169.959,57.1753 C170.016,57.1773 170.072,57.1783 170.128,57.1783 C173.192,57.1783 174.646,54.1033 175.933,51.3843 C177.072,48.9743 178.15,46.7033 180,46.6113 L180,44.6113 Z" id="Fill-24" fill="#000000"></path>
+                <polygon id="Fill-18" fill="#3ECC5F" points="80 166 120 166 120 126 80 126"></polygon>
+                <path d="M140,141 C139.781,141 139.572,141.037 139.361,141.064 C139.323,140.914 139.287,140.763 139.245,140.613 C141.051,139.859 142.32,138.079 142.32,136 C142.32,133.238 140.082,131 137.32,131 C136.182,131 135.145,131.396 134.304,132.036 C134.193,131.923 134.082,131.811 133.969,131.7 C134.596,130.864 134.98,129.838 134.98,128.713 C134.98,125.951 132.742,123.713 129.98,123.713 C127.915,123.713 126.143,124.966 125.381,126.754 C125.233,126.712 125.084,126.677 124.936,126.639 C124.963,126.428 125,126.219 125,126 C125,123.238 122.762,121 120,121 C117.238,121 115,123.238 115,126 C115,126.219 115.037,126.428 115.064,126.639 C114.916,126.677 114.767,126.712 114.619,126.754 C113.857,124.966 112.085,123.713 110.02,123.713 C107.258,123.713 105.02,125.951 105.02,128.713 C105.02,129.838 105.404,130.864 106.031,131.7 C102.314,135.332 100,140.393 100,146 C100,157.046 108.954,166 120,166 C129.339,166 137.16,159.59 139.361,150.936 C139.572,150.963 139.781,151 140,151 C142.762,151 145,148.762 145,146 C145,143.238 142.762,141 140,141" id="Fill-19" fill="#44D860"></path>
+                <polygon id="Fill-20" fill="#3ECC5F" points="80 106 120 106 120 86 80 86"></polygon>
+                <path d="M130,98.5 C131.381,98.5 132.5,97.381 132.5,96 C132.5,94.619 131.381,93.5 130,93.5 C129.891,93.5 129.786,93.519 129.681,93.532 C129.661,93.457 129.644,93.382 129.623,93.307 C130.525,92.93 131.16,92.039 131.16,91 C131.16,89.619 130.041,88.5 128.66,88.5 C128.091,88.5 127.572,88.697 127.152,89.018 C127.097,88.961 127.041,88.905 126.984,88.85 C127.298,88.433 127.49,87.919 127.49,87.356 C127.49,85.976 126.371,84.856 124.99,84.856 C123.957,84.856 123.071,85.483 122.69,86.377 C121.833,86.138 120.934,86 120,86 C114.478,86 110,90.478 110,96 C110,101.522 114.478,106 120,106 C120.934,106 121.833,105.862 122.69,105.623 C123.071,106.517 123.957,107.144 124.99,107.144 C126.371,107.144 127.49,106.024 127.49,104.644 C127.49,104.081 127.298,103.567 126.984,103.15 C127.041,103.095 127.097,103.039 127.152,102.982 C127.572,103.303 128.091,103.5 128.66,103.5 C130.041,103.5 131.16,102.381 131.16,101 C131.16,99.961 130.525,99.07 129.623,98.693 C129.644,98.619 129.661,98.543 129.681,98.468 C129.786,98.481 129.891,98.5 130,98.5" id="Fill-21" fill="#44D860"></path>
+                <path d="M140,24.75 C139.84,24.75 139.67,24.73 139.51,24.7 C139.35,24.67 139.189,24.62 139.04,24.56 C138.89,24.5 138.75,24.42 138.609,24.33 C138.479,24.24 138.35,24.13 138.229,24.02 C138.12,23.9 138.01,23.78 137.92,23.64 C137.83,23.5 137.75,23.36 137.689,23.21 C137.63,23.06 137.58,22.9 137.55,22.74 C137.52,22.58 137.5,22.41 137.5,22.25 C137.5,22.09 137.52,21.92 137.55,21.76 C137.58,21.6 137.63,21.45 137.689,21.29 C137.75,21.14 137.83,21 137.92,20.86 C138.01,20.73 138.12,20.6 138.229,20.48 C138.35,20.37 138.479,20.26 138.609,20.17 C138.75,20.08 138.89,20 139.04,19.94 C139.189,19.88 139.35,19.83 139.51,19.8 C139.83,19.73 140.16,19.73 140.49,19.8 C140.649,19.83 140.81,19.88 140.96,19.94 C141.109,20 141.25,20.08 141.39,20.17 C141.52,20.26 141.649,20.37 141.77,20.48 C141.88,20.6 141.99,20.73 142.08,20.86 C142.17,21 142.25,21.14 142.31,21.29 C142.37,21.45 142.42,21.6 142.45,21.76 C142.479,21.92 142.5,22.09 142.5,22.25 C142.5,22.91 142.229,23.56 141.77,24.02 C141.649,24.13 141.52,24.24 141.39,24.33 C141.25,24.42 141.109,24.5 140.96,24.56 C140.81,24.62 140.649,24.67 140.49,24.7 C140.33,24.73 140.16,24.75 140,24.75" id="Fill-22" fill="#000000"></path>
+                <path d="M160,23.5 C159.34,23.5 158.7,23.23 158.229,22.77 C158.12,22.65 158.01,22.52 157.92,22.39 C157.83,22.25 157.75,22.11 157.689,21.96 C157.63,21.81 157.58,21.65 157.55,21.49 C157.52,21.33 157.5,21.16 157.5,21 C157.5,20.34 157.77,19.7 158.229,19.23 C158.35,19.12 158.479,19.01 158.609,18.92 C158.75,18.83 158.89,18.75 159.04,18.69 C159.189,18.63 159.35,18.58 159.51,18.55 C159.83,18.48 160.17,18.48 160.49,18.55 C160.649,18.58 160.81,18.63 160.96,18.69 C161.109,18.75 161.25,18.83 161.39,18.92 C161.52,19.01 161.649,19.12 161.77,19.23 C162.229,19.7 162.5,20.34 162.5,21 C162.5,21.16 162.479,21.33 162.45,21.49 C162.42,21.65 162.37,21.81 162.31,21.96 C162.24,22.11 162.17,22.25 162.08,22.39 C161.99,22.52 161.88,22.65 161.77,22.77 C161.649,22.88 161.52,22.99 161.39,23.08 C161.25,23.17 161.109,23.25 160.96,23.31 C160.81,23.37 160.649,23.42 160.49,23.45 C160.33,23.48 160.16,23.5 160,23.5" id="Fill-23" fill="#000000"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/eCommercePy.png b/src/icons/eCommercePy.png
deleted file mode 100644
index ae9d304fb..000000000
Binary files a/src/icons/eCommercePy.png and /dev/null differ
diff --git a/src/icons/eDevice SmartStack.png b/src/icons/eDevice SmartStack.png
deleted file mode 100644
index efb8bac3f..000000000
Binary files a/src/icons/eDevice SmartStack.png and /dev/null differ
diff --git a/src/icons/ensighten.png b/src/icons/ensighten.png
new file mode 100644
index 000000000..935be0caa
Binary files /dev/null and b/src/icons/ensighten.png differ
diff --git a/src/icons/flarum.png b/src/icons/flarum.png
new file mode 100644
index 000000000..fc3840330
Binary files /dev/null and b/src/icons/flarum.png differ
diff --git a/src/icons/freshchat.png b/src/icons/freshchat.png
new file mode 100644
index 000000000..b79a05767
Binary files /dev/null and b/src/icons/freshchat.png differ
diff --git a/src/icons/futureshop.png b/src/icons/futureshop.png
new file mode 100644
index 000000000..da3bdf84b
Binary files /dev/null and b/src/icons/futureshop.png differ
diff --git a/src/icons/gitea.svg b/src/icons/gitea.svg
new file mode 100644
index 000000000..ac1594adb
--- /dev/null
+++ b/src/icons/gitea.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46667 135.46667"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.1 r15371"
+   inkscape:export-filename=""
+   inkscape:export-xdpi="48.000004"
+   inkscape:export-ydpi="48.000004">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="418.13805"
+     inkscape:cy="177.57445"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     units="px"
+     width="256px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="false"
+     inkscape:measure-start="283.373,243.952"
+     inkscape:measure-end="290.267,236.527">
+    <sodipodi:guide
+       position="0,0"
+       orientation="0,512"
+       id="guide3699"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="135.46667,0"
+       orientation="-512,0"
+       id="guide3701"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="135.46667,135.46667"
+       orientation="0,-512"
+       id="guide3703"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="0,135.46667"
+       orientation="512,0"
+       id="guide3705"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53334)"
+     style="display:inline">
+    <path
+       style="fill:#609926;fill-opacity:1;stroke:#428f29;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 27.709937,195.15095 c -9.546573,-0.0272 -22.3392732,6.79805 -21.6317552,23.90397 1.105534,26.72889 25.4565952,29.20839 35.1916502,29.42301 1.068023,5.01357 12.521798,22.30563 21.001818,23.21667 h 37.15277 c 22.27763,-1.66785 38.9607,-75.75671 26.59321,-76.03825 -46.781583,2.47691 -49.995146,2.13838 -88.599758,0 -2.495053,-0.0266 -5.972321,-0.49474 -9.707935,-0.5054 z m 2.491319,9.45886 c 1.351378,13.69267 3.555849,21.70359 8.018216,33.94345 -11.382872,-1.50473 -21.069822,-5.22443 -22.851515,-19.10984 -0.950962,-7.4112 2.390428,-15.16769 14.833299,-14.83361 z"
+       id="path3722"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sscccccsccsc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     style="display:inline">
+    <rect
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.24757317;stroke-opacity:1"
+       id="rect4599"
+       width="34.762054"
+       height="34.762054"
+       x="87.508659"
+       y="18.291576"
+       transform="rotate(25.914715)"
+       ry="5.4825778" />
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26644793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 79.804947,57.359056 3.241146,1.609954 V 35.255731 h -3.262698 z"
+       id="path4525"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Layer 3"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g4539">
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="90.077766"
+         cx="49.064713"
+         id="path4606"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="102.1049"
+         cx="36.810425"
+         id="path4606-3"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <circle
+         transform="rotate(-19.796137)"
+         r="3.4745038"
+         cy="111.43928"
+         cx="46.484283"
+         id="path4606-1"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1" />
+      <rect
+         transform="rotate(26.024158)"
+         y="18.061695"
+         x="97.333458"
+         height="27.261492"
+         width="2.6726954"
+         id="rect4629-8"
+         style="fill:#609926;fill-opacity:1;stroke:none;stroke-width:0.27444693;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4514"
+         d="m 76.558096,68.116343 c 12.97589,6.395378 13.012989,4.101862 4.890858,20.907244"
+         style="fill:none;stroke:#609926;stroke-width:2.68000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/google_cloud.svg b/src/icons/google_cloud.svg
new file mode 100644
index 000000000..37faf439a
--- /dev/null
+++ b/src/icons/google_cloud.svg
@@ -0,0 +1 @@
+<svg id="Art" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 28"><defs><style>.cls-1{fill:#ea4335;}.cls-2{fill:#4285f4;}.cls-3{fill:#34a853;}.cls-4{fill:#fbbc05;}.cls-5{fill:#5f6368;}</style></defs><title>Cloud_Logo_Nav</title><path class="cls-1" d="M21.85,7.41l1,0,2.85-2.85.14-1.21A12.81,12.81,0,0,0,5,9.6a1.55,1.55,0,0,1,1-.06l5.7-.94s.29-.48.44-.45a7.11,7.11,0,0,1,9.73-.74Z"/><path class="cls-2" d="M29.76,9.6a12.84,12.84,0,0,0-3.87-6.24l-4,4A7.11,7.11,0,0,1,24.5,13v.71a3.56,3.56,0,1,1,0,7.12H17.38l-.71.72v4.27l.71.71H24.5A9.26,9.26,0,0,0,29.76,9.6Z"/><path class="cls-3" d="M10.25,26.49h7.12v-5.7H10.25a3.54,3.54,0,0,1-1.47-.32l-1,.31L4.91,23.63l-.25,1A9.21,9.21,0,0,0,10.25,26.49Z"/><path class="cls-4" d="M10.25,8A9.26,9.26,0,0,0,4.66,24.6l4.13-4.13a3.56,3.56,0,1,1,4.71-4.71l4.13-4.13A9.25,9.25,0,0,0,10.25,8Z"/></svg>
diff --git a/src/icons/idosellshop.png b/src/icons/idosellshop.png
new file mode 100644
index 000000000..f7e921195
Binary files /dev/null and b/src/icons/idosellshop.png differ
diff --git a/src/icons/ionic.png b/src/icons/ionic.png
new file mode 100644
index 000000000..f1b7f2ec5
Binary files /dev/null and b/src/icons/ionic.png differ
diff --git a/src/icons/iplabel.svg b/src/icons/iplabel.svg
new file mode 100644
index 000000000..b8c0f4079
--- /dev/null
+++ b/src/icons/iplabel.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 110 112"><defs><style>.cls-1{fill:#3d3d3f;}.cls-2{fill:#ee7509;fill-rule:evenodd;}</style></defs><title>logo</title>
+<g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1">
+<!-- 454.9 112.24 -->
+<path class="cls-1" d="M45.05,10.86H45a7.34,7.34,0,0,0-7.69,7.6,7.59,7.59,0,0,0,7.77,7.87h0c5.09,0,7.75-4,7.75-7.93A7.35,7.35,0,0,0,45.05,10.86Zm0,15.22h0Z"/>
+
+<path class="cls-2" d="M55.18,0C41.06-.22,11.49,4.56,0,40c.39.3,1.61,1,1.94,1.26C17,7.74,43.63,5.89,53.61,6.67c64.8,5.09,59.91,100.14-7.47,97.92l.16,0C1.65,104-.52,38,31.42,34.23c1.21-.13,3.08-.3,3.55,1.75.09.39-11.16,38.78-10.82,41.41.21,3.74,2.45,8.7,10.49,7.19.72-1.77,13.94-50.72,13.91-50.75a12.7,12.7,0,0,0-9.73-5C11.1,27.15,3.14,54.72,3.88,67.51c.05,12.56,8.74,40.86,44.76,44.67,44.55,1.79,61.75-33,61.55-57.87C110,28.37,86.77.51,55.18,0Z"/><path class="cls-2" d="M52.08,33.76C50.61,37.56,36.79,89,36,92.75a13.91,13.91,0,0,0-.47,3.79,7.74,7.74,0,0,0,2.12,4.91,8,8,0,0,0,6.69,1.95,8.86,8.86,0,0,0,2-.39c.5-2.25,4.5-18.09,5.93-22.28a14.68,14.68,0,0,0,8.09,2.39c25.45-.74,42-50.9,20-52.48-11.78-.94-17,10.23-19,11.18-.63-.74,3.41-9.66,3.55-11.37A40.87,40.87,0,0,0,52.08,33.76ZM72,38.34C83.88,37,68.74,84.4,55.71,78.72c-4.23-1.09-2-7.63,2.29-21.71C61.6,45.3,65.92,38.81,72,38.34Z"/>
+
+</g></g></svg>
diff --git a/src/icons/koha.png b/src/icons/koha.png
new file mode 100644
index 000000000..3bdb0d688
Binary files /dev/null and b/src/icons/koha.png differ
diff --git a/src/icons/laterpay.png b/src/icons/laterpay.png
new file mode 100644
index 000000000..b425ec8e9
Binary files /dev/null and b/src/icons/laterpay.png differ
diff --git a/src/icons/marked.svg b/src/icons/marked.svg
new file mode 100644
index 000000000..a67fb80e5
--- /dev/null
+++ b/src/icons/marked.svg
@@ -0,0 +1,32 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="300px" height="439.589px" viewBox="100 100 400 400" xml:space="preserve">
+<g>
+	<g id="Marked_Letters">
+		<path fill="#010101" d="M185.044,358.869h-9.961l-1.143-25.986l-14.092,25.986h-6.24l-6.709-26.807l-8.818,26.807h-10.225    l13.389-40.605h10.928l6.416,25.781l13.916-25.781h10.635L185.044,358.869z"/>
+		<path fill="#010101" d="M226.617,358.869h-10.811l-1.084-8.994H202.33l-4.102,8.994h-10.605l20.566-40.605h10.986L226.617,358.869    z M214.019,344.162l-1.934-15.527l-7.061,15.527H214.019z"/>
+		<path fill="#010101" d="M267.712,358.869h-11.338l-4.043-8.467c-1.191-2.559-2.227-4.478-3.105-5.757s-1.651-2.07-2.314-2.373    c-0.664-0.303-1.553-0.454-2.666-0.454h-1.553l-2.578,17.051h-10.283l5.889-40.605h15.85c5.761,0,9.672,1.27,11.733,3.809    c2.061,2.539,3.091,5.283,3.091,8.232c0,3.105-0.854,5.522-2.563,7.251c-1.709,1.729-4.097,2.798-7.163,3.208    c1.562,0.898,2.769,1.953,3.618,3.164s1.86,3.096,3.032,5.654L267.712,358.869z M255.525,330.012c0-1.562-0.571-2.925-1.714-4.087    s-3.453-1.743-6.929-1.743h-1.611l-1.699,11.719h4.102c2.89,0,4.922-0.61,6.094-1.831S255.525,331.496,255.525,330.012z"/>
+		<path fill="#010101" d="M313.705,318.264l-17.578,18.223l14.912,22.383h-11.807l-14.59-21.65l-3.282,21.65h-10.342l6.064-40.605    h10.401l-2.578,17.256l16.611-17.256H313.705z"/>
+		<path fill="#010101" d="M346.426,318.264L345.4,325.5h-16.436l-1.26,8.818h14.268l-1.025,7.266h-14.385l-1.377,10.02h19.98    l-1.025,7.266h-30.439l5.889-40.605H346.426z"/>
+		<path fill="#010101" d="M389.953,338.156c0,4.512-0.86,8.301-2.578,11.367c-1.719,3.066-4.273,5.391-7.662,6.973    s-7.583,2.373-12.582,2.373H348.41l5.83-40.605h14.941c3.534,0,6.625,0.527,9.271,1.582s4.82,2.51,6.52,4.365    s2.953,3.97,3.764,6.343S389.953,335.461,389.953,338.156z M379.377,338.303c0-2.031-0.387-4.004-1.158-5.918    s-2.192-3.54-4.262-4.878c-2.07-1.338-4.941-2.007-8.613-2.007h-1.67l-3.779,26.104h5.449c2.597,0,4.828-0.391,6.693-1.172    s3.33-1.821,4.395-3.12s1.821-2.71,2.271-4.233C379.152,341.555,379.377,339.963,379.377,338.303z"/>
+	</g>
+	<g>
+		<path fill="#010101" d="M406.922,307.149l-3.703,26.35c-0.609,4.324-2.72,6.486-6.33,6.486c-0.773,0-1.553-0.07-2.338-0.211    l-0.756-3.023c0.879,0.188,1.67,0.281,2.373,0.281c1.219,0,2.118-0.302,2.698-0.905s0.964-1.55,1.151-2.839l3.674-26.139H406.922z    "/>
+		<path fill="#010101" d="M423.027,307.8l-0.475,3.357c-1.312-0.867-2.748-1.301-4.307-1.301c-1.312,0-2.361,0.34-3.146,1.02    s-1.178,1.576-1.178,2.689c0,0.551,0.188,1.131,0.562,1.74s1.471,1.644,3.287,3.103s3.015,2.739,3.595,3.841    s0.87,2.203,0.87,3.305c0,1.758-0.662,3.275-1.986,4.553s-3.088,1.916-5.291,1.916c-1.957,0-3.938-0.586-5.941-1.758l0.51-3.604    c2.238,1.559,4.16,2.338,5.766,2.338c0.867,0,1.69-0.284,2.47-0.852c0.779-0.568,1.169-1.339,1.169-2.312    c0-0.62-0.197-1.265-0.59-1.933c-0.394-0.667-1.502-1.745-3.324-3.232c-1.824-1.486-3.014-2.778-3.568-3.874    c-0.555-1.097-0.832-2.185-0.832-3.263c0-1.899,0.785-3.491,2.355-4.775c1.57-1.283,3.422-1.926,5.555-1.926    C420.016,306.833,421.516,307.155,423.027,307.8z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#010101" d="M357,200v-92c0-8.284-6.716-15-15-15H172c-8.284,0-15,6.716-15,15v92H357z"/>
+			<path fill="#010101" d="M157,205v73c0,8.284,6.716,15,15,15h170c8.284,0,15-6.716,15-15v-73H157z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M208.737,180.15v-33.125l16.987,21.234l16.987-21.234v33.125h16.987v-57.756h-16.987l-16.987,21.234     l-16.987-21.234H191.75v57.756H208.737z"/>
+			<path fill="#FFFFFF" d="M322.55,151.272h-16.987v-28.878h-16.986v28.878h-16.987L297.069,181L322.55,151.272z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M217,241.154c0,2.124-1.722,3.846-3.845,3.846h-5.31c-2.124,0-3.845-1.722-3.845-3.846v-0.309     c0-2.124,1.722-3.846,3.845-3.846h5.31c2.124,0,3.845,1.722,3.845,3.846V241.154z"/>
+			<path fill="#FFFFFF" d="M207.859,256.5c0,1.933-1.1,3.5-2.457,3.5h-12.046c-1.357,0-2.457-1.567-2.457-3.5l0,0     c0-1.933,1.1-3.5,2.457-3.5h12.046C206.759,253,207.859,254.567,207.859,256.5L207.859,256.5z"/>
+			<path fill="#FFFFFF" d="M328.044,238.021c-1.058-3.094-2.692-5.85-4.907-8.269c-2.215-2.418-5.049-4.314-8.498-5.689     c-3.45-1.375-7.479-2.063-12.086-2.063h-19.477l-7.6,52.932h24.403c6.518,0,11.984-1.032,16.402-3.094     c4.416-2.062,7.746-5.092,9.986-9.09c2.24-3.996,3.361-8.936,3.361-14.817C329.629,244.418,329.1,241.115,328.044,238.021z      M314.964,254.347c-0.586,1.986-1.573,3.826-2.96,5.519c-1.389,1.694-3.297,3.049-5.729,4.067s-5.34,1.528-8.727,1.528h-7.103     l4.927-34.027h2.176c4.787,0,8.529,0.872,11.229,2.616c2.698,1.744,4.55,3.863,5.557,6.358c1.005,2.494,1.508,5.066,1.508,7.713     C315.842,250.286,315.549,252.361,314.964,254.347z"/>
+			<path fill="#FFFFFF" d="M246.148,241.043l1.373-9.61h21.424l1.336-9.434h-10.601h-24.38h-1.256c-2.125,0-3.846,1.877-3.846,4     s1.721,4,3.846,4h0.096h3.793c1.928,0,3.491,1.563,3.491,3.491c0,1.928-1.563,3.491-3.491,3.491h-4.806L233.126,237h-8.983     c-1.299,0-2.353,1.786-2.353,3.988c0,2.203,1.053,3.989,2.353,3.989h7.826L231.966,245h3.189c2.124,0,3.845,1.722,3.845,3.846     v0.309c0,2.124-1.722,3.846-3.845,3.846h-4.349h-0.96H216.2c-1.933,0-3.5,1.567-3.5,3.5s1.567,3.5,3.5,3.5h8.645h4.945h0.364     c2.124,0,3.845,1.722,3.845,3.846v0.309c0,2.124-1.722,3.846-3.845,3.846h-1.524h-3.785h-1.8c-2.125,0-3.846,1.377-3.846,3.5     s1.721,3.5,3.846,3.5h25.636c0.273,0,0.538-0.024,0.795-0.068h17.828l1.336-9.471h-26.045l1.795-13.062h18.751l1.336-9.471     h-18.598l0.029-0.205C246.055,242.213,246.144,241.647,246.148,241.043z"/>
+		</g>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/mkdocs.png b/src/icons/mkdocs.png
new file mode 100644
index 000000000..279d831ff
Binary files /dev/null and b/src/icons/mkdocs.png differ
diff --git a/src/icons/mobirise.png b/src/icons/mobirise.png
new file mode 100644
index 000000000..8244640ea
Binary files /dev/null and b/src/icons/mobirise.png differ
diff --git a/src/icons/paperjs.png b/src/icons/paperjs.png
new file mode 100644
index 000000000..37cb8a114
Binary files /dev/null and b/src/icons/paperjs.png differ
diff --git a/src/icons/parselecom.png b/src/icons/parselecom.png
new file mode 100644
index 000000000..ba23f2e5b
Binary files /dev/null and b/src/icons/parselecom.png differ
diff --git a/src/icons/pelican.png b/src/icons/pelican.png
new file mode 100644
index 000000000..3fffd4858
Binary files /dev/null and b/src/icons/pelican.png differ
diff --git a/src/icons/polyfill.svg b/src/icons/polyfill.svg
new file mode 100644
index 000000000..cfa655abb
--- /dev/null
+++ b/src/icons/polyfill.svg
@@ -0,0 +1,6 @@
+<svg class='logo' viewBox="0 0 326 226" xmlns="http://www.w3.org/2000/svg">
+	<g>
+		<path fill="#ccc" d="M0 0h72.4v226.8H0zM84.6 0H157v226.8H84.7zM169.2 0h72.5v226.8h-72.5zM254 0h72.3v226.8H254z"/>
+		<path fill="#0A95C7" d="M0 0h72.4v139H0zM84.6 0H157v92.6H84.7zM169.2 0h72.5v46.3h-72.5z"/>
+	</g>
+</svg>
diff --git a/src/icons/tilda.png b/src/icons/projesoft.png
similarity index 60%
rename from src/icons/tilda.png
rename to src/icons/projesoft.png
index 8d942ef57..77b9293da 100644
Binary files a/src/icons/tilda.png and b/src/icons/projesoft.png differ
diff --git a/src/icons/raychat.png b/src/icons/raychat.png
new file mode 100644
index 000000000..813d354dd
Binary files /dev/null and b/src/icons/raychat.png differ
diff --git a/src/icons/raychat.svg b/src/icons/raychat.svg
deleted file mode 100644
index 708303307..000000000
--- a/src/icons/raychat.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.9386" y1="1.0265" x2="11.7312" y2="31.1426">
-	<stop  offset="0" style="stop-color:#D61395"/>
-	<stop  offset="0.2656" style="stop-color:#BB1089"/>
-	<stop  offset="0.8337" style="stop-color:#760769"/>
-	<stop  offset="0.9987" style="stop-color:#61045F"/>
-</linearGradient>
-<circle display="none" fill="url(#SVGID_1_)" cx="16.335" cy="16.085" r="15.742"/>
-<rect fill="#FFFFFF" width="32" height="32"/>
-<g>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.3895" y1="2.3882" x2="8.5565" y2="28.6998">
-		<stop  offset="0" style="stop-color:#D61395"/>
-		<stop  offset="0.2656" style="stop-color:#BB1089"/>
-		<stop  offset="0.8337" style="stop-color:#760769"/>
-		<stop  offset="0.9987" style="stop-color:#61045F"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M15.21,16.909c-0.414-0.414-0.414-1.085,0-1.499c0.414-0.414,1.085-0.414,1.499,0
-		c3.125,3.125,8.026,3.415,11.481,0.871c0.174-0.833,0.268-1.695,0.268-2.579c0-1.103-0.143-2.173-0.41-3.192
-		c-0.316,0.713-1.029,1.212-1.859,1.212c-1.123,0-2.033-0.91-2.033-2.033s0.91-2.033,2.033-2.033c0.289,0,0.563,0.061,0.812,0.169
-		c-2.111-3.988-6.3-6.706-11.126-6.706c-6.95,0-12.583,5.634-12.583,12.583c0,6.311,4.646,11.536,10.704,12.443l-1.168,2.624
-		c-0.647,2.232,0.714,3.06,2.542,1.546l8.895-7.176L24.2,23.133c1.217-1.075,2.221-2.383,2.95-3.852
-		C23.179,20.921,18.432,20.131,15.21,16.909z M18.318,7.654c1.123,0,2.033,0.91,2.033,2.033s-0.91,2.033-2.033,2.033
-		c-1.123,0-2.033-0.91-2.033-2.033S17.195,7.654,18.318,7.654z"/>
-</g>
-</svg>
diff --git a/src/icons/redoc.png b/src/icons/redoc.png
new file mode 100644
index 000000000..f99f5d48f
Binary files /dev/null and b/src/icons/redoc.png differ
diff --git a/src/icons/scrollreveal.svg b/src/icons/scrollreveal.svg
new file mode 100644
index 000000000..8e0dd8e82
--- /dev/null
+++ b/src/icons/scrollreveal.svg
@@ -0,0 +1,16 @@
+
+<svg
+	width="42px" height="32px"
+	viewBox="2 2 42 32"
+	version="1.1"
+	xmlns="http://www.w3.org/2000/svg"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+    <rect stroke="none" fill="#FFCB36" fill-rule="evenodd" x="2" y="2" width="6" height="18" rx="3"></rect>
+    <rect stroke="none" fill="#007D97" fill-rule="evenodd" x="26" y="2" width="6" height="32" rx="3"></rect>
+    <rect stroke="none" fill="#2EAD6D" fill-rule="evenodd" x="14" y="2" width="6" height="8" rx="3"></rect>
+    <rect stroke="none" fill="#E31D65" fill-rule="evenodd" x="14" y="16" width="6" height="18" rx="3"></rect>
+    <rect stroke="none" fill="#E31D65" fill-rule="evenodd" x="38" y="2" width="6" height="18" rx="3"></rect>
+    <rect stroke="none" fill="#FF7C35" fill-rule="evenodd" x="2" y="26" width="6" height="8" rx="3"></rect>
+    <rect stroke="none" fill="#553BB8" fill-rule="evenodd" x="38" y="26" width="6" height="8" rx="3"></rect>
+</svg>
diff --git a/src/icons/shopline.png b/src/icons/shopline.png
new file mode 100644
index 000000000..ebdb09d14
Binary files /dev/null and b/src/icons/shopline.png differ
diff --git a/src/icons/signal.png b/src/icons/signal.png
new file mode 100644
index 000000000..56ac41aa5
Binary files /dev/null and b/src/icons/signal.png differ
diff --git a/src/icons/softtr.png b/src/icons/softtr.png
new file mode 100644
index 000000000..65637e777
Binary files /dev/null and b/src/icons/softtr.png differ
diff --git a/src/icons/spip.svg b/src/icons/spip.svg
new file mode 100644
index 000000000..6650df09c
--- /dev/null
+++ b/src/icons/spip.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FFFFFF" d="M142.3,59.4C133.4,23.1,96.7,0.9,60.4,9.8c-3.4,0.8-6.6,1.9-9.7,3.2C36.3,21.2,24,32.9,15.2,47
+			C8.9,60.5,7,76.2,10.8,91.8c12,48.7,57.8,56.9,82.7,69.3c5.3,2.6,9.5,7.3,11,13.4c2.7,10.8-4,21.8-14.8,24.4c-0.1,0-0.2,0-0.2,0
+			c-0.4,0.1-0.8,0.2-1,0.2c-0.1,0-0.2,0-0.2,0.1c0,0,0,0,0,0c3.8,0.5,7.8,0.7,11.7,0.7c6.6,0,13.1-0.6,19.4-1.9l0.1,0c0,0,0,0,0.1,0
+			c10.6-7.7,16.1-21.2,12.8-34.7c0,0,0,0,0,0s0,0,0-0.1v0c0,0,0-0.1,0-0.1c-8.9-35.6-45.9-31.8-51.8-55.8c-4.2-17,7.2-30,24.2-34.2
+			c10.1-2.5,20.2,0.2,27.6,6.2c1.1,0.9,2.4,2,3.7,3.5c0,0.1,0.1,0.1,0.1,0.2c0,0,0,0,0.1,0.1c0.2,0.3,0.5,0.5,0.7,0.8
+			c0.2,0.2,0.3,0.4,0.5,0.6c0.2,0.2,0.3,0.4,0.5,0.7c0,0,0.1,0.1,0.1,0.1c1.5,2,2.5,3.5,3.8,3.2c1.1-0.3,1.8-2.9,2.1-4.7
+			C144.8,75.9,144.3,67.6,142.3,59.4z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path fill="#E8246F" d="M104.5,174.5c-1.5-6.2-5.7-10.8-11-13.4c-24.9-12.4-70.7-20.5-82.7-69.3C7,76.2,8.9,60.5,15.2,47
+			c-3,4.8-5.6,9.9-7.8,15.2c-0.2,0.5-0.4,1.1-0.6,1.6C6.4,64.8,6,65.9,5.6,67c-0.2,0.5-0.4,1.1-0.6,1.6c-0.4,1.1-0.7,2.2-1,3.3
+			c-0.2,0.6-0.3,1.1-0.5,1.7c-0.2,0.6-0.3,1.1-0.5,1.7c-0.3,1.1-0.5,2.3-0.8,3.4c-0.1,0.6-0.2,1.1-0.4,1.7c-0.1,0.6-0.2,1.1-0.3,1.7
+			c-0.1,0.3-0.1,0.7-0.2,1c-0.1,0.4-0.1,0.7-0.2,1.1c0,0.3-0.1,0.6-0.1,0.9C1,85.6,1,86,0.9,86.4c-0.1,0.6-0.2,1.2-0.2,1.8
+			c-0.1,0.5-0.1,1-0.2,1.6c-0.1,0.7-0.1,1.5-0.2,2.2c-0.1,0.9-0.1,1.7-0.2,2.6c0,0.5-0.1,1-0.1,1.6c0,0.1,0,0.2,0,0.3
+			C0,97,0,97.6,0,98.1c0,0.6,0,1.3,0,1.9c0,0.8,0,1.6,0,2.4c0,0.5,0,0.9,0,1.4c0,0.4,0,0.8,0.1,1.2c0,0.2,0,0.5,0,0.7
+			c0,0.6,0.1,1.1,0.1,1.7c0,0.2,0,0.5,0.1,0.7c0.1,0.7,0.1,1.4,0.2,2.1c0.1,0.7,0.2,1.4,0.2,2.2c0,0.3,0.1,0.6,0.1,1
+			c0.1,0.5,0.1,0.9,0.2,1.4c0.1,0.5,0.1,1,0.2,1.5c0,0.2,0,0.4,0.1,0.5c0.1,0.5,0.2,1,0.3,1.5c0.1,0.4,0.1,0.8,0.2,1.2
+			c0.1,0.4,0.2,0.8,0.2,1.2c0.1,0.3,0.1,0.7,0.2,1c0.1,0.5,0.2,0.9,0.3,1.4c0.2,0.7,0.3,1.3,0.5,2c0.2,0.6,0.3,1.1,0.5,1.7
+			c1,3.6,2.2,7.1,3.5,10.5c0.2,0.5,0.4,1,0.6,1.5c0.3,0.6,0.5,1.3,0.8,1.9c0.3,0.6,0.5,1.2,0.8,1.7c0,0.1,0.1,0.2,0.1,0.2
+			c0.2,0.5,0.5,1,0.7,1.4c0.1,0.3,0.3,0.6,0.5,0.9c0.2,0.4,0.4,0.8,0.7,1.3c0.3,0.6,0.6,1.2,0.9,1.8c0.2,0.5,0.5,0.9,0.8,1.4
+			c0.1,0.2,0.3,0.4,0.4,0.7c0.2,0.3,0.4,0.7,0.6,1c0.2,0.4,0.5,0.9,0.8,1.3c0.4,0.6,0.8,1.3,1.2,1.9c0.4,0.6,0.8,1.2,1.2,1.9
+			c1.3,1.9,2.6,3.7,3.9,5.4c0.5,0.6,0.9,1.2,1.4,1.7c0.4,0.4,0.7,0.9,1.1,1.3c0.6,0.7,1.2,1.4,1.8,2.1c0.5,0.5,1,1.1,1.5,1.6
+			c0.5,0.5,1,1.1,1.5,1.6c6.2,6.4,13.3,11.9,21,16.4c11.6,6.8,24.7,11.3,38.7,13c0.1,0,0.2,0,0.3-0.1c0.2-0.1,0.6-0.1,1-0.2
+			c0.1,0,0.2,0,0.2,0C100.5,196.2,107.2,185.3,104.5,174.5z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path fill="#E7256F" d="M100,0c-0.7,0-1.5,0-2.2,0c-0.4,0-0.8,0-1.2,0c-0.6,0-1.2,0-1.8,0.1c-0.7,0-1.4,0.1-2.1,0.1
+			c-0.2,0-0.4,0-0.6,0.1c-0.8,0.1-1.5,0.1-2.3,0.2c-0.6,0.1-1.1,0.1-1.7,0.2c-0.4,0-0.8,0.1-1.3,0.2c-0.5,0.1-1.1,0.1-1.6,0.2
+			c-0.5,0.1-1.1,0.2-1.6,0.3c-1.1,0.2-2.1,0.4-3.2,0.6c-0.5,0.1-1.1,0.2-1.6,0.3c-0.6,0.1-1.2,0.3-1.9,0.4c-0.6,0.1-1.1,0.3-1.7,0.4
+			c-0.2,0-0.4,0.1-0.6,0.2c-1,0.3-2,0.5-3,0.8c-0.1,0-0.3,0.1-0.5,0.1c-0.9,0.3-1.7,0.5-2.6,0.8c-0.1,0-0.2,0-0.2,0.1
+			c-0.6,0.2-1.3,0.4-1.9,0.7c-0.1,0-0.3,0.1-0.4,0.1c-0.3,0.1-0.5,0.2-0.8,0.3c0,0-0.1,0-0.1,0C64.5,6.5,64,6.7,63.4,7
+			c-0.1,0-0.1,0-0.2,0.1c-0.2,0.1-0.3,0.1-0.5,0.2c-0.7,0.3-1.4,0.6-2.1,0.9c-0.8,0.3-1.5,0.7-2.3,1c-0.1,0-0.2,0.1-0.2,0.1
+			c-0.1,0-0.2,0.1-0.3,0.1c-0.4,0.2-0.9,0.4-1.3,0.6c-0.6,0.3-1.1,0.5-1.7,0.8c-0.5,0.2-1,0.5-1.5,0.8c-0.1,0.1-0.2,0.1-0.4,0.2
+			c-0.8,0.4-1.5,0.8-2.2,1.2c3.1-1.3,6.3-2.4,9.7-3.2c36.3-8.9,73,13.2,81.9,49.5c2,8.2,2.4,16.5,1.5,24.4c-0.3,1.9-1,4.5-2.1,4.7
+			c-1.3,0.3-2.3-1.1-3.8-3.2c0,0-0.1-0.1-0.1-0.1c-0.2-0.2-0.3-0.4-0.5-0.7c-0.2-0.2-0.3-0.4-0.5-0.6c-0.2-0.3-0.4-0.5-0.7-0.8
+			c0,0,0,0-0.1-0.1c0-0.1-0.1-0.1-0.1-0.2c-1.3-1.5-2.5-2.7-3.7-3.5c-7.4-6.1-17.5-8.7-27.6-6.2c-17,4.2-28.3,17.2-24.2,34.2
+			c5.9,24,42.9,20.2,51.8,55.8c0,0,0,0.1,0,0.1v0c0,0,0,0,0,0.1s0,0,0,0c3.3,13.5-2.2,27.1-12.9,34.7c1.6-0.3,3.2-0.7,4.8-1.1
+			c0.8-0.2,1.6-0.4,2.4-0.6c1.6-0.4,3.1-0.9,4.7-1.4c2.3-0.8,4.6-1.6,6.8-2.5c2.6-1.1,5.2-2.3,7.8-3.6c1.9-1,3.8-2,5.6-3.1
+			c0.6-0.4,1.2-0.7,1.8-1.1c0.6-0.4,1.2-0.8,1.8-1.2c0.6-0.4,1.2-0.8,1.8-1.2c0.6-0.4,1.2-0.8,1.7-1.2c0.6-0.4,1.1-0.8,1.7-1.2
+			c0,0,0,0,0.1-0.1c0.5-0.4,1.1-0.8,1.6-1.2c1.1-0.9,2.2-1.8,3.3-2.7c0.5-0.5,1.1-0.9,1.6-1.4c0.5-0.5,1-0.9,1.6-1.4
+			c0.5-0.5,1-0.9,1.5-1.4c0,0,0.1,0,0.1-0.1c0.5-0.5,1-1,1.5-1.5c0.5-0.5,1-1,1.5-1.5c1.4-1.5,2.8-3.1,4.2-4.7
+			c0.5-0.5,0.9-1.1,1.3-1.6c0.3-0.4,0.6-0.7,0.9-1.1c0.3-0.3,0.5-0.7,0.8-1c0.4-0.5,0.7-0.9,1-1.4c0.3-0.5,0.7-0.9,1-1.4
+			c0.1-0.2,0.2-0.4,0.4-0.5c0.3-0.5,0.6-0.9,0.9-1.4c0.4-0.6,0.8-1.2,1.2-1.8c1.7-2.7,3.3-5.5,4.8-8.4c0.3-0.5,0.5-1,0.8-1.5
+			c0.2-0.5,0.5-1.1,0.7-1.6c0.2-0.5,0.5-1,0.7-1.5c0.2-0.6,0.5-1.1,0.7-1.7c0.3-0.8,0.6-1.5,0.9-2.3c0,0,0-0.1,0-0.1
+			c0.3-0.7,0.6-1.4,0.8-2.2c0.2-0.7,0.5-1.3,0.7-2c0.1-0.3,0.2-0.6,0.3-1c0.2-0.5,0.4-1.1,0.5-1.7c0.2-0.6,0.3-1.1,0.5-1.7
+			c0.2-0.5,0.3-1,0.4-1.5c0-0.2,0.1-0.3,0.1-0.5c0.1-0.5,0.3-0.9,0.4-1.4c0.1-0.3,0.2-0.7,0.2-1c0.1-0.5,0.2-1,0.3-1.5
+			c0.3-1.4,0.6-2.8,0.9-4.3c0.1-0.5,0.2-1,0.2-1.5c0.1-0.6,0.2-1.2,0.3-1.8c0.1-0.5,0.1-1,0.2-1.5c0-0.3,0.1-0.5,0.1-0.8
+			c0.1-0.6,0.2-1.3,0.2-2c0-0.1,0-0.1,0-0.2c0.1-0.6,0.1-1.2,0.2-1.7c0-0.5,0.1-1,0.1-1.5c0-0.2,0-0.4,0-0.6c0-0.5,0.1-1,0.1-1.5
+			c0-0.3,0-0.7,0-1c0-0.5,0-1,0-1.5c0-0.8,0-1.5,0-2.3C200,44.8,155.2,0,100,0z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/icons/sucuri.png b/src/icons/sucuri.png
new file mode 100644
index 000000000..ec4be30a3
Binary files /dev/null and b/src/icons/sucuri.png differ
diff --git a/src/icons/sympa.png b/src/icons/sympa.png
new file mode 100644
index 000000000..288e92224
Binary files /dev/null and b/src/icons/sympa.png differ
diff --git a/src/icons/tailwindcss.svg b/src/icons/tailwindcss.svg
new file mode 100644
index 000000000..5b0424030
--- /dev/null
+++ b/src/icons/tailwindcss.svg
@@ -0,0 +1 @@
+<svg class="mx-auto block h-24 mb-3" viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><circle id="b" cx="40" cy="40" r="40"></circle><filter x="-8.8%" y="-6.2%" width="117.5%" height="117.5%" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset><feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" in="shadowBlurOuter1"></feColorMatrix></filter><linearGradient x1="0%" y1="0%" y2="100%" id="c"><stop stop-color="#2383AE" offset="0%"></stop><stop stop-color="#6DD7B9" offset="100%"></stop></linearGradient></defs><g fill="none" fill-rule="evenodd"><g transform="translate(5 5)"><use fill="#000" filter="url(#a)" xlink:href="#b"></use><use fill="#FFF" xlink:href="#b"></use></g><path d="M25.6 33.92C27.52 26.24 32.32 22.4 40 22.4c11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32zM11.2 51.2c1.92-7.68 6.72-11.52 14.4-11.52 11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32z" fill="url(#c)" transform="translate(5 5)"></path></g></svg>
\ No newline at end of file
diff --git a/src/icons/transifex.png b/src/icons/transifex.png
new file mode 100644
index 000000000..4c90c29a6
Binary files /dev/null and b/src/icons/transifex.png differ
diff --git a/src/icons/tray.png b/src/icons/tray.png
new file mode 100644
index 000000000..66d510765
Binary files /dev/null and b/src/icons/tray.png differ
diff --git a/src/icons/webdev.png b/src/icons/webdev.png
new file mode 100644
index 000000000..a37ce3ec8
Binary files /dev/null and b/src/icons/webdev.png differ
diff --git a/src/icons/websocket.png b/src/icons/websocket.png
new file mode 100644
index 000000000..7d94f1073
Binary files /dev/null and b/src/icons/websocket.png differ
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index 95c933eab..a50ddb913 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -6,20 +6,123 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-'use strict';
-
 const validation = {
   hostname: /(www.)?((.+?)\.(([a-z]{2,3}\.)?[a-z]{2,6}))$/,
-  hostnameBlacklist: /((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/
+  hostnameBlacklist: /((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/,
 };
 
+/**
+ * Enclose string in array
+ */
+function asArray(value) {
+  return value instanceof Array ? value : [value];
+}
+
+/**
+ *
+ */
+function asyncForEach(iterable, iterator) {
+  return Promise.all((iterable || [])
+    .map(item => new Promise(resolve => setTimeout(() => resolve(iterator(item)), 1))));
+}
+
+/**
+ * Mark application as detected, set confidence and version
+ */
+function addDetected(app, pattern, type, value, key) {
+  app.detected = true;
+
+  // Set confidence level
+  app.confidence[`${type} ${key ? `${key} ` : ''}${pattern.regex}`] = pattern.confidence === undefined ? 100 : parseInt(pattern.confidence, 10);
+
+  // Detect version number
+  if (pattern.version) {
+    const versions = [];
+    const matches = pattern.regex.exec(value);
+
+    let { version } = pattern;
+
+    if (matches) {
+      matches.forEach((match, i) => {
+        // Parse ternary operator
+        const ternary = new RegExp(`\\\\${i}\\?([^:]+):(.*)$`).exec(version);
+
+        if (ternary && ternary.length === 3) {
+          version = version.replace(ternary[0], match ? ternary[1] : ternary[2]);
+        }
+
+        // Replace back references
+        version = version.trim().replace(new RegExp(`\\\\${i}`, 'g'), match || '');
+      });
+
+      if (version && versions.indexOf(version) === -1) {
+        versions.push(version);
+      }
+
+      if (versions.length) {
+        // Use the longest detected version number
+        app.version = versions.reduce((a, b) => (a.length > b.length ? a : b));
+      }
+    }
+  }
+}
+
+function resolveExcludes(apps, detected) {
+  const excludes = [];
+  const detectedApps = Object.assign({}, apps, detected);
+
+  // Exclude app in detected apps only
+  Object.keys(detectedApps).forEach((appName) => {
+    const app = detectedApps[appName];
+
+    if (app.props.excludes) {
+      asArray(app.props.excludes).forEach((excluded) => {
+        excludes.push(excluded);
+      });
+    }
+  });
+
+  // Remove excluded applications
+  Object.keys(apps).forEach((appName) => {
+    if (excludes.indexOf(appName) > -1) {
+      delete apps[appName];
+    }
+  });
+}
+
+class Application {
+  constructor(name, props, detected) {
+    this.confidence = {};
+    this.confidenceTotal = 0;
+    this.detected = Boolean(detected);
+    this.excludes = [];
+    this.name = name;
+    this.props = props;
+    this.version = '';
+  }
+
+  /**
+   * Calculate confidence total
+   */
+  getConfidence() {
+    let total = 0;
+
+    Object.keys(this.confidence).forEach((id) => {
+      total += this.confidence[id];
+    });
+
+    this.confidenceTotal = Math.min(total, 100);
+
+    return this.confidenceTotal;
+  }
+}
+
 class Wappalyzer {
   constructor() {
     this.apps = {};
     this.categories = {};
     this.driver = {};
     this.jsPatterns = {};
-
     this.detected = {};
     this.hostnameCache = {};
     this.adCache = [];
@@ -35,79 +138,118 @@ class Wappalyzer {
    * Log messages to console
    */
   log(message, source, type) {
-    this.driver.log(message, source || '', type || 'debug');
+    if (this.driver.log) {
+      this.driver.log(message, source || '', type || 'debug');
+    }
   }
 
   analyze(url, data, context) {
-    var apps = {};
-
-    if ( typeof data.html !== 'string' ) {
-      data.html = '';
-    }
-
-    if ( this.detected[url.canonical] === undefined ) {
+    const apps = {};
+    const promises = [];
+    const startTime = new Date();
+    const {
+      scripts,
+      cookies,
+      headers,
+      js,
+    } = data;
+
+    let { html } = data;
+
+    if (this.detected[url.canonical] === undefined) {
       this.detected[url.canonical] = {};
     }
 
+    const metaTags = [];
+
     // Additional information
-    const matches = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
+    let language = null;
 
-    const language = matches && matches.length ? matches[1] : null;
+    if (html) {
+      if (typeof html !== 'string') {
+        html = '';
+      }
 
-    Object.keys(this.apps).forEach(appName => {
-      apps[appName] = this.detected[url.canonical] && this.detected[url.canonical][appName] ? this.detected[url.canonical][appName] : new Application(appName, this.apps[appName]);
+      let matches = data.html.match(new RegExp('<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"', 'i'));
 
-      var app = apps[appName];
+      language = matches && matches.length ? matches[1] : null;
 
-      this.analyzeUrl(app, url);
+      // Meta tags
+      const regex = /<meta[^>]+>/ig;
 
-      if ( data.html ) {
-        this.analyzeHtml(app, data.html);
-        this.analyzeMeta(app, data.html);
-      }
+      do {
+        matches = regex.exec(html);
+
+        if (!matches) {
+          break;
+        }
+
+        metaTags.push(matches[0]);
+      } while (matches);
+    }
+
+    Object.keys(this.apps).forEach((appName) => {
+      apps[appName] = this.detected[url.canonical] && this.detected[url.canonical][appName]
+        ? this.detected[url.canonical][appName]
+        : new Application(appName, this.apps[appName]);
 
-      if ( data.scripts ) {
-        this.analyzeScripts(app, data.scripts);
+      const app = apps[appName];
+
+      promises.push(this.analyzeUrl(app, url));
+
+      if (html) {
+        promises.push(this.analyzeHtml(app, html));
+        promises.push(this.analyzeMeta(app, metaTags));
       }
 
-      if ( data.headers ) {
-        this.analyzeHeaders(app, data.headers);
+      if (scripts) {
+        promises.push(this.analyzeScripts(app, scripts));
       }
 
-      if ( data.env ) {
-        this.analyzeEnv(app, data.env);
+      if (cookies) {
+        promises.push(this.analyzeCookies(app, cookies));
       }
 
-      if ( data.robotsTxt ) {
-        this.analyzeRobotsTxt(app, data.robotsTxt);
+      if (headers) {
+        promises.push(this.analyzeHeaders(app, headers));
       }
-    })
+    });
 
-    if ( data.js ) {
-      Object.keys(data.js).forEach(appName => {
-        this.analyzeJs(apps[appName], data.js[appName]);
+    if (js) {
+      Object.keys(js).forEach((appName) => {
+        if (typeof js[appName] !== 'function') {
+          promises.push(this.analyzeJs(apps[appName], js[appName]));
+        }
       });
     }
 
-    Object.keys(apps).forEach(appName => {
-      var app = apps[appName];
+    return new Promise(async (resolve) => {
+      await Promise.all(promises);
 
-      if ( !app.detected || !app.getConfidence() ) {
-        delete apps[app.name];
-      }
-    });
+      Object.keys(apps).forEach((appName) => {
+        const app = apps[appName];
 
-    this.resolveExcludes(apps);
-    this.resolveImplies(apps, url.canonical);
+        if (!app.detected || !app.getConfidence()) {
+          delete apps[app.name];
+        }
+      });
 
-    this.cacheDetectedApps(apps, url.canonical);
-    this.trackDetectedApps(apps, url, language);
+      resolveExcludes(apps, this.detected[url]);
+      this.resolveImplies(apps, url.canonical);
 
-    if ( Object.keys(apps).length ) {
-      this.log(Object.keys(apps).length + ' apps detected: ' + Object.keys(apps).join(', ') + ' on ' + url.canonical, 'core');
-    }
+      this.cacheDetectedApps(apps, url.canonical);
+      this.trackDetectedApps(apps, url, language);
+
+      this.log(`Processing ${Object.keys(data).join(', ')} took ${((new Date() - startTime) / 1000).toFixed(2)}s (${url.hostname})`, 'core');
+
+      if (Object.keys(apps).length) {
+        this.log(`Identified ${Object.keys(apps).join(', ')} (${url.hostname})`, 'core');
+      }
 
-    this.driver.displayApps(this.detected[url.canonical], { language }, context);
+      this.driver.displayApps(this.detected[url.canonical], { language }, context);
+
+      return resolve();
+    });
   }
 
   /**
@@ -121,33 +263,32 @@ class Wappalyzer {
    *
    */
   robotsTxtAllows(url) {
-    return new Promise((resolve, reject) => {
-      var parsed = this.parseUrl(url);
+    return new Promise(async (resolve, reject) => {
+      const parsed = this.parseUrl(url);
 
-      if ( parsed.protocol !== 'http:' && parsed.protocol !== 'https:' ) {
+      if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
         return reject();
       }
 
-      this.driver.getRobotsTxt(parsed.host, parsed.protocol === 'https:')
-        .then(robotsTxt => {
-          if (robotsTxt.some(disallowedPath => parsed.pathname.indexOf(disallowedPath) === 0)) {
-            return reject();
-          } else {
-            return resolve();
-          }
-        });
+      const robotsTxt = await this.driver.getRobotsTxt(parsed.host, parsed.protocol === 'https:');
+
+      if (robotsTxt.some(disallowedPath => parsed.pathname.indexOf(disallowedPath) === 0)) {
+        return reject();
+      }
+
+      return resolve();
     });
-  };
+  }
 
   /**
    * Parse a URL
    */
   parseUrl(url) {
-    var a = this.driver.document.createElement('a');
+    const a = this.driver.document.createElement('a');
 
     a.href = url;
 
-    a.canonical = a.protocol + '//' + a.host + a.pathname;
+    a.canonical = `${a.protocol}//${a.host}${a.pathname}`;
 
     return a;
   }
@@ -155,22 +296,21 @@ class Wappalyzer {
   /**
    *
    */
-  parseRobotsTxt(robotsTxt) {
-    var userAgent;
-    var disallow = [];
+  static parseRobotsTxt(robotsTxt) {
+    const disallow = [];
 
-    robotsTxt.split('\n').forEach(line => {
-      var matches = /^User-agent:\s*(.+)$/i.exec(line);
+    let userAgent;
 
-      if ( matches ) {
+    robotsTxt.split('\n').forEach((line) => {
+      let matches = /^User-agent:\s*(.+)$/i.exec(line.trim());
+
+      if (matches) {
         userAgent = matches[1].toLowerCase();
-      } else {
-        if ( userAgent === '*' || userAgent === 'wappalyzer' ) {
-          matches = /^Disallow:\s*(.+)$/i.exec(line);
+      } else if (userAgent === '*' || userAgent === 'wappalyzer') {
+        matches = /^Disallow:\s*(.+)$/i.exec(line.trim());
 
-          if ( matches ) {
-            disallow.push(matches[1]);
-          }
+        if (matches) {
+          disallow.push(matches[1]);
         }
       }
     });
@@ -182,61 +322,59 @@ class Wappalyzer {
    *
    */
   ping() {
-    if ( Object.keys(this.hostnameCache).length + this.adCache.length > 50 ) {
-      this.driver.ping(this.hostnameCache, this.adCache);
+    if (Object.keys(this.hostnameCache).length > 100) {
+      this.driver.ping(this.hostnameCache);
 
       this.hostnameCache = {};
-      this.adCache = [];
     }
-  }
 
-  /**
-   * Enclose string in array
-   */
-  asArray(value) {
-    return value instanceof Array ? value : [ value ];
+    if (this.adCache.length > 50) {
+      this.driver.ping({}, this.adCache);
+
+      this.adCache = [];
+    }
   }
 
   /**
    * Parse apps.json patterns
    */
   parsePatterns(patterns) {
-    if ( !patterns ) {
+    if (!patterns) {
       return [];
     }
 
-    var parsed = {};
+    let parsed = {};
 
     // Convert string to object containing array containing string
-    if ( typeof patterns === 'string' || patterns instanceof Array ) {
+    if (typeof patterns === 'string' || patterns instanceof Array) {
       patterns = {
-        main: this.asArray(patterns)
+        main: asArray(patterns),
       };
     }
 
-    Object.keys(patterns).forEach(key => {
+    Object.keys(patterns).forEach((key) => {
       parsed[key] = [];
 
-      this.asArray(patterns[key]).forEach(pattern => {
-        var attrs = {};
+      asArray(patterns[key]).forEach((pattern) => {
+        const attrs = {};
 
         pattern.split('\\;').forEach((attr, i) => {
-          if ( i ) {
+          if (i) {
             // Key value pairs
             attr = attr.split(':');
 
-            if ( attr.length > 1 ) {
+            if (attr.length > 1) {
               attrs[attr.shift()] = attr.join(':');
             }
           } else {
             attrs.string = attr;
 
             try {
-              attrs.regex = new RegExp(attr.replace('/', '\/'), 'i'); // Escape slashes in regular expression
-            } catch (e) {
+              attrs.regex = new RegExp(attr.replace('/', '\\/'), 'i'); // Escape slashes in regular expression
+            } catch (error) {
               attrs.regex = new RegExp();
 
-              this.log(e + ': ' + attr, 'error', 'core');
+              this.log(`${error.message}: ${attr}`, 'error', 'core');
             }
           }
         });
@@ -246,7 +384,7 @@ class Wappalyzer {
     });
 
     // Convert back to array if the original pattern list was an array (or string)
-    if ( 'main' in parsed ) {
+    if ('main' in parsed) {
       parsed = parsed.main;
     }
 
@@ -257,69 +395,51 @@ class Wappalyzer {
    * Parse JavaScript patterns
    */
   parseJsPatterns() {
-    Object.keys(this.apps).forEach(appName => {
-      if ( this.apps[appName].js ) {
+    Object.keys(this.apps).forEach((appName) => {
+      if (this.apps[appName].js) {
         this.jsPatterns[appName] = this.parsePatterns(this.apps[appName].js);
       }
     });
   }
 
-  resolveExcludes(apps) {
-    var excludes = [];
-
-    // Exclude app in detected apps only
-    Object.keys(apps).forEach(appName => {
-      var app = apps[appName];
-
-      if ( app.props.excludes ) {
-        this.asArray(app.props.excludes).forEach(excluded => {
-          excludes.push(excluded);
-        });
-      }
-    })
-
-    // Remove excluded applications
-    Object.keys(apps).forEach(appName => {
-      if ( excludes.indexOf(appName) !== -1 ) {
-        delete apps[appName];
-      }
-    })
-  }
-
   resolveImplies(apps, url) {
-    var checkImplies = true;
+    let checkImplies = true;
 
-    // Implied applications
-    // Run several passes as implied apps may imply other apps
-    while ( checkImplies ) {
-      checkImplies = false;
-
-      Object.keys(apps).forEach(appName => {
-        var app = apps[appName];
+    const resolve = (appName) => {
+      const app = apps[appName];
 
-        if ( app && app.props.implies ) {
-          this.asArray(app.props.implies).forEach(implied => {
-            implied = this.parsePatterns(implied)[0];
+      if (app && app.props.implies) {
+        asArray(app.props.implies).forEach((implied) => {
+          [implied] = this.parsePatterns(implied);
 
-            if ( !this.apps[implied.string] ) {
-              this.log('Implied application ' + implied.string + ' does not exist', 'core', 'warn');
+          if (!this.apps[implied.string]) {
+            this.log(`Implied application ${implied.string} does not exist`, 'core', 'warn');
 
-              return;
-            }
+            return;
+          }
 
-            if ( !( implied.string in apps ) ) {
-              apps[implied.string] = this.detected[url] && this.detected[url][implied.string] ? this.detected[url][implied.string] : new Application(implied.string, this.apps[implied.string], true);
+          if (!(implied.string in apps)) {
+            apps[implied.string] = this.detected[url] && this.detected[url][implied.string]
+              ? this.detected[url][implied.string]
+              : new Application(implied.string, this.apps[implied.string], true);
 
-              checkImplies = true;
-            }
+            checkImplies = true;
+          }
 
-            // Apply app confidence to implied app
-            Object.keys(app.confidence).forEach(id => {
-              apps[implied.string].confidence[id + ' implied by ' + appName] = app.confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 );
-            });
+          // Apply app confidence to implied app
+          Object.keys(app.confidence).forEach((id) => {
+            apps[implied.string].confidence[`${id} implied by ${appName}`] = app.confidence[id] * (implied.confidence === undefined ? 1 : implied.confidence / 100);
           });
-        }
-      });
+        });
+      }
+    };
+
+    // Implied applications
+    // Run several passes as implied apps may imply other apps
+    while (checkImplies) {
+      checkImplies = false;
+
+      Object.keys(apps).forEach(resolve);
     }
   }
 
@@ -327,18 +447,19 @@ class Wappalyzer {
    * Cache detected applications
    */
   cacheDetectedApps(apps, url) {
-    Object.keys(apps).forEach(appName => {
-      var app = apps[appName];
+    Object.keys(apps).forEach((appName) => {
+      const app = apps[appName];
 
       // Per URL
       this.detected[url][appName] = app;
 
-      Object.keys(app.confidence).forEach(id => {
-        this.detected[url][appName].confidence[id] = app.confidence[id];
-      });
-    })
+      Object.keys(app.confidence)
+        .forEach((id) => {
+          this.detected[url][appName].confidence[id] = app.confidence[id];
+        });
+    });
 
-    if ( this.driver.ping instanceof Function ) {
+    if (this.driver.ping instanceof Function) {
       this.ping();
     }
   }
@@ -347,41 +468,44 @@ class Wappalyzer {
    * Track detected applications
    */
   trackDetectedApps(apps, url, language) {
-    if ( !( this.driver.ping instanceof Function ) ) {
+    if (!(this.driver.ping instanceof Function)) {
       return;
     }
 
-    const hostname = url.protocol + '//' + url.hostname;
+    const hostname = `${url.protocol}//${url.hostname}`;
 
-    Object.keys(apps).forEach(appName => {
+    Object.keys(apps).forEach((appName) => {
       const app = apps[appName];
 
-      if ( this.detected[url.canonical][appName].getConfidence() >= 100 ) {
-        if ( validation.hostname.test(url.hostname) && !validation.hostnameBlacklist.test(url.hostname) ) {
-          if ( !( hostname in this.hostnameCache ) ) {
+      if (this.detected[url.canonical][appName].getConfidence() >= 100) {
+        if (
+          validation.hostname.test(url.hostname)
+          && !validation.hostnameBlacklist.test(url.hostname)
+        ) {
+          if (!(hostname in this.hostnameCache)) {
             this.hostnameCache[hostname] = {
               applications: {},
-              meta: {}
+              meta: {},
             };
           }
 
-          if ( !( appName in this.hostnameCache[hostname].applications ) ) {
+          if (!(appName in this.hostnameCache[hostname].applications)) {
             this.hostnameCache[hostname].applications[appName] = {
-              hits: 0
+              hits: 0,
             };
           }
 
-          this.hostnameCache[hostname].applications[appName].hits ++;
+          this.hostnameCache[hostname].applications[appName].hits += 1;
 
-          if ( apps[appName].version ) {
+          if (apps[appName].version) {
             this.hostnameCache[hostname].applications[appName].version = app.version;
           }
         }
       }
     });
 
-    if ( hostname in this.hostnameCache ) {
-      this.hostnameCache[hostname].meta['language'] = language;
+    if (hostname in this.hostnameCache) {
+      this.hostnameCache[hostname].meta.language = language;
     }
 
     this.ping();
@@ -391,215 +515,158 @@ class Wappalyzer {
    * Analyze URL
    */
   analyzeUrl(app, url) {
-    var patterns = this.parsePatterns(app.props.url);
+    const patterns = this.parsePatterns(app.props.url);
 
-    if ( patterns.length ) {
-      patterns.forEach(pattern => {
-        if ( pattern.regex.test(url.canonical) ) {
-          this.addDetected(app, pattern, 'url', url.canonical);
-        }
-      });
+    if (!patterns.length) {
+      return Promise.resolve();
     }
+
+    return asyncForEach(patterns, (pattern) => {
+      if (pattern.regex.test(url.canonical)) {
+        addDetected(app, pattern, 'url', url.canonical);
+      }
+    });
   }
 
   /**
    * Analyze HTML
    */
   analyzeHtml(app, html) {
-    var patterns = this.parsePatterns(app.props.html);
+    const patterns = this.parsePatterns(app.props.html);
 
-    if ( patterns.length ) {
-      patterns.forEach(pattern => {
-        if ( pattern.regex.test(html) ) {
-          this.addDetected(app, pattern, 'html', html);
-        }
-      });
+    if (!patterns.length) {
+      return Promise.resolve();
     }
+
+    return asyncForEach(patterns, (pattern) => {
+      if (pattern.regex.test(html)) {
+        addDetected(app, pattern, 'html', html);
+      }
+    });
   }
 
   /**
    * Analyze script tag
    */
   analyzeScripts(app, scripts) {
-    var patterns = this.parsePatterns(app.props.script);
+    const patterns = this.parsePatterns(app.props.script);
 
-    if ( patterns.length ) {
-      patterns.forEach(pattern => {
-        var match;
+    if (!patterns.length) {
+      return Promise.resolve();
+    }
 
-        scripts.forEach(uri => {
-          if ( pattern.regex.test(uri) ) {
-            this.addDetected(app, pattern, 'script', uri);
-          }
-        });
+    return asyncForEach(patterns, (pattern) => {
+      scripts.forEach((uri) => {
+        if (pattern.regex.test(uri)) {
+          addDetected(app, pattern, 'script', uri);
+        }
       });
-    }
+    });
   }
 
   /**
    * Analyze meta tag
    */
-  analyzeMeta(app, html) {
-    var regex = /<meta[^>]+>/ig;
-    var patterns = this.parsePatterns(app.props.meta);
-    var content;
-    var match;
-
-    while ( patterns && ( match = regex.exec(html) ) ) {
-      for ( var meta in patterns ) {
-        if ( new RegExp('(name|property)=["\']' + meta + '["\']', 'i').test(match) ) {
-          content = match.toString().match(/content=("|')([^"']+)("|')/i);
-
-          patterns[meta].forEach(pattern => {
-            if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
-              this.addDetected(app, pattern, 'meta', content[2], meta);
+  analyzeMeta(app, metaTags) {
+    const patterns = this.parsePatterns(app.props.meta);
+    const promises = [];
+
+    if (!app.props.meta) {
+      return Promise.resolve();
+    }
+
+    metaTags.forEach((match) => {
+      Object.keys(patterns).forEach((meta) => {
+        const r = new RegExp(`(?:name|property)=["']${meta}["']`, 'i');
+
+        if (r.test(match)) {
+          const content = match.match(/content=("|')([^"']+)("|')/i);
+
+          promises.push(asyncForEach(patterns[meta], (pattern) => {
+            if (content && content.length === 4 && pattern.regex.test(content[2])) {
+              addDetected(app, pattern, 'meta', content[2], meta);
             }
-          });
+          }));
         }
-      }
-    }
+      });
+    });
+
+    return Promise.all(promises);
   }
 
   /**
-   * analyze response headers
+   * Analyze response headers
    */
   analyzeHeaders(app, headers) {
-    var patterns = this.parsePatterns(app.props.headers);
+    const patterns = this.parsePatterns(app.props.headers);
+    const promises = [];
 
-    if ( headers ) {
-      Object.keys(patterns).forEach(headerName => {
-        patterns[headerName].forEach(pattern => {
+    Object.keys(patterns).forEach((headerName) => {
+      if (typeof patterns[headerName] !== 'function') {
+        promises.push(asyncForEach(patterns[headerName], (pattern) => {
           headerName = headerName.toLowerCase();
 
-          if ( headerName in headers ) {
-            headers[headerName].forEach(headerValue => {
-              if ( pattern.regex.test(headerValue) ) {
-                this.addDetected(app, pattern, 'headers', headerValue, headerName);
+          if (headerName in headers) {
+            headers[headerName].forEach((headerValue) => {
+              if (pattern.regex.test(headerValue)) {
+                addDetected(app, pattern, 'headers', headerValue, headerName);
               }
             });
           }
-        });
-      });
-    }
-  }
-
-  /**
-   * Analyze environment variables
-   */
-  analyzeEnv(app, envs) {
-    var patterns = this.parsePatterns(app.props.env);
-
-    if ( patterns.length ) {
-      patterns.forEach(pattern => {
-        Object.keys(envs).forEach(env => {
-          if ( pattern.regex.test(envs[env]) ) {
-            this.addDetected(app, pattern, 'env', envs[env]);
-          }
-        })
-      });
-    }
-  }
-
-  /**
-   * Analyze JavaScript variables
-   */
-  analyzeJs(app, results) {
-    Object.keys(results).forEach(string => {
-      Object.keys(results[string]).forEach(index => {
-        const pattern = this.jsPatterns[app.name][string][index];
-        const value = results[string][index];
-
-        if ( pattern.regex.test(value) ) {
-          this.addDetected(app, pattern, 'js', value);
-        }
-      });
+        }));
+      }
     });
-  }
 
-  /**
-   * Analyze robots.txt
-   */
-  analyzeRobotsTxt(app, robotsTxt) {
-    var patterns = this.parsePatterns(app.props.robotsTxt);
-
-    if ( patterns.length ) {
-      patterns.forEach(pattern => {
-        if ( pattern.regex.test(robotsTxt) ) {
-          this.addDetected(app, pattern, 'robotsTxt', robotsTxt);
-        }
-      });
-    }
+    return promises ? Promise.all(promises) : Promise.resolve();
   }
 
   /**
-   * Mark application as detected, set confidence and version
+   * Analyze cookies
    */
-  addDetected(app, pattern, type, value, key) {
-    app.detected = true;
+  analyzeCookies(app, cookies) {
+    const patterns = this.parsePatterns(app.props.cookies);
+    const promises = [];
 
-    // Set confidence level
-    app.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence || 100;
+    Object.keys(patterns).forEach((cookieName) => {
+      if (typeof patterns[cookieName] !== 'function') {
+        const cookieNameLower = cookieName.toLowerCase();
 
-    // Detect version number
-    if ( pattern.version ) {
-      var versions = [];
-      var version  = pattern.version;
-      var matches  = pattern.regex.exec(value);
+        promises.push(asyncForEach(patterns[cookieName], (pattern) => {
+          const cookie = cookies.find(_cookie => _cookie.name.toLowerCase() === cookieNameLower);
 
-      if ( matches ) {
-        matches.forEach((match, i) => {
-          // Parse ternary operator
-          var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.*)$').exec(version);
-
-          if ( ternary && ternary.length === 3 ) {
-            version = version.replace(ternary[0], match ? ternary[1] : ternary[2]);
+          if (cookie && pattern.regex.test(cookie.value)) {
+            addDetected(app, pattern, 'cookies', cookie.value, cookieName);
           }
-
-          // Replace back references
-          version = version.replace(new RegExp('\\\\' + i, 'g'), match || '');
-        });
-
-        if ( version && versions.indexOf(version) === -1 ) {
-          versions.push(version);
-        }
-
-        if ( versions.length ) {
-          // Use the longest detected version number
-          app.version = versions.reduce((a, b) => a.length > b.length ? a : b);
-        }
+        }));
       }
-    }
-  }
-}
+    });
 
-/**
- * Application class
- */
-class Application {
-  constructor(name, props, detected) {
-    this.confidence      = {};
-    this.confidenceTotal = 0;
-    this.detected        = Boolean(detected);
-    this.excludes        = [];
-    this.name            = name;
-    this.props           = props;
-    this.version         = '';
+    return promises ? Promise.all(promises) : Promise.resolve();
   }
 
   /**
-   * Calculate confidence total
+   * Analyze JavaScript variables
    */
-  getConfidence() {
-    var total = 0;
+  analyzeJs(app, results) {
+    const promises = [];
 
-    for ( var id in this.confidence ) {
-      total += this.confidence[id];
-    }
+    Object.keys(results).forEach((string) => {
+      if (typeof results[string] !== 'function') {
+        promises.push(asyncForEach(Object.keys(results[string]), (index) => {
+          const pattern = this.jsPatterns[app.name][string][index];
+          const value = results[string][index];
+
+          if (pattern && pattern.regex.test(value)) {
+            addDetected(app, pattern, 'js', value, string);
+          }
+        }));
+      }
+    });
 
-    return this.confidenceTotal = Math.min(total, 100);
+    return promises ? Promise.all(promises) : Promise.resolve();
   }
 }
 
-if ( typeof module === 'object' ) {
+if (typeof module === 'object') {
   module.exports = Wappalyzer;
 }
diff --git a/src/wappalyzer.spec.js b/src/wappalyzer.spec.js
new file mode 100644
index 000000000..ea68c22e0
--- /dev/null
+++ b/src/wappalyzer.spec.js
@@ -0,0 +1,143 @@
+/* eslint-env mocha */
+
+const { assert, expect } = require('chai');
+const Wappalyzer = require('../src/wappalyzer');
+
+const appsJson = {
+  appUrl: {
+    url: 'test',
+  },
+  appCookies: {
+    cookies: {
+      test: 'test',
+    },
+  },
+  appUppercaseCookies: {
+    cookies: {
+      Test: 'Test',
+    },
+  },
+  appHeaders: {
+    headers: {
+      'X-Powered-By': 'test',
+    },
+  },
+  appHtml: {
+    html: 'test v(\\d)\\;confidence:50\\;version:\\1',
+    implies: 'appImplies',
+    excludes: 'appExcludes',
+  },
+  appMeta: {
+    meta: {
+      generator: 'test',
+    },
+  },
+  appScript: {
+    script: 'test',
+  },
+  appJs: {
+    js: {
+      key: 'value',
+    },
+  },
+  appImplies: {
+  },
+  appExcludes: {
+    html: 'test',
+  },
+};
+
+const driverData = {
+  cookies: [
+    {
+      name: 'test',
+      value: 'test',
+      domain: '',
+      path: '',
+    },
+  ],
+  headers: {
+    'x-powered-by': [
+      'test',
+    ],
+  },
+  html: '<meta name="generator" content="test"> html test v1',
+  scripts: [
+    'test',
+  ],
+  js: {
+    appJs: {
+      key: [
+        'value',
+      ],
+    },
+  },
+};
+
+describe('Wappalyzer', () => {
+  describe('#analyze()', () => {
+    let apps;
+
+    before(async () => {
+      const wappalyzer = new Wappalyzer();
+
+      wappalyzer.apps = appsJson;
+
+      wappalyzer.parseJsPatterns();
+
+      wappalyzer.driver.displayApps = (detected) => {
+        apps = detected;
+      };
+
+      await wappalyzer.analyze({ canonical: 'test' }, driverData);
+    });
+
+    it('should identify technologies using URLs', () => {
+      expect(apps).to.have.any.keys('appUrl');
+    });
+
+    it('should identify technologies using HTML', () => {
+      expect(apps).to.have.any.keys('appHtml');
+    });
+
+    it('should identify technologies using meta tags', () => {
+      expect(apps).to.have.any.keys('appMeta');
+    });
+
+    it('should identify technologies using script URLs', () => {
+      expect(apps).to.have.any.keys('appScript');
+    });
+
+    it('should identify technologies using headers', () => {
+      expect(apps).to.have.any.keys('appHeaders');
+    });
+
+    it('should identify technologies using cookies', () => {
+      expect(apps).to.have.any.keys('appCookies');
+    });
+
+    it('should identify technologies using uppercase named cookies', () => {
+      expect(apps).to.have.any.keys('appUppercaseCookies');
+    });
+
+    it('should identify technologies using JavaScript', () => {
+      expect(apps).to.have.any.keys('appJs');
+    });
+
+    it('should return the implied technology', () => {
+      expect(apps).to.have.any.keys('appImplies');
+    });
+
+    it('should not return the excluded technology', () => {
+      expect(apps).to.not.have.any.keys('appExcludes');
+    });
+
+    it('should return the confidence value', () => {
+      assert.equal(apps.appHtml.confidenceTotal, 50);
+    });
+
+    it('should return the version number', () => {
+      assert.equal(apps.appHtml.version, '1');
+    });
+  });
+});
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index c87638c01..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-file-type@3.8.*:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.8.0.tgz#bcadf6a8f624ebe4a10e5ad26727b6b93f16d78d"
-
-html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-
-is-svg@2.0.*:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.0.1.tgz#f93ab3bf1d6bbca30e9753cd3485b1300eebc013"
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-read-chunk@2.0.*:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.0.0.tgz#3246e877829116cec059674c4d5f300f7a9261f3"
-  dependencies:
-    pify "^2.3.0"