diff --git a/src/apps.json b/src/apps.json
index 72b85cdb3..3b8b6d09e 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -61,6 +61,15 @@
       "implies": "Drupal\\;confidence:95",
       "website": "https://www.acquia.com/"
     },
+    "All in One SEO Pack": {
+      "cats": [
+        54
+      ],
+      "implies": "WordPress",
+			"html": "<!-- All in One SEO Pack ([\\d.]+) \\;version:\\1",
+      "website": "https://www.acquia.com/",
+			"icon": "all-in-One-SEO-Pack.png"
+    },
     "Amber": {
       "cats": [
         18,
@@ -1125,6 +1134,7 @@
         11
       ],
       "icon": "Blogger.png",
+      "implies": "Python",
       "meta": {
         "generator": "^Blogger$"
       },
@@ -1368,6 +1378,7 @@
       ],
       "js": {
         "CKEDITOR": "",
+				"CKEDITOR_BASEPATH": "",
         "CKEDITOR.version": "(.*)\\;version:\\1"
       },
       "icon": "CKEditor.png",
@@ -1746,7 +1757,9 @@
         "CloudFlare": ""
       },
       "headers": {
-        "Server": "^cloudflare$"
+        "Server": "^cloudflare$",
+        "cf-cache-status": "",
+        "cf-ray": ""
       },
       "icon": "CloudFlare.svg",
       "website": "http://www.cloudflare.com"
@@ -1805,7 +1818,10 @@
       "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"
@@ -1842,6 +1858,16 @@
       "icon": "coinlab.png",
       "website": "https://coinlab.biz/en"
     },
