diff --git a/.travis.yml b/.travis.yml
index 7009b2ce8..2b27a8fa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,3 +23,6 @@ deploy:
 
 env:
   - CXX=g++-4.8
+
+notifications:
+  slack: wappalyzer:ppXlJRMBDxrKYS9vgVxT7FuH
diff --git a/README.md b/README.md
index ed13de90d..79b36246e 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 # Wappalyzer [![Travis](https://img.shields.io/travis/AliasIO/Wappalyzer.svg)](https://travis-ci.org/AliasIO/Wappalyzer/) [![Scrutinizer](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AliasIO/Wappalyzer/?branch=master)
 
-[Wappalyzer](https://wappalyzer.com/) is a
+[Wappalyzer](https://www.wappalyzer.com/) is a
 [cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
 technologies used on websites. It detects
-[content management systems](https://wappalyzer.com/categories/cms),
-[eCommerce platforms](https://wappalyzer.com/categories/ecommerce),
-[web servers](https://wappalyzer.com/categories/web-servers),
-[JavaScript frameworks](https://wappalyzer.com/categories/javascript-frameworks),
-[analytics tools](https://wappalyzer.com/categories/analytics) and
-[many more](https://wappalyzer.com/applications).
+[content management systems](https://www.wappalyzer.com/categories/cms),
+[eCommerce platforms](https://www.wappalyzer.com/categories/ecommerce),
+[web servers](https://www.wappalyzer.com/categories/web-servers),
+[JavaScript frameworks](https://www.wappalyzer.com/categories/javascript-frameworks),
+[analytics tools](https://www.wappalyzer.com/categories/analytics) and
+[many more](https://www.wappalyzer.com/applications).
 
 *Licensed under the [GPL](https://github.com/AliasIO/Wappalyzer/blob/master/LICENSE).*
 
 
 ## Documentation
 
-Please read the [developer documentation](https://wappalyzer.com/docs) to get started.
+Please read the [developer documentation](https://www.wappalyzer.com/docs) to get started.
diff --git a/bin/build b/bin/build
index 9f38e3454..ea7ad0cc8 100755
--- a/bin/build
+++ b/bin/build
@@ -49,50 +49,65 @@ pushd $webextension_dir > /dev/null
 
 sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" manifest.json
 
-zip -qr ../../../build/wappalyzer_webextension.zip .
+zip -qr ../../../build/wappalyzer_webextension.zip . \
+  -x images/icon_44.png \
+  -x images/icon_50.png \
+  -x images/icon_150.png \
+  -x js/ms_\*.js \
+  -x manifest.edge.json \
+  -x \*.log \
+  -x \*.lock \
+  -x \*.gitignore \
+  -x \*.gitkeep \
+  -x \*.js.map \
+  -x \*.min.js \
+  -x \*.yarn-integrity \
+  -x \*package.json \
+  -x \*LICENSE \
+  -x \*README.md
 
 popd > /dev/null
 
 # Edge
-echo "Building Edge application..."
-
-pushd build > /dev/null
-
-webextension_dir="../$webextension_dir"
-manifest_dir="Wappalyzer/edgeextension/manifest"
-
-mv $webextension_dir/manifest.json $webextension_dir/manifest.webextension.json
-mv $webextension_dir/manifest.edge.json $webextension_dir/manifest.json
-
-sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" $webextension_dir/manifest.json
-
-manifoldjs -l debug -p edgeextension -f edgeextension -m $webextension_dir/manifest.json
-
-# Replace symlinks with actual files
-rm $manifest_dir/Extension/images/icons
-
-cp ../src/apps.json $manifest_dir/Extension
-cp ../src/wappalyzer.js $manifest_dir/Extension/js
-cp -r ../src/icons $manifest_dir/Extension/images
-
-mv $webextension_dir/manifest.json $webextension_dir/manifest.edge.json
-mv $webextension_dir/manifest.webextension.json $webextension_dir/manifest.json
-
-sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-NAME-HERE/1591Wappalyzer.Wappalyzer/' $manifest_dir/appxmanifest.xml
-sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-PUBLISHER-HERE/D240C22F-A6C1-45DF-BF7B-4C835064DF51/' $manifest_dir/appxmanifest.xml
-sed -i 's/INSERT-YOUR-PACKAGE-PROPERTIES-PUBLISHERDISPLAYNAME-HERE/Wappalyzer/' $manifest_dir/appxmanifest.xml
-sed -i 's/Version="0.\([^"]\+\)/Version="\1.0/' $manifest_dir/appxmanifest.xml
-
-cp $webextension_dir/images/icon_44.png  $manifest_dir/Assets/Square44x44Logo.png
-cp $webextension_dir/images/icon_150.png $manifest_dir/Assets/Square150x150Logo.png
-cp $webextension_dir/images/icon_50.png  $manifest_dir/Assets/StoreLogo.png
-
-manifoldjs -l debug -p edgeextension package $manifest_dir
-
-mv Wappalyzer/edgeextension/package/edgeExtension.appx wappalyzer_edge.appx
-
-rm -rf Wappalyzer
-
-popd > /dev/null
+#echo "Building Edge application..."
+#
+#pushd build > /dev/null
+#
+#webextension_dir="../$webextension_dir"
+#manifest_dir="Wappalyzer/edgeextension/manifest"
+#
+#mv $webextension_dir/manifest.json $webextension_dir/manifest.webextension.json
+#mv $webextension_dir/manifest.edge.json $webextension_dir/manifest.json
+#
+#sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" $webextension_dir/manifest.json
+#
+#manifoldjs -l debug -p edgeextension -f edgeextension -m $webextension_dir/manifest.json
+#
+## Replace symlinks with actual files
+#rm $manifest_dir/Extension/images/icons
+#
+#cp ../src/apps.json $manifest_dir/Extension
+#cp ../src/wappalyzer.js $manifest_dir/Extension/js
+#cp -r ../src/icons $manifest_dir/Extension/images
+#
+#mv $webextension_dir/manifest.json $webextension_dir/manifest.edge.json
+#mv $webextension_dir/manifest.webextension.json $webextension_dir/manifest.json
+#
+#sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-NAME-HERE/1591Wappalyzer.Wappalyzer/' $manifest_dir/appxmanifest.xml
+#sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-PUBLISHER-HERE/D240C22F-A6C1-45DF-BF7B-4C835064DF51/' $manifest_dir/appxmanifest.xml
+#sed -i 's/INSERT-YOUR-PACKAGE-PROPERTIES-PUBLISHERDISPLAYNAME-HERE/Wappalyzer/' $manifest_dir/appxmanifest.xml
+#sed -i 's/Version="0.\([^"]\+\)/Version="\1.0/' $manifest_dir/appxmanifest.xml
+#
+#cp $webextension_dir/images/icon_44.png  $manifest_dir/Assets/Square44x44Logo.png
+#cp $webextension_dir/images/icon_150.png $manifest_dir/Assets/Square150x150Logo.png
+#cp $webextension_dir/images/icon_50.png  $manifest_dir/Assets/StoreLogo.png
+#
+#manifoldjs -l debug -p edgeextension package $manifest_dir
+#
+#mv Wappalyzer/edgeextension/package/edgeExtension.appx wappalyzer_edge.appx
+#
+#rm -rf Wappalyzer
+#
+#popd > /dev/null
 
 echo "Done (v$version)."
diff --git a/bin/validate-icons b/bin/validate-icons
index 467f6df19..8a6913a46 100755
--- a/bin/validate-icons
+++ b/bin/validate-icons
@@ -4,18 +4,24 @@ var
 	app,
 	fs        = require('fs'),
 	fileType  = require('../node_modules/file-type'),
-	readChunk = require('../node_modules/read-chunk')
-	isSvg     = require('../node_modules/is-svg')
-	json      = require('../src/apps.json');
+	readChunk = require('../node_modules/read-chunk'),
+	isSvg     = require('../node_modules/is-svg'),
+	json      = require('../src/apps.json'),
+
+	basePath = 'src/icons/',
+
+	iconPaths = [];//Will be used to check for stray icons
+
 
 for (app in json.apps) {
 	(function(app) {
 		var
-			basePath = 'src/icons/';
 			iconPath = json.apps[app].icon || 'default.svg';
 			path     = basePath + iconPath,
 			ext      = iconPath.substr(iconPath.length - 4);
 
+		iconPaths.push(iconPath)
+
 		if ( ext !== '.png' && ext !== '.svg' ) {
 			throw err = new Error('Icon file extension specified for app "' + app + '" is not ".png" or ".svg": src/icons/' + iconPath);
 		}
@@ -41,3 +47,14 @@ for (app in json.apps) {
 		});
 	}(app));
 }
+
+
+// Check for stray files in icons folder
+  fs.readdirSync(basePath).forEach(function(file) {
+	if (!fs.statSync(basePath + file).isDirectory()) {
+		if(iconPaths.indexOf(file) === -1){
+			throw new Error('Stray file (no associated app): ' + basePath + file);
+		}
+	}
+  });
+
diff --git a/bin/validate-regex b/bin/validate-regex
index 423aa2c69..380ffdb15 100755
--- a/bin/validate-regex
+++ b/bin/validate-regex
@@ -75,6 +75,18 @@ for ( app in json.apps ) {
 						throw new Error('HTML patterns must contain "<" or ">".\n' + app + ': ' + type + ': ' + pattern);
 					}
 				}
+
+				//Warn about suspicious periods (".") in patterns which should probably have been escaped
+				//	Periods inside character classes (such as [\d.]) don't count as wildcard, so we'll replace
+				//	the character classes in the pattern with "_". (We could remove them entirely, but then
+				//  we'd have to deal with leftover * and + characters; for example, removing the character
+				//  class entirely from the pattern /test.[a-z]+/ would yield the pattern /test.+/, which
+				//  would mean not detecting the un-escaped ".". Replacing the character class with an
+				//	underscore instead gives /test._+/, which WOULD yield a warning about the unescaped ".".)
+				if ( /(?:^\/|[^\\])\.(?:[^*+]|\/$)/.test(regex.replace(/([^\\]|^)\[[^\]]+\]/g,'$1_') ) ) {
+					console.warn('Suspicious period (".") in pattern. Should this have been escaped?\n\tApp: ' + app + '\n\tPattern: ' + type + ': ' + pattern);
+				}
+
 			});
 		}
 	});
diff --git a/src/apps.json b/src/apps.json
index 9ab09dcfb..349376559 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -14,8 +14,8 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "BITRIX_",
-				"X-Powered-CMS": "Bitrix Site Manager"
+				"Set-Cookie": "^BITRIX_",
+				"X-Powered-CMS": "^Bitrix Site Manager"
 			},
 			"html": "(?:<link[^>]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))",
 			"icon": "1C-Bitrix.png",
@@ -78,6 +78,17 @@
 			"icon": "ebis.png",
 			"website": "http://www.ebis.ne.jp"
 		},
+		"Amber": {
+			"cats": [
+				"18",
+				"22"
+			],
+			"headers": {
+				"X-Powered-By": "^Amber$"
+			},
+			"icon": "amber.png",
+			"website": "https://amberframework.org"
+		},
 		"AMPcms": {
 			"cats": [
 				"1"
@@ -256,7 +267,7 @@
 				"36"
 			],
 			"headers": {
-				"X-Advertising-By": "adnegah.net"
+				"X-Advertising-By": "adnegah\\.net"
 			},
 			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
 			"icon": "adnegah.png",
@@ -370,12 +381,22 @@
 				"6"
 			],
 			"html": [
-				"<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy. Information and contribution at https://www.afterbuy.de</dd>"
+				"<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy\\. Information and contribution at https://www\\.afterbuy\\.de</dd>"
 			],
 			"icon": "after-buy.png",
 			"script": "shop-static\\.afterbuy\\.de",
 			"website": "http://www.afterbuy.de"
 		},
+    "Afosto": {
+      "cats": [
+        "6"
+      ],
+      "headers": {
+        "X-Powered-By": "Afosto SaaS BV"
+      },
+      "icon": "Afosto.svg",
+      "website": "http://afosto.com"
+    },
 		"Aircall": {
 			"cats": [
 				"52"
@@ -440,7 +461,7 @@
 			"env": "^AUI$",
 			"icon": "AlloyUI.png",
 			"implies": [
-				"Twitter Bootstrap",
+				"Bootstrap",
 				"YUI"
 			],
 			"script": "^https?://cdn\\.alloyui\\.com/",
@@ -578,7 +599,7 @@
 				"22"
 			],
 			"headers": {
-				"Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:",
+				"Server": "^Apache-Coyote(/1\\.1)?$\\;version:\\1?4.1+:",
 				"X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Apache Tomcat.svg",
@@ -609,7 +630,7 @@
 				"51"
 			],
 			"headers": {
-				"X-Powered-By": "Salesforce.com ApexPages"
+				"X-Powered-By": "Salesforce\\.com ApexPages"
 			},
 			"icon": "ApexPages.png",
 			"implies": "Salesforce",
@@ -661,8 +682,8 @@
 				"35"
 			],
 			"script": [
-				"js.arcgis.com",
-				"basemaps.arcgis.com"
+				"js\\.arcgis\\.com",
+				"basemaps\\.arcgis\\.com"
 			],
 			"icon": "arcgis_icon.png",
 			"website": "https://developers.arcgis.com/javascript/"
@@ -700,7 +721,7 @@
 			],
 			"env": "^ArvanCloud$",
 			"headers": {
-				"AR-PoweredBy": "Arvan Cloud \\(arvancloud.com\\)"
+				"AR-PoweredBy": "Arvan Cloud \\(arvancloud\\.com\\)"
 			},
 			"icon": "ArvanCloud.png",
 			"website": "http://www.ArvanCloud.com"
@@ -718,20 +739,6 @@
 			},
 			"website": "http://www.methods.co.nz/asciidoc"
 		},
-		"Asymptix PHP Framework": {
-			"cats": [
-				"18"
-			],
-			"headers": {
-				"X-Powered-By": "Asymptix PHP Framework(?:.*)"
-			},
-			"html": [
-				"Powered by <a href=\"http://www.asymptix.com/\" rel=\"external\">Asymptix PHP Framework</a>"
-			],
-			"icon": "Asymptix PHP Framework.png",
-			"implies": "PHP",
-			"website": "http://github.com/Asymptix/Framework"
-		},
 		"Atlassian Bitbucket": {
 			"cats": [
 				"47"
@@ -739,6 +746,7 @@
 			"env": "^bitbucket$",
 			"icon": "Atlassian Bitbucket.svg",
 			"implies": "Python",
+      "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9+]\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1</span>",
 			"meta": {
 				"application-name": "Bitbucket"
 			},
@@ -947,6 +955,17 @@
 			"icon": "bizweb.png",
 			"website": "https://www.bizweb.vn"
 		},
+		"Blade": {
+			"cats": [
+				"18", "22"
+			],
+			"headers": {
+				"X-Powered-By": "blade-([\\w.]+)?\\;version:\\1"
+			},
+			"icon": "Blade.png",
+			"implies": "Java",
+			"website": "https://lets-blade.com"
+		},
 		"Blesta": {
 			"cats": [
 				"6"
@@ -1117,6 +1136,14 @@
 			"icon": "Bugzilla.png",
 			"implies": "Perl",
 			"website": "http://www.bugzilla.org"
+        },
+        "Bulma": {
+			"cats": [
+				"18"
+			],
+			"html": "<link[^>]+?href=\"[^\"]+bulma(?:\\.min)?\\.css",
+			"icon": "Bulma.png",
+			"website": "http://bulma.io"
 		},
 		"Burning Board": {
 			"cats": [
@@ -1144,7 +1171,7 @@
 				"36"
 			],
 			"env": "^_bsa",
-			"html": "<script[^>]*>[^<]+?bsa.src\\s*=\\s*['\"](?:https?:)?\\/{2}\\w\\d\\.buysellads\\.com\\/[\\w\\d\\/]+?bsa\\.js['\"]",
+			"html": "<script[^>]*>[^<]+?bsa\\.src\\s*=\\s*['\"](?:https?:)?\\/{2}\\w\\d\\.buysellads\\.com\\/[\\w\\d\\/]+?bsa\\.js['\"]",
 			"icon": "BuySellAds.png",
 			"script": "^https?://s\\d\\.buysellads\\.com/",
 			"website": "http://buysellads.com"
@@ -1208,7 +1235,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "Dragonfly CMS"
+				"X-Powered-By": "^Dragonfly CMS"
 			},
 			"icon": "CPG Dragonfly.png",
 			"implies": "PHP",
@@ -1224,7 +1251,7 @@
 			"env": "^fn_compare_strings$",
 			"html": [
 				"&nbsp;Powered by (?:<a href=[^>]+cs-cart\\.com|CS-Cart)",
-				".cm-noscript[^>]+</style>"
+				"\\.cm-noscript[^>]+</style>"
 			],
 			"icon": "CS Cart.png",
 			"implies": "PHP",
@@ -1421,7 +1448,7 @@
 				"22"
 			],
 			"headers": {
-				"Server": "Cherokee/([\\d.]+)\\;version:\\1"
+				"Server": "Cherokee(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Cherokee.png",
 			"website": "http://www.cherokee-project.com"
@@ -1453,7 +1480,7 @@
 			],
 			"headers": {
 				"Access-Control-Allow-Headers": "X-CKAN-API-KEY",
-				"Link": "<http://ckan.org/>; rel=shortlink"
+				"Link": "<http://ckan\\.org/>; rel=shortlink"
 			},
 			"icon": "Ckan.png",
 			"implies": [
@@ -1563,6 +1590,25 @@
 			"icon": "CodeMirror.png",
 			"website": "http://codemirror.net"
 		},
+		"CoinHive": {
+			"cats": [
+				"19"
+			],
+			"env": "^CoinHive$",
+			"script":  "\\/(?:coinhive|(authedmine))(?:\\.min)?\\.js\\;version:\\1?opt-in:",
+			"url": "https?://cnhv.co/",
+			"icon": "CoinHive.svg",
+			"website": "https://coinhive.com"
+		},
+		"CoinHive Captcha": {
+			"cats": [
+				"16"
+			],
+			"html": "(?:<div[^>]+class=\"coinhive-captcha[^>]+data-key|<div[^>]+data-key[^>]+class=\"coinhive-captcha)",
+			"script":  "https?://authedmine\\.com/(?:lib/captcha|captcha)",
+			"icon": "CoinHive.svg",
+			"website": "https://coinhive.com"
+		},
 		"Comandia": {
 			"cats": [
 				"6"
@@ -1740,7 +1786,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "CppCMS/([\\d.]+)\\;version:\\1"
+				"X-Powered-By": "^CppCMS/([\\d.]+)$\\;version:\\1"
 			},
 			"icon": "CppCMS.png",
 			"implies": "C\\+\\+",
@@ -1751,8 +1797,8 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "CraftSessionId=",
-				"X-Powered-By": "Craft CMS"
+				"Set-Cookie": "^CraftSessionId=",
+				"X-Powered-By": "^Craft CMS$"
 			},
 			"icon": "Craft CMS.svg",
 			"implies": "Yii",
@@ -1764,7 +1810,7 @@
 			],
 			"env": "^CE2$",
 			"icon": "Crazy Egg.png",
-			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js",
+			"script": "script\\.crazyegg\\.com/pages/scripts/\\d+/\\d+\\.js",
 			"website": "http://crazyegg.com"
 		},
 		"Criteo": {
@@ -1785,6 +1831,15 @@
 			"script": "tag\\.crsspxl\\.com/s1\\.js",
 			"website": "http://datadesk.crsspxl.com"
 		},
+    "Crypto-Loot": {
+			"cats": [
+				"19"
+			],
+			"env": "^CryptoLoot$",
+			"script": "^(?:https):?//crypto-loot\\.com/lib/",
+			"icon": "Crypto-Loot.png",
+			"website": "https://crypto-loot.com/"
+		},
 		"CubeCart": {
 			"cats": [
 				"6"
@@ -1810,7 +1865,7 @@
 			"cats": [
 				"25"
 			],
-			"env": "^d3$",
+			"env": "^d3$\\;confidence:20",
 			"icon": "D3.png",
 			"script": "/d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
 			"website": "http://d3js.org"
@@ -1906,7 +1961,7 @@
 				"Server": "Darwin",
 				"X-Powered-By": "Darwin"
 			},
-			"icon": "Darwin.png",
+			"icon": "Apple.svg",
 			"website": "http://opensource.apple.com"
 		},
 		"DataLife Engine": {
@@ -1991,7 +2046,7 @@
 			"cats": [
 				"40"
 			],
-			"icon": "Dell.png",
+			"icon": "Dell.svg",
 			"website": "http://dell.com"
 		},
 		"Deployd": {
@@ -2107,12 +2162,12 @@
 				"8"
 			],
 			"headers": {
-				"Set-Cookie": "DokuWiki="
+				"Set-Cookie": "^DokuWiki="
 			},
 			"icon": "DokuWiki.png",
 			"implies": "PHP",
 			"meta": {
-				"generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
+				"generator": "^DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
 			},
 			"website": "http://www.dokuwiki.org"
 		},
@@ -2152,7 +2207,7 @@
 				"36"
 			],
 			"icon": "DoubleClick.svg",
-			"script": "https?://fls.doubleclick.net",
+			"script": "https?://fls\\.doubleclick\\.net",
 			"website": "http://support.google.com/ds/answer/6029713?hl=en"
 		},
 		"DoubleClick for Publishers (DFP)": {
@@ -2277,7 +2332,10 @@
 				"12"
 			],
 			"icon": "ef.js.svg",
-			"env": "^ef|efCore$",
+			"env": [
+				"^ef$\\;confidence:20",
+				"^efCore$"
+			],
 			"script": "/ef(?:-core)?(?:\\.min|\\.dev)?\\.js",
 			"website": "http://ef.js.org"
 		},
@@ -2612,7 +2670,7 @@
 				"18"
 			],
 			"headers": {
-				"X-Powered-By": "Fat-Free Framework"
+				"X-Powered-By": "^Fat-Free Framework$"
 			},
 			"icon": "Fat-Free Framework.png",
 			"implies": "PHP",
@@ -2628,6 +2686,14 @@
 			"icon": "Fedora.png",
 			"website": "http://fedoraproject.org"
 		},
+		"Fingerprintjs": {
+			"cats": [
+				"12"
+			],
+			"env": "^Fingerprint(\\d)?$\\;version:\\1",
+			"script": "fingerprint(\\d)?(?:\\.min)?\\.js\\;version:\\1",
+			"website": "https://valve.github.io/fingerprintjs2/"
+		},
 		"Firebase": {
 			"cats": [
 				"34"
@@ -2678,7 +2744,7 @@
 			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
 			"icon": "FlexCMP.png",
 			"meta": {
-				"generator": "FlexCMP"
+				"generator": "^FlexCMP"
 			},
 			"website": "http://www.flexcmp.com/cms/home"
 		},
@@ -2810,10 +2876,10 @@
 			"cats": [
 				"20"
 			],
-			"html": "<html[^>]+urn:schemas-microsoft-com:office:office",
 			"icon": "FrontPage.png",
 			"meta": {
-				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
+				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1",
+				"ProgId": "^FrontPage\\."
 			},
 			"website": "http://office.microsoft.com/frontpage"
 		},
@@ -2866,6 +2932,21 @@
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
 			"website": "http://gambio.de"
+    },
+    "Gatsby": {
+			"cats": [
+				"12"
+			],
+      "html": [
+        "<div id=\"___gatsby\">",
+        "<style id=\"gatsby-inlined-css\">"
+      ],
+			"icon": "Gatsby.svg",
+			"implies": [
+        "React",
+        "Webpack"
+			],
+			"website": "https://www.gatsbyjs.org/"
 		},
 		"Gauges": {
 			"cats": [
@@ -2990,7 +3071,7 @@
 			],
 			"html": [
 				"<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
-				"<a href=\"http://www.gitphp.org/\" target=\"_blank\">GitPHP by Chris Han"
+				"<a href=\"http://www\\.gitphp\\.org/\" target=\"_blank\">GitPHP by Chris Han"
 			],
 			"implies": "PHP",
 			"website": "http://gitphp.org"
@@ -2999,7 +3080,7 @@
 			"cats": [
 				"47"
 			],
-			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
+			"html": "Powered by <a href=\"https://gerrit\\.googlesource\\.com/gitiles/\">Gitiles<",
 			"implies": [
 				"Java",
 				"git"
@@ -3143,7 +3224,7 @@
 			"icon": "Google Maps.png",
 			"script": [
 				"(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1",
-				"//maps.googleapis.com/maps/api/js"
+				"//maps\\.googleapis\\.com/maps/api/js"
 			],
 			"website": "http://maps.google.com"
 		},
@@ -3420,7 +3501,7 @@
 			"cats": [
 				"4"
 			],
-			"html": "<p>Produced by <a href=\"http://www.haskell.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
+			"html": "<p>Produced by <a href=\"http://www\\.haskell\\.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
 			"script": "haddock-util\\.js",
 			"website": "http://www.haskell.org/haddock/"
 		},
@@ -3485,7 +3566,7 @@
 			],
 			"env": "^heap$",
 			"icon": "Heap.png",
-			"script": "heap-\\d+.js",
+			"script": "heap-\\d+\\.js",
 			"website": "http://heapanalytics.com"
 		},
 		"Hello Bar": {
@@ -3696,6 +3777,16 @@
 			"implies": "Windows Server",
 			"website": "http://www.iis.net"
 		},
+		"Includable": {
+			"cats": [
+				"18"
+			],
+			"headers": {
+				"X-Includable-Version": ""
+			},
+			"icon": "Includable.svg",
+			"website": "http://includable.com"
+		},
 		"INFOnline": {
 			"cats": [
 				"10"
@@ -3750,7 +3841,7 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "ICMSession[^;]+=",
+				"Set-Cookie": "^ICMSSession[^;]*=",
 				"X-Powered-By": "ImpressCMS"
 			},
 			"icon": "ImpressCMS.png",
@@ -4159,7 +4250,7 @@
 				"X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1"
 			},
 			"html": "(?:<div[^>]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"icon": "Joomla.png",
+			"icon": "Joomla.svg",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
@@ -4167,6 +4258,15 @@
 			"url": "option=com_",
 			"website": "http://joomla.org"
 		},
+		"JSEcoin": {
+			"cats": [
+				"19"
+			],
+			"env": "^jseMine$",
+			"script": "^(?:https):?//load\\.jsecoin\\.com/server/load/",
+			"icon": "JSEcoin.png",
+			"website": "https://jsecoin.com/"
+		},
 		"K2": {
 			"cats": [
 				"19"
@@ -4221,6 +4321,17 @@
 			"script": "cdn\\.mykamva\\.ir",
 			"website": "http://kamva.ir"
 		},
+        "Hinza Advanced CMS" : {
+            "cats" : [
+                "1", "6"
+            ],
+            "icon": "hinza_advanced_cms.svg",
+            "meta" : {
+                "generator": "hinzacms"
+            },
+            "implies": "Laravel",
+            "website" : "http://hinzaco.com"
+        },
 		"Kendo UI": {
 			"cats": [
 				"18"
@@ -4303,7 +4414,7 @@
 			"cats": [
 				"12"
 			],
-			"env": "^ko$",
+			"env": "^ko$\\;confidence:20",
 			"icon": "Knockout.js.png",
 			"website": "http://knockoutjs.com"
 		},
@@ -4415,7 +4526,7 @@
 				"5"
 			],
 			"icon": "Kontaktify.png",
-			"script": "//(?:www\\.)?kontaktify\\.com/embed.js",
+			"script": "//(?:www\\.)?kontaktify\\.com/embed\\.js",
 			"website": "https://www.kontaktify.com"
 		},
 		"Koobi": {
@@ -4559,7 +4670,7 @@
 			],
 			"html": "<!-- \\[START\\] 'blocks/head.rain' -->",
 			"icon": "Lightspeed.svg",
-			"script": "http://assets.webshopapp.com",
+			"script": "http://assets\\.webshopapp\\.com",
 			"url": "seoshop.webshopapp.com",
 			"website": "http://www.lightspeedhq.com/products/ecommerce/"
 		},
@@ -4617,7 +4728,7 @@
 			"headers": {
 				"Server": "^LiteSpeed$"
 			},
-			"icon": "LiteSpeed.png",
+			"icon": "LiteSpeed.svg",
 			"website": "http://litespeedtech.com"
 		},
 		"Lithium": {
@@ -4700,10 +4811,10 @@
 				"<script[^<>]*>[^]{0,128}?src\\s*=\\s*['\"]//counter\\.yadro\\.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
 				"<!--LiveInternet counter-->",
 				"<!--/LiveInternet-->",
-				"<a href=\"http://www.liveinternet.ru/click\""
+				"<a href=\"http://www\\.liveinternet\\.ru/click\""
 			],
 			"icon": "Liveinternet.png",
-			"script": "/js/al/common.js\\?[0-9_]+",
+			"script": "/js/al/common\\.js\\?[0-9_]+",
 			"website": "http://liveinternet.ru/rating/"
 		},
 		"Lo-dash": {
@@ -4854,7 +4965,7 @@
 			],
 			"env": "^setM(?:Iframe|RefURL)$",
 			"icon": "MadAdsMedia.png",
-			"script": "^https?://(?:ads-by|pixel)\\.madadsmedia.com/",
+			"script": "^https?://(?:ads-by|pixel)\\.madadsmedia\\.com/",
 			"website": "http://madadsmedia.com"
 		},
 		"Magento": {
@@ -4869,7 +4980,8 @@
 			},
 			"html": [
 				"<script [^>]+data-requiremodule=\"mage/\\;version:2",
-				"<script [^>]+data-requiremodule=\"Magento_\\;version:2"
+				"<script [^>]+data-requiremodule=\"Magento_\\;version:2",
+        "<script type=\"text/x-magento-init\">"
 			],
 			"icon": "Magento.png",
 			"implies": "PHP",
@@ -4881,7 +4993,7 @@
 			],
 			"website": "http://www.magentocommerce.com"
 		},
-		"Mailchimp": {
+		"MailChimp": {
 			"cats": [
 				"32"
 			],
@@ -4894,8 +5006,8 @@
 			],
 			"icon": "mailchimp.svg",
 			"script": [
-				"s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js",
-				"cdn-images.mailchimp.com/[^>]*.css"
+				"s3\\.amazonaws\\.com/downloads\\.mailchimp\\.com/js/mc-validate\\.js",
+				"cdn-images\\.mailchimp\\.com/[^>]*\\.css"
 			],
 			"website": "http://mailchimp.com"
 		},
@@ -4982,7 +5094,7 @@
 				"2"
 			],
 			"env": "mm_(?:config|license|user|current_user_id)",
-			"html": "<noscript> To use Mattermost, please enable JavaScript. </noscript>",
+			"html": "<noscript> To use Mattermost, please enable JavaScript\\. </noscript>",
 			"icon": "mattermost.png",
 			"implies": [
 				"Go",
@@ -5064,7 +5176,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Powered-By": "Medium"
+				"X-Powered-By": "^Medium$"
 			},
 			"icon": "Medium.svg",
 			"script": "medium\\.com",
@@ -5148,6 +5260,42 @@
 			"icon": "Microsoft.svg",
 			"website": "http://microsoft.com"
 		},
+		"Microsoft Excel": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft Excel.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:excel\"|<!--\\s*(?:START|END) OF OUTPUT FROM EXCEL PUBLISH AS WEB PAGE WIZARD\\s*-->|<div [^>]*x:publishsource=\"?Excel\"?)",
+			"meta": {
+				"generator": "Microsoft Excel( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^Excel\\."
+			},
+			"website": "https://office.microsoft.com/excel"
+		},
+		"Microsoft PowerPoint": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft PowerPoint.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:powerpoint\"|<link rel=\"?Presentation-XML\"? href=\"?[^\"]+\\.xml\"?>|<o:PresentationFormat>[^<]+</o:PresentationFormat>[^!]+<o:Slides>\\d+</o:Slides>(?:[^!]+<o:Version>([\\d.]+)</o:Version>)?)\\;version:\\1",
+			"meta": {
+				"generator": "Microsoft PowerPoint ( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^PowerPoint\\."
+			},
+			"website": "https://office.microsoft.com/powerpoint"
+		},
+		"Microsoft Publisher": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft Publisher.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:publisher\"|<!--[if pub]><xml>)",
+			"meta": {
+				"generator": "Microsoft Publisher( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^Publisher\\."
+			},
+			"website": "https://office.microsoft.com/publisher"
+		},
 		"Microsoft SharePoint": {
 			"cats": [
 				"1"
@@ -5165,11 +5313,23 @@
 			},
 			"website": "http://sharepoint.microsoft.com"
 		},
+		"Microsoft Word": {
+			"cats": [
+				"20"
+			],
+			"icon": "Microsoft Word.svg",
+			"html": "(?:<html [^>]*xmlns:w=\"urn:schemas-microsoft-com:office:word\"|<w:WordDocument>|<div [^>]*class=\"?WordSection1[\" >]|<style[^>]*>[^>]*@page WordSection1)",
+			"meta": {
+				"generator": "Microsoft Word( [\\d.]+)?\\;version:\\1",
+				"ProgId": "^Word\\."
+			},
+			"website": "https://office.microsoft.com/word"
+		},
 		"Mietshop": {
 			"cats": [
 				"6"
 			],
-			"html": "<a href=\"https://ssl.mietshop.d",
+			"html": "<a href=\"https://ssl\\.mietshop\\.d",
 			"icon": "mietshop.png",
 			"meta": {
 				"generator": "Mietshop"
@@ -5253,7 +5413,7 @@
 				"12"
 			],
 			"env": "^Modernizr$",
-			"icon": "Modernizr.png",
+			"icon": "Modernizr.svg",
 			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
 			"website": "http://www.modernizr.com"
 		},
