diff --git a/src/apps.json b/src/apps.json
index 666f8b3f1..14619fdf8 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -17,7 +17,8 @@
     },
     "1C-Bitrix": {
       "cats": [
-        1
+        1,
+		6
       ],
       "headers": {
         "Set-Cookie": "BITRIX_",
@@ -78,6 +79,14 @@
       "icon": "ebis.png",
       "website": "http://www.ebis.ne.jp"
     },
+    "Alpine.js": {
+      "cats": [
+        12
+      ],
+      "html": "<[^>]+x-data[^<]+",
+      "icon": "Alpine.js.png",
+      "website": "https://github.com/alpinejs/alpine"
+    },
     "AOLserver": {
       "cats": [
         22
@@ -562,7 +571,7 @@
         61
       ],
       "html": [
-        "<form[^>]+?action=\"[^\"]+airform\\.io"
+        "<form[^>]+?action=\"[^\"]*airform\\.io[^>]+?>"
       ],
       "icon": "Airform.svg",
       "website": "https://airform.io"
@@ -715,12 +724,24 @@
       "implies": "Amazon Web Services",
       "website": "https://aws.amazon.com/elasticloadbalancing/"
     },
+    "Amazon ALB": {
+      "cats": [
+        65
+      ],
+      "cookies": {
+        "AWSALB": "",
+        "AWSALBCORS": ""
+      },
+      "icon": "aws-elb.png",
+      "implies": "Amazon Web Services",
+      "website": "https://aws.amazon.com/elasticloadbalancing/"
+    },
     "Amazon S3": {
       "cats": [
         19
       ],
       "headers": {
-        "Server": "^AmazonS3$"
+        "server": "^AmazonS3$"
       },
       "icon": "aws-s3.svg",
       "implies": "Amazon Web Services",
@@ -960,6 +981,14 @@
       "icon": "apostrophecms.svg",
       "implies": "Node.js",
       "website": "http://apostrophecms.org"
+    },
+	"AppDynamics": {
+      "cats": [
+        10
+      ],
+      "icon": "AppDynamics.png",
+      "script": "adrum\\.js|adrum.([0-9].*)\\.js\\;version:\\1",
+      "website": "https://appdynamics.com"
     },
     "AppNexus": {
       "cats": [
@@ -1141,6 +1170,19 @@
       ],
       "website": "http://www.atlassian.com/software/jira/overview/"
     },
+    "Atlassian Statuspage": {
+      "cats": [
+        13,
+        62
+      ],
+      "headers": {
+        "X-StatusPage-Skip-Logging": "",
+        "X-StatusPage-Version": ""
+      },
+      "html": "<a[^>]*href=\"https?://(?:www\\.)?statuspage\\.io/powered-by[^>]+>",
+      "icon": "Atlassian Statuspage.svg",
+      "website": "https://www.statuspage.io/"
+    },
     "Aurelia": {
       "cats": [
         12
@@ -1304,6 +1346,16 @@
       "implies": "Python",
       "website": "http://docs.python.org/2/library/basehttpserver.html"
     },
+    "Big Cartel": {
+      "cats": [
+        6
+      ],
+      "icon": "bigcartel.png",
+      "meta": {
+        "generator": "Big Cartel"
+      },
+      "website": "https://www.bigcartel.com"
+    },
     "BigDump": {
       "cats": [
         3
@@ -1386,6 +1438,17 @@
         "blazor\\.webassembly\\.js"
       ]
     },
+    "Blessing Skin": {
+      "cats": [
+        7
+      ],
+      "icon": "Blessing Skin.png",
+      "website": "https://github.com/bs-community/blessing-skin-server",
+      "implies": "Laravel",
+      "js": {
+        "blessing.version": "^(.+)$\\;version:\\1"
+      }
+    },
     "Blesta": {
       "cats": [
         6
@@ -1875,7 +1938,7 @@
       ],
       "script": "/website/JavaScript/Vertoshop\\.js",
       "icon": "ccvshop.png",
-      "website": "https://www.ccvshop.nl"
+      "website": "https://ccvshop.be"
     },
     "CentOS": {
       "cats": [
@@ -2127,6 +2190,16 @@
       },
       "icon": "cnzz.ico",
       "website": "https://web.umeng.com/"
+},
+    "CloudSuite": {
+      "cats": [
+        6
+      ],
+      "cookies": {
+        "cs_secure_session": ""
+      },
+      "icon": "CloudSuite.svg",
+      "website": "https://cloudsuite.com"
     },
     "Coaster CMS": {
       "cats": [
@@ -3183,10 +3256,13 @@
       "cats": [
         6
       ],
+      "headers": {
+        "X-epages-RequestId": ""
+      },
+      "icon": "epages.png",
       "js": {
         "epages": ""
       },
-      "icon": "epages.png",
       "website": "http://www.epages.com/"
     },
     "EPiServer": {
@@ -5275,6 +5351,15 @@
       "icon": "Ionicons.png",
       "website": "http://ionicons.com"
     },
+    "J2Store": {
+      "cats": [
+        6
+      ],
+      "html": "var j2storeURL",
+      "icon": "j2store.png",
+      "implies": "Joomla",
+      "website": "https://www.j2store.org/"
+    },
     "JAlbum": {
       "cats": [
         7
@@ -6651,17 +6736,34 @@
       "icon": "Meebo.png",
       "website": "http://www.meebo.com"
     },
-    "Melis CMS V2": {
+    "Melis Platform": {
       "cats": [
         1,
-        6
+        6,
+        11,
+        32
+      ],
+      "cpe": "cpe:/a:melisplatform:melisplatform",
+      "html": [
+        "<!-- Rendered with Melis CMS V2",
+        "<!-- Rendered with Melis Platform"
       ],
-      "html": "<!-- Rendered with Melis CMS V2",
-      "icon": "meliscmsv2.png",
       "meta": {
-        "powered-by": "^Melis CMS"
+        "powered-by": "^Melis CMS\\.",
+        "generator": "^Melis Platform\\."
       },
-      "website": "http://www.melistechnology.com/"
+      "icon": "melis-platform.svg",
+      "implies": [
+        "Apache",
+        "PHP",
+        "MySQL",
+        "Symfony",
+        "Laravel",
+        "Zend",
+        "Laminas",
+        "Lumen"
+      ],
+      "website": "https://www.melistechnology.com/"
     },
     "MemberStack": {
       "cats": [
@@ -7245,6 +7347,16 @@
       "script": "pub\\.mybloglog\\.com",
       "website": "http://www.mybloglog.com"
     },
+    "MyCashFlow": {
+      "cats": [
+        6
+      ],
+      "headers": {
+        "X-MCF-ID": ""
+      },
+      "icon": "mycashflow.png",
+      "website": "https://www.mycashflow.fi/"
+    },
     "MySQL": {
       "cats": [
         34
@@ -7344,7 +7456,7 @@
         "X-NF-Request-ID": "",
         "Server": "^Netlify"
       },
-      "url": "^https?://[^/]+\\.netlify\\.com/",
+      "url": "^https?://[^/]+\\.netlify\\.(com||app)/",
       "icon": "Netlify.svg",
       "website": "https://www.netlify.com/"
     },
@@ -7412,7 +7524,7 @@
       "headers": {
         "x-powered-by": "^Next\\.js ?([0-9.]+)?\\;version:\\1"
       },
-      "icon": "zeit.svg",
+      "icon": "vercel.svg",
       "implies": [
         "React",
         "webpack",
@@ -7472,18 +7584,18 @@
       "script": "^/nodebb\\.min\\.js\\?",
       "website": "https://nodebb.org"
     },
-    "Now": {
+    "Vercel": {
       "cats": [
         22
       ],
       "headers": {
         "server": "^now$",
         "x-now-trace": "",
-        "x-now-id": "",
-        "x-now-cache": ""
+        "x-vercel-id": "",
+        "x-vercel-cache": ""
       },
-      "icon": "zeit.svg",
-      "website": "https://zeit.co/now"
+      "icon": "vercel.svg",
+      "website": "https://vercel.com"
     },
     "OWL Carousel": {
       "cats": [
@@ -7514,6 +7626,9 @@
       "cats": [
         1
       ],
+      "meta": {
+        "generator": "OctoberCMS"
+      },
       "cookies": {
         "october_session": ""
       },
@@ -7674,6 +7789,14 @@
       "icon": "Tebex.png",
       "website": "https://www.tebex.io/"
     },
+    "T-Soft": {
+      "cats": [
+        6
+      ],
+      "html": "<a href=\"http://www.tsoft.com.tr\" target=\"_blank\" title=\"T-Soft E-ticaret Sistemleri\">",
+      "icon": "Tsoft.png",
+      "website": "https://www.tsoft.com.tr/"
+    },
     "OpenCms": {
       "cats": [
         1
@@ -8886,7 +9009,7 @@
       "script": [
         "react(?:-with-addons)?[.-]([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
-        "react.*\\.js"
+        "^react\\b.*\\.js"
       ],
       "website": "https://reactjs.org"
     },
@@ -9298,6 +9421,20 @@
       "script": "/sim(?:site|core)/js",
       "website": "http://simgroep.nl/internet/portfolio-contentbeheer_41623/"
     },
+    "SlickStack": {
+      "cats": [
+        47,
+        9
+      ],
+      "icon": "SlickStack.png",
+      "implies": [
+        "WordPress"
+      ],
+      "headers": {
+        "x-powered-by": "SlickStack"
+      },
+      "website": "https://slickstack.io"
+    },
     "SMF": {
       "cats": [
         2
@@ -10494,6 +10631,24 @@
       "script": "sweetalert2(?:\\.all)?(?:\\.min)?\\.js",
       "website": "https://sweetalert2.github.io/"
     },
+    "Swell": {
+      "cats": [
+        6
+      ],
+      "html": [
+        "<[^>]*swell\\.is",
+        "<[^>]*swell\\.store",
+        "<[^>]*schema\\.io"
+      ],
+      "cookies": {
+        "swell-session": ""
+      },
+      "js": {
+        "swell.version": "^(.+)$\\;version:\\1"
+      },
+      "icon": "Swell.svg",
+      "website": "https://www.swell.is/"
+    },
     "Swiftlet": {
       "cats": [
         18
@@ -10573,6 +10728,17 @@
       },
       "website": "https://github.com/syntaxhighlighter"
     },
+    "TagCommander": {
+      "cats": [
+        42
+      ],
+      "script": "\\.tagcommander\\.com",
+      "icon": "tagcommander.png",
+      "js": {
+        "tc_vars": ""
+      },
+      "website": "https://www.commandersact.com/en/solutions/tagcommander/"
+    },
     "TWiki": {
       "cats": [
         8
@@ -11562,7 +11728,7 @@
       "cats": [
         6
       ],
-      "cookies": {
+      "js": {
         "WHMCS": ""
       },
       "icon": "WHMCS.png",
@@ -11804,16 +11970,12 @@
         "cookie_name": "NivCMSPro"
       },
       "icon": "nivsoft.png",
-      "js": {
-        "": ""
-      },
       "headers": {
         "X-Powered-By": "NivCMS"
       },
       "meta": {
         "generator": "^NivCMS"
       },
-      "script": "",
       "website": "https://NivSoft.ir"
     },
     "Weebly": {
@@ -12055,6 +12217,19 @@
       "icon": "wpvip.svg",
       "website": "https://wpvip.com"
     },
+	"kolors4u": {
+		"cats": [
+			1,11,23,6
+		],
+		"headers": {
+			"X-Content-Encoded-By": "kolors4u ([\\d.]+)\\;version:\\1"
+		},
+		"implies": "WordPress",
+		"meta": {
+			"generator": "kolors4u (?: ([\\d.]+))?\\;version:\\1"
+		},
+		"website": "kolors4u.com"
+	},
     "Wowza Media Server": {
       "cats": [
         38
@@ -13299,7 +13474,7 @@
       "cats": [
         13
       ],
-      "html": "<!--\\s+OTRS: Copyright \\d+-\\d+, OTRS AG",
+      "html": "<!--\\s+OTRS: Copyright",
       "icon": "otrs.png",
       "implies": "Perl",
       "script": "^/otrs-web/js/",
@@ -13392,7 +13567,7 @@
       "cats": [
         1
       ],
-      "icon": "php.svg",
+      "icon": "PHP.svg",
       "implies": "PHP",
       "js": {
         "phpcms": ""
@@ -14012,6 +14187,14 @@
         "LiveStory": "",
         "LSHelpers": ""
       }
+    },
+    "RebelMouse": {
+      "cats": [
+        1
+      ],
+      "icon": "RebelMouse.svg",
+      "html": "<!-- Powered by RebelMouse.",
+      "website": "https://www.rebelmouse.com/"
     }
   },
   "categories": {
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index 1c0e6c678..e64cda9be 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -1,8 +1,13 @@
 const url = require('url');
 const fs = require('fs');
 const path = require('path');
+const LanguageDetect = require('languagedetect');
 const Wappalyzer = require('./wappalyzer');
 
+const languageDetect = new LanguageDetect();
+
+languageDetect.setLanguageType('iso2');
+
 const json = JSON.parse(fs.readFileSync(path.resolve(`${__dirname}/apps.json`)));
 
 const extensions = /^([^.]+$|\.(asp|aspx|cgi|htm|html|jsp|php)$)/;
@@ -229,12 +234,21 @@ class Driver {
     const html = processHtml(browser.html, this.options.htmlMaxCols, this.options.htmlMaxRows);
     const js = processJs(browser.js, this.wappalyzer.jsPatterns);
 
+    let language = null;
+
+    try {
+      [[language]] = languageDetect.detect(html.replace(/<\/?[^>]+(>|$)/g, ' '), 1);
+    } catch (error) {
+      this.wappalyzer.log(`${error.message || error}; url: ${pageUrl.href}`, 'driver', 'error');
+    }
+
     await this.wappalyzer.analyze(pageUrl, {
       cookies,
       headers,
       html,
       js,
       scripts,
+      language,
     });
 
     const reducedLinks = Array.prototype.reduce.call(
diff --git a/src/drivers/npm/npm-shrinkwrap.json b/src/drivers/npm/npm-shrinkwrap.json
index d4230dd48..b7d31ac7c 100644
--- a/src/drivers/npm/npm-shrinkwrap.json
+++ b/src/drivers/npm/npm-shrinkwrap.json
@@ -1,14 +1,9 @@
 {
   "name": "wappalyzer",
-  "version": "5.9.32",
+  "version": "5.9.33",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/mime-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
-      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM="
-    },
     "abab": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
@@ -40,11 +35,6 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
     },
-    "agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
-    },
     "ajv": {
       "version": "6.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
@@ -103,11 +93,6 @@
         "regenerator-runtime": "^0.11.0"
       }
     },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -121,30 +106,11 @@
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "browser-process-hrtime": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
       "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-    },
-    "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=="
-    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -158,22 +124,6 @@
         "delayed-stream": "~1.0.0"
       }
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
     "core-js": {
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
@@ -302,32 +252,6 @@
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
-    "extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
-      "requires": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
-        "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -348,14 +272,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -371,11 +287,6 @@
         "mime-types": "^2.1.12"
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -384,19 +295,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "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"
-      }
-    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -429,15 +327,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
-      "requires": {
-        "agent-base": "5",
-        "debug": "4"
-      }
-    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -446,30 +335,11 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -549,6 +419,11 @@
         "verror": "1.10.0"
       }
     },
+    "languagedetect": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/languagedetect/-/languagedetect-2.0.0.tgz",
+      "integrity": "sha512-AZb/liiQ+6ZoTj4f1J0aE6OkzhCo8fyH+tuSaPfSo8YHCWLFJrdSixhtO2TYdIkjcDQNaR4RmGaV2A5FJklDMQ=="
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -591,27 +466,6 @@
         "mime-db": "1.43.0"
       }
     },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -627,14 +481,6 @@
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -661,16 +507,6 @@
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
       "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
     },
-    "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="
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -686,21 +522,6 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
     "psl": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
@@ -711,23 +532,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "puppeteer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
-      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
-      "requires": {
-        "@types/mime-types": "^2.1.0",
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^4.0.0",
-        "mime": "^2.0.3",
-        "mime-types": "^2.1.25",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      }
-    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -738,27 +542,6 @@
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
     },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "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"
-      },
-      "dependencies": {
-        "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=="
-        }
-      }
-    },
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
@@ -814,14 +597,6 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
@@ -864,21 +639,6 @@
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
       "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
     },
