diff --git a/README.md b/README.md
index ae5627f3d..ed13de90d 100644
--- a/README.md
+++ b/README.md
@@ -10,26 +10,9 @@ technologies used on websites. It detects
 [analytics tools](https://wappalyzer.com/categories/analytics) and
 [many more](https://wappalyzer.com/applications).
 
-Refer to the [wiki](https://github.com/AliasIO/Wappalyzer/wiki) for
-[screenshots](https://github.com/AliasIO/Wappalyzer/wiki/Screenshots), information on how to
-[contribute](https://github.com/AliasIO/Wappalyzer/wiki/Contributing) and
-[more](https://github.com/AliasIO/Wappalyzer/wiki/_pages).
-
 *Licensed under the [GPL](https://github.com/AliasIO/Wappalyzer/blob/master/LICENSE).*
 
 
-## Getting Started
-
-Install [Docker](https://www.docker.com/) on your system first.
-
-```shell
-$ git clone https://github.com/AliasIO/Wappalyzer.git
-$ cd Wappalyzer
-$ ./run links
-```
-
-The	`links` command creates symlinks for files that shared between the various
-drivers (i.e. different platforms). If your file system does not support
-symlinks, you need to manually copy these files (see [`bin/links`](https://github.com/AliasIO/Wappalyzer/blob/master/bin/links)).
+## Documentation
 
-Please run `./run validate` before submitting a pull request.
+Please read the [developer documentation](https://wappalyzer.com/docs) to get started.
diff --git a/bin/validate-icons b/bin/validate-icons
index e1e629bbe..467f6df19 100755
--- a/bin/validate-icons
+++ b/bin/validate-icons
@@ -30,7 +30,7 @@ for (app in json.apps) {
 					} else if ( buffer.mime !== 'image/png' ) {
 						throw new Error('Incorrect mimetype "' + buffer.mime + '" when expected PNG for app "' + app + '": src/icons/' + iconPath);
 					}
-				} else if ( type === 'svg' ) {
+				} else if ( ext === '.svg' ) {
 					if ( !isSvg(fs.readFileSync(path)) ) {
 						throw new Error('Incorrect mimetype when expected SVG for app "' + app + '": src/icons/' + iconPath);
 					}
diff --git a/src/apps.json b/src/apps.json
old mode 100755
new mode 100644
index 5435100f4..9ab09dcfb
--- a/src/apps.json
+++ b/src/apps.json
@@ -842,7 +842,7 @@
 			"website": "http://bigace.de"
 		},
 		"Bablic": {
-		      "cats": [
+			"cats": [
 				"3","9"
 			],
 			"website":"https://www.bablic.com/",
@@ -1954,6 +1954,20 @@
 			"icon": "Debian.png",
 			"website": "http://debian.org"
 		},
+    "PHPDebugBar": {
+			"cats": [
+				"47"
+			],
+			"env": [
+				"^phpdebugbar",
+				"^PhpDebugBar"
+			],
+			"script": [
+				"debugbar.*\\.js"
+      ],
+			"icon": "phpdebugbar.png",
+			"website": "http://phpdebugbar.com/"
+		},
 		"Decorum": {
 			"cats": [
 				"22"
@@ -2258,6 +2272,15 @@
 			],
 			"website": "http://www.ec-cube.net"
 		},
+		"ef.js": {
+			"cats": [
+				"12"
+			],
+			"icon": "ef.js.svg",
+			"env": "^ef|efCore$",
+			"script": "/ef(?:-core)?(?:\\.min|\\.dev)?\\.js",
+			"website": "http://ef.js.org"
+		},
 		"ELOG": {
 			"cats": [
 				"19"
@@ -2571,7 +2594,7 @@
 			],
 			"icon": "FancyBox.png",
 			"implies": "jQuery",
-			"script": "jquery\\.fancybox\\.pack\\.js(?:\\?v=([\\d.]+))?$\\;version:\\1",
+			"script": "jquery\\.fancybox(?:\\.pack|\\.min)?\\.js(?:\\?v=([\\d.]+))?$\\;version:\\1",
 			"website": "http://fancyapps.com/fancybox"
 		},
 		"Fastly": {
@@ -3652,6 +3675,16 @@
 			"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"
@@ -3700,16 +3733,16 @@
 		},
 		"imperia CMS": {
 			"cats": [
-        "1"
-      ],
+				"1"
+			],
 			"meta": {
-			  "X-Imperia-Live-Info": "",
-			  "GENERATOR": "^IMPERIA ([0-9.]{2,})+$\\;version:\\1"
+				"X-Imperia-Live-Info": "",
+				"GENERATOR": "^IMPERIA ([0-9.]{2,})+$\\;version:\\1"
 			},
 			"html": "<imp:live-info sysid=\"[0-9a-f-]+\"(?: node_id=\"[0-9/]*\")? *\/>",
 			"icon": "imperiaCMS.svg",
 			"implies": "Perl",
-		  	"url": "imperia/md/",
+				"url": "imperia/md/",
 			"website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/imperia-cms"
 		},
 		"ImpressCMS": {
@@ -3925,6 +3958,16 @@
 			"icon": "JC-HTTPD.png",
 			"implies": "Canon",
 			"website": "http://canon.com"
+        },
+        "JET Enterprise": {
+			"cats": [
+				"6"
+			],
+			"headers": {
+				"powered": "jet-enterprise"
+			},
+			"icon": "JET Enterprise.svg",
+			"website": "http://www.jetecommerce.com.br/"
 		},
 		"JS Charts": {
 			"cats": [
@@ -3956,7 +3999,16 @@
 			},
 			"website": "http://www.jalios.com"
 		},
-		"Java": {
+    "Jahia DX": {
+      "cats": [
+        "1",
+        "47"
+      ],
+      "html": "<script id=\"staticAssetAggregatedJavascrip",
+      "icon": "JahiaDX.svg",
+      "website": "http://www.jahia.com/dx"
+    },
+    "Java": {
 			"cats": [
 				"27"
 			],
@@ -4280,6 +4332,18 @@
 			},
 			"website": "http://koala-framework.org"
 		},
+		"KobiMaster": {
+			"cats": [
+				"6"
+			],
+			"icon": "Kobimaster.png",
+			"implies": "Microsoft ASP.NET",
+			"env": [
+				"^kmPageInfo$",
+				"^kmGetSession$"
+			],
+			"website": "http://www.kobimaster.com.tr/"
+		},
 		"Koego": {
 			"cats": [
 				"10"
@@ -4885,6 +4949,15 @@
 			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
 			"website": "http://www.marketo.com"
 		},
+    "Material Design Lite": {
+      "cats": [
+        "18"
+      ],
+      "html": "<link[^>]* href=\"[^\"]*material(?:\\.[\\w]+-[\\w]+)?(?:\\.min)?\\.css",
+      "icon": "Material Design Lite.png",
+      "script": "material(?:\\.min)?\\.js",
+      "website": "https://getmdl.io"
+    },
 		"Materialize CSS": {
 			"cats": [
 				"18"
@@ -5492,6 +5565,25 @@
 			"env": "^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",
+			"env": "^neon$",
+			"script": "/neonclear(?:\\.min|\\.dev)?\\.js",
+			"website": "http://neon.atm.re"
 		},
 		"Neos CMS": {
 			"cats": [
@@ -5601,7 +5693,6 @@
 			"headers": {
 				"x-powered-by": "^Next.js ?([0-9.]+)?\\;version:\\1"
 			},
-			"html": "<[^>]+__next",
       "env": "^__NEXT_DATA__$",
       "icon": "zeit.svg",
 			"implies": [
@@ -6227,20 +6318,20 @@
 			"env": "Phaser",
 			"icon": "Phaser.png",
 			"website": "http://phaser.io"
-    },
-    "Phenomic": {
+		},
+		"Phenomic": {
 			"cats": [
-        "1",
-        "11"
+				"1",
+				"11"
 			],
 			"html":[
-        "<[^>]+id=\"phenomic(?:root)?\""
+				"<[^>]+id=\"phenomic(?:root)?\""
 			],
-      "icon": "Phenomic.svg",
-      "implies": [
+			"icon": "Phenomic.svg",
+			"implies": [
 				"React"
-      ],
-      "script": "/phenomic.browser.[a-f0-9]+.js",
+			],
+			"script": "/phenomic.browser.[a-f0-9]+.js",
 			"website": "https://phenomic.io/"
 		},
 		"Phusion Passenger": {
@@ -6285,10 +6376,10 @@
 			"script": "//assets\\.pinterest\\.com/js/pinit\\.js",
 			"website": "http://pinterest.com"
 		},
-	    "pirobase CMS": {
+			"pirobase CMS": {
 			"cats": [
-        "1"
-      ],
+				"1"
+			],
 			"html": "<[^<]+=\"[^\"]*site/[a-z0-9/._-]*/resourceCached/[a-z0-9/._-]*\"[^>]*>|[^<]+cbi:///cms/[^>]+",
 			"icon": "pirobaseCMS.svg",
 			"implies": "Java",
@@ -6777,6 +6868,19 @@
 			"icon": "Raspbian.svg",
 			"website": "https://www.raspbian.org/"
 		},
+		"Rayo": {
+			"cats": [
+				"6"
+			],
+			"env": "^Rayo",
+            "icon": "Rayo.png",
+            "implies": [ "AngularJS", "Microsoft ASP.NET", "Twitter Bootstrap", "jQuery", "Underscore.js", "Moment.js",
+            "Font Awesome", "Google Maps", "Modernizr", "Semantic-ui" ],
+            "meta": {
+				"generator": "^Rayo"
+			},
+			"website": "http://www.rayo.ir"
+		},
 		"Rdf": {
 			"cats": [
 				"27"
@@ -7503,6 +7607,16 @@
 			},
 			"website": "http://www.silverstripe.org"
 		},
+		"Simplébo": {
+			"cats": [
+				"1"
+			],
+			"headers": {
+				"X-ServedBy": "simplebo"
+			},
+			"icon": "Simplebo.png",
+			"website": "https://www.simplebo.fr"
+		},
 		"SimpleHTTP": {
 			"cats": [
 				"22"
@@ -8184,6 +8298,16 @@
 			"icon": "Tengine.png",
 			"website": "http://tengine.taobao.org"
 		},
+		"Textalk": {
+			"cats": [
+				"6"
+			],
+			"meta": {
+				"generator": "Textalk Webshop"
+			},
+			"icon": "textalk.png",
+			"website": "https://www.textalk.se"
+		},
 		"Textpattern CMS": {
 			"cats": [
 				"1"
@@ -8222,6 +8346,26 @@
 			"implies": "PHP",
 			"website": "http://www.thinkphp.cn"
 		},
+		"Ticimax": {
+			"cats": [
+				"6"
+			],
+			"icon": "Ticimax.png",
+			"script": [
+				"cdn\\.ticimax\\.com/"
+			],
+			"website": "https://www.ticimax.com"
+		},
+		"Tictail": {
+			"cats": [
+				"6"
+			],
+			"script": [
+				"https:\\/\\/tictail\\.com"
+			],
+			"icon": "tictail.png",
+			"website": "https://tictail.com"
+		},
 		"TiddlyWiki": {
 			"cats": [
 				"1",
@@ -8348,6 +8492,16 @@
 			"script": "lucide\\.init(?:\\.min)?\\.js",
 			"website": "http://www.translucide.net"
 		},
+		"T-Soft": {
+			"cats": [
+				"6"
+			],
+			"icon": "Tsoft.png",
+			"meta": {
+				"copyright": "T-Soft E-Ticaret Sistemleri"
+			},
+			"website": "http://www.tsoft.com.tr/"
+		},
 		"Tumblr": {
 			"cats": [
 				"11"
@@ -8469,7 +8623,7 @@
 			"env": "^TypechoComment$",
 			"meta": {
 				"generator": "Typecho( [\\d.]+)?\\;version:\\1"
-      },
+			},
 			"url": "/admin/login\\.php?referer=http%3A%2F%2F",
 			"website": "http://typecho.org/"
 		},
@@ -9022,6 +9176,16 @@
 			"url": "/websale7/",
 			"website": "http://websale.de"
 		},
+		"WebSite X5": {
+			"cats": [
+				"20"
+			],
+			"meta": {
+				"generator": "Incomedia WebSite X5 (\\w+ [\\d.]+)\\;version:\\1"
+			},
+			"icon": "WebSite X5.png",
+			"website": "http://websitex5.com"
+		},
 		"WebsiteBaker": {
 			"cats": [
 				"1"
@@ -9061,6 +9225,16 @@
 			"script": "cdn\\d+\\.editmysite\\.com",
 			"website": "http://www.weebly.com"
 		},
+		"Wikinggruppen": {
+			"cats": [
+				"6"
+			],
+			"html": [
+				"<!-- WIKINGGRUPPEN"
+			],
+			"icon": "wikinggruppen.png",
+			"website": "https://wikinggruppen.se/"
+		},
 		"Wikispaces": {
 			"cats": [
 				"8"
@@ -9130,12 +9304,9 @@
 			"env": "^wix(?:Events|Data|Errors)",
 			"headers": {
 				"Set-Cookie": "Domain=\\.wix\\.com",
-				"X-Wix-Dispatcher-Cache-Hit": ""
-			},
-			"icon": "Wix.png",
-			"meta": {
 				"X-Wix-Renderer-Server": ""
 			},
+			"icon": "Wix.png",
 			"script": "static\\.wixstatic\\.com",
 			"website": "http://wix.com"
 		},
@@ -9455,11 +9626,13 @@
 			"cats": [
 				"18"
 			],
+			"env": "^yii$",
 			"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"
@@ -10168,14 +10341,14 @@
 				"6"
 			],
 			"headers": {
-  			"Set-Cookie": "Nop\\.customer="
-       },
+				"Set-Cookie": "Nop\\.customer="
+			 },
 			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)",
 			"icon": "nopCommerce.png",
 			"implies": "Microsoft ASP.NET",
 			"meta": {
-  			"generator": "^nopCommerce$"
-       },
+				"generator": "^nopCommerce$"
+			 },
 			"website": "http://www.nopcommerce.com"
 		},
 		"openEngine": {
@@ -10600,7 +10773,16 @@
 			"icon": "xui.png",
 			"script": "[^a-z]xui.*\\.js",
 			"website": "http://xuijs.com"
-		}
+		},
+    "Raychat": {
+      "cats": [
+        "52"
+      ],
+      "env": "^Raychat$",
+      "icon": "raychat.svg",
+      "script": "app\\.raychat\\.io/scripts/js",
+      "website": "https://raychat.io"
+    }
 	},
 	"categories": {
 		"1": {
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index ef7569b17..bae6c69be 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -61,7 +61,16 @@ const driver = {
       browser.visit(url, error => {
         wappalyzer.driver.document = browser.document;
 
-        const headers = browser.resources['0'].response.headers;
+        if ( !browser.resources['0'].response ) {
+            return reject('No response from server');
+        }
+
+        const headers = {};
+
+        browser.resources['0'].response.headers._headers.forEach(header => {
+          headers[header[0]] = header[1];
+        });
+
         const vars = Object.getOwnPropertyNames(browser.window);
         const html = browser.html();
 
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
new file mode 100644
index 000000000..797f789cc
--- /dev/null
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -0,0 +1,66 @@
+{
+    "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" }
+}
diff --git a/src/drivers/webextension/_locales/zh/messages.json b/src/drivers/webextension/_locales/zh/messages.json
new file mode 100644
index 000000000..d114338b8
--- /dev/null
+++ b/src/drivers/webextension/_locales/zh/messages.json
@@ -0,0 +1,66 @@
+{
+    "github":                   { "message": "在GitHub上fork Wappalyzer!" },
+    "twitter":                  { "message": "在Twitter上关注Wappalyzer" },
+    "website":                  { "message": "访问wappalyzer.com" },
+    "options":                  { "message": "选项" },
+    "optionsSave":              { "message": "保存选项" },
+    "optionsSaved":             { "message": "已保存" },
+    "optionUpgradeMessage":     { "message": "通知我更新内容" },
+    "optionDynamicIcon":        { "message": "使用应用程序logo而不是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": "Issue跟踪器" },
+    "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": "内容分发网络" },
+    "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": "信息流阅读器" },
+    "categoryName50":           { "message": "文档管理系统" },
+    "categoryName51":           { "message": "着陆页构建器" },
+    "categoryName52":           { "message": "在线聊天" },
+    "categoryName53":           { "message": "客户关系管理（CRM）" }
+}
diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css
index 5c922c3b0..31479c0b0 100644
--- a/src/drivers/webextension/css/popup.css
+++ b/src/drivers/webextension/css/popup.css
@@ -2,7 +2,6 @@ body {
 	background: #fff;
 	font-family: Helvetica, Arial, sans-serif;
   font-size: .8rem;
-  height: 20.8rem;
 	margin: 0;
   overflow: hidden;
   width: 30rem;
diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js
index af4d823a6..1a88c1cd4 100644
--- a/src/drivers/webextension/js/iframe.js
+++ b/src/drivers/webextension/js/iframe.js
@@ -181,7 +181,7 @@ var exports = {};
 				video_assets: opt_video_assets,
 				assets: opt_assets,
 				version: '3',
-				mrev: '6f3a97b-c',
+				mrev: '88d43ba-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -890,7 +890,7 @@ var exports = {};
 	var _pageTags;
 	var INIT_MS_BW_SEARCHES = 2000;
 	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
-	var POST_MSG_ID = '1503946945-8336-24876-10613-9147';
+	var POST_MSG_ID = '1506716276-29567-8539-3286-4931';
 	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {
diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js
index 1ff4dadb5..7c60d52a5 100644
--- a/src/drivers/webextension/js/network.js
+++ b/src/drivers/webextension/js/network.js
@@ -280,20 +280,19 @@
 		browserProxy.tabs.sendMessage(this.tabId, message);
 	};
 
-	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, nonAdTrackingEvent) {
+	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, adTrackingEvent) {
 		var msg = {};
 		msg.assets = [];
 		msg.requests = [];
 		msg.event_data = {};
-		if (  !nonAdTrackingEvent  ) {
-			msg.event = 'new-video-ad';
+		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 ( nonAdTrackingEvent === 'new-invalid-video-ad' ) {
-			msg.event = nonAdTrackingEvent;
+		} else if ( adTrackingEvent === 'new-invalid-video-ad' ) {
 			msg.requests = reqs.map(function(request) {
 				return parseHostnameFromUrl(request.url);
 			});
@@ -304,8 +303,6 @@
 				contentType: assetReq.contentType,
 				size: assetReq.size
 			}];
-		} else if ( nonAdTrackingEvent === 'robots-txt-no-scraping' ) {
-			msg.event = nonAdTrackingEvent;
 		}
 		msg.origUrl = curPageUrl;
 		msg.displayAdFound = this.displayAdFound;
@@ -635,10 +632,10 @@
 				var tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
 
 				if ( _this.isValidVideoAd(msgAssetReq, tagReqs) ) {
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, true);
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
 				} else {
 
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, false);
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
 				}
 
 			} else {
diff --git a/src/icons/3DM.png b/src/icons/3DM.png
old mode 100755
new mode 100644
diff --git a/src/icons/3ware.png b/src/icons/3ware.png
old mode 100755
new mode 100644
diff --git a/src/icons/ATEN.png b/src/icons/ATEN.png
old mode 100755
new mode 100644
diff --git a/src/icons/Amazon-Cloudfront.svg b/src/icons/Amazon-Cloudfront.svg
old mode 100755
new mode 100644
diff --git a/src/icons/ApexPages.png b/src/icons/ApexPages.png
old mode 100755
new mode 100644
diff --git a/src/icons/BaseHTTP.png b/src/icons/BaseHTTP.png
old mode 100755
new mode 100644
diff --git a/src/icons/BoldChat.png b/src/icons/BoldChat.png
old mode 100755
new mode 100644
diff --git a/src/icons/Brother.png b/src/icons/Brother.png
old mode 100755
new mode 100644
diff --git a/src/icons/Canon.png b/src/icons/Canon.png
old mode 100755
new mode 100644
diff --git a/src/icons/Catwalk.png b/src/icons/Catwalk.png
old mode 100755
new mode 100644
diff --git a/src/icons/CherryPy.png b/src/icons/CherryPy.png
old mode 100755
new mode 100644
diff --git a/src/icons/Cloudera.png b/src/icons/Cloudera.png
old mode 100755
new mode 100644
diff --git a/src/icons/Darwin.png b/src/icons/Darwin.png
old mode 100755
new mode 100644
diff --git a/src/icons/Dell.png b/src/icons/Dell.png
old mode 100755
new mode 100644
diff --git a/src/icons/DovetailWRP.png b/src/icons/DovetailWRP.png
old mode 100755
new mode 100644
diff --git a/src/icons/EWS-NIC4.png b/src/icons/EWS-NIC4.png
old mode 100755
new mode 100644
diff --git a/src/icons/Erlang.png b/src/icons/Erlang.png
old mode 100755
new mode 100644
diff --git a/src/icons/FancyBox.png b/src/icons/FancyBox.png
old mode 100755
new mode 100644
diff --git a/src/icons/Grandstream.png b/src/icons/Grandstream.png
old mode 100755
new mode 100644
diff --git a/src/icons/Hotjar.png b/src/icons/Hotjar.png
old mode 100755
new mode 100644
diff --git a/src/icons/Ideasoft.png b/src/icons/Ideasoft.png
new file mode 100644
index 000000000..61df86aeb
Binary files /dev/null and b/src/icons/Ideasoft.png differ
diff --git a/src/icons/Indico.png b/src/icons/Indico.png
old mode 100755
new mode 100644
diff --git a/src/icons/InfernoJS.png b/src/icons/InfernoJS.png
old mode 100755
new mode 100644
diff --git a/src/icons/JC-HTTPD.png b/src/icons/JC-HTTPD.png
old mode 100755
new mode 100644
diff --git a/src/icons/JET Enterprise.svg b/src/icons/JET Enterprise.svg
new file mode 100644
index 000000000..fa2687f49
--- /dev/null
+++ b/src/icons/JET Enterprise.svg	
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" viewBox="0 0 51 51" overflow="scroll">
+  <path fill="#CC2128" d="M5.5 1.4h40.1c2.3 0 4.1 1.9 4.1 4.1v40.1c0 2.3-1.9 4.1-4.1 4.1H5.5c-2.3 0-4.1-1.9-4.1-4.1V5.5c0-2.2 1.9-4.1 4.1-4.1z"/>
+  <g fill="#FFF">
+    <path d="M10.5 14.7l.8 3.3h2.5c-1.2 5.6-3.4 16.1-3.4 16.1-.2 1-.6 2.1-1.5 2.8-1 .8-2.5.6-3.6.3l-.9 3.2c.2.1 2.9.8 5.2.3 1.4-.3 2.6-1.3 3.2-2.1.8-1 1.2-2.8 1.5-4 .3-1 4.2-20.2 4.2-20.2h-8v.3zm30.9 16.6c-.5.2-1.1.4-1.5.4-1.2.1-2.2-.7-1.4-3.7.8-3.4 2.3-9.9 2.3-9.9h5.1l.8-3.3h-5.1l1.1-4.6H39c-.2.7-3.6 15.8-4 17.3-.4 2.1-1.1 4.4.4 6.2.9 1.1 2.3 1.5 3.5 1.5 1.1 0 2.1-.1 2.9-.5-.4-.5-.6-1.1-.6-1.8-.2-.7-.1-1.2.2-1.6z"/>
+    <path d="M43.8 30.7c-.4 0-.8.1-1.2.4-.5.4-.9 1-.9 1.7 0 .5.2 1 .5 1.4.4.4.9.7 1.6.7 1.1 0 2.1-.9 2.1-2.1 0-1.1-1-2.1-2.1-2.1zm-21.5-4.2h.8c3.8 0 9.6-.6 11.2-4.8.8-2 .6-4.3-1-5.8-1.3-1.2-3.2-1.6-4.9-1.6-5.5.2-9.3 5.1-10.1 9.7-.5 2.9-.6 6.1 1.3 8.6 1.5 2 3.7 2.5 6.2 2.5 3.1 0 5.5-1 5.5-1l.8-3.7s-2.7 1.5-5.6 1.5c-2.4 0-3.8-1.4-4-3.4-.2-.8-.2-2-.2-2zm6-9c.8 0 1.4.2 1.8.5.4.3.6.8.6 1.5 0 1.2-.6 2.1-2 2.8-1.3.7-3.1 1-5.3 1h-.5c.6-4.2 3.7-5.8 5.4-5.8z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/JahiaDX.svg b/src/icons/JahiaDX.svg
new file mode 100644
index 000000000..f6dc0356e
--- /dev/null
+++ b/src/icons/JahiaDX.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192.16 192.16"><defs><style>.cls-1{fill:#209fda;fill-rule:evenodd;}.cls-2{fill:#fff;}</style></defs><title>jahia-dx-logo</title><path class="cls-1" d="M288.62,514.12,205.91,431.4a13.37,13.37,0,0,1,0-18.91l82.71-82.71a13.37,13.37,0,0,1,18.91,0l82.71,82.71a13.37,13.37,0,0,1,0,18.91l-82.71,82.71A13.37,13.37,0,0,1,288.62,514.12Z" transform="translate(-201.99 -325.87)"/><rect class="cls-2" x="347.96" y="411.01" width="22.21" height="22.21" rx="1.34" ry="1.34" transform="translate(-395.31 51.64) rotate(-45)"/><path class="cls-2" d="M342.41,389.76,328.6,375.94a1.34,1.34,0,0,0-1.89,0l-29.52,29.53a1.34,1.34,0,0,1-1.89,0l-29.52-29.53a1.34,1.34,0,0,0-1.89,0l-13.82,13.82a1.34,1.34,0,0,0,0,1.89l76.64,76.65a1.34,1.34,0,0,0,1.89,0l13.82-13.82a1.34,1.34,0,0,0,0-1.89l-29.52-29.52a1.34,1.34,0,0,1,0-1.89l29.52-29.52A1.34,1.34,0,0,0,342.41,389.76Z" transform="translate(-201.99 -325.87)"/><path class="cls-2" d="M250.06,454.48l13.82,13.82a1.34,1.34,0,0,0,1.89,0l22.61-22.62L272.68,430l-22.62,22.61A1.34,1.34,0,0,0,250.06,454.48Z" transform="translate(-201.99 -325.87)"/></svg>
\ No newline at end of file
diff --git a/src/icons/Jetty.png b/src/icons/Jetty.png
old mode 100755
new mode 100644
diff --git a/src/icons/Jive.png b/src/icons/Jive.png
old mode 100755
new mode 100644
diff --git a/src/icons/KS_HTTP.png b/src/icons/KS_HTTP.png
old mode 100755
new mode 100644
diff --git a/src/icons/Koala Framework.png b/src/icons/Koala Framework.png
old mode 100755
new mode 100644
diff --git a/src/icons/Kobimaster.png b/src/icons/Kobimaster.png
new file mode 100644
index 000000000..f7ab88580
Binary files /dev/null and b/src/icons/Kobimaster.png differ
diff --git a/src/icons/LabVIEW.png b/src/icons/LabVIEW.png
old mode 100755
new mode 100644
diff --git a/src/icons/LivePerson.png b/src/icons/LivePerson.png
old mode 100755
new mode 100644
diff --git a/src/icons/Logitech Media Server.png b/src/icons/Logitech Media Server.png
old mode 100755
new mode 100644
diff --git a/src/icons/MOBOTIX.png b/src/icons/MOBOTIX.png
old mode 100755
new mode 100644
diff --git a/src/icons/Material Design Lite.png b/src/icons/Material Design Lite.png
new file mode 100644
index 000000000..11ec0b532
Binary files /dev/null and b/src/icons/Material Design Lite.png differ
diff --git a/src/icons/Medium.svg b/src/icons/Medium.svg
old mode 100755
new mode 100644
diff --git a/src/icons/Neonclear.png b/src/icons/Neonclear.png
new file mode 100644
index 000000000..0e0dcc59c
Binary files /dev/null and b/src/icons/Neonclear.png differ
diff --git a/src/icons/NodeBB.png b/src/icons/NodeBB.png
old mode 100755
new mode 100644
diff --git a/src/icons/Olark.png b/src/icons/Olark.png
old mode 100755
new mode 100644
diff --git a/src/icons/PHP-Fusion.png b/src/icons/PHP-Fusion.png
index f64b7ec6a..0ccdba169 100644
Binary files a/src/icons/PHP-Fusion.png and b/src/icons/PHP-Fusion.png differ
diff --git a/src/icons/PerfSONAR-PS.png b/src/icons/PerfSONAR-PS.png
old mode 100755
new mode 100644
diff --git a/src/icons/Plataforma NEO.svg b/src/icons/Plataforma NEO.svg
new file mode 100644
index 000000000..51a5595bf
--- /dev/null
+++ b/src/icons/Plataforma NEO.svg	
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" viewBox="0 0 51 51" overflow="scroll">
+  <path fill="#FF7800" d="M5.6 1.4h39.9c2.3 0 4.2 1.8 4.2 4.2v39.9c0 2.3-1.8 4.2-4.2 4.2H5.6c-2.3 0-4.2-1.8-4.2-4.2V5.6c0-2.3 1.9-4.2 4.2-4.2z"/>
+  <path fill="#FEFEFE" d="M40.1 17.6c-3.2 0-6.1 1.9-7.3 4.8-1-2.3-3.5-4.8-6.9-4.8h-.4c-3.5 0-6.1 1.9-7.3 4.8-1.3-2.9-4.2-4.8-7.3-4.8-4.4 0-7.9 3.5-7.9 7.9v8h4v-7.9c0-2.3 1.9-4.2 4.2-4.2s4.2 1.9 4.2 4.2v7.9h3.8v-3.2c3.2 4.4 10.7 4.4 13.6-1h-5.4c-.4.4-1 .4-1.5.4-1.5 0-3.2-1-3.8-2.9h10.7c.4 3.8 3.8 6.7 7.6 6.7 4.4 0 8.2-3.5 8.2-7.9s-4.1-8-8.5-8zM22 23.5c.6-1.5 2.3-2.4 3.8-2.3 1.5.1 2.5 1 3.2 2.3h-7zm18.1 6.1c-2.3 0-4.2-1.9-4.2-4.2s1.9-4.2 4.2-4.2c2.5 0 4.4 1.9 4.4 4.2s-1.9 4.2-4.4 4.2z"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Rayo.png b/src/icons/Rayo.png
new file mode 100644
index 000000000..9519434a5
Binary files /dev/null and b/src/icons/Rayo.png differ
diff --git a/src/icons/Sentinel.png b/src/icons/Sentinel.png
old mode 100755
new mode 100644
diff --git a/src/icons/Simplebo.png b/src/icons/Simplebo.png
new file mode 100644
index 000000000..769cb5dd7
Binary files /dev/null and b/src/icons/Simplebo.png differ
diff --git a/src/icons/Splunk.png b/src/icons/Splunk.png
old mode 100755
new mode 100644
diff --git a/src/icons/Subrion.png b/src/icons/Subrion.png
old mode 100755
new mode 100644
diff --git a/src/icons/Tealium.png b/src/icons/Tealium.png
old mode 100755
new mode 100644
diff --git a/src/icons/Telescope.png b/src/icons/Telescope.png
old mode 100755
new mode 100644
diff --git a/src/icons/Ticimax.png b/src/icons/Ticimax.png
new file mode 100644
index 000000000..4d566d818
Binary files /dev/null and b/src/icons/Ticimax.png differ
diff --git a/src/icons/Tsoft.png b/src/icons/Tsoft.png
new file mode 100644
index 000000000..04cc84c96
Binary files /dev/null and b/src/icons/Tsoft.png differ
diff --git a/src/icons/WebSite X5.png b/src/icons/WebSite X5.png
new file mode 100644
index 000000000..da5e59c3f
Binary files /dev/null and b/src/icons/WebSite X5.png differ
diff --git a/src/icons/Wowza Media Server.png b/src/icons/Wowza Media Server.png
old mode 100755
new mode 100644
diff --git a/src/icons/XAMPP.png b/src/icons/XAMPP.png
old mode 100755
new mode 100644
diff --git a/src/icons/Zabbix.png b/src/icons/Zabbix.png
old mode 100755
new mode 100644
diff --git a/src/icons/aws-ec2.svg b/src/icons/aws-ec2.svg
old mode 100755
new mode 100644
diff --git a/src/icons/aws-s3.svg b/src/icons/aws-s3.svg
old mode 100755
new mode 100644
diff --git a/src/icons/debut.png b/src/icons/debut.png
old mode 100755
new mode 100644
diff --git a/src/icons/eSyndiCat.png b/src/icons/eSyndiCat.png
old mode 100755
new mode 100644
diff --git a/src/icons/ef.js.svg b/src/icons/ef.js.svg
new file mode 100644
index 000000000..e3cf921e8
--- /dev/null
+++ b/src/icons/ef.js.svg
@@ -0,0 +1,7 @@
+<?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 width="100%" height="100%" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(0.452548,-0.452548,0.452548,0.452548,53.7109,229.3)">
+        <path d="M390.875,449.875L-2.875,449.875L-2.875,56.125L390.875,56.125L390.875,449.875ZM90.875,149.875L90.875,356.125L297.125,356.125L297.125,149.875L90.875,149.875Z" style="fill:rgb(255,178,0);"/>
+    </g>
+</svg>
diff --git a/src/icons/mod_perl.png b/src/icons/mod_perl.png
old mode 100755
new mode 100644
diff --git a/src/icons/osTicket.png b/src/icons/osTicket.png
old mode 100755
new mode 100644
diff --git a/src/icons/phpdebugbar.png b/src/icons/phpdebugbar.png
new file mode 100644
index 000000000..2cb46bf4e
Binary files /dev/null and b/src/icons/phpdebugbar.png differ
diff --git a/src/icons/raychat.svg b/src/icons/raychat.svg
new file mode 100644
index 000000000..a75491199
--- /dev/null
+++ b/src/icons/raychat.svg
@@ -0,0 +1,29 @@
+<?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/textalk.png b/src/icons/textalk.png
new file mode 100644
index 000000000..f2cd02094
Binary files /dev/null and b/src/icons/textalk.png differ
diff --git a/src/icons/tictail.png b/src/icons/tictail.png
new file mode 100644
index 000000000..9ca29b6d8
Binary files /dev/null and b/src/icons/tictail.png differ
diff --git a/src/icons/uCore.png b/src/icons/uCore.png
old mode 100755
new mode 100644
diff --git a/src/icons/wikinggruppen.png b/src/icons/wikinggruppen.png
new file mode 100644
index 000000000..b9f7c5e39
Binary files /dev/null and b/src/icons/wikinggruppen.png differ
diff --git a/src/icons/wpCache.png b/src/icons/wpCache.png
index e8a21e343..7f24b9d35 100644
Binary files a/src/icons/wpCache.png and b/src/icons/wpCache.png differ
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index 1374dbfbe..6fed51ec9 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -296,10 +296,6 @@ class Wappalyzer {
    * Cache detected applications
    */
   cacheDetectedApps(apps, url) {
-    if ( !( this.driver.ping instanceof Function ) ) {
-      return;
-    }
-
     Object.keys(apps).forEach(appName => {
       var app = apps[appName];
 
@@ -311,7 +307,9 @@ class Wappalyzer {
       });
     })
 
-    this.ping();
+    if ( this.driver.ping instanceof Function ) {
+      this.ping();
+    }
   }
 
   /**