@@ -5263,7 +5423,7 @@
 			],
 			"icon": "modified.png",
 			"meta": {
-				"generator": "\\(c\\) by modified eCommerce Shopsoftware ------ http://www.modified-shop.org"
+				"generator": "\\(c\\) by modified eCommerce Shopsoftware ------ http://www\\.modified-shop\\.org"
 			},
 			"website": "http://www.modified-shop.org/"
 		},
@@ -5272,7 +5432,7 @@
 				"1",
 				"6"
 			],
-			"html": "(?:<script|link)[^>]*mg-(?:core|plugins|templates)",
+			"html": "(?:<script|link)[^>]*(?:src=|href=)[\"'][^\"]*mg-(?:core|plugins|templates)",
 			"icon": "Moguta.CMS.png",
 			"implies": "PHP",
 			"website": "http://moguta.ru"
@@ -5292,7 +5452,8 @@
 				"18"
 			],
 			"headers": {
-				"x-powered-by": "mojolicious"
+				"x-powered-by": "mojolicious",
+				"server": "^mojolicious"
 			},
 			"icon": "Mojolicious.png",
 			"implies": "Perl",
@@ -5542,7 +5703,7 @@
 			"cats": [
 				"25"
 			],
-			"env": "^nv$",
+			"env": "^nv$\\;confidence:20",
 			"html": "<link[^>]* href=[^>]+nv\\.d3(?:\\.min)?\\.css",
 			"icon": "NVD3.png",
 			"implies": "D3",
@@ -5555,7 +5716,7 @@
 			],
 			"env": "^nvg[0-9]$",
 			"icon": "Navegg.png",
-			"script": "tag.navdmp.com",
+			"script": "tag\\.navdmp\\.com",
 			"website": "https://www.navegg.com/"
 		},
 		"Nedstat": {
@@ -5666,7 +5827,7 @@
 			"env": "^Nette$",
 			"headers": {
 				"Set-Cookie": "nette-browser=",
-				"X-Powered-By": "Nette Framework"
+				"X-Powered-By": "^Nette Framework"
 			},
 			"html": [
 				"<input[^>]+data-nette-rules",
@@ -5691,7 +5852,7 @@
 				"22"
 			],
 			"headers": {
-				"x-powered-by": "^Next.js ?([0-9.]+)?\\;version:\\1"
+				"x-powered-by": "^Next\\.js ?([0-9.]+)?\\;version:\\1"
 			},
       "env": "^__NEXT_DATA__$",
       "icon": "zeit.svg",
@@ -5736,7 +5897,7 @@
 				"22"
 			],
 			"headers": {
-				"server": "now"
+				"server": "^now$"
 			},
 			"icon": "zeit.svg",
 			"website": "https://zeit.co/now"
@@ -5776,7 +5937,7 @@
 				"1",
 				"11"
 			],
-			"html": "Powered by <a href=\"http://octopress.org\">",
+			"html": "Powered by <a href=\"http://octopress\\.org\">",
 			"icon": "octopress.png",
 			"implies": "Jekyll",
 			"meta": {
@@ -6123,7 +6284,7 @@
 			],
 			"env": "^IsOwaPremiumBrowser$",
 			"html": "<link\\s[^>]*href=\"[^\"]*?([\\d.]+)/themes/resources/owafont\\.css\\;version:\\1",
-			"icon": "Outlook Web App.png",
+			"icon": "Outlook.svg",
 			"implies": "Microsoft ASP.NET",
 			"url": "/owa/auth/log(?:on|off)\\.aspx",
 			"website": "http://help.outlook.com"
@@ -6154,8 +6315,8 @@
 			],
 			"headers": {
 				"Server": "php/?([\\d.]+)?\\;version:\\1",
-				"Set-Cookie": "PHPSESSID",
-				"X-Powered-By": "php/?([\\d.]+)?\\;version:\\1"
+				"Set-Cookie": "^PHPSESSID",
+				"X-Powered-By": "^php/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "PHP.svg",
 			"url": "\\.php(?:$|\\?)",
@@ -6220,13 +6381,21 @@
 			"script": "paths(?:\\.min)?\\.js",
 			"website": "http://github.com/andreaferretti/paths-js"
 		},
+		"Braintree": {
+			"cats": [
+				"41"
+			],
+			"env": "^braintree$",
+			"icon": "Braintree.svg",
+			"website": "https://www.braintreepayments.com"
+		},
 		"PayPal": {
 			"cats": [
 				"41"
 			],
 			"env": "^PAYPAL$",
 			"html": "<input[^>]+_s-xclick",
-			"icon": "PayPal.png",
+			"icon": "PayPal.svg",
 			"script": "paypalobjects\\.com/js",
 			"website": "http://paypal.com"
 		},
@@ -6334,6 +6503,17 @@
 			"script": "/phenomic.browser.[a-f0-9]+.js",
 			"website": "https://phenomic.io/"
 		},
+		"PHPoole": {
+			"cats": [
+				"1",
+				"11"
+			],
+			"icon": "PHPoole.png",
+			"meta": {
+				"generator": "^PHPoole$"
+			},
+			"website": "https://phpoole.org"
+		},
 		"Phusion Passenger": {
 			"cats": [
 				"22"
@@ -6362,7 +6542,7 @@
 				"18"
 			],
 			"headers": {
-				"X-Powered-By": "pimcore"
+				"X-Powered-By": "^pimcore$"
 			},
 			"icon": "pimcore.svg",
 			"implies": "PHP",
@@ -6380,7 +6560,10 @@
 			"cats": [
 				"1"
 			],
-			"html": "<[^<]+=\"[^\"]*site/[a-z0-9/._-]*/resourceCached/[a-z0-9/._-]*\"[^>]*>|[^<]+cbi:///cms/[^>]+",
+			"html": [
+        "<(?:script|link)[^>]/site/[a-z0-9/._-]+/resourceCached/[a-z0-9/._-]+",
+        "<input[^>]+cbi:///cms/"
+      ],
 			"icon": "pirobaseCMS.svg",
 			"implies": "Java",
 			"website": "https://www.pirobase-imperia.com/de/produkte/produktuebersicht/pirobase-cms"
@@ -6563,13 +6746,22 @@
 				"<!-- /Block [a-z ]+ module (?:HEADER|TOP)?\\s?-->",
 				"<!-- /Module Block [a-z ]+ -->"
 			],
-			"icon": "PrestaShop.png",
+			"icon": "PrestaShop.svg",
 			"implies": "PHP",
 			"meta": {
 				"generator": "PrestaShop"
 			},
 			"website": "http://www.prestashop.com"
 		},
+		"Prism": {
+			"cats": [
+				"19"
+			],
+			"env": "^Prism$",
+			"icon": "Prism.svg",
+			"script": "prism\\.js",
+			"website": "http://prismjs.com"
+		},
 		"Project Wonderful": {
 			"cats": [
 				"36"
@@ -6580,6 +6772,15 @@
 			"script": "^https?://(?:www\\.)?projectwonderful\\.com/(?:pwa\\.js|gen\\.php)",
 			"website": "http://projectwonderful.com"
 		},
+		"ProjectPoi": {
+			"cats": [
+				"19"
+			],
+			"env": "^ProjectPoi$",
+			"script": "^(?:https):?//ppoi\\.org/lib/",
+			"icon": "ProjectPoi.png",
+			"website": "https://ppoi.org/"
+		},
 		"Prospector": {
 			"cats": [
 				"36"
@@ -6664,7 +6865,7 @@
 			"cats": [
 				"19"
 			],
-			"html": "<link[^>]+pygments.css[\"']",
+			"html": "<link[^>]+pygments\\.css[\"']",
 			"icon": "pygments.png",
 			"website": "http://pygments.org"
 		},
@@ -6827,7 +7028,7 @@
 			"icon": "Rakuten DBCore.png",
 			"meta": {
 				"generator": "Rakuten DBCore",
-				"generator:site": "http://ecservice.rakuten.com.br"
+				"generator:site": "http://ecservice\\.rakuten\\.com\\.br"
 			},
 			"website": "http://ecservice.rakuten.com.br"
 		},
@@ -6846,7 +7047,7 @@
 			"env": "^Raphael$",
 			"icon": "Raphael.png",
 			"script": "raphael.*\\.js",
-			"website": "http://raphaeljs.com"
+			"website": "http://dmitrybaranovskiy.github.io/raphael/"
 		},
 		"Rapid Logic": {
 			"cats": [
@@ -6870,12 +7071,11 @@
 		},
 		"Rayo": {
 			"cats": [
-				"6"
+				"1"
 			],
 			"env": "^Rayo",
             "icon": "Rayo.png",
-            "implies": [ "AngularJS", "Microsoft ASP.NET", "Twitter Bootstrap", "jQuery", "Underscore.js", "Moment.js",
-            "Font Awesome", "Google Maps", "Modernizr", "Semantic-ui" ],
+            "implies": [ "AngularJS", "Microsoft ASP.NET" ],
             "meta": {
 				"generator": "^Rayo"
 			},
@@ -7179,6 +7379,7 @@
 			"env": "^smf_",
 			"icon": "SMF.png",
 			"implies": "PHP",
+      "html": "credits/?\" title=\"Simple Machines Forum\" target=\"_blank\" class=\"new_win\">SMF ([0-9.]+)</a>\\;version:\\1",
 			"website": "http://www.simplemachines.org"
 		},
 		"SOBI 2": {
@@ -7267,7 +7468,7 @@
 			],
 			"headers": {
 				"Set-Cookie": "^sails\\.sid$",
-				"X-Powered-By": "^Sails$"
+				"X-Powered-By": "^Sails(?:$|[^a-z0-9])"
 			},
 			"icon": "Sails.js.svg",
 			"implies": "Express",
@@ -7294,6 +7495,7 @@
 				"Server": "Demandware eCommerce Server"
 			},
 			"html": "<[^>]+demandware\\.edgesuite",
+			"script": "/demandware\\.static/",
 			"icon": "Salesforce.svg",
 			"website": "http://demandware.com"
 		},
@@ -7367,12 +7569,22 @@
 			"icon": "Scientific Linux.png",
 			"website": "http://scientificlinux.org"
 		},
+		"SeamlessCMS": {
+			"cats": [
+				"1"
+			],
+			"icon": "SeamlessCMS.png",
+			"meta": {
+				"generator": "^Seamless\\.?CMS"
+			},
+			"website": "http://www.seamlesscms.com"
+		},
 		"Segment": {
 			"cats": [
 				"10"
 			],
 			"env": "^analytics$",
-			"html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics.js[\\s\\S]*script>",
+			"html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics\\.js[\\s\\S]*script>",
 			"icon": "Segment.png",
 			"script": "cdn\\.segment\\.com/analytics\\.js",
 			"website": "http://segment.com"
@@ -7583,7 +7795,11 @@
 			"meta": {
 				"application-name": "Shopware"
 			},
-			"script": "(?:(shopware)|/web/cache/[0-9]{10}_.+)\\.js\\;version:\\1?4:5",
+			"script": [
+        "(?:(shopware)|/web/cache/[0-9]{10}_.+)\\.js\\;version:\\1?4:5",
+        "/jquery\\.shopware\\.min\\.js",
+        "/engine/Shopware/"
+      ],
 			"website": "http://shopware.com"
 		},
 		"Silva": {
@@ -7785,10 +8001,10 @@
 			"cats": [
 				"12"
 			],
-			"env": "^io$",
+			"env": "^io$\\;confidence:20",
 			"icon": "Socket.io.png",
 			"implies": "Node.js",
-			"script": "socket.io.*\\.js",
+			"script": "socket\\.io.*\\.js",
 			"website": "http://socket.io"
 		},
 		"Solodev": {
@@ -8009,6 +8225,16 @@
 			"script": "statcounter\\.com/counter/counter",
 			"website": "http://www.statcounter.com"
 		},
+		"Storeden": {
+			"cats" : [
+				"6"
+			],
+			"headers" : {
+				"X-Powered-By": "Storeden"
+			},
+			"icon": "storeden.svg",
+			"website": "https://www.storeden.com"
+		},
 		"Store Systems": {
 			"cats": [
 				"6"
@@ -8033,7 +8259,7 @@
 			],
 			"icon": "strapdown.js.png",
 			"implies": [
-				"Twitter Bootstrap",
+				"Bootstrap",
 				"Google Code Prettify"
 			],
 			"script": "strapdown\\.js",
@@ -8043,7 +8269,7 @@
 			"cats": [
 				"6"
 			],
-			"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
+			"html": "<a href=\"http://www\\.strato\\.de/\" target=\"_blank\">",
 			"icon": "strato.png",
 			"website": "http://shop.strato.com"
 		},
@@ -8119,6 +8345,17 @@
 			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
 			"website": "http://buildinternet.com/project/supersized"
 		},
+		"Svbtle": {
+			"cats": [
+				"11"
+			],
+			"icon": "svbtle.png",
+			"meta": {
+				"generator": "^Svbtle\\.com$"
+			},
+			"url": "\\.svbtle\\.com",
+			"website": "https://www.svbtle.com"
+		},
 		"SweetAlert": {
 			"cats": [
 				"12"
@@ -8360,9 +8597,7 @@
 			"cats": [
 				"6"
 			],
-			"script": [
-				"https:\\/\\/tictail\\.com"
-			],
+			"html": "<link[^>]*tictail\\.com",
 			"icon": "tictail.png",
 			"website": "https://tictail.com"
 		},
@@ -8399,6 +8634,15 @@
 			"script": "(?:/|_)tiki",
 			"website": "http://tiki.org"
 		},
+		"Tilda": {
+			"cats": [
+				"1"
+			],
+			"icon": "tilda.png",
+			"html": "<link[^>]* href=[^>]+tilda(?:cdn|\\.ws|-blocks)",
+			"script": "tilda(?:cdn|\\.ws|-blocks)",
+			"website": "https://tilda.cc"
+		},
 		"Timeplot": {
 			"cats": [
 				"25"
@@ -8477,7 +8721,7 @@
 			],
 			"env": "^TrackJs$",
 			"icon": "TrackJs.png",
-			"script": "tracker.js",
+			"script": "tracker\\.js",
 			"website": "http://trackjs.com"
 		},
 		"Translucide": {
@@ -8562,19 +8806,18 @@
 			"script": "//platform\\.twitter\\.com/widgets\\.js",
 			"website": "http://twitter.com"
 		},
-		"Twitter Bootstrap": {
+		"Bootstrap": {
 			"cats": [
 				"18"
 			],
-			"env": "^Twipsy$\\;confidence:50",
 			"html": [
 				"<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
 				"<link[^>]+?href=\"[^\"]+bootstrap(?:\\.min)?\\.css",
 				"<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
 			],
-			"icon": "Twitter Bootstrap.png",
-			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.js|\\.min\\.js))",
-			"website": "http://getbootstrap.com"
+			"icon": "Bootstrap.png",
+			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.min)?\\.js)",
+			"website": "https://getbootstrap.com"
 		},
 		"Twitter Emoji (Twemoji)": {
 			"cats": [
@@ -8718,7 +8961,7 @@
 				"1"
 			],
 			"headers": {
-				"X-Generated-By": "UMI.CMS"
+				"X-Generated-By": "UMI\\.CMS"
 			},
 			"icon": "UMI.CMS.png",
 			"implies": "PHP",
@@ -8733,6 +8976,7 @@
 				"X-Unbounce-PageId": ""
 			},
 			"icon": "Unbounce.png",
+			"script": "ubembed\\.com",
 			"website": "http://unbounce.com"
 		},
 		"Underscore.js": {
@@ -8903,6 +9147,18 @@
 			"script": "zencdn\\.net/c/video\\.js",
 			"website": "http://videojs.com"
 		},
+		"Vigbo": {
+			"cats": [
+				"1"
+			],
+			"headers": {
+				"Set-Cookie": "_gphw_mode="
+			},
+			"icon": "vigbo.png",
+      "html": "<link[^>]* href=[^>]+(?:\\.vigbo\\.com|\\.gophotoweb\\.com)",
+      "script": "(?:\\.vigbo.com|\\.gophotoweb\\.com)",
+			"website": "https://vigbo.com"
+		},
 		"VigLink": {
 			"cats": [
 				"36"
@@ -8928,17 +9184,6 @@
 			"icon": "Vimeo.png",
 			"website": "http://vimeo.com"
 		},
-		"Vinala": {
-			"cats": [
-				"18"
-			],
-			"headers": {
-				"Set-Cookie": "vinala_version"
-			},
-			"icon": "Vinala.png",
-			"implies": "PHP",
-			"website": "https://github.com/vinala/vinala"
-		},
 		"Virata EmWeb": {
 			"cats": [
 				"22"
@@ -9052,7 +9297,7 @@
 				"6"
 			],
 			"env": "^WEBXPAY$",
-			"html": "Powered by <a href=\"https://www.webxpay.com\">WEBXPAY<",
+			"html": "Powered by <a href=\"https://www\\.webxpay\\.com\">WEBXPAY<",
 			"icon": "WEBXPAY.png",
 			"website": "https://webxpay.com"
 		},
@@ -9333,14 +9578,14 @@
 			"cats": [
 				"6"
 			],
-			"env": "woocommerce",
+			"env": "^woocommerce_params$",
 			"html": "<!-- WooCommerce",
 			"icon": "WooCommerce.png",
 			"implies": "WordPress",
 			"meta": {
 				"generator": "WooCommerce ([\\d.]+)\\;version:\\1"
 			},
-			"script": "woocommerce",
+			"script": "woocommerce(?:\\.min)?\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
 			"website": "http://www.woothemes.com/woocommerce"
 		},
 		"Woopra": {
@@ -9485,6 +9730,21 @@
 			"icon": "XenForo.png",
 			"website": "http://xenforo.com"
 		},
+		"Xeora": {
+			"cats": [
+				"18",
+				"22",
+				"27"
+			],
+			"html": "<input type=\"hidden\" name=\"_sys_bind_\\d+\" id=\"_sys_bind_\\d+\" />",
+			"headers": {
+				"Server": "XeoraEngine",
+				"X-Powered-By": "XeoraCube"
+			},
+			"icon": "xeora.png",
+			"script": "/_bi_sps_v.+\\.js",
+			"website": "http://www.xeora.org"
+		},
 		"Xitami": {
 			"cats": [
 				"22"
@@ -9500,7 +9760,7 @@
 				"6"
 			],
 			"html": [
-				"Powered by <a href=\"http://www.xonic-solutions.de/index.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"
+				"Powered by <a href=\"http://www\\.xonic-solutions\\.de/index\\.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"
 			],
 			"icon": "xonic.png",
 			"meta": {
@@ -9628,7 +9888,7 @@
 			],
 			"env": "^yii$",
 			"html": [
-				"Powered by <a href=\"http://www.yiiframework.com/\" rel=\"external\">Yii Framework</a>",
+				"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)\\]"
 			],
@@ -9641,7 +9901,7 @@
 		},
 		"Yoast SEO": {
 			"cats": [
-				"32"
+				"54"
 			],
 			"html": [
 				"<!-- This site is optimized with the Yoast"
@@ -9844,7 +10104,7 @@
 			],
 			"html": [
 				"<[^>]+id='cgit'",
-				"generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v([\\d.a-z-]+)</a>\\;version:\\1"
+				"generated by <a href='http://git\\.zx2c4\\.com/cgit/about/'>cgit v([\\d.a-z-]+)</a>\\;version:\\1"
 			],
 			"icon": "cgit.png",
 			"implies": "git",
@@ -9953,7 +10213,7 @@
 				"47"
 			],
 			"headers": {
-				"X-Powered-By": "^enduro.js$"
+				"X-Powered-By": "^enduro\\.js$"
 			},
 			"icon": "enduro.js.svg",
 			"implies": "Node.js",
@@ -9963,7 +10223,7 @@
 			"cats": [
 				"47"
 			],
-			"icon": "git.png",
+			"icon": "git.svg",
 			"meta": {
 				"generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
 			},
@@ -9985,7 +10245,7 @@
 				"47"
 			],
 			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
-			"icon": "git.png",
+			"icon": "git.svg",
 			"implies": [
 				"Perl",
 				"git"
@@ -9993,7 +10253,7 @@
 			"meta": {
 				"generator": "gitweb(?:/([\\d.]+\\d))?\\;version:\\1"
 			},
-			"script": "static/gitweb.js$",
+			"script": "static/gitweb\\.js$",
 			"website": "http://git-scm.com"
 		},
 		"govCMS": {
@@ -10070,8 +10330,8 @@
 				"8"
 			],
 			"html": [
-				"<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" href=\"/ikiwiki\\.cgi",
-				"<a href=\"/ikiwiki\\.cgi\\?do="
+				"<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" href=\"[^\"]*/ikiwiki\\.cgi",
+				"<a href=\"/(?:cgi-bin/)?ikiwiki\\.cgi\\?do="
 			],
 			"icon": "ikiwiki.png",
 			"website": "http://ikiwiki.info"
@@ -10412,7 +10672,7 @@
 			"cats": [
 				"19"
 			],
-			"html": "<a href=\"https://owncloud.com\" target=\"_blank\">ownCloud Inc.</a><br/>Your Cloud, Your Data, Your Way!",
+			"html": "<a href=\"https://owncloud\\.com\" target=\"_blank\">ownCloud Inc\\.</a><br/>Your Cloud, Your Data, Your Way!",
 			"icon": "ownCloud.png",
 			"implies": "PHP",
 			"meta": {
@@ -10514,8 +10774,8 @@
 			],
 			"html": [
 				"<span id='logo'>phpLiteAdmin</span> <span id='version'>v([0-9.]+)<\\;version:\\1",
-				"<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www.phpliteadmin.org/) -->",
-				"Powered by <a href='http://www.phpliteadmin\\.org/'"
+				"<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www\\.phpliteadmin\\.org/) -->",
+				"Powered by <a href='http://www\\.phpliteadmin\\.org/'"
 			],
 			"icon": "phpliteadmin.png",
 			"implies": [
@@ -10673,7 +10933,7 @@
 			"meta": {
 				"generator": "uKnowva (?: ([\\d.]+))?\\;version:\\1"
 			},
-			"script": "/media/conv/js/jquery.js",
+			"script": "/media/conv/js/jquery\\.js",
 			"website": "http://uknowva.com"
 		},
 		"vBulletin": {
@@ -10764,16 +11024,6 @@
 			},
 			"website": "http://www.xt-commerce.com"
 		},