-    "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==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      },
-      "dependencies": {
-        "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=="
-        }
-      }
-    },
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -922,11 +682,6 @@
         "prelude-ls": "~1.1.2"
       }
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -944,11 +699,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
     "uuid": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -1005,11 +755,6 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
     "ws": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
@@ -1023,15 +768,6 @@
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
     },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
     "zombie": {
       "version": "6.1.4",
       "resolved": "https://registry.npmjs.org/zombie/-/zombie-6.1.4.tgz",
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index 84503fd3a..330d7079d 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Identify technology on websites",
   "homepage": "https://www.wappalyzer.com",
-  "version": "5.9.32",
+  "version": "5.9.33",
   "author": "Wappalyzer",
   "license": "MIT",
   "repository": {
@@ -27,6 +27,7 @@
     "wappalyzer": "./cli.js"
   },
   "dependencies": {
+    "languagedetect": "^2.0.0",
     "zombie": "^6.1.4"
   },
   "peerDependencies": {
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 0d9c029d6..270801b1a 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -5,10 +5,10 @@
   "options":                  { "message": "选项" },
   "optionsSave":              { "message": "保存选项" },
   "optionsSaved":             { "message": "已保存" },
-  "optionUpgradeMessage":     { "message": "通知我更新详情" },
-  "optionDynamicIcon":        { "message": "使用应用程序而非 Wappalyzer 的标志" },
-  "optionTracking":           { "message": "发送匿名的应用报告到 wappalyzer.com 供研究使用" },
-  "optionThemeMode":          { "message": "启用暗模式的兼容性。" },
+  "optionUpgradeMessage":     { "message": "告诉我更新详情" },
+  "optionDynamicIcon":        { "message": "使用技术的图标代替 Wappalyzer 标识" },
+  "optionTracking":           { "message": "匿名发送检测到的技术至 wappalyzer.com" },
+  "optionThemeMode":          { "message": "启用深色模式的兼容。" },
   "nothingToDo":              { "message": "这儿啥也没有。" },
   "noAppsDetected":           { "message": "未检测到任何技术。" },
   "categoryPin":              { "message": "总是显示图标" },
@@ -19,9 +19,9 @@
   "categoryName2":            { "message": "消息板" },
   "categoryName3":            { "message": "数据库管理器" },
   "categoryName4":            { "message": "文档工具" },
-  "categoryName5":            { "message": "插件" },
+  "categoryName5":            { "message": "微件（Widgets）" },
   "categoryName6":            { "message": "电子商务" },
-  "categoryName7":            { "message": "照片相册" },
+  "categoryName7":            { "message": "图库" },
   "categoryName8":            { "message": "维基" },
   "categoryName9":            { "message": "主机面板" },
   "categoryName10":           { "message": "分析" },
@@ -50,7 +50,7 @@
   "categoryName33":           { "message": "Web 服务器扩展" },
   "categoryName34":           { "message": "数据库" },
   "categoryName35":           { "message": "地图" },
-  "categoryName36":           { "message": "广告网络" },
+  "categoryName36":           { "message": "广告" },
   "categoryName37":           { "message": "网络服务" },
   "categoryName38":           { "message": "媒体服务器" },
   "categoryName39":           { "message": "网络摄像头" },
@@ -64,8 +64,8 @@
   "categoryName47":           { "message": "开发工具" },
   "categoryName48":           { "message": "网络存储" },
   "categoryName49":           { "message": "信息流（Feed）阅读器" },
-  "categoryName50":           { "message": "文档管理系统" },
-  "categoryName51":           { "message": "着陆页构建器" },
+  "categoryName50":           { "message": "文档管理系统（DMS）" },
+  "categoryName51":           { "message": "网页构建" },
   "categoryName52":           { "message": "在线聊天" },
   "categoryName53":           { "message": "客户关系管理（CRM）" },
   "categoryName54":           { "message": "搜索引擎优化（SEO）" },
@@ -80,5 +80,5 @@
 	"categoryName63":           { "message": "基础设施即服务（IaaS）" },
 	"categoryName64":           { "message": "反向代理" },
 	"categoryName65":           { "message": "负载均衡" },
-	"categoryName66":           { "message": "UI Frameworks" }
+	"categoryName66":           { "message": "用户界面（UI）框架" }
 }
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 89541a146..5059c4837 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -3,7 +3,7 @@
  */
 
 /* eslint-env browser */
-/* global browser, chrome, fetch, Wappalyzer */
+/* global browser, chrome, Wappalyzer */
 
 /** global: browser */
 /** global: chrome */
@@ -24,10 +24,6 @@ browser.tabs.onRemoved.addListener((tabId) => {
 function userAgent() {
   const url = chrome.extension.getURL('/');
 
-  if (url.match(/^chrome-/)) {
-    return 'chrome';
-  }
-
   if (url.match(/^moz-/)) {
     return 'firefox';
   }
@@ -35,6 +31,8 @@ function userAgent() {
   if (url.match(/^ms-browser-/)) {
     return 'edge';
   }
+
+  return 'chrome';
 }
 
 /**
@@ -162,7 +160,20 @@ browser.runtime.onConnect.addListener((port) => {
 
         break;
       case 'analyze':
-        wappalyzer.analyze(url, message.subject, { tab: port.sender.tab });
+        if (message.subject.html) {
+          browser.i18n.detectLanguage(message.subject.html)
+            .then(({ languages }) => {
+              const language = languages
+                .filter(({ percentage }) => percentage >= 75)
+                .map(({ language: lang }) => lang)[0];
+
+              message.subject.language = language;
+
+              wappalyzer.analyze(url, message.subject, { tab: port.sender.tab });
+            });
+        } else {
+          wappalyzer.analyze(url, message.subject, { tab: port.sender.tab });
+        }
 
         await setOption('hostnameCache', wappalyzer.hostnameCache);
 
@@ -219,7 +230,7 @@ wappalyzer.driver.document = document;
 wappalyzer.driver.log = (message, source, type) => {
   const log = ['warn', 'error'].indexOf(type) !== -1 ? type : 'log';
 
-  console.log(`[wappalyzer ${type}]`, `[${source}]`, message); // eslint-disable-line no-console
+  console[log](`[wappalyzer ${type}]`, `[${source}]`, message); // eslint-disable-line no-console
 };
 
 /**
diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js
index 3e9a6658f..45fbd71e3 100644
--- a/src/drivers/webextension/js/inject.js
+++ b/src/drivers/webextension/js/inject.js
@@ -1,4 +1,5 @@
 /* eslint-env browser */
+/* eslint-disable no-restricted-globals, no-prototype-builtins */
 
 (() => {
   try {
@@ -7,7 +8,7 @@
 
       let value = properties.length ? window : null;
 
-      for (let i = 0; i < properties.length; i++) {
+      for (let i = 0; i < properties.length; i += 1) {
         const property = properties[i];
 
         if (value && value.hasOwnProperty(property)) {
diff --git a/src/icons/Alpine.js.png b/src/icons/Alpine.js.png
new file mode 100644
index 000000000..a8f7db91f
Binary files /dev/null and b/src/icons/Alpine.js.png differ
diff --git a/src/icons/AppDynamics.png b/src/icons/AppDynamics.png
new file mode 100644
index 000000000..1470b96fd
Binary files /dev/null and b/src/icons/AppDynamics.png differ
diff --git a/src/icons/Atlassian Statuspage.svg b/src/icons/Atlassian Statuspage.svg
new file mode 100644
index 000000000..b651642d7
--- /dev/null
+++ b/src/icons/Atlassian Statuspage.svg	
@@ -0,0 +1 @@
+<svg height="256" preserveAspectRatio="xMidYMid" viewBox="0 0 256 256" width="256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" x1="50%" x2="50%" y1="82.799084%" y2="-5.781339%"><stop offset="0" stop-color="#2684ff"/><stop offset=".82" stop-color="#0052cc"/></linearGradient><circle cx="128" cy="128.433426" fill="url(#a)" r="59.86478"/><path d="m1.61622537 59.2547248 32.18351583 38.1192816c1.1895886 1.3988403 2.8901894 2.2625519 4.7214565 2.3979625s3.6404097-.4687778 5.0228063-1.6774361c52.1180816-46.7312884 116.656667-46.7312884 168.911992 0 1.382397 1.2086583 3.191539 1.8128467 5.022806 1.6774361s3.531868-.9991222 4.721457-2.3979625l32.183516-38.1192816c2.432063-2.8842722 2.079561-7.1909293-.789148-9.6413304-75.483726-66.1511925-175.5682846-66.1511925-251.18925358 0-2.86870915 2.4504011-3.22121134 6.7570582-.78914805 9.6413304z" fill="#2684ff"/></svg>
\ No newline at end of file
diff --git a/src/icons/Blessing Skin.png b/src/icons/Blessing Skin.png
new file mode 100644
index 000000000..f7e0c6eee
Binary files /dev/null and b/src/icons/Blessing Skin.png differ
diff --git a/src/icons/CloudSuite.svg b/src/icons/CloudSuite.svg
new file mode 100644
index 000000000..44b0b02d4
--- /dev/null
+++ b/src/icons/CloudSuite.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 54 (76480) - https://sketchapp.com -->
+    <title>cloudsuite-logo-rgb</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cloudsuite-logo-rgb" fill-rule="nonzero">
+            <path d="M4.27670588,47.872 C3.18994599,45.9890002 3.19030688,43.6692571 4.27765261,41.7865955 C5.36499834,39.9039339 7.37413522,38.7443749 9.54824084,38.7447132 C11.7223465,38.7450514 13.7311225,39.9052355 14.8178824,41.7882353 L14.8178824,41.7882353 C11.2964048,35.6764875 11.2975328,28.1515921 14.8208425,22.0409003 C18.3441522,15.9302086 24.8559913,12.1592664 31.9096471,12.1449412 C35.1801978,12.0297588 37.7720219,9.34504899 37.7720219,6.07247059 C37.7720219,2.79989219 35.1801978,0.11518237 31.9096471,0 C20.5093578,0.00368496033 9.97660662,6.08769863 4.27738533,15.9611725 C-1.42183596,25.8346463 -1.42209495,37.9982835 4.27670588,47.872 L4.27670588,47.872 L4.27670588,47.872 Z" id="Path" fill="#EF7733"></path>
+            <path d="M54.4752941,9.344 C48.5029642,3.34097068 40.3774996,-0.0236277621 31.9096471,-0.000123607777 C35.1801978,0.11518237 37.7720219,2.79989219 37.7720219,6.07247059 C37.7720219,9.34504899 35.1801978,12.0297588 31.9096471,12.1449412 C38.9686839,12.1485326 45.4903642,15.9152337 49.0210148,22.0278862 C52.5516655,28.1405386 52.5556729,35.671829 49.0315294,41.7882353 C47.9447695,43.6712351 47.9451303,45.9909782 49.0324761,47.8736398 C50.1198218,49.7563014 52.1289587,50.9158604 54.3030644,50.9155222 C56.47717,50.915184 58.485946,49.7549998 59.5727059,47.872 C66.7925726,35.3602506 64.7113287,19.5594716 54.4978824,9.344 L54.4752941,9.344 Z" id="Path" fill="#36AF84"></path>
+            <path d="M54.2870588,50.9063529 C52.1135609,50.9101428 50.103566,49.7526938 49.0158496,47.8709445 C47.9281333,45.9891951 47.92837,43.6697625 49.0164706,41.7882353 L49.0164706,41.7882353 C45.4871942,47.9084809 38.9595156,51.6795049 31.8945882,51.6795049 C24.8296609,51.6795049 18.3019823,47.9084809 14.7727059,41.7882353 C13.685946,39.9052355 11.67717,38.7450514 9.50306437,38.7447132 C7.32895875,38.7443749 5.31982186,39.9039339 4.23247614,41.7865955 C3.14513041,43.6692571 3.14476952,45.9890002 4.23152941,47.872 C9.93412812,57.7429349 20.4684551,63.8230047 31.8682353,63.8230047 C43.2680155,63.8230047 53.8023425,57.7429349 59.5049412,47.872 C58.4276454,49.7380277 56.4416922,50.8929182 54.2870588,50.9063529 Z" id="Path" fill="#213360"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/RebelMouse.svg b/src/icons/RebelMouse.svg
new file mode 100644
index 000000000..980595369
--- /dev/null
+++ b/src/icons/RebelMouse.svg
@@ -0,0 +1,12 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="64" height="64" fill="white"/>
+<path d="M34.9085 56.5666C41.7526 56.5666 47.3009 56.1007 47.3009 55.5261C47.3009 54.9514 41.7526 54.4856 34.9085 54.4856C28.0643 54.4856 22.516 54.9514 22.516 55.5261C22.516 56.1007 28.0643 56.5666 34.9085 56.5666Z" fill="#212121"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.8752 28.0291C16.8752 28.0291 16.47 28.0337 15.9045 28.311C15.339 28.5883 14.9742 28.8652 14.4485 28.9721C13.9227 29.079 12.4819 29.1379 12.1512 29.1455C11.7758 29.1542 11.3278 29.599 11.9247 30.1643C12.5216 30.7297 13.8763 31.7894 14.8044 32.061C15.7324 32.3326 16.9851 32.1359 17.4685 31.9852C17.9519 31.8344 18.3744 31.4649 18.3744 31.4649C18.3744 31.4649 18.3469 33.5719 18.698 34.6405C19.0128 35.5983 20.3417 37.2693 20.7041 37.5235C21.1401 37.8291 21.5172 37.6915 21.5454 37.1117C21.5656 36.6945 21.6554 35.7038 21.6856 35.3342C21.7029 35.1215 21.9768 34.3262 21.9768 34.3262C22.4063 34.6292 22.8569 34.9008 23.325 35.1391C24.0946 35.5181 25.0938 35.9216 25.0938 35.9216C24.148 36.6963 23.3762 37.6633 22.8288 38.7591C22.1901 40.064 21.6212 41.2757 21.664 43.0728C21.7259 45.674 22.6562 46.942 22.6562 46.942C22.6562 46.942 21.0143 47.2371 20.1001 46.2159C19.1091 45.109 19.3624 42.1395 19.4206 40.9159C19.4803 39.6652 19.5177 37.6542 19.1617 36.754C18.7871 35.8073 17.6873 34.7319 16.1655 34.7592C14.3877 34.7912 13.5482 35.938 13.3001 36.2229C13.0019 36.5651 13.3494 36.7052 13.5966 36.5806C13.975 36.3899 14.7378 36.0108 15.1951 35.9864C15.6698 35.961 16.6201 35.9872 17.0264 36.9814C17.4924 38.1218 17.1865 40.843 17.1019 42.2271C17.0443 43.1684 16.9057 44.3499 17.1385 45.7269C17.3313 46.8669 18.1047 47.8977 18.4825 48.2315C19.3312 48.9814 19.9855 49.1745 20.9092 49.4021C21.7872 49.6183 22.9562 49.6723 23.7673 49.543C24.3144 49.4526 24.8548 49.3258 25.3852 49.1636C25.3852 49.1636 25.2876 51.118 25.3634 52.3395C25.4494 53.7242 25.5982 54.5475 26.3017 55.0708C27.0109 55.5982 27.9672 55.6183 29.0197 55.6183C30.8256 55.6183 31.9133 55.6391 32.3668 55.2146C32.8791 54.738 33.1658 53.3325 33.2799 52.8055C33.3994 52.2541 33.528 51.5483 33.528 51.5483C33.528 51.5483 33.7006 51.5618 33.8839 51.5646C34.0673 51.5673 34.2614 51.5592 34.2614 51.5592C34.5247 52.2955 34.7331 53.0505 34.8847 53.818C35.0371 54.6489 35.2935 55.2356 36.1595 55.591C36.8093 55.751 37.855 55.7211 39.0392 55.6996C40.6254 55.6704 41.4192 55.1577 41.7464 54.7131C42.1202 54.2052 42.2437 53.3463 42.2533 52.7622C42.2647 52.0669 42.186 51.2145 42.1994 50.6487C42.214 50.031 42.3391 48.9809 42.3612 48.7086C42.3832 48.4364 42.4582 47.8741 42.4582 47.8741C42.4582 47.8741 43.4308 46.477 43.6878 45.1429C43.8765 44.1629 44.0152 43.0914 44.0221 42.5525C44.0291 42.0136 43.9891 40.8102 43.9898 40.6558C44.659 39.7536 46.5317 37.504 47.0671 36.8728C47.859 35.9393 49.6191 33.8415 49.6198 33.845C49.6221 33.8574 50.4082 33.7592 50.9205 33.5427C51.5142 33.292 51.9467 32.8092 52.2102 32.2669C52.4672 31.7381 52.6838 31.0444 52.5834 30.3919C52.3547 28.905 51.5273 28.6255 50.9893 28.338C51.0109 28.1863 51.3918 27.3804 51.3345 26.4983C51.2634 25.4047 50.1478 24.7208 49.5117 24.6801C48.7999 24.6346 48.444 24.7451 48.444 24.7451C48.444 24.7451 48.4116 24.3875 48.4008 24.1924C52.163 24.037 54.1945 22.9893 56.1663 20.7892C56.9882 19.8723 58.0125 18.2301 57.9999 14.9799C57.9889 12.1624 55.5932 8.41607 53.8996 6.92916C52.0639 5.31694 50.1031 4.02662 47.2039 4.0006C44.3273 3.97459 42.489 4.78909 40.7219 6.24414C38.8607 7.77669 37.8745 10.4386 37.8745 10.4386C37.8745 10.4386 36.0473 9.68604 33.0412 9.84647C30.1372 10.0016 27.9365 10.5167 26.3621 11.1069C25.0549 11.597 23.7994 12.3895 23.7994 12.3895C23.7994 12.3895 23.3388 11.0004 22.3572 10.0428C21.17 8.88454 20.1385 8.06536 18.6872 7.54473C16.9743 6.93027 14.7192 7.19357 12.9062 7.75068C10.8278 8.38915 10.0534 9.09368 9.15283 9.92918C8.34127 10.6821 7.02178 12.2399 6.17605 14.2645C5.41969 16.0751 4.98352 17.8833 5.00048 19.4994C5.01775 21.1486 5.85184 24.0418 7.4703 25.5797C9.08876 27.1176 11.813 27.8984 13.1111 28.0075C14.9151 28.159 16.3877 27.6286 16.6487 27.5414C16.7123 27.7093 16.788 27.8723 16.8752 28.0291Z" fill="#212121"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.9474 13.0073C22.9474 13.0073 22.5302 11.7539 21.7718 10.9263C21.2852 10.3953 19.4202 8.53489 17.4576 8.28179C15.3687 8.01238 12.9414 8.53131 11.1913 9.60405C9.30889 10.7578 8.03114 12.8664 7.50264 13.8201C6.98429 14.7556 5.95322 17.6581 6.02505 19.5428C6.08976 21.2345 6.90605 23.8842 8.43637 25.1013C10.0307 26.3694 12.0296 26.9811 13.5394 27.0429C14.9911 27.1024 16.4774 26.5812 16.5421 26.5443C16.5591 26.4185 16.6311 25.9547 16.7046 25.6599C16.7708 25.4344 16.8566 25.2152 16.9612 25.0049C16.9612 25.0049 16.8748 24.333 16.8748 24.0512C16.8748 23.7694 16.8641 23.3034 16.8641 23.3034C16.8641 23.3034 15.2863 23 14.2756 22.1328C13.5104 21.476 12.7836 19.9345 13.1108 18.3719C13.3243 17.3532 14.0184 15.4961 15.4081 14.6219C16.7347 13.7873 18.0872 13.8634 19.2045 14.2425C19.8554 14.4636 20.5851 15.1854 20.5851 15.1854C20.5851 15.1854 21.2969 14.3705 21.8366 13.896C22.4405 13.3649 22.9474 13.0073 22.9474 13.0073ZM38.9314 10.7637C38.9314 10.7637 39.9222 11.1787 40.6355 11.5224C41.4229 11.9017 42.372 12.5954 42.372 12.5954C42.372 12.5954 42.9936 11.7441 43.5799 11.3599C44.2744 10.9046 45.837 10.3397 47.2901 11.0022C48.6216 11.6092 50.2442 13.2605 50.7896 14.7856C51.3182 16.2634 50.9279 17.7269 50.172 18.4431C49.2409 19.325 47.6569 19.8571 47.6569 19.8571C47.6569 19.8571 48.3125 20.62 48.5952 21.5154C48.7725 22.0601 48.8385 22.6352 48.7894 23.2062C48.7894 23.2062 50.8831 23.0704 51.8848 22.6534C53.1747 22.1164 55.0954 20.7328 55.8539 19.5211C56.7002 18.169 57.2236 16.1214 56.9 14.0586C56.5873 12.0643 54.9058 9.26375 53.2976 7.82659C51.5504 6.26502 49.8893 4.77909 46.5028 4.98693C43.3166 5.18247 42.1172 6.3707 41.3485 6.99928C39.6801 8.36341 38.9314 10.7637 38.9314 10.7637ZM18.7519 28.9071C18.7545 29.0469 19.1981 30.0251 19.9087 30.9968C20.4499 31.7351 21.0959 32.3897 21.826 32.9397C23.097 33.8857 25.4062 35.2579 28.7179 35.7027C32.2134 36.1722 35.2 35.681 35.448 35.616C35.1287 35.5661 34.3858 35.4859 33.5082 35.4411C32.6398 35.3966 31.3172 35.3342 31.0368 35.3342C31.2956 35.2042 32.1904 34.6908 33.787 34.7164C35.1352 34.7381 36.0627 35.215 36.2785 35.4643C36.8177 35.3667 39.3862 34.7218 40.4633 34.1745C41.5522 33.621 42.7821 32.5162 43.0301 32.1586C42.9978 31.9527 42.7227 31.1603 42.8576 30.5112C42.986 29.8934 43.5323 29.1367 44.2812 28.7445C44.6415 28.5555 45.0213 28.4065 45.4137 28.3001C45.7088 27.6469 46.0598 27.0207 46.4628 26.4286C46.7459 26.0177 47.0577 25.6276 47.3959 25.2611C47.3959 25.2611 47.3799 24.823 47.348 24.4081C47.3133 23.9555 47.2894 23.6874 47.2492 23.6158C46.7485 22.7241 45.3645 21.1014 44.1688 20.3188C43.6527 19.9807 41.7486 18.9482 39.4205 18.6299C37.0275 18.3029 34.2011 18.6399 33.3878 18.7191C31.7829 18.8752 29.3072 19.1583 26.4585 20.5151C24.7368 21.3278 23.1118 22.3331 21.6143 23.5118C19.2077 25.3229 18.7296 27.7073 18.7519 28.9071ZM26.3772 36.2663C26.2753 36.2766 25.1895 36.9209 24.2352 38.3993C23.6506 39.305 22.7533 41.1544 22.7102 42.7151C22.6671 44.2758 23.0866 45.5179 23.3674 46.0606C23.7262 46.7546 24.3824 47.0916 24.5221 47.1913C24.5221 47.1913 23.7297 45.8322 23.7779 43.5496C23.8282 41.1785 24.7486 39.4636 24.9859 39.0842C24.781 39.702 24.382 42.054 24.5761 43.7664C24.7599 45.3888 25.3825 46.809 25.8294 47.4999C26.2422 48.1418 26.7106 48.7458 27.2293 49.3048C27.2293 49.3048 27.0314 49.2876 26.8719 49.2587C26.7027 49.228 26.442 49.1726 26.442 49.1726C26.4317 49.302 26.3229 51.3186 26.3601 52.1688C26.4004 53.0902 26.5187 53.7751 26.7332 54.0736C27.1065 54.5933 28.2814 54.862 29.1459 54.9006C30.1662 54.9461 31.2593 54.7323 31.6405 54.4205C31.9421 54.1738 32.185 52.8721 32.2861 52.4566C32.3801 52.0701 32.4641 51.3621 32.4667 51.3552C32.4667 51.3552 31.3925 50.9845 30.8963 50.8003C30.4398 50.6309 29.6559 50.3236 29.505 50.2586C30.4218 50.4428 33.0498 50.7528 33.9184 50.7788C34.8114 50.8054 36.6385 50.6704 37.3611 50.5187C37.2641 50.5837 36.6348 50.8264 36.0781 51.065C35.6992 51.2275 35.2472 51.3901 35.2472 51.3901C35.2472 51.3901 35.437 52.1575 35.5707 52.7817C35.6856 53.3178 35.8063 54.2177 36.1661 54.5506C36.5457 54.9017 37.5907 55.196 38.733 55.1466C39.8375 55.099 40.7758 54.4768 41.0562 53.8482C41.3366 53.2197 41.1727 51.919 41.1727 51.247C41.1727 50.5751 41.1533 49.2864 41.1533 49.2864C41.1533 49.2864 40.2991 49.6083 39.6261 49.7123C39.9885 49.5042 40.9843 48.5151 41.6969 47.3062C42.3611 46.1793 42.7582 44.9782 42.8876 44.0027C43.017 43.0273 43.0041 41.5186 43.0041 41.5186C43.0041 41.5186 42.4072 41.535 42.3699 41.4796C42.3404 41.4357 42.7409 40.6124 43.3535 39.8278C43.8902 39.1403 45.73 36.9424 46.3907 36.1774C47.0967 35.36 48.6815 33.4158 48.6815 33.4158C48.5147 33.3576 48.3587 33.2719 48.2198 33.1622C48.0539 33.0352 47.8981 32.8953 47.7539 32.7438C47.7539 32.7438 48.9938 33.0007 49.6457 32.8973C50.3347 32.788 50.8136 32.5803 51.1155 32.1468C51.4175 31.7134 51.6484 30.9327 51.5398 30.2047C51.4344 29.499 50.5221 29.0975 50.0838 29.0101C49.8547 28.9645 49.67 28.8517 49.7534 28.6282C49.9905 27.9931 50.4076 27.2731 50.3049 26.4738C50.2512 26.0565 49.7386 25.4388 48.8758 25.6123C48.013 25.7857 47.7434 26.2575 47.3069 26.8536C46.8974 27.4124 46.5138 28.376 46.5138 28.376C46.5125 28.3713 47.3781 28.3625 47.8823 29.0041C48.3799 29.6372 48.4373 30.7799 47.9998 31.3944C47.4864 32.1154 46.0932 31.9743 46.0932 31.9743C46.0932 31.9743 47.1494 31.5985 47.3874 30.9338C47.6948 30.0755 47.4872 28.9258 45.5323 29.2431C44.3491 29.4351 43.794 30.3257 43.7743 30.923C43.7582 31.4112 44.0738 32.1537 44.0224 32.3754C43.9883 32.5218 43.3696 33.2587 42.7191 33.8277C41.9256 34.5218 41.0347 34.9965 40.3784 35.3621C40.2322 35.4435 39.7851 35.7485 39.6969 35.6092C39.2108 35.7978 38.5568 36.0143 37.842 36.2108C36.4091 36.6046 34.5859 36.8501 33.2693 36.9056C28.6126 37.1022 26.3772 36.2663 26.3772 36.2663ZM34.2484 37.8149C32.2963 37.9649 30.4214 38.6814 29.2673 40.5972C28.3557 42.1103 28.2695 42.9003 28.2625 43.7255C28.2561 44.4455 28.4761 46.0467 29.6399 47.1816C30.7554 48.2692 32.9035 48.5705 33.8527 48.643C35.2445 48.7492 36.5965 48.4843 37.8376 47.663C39.1672 46.7829 40.0679 44.7223 40.0382 43.0793C40.007 41.3475 39.539 40.0281 38.2361 39.0104C36.9827 38.0317 35.2272 37.7397 34.2484 37.8149Z" fill="#97C5EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.3936 32.0826C19.3936 32.0826 19.9113 32.7654 20.2349 33.0256C20.5584 33.2857 21.1139 33.7788 21.1139 33.7788C21.1139 33.7788 20.8242 34.3729 20.7526 34.7326C20.6555 35.2203 20.6717 35.9194 20.6232 35.9357C20.5746 35.9519 19.879 34.9277 19.6201 34.1473C19.3613 33.367 19.3936 32.0826 19.3936 32.0826ZM17.695 29.1075C17.695 29.1075 17.9376 29.6115 18.0024 29.7578C18.0671 29.9041 18.1696 30.2184 18.2019 30.2997C18.2419 30.4002 17.3571 30.9349 16.9209 31.0972C16.3825 31.2977 15.3131 31.192 14.763 30.9482C14.213 30.7044 13.3759 30.093 13.3962 30.0839C13.4779 30.0469 14.4228 29.9509 14.7838 29.8744C15.3825 29.7475 16.2164 29.1125 16.5995 28.9983C17.0902 28.852 17.695 29.1075 17.695 29.1075ZM17.9085 27.6671C17.9085 27.6671 17.9021 25.8625 19.3646 24.1978C20.8271 22.533 22.2417 21.5268 23.4059 20.865C24.6354 20.1659 27.3372 18.849 29.7315 18.2638C31.9738 17.7157 37.3838 17.207 40.1503 17.7273C42.7077 18.2082 44.3307 19.0141 45.3946 19.9639C46.3468 20.8139 47.7706 22.6037 47.7702 22.6045C47.7698 22.6053 47.9153 22.1072 47.5221 21.2552C47.2115 20.5825 46.669 19.951 45.852 19.1987C45.2483 18.6426 44.2757 17.9549 44.2757 17.9549C44.2757 17.9549 44.7449 18.1175 44.9552 18.1825C45.1655 18.2475 45.667 18.5402 45.667 18.5402C45.1123 17.3987 44.4145 16.3334 43.5907 15.3699C42.7029 14.3252 41.792 13.1868 40.0722 12.4009C37.8996 11.4081 35.9592 10.7687 32.9672 10.9479C30.0719 11.1212 27.6445 11.647 25.8164 12.5249C23.9883 13.4028 22.2572 14.8172 21.4321 15.8577C20.6854 16.7993 20.0094 17.9188 19.6876 18.6349C18.8903 20.4093 18.7465 21.3202 18.698 21.5966C18.9083 21.5478 19.2481 21.4828 19.2481 21.4828C19.2481 21.4828 18.8121 21.99 18.4599 22.4285C17.9444 23.0709 17.8604 23.4731 17.9376 23.9051C18.0509 23.8401 18.5754 23.3455 18.7952 23.1248C19.0701 22.8484 19.7172 22.3444 19.7172 22.3444C19.7172 22.3444 18.973 23.3686 18.601 23.9702C18.229 24.5717 17.7748 25.7933 17.6788 26.36C17.5997 26.8093 17.6811 27.2722 17.9085 27.6671Z" fill="#FD4239"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.167 15.766C20.167 15.766 17.8994 18.969 17.469 21.9828C17.3803 22.2502 17.2355 22.5482 17.16 22.559C17.0845 22.5698 15.5918 22.1347 14.8518 21.6092C14.2739 21.1988 13.6611 19.8788 13.8121 18.6541C13.9382 17.6318 14.8379 15.7274 15.904 15.2026C16.727 14.7974 17.6517 14.5789 18.5577 14.839C19.4637 15.0991 20.167 15.766 20.167 15.766ZM42.982 13.0956C42.9881 13.1268 43.4455 13.5898 44.0359 14.2857C44.4711 14.7982 44.9577 15.4382 45.3381 15.9773C45.7621 16.5718 46.1543 17.1887 46.5127 17.8253C46.9778 18.6772 47.1608 19.2288 47.1932 19.2397C47.2256 19.2506 49.1456 18.4318 49.4754 18.0762C50.0532 17.4531 50.5798 16.5517 50.1052 15.1861C49.6306 13.8205 48.0544 12.0777 47.0126 11.7163C46.0807 11.3931 45.0259 11.5491 44.4919 11.7845C43.7992 12.0893 42.9711 13.0414 42.9819 13.0956H42.982ZM34.2937 38.5532C32.5312 38.604 31.2631 39.3553 30.5297 40.1573C29.7963 40.9593 28.9623 42.4001 28.9766 43.7556C28.9943 45.4363 29.9043 46.7051 30.8042 47.1859C31.5199 47.5683 32.9502 47.9687 34.2026 47.9844C35.6409 48.0025 36.8125 47.6118 37.7536 46.8433C38.509 46.2265 39.2909 45.0989 39.3455 43.1091C39.387 41.593 38.7372 40.3843 38.1324 39.8107C37.2123 38.9379 35.5961 38.5157 34.2937 38.5532ZM23.5298 47.7983C23.5298 47.7983 23.8318 48.0042 24.0367 48.1126C24.2417 48.221 24.5544 48.4161 24.5544 48.4161C24.5544 48.4161 23.519 48.7846 22.7317 48.7737C22.0515 48.7644 19.8972 48.7395 18.7734 47.278C17.6356 45.7986 17.8567 43.7339 17.8459 43.1704C17.835 42.6068 18.0508 38.6941 17.9645 38.1956C17.8783 37.6971 17.7704 36.6773 17.1448 36.1146C16.2173 35.28 14.8044 35.6377 14.7936 35.6269C14.7829 35.6161 15.4176 35.1502 16.7458 35.3613C17.7993 35.5288 18.3265 36.5783 18.5146 37.1226C18.7843 37.9029 18.644 39.8646 18.6225 40.5474C18.6009 41.2303 18.4639 44.0152 18.5361 44.4818C18.6758 45.384 19.01 46.3227 19.7558 46.9871C20.3504 47.5168 21.191 47.8091 22.2464 47.82C23.0768 47.8285 23.5298 47.7983 23.5298 47.7983ZM32.3394 14.2841C32.3394 14.2841 32.504 13.7676 32.5946 13.4944C32.6852 13.2213 32.8634 13.1867 33.0575 13.4858C33.2517 13.785 33.434 14.154 33.434 14.154C33.434 14.154 34.0016 14.1633 34.2734 14.2023C34.5452 14.2414 34.6432 14.3751 34.4491 14.5962C34.2739 14.7775 34.0894 14.9493 33.8962 15.1109C33.8962 15.1109 34.0996 15.7389 34.1255 15.947C34.1514 16.1551 34.0368 16.3025 33.8167 16.1984C33.5967 16.0944 33.0225 15.9123 33.0225 15.9123C33.0225 15.9123 32.4207 16.2975 32.2789 16.3889C32.1064 16.5 31.9625 16.4398 31.9754 16.1796C31.9884 15.9195 32.058 15.3843 32.058 15.3843C32.058 15.3843 31.6691 15.0715 31.4361 14.8895C31.2031 14.7074 31.2352 14.5434 31.5066 14.4638C31.7541 14.391 32.3394 14.2841 32.3394 14.2841Z" fill="#F6EBD0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.463 34.1744C41.552 33.6209 42.7819 32.5162 43.0299 32.1585L40.463 34.1744ZM30.7345 30.7603C30.5689 31.0996 30.5088 31.481 30.562 31.8551C30.6508 32.4004 31.1379 33.3074 32.5832 33.4808C34.0284 33.6542 35.8059 33.3052 36.7097 32.7112C37.6112 32.1186 37.7226 31.3546 37.6157 30.7062C37.533 30.205 37.2598 29.98 37.2598 29.98C37.2598 29.98 39.021 29.8239 40.0639 29.1671C41.1481 28.4843 41.6412 26.9187 41.4198 25.0486C41.2158 23.3253 40.4887 21.4291 39.359 20.6796C38.5821 20.164 37.2971 20.0272 36.4165 20.2695C35.5038 20.5207 34.9058 20.6997 34.5283 20.8081C34.1862 20.9063 33.6466 21.0845 33.4524 21.1468C33.2154 20.983 32.9459 20.8728 32.6624 20.8238C32.1731 20.7262 31.0956 20.7803 30.411 20.7913C29.8069 20.801 28.9465 20.5523 27.8009 20.8021C26.6451 21.0542 25.9782 22.2631 25.5791 23.1085C25.222 23.865 24.7303 25.6547 25.2016 27.4655C25.5761 28.905 26.2499 29.6837 26.6463 29.9607C27.2484 30.3926 27.9514 30.6611 28.687 30.74C29.3672 30.8137 30.053 30.8205 30.7346 30.7603H30.7345Z" fill="#212121"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.0513 21.625C33.4531 22.1069 33.7169 23.8698 33.7801 25.042C33.8417 26.1852 33.9682 28.11 33.5578 28.7021C33.2482 29.1488 32.9677 29.2299 32.5159 29.3802C32.2147 29.4804 31.7934 29.6582 31.5303 29.7663C31.3022 29.8248 29.8822 30.1664 28.7844 30.0104C27.6867 29.8544 26.9419 29.4126 26.4649 28.5913C25.9135 27.6446 25.6682 26.5491 25.7627 25.4562C25.8716 24.094 26.3888 22.6509 27.3109 21.8721C28.0724 21.229 28.5317 21.4027 29.1917 21.4279C29.931 21.4561 30.9478 21.485 31.5431 21.4734C32.0957 21.4634 32.8037 21.3281 33.0513 21.625ZM33.8149 21.7051C33.802 21.7701 34.0641 22.2033 34.1868 23.4945C34.3055 24.7431 34.291 25.957 34.3126 27.1708C34.3255 27.8865 34.2729 28.925 34.3385 28.9779C34.4463 29.0646 35.0453 29.0717 35.4482 29.1046C35.8628 29.1384 36.1933 29.2632 36.5495 29.2679C36.9193 29.2727 38.1334 29.1118 38.812 28.908C39.421 28.7249 40.8375 28.4963 40.7378 25.5598C40.6529 23.0509 39.5655 21.3849 38.5193 21.0267C37.2532 20.5929 36.0309 21.1389 35.5129 21.2564C35.1487 21.339 33.8279 21.64 33.8149 21.7051Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.2399 22.2493C36.6756 22.3531 36.3799 23.1828 36.541 24.2718C36.7021 25.3608 37.5087 25.4126 37.8853 25.3866C38.2619 25.3607 38.9336 24.6866 38.7184 23.5198C38.5032 22.3531 37.8043 22.1456 37.2399 22.2493ZM31.2881 25.9951C32.1547 25.9951 32.5996 25.0947 32.5996 23.9527C32.5996 22.8107 31.8033 22.4593 31.2881 22.4375C30.7729 22.4157 29.9999 23.0084 30.0233 24.3481C30.0468 25.6878 30.5152 25.9952 31.2881 25.9952V25.9951Z" fill="#212121"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.3292 29.8067C35.3292 29.8067 34.3261 29.6007 33.3663 29.85C32.5121 30.0718 32.1151 30.4461 31.9533 30.6954C31.7915 30.9446 31.9641 31.1723 32.4063 30.8797C32.8036 30.6167 33.0635 30.3248 33.4741 30.1643C34.2506 29.8608 35.3292 29.8067 35.3292 29.8067ZM31.0122 22.2446C31.2859 22.2562 31.5651 22.6165 31.5523 22.9958C31.5395 23.3751 31.2925 23.6507 31.019 23.6351C30.7455 23.6195 30.5142 23.3316 30.5272 22.9523C30.5401 22.5731 30.7385 22.233 31.0121 22.2446H31.0122ZM37.2706 21.9281C37.5277 21.9281 37.7361 22.2026 37.7361 22.5411C37.7361 22.8796 37.5276 23.1541 37.2706 23.1541C37.0135 23.1541 36.8051 22.8796 36.8051 22.5411C36.8051 22.2025 37.0135 21.9281 37.2706 21.9281Z" fill="white"/>
+</svg>
diff --git a/src/icons/SlickStack.png b/src/icons/SlickStack.png
new file mode 100644
index 000000000..24b48486f
Binary files /dev/null and b/src/icons/SlickStack.png differ
diff --git a/src/icons/Swell.svg b/src/icons/Swell.svg
new file mode 100644
index 000000000..ae3cfb497
--- /dev/null
+++ b/src/icons/Swell.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Primary_Art" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 240 280" style="enable-background:new 0 0 240 280;" xml:space="preserve">
+	<style type="text/css">
+		.st0{fill:#550088;}
+	</style>
+	<path class="st0" d="M146.4,18.7c45.3,0,69.4,21,69.4,36.2c0,1.1-0.4,1.7-0.7,2l-0.3,0.3l-0.3,0.3l-29.9,30.1l-19.9,20l26.1,10.5
+    c22.1,8.9,30.7,20.8,30.7,42.4c0,9.3-3.6,17.6-10.8,24.7l-54.4,54.6l-0.2,0.2l-0.2,0.2c-12.7,13.5-36.1,21.2-64,21.2
+    c-47.2,0-73.3-20.4-73.3-34.4c0-1.8,0.4-2.9,0.7-3.2l0.4-0.3L20,223l32.1-32.2l0.4-0.4l0.1-0.1L70,172.1l-22.8-11.3
+    c-17.3-8.5-24.3-20.1-24.3-39.9c0-10.3,4-19.5,12-27.4l54.4-54.6l0.1-0.1l0.1-0.1C101.7,26,122.5,18.7,146.4,18.7 M146.4,0
+    c-30,0-55,9.8-70.3,25.7L21.7,80.3C10.7,91.2,4.3,105.2,4.3,120.9c0,31.2,15.1,47,34.7,56.7c0,0,0,0,0,0L6.9,209.8
+    c-4.4,4-6.9,9.8-6.9,17.1C0,253,34.4,280,91.9,280c34,0,61.6-10.2,77.5-27.1l54.4-54.6c10.4-10.3,16.2-23.2,16.2-37.9
+    c0-34.8-19.1-50.3-42.3-59.7l29.9-30.1c4.3-3.9,6.9-9.4,6.9-15.8C234.5,27.9,201.5,0,146.4,0L146.4,0z" />
+</svg>
diff --git a/src/icons/Tsoft.png b/src/icons/Tsoft.png
new file mode 100644
index 000000000..6b05a85d8
Binary files /dev/null and b/src/icons/Tsoft.png differ
diff --git a/src/icons/bigcartel.png b/src/icons/bigcartel.png
new file mode 100644
index 000000000..8425619da
Binary files /dev/null and b/src/icons/bigcartel.png differ
diff --git a/src/icons/j2store.png b/src/icons/j2store.png
new file mode 100644
index 000000000..65798b62f
Binary files /dev/null and b/src/icons/j2store.png differ
diff --git a/src/icons/kolors4u.png b/src/icons/kolors4u.png
new file mode 100644
index 000000000..611b8b53a
Binary files /dev/null and b/src/icons/kolors4u.png differ
diff --git a/src/icons/melis-platform.svg b/src/icons/melis-platform.svg
new file mode 100644
index 000000000..103ae55c6
--- /dev/null
+++ b/src/icons/melis-platform.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!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="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">  <image id="image0" width="512" height="512" x="0" y="0"
+    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA/FBMVEXGICbKHyXTHSTPHiXQ
+HiTjGyPiGyPZHSTSHiTnGyPmGyPbHCTGIijcen7tu73xurz3urzuYWfoJi7HIynmn6H9+fn++fnx
+foLpKzPnoqX////ygYXpLDP+/f3++/v+/v7++fr++vr//Pz+/Pz12trlnJ/lm57uvb/67e7//v71
+oqb0mZ32qKv61Nb9+Pjqq63Za2/119jpLzfqO0L1n6PmnqH78fHop6nZaW3z0tP++Pj99vbpLzbq
+OkD0m57xfYHpKzLGISfOQEXUV1zTVVrPQkfLMzjSTVLUV1vdVVrtU1noICjoIyvqPELpNDvnHyfR
+HiTkGyPNHiXaHSRR2NpIAAAAAWJLR0QadWfkMgAAAAd0SU1FB+QECBcKKz4P2SQAAAUySURBVHja
+7d1VrtxQFEXBDjMzMzMzM9P855IJJNK7kRKne9UagI+0Xd/2bCZJkiRJkiRJkiRJkiRJkiRJkiRJ
+kiRJkiRJkiRJkiRJ07Vs+aK2Yupp56OVqxa01WumnnY+WrtuQVu/Yepp5yMA4gEQD4B4AMQDIB4A
+8QCIB0A8AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A
+8QCIB0A8AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A
+8QCIB0A8AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A
+8QCIB0A8AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A
+8QCIB0A8AOIBEA+AeADEAyAeAPEAiAdAPAD+gzZu2jxZW7ZO27btAMx27Nw1Wbsnbs9eAGY79u3P
+duAgAAAAMPVrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAKoB8GcADg3/GODwkeEjR0c//n/sOAD/BsCJk6dOD3bm7OiRc+cvDHbxEgD/BsDlKxtHj1y9
+Nnrk0PXR0W/cBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAgLkJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJiXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIB5CQAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAACYlwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHwAty4PdvvOMIC79379qPu/
+7cHD0dEfPb4/2pOnAMyePX8x2MtXw0dev/nVg96+e//7PoyO/vHT+9E+fwFg0tb+pf0nD4ClBUA8
+AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A8QCIB0A8
+AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A8QCIB0A8
+AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A8QCIB0A8
+AOIBEA+AeADEAyAeAPEAiAdAPADiARAPgHgAxAMgHgDxAIgHQDwA4gEQD4B4AMQDIB4A8QCIB0A8
+AOIBEA+AeADEAyAeAPEAiPd1/YL2DYAl9f3HgrZm+dTTSpIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
+SZIkSZIkSZIkaYn9BDMRdrlBlbs4AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIwLTA0LTA4VDIzOjEw
+OjQzKzAzOjAwrNo4dQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMC0wNC0wOFQyMzoxMDo0MyswMzow
+MN2HgMkAAAAASUVORK5CYII=" />
+</svg>
diff --git a/src/icons/mycashflow.png b/src/icons/mycashflow.png
new file mode 100644
index 000000000..50a8b455f
Binary files /dev/null and b/src/icons/mycashflow.png differ
diff --git a/src/icons/tagcommander.png b/src/icons/tagcommander.png
new file mode 100644
index 000000000..43f91fcea
Binary files /dev/null and b/src/icons/tagcommander.png differ
diff --git a/src/icons/vercel.svg b/src/icons/vercel.svg
new file mode 100644
index 000000000..552a450b4
--- /dev/null
+++ b/src/icons/vercel.svg
@@ -0,0 +1 @@
+<svg width="116" height="100" viewBox="0 0 116 100" fill="#000" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M57.5 0L115 100H0L57.5 0z" /></svg>
\ No newline at end of file
diff --git a/src/icons/zeit.svg b/src/icons/zeit.svg
deleted file mode 100644
index 8ce0bfb63..000000000
--- a/src/icons/zeit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><title>Zeit</title><desc>Created with Sketch.</desc><defs><linearGradient x1="100.686%" y1="181.283%" x2="41.808%" y2="100%" id="a"><stop stop-color="#fff" offset="0%"/><stop offset="100%"/></linearGradient></defs><path d="M15.766 3l14.766 26.134h-29.531z" fill-rule="nonzero" fill="url(#a)"/></svg>
\ No newline at end of file
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index f6ff1b8b5..771de8426 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -172,7 +172,7 @@ class Wappalyzer {
 
       let matches = data.html.match(new RegExp('<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"', 'i'));
 
-      language = matches && matches.length ? matches[1] : null;
+      language = matches && matches.length ? matches[1] : data.language || null;
 
       // Meta tags
       const regex = /<meta[^>]+>/ig;