+    "ColorMeShop": {
+      "cats": [
+        6
+      ],
+      "js": {
+        "Colorme": ""
+      },
+      "icon": "colormeshop.png",
+      "website": "https://shop-pro.jp"
+    },
     "Comandia": {
       "cats": [
         6
@@ -2211,7 +2237,7 @@
       ],
       "icon": "DTG.png",
       "implies": "Mono.net",
-      "website": "http://www.dtg.nl"
+      "website": "https://www.dtg.nl"
     },
     "Dancer": {
       "cats": [
@@ -2272,7 +2298,7 @@
         "X-Powered-By": "Darwin"
       },
       "icon": "Apple.svg",
-      "website": "http://opensource.apple.com"
+      "website": "https://opensource.apple.com"
     },
     "DataLife Engine": {
       "cats": [
@@ -2289,7 +2315,7 @@
       "meta": {
         "generator": "DataLife Engine"
       },
-      "website": "http://dle-news.ru"
+      "website": "https://dle-news.ru"
     },
     "DataTables": {
       "cats": [
@@ -2309,7 +2335,7 @@
         "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"
+      "website": "https://debian.org"
     },
     "DedeCMS": {
       "cats": [
@@ -2354,7 +2380,7 @@
         "PHP",
         "Apache"
       ],
-      "website": "http://www.directadmin.com"
+      "website": "https://www.directadmin.com"
     },
     "Discourse": {
       "cats": [
@@ -2368,7 +2394,7 @@
       "meta": {
         "generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1"
       },
-      "website": "http://discourse.org"
+      "website": "https://discourse.org"
     },
     "Discuz! X": {
       "cats": [
@@ -2398,7 +2424,7 @@
       "html": "<div[^>]+id=\"disqus_thread\"",
       "icon": "Disqus.svg",
       "script": "disqus_url",
-      "website": "http://disqus.com"
+      "website": "https://disqus.com"
     },
     "Django": {
       "cats": [
@@ -2411,7 +2437,7 @@
       "html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?|<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>)\\;version:\\1",
       "icon": "Django.png",
       "implies": "Python",
-      "website": "http://djangoproject.com"
+      "website": "https://djangoproject.com"
     },
     "Django CMS": {
       "cats": [
@@ -2419,7 +2445,7 @@
       ],
       "icon": "Django CMS.png",
       "implies": "Django",
-      "website": "http://django-cms.org"
+      "website": "https://django-cms.org"
     },
     "Dojo": {
       "cats": [
@@ -2431,7 +2457,7 @@
       },
       "icon": "Dojo.png",
       "script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
-      "website": "http://dojotoolkit.org"
+      "website": "https://dojotoolkit.org"
     },
     "Dokeos": {
       "cats": [
@@ -2451,7 +2477,7 @@
       "meta": {
         "generator": "Dokeos"
       },
-      "website": "http://dokeos.com"
+      "website": "https://dokeos.com"
     },
     "DokuWiki": {
       "cats": [
@@ -2465,7 +2491,7 @@
       "meta": {
         "generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
       },
-      "website": "http://www.dokuwiki.org"
+      "website": "https://www.dokuwiki.org"
     },
     "Dotclear": {
       "cats": [
@@ -3232,6 +3258,14 @@
       "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
@@ -3409,6 +3443,7 @@
         4
       ],
       "icon": "GitBook.png",
+      "url": "^https?://[^/]+\\.gitbook\\.io/",
       "meta": {
         "generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
       },
@@ -3625,6 +3660,16 @@
       "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
@@ -4207,6 +4252,16 @@
       ],
       "website": "https://www.ideasoft.com"
     },
+    "IdoSell Shop": {
+      "cats": [
+        6
+      ],
+      "js": {
+        "IAI_Ajax": ""
+      },
+      "icon": "idosellshop.png",
+      "website": "https://www.idosell.com"
+    },
     "IIS": {
       "cats": [
         22
@@ -5120,6 +5175,9 @@
       "cats": [
         18
       ],
+      "js": {
+        "Laravel": ""
+      },
       "cookies": {
         "laravel_session": ""
       },
@@ -6099,6 +6157,9 @@
       "js": {
         "show_switch2gui": ""
       },
+      "cookies": {
+        "MOIN_SESSION": ""
+      },
       "icon": "MoinMoin.png",
       "implies": "Python",
       "script": "moin(?:_static(\\d)(\\d)(\\d)|.+)/common/js/common\\.js\\;version:\\1.\\2.\\3",
@@ -6624,8 +6685,7 @@
     },
     "Octopress": {
       "cats": [
-        1,
-        11
+        57
       ],
       "html": "Powered by <a href=\"http://octopress\\.org\">",
       "icon": "octopress.png",
@@ -7062,7 +7122,7 @@
     },
     "Pelican": {
       "cats": [
-        1
+        57
       ],
       "implies": "Python",
       "icon": "pelican.png",
@@ -7310,7 +7370,7 @@
         22
       ],
       "headers": {
-        "X-Powered-By": "^Phusion Passenger ?([\\d.]+)?\\;version:\\1",
+        "X-Powered-By": "Phusion Passenger ?([\\d.]+)?\\;version:\\1",
         "Server": "Phusion Passenger ([\\d.]+)\\;version:\\1"
       },
       "icon": "Phusion Passenger.png",
@@ -7556,7 +7616,10 @@
         "<!-- /Module Block [a-z ]+ -->"
       ],
       "icon": "PrestaShop.svg",
-      "implies": "PHP",
+      "implies": [
+				"PHP",
+				"MySQL"
+			],
       "meta": {
         "generator": "PrestaShop"
       },
@@ -7596,6 +7659,16 @@
       "icon": "ProjectPoi.png",
       "website": "https://ppoi.org/"
     },
+    "Projesoft": {
+      "cats": [
+        6
+      ],
+      "icon": "projesoft.png",
+      "script": [
+        "projesoft\\.js"
+      ],
+      "website": "https://www.projesoft.com.tr"
+    },
     "Prospector": {
       "cats": [
         36
@@ -9282,6 +9355,17 @@
       "script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
       "website": "http://sublimevideo.net"
     },
+    "Sucuri": {
+      "cats": [
+        31
+      ],
+      "headers": {
+        "x-sucuri-id": "",
+        "x-sucuri-cache:": ""
+      },
+      "icon": "sucuri.png",
+      "website": "https://sucuri.net/"
+    },
     "Subrion": {
       "cats": [
         1
@@ -10044,7 +10128,7 @@
       "icon": "Underscore.js.png",
       "js": {
         "_.restArguments": "",
-        "_.VERSION": "(.*)\\;version:\\1"
+        "_.VERSION": "(.*)\\;confidence:0\\;version:\\1"
       },
 			"excludes": "Lodash",
       "script": "underscore.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
@@ -10866,6 +10950,10 @@
       "js": {
         "XF.GuestUsername": ""
       },
+      "implies": [
+				"PHP",
+				"MySQL"
+			],
       "cookies": {
         "xf_session": "",
         "xf_csrf": ""
@@ -11062,7 +11150,7 @@
         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",
diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
old mode 100644
new mode 100755
index 77ff1c160..bc29ba604
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 'use strict';
 
 const Wappalyzer = require('./driver');
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index 632400db5..19a28254f 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -16,6 +16,9 @@
     "driver.js",
     "wappalyzer.js"
   ],
+  "bin": {
+    "wappalyzer": "./index.js"
+  },
   "dependencies": {
     "npm": "^6.1.0",
     "request": "^2.85.0",
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
index c9acb2c76..7b59dc3db 100644
--- a/src/drivers/webextension/_locales/pt_BR/messages.json
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -13,19 +13,19 @@
   "categoryPin":              { "message": "Sempre mostrar ícone" },
 	"categoryName1":            { "message": "CMS" },
 	"categoryName2":            { "message": "Fórum" },
-	"categoryName3":            { "message": "Gestor de banco de dados" },
+	"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": "Wikis" },
-	"categoryName9":            { "message": "Gestor de servidores" },
-	"categoryName10":           { "message": "Ferramenta de estatisticas" },
+	"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": "Sistemas de comentários" },
+	"categoryName15":           { "message": "Sistema de comentários" },
 	"categoryName16":           { "message": "Captcha" },
 	"categoryName17":           { "message": "Script de fonte" },
 	"categoryName18":           { "message": "Framework web" },
@@ -35,7 +35,7 @@
 	"categoryName22":           { "message": "Servidor web" },
 	"categoryName23":           { "message": "Ferramenta de cache" },
 	"categoryName24":           { "message": "Editor WYSIWYG" },
-	"categoryName25":           { "message": "Gráficos JavaScript" },
+	"categoryName25":           { "message": "Gráfico JavaScript" },
 	"categoryName26":           { "message": "Framework mobile" },
 	"categoryName27":           { "message": "Linguagem de programação" },
 	"categoryName28":           { "message": "Sistema Operacional" },
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index fc69619f8..4c5d7cc67 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -11,11 +11,11 @@ function getOption(name, defaultValue, callback) {
 }
 
 function setOption(name, value) {
-  var option = {};
-
-  option[name] = value;
-
-  browser.storage.local.set(option);
+  ( chrome || browser ).runtime.sendMessage({
+    id: 'set_option',
+    key: name,
+    value: value
+  });
 }
 
 document.addEventListener('DOMContentLoaded', () => {
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/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/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/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/projesoft.png b/src/icons/projesoft.png
new file mode 100644
index 000000000..77b9293da
Binary files /dev/null and b/src/icons/projesoft.png differ
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