-		"xui": {
-			"cats": [
-				"26",
-				"12"
-			],
-			"env": "^xui$",
-			"icon": "xui.png",
-			"script": "[^a-z]xui.*\\.js",
-			"website": "http://xuijs.com"
-		},
     "Raychat": {
       "cats": [
         "52"
@@ -10782,7 +11032,39 @@
       "icon": "raychat.svg",
       "script": "app\\.raychat\\.io/scripts/js",
       "website": "https://raychat.io"
-    }
+    },
+    "Mautic": {
+      "cats": [
+        "32"
+      ],
+      "env": "^MauticTrackingObject$",
+      "icon": "mautic.svg",
+      "script": "[^a-z]mtc.*\\.js",
+      "website": "https://www.mautic.org/"
+    },
+    "Anetwork": {
+    	"cats": [
+     		"36"
+    	],
+    	"icon": "Anetwork.png",
+   		"script": "static-cdn\\.anetwork\\.ir/",
+    	"website": "https://www.anetwork.ir"
+   	},
+		"Akaunting": {
+			"cats": [
+				"55"
+			],
+			"html": [
+				"<link[^>]+akaunting-green\\.css",
+				"Powered By Akaunting: <a [^>]*href=\"https?://(?:www\\.)?akaunting\\.com[^>]+>"
+			],
+			"headers": {
+				"X-Akaunting": "^Free Accounting Software$"
+			},
+			"implies": "Laravel",
+			"icon": "akaunting.svg",
+			"website": "https://akaunting.com"
+		}
 	},
 	"categories": {
 		"1": {
@@ -10996,6 +11278,14 @@
 		"53": {
 			"name": "CRM",
 			"priority": "9"
+		},
+    "54": {
+      "name": "SEO",
+      "priority": "9"
+    },
+		"55": {
+			"name": "Accounting",
+			"priority": "1"
 		}
 	}
 }
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 28cfca9c1..1bcb3783c 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -1,158 +1,153 @@
 /**
- * WebExtension driver
+ * Bookmarklet driver
  */
 
 /** global: wappalyzer */
 /** global: XMLHttpRequest */
 
 (function() {
-	if ( typeof wappalyzer === 'undefined' ) {
-		return;
-	}
-
-	var
-		w             = wappalyzer,
-		debug         = true,
-		d             = window.document,
-		container     = d.getElementById('wappalyzer-container'),
-		domain        = window.top.location.host,
-		url           = window.top.location.href.replace(/#.*$/, ''),
-		hasOwn        = Object.prototype.hasOwnProperty;
-
-	w.driver = {
-		timeout: 1000,
-
-		/**
-		 * Log messages to console
-		 */
-		log: function(args) {
-			if ( debug && console != null && console[args.type] != null ) {
-				console[args.type](args.message);
-			}
-		},
-
-		/**
-		 * Initialize
-		 */
-		init: function() {
-			w.driver.getEnvironmentVars();
-			w.driver.getResponseHeaders();
-		},
-
-		getEnvironmentVars: function() {
-			w.log('func: getEnvironmentVars');
-
-			var i, env = [];
-
-			for ( i in window ) {
-				env.push(i);
-			}
-
-			w.analyze(domain, url, { html: d.documentElement.innerHTML, env: env });
-		},
-
-		getResponseHeaders: function() {
-			w.log('func: getResponseHeaders');
-
-			var xhr = new XMLHttpRequest();
-
-			xhr.open('GET', url, true);
-
-			xhr.onreadystatechange = function() {
-				if ( xhr.readyState === 4 && xhr.status ) {
-					var headers = xhr.getAllResponseHeaders().split("\n");
-
-					if ( headers.length > 0 && headers[0] != '' ) {
-						w.log('responseHeaders: ' + xhr.getAllResponseHeaders());
-
-						var responseHeaders = {};
-
-						headers.forEach(function(line) {
-							var name, value;
-
-							if ( line ) {
-								name  = line.substring(0, line.indexOf(': '));
-								value = line.substring(line.indexOf(': ') + 2, line.length - 1);
-
-								responseHeaders[name.toLowerCase()] = value;
-							}
-						});
-
-						w.analyze(domain, url, { headers: responseHeaders });
-					}
-				}
-			}
-
-			xhr.send();
-		},
-
-		/**
-		 * Display apps
-		 */
-		displayApps: function() {
-			w.log('func: diplayApps');
-
-			var
-				i,
-				first = true,
-				app,
-				category,
-				html;
-
-			html =
-				'<a id="wappalyzer-close" href="javascript: window.document.body.removeChild(window.document.getElementById(\'wappalyzer-container\')); void(0);">' +
-					'Close' +
-				'</a>' +
-				'<div id="wappalyzer-apps">';
-
-			if ( detected[url] != null && Object.keys(detected[url]).length ) {
-				for ( app in detected[url] ) {
-					if ( !hasOwn.call(detected[url], app) ) {
-						continue;
-					}
-
-					html +=
-						'<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
-							'<a target="_blank" class="wappalyzer-application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
-								'<strong>' +
-									'<img src="' + w.config.websiteURL + 'images/icons/' + (w.apps[app].icon || 'default.svg') + '" width="16" height="16"/> ' + app +
-								'</strong>' +
-							'</a>';
-
-					for ( i in w.apps[app].cats ) {
-						if ( !hasOwn.call(w.apps[app].cats, i) ) {
-							continue;
-						}
-
-						category = w.categories[w.apps[app].cats[i]].name;
-
-						html += '<a target="_blank" class="wappalyzer-category" href="' + w.config.websiteURL + 'categories/' + w.driver.slugify(category) + '">' + category + '</a>';
-					}
-
-					html += '</div>';
-
-					first = false;
-				}
-			} else {
-				html += '<div id="wappalyzer-empty">No applications detected</div>';
-			}
-
-			html += '</div>';
-
-			container.innerHTML = html;
-		},
-
-		/**
-		 * Go to URL
-		 */
-		goToURL: function(args) {
-			window.open(args.url);
-		},
-
-		slugify: function(string) {
-			return string.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '');
-		}
-	};
-
-	w.driver.init();
+	const container = document.getElementById('wappalyzer-container');
+	const domain = top.location.host;
+	const url = top.location.href.replace(/#.*$/, '');
+	const hasOwn = Object.prototype.hasOwnProperty;
+
+  /**
+   * Log messages to console
+   */
+  wappalyzer.driver.log = (message, source, type) => {
+    console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
+  };
+
+  function getPageContent() {
+    wappalyzer.log('func: getPageContent');
+
+    var env = [];
+
+    for ( let i in window ) {
+      env.push(i);
+    }
+
+    var scripts = Array.prototype.slice
+      .apply(document.scripts)
+      .filter(s => s.src)
+      .map(s => s.src);
+
+    wappalyzer.analyze(domain, url, {
+      html: document.documentElement.innerHTML,
+      env: env,
+      scripts: scripts
+    });
+  }
+
+	function getResponseHeaders() {
+    wappalyzer.log('func: getResponseHeaders');
+
+    var xhr = new XMLHttpRequest();
+
+    xhr.open('GET', url, true);
+
+    xhr.onreadystatechange = () => {
+      if ( xhr.readyState === 4 && xhr.status ) {
+        var headers = xhr.getAllResponseHeaders().split("\n");
+
+        if ( headers.length > 0 && headers[0] != '' ) {
+          wappalyzer.log('responseHeaders: ' + xhr.getAllResponseHeaders());
+
+          var responseHeaders = {};
+
+          headers.forEach(line => {
+            var name, value;
+
+            if ( line ) {
+              name  = line.substring(0, line.indexOf(': '));
+              value = line.substring(line.indexOf(': ') + 2, line.length - 1);
+
+              if ( !responseHeaders[name.toLowerCase()] ){
+                responseHeaders[name.toLowerCase()] = []
+              }
+              responseHeaders[name.toLowerCase()].push(value);
+            }
+          });
+
+          wappalyzer.analyze(domain, url, {
+            headers: responseHeaders
+          });
+        }
+      }
+    }
+
+    xhr.send();
+  }
+
+  /**
+   * Display apps
+   */
+  wappalyzer.driver.displayApps = detected => {
+    wappalyzer.log('func: diplayApps');
+
+    var first = true;
+    var app;
+    var category;
+    var html;
+
+    html =
+      '<a id="wappalyzer-close" href="javascript: document.body.removeChild(document.getElementById(\'wappalyzer-container\')); void(0);">' +
+        'Close' +
+      '</a>' +
+      '<div id="wappalyzer-apps">';
+
+    if ( detected != null && Object.keys(detected).length ) {
+      for ( app in detected ) {
+        if ( !hasOwn.call(detected, app) ) {
+          continue;
+        }
+
+        var version = detected[app].version,
+          confidence = detected[app].confidence;
+        
+        html +=
+          '<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
+            '<a target="_blank" class="wappalyzer-application" href="' + wappalyzer.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
+              '<strong>' +
+                '<img src="' + wappalyzer.config.websiteURL + 'images/icons/' + (wappalyzer.apps[app].icon || 'default.svg') + '" width="16" height="16"/> ' + app +
+              '</strong>' +
+              ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + 
+            '</a>';
+
+        for ( let i in wappalyzer.apps[app].cats ) {
+          if ( !hasOwn.call(wappalyzer.apps[app].cats, i) ) {
+            continue;
+          }
+
+          category = wappalyzer.categories[wappalyzer.apps[app].cats[i]].name;
+
+          html += '<a target="_blank" class="wappalyzer-category" href="' + wappalyzer.config.websiteURL + 'categories/' + slugify(category) + '">' + category + '</a>';
+        }
+
+        html += '</div>';
+
+        first = false;
+      }
+    } else {
+      html += '<div id="wappalyzer-empty">No applications detected</div>';
+    }
+
+    html += '</div>';
+
+    container.innerHTML = html;
+  },
+
+  /**
+   * Open a tab
+   */
+  function openTab(args) {
+    open(args.url);
+  }
+
+  function slugify(string) {
+    return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+  }
+
+  getPageContent();
+  getResponseHeaders();
 })();
diff --git a/src/drivers/npm/README.md b/src/drivers/npm/README.md
index afa90ec84..c13078019 100644
--- a/src/drivers/npm/README.md
+++ b/src/drivers/npm/README.md
@@ -1,14 +1,14 @@
 # Wappalyzer
 
-[Wappalyzer](https://wappalyzer.com/) is a
+[Wappalyzer](https://www.wappalyzer.com/) is a
 [cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
 technologies used on websites. It detects
-[content management systems](https://wappalyzer.com/categories/cms),
-[eCommerce platforms](https://wappalyzer.com/categories/ecommerce),
-[web servers](https://wappalyzer.com/categories/web-servers),
-[JavaScript frameworks](https://wappalyzer.com/categories/javascript-frameworks),
-[analytics tools](https://wappalyzer.com/categories/analytics) and
-[many more](https://wappalyzer.com/applications).
+[content management systems](https://www.wappalyzer.com/categories/cms),
+[eCommerce platforms](https://www.wappalyzer.com/categories/ecommerce),
+[web servers](https://www.wappalyzer.com/categories/web-servers),
+[JavaScript frameworks](https://www.wappalyzer.com/categories/javascript-frameworks),
+[analytics tools](https://www.wappalyzer.com/categories/analytics) and
+[many more](https://www.wappalyzer.com/applications).
 
 
 ## Installation
@@ -20,21 +20,49 @@ $ npm i wappalyzer
 
 ## Run from the command line
 
-```shell
-$ node index.js https://wappalyzer.com
+```
+node index.js [url] [options]
+```
+
+### Options
+
+```
+  --debug=0|1             Output debug messages.
+  --delay=ms              Wait for ms milliseconds between requests.
+  --max-depth=num         Don't analyze pages more than num levels deep.
+  --max-urls=num          Exit when num URLs have been analyzed.
+  --max-wait=ms           Wait no more than ms milliseconds for page resources to load.
+  --recursive=0|1         Follow links on pages (crawler).
+  --request-timeout=ms    Wait no more than ms millisecond for the page to load.
+  --user-agent=str        Set the user agent string.
 ```
 
 
 ## Run from a script
 
 ```javascript
-const wappalyzer = require('wappalyzer');
+const options = {
+  debug: false,
+  delay: 500,
+  maxDepth: 3,
+  maxUrls: 10,
+  maxWait: 1000,
+  recursive: true,
+  requestTimeout: 3000,
+  userAgent: 'Wappalyzer',
+};
+
+const wappalyzer = new Wappalyzer('https://www.wappalyzer.com', options);
 
-wappalyzer.analyze('https://wappalyzer.com')
+wappalyzer.analyze()
   .then(json => {
-    console.log(JSON.stringify(json, null, 2));
+    process.stdout.write(JSON.stringify(json, null, 2) + '\n')
+
+    process.exit(0);
   })
   .catch(error => {
-    console.error(error);
-  });
+    process.stderr.write(error + '\n')
+
+    process.exit(1);
+});
 ```
diff --git a/src/drivers/npm/driver.js b/src/drivers/npm/driver.js
index bae6c69be..d15961ac9 100644
--- a/src/drivers/npm/driver.js
+++ b/src/drivers/npm/driver.js
@@ -2,89 +2,201 @@
 
 const Wappalyzer = require('./wappalyzer');
 const request = require('request');
+const url = require('url');
 const fs = require('fs');
 const Browser = require('zombie');
 
 const json = JSON.parse(fs.readFileSync(__dirname + '/apps.json'));
 
-const driver = {
-  quiet: true,
-
-  analyze: url => {
-    const wappalyzer = new Wappalyzer();
+class Driver {
+  constructor(pageUrl, options) {
+    this.options = Object.assign({}, {
+      debug: false,
+      delay: 500,
+      maxDepth: 3,
+      maxUrls: 10,
+      maxWait: 1000,
+      recursive: false,
+      requestTimeout: 3000,
+      userAgent: 'Mozilla/5.0 (compatible; Wappalyzer)',
+    }, options || {});
+
+    this.options.debug = Boolean(this.options.debug);
+    this.options.recursive = Boolean(this.options.recursive);
+    this.options.delay = this.options.recursive ? parseInt(this.options.delay, 10) : 0;
+    this.options.maxDepth = parseInt(this.options.maxDepth, 10);
+    this.options.maxUrls = parseInt(this.options.maxUrls, 10);
+    this.options.maxWait = parseInt(this.options.maxWait, 10);
+
+    this.origPageUrl = url.parse(pageUrl);
+    this.analyzedPageUrls = [];
+    this.apps = [];
+
+    this.wappalyzer = new Wappalyzer();
+
+    this.wappalyzer.apps = json.apps;
+    this.wappalyzer.categories = json.categories;
+
+    this.wappalyzer.driver.log = (message, source, type) => this.log(message, source, type);
+    this.wappalyzer.driver.displayApps = detected => this.displayApps(detected);
+  }
 
-    wappalyzer.apps = json.apps;
-    wappalyzer.categories = json.categories;
+  analyze() {
+    this.time = {
+      start: new Date().getTime(),
+      last: new Date().getTime(),
+    }
 
-    return new Promise((resolve, reject) => {
-      wappalyzer.driver.log = (message, source, type) => {
-        if ( type === 'error' ) {
-          return reject(message);
-        }
+    return this.crawl(this.origPageUrl);
+  }
 
-        if ( !driver.quiet ) {
-          console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
-        }
-      };
+  log(message, source, type) {
+    this.options.debug && console.log('[wappalyzer ' + type + ']', '[' + source + ']', message);
+  }
 
-      wappalyzer.driver.displayApps = detected => {
-        var apps = [];
+  displayApps(detected) {
+    this.timer('displayApps');
 
-        Object.keys(detected).forEach(appName => {
-          const app = detected[appName];
+    Object.keys(detected).forEach(appName => {
+      const app = detected[appName];
 
-          var categories = [];
+      var categories = [];
 
-          app.props.cats.forEach(id => {
-            var category = {};
+      app.props.cats.forEach(id => {
+        var category = {};
 
-            category[id] = wappalyzer.categories[id].name;
+        category[id] = json.categories[id].name;
 
-            categories.push(category)
-          });
+        categories.push(category)
+      });
 
-          apps.push({
-            name: app.name,
-            confidence: app.confidenceTotal.toString(),
-            version: app.version,
-            icon: app.props.icon || 'default.svg',
-            website: app.props.website,
-            categories
-          });
+      if ( !this.apps.some(detectedApp => detectedApp.name === app.name) ) {
+        this.apps.push({
+          name: app.name,
+          confidence: app.confidenceTotal.toString(),
+          version: app.version,
+          icon: app.props.icon || 'default.svg',
+          website: app.props.website,
+          categories
         });
+      }
+    });
+  }
+
+  fetch(pageUrl, index, depth) {
+    this.timer('fetch');
 
-        resolve(apps);
-      };
+    return new Promise(resolve => {
+      // Return when the URL is a duplicate or maxUrls has been reached
+      if ( this.analyzedPageUrls.indexOf(pageUrl.href) !== -1 || this.analyzedPageUrls.length >= this.options.maxUrls ) {
+        return resolve();
+      }
 
-      const browser = new Browser();
+      this.analyzedPageUrls.push(pageUrl.href);
 
-      browser.visit(url, error => {
-        wappalyzer.driver.document = browser.document;
+      this.wappalyzer.log('depth: ' + depth + '; delay: ' + ( this.options.delay * index ) + 'ms; url: ' + pageUrl.href, 'driver');
 
-        if ( !browser.resources['0'].response ) {
-            return reject('No response from server');
-        }
+      const browser = new Browser({
+        silent: true,
+        userAgent: this.options.userAgent,
+        waitDuration: this.options.maxWait + 'ms',
+      });
 
-        const headers = {};
+      this.sleep(this.options.delay * index)
+        .then(() => {
+          this.timer('browser.visit start');
 
-        browser.resources['0'].response.headers._headers.forEach(header => {
-          headers[header[0]] = header[1];
-        });
+          browser.visit(pageUrl.href, this.options.requestTimeout, error => {
+            this.timer('browser.visit end');
+
+            if ( !browser.resources['0'] || !browser.resources['0'].response ) {
+              this.wappalyzer.log('No response from server', 'browser', 'error');
+
+              return resolve();
+            }
+
+            browser.wait(this.options.maxWait)
+              .catch(error => this.wappalyzer.log(error.message, 'browser', 'error'))
+              .finally(() => {
+                this.timer('browser.wait end');
+
+                const headers = {};
 
-        const vars = Object.getOwnPropertyNames(browser.window);
-        const html = browser.html();
+                browser.resources['0'].response.headers._headers.forEach(header => {
+                  if ( !headers[header[0]] ){
+                    headers[header[0]] = [];
+                  }
 
-        const hostname = wappalyzer.parseUrl(url).hostname;
+                  headers[header[0]].push(header[1]);
+                });
 
-        wappalyzer.analyze(hostname, url, {
-          headers,
-          html,
-          env: vars
+                let html = '';
+
+                try {
+                  html = browser.html();
+                } catch ( e ) {
+                  this.wappalyzer.log(error.message, 'browser', 'error');
+                }
+
+                const vars = Object.getOwnPropertyNames(browser.window);
+                const scripts = Array.prototype.slice
+                  .apply(browser.document.scripts)
+                  .filter(s => s.src)
+                  .map(s => s.src);
+
+                this.wappalyzer.analyze(pageUrl.hostname, pageUrl.href, {
+                  headers,
+                  html,
+                  env: vars,
+                  scripts
+                });
+
+                const links = browser.body.getElementsByTagName('a');
+
+                resolve(links);
+              });
+          });
         });
-      });
+    });
+  }
 
+  crawl(pageUrl, index = 1, depth = 1) {
+    this.timer('crawl');
+
+    return new Promise(resolve => {
+      this.fetch(pageUrl, index, depth)
+        .then(links => {
+          if ( links && Boolean(this.options.recursive) && depth < this.options.maxDepth ) {
+            links = Array.from(links)
+              .filter(link => link.hostname === this.origPageUrl.hostname)
+              .map(link => { link.hash = ''; return link });
+
+            return Promise.all(links.map((link, index) => this.crawl(link, index + 1, depth + 1)));
+          } else {
+            return Promise.resolve();
+          }
+        })
+        .then(() => {
+          this.timer('done');
+
+          resolve(this.apps)
+        });
     });
   }
-}
 
-module.exports = driver;
+  sleep(ms) {
+    return ms ? new Promise(resolve => setTimeout(resolve, ms)) : Promise.resolve();
+  }
+
+  timer(step) {
+    const time = new Date().getTime();
+    const sinceStart = ( Math.round(( time - this.time.start ) / 10) / 100) + 's';
+    const sinceLast = ( Math.round(( time - this.time.last ) / 10) / 100) + 's';
+
+    this.wappalyzer.log('[' + step + '] Time lapsed: ' + sinceLast + ' / ' + sinceStart, 'driver');
+
+    this.time.last = time;
+  }
+};
+
+module.exports = Driver;
diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
index 54a3fb43d..c8c254850 100644
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const wappalyzer = require('./driver');
+const Wappalyzer = require('./driver');
 
 const args = process.argv.slice(2);
 
-const url = args[0] || '';
+const url = args.shift() || '';
 
 if ( !url ) {
   process.stderr.write('No URL specified\n');
@@ -12,12 +12,30 @@ if ( !url ) {
   process.exit(1);
 }
 
-wappalyzer.analyze(url)
+var options = {};
+var arg;
+
+while ( arg = args.shift() ) {
+  var matches = /--([^=]+)=(.+)/.exec(arg);
+
+  if ( matches ) {
+    var key = matches[1].replace(/-\w/g, matches => matches[1].toUpperCase());
+    var value = matches[2];
+
+    options[key] = value;
+  }
+}
+
+const wappalyzer = new Wappalyzer(url, options);
+
+wappalyzer.analyze()
   .then(json => {
     process.stdout.write(JSON.stringify(json) + '\n')
 
-    process.exit();
+    process.exit(0);
   })
   .catch(error => {
-    throw error
+    process.stderr.write(error + '\n')
+
+    process.exit(1);
   });
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
index 921016f88..7515906fa 100644
--- a/src/drivers/npm/package.json
+++ b/src/drivers/npm/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
diff --git a/src/drivers/npm/yarn.lock b/src/drivers/npm/yarn.lock
new file mode 100644
index 000000000..a00c71191
--- /dev/null
+++ b/src/drivers/npm/yarn.lock
@@ -0,0 +1,542 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abab@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+acorn-globals@^1.0.4:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+  dependencies:
+    acorn "^2.1.0"
+
+acorn@^2.1.0, acorn@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+
+ajv@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-runtime@5.8.29:
+  version "5.8.29"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-5.8.29.tgz#4a2052cbcff531788d3a9d6b03cd7f448285f825"
+  dependencies:
+    core-js "^1.0.0"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bluebird@^3.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.29 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+debug@^2.2:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+escodegen@^1.6.1:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.5.6"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+eventsource@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+  dependencies:
+    original ">=0.0.5"
+
+extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+extsprintf@1.3.0, extsprintf@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+hoek@4.x.x:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+iconv-lite@^0.4.13:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
+  dependencies:
+    abab "^1.0.0"
+    acorn "^2.4.0"
+    acorn-globals "^1.0.4"
+    cssom ">= 0.3.0 < 0.4.0"
+    cssstyle ">= 0.2.29 < 0.3.0"
+    escodegen "^1.6.1"
+    nwmatcher ">= 1.3.7 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.55.0"
+    sax "^1.1.4"
+    symbol-tree ">= 3.1.0 < 4.0.0"
+    tough-cookie "^2.2.0"
+    webidl-conversions "^2.0.0"
+    whatwg-url-compat "~0.6.5"
+    xml-name-validator ">= 2.0.1 < 3.0.0"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lodash@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
+mime-types@^2.1.12, mime-types@~2.1.17:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
+mime@^1.3.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+ms@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
+"nwmatcher@>= 1.3.7 < 2.0.0":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+
+oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+options@>=0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+
+original@>=0.0.5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+  dependencies:
+    url-parse "1.0.x"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+querystringify@0.0.x:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
+
+request@^2.55.0, request@^2.65.0, request@^2.81.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+requires-port@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+sax@^1.1.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+sshpk@^1.7.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+"symbol-tree@>= 3.1.0 < 4.0.0":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+tough-cookie@^2.2.0, tough-cookie@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.1:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+ultron@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+
+url-parse@1.0.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
+  dependencies:
+    querystringify "0.0.x"
+    requires-port "1.0.x"
+
+uuid@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+webidl-conversions@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
+
+whatwg-url-compat@~0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz#00898111af689bb097541cd5a45ca6c8798445bf"
+  dependencies:
+    tr46 "~0.0.1"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+ws@^1.0.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
+  dependencies:
+    options ">=0.0.5"
+    ultron "1.0.x"
+
+"xml-name-validator@>= 2.0.1 < 3.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+zombie@^5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/zombie/-/zombie-5.0.7.tgz#215ba90b4b97f75b796c935affcc63d68cbac772"
+  dependencies:
+    babel-runtime "5.8.29"
+    bluebird "^3.0"
+    debug "^2.2"
+    eventsource "^0.1.6"
+    iconv-lite "^0.4.13"
+    jsdom "^7.2.2"
+    lodash "^3.10.1"
+    mime "^1.3.4"
+    ms "^0.7.1"
+    request "^2.65.0"
+    tough-cookie "^2.2.0"
+    ws "^1.0.1"
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
new file mode 100644
index 000000000..698326cd4
--- /dev/null
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -0,0 +1,68 @@
+{
+	"github":                   { "message": "Forke Wappalyzer bei GitHub!" },
+	"twitter":                  { "message": "Folge Wappalyzer bei Twitter" },
+	"website":                  { "message": "Gehe zu wappalyzer.com" },
+	"options":                  { "message": "Optionen" },
+	"optionsSave":              { "message": "Optionen speichern" },
+	"optionsSaved":             { "message": "Gespeichert" },
+	"optionUpgradeMessage":     { "message": "Benachrichtige mich bei Upgrades" },
+	"optionDynamicIcon":        { "message": "Applikations Icon anstatt des Wappalyzer Icons verwenden" },
+	"optionTracking":           { "message": "Anonyme Statistiken an wappalyzer.com übermitteln" },
+	"nothingToDo":              { "message": "Nichts zu tun." },
+	"noAppsDetected":           { "message": "Keine Applikation entdeckt." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Nachrichten Board" },
+	"categoryName3":            { "message": "Datenbankverwaltung" },
+	"categoryName4":            { "message": "Dokumentations Tool" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "Ecommerce" },
+	"categoryName7":            { "message": "Fotogalerien" },
+	"categoryName8":            { "message": "Wikis" },
+	"categoryName9":            { "message": "Hosting-Panels" },
+	"categoryName10":           { "message": "Statistiken" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "JavaScript Framework" },
+	"categoryName13":           { "message": "Fehlertracker" },
+	"categoryName14":           { "message": "Videospieler" },
+	"categoryName15":           { "message": "Kommentarsystem" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Schrift Script" },
+	"categoryName18":           { "message": "Web Framework" },
+	"categoryName19":           { "message": "Sonstiges" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Web Server" },
+	"categoryName23":           { "message": "Cache Tool" },
+	"categoryName24":           { "message": "Rich Text Editor" },
+	"categoryName25":           { "message": "JavaScript Graphics" },
+	"categoryName26":           { "message": "Mobile Framework" },
+	"categoryName27":           { "message": "Programmiersprache" },
+	"categoryName28":           { "message": "Betriebssystem" },
+	"categoryName29":           { "message": "Suchmaschine" },
+	"categoryName30":           { "message": "Webmail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Automation" },
+	"categoryName33":           { "message": "Web Server Erweiterung" },
+	"categoryName34":           { "message": "Datenbank" },
+	"categoryName35":           { "message": "Map" },
+	"categoryName36":           { "message": "Werbenetzwerk" },
+	"categoryName37":           { "message": "Netzwerkdienst" },
+	"categoryName38":           { "message": "Medienserver" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Drucker" },
+	"categoryName41":           { "message": "Zahlungsverarbeiter" },
+	"categoryName42":           { "message": "Schlagwort Manager" },
+	"categoryName43":           { "message": "Bezahlblockade" },
+	"categoryName44":           { "message": "Build/CI-System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Fernzugriff" },
+	"categoryName47":           { "message": "Entwicklungswerkzeug" },
+	"categoryName48":           { "message": "Netzwerkspeicher" },
+	"categoryName49":           { "message": "Feedleser" },
+	"categoryName50":           { "message": "Dokumentmanagementsysteme" },
+	"categoryName51":           { "message": "Startseitenersteller" },
+	"categoryName52":           { "message": "Live-Chat" },
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Buchhaltung" }
+}
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 41058767a..2330f652e 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -58,5 +58,6 @@
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
 	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
 	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index 94a1db7d8..bac2a4731 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -62,5 +62,7 @@
 	"categoryName50":           { "message": "Document Management Systems" },
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Accounting" }
 }
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index 9a2639722..bd183d439 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -62,5 +62,6 @@
 	"categoryName50":           { "message": "Document Management Systems" },
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index ebf5e46b2..9195ed1ea 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -62,5 +62,6 @@
 	"categoryName50":       { "message": "Système de gestion de documents" },
 	"categoryName51":       { "message": "Landing Page Builder" },
 	"categoryName52":       { "message": "Chat en direct" },
-	"categoryName53":       { "message": "CRM" }
+	"categoryName53":       { "message": "CRM" },
+  "categoryName54":       { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index 055cb2b95..94f09b33c 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -58,5 +58,6 @@
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
 	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
 	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index ab7db8aea..dbd63b630 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -62,5 +62,6 @@
 	"categoryName50":           { "message": "Sistem Manajemen Dokumen" },
 	"categoryName51":           { "message": "Pembuat Laman Landas" },
 	"categoryName52":           { "message": "Chat Langsung" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index b93fea5d8..ac5aef344 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -62,6 +62,7 @@
 	"categoryName50":           { "message": "Sistema di Gestione Documenti" },
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
 
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index a05cfc450..dd281d1b4 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -62,5 +62,6 @@
 	"categoryName50":           { "message": "Systemy zarządzania dokumentami" },
 	"categoryName51":           { "message": "Konstruktory stron" },
 	"categoryName52":           { "message": "Czat na żywo" },
-	"categoryName53":           { "message": "Zarządzanie relacjami z klientami" }
+	"categoryName53":           { "message": "Zarządzanie relacjami z klientami" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index 48fd99b91..4723810c0 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -6,7 +6,7 @@
 	"optionsSave":              { "message": "Salvează opțiuni" },
 	"optionsSaved":             { "message": "Salvat" },
 	"optionUpgradeMessage":     { "message": "Anunță-mă dacă sunt actualizări" },
-	"optionDynamicIcon":        { "message": "Use application icon instead of Wappalyzer logo" },
+	"optionDynamicIcon":        { "message": "Foloseşte icon-ul aplicaţiei în locul logo-ului Wappalyzer" },
 	"optionTracking":           { "message": "Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare" },
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
 	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
@@ -49,14 +49,16 @@
 	"categoryName41":           { "message": "Sistem de plată" },
 	"categoryName42":           { "message": "Manager cuvinte cheie" },
 	"categoryName43":           { "message": "Paywall" },
-	"categoryName44":           { "message": "Build/CI System" },
-	"categoryName45":           { "message": "SCADA System" },
-	"categoryName46":           { "message": "Remote Access" },
-	"categoryName47":           { "message": "Development Tool" },
-	"categoryName48":           { "message": "Network Storage" },
-	"categoryName49":           { "message": "Feed Readers" },
-	"categoryName50":           { "message": "Document Management Systems" },
+	"categoryName44":           { "message": "Sistem Build/CI" },
+	"categoryName45":           { "message": "Sistem SCADA" },
+	"categoryName46":           { "message": "Acces de la distanță" },
+	"categoryName47":           { "message": "Instrument de dezvoltare" },
+	"categoryName48":           { "message": "Stocare în rețea" },
+	"categoryName49":           { "message": "Cititor de Feed-uri" },
+	"categoryName50":           { "message": "Sistem de management al documentelor" },
 	"categoryName51":           { "message": "Landing Page Builder" },
-	"categoryName52":           { "message": "Live Chat" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName52":           { "message": "Chat Live" },
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" },
+  "categoryName55":           { "message": "Contabilitate" }
 }
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 9b8842c76..8f22b3a5b 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -1,4 +1,4 @@
-{
+{
   "categoryName1" : { "message" : "CMS" },
   "categoryName2" : { "message" : "Форум" },
   "categoryName3" : { "message" : "Менеджер БД" },
@@ -62,5 +62,6 @@
   "optionsSave" : { "message" : "Сохранить" },
   "optionsSaved" : { "message" : "Успешно сохранено!" },
   "twitter" : { "message" : "Следите за новостями в Твиттере" },
-  "website" : { "message" : "Перейти на Wappalyzer.com" }
+  "website" : { "message" : "Перейти на Wappalyzer.com" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index 797f789cc..4168472d7 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -62,5 +62,6 @@
     "categoryName50":           { "message": "Systémy správy dokumentov" },
     "categoryName51":           { "message": "Nástroj na tvorbu vstupnej stránky" },
     "categoryName52":           { "message": "Živý chat" },
-    "categoryName53":           { "message": "CRM" }
+    "categoryName53":           { "message": "CRM" },
+    "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
new file mode 100644
index 000000000..ff6fb9cb0
--- /dev/null
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -0,0 +1,67 @@
+{
+	"github":                   { "message": "GitHub'da Wappalyzer'ı Forkla!" },
+	"twitter":                  { "message": "Wappalyzer'ı Twitter'da takip et" },
+	"website":                  { "message": "Wappalyzer.com'a git" },
+	"options":                  { "message": "Ayarlar" },
+	"optionsSave":              { "message": "Ayarları kaydet" },
+	"optionsSaved":             { "message": "Kaydedildi" },
+	"optionUpgradeMessage":     { "message": "Güncellemeleri göster" },
+	"optionDynamicIcon":        { "message": "Wappalyzer logosu yerine uygulama simgesi kullan" },
+	"optionTracking":           { "message": "Anonim olarak tespit edilen uygulamalar hakkında wappalyzer.com'a araştırma raporları gönderin" },
+	"nothingToDo":              { "message": "Burada yapacak birşey yok." },
+	"noAppsDetected":           { "message": "Uygulamalar tespit edilemedi." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Mesaj Tahtası" },
+	"categoryName3":            { "message": "Veritabanı Yöneticisi" },
+	"categoryName4":            { "message": "Doküman Aracı" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "E-Ticaret" },
+	"categoryName7":            { "message": "Foto Galerisi" },
+	"categoryName8":            { "message": "Wikis" },
+	"categoryName9":            { "message": "Hosting Panelleri" },
+	"categoryName10":           { "message": "Analitik" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "JavaScript Framework" },
+	"categoryName13":           { "message": "Hata Takibi" },
+	"categoryName14":           { "message": "Video Oynatıcı" },
+	"categoryName15":           { "message": "Yorum Sistemi" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Font Script" },
+	"categoryName18":           { "message": "Web Framework" },
+	"categoryName19":           { "message": "Çeşitli" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Web Server" },
+	"categoryName23":           { "message": "Öncellek Aracı" },
+	"categoryName24":           { "message": "Zengin Metin Editörü" },
+	"categoryName25":           { "message": "JavaScript Grafikleri" },
+	"categoryName26":           { "message": "Mobil Framework" },
+	"categoryName27":           { "message": "Programlama Dilleri" },
+	"categoryName28":           { "message": "İşletim sistemi" },
+	"categoryName29":           { "message": "Arama Motoru" },
+	"categoryName30":           { "message": "Web Posta" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Pazarlama Otomasyonu" },
+	"categoryName33":           { "message": "Web Sunucu Eklentileri" },
+	"categoryName34":           { "message": "Veritabanı" },
+	"categoryName35":           { "message": "Harita" },
+	"categoryName36":           { "message": "Reklamcılık Ağı" },
+	"categoryName37":           { "message": "Ağ Servisi" },
+	"categoryName38":           { "message": "Medya Sunucusu" },
+	"categoryName39":           { "message": "Bilgisayar Kamerası" },
+	"categoryName40":           { "message": "Yazıcı" },
+	"categoryName41":           { "message": "Ödeme İşlemcisi" },
+	"categoryName42":           { "message": "Etiket Yöneticisi" },
+	"categoryName43":           { "message": "Ödeme Duvarı" },
+	"categoryName44":           { "message": "Build/CI Sistemi" },
+	"categoryName45":           { "message": "SCADA Sistemi" },
+	"categoryName46":           { "message": "Uzaktan Erişim" },
+	"categoryName47":           { "message": "Geliştirme Aracı" },
+	"categoryName48":           { "message": "Ağ Depolama" },
+	"categoryName49":           { "message": "Besleme Okuyucuları" },
+	"categoryName50":           { "message": "Doküman Yönetim Sistemleri" },
+	"categoryName51":           { "message": "Açılış Sayfası Oluşturucu" },
+	"categoryName52":           { "message": "Canlı Sohbet" },
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
+}
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index 5b9a6e65f..243915b3d 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -62,5 +62,6 @@
 	"categoryName50":           { "message": "Керування документами" },
 	"categoryName51":           { "message": "Генератор лендінгів" },
 	"categoryName52":           { "message": "Чат реального часу" },
-	"categoryName53":           { "message": "CRM" }
+	"categoryName53":           { "message": "CRM" },
+  "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
new file mode 100644
index 000000000..1604da917
--- /dev/null
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -0,0 +1,67 @@
+{
+	"github":                   { "message": "GitHubda Wappalyzer dan nusxa olish!" },
+	"twitter":                  { "message": "Twitterda Wappalyzerni kuzatib boring" },
+	"website":                  { "message": "wappalyzer.com ga o'tish" },
+	"options":                  { "message": "Sozlovlar" },
+	"optionsSave":              { "message": "Saqlash" },
+	"optionsSaved":             { "message": "Saqlandi" },
+	"optionUpgradeMessage":     { "message": "Yangilanishlar haqida habar berish" },
+	"optionDynamicIcon":        { "message": "Wappalyzer logotipi o'rnida dastur logotipidan foydalanish" },
+	"optionTracking":           { "message": "Wappalyzer takomillashtirish uchun hisobotlarni maxfiy ravishda serverga jo'natish" },
+	"nothingToDo":              { "message": "Bu yerda tekshirib bolmaydi." },
+	"noAppsDetected":           { "message": "Hech qanday dastur aniqlanmadi." },
+	"categoryName1":            { "message": "CMS (KBT)" },
+	"categoryName2":            { "message": "Forum" },
+	"categoryName3":            { "message": "MB boshqaruvi" },
+	"categoryName4":            { "message": "Qo'llanmalar" },
+	"categoryName5":            { "message": "Vidjet" },
+	"categoryName6":            { "message": "E-tijorat" },
+	"categoryName7":            { "message": "Foto galereya" },
+	"categoryName8":            { "message": "Vikilar" },
+	"categoryName9":            { "message": "Hosting Panel" },
+	"categoryName10":           { "message": "Analitika" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "JavaScript Freymvork" },
+	"categoryName13":           { "message": "Bag treker" },
+	"categoryName14":           { "message": "Video Player" },
+	"categoryName15":           { "message": "Izohlar tizimi" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Shrift" },
+	"categoryName18":           { "message": "Veb Freymvork" },
+	"categoryName19":           { "message": "Boshqalar" },
+	"categoryName20":           { "message": "Muharrir" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Veb Server" },
+	"categoryName23":           { "message": "Keshlash vositasi" },
+	"categoryName24":           { "message": "WYSIWYG muharriri" },
+	"categoryName25":           { "message": "JavaScript grafika" },
+	"categoryName26":           { "message": "Mobile Freymvork" },
+	"categoryName27":           { "message": "Dasturlash tili" },
+	"categoryName28":           { "message": "Operatsion tizim" },
+	"categoryName29":           { "message": "Qidiruv vositasi" },
+	"categoryName30":           { "message": "Veb Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Boshqaruv Tizim" },
+	"categoryName33":           { "message": "Veb Server Ilovasi" },
+	"categoryName34":           { "message": "Ma'lumotlar ombori" },
+	"categoryName35":           { "message": "Xarita" },
+	"categoryName36":           { "message": "Reklama tarmog'i" },
+	"categoryName37":           { "message": "Tarmoq xizmati" },
+	"categoryName38":           { "message": "Media Server" },
+	"categoryName39":           { "message": "Veb kamera" },
+	"categoryName40":           { "message": "Printer" },
+	"categoryName41":           { "message": "To'lov tizimi" },
+	"categoryName42":           { "message": "Tag Menejeri" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "CI Tizim" },
+	"categoryName45":           { "message": "SCADA Tizim" },
+	"categoryName46":           { "message": "Masofaviy boshqaruv" },
+	"categoryName47":           { "message": "Dasturchilar uchun" },
+	"categoryName48":           { "message": "Tarmoq omborlar" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Qo'llanma tuzuvchi tizim" },
+	"categoryName51":           { "message": "Sahifa generatorlari" },
+	"categoryName52":           { "message": "Live Chat" },
+	"categoryName53":           { "message": "CRM" },
+	"categoryName54":           { "message": "SEO" }
+}
diff --git a/src/drivers/webextension/_locales/zh/messages.json b/src/drivers/webextension/_locales/zh/messages.json
index d114338b8..3ec51ce53 100644
--- a/src/drivers/webextension/_locales/zh/messages.json
+++ b/src/drivers/webextension/_locales/zh/messages.json
@@ -62,5 +62,6 @@
     "categoryName50":           { "message": "文档管理系统" },
     "categoryName51":           { "message": "着陆页构建器" },
     "categoryName52":           { "message": "在线聊天" },
-    "categoryName53":           { "message": "客户关系管理（CRM）" }
+    "categoryName53":           { "message": "客户关系管理（CRM）" },
+    "categoryName54":           { "message": "SEO" }
 }
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
new file mode 100644
index 000000000..7c49d5249
--- /dev/null
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -0,0 +1,67 @@
+{
+  "github":                   { "message": "在 GitHub 上 fork Wappalyzer！" },
+  "twitter":                  { "message": "追隨 Wappalyzer 的 Twitter" },
+  "website":                  { "message": "前往 wappalyzer.com" },
+  "options":                  { "message": "選項" },
+  "optionsSave":              { "message": "保存選項" },
+  "optionsSaved":             { "message": "選項已保存" },
+  "optionUpgradeMessage":     { "message": "通知我更新內容" },
+  "optionDynamicIcon":        { "message": "使用應用程式圖示取代 Wappalyzer 的 logo" },
+  "optionTracking":           { "message": "匿名傳送應用程式偵測報告至 wappalyzer.com 作為研究用途" },
+  "nothingToDo":              { "message": "這裡什麼也沒有。" },
+  "noAppsDetected":           { "message": "未偵測到應用程式。" },
+  "categoryName1":            { "message": "內容管理系統（CMS）" },
+  "categoryName2":            { "message": "留言板/討論區" },
+  "categoryName3":            { "message": "資料庫管理" },
+  "categoryName4":            { "message": "文書處理工具" },
+  "categoryName5":            { "message": "外掛/小工具" },
+  "categoryName6":            { "message": "電子商務" },
+  "categoryName7":            { "message": "相簿" },
+  "categoryName8":            { "message": "維基" },
+  "categoryName9":            { "message": "伺服器控制面板" },
+  "categoryName10":           { "message": "分析" },
+  "categoryName11":           { "message": "部落格" },
+  "categoryName12":           { "message": "JavaScript 框架" },
+  "categoryName13":           { "message": "Issue 追蹤" },
+  "categoryName14":           { "message": "影音撥放器" },
+  "categoryName15":           { "message": "評論系統" },
+  "categoryName16":           { "message": "驗證碼" },
+  "categoryName17":           { "message": "字型" },
+  "categoryName18":           { "message": "網頁框架" },
+  "categoryName19":           { "message": "其他" },
+  "categoryName20":           { "message": "編輯器" },
+  "categoryName21":           { "message": "學習管理系統（LMS）" },
+  "categoryName22":           { "message": "網頁伺服器" },
+  "categoryName23":           { "message": "快取工具" },
+  "categoryName24":           { "message": "高級文字編輯器" },
+  "categoryName25":           { "message": "JavaScript 圖形庫" },
+  "categoryName26":           { "message": "行動框架" },
+  "categoryName27":           { "message": "程式語言" },
+  "categoryName28":           { "message": "作業系統" },
+  "categoryName29":           { "message": "搜尋引擎" },
+  "categoryName30":           { "message": "網路信箱" },
+  "categoryName31":           { "message": "內容傳遞網路（CDN）" },
+  "categoryName32":           { "message": "行銷自動化" },
+  "categoryName33":           { "message": "網頁伺服器擴充功能" },
+  "categoryName34":           { "message": "資料庫" },
+  "categoryName35":           { "message": "地圖" },
+  "categoryName36":           { "message": "廣告聯播" },
+  "categoryName37":           { "message": "網路服務" },
+  "categoryName38":           { "message": "媒體伺服器" },
+  "categoryName39":           { "message": "網路攝影機" },
+  "categoryName40":           { "message": "印表機" },
+  "categoryName41":           { "message": "付款處理" },
+  "categoryName42":           { "message": "標籤管理" },
+  "categoryName43":           { "message": "付費牆" },
+  "categoryName44":           { "message": "建立/整合系統" },
+  "categoryName45":           { "message": "監控與資料擷取系統（SCADA）" },
+  "categoryName46":           { "message": "遠端" },
+  "categoryName47":           { "message": "開發工具" },
+  "categoryName48":           { "message": "網路儲存設備" },
+  "categoryName49":           { "message": "Feed 閱讀器" },
+  "categoryName50":           { "message": "文件管理系統" },
+  "categoryName51":           { "message": "著陸頁產生器" },
+  "categoryName52":           { "message": "線上聊天" },
+  "categoryName53":           { "message": "客戶關係管理系統（CRM）" },
+  "categoryName54":           { "message": "SEO" }
+}
diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css
index 31479c0b0..4a86fde55 100644
--- a/src/drivers/webextension/css/popup.css
+++ b/src/drivers/webextension/css/popup.css
@@ -2,6 +2,7 @@ body {
 	background: #fff;
 	font-family: Helvetica, Arial, sans-serif;
   font-size: .8rem;
+  height: 20.8rem;
 	margin: 0;
   overflow: hidden;
   width: 30rem;
@@ -40,6 +41,7 @@ body {
 }
 
 .detected__category {
+  page-break-inside: avoid;
   break-inside: avoid-column;
   padding-bottom: 1rem;
 }
diff --git a/src/drivers/webextension/html/popup.html b/src/drivers/webextension/html/popup.html
index 1f17595cf..9fc0278ad 100644
--- a/src/drivers/webextension/html/popup.html
+++ b/src/drivers/webextension/html/popup.html
@@ -12,7 +12,7 @@
 	</head>
 	<body>
     <div class="header">
-      <a href="https://wappalyzer.com/" class="header__link" target="_blank">
+      <a href="https://www.wappalyzer.com/" class="header__link" target="_blank">
         <img class="header__logo" src="../images/logo-white.svg">
       </a>
     </div>
diff --git a/src/drivers/webextension/images/icon_64.png b/src/drivers/webextension/images/icon_64.png
deleted file mode 100644
index 160dfde79..000000000
Binary files a/src/drivers/webextension/images/icon_64.png and /dev/null differ
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
index c4e1940b0..7ad284495 100644
--- a/src/drivers/webextension/js/content.js
+++ b/src/drivers/webextension/js/content.js
@@ -7,6 +7,11 @@ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
     html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
   }
 
+  var scripts = Array.prototype.slice
+      .apply(document.scripts)
+      .filter(s => s.src)
+      .map(s => s.src);
+
   try {
     browser.runtime.sendMessage({
       id: 'analyze',
@@ -14,6 +19,12 @@ if ( typeof browser !== 'undefined' && typeof document.body !== 'undefined' ) {
       source: 'content.js'
     });
 
+    browser.runtime.sendMessage({
+      id: 'analyze',
+      subject: { scripts },
+      source: 'content.js'
+    });
+
     var container = document.createElement('wappalyzerData');
 
     container.setAttribute('id',    'wappalyzerData');
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index e9c6c97a6..4b9a40dc6 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -101,7 +101,7 @@ getOption('version')
         .then(upgradeMessage => {
           if ( upgradeMessage ) {
             openTab({
-              url: wappalyzer.config.websiteURL + 'upgraded',
+              url: wappalyzer.config.websiteURL + 'upgraded?v' + version,
               background: true
             });
           }
@@ -138,20 +138,23 @@ browser.webRequest.onCompleted.addListener(request => {
     var url = wappalyzer.parseUrl(request.url);
 
     request.responseHeaders.forEach(function(header) {
-      responseHeaders[header.name.toLowerCase()] = header.value || '' + header.binaryValue;
+      if ( !responseHeaders[header.name.toLowerCase()] ) {
+        responseHeaders[header.name.toLowerCase()] = []
+      }
+      responseHeaders[header.name.toLowerCase()].push(header.value || '' + header.binaryValue);
     });
 
     if ( headersCache.length > 50 ) {
       headersCache = {};
     }
 
-    if ( /text\/html/.test(responseHeaders['content-type']) ) {
+    if ( /text\/html/.test(responseHeaders['content-type'][0]) ) {
       if ( headersCache[url.canonical] === undefined ) {
         headersCache[url.canonical] = {};
       }
 
       Object.keys(responseHeaders).forEach(header => {
-        headersCache[url.canonical][header] = responseHeaders[header];
+        headersCache[url.canonical][header] = responseHeaders[header].slice();
       });
     }
   }
@@ -313,7 +316,7 @@ wappalyzer.driver.ping = (hostnameCache, adCache) => {
     .then(tracking => {
       if ( tracking ) {
         if ( Object.keys(hostnameCache).length ) {
-          post('http://ping.wappalyzer.com/v2/', hostnameCache);
+          post('http://ping.wappalyzer.com/v3/', hostnameCache);
         }
 
         if ( adCache.length ) {
diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js
index 1a88c1cd4..c62fdc471 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: '88d43ba-c',
+				mrev: 'b084b53-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 = '1506716276-29567-8539-3286-4931';
+	var POST_MSG_ID = '1510070508-5767-8848-29475-8984';
 	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 7c60d52a5..5842b9818 100644
--- a/src/drivers/webextension/js/network.js
+++ b/src/drivers/webextension/js/network.js
@@ -444,6 +444,8 @@
 					if ( videoId ) {
 						request.isYoutubeAd = true;
 						request.isVideo = true;
+						request.rawSrcUrl = frameUrl;
+						request.rawDestUrl = requestUrl;
 						request.url = 'https://www.youtube.com/watch?v=' + this.parseYoutubeVideoIdFromUrl(requestUrl);
 					}
 				} else if ( !this.bannedRequest(request) &&
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index 95184f8ea..237dbae7e 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -76,7 +76,7 @@ function appsToDomTemplate(response) {
             'a', {
               class: 'detected__app',
               target: '_blank',
-              href: 'https://wappalyzer.com/applications/' + slugify(appName)
+              href: 'https://www.wappalyzer.com/applications/' + slugify(appName)
             }, [
               'img', {
                 class: 'detected__app-icon',
@@ -100,7 +100,7 @@ function appsToDomTemplate(response) {
             'a', {
               class: 'detected__category-link',
               target: '_blank',
-              href: 'https://wappalyzer.com/categories/' + slugify(response.categories[cat].name)
+              href: 'https://www.wappalyzer.com/categories/' + slugify(response.categories[cat].name)
             }, [
               'span', {
                 class: 'detected__category-name'
diff --git a/src/drivers/webextension/manifest.edge.json b/src/drivers/webextension/manifest.edge.json
index 50cb00946..6c5d4c690 100644
--- a/src/drivers/webextension/manifest.edge.json
+++ b/src/drivers/webextension/manifest.edge.json
@@ -2,9 +2,9 @@
 	"name": "Wappalyzer",
 	"short_name": "Wappalyzer",
 	"author": "Elbert Alias",
-	"homepage_url": "https://wappalyzer.com/",
+	"homepage_url": "https://www.wappalyzer.com/",
 	"description": "Identify web technologies",
-	"version": "5.1.2",
+	"version": "5.1.6",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 957da7969..b46567b82 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -2,9 +2,9 @@
 	"name": "Wappalyzer",
 	"short_name": "Wappalyzer",
 	"author": "Elbert Alias",
-	"homepage_url": "https://wappalyzer.com/",
+	"homepage_url": "https://www.wappalyzer.com",
 	"description": "Identify web technologies",
-	"version": "5.1.2",
+	"version": "5.2.0",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/src/icons/Afosto.svg b/src/icons/Afosto.svg
new file mode 100644
index 000000000..882f7d91d
--- /dev/null
+++ b/src/icons/Afosto.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 48"><g fill="none"><path fill="#04A54F" d="M41.48 35.9v11.83l-9.83-6.1"/><path fill="#2F3B60" d="M41.45 35.9l-20.7 11.96V23.94"/><path fill="#1F76BB" d="M41.45 12v23.9l-20.7-11.96"/><path fill="#8CC542" d="M41.45 11.97V12l-20.7 11.94V0"/><path fill="#E92629" d="M20.76 23.94v23.92h-.03L.03 35.93v-.02"/><path fill="#FAED20" d="M20.76 0v23.94L.03 11.97 20.73 0"/><path fill="#F15B2A" d="M20.76 23.94L.03 35.9v.02L0 35.9V11.97h.02"/></g></svg>
diff --git a/src/icons/Anetwork.png b/src/icons/Anetwork.png
new file mode 100644
index 000000000..f28e95dc5
Binary files /dev/null and b/src/icons/Anetwork.png differ
diff --git a/src/icons/Apple.svg b/src/icons/Apple.svg
new file mode 100644
index 000000000..2954f0f52
--- /dev/null
+++ b/src/icons/Apple.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="747.63776" height="909.28345" id="svg2811">
+  <defs id="defs2813">
+    <clipPath id="clp12">
+      <path d="M 45.315,71.927 L 58.235,71.927 L 58.235,87.794 L 45.315,87.794 L 45.315,71.927 z " id="path184"/>
+    </clipPath>
+    <clipPath id="clp21">
+      <path d="M 123.91,72.178 L 150.14,72.178 L 150.14,87.472 L 123.91,87.472 L 123.91,72.178 z " id="path592"/>
+    </clipPath>
+    <clipPath id="clp9">
+      <path d="M 413.96,49.857 L 445.72,49.857 L 445.72,58.576 L 413.96,58.576 L 413.96,49.857 z " id="path100"/>
+    </clipPath>
+  </defs>
+  <g transform="translate(-1074.235,-1639.219)" id="layer1">
+    <g transform="translate(19.48863,19.49672)" id="g25472">
+      <g transform="matrix(54.85033,0,0,-54.85033,-1411.313,6454.729)" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" clip-path="url(#clp12)" id="g186">
+        <path d="M 56.105,79.364 C 56.087,81.372 57.745,82.336 57.82,82.383 C 56.887,83.748 55.435,83.935 54.917,83.957 C 53.682,84.082 52.506,83.23 51.88,83.23 C 51.254,83.23 50.286,83.939 49.262,83.919 C 47.914,83.899 46.673,83.136 45.979,81.93 C 44.58,79.503 45.622,75.906 46.984,73.936 C 47.651,72.973 48.445,71.888 49.489,71.928 C 50.495,71.968 50.875,72.578 52.089,72.578 C 53.303,72.578 53.645,71.928 54.708,71.947 C 55.789,71.968 56.475,72.931 57.137,73.897 C 57.901,75.015 58.217,76.097 58.235,76.154 C 58.211,76.164 56.127,76.963 56.105,79.364" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path188"/>
+      </g>
+      <path d="M 1556.5087,1778.2074 C 1586.8952,1741.403 1607.4089,1690.2272 1601.7588,1639.2187 C 1557.9852,1640.9758 1505.0032,1668.3995 1473.5732,1705.2039 C 1445.4359,1737.7314 1420.7536,1789.8374 1427.4422,1839.8074 C 1476.2605,1843.5921 1526.1172,1814.9577 1556.5087,1778.2074" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path190"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/ArvanCloud.png b/src/icons/ArvanCloud.png
index c9ec8e0ed..debf6aea9 100644
Binary files a/src/icons/ArvanCloud.png and b/src/icons/ArvanCloud.png differ
diff --git a/src/icons/Asymptix PHP Framework.png b/src/icons/Asymptix PHP Framework.png
deleted file mode 100644
index cc8d5eeac..000000000
Binary files a/src/icons/Asymptix PHP Framework.png and /dev/null differ
diff --git a/src/icons/Blade.png b/src/icons/Blade.png
new file mode 100644
index 000000000..64ec225c5
Binary files /dev/null and b/src/icons/Blade.png differ
diff --git a/src/icons/Twitter Bootstrap.png b/src/icons/Bootstrap.png
similarity index 100%
rename from src/icons/Twitter Bootstrap.png
rename to src/icons/Bootstrap.png
diff --git a/src/icons/Braintree.svg b/src/icons/Braintree.svg
new file mode 100644
index 000000000..2a71b1478
--- /dev/null
+++ b/src/icons/Braintree.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 160 160" style="enable-background:new 0 0 160 160;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1C1C1C;}
+</style>
+<path class="st0" d="M45.8,122.9v-12.8h10.1V47.8H45.8V35h40.7c18.6,0,30.1,8.7,30.1,23.7c0,9.9-5.8,15.9-13,18.8
+	c10.5,2.9,18,10.3,18,20.4c0,16.1-12.4,25-32.8,25H45.8z M69.7,47.8v23.9h15.1c11.4,0,17.3-4.3,17.3-12c0-7.8-6-12-17.5-12
+	C84.6,47.8,69.7,47.8,69.7,47.8z M69.7,109.9h17.3c13.4,0,20-4.3,20-12.8c0-8.3-7.2-12.8-21.1-12.8H69.7
+	C69.7,84.3,69.7,109.9,69.7,109.9z"/>
+</svg>
diff --git a/src/icons/Bulma.png b/src/icons/Bulma.png
new file mode 100644
index 000000000..b46f32bb5
Binary files /dev/null and b/src/icons/Bulma.png differ
diff --git a/src/icons/CloudFlare.svg b/src/icons/CloudFlare.svg
index d3cddf486..7ab2a4ede 100644
--- a/src/icons/CloudFlare.svg
+++ b/src/icons/CloudFlare.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 534.00001 242" height="242" width="534"><defs><radialGradient id="k" spreadMethod="pad" gradientTransform="translate(337.87 976.07) scale(135.27)" gradientUnits="userSpaceOnUse" r="1" cy="0" cx="0" fy="-.181" fx=".62"><stop offset="0" stop-color="#fff"/><stop offset=".001" stop-color="#fff"/><stop offset=".133" stop-color="#f6eb08"/><stop offset=".859" stop-color="#eb821a"/><stop offset="1" stop-color="#eb821a"/></radialGradient><clipPath id="i"><path d="M5212.8 939.52l-18 36.011-20 33.999-28 44-28 36-34 42-34 35.99-40 38.01-38 31.99-42 30-42 26.01-46.5 26-39.5 20-40 16-36 10-36 8-36 6-42 4-2748-6-44-2-44-2-48-6.01-40-7.99-52-12.01-36-11.99-38-14-38-13.5-48-24.5-36-18-46-30-42-32-44-36.01-38-37.99-30-36-32-42-24-42-18-35.999-10-34.011-6.64-28.211h4074.25l-11.61 28.211z"/></clipPath><linearGradient id="j" gradientTransform="matrix(0 -468.741 -468.741 0 3187.29 1381.09)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#f57c14"/><stop offset=".061" stop-color="#f57c14"/><stop offset="1" stop-color="#9e3539"/></linearGradient><clipPath id="g"><path d="M5192.46 1066.59c0 268.02-217.19 485.3-485.11 485.3-267.91 0-485.1-217.28-485.1-485.3 0-37.78 4.45-74.5 12.61-109.789h944.98c8.17 35.289 12.62 72.009 12.62 109.789z"/></clipPath><linearGradient id="h" gradientTransform="scale(-453.222 453.222) rotate(-71.161 -2.952 9.265)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><clipPath id="e"><path d="M2223.9 947.762c0 293.878-238.14 532.128-531.91 532.128s-531.92-238.25-531.92-532.128c0-1.043.08-2.051.08-3.082h1063.67c.01 1.031.08 2.039.08 3.082z"/></clipPath><linearGradient id="f" gradientTransform="scale(1751.07 -1751.07) rotate(56.997 1.336 .019)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><clipPath id="c"><path d="M2443.21 1615.69c-49.44-179.67-235.17-285.23-414.85-235.79-179.67 49.44-285.23 235.18-235.79 414.83 49.44 179.68 235.16 285.26 414.83 235.82 179.68-49.45 285.26-235.19 235.81-414.86z"/></clipPath><linearGradient id="d" gradientTransform="scale(356.64 -356.64) rotate(60.384 7.594 1.826)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><linearGradient id="b" gradientTransform="rotate(-90 599.358 311.542) scale(99.12637)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#f57d14"/><stop offset="1" stop-color="#fff"/></linearGradient><radialGradient id="a" spreadMethod="pad" gradientTransform="translate(422.72 945.976) scale(101.06288)" gradientUnits="userSpaceOnUse" r="1" cy="0" cx="0" fy=".051" fx="-.024"><stop offset="0" stop-color="#fff"/><stop offset=".002" stop-color="#fff"/><stop offset=".19" stop-color="#f6eb08"/><stop offset=".859" stop-color="#eb821a"/><stop offset="1" stop-color="#eb821a"/></radialGradient></defs><path d="M414.382 881.298l12.002-42 1.749.25 1.25 44 22.5-37.25 2 1-10.5 42.25 31.876-30.25 1.624 1.5-21.5 38.25 38.75-20.5 1.25 1.5-30.75 31.5 42.75-9.75 1 1.75-38 22.25 44 1.625v1.875l-42.5 11.75 42.25 12.5v1.75l-44 .75 37.25 23.25-1 2-42.374-10.75 29.875 31.75-1 1.75-38-21.75 20.375 38.5-1.875 1.5-31.25-30.75 10.25 42.25-2 1.25-22.252-37.75-.686 43.5-2.312.5-12.002-42-12.5 42-2.248-.5v-43.5l-1.25-.5-24.25 36.5 10.5-42.25-32 30-1.75-1.5 21.75-38-39 20.25-1.25-1.5 30.748-31-42.998 9.5-.5-1.75 38-22.25-43.5-1.75-.75-1.75 42.187-12-41.687-12.25.25-2 43.75-.75-37-22.5.25-2 42.875 10.75-30.375-32 1.5-1.75 38.5 21-21-38 1.25-1.5 32.25 30.75-10.502-42.75-.358-.75 25.297 38 .563-44.25h2.5l11.998 42" fill="url(#a)" fill-rule="evenodd" transform="translate(.5 -810.362)"/><path d="M533.563 212.463c0-41.94-33.998-75.938-75.938-75.938-16.94 0-32.583 5.551-45.214 14.929a127.159 127.159 0 0 0 2.401-24.616C414.813 56.94 358.15.275 288.25.275c-55.661 0-102.929 35.933-119.875 85.866a56.701 56.701 0 0 0-34.141-11.366c-31.454 0-56.953 25.499-56.953 56.954 0 4.87.614 9.595 1.764 14.107C35.42 147.106.437 182.844.437 226.775c0 5.11.495 10.103 1.4 14.95h525.874a75.69 75.69 0 0 0 5.851-29.262" fill="#f57c14"/><path d="M399.445 937.266c0 61.651-50.144 100.652-111.795 100.652s-111.463-39-111.463-100.652c0-61.651 49.978-111.629 111.63-111.629 61.65 0 111.628 49.978 111.628 111.629" fill="url(#b)" fill-rule="evenodd" transform="translate(.5 -810.362)"/><path d="M382.848 127.608c0 37.702-42.642 68.266-95.24 68.266-52.598 0-95.237-30.564-95.237-68.266 0-37.703 42.639-68.267 95.238-68.267 52.597 0 95.239 30.564 95.239 68.267" fill="#f57c14" fill-rule="evenodd"/><g clip-path="url(#c)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M2443.21 1615.69c-49.44-179.67-235.17-285.23-414.85-235.79-179.67 49.44-285.23 235.18-235.79 414.83 49.44 179.68 235.16 285.26 414.83 235.82 179.68-49.45 285.26-235.19 235.81-414.86" fill="url(#d)"/></g><path d="M168.8 115.904c7.151 12.385-1.79 30.935-19.97 41.431-18.18 10.498-38.716 8.965-45.866-3.42-7.152-12.386 1.789-30.935 19.97-41.431 18.18-10.498 38.715-8.966 45.866 3.42" fill="#f57c14" fill-rule="evenodd"/><g clip-path="url(#e)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M2223.9 947.762c0 293.878-238.14 532.128-531.91 532.128s-531.92-238.25-531.92-532.128c0-1.043.08-2.051.08-3.082h1063.67c.01 1.031.08 2.039.08 3.082" fill="url(#f)"/></g><g clip-path="url(#g)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M5192.46 1066.59c0 268.02-217.19 485.3-485.11 485.3-267.91 0-485.1-217.28-485.1-485.3 0-37.78 4.45-74.5 12.61-109.789h944.98c8.17 35.289 12.62 72.009 12.62 109.789" fill="url(#h)"/></g><g clip-path="url(#i)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M5212.8 939.52l-18 36.011-20 33.999-28 44-28 36-34 42-34 35.99-40 38.01-38 31.99-42 30-42 26.01-46.5 26-39.5 20-40 16-36 10-36 8-36 6-42 4-2748-6-44-2-44-2-48-6.01-40-7.99-52-12.01-36-11.99-38-14-38-13.5-48-24.5-36-18-46-30-42-32-44-36.01-38-37.99-30-36-32-42-24-42-18-35.999-10-34.011-6.64-28.211h4074.25l-11.61 28.211" fill="url(#j)"/></g><path d="M421.924 951.748l45.999 60.25-1.75 1.25-53.75-48.25-206.25 37.5-.25-2 191.75-44-105.5-36 1.25-1.5 128.5 32.75" fill="url(#k)" fill-rule="evenodd" transform="translate(.5 -810.362)"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 341.2 154.3"><defs><style>.cls-1{fill:#fff}.cls-2{fill:#f38020}.cls-3{fill:#faae40}</style></defs><title>cloud</title><path class="cls-1" d="M312.8 91.7l-42.9-24.6-7.4-3.2L87 65.1v89.1h225.8V91.7z"/><path class="cls-2" d="M234.7 146c2.1-7.2 1.3-13.8-2.2-18.7-3.2-4.5-8.6-7.1-15.1-7.4l-123.1-1.6a2.28 2.28 0 0 1-1.9-1 2.76 2.76 0 0 1-.3-2.2 3.38 3.38 0 0 1 2.9-2.2l124.2-1.6c14.7-.7 30.7-12.6 36.3-27.2l7.1-18.5a4 4 0 0 0 .2-2.4 80.87 80.87 0 0 0-155.5-8.3 36.35 36.35 0 0 0-58 25.4 38.18 38.18 0 0 0 .9 12.7A51.66 51.66 0 0 0 0 144.7a63 63 0 0 0 .5 7.5 2.46 2.46 0 0 0 2.4 2.1h227.2a3.09 3.09 0 0 0 2.9-2.2z"/><path class="cls-3" d="M273.9 66.9c-1.1 0-2.3 0-3.4.1a2 2 0 0 0-1.8 1.4l-4.8 16.7c-2.1 7.2-1.3 13.8 2.2 18.7 3.2 4.5 8.6 7.1 15.1 7.4l26.2 1.6a2.28 2.28 0 0 1 1.9 1 2.82 2.82 0 0 1 .3 2.2 3.38 3.38 0 0 1-2.9 2.2l-27.3 1.6c-14.8.7-30.7 12.6-36.3 27.2l-2 5.1a1.44 1.44 0 0 0 1.4 2h93.8a2.46 2.46 0 0 0 2.4-1.8 68.35 68.35 0 0 0 2.5-18.2 67.37 67.37 0 0 0-67.3-67.2"/></svg>
\ No newline at end of file
diff --git a/src/icons/CoinHive.svg b/src/icons/CoinHive.svg
new file mode 100644
index 000000000..d61cede8b
--- /dev/null
+++ b/src/icons/CoinHive.svg
@@ -0,0 +1,10 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="512px" height="512px" viewBox="0 0 5120 5120" preserveAspectRatio="xMidYMid meet">
+<g id="layer1" fill="#ffffff" stroke="none">
+ <path d="M1752 3990 c-436 -252 -804 -465 -817 -474 l-25 -16 0 -945 0 -945 37 -24 c21 -13 390 -227 820 -475 l783 -451 812 469 c447 257 814 473 815 478 2 5 -361 220 -807 477 l-810 468 0 943 c0 519 -3 946 -7 948 -5 3 -365 -201 -801 -453z"/>
+ </g>
+<g id="layer2" fill="#ff9600" stroke="none">
+ <path d="M1585 4221 l-950 -549 0 -1117 0 -1117 950 -549 c523 -302 957 -548 965 -548 8 0 443 246 965 548 l950 549 0 1117 0 1117 -950 549 c-522 301 -957 548 -965 548 -8 0 -442 -246 -965 -548z m955 -739 l0 -939 805 -464 c443 -255 804 -467 802 -471 -1 -4 -361 -215 -799 -468 l-798 -460 -810 467 -810 468 0 940 0 940 798 462 c438 253 800 462 805 462 4 1 7 -421 7 -937z"/>
+ </g>
+
+</svg>
\ No newline at end of file
diff --git a/src/icons/Crypto-Loot.png b/src/icons/Crypto-Loot.png
new file mode 100644
index 000000000..4bcd3b9b3
Binary files /dev/null and b/src/icons/Crypto-Loot.png differ
diff --git a/src/icons/Darwin.png b/src/icons/Darwin.png
deleted file mode 100644
index 65606bf25..000000000
Binary files a/src/icons/Darwin.png and /dev/null differ
diff --git a/src/icons/Dell.png b/src/icons/Dell.png
deleted file mode 100644
index 5803d6385..000000000
Binary files a/src/icons/Dell.png and /dev/null differ
diff --git a/src/icons/Dell.svg b/src/icons/Dell.svg
new file mode 100644
index 000000000..a6863301c
--- /dev/null
+++ b/src/icons/Dell.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg height="72" version="1.1" width="72" xmlns="http://www.w3.org/2000/svg">
+  <path d="m33.479 27.059-8.942 6.879c-0.917-3.44-3.899-5.963-7.568-5.963h-6.4199v15.822h6.4199c3.6688 0 6.8785-2.5234 7.5664-5.9629l8.9434 6.8789 8.9434-6.8789v5.9629h10.088v-3.2109h-6.6484v-12.611h-3.6699v5.9609l-8.4844 6.8809-1.835-1.606 4.129-3.211 4.3555-3.4395-2.5215-2.0625-8.4844 6.6484-1.834-1.6055 8.4844-6.4199-2.5234-2.0625zm-19.49 4.125h2.752c0.57325 0 1.1325 0.13072 1.6484 0.36719 0.51592 0.23647 0.9874 0.57983 1.3887 1.0098 0.40128 0.42994 0.73164 0.94498 0.96094 1.5254s0.35742 1.2262 0.35742 1.9141c0 0.63058-0.11479 1.2467-0.32617 1.8164-0.21139 0.56967-0.51931 1.0928-0.90625 1.5371-0.38694 0.44427-0.85223 0.81007-1.3789 1.0645-0.52667 0.25438-1.1136 0.39648-1.7441 0.39648h-2.752v-9.6309zm49.987 9.4031v3.2102h-10.089v-15.822h3.6688v12.611h6.4204zm-27.976-40.587c-19.72 0-36 16.28-36 36s16.051 36 36 36 36-16.051 36-36-16.28-36-36-36zm0 3.6699c2.2356-0.000025 4.4168 0.22437 6.5234 0.6543 2.1067 0.42993 4.1395 1.064 6.0742 1.8809 1.9347 0.81688 3.7725 1.8177 5.4922 2.9785s3.3214 2.4816 4.7832 3.9434 2.7825 3.0635 3.9434 4.7832c1.1608 1.7197 2.1616 3.5575 2.9785 5.4922 0.81688 1.9347 1.4509 3.9676 1.8809 6.0742 0.42994 2.1067 0.6543 4.2878 0.6543 6.5234s-0.22436 4.4168-0.6543 6.5234c-0.42994 2.1067-1.064 4.1395-1.8809 6.0742-0.81688 1.9347-1.8177 3.7725-2.9785 5.4922s-2.4816 3.3214-3.9434 4.7832-3.0635 2.7825-4.7832 3.9434c-1.7197 1.1608-3.5575 2.1616-5.4922 2.9785-1.9347 0.81688-3.9676 1.4509-6.0742 1.8809-2.1067 0.42994-4.2878 0.6543-6.5234 0.6543s-4.4168-0.22436-6.5234-0.6543c-2.107-0.427-4.14-1.061-6.075-1.878-1.934-0.817-3.772-1.818-5.492-2.979-1.72-1.16-3.321-2.481-4.783-3.943s-2.783-3.063-3.9434-4.783c-1.1608-1.72-2.1616-3.558-2.9785-5.492-0.8169-1.935-1.4509-3.968-1.8809-6.075-0.4299-2.106-0.6543-4.287-0.6543-6.523s0.2244-4.417 0.6543-6.523c0.4299-2.107 1.064-4.14 1.8809-6.075 0.8169-1.934 1.8177-3.772 2.9785-5.492 1.1604-1.72 2.4814-3.321 3.9434-4.783s3.063-2.783 4.783-3.9434c1.72-1.1608 3.558-2.1616 5.492-2.9785 1.935-0.8169 3.968-1.4509 6.075-1.8809 2.106-0.4299 4.287-0.6543 6.523-0.6543z" fill="#007db8" />
+</svg>
diff --git a/src/icons/Elm.png b/src/icons/Elm.png
deleted file mode 100644
index 855bd9b67..000000000
Binary files a/src/icons/Elm.png and /dev/null differ
diff --git a/src/icons/Gatsby.svg b/src/icons/Gatsby.svg
new file mode 100644
index 000000000..13364f3ba
--- /dev/null
+++ b/src/icons/Gatsby.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.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"
+	 fill="#744c9e" width="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<g>
+		<path d="M600,28.644C284.449,28.644,28.644,284.448,28.644,600c0,315.553,255.806,571.356,571.356,571.356
+			c315.553,0,571.356-255.804,571.356-571.356C1171.356,284.448,915.553,28.644,600,28.644z M151.414,605.956l442.629,442.63
+			C350.989,1045.418,154.581,849.01,151.414,605.956z M700.417,1037.37L162.63,499.583C208.232,300.142,386.734,151.339,600,151.339
+			c149.077,0,281.147,72.727,362.734,184.616l-62.12,54.812C834.433,295.859,724.478,233.746,600,233.746
+			c-158.485,0-293.447,100.668-344.46,241.545l469.17,469.17c113.938-41.26,201.566-137.44,230.914-256.56H761.152v-87.9h205.102
+			v-0.002h82.407V600C1048.661,813.266,899.859,991.768,700.417,1037.37z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/icons/Includable.svg b/src/icons/Includable.svg
new file mode 100644
index 000000000..f65da2ed5
--- /dev/null
+++ b/src/icons/Includable.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>Includable</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Logo-basics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Includable" fill="#2CAEDD">
+            <g id="Group" transform="translate(0.000000, 82.000000)">
+                <path d="M32.0617207,62.8622814 C49.3106739,62.8622814 63.5306359,49.0233146 63.5306359,31.7743614 C63.5306359,14.9045061 49.3106739,0.87788484 32.0617207,0.87788484 C14.6232186,0.87788484 0.596597307,14.9045061 0.596597307,31.7743614 C0.596597307,49.0233146 14.6232186,62.8622814 32.0617207,62.8622814 Z M6.66216326,279.133826 L57.4612782,279.133826 L57.4612782,89.5848896 L6.66216326,89.5848896 L6.66216326,279.133826 Z M223.495958,86.3625577 C200.183333,86.3625577 178.191865,95.8437963 162.650747,114.0386 L162.0821,114.0386 L162.0821,89.586787 L111.282985,89.586787 L111.282985,279.135723 L162.0821,279.135723 L162.0821,183.794503 C162.0821,150.054792 179.331053,132.047643 205.109708,132.047643 C228.615671,132.047643 241.503104,143.23103 241.503104,179.434877 L241.503104,279.325272 L292.302219,279.325272 L292.302219,166.733204 C292.302219,108.352132 264.059427,86.3644551 223.492163,86.3644551 L223.495958,86.3625577 Z M427.620876,282.356158 C465.724004,282.356158 495.102194,267.194137 511.403403,248.243035 L476.528293,217.532316 C467.619493,227.57841 452.645127,236.676759 432.55294,236.676759 C402.414659,236.676759 381.753825,215.255834 381.753825,184.171703 C381.753825,153.460984 401.846012,132.043848 432.171947,132.043848 C451.31639,132.043848 466.099313,140.382107 476.334955,152.32369 L510.643313,122.754056 C491.496975,98.6813412 460.223295,86.3606604 430.085015,86.3606604 C371.324844,86.3606604 330.19462,126.355486 330.19462,184.547009 C330.19462,242.738533 371.514393,282.35426 427.620878,282.35426 L427.620876,282.356158 Z" id="includable"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/JSEcoin.png b/src/icons/JSEcoin.png
new file mode 100644
index 000000000..9c7d398a2
Binary files /dev/null and b/src/icons/JSEcoin.png differ
diff --git a/src/icons/Joomla.png b/src/icons/Joomla.png
deleted file mode 100644
index 9952bb3da..000000000
Binary files a/src/icons/Joomla.png and /dev/null differ
diff --git a/src/icons/Joomla.svg b/src/icons/Joomla.svg
new file mode 100644
index 000000000..874c0b886
--- /dev/null
+++ b/src/icons/Joomla.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Joomla!-Logo" fill-rule="nonzero">
+            <path d="M11.15988,30.1450638 L10.0209886,29.0081196 C6.48961072,25.4757145 5.39628107,20.4304475 6.73395235,15.9572253 C3.20359271,15.1594172 0.566996815,12.0029299 0.566996815,8.23047055 C0.567970395,3.85633913 4.11335353,0.30963408 8.48677932,0.30963408 C12.4245149,0.31167949 15.6892839,3.18418528 16.3032106,6.94744476 C20.5762148,5.94533682 25.2527185,7.11088999 28.5849056,10.4430771 L29.0394868,10.8976493 L23.1943663,16.7397063 L22.7408122,16.2841068 C20.844878,14.3891909 17.7701089,14.3891909 15.8721382,16.2861522 C13.9680313,18.1902592 13.9721132,21.2742193 15.8619201,23.1640172 L17.0050005,24.3050523 L22.8511393,30.1450638 L29.0333506,36.3242203 L23.1943663,42.1683137 L17.0050005,35.9871207 L11.15988,30.1450638" id="path174" fill="#86BE3C"></path>
+            <path d="M17.6975817,23.6124711 L23.8849109,17.4292238 L29.7310497,11.5902394 L30.8710576,10.452268 C34.3891627,6.93519017 39.402766,5.82786419 43.8586245,7.13642635 C44.3918513,3.28020343 47.7015657,0.30963408 51.7048884,0.30963408 C56.0790198,0.30963408 59.626752,3.85429372 59.6257249,8.23047055 C59.6257249,12.2501387 56.6296191,15.5721077 52.7478599,16.0828707 C54.0237312,20.5223837 52.9123233,25.5002326 49.4177182,28.9979014 L48.9621187,29.4545191 L43.121089,23.6083803 L43.5725976,23.1558535 C45.4705772,21.2588921 45.4705772,18.1820865 43.574643,16.2861522 C41.6838089,14.3973636 38.6162032,14.3932817 36.7120963,16.2963704 L35.5720795,17.43536 L29.7259407,23.277408 L23.5427023,29.4545191 L17.6975817,23.6124711" id="path176" fill="#E4B645"></path>
+            <path d="M44.0159335,53.1015031 C39.5212658,54.4841287 34.428999,53.3968192 30.8710576,49.8394941 L30.4236398,49.3925765 L36.2636513,43.5463394 L36.7120963,43.9958115 C38.610067,45.892764 41.6868815,45.892764 43.5828157,43.997848 C45.4726137,42.1060046 45.4767045,39.0394082 43.5725976,37.134283 L42.4305443,35.9912026 L36.5895146,30.1450638 L30.4175125,23.9679526 L36.2636513,18.1279411 L42.4305443,24.3009704 L48.2695287,30.1450638 L49.4177182,31.2942715 C52.7774781,34.6540404 53.9379222,39.3805986 52.8929143,43.6801574 C56.7399462,44.2215658 59.6992792,47.5271894 59.6992792,51.5233577 C59.6992792,55.8987217 56.151547,59.4421577 51.779461,59.4421577 C47.9446836,59.4421577 44.7473417,56.7207353 44.0159335,53.1015031" id="path184" fill="#C33734"></path>
+            <path d="M41.7379542,36.6837927 L35.5720795,42.856813 L29.7310497,48.7019335 L28.5849056,49.8474613 C25.2108367,53.2232719 20.4526149,54.3704343 16.133647,53.2990682 C15.3266479,56.8184952 12.1762879,59.4401033 8.41292127,59.4421577 C4.03755724,59.4421577 0.49118267,55.8967835 0.492183045,51.5233577 C0.492183045,47.7784801 3.09183652,44.6383382 6.5844052,43.8139755 C5.47902638,39.4745714 6.62424157,34.680595 10.0209886,31.2840534 L10.4679062,30.8386721 L16.3134287,36.6797018 L15.8619201,37.1281557 C13.9659859,39.0261264 13.9659859,42.0978319 15.8639655,43.997848 C17.7670452,45.9009367 20.8510053,45.8968459 22.7408122,44.0060207 L23.8849109,42.8598766 L29.7259407,37.0168104 L35.8979427,30.8386721 L41.7379542,36.6837927" id="path186" fill="#748EC4"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/LiteSpeed.png b/src/icons/LiteSpeed.png
deleted file mode 100644
index 33f30a8aa..000000000
Binary files a/src/icons/LiteSpeed.png and /dev/null differ
diff --git a/src/icons/LiteSpeed.svg b/src/icons/LiteSpeed.svg
new file mode 100644
index 000000000..7c841b8c1
--- /dev/null
+++ b/src/icons/LiteSpeed.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="60"
+   height="60"
+   viewBox="0 0 60 60"
+   enable-background="new 0 0 250 60"
+   xml:space="preserve"
+   sodipodi:docname="LiteSpeed.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata55"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs53"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath100"><use
+         x="0"
+         y="0"
+         xlink:href="#g96"
+         id="use102"
+         width="100%"
+         height="100%" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview51"
+     showgrid="false"
+     inkscape:zoom="6.024"
+     inkscape:cx="97.604592"
+     inkscape:cy="3.439575"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g48" /><g
+     id="g12"><path
+       d="m 52.013,22.19 -3.08,3.08 3.095,-3.093 c -0.004,0.002 -0.007,0.005 -0.015,0.013 z"
+       id="path10"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><g
+     id="g16"><polygon
+       points="48.933,25.271 46.823,27.38 "
+       id="polygon14"
+       style="fill:#ffffff" /></g><g
+     id="g48"
+     transform="translate(-28)"><g
+       id="g98"
+       clip-path="url(#clipPath100)"><g
+         inkscape:label="Clip"
+         id="g96" /></g><g
+       id="g46"
+       transform="translate(31.623125)"><g
+         id="g24"><path
+           d="m 48.215,29.117 -13.277,-13.276 -5.656,7.178 6.099,6.098 c 0.562,0.563 0.562,1.483 0,2.045 l -1.765,1.765 c 0,0 1.189,1.779 1.244,1.888 0.274,0.55 0.34,1.841 -0.438,2.432 l -13.87,10.646 c -0.003,3.572 -0.007,10.92 -0.002,10.923 0.003,10e-4 27.665,-27.653 27.665,-27.653 0.563,-0.564 0.563,-1.482 0,-2.046 z"
+           id="path20"
+           inkscape:connector-curvature="0"
+           style="fill:#5e8cda" /><path
+           d="m 17.375,30.789 c -0.562,-0.562 -0.562,-1.479 0,-2.043 L 19.141,26.98 17.934,25.245 C 17.358,24.429 17.538,23.27 18.333,22.663 L 32.204,12.015 32.214,1.1 32.205,1.094 32.198,1.084 4.539,28.746 C 3.976,29.31 3.976,30.227 4.54,30.791 l 13.276,13.276 5.657,-7.181 z"
+           id="path22"
+           inkscape:connector-curvature="0"
+           style="fill:#093071" /></g><g
+         id="g28"><polygon
+           points="20.192,45.973 26.611,39.554 "
+           id="polygon26"
+           style="fill:#ffffff" /></g><g
+         id="g44"><g
+           id="g34"><g
+             id="g32"><path
+               d="m 39.195,7.751 c 0.185,0 0.371,0.117 0.453,0.282 0.146,0.302 -0.046,0.585 -0.239,0.828 L 27.254,24.289 c -0.175,0.224 -0.188,0.655 -0.028,0.888 0,0 6.561,9.514 6.787,9.84 0.249,0.359 0.266,1.422 -0.305,1.854 L 14.166,51.873 c -0.278,0.214 -0.436,0.283 -0.629,0.285 -0.175,-0.012 -0.356,-0.131 -0.431,-0.281 -0.146,-0.298 0.047,-0.587 0.238,-0.833 L 25.497,35.619 c 0.176,-0.232 0.191,-0.646 0.029,-0.888 l -6.783,-9.757 c -0.431,-0.612 -0.297,-1.481 0.299,-1.937 L 38.589,8.033 c 0.317,-0.247 0.478,-0.282 0.606,-0.282 m 0,-0.25 c -0.235,0 -0.455,0.096 -0.76,0.334 L 18.891,22.839 c -0.702,0.537 -0.859,1.558 -0.352,2.279 l 6.782,9.755 c 0.1,0.149 0.088,0.447 -0.023,0.594 L 13.147,50.89 c -0.16,0.206 -0.493,0.635 -0.266,1.098 0.114,0.23 0.376,0.402 0.639,0.42 0.306,-0.002 0.523,-0.125 0.798,-0.336 L 33.86,37.068 c 0.676,-0.512 0.678,-1.732 0.358,-2.194 -0.226,-0.326 -6.786,-9.84 -6.786,-9.84 -0.1,-0.144 -0.09,-0.453 0.019,-0.591 L 39.605,9.016 C 39.765,8.814 40.099,8.392 39.873,7.924 39.748,7.671 39.477,7.501 39.195,7.501 Z"
+               id="path30"
+               inkscape:connector-curvature="0"
+               style="fill:#5e8cda" /></g></g><g
+           id="g38"><path
+             d="m 33.517,35.054 c 0.158,0.239 0.299,1.14 -0.096,1.44 L 13.875,51.496 c -0.164,0.128 -0.27,0.188 -0.316,0.185 -0.067,0.004 -0.019,-0.115 0.161,-0.346 L 25.869,35.916 c 0.307,-0.396 0.327,-1.048 0.045,-1.455 l -6.781,-9.759 c 0,0 14.226,10.112 14.384,10.352 z"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#f5cd21" /></g><g
+           id="g42"><path
+             d="m 33.517,35.054 -6.679,-9.607 c -0.283,-0.408 -0.26,-1.061 0.044,-1.449 L 39.032,8.573 c 0.181,-0.23 0.228,-0.346 0.163,-0.346 -0.049,0 -0.156,0.057 -0.317,0.185 L 19.332,23.415 c -0.393,0.301 -0.484,0.883 -0.199,1.288 z"
+             id="path40"
+             inkscape:connector-curvature="0"
+             style="fill:#fddd75" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Microsoft Excel.svg b/src/icons/Microsoft Excel.svg
new file mode 100644
index 000000000..9c912bb4e
--- /dev/null
+++ b/src/icons/Microsoft Excel.svg	
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03758" height="107.5" viewBox="0 0 88.030066 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="word.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" inkscape:zoom="1.0905983" inkscape:cx="344.89442" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
+  <path d="m 46.04,0 5.94,0 c 0,2.67 0,5.33 0,8 10.01,0 20.02,0.02 30.03,-0.03 1.69,0.07 3.55,-0.05 5.02,0.96 1.03,1.48 0.91,3.36 0.98,5.06 -0.05,17.36 -0.03,34.71 -0.02,52.06 -0.05,2.91 0.27,5.88 -0.34,8.75 -0.4,2.08 -2.9,2.13 -4.57,2.2 -10.36,0.03 -20.73,-0.02 -31.1,0 0,3 0,6 0,9 l -6.21,0 C 30.53,83.23 15.26,80.67 0,78 0,54.67 0,31.34 0,8.01 15.35,5.34 30.7,2.71 46.04,0 z" id="path10" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 51.98,11 c 11,0 22,0 33,0 0,21 0,42 0,63 -11,0 -22,0 -33,0 0,-2 0,-4 0,-6 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-1.33 0,-2.67 0,-4 2.67,0 5.33,0 8,0 0,-2.33 0,-4.67 0,-7 -2.67,0 -5.33,0 -8,0 0,-2 0,-4 0,-6 z" id="path48" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 63.98,17 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path58" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 29.62,26.37 c 2.26,-0.16 4.53,-0.3 6.8,-0.41 -2.67,5.47 -5.35,10.94 -8.07,16.39 2.75,5.6 5.56,11.16 8.32,16.76 -2.41,-0.14 -4.81,-0.29 -7.22,-0.46 -1.7,-4.17 -3.77,-8.2 -4.99,-12.56 -1.36,4.06 -3.3,7.89 -4.86,11.87 -2.19,-0.03 -4.38,-0.12 -6.57,-0.21 2.57,-5.03 5.05,-10.1 7.7,-15.1 -2.25,-5.15 -4.72,-10.2 -7.04,-15.32 2.2,-0.13 4.4,-0.26 6.6,-0.38 1.49,3.91 3.12,7.77 4.35,11.78 1.32,-4.25 3.29,-8.25 4.98,-12.36 z" id="path72" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 63.98,28 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path90" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,39 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path108" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,50 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path114" inkscape:connector-curvature="0" style="fill:#207245"/>
+  <path d="m 63.98,61 c 4.67,0 9.33,0 14,0 0,2.33 0,4.67 0,7 -4.67,0 -9.33,0 -14,0 0,-2.33 0,-4.67 0,-7 z" id="path120" inkscape:connector-curvature="0" style="fill:#207245"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Microsoft PowerPoint.svg b/src/icons/Microsoft PowerPoint.svg
new file mode 100644
index 000000000..4f0b261b4
--- /dev/null
+++ b/src/icons/Microsoft PowerPoint.svg	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="110.03056"
+   height="107.5"
+   viewBox="0 0 88.024445 86"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Microsoft_PowerPoint_2013_logo.svg">
+  <metadata
+     id="metadata126">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs124">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18">
+      <path
+         d="M 0,204 H 250.91 V 0 H 0 Z"
+         id="path16"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1360"
+     inkscape:window-height="706"
+     id="namedview122"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="68.378088"
+     inkscape:cy="84.987245"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="g12"
+     transform="matrix(0.48158935,0,0,-0.49500577,-16.645044,93.37089)">
+    <g
+       id="g14"
+       clip-path="url(#clipPath18)">
+      <g
+         id="g20"
+         transform="translate(211.3203,43.75)">
+        <path
+           d="m 0,0 v 0 m -0.01,0 h -72.24 v 15.083 h 56.333 v 7 H -72.25 v 11.833 h 56.333 v 7 H -72.25 v 19.453 c 4.539,-5.322 11.289,-8.702 18.833,-8.702 13.669,0 24.749,11.081 24.749,24.749 h -24.749 v 24.749 c -7.544,0 -14.294,-3.38 -18.833,-8.702 V 120 H 0 Z M 0,126 h -72.25 v 18.874 l -104.5,-18.131 V -10.745 l 104.5,-18.131 V -6 H 0 c 3.309,0 6,2.691 6,6 v 120 c 0,3.309 -2.691,6 -6,6"
+           style="fill:#cb4a32;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path22"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g24"
+         transform="translate(161.7363,148.416)">
+        <path
+           d="M 0,0 V -24.749 H 24.749 C 24.749,-11.081 13.669,0 0,0"
+           style="fill:#cb4a32;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path26"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g28"
+         transform="translate(78.7876,102.8086)">
+        <path
+           d="m 0,0 c 4.169,-0.32 8.241,-1.099 10.773,3.223 1.914,3.261 1.753,9.22 -0.467,11.726 C 7.435,18.189 3.726,17.727 0,17.137 Z m -0.294,-30.68 h -10.467 v 58.422 c 8.075,0 16.109,0.227 24.113,-0.153 2.104,-0.1 4.547,-1.664 6.1,-3.268 5.944,-6.137 5.945,-13.782 4.169,-21.407 -1.583,-6.791 -5.964,-11.569 -12.869,-13.249 -3.44,-0.837 -7.121,-0.683 -11.046,-1.006 z"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path30"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/Microsoft Publisher.svg b/src/icons/Microsoft Publisher.svg
new file mode 100644
index 000000000..254859b47
--- /dev/null
+++ b/src/icons/Microsoft Publisher.svg	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="111.27187"
+   height="107.5"
+   viewBox="0 0 89.017499 86"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="n.svg">
+  <metadata
+     id="metadata126">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs124" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="960"
+     id="namedview122"
+     showgrid="false"
+     inkscape:zoom="1.0905983"
+     inkscape:cx="-13.79109"
+     inkscape:cy="53.75"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="m 46.0475,0 5.94,0 c 0,6 0,12 0,18 2.34,0 4.69,0 7.04,0 0.28,-3.57 -1.33,-9.24 3.17,-10.7 6.22,-0.73 12.53,-0.07 18.79,-0.33 2.47,0.22 5.63,-0.6 7.49,1.51 0.53,1.43 0.46,3 0.53,4.51 -0.03,13.66 -0.05,27.33 0.01,40.99 -0.04,1.82 -0.01,3.7 -0.62,5.44 -3.03,0.99 -6.29,0.5 -9.41,0.59 -0.15,4.56 0.39,9.19 -0.32,13.71 -0.85,2.34 -3.63,2.23 -5.66,2.29 -7.01,0.02 -14.01,-0.03 -21.02,-0.01 0,3.33 0,6.67 0,10 l -6.19,0 c -15.25,-2.77 -30.53,-5.32 -45.79,-8 -0.01,-23.33 -0.01,-46.66 0,-69.99 15.34,-2.67 30.7,-5.3 46.04,-8.01 z"
+     id="path30"
+     inkscape:connector-curvature="0"
+     style="fill:#077467" />
+  <path
+     d="m 63.8675,10.3 c 7.35,-0.65 14.75,-0.14 22.12,-0.3 0,15.33 0,30.67 0,46 -2.34,0 -4.67,0 -7,0 -0.02,-12.02 0.03,-24.03 -0.02,-36.05 -4.7,-3.72 -11.01,-5.27 -15.1,-9.65 z"
+     id="path44"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" />
+  <path
+     d="m 51.9875,21 c 7.67,0 15.33,0 23,0 0,17.33 0,34.67 0,52 -7.67,0 -15.33,0 -23,0 -0.01,-2 -0.01,-4 0,-6 5.67,0 11.33,0 17,0 -0.01,-1.33 -0.01,-2.67 0,-4 -5.67,0 -11.33,0 -17,0 -0.01,-1.67 -0.01,-3.33 0,-5 5.67,0 11.33,0 17,0 -0.01,-1.33 -0.01,-2.67 0,-4 -5.67,0 -11.33,0 -17,0 -0.01,-1.67 -0.01,-3.33 0,-5 5.67,0 11.33,0 17,0 -0.01,-1.33 -0.01,-2.67 0,-4 -5.67,0 -11.33,0 -17,0 -0.01,-1.67 -0.01,-3.33 0,-5 5.67,0 11.33,0 17,0 0,-4.67 0,-9.33 0,-14 -5.67,0 -11.33,0 -17,0 -0.01,-1.67 -0.01,-3.33 0,-5 z"
+     id="path62"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" />
+  <path
+     d="m 15.9875,26.47 c 5.45,0.17 12.07,-2.2 16.59,1.89 4.29,5.25 3.14,14.83 -3.25,17.96 -2.27,1.16 -4.87,1.01 -7.33,0.91 -0.01,3.92 -0.02,7.84 -0.01,11.77 -2.02,-0.2 -4.04,-0.4 -6.05,-0.62 0.1,-10.64 0.01,-21.27 0.05,-31.91 z"
+     id="path82"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" />
+  <path
+     d="m 21.9875,31.84 c 1.98,-0.11 4.46,-0.47 5.78,1.44 1.1,1.96 1.02,4.51 0.09,6.52 -1.16,2.05 -3.72,1.85 -5.72,2.08 -0.2,-3.34 -0.17,-6.69 -0.15,-10.04 z"
+     id="path100"
+     inkscape:connector-curvature="0"
+     style="fill:#077467" />
+</svg>
diff --git a/src/icons/Microsoft Word.svg b/src/icons/Microsoft Word.svg
new file mode 100644
index 000000000..626051757
--- /dev/null
+++ b/src/icons/Microsoft Word.svg	
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03056" height="107.5" viewBox="0 0 88.024445 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="Microsoft-Office-2013-lineup.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="1.0905983" inkscape:cx="321.51598" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2"/>
+  <g id="g3103" transform="translate(-21.015556,0)">
+    <path id="path6" d="M 67.02,0 73,0 c 0,2.67 0,5.33 0,8 10.7,0.06 21.39,-0.11 32.08,0.06 2.28,-0.23 4.07,1.54 3.86,3.82 0.17,19.7 -0.04,39.41 0.1,59.11 -0.1,2.02 0.2,4.26 -0.97,6.05 -1.46,1.04 -3.35,0.91 -5.05,0.99 C 93.01,77.98 83.01,78 73,78 c 0,2.67 0,5.33 0,8 l -6.25,0 C 51.53,83.22 36.27,80.67 21.02,78 21.01,54.67 21.02,31.34 21.02,8.02 36.35,5.34 51.69,2.73 67.02,0 z" inkscape:connector-curvature="0" style="fill:#2a5699"/>
+    <path id="path46" d="m 73,11 c 11,0 22,0 33,0 0,21.33 0,42.67 0,64 -11,0 -22,0 -33,0 0,-2.67 0,-5.33 0,-8 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-1.67 0,-3.33 0,-5 8.67,0 17.33,0 26,0 0,-1.33 0,-2.67 0,-4 -8.67,0 -17.33,0 -26,0 0,-2.33 0,-4.67 0,-7 z" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+    <path id="path88" d="m 41.68,28.67 c 1.9,-0.11 3.8,-0.19 5.7,-0.29 1.33,6.75 2.69,13.49 4.13,20.21 1.13,-6.94 2.38,-13.86 3.59,-20.79 2,-0.07 4,-0.18 5.99,-0.3 -2.26,9.69 -4.24,19.46 -6.71,29.09 -1.67,0.87 -4.17,-0.04 -6.15,0.1 -1.33,-6.62 -2.88,-13.2 -4.07,-19.85 -1.17,6.46 -2.69,12.86 -4.03,19.28 -1.92,-0.1 -3.85,-0.22 -5.78,-0.35 -1.66,-8.8 -3.61,-17.54 -5.16,-26.36 1.71,-0.08 3.43,-0.15 5.14,-0.21 1.03,6.37 2.2,12.71 3.1,19.09 1.41,-6.54 2.85,-13.08 4.25,-19.62 z" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Modernizr.png b/src/icons/Modernizr.png
deleted file mode 100644
index 41a2b0db4..000000000
Binary files a/src/icons/Modernizr.png and /dev/null differ
diff --git a/src/icons/Modernizr.svg b/src/icons/Modernizr.svg
new file mode 100644
index 000000000..9253469fc
--- /dev/null
+++ b/src/icons/Modernizr.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="78.000298"
+   width="78.002998"
+   id="svg47"
+   version="1.1"
+   viewBox="0 0 78.002998 78.000298">
+  <metadata
+     id="metadata51">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Modernizr logo</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="23.969999"
+       x2="145.2"
+       y1="77.129997"
+       x1="92.040001"
+       id="a">
+      <stop
+         id="stop10"
+         stop-color="#d81e75"
+         offset="0" />
+      <stop
+         id="stop12"
+         stop-color="#ff5fa8"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <title
+     id="title17">Modernizr logo</title>
+  <g
+     transform="translate(0,-9.9997)"
+     id="g54">
+    <path
+       style="fill:#d81e75"
+       d="m 0,65.33705 v 19.53 a 3.15,3.15 0 0 0 3.26,3.13 h 71.61 a 3,3 0 0 0 3.13,-3.13 v -71.61 A 3.15,3.15 0 0 0 74.87,9.9970503 H 55.34 A 3.33,3.33 0 0 0 52,13.25705 v 19.53 a 3.15,3.15 0 0 1 -3.17,3.21 H 29.3 a 3.33,3.33 0 0 0 -3.3,3.3 v 19.53 a 3.15,3.15 0 0 1 -3.21,3.17 H 3.26 a 3.33,3.33 0 0 0 -3.26,3.34 z"
+       id="path21" />
+  </g>
+  <path
+     style="opacity:0.8;fill:#ff3388"
+     id="path23"
+     d="M 74.87,-0.00264973 H 55.34 A 3.33,3.33 0 0 0 52,3.2573503 V 22.78735 a 3.15,3.15 0 0 1 -3.17,3.21 H 29.3 a 3.33,3.33 0 0 0 -3.3,3.3 v 48.7 h 48.87 a 3,3 0 0 0 3.13,-3.13 V 3.2573503 a 3.15,3.15 0 0 0 -3.13,-3.26000003 z" />
+  <path
+     style="opacity:0.8;fill:#ff5fa8"
+     id="path25"
+     d="M 74.87,-0.00264973 H 55.34 A 3.33,3.33 0 0 0 52,3.2573503 V 77.99735 h 22.87 a 3,3 0 0 0 3.13,-3.13 V 3.2573503 a 3.15,3.15 0 0 0 -3.13,-3.26000003 z" />
+</svg>
diff --git a/src/icons/Outlook Web App.png b/src/icons/Outlook Web App.png
deleted file mode 100644
index e5aaa3250..000000000
Binary files a/src/icons/Outlook Web App.png and /dev/null differ
diff --git a/src/icons/Outlook.svg b/src/icons/Outlook.svg
new file mode 100644
index 000000000..197e79925
--- /dev/null
+++ b/src/icons/Outlook.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03257" height="107.5" viewBox="0 0 88.026056 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="popwe.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" inkscape:zoom="1.0905983" inkscape:cx="258.62288" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
+  <path d="m 46.01,0 5.98,0 c 0,6.67 0,13.33 0,20 10.36,0.02 20.71,-0.03 31.06,0 2.04,-0.1 4.83,0.49 4.79,3.06 0.38,12.65 0.01,25.33 0.18,37.99 0.04,2.24 -0.03,5.77 -3.08,5.8 -10.97,0.38 -21.97,0.03 -32.95,0.15 0,6.33 0,12.67 0,19 l -6.2,0 C 30.55,83.23 15.27,80.68 0.01,78 0,54.67 0,31.34 0,8.02 15.34,5.33 30.68,2.73 46.01,0 z" id="path18" inkscape:connector-curvature="0" style="fill:#0071c5"/>
+  <path d="m 51.99,23 c 11.08,0.01 22.15,-0.03 33.23,0.02 -0.19,1.31 -0.59,2.6 -1.69,3.42 C 76.91,32.61 70.33,38.81 63.73,45 59.76,41.41 55.9,37.7 51.99,34.05 c 0,-3.69 0,-7.37 0,-11.05 z" id="path64" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 21.44,26.66 c 5.64,-2.13 12.23,0.86 14.62,6.31 3.26,7.5 2.8,17.76 -3.68,23.43 -5.97,5.11 -15.98,2.2 -18.7,-5.06 -3.58,-8.37 -1.84,-21.25 7.76,-24.68 z" id="path76" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 66.87,45.89 c 6.01,-5.71 12.07,-11.38 18.11,-17.06 0.03,11.72 0,23.45 0.01,35.17 -11,0 -22,0 -33,0 0,-8.72 -0.01,-17.44 0.01,-26.15 3.73,3.3 7.07,7.06 11.03,10.07 1.63,0.3 2.73,-1.11 3.84,-2.03 z" id="path92" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 22.41,32.67 c 2.66,-1.27 5.99,0.02 7.24,2.65 2,3.96 1.99,8.79 0.68,12.97 -0.93,2.97 -4.18,5.42 -7.33,4.25 -3.93,-1.24 -5.12,-5.9 -5.16,-9.55 -0.05,-3.78 0.82,-8.49 4.57,-10.32 z" id="path96" inkscape:connector-curvature="0" style="fill:#0071c5"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/PHPoole.png b/src/icons/PHPoole.png
new file mode 100644
index 000000000..ce4a53cf6
Binary files /dev/null and b/src/icons/PHPoole.png differ
diff --git a/src/icons/PayPal.png b/src/icons/PayPal.png
deleted file mode 100644
index d935d281b..000000000
Binary files a/src/icons/PayPal.png and /dev/null differ
diff --git a/src/icons/PayPal.svg b/src/icons/PayPal.svg
new file mode 100644
index 000000000..dd55b063d
--- /dev/null
+++ b/src/icons/PayPal.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg14712"
+   viewBox="-1.3557 -1.3557 41.005178 47.901399"
+   height="271"
+   width="232.146"
+   version="1.1">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14714" />
+  <path
+     style="fill:#003087;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14499"
+     d="M 32.60643,3.4075 C 30.51393,1.0225 26.73143,0 21.89268,0 H 7.84893 C 6.85893,0 6.01768,0.72 5.86268,1.69625 L 0.01518001,38.7825 c -0.11625,0.73125 0.45,1.39375 1.19124999,1.39375 h 8.67 l 2.1775,-13.81125 -0.0675,0.4325 c 0.155,-0.97625 0.99,-1.69625 1.97875,-1.69625 h 4.12 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.1025,-0.555 0.14375,-0.8225 -0.23375,-0.12375 -0.23375,-0.12375 0,0 0.55125,-3.515 -0.004,-5.9075 -1.905,-8.07375" />
+  <path
+     style="fill:#003087;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14527"
+     d="M 32.60643,3.4075 C 30.51393,1.0225 26.73143,0 21.89268,0 H 7.84893 C 6.85893,0 6.01768,0.72 5.86268,1.69625 L 0.01518001,38.7825 c -0.11625,0.73125 0.45,1.39375 1.19124999,1.39375 h 8.67 l 2.1775,-13.81125 -0.0675,0.4325 c 0.155,-0.97625 0.99,-1.69625 1.97875,-1.69625 h 4.12 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.1025,-0.555 0.14375,-0.8225 -0.23375,-0.12375 -0.23375,-0.12375 0,0 0.55125,-3.515 -0.004,-5.9075 -1.905,-8.07375" />
+  <path
+     style="fill:#002f86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14531"
+     d="m 14.39418,11.52788 c 0.0925,-0.5875 0.47,-1.06875 0.9775,-1.3125 0.23125,-0.11 0.48875,-0.17125 0.75875,-0.17125 h 11.01 c 1.30375,0 2.52,0.085 3.63125,0.26375 0.31875,0.0512 0.6275,0.11 0.9275,0.1775 0.3,0.0662 0.59125,0.14125 0.87375,0.22375 0.14125,0.0412 0.28,0.0838 0.41625,0.12875 0.54625,0.1825 1.055,0.395 1.5225,0.64375 0.55125,-3.51625 -0.004,-5.9075 -1.905,-8.07375 -2.09375,-2.385 -5.875,-3.4075 -10.71375,-3.4075 h -14.045 c -0.98875,0 -1.83,0.72 -1.985,1.69625 l -5.84749999,37.085 c -0.11625,0.7325 0.45,1.39375 1.18999999,1.39375 h 8.67125 l 2.1775,-13.81125 z" />
+  <path
+     style="fill:#009cde;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14535"
+     d="m 34.51168,11.48125 v 0 c -0.0425,0.26875 -0.0888,0.54125 -0.14375,0.8225 -1.85125,9.50875 -8.18875,12.7975 -16.2825,12.7975 h -4.12125 c -0.98875,0 -1.82375,0.72 -1.9775,1.69625 l -2.11,13.3775 -0.59875,3.795 c -0.10125,0.64 0.39375,1.22 1.04125,1.22 h 7.30875 c 0.865,0 1.60125,-0.63 1.73625,-1.48375 l 0.0713,-0.3725 1.3775,-8.73 0.0888,-0.4825 c 0.135,-0.85375 0.87125,-1.48375 1.73625,-1.48375 h 1.09375 c 7.08,0 12.62375,-2.87625 14.24375,-11.195 0.67625,-3.47625 0.32625,-6.37875 -1.4625,-8.4175 -0.5425,-0.6175 -1.21625,-1.1275 -2.00125,-1.54375" />
+  <path
+     style="fill:#012069;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14539"
+     d="m 32.57331,10.70863 c -0.2825,-0.0825 -0.57375,-0.1575 -0.87375,-0.22375 -0.3,-0.0663 -0.61,-0.125 -0.9275,-0.17625 -1.1125,-0.18 -2.3275,-0.265 -3.6325,-0.265 H 16.13081 c -0.27125,0 -0.52875,0.0613 -0.75875,0.1725 -0.50875,0.24375 -0.885,0.72375 -0.9775,1.3125 l -2.34,14.83625 -0.0675,0.4325 c 0.15375,-0.97625 0.98875,-1.69625 1.9775,-1.69625 h 4.12125 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.10125,-0.55375 0.14375,-0.8225 -0.46875,-0.2475 -0.97625,-0.46125 -1.5225,-0.6425 -0.13625,-0.045 -0.275,-0.0888 -0.41625,-0.13" />
+</svg>
diff --git a/src/icons/PrestaShop.png b/src/icons/PrestaShop.png
deleted file mode 100644
index 61e163051..000000000
Binary files a/src/icons/PrestaShop.png and /dev/null differ
diff --git a/src/icons/PrestaShop.svg b/src/icons/PrestaShop.svg
new file mode 100644
index 000000000..6ead63f6a
--- /dev/null
+++ b/src/icons/PrestaShop.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="development">
+            <g id="Group">
+                <path d="M83.1576159,196.209967 C85.192053,195.274419 87.2264901,194.50897 89.3456954,193.658472 C91.7192053,192.807973 94.0927152,191.957475 96.4662252,191.192027 C99.4331126,190.256478 102.484768,189.49103 105.536424,188.810631 C109.690066,187.960133 113.843709,187.279734 117.997351,186.854485 C115.623841,194.253821 113.080795,201.653156 110.198675,208.967442 C110.283444,210.413289 110.368212,211.774086 110.45298,213.219934 C116.13245,212.114286 121.981457,211.518937 128,211.518937 C134.018543,211.518937 139.86755,212.114286 145.54702,213.219934 C145.54702,211.774086 145.631788,210.328239 145.801325,208.967442 C143.003974,201.653156 140.376159,194.253821 138.002649,186.854485 C142.156291,187.279734 146.394702,187.875083 150.463576,188.810631 C153.515232,189.49103 156.482119,190.256478 159.533775,191.192027 C161.907285,191.957475 164.280795,192.722924 166.654305,193.658472 C168.77351,194.42392 170.807947,195.274419 172.842384,196.209967 C187.25298,202.673754 200.392053,212.199336 211.157616,224.616611 C238.198675,201.227907 255.321854,166.612625 255.321854,127.91495 C255.321854,57.4086379 198.357616,0.170099668 128,0.170099668 C57.7271523,0.170099668 0.678145695,57.323588 0.678145695,127.91495 C0.678145695,166.527575 17.8013245,201.142857 44.8423841,224.616611 C55.607947,212.199336 68.7470199,202.673754 83.1576159,196.209967 Z" id="XMLID_125_" fill="#A0DBE8" fill-rule="nonzero"></path>
+                <path d="M91.5496689,219.343522 C97.4834437,216.706977 103.84106,214.665781 110.368212,213.390033 C110.368212,211.944186 110.283444,210.498339 110.113907,209.137542 C112.911258,201.823256 115.539073,194.42392 117.912583,187.024585 C113.75894,187.449834 109.52053,188.045183 105.451656,188.980731 C102.4,189.66113 99.4331126,190.426578 96.381457,191.362126 C94.007947,192.127575 91.6344371,192.893023 89.2609272,193.828571 L98.5006623,196.124917 L91.5496689,219.343522 Z" id="XMLID_124_" fill="#525353" fill-rule="nonzero"></path>
+                <path d="M69.6794702,233.036545 C69.9337748,230.65515 70.018543,228.273754 70.018543,225.807309 C70.018543,224.361462 71.205298,223.170764 72.6463576,223.170764 L74.9350993,223.170764 L83.0728477,196.124917 C68.6622517,202.588704 55.5231788,212.114286 44.7576159,224.531561 C50.6913907,229.719601 57.1337748,234.312292 63.9152318,238.309635 C65.8649007,236.523588 67.7298013,234.737542 69.6794702,233.036545 Z" id="XMLID_123_" fill="#525353" fill-rule="nonzero"></path>
+                <path d="M172.757616,196.209967 L180.895364,223.255814 L183.184106,223.255814 C184.625166,223.255814 185.811921,224.446512 185.811921,225.892359 C185.811921,228.358804 185.981457,230.740199 186.150993,233.121595 C188.100662,234.822591 190.050331,236.523588 191.830464,238.394684 C198.696689,234.397342 205.054305,229.804651 210.988079,224.616611 C200.307285,212.199336 187.168212,202.673754 172.757616,196.209967 Z" id="XMLID_122_" fill="#525353" fill-rule="nonzero"></path>
+                <path d="M157.245033,195.954817 L166.484768,193.658472 C164.111258,192.807973 161.737748,191.957475 159.364238,191.192027 C156.397351,190.256478 153.345695,189.49103 150.29404,188.810631 C146.140397,187.960133 141.986755,187.279734 137.833113,186.854485 C140.206623,194.253821 142.749669,201.653156 145.631788,208.967442 C145.54702,210.413289 145.462252,211.774086 145.377483,213.219934 C151.989404,214.495681 158.262252,216.536877 164.196026,219.173422 L157.245033,195.954817 Z" id="XMLID_121_" fill="#525353" fill-rule="nonzero"></path>
+                <path d="M127.915232,223.255814 L145.886093,223.255814 C145.54702,219.93887 145.377483,216.621927 145.462252,213.390033 C139.782781,212.284385 133.933775,211.689037 127.915232,211.689037 C121.896689,211.689037 116.047682,212.284385 110.368212,213.390033 C110.45298,216.706977 110.283444,219.93887 109.944371,223.255814 L127.915232,223.255814 Z" id="XMLID_120_" fill="#000000" fill-rule="nonzero"></path>
+                <path d="M64,238.309635 C65.4410596,239.160133 66.9668874,240.010631 68.4927152,240.86113 C69.0013245,238.309635 69.4251656,235.67309 69.6794702,233.036545 C67.7298013,234.737542 65.8649007,236.523588 64,238.309635 Z" id="XMLID_119_" fill="#000000" fill-rule="nonzero"></path>
+                <path d="M90.3629139,223.255814 L110.029139,223.255814 C110.368212,219.93887 110.537748,216.621927 110.45298,213.390033 C103.84106,214.665781 97.5682119,216.706977 91.6344371,219.343522 L90.3629139,223.255814 Z" id="XMLID_118_" fill="#000000" fill-rule="nonzero"></path>
+                <path d="M186.235762,233.036545 C186.490066,235.67309 186.913907,238.309635 187.422517,240.86113 C188.948344,240.095681 190.389404,239.245183 191.915232,238.309635 C190.050331,236.523588 188.18543,234.737542 186.235762,233.036545 Z" id="XMLID_117_" fill="#000000" fill-rule="nonzero"></path>
+                <path d="M165.552318,223.255814 L164.365563,219.343522 C158.431788,216.706977 152.074172,214.665781 145.54702,213.390033 C145.462252,216.706977 145.631788,219.93887 145.970861,223.255814 L165.552318,223.255814 L165.552318,223.255814 Z" id="XMLID_116_" fill="#000000" fill-rule="nonzero"></path>
+                <path d="M90.3629139,223.255814 L91.5496689,219.343522 L98.5854305,195.954817 L89.3456954,193.658472 C87.2264901,194.42392 85.192053,195.274419 83.1576159,196.209967 L75.0198675,223.255814 L83.7509934,223.255814 L90.3629139,223.255814 L90.3629139,223.255814 Z" id="XMLID_115_" fill="#AA9678" fill-rule="nonzero"></path>
+                <path d="M164.365563,219.343522 L165.552318,223.255814 L172.164238,223.255814 L180.895364,223.255814 L172.757616,196.209967 C170.723179,195.274419 168.688742,194.50897 166.569536,193.658472 L157.329801,195.954817 L164.365563,219.343522 Z" id="XMLID_114_" fill="#AA9678" fill-rule="nonzero"></path>
+                <path d="M75.2741722,228.699003 C75.3589404,228.613953 75.4437086,228.613953 75.5284768,228.528904 L75.2741722,228.528904 C75.2741722,228.528904 75.2741722,228.613953 75.2741722,228.699003 Z" id="XMLID_113_" fill="#C0B098" fill-rule="nonzero"></path>
+                <path d="M127.915232,228.528904 L109.181457,228.528904 L88.7523179,228.528904 L75.5284768,228.528904 C75.4437086,228.613953 75.3589404,228.613953 75.2741722,228.699003 C75.1046358,233.716944 74.4264901,238.564784 73.3245033,243.327575 C89.8543046,251.237209 108.333775,255.659801 127.915232,255.659801 L127.915232,228.528904 L127.915232,228.528904 Z" id="XMLID_112_" fill="#C0B098" fill-rule="nonzero"></path>
+                <path d="M180.64106,228.528904 L180.386755,228.528904 C180.471523,228.613953 180.556291,228.613953 180.64106,228.699003 C180.64106,228.613953 180.64106,228.528904 180.64106,228.528904 Z" id="XMLID_111_" fill="#AA9678" fill-rule="nonzero"></path>
+                <path d="M180.386755,228.528904 L167.162914,228.528904 L146.649007,228.528904 L127.915232,228.528904 L127.915232,228.528904 L127.915232,255.659801 C147.411921,255.659801 165.976159,251.237209 182.50596,243.327575 C181.403974,238.564784 180.725828,233.631894 180.556291,228.699003 C180.556291,228.613953 180.471523,228.528904 180.386755,228.528904 Z" id="XMLID_110_" fill="#AA9678" fill-rule="nonzero"></path>
+                <rect id="XMLID_109_" fill="#786453" fill-rule="nonzero" x="127.830464" y="225.892359" width="1" height="2.63654485"></rect>
+                <path d="M186.235762,233.036545 C185.981457,230.65515 185.896689,228.273754 185.896689,225.807309 C185.896689,224.361462 184.709934,223.170764 183.268874,223.170764 L180.980132,223.170764 L172.07947,223.170764 L165.46755,223.170764 L145.801325,223.170764 L127.830464,223.170764 L109.859603,223.170764 L90.1933775,223.170764 L83.581457,223.170764 L74.8503311,223.170764 L72.5615894,223.170764 C71.1205298,223.170764 69.9337748,224.361462 69.9337748,225.807309 C69.9337748,228.273754 69.7642384,230.65515 69.594702,233.036545 C69.3403974,235.67309 68.9165563,238.309635 68.407947,240.86113 C70.018543,241.711628 71.6291391,242.562126 73.2397351,243.327575 C74.3417219,238.564784 75.0198675,233.631894 75.189404,228.699003 C75.189404,228.613953 75.189404,228.613953 75.189404,228.528904 L75.4437086,228.528904 L88.6675497,228.528904 L109.096689,228.528904 L127.830464,228.528904 L127.830464,228.528904 L146.649007,228.528904 L167.078146,228.528904 L180.301987,228.528904 L180.556291,228.528904 C180.556291,228.613953 180.556291,228.613953 180.556291,228.699003 C180.725828,233.716944 181.403974,238.564784 182.50596,243.327575 C184.116556,242.562126 185.727152,241.711628 187.337748,240.86113 C186.829139,238.309635 186.490066,235.67309 186.235762,233.036545 Z" id="XMLID_108_" fill="#8B7460" fill-rule="nonzero"></path>
+                <g transform="translate(38.145695, 38.272425)">
+                    <path d="M132.662252,70.2511628 L132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 C134.272848,74.8438538 136.05298,79.5215947 136.98543,84.2843854 C136.98543,84.6245847 136.900662,84.9647841 136.900662,85.3049834 C136.815894,85.8152824 136.731126,86.2405316 136.646358,86.6657807 C136.815894,86.0704319 136.900662,85.3049834 137.070199,84.454485 C136.137748,79.6066445 134.272848,74.9289037 132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 L132.662252,70.2511628 Z" id="XMLID_107_"></path>
+                    <path d="M169.70596,99.1681063 C169.621192,99.1681063 169.536424,99.2531561 169.451656,99.2531561 C169.536424,99.1681063 169.621192,99.1681063 169.70596,99.1681063 Z" id="XMLID_106_"></path>
+                    <path d="M170.553642,98.4877076 C170.468874,98.5727575 170.384106,98.6578073 170.299338,98.7428571 C170.384106,98.6578073 170.468874,98.5727575 170.553642,98.4877076 Z" id="XMLID_105_"></path>
+                    <path d="M128.847682,66.9342193 C125.880795,64.4677741 122.829139,62.1714286 119.607947,60.2152824 L119.607947,60.2152824 C122.829139,62.1714286 125.880795,64.3827243 128.847682,66.9342193 Z" id="XMLID_104_"></path>
+                    <path d="M158.34702,97.4671096 C158.34702,97.5521595 158.34702,97.5521595 158.34702,97.4671096 C158.34702,97.5521595 158.34702,97.5521595 158.34702,97.4671096 Z" id="XMLID_103_"></path>
+                    <path d="M163.687417,104.271096 C163.772185,104.356146 163.856954,104.526246 163.941722,104.611296 C163.941722,104.441196 163.772185,104.356146 163.687417,104.271096 Z" id="XMLID_102_"></path>
+                    <path d="M136.561589,86.9209302 C136.476821,87.3461794 136.392053,87.6863787 136.307285,87.9415282 C136.392053,87.6013289 136.476821,87.2611296 136.561589,86.9209302 Z" id="XMLID_101_"></path>
+                    <path d="M124.100662,133.528239 C122.150993,136.760133 120.87947,139.906977 120.201325,142.798671 C120.87947,139.821927 122.150993,136.760133 124.100662,133.528239 C124.778808,132.422591 125.372185,131.401993 125.965563,130.381395 C125.372185,131.316944 124.778808,132.422591 124.100662,133.528239 C124.100662,133.443189 124.100662,133.443189 124.100662,133.528239 Z" id="XMLID_100_"></path>
+                    <path d="M132.662252,70.2511628 C132.74702,69.9960133 132.916556,69.8259136 133.001325,69.5707641 L133.001325,69.5707641 C132.831788,69.8259136 132.74702,69.9960133 132.662252,70.2511628 C133.425166,70.9315615 134.188079,71.6119601 134.950993,72.2923588 C134.188079,71.6119601 133.425166,70.9315615 132.662252,70.2511628 Z" id="XMLID_99_"></path>
+                    <path d="M115.030464,57.5787375 C114.860927,57.4936877 114.691391,57.4086379 114.606623,57.323588 C114.776159,57.4086379 114.860927,57.4936877 115.030464,57.5787375 Z" id="XMLID_96_"></path>
+                    <path d="M115.708609,57.9189369 C115.539073,57.833887 115.369536,57.6637874 115.2,57.5787375 C115.284768,57.7488372 115.539073,57.833887 115.708609,57.9189369 Z" id="XMLID_95_"></path>
+                    <path d="M119.862252,68.2099668 C119.862252,68.5501661 119.862252,68.8053156 119.862252,69.145515 C119.862252,68.8053156 119.862252,68.5501661 119.862252,68.2099668 Z" id="XMLID_94_"></path>
+                    <path d="M168.943046,110.990033 C169.112583,111.160133 169.282119,111.415282 169.451656,111.585382 C169.282119,111.415282 169.112583,111.160133 168.943046,110.990033 Z" id="XMLID_92_"></path>
+                    <path d="M119.862252,72.207309 C119.862252,73.5681063 119.777483,74.9289037 119.692715,76.2046512 C119.777483,74.9289037 119.862252,73.5681063 119.862252,72.207309 Z" id="XMLID_91_"></path>
+                    <path d="M119.353642,60.0451827 C118.929801,59.7900332 117.658278,59.1096346 116.556291,58.4292359 C117.658278,59.0245847 118.845033,59.7049834 119.353642,60.0451827 Z" id="XMLID_89_"></path>
+                    <path d="M116.471523,58.344186 C116.217219,58.1740864 115.962914,58.0039867 115.708609,57.9189369 C115.962914,58.0890365 116.217219,58.2591362 116.471523,58.344186 Z" id="XMLID_88_"></path>
+                    <path d="M173.181457,91.1734219 C173.181457,91.0883721 173.181457,91.0033223 173.181457,90.9182724 C173.181457,90.9182724 173.181457,90.9182724 173.181457,90.9182724 C173.181457,90.9182724 173.181457,90.9182724 173.181457,90.9182724 C173.181457,90.8332226 173.181457,90.7481728 173.181457,90.6631229 C173.181457,90.7481728 173.181457,90.8332226 173.181457,91.0033223 C173.181457,90.9182724 173.181457,91.0883721 173.181457,91.1734219 Z" id="XMLID_86_"></path>
+                    <path d="M152.328477,90.4079734 C152.413245,90.5780731 152.582781,90.6631229 152.66755,90.8332226 C152.66755,90.8332226 152.66755,90.8332226 152.66755,90.8332226 L152.66755,90.8332226 C152.66755,90.7481728 152.498013,90.5780731 152.328477,90.4079734 L152.328477,90.4079734 Z" id="XMLID_85_"></path>
+                    <path d="M134.950993,72.2923588 C136.646358,73.8232558 138.341722,75.4392027 139.952318,77.0551495 C138.256954,75.4392027 136.646358,73.8232558 134.950993,72.2923588 Z" id="XMLID_84_"></path>
+                    <path d="M168.095364,81.9880399 C168.434437,81.9880399 168.688742,82.0730897 169.027815,82.1581395 C168.688742,82.0730897 168.349669,81.9880399 168.095364,81.9880399 Z" id="XMLID_83_"></path>
+                    <path d="M163.178808,88.3667774 C163.178808,88.5368771 163.09404,88.6219269 163.09404,88.7920266 C163.09404,88.6219269 163.178808,88.5368771 163.178808,88.3667774 Z" id="XMLID_82_"></path>
+                    <path d="M169.282119,82.2431894 C169.451656,82.3282392 169.70596,82.413289 169.875497,82.5833887 C169.70596,82.4983389 169.451656,82.3282392 169.282119,82.2431894 Z" id="XMLID_81_"></path>
+                    <path d="M171.231788,83.944186 C171.316556,84.0292359 171.401325,84.1142857 171.401325,84.1993355 C171.316556,84.1142857 171.316556,84.0292359 171.231788,83.944186 Z" id="XMLID_80_"></path>
+                    <path d="M173.096689,88.9621262 C173.096689,88.9621262 173.096689,88.9621262 173.096689,88.9621262 C173.096689,88.8770764 173.096689,88.8770764 173.096689,88.7920266 C173.096689,88.8770764 173.096689,88.9621262 173.096689,88.9621262 C173.096689,88.9621262 173.096689,88.9621262 173.096689,88.9621262 Z" id="XMLID_79_"></path>
+                    <path d="M173.096689,92.7043189 C173.096689,92.7043189 173.096689,92.7043189 173.096689,92.7043189 C173.096689,92.6192691 173.096689,92.6192691 173.096689,92.7043189 C173.096689,92.7043189 173.096689,92.7893688 173.096689,92.7893688 C173.096689,92.7893688 173.096689,92.7893688 173.096689,92.7043189 Z" id="XMLID_78_"></path>
+                    <path d="M164.704636,84.1993355 C164.789404,84.1142857 164.874172,84.0292359 164.874172,83.944186 C164.874172,84.0292359 164.789404,84.1142857 164.704636,84.1993355 Z" id="XMLID_77_"></path>
+                    <path d="M167.162914,82.1581395 C167.417219,82.0730897 167.756291,81.9880399 168.095364,81.9880399 C167.756291,81.9880399 167.417219,82.0730897 167.162914,82.1581395 Z" id="XMLID_76_"></path>
+                    <path d="M144.529801,81.8179402 C143.766887,80.9674419 142.919205,80.2019934 142.156291,79.351495 C143.003974,80.1169435 143.766887,80.9674419 144.529801,81.8179402 Z" id="XMLID_75_"></path>
+                    <path d="M168.095364,54.0916944 L168.095364,54.0916944 C168.095364,54.0916944 168.095364,54.0916944 168.095364,54.0916944 L168.095364,65.9136213 L163.602649,86.7508306 C163.602649,86.8358804 163.602649,86.8358804 163.602649,86.9209302 C163.602649,86.9209302 163.602649,86.8358804 163.602649,86.8358804 L163.602649,86.8358804 L163.602649,86.8358804 L168.095364,65.9986711 L168.095364,54.0916944 L168.095364,54.0916944 L168.095364,54.0916944 L168.095364,54.0916944 Z" id="XMLID_74_"></path>
+                    <path d="M148.768212,86.3255814 C148.344371,85.9003322 147.92053,85.3900332 147.496689,84.9647841 C148.005298,85.4750831 148.344371,85.9003322 148.768212,86.3255814 Z" id="XMLID_73_"></path>
+                    <path d="M172.588079,86.8358804 C172.672848,87.0059801 172.672848,87.1760797 172.757616,87.3461794 C172.757616,87.3461794 172.757616,87.3461794 172.757616,87.3461794 C172.757616,87.0910299 172.672848,87.0059801 172.588079,86.8358804 L172.588079,86.8358804 L172.588079,86.8358804 Z" id="XMLID_72_"></path>
+                    <path d="M162.924503,90.7481728 L162.924503,90.7481728 C162.924503,90.6631229 162.924503,90.5780731 162.924503,90.4930233 C163.009272,90.6631229 162.924503,90.6631229 162.924503,90.7481728 Z" id="XMLID_71_"></path>
+                    <path d="M166.315232,82.5833887 C166.484768,82.413289 166.739073,82.3282392 166.908609,82.2431894 C166.654305,82.3282392 166.484768,82.4983389 166.315232,82.5833887 Z" id="XMLID_70_"></path>
+                    <path d="M165.382781,83.3488372 C165.552318,83.0936877 165.806623,82.923588 166.060927,82.7534884 C165.806623,82.923588 165.552318,83.1787375 165.382781,83.3488372 Z" id="XMLID_69_"></path>
+                    <path d="M172.757616,94.3202658 C172.757616,94.3202658 172.757616,94.3202658 172.757616,94.3202658 C172.672848,94.745515 172.503311,95.1707641 172.333775,95.5960133 C172.503311,95.255814 172.672848,94.8305648 172.757616,94.3202658 L172.757616,94.3202658 L172.757616,94.3202658 Z" id="XMLID_68_"></path>
+                    <path d="M17.6317881,86.8358804 C17.8013245,86.5807309 18.0556291,86.2405316 18.2251656,85.9853821 C18.0556291,86.3255814 17.8013245,86.5807309 17.6317881,86.8358804 Z" id="XMLID_67_"></path>
+                    <path d="M170.129801,82.7534884 C170.384106,82.923588 170.553642,83.1787375 170.807947,83.3488372 C170.553642,83.1787375 170.384106,82.923588 170.129801,82.7534884 Z" id="XMLID_66_"></path>
+                    <path d="M21.2768212,81.5627907 C21.3615894,81.4777409 21.4463576,81.3076412 21.5311258,81.2225914 C21.4463576,81.3076412 21.3615894,81.392691 21.2768212,81.5627907 Z" id="XMLID_65_"></path>
+                    <path d="M107.994702,90.7481728 L107.994702,90.7481728 C107.994702,90.7481728 107.994702,90.7481728 107.994702,90.7481728 L107.994702,90.7481728 L107.994702,90.7481728 L107.994702,90.6631229 C107.994702,90.6631229 107.994702,90.6631229 107.994702,90.7481728 Z" id="XMLID_64_"></path>
+                    <path d="M12.1218543,97.0418605 C11.8675497,97.4671096 11.6980132,97.9774086 11.4437086,98.4026578 C11.6980132,97.9774086 11.8675497,97.5521595 12.1218543,97.0418605 Z" id="XMLID_63_"></path>
+                    <path d="M9.32450331,103.590698 C9.32450331,103.675748 9.2397351,103.760797 9.2397351,103.845847 C9.2397351,103.760797 9.32450331,103.675748 9.32450331,103.590698 Z" id="XMLID_62_"></path>
+                    <path d="M29.4993377,71.8671096 C29.7536424,71.6119601 30.007947,71.3568106 30.2622517,71.1016611 C30.007947,71.3568106 29.7536424,71.6119601 29.4993377,71.8671096 Z" id="XMLID_59_"></path>
+                    <path d="M25.0066225,76.8 C25.2609272,76.4598007 25.5152318,76.2046512 25.7695364,75.8644518 C25.5152318,76.2046512 25.2609272,76.4598007 25.0066225,76.8 Z" id="XMLID_58_"></path>
+                    <polygon id="XMLID_57_" points="172.588079 86.8358804 168.095364 65.9986711"></polygon>
+                    <path d="M93.584106,102.5701 C93.4993377,102.5701 93.4145695,102.48505 93.3298013,102.48505 C93.4145695,102.5701 93.4993377,102.5701 93.584106,102.5701 Z" id="XMLID_56_"></path>
+                    <path d="M94.7708609,102.740199 C94.6860927,102.740199 94.6013245,102.740199 94.5165563,102.65515 C94.6013245,102.740199 94.6860927,102.740199 94.7708609,102.740199 Z" id="XMLID_55_"></path>
+                    <path d="M14.9192053,91.5136213 C14.6649007,92.0239203 14.3258278,92.5342193 14.0715232,93.1295681 C14.3258278,92.6192691 14.5801325,92.1089701 14.9192053,91.5136213 Z" id="XMLID_54_"></path>
+                    <path d="M92.397351,102.2299 C92.3125828,102.2299 92.3125828,102.2299 92.2278146,102.14485 C92.3125828,102.2299 92.3125828,102.2299 92.397351,102.2299 Z" id="XMLID_52_"></path>
+                    <path d="M84.3443709,88.0265781 C84.3443709,88.1116279 84.2596026,88.1966777 84.2596026,88.2817276 C84.3443709,88.1966777 84.3443709,88.1116279 84.3443709,88.0265781 Z" id="XMLID_49_"></path>
+                    <path d="M84.6834437,86.9209302 C84.6834437,87.0059801 84.5986755,87.0059801 84.5986755,87.0910299 C84.5986755,87.0910299 84.6834437,87.0059801 84.6834437,86.9209302 Z" id="XMLID_46_"></path>
+                    <path d="M85.1072848,85.9003322 C85.1072848,85.9003322 85.1072848,85.9853821 85.0225166,85.9853821 C85.0225166,85.9853821 85.1072848,85.9003322 85.1072848,85.9003322 Z" id="XMLID_45_"></path>
+                    <path d="M98.415894,79.0112957 C98.3311258,79.0112957 98.3311258,79.0112957 98.415894,79.0112957 C98.3311258,79.0112957 98.3311258,79.0112957 98.415894,79.0112957 Z" id="XMLID_44_"></path>
+                    <path d="M93.7536424,79.0112957 C93.7536424,79.0112957 93.6688742,79.0112957 93.7536424,79.0112957 C93.6688742,79.0112957 93.7536424,79.0112957 93.7536424,79.0112957 Z" id="XMLID_41_"></path>
+                    <path d="M96.1271523,52.0504983 C96.1271523,51.8803987 96.1271523,51.710299 96.1271523,51.5401993 C96.1271523,51.710299 96.1271523,51.8803987 96.1271523,52.0504983 Z" id="XMLID_39_"></path>
+                    <path d="M96.1271523,51.2850498 C96.1271523,51.2 96.1271523,51.0299003 96.1271523,50.9448505 C96.1271523,51.0299003 96.1271523,51.1149502 96.1271523,51.2850498 Z" id="XMLID_38_"></path>
+                    <path d="M96.1271523,50.7747508 C96.1271523,50.689701 96.1271523,50.689701 96.1271523,50.7747508 C96.1271523,50.689701 96.1271523,50.689701 96.1271523,50.7747508 Z" id="XMLID_37_"></path>
+                    <path d="M96.1271523,53.6664452 L96.1271523,53.4963455 L96.1271523,52.9860465 C96.1271523,52.8159468 96.1271523,52.6458472 96.1271523,52.4757475 C96.1271523,52.8159468 96.1271523,53.241196 96.1271523,53.6664452 Z" id="XMLID_36_"></path>
+                    <path d="M171.570861,97.2119601 C171.401325,97.3820598 171.316556,97.6372093 171.14702,97.807309 C171.316556,97.6372093 171.486093,97.3820598 171.570861,97.2119601 Z" id="XMLID_35_"></path>
+                    <path d="M84.1748344,89.3023256 C84.1748344,89.3873754 84.1748344,89.4724252 84.0900662,89.5574751 C84.0900662,89.4724252 84.0900662,89.3873754 84.1748344,89.3023256 Z" id="XMLID_34_"></path>
+                    <path d="M172.249007,95.9362126 C172.164238,96.1913621 171.994702,96.5315615 171.825166,96.786711 C171.994702,96.5315615 172.07947,96.276412 172.249007,95.9362126 Z" id="XMLID_32_"></path>
+                    <path d="M126.219868,166.697674 C125.796026,166.272425 125.456954,165.762126 125.033113,165.251827 C125.456954,165.847176 125.880795,166.272425 126.219868,166.697674 L126.219868,166.697674 Z" id="XMLID_31_" fill="#525353" fill-rule="nonzero"></path>
+                    <path d="M129.186755,169.674419 C129.186755,169.674419 129.186755,169.674419 129.186755,169.674419 C129.186755,169.674419 129.186755,169.674419 129.186755,169.674419 C129.186755,169.674419 127.915232,168.653821 126.219868,166.782724 L126.219868,166.782724 C127.915232,168.653821 129.186755,169.674419 129.186755,169.674419 Z" id="XMLID_30_" fill="#AA9678" fill-rule="nonzero"></path>
+                    <circle id="XMLID_29_" fill="#FFFFFF" fill-rule="nonzero" transform="translate(168.453205, 54.398970) rotate(-4.571494) translate(-168.453205, -54.398970) " cx="168.07937" cy="54.0237268" r="1"></circle>
+                    <path d="M174.537748,61.2358804 L174.537748,61.2358804 L174.537748,61.2358804 C174.537748,61.2358804 174.537748,61.1508306 174.537748,61.2358804 L174.537748,61.2358804 C173.435762,59.7049834 172.333775,58.344186 171.231788,57.1534884 C171.231788,57.1534884 171.231788,57.1534884 171.231788,57.1534884 C171.231788,57.1534884 171.231788,57.1534884 171.231788,57.1534884 C171.231788,57.1534884 171.231788,57.1534884 171.231788,57.1534884 L171.231788,57.1534884 C170.723179,56.5581395 170.21457,56.0478405 169.70596,55.5375415 C169.536424,55.3674419 169.282119,55.1973422 169.112583,55.0272425 C168.77351,54.6870432 168.434437,54.4318937 168.095364,54.1767442 L168.095364,54.1767442 L168.095364,66.0837209 L172.588079,86.9209302 L172.588079,86.9209302 C172.672848,87.0910299 172.672848,87.2611296 172.757616,87.4312292 L175.89404,91.0033223 L175.89404,91.0033223 L179.2,91.0033223 C179.2,90.6631229 179.2,90.4079734 179.2,90.0677741 L179.2,90.0677741 C179.2,80.2019934 177.589404,70.7614618 174.707285,61.9162791 L174.707285,61.9162791 C174.622517,61.5760797 174.622517,61.4059801 174.537748,61.2358804 Z" id="XMLID_27_" fill="#BBBCBD" fill-rule="nonzero"></path>
+                    <path d="M173.096689,88.8770764 C173.096689,88.8770764 173.096689,88.9621262 173.096689,88.9621262 C173.096689,88.9621262 173.096689,88.9621262 173.096689,89.0471761 C173.096689,89.0471761 173.096689,89.0471761 173.096689,89.0471761 C173.181457,89.5574751 173.181457,90.0677741 173.181457,90.5780731 C173.181457,90.6631229 173.181457,90.7481728 173.181457,90.8332226 C173.181457,90.8332226 173.181457,90.8332226 173.181457,90.8332226 C173.181457,90.8332226 173.181457,90.8332226 173.181457,90.8332226 C173.181457,90.9182724 173.181457,91.0033223 173.181457,91.0883721 C173.181457,91.5986711 173.181457,92.1089701 173.096689,92.5342193 C173.096689,92.5342193 173.096689,92.5342193 173.096689,92.5342193 C173.096689,92.5342193 173.096689,92.6192691 173.096689,92.6192691 C173.096689,92.6192691 173.096689,92.7043189 173.096689,92.7043189 C173.011921,93.2146179 172.927152,93.7249169 172.842384,94.2352159 C172.842384,94.2352159 172.842384,94.2352159 172.842384,94.2352159 L172.842384,94.2352159 L172.842384,94.2352159 C172.842384,94.2352159 172.842384,94.2352159 172.842384,94.2352159 L172.842384,94.2352159 L175.978808,90.7481728 L172.842384,87.1760797 C172.842384,87.1760797 172.842384,87.1760797 172.842384,87.1760797 C172.927152,87.7714286 173.011921,88.2817276 173.096689,88.8770764 Z" id="XMLID_25_" fill="#676A6A" fill-rule="nonzero"></path>
+                    <path d="M173.011921,92.8744186 C173.011921,92.7893688 173.011921,92.7893688 173.011921,92.7043189 C173.096689,92.1940199 173.096689,91.6837209 173.096689,91.2584718 C173.096689,91.1734219 173.096689,91.0033223 173.096689,90.9182724 C173.096689,90.8332226 173.096689,90.7481728 173.096689,90.5780731 C173.096689,90.0677741 173.096689,89.5574751 173.011921,89.0471761 C173.011921,88.9621262 173.011921,88.9621262 173.011921,88.8770764 C172.927152,88.3667774 172.842384,87.8564784 172.757616,87.3461794 C172.672848,87.1760797 172.672848,87.0059801 172.588079,86.8358804 C172.249007,85.8152824 171.909934,84.9647841 171.401325,84.1993355 C171.316556,84.1142857 171.231788,84.0292359 171.231788,83.944186 C171.062252,83.7740864 170.977483,83.6039867 170.807947,83.433887 C170.638411,83.1787375 170.384106,83.0086379 170.129801,82.8385382 C170.045033,82.7534884 169.960265,82.7534884 169.875497,82.6684385 C169.70596,82.4983389 169.451656,82.413289 169.282119,82.3282392 C169.197351,82.3282392 169.112583,82.2431894 169.027815,82.2431894 C168.77351,82.1581395 168.434437,82.0730897 168.095364,82.0730897 C167.756291,82.0730897 167.501987,82.1581395 167.162914,82.2431894 C167.078146,82.2431894 166.993377,82.3282392 166.908609,82.3282392 C166.739073,82.413289 166.484768,82.4983389 166.315232,82.6684385 C166.230464,82.7534884 166.145695,82.7534884 166.060927,82.8385382 C165.806623,83.0086379 165.637086,83.2637874 165.382781,83.433887 C165.213245,83.6039867 165.128477,83.7740864 164.95894,83.944186 C164.874172,84.0292359 164.789404,84.1142857 164.789404,84.1993355 C164.280795,84.9647841 163.856954,85.8152824 163.602649,86.8358804 C163.602649,86.8358804 163.602649,86.9209302 163.602649,86.9209302 C163.433113,87.3461794 163.348344,87.8564784 163.263576,88.3667774 C163.263576,88.5368771 163.178808,88.6219269 163.178808,88.7920266 C163.09404,89.3873754 163.09404,89.8976744 163.009272,90.4930233 C163.009272,90.5780731 163.009272,90.6631229 163.009272,90.7481728 L163.009272,90.7481728 C163.009272,95.5960133 165.298013,99.5933555 168.095364,99.5933555 C168.603974,99.5933555 169.027815,99.4232558 169.536424,99.2531561 C169.621192,99.2531561 169.70596,99.1681063 169.790728,99.1681063 C169.960265,99.0830565 170.129801,98.9129568 170.299338,98.827907 C170.384106,98.7428571 170.468874,98.6578073 170.553642,98.5727575 C170.807947,98.4026578 170.977483,98.1475083 171.231788,97.8923588 C171.401325,97.7222591 171.486093,97.5521595 171.655629,97.29701 C171.740397,97.1269103 171.825166,97.0418605 171.909934,96.8717608 C172.07947,96.6166113 172.164238,96.3614618 172.333775,96.0212625 C172.418543,95.9362126 172.418543,95.8511628 172.503311,95.6810631 C172.672848,95.255814 172.757616,94.8305648 172.927152,94.4053156 C172.927152,93.8950166 173.011921,93.3847176 173.011921,92.8744186 Z M168.264901,89.6425249 C167.162914,89.6425249 166.315232,88.1966777 166.315232,86.3255814 C166.315232,84.5395349 167.162914,83.0086379 168.264901,83.0086379 C169.366887,83.0086379 170.21457,84.454485 170.21457,86.3255814 C170.21457,88.1966777 169.282119,89.6425249 168.264901,89.6425249 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
+                    <ellipse id="XMLID_22_" fill="#FFFFFF" fill-rule="nonzero" cx="168.264901" cy="86.3255814" rx="1.94966887" ry="3.31694352"></ellipse>
+                    <path d="M163.517881,86.8358804 L163.517881,86.8358804 C163.856954,85.8152824 164.196026,84.9647841 164.704636,84.1993355 C164.789404,84.1142857 164.874172,84.0292359 164.874172,83.944186 C165.043709,83.7740864 165.128477,83.6039867 165.298013,83.433887 C165.46755,83.1787375 165.721854,83.0086379 165.976159,82.8385382 C166.060927,82.7534884 166.145695,82.7534884 166.230464,82.6684385 C166.4,82.4983389 166.654305,82.413289 166.823841,82.3282392 C166.908609,82.3282392 166.993377,82.2431894 167.078146,82.2431894 C167.33245,82.1581395 167.671523,82.0730897 168.010596,82.0730897 C168.349669,82.0730897 168.603974,82.1581395 168.943046,82.2431894 C169.027815,82.2431894 169.112583,82.3282392 169.197351,82.3282392 C169.366887,82.413289 169.621192,82.4983389 169.790728,82.6684385 C169.875497,82.7534884 169.960265,82.7534884 170.045033,82.8385382 C170.299338,83.0086379 170.468874,83.2637874 170.723179,83.433887 C170.892715,83.6039867 170.977483,83.7740864 171.14702,83.944186 C171.231788,84.0292359 171.316556,84.1142857 171.316556,84.1993355 C171.825166,84.9647841 172.249007,85.8152824 172.503311,86.8358804 L172.503311,86.8358804 L172.503311,86.8358804 L168.010596,65.9986711 L163.517881,86.8358804 L163.517881,86.8358804 L163.517881,86.8358804 Z" id="XMLID_21_" fill="#909393" fill-rule="nonzero"></path>
+                    <path d="M107.994702,90.6631229 C107.994702,90.2378738 107.994702,89.8126246 107.909934,89.3873754 C107.909934,89.3873754 107.909934,89.3873754 107.909934,89.3873754 C107.825166,88.9621262 107.825166,88.6219269 107.740397,88.1966777 C107.740397,88.1966777 107.740397,88.1966777 107.740397,88.1966777 C107.655629,87.7714286 107.570861,87.4312292 107.401325,87.0910299 C107.401325,87.0910299 107.401325,87.0910299 107.401325,87.0910299 C107.316556,86.7508306 107.14702,86.3255814 106.977483,85.9853821 C106.977483,85.9853821 106.977483,85.9853821 106.977483,85.9853821 C106.807947,85.6451827 106.638411,85.3049834 106.468874,84.9647841 L106.468874,84.9647841 C105.875497,83.944186 105.197351,83.0086379 104.349669,82.2431894 C103.247682,81.2225914 101.976159,80.372093 100.619868,79.7767442 C100.619868,79.7767442 100.619868,79.7767442 100.619868,79.7767442 C99.9417219,79.5215947 99.1788079,79.2664452 98.5006623,79.0963455 C98.5006623,79.0963455 98.5006623,79.0963455 98.415894,79.0963455 C97.6529801,78.9262458 96.8900662,78.841196 96.1271523,78.841196 C95.3642384,78.841196 94.6013245,78.9262458 93.8384106,79.0963455 C93.8384106,79.0963455 93.7536424,79.0963455 93.7536424,79.0963455 C92.9907285,79.2664452 92.3125828,79.4365449 91.6344371,79.6916944 C91.6344371,79.6916944 91.6344371,79.6916944 91.5496689,79.6916944 C90.8715232,79.9468439 90.1933775,80.2870432 89.6,80.7122924 C89.6,80.7122924 89.6,80.7122924 89.6,80.7122924 C89.0066225,81.1375415 88.413245,81.5627907 87.9046358,82.0730897 L87.9046358,82.0730897 L87.8198675,82.0730897 C86.9721854,82.923588 86.2092715,83.8591362 85.615894,84.8797342 C85.615894,84.8797342 85.615894,84.8797342 85.615894,84.8797342 C85.4463576,85.2199336 85.2768212,85.5601329 85.1072848,85.9003322 C85.1072848,85.9003322 85.1072848,85.9853821 85.0225166,85.9853821 C84.8529801,86.3255814 84.7682119,86.5807309 84.6834437,86.9209302 C84.6834437,87.0059801 84.5986755,87.0059801 84.5986755,87.0910299 C84.5139073,87.4312292 84.4291391,87.6863787 84.3443709,88.0265781 C84.3443709,88.1116279 84.2596026,88.1966777 84.2596026,88.2817276 C84.1748344,88.6219269 84.1748344,88.8770764 84.0900662,89.2172757 C84.0900662,89.3023256 84.0900662,89.3873754 84.005298,89.4724252 C84.005298,89.8976744 83.9205298,90.3229236 83.9205298,90.7481728 C83.9205298,91.5136213 84.005298,92.2790698 84.1748344,93.0445183 C84.1748344,93.0445183 84.1748344,93.0445183 84.1748344,93.1295681 C84.3443709,93.8950166 84.5139073,94.5754153 84.8529801,95.3408638 C84.8529801,95.3408638 84.8529801,95.3408638 84.8529801,95.3408638 C85.4463576,96.7016611 86.2940397,97.9774086 87.3112583,99.0830565 C88.1589404,99.9335548 89.0913907,100.699003 90.1086093,101.294352 C90.1086093,101.294352 90.1086093,101.294352 90.1086093,101.294352 C90.4476821,101.464452 90.786755,101.634551 91.1258278,101.804651 C91.1258278,101.804651 91.210596,101.804651 91.210596,101.804651 C91.5496689,101.974751 91.8887417,102.059801 92.1430464,102.14485 C92.2278146,102.14485 92.2278146,102.14485 92.3125828,102.2299 C92.6516556,102.31495 92.9059603,102.4 93.2450331,102.48505 C93.3298013,102.48505 93.4145695,102.5701 93.4993377,102.5701 C93.8384106,102.65515 94.0927152,102.65515 94.4317881,102.740199 C94.5165563,102.740199 94.6013245,102.740199 94.6860927,102.825249 C95.1099338,102.825249 95.5337748,102.910299 95.9576159,102.910299 C97.6529801,102.910299 99.1788079,102.5701 100.619868,101.974751 C101.298013,101.634551 101.976159,101.294352 102.654305,100.869103 C103.925828,100.018605 105.027815,98.9129568 105.875497,97.6372093 C106.299338,96.9568106 106.638411,96.276412 106.977483,95.5960133 C107.570861,94.1501661 107.909934,92.5342193 107.909934,90.9182724 C107.909934,90.9182724 107.909934,90.8332226 107.909934,90.8332226 L107.909934,90.8332226 C107.994702,90.6631229 107.994702,90.6631229 107.994702,90.6631229 L107.994702,90.6631229 Z M96.0423841,89.2172757 C93.584106,89.2172757 91.5496689,87.1760797 91.5496689,84.7096346 C91.5496689,82.2431894 93.584106,80.2019934 96.0423841,80.2019934 C98.5006623,80.2019934 100.535099,82.2431894 100.535099,84.7096346 C100.535099,87.1760797 98.5006623,89.2172757 96.0423841,89.2172757 Z" id="Shape" fill="#000000" fill-rule="nonzero"></path>
+                    <ellipse id="XMLID_18_" fill="#FFFFFF" fill-rule="nonzero" cx="96.0423841" cy="84.7096346" rx="4.49271523" ry="4.5076412"></ellipse>
+                    <path d="M87.7350993,82.0730897 L87.7350993,82.0730897 L87.7350993,82.0730897 L87.7350993,82.0730897 L87.7350993,82.0730897 L96.0423841,56.6431894 C96.0423841,56.6431894 96.0423841,55.1122924 96.0423841,53.6664452 C96.0423841,53.241196 96.0423841,52.8159468 96.0423841,52.4757475 C96.0423841,52.3056478 96.0423841,52.220598 96.0423841,52.1355482 C96.0423841,51.9654485 96.0423841,51.7953488 96.0423841,51.6252492 C96.0423841,51.5401993 96.0423841,51.3700997 96.0423841,51.2850498 C96.0423841,51.2 96.0423841,51.0299003 96.0423841,50.9448505 C96.0423841,50.8598007 96.0423841,50.7747508 96.0423841,50.7747508 C96.0423841,50.689701 96.0423841,50.689701 96.0423841,50.689701 C91.4649007,49.7541528 86.7178808,49.2438538 81.8860927,49.2438538 C80.2754967,49.2438538 78.6649007,49.3289037 77.0543046,49.4139535 C76.8,49.4139535 76.6304636,49.4139535 76.3761589,49.4990033 C68.0688742,50.0943522 59.9311258,52.3056478 52.386755,55.792691 C45.9443709,58.7694352 39.8410596,62.6817276 34.5006623,67.2744186 L34.5006623,67.2744186 C34.5006623,67.2744186 34.5006623,67.2744186 34.5006623,67.2744186 C33.0596026,68.5501661 31.618543,69.8259136 30.2622517,71.186711 C30.007947,71.4418605 29.7536424,71.69701 29.4993377,71.9521595 C28.2278146,73.227907 26.9562914,74.5887043 25.7695364,75.9495017 C25.5152318,76.289701 25.2609272,76.5448505 25.0066225,76.8850498 C23.8198675,78.330897 22.6331126,79.7767442 21.5311258,81.2225914 C21.4463576,81.3076412 21.3615894,81.4777409 21.2768212,81.5627907 C20.2596026,83.0086379 19.2423841,84.454485 18.2251656,85.9853821 C18.0556291,86.2405316 17.8013245,86.5807309 17.6317881,86.8358804 C16.8688742,88.1116279 16.1059603,89.3873754 15.4278146,90.6631229 L52.9801325,90.6631229 L53.0649007,90.6631229 L87.7350993,82.0730897 Z" id="XMLID_17_" fill="#BBBCBD" fill-rule="nonzero"></path>
+                    <path d="M119.523179,79.2664452 C119.607947,78.2458472 119.692715,77.310299 119.692715,76.289701 C119.777483,74.9289037 119.777483,73.6531561 119.862252,72.2923588 C119.862252,71.2717608 119.862252,70.2511628 119.862252,69.145515 C119.862252,68.8053156 119.862252,68.5501661 119.862252,68.2099668 C119.862252,65.4883721 119.692715,62.8518272 119.607947,60.1302326 L119.607947,60.1302326 L119.607947,60.1302326 C119.607947,60.1302326 119.607947,60.1302326 119.607947,60.1302326 C119.607947,60.1302326 119.607947,60.1302326 119.607947,60.1302326 C119.607947,60.1302326 119.523179,60.1302326 119.523179,60.0451827 C119.523179,60.0451827 119.438411,60.0451827 119.438411,59.9601329 C118.929801,59.7049834 117.743046,59.0245847 116.64106,58.344186 C116.64106,58.344186 116.556291,58.344186 116.556291,58.344186 C116.301987,58.1740864 116.047682,58.0039867 115.793377,57.9189369 C115.793377,57.9189369 115.793377,57.9189369 115.793377,57.9189369 C115.623841,57.833887 115.454305,57.6637874 115.284768,57.5787375 C115.284768,57.5787375 115.2,57.4936877 115.2,57.4936877 C115.030464,57.4086379 114.860927,57.323588 114.776159,57.2385382 C113.080795,56.30299 111.300662,55.5375415 109.52053,54.772093 C105.282119,52.9860465 99.5178808,51.3700997 96.2119205,50.6046512 L96.2119205,52.9009967 L96.2119205,53.4112957 L96.2119205,53.5813953 C96.2119205,55.1122924 96.2119205,56.5581395 96.2119205,56.5581395 L104.434437,81.90299 L104.434437,81.90299 C105.282119,82.6684385 106.045033,83.6039867 106.553642,84.6245847 L106.553642,84.6245847 C106.723179,84.9647841 106.892715,85.3049834 107.062252,85.6451827 C107.062252,85.6451827 107.062252,85.6451827 107.062252,85.6451827 C107.231788,85.9853821 107.401325,86.3255814 107.486093,86.7508306 C107.486093,86.7508306 107.486093,86.7508306 107.486093,86.7508306 C107.570861,87.0910299 107.740397,87.5162791 107.825166,87.8564784 C107.825166,87.8564784 107.825166,87.8564784 107.825166,87.8564784 C107.909934,88.2817276 107.994702,88.6219269 107.994702,89.0471761 C107.994702,89.0471761 107.994702,89.0471761 107.994702,89.0471761 C108.07947,89.4724252 108.07947,89.8976744 108.07947,90.3229236 L108.07947,90.3229236 L108.07947,90.4079734 L118.082119,90.4079734 C118.760265,86.7508306 119.268874,83.0086379 119.523179,79.2664452 C119.523179,79.4365449 119.523179,79.351495 119.523179,79.2664452 Z" id="XMLID_16_" fill="#E2DDDB" fill-rule="nonzero"></path>
+                    <path d="M108.07947,126.894352 C110.368212,124.598007 112.487417,122.471761 114.521854,120.345515 C115.708609,119.069767 116.895364,117.79402 118.082119,116.603322 C126.474172,107.50299 132.577483,98.9129568 136.307285,87.9415282 C136.392053,87.6863787 136.476821,87.3461794 136.561589,86.9209302 C136.561589,86.8358804 136.561589,86.8358804 136.561589,86.7508306 C136.646358,86.3255814 136.731126,85.9003322 136.815894,85.3900332 C136.815894,85.0498339 136.900662,84.7096346 136.900662,84.3694352 C135.968212,79.6066445 134.188079,74.9289037 132.577483,70.3362126 C132.577483,70.3362126 132.577483,70.3362126 132.577483,70.4212625 C132.577483,70.4212625 132.577483,70.4212625 132.492715,70.3362126 C132.153642,70.0810631 131.899338,69.7408638 131.560265,69.4857143 C130.627815,68.6352159 129.695364,67.7847176 128.678146,66.9342193 C125.711258,64.4677741 122.659603,62.1714286 119.438411,60.2152824 L119.438411,60.2152824 C119.607947,62.9368771 119.692715,65.5734219 119.692715,68.2950166 C119.692715,68.6352159 119.692715,68.8903654 119.692715,69.2305648 C119.692715,70.2511628 119.692715,71.2717608 119.692715,72.3774086 C119.692715,73.738206 119.607947,75.0990033 119.523179,76.3747508 C119.438411,77.3953488 119.438411,78.330897 119.353642,79.351495 C119.353642,79.4365449 119.353642,79.5215947 119.353642,79.6916944 C119.01457,83.433887 118.590728,87.1760797 117.912583,90.8332226 L116.725828,96.4465116 C114.26755,106.482392 109.266225,115.497674 105.197351,124.853156 C104.095364,127.319601 103.078146,129.871096 102.145695,132.422591 C102.060927,132.677741 101.976159,132.93289 101.891391,133.18804 C103.162914,131.827243 104.349669,130.636545 105.197351,129.786047 C106.299338,128.680399 107.14702,127.74485 108.07947,126.894352 Z" id="XMLID_14_" fill="#FBB040" fill-rule="nonzero"></path>
+                    <path d="M87.8198675,82.0730897 L87.8198675,82.0730897 C88.3284768,81.5627907 88.9218543,81.1375415 89.5152318,80.7122924 C89.5152318,80.7122924 89.5152318,80.7122924 89.5152318,80.7122924 C90.1086093,80.2870432 90.786755,79.9468439 91.4649007,79.6916944 C91.4649007,79.6916944 91.4649007,79.6916944 91.5496689,79.6916944 C92.2278146,79.4365449 92.9059603,79.1813953 93.6688742,79.0963455 C93.6688742,79.0963455 93.7536424,79.0963455 93.7536424,79.0963455 C94.5165563,78.9262458 95.2794702,78.841196 96.0423841,78.841196 C96.805298,78.841196 97.5682119,78.9262458 98.3311258,79.0963455 C98.3311258,79.0963455 98.3311258,79.0963455 98.415894,79.0963455 C99.1788079,79.2664452 99.8569536,79.4365449 100.535099,79.7767442 C100.535099,79.7767442 100.535099,79.7767442 100.535099,79.7767442 C101.891391,80.372093 103.162914,81.1375415 104.264901,82.2431894 L104.264901,82.2431894 L96.0423841,56.8983389 L87.8198675,82.0730897 Z" id="XMLID_13_" fill="#909393" fill-rule="nonzero"></path>
+                    <path d="M84.9377483,95.3408638 C84.6834437,94.6604651 84.4291391,93.8950166 84.2596026,93.1295681 C84.2596026,93.1295681 84.2596026,93.1295681 84.2596026,93.0445183 C84.0900662,92.2790698 84.005298,91.5136213 84.005298,90.7481728 C84.005298,90.3229236 84.005298,89.8976744 84.0900662,89.4724252 C84.0900662,89.3873754 84.0900662,89.3023256 84.1748344,89.2172757 C84.1748344,88.8770764 84.2596026,88.6219269 84.3443709,88.2817276 C84.3443709,88.1966777 84.4291391,88.1116279 84.4291391,88.0265781 C84.5139073,87.6863787 84.5986755,87.4312292 84.6834437,87.0910299 C84.6834437,87.0059801 84.7682119,87.0059801 84.7682119,86.9209302 C84.8529801,86.5807309 85.0225166,86.2405316 85.1072848,85.9853821 C85.1072848,85.9853821 85.1072848,85.9003322 85.192053,85.9003322 C85.3615894,85.5601329 85.5311258,85.2199336 85.7006623,84.8797342 C85.7006623,84.8797342 85.7006623,84.8797342 85.7006623,84.8797342 C86.2940397,83.8591362 87.0569536,82.923588 87.9046358,82.0730897 L87.9046358,82.0730897 L53.1496689,90.6631229 L53.0649007,90.6631229 L87.4807947,99.0830565 C86.3788079,98.0624585 85.5311258,96.786711 84.9377483,95.3408638 C84.9377483,95.3408638 84.9377483,95.3408638 84.9377483,95.3408638 Z" id="XMLID_12_" fill="#676A6A" fill-rule="nonzero"></path>
+                    <path d="M163.09404,88.7920266 C163.09404,88.6219269 163.178808,88.4518272 163.178808,88.3667774 C163.263576,87.8564784 163.348344,87.3461794 163.517881,86.9209302 C163.517881,86.8358804 163.517881,86.8358804 163.517881,86.7508306 L168.010596,65.9136213 L168.010596,54.0066445 C164.280795,50.9448505 160.381457,49.2438538 156.227815,49.2438538 C150.972185,49.2438538 146.140397,52.1355482 142.495364,55.7076412 C138.511258,59.6199336 135.459603,64.5528239 132.916556,69.4857143 C132.831788,69.7408638 132.662252,69.9109635 132.577483,70.166113 C133.340397,70.8465116 134.103311,71.5269103 134.866225,72.207309 C136.561589,73.738206 138.256954,75.3541528 139.86755,76.9700997 C140.630464,77.7355482 141.393377,78.5009967 142.156291,79.2664452 C142.919205,80.1169435 143.766887,80.882392 144.529801,81.7328904 C145.54702,82.8385382 146.564238,83.8591362 147.496689,84.9647841 C147.92053,85.3900332 148.344371,85.9003322 148.768212,86.3255814 C149.954967,87.6863787 151.141722,88.9621262 152.328477,90.3229236 L152.328477,90.3229236 C152.498013,90.4930233 152.66755,90.6631229 152.752318,90.7481728 L163.009272,90.7481728 C163.009272,90.6631229 163.009272,90.5780731 163.009272,90.4930233 C163.009272,89.9827243 163.009272,89.3873754 163.09404,88.7920266 Z" id="XMLID_11_" fill="#E2DDDB" fill-rule="nonzero"></path>
+                    <path d="M132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 L132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 C132.662252,70.3362126 132.662252,70.3362126 132.662252,70.2511628 C132.662252,70.3362126 132.662252,70.3362126 132.662252,70.2511628 Z" id="XMLID_10_" fill="#E2DDDB" fill-rule="nonzero"></path>
+                    <path d="M9.2397351,103.845847 C9.2397351,103.760797 9.32450331,103.675748 9.32450331,103.590698 C10.002649,101.889701 10.6807947,100.188704 11.4437086,98.4877076 C11.613245,97.9774086 11.8675497,97.5521595 12.1218543,97.1269103 C12.7152318,95.766113 13.3933775,94.4903654 14.0715232,93.2146179 C14.3258278,92.7043189 14.5801325,92.1940199 14.9192053,91.5986711 C15.0887417,91.3435216 15.2582781,91.0033223 15.4278146,90.7481728 C16.1907285,89.4724252 16.8688742,88.1966777 17.6317881,86.9209302 C17.8013245,86.6657807 18.0556291,86.3255814 18.2251656,86.0704319 C19.1576159,84.5395349 20.1748344,83.0936877 21.2768212,81.6478405 C21.3615894,81.5627907 21.4463576,81.392691 21.5311258,81.3076412 C22.6331126,79.7767442 23.8198675,78.330897 25.0066225,76.9700997 C25.2609272,76.6299003 25.5152318,76.3747508 25.7695364,76.0345515 C26.9562914,74.6737542 28.2278146,73.3129568 29.4993377,72.0372093 C29.7536424,71.7820598 30.007947,71.5269103 30.2622517,71.2717608 C31.618543,69.9109635 32.9748344,68.6352159 34.5006623,67.3594684 C34.5006623,67.3594684 34.5006623,67.3594684 34.5006623,67.3594684 C40.1801325,48.138206 57.7271523,34.1049834 78.410596,34.1049834 C86.7178808,34.1049834 95.0251656,36.4863787 102.145695,40.9089701 C109.435762,45.4166113 115.369536,51.9654485 119.184106,59.5348837 C119.184106,59.5348837 119.184106,59.6199336 119.268874,59.6199336 C119.353642,59.7900332 119.438411,59.9601329 119.607947,60.2152824 L119.607947,60.2152824 L119.607947,60.2152824 C119.607947,60.2152824 119.607947,60.2152824 119.607947,60.2152824 C119.607947,60.2152824 119.607947,60.2152824 119.607947,60.2152824 C122.829139,62.1714286 125.880795,64.4677741 128.847682,66.9342193 C129.864901,67.7847176 130.797351,68.6352159 131.729801,69.4857143 C132.068874,69.7408638 132.323179,70.0810631 132.662252,70.3362126 C132.662252,70.3362126 132.662252,70.3362126 132.662252,70.3362126 C132.662252,70.3362126 132.662252,70.3362126 132.662252,70.3362126 C132.74702,70.0810631 132.831788,69.9109635 133.001325,69.655814 C135.883444,51.2 144.021192,37.8471761 153.6,37.8471761 C160.805298,37.8471761 167.247682,45.4166113 171.14702,57.0684385 L171.14702,57.1534884 C171.14702,57.1534884 171.14702,57.1534884 171.14702,57.1534884 C172.249007,58.344186 173.350993,59.7049834 174.45298,61.1508306 L174.45298,61.1508306 C174.45298,61.1508306 174.45298,61.2358804 174.537748,61.2358804 L174.537748,61.2358804 L174.537748,61.2358804 C174.622517,61.4059801 174.622517,61.5760797 174.707285,61.7461794 L174.707285,61.7461794 L174.537748,61.1508306 C162.58543,25.7700997 129.271523,0.255149502 89.9390728,0.255149502 C40.6039735,0.255149502 0.678145695,40.3136213 0.678145695,89.8126246 C0.678145695,99.5933555 2.20397351,108.948837 5.08609272,117.70897 C5.08609272,117.70897 5.08609272,117.70897 5.08609272,117.62392 C5.6794702,114.987375 6.35761589,112.350831 7.1205298,109.799336 C7.7986755,107.75814 8.47682119,105.801993 9.2397351,103.845847 Z" id="XMLID_9_" fill="#525353" fill-rule="nonzero"></path>
+                    <path d="M175.89404,90.8332226 L172.757616,94.3202658 L172.757616,94.3202658 C172.757616,94.3202658 172.757616,94.3202658 172.757616,94.3202658 C172.672848,94.745515 172.503311,95.1707641 172.333775,95.5960133 C172.333775,95.6810631 172.249007,95.766113 172.164238,95.9362126 C172.07947,96.1913621 171.909934,96.5315615 171.740397,96.786711 C171.655629,96.9568106 171.570861,97.0418605 171.486093,97.2119601 C171.316556,97.3820598 171.231788,97.6372093 171.062252,97.807309 C170.892715,98.0624585 170.638411,98.317608 170.384106,98.4877076 C170.299338,98.5727575 170.21457,98.6578073 170.129801,98.7428571 C169.960265,98.9129568 169.790728,98.9980066 169.621192,99.0830565 C169.536424,99.0830565 169.451656,99.1681063 169.366887,99.1681063 C168.943046,99.4232558 168.434437,99.5083056 167.925828,99.5083056 C165.128477,99.5083056 162.839735,95.5960133 162.839735,90.6631229 L162.839735,90.6631229 L162.839735,90.6631229 L152.582781,90.6631229 L152.582781,90.6631229 C152.582781,90.6631229 152.582781,90.6631229 152.582781,90.6631229 C154.53245,92.8744186 156.397351,95.0857143 158.177483,97.3820598 C158.177483,97.3820598 158.262252,97.4671096 158.262252,97.4671096 C160.042384,99.6784053 161.822517,101.889701 163.602649,104.100997 C163.687417,104.186047 163.772185,104.356146 163.856954,104.441196 C165.552318,106.567442 167.162914,108.693688 168.77351,110.819934 C168.943046,110.990033 169.112583,111.245183 169.282119,111.415282 C170.977483,113.711628 172.672848,116.007973 174.368212,118.219269 C174.368212,118.219269 174.368212,118.219269 174.368212,118.304319 C177.335099,109.544186 178.945695,100.273754 179.030464,90.5780731 L179.030464,90.5780731 L175.89404,90.8332226 L175.89404,90.8332226 Z" id="XMLID_8_" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    <path d="M76.3761589,49.4139535 C76.6304636,49.4139535 76.8,49.4139535 77.0543046,49.3289037 C78.6649007,49.2438538 80.2754967,49.158804 81.8860927,49.158804 C86.7178808,49.158804 91.4649007,49.669103 96.0423841,50.6046512 C96.0423841,50.6046512 96.0423841,50.6046512 96.0423841,50.689701 C96.0423841,50.689701 96.0423841,50.7747508 96.0423841,50.8598007 C96.0423841,50.9448505 96.0423841,51.0299003 96.0423841,51.2 C96.0423841,51.2850498 96.0423841,51.3700997 96.0423841,51.5401993 C96.0423841,51.710299 96.0423841,51.8803987 96.0423841,52.0504983 C96.0423841,52.1355482 96.0423841,52.3056478 96.0423841,52.3906977 C96.0423841,52.5607973 96.0423841,52.730897 96.0423841,52.9009967 L96.0423841,50.6046512 C99.2635762,51.3700997 105.027815,52.9860465 109.350993,54.772093 C111.131126,55.5375415 112.911258,56.3880399 114.606623,57.2385382 C114.691391,57.2385382 114.860927,57.323588 115.030464,57.4936877 C115.030464,57.4936877 115.115232,57.4936877 115.115232,57.5787375 C115.284768,57.6637874 115.454305,57.7488372 115.623841,57.9189369 C115.623841,57.9189369 115.623841,57.9189369 115.623841,57.9189369 C115.878146,58.0890365 116.13245,58.1740864 116.386755,58.344186 C116.386755,58.344186 116.471523,58.344186 116.471523,58.344186 C117.57351,58.9395349 118.760265,59.7049834 119.268874,59.9601329 C119.353642,59.9601329 119.353642,60.0451827 119.353642,60.0451827 C119.353642,60.0451827 119.438411,60.1302326 119.438411,60.1302326 L119.438411,60.1302326 C119.353642,59.9601329 119.268874,59.7900332 119.099338,59.5348837 C119.099338,59.5348837 119.099338,59.4498339 119.01457,59.4498339 C115.2,51.7953488 109.181457,45.2465116 101.976159,40.8239203 C94.8556291,36.4863787 86.5483444,34.0199336 78.2410596,34.0199336 C57.5576159,34.0199336 40.010596,48.0531561 34.3311258,67.2744186 C39.7562914,62.5966777 45.7748344,58.6843854 52.2172185,55.792691 C59.9311258,52.220598 68.1536424,50.0943522 76.3761589,49.4139535 Z" id="XMLID_7_" fill="#000000" fill-rule="nonzero"></path>
+                    <path d="M96.1271523,52.9860465 L96.1271523,53.4963455" id="XMLID_6_"></path>
+                    <path d="M142.580132,55.792691 C146.225166,52.220598 151.056954,49.3289037 156.312583,49.3289037 C160.466225,49.3289037 164.450331,51.0299003 168.095364,54.0916944 C168.095364,54.0916944 168.095364,54.0916944 168.095364,54.0916944 L168.095364,54.0916944 L168.095364,54.0916944 C168.434437,54.3468439 168.77351,54.6870432 169.112583,54.9421927 C169.282119,55.1122924 169.536424,55.282392 169.70596,55.4524917 C170.21457,55.9627907 170.723179,56.4730897 171.231788,57.0684385 L171.231788,57.0684385 C171.231788,57.0684385 171.231788,57.0684385 171.231788,57.0684385 C171.231788,57.0684385 171.231788,57.0684385 171.231788,57.0684385 L171.231788,57.0684385 L171.231788,56.9833887 C167.247682,45.3315615 160.890066,37.7621262 153.684768,37.7621262 C144.10596,37.7621262 135.968212,51.0299003 133.086093,69.5707641 L133.086093,69.5707641 C135.459603,64.6378738 138.596026,59.7049834 142.580132,55.792691 Z" id="XMLID_5_" fill="#000000" fill-rule="nonzero"></path>
+                    <path d="M57.981457,173.416611 C58.8291391,173.756811 59.592053,174.01196 60.4397351,174.26711 C69.6794702,177.499003 79.597351,179.28505 89.9390728,179.28505 C101.721854,179.28505 112.996026,176.988704 123.25298,172.821262 C123.761589,172.566113 124.354967,172.396013 124.863576,172.140864 C125.711258,171.800664 126.643709,171.375415 127.491391,170.950166 C128.254305,170.609967 129.017219,170.269767 129.780132,169.844518 C129.610596,169.844518 129.44106,169.929568 129.271523,169.929568 L129.271523,169.929568 C126.050331,170.269767 122.913907,170.354817 119.777483,169.844518 C101.382781,167.207973 97.3139073,158.277741 97.9072848,149.092359 C96.5509934,148.32691 95.2794702,147.476412 93.8384106,146.455814 C79.6821192,136.164784 71.2900662,125.193355 71.2900662,125.193355 C71.2900662,125.193355 82.2251656,133.613289 98.5006623,139.992027 C98.8397351,140.162126 99.1788079,140.247176 99.5178808,140.417276 C100.280795,137.780731 101.213245,135.229236 101.976159,133.01794 L101.976159,133.01794 C102.060927,132.762791 102.145695,132.507641 102.230464,132.252492 C103.162914,129.700997 104.180132,127.149502 105.282119,124.683056 C109.350993,115.327575 114.352318,106.227243 116.810596,96.276412 L117.997351,90.6631229 L107.994702,90.6631229 L107.994702,90.6631229 L107.994702,90.6631229 C107.994702,90.6631229 107.994702,90.6631229 107.994702,90.6631229 L107.994702,90.6631229 L107.994702,90.6631229 C107.994702,90.6631229 107.994702,90.7481728 107.994702,90.7481728 C107.994702,92.4491694 107.655629,93.9800664 107.062252,95.4259136 C106.723179,96.1063123 106.384106,96.8717608 105.960265,97.4671096 C105.112583,98.7428571 104.010596,99.848505 102.739073,100.699003 C102.060927,101.124252 101.382781,101.464452 100.704636,101.804651 C99.2635762,102.4 97.6529801,102.740199 96.0423841,102.740199 C95.618543,102.740199 95.194702,102.740199 94.7708609,102.65515 C94.6860927,102.65515 94.6013245,102.65515 94.5165563,102.5701 C94.1774834,102.5701 93.9231788,102.48505 93.584106,102.4 C93.4993377,102.4 93.4145695,102.31495 93.3298013,102.31495 C92.9907285,102.2299 92.7364238,102.14485 92.397351,102.059801 C92.3125828,102.059801 92.3125828,102.059801 92.2278146,101.974751 C91.8887417,101.889701 91.5496689,101.719601 91.2953642,101.634551 C91.2953642,101.634551 91.210596,101.634551 91.210596,101.634551 C90.8715232,101.464452 90.5324503,101.294352 90.1933775,101.124252 C90.1933775,101.124252 90.1933775,101.124252 90.1933775,101.124252 C89.1761589,100.528904 88.2437086,99.848505 87.3960265,98.9129568 L52.9801325,90.4930233 L15.4278146,90.4930233 C15.2582781,90.7481728 15.0887417,91.0883721 14.9192053,91.3435216 C14.6649007,91.8538206 14.3258278,92.3641196 14.0715232,92.9594684 C13.3933775,94.2352159 12.7152318,95.5960133 12.1218543,96.8717608 C11.8675497,97.29701 11.6980132,97.807309 11.4437086,98.2325581 C10.6807947,99.9335548 10.002649,101.634551 9.32450331,103.335548 C9.32450331,103.420598 9.2397351,103.505648 9.2397351,103.590698 C8.47682119,105.546844 7.7986755,107.58804 7.20529801,109.629236 C6.44238411,112.180731 5.76423841,114.817276 5.17086093,117.453821 C11.1046358,135.569435 22.5483444,151.133555 37.6370861,162.019934 C38.0609272,162.360133 38.5695364,162.615282 38.9933775,162.955482 C41.5364238,164.741528 44.1642384,166.442525 46.8768212,167.888372 C50.4370861,170.099668 54.1668874,171.885714 57.981457,173.416611 Z" id="XMLID_4_" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    <path d="M119.607947,145.520266 C119.438411,146.455814 119.353642,147.391362 119.353642,148.32691 C119.268874,149.942857 119.438411,151.558804 119.692715,153.004651 C119.862252,154.025249 120.031788,154.960797 120.286093,155.896346 C120.709934,157.257143 121.133775,158.53289 121.727152,159.723588 C122.32053,160.914286 122.913907,162.019934 123.507285,162.955482 C123.676821,163.295681 123.931126,163.63588 124.100662,163.89103 C124.439735,164.316279 124.69404,164.741528 125.033113,165.166777 C125.456954,165.677076 125.880795,166.187375 126.219868,166.612625 C127.830464,168.483721 129.186755,169.504319 129.186755,169.504319 C129.186755,169.504319 129.186755,169.504319 129.186755,169.589369 C129.186755,169.674419 129.186755,169.759468 129.271523,169.844518 L129.271523,169.844518 C129.44106,169.844518 129.610596,169.759468 129.780132,169.759468 C133.764238,169.249169 137.748344,168.143522 141.73245,166.782724 C143.766887,166.017276 145.801325,165.251827 147.750993,164.401329 C148.344371,164.146179 148.937748,163.80598 149.531126,163.550831 C169.960265,153.6 187.083444,136.079734 187.083444,136.079734 C161.483444,148.752159 136.307285,148.24186 119.607947,145.520266 Z" id="XMLID_3_" fill="#9F2255" fill-rule="nonzero"></path>
+                    <path d="M168.943046,110.990033 C167.33245,108.863787 165.637086,106.737542 164.02649,104.611296 C163.941722,104.526246 163.856954,104.356146 163.772185,104.271096 C161.992053,102.059801 160.211921,99.848505 158.431788,97.6372093 C158.431788,97.6372093 158.34702,97.5521595 158.34702,97.5521595 C156.482119,95.255814 154.617219,93.0445183 152.752318,90.8332226 C152.66755,90.6631229 152.498013,90.5780731 152.413245,90.4079734 C151.22649,89.0471761 150.039735,87.7714286 148.85298,86.4106312 C148.429139,85.9853821 148.005298,85.4750831 147.581457,85.0498339 C146.564238,83.944186 145.631788,82.923588 144.61457,81.8179402 C143.851656,80.9674419 143.003974,80.2019934 142.24106,79.351495 C141.478146,78.5860465 140.715232,77.820598 139.952318,77.0551495 C138.341722,75.4392027 136.646358,73.8232558 134.950993,72.2923588 C134.188079,71.6119601 133.425166,70.9315615 132.662252,70.2511628 C132.662252,70.2511628 132.662252,70.2511628 132.662252,70.2511628 C134.272848,74.9289037 136.137748,79.6066445 137.070199,84.454485 C137.324503,85.7302326 137.49404,86.9209302 137.663576,88.1116279 C139.952318,104.866445 134.527152,115.837874 126.050331,130.296346 C125.456954,131.316944 124.778808,132.422591 124.18543,133.443189 C122.235762,136.675083 120.964238,139.821927 120.286093,142.713621 C120.031788,143.649169 119.862252,144.584718 119.692715,145.520266 C136.392053,148.24186 161.483444,148.752159 187.168212,136.079734 C187.168212,136.079734 182.166887,128.680399 174.537748,118.474419 C172.842384,116.178073 171.14702,113.881728 169.451656,111.670432 C169.282119,111.415282 169.112583,111.160133 168.943046,110.990033 Z" id="XMLID_2_" fill="#E2066F" fill-rule="nonzero"></path>
+                    <path d="M129.186755,169.674419 C129.186755,169.674419 127.915232,168.653821 126.219868,166.782724 C125.796026,166.357475 125.456954,165.847176 125.033113,165.336877 C124.69404,164.911628 124.439735,164.486379 124.100662,164.06113 C123.931126,163.72093 123.676821,163.465781 123.507285,163.125581 C122.913907,162.104983 122.32053,161.084385 121.727152,159.893688 C121.218543,158.70299 120.709934,157.427243 120.286093,156.066445 C120.031788,155.130897 119.777483,154.195349 119.692715,153.174751 C119.438411,151.728904 119.353642,150.112957 119.353642,148.49701 C119.353642,147.561462 119.438411,146.625914 119.607947,145.690365 C119.777483,144.754817 119.94702,143.819269 120.201325,142.883721 C120.964238,139.992027 122.150993,136.930233 124.100662,133.613289 C124.100662,133.613289 124.100662,133.613289 124.100662,133.613289 C124.69404,132.507641 125.372185,131.487043 125.965563,130.466445 C134.442384,116.007973 139.86755,105.121595 137.578808,88.2817276 C137.409272,87.0910299 137.239735,85.8152824 136.98543,84.6245847 C136.900662,85.4750831 136.731126,86.2405316 136.561589,86.8358804 C136.561589,86.9209302 136.561589,86.9209302 136.561589,87.0059801 C136.476821,87.4312292 136.392053,87.7714286 136.307285,88.0265781 C132.577483,98.9980066 126.474172,107.58804 118.082119,116.688372 C116.980132,117.96412 115.793377,119.154817 114.521854,120.430565 C112.487417,122.556811 110.283444,124.768106 108.07947,126.979402 C107.14702,127.91495 106.21457,128.765449 105.282119,129.700997 C104.434437,130.551495 103.247682,131.742193 101.976159,133.10299 L101.976159,133.10299 C101.213245,135.314286 100.280795,137.865781 99.5178808,140.502326 C99.1788079,140.332226 98.8397351,140.247176 98.5006623,140.077076 C82.2251656,133.783389 71.2900662,125.278405 71.2900662,125.278405 C71.2900662,125.278405 79.6821192,136.249834 93.8384106,146.540864 C95.194702,147.561462 96.5509934,148.41196 97.9072848,149.177409 C97.3139073,158.447841 101.382781,167.293023 119.777483,169.929568 C122.913907,170.354817 126.050331,170.354817 129.271523,170.014618 C129.271523,169.844518 129.186755,169.759468 129.186755,169.674419 C129.186755,169.674419 129.186755,169.674419 129.186755,169.674419 Z" id="XMLID_1_" fill="#000000" fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Prism.svg b/src/icons/Prism.svg
new file mode 100644
index 000000000..b3257ac00
--- /dev/null
+++ b/src/icons/Prism.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 170">
+	<path fill="#fff" d="M55.37 131.5H48.4v9.13h6.97c1.67 0 2.92-.4 3.78-1.22.85
+	-.8 1.28-1.92 1.28-3.33s-.43-2.54-1.28-3.35c-.86-.8-2.12-1.2-3.78-1.2m29.52
+	6.4c.3-.53.47-1.2.47-2.04 0-1.35-.45-2.4-1.37-3.2-.92-.76-2.14-1.15-3.65
+	-1.15H72.9v8.52h7.32c2.26 0 3.82-.7 4.67-2.1M100 0L0 170h200L100 0M60.86
+	141.03c-1.3 1.22-3.1 1.84-5.33 1.84H48.4v7.55H46v-21.2h9.53c2.24 0 4.02.63
+	5.34 1.87 1.3 1.23 1.96 2.88 1.96 4.95 0 2.1-.66 3.75-1.97 4.98m24.5 9.4l
+	-5.1-8.14h-7.37v8.12h-2.4v-21.2h10.14c2.15 0 3.88.6 5.18 1.8 1.3 1.18 1.95
+	2.8 1.95 4.84 0 2.64-1.1 4.44-3.3 5.4-.6.28-1.22.5-1.82.6l5.57 8.56h-2.85m
+	13.43 0h-2.4v-21.2h2.4v21.2m23.56-1.32c-1.48 1.05-3.53 1.57-6.16 1.57-2.96 0
+	-5.23-.6-6.78-1.85-1.4-1.1-2.18-2.7-2.37-4.74h2.5c.08 1.45.78 2.56 2.1 3.33
+	1.16.67 2.68 1 4.58 1 3.97 0 5.95-1.25 5.95-3.74 0-.86-.35-1.53-1.07-2.02-.7
+	-.5-1.6-.9-2.68-1.2-1.07-.33-2.24-.63-3.48-.9s-2.4-.65-3.5-1.08-1.97-1.02
+	-2.68-1.73c-.7-.72-1.07-1.68-1.07-2.9 0-1.73.65-3.13 1.97-4.22 1.32-1.08
+	3.32-1.62 6-1.62 2.67 0 4.75.6 6.23 1.85 1.34 1.1 2.05 2.5 2.14 4.2h-2.46c
+	-.22-1.76-1.35-2.92-3.4-3.5-.72-.2-1.62-.3-2.7-.3s-1.98.1-2.72.35c-.74.25
+	-1.3.55-1.7.9-.42.35-.7.74-.83 1.17s-.2.88-.2 1.36c0 .5.2.93.62 1.33s.96.75
+	1.65 1.03c.68.28 1.46.52 2.33.73.88.2 1.77.43 2.67.65.9.22 1.8.48 2.68.77.87
+	.3 1.65.65 2.33 1.1 1.53.96 2.28 2.27 2.28 3.94 0 2-.74 3.5-2.22 4.55m28.84
+	1.32v-17.54l-7.84 10.08-7.97-10.08v17.54H133v-21.2h2.78l7.58 10.06 7.45
+	-10.05h2.8v21.2h-2.4"/>
+</svg>
diff --git a/src/icons/ProjectPoi.png b/src/icons/ProjectPoi.png
new file mode 100644
index 000000000..65bfdff62
Binary files /dev/null and b/src/icons/ProjectPoi.png differ
diff --git a/src/icons/SeamlessCMS.png b/src/icons/SeamlessCMS.png
new file mode 100644
index 000000000..1a98b69c9
Binary files /dev/null and b/src/icons/SeamlessCMS.png differ
diff --git a/src/icons/Seoshop.png b/src/icons/Seoshop.png
deleted file mode 100644
index b201673b7..000000000
Binary files a/src/icons/Seoshop.png and /dev/null differ
diff --git a/src/icons/Vinala.png b/src/icons/Vinala.png
deleted file mode 100644
index b453eb188..000000000
Binary files a/src/icons/Vinala.png and /dev/null differ
diff --git a/src/icons/aaa.png b/src/icons/aaa.png
deleted file mode 100644
index f16159bc0..000000000
Binary files a/src/icons/aaa.png and /dev/null differ
diff --git a/src/icons/akaunting.svg b/src/icons/akaunting.svg
new file mode 100644
index 000000000..34315c61e
--- /dev/null
+++ b/src/icons/akaunting.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.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="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<path fill="#6DA252" d="M392.296,826.698c-58.699-53.798-96.443-130.089-99.567-215.22H100
+		c3.233,143.609,67.006,272.265,166.8,361.471L392.296,826.698z"/>
+	<path fill="#6DA252" d="M599.931,99.932c-271.909,0-493.127,217.018-499.91,487.29h192.76
+		c6.698-163.856,141.65-294.635,307.15-294.635c169.781,0,307.416,137.633,307.416,307.413
+		c0,114.208-62.285,213.877-154.735,266.879l90.696,170.066C996.438,951.471,1100,787.826,1100,600
+		C1100,323.821,876.108,99.932,599.931,99.932"/>
+	<path fill="#6DA252" d="M731.105,878.093c-39.785,18.799-84.254,29.321-131.175,29.321c-71.32,0-136.971-24.285-189.125-65.041
+		L285.267,988.674c85.932,69.656,195.424,111.395,314.664,111.395c79.704,0,155.051-18.656,221.918-51.822L731.105,878.093z"/>
+	<rect x="907.347" y="600" fill="#6DA252" width="192.653" height="500.068"/>
+</g>
+</svg>
diff --git a/src/icons/amber.png b/src/icons/amber.png
new file mode 100644
index 000000000..2012e0c00
Binary files /dev/null and b/src/icons/amber.png differ
diff --git a/src/icons/git.png b/src/icons/git.png
deleted file mode 100644
index 5ff1d2b09..000000000
Binary files a/src/icons/git.png and /dev/null differ
diff --git a/src/icons/git.svg b/src/icons/git.svg
new file mode 100644
index 000000000..6b4299798
--- /dev/null
+++ b/src/icons/git.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.52 122.52" height="122.52" width="122.52" xml:space="preserve" id="svg2" version="1.1"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"/><g transform="matrix(1.3333333,0,0,-1.3333333,0,122.52)" id="g10"><g transform="scale(0.1)" id="g12"><path id="path14" style="fill:#f03c2e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 901.543,500.352 500.352,901.527 c -23.094,23.11 -60.567,23.11 -83.692,0 L 333.359,818.211 439.031,712.535 c 24.563,8.293 52.727,2.727 72.297,-16.847 19.688,-19.696 25.203,-48.102 16.699,-72.75 L 629.883,521.094 c 24.648,8.496 53.066,3.004 72.754,-16.711 27.5,-27.492 27.5,-72.059 0,-99.574 -27.52,-27.516 -72.078,-27.516 -99.61,0 -20.683,20.703 -25.8,51.097 -15.312,76.582 l -95,94.992 V 326.414 c 6.699,-3.32 13.027,-7.742 18.613,-13.312 27.5,-27.497 27.5,-72.059 0,-99.598 -27.5,-27.488 -72.09,-27.488 -99.57,0 -27.5,27.539 -27.5,72.101 0,99.598 6.797,6.789 14.668,11.925 23.066,15.363 v 252.281 c -8.398,3.438 -16.25,8.531 -23.066,15.367 -20.828,20.821 -25.84,51.395 -15.156,76.977 L 292.422,777.285 17.3242,502.211 c -23.10545,-23.129 -23.10545,-60.602 0,-83.711 L 418.535,17.3242 c 23.098,-23.10545 60.559,-23.10545 83.692,0 L 901.543,416.641 c 23.113,23.113 23.113,60.605 0,83.711"/></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/hinza_advanced_cms.svg b/src/icons/hinza_advanced_cms.svg
new file mode 100644
index 000000000..b3bbf8ba4
--- /dev/null
+++ b/src/icons/hinza_advanced_cms.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg"  width="700" height="700" viewBox="0 0 700 700">
+<style type="text/css">
+	.st0{fill:#424242;}
+	.st1{fill:#FFA605;}
+</style>
+<title>ac</title>
+<path class="st0" d="M76.1,106H0v486.6h57.1V269.1c0-8.2,4.1-16.3,12.2-21.7c12.2-6.8,27.2-4.1,35.3,8.2l214.8,337.1h68L76.1,106z"
+	/>
+<path class="st0" d="M651.1,116.9c-21.7-6.8-44.9-10.9-66.6-10.9c-59.8,0-116.9,25.8-157.7,70.7c-88.3,97.9-88.3,246-1.4,345.2
+	l1.4,1.4c40.8,44.9,97.9,70.7,157.7,70.7c23.1,0,44.9-4.1,66.6-10.9c17.7-5.4,34-13.6,48.9-24.5c-5.4-6.8-12.2-15-16.3-21.7
+	c-4.1-6.8-10.9-16.3-15-24.5c-25.8,15-54.4,23.1-84.3,23.1c-46.2,0-91.1-20.4-123.7-54.4c-66.6-73.4-66.6-186.2,0-259.6
+	c31.3-34,76.1-54.4,123.7-54.4c29.9,0,58.4,8.2,84.3,23.1c4.1-8.2,9.5-16.3,15-24.5c5.4-8.2,10.9-15,16.3-21.7
+	C685,131.8,668.7,123.7,651.1,116.9z"/>
+<path class="st1" d="M135.9,106h292.2c-15,10.9-28.5,23.1-40.8,35.3c-25.8,27.2-46.2,59.8-59.8,95.1s-20.4,73.4-20.4,111.5
+	c0,9.5,0,19,1.4,28.5L135.9,106z"/>
+</svg>
diff --git a/src/icons/iWeb.png b/src/icons/iWeb.png
index 160b433ff..cc7ad0162 100644
Binary files a/src/icons/iWeb.png and b/src/icons/iWeb.png differ
diff --git a/src/icons/mautic.svg b/src/icons/mautic.svg
new file mode 100644
index 000000000..b0f5170b6
--- /dev/null
+++ b/src/icons/mautic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, 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="468px" height="468px" viewBox="0 0 468 468" enable-background="new 0 0 468 468" xml:space="preserve">
+<g>
+	<path fill="#4F5F9F" d="M234.342,432.312c-108.93,0-197.531-88.61-197.531-197.521c0-108.903,88.601-197.504,197.531-197.504
+		c26.302,0,51.865,5.092,75.959,15.138c6.81,2.835,10.019,10.666,7.184,17.476c-2.836,6.814-10.657,10.023-17.477,7.192
+		c-20.812-8.674-42.91-13.073-65.667-13.073c-94.198,0-170.802,76.6-170.802,170.771c0,94.169,76.604,170.791,170.802,170.791
+		c94.165,0,170.777-76.622,170.777-170.791c0-20.188-3.482-39.938-10.347-58.708c-2.543-6.933,1.021-14.6,7.949-17.139
+		c6.938-2.539,14.604,1.021,17.148,7.945c7.949,21.724,11.979,44.574,11.979,67.902
+		C431.849,343.702,343.248,432.312,234.342,432.312"/>
+	<polygon fill="#FDB931" points="320.748,214.559 289.981,246.477 307.074,317.857 345.654,317.857 	"/>
+	<polygon fill="#FDB931" points="308.195,120.114 318.834,130.744 234.096,220.261 161.959,145.872 120.489,317.857 159.06,317.857 
+		181.942,222.344 234.096,279.368 345.919,157.632 356.621,168.407 367.232,108.231 	"/>
+</g>
+</svg>
diff --git a/src/icons/raychat.svg b/src/icons/raychat.svg
index a75491199..708303307 100644
--- a/src/icons/raychat.svg
+++ b/src/icons/raychat.svg
@@ -1,29 +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>
+<?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/storeden.svg b/src/icons/storeden.svg
new file mode 100644
index 000000000..36201b52b
--- /dev/null
+++ b/src/icons/storeden.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.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="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="566.93px" height="566.93px" viewBox="0 0 566.93 566.93" enable-background="new 0 0 566.93 566.93" xml:space="preserve">
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#2D3B56" d="M461.163,193.684c-9.271,0-16.793-7.52-16.793-16.794
+		c0-5.5,2.68-10.335,6.769-13.401c2.803-2.104,6.251-3.39,10.024-3.39c4.918,0,9.298,2.147,12.366,5.514
+		c2.724,2.983,4.432,6.919,4.432,11.278C477.961,186.164,470.443,193.684,461.163,193.684z M275.264,143.301v-32.788
+		c0-48.491,39.448-87.936,87.939-87.936c48.483,0,87.936,39.445,87.936,87.936v32.788H275.264z M265.237,193.684
+		c-9.274,0-16.791-7.52-16.791-16.794c0-4.359,1.703-8.295,4.427-11.278c3.072-3.366,7.451-5.514,12.363-5.514
+		c3.774,0,7.223,1.287,10.026,3.39c4.091,3.066,6.77,7.901,6.77,13.401C282.034,186.164,274.513,193.684,265.237,193.684z
+		 M473.529,143.301v-32.788c0-60.834-49.498-110.326-110.326-110.326c-60.832,0-110.329,49.492-110.329,110.326v32.788H161.68
+		v74.741h103.558c9.276,0,16.796,7.52,16.796,16.794v4.84c0,9.278-7.521,16.799-16.796,16.799H139.288
+		c-9.273,0-16.792,7.516-16.792,16.791c0,9.275,7.519,16.798,16.792,16.798h96.792c9.275,0,16.794,7.516,16.794,16.788v1.868
+		c0,9.271-7.519,16.793-16.794,16.793h-74.4v0.328c-11.836,1.613-20.992,11.653-20.992,23.934c0,12.272,9.156,22.31,20.992,23.926
+		v0.325h110.925c9.274,0,16.792,7.519,16.792,16.799c0,9.266-7.518,16.788-16.792,16.788h-140.78
+		c-9.792,0-17.725,7.936-17.725,17.726c0,9.795,7.932,17.725,17.725,17.725h97.032c9.275,0,16.791,7.523,16.791,16.8v1.896
+		c0,9.275-7.516,16.792-16.791,16.792h-65.242c8.292,38.736,42.689,87.559,83.899,87.559h231.376
+		c47.408,0,85.832-58.19,85.832-105.595V143.301H473.529"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#2D3B56" d="M91.707,256.475H72.115c-9.276,0-16.792,7.516-16.792,16.791
+		c0,9.275,7.516,16.798,16.792,16.798h19.592c9.277,0,16.793-7.522,16.793-16.798C108.5,263.991,100.984,256.475,91.707,256.475"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" fill="#2D3B56" d="M54.389,407.612H19.868c-9.79,0-17.727,7.936-17.727,17.726
+		c0,9.795,7.937,17.725,17.727,17.725h34.521c9.79,0,17.726-7.93,17.726-17.725C72.115,415.548,64.179,407.612,54.389,407.612"/>
+</g>
+</svg>
diff --git a/src/icons/svbtle.png b/src/icons/svbtle.png
new file mode 100644
index 000000000..235e1eb02
Binary files /dev/null and b/src/icons/svbtle.png differ
diff --git a/src/icons/tilda.png b/src/icons/tilda.png
new file mode 100644
index 000000000..72e82be4f
Binary files /dev/null and b/src/icons/tilda.png differ
diff --git a/src/icons/vigbo.png b/src/icons/vigbo.png
new file mode 100644
index 000000000..e14e507f1
Binary files /dev/null and b/src/icons/vigbo.png differ
diff --git a/src/icons/xeora.png b/src/icons/xeora.png
new file mode 100644
index 000000000..36151f12f
Binary files /dev/null and b/src/icons/xeora.png differ
diff --git a/src/icons/xui.png b/src/icons/xui.png
deleted file mode 100644
index eb4ff5b39..000000000
Binary files a/src/icons/xui.png and /dev/null differ
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index 6fed51ec9..a3f714e56 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -24,7 +24,7 @@ class Wappalyzer {
     this.adCache = [];
 
     this.config = {
-      websiteURL: 'https://wappalyzer.com/',
+      websiteURL: 'https://www.wappalyzer.com/',
       twitterURL: 'https://twitter.com/Wappalyzer',
       githubURL: 'https://github.com/AliasIO/Wappalyzer',
     };
@@ -62,10 +62,13 @@ class Wappalyzer {
 
       if ( data.html ) {
         this.analyzeHtml(app, data.html);
-        this.analyzeScript(app, data.html);
         this.analyzeMeta(app, data.html);
       }
 
+      if ( data.scripts ) {
+        this.analyzeScripts(app, data.scripts);
+      }
+
       if ( data.headers ) {
         this.analyzeHeaders(app, data.headers);
       }
@@ -166,7 +169,7 @@ class Wappalyzer {
    *
    */
   ping() {
-    if ( Object.keys(this.hostnameCache).length >= 50 || this.adCache.length >= 50 ) {
+    if ( Object.keys(this.hostnameCache).length + this.adCache.length > 200 ) {
       this.driver.ping(this.hostnameCache, this.adCache);
 
       this.hostnameCache = {};
@@ -178,13 +181,17 @@ class Wappalyzer {
    * Enclose string in array
    */
   asArray(value) {
-    return typeof value === 'string' ? [ value ] : value;
+    return value instanceof Array ? value : [ value ];
   }
 
   /**
    * Parse apps.json patterns
    */
   parsePatterns(patterns) {
+    if ( !patterns ) {
+      return [];
+    }
+
     var parsed = {};
 
     // Convert string to object containing array containing string
@@ -194,7 +201,7 @@ class Wappalyzer {
       };
     }
 
-    for ( var key in patterns ) {
+    Object.keys(patterns).forEach(key => {
       parsed[key] = [];
 
       this.asArray(patterns[key]).forEach(pattern => {
@@ -223,7 +230,7 @@ class Wappalyzer {
 
         parsed[key].push(attrs);
       });
-    }
+    });
 
     // Convert back to array if the original pattern list was an array (or string)
     if ( 'main' in parsed ) {
@@ -396,19 +403,18 @@ class Wappalyzer {
   /**
    * Analyze script tag
    */
-  analyzeScript(app, html) {
-    var regex = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
+  analyzeScripts(app, scripts) {
     var patterns = this.parsePatterns(app.props.script);
 
     if ( patterns.length ) {
       patterns.forEach(pattern => {
         var match;
 
-        while ( ( match = regex.exec(html) ) ) {
-          if ( pattern.regex.test(match[2]) ) {
-            this.addDetected(app, pattern, 'script', match[2]);
+        scripts.forEach(uri => {
+          if ( pattern.regex.test(uri) ) {
+            this.addDetected(app, pattern, 'script', uri);
           }
-        }
+        });
       });
     }
   }
@@ -444,12 +450,16 @@ class Wappalyzer {
     var patterns = this.parsePatterns(app.props.headers);
 
     if ( headers ) {
-      Object.keys(patterns).forEach(header => {
-        patterns[header].forEach(pattern => {
-          header = header.toLowerCase();
-
-          if ( header in headers && pattern.regex.test(headers[header]) ) {
-            this.addDetected(app, pattern, 'headers', headers[header], header);
+      Object.keys(patterns).forEach(headerName => {
+        patterns[headerName].forEach(pattern => {
+          headerName = headerName.toLowerCase();
+
+          if ( headerName in headers ) {
+            headers[headerName].forEach(headerValue => {
+              if ( pattern.regex.test(headerValue) ) {
+                this.addDetected(app, pattern, 'headers', headerValue, headerName);
+              }
+            });
           }
         });
       });
diff --git a/yarn.lock b/yarn.lock
index 74c1d9e1f..c87638c01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,813 +2,26 @@
 # yarn lockfile v1
 
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
-async@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-colors@1.0.x:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
-concat-stream@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-cycle@1.0.x:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
-decamelize@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es6-promise@~4.0.3:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-extend@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extract-zip@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
-  dependencies:
-    concat-stream "1.5.0"
-    debug "0.7.4"
-    mkdirp "0.5.0"
-    yauzl "2.4.1"
-
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
-
-eyes@0.1.x:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
-
-fd-slicer@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
-  dependencies:
-    pend "~1.2.0"
-
 file-type@3.8.*:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.8.0.tgz#bcadf6a8f624ebe4a10e5ad26727b6b93f16d78d"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-fs-extra@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-hasha@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
-  dependencies:
-    is-stream "^1.0.1"
-    pinkie-promise "^2.0.0"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
-
 html-comment-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-my-json-valid@^2.12.4:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-stream@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
 is-svg@2.0.*:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.0.1.tgz#f93ab3bf1d6bbca30e9753cd3485b1300eebc013"
   dependencies:
     html-comment-regex "^1.1.0"
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isstream@0.1.x, isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
-jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.0.2"
-    json-schema "0.2.3"
-    verror "1.3.6"
-
-kew@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
-
-linerstream@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/linerstream/-/linerstream-0.1.4.tgz#5de7bf69faa2b0f9d85e8332099b70e419a845d5"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-lodash.assign@^4.0.3, lodash.assign@^4.0.6:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
-  dependencies:
-    mime-db "~1.27.0"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-mkdirp@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
-  dependencies:
-    minimist "0.0.8"
-
-normalize-package-data@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-
-phantom@^2.0.x:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/phantom/-/phantom-2.1.21.tgz#76b7790ff62cf09fbe922ae844b9fb745ce8bb28"
-  dependencies:
-    linerstream "^0.1.4"
-    phantomjs-prebuilt "^2.1.4"
-    winston "^2.2.0"
-
-phantomjs-prebuilt@^2.1.4:
-  version "2.1.14"
-  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
-  dependencies:
-    es6-promise "~4.0.3"
-    extract-zip "~1.5.0"
-    fs-extra "~1.0.0"
-    hasha "~2.2.0"
-    kew "~0.7.0"
-    progress "~1.1.8"
-    request "~2.79.0"
-    request-progress "~2.0.1"
-    which "~1.2.10"
-
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-progress@~1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
 read-chunk@2.0.*:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.0.0.tgz#3246e877829116cec059674c4d5f300f7a9261f3"
   dependencies:
     pify "^2.3.0"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-request-progress@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
-  dependencies:
-    throttleit "^1.0.0"
-
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
-"semver@2 || 3 || 4 || 5":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-stack-trace@0.0.x:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-svg2png-many@*:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/svg2png-many/-/svg2png-many-0.0.7.tgz#e478f65fa38ca0f23a21f9519a85025e054b5552"
-  dependencies:
-    phantom "^2.0.x"
-    yargs "^4.6.0"
-
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-
-tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-typedarray@~0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-uuid@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
-  dependencies:
-    extsprintf "1.0.2"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
-which@~1.2.10:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
-window-size@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-
-winston@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-2.3.1.tgz#0b48420d978c01804cf0230b648861598225a119"
-  dependencies:
-    async "~1.0.0"
-    colors "1.0.x"
-    cycle "1.0.x"
-    eyes "0.1.x"
-    isstream "0.1.x"
-    stack-trace "0.0.x"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-yargs-parser@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
-  dependencies:
-    camelcase "^3.0.0"
-    lodash.assign "^4.0.6"
-
-yargs@^4.6.0:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
-  dependencies:
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    lodash.assign "^4.0.3"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.1"
-    which-module "^1.0.0"
-    window-size "^0.2.0"
-    y18n "^3.2.1"
-    yargs-parser "^2.4.1"
-
-yauzl@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
-  dependencies:
-    fd-slicer "~1.0.1"