diff --git a/.gitignore b/.gitignore
index a521d03f0..3c2aaf799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 wappalyzer-chrome.zip
 wappalyzer-firefox.xpi
+wappalyzer.xpi
 
 drivers/**/apps.json
 drivers/**/wappalyzer.js
 drivers/**/icons/*.png
 
-drivers/firefox-jetpack/data
+node_modules/*
diff --git a/README.md b/README.md
index 3cc748255..d3b8982b4 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # Wappalyzer
 
-[Wappalyzer](http://wappalyzer.com/) is a 
+[Wappalyzer](https://wappalyzer.com/) is a 
 [cross-platform](https://github.com/ElbertF/Wappalyzer/wiki/Drivers) utility that uncovers the 
 technologies used on websites.  It detects
-[content management systems](http://wappalyzer.com/categories/cms),
-[web shops](http://wappalyzer.com/categories/web-shops),
-[web servers](http://wappalyzer.com/categories/web-servers), 
-[JavaScript frameworks](http://wappalyzer.com/categories/javascript-frameworks),
-[analytics tools](http://wappalyzer.com/categories/analytics) and
-[many more](http://wappalyzer.com/applications).
+[content management systems](https://wappalyzer.com/categories/cms),
+[web shops](https://wappalyzer.com/categories/web-shops),
+[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).
 
 Refer to the [wiki](https://github.com/ElbertF/Wappalyzer/wiki) for
 [screenshots](https://github.com/ElbertF/Wappalyzer/wiki/Screenshots), information on how to 
@@ -16,3 +16,8 @@ Refer to the [wiki](https://github.com/ElbertF/Wappalyzer/wiki) for
 [more](https://github.com/ElbertF/Wappalyzer/wiki/_pages).
 
 *Licensed under the [GPL](https://github.com/ElbertF/Wappalyzer/blob/master/LICENSE).*
+
+Donate Bitcoin: 16gb4uGDAjaeRJwKVmKr2EXa8x2fmvT8EQ - *Thanks!*
+![QR Code](https://wappalyzer.com/sites/default/themes/wappalyzer/images/bitcoinqrcode.png)
+
+
diff --git a/drivers/bookmarklet/index.html b/drivers/bookmarklet/index.html
index a550be879..78bfee9d8 100644
--- a/drivers/bookmarklet/index.html
+++ b/drivers/bookmarklet/index.html
@@ -2,9 +2,11 @@
 
 <html>
 	<head>
+		<meta charset="utf-8">
+
 		<title>Wappalyzer</title>
 
-		<script type="text/javascript" src="js/lib/jquery.min.js"></script>
+		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 
 		<style type="text/css">
 			body {
@@ -48,7 +50,7 @@
 				if ( e !== null ) { d.body.removeChild(e); }
 
 				var
-					u = 'http://wappalyzer.com/bookmarklet/',
+					u = 'https://wappalyzer.com/bookmarklet/',
 					t = new Date().getTime(),
 					c = d.createElement('div'),
 					p = d.createElement('div'),
diff --git a/drivers/bookmarklet/js/apps.js b/drivers/bookmarklet/js/apps.js
new file mode 100644
index 000000000..f34085517
--- /dev/null
+++ b/drivers/bookmarklet/js/apps.js
@@ -0,0 +1,3088 @@
+var json =
+{
+	"categories": {
+		"1": "cms",
+		"2": "message-boards",
+		"3": "database-managers",
+		"4": "documentation-tools",
+		"5": "widgets",
+		"6": "web-shops",
+		"7": "photo-galleries",
+		"8": "wikis",
+		"9": "hosting-panels",
+		"10": "analytics",
+		"11": "blogs",
+		"12": "javascript-frameworks",
+		"13": "issue-trackers",
+		"14": "video-players",
+		"15": "comment-systems",
+		"16": "captchas",
+		"17": "font-scripts",
+		"18": "web-frameworks",
+		"19": "miscellaneous",
+		"20": "editors",
+		"21": "lms",
+		"22": "web-servers",
+		"23": "cache-tools",
+		"24": "rich-text-editors",
+		"25": "javascript-graphics",
+		"26": "mobile-frameworks",
+		"27": "programming-languages",
+		"28": "operating-systems",
+		"29": "search-engines",
+		"30": "web-mail",
+		"31": "cdn",
+		"32": "marketing-automation",
+		"33": "web-server-extensions",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertising-networks",
+		"37": "network-devices",
+		"38": "media-servers",
+		"39": "webcams",
+		"40": "printers"
+	},
+	"apps": {
+		"1C-Bitrix": {
+			"website": "www.1c-bitrix.ru",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-CMS": "Bitrix Site Manager", "Set-Cookie": "BITRIX_" },
+			"html": "(?:<link[^>]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))",
+			"script": "1c-bitrix",
+			"implies": "PHP"
+		},
+		"1und1": {
+			"website": "1und1.de",
+			"cats": [ 6 ],
+			"url": "/shop/catalog/browse\\?sessid=",
+			"implies": "PHP"
+		},
+		"2z Project": {
+			"website": "2zproject-cms.ru",
+			"cats": [ 1 ],
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
+		},
+		"3dCart": {
+			"website": "www.3dcart.com",
+			"cats": [ 1, 6 ],
+			"headers": { "X-Powered-By": "3DCART" },
+			"script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)"
+		},
+		"3DM": {
+			"website": "www.3ware.com",
+			"cats": [ 19 ],
+			"html": "<title>3ware 3DM([\\d\\.]+)?\\;version:\\1",
+			"implies": "3ware"
+		},
+		"3ware": {
+			"website": "www.3ware.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Accessible Portal": {
+			"website": "www.accessibleportal.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Accessible Portal" },
+			"implies": "PHP"
+		},
+		"AddThis": {
+			"website": "www.addthis.com",
+			"cats": [ 5 ],
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
+			"env": "^addthis"
+		},
+		"Adobe ColdFusion": {
+			"website": "adobe.com/products/coldfusion-family.html",
+			"cats": [ 18 ],
+			"url": "\\.cfm(?:$|\\?)",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
+		"Adobe CQ5": {
+			"website": "adobe.com/products/cq.html",
+			"cats": [ 1 ],
+			"html": [ "<div class=\"[^\"]*parbase","_jcr_content","/etc/designs/","/etc/clientlibs/" ],
+			"implies": "Java"
+		},
+		"Adobe GoLive": {
+			"website": "www.adobe.com/products/golive",
+			"cats": [ 20 ],
+			"meta": { "generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1" }
+		},
+		"Advanced Web Stats": {
+			"website": "www.advancedwebstats.com",
+			"cats": [ 10 ],
+			"html": "aws\\.src = [^<]+caphyon-analytics",
+			"implies": "Java"
+		},
+		"AlloyUI": {
+			"website": "www.alloyui.com",
+			"cats": [ 12 ],
+			"env": "^AUI$",
+			"script": "^https?://cdn\\.alloyui.com/",
+			"implies": [ "Twitter Bootstrap", "YUI" ]
+		},
+		"Amaya": {
+			"website": "www.w3.org/Amaya",
+			"cats": [ 20 ],
+			"meta": { "generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1" }
+		},
+		"amCharts": {
+			"website": "amcharts.com",
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
+		"Ametys": {
+			"website": "ametys.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "(?:Ametys|Anyware Technologies)" },
+			"script": "ametys\\.js",
+			"implies": "Java"
+		},
+		"Amiro.CMS": {
+			"website": "amirocms.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Amiro" },
+			"html": "system_(?:js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\1",
+			"implies": "PHP"
+		},
+		"AMPcms": {
+			"website": "www.ampcms.org",
+			"cats": [ 1 ],
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"env": "^amp_js_init$",
+			"implies": "PHP"
+		},
+		"AngularJS": {
+			"website": "angularjs.org",
+			"cats": [ 12 ],
+			"env": "^angular$",
+			"script": [ "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "/([\\d.]+(\\-?rc[.\\d]*)*)/angular(\\.min)?\\.js\\;version:\\1", "angular.*\\.js" ]
+		},
+		"AOLserver": {
+			"website": "aolserver.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
+		},
+		"Apache": {
+			"website": "apache.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1" }
+		},
+		"Apache Hadoop": {
+			"website": "hadoop.apache.org",
+			"cats": [ 34 ],
+			"html": "type=\"text/css\" href=\"/static/hadoop.css\""
+		},
+		"Apache HBase": {
+			"website": "hbase.apache.org",
+			"cats": [ 34 ],
+			"html": "type=\"text/css\" href=\"/static/hbase.css\""
+		},
+		"Apache JSPWiki": {
+			"website": "jspwiki.org",
+			"cats": [ 8 ],
+			"url": "wiki\\.jsp",
+			"script": "jspwiki",
+			"html": "<html[^>]* xmlns:jspwiki="
+		},
+		"Apache Tomcat": {
+			"website": "tomcat.apache.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
+		},
+		"Apache Traffic Server": {
+			"website": "trafficserver.apache.org/",
+			"cats": [ 22 ],
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
+		},
+		"Arc Forum": {
+			"website": "arclanguage.org",
+			"cats": [ 2 ],
+			"html": "ping\\.src = node\\.href;"
+		},
+		"AsciiDoc": {
+			"website": "www.methods.co.nz/asciidoc",
+			"cats": [ 1, 20, 27 ],
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
+			"env": "^asciidoc$"
+		},
+		"ATEN": {
+			"website": "www.aten.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "ATEN HTTP Server(\\(V?([\\d\\.]+)\\))?\\;version:\\2" }
+		},
+		"ATG Web Commerce": {
+			"website": "oracle.com/us/products/applications/web-commerce/atg",
+			"cats": [ 6 ],
+			"headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" },
+			"html": "<[^>]+_DARGS"
+		},
+		"Atlassian Confluence": {
+			"website": "www.atlassian.com/software/confluence/overview/team-collaboration-software",
+			"cats": [ 8 ],
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\1",
+			"headers": { "X-Confluence-Request-Time": ".*" },
+			"meta": { "confluence-request-time": ".*" },
+			"implies": "Java"
+		},
+		"Atlassian Jira": {
+			"website": "www.atlassian.com/software/jira/overview/",
+			"cats": [ 13 ],
+			"env": "^jira$",
+			"script": "/jira/s/",
+			"url": "/secure/Dashboard\\.jspa",
+			"html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(\\.\\d+)?))?\\;version:\\1",
+			"implies": "Java"
+		},
+		"AWStats": {
+			"website": "awstats.sourceforge.net",
+			"cats": [ 10 ],
+			"meta": { "generator": "AWStats ([\\d.]+(?: \\(?:build [\\d.]+\\))?)\\;version:\\1" },
+			"implies": "Perl"
+		},
+		"Backbone.js": {
+			"website": "documentcloud.github.com/backbone",
+			"cats": [ 12 ],
+			"script": "backbone.*\\.js",
+			"env": "^Backbone$",
+			"implies": "Underscore.js"
+		},
+		"Banshee": {
+			"website": "www.banshee-php.org",
+			"cats": [ 1, 18 ],
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(?:v([\\d.]+))?\\;version:\\1",
+			"implies": "PHP"
+		},
+		"basket.js": {
+			"website": "addyosmani.github.io/basket.js/",
+			"cats": [ 12 ],
+			"script": "basket.*\\.js",
+			"env": "^basket$"
+		},
+		"BaseHTTP": {
+			"website": "docs.python.org/2/library/basehttpserver.html",
+			"cats": [ 22 ],
+			"headers": { "Server": "BaseHTTP\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": "Python"
+		},
+		"BIGACE": {
+			"website": "bigace.de",
+			"cats": [ 1 ],
+			"meta": { "generator": "BIGACE ([\\d.]+)\\;version:\\1" },
+			"html": "(?:Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
+			"implies": "PHP"
+		},
+		"Bigcommerce": {
+			"website": "www.bigcommerce.com",
+			"cats": [ 6 ],
+			"url": "mybigcommerce\\.com",
+			"html": "<link href=[^>]+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
+			"env": "^compareProducts$"
+		},
+		"BigDump": {
+			"website": "www.ozerov.de/bigdump.php",
+			"cats": [ 3 ],
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\\. ([\\d.b]+)\\;version:\\1",
+			"implies": "PHP"
+		},
+		"Bigware": {
+			"website": "bigware.de",
+			"cats": [ 6 ],
+			"html": "(?:Diese <a href=[^>]+bigware\\.de|<a href=[^>]+/main_bigware_\\d+\\.php)",
+			"url": "(?:\\?|&)bigWAdminID=",
+			"headers": { "Set-Cookie": "(?:bigwareCsid|bigWAdminID)" },
+			"implies": "PHP"
+		},
+		"BittAds": {
+			"website": "bittads.com",
+			"cats": [ 36 ],
+			"script": "bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
+		"Blip.tv": {
+			"website": "blip.tv",
+			"cats": [ 14 ],
+			"html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play"
+		},
+		"Blogger": {
+			"website": "www.blogger.com",
+			"cats": [ 11 ],
+			"meta": { "generator": "blogger" },
+			"url": "\\.blogspot\\.com"
+		},
+		"Boa": {
+			"website": "www.boa.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1" }
+		},
+		"Brother": {
+			"website": "www.brother.com",
+			"cats": [ 40 ]
+		},
+		"BrowserCMS": {
+			"website": "browsercms.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
+			"implies": "Ruby"
+		},
+		"Bugzilla": {
+			"website": "www.bugzilla.org",
+			"cats": [ 13 ],
+			"html": "href=\"enter_bug\\.cgi\">",
+			"implies": "Perl"
+		},
+		"Burning Board": {
+			"website": "www.woltlab.com",
+			"cats": [ 2 ],
+			"html": "<a href=\"[^>]+woltlab\\.com.+Burning Board",
+			"implies": "PHP"
+		},
+		"Business Catalyst": {
+			"website": "businesscatalyst.com",
+			"cats": [ 1 ],
+			"script": "CatalystScripts",
+			"html": "<!-- BC_OBNW -->"
+		},
+		"Canon": {
+			"website": "www.canon.com",
+			"cats": [ 40 ]
+		},
+		"CakePHP": {
+			"website": "cakephp.org",
+			"cats": [ 18 ],
+			"headers": { "Set-Cookie": "cakephp=" },
+			"meta": { "application-name": "CakePHP" },
+			"implies": "PHP"
+		},
+		"Cargo": {
+			"website": "cargocollective.com",
+			"cats": [ 1 ],
+			"meta": { "cargo_title": ".*" },
+			"script": "/cargo\\.",
+			"html": "<link [^>]+Cargo feed",
+			"implies": "PHP"
+		},
+		"Catwalk": {
+			"website": "www.canon.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Catwalk\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": "Canon"
+		},
+		"CentOS": {
+			"website": "centos.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "CentOS", "X-Powered-By": "CentOS" }
+		},
+		"CFML": {
+			"website": "adobe.com/products/coldfusion-family.html",
+			"cats": [ 27 ]
+		},
+		"CacheFly": {
+			"website": "www.cachefly.com",
+			"cats": [ 31 ],
+			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
+		},
+		"Chameleon": {
+			"website": "chameleon-system.de",
+			"cats": [ 1 ],
+			"meta": { "generator": "chameleon-cms" },
+			"implies": [ "Apache", "PHP" ]
+		},
+		"Chamilo": {
+			"website": "www.chamilo.org",
+			"cats": [ 21 ],
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"Chartbeat": {
+			"website": "chartbeat.com",
+			"cats": [ 10 ],
+			"html": "function loadChartbeat\\(\\) \\{",
+			"script": "chartbeat\\.js"
+		},
+		"Cherokee": {
+			"website": "www.cherokee-project.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
+		},
+		"CherryPy": {
+			"website": "www.cherrypy.org",
+			"cats": [ 18, 22 ],
+			"headers": { "Server": "CherryPy\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": "Python"
+		},
+		"CKEditor": {
+			"website": "ckeditor.com",
+			"cats": [ 24 ],
+			"env": "^CKEDITOR$"
+		},
+		"Cloudera": {
+			"website": "www.cloudera.com",
+			"cats": [ 34 ],
+			"headers": { "Server": "cloudera" }
+		},
+		"ClickHeat": {
+			"website": "www.labsmedia.com/clickheat/index.html",
+			"cats": [ 10 ],
+			"script": "clickheat.*\\.js",
+			"env": "^clickHeat",
+			"implies": "PHP"
+		},
+		"ClickTale": {
+			"website": "www.clicktale.com",
+			"cats": [ 10 ],
+			"html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)",
+			"env": "^ClickTale"
+		},
+		"Clicky": {
+			"website": "getclicky.com",
+			"cats": [ 10 ],
+			"script": "static\\.getclicky\\.com",
+			"env": "^clicky$"
+		},
+		"CloudFlare": {
+			"website": "www.cloudflare.com",
+			"cats": [ 31 ],
+			"headers": { "Server": "cloudflare" },
+			"env": "^CloudFlare$"
+		},
+		"CMS Made Simple": {
+			"website": "cmsmadesimple.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "CMS Made Simple" },
+			"implies": "PHP"
+		},
+		"CMSimple": {
+			"website": "www.cmsimple.org/en",
+			"cats": [ 1 ],
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"CO2Stats": {
+			"website": "co2stats.com",
+			"cats": [ 10 ],
+			"html": "src=[^>]+co2stats\\.com/propres\\.php"
+		},
+		"CodeIgniter": {
+			"website": "codeigniter.com",
+			"cats": [ 18 ],
+			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_session)" },
+			"implies": "PHP"
+		},
+		"CodeMirror": {
+			"website": "codemirror.net",
+			"cats": [ 19 ],
+			"env": "^CodeMirror$"
+		},
+		"Commerce Server": {
+			"website": "commerceserver.net",
+			"cats": [ 6 ],
+			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
+			"implies": "Microsoft ASP.NET"
+		},
+		"CompaqHTTPServer": {
+			"website": "www.hp.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"comScore": {
+			"website": "comscore.com",
+			"cats": [ 10 ],
+			"script": "\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
+			"html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)|\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
+			"env": "^_?COMSCORE$"
+		},
+		"Concrete5": {
+			"website": "concrete5.org",
+			"cats": [ 1 ],
+			"script": "concrete/js/",
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
+			"env": "^CCM_IMAGE_PATH$",
+			"implies": "PHP"
+		},
+		"Connect": {
+			"website": "www.senchalabs.org/connect",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "^Connect$" },
+			"implies": "node.js"
+		},
+		"Contao": {
+			"website": "contao.org",
+			"cats": [ 1 ],
+			"html": "(?:<!--[^>]+powered by (?:TYPOlight|Contao)-->|<link[^>]+(?:typolight|contao)\\.css)",
+			"implies": "PHP"
+		},
+		"Contenido": {
+			"website": "contenido.org/en",
+			"cats": [ 1 ],
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"Contens": {
+			"website": "www.contens.com/en/pub/index.cfm",
+			"cats": [ 1 ],
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
+			"implies": [ "Java", "CFML" ]
+		},
+		"ContentBox": {
+			"website": "www.gocontentbox.org",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "ContentBox powered by ColdBox" },
+			"implies": "Adobe ColdFusion"
+		},
+		"ConversionLab": {
+			"website": "www.trackset.it/conversionlab",
+			"cats": [ 10 ],
+			"script": "conversionlab\\.trackset\\.com/track/tsend\\.js"
+		},
+		"Coppermine": {
+			"website": "coppermine-gallery.net",
+			"cats": [ 7 ],
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
+			"implies": "PHP"
+		},
+		"Cosmoshop": {
+			"website": "cosmoshop.de",
+			"cats": [ 6 ],
+			"script": "cosmoshop_functions\\.js"
+		},
+		"Cotonti": {
+			"website": "www.cotonti.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Cotonti" },
+			"implies": "PHP"
+		},
+		"CouchDB": {
+			"website": "couchdb.apache.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
+		},
+		"cPanel": {
+			"website": "www.cpanel.net",
+			"cats": [ 9 ],
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
+			"html": "<!-- cPanel"
+		},
+		"CPG Dragonfly": {
+			"website": "dragonflycms.org",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "Dragonfly CMS" },
+			"meta": { "generator": "CPG Dragonfly" },
+			"implies": "PHP"
+		},
+		"Crazy Egg": {
+			"website": "crazyegg.com",
+			"cats": [ 10 ],
+			"env": "^CE2$",
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
+		},
+		"Cross Pixel": {
+			"website": "datadesk.crsspxl.com",
+			"cats": [ 10 ],
+			"env": "^crsspxl$",
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
+		},
+		"CS Cart": {
+			"website": "www.cs-cart.com",
+			"cats": [ 6 ],
+			"env": "^fn_compare_strings$",
+			"html": "&nbsp;Powered by (?:<a href=[^>]+cs-cart\\.com|CS-Cart)",
+			"implies": "PHP"
+		},
+		"CubeCart": {
+			"website": "www.cubecart.com",
+			"cats": [ 6 ],
+			"html": "(?:Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"meta": { "generator": "cubecart" },
+			"implies": "PHP"
+		},
+		"Cufon": {
+			"website": "cufon.shoqolate.com",
+			"cats": [ 17 ],
+			"script": "cufon-yui\\.js",
+			"env": "^Cufon$"
+		},
+		"d3": {
+			"website": "d3js.org",
+			"cats": [ 25 ],
+			"script": "d3(?:\\. v[0-9]+)?(?:\\.min)?\\.js",
+			"env": "^d3$"
+		},
+		"Dancer": {
+			"website": "perldancer.org",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d.]+)\\;version:\\1" },
+			"implies": "Perl"
+		},
+		"Danneo CMS": {
+			"website": "danneo.com",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
+			"implies": [ "Apache", "PHP" ]
+		},
+		"Darwin": {
+			"website": "opensource.apple.com",
+			"cats": [ 28 ],
+			"headers": { "Server": "Darwin", "X-Powered-By": "Darwin" }
+		},
+		"DataLife Engine": {
+			"website": "dle-news.ru",
+			"cats": [ 1 ],
+			"env": "^dle_root$",
+			"meta": { "generator": "DataLife Engine" },
+			"implies": [ "PHP", "Apache" ]
+		},
+		"David Webbox": {
+			"website": "www.tobit.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
+		},
+		"Debian": {
+			"website": "debian.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "Debian", "X-Powered-By": "(?:Debian|dotdeb|(sarge|etch|lenny|squeeze|wheezy|jessie))\\;version:\\1" }
+		},
+		"debut": {
+			"website": "www.brother.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "debut\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": "Brother"
+		},
+		"DedeCMS": {
+			"website": "dedecms.com",
+			"cats": [ 1 ],
+			"env": "^DedeContainer",
+			"script": "dedeajax",
+			"implies": "PHP"
+		},
+		"Dell": {
+			"website": "dell.com",
+			"cats": [ 40 ]
+		},
+		"Demandware": {
+			"website": "demandware.com",
+			"cats": [ 6 ],
+			"headers": { "Server": "Demandware eCommerce Server" },
+			"html": "<[^>]+demandware\\.edgesuite",
+			"env": "^dwAnalytics$"
+		},
+		"DHTMLX": {
+			"website": "dhtmlx.com",
+			"cats": [ 12 ],
+			"script": "dhtmlxcommon\\.js"
+		},
+		"DirectAdmin": {
+			"website": "www.directadmin.com",
+			"cats": [ 9 ],
+			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
+			"implies": [ "PHP", "Apache" ]
+		},
+		"Disqus": {
+			"website": "disqus.com",
+			"cats": [ 15 ],
+			"script": "disqus_url",
+			"html": "<div[^>]+id=\"disqus_thread\"",
+			"env": "^DISQUS$"
+		},
+		"Django": {
+			"website": "djangoproject.com",
+			"cats": [ 18 ],
+			"html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\1",
+			"env": "^__admin_media_prefix__",
+			"implies": "Python"
+		},
+		"Django CMS": {
+			"website": "django-cms.org",
+			"cats": [ 1 ],
+			"script": "media/cms/js/csrf\\.js",
+			"headers": { "Set-Cookie": "django[^;]=" },
+			"implies": "Django"
+		},
+		"Dojo": {
+			"website": "dojotoolkit.org",
+			"cats": [ 12 ],
+			"script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
+			"env": "^dojo$"
+		},
+		"Dokeos": {
+			"website": "dokeos.com",
+			"cats": [ 21 ],
+			"meta": { "generator": "Dokeos" },
+			"html": "(?:Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue)",
+			"headers": { "X-Powered-By": "Dokeos" },
+			"implies": [ "PHP", "Xajax", "jQuery", "CKEditor" ]
+		},
+		"DokuWiki": {
+			"website": "www.dokuwiki.org",
+			"cats": [ 8 ],
+			"meta": { "generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1" },
+			"headers": { "Set-Cookie": "DokuWiki=" },
+			"implies": "PHP"
+		},
+		"Dotclear": {
+			"website": "dotclear.org",
+			"cats": [ 1 ],
+			"implies": "PHP"
+		},
+		"DotNetNuke": {
+			"website": "dotnetnuke.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "DotNetNuke" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=" },
+			"html": "<!-- by DotNetNuke Corporation",
+			"env": "^DotNetNuke$",
+			"implies": "Microsoft ASP.NET"
+		},
+		"Doxygen": {
+			"website": "stack.nl/~dimitri/doxygen",
+			"cats": [ 4 ],
+			"meta": { "generator": "Doxygen ([\\d.]+)\\;version:\\1" },
+			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
+		},
+		"DreamWeaver": {
+			"website": "www.adobe.com/products/dreamweaver",
+			"cats": [ 20 ],
+			"html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1"
+		},
+		"Drupal": {
+			"website": "drupal.org",
+			"cats": [ 1 ],
+			"script": "drupal\\.js",
+			"html": "<(?:link|style)[^>]+sites/(?:default|all)/(?:themes|modules)/",
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1", "Expires": "19 Nov 1978" },
+			"env": "^Drupal$",
+			"implies": "PHP"
+		},
+		"Drupal Commerce": {
+			"website": "drupalcommerce.org",
+			"cats": [ 6 ],
+			"html": "(?:id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
+			"implies": "Drupal"
+		},
+		"dwhttpd": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1" }
+		},
+		"Dynamicweb": {
+			"website": "www.dynamicweb.dk",
+			"cats": [ 1, 6, 10 ],
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
+			"headers": { "Set-Cookie": "Dynamicweb=" },
+			"implies": "Microsoft ASP.NET"
+		},
+		"e107": {
+			"website": "e107.org",
+			"cats": [ 1 ],
+			"script": "[^a-z0-9]e107\\.js",
+			"headers": { "Set-Cookie": "e107_tz[^;]+=", "X-Powered-By": "e107" },
+			"implies": "PHP"
+		},
+		"EdgeCast": {
+			"website": "www.edgecast.com",
+			"cats": [ 31 ],
+			"headers": { "Server": "^EC(?:S|Acc)" },
+			"url": "https?://(?:[^/]+\\.)?edgecastcdn\\.net/"
+		},
+		"eHTTP": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "\\beHTTP( v?([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "HP ProCurve"]
+		},
+		"ELOG": {
+			"website": "midas.psi.ch/elog",
+			"cats": [ 19 ],
+			"html": "<title>ELOG Logbook Selection</title>"
+		},
+		"ELOG HTTP": {
+			"website": "midas.psi.ch/elog",
+			"cats": [ 22 ],
+			"headers": { "Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1" },
+			"implies": "ELOG"
+		},
+		"Eloqua": {
+			"website": "eloqua.com",
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(?:SiteID|Load|CurESite)$"
+		},
+		"Ember.js": {
+			"website": "emberjs.com",
+			"cats": [ 12 ],
+			"env": "^Ember$"
+		},
+		"Embedthis-http": {
+			"website": "github.com/embedthis/http",
+			"cats": [ 22 ],
+			"headers": { "Server": "Embedthis-http(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"E-Merchant": {
+			"website": "e-merchant.com",
+			"cats": [ 6 ],
+			"script": "cdn\\.e-merchant\\.com"
+		},
+		"Enyo": {
+			"website": "enyojs.com",
+			"cats": [ 12, 26 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
+		"EPiServer": {
+			"website": "episerver.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
+			"implies": "Microsoft ASP.NET"
+		},
+		"EPrints": {
+			"website": "www.eprints.org",
+			"cats": [ 19 ],
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
+			"implies": "Perl"
+		},
+		"Erlang": {
+			"website": "www.erlang.org",
+			"cats": [ 27 ],
+			"headers": { "Server": "Erlang( OTP/([\\-\\d\\.ABR]+))?\\;version:\\1" }
+		},
+		"eSyndiCat": {
+			"website": "esyndicat.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "^eSyndiCat " },
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
+			"implies": [ "PHP" ]
+		},
+		"EWS-NIC4": {
+			"website": "dell.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "EWS-NIC4(\\/([\\d\\.a-z]+))?\\;version:\\2" },
+			"implies": "Dell"
+		},
+		"Exhibit": {
+			"website": "simile-widgets.org/exhibit/",
+			"cats": [ 25 ],
+			"script": "exhibit.*\\.js",
+			"env": "^Exhibit$"
+		},
+		"Express": {
+			"website": "expressjs.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "^Express$" },
+			"implies": [ "Connect", "node.js" ]
+		},
+		"ExpressionEngine": {
+			"website": "expressionengine.com",
+			"cats": [ 1 ],
+			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker)" },
+			"implies": "PHP"
+		},
+		"ExtJS": {
+			"website": "www.extjs.com",
+			"cats": [ 12 ],
+			"script": "ext-base\\.js",
+			"env": "^Ext$"
+		},
+		"eZ Publish": {
+			"website": "ez.no",
+			"cats": [ 1, 6 ],
+			"meta": { "generator": "eZ Publish" },
+			"headers": { "X-Powered-By": "^eZ Publish" },
+			"implies": "PHP"
+		},
+		"Fact Finder": {
+			"website": "fact-finder.com",
+			"cats": [ 29 ],
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "(?:/ViewParametricSearch|ffsuggest\\.[a-z]htm)"
+		},
+		"FAST ESP": {
+			"website": "microsoft.com/enterprisesearch",
+			"cats": [ 29 ],
+			"html": "<form[^>]+id=\"fastsearch\""
+		},
+		"FAST Search for SharePoint": {
+			"website": "sharepoint.microsoft.com/en-us/product/capabilities/search/Pages/Fast-Search.aspx",
+			"cats": [ 29 ],
+			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
+			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
+		},
+		"Fedora": {
+			"website": "fedoraproject.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
+		"FlashCom": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "FlashCom\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"FlexCMP": {
+			"website": "http://www.flexcmp.com/cms/home",
+			"cats": [ 1 ],
+			"meta": { "generator": "FlexCMP" },
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
+		},
+		"FluxBB": {
+			"website": "fluxbb.org",
+			"cats": [ 2 ],
+			"html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb"
+		},
+		"Flyspray": {
+			"website": "flyspray.org",
+			"cats": [ 13 ],
+			"html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
+		},
+		"FreeBSD": {
+			"website": "freebsd.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1" }
+		},
+		"FrontPage": {
+			"website": "office.microsoft.com/frontpage",
+			"cats": [ 20 ],
+			"meta": { "generator": "Microsoft FrontPage(?:\\s([\\d.]+))?\\;version:\\1" },
+			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
+		},
+		"FWP": {
+			"website": "fwpshop.org",
+			"cats": [ 6 ],
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
+		},
+		"Gallery": {
+			"website": "gallery.menalto.com",
+			"cats": [ 7 ],
+			"env": "^galleryAuthToken$",
+			"html": "<div id=\"gsNavBar\" class=\"gcBorder1\">"
+		},
+		"Gambio": {
+			"website": "gambio.de",
+			"cats": [ 6 ],
+			"html": "(?:<link[^>]* href=\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->)",
+			"implies": "PHP"
+		},
+		"Gauges": {
+			"website": "get.gaug.es",
+			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
+			"env": "^_gauges$"
+		},
+		"Gentoo": {
+			"website": "www.gentoo.org",
+			"cats": [ 28 ],
+			"headers": { "X-Powered-By": "gentoo" }
+		},
+		"Get Satisfaction": {
+			"website": "getsatisfaction.com",
+			"cats": [ 13 ],
+			"env": "^GSFN"
+		},
+		"GetSimple CMS": {
+			"website": "get-simple.info",
+			"cats": [ 1 ],
+			"meta": { "generator": "GetSimple" },
+			"implies": "PHP"
+		},
+		"Ghost": {
+			"website": "ghost.org",
+			"cats": [ 11 ],
+			"headers": { "X-Ghost-Cache-Status": ".*" }
+ 		},
+		"GoAhead": {
+			"website": "embedthis.com/products/goahead/index.html",
+			"cats": [ 22 ],
+			"headers": { "Server": "GoAhead" }
+		},
+		"Google Analytics": {
+			"website": "google.com/analytics",
+			"cats": [ 10 ],
+			"html": "_gaq\\.push\\(\\['_setAccount|i\\['GoogleAnalyticsObject'\\]|ga\\.async = true",
+			"script": "(?:\\.google-analytics\\.com\/ga\\.js|\/urchin\\.js|\\.google-analytics\\.com\/analytics\\.js)",
+			"headers": { "Set-Cookie": "__utma" },
+			"env": "^gaGlobal$"
+		},
+		"Google AdSense": {
+			"website": "google.com/adsense",
+			"cats": [ 36 ],
+			"env": [ "^google_ad_" ],
+			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad.ca.doubleclick.net" ]
+		},
+		"Google App Engine": {
+			"website": "code.google.com/appengine",
+			"cats": [ 22 ],
+			"headers": { "Server": "Google Frontend" }
+		},
+		"Google Charts": {
+			"website": "developers.google.com/chart/",
+			"cats": [ 25 ],
+			"env": "^google\\.visualization$"
+		},
+		"Google Code Prettify": {
+			"website": "code.google.com/p/google-code-prettify",
+			"cats": [ 19 ],
+			"env": "^prettyPrint$"
+		},
+		"Google Font API": {
+			"website": "code.google.com/apis/webfonts",
+			"cats": [ 17 ],
+			"script": "googleapis\\.com/.+webfont",
+			"html": "<link[^>]* href=[^>]+fonts\\.googleapis\\.com",
+			"env": "^WebFonts$"
+		},
+		"Google Maps": {
+			"website": "maps.google.com",
+			"cats": [ 35 ],
+			"script": "(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1"
+		},
+		"Google PageSpeed": {
+			"website": "developers.google.com/speed/pagespeed/mod",
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
+		},
+		"Google Sites": {
+			"website": "sites.google.com",
+			"cats": [ 1 ],
+			"url": "sites\\.google\\.com"
+		},
+		"Google Tag Manager": {
+			"website": "www.google.com/tagmanager",
+			"cats": [ 19 ],
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+		},
+		"Google Web Toolkit": {
+			"website": "developers.google.com/web-toolkit",
+			"cats": [ 18 ],
+			"env": "^__gwt_",
+			"implies": "Java"
+		},
+		"GoStats": {
+			"website": "gostats.com",
+			"cats": [ 10 ],
+			"env": "^_go(?:stats|_track)"
+		},
+		"Graffiti CMS": {
+			"website": "graffiticms.codeplex.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti\\.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
+		},
+		"Grandstream": {
+			"website": "www.grandstream.com",
+			"cats": [ 22, 39 ],
+			"headers": { "Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Gravatar": {
+			"website": "gravatar.com",
+			"cats": [ 19 ],
+			"html": "(secure\\.)?gravatar\\.com/avatar/.+",
+			"env": "^Gravatar$"
+		},
+		"Gravity Insights": {
+			"website": "insights.gravity.com",
+			"cats": [ 10 ],
+			"env": "^GravityInsights$"
+		},
+		"G-WAN": {
+			"website": "gwan.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "G-WAN" }
+		},
+		"GX WebManager": {
+			"website": "www.gxsoftware.com/en/products/web-content-management.htm",
+			"cats": [ 1 ],
+			"meta": { "generator": "GX WebManager(?: ([\\d.]+))?\\;version:\\1" },
+			"html": "<!--\\s+Powered by GX"
+		},
+		"Handlebars": {
+			"website": "handlebarsjs.com",
+			"cats": [ 12 ],
+			"env": "^Handlebars$"
+		},
+		"Hello Bar": {
+			"cats": [ 5 ],
+			"script": "(hellobar\\.com/hellobar\\.js|new HelloBar)",
+			"html": "/hellobar\\.js"
+		},
+		"Hiawatha": {
+			"website": "hiawatha-webserver.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
+		},
+		"Highcharts": {
+			"website": "highcharts.com",
+			"cats": [ 25 ],
+			"script": "highcharts.*\\.js",
+			"env": "^Highcharts$"
+		},
+		"Highstock": {
+			"website": "highcharts.com/products/highstock",
+			"cats": [ 25 ],
+			"script": "highstock(\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\2"
+		},
+		"Hogan.js": {
+			"website": "twitter.github.com/hogan.js",
+			"cats": [ 12 ],
+			"env": "^Hogan$"
+		},
+		"Hotaru CMS": {
+			"website": "hotarucms.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
+		},
+		"HP ProCurve": {
+			"website": "hp.com/networking",
+			"cats": [ 37 ]
+		},
+		"HubSpot": {
+			"website": "hubspot.com",
+			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
+			"env": "^(?:_hsq|hubspot)$"
+		},
+		"Hybris": {
+			"website": "hybris.com",
+			"cats": [ 6 ],
+			"html": "(?:/sys_master/|/hybr/|/_ui/desktop/)",
+			"headers": { "Set-Cookie": "_hybris" },
+			"implies": "Java"
+		},
+		"IBM Coremetrics": {
+			"website": "ibm.com/software/marketing-solutions/coremetrics",
+			"cats": [ 10 ],
+			"script": "cmdatatagutils\\.js"
+		},
+		"IBM HTTP Server": {
+			"website": "ibm.com/software/webservers/httpservers",
+			"cats": [ 22 ],
+			"headers": { "Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"IBM WebSphere Portal": {
+			"website": "ibm.com/software/websphere/portal",
+			"cats": [ 1 ],
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
+			"url": "/wps/",
+			"implies": "Java"
+		},
+		"IBM WebSphere Commerce": {
+			"website": "ibm.com/software/genservers/commerceproductline",
+			"cats": [ 6 ],
+			"url": "/wcs/",
+			"implies": "Java"
+		},
+		"iCongo": {
+			"website": "hybris.com/icongo",
+			"cats": [ 6 ],
+			"meta": { "iCongo": ".*" },
+			"implies": "Adobe ColdFusion"
+		},
+		"IIS": {
+			"website": "www.iis.net",
+			"cats": [ 22 ],
+			"headers": { "Server": "IIS(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Windows Server"
+		},
+		"ImpressCMS": {
+			"website": "www.impresscms.org",
+			"cats": [ 1 ],
+			"script": "include/linkexternal\\.js",
+			"meta": { "generator": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
+			"implies": "PHP"
+		},
+		"ImpressPages": {
+			"website": "impresspages.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"Indexhibit": {
+			"website": "www.indexhibit.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Indexhibit" },
+			"html": "<(?:link|a href) [^>]+ndxz-studio",
+			"implies": [ "PHP", "Apache", "Exhibit" ]
+		},
+		"Indico": {
+			"website": "indico-software.org",
+			"cats": [ 1 ],
+			"headers": { "Set-cookie": "MAKACSESSION" },
+			"html": "Powered by\\s+(CERN )?<a href=\"http://(cdsware.cern.ch/indico/|indico-software.org|cern.ch/indico)\">(CDS )?Indico( [\\d\\.]+)?\\;version:\\4"
+		},
+		"InstantCMS": {
+			"website": "www.instantcms.ru",
+			"cats": [ 1 ],
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
+		},
+		"IntenseDebate": {
+			"website": "intensedebate.com",
+			"cats": [ 15 ],
+			"script": "intensedebate\\.com"
+		},
+		"Intercom": {
+			"website": "intercom.io",
+			"cats": [ 10 ],
+			"script": "(api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
+			"env": "^Intercom$"
+		},
+		"Intershop": {
+			"website": "intershop.com",
+			"cats": [ 6 ],
+			"script": "(?:is-bin|INTERSHOP)"
+		},
+		"IPB": {
+			"website": "www.invisionpower.com",
+			"cats": [ 2 ],
+			"script": "jscripts/ips_",
+			"env": "^(?:IPBoard$|ipb_var)",
+			"html": "<link[^>]+ipb_[^>]+\\.css"
+		},
+		"iWeb": {
+			"website": "apple.com/ilife/iweb",
+			"cats": [ 20 ],
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
+		},
+		"JAlbum": {
+			"website": "jalbum.net/en",
+			"cats": [ 7 ],
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
+			"implies": "Java"
+		},
+		"Jalios": {
+			"website": "www.jalios.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Jalios" }
+		},
+		"Java": {
+			"website": "java.com",
+			"cats": [ 27 ],
+			"headers": { "Set-Cookie": "JSESSIONID" }
+		},
+		"Javascript Infovis Toolkit": {
+			"website": "thejit.org",
+			"cats": [ 25 ],
+			"script": "jit.*\\.js",
+			"env": "^\\$jit$"
+		},
+		"JavaServer Faces": {
+			"website": "javaserverfaces.java.net",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "JSF(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Java"
+		},
+		"JavaServer Pages": {
+			"website": "www.oracle.com/technetwork/java/javaee/jsp/index.html",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "JSP(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Java"
+		},
+		"Java Servlet": {
+			"website": "www.oracle.com/technetwork/java/index-jsp-135475.html",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Servlet(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Java"
+		},
+		"Jetty": {
+			"website": "www.eclipse.org/jetty",
+			"cats": [ 22 ],
+			"headers": { "Server": "Jetty(\\(([\\d\\.]+\\d+))?\\;version:\\2" },
+			"implies": "Java"
+		},
+		"Jirafe": {
+			"website": "jirafe.com",
+			"cats": [ 10, 32 ],
+			"script": "/jirafe\\.js",
+			"env": "^jirafe$"
+		},
+		"Jo": {
+			"website": "joapp.com",
+			"cats": [ 26, 12 ],
+			"env": "^jo(?:Cache|DOM|Event)$"
+		},
+		"JobberBase": {
+			"website": "jobberbase.com",
+			"cats": [ 19 ],
+			"meta": { "generator": "Jobberbase" },
+			"env": "^Jobber$"
+		},
+		"Joomla": {
+			"website": "joomla.org",
+			"cats": [ 1 ],
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" },
+			"html": "(?:<div[^>]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
+			"env": "^(jcomments|Joomla)$",
+			"implies": "PHP"
+		},
+		"jqPlot": {
+			"website": "www.jqplot.com",
+			"cats": [ 25 ],
+			"script": "jqplot.*\\.js"
+		},
+		"jQTouch": {
+			"website": "jqtouch.com",
+			"cats": [ 26 ],
+			"script": "jqtouch.*\\.js",
+			"env": "^jQT$"
+		},
+		"jQuery": {
+			"website": "jquery.com",
+			"cats": [ 12 ],
+			"script": [ "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "/([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"env": "^jQuery$"
+		},
+		"jQuery Mobile": {
+			"website": "jquerymobile.com",
+			"cats": [ 26 ],
+			"script": "jquery\\.mobile(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1",
+			"implies": "jQuery"
+		},
+		"jQuery Sparklines": {
+			"website": "omnipotent.net/jquery.sparkline/",
+			"cats": [ 25 ],
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
+		},
+		"jQuery UI": {
+			"website": "jqueryui.com",
+			"cats": [ 12 ],
+			"script": [ "jquery-ui(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "([\\d.]+)/jquery-ui(\\.min)?\\.js\\;version:\\1", "jquery-ui.*\\.js" ],
+			"implies": "jQuery"
+		},
+		"JS Charts": {
+			"website": "www.jscharts.com",
+			"cats": [ 25 ],
+			"script": "jscharts.*\\.js",
+			"env": "^JSChart$"
+		},
+		"JTL Shop": {
+			"website": "www.jtl-software.de/produkte/jtl-shop3",
+			"cats": [ 6 ],
+			"html": "(?:<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
+		},
+		"K2": {
+			"website": "getk2.org",
+			"cats": [ 19 ],
+			"html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
+			"env": "^K2RatingURL$",
+			"implies": "Joomla"
+		},
+		"Kampyle": {
+			"website": "www.kampyle.com",
+			"cats": [ 10, 13 ],
+			"script": "cf\\.kampyle\\.com/k_button\\.js",
+			"headers": { "Set-Cookie": "k_visit" },
+			"env": "^k_track$"
+		},
+		"Kendo UI": {
+			"website": "www.kendoui.com",
+			"cats": [ 18 ],
+			"env": "^kendo$",
+			"html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
+			"implies": "jQuery"
+		},
+		"Kentico CMS": {
+			"website": "www.kentico.comhome.aspx",
+			"cats": [ 1 ],
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
+		},
+		"KineticJS": {
+			"website": "kineticjs.com",
+			"cats": [ 25 ],
+			"script": "kinetic(?:-v?([\\d.]+))?\\.js\\;version:\\1",
+			"env": "^Kinetic$"
+		},
+		"KISSmetrics": {
+			"website": "www.kissmetrics.com",
+			"cats": [ 10 ],
+			"env": "^KM_COOKIE_DOMAIN$"
+		},
+		"Knockout.js": {
+			"website": "knockoutjs.com",
+			"cats": [ 12 ],
+			"env": "^ko$"
+		},
+		"Koego": {
+			"website": "www.koego.com/en",
+			"cats": [ 10 ],
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
+		},
+		"Kohana": {
+			"website": "kohanaframework.org",
+			"cats": [ 18 ],
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"Kolibri CMS": {
+			"website": "alias.io",
+			"cats": [ 1 ],
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
+		},
+		"Komodo CMS": {
+			"website": "www.komodocms.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "^Komodo CMS" },
+			"implies": "PHP"
+		},
+		"Koobi": {
+			"website": "dream4.de/cms",
+			"cats": [ 1 ],
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
+		},
+		"KS_HTTP": {
+			"website": "www.canon.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "KS_HTTP\\/?([\\d\\.]+)?\\;version:\\1" },
+			"implies": [ "Canon"]
+		},
+		"LabVIEW": {
+			"website": "ni.com/labview",
+			"cats": [ 22 ],
+			"headers": { "Server": "LabVIEW(/([\\d\\.]+))?\\;version:\\2" }
+		},
+		"Laravel": {
+			"website": "laravel.com",
+			"cats": [ 18 ],
+			"headers": { "Set-Cookie": "laravel_session" },
+			"implies": "PHP"
+		},
+		"LEPTON": {
+			"website": "www.lepton-cms.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
+			"implies": "PHP"
+		},
+		"LESS": {
+			"website": "lesscss.org",
+			"cats": [ 19 ],
+			"html": "<link[^>]+ rel=\"stylesheet/less\""
+		},
+		"libwww-perl-daemon": {
+			"website": "search.cpan.org/~gaas/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm",
+			"cats": [ 22 ],
+			"headers": { "Server": "libwww-perl-daemon(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": "Perl"
+		},
+		"Liferay": {
+			"website": "www.liferay.com",
+			"cats": [ 1 ],
+			"env": "^Liferay$",
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
+		},
+		"Lift": {
+			"website": "liftweb.net",
+			"cats": [ 18 ],
+			"headers": { "X-Lift-Version": "(.+)\\;version:\\1" },
+			"implies": "Scala"
+		},
+		"Lightbox": {
+			"website": "http://lokeshdhakar.com/projects/lightbox2/",
+			"cats": [ 7, 12 ],
+			"script": "lightbox.*\\.js",
+			"html": "<link.+?href=\"[^\"]+lightbox(\\.min)?\\.css"
+		},
+		"LightMon Engine": {
+			"website": "en.lightmon.ru",
+			"cats": [ 1 ],
+			"html": "<!-- Lightmon Engine Copyright Lightmon",
+			"implies": "PHP"
+		},
+		"lighttpd": {
+			"website": "www.lighttpd.net",
+			"cats": [ 22 ],
+			"headers": { "Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"LimeSurvey": {
+			"website": "limesurvey.org/",
+			"cats": [ 19 ],
+			"headers": { "generator": "LimeSurvey" }
+		},
+		"LiteSpeed": {
+			"website": "litespeedtech.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
+		"Livefyre": {
+			"website": "livefyre.com",
+			"cats": [ 15 ],
+			"script": "livefyre_init\\.js",
+			"env": "^fyre$"
+		},
+		"LiveJournal": {
+			"website": "www.livejournal.com",
+			"cats": [ 11 ],
+			"url": "\\.livejournal\\.com"
+		},
+		"LiveStreet CMS": {
+			"website": "livestreetcms.com",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "LiveStreet CMS" }
+		},
+		"Lockerz Share": {
+			"website": "share.lockerz.com",
+			"cats": [ 5 ],
+			"script": "addtoany\\.com/menu/page\\.js",
+			"env": "^a2apage_init$"
+		},
+		"Locomotive": {
+			"website": "www.locomotivecms.com",
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
+		"Logitech Media Server": {
+			"website": "www.mysqueezebox.com",
+			"cats": [ 22, 38 ],
+			"headers": { "Server": "Logitech Media Server( \\(([\\d\\.]+))?\\;version:\\2" }
+		},
+		"Lotus Domino": {
+			"website": "www-01.ibm.com/software/lotus/products/domino",
+			"cats": [ 22 ],
+			"headers": { "Server": "Lotus-Domino" }
+		},
+		"Magento": {
+			"website": "www.magentocommerce.com",
+			"cats": [ 6 ],
+			"script": [ "js/mage", "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community" ],
+			"headers": { "Set-Cookie": "frontend=\\;confidence:50" },
+			"env": "^(?:Mage|VarienForm)$",
+			"implies": "PHP"
+		},
+		"Mambo": {
+			"website": "mambo-foundation.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Mambo" }
+		},
+		"MantisBT": {
+			"website": "www.mantisbt.org",
+			"cats": [ 13 ],
+			"html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker"
+		},
+		"ManyContacts": {
+			"website": "www.manycontacts.com",
+			"cats": [ 5 ],
+			"html": "\/assets\/js\/manycontacts\\.min\\.js",
+			"script": "\/assets\/js\/manycontacts\\.min\\.js"
+		},
+		"Marketo": {
+			"website": "www.marketo.com",
+			"cats": [ 32 ],
+			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"env": "^Munchkin$"
+		},
+		"MathJax": {
+			"website": "mathjax.org",
+			"cats": [ 25 ],
+			"script": "mathjax.js",
+			"env": "^MathJax$"
+		},
+		"MaxSite CMS": {
+			"website": "max-3000.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "MaxSite CMS" }
+		},
+		"MediaElement.js": {
+			"website": "mediaelementjs.com",
+			"cats": [ 14 ],
+			"env": "^mejs$"
+		},
+		"MediaWiki": {
+			"website": "www.mediawiki.org",
+			"cats": [ 8 ],
+			"meta": { "generator": "MediaWiki" },
+			"html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)"
+		},
+		"Meebo": {
+			"website": "www.meebo.com",
+			"cats": [ 5 ],
+			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\(?:'domReady'\\))"
+		},
+		"Méthode": {
+			"website": "www.eidosmedia.com/solutions",
+			"cats": [ 1 ],
+			"env": "^eidosBase$\\;confidence:99",
+			"html": "<!-- Methode uuid: \"[a-f0-9]+\" ?-->",
+			"meta": { "eomportal-instanceid": "[0-9]+", "eomportal-id": "[0-9]+", "eomportal-loid": "[0-9.]+", "eomportal-uuid": "[a-f0-9]+", "eomportal-lastUpdate": ".*" }
+		},
+		"Microsoft ASP.NET": {
+			"website": "www.asp.net",
+			"cats": [ 18 ],
+			"url": "\\.aspx(?:$|\\?)",
+			"html": "<input[^>]+name=\"__VIEWSTATE",
+			"headers": { "X-Powered-By": "ASP\\.NET\\;confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
+			"implies": "IIS\\;confidence:50"
+		},
+		"Microsoft SharePoint": {
+			"website": "sharepoint.microsoft.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Microsoft SharePoint" },
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
+		},
+		"MiniBB": {
+			"website": "www.minibb.com",
+			"cats": [ 2 ],
+			"html": "<a href=\"[^>]+minibb.+\\s+<!--End of copyright link"
+		},
+		"MiniServ": {
+			"website": "sourceforge.net/projects/miniserv",
+			"cats": [ 22 ],
+			"headers": { "Server": "MiniServ\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Mint": {
+			"website": "haveamint.com",
+			"cats": [ 10 ],
+			"script": "mint/\\?js",
+			"env": "^Mint$"
+		},
+		"Mixpanel": {
+			"website": "mixpanel.com",
+			"cats": [ 10 ],
+			"script": "api\\.mixpanel\\.com/track",
+			"env": "^Mixpanel$"
+		},
+		"MOBOTIX": {
+			"website": "mobotix.com",
+			"cats": [ 39 ],
+			"meta": { "publisher": "MOBOTIX AG\\;confidence:40", "copyright": "MOBOTIX AG\\;confidence:40", "author": "MOBOTIX AG\\;confidence:40" },
+			"url": "control/userimage.html\\;confidence:70"
+		},
+		"MochiKit": {
+			"website": "mochikit.com",
+			"cats": [ 12 ],
+			"script": "MochiKit\\.js",
+			"env": "^MochiKit$"
+		},
+		"Modernizr": {
+			"website": "www.modernizr.com",
+			"cats": [ 12 ],
+			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
+			"env": "^Modernizr$"
+		},
+		"MODx": {
+			"website": "modxcms.com",
+			"cats": [ 1 ],
+			"html": "(?:<a[^>]+>Powered by MODx</a>|<(?:link|script)[^>]+assets/snippets/)",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
+			"implies": "PHP"
+		},
+		"mod_auth_pam": {
+			"website": "pam.sourceforge.net/mod_auth_pam",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_auth_pam(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": "Apache"
+		},
+		"mod_fastcgi": {
+			"website": "www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_fastcgi(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Apache"
+		},
+		"mod_jk": {
+			"website": "tomcat.apache.org/tomcat-3.3-doc/mod_jk-howto.html",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_jk(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "Apache Tomcat", "Apache" ]
+		},
+		"mod_perl": {
+			"website": "perl.apache.org",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_perl(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "Perl", "Apache" ]
+		},
+		"mod_python": {
+			"website": "www.modpython.org",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_python(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Python", "Apache" ]
+		},
+		"mod_rack": {
+			"website": "phusionpassenger.com",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_rack(?:/([\\d.]+))?\\;version:\\1", "X-Powered-By": "mod_rack(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
+		},
+		"mod_rails": {
+			"website": "phusionpassenger.com",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_rails(?:/([\\d.]+))?\\;version:\\1", "X-Powered-By": "mod_rails(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
+		},
+		"mod_ssl": {
+			"website": "modssl.org",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_ssl(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "Apache"
+		},
+		"mod_wsgi": {
+			"website": "code.google.com/p/modwsgi",
+			"cats": [ 33 ],
+			"headers": { "Server": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1", "X-Powered-By": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Python\\;confidence:50", "Apache" ]
+		},
+		"MoinMoin": {
+			"website": "moinmo.in",
+			"cats": [ 8 ],
+			"script": "moin(?:_static(\\d)(\\d)(\\d)|.+)/common/js/common\\.js\\;version:\\1.\\2.\\3",
+			"env": "^show_switch2gui$",
+			"implies": "Python"
+		},
+		"Mojolicious": {
+			"website": "mojolicio.us",
+			"cats": [ 18 ],
+			"headers": { "x-powered-by": "mojolicious" },
+			"implies": "Perl"
+		},
+		"Mollom": {
+			"website": "mollom.com",
+			"cats": [ 16 ],
+			"script": "mollom\\.js",
+			"html": "<img[^>]+/.mollom/.com"
+		},
+		"Mondo Media": {
+			"website": "mondo-media.de",
+			"cats": [ 6 ],
+			"meta": { "generator": "Mondo Shop" }
+		},
+		"Mongrel": {
+			"website": "mongrel2.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "Mongrel" },
+			"implies": "Ruby"
+		},
+		"MongoDB": {
+			"website": "www.mongodb.org",
+			"cats": [ 34 ]
+		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
+		"Moodle": {
+			"website": "moodle.org",
+			"cats": [ 21 ],
+			"html": "<img[^>]+moodlelogo",
+			"headers": { "Set-Cookie": "MoodleSession" },
+			"env": "^moodle",
+			"implies": "PHP"
+		},
+		"Moogo": {
+			"website": "www.moogo.com",
+			"cats": [ 1 ],
+			"script": "kotisivukone\\.js"
+		},
+		"MooTools": {
+			"website": "mootools.net",
+			"cats": [ 12 ],
+			"script": "mootools.*\\.js",
+			"env": "^MooTools$"
+		},
+		"Movable Type": {
+			"website": "movabletype.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Movable Type" }
+		},
+		"Mura CMS": {
+			"website": "www.getmura.com",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "Mura CMS ([\\d]+)\\;version:\\1" },
+			"implies": "Adobe ColdFusion"
+		},
+		"Mustache": {
+			"website": "mustache.github.com",
+			"cats": [ 12 ],
+			"env": "^Mustache$"
+		},
+		"MyBB": {
+			"website": "www.mybboard.net",
+			"cats": [ 2 ],
+			"html": "(?:<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
+			"env": "^MyBB$"
+		},
+		"MyBlogLog": {
+			"website": "www.mybloglog.com",
+			"cats": [ 5 ],
+			"script": "pub\\.mybloglog\\.com"
+		},
+		"Mynetcap": {
+			"website": "www.netcap-creation.fr",
+			"cats": [ 1 ],
+			"meta": { "generator": "Mynetcap" }
+		},
+		"MySQL": {
+			"website": "mysql.com",
+			"cats": [ 34 ]
+		},
+		"Nedstat": {
+			"website": "www.nedstat.com",
+			"cats": [ 10 ],
+			"html": "sitestat\\(\".+nl\\.sitestat\\.com"
+		},
+		"Netmonitor": {
+			"website": "netmonitor.fi/en",
+			"cats": [ 10 ],
+			"script": "netmonitor\\.fi/nmtracker\\.js",
+			"env": "^netmonitor$"
+		},
+		"New Relic": {
+			"website": "newrelic.com",
+			"cats": [ 10 ],
+			"env": "^NREUM"
+		},
+		"Nginx": {
+			"website": "nginx.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "nginx(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"node.js": {
+			"website": "nodejs.org",
+			"cats": [ 27 ]
+		},
+		"Nokia Maps": {
+			"website": "developer.here.net",
+			"cats": [ 35 ]
+		},
+		"NOIX": {
+			"website": "www.noix.com.br/tecnologias/joomla",
+			"cats": [ 19 ],
+			"html": "(?:<[^>]+(?:src|href)=[^>]*(?:/media/noix)|<!-- NOIX)"
+		},
+		"nopCommerce": {
+			"website": "www.nopcommerce.com",
+			"cats": [ 6 ],
+			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
+		},
+		"Open Web Analytics": {
+			"website": "openwebanalytics.com",
+			"cats": [ 10 ],
+			"html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
+			"env": "^_?owa_"
+		},
+		"OneStat": {
+			"website": "www.onestat.com",
+			"cats": [ 10 ],
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+		},
+		"OpenCart": {
+			"website": "www.opencart.com",
+			"cats": [ 6 ],
+			"html": "(?:index\\.php\\?route=[a-z]+/|Powered By <a href=\"[^>]+OpenCart)",
+			"implies": "PHP"
+		},
+		"openEngine": {
+			"website": "openengine.de/html/pages/de/",
+			"cats": [ 1 ],
+			"meta": { "openEngine": ".*" }
+		},
+		"OpenGrok": {
+			"website": "hub.opensolaris.org/bin/view/Project+opengrok/WebHome",
+			"cats": [ 19 ],
+			"headers": { "Set-Cookie": "OpenGrok" },
+			"meta": { "generator": "OpenGrok(?: v?([\\d.]+))?\\;version:\\1" },
+			"implies": "Java"
+		},
+		"OpenGSE": {
+			"website": "code.google.com/p/opengse",
+			"cats": [ 22 ],
+			"headers": { "Server": "GSE" },
+			"implies": "Java"
+		},
+		"OpenLayers": {
+			"website": "openlayers.org",
+			"cats": [ 35 ],
+			"script": "openlayers",
+			"env": "^OpenLayers$"
+		},
+		"OpenNemas": {
+			"website": "www.opennemas.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "OpenNemas(.*)" },
+			"headers": { "X-Powered-By": "OpenNemas" }
+		},
+		"OpenSSL": {
+			"website": "openssl.org",
+			"cats": [ 33 ],
+			"headers": { "Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1" }
+		},
+		"OpenText Web Solutions": {
+			"website": "websolutions.opentext.com",
+			"cats": [ 1 ],
+			"html": "<!--[^>]+published by Open Text Web Solutions",
+			"implies": "Microsoft ASP.NET"
+		},
+		"Ophal": {
+			"website": "ophal.org",
+			"cats": [ 1, 11, 18 ],
+			"headers": { "X-Powered-By": "^Ophal/" }
+		},
+		"Optimizely": {
+			"website": "optimizely.com",
+			"cats": [ 10 ],
+			"script": "optimizely\\.com.*\\.js",
+			"env": "^optimizely$"
+		},
+		"Oracle Application Server": {
+			"website": "www.oracle.com/technetwork/middleware/ias/overview/index.html",
+			"cats": [ 22 ],
+			"headers": { "Server": "Oracle\\bApplication\\bServer(?:\\b(\\d+[a-z]?))?\\;version:\\1" }
+		},
+		"Oracle Recommendations On Demand": {
+			"website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html",
+			"cats": [ 10 ],
+			"script": "atgsvcs.+atgsvcs\\.js"
+		},
+		"osCommerce": {
+			"website": "www.oscommerce.com",
+			"cats": [ 6 ],
+			"html": "(?:<a[^>]*(?:\\?|&)osCsid|Powered by (?:<[^>]+>)?osCommerce</a>|<[^>]+class=\"[^>]*infoBoxHeading)",
+			"headers": { "Set-Cookie": "osCsid=" }
+		},
+		"osCSS": {
+			"website": "www.oscss.org",
+			"cats": [ 6 ],
+			"html": "<body onload=\"window\\.defaultStatus='oscss templates';\""
+		},
+		"Outbrain": {
+			"website": "outbrain.com",
+			"cats": [ 5 ],
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
+			"env": "^(?:OutbrainPermaLink|OB_releaseVer)$"
+		},
+		"OXID eShop": {
+			"website": "oxid-esales.com",
+			"cats": [ 6 ],
+			"html": "<!--[^-]*OXID eShop",
+			"env": "^ox(?:TopMenu|ModalPopup|LoginBox|InputValidator)"
+		},
+		"PANSITE": {
+			"website": "panvision.de/Produkte/Content_Management/index.asp",
+			"cats": [ 1 ],
+			"meta": { "generator": "PANSITE" }
+		},
+		"papaya CMS": {
+			"website": "papaya-cms.com",
+			"cats": [ 1 ],
+			"html": "<link[^>]*/papaya-themes/"
+		},
+		"Pardot": {
+			"website": "pardot.com",
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(?:Tracker|Hostname|Protocol|CId|AId)$"
+		},
+		"Parse.ly": {
+			"website": "parse.ly",
+			"cats": [ 10 ],
+			"env": "^PARSELY$"
+		},
+		"Percussion": {
+			"website": "percussion.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "(?:Percussion|Rhythmyx)" },
+			"html": "<[^>]+class=\"perc-region\""
+		},
+		"PerfSONAR-PS": {
+			"website": "psps.perfsonar.net",
+			"cats": [ 19 ],
+			"headers": { "User-agent": "perfSONAR-PS/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Perl": {
+			"website": "perl.org",
+			"cats": [ 27 ],
+			"url": "\\.pl(?:$|\\?)"
+		},
+		"PHP": {
+			"website": "php.net",
+			"cats": [ 27 ],
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"url": "\\.php(?:$|\\?)"
+		},
+		"phpAlbum": {
+			"website": "phpalbum.net",
+			"cats": [ 7 ],
+			"html": "<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
+			"implies": "PHP"
+		},
+		"phpBB": {
+			"website": "phpbb.com",
+			"cats": [ 2 ],
+			"meta": { "copyright": "phpBB Group" },
+			"html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+			"env": "^(?:style_cookie_settings|phpbb_)",
+			"headers": { "Set-Cookie": "^phpbb" },
+			"implies": "PHP"
+		},
+		"phpCMS": {
+			"website": "phpcms.de",
+			"cats": [ 1 ],
+			"env": "^phpcms",
+			"implies": "PHP"
+		},
+		"phpDocumentor": {
+			"website": "www.phpdoc.org",
+			"cats": [ 4 ],
+			"html": "<!-- Generated by phpDocumentor",
+			"implies": "PHP"
+		},
+		"PHP-Fusion": {
+			"website": "www.php-fusion.co.uk",
+			"cats": [ 1 ],
+			"html": "Powered by <a href=\"[^>]+php-fusion",
+			"implies": "PHP"
+		},
+		"phpMyAdmin": {
+			"website": "www.phpmyadmin.net",
+			"cats": [ 3 ],
+			"html": "(?:PMA_sendHeaderLocation\\(|<title>phpMyAdmin</title>)",
+			"env":	"pma_absolute_uri",
+			"implies": [ "PHP", "MySQL" ]
+		},
+		"PHP-Nuke": {
+			"website": "phpnuke.org",
+			"cats": [ 2 ],
+			"meta": { "generator": "PHP-Nuke" },
+			"html": "<[^>]+Powered by PHP-Nuke"
+		},
+		"phpPgAdmin": {
+			"website": "phppgadmin.sourceforge.net",
+			"cats": [ 3 ],
+			"html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
+			"implies": "PHP"
+		},
+		"phpSQLiteCMS": {
+			"website": "phpsqlitecms.net",
+			"cats": [ 1 ],
+			"meta": { "generator": "^phpSQLiteCMS(?: (.+))?$\\;version:\\1" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
+		},
+		"phpwind": {
+			"website": "www.phpwind.net",
+			"cats": [ 1, 2 ],
+			"meta": { "generator": "^phpwind" },
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
+			"implies": "PHP"
+		},
+		"Piwik": {
+			"website": "piwik.org",
+			"cats": [ 10 ],
+			"script": "piwik\\.js|piwik\\.php",
+			"html": "var piwikTracker = Piwik\\.getTracker\\(",
+			"env": [ "^Piwik$", "^_paq$" ]
+		},
+		"Plentymarkets": {
+			"website": "plentymarkets.eu",
+			"cats": [ 6 ],
+			"meta": { "generator": "plentymarkets" }
+		},
+		"Plesk": {
+			"website": "parallels.com/products/plesk",
+			"cats": [ 9 ],
+			"headers": { "X-Powered-By-Plesk": "Plesk", "X-Powered-By": "PleskLin" },
+			"script": "common\\.js\\?plesk"
+		},
+		"Pligg": {
+			"website": "pligg.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Pligg" },
+			"html": "<span[^>]+id=\"xvotes-0",
+			"env": "^pligg_"
+		},
+		"Plone": {
+			"website": "plone.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Plone" },
+			"implies": "Python"
+		},
+		"Plura": {
+			"website": "www.pluraprocessing.com",
+			"cats": [ 19 ],
+			"html": "<iframe src=\"[^>]+pluraserver\\.com"
+		},
+		"Po.st": {
+			"website": "http://www.po.st/",
+			"cats": [ 5 ],
+			"env": "^pwidget_config$"
+		},
+		"Posterous": {
+			"website": "posterous.com",
+			"cats": [ 1, 11 ],
+			"html": "<div class=\"posterous",
+			"env": "^Posterous"
+		},
+		"Powergap": {
+			"website": "powergap.de",
+			"cats": [ 6 ],
+			"html": "(s\\d\\d)\\.php\\?shopid=\\1"
+		},
+		"Prefix-Free": {
+			"website": "http://leaverou.github.io/prefixfree/",
+			"cats": [ 19 ],
+			"script": "prefixfree\\.js",
+			"env": "^PrefixFree$"
+		},
+		"Prestashop": {
+			"website": "www.prestashop.com",
+			"cats": [ 6 ],
+			"meta": { "generator": "PrestaShop" },
+			"html": "Powered by <a\\s+[^>]+>PrestaShop",
+			"implies": "PHP"
+		},
+		"Prototype": {
+			"website": "www.prototypejs.org",
+			"cats": [ 12 ],
+			"script": "(?:prototype|protoaculous)(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
+			"env": "^Prototype$"
+		},
+		"Protovis": {
+			"website": "mbostock.github.com/protovis",
+			"cats": [ 25 ],
+			"script": "protovis.*\\.js",
+			"env": "^protovis$"
+		},
+		"punBB": {
+			"website": "punbb.informer.com",
+			"cats": [ 2 ],
+			"html": "Powered by <a href=\"[^>]+punbb",
+			"implies": "PHP"
+		},
+		"Python": {
+			"website": "python.org",
+			"cats": [ 27 ],
+			"headers": { "Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;confidence:50\\;version:\\1" }
+		},
+		"Quantcast": {
+			"website": "www.quantcast.com",
+			"cats": [ 10 ],
+			"script": "edge\\.quantserve\\.com/quant\\.js",
+			"env": "^quantserve$"
+		},
+		"Quick.Cart": {
+			"website": "opensolution.org",
+			"cats": [ 6 ],
+			"meta": { "generator": "Quick\\.Cart(?: v([\\d.]+))?\\;version:\\1" },
+			"html": "<a href=\"[^>]+opensolution\\.org/\">(?:Shopping cart by|Sklep internetowy)"
+		},
+		"Quick.CMS": {
+			"website": "opensolution.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Quick\\.CMS(?: v([\\d.]+))?\\;version:\\1" },
+			"html": "<a href=\"[^>]+opensolution\\.org/\">CMS by"
+		},
+		"RackCache": {
+			"website": "github.com/rtomayko/rack-cache",
+			"cats": [ 23 ],
+			"headers": { "X-Rack-Cache": ".+" },
+			"implies": "Ruby"
+		},
+		"Raphael": {
+			"website": "raphaeljs.com",
+			"cats": [ 25 ],
+			"script": "raphael.*\\.js",
+			"env": "^Raphael$"
+		},
+		"RBS Change": {
+			"website": "www.rbschange.fr",
+			"cats": [ 1, 6 ],
+			"html": "<html[^>]+xmlns:change=",
+			"meta": { "generator": "RBS Change" },
+			"implies": "PHP"
+		},
+		"RCMS": {
+			"website": "www.rcms.fi",
+			"cats": [ 1 ],
+			"meta": { "generator": "^(?:RCMS|ReallyCMS)" }
+		},
+		"reCAPTCHA": {
+			"website": "recaptcha.net",
+			"cats": [ 16 ],
+			"script": "(?:api-secure\\.recaptcha\\.net|recaptcha_ajax\\.js)",
+			"html": "(?:<div[^>]+id=\"recaptcha_image|<link[^>]+recaptcha|document\\.getElementById\\(?:'recaptcha)",
+			"env": "^Recaptcha$"
+		},
+		"Red Hat": {
+			"website": "redhat.com",
+			"cats": [ 28 ],
+			"headers": { "Server": "(?:.*rhel(\\d+)|Red Hat)\\;version:\\1", "X-Powered-By": "Red Hat" }
+		},
+		"Reddit": {
+			"website": "code.reddit.com",
+			"cats": [ 2 ],
+			"html": "(?:<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)",
+			"url": "^(?:www\\.)?reddit\\.com",
+			"env": "^reddit$",
+			"implies": "Python"
+		},
+		"Redmine": {
+			"website": "www.redmine.org",
+			"cats": [ 13 ],
+			"meta": { "description": "Redmine" },
+			"html": "Powered by <a href=\"[^>]+Redmine",
+			"implies": "Ruby on Rails"
+		},
+		"Reinvigorate": {
+			"website": "www.reinvigorate.net",
+			"cats": [ 10 ],
+			"env": "^reinvigorate$"
+		},
+		"RequireJS": {
+			"website": "requirejs.org",
+			"cats": [ 12 ],
+			"script": "require.*\\.js",
+			"env": "^requirejs$"
+		},
+		"Reveal.js": {
+			"website": "lab.hakim.se/reveal-js",
+			"cats": [ 12 ],
+			"script": "reveal(?:\\.min)?\\.js",
+			"env": "^Reveal$"
+		},
+		"RiteCMS": {
+			"website": "ritecms.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "^RiteCMS(?: (.+))?\\;version:\\1" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
+		},
+		"RoundCube": {
+			"website": "roundcube.net",
+			"cats": [ 30 ],
+			"html": "<title>RoundCube",
+			"env": "^(?:rcmail|rcube_|roundcube)",
+			"implies": "PHP"
+		},
+		"Ruby": {
+			"website": "ruby-lang.org",
+			"cats": [ 27 ],
+			"headers": { "Server": "(?:Mongrel|WEBrick|Ruby)" }
+		},
+		"Ruby on Rails": {
+			"website": "rubyonrails.org",
+			"cats": [ 18 ],
+			"script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
+			"meta": { "csrf-param": "authenticity_token\\;confidence:50" },
+			"headers": { "Server": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50", "X-Powered-By": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50" },
+			"implies": "Ruby"
+		},
+		"S.Builder": {
+			"website": "www.sbuilder.ru",
+			"cats": [ 1 ],
+			"meta": { "generator": "S\\.Builder" }
+		},
+		"Serendipity": {
+			"website": "s9y.org",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity v\\.(.+)\\;version:\\1" },
+			"implies": "PHP"
+		},
+		"SAP": {
+			"website": "sap.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "SAP NetWeaver Application Server" }
+		},
+		"Sarka-SPIP": {
+			"website": "sarka-spip.net",
+			"cats": [ 1 ],
+			"meta": { "generator": "^SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
+			"headers": { "X-Spip-Cache": ".*" },
+			"implies": "SPIP"
+		},
+		"Scala": {
+			"website": "www.scala-lang.org",
+			"cats": [ 27 ]
+		},
+		"script.aculo.us": {
+			"website": "script.aculo.us",
+			"cats": [ 12 ],
+			"script": "(?:scriptaculous|protoaculous)\\.js",
+			"env": "^Scriptaculous$"
+		},
+		"SDL Tridion": {
+			"website": "www.sdl.com/products/tridion",
+			"cats": [ 1 ],
+			"html": "mfinfo\\.application='Tridion"
+		},
+		"Sencha Touch": {
+			"website": "sencha.com/products/touch",
+			"cats": [ 12, 26 ],
+			"script": "sencha-touch.*\\.js"
+		},
+		"Sentinel Protection Server": {
+			"website": "www.safenet-inc.com/software-monetization/sentinel-rms/",
+			"cats": [ 22 ],
+			"headers": { "Server": "SentinelProtectionServer\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Sentinel Keys Server": {
+			"website": "www.safenet-inc.com/software-monetization/sentinel-rms",
+			"cats": [ 22 ],
+			"headers": { "Server": "SentinelKeysServer\\/?([\\d\\.]+)?\\;version:\\1" }
+		},
+		"Sentinel License Monitor": {
+			"website": "www.safenet-inc.com/software-monetization/sentinel-rms/",
+			"cats": [ 19 ],
+			"html": "<title>Sentinel (Keys )?License Monitor</title>"
+		},
+		"Seoshop": {
+			"website": "getseoshop.com",
+			"cats": [ 6 ],
+			"html": "http://www\\.getseoshop\\.com"
+		},
+		"ShareThis": {
+			"website": "sharethis.com",
+			"cats": [ 5 ],
+			"script": "w\\.sharethis\\.com/",
+			"env": "^SHARETHIS$"
+		},
+		"Shopalize": {
+			"website": "shopalize.com",
+			"cats": [ 5, 10 ],
+			"env": "^Shopalize$"
+		},
+		"Shopatron": {
+			"website": "ecommerce.shopatron.com",
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
+		"Shopify": {
+			"website": "shopify.com",
+			"cats": [ 6 ],
+			"html": "<link[^>]+=cdn\\.shopify\\.com",
+			"env": "^Shopify$"
+		},
+		"Shopware": {
+			"website": "shopware.de",
+			"cats": [ 6 ],
+			"meta": { "application-name": "Shopware" },
+			"script": "shopware\\.js",
+			"implies": "PHP"
+		},
+		"sIFR": {
+			"website": "www.mikeindustries.com/blog/sifr",
+			"cats": [ 17 ],
+			"script": "sifr\\.js"
+		},
+		"Silva": {
+			"website": "silvacms.org",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "SilvaCMS" }
+		},
+		"SilverStripe": {
+			"website": "www.silverstripe.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "SilverStripe" },
+			"html": "Powered by <a href=\"[^>]+SilverStripe"
+		},
+		"Site Meter": {
+			"website": "www.sitemeter.com",
+			"cats": [ 10 ],
+			"script": "sitemeter\\.com/js/counter\\.js\\?site="
+		},
+		"SiteCatalyst": {
+			"website": "www.omniture.com\/en\/products\/online_analytics\/sitecatalyst",
+			"cats": [ 10 ],
+			"script": "\/s_code.js",
+			"html": "var s_code=s\\.t\\(\\);if\\(s_code\\)document\\.write\\(s_code\\)",
+			"env": "^s_account$"
+		},
+		"SiteEdit": {
+			"website": "www.siteedit.ru",
+			"cats": [ 1 ],
+			"meta": { "generator": "SiteEdit" }
+		},
+		"Smartstore": {
+			"website": "smartstore.com",
+			"cats": [ 6 ],
+			"script": "smjslib\\.js"
+		},
+		"SMF": {
+			"website": "www.simplemachines.org",
+			"cats": [ 2 ],
+			"env": "^smf_",
+			"implies": "PHP"
+		},
+		"sNews": {
+			"website": "snewscms.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "sNews" }
+		},
+		"Snap.svg": {
+			"website": "snapsvg.io",
+			"cats": [ 12 ],
+			"script": "snap\\.svg(-min)?\\.js",
+			"env": "^Snap$"
+		},
+		"Snoobi": {
+			"website": "www.snoobi.com",
+			"cats": [ 10 ],
+			"script": "snoobi\\.com/snoop\\.php",
+			"env": "^snoobi$"
+		},
+		"SOBI 2": {
+			"website": "www.sigsiu.net/sobi2.html",
+			"cats": [ 19 ],
+			"html": "(?:<!-- start of Sigsiu Online Business Index|<div[^>]* class=\"sobi2)",
+			"implies": "Joomla"
+		},
+		"SobiPro": {
+			"website": "sigsiu.net/sobipro.html",
+			"cats": [ 19 ],
+			"env": "^SobiProUrl$",
+			"html": " <(?:script|link)[^>].*com_sobipro.*>",
+			"implies": "Joomla"
+		},
+		"SoundManager": {
+			"website": "www.schillmania.com/projects/soundmanager2",
+			"cats": [ 12 ],
+			"env": "^(?:SoundManager|BaconPlayer)$"
+		},
+		"SPDY": {
+			"website": "chromium.org/spdy",
+			"cats": [ 19 ],
+			"headers": { "X-Firefox-Spdy": ".*" }
+		},
+		"Sphinx": {
+			"website": "sphinx.pocoo.org",
+			"cats": [ 4 ],
+			"env": "^DOCUMENTATION_OPTIONS$",
+			"implies": "Python"
+		},
+		"SPIP": {
+			"website": "www.spip.net",
+			"cats": [ 1 ],
+			"meta": { "generator": "(^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
+			"headers": { "X-Spip-Cache": ".*" }
+		},
+		"Spree": {
+			"website": "spreecommerce.com",
+			"cats": [ 6 ],
+			"html": "(<link[^>]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|<script>\\s*Spree\\.(routes|translations|api_key))",
+			"implies": "Ruby on Rails"
+		},
+		"SQL Buddy": {
+			"website": "www.sqlbuddy.com",
+			"cats": [ 3 ],
+			"html": "(?:<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
+		},
+		"SQLite": {
+			"website": "www.sqlite.org",
+			"cats": [ 34 ]
+		},
+		"Squarespace": {
+			"website": "www.squarespace.com",
+			"cats": [ 1 ],
+			"headers": { "X-ServedBy": "squarespace" },
+			"env": "^Squarespace"
+		},
+		"Squiz Matrix": {
+			"website": "squiz.net",
+			"cats": [ 1 ],
+			"meta": { "generator": "Squiz Matrix" },
+			"html": "  Running (?:MySource|Squiz) Matrix",
+			"headers": { "X-Powered-By": "Squiz Matrix" },
+			"implies": "PHP"
+		},
+		"StatCounter": {
+			"website": "www.statcounter.com",
+			"cats": [ 10 ],
+			"script": "statcounter\\.com/counter/counter"
+		},
+		"Store Systems": {
+			"website": "store-systems.de",
+			"cats": [ 6 ],
+			"html": "Shopsystem von <a href=[^>]+store-systems\\.de\"|\\.mws_boxTop"
+		},
+		"SublimeVideo": {
+			"website": "sublimevideo.net",
+			"cats": [ 14 ],
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
+			"env": "^sublimevideo$"
+		},
+		"Subrion": {
+			"website": "subrion.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "^Subrion " },
+			"headers": { "X-Powered-CMS": "Subrion CMS" },
+			"implies": "PHP"
+		},
+		"SunOS": {
+			"website": "oracle.com/solaris",
+			"cats": [ 28 ],
+			"headers": { "Server": "SunOS( [\\d\\.]+)?\\;version:\\1", "Servlet-engine": "SunOS( [\\d\\.]+)?\\;version:\\1" }
+		},
+		"Supersized": {
+			"website": "buildinternet.com/project/supersized",
+			"cats": [ 7, 25 ],
+			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1"
+		},
+		"SUSE": {
+			"website": "suse.com",
+			"cats": [ 28 ],
+			"headers": { "Server": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1", "X-Powered-By": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1" }
+		},
+		"Scientific Linux": {
+			"website": "scientificlinux.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "Scientific Linux", "X-Powered-By": "Scientific Linux" }
+		},
+		"Splunk": {
+			"website": "splunk.com",
+			"cats": [ 19 ],
+			"meta": { "author": "Splunk Inc\\;confidence:50" },
+			"html": "<p class=\"footer\">&copy; [-0-9]+ Splunk Inc.( Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\2"
+		},
+		"Splunkd": {
+			"website": "splunk.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Splunkd" }
+		},
+		"SWFObject": {
+			"website": "blog.deconcept.com/swfobject",
+			"cats": [ 19 ],
+			"script": "swfobject.*\\.js",
+			"env": "^SWFObject$"
+		},
+		"swift.engine": {
+			"website": "mittec.ru/default",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "swift\\.engine" }
+		},
+		"Swiftlet": {
+			"website": "swiftlet.org",
+			"cats": [ 18 ],
+			"meta": { "generator": "Swiftlet" },
+			"html": "Powered by <a href=\"[^>]+Swiftlet",
+			"headers": { "X-Swiftlet-Cache": ".*", "X-Powered-By": "Swiftlet", "X-Generator": "Swiftlet" },
+			"implies": "PHP"
+		},
+		"Textpattern CMS": {
+			"website": "textpattern.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "Textpattern" }
+		},
+		"three.js": {
+			"website": "mrdoob.github.com/three.js",
+			"cats": [ 25 ],
+			"script": "three\\.js",
+			"env": "^THREE$"
+		},
+		"Tiki Wiki CMS Groupware": {
+			"website": "tiki.org",
+			"cats": [ 1, 2, 8, 11, 13 ],
+			"script": "(?:/|_)tiki",
+			"meta": { "generator": "^Tiki" }
+		},
+		"Timeplot": {
+			"website": "www.simile-widgets.org/timeplot/",
+			"cats": [ 25 ],
+			"script": "timeplot.*\\.js",
+			"env": "^Timeplot$"
+		},
+		"TinyMCE": {
+			"website": "tinymce.com",
+			"cats": [ 24 ],
+			"env": "^tinyMCE$"
+		},
+		"Tealeaf": {
+			"website": "www.tealeaf.com",
+			"cats": [ 10 ],
+			"env": "^TeaLeaf$"
+		},
+		"TomatoCart": {
+			"website": "tomatocart.com",
+			"cats": [ 6 ],
+			"meta": { "generator": "TomatoCart" },
+			"env": "^AjaxShoppingCart$"
+		},
+		"Trac": {
+			"website": "trac.edgewall.org",
+			"cats": [ 13 ],
+			"html": "<a id=\"tracpowered",
+			"implies": "Python"
+		},
+		"Tumblr": {
+			"website": "www.tumblr.com",
+			"cats": [ 11 ],
+			"html": "<iframe src=\"[^>]+tumblr\\.com",
+			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
+			"headers": { "X-Tumblr-Usec": ".*" }
+		},
+		"TWiki": {
+			"website": "twiki.org",
+			"cats": [ 8 ],
+			"headers": { "Set-cookie": "TWIKISID" },
+			"script": "(TWikiJavascripts|twikilib(\\.js|\\.min\\.js))",
+			"html": "This site is powered by the TWiki collaboration platform"
+		},
+		"Twilight CMS": {
+			"website": "www.twilightcms.com",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-CMS": "Twilight CMS" }
+		},
+		"Twitter Bootstrap": {
+			"website": "twitter.github.com/bootstrap",
+			"cats": [ 18 ],
+			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.js|\\.min\\.js))",
+			"html": "<link.+?href=\"[^\"]+bootstrap(\\.min)?\\.css",
+			"env": "^Twipsy$\\;confidence:50"
+		},
+		"Typekit": {
+			"website": "typekit.com",
+			"cats": [ 17 ],
+			"script": "use\\.typekit\\.com",
+			"env": "^Typekit$"
+		},
+		"TypePad": {
+			"website": "www.typepad.com",
+			"cats": [ 11 ],
+			"meta": { "generator": "typepad" },
+			"url": "typepad\\.com"
+		},
+		"TYPO3": {
+			"website": "typo3.com",
+			"cats": [ 1 ],
+			"headers": { "Set-Cookie": "fe_typo_user" },
+			"meta": { "generator": "TYPO3" },
+			"html": "(?:<(?:script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)",
+			"url": "/typo3/",
+			"implies": "PHP"
+		},
+		"Ubercart": {
+			"website": "www.ubercart.org",
+			"cats": [ 6 ],
+			"script": "uc_cart/uc_cart_block\\.js",
+			"implies": "Drupal"
+		},
+		"Ubuntu": {
+			"website": "ubuntu.com/business/server/overview",
+			"cats": [ 28 ],
+			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu" }
+		},
+		"uCore": {
+			"website": "ucore.io",
+			"cats": [ 1, 18 ],
+			"headers": { "Set-Cookie": "ucore" },
+			"meta": { "generator": "uCore PHP Framework" },
+			"implies": "PHP"
+		},
+		"UIKit": {
+			"website": "getuikit.com",
+			"cats": [ 18 ],
+			"script": "uikit.*\\.js"
+		},
+		"Umbraco": {
+			"website": "umbraco.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "umbraco" },
+			"headers": { "X-Umbraco-Version": ".+" },
+			"html": "powered by <a href=[^>]+umbraco",
+			"implies": "Microsoft ASP.NET"
+		},
+		"Underscore.js": {
+			"website": "documentcloud.github.com/underscore",
+			"cats": [ 12 ],
+			"script": "underscore.*\\.js"
+		},
+		"UNIX": {
+			"website": "unix.org",
+			"cats": [ 28 ],
+			"headers": { "Server": "Unix" }
+		},
+		"UserRules": {
+			"website": "www.userrules.com",
+			"cats": [ 13 ],
+			"env": "^_usrp$"
+		},
+		"UserVoice": {
+			"website": "uservoice.com",
+			"cats": [ 13 ],
+			"env": "^UserVoice$"
+		},
+		"Vanilla": {
+			"website": "vanillaforums.org",
+			"cats": [ 2 ],
+			"html": "<body id=\"(?:DiscussionsPage|vanilla)",
+			"headers": { "X-Powered-By": "Vanilla" },
+			"implies": "PHP"
+		},
+		"Varnish": {
+			"website": "www.varnish-cache.org",
+			"cats": [ 23 ],
+			"headers": { "X-Varnish": ".+", "X-Varnish-Age": ".+", "X-Varnish-Cache": ".+", "X-Varnish-Action": ".+", "X-Varnish-Hostname": ".+", "Via": "Varnish" }
+		},
+		"vBulletin": {
+			"website": "www.vbulletin.com",
+			"cats": [ 2 ],
+			"meta": { "generator": "vBulletin" },
+			"env": "^(?:vBulletin|vB_[^g])",
+			"implies": "PHP"
+		},
+		"VideoJS": {
+			"website": "videojs.com",
+			"cats": [ 14 ],
+			"env": "^VideoJS$",
+			"html": "<div[^>]+class=\"video-js+\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
+		"viennaCMS": {
+			"website": "www.viennacms.nl",
+			"cats": [ 1 ],
+			"html": "powered by <a href=\"[^>]+viennacms"
+		},
+		"Vignette": {
+			"website": "www.vignette.com",
+			"cats": [ 1 ],
+			"html": "<[^>]+=\"vgn-?ext"
+		},
+		"Vimeo": {
+			"website": "vimeo.com",
+			"cats": [ 14 ],
+			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
+		},
+		"VirtueMart": {
+			"website": "virtuemart.net",
+			"cats": [ 6 ],
+			"html": "<div id=\"vmMainPage"
+		},
+		"VisualPath": {
+			"website": "www.trackset.com/web-analytics-software/visualpath",
+			"cats": [ 10 ],
+			"script": "visualpath[^/]*\\.trackset\\.it/[^/]+/track/include\\.js"
+		},
+		"VIVVO": {
+			"website": "vivvo.net",
+			"cats": [ 1 ],
+			"headers": { "Set-Cookie": "VivvoSessionId" },
+			"env": "^vivvo"
+		},
+		"Volusion": {
+			"website": "volusion.com",
+			"cats": [ 6 ],
+			"html": "/v/vspfiles(?:/.)*/css/.+\\.css"
+		},
+		"Vox": {
+			"website": "www.vox.com",
+			"cats": [ 11 ],
+			"url": "\\.vox\\.com"
+		},
+		"VP-ASP": {
+			"website": "www.vpasp.com",
+			"cats": [ 6 ],
+			"script": "vs350\\.js",
+			"html": "<a[^>]+>Powered By VP-ASP Shopping Cart</a>",
+			"implies": "Microsoft ASP.NET"
+		},
+		"W3Counter": {
+			"website": "www.w3counter.com",
+			"cats": [ 10 ],
+			"script": "w3counter\\.com/tracker\\.js"
+		},
+		"W3 Total Cache": {
+			"website": "www.w3-edge.com/wordpress-plugins/w3-total-cache",
+			"cats": [ 23 ],
+			"html": "<!--[^>]+W3 Total Cache",
+			"headers": { "X-Powered-By": "W3 Total Cache(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "WordPress"
+		},
+		"Web2py": {
+			"website": "http://web2py.com",
+			"cats": [ 18 ],
+			"script": "web2py\\.js",
+			"headers": { "X-Powered-By": "web2py" },
+			"implies": [ "Python" , "jQuery" ]
+		},
+		"Webix": {
+			"website": "webix.com",
+			"cats": [ 12 ],
+			"script": [ "\bwebix.js" ],
+			"env": "^webix$"
+		},
+		"Web Optimizer": {
+			"website": "www.web-optimizer.us",
+			"cats": [ 10 ],
+			"html": "<title [^>]*lang=\"wo\">"
+		},
+		"webEdition": {
+			"website": "webedition.de/en",
+			"cats": [ 1 ],
+			"meta": { "generator": "webEdition", "DC.title": "webEdition" }
+		},
+		"WebGUI": {
+			"website": "www.webgui.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "WebGUI" }
+		},
+		"WebPublisher": {
+			"website": "scannet.dk",
+			"cats": [ 1 ],
+			"meta": { "generator": "WEB\\|Publisher" }
+		},
+		"Websale": {
+			"website": "websale.de",
+			"cats": [ 6 ],
+			"url": "/websale7/"
+		},
+		"WebsiteBaker": {
+			"website": "websitebaker2.org/en/home.php",
+			"cats": [ 1 ],
+			"meta": { "generator": "WebsiteBaker" },
+			"implies": [ "PHP", "MySQL" ]
+		},
+		"WebsPlanet": {
+			"website": "websplanet.com",
+			"cats": [ 1 ],
+			"meta": { "generator": "WebsPlanet" }
+		},
+		"Webtrekk": {
+			"website": "www.webtrekk.com",
+			"cats": [ 10 ],
+			"env": "^webtrekk"
+		},
+		"Webtrends": {
+			"website": "worldwide.webtrends.com",
+			"cats": [ 10 ],
+			"html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
+			"env": "^(?:WTOptimize|WebTrends)"
+		},
+		"Weebly": {
+			"website": "www.weebly.com",
+			"cats": [ 1 ],
+			"html": "<[^>]+class=\"weebly"
+		},
+		"WikkaWiki": {
+			"website": "wikkawiki.org",
+			"cats": [ 8 ],
+			"meta": { "generator": "WikkaWiki" },
+			"html": "Powered by <a href=\"[^>]+WikkaWiki"
+		},
+		"Windows Server": {
+			"website": "microsoft.com/windowsserver",
+			"cats": [ 28 ],
+			"headers": { "Server": "Win32|Win64" }
+		},
+		"Wink": {
+			"website": "winktoolkit.org",
+			"cats": [ 26, 12 ],
+			"script": "(?:_base/js/base|wink).*\\.js",
+			"env": "^wink$"
+		},
+		"Wix": {
+			"website": "wix.com",
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(?:Events|Data|Errors)"
+		},
+		"Wolf CMS": {
+			"website": "www.wolfcms.org",
+			"cats": [ 1 ],
+			"html": "(?:<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
+		},
+		"WooCommerce": {
+			"website": "www.woothemes.com/woocommerce",
+			"cats": [ 6 ],
+			"env": "woocommerce",
+			"html": "<!-- WooCommerce",
+			"script": "woocommerce",
+			"meta": { "generator": "WooCommerce ([\\d.]+);version:\\1" },
+			"implies": [ "WordPress", "PHP" ]
+		},
+		"Woopra": {
+			"website": "www.woopra.com",
+			"cats": [ 10 ],
+			"script": "static\\.woopra\\.com"
+		},
+		"WordPress": {
+			"website": "wordpress.org",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
+			"html": "<link rel=[\"']stylesheet[\"'] [^>]+wp-(?:content|includes)",
+			"env": "^wp_username$",
+			"implies": "PHP"
+		},
+		"WordPress Super Cache": {
+			"website": "ocaoimh.ie/wp-super-cache/",
+			"cats": [ 23 ],
+			"html": "<!--[^>]+WP-Super-Cache",
+			"implies": "WordPress"
+		},
+		"Wowza Media Server": {
+			"website": "www.wowza.com",
+			"cats": [ 38 ],
+			"html": "<title>Wowza Media Server \\d+ ((\\w+ Edition )?\\d+\\.[\\d\\.]+( build\\d+)?)?\\;version:\\1"
+		},
+		"Xajax": {
+			"website": "xajax-project.org",
+			"cats": [ 12 ],
+			"script": "xajax_core.*\\.js"
+		},
+		"Xanario": {
+			"website": "xanario.de",
+			"cats": [ 6 ],
+			"meta": { "generator": "xanario shopsoftware" }
+		},
+		"XenForo": {
+			"website": "xenforo.com",
+			"cats": [ 2 ],
+			"html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding)"
+		},
+		"AT Internet Analyzer": {
+			"website": "atinternet.com/en",
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
+			"website": "atinternet.com/en",
+			"cats": [ 10 ],
+			"script": "xiti\\.com/hit\\.xiti",
+			"env": "^Xt_"
+		},
+		"XAMPP": {
+			"website": "www.apachefriends.org/en/xampp.html",
+			"cats": [ 22 ],
+			"meta": { "author": "Kai Oswald Seidler\\;confidence:10" },
+			"html": "<title>XAMPP( Version ([\\d\\.]+))?</title>\\;version:\\1\\;confidence:90",
+			"implies": [ "Apache", "MySQL", "PHP", "Perl" ]
+		},
+		"XMB": {
+			"website": "www.xmbforum.com",
+			"cats": [ 2 ],
+			"html": "<!-- Powered by XMB"
+		},
+		"XOOPS": {
+			"website": "xoops.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "XOOPS" },
+			"env": "^xoops",
+			"implies": "PHP"
+		},
+		"xtCommerce": {
+			"website": "www.xt-commerce.com",
+			"cats": [ 6 ],
+			"meta": { "generator": "xt:Commerce" },
+			"html": "<div class=\"copyright\">.+<a[^>]+>xt:Commerce"
+		},
+		"xui": {
+			"website": "xuijs.com",
+			"cats": [ 26, 12 ],
+			"script": "[^a-z]xui.*\\.js",
+			"env": "^xui$"
+		},
+		"YaBB": {
+			"website": "www.yabbforum.com",
+			"cats": [ 2 ],
+			"html": "Powered by <a href=\"[^>]+yabbforum"
+		},
+		"Yahoo! Ecommerce": {
+			"website": "smallbusiness.yahoo.com/ecommerce",
+			"cats": [ 6 ],
+			"html": "<link[^>]+store\\.yahoo\\.net",
+			"headers": { "X-XRDS-Location": "/ystore/" },
+			"env": "^YStore$"
+		},
+		"Yahoo! Web Analytics": {
+			"website": "web.analytics.yahoo.com",
+			"cats": [ 10 ],
+			"script": "d\\.yimg\\.com/mi/ywa\\.js",
+			"env": "^YWA$"
+		},
+		"Yandex.Metrika": {
+			"website": "metrika.yandex.com",
+			"cats": [ 10 ],
+			"html": "mc\\.yandex\\.ru\/metrika\/watch\\.js|\\b(?:yaParams|yaCounter|yandex_metrika_callbacks)\\b",
+			"script": "mc\\.yandex\\.ru\/metrika\/watch\\.js"
+		},
+		"YouTube": {
+			"website": "www.youtube.com",
+			"cats": [ 14 ],
+			"html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)"
+		},
+		"YUI Doc": {
+			"website": "developer.yahoo.com/yui/yuidoc",
+			"cats": [ 4 ],
+			"html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)"
+		},
+		"YUI": {
+			"website": "yuilibrary.com",
+			"cats": [ 12 ],
+			"script": "(?:/yui/|yui\\.yahooapis\\.com)",
+			"env": "^YAHOO$"
+		},
+		"Zabbix": {
+			"website": "zabbix.com",
+			"cats": [ 19 ],
+			"html": "zbxCallPostScripts\\(\\);",
+			"meta": { "Author": "ZABBIX SIA\\;confidence:70" },
+			"url": "\\/zabbix\\/\\;confidence:30"
+		},
+		"Zen Cart": {
+			"website": "www.zen-cart.com",
+			"cats": [ 6 ],
+			"meta": { "generator": "Zen Cart" }
+		},
+		"Zend": {
+			"website": "zend.com",
+			"cats": [ 22 ],
+			"headers": { "X-Powered-By": "Zend" }
+		},
+		"Zepto": {
+			"website": "zeptojs.com",
+			"cats": [ 12 ],
+			"script": "zepto.*\\.js",
+			"env": "^Zepto$"
+		},
+		"Zinnia": {
+			"website": "django-blog-zinnia.com",
+			"cats": [ 11 ],
+			"meta": { "generator": "Zinnia" },
+			"implies": "Django"
+		},
+		"ZK": {
+			"website": "zkoss.org",
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": "Java"
+		},
+		"Zope": {
+			"website": "zope.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "^Zope/" }
+		},
+		"ZURB Foundation": {
+			"website": "foundation.zurb.com",
+			"cats": [ 18 ],
+			"html": "<link[^>]+foundation[^>\"]+css"
+		}
+	}
+};
+
+wappalyzer.apps = json.apps;
+wappalyzer.categories = json.categories;
diff --git a/drivers/bookmarklet/js/driver.js b/drivers/bookmarklet/js/driver.js
index 19b3f8121..1525822b5 100644
--- a/drivers/bookmarklet/js/driver.js
+++ b/drivers/bookmarklet/js/driver.js
@@ -113,6 +113,7 @@
 			w.log('func: diplayApps');
 
 			var
+				first = true,
 				category,
 				html
 				;
@@ -124,10 +125,10 @@
 				'<div id="wappalyzer-apps">'
 				;
 
-			if ( w.detected[url] != null && w.detected[url].length ) {
-				w.detected[url].forEach(function(app, i) {
+			if ( w.detected[url] != null && Object.keys(w.detected[url]).length ) {
+				for ( app in w.detected[url] ) {
 					html +=
-						'<div class="wappalyzer-app' + ( !i ? ' wappalyzer-first' : '' ) + '">' +
+						'<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 + 'bookmarklet/images/icons/' + app + '.png" width="16" height="16"/> ' + app +
@@ -135,14 +136,16 @@
 							'</a>'
 							;
 
-					for ( cat in w.apps[app].cats ) {
-						category = w.apps[app].cats[cat];
+					for ( i in w.apps[app].cats ) {
+						category = w.apps[app].cats[i];
 
 						html += '<a target="_blank" class="wappalyzer-category" href="' + w.config.websiteURL + 'categories/' + w.categories[category] + '">' + categoryNames[category] + '</a>';
 					}
 
 					html += '</div>';
-				});
+
+					first = false;
+				}
 			} else {
 				html += '<div id="wappalyzer-empty">No applications detected</div>';
 			}
diff --git a/drivers/chrome/_locales/es/messages.json b/drivers/chrome/_locales/es/messages.json
new file mode 100644
index 000000000..6181cce50
--- /dev/null
+++ b/drivers/chrome/_locales/es/messages.json
@@ -0,0 +1,51 @@
+{
+	"github":                   { "message": "¡Forkea Wappalyzer en GitHub!" },
+	"twitter":                  { "message": "Sigue Wappalyzer en Twitter" },
+	"website":                  { "message": "Ir a wappalyzer.com" },
+	"options":                  { "message": "Opciones de Wappalyzer" },
+	"optionsSave":              { "message": "Guardar opciones" },
+	"optionsSaved":             { "message": "Guardado" },
+	"optionAutoAnalyzeHeaders": { "message": "Analizar cabeceras automáticamente al hacer clic" },
+	"optionUpgradeMessage":     { "message": "Indicarme actualizaciones" },
+	"optionTracking":           { "message": "Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis" },
+	"analyzeHeaders":           { "message": "Analizar cabeceras" },
+	"analyzeHeadersDone":       { "message": "Completado" },
+	"nothingToDo":              { "message": "Nada que hacer aquí." },
+	"noAppsDetected":           { "message": "Aplicaciones no detectadas." },
+	"categoryName1":            { "message": "Gestor de Contenido" },
+	"categoryName2":            { "message": "Foro" },
+	"categoryName3":            { "message": "Gestor de Bases de Datos" },
+	"categoryName4":            { "message": "Herramienta de Documentación" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "Tienda Web" },
+	"categoryName7":            { "message": "Galería fotográfica" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Panel de Hosting" },
+	"categoryName10":           { "message": "Analítica" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework Javascript" },
+	"categoryName13":           { "message": "Gestor de Incidencias" },
+	"categoryName14":           { "message": "Reproductor de Vídeo" },
+	"categoryName15":           { "message": "Sistema de Comentarios" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Tipografía" },
+	"categoryName18":           { "message": "Framework Web" },
+	"categoryName19":           { "message": "Miscelánea" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Servidor Web" },
+	"categoryName23":           { "message": "Herramienta de Cache" },
+	"categoryName24":           { "message": "Editor de Texto Enriquecido" },
+	"categoryName25":           { "message": "Gráficos Javascript" },
+	"categoryName26":           { "message": "Framework Móvil" },
+	"categoryName27":           { "message": "Lenguaje de programación" },
+	"categoryName28":           { "message": "Sistema Operativo" },
+	"categoryName29":           { "message": "Motor de Búsqueda" },
+	"categoryName30":           { "message": "Correo Web" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Automatización de Marketing" },
+	"categoryName33":           { "message": "Extensión de Servidor Web" },
+	"categoryName34":           { "message": "Base de Datos" },
+	"categoryName35":           { "message": "Mapa" },
+	"categoryName36":           { "message": "Red de Publicidad" }
+}
diff --git a/drivers/chrome/images/github.png b/drivers/chrome/images/github.png
index eb24ee314..037d0c336 100644
Binary files a/drivers/chrome/images/github.png and b/drivers/chrome/images/github.png differ
diff --git a/drivers/chrome/images/header.png b/drivers/chrome/images/header.png
index 57fbe88c9..6dcce3087 100644
Binary files a/drivers/chrome/images/header.png and b/drivers/chrome/images/header.png differ
diff --git a/drivers/chrome/images/icon_128.png b/drivers/chrome/images/icon_128.png
index 4ddebb142..0e1e1fb0c 100644
Binary files a/drivers/chrome/images/icon_128.png and b/drivers/chrome/images/icon_128.png differ
diff --git a/drivers/chrome/images/icon_32.png b/drivers/chrome/images/icon_32.png
index 73694aa3d..5381e555a 100644
Binary files a/drivers/chrome/images/icon_32.png and b/drivers/chrome/images/icon_32.png differ
diff --git a/drivers/chrome/images/icon_hot.png b/drivers/chrome/images/icon_hot.png
index 7f74461f2..06464af29 100644
Binary files a/drivers/chrome/images/icon_hot.png and b/drivers/chrome/images/icon_hot.png differ
diff --git a/drivers/chrome/images/options.png b/drivers/chrome/images/options.png
index db259c9bb..344b7fb8a 100644
Binary files a/drivers/chrome/images/options.png and b/drivers/chrome/images/options.png differ
diff --git a/drivers/chrome/images/twitter.png b/drivers/chrome/images/twitter.png
index 76742a44f..e20284ddf 100644
Binary files a/drivers/chrome/images/twitter.png and b/drivers/chrome/images/twitter.png differ
diff --git a/drivers/chrome/js/content.js b/drivers/chrome/js/content.js
index e160070dd..7a3bf3e79 100644
--- a/drivers/chrome/js/content.js
+++ b/drivers/chrome/js/content.js
@@ -60,4 +60,4 @@
 	}
 
 	c.init();
-})();
+}());
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index de0b651d2..1c7565d68 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -116,11 +116,14 @@
 			});
 
 			if ( firstRun ) {
-				driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
-					firstRun = false;
-				}
+				w.driver.goToURL({ url: w.config.websiteURL + 'installed', medium: 'install' });
+
+				firstRun = false;
+			}
+
 			if ( upgraded ) {
-				driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+				w.driver.goToURL({ url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+
 				upgraded = false;
 			}
 		},
@@ -181,7 +184,7 @@
 				xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 
 				xhr.onreadystatechange = function(e) {
-					if ( request.readyState == 4 ) { w.log('w.driver.ping: status ' + request.status); }
+					if ( xhr.readyState == 4 ) { w.log('w.driver.ping: status ' + xhr.status); }
 				};
 
 				xhr.send('json=' + encodeURIComponent(JSON.stringify(w.ping)));
diff --git a/drivers/chrome/js/popup.js b/drivers/chrome/js/popup.js
index d21be18fb..e9c7b926e 100644
--- a/drivers/chrome/js/popup.js
+++ b/drivers/chrome/js/popup.js
@@ -63,14 +63,14 @@ document.addEventListener('DOMContentLoaded', function() {
 
 							html =
 								'<div class="detected-app">' +
-									'<a target="_blank" href="http://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
+									'<a target="_blank" href="https://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
 										'<img src="images/icons/' + appName + '.png"/>' +
 										'<span class="label">' + appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
 									'</a>';
 
 							response.apps[appName].cats.forEach(function(cat) {
 								html +=
-									'<a target="_blank" href="http://wappalyzer.com/categories/' + response.categories[cat] + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
+									'<a target="_blank" href="https://wappalyzer.com/categories/' + response.categories[cat] + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
 										'<span class="category">' + chrome.i18n.getMessage('categoryName' + cat) + '</span>' +
 									'</a>';
 							});
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 1bc8d5c27..b6957a52a 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
-	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
+	"homepage_url": "https://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.26",
+	"version": "2.29",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox-jetpack/images/icon128.png b/drivers/firefox-jetpack/images/icon128.png
deleted file mode 100644
index a72b1c8af..000000000
Binary files a/drivers/firefox-jetpack/images/icon128.png and /dev/null differ
diff --git a/drivers/firefox-jetpack/images/icon16.png b/drivers/firefox-jetpack/images/icon16.png
deleted file mode 100644
index 7b4552a78..000000000
Binary files a/drivers/firefox-jetpack/images/icon16.png and /dev/null differ
diff --git a/drivers/firefox-jetpack/images/icon16_hot.png b/drivers/firefox-jetpack/images/icon16_hot.png
deleted file mode 100644
index 7f74461f2..000000000
Binary files a/drivers/firefox-jetpack/images/icon16_hot.png and /dev/null differ
diff --git a/drivers/firefox-jetpack/images/icon48.png b/drivers/firefox-jetpack/images/icon48.png
deleted file mode 100644
index 8daa0a937..000000000
Binary files a/drivers/firefox-jetpack/images/icon48.png and /dev/null differ
diff --git a/drivers/firefox-jetpack/images/icon64.png b/drivers/firefox-jetpack/images/icon64.png
deleted file mode 100644
index 58d6a0edc..000000000
Binary files a/drivers/firefox-jetpack/images/icon64.png and /dev/null differ
diff --git a/drivers/firefox-jetpack/lib/driver.js b/drivers/firefox-jetpack/lib/driver.js
deleted file mode 100644
index 02acb325a..000000000
--- a/drivers/firefox-jetpack/lib/driver.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Jetpack driver
- */
-
-(function() {
-	'use strict';
-
-	var
-		{ Cc, Ci } = require('chrome'),
-		tabs       = require('tabs'),
-		self       = require('self'),
-		main       = require('wappalyzer'),
-		w          = main.wappalyzer
-		;
-
-	w.driver = {
-		/**
-		 * Log messages to console
-		 */
-		log: function(args) {
-			console.log(args.message);
-		},
-
-		/**
-		 * Initialize
-		 */
-		init: function(callback) {
-		}
-	}
-
-	w.init();
-})();
diff --git a/drivers/firefox-jetpack/package.json b/drivers/firefox-jetpack/package.json
deleted file mode 100644
index 1494c1a67..000000000
--- a/drivers/firefox-jetpack/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"id":          "wappalyzer@crunchlabz.com",
-  "name":        "wappalyzer",
-  "fullName":    "Wappalyzer",
-  "description": "Identifies software on the web",
-	"icon":        "images/icon48.png",
-	"icon64":      "images/icon64.png",
-  "homepage":    "http://wappalyzer.com",
-  "author":      "Elbert Alias",
-  "license":     "GPLv3",
-  "version":     "3.0.0",
-	"main":        "driver"
-}
diff --git a/drivers/firefox-jetpack/test/test-main.js b/drivers/firefox-jetpack/test/test-main.js
deleted file mode 100644
index fdd945127..000000000
--- a/drivers/firefox-jetpack/test/test-main.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var main = require("main");
-
-exports.test_run = function(test) {
-  test.pass("Unit test running!");
-};
-
diff --git a/drivers/firefox-jetpack/README.md b/drivers/firefox-sdk/README.md
similarity index 100%
rename from drivers/firefox-jetpack/README.md
rename to drivers/firefox-sdk/README.md
diff --git a/drivers/firefox-sdk/data/css/panel.css b/drivers/firefox-sdk/data/css/panel.css
new file mode 100644
index 000000000..d37ac28e6
--- /dev/null
+++ b/drivers/firefox-sdk/data/css/panel.css
@@ -0,0 +1,61 @@
+body {
+	background: #fff;
+	color: #000;
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 16px;
+	margin: 0;
+	min-width: 200px;
+	padding: 15px;
+}
+
+img {
+	display: inline-block;
+	height: 16px;
+	margin-right: 8px;
+	vertical-align: top;
+	width: 16px;
+}
+
+.detected-app {
+	padding: 7px 0;
+}
+
+.detected-app:first-child {
+	padding-top: 0;
+}
+
+.detected-app:last-child {
+	border: none;
+	padding-bottom: 0;
+}
+
+	.detected-app a {
+		color: #000;
+		display: block;
+		text-decoration: none;
+	}
+
+	.detected-app a:hover .label {
+		text-decoration: underline;
+	}
+
+	.detected-app a:hover .category {
+		text-decoration: underline;
+	}
+
+.label {
+	font-weight: bold;
+}
+
+.category {
+	color: #999;
+	display: block;
+	margin: 5px 0 0 24px;
+}
+
+#empty {
+	color: #999;
+	font-style: italic;
+	text-align: center;
+}
diff --git a/drivers/firefox-sdk/data/images/icon32.png b/drivers/firefox-sdk/data/images/icon32.png
new file mode 100644
index 000000000..7a9f9fe98
Binary files /dev/null and b/drivers/firefox-sdk/data/images/icon32.png differ
diff --git a/drivers/firefox-sdk/data/images/icon32_hot.png b/drivers/firefox-sdk/data/images/icon32_hot.png
new file mode 100644
index 000000000..0c0cd90ca
Binary files /dev/null and b/drivers/firefox-sdk/data/images/icon32_hot.png differ
diff --git a/drivers/firefox-sdk/data/js/content.js b/drivers/firefox-sdk/data/js/content.js
new file mode 100644
index 000000000..35559c4dd
--- /dev/null
+++ b/drivers/firefox-sdk/data/js/content.js
@@ -0,0 +1,72 @@
+(function() {
+	'use strict';
+
+	var
+		data    = {},
+		lastEnv = [],
+		prefs   = sendSyncMessage('wappalyzer', { action: 'get prefs' })[0]
+		;
+
+	addEventListener('DOMContentLoaded', function() {
+		removeEventListener('DOMContentLoaded', onLoad, false);
+
+		onLoad();
+	}, false);
+
+	function onLoad() {
+		if ( content.document.contentType != 'text/html' ) {
+			return;
+		}
+
+		if ( prefs.analyzeJavaScript && prefs.analyzeOnLoad ) {
+			content.document.documentElement.addEventListener('load', function() {
+				var env = Object.keys(content.wrappedJSObject).slice(0, 500);
+
+				lastEnv = env;
+
+				// Only analyze new variables
+				env = { env: env.filter(function(i) { return lastEnv.indexOf(i) === -1; }) };
+
+				if ( env.length ) {
+					sendAsyncMessage('wappalyzer', {
+						action: 'analyze',
+						analyze: { env: env }
+						});
+				}
+
+				env = null;
+
+				removeEventListener('load', onLoad, true);
+			}, true);
+		}
+
+		// HTML
+		var html = content.document.documentElement.outerHTML;
+
+		// Comments outside HTML
+		//if ( content.document.lastChild.nodeType === 8 ) {
+			//content.alert(content.document.lastChild.nodeValue);
+		//}
+
+		if ( html.length > 50000 ) {
+			html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+		}
+
+		data = { html: html };
+
+		if ( prefs.analyzeJavaScript ) {
+			data.env = Object.keys(content.wrappedJSObject).slice(0, 500);
+
+			lastEnv = data.env;
+		}
+
+		sendAsyncMessage('wappalyzer', {
+			action:   'analyze',
+			hostname: content.location.hostname,
+			url:      content.location.href,
+			analyze:  data
+			});
+
+		data = null;
+	}
+})();
diff --git a/drivers/firefox-sdk/data/js/panel.js b/drivers/firefox-sdk/data/js/panel.js
new file mode 100644
index 000000000..5a4228f7c
--- /dev/null
+++ b/drivers/firefox-sdk/data/js/panel.js
@@ -0,0 +1,42 @@
+(function() {
+	self.port.on('displayApps', function(message) {
+		var
+			detectedApps = document.getElementById('detected-apps')
+			empty = document.getElementById('empty');
+
+		detectedApps.innerHTML = '';
+
+		if ( message.tabCache.count > 0 ) {
+			empty.style.display = 'none';
+
+			for ( appName in message.tabCache.appsDetected ) {
+				confidence = message.tabCache.appsDetected[appName].confidenceTotal;
+				version    = message.tabCache.appsDetected[appName].version;
+
+				html =
+					'<div class="detected-app">' +
+						'<a target="_blank" href="https://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=firefox&utm_medium=panel&utm_campaign=extensions">' +
+							'<img src="images/icons/' + appName + '.png"/>' +
+							'<span class="label">' + appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
+						'</a>';
+
+				message.apps[appName].cats.forEach(function(cat) {
+					html +=
+						'<a target="_blank" href="https://wappalyzer.com/categories/' + message.categories[cat] + '?utm_source=firefox&utm_medium=panel&utm_campaign=extensions">' +
+							'<span class="category">' + message.categoryNames[cat] + '</span>' +
+						'</a>';
+				});
+
+				html +=
+						'</a>' +
+					'</div>';
+
+				detectedApps.innerHTML = detectedApps.innerHTML + html;
+			}
+		} else {
+			empty.style.display = 'block';
+		}
+
+		self.port.emit('resize', document.body.offsetHeight);
+	});
+}());
diff --git a/drivers/firefox-sdk/data/js/tab.js b/drivers/firefox-sdk/data/js/tab.js
new file mode 100644
index 000000000..78c0e61d7
--- /dev/null
+++ b/drivers/firefox-sdk/data/js/tab.js
@@ -0,0 +1,31 @@
+(function() {
+	var lastEnv = [];
+
+	if ( document.contentType === 'text/html' ) {
+		var
+			html = document.documentElement.outerHTML
+			env = [];
+
+		self.port.emit('log', 'init');
+
+		if ( html.length > 50000 ) {
+			html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+		}
+
+		self.port.emit('analyze', {
+			hostname: location.hostname,
+			url:      location.href,
+			analyze:  { html: html }
+		});
+
+		setTimeout(function() {
+			var env = Object.keys(unsafeWindow).slice(0, 500);
+
+			self.port.emit('analyze', {
+				hostname: location.hostname,
+				url:      location.href,
+				analyze:  { env: env }
+			});
+		}, 1000);
+	}
+}());
diff --git a/drivers/firefox-sdk/data/panel.html b/drivers/firefox-sdk/data/panel.html
new file mode 100644
index 000000000..b1a10015c
--- /dev/null
+++ b/drivers/firefox-sdk/data/panel.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Panel</title>
+
+		<link rel="stylesheet" href="css/panel.css">
+	</head>
+	<body>
+		<div id="empty" data-l10n-id="noAppsDetected"></div>
+
+		<div id="detected-apps"></div>
+	</body>
+</html>
diff --git a/drivers/firefox-jetpack/doc/main.md b/drivers/firefox-sdk/doc/main.md
similarity index 100%
rename from drivers/firefox-jetpack/doc/main.md
rename to drivers/firefox-sdk/doc/main.md
diff --git a/drivers/firefox-sdk/images/icon128.png b/drivers/firefox-sdk/images/icon128.png
new file mode 100644
index 000000000..c2eef6b98
Binary files /dev/null and b/drivers/firefox-sdk/images/icon128.png differ
diff --git a/drivers/firefox-sdk/images/icon128_hot.png b/drivers/firefox-sdk/images/icon128_hot.png
new file mode 100644
index 000000000..0e1e1fb0c
Binary files /dev/null and b/drivers/firefox-sdk/images/icon128_hot.png differ
diff --git a/drivers/firefox-sdk/images/icon16.png b/drivers/firefox-sdk/images/icon16.png
new file mode 100644
index 000000000..7ad880fcc
Binary files /dev/null and b/drivers/firefox-sdk/images/icon16.png differ
diff --git a/drivers/firefox-sdk/images/icon16_hot.png b/drivers/firefox-sdk/images/icon16_hot.png
new file mode 100644
index 000000000..06464af29
Binary files /dev/null and b/drivers/firefox-sdk/images/icon16_hot.png differ
diff --git a/drivers/firefox-sdk/images/icon48.png b/drivers/firefox-sdk/images/icon48.png
new file mode 100644
index 000000000..5c0ac3909
Binary files /dev/null and b/drivers/firefox-sdk/images/icon48.png differ
diff --git a/drivers/firefox-sdk/images/icon48_hot.png b/drivers/firefox-sdk/images/icon48_hot.png
new file mode 100644
index 000000000..00bd19d77
Binary files /dev/null and b/drivers/firefox-sdk/images/icon48_hot.png differ
diff --git a/drivers/firefox-sdk/images/icon64.png b/drivers/firefox-sdk/images/icon64.png
new file mode 100644
index 000000000..ad3dbcf49
Binary files /dev/null and b/drivers/firefox-sdk/images/icon64.png differ
diff --git a/drivers/firefox-sdk/images/icon64_hot.png b/drivers/firefox-sdk/images/icon64_hot.png
new file mode 100644
index 000000000..1954d72c1
Binary files /dev/null and b/drivers/firefox-sdk/images/icon64_hot.png differ
diff --git a/drivers/firefox-sdk/lib/driver.js b/drivers/firefox-sdk/lib/driver.js
new file mode 100644
index 000000000..d70c108e8
--- /dev/null
+++ b/drivers/firefox-sdk/lib/driver.js
@@ -0,0 +1,324 @@
+(function() {
+	'use strict';
+
+	var
+		{Cc, Ci} = require('chrome'),
+		main = require('wappalyzer'),
+		w = main.wappalyzer,
+		mediator = Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator),
+		doc = mediator.getMostRecentWindow('navigator:browser').document,
+		urlBar = doc.getElementById('urlbar-icons'),
+		tabCache = {},
+		headersCache = {},
+		categoryNames = {},
+		data = require('sdk/self').data,
+		ss = require('sdk/simple-storage'),
+		sp = require("sdk/simple-prefs"),
+		tabs = require('sdk/tabs'),
+		panel = require('sdk/panel').Panel({
+			width: 250,
+			height: 50,
+			contentURL: data.url('panel.html'),
+			contentScriptFile: data.url('js/panel.js'),
+			position: { right: 30, top: 30 }
+		}),
+		widget = require('sdk/widget').Widget({
+			id: 'wappalyzer',
+			label: 'Wappalyzer',
+			contentURL: data.url('images/icon32.png'),
+			panel: panel
+		}),
+		initTab,
+		addIcon,
+		removeIcons;
+
+	initTab = function(tab) {
+		tabCache[tab.id] = { count: 0, appsDetected: [] };
+
+		tab.on('ready', function(tab) {
+			var worker = tab.attach({
+				contentScriptFile: data.url('js/tab.js')
+			});
+
+			worker.port.on('analyze', function(message) {
+				var url = message.url.replace(/#.*$/, '');
+
+				if ( headersCache[url] !== undefined ) {
+					message.analyze.headers = headersCache[url];
+				}
+
+				w.analyze(message.hostname, url, message.analyze);
+			});
+
+			worker.port.on('log', function(message) {
+				w.log('[ tab.js ] ' + message);
+			});
+		});
+	};
+
+	tabs.on('open', initTab);
+
+	tabs.on('close', function(tab) {
+		tabCache[tab.id] = null;
+	});
+
+	tabs.on('activate', function(tab) {
+		w.driver.displayApps();
+	});
+
+	panel.port.on('resize', function(height) {
+		panel.height = height;
+	});
+
+	addIcon = function(url) {
+		var
+			icon = doc.createElement('image'),
+			show = true;
+
+
+		icon.setAttribute('src',    data.url(url));
+		icon.setAttribute('class',  'wappalyzer-icon');
+		icon.setAttribute('width',  '16');
+		icon.setAttribute('height', '16');
+		icon.setAttribute('style',  'cursor: pointer; margin-right: 2px;');
+
+		icon.addEventListener('mouseover', function() {
+			if ( panel.isShowing ) {
+				show = false;
+			}
+		});
+
+		icon.addEventListener('mouseout', function() {
+			show = true;
+		});
+
+		icon.addEventListener('click', function() {
+			if ( show ) {
+				panel.show();
+
+				show = false;
+			} else {
+				panel.hide();
+
+				show = true;
+			}
+		}, false);
+
+		urlBar.appendChild(icon);
+
+		return icon;
+	};
+
+	removeIcons = function() {
+		var icons;
+
+		do {
+			icons = urlBar.getElementsByClassName('wappalyzer-icon');
+
+			if ( icons.length ) {
+				urlBar.removeChild(icons[0]);
+			}
+		} while ( icons.length );
+	};
+
+	w.driver = {
+		/**
+		 * Log messages to console
+		 */
+		log: function(args) {
+			console.log(args.message);
+		},
+
+		/**
+		 * Initialize
+		 */
+		init: function(callback) {
+			var json = JSON.parse(data.load('apps.json'));
+
+			try {
+				var version = require('sdk/self').version;
+
+				if ( !ss.storage.version ) {
+					w.driver.goToURL({ url: w.config.websiteURL + 'installed', medium: 'install' });
+				} else if ( version !== ss.storage.version ) {
+					w.driver.goToURL({ url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+				}
+
+				ss.storage.version = version;
+			} catch(e) { }
+
+			w.apps = json.apps;
+			w.categories = json.categories;
+
+			for ( var id in w.categories ) {
+				categoryNames[id] = require('sdk/l10n').get('cat' + id);
+			}
+
+			for each ( var tab in tabs ) {
+				initTab(tab);
+			}
+
+			sp.on('urlbar', function() {
+				if ( !sp.prefs.urlbar ) {
+					removeIcons();
+				}
+			});
+
+			var httpRequestObserver = {
+				init: function() {
+					var observerService = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
+
+					observerService.addObserver(this, 'http-on-examine-response', false);
+				},
+
+				observe: function(subject, topic, data) {
+					if ( topic == 'http-on-examine-response' ) {
+						subject.QueryInterface(Ci.nsIHttpChannel);
+
+						this.onExamineResponse(subject);
+					}
+				},
+
+				onExamineResponse: function (subject) {
+					var uri = subject.URI.spec.replace(/#.*$/, ''); // Remove hash
+
+					if ( headersCache.length > 50 ) {
+						headersCache = {};
+					}
+
+					if ( subject.contentType === 'text/html' ) {
+						if ( headersCache[uri] === undefined ) {
+							headersCache[uri] = {};
+						}
+
+						subject.visitResponseHeaders(function(header, value) {
+							headersCache[uri][header.toLowerCase()] = value;
+						});
+					}
+				}
+			};
+
+			httpRequestObserver.init();
+		},
+
+		goToURL: function(args) {
+			var url = args.url + ( typeof args.medium === 'undefined' ? '' :  '?utm_source=firefox&utm_medium=' + args.medium + '&utm_campaign=extensions');
+
+			tabs.open(url);
+		},
+
+		displayApps: function() {
+			var
+				url   = tabs.activeTab.url.replace(/#.*$/, ''),
+				count = w.detected[url] ? Object.keys(w.detected[url]).length : 0;
+
+			w.log('display apps');
+
+			if ( tabCache[tabs.activeTab.id] === undefined ) {
+				initTab(tabs.activeTab);
+			}
+
+			tabCache[tabs.activeTab.id].count = count;
+			tabCache[tabs.activeTab.id].appsDetected = w.detected[url];
+
+			if ( sp.prefs.urlbar ) {
+				removeIcons();
+
+				// Add icons
+				if ( count ) {
+					for ( appName in tabCache[tabs.activeTab.id].appsDetected ) {
+						addIcon('images/icons/' + appName + '.png');
+					}
+				} else {
+					addIcon('images/icon32.png');
+				}
+			}
+
+			widget.contentURL = data.url('images/icon32.png');
+
+			if ( count > 0 ) {
+				// Find the main application to display
+				var i, appName, found = false;
+
+				widget.contentURL = data.url('images/icon32_hot.png'),
+
+				w.driver.categoryOrder.forEach(function(match) {
+					for ( appName in w.detected[url] ) {
+						w.apps[appName].cats.forEach(function(cat) {
+							if ( cat == match && !found ) {
+								widget.contentURL = data.url('images/icons/' + appName + '.png'),
+
+								found = true;
+							}
+						});
+					}
+				});
+			};
+
+			panel.port.emit('displayApps', { tabCache: tabCache[tabs.activeTab.id], apps: w.apps, categories: w.categories, categoryNames: categoryNames });
+		},
+
+		ping: function() {
+			var Request = require('sdk/request').Request;
+
+			if ( Object.keys(w.ping.hostnames).length && sp.prefs.tracking ) {
+				Request({
+					url: w.config.websiteURL + 'ping/v2/',
+					content: { json: encodeURIComponent(JSON.stringify(w.ping)) },
+					onComplete: function (response) {
+						w.log('w.driver.ping: status ' + response.status);
+					}
+				}).post();
+
+				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
+
+				w.ping = { hostnames: {} };
+			}
+		},
+
+		categoryOrder: [ // Used to pick the main application
+			 1, // CMS
+			11, // Blog
+			 6, // Web Shop
+			 2, // Message Board
+			 8, // Wiki
+			13, // Issue Tracker
+			30, // Web Mail
+			18, // Web Framework
+			21, // LMS
+			 7, // Photo Gallery
+			 3, // Database Manager
+			34, // Database
+			 4, // Documentation Tool
+			 9, // Hosting Panel
+			29, // Search Engine
+			12, // Javascript Framework
+			26, // Mobile Framework
+			25, // Javascript Graphics
+			22, // Web Server
+			27, // Programming Language
+			28, // Operating System
+			15, // Comment System
+			20, // Editor
+			10, // Analytics
+			32, // Marketing Automation
+			38, // Media Server
+			31, // CDN
+			23, // Cache Tool
+			17, // Font Script
+			24, // Rich Text Editor
+			35, // Map
+			 5, // Widget
+			14, // Video Player
+			16, // Captcha
+			33, // Web Server Extension
+			37, // Network Device
+			39, // Webcam
+			40, // Printer
+			36, // Advertising Network
+			19  // Miscellaneous
+		]
+	}
+
+	w.init();
+}());
diff --git a/drivers/firefox-sdk/locale/de-DE.properties b/drivers/firefox-sdk/locale/de-DE.properties
new file mode 100755
index 000000000..f3851f4b3
--- /dev/null
+++ b/drivers/firefox-sdk/locale/de-DE.properties
@@ -0,0 +1,54 @@
+name                 = Wappalyzer
+noAppsDetected       = Keine Applikationen erkannt
+
+preferences          = Weitere Optionen ...
+categories           = Kategorienverwaltung
+tracking_title       = Tracken
+tracking_description = Sende anonyme Reports über gefundene Applikationen zu Forschungszwecken an wappalyzer.com
+urlbar_title         = Display icons in URL bar
+
+feedback             = Feedback
+github               = Github
+twitter              = Twitter
+website              = Zu wappalyzer.com browsen
+
+cat1                 = CMS
+cat2                 = Message Board
+cat3                 = Database Manager
+cat4                 = Documentation Tool
+cat5                 = Widget
+cat6                 = Web Shop
+cat7                 = Photo Gallery
+cat8                 = Wiki
+cat9                 = Hosting Panel
+cat10                = Analytics
+cat11                = Blog
+cat12                = JavaScript Framework
+cat13                = Issue Tracker
+cat14                = Video Player
+cat15                = Comment System
+cat16                = CAPTCHA
+cat17                = Font Script
+cat18                = Web Framework
+cat19                = Miscellaneous
+cat20                = Editor
+cat21                = LMS
+cat22                = Web Server
+cat23                = Cache Tool
+cat24                = Rich Text Editor
+cat25                = Javascript Graphics
+cat26                = Mobile Framework
+cat27                = Programming Language
+cat28                = Operating System
+cat29                = Search Engine
+cat30                = Web mail
+cat31                = CDN
+cat32                = Marketing Automation
+cat33                = Web Server Extension
+cat34                = Database
+cat35                = Map
+cat36                = Advertizing Network
+cat37                = Network Device
+cat38                = Media Server
+cat39                = Webcam
+cat40                = Printer
diff --git a/drivers/firefox-sdk/locale/en-GB.properties b/drivers/firefox-sdk/locale/en-GB.properties
new file mode 100755
index 000000000..2bc0ee937
--- /dev/null
+++ b/drivers/firefox-sdk/locale/en-GB.properties
@@ -0,0 +1,54 @@
+name                 = Wappalyzer
+noAppsDetected       = No applications detected
+
+preferences          = Options
+categories           = Categories
+tracking_title       = Tracking
+tracking_description = Anonymously send reports on detected applications to wappalyzer.com for analysis
+urlbar_title         = Display icons in URL bar
+
+feedback             = Feedback
+github               = Github
+twitter              = Twitter
+website              = Go to wappalyzer.com
+
+cat1                 = CMS
+cat2                 = Message Board
+cat3                 = Database Manager
+cat4                 = Documentation Tool
+cat5                 = Widget
+cat6                 = Web Shop
+cat7                 = Photo Gallery
+cat8                 = Wiki
+cat9                 = Hosting Panel
+cat10                = Analytics
+cat11                = Blog
+cat12                = JavaScript Framework
+cat13                = Issue Tracker
+cat14                = Video Player
+cat15                = Comment System
+cat16                = CAPTCHA
+cat17                = Font Script
+cat18                = Web Framework
+cat19                = Miscellaneous
+cat20                = Editor
+cat21                = LMS
+cat22                = Web Server
+cat23                = Cache Tool
+cat24                = Rich Text Editor
+cat25                = Javascript Graphics
+cat26                = Mobile Framework
+cat27                = Programming Language
+cat28                = Operating System
+cat29                = Search Engine
+cat30                = Web Mail
+cat31                = CDN
+cat32                = Marketing Automation
+cat33                = Web Server Extension
+cat34                = Database
+cat35                = Map
+cat36                = Advertising Network
+cat37                = Network Device
+cat38                = Media Server
+cat39                = Webcam
+cat40                = Printer
diff --git a/drivers/firefox-sdk/locale/en-US.properties b/drivers/firefox-sdk/locale/en-US.properties
new file mode 100755
index 000000000..2692e2ae6
--- /dev/null
+++ b/drivers/firefox-sdk/locale/en-US.properties
@@ -0,0 +1,54 @@
+name                 = Wappalyzer
+noAppsDetected       = No applications detected
+
+preferences          = Options
+categories           = Categories
+tracking_title       = Tracking
+research_description = Anonymously send reports on detected applications to wappalyzer.com for analysis
+urlbar_title         = Display icons in URL bar
+
+feedback             = Feedback
+github               = Github
+twitter              = Twitter
+website              = Go to wappalyzer.com
+
+cat1                 = CMS
+cat2                 = Message Board
+cat3                 = Database Manager
+cat4                 = Documentation Tool
+cat5                 = Widget
+cat6                 = Web Shop
+cat7                 = Photo Gallery
+cat8                 = Wiki
+cat9                 = Hosting Panel
+cat10                = Analytics
+cat11                = Blog
+cat12                = JavaScript Framework
+cat13                = Issue Tracker
+cat14                = Video Player
+cat15                = Comment System
+cat16                = CAPTCHA
+cat17                = Font Script
+cat18                = Web Framework
+cat19                = Miscellaneous
+cat20                = Editor
+cat21                = LMS
+cat22                = Web Server
+cat23                = Cache Tool
+cat24                = Rich Text Editor
+cat25                = Javascript Graphics
+cat26                = Mobile Framework
+cat27                = Programming Language
+cat28                = Operating System
+cat29                = Search Engine
+cat30                = Web Mail
+cat31                = CDN
+cat32                = Marketing Automation
+cat33                = Web Server Extension
+cat34                = Database
+cat35                = Map
+cat36                = Advertising Network
+cat37                = Network Device
+cat38                = Media Server
+cat39                = Webcam
+cat40                = Printer
diff --git a/drivers/firefox-sdk/locale/es-ES.properties b/drivers/firefox-sdk/locale/es-ES.properties
new file mode 100755
index 000000000..e215f0227
--- /dev/null
+++ b/drivers/firefox-sdk/locale/es-ES.properties
@@ -0,0 +1,54 @@
+name                 = Wappalyzer
+noAppsDetected       = Aplicaciones no detectadas
+
+preferences          = Opciones
+categories           = Categorías
+tracking_title       = Seguimiento
+tracking_description = Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis
+urlbar_title         = Display icons in URL bar
+
+feedback             = Opinión
+github               = Github
+twitter              = Twitter
+website              = Ir a wappalyzer.com
+
+cat1                 = Gestor de Contenido
+cat2                 = Foro
+cat3                 = estor de Bases de Datos
+cat4                 = Herramienta de Documentación
+cat5                 = Widget
+cat6                 = Tienda Web
+cat7                 = Galería fotográfica
+cat8                 = Wiki
+cat9                 = Panel de Hosting
+cat10                = Analítica
+cat11                = Blog
+cat12                = Framework JavaScript
+cat13                = Gestor de Incidencias
+cat14                = Reproductor de Vídeo
+cat15                = Sistema de Comentarios
+cat16                = CAPTCHA
+cat17                = Tipografía
+cat18                = Framework Web
+cat19                = Miscelánea
+cat20                = Editor
+cat21                = LMS
+cat22                = Servidor Web
+cat23                = Herramienta de Cache
+cat24                = Editor de Texto Enriquecido
+cat25                = Gráficos Javascript
+cat26                = Framework Móvil
+cat27                = Lenguaje de programación
+cat28                = Sistema Operativo
+cat29                = Motor de Búsqueda
+cat30                = Correo Web
+cat31                = CDN
+cat32                = Automatización de Marketing
+cat33                = Extensión de Servidor Web
+cat34                = Base de Datos
+cat35                = Mapa
+cat36                = Red de Publicidad
+cat37                = Dispositivo de Red
+cat38                = Servidores de Contenido
+cat39                = Webcam
+cat40                = Impresora
diff --git a/drivers/firefox-sdk/locale/fr-FR.properties b/drivers/firefox-sdk/locale/fr-FR.properties
new file mode 100644
index 000000000..aa8b9827b
--- /dev/null
+++ b/drivers/firefox-sdk/locale/fr-FR.properties
@@ -0,0 +1,54 @@
+﻿name                 = Wappalyzer
+noAppsDetected       = Pas d'applications détectées
+
+preferences          = Plus d'options...
+categories           = Gérer les catégories
+tracking_title       = Traçage
+tracking_description = Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche
+urlbar_title         = Display icons in URL bar
+
+feedback             = Donner votre avis
+github               = Github
+twitter              = Twitter
+website              = Aller à wappalyzer.com
+
+cat1                 = CMS
+cat2                 = Forum
+cat3                 = Gestionnaire de base de données
+cat4                 = Outil de documentation
+cat5                 = Widget
+cat6                 = Boutique en ligne
+cat7                 = Galerie photo
+cat8                 = Wiki
+cat9                 = Gestionnaires de serveur
+cat10                = Outil de statistiques
+cat11                = Blog
+cat12                = Framework JavaScript
+cat13                = Outils de suivi de problèmes
+cat14                = Lecteur de vidéos
+cat15                = Système de commentaires
+cat16                = CAPTCHA
+cat17                = Script de police
+cat18                = Framework web
+cat19                = Divers
+cat20                = Editeur
+cat21                = LMS
+cat22                = Serveur web
+cat23                = Outil de cache
+cat24                = Editeur WYSIWYG
+cat25                = Graphismes JavaScript
+cat26                = Framework pour mobiles
+cat27                = Language de programmation
+cat28                = Système d'exploitation
+cat29                = Moteur de recherche
+cat30                = Web Mail
+cat31                = CDN
+cat32                = Logiciel de marketing
+cat33                = Web Server Extension
+cat34                = Database
+cat35                = Map
+cat36                = Advertizing Network
+cat37                = Network Device
+cat38                = Media Server
+cat39                = Webcam
+cat40                = Printer
diff --git a/drivers/firefox-sdk/locale/nl-NL.properties b/drivers/firefox-sdk/locale/nl-NL.properties
new file mode 100755
index 000000000..6907ed06d
--- /dev/null
+++ b/drivers/firefox-sdk/locale/nl-NL.properties
@@ -0,0 +1,54 @@
+name                 = Wappalyzer
+noAppsDetected       = Geen applications gedetecteerd
+
+preferences          = Meer opties...
+categories           = Beheer categorien
+tracking_title       = Tracking
+tracking_description = Verzend anonieme informatie over applicaties naar wappalyzer.com voor onderzoek
+urlbar_title         = Display icons in URL bar
+
+feedback             = Feedback
+github               = Github
+twitter              = Twitter
+website              = Ga naar wappalyzer.com
+
+cat1                 = CMS
+cat2                 = Forum
+cat3                 = Database Manager
+cat4                 = Documentatie Tool
+cat5                 = Widget
+cat6                 = Web Winkel
+cat7                 = Photo Gallerij
+cat8                 = Wiki
+cat9                 = Hosting Paneel
+cat10                = Analytics
+cat11                = Blog
+cat12                = JavaScript Framework
+cat13                = Issue Tracker
+cat14                = Video Speler
+cat15                = Comment Systeem
+cat16                = CAPTCHA
+cat17                = Font Script
+cat18                = Web Framework
+cat19                = Overige
+cat20                = Editor
+cat21                = LMS
+cat22                = Web Server
+cat23                = Cache Tool
+cat24                = Rich Text Editor
+cat25                = Javascript Graphics
+cat26                = Mobiel Framework
+cat27                = Programmeer Taal
+cat28                = Operating System
+cat29                = Zoek Machine
+cat30                = Web Mail
+cat31                = CDN
+cat32                = Marketing Automatisering
+cat33                = Web Server Extentie
+cat34                = Database
+cat35                = Landkaart
+cat36                = Advertentie Netwerk
+cat37                = Network Apparaat
+cat38                = Media Server
+cat39                = Webcam
+cat40                = Printer
diff --git a/drivers/firefox-sdk/package.json b/drivers/firefox-sdk/package.json
new file mode 100644
index 000000000..3a477e8ef
--- /dev/null
+++ b/drivers/firefox-sdk/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "wappalyzer",
+  "title": "Wappalyzer",
+	"icon": "images/icon48_hot.png",
+	"icon64": "images/icon64_hot.png",
+  "id": "ec8030f7-c20a-464f-9b0e-13a3a9e97384",
+  "description": "Identifies software on the web",
+  "author": "Elbert Alias",
+  "license": "GPLv3",
+  "version": "3.0.0",
+	"main": "driver",
+	"preferences": [{
+		"name": "tracking",
+		"title": "Tracking",
+		"description": "Anonymously send reports on detected applications to wappalyzer.com for analysis",
+		"type": "bool",
+		"value": true
+	}, {
+		"name": "urlbar",
+		"title": "Display icons in URL bar",
+		"type": "bool",
+		"value": true
+	}]
+}
diff --git a/drivers/firefox/chrome.manifest b/drivers/firefox/chrome.manifest
index 8346a338b..cc49ead76 100644
--- a/drivers/firefox/chrome.manifest
+++ b/drivers/firefox/chrome.manifest
@@ -2,6 +2,7 @@ content wappalyzer content/
 locale  wappalyzer en-US locale/en-US/
 locale  wappalyzer de-DE locale/de-DE/
 locale  wappalyzer fr-FR locale/fr-FR/
+locale  wappalyzer es-ES locale/es-ES/
 skin    wappalyzer classic/1.0 skin/
 
 overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/xul/wappalyzer.xul
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 3e21b6786..504fd3a8a 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -113,13 +113,15 @@
 					gBrowser.tabContainer.addEventListener('TabSelect', w.driver.displayApps, false);
 
 					if ( firstRun ) {
-						driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
+						w.driver.goToURL({ url: w.config.websiteURL + 'installed', medium: 'install' });
 
 						firstRun = false;
 					}
 
 					if ( upgraded ) {
-						driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+						setTimeout(function() {
+							w.driver.goToURL({ url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+						}, 500);
 
 						upgraded = false;
 					}
@@ -203,11 +205,11 @@
 							menuSeparator = d.createElement('menuseparator');
 							menuItem      = d.createElement('menuitem');
 
-							menuItem.setAttribute('class',     'wappalyzer-application menuitem-iconic');
-							menuItem.setAttribute('image',     'chrome://wappalyzer/skin/images/icons/' + app + '.png');
-							menuItem.setAttribute('label',     app + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ));
-							menuItem.setAttribute('name',      app);
-							menuItem.setAttribute('data-url',  w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, ''));
+							menuItem.setAttribute('class',    'wappalyzer-application menuitem-iconic');
+							menuItem.setAttribute('image',    'chrome://wappalyzer/skin/images/icons/' + app + '.png');
+							menuItem.setAttribute('label',    app + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ));
+							menuItem.setAttribute('name',     app);
+							menuItem.setAttribute('data-url', w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, ''));
 
 							menuItem.addEventListener('command', function() {
 								w.driver.goToURL({ url: this.getAttribute('data-url'), medium: 'menu' });
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 885e23085..76b4f90ff 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -166,7 +166,7 @@
 
 		<vbox>
 			<hbox>
-				<label class="header" value="Tracking"/>
+				<label class="header" value="&wappalyzer.tracking;"/>
 			</hbox>
 			
 			<groupbox>
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index ad949eb94..5f40707f3 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.7.4</em:version>
+		<em:version>2.7.8</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -12,7 +12,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>25.*</em:maxVersion>
+				<em:maxVersion>28.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
@@ -21,7 +21,7 @@
 			<Description>
 				<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
 				<em:minVersion>2.0</em:minVersion>
-				<em:maxVersion>2.24.*</em:maxVersion>
+				<em:maxVersion>2.26.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
@@ -33,6 +33,6 @@
 		<em:iconURL>chrome://wappalyzer/skin/images/icon32.png</em:iconURL>
 		<em:icon64URL>chrome://wappalyzer/skin/images/icon64.png</em:icon64URL>
 		<em:creator>Elbert Alias</em:creator>
-		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
+		<em:homepageURL>https://wappalyzer.com</em:homepageURL>
 	</Description>
 </RDF>
diff --git a/drivers/firefox/locale/es-ES/wappalyzer.dtd b/drivers/firefox/locale/es-ES/wappalyzer.dtd
new file mode 100755
index 000000000..199cd2020
--- /dev/null
+++ b/drivers/firefox/locale/es-ES/wappalyzer.dtd
@@ -0,0 +1,60 @@
+<!ENTITY wappalyzer.name              "Wappalyzer">
+<!ENTITY wappalyzer.help              "Wappalyzer - Clic para mas detalles y configuración">
+
+<!ENTITY wappalyzer.showIcons         "Mostrar iconos de aplicaciones">
+<!ENTITY wappalyzer.preferences       "Opciones">
+<!ENTITY wappalyzer.addonBar          "Colocar en barra de complementos (pulsa Ctrl+/ o Cmd+/ para alternar)">
+<!ENTITY wappalyzer.categories        "Categorías">
+<!ENTITY wappalyzer.performance       "Rendimiento">
+<!ENTITY wappalyzer.interface         "Interfaz">
+<!ENTITY wappalyzer.tracking          "Seguimiento">
+<!ENTITY wappalyzer.research          "Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis">
+<!ENTITY wappalyzer.analyzeHeaders    "Analizar cabeceras de respuesta">
+<!ENTITY wappalyzer.analyzeJavaScript "Analizar JavaScript">
+<!ENTITY wappalyzer.analyzeOnload     "Analizar eventos onLoad">
+
+<!ENTITY wappalyzer.feedback          "Opinión">
+<!ENTITY wappalyzer.github            "Github">
+<!ENTITY wappalyzer.twitter           "Twitter">
+<!ENTITY wappalyzer.website           "Ir a wappalyzer.com">
+
+<!ENTITY wappalyzer.cat1              "Gestores de Contenido">
+<!ENTITY wappalyzer.cat2              "Foros">
+<!ENTITY wappalyzer.cat3              "Gestores de Bases de Datos">
+<!ENTITY wappalyzer.cat4              "Herramientas de Documentación">
+<!ENTITY wappalyzer.cat5              "Widgets">
+<!ENTITY wappalyzer.cat6              "Tiendas Web">
+<!ENTITY wappalyzer.cat7              "Galerías fotográfica">
+<!ENTITY wappalyzer.cat8              "Wikis">
+<!ENTITY wappalyzer.cat9              "Paneles de Hosting">
+<!ENTITY wappalyzer.cat10             "Analítica">
+<!ENTITY wappalyzer.cat11             "Blogs">
+<!ENTITY wappalyzer.cat12             "Framework JavaScript">
+<!ENTITY wappalyzer.cat13             "Gestores de Incidencias">
+<!ENTITY wappalyzer.cat14             "Reproductores de Vídeo">
+<!ENTITY wappalyzer.cat15             "Sistemas de Comentarios">
+<!ENTITY wappalyzer.cat16             "CAPTCHAs">
+<!ENTITY wappalyzer.cat17             "Tipografías">
+<!ENTITY wappalyzer.cat18             "Framework Web">
+<!ENTITY wappalyzer.cat19             "Miscelánea">
+<!ENTITY wappalyzer.cat20             "Editores">
+<!ENTITY wappalyzer.cat21             "LMS">
+<!ENTITY wappalyzer.cat22             "Servidores Web">
+<!ENTITY wappalyzer.cat23             "Herramientas de Cache">
+<!ENTITY wappalyzer.cat24             "Editores de Texto Enriquecido">
+<!ENTITY wappalyzer.cat25             "Gráficos Javascript">
+<!ENTITY wappalyzer.cat26             "Framework Móvil">
+<!ENTITY wappalyzer.cat27             "Lenguajes de programación">
+<!ENTITY wappalyzer.cat28             "Sistemas Operativos">
+<!ENTITY wappalyzer.cat29             "Motor de Búsqueda">
+<!ENTITY wappalyzer.cat30             "Correos Web">
+<!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Lenguajes de programación">
+<!ENTITY wappalyzer.cat33             "Extensiones de Servidor Web">
+<!ENTITY wappalyzer.cat34             "Bases de Datos">
+<!ENTITY wappalyzer.cat35             "Mapa">
+<!ENTITY wappalyzer.cat36             "Redes de Publicidad">
+<!ENTITY wappalyzer.cat37             "Dispositivos de Red">
+<!ENTITY wappalyzer.cat38             "Servidores de Contenido">
+<!ENTITY wappalyzer.cat39             "Cámaras Web">
+<!ENTITY wappalyzer.cat40             "Impresoras">
diff --git a/drivers/firefox/locale/es-ES/wappalyzer.properties b/drivers/firefox/locale/es-ES/wappalyzer.properties
new file mode 100755
index 000000000..b9619d71a
--- /dev/null
+++ b/drivers/firefox/locale/es-ES/wappalyzer.properties
@@ -0,0 +1,44 @@
+wappalyzer.name           = Wappalyzer
+wappalyzer.noAppsDetected = Aplicaciones no detectadas
+wappalyzer.addonBar       = Wappalyzer se ha colocado en la barra de complementos.\n\nPara mostrar la barra de complementos, cierra esta ventana y pulsa Ctrl+/.
+
+wappalyzer.cat1	          = Gestor de Contenido
+wappalyzer.cat2	          = Foro 
+wappalyzer.cat3	          = estor de Bases de Datos
+wappalyzer.cat4	          = Herramienta de Documentación
+wappalyzer.cat5	          = Widget
+wappalyzer.cat6	          = Tienda Web
+wappalyzer.cat7	          = Galería fotográfica
+wappalyzer.cat8	          = Wiki
+wappalyzer.cat9	          = Panel de Hosting
+wappalyzer.cat10          = Analítica
+wappalyzer.cat11          = Blog
+wappalyzer.cat12          = Framework JavaScript
+wappalyzer.cat13          = Gestor de Incidencias
+wappalyzer.cat14          = Reproductor de Vídeo
+wappalyzer.cat15          = Sistema de Comentarios
+wappalyzer.cat16          = CAPTCHA
+wappalyzer.cat17          = Tipografía
+wappalyzer.cat18          = Framework Web
+wappalyzer.cat19          = Miscelánea
+wappalyzer.cat20          = Editor
+wappalyzer.cat21          = LMS
+wappalyzer.cat22          = Servidor Web
+wappalyzer.cat23          = Herramienta de Cache
+wappalyzer.cat24          = Editor de Texto Enriquecido
+wappalyzer.cat25          = Gráficos Javascript
+wappalyzer.cat26          = Framework Móvil
+wappalyzer.cat27          = Lenguaje de programación
+wappalyzer.cat28          = Sistema Operativo
+wappalyzer.cat29          = Motor de Búsqueda
+wappalyzer.cat30          = Correo Web
+wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Automatización de Marketing
+wappalyzer.cat33          = Extensión de Servidor Web
+wappalyzer.cat34          = Base de Datos
+wappalyzer.cat35          = Mapa
+wappalyzer.cat36          = Red de Publicidad
+wappalyzer.cat37          = Dispositivo de Red
+wappalyzer.cat38          = Servidores de Contenido
+wappalyzer.cat39          = Webcam
+wappalyzer.cat40          = Impresora
diff --git a/drivers/firefox/skin/images/feedback.png b/drivers/firefox/skin/images/feedback.png
index 30b528c41..abe7c8f58 100644
Binary files a/drivers/firefox/skin/images/feedback.png and b/drivers/firefox/skin/images/feedback.png differ
diff --git a/drivers/firefox/skin/images/github.png b/drivers/firefox/skin/images/github.png
index eb24ee314..037d0c336 100644
Binary files a/drivers/firefox/skin/images/github.png and b/drivers/firefox/skin/images/github.png differ
diff --git a/drivers/firefox/skin/images/icon.png b/drivers/firefox/skin/images/icon.png
index 7b4552a78..7ad880fcc 100644
Binary files a/drivers/firefox/skin/images/icon.png and b/drivers/firefox/skin/images/icon.png differ
diff --git a/drivers/firefox/skin/images/icon128.png b/drivers/firefox/skin/images/icon128.png
index a72b1c8af..0e1e1fb0c 100644
Binary files a/drivers/firefox/skin/images/icon128.png and b/drivers/firefox/skin/images/icon128.png differ
diff --git a/drivers/firefox/skin/images/icon32.png b/drivers/firefox/skin/images/icon32.png
index e554cd3ef..96cceb6f6 100644
Binary files a/drivers/firefox/skin/images/icon32.png and b/drivers/firefox/skin/images/icon32.png differ
diff --git a/drivers/firefox/skin/images/icon64.png b/drivers/firefox/skin/images/icon64.png
index 58d6a0edc..1954d72c1 100644
Binary files a/drivers/firefox/skin/images/icon64.png and b/drivers/firefox/skin/images/icon64.png differ
diff --git a/drivers/firefox/skin/images/icon_hot.png b/drivers/firefox/skin/images/icon_hot.png
index 7f74461f2..06464af29 100644
Binary files a/drivers/firefox/skin/images/icon_hot.png and b/drivers/firefox/skin/images/icon_hot.png differ
diff --git a/drivers/firefox/skin/images/twitter.png b/drivers/firefox/skin/images/twitter.png
index 76742a44f..e20284ddf 100644
Binary files a/drivers/firefox/skin/images/twitter.png and b/drivers/firefox/skin/images/twitter.png differ
diff --git a/drivers/html/images/icon.png b/drivers/html/images/icon.png
index a72b1c8af..0e1e1fb0c 100644
Binary files a/drivers/html/images/icon.png and b/drivers/html/images/icon.png differ
diff --git a/links.cmd b/links.cmd
index d6a53d307..7b3276dd5 100644
--- a/links.cmd
+++ b/links.cmd
@@ -34,22 +34,22 @@ mklink /h drivers\firefox\content\js\wappalyzer.js share\js\wappalyzer.js
 
 
 
-::	FIREFOX JETPACK
+::	FIREFOX SKD
 ::
 ::Sync icons folder
-::ln -f share\images\icons         drivers\firefox-jetpack\images\icons
-if exist drivers\firefox-jetpack\images\icons rmdir /q /s drivers\firefox-jetpack\images\icons
-mklink /j drivers\firefox-jetpack\images\icons share\images\icons
+::ln -f share\images\icons         drivers\firefox-sdk\images\icons
+if exist drivers\firefox-sdk\images\icons rmdir /q /s drivers\firefox-jetpack\images\icons
+mklink /j drivers\firefox-sdk\images\icons share\images\icons
 
 ::Sync apps JSON
-::ln -f share\apps.json            drivers\firefox-jetpack\data
-if exist drivers\firefox-jetpack\data\apps.json del drivers\firefox-jetpack\data\apps.json
-mklink /h drivers\firefox-jetpack\data\apps.json share\apps.json
+::ln -f share\apps.json            drivers\firefox-sdk\data
+if exist drivers\firefox-sdk\data\apps.json del drivers\firefox-jetpack\data\apps.json
+mklink /h drivers\firefox-sdk\data\apps.json share\apps.json
 
 ::Sync Wappalyzer.js
-::ln -f share\js\wappalyzer.js     drivers\firefox-jetpack\lib
-if exist drivers\firefox-jetpack\lib\wappalyzer.js del drivers\firefox-jetpack\lib\wappalyzer.js
-mklink /h drivers\firefox-jetpack\lib\wappalyzer.js share\js\wappalyzer.js
+::ln -f share\js\wappalyzer.js     drivers\firefox-sdk\lib
+if exist drivers\firefox-sdk\lib\wappalyzer.js del drivers\firefox-jetpack\lib\wappalyzer.js
+mklink /h drivers\firefox-sdk\lib\wappalyzer.js share\js\wappalyzer.js
 
 
 
@@ -120,4 +120,4 @@ mklink /h drivers\php\apps.json share\apps.json
 ::Sync Wappalyzer.js
 ::ln -f share\js\wappalyzer.js     drivers\php\js
 if exist drivers\php\js\wappalyzer.js del drivers\php\js\wappalyzer.js
-mklink /h drivers\php\js\wappalyzer.js share\js\wappalyzer.js
\ No newline at end of file
+mklink /h drivers\php\js\wappalyzer.js share\js\wappalyzer.js
diff --git a/links.sh b/links.sh
index 48a179a1a..5572552cb 100755
--- a/links.sh
+++ b/links.sh
@@ -1,24 +1,24 @@
 #!/bin/sh
 
-ln -f share/images/icons/*.png drivers/firefox/skin/images/icons
-ln -f share/apps.json          drivers/firefox/content
-ln -f share/js/wappalyzer.js   drivers/firefox/content/js
+ln -f share/images/icons/*.png    drivers/firefox/skin/images/icons
+ln -f share/apps.json             drivers/firefox/content
+ln -f share/js/wappalyzer.js      drivers/firefox/content/js
 
-ln -f share/images/icons/*.png drivers/firefox-jetpack/images/icons
-ln -f share/apps.json          drivers/firefox-jetpack/data
-ln -f share/js/wappalyzer.js   drivers/firefox-jetpack/lib
+ln -f share/images/icons/*.png    drivers/firefox-sdk/data/images/icons
+ln -f share/apps.json             drivers/firefox-sdk/data
+ln -f share/js/wappalyzer.js      drivers/firefox-sdk/lib
 
-ln -f share/images/icons/*.png drivers/chrome/images/icons
-ln -f share/apps.json          drivers/chrome
-ln -f share/js/wappalyzer.js   drivers/chrome/js
+ln -f share/images/icons/*.png    drivers/chrome/images/icons
+ln -f share/apps.json             drivers/chrome
+ln -f share/js/wappalyzer.js      drivers/chrome/js
 
-ln -f share/images/icons/*.png drivers/bookmarklet/images/icons
-ln -f share/apps.json          drivers/bookmarklet/json
-ln -f share/js/wappalyzer.js   drivers/bookmarklet/js
+ln -f share/images/icons/*.png    drivers/bookmarklet/images/icons
+ln -f share/apps.json             drivers/bookmarklet/json
+ln -f share/js/wappalyzer.js      drivers/bookmarklet/js
 
-ln -f share/images/icons/*.png drivers/html/images/icons
-ln -f share/apps.json          drivers/html
-ln -f share/js/wappalyzer.js   drivers/html/js
+ln -f share/images/icons/*.png    drivers/html/images/icons
+ln -f share/apps.json             drivers/html
+ln -f share/js/wappalyzer.js      drivers/html/js
 
-ln -f share/apps.json          drivers/php
-ln -f share/js/wappalyzer.js   drivers/php/js
+ln -f share/apps.json             drivers/php
+ln -f share/js/wappalyzer.js      drivers/php/js
diff --git a/package.cmd b/package.cmd
index ebdc8a49c..067d8b4fc 100644
--- a/package.cmd
+++ b/package.cmd
@@ -1,5 +1,5 @@
 ::	package.cmd
-::	Copyright (c) 2012 q-- <https://github.com/q-->
+::	Copyright (c) 2012-2014 q-- <https://github.com/q-->
 ::	
 ::	Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 ::	
@@ -8,17 +8,6 @@
 ::	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 @echo off
 
-::Detect HTA host
-if exist %windir%\SysWOW64\mshta.exe goto hta64
-if exist %windir%\System32\mshta.exe goto hta32
-:hta32
-set hta=%windir%\System32\mshta.exe 
-goto endDetection
-:hta64
-set hta=%windir%\SysWOW64\mshta.exe 
-goto endDetection
-:endDetection
-
 ::Links
 call links.cmd
 
@@ -26,19 +15,45 @@ call links.cmd
 if exist wappalyzer-chrome.zip del wappalyzer-chrome.zip
 if exist wappalyzer-firefox.xpi del wappalyzer-firefox.xpi
 
+::Check if where.exe is present
+where.exe /Q cmd.exe
+IF NOT %ERRORLEVEL%==0 GOTO noWhere
+
+::Check for 7-Zip
+where.exe 7z.exe
+IF %ERRORLEVEL%==0 GOTO sevenZipIsInPath
+
+::Ok, WHERE can't find 7-Zip. Check at the default install location
+IF EXIST "C:\Program Files\7-zip\7z.exe" (
+	set zip="C:\Program Files\7-zip\7z.exe"
+	GOTO Package
+) ELSE (
+	echo.7-Zip was not found.
+	echo.Please download 7-Zip from http://7-zip.org/ and add 7z.exe ^(the command-line edition^) to PATH.
+	pause
+	goto :end
+)
+
+
+::WHERE command isn't found. Try it anyway.
+::(WHERE is present by default in Vista and newer, older Windows versions require that you install it yourself.)
+:noWhere
+echo.WHERE.exe was not found on your system.
+echo.If the script fails, please download 7-Zip from http://7-zip.org/ and add 7z.exe (the command-line edition) to PATH.
+
 
-::Prompt to download 7-Zip if necessary
-set dl7zfile=.windows_zip\Download 7-Zip.hta
-:retry
-if not exist .windows_zip\7za.exe cd .windows_zip&%hta% "%cd%\%dl7zfile%"&cd ..&goto retry
+::7-Zip command line is found in PATH
+:sevenZipIsInPath
+set zip=7z.exe
 
 
+:Package
 ::Pack Chrome extension
-cd drivers\chrome&&..\..\.windows_zip\7za.exe a -tzip -mx9 ..\..\wappalyzer-chrome.zip *
+cd drivers\chrome&&%zip% a -tzip -mx9 ..\..\wappalyzer-chrome.zip *
 cd..\..
 
 ::Pack Firefox extension
-cd drivers\firefox&&..\..\.windows_zip\7za.exe a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
+cd drivers\firefox&&%zip% a -tzip -mx9 ..\..\wappalyzer-firefox.xpi *
 cd..\..
 
 
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..d5d5a4b18
--- /dev/null
+++ b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "Wappalyzer",
+  "version": "1.1.2",
+  "description": "Wappalyzer is a cross-platform utility that uncovers the technologies used on websites. It detects content management systems, web shops, web servers, JavaScript frameworks, analytics tools and many more.",
+  "main": "./share/js/wappalyzer.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ElbertF/Wappalyzer"
+  },
+  "author": "ElbertF",
+  "license": "GNU GPL",
+  "bugs": {
+    "url": "https://github.com/ElbertF/Wappalyzer/issues"
+  },
+  "homepage": "https://wappalyzer.com/"
+}
diff --git a/share/apps.json b/share/apps.json
index 74b58644f..5ee8bb3eb 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -116,6 +116,11 @@
 			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"implies": "Java"
 		},
+		"Akamai": {
+			"website": "akamai.com",
+			"cats": [ 31 ],
+			"headers": { "X-Akamai-Transformed": ".*" }
+		},
 		"AlloyUI": {
 			"website": "www.alloyui.com",
 			"cats": [ 12 ],
@@ -155,6 +160,11 @@
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
+		"Anchor CMS": {
+			"website": "anchorcms.com",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "Anchor CMS" }
+		},
 		"AngularJS": {
 			"website": "angularjs.org",
 			"cats": [ 12 ],
@@ -257,7 +267,7 @@
 			"implies": "PHP"
 		},
 		"basket.js": {
-			"website": "http://addyosmani.github.io/basket.js/",
+			"website": "addyosmani.github.io/basket.js/",
 			"cats": [ 12 ],
 			"script": "basket.*\\.js",
 			"env": "^basket$"
@@ -403,7 +413,7 @@
 		"Chartbeat": {
 			"website": "chartbeat.com",
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {",
+			"html": "function loadChartbeat\\(\\) \\{",
 			"script": "chartbeat\\.js"
 		},
 		"Cherokee": {
@@ -494,7 +504,8 @@
 		"comScore": {
 			"website": "comscore.com",
 			"cats": [ 10 ],
-			"html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)",
+			"script": "\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
+			"html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)|\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
 			"env": "^_?COMSCORE$"
 		},
 		"Concrete5": {
@@ -607,10 +618,11 @@
 			"script": "cufon-yui\\.js",
 			"env": "^Cufon$"
 		},
-		"d3": {
-			"website": "mbostock.github.com/d3",
+		"D3": {
+			"website": "d3js.org",
 			"cats": [ 25 ],
-			"script": "d3(?:\\.v2)?(?:\\.min)?\\.js"
+			"script": "d3(?:\\. v[0-9]+)?(?:\\.min)?\\.js",
+			"env": "^d3$"
 		},
 		"Dancer": {
 			"website": "perldancer.org",
@@ -728,7 +740,6 @@
 		"Dotclear": {
 			"website": "dotclear.org",
 			"cats": [ 1 ],
-			"meta": { "dc.title": ".*" },
 			"implies": "PHP"
 		},
 		"DotNetNuke": {
@@ -749,7 +760,7 @@
 		"DreamWeaver": {
 			"website": "www.adobe.com/products/dreamweaver",
 			"cats": [ 20 ],
-			"html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) {)\\;version:\\1"
+			"html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1"
 		},
 		"Drupal": {
 			"website": "drupal.org",
@@ -997,6 +1008,11 @@
 			"meta": { "generator": "GetSimple" },
 			"implies": "PHP"
 		},
+		"Ghost": {
+			"website": "ghost.org",
+			"cats": [ 11 ],
+			"headers": { "X-Ghost-Cache-Status": ".*" }
+ 		},
 		"GoAhead": {
 			"website": "embedthis.com/products/goahead/index.html",
 			"cats": [ 22 ],
@@ -1005,8 +1021,8 @@
 		"Google Analytics": {
 			"website": "google.com/analytics",
 			"cats": [ 10 ],
-			"html": "_gaq\\.push\\(\\['_setAccount",
-			"script": "(?:\\.google-analytics\\.com/ga\\.js|google-analytics\\.com/urchin\\.js)",
+			"html": "_gaq\\.push\\(\\['_setAccount|i\\['GoogleAnalyticsObject'\\]|ga\\.async = true",
+			"script": "(?:\\.google-analytics\\.com\/ga\\.js|\/urchin\\.js|\\.google-analytics\\.com\/analytics\\.js)",
 			"headers": { "Set-Cookie": "__utma" },
 			"env": "^gaGlobal$"
 		},
@@ -1108,6 +1124,11 @@
 			"cats": [ 12 ],
 			"env": "^Handlebars$"
 		},
+		"Hello Bar": {
+			"cats": [ 5 ],
+			"script": "(hellobar\\.com/hellobar\\.js|new HelloBar)",
+			"html": "/hellobar\\.js" 
+		},
 		"Hiawatha": {
 			"website": "hiawatha-webserver.org",
 			"cats": [ 22 ],
@@ -1152,6 +1173,11 @@
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": "Java"
 		},
+		"IBM Coremetrics": {
+			"website": "ibm.com/software/marketing-solutions/coremetrics",
+			"cats": [ 10 ],
+			"script": "cmdatatagutils\\.js"
+		},
 		"IBM HTTP Server": {
 			"website": "ibm.com/software/webservers/httpservers",
 			"cats": [ 22 ],
@@ -1196,6 +1222,11 @@
 			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
+		"Incapsula": {
+			"website": "www.incapsula.com",
+			"cats": [ 31 ],
+			"headers": { "X-CDN": "Incapsula" }
+		},
 		"Indexhibit": {
 			"website": "www.indexhibit.org",
 			"cats": [ 1 ],
@@ -1521,6 +1552,11 @@
 			"cats": [ 11 ],
 			"url": "\\.livejournal\\.com"
 		},
+		"LiveStreet CMS": {
+			"website": "livestreetcms.com",
+			"cats": [ 1 ],
+			"headers": { "X-Powered-By": "LiveStreet CMS" }
+		},
 		"Lockerz Share": {
 			"website": "share.lockerz.com",
 			"cats": [ 5 ],
@@ -1561,12 +1597,24 @@
 			"cats": [ 13 ],
 			"html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker"
 		},
+		"ManyContacts": {
+			"website": "www.manycontacts.com",
+			"cats": [ 5 ],
+			"html": "\/assets\/js\/manycontacts\\.min\\.js",
+			"script": "\/assets\/js\/manycontacts\\.min\\.js"
+		},
 		"Marketo": {
 			"website": "www.marketo.com",
 			"cats": [ 32 ],
 			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
 			"env": "^Munchkin$"
 		},
+		"MathJax": {
+			"website": "mathjax.org",
+			"cats": [ 25 ],
+			"script": "mathjax.js",
+			"env": "^MathJax$"
+		},
 		"MaxSite CMS": {
 			"website": "max-3000.com",
 			"cats": [ 1 ],
@@ -1588,10 +1636,10 @@
 			"cats": [ 5 ],
 			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\(?:'domReady'\\))"
 		},
-		"Méthode": {
+		"Methode": {
 			"website": "www.eidosmedia.com/solutions",
 			"cats": [ 1 ],
-			"env": "^eidosBase$;\\confidence:99",
+			"env": "^eidosBase$\\;confidence:99",
 			"html": "<!-- Methode uuid: \"[a-f0-9]+\" ?-->",
 			"meta": { "eomportal-instanceid": "[0-9]+", "eomportal-id": "[0-9]+", "eomportal-loid": "[0-9.]+", "eomportal-uuid": "[a-f0-9]+", "eomportal-lastUpdate": ".*" }
 		},
@@ -1600,7 +1648,7 @@
 			"cats": [ 18 ],
 			"url": "\\.aspx(?:$|\\?)",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
-			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "ASP\\.NET\\;confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": "IIS\\;confidence:50"
 		},
 		"Microsoft SharePoint": {
@@ -1903,9 +1951,15 @@
 			"html": "<!--[^>]+published by Open Text Web Solutions",
 			"implies": "Microsoft ASP.NET"
 		},
+		"Ophal": {
+			"website": "ophal.org",
+			"cats": [ 1, 11, 18 ],
+			"headers": { "X-Powered-By": "^Ophal/" }
+		},
 		"Optimizely": {
 			"website": "optimizely.com",
 			"cats": [ 10 ],
+			"script": "optimizely\\.com.*\\.js",
 			"env": "^optimizely$"
 		},
 		"Oracle Application Server": {
@@ -2052,6 +2106,7 @@
 		"Piwik": {
 			"website": "piwik.org",
 			"cats": [ 10 ],
+			"script": "piwik\\.js|piwik\\.php",
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
 			"env": [ "^Piwik$", "^_paq$" ]
 		},
@@ -2145,7 +2200,14 @@
 		"Quick.Cart": {
 			"website": "opensolution.org",
 			"cats": [ 6 ],
-			"html": "<a href=\"[^>]+opensolution\\.org/\">Powered by"
+			"meta": { "generator": "Quick\\.Cart(?: v([\\d.]+))?\\;version:\\1" },
+			"html": "<a href=\"[^>]+opensolution\\.org/\">(?:Shopping cart by|Sklep internetowy)"
+		},
+		"Quick.CMS": {
+			"website": "opensolution.org",
+			"cats": [ 1 ],
+			"meta": { "generator": "Quick\\.CMS(?: v([\\d.]+))?\\;version:\\1" },
+			"html": "<a href=\"[^>]+opensolution\\.org/\">CMS by"
 		},
 		"RackCache": {
 			"website": "github.com/rtomayko/rack-cache",
@@ -2329,7 +2391,7 @@
 			"env": "^Shopify$"
 		},
 		"Shopware": {
-			"website": "shopware.de",
+			"website": "shopware.com",
 			"cats": [ 6 ],
 			"meta": { "application-name": "Shopware" },
 			"script": "shopware\\.js",
@@ -2357,8 +2419,10 @@
 			"script": "sitemeter\\.com/js/counter\\.js\\?site="
 		},
 		"SiteCatalyst": {
-			"website": "www.omniture.com/en/products/online_analytics/sitecatalyst",
+			"website": "www.omniture.com\/en\/products\/online_analytics\/sitecatalyst",
 			"cats": [ 10 ],
+			"script": "\/s_code.js",
+			"html": "var s_code=s\\.t\\(\\);if\\(s_code\\)document\\.write\\(s_code\\)",
 			"env": "^s_account$"
 		},
 		"SiteEdit": {
@@ -2618,7 +2682,7 @@
 			"website": "typo3.com",
 			"cats": [ 1 ],
 			"headers": { "Set-Cookie": "fe_typo_user" },
-			"meta": { "generator": "TYPO3" },
+			"meta": { "generator": "TYPO3\\s?([\\d.]+)?\\;version:\\1" },
 			"html": "(?:<(?:script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)",
 			"url": "/typo3/",
 			"implies": "PHP"
@@ -2641,6 +2705,11 @@
 			"meta": { "generator": "uCore PHP Framework" },
 			"implies": "PHP"
 		},
+		"UIKit": {
+			"website": "getuikit.com",
+			"cats": [ 18 ],
+			"script": "uikit.*\\.js"
+		},
 		"Umbraco": {
 			"website": "umbraco.com",
 			"cats": [ 1 ],
@@ -2755,6 +2824,19 @@
 			"headers": { "X-Powered-By": "W3 Total Cache(?:/([\\d.]+))?\\;version:\\1" },
 			"implies": "WordPress"
 		},
+		"Web2py": {
+			"website": "http://web2py.com",
+			"cats": [ 18 ],
+			"script": "web2py\\.js",
+			"headers": { "X-Powered-By": "web2py" },
+			"implies": [ "Python" , "jQuery" ]
+		},
+		"Webix": {
+			"website": "webix.com",
+			"cats": [ 12 ],
+			"script": [ "\bwebix.js" ],
+			"env": "^webix$"
+		},
 		"Web Optimizer": {
 			"website": "www.web-optimizer.us",
 			"cats": [ 10 ],
@@ -2836,6 +2918,15 @@
 			"cats": [ 1 ],
 			"html": "(?:<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
 		},
+		"WooCommerce": {
+			"website": "www.woothemes.com/woocommerce",
+			"cats": [ 6 ],
+			"env": "woocommerce",
+			"html": "<!-- WooCommerce",
+			"script": "woocommerce",
+			"meta": { "generator": "WooCommerce ([\\d.]+);version:\\1" },
+			"implies": [ "WordPress", "PHP" ]
+		},
 		"Woopra": {
 			"website": "www.woopra.com",
 			"cats": [ 10 ],
@@ -2860,6 +2951,13 @@
 			"cats": [ 38 ],
 			"html": "<title>Wowza Media Server \\d+ ((\\w+ Edition )?\\d+\\.[\\d\\.]+( build\\d+)?)?\\;version:\\1"
 		},
+		"WP Rocket": {
+			"website": "wp-rocket.me",
+			"cats": [ 23 ],
+			"html": "<!--[^>]+WP Rocket",
+			"headers": { "X-Powered-By": "WP Rocket(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": "WordPress"
+		},
 		"Xajax": {
 			"website": "xajax-project.org",
 			"cats": [ 12 ],
@@ -2938,7 +3036,8 @@
 		"Yandex.Metrika": {
 			"website": "metrika.yandex.com",
 			"cats": [ 10 ],
-			"script": "mc\\.yandex\\.ru/metrika/watch\\.js"
+			"html": "mc\\.yandex\\.ru\/metrika\/watch\\.js|\\b(?:yaParams|yaCounter|yandex_metrika_callbacks)\\b",
+			"script": "mc\\.yandex\\.ru\/metrika\/watch\\.js"
 		},
 		"YouTube": {
 			"website": "www.youtube.com",
@@ -3001,37 +3100,6 @@
 			"website": "foundation.zurb.com",
 			"cats": [ 18 ],
 			"html": "<link[^>]+foundation[^>\"]+css"
-		},
-		"WooCommerce": {
-			"website": "www.woothemes.com/woocommerce",
-			"cats": [ 6 ],
-			"env": "woocommerce",
-			"html": "<!-- WooCommerce",
-			"script": "woocommerce",
-			"meta": { "generator": "WooCommerce ([\\d.]+);version:\\1" },
-			"implies": [ "WordPress", "PHP" ]
-		},
-		"LiveStreet CMS": {
-			"website": "livestreetcms.com",
-			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "LiveStreet CMS" }
-		},
-		"Ophal": {
-			"website": "ophal.org",
-			"cats": [ 1, 11, 18 ],
-			"headers": { "X-Powered-By": "^Ophal/" }
-		},
-		"UIKit": {
-			"website": "getuikit.com",
-			"cats": [ 18 ],
-			"script": "uikit.*\\.js"
-		},
-		"Web2py": {
-			"website": "http://web2py.com",
-			"cats": [ 18 ],
-			"script": "web2py\\.js",
-			"headers": { "X-Powered-By": "web2py" },
-			"implies": [ "Python" , "jQuery" ]
 		}
 	}
 }
diff --git a/share/images/icons-32/Google AdSense.png b/share/images/icons-32/Google AdSense.png
deleted file mode 100644
index fd1be3b20..000000000
Binary files a/share/images/icons-32/Google AdSense.png and /dev/null differ
diff --git a/share/images/icons-32/Snap.svg.png b/share/images/icons-32/Snap.svg.png
deleted file mode 100644
index 2118f9632..000000000
Binary files a/share/images/icons-32/Snap.svg.png and /dev/null differ
diff --git a/share/images/icons-32/WooCommerce.png b/share/images/icons-32/WooCommerce.png
deleted file mode 100644
index ba714d3b5..000000000
Binary files a/share/images/icons-32/WooCommerce.png and /dev/null differ
diff --git a/share/images/icons/2z Project.png b/share/images/icons/2z Project.png
index 8e887904d..9b39574d0 100644
Binary files a/share/images/icons/2z Project.png and b/share/images/icons/2z Project.png differ
diff --git a/share/images/icons/3dCart.png b/share/images/icons/3dCart.png
index 618a44c61..54bbcdda7 100644
Binary files a/share/images/icons/3dCart.png and b/share/images/icons/3dCart.png differ
diff --git a/share/images/icons/AMPcms.png b/share/images/icons/AMPcms.png
index c25786c36..a372c05fe 100644
Binary files a/share/images/icons/AMPcms.png and b/share/images/icons/AMPcms.png differ
diff --git a/share/images/icons/AT Internet Analyzer.png b/share/images/icons/AT Internet Analyzer.png
index 1e0760e2c..d0ec37a7c 100644
Binary files a/share/images/icons/AT Internet Analyzer.png and b/share/images/icons/AT Internet Analyzer.png differ
diff --git a/share/images/icons/AT Internet XiTi.png b/share/images/icons/AT Internet XiTi.png
index 1e0760e2c..d0ec37a7c 100644
Binary files a/share/images/icons/AT Internet XiTi.png and b/share/images/icons/AT Internet XiTi.png differ
diff --git a/share/images/icons/ATEN.png b/share/images/icons/ATEN.png
index f15a46b5f..103bb5bb4 100755
Binary files a/share/images/icons/ATEN.png and b/share/images/icons/ATEN.png differ
diff --git a/share/images/icons/ATG Web Commerce.png b/share/images/icons/ATG Web Commerce.png
index c16a0b85f..063282891 100644
Binary files a/share/images/icons/ATG Web Commerce.png and b/share/images/icons/ATG Web Commerce.png differ
diff --git a/share/images/icons/Accessible Portal.png b/share/images/icons/Accessible Portal.png
index e3615a7b1..894cb58ff 100644
Binary files a/share/images/icons/Accessible Portal.png and b/share/images/icons/Accessible Portal.png differ
diff --git a/share/images/icons/Adobe CQ5.png b/share/images/icons/Adobe CQ5.png
index 46da78df4..48084fc15 100644
Binary files a/share/images/icons/Adobe CQ5.png and b/share/images/icons/Adobe CQ5.png differ
diff --git a/share/images/icons/Adobe ColdFusion.png b/share/images/icons/Adobe ColdFusion.png
index d29d36e85..b8424fb73 100644
Binary files a/share/images/icons/Adobe ColdFusion.png and b/share/images/icons/Adobe ColdFusion.png differ
diff --git a/share/images/icons/Advanced Web Stats.png b/share/images/icons/Advanced Web Stats.png
index 0583b4432..11e1ab54c 100644
Binary files a/share/images/icons/Advanced Web Stats.png and b/share/images/icons/Advanced Web Stats.png differ
diff --git a/share/images/icons/Akamai.png b/share/images/icons/Akamai.png
new file mode 100644
index 000000000..ea9931504
Binary files /dev/null and b/share/images/icons/Akamai.png differ
diff --git a/share/images/icons/Alloy.png b/share/images/icons/Alloy.png
new file mode 100755
index 000000000..56a9952fd
Binary files /dev/null and b/share/images/icons/Alloy.png differ
diff --git a/share/images/icons/Amiro.CMS.png b/share/images/icons/Amiro.CMS.png
index 4762fe92b..1eb961124 100644
Binary files a/share/images/icons/Amiro.CMS.png and b/share/images/icons/Amiro.CMS.png differ
diff --git a/share/images/icons/Anchor CMS.png b/share/images/icons/Anchor CMS.png
new file mode 100644
index 000000000..1839a9d40
Binary files /dev/null and b/share/images/icons/Anchor CMS.png differ
diff --git a/share/images/icons/Apache Hadoop.png b/share/images/icons/Apache Hadoop.png
index bba57138c..597a05c34 100755
Binary files a/share/images/icons/Apache Hadoop.png and b/share/images/icons/Apache Hadoop.png differ
diff --git a/share/images/icons/Apache JSPWiki.png b/share/images/icons/Apache JSPWiki.png
index 65d7cd73a..25a2fca9b 100644
Binary files a/share/images/icons/Apache JSPWiki.png and b/share/images/icons/Apache JSPWiki.png differ
diff --git a/share/images/icons/Apache Tomcat.png b/share/images/icons/Apache Tomcat.png
index 5c02510b1..430ce13b4 100644
Binary files a/share/images/icons/Apache Tomcat.png and b/share/images/icons/Apache Tomcat.png differ
diff --git a/share/images/icons/Apache Traffic Server.png b/share/images/icons/Apache Traffic Server.png
index 84db1dcf2..b1a453fc7 100644
Binary files a/share/images/icons/Apache Traffic Server.png and b/share/images/icons/Apache Traffic Server.png differ
diff --git a/share/images/icons/Apache.png b/share/images/icons/Apache.png
index d268dcca8..4fa18b786 100644
Binary files a/share/images/icons/Apache.png and b/share/images/icons/Apache.png differ
diff --git a/share/images/icons/AsciiDoc.png b/share/images/icons/AsciiDoc.png
index 9bf9b62a9..97cbed726 100644
Binary files a/share/images/icons/AsciiDoc.png and b/share/images/icons/AsciiDoc.png differ
diff --git a/share/images/icons/Atlassian Confluence.png b/share/images/icons/Atlassian Confluence.png
index 87027bad6..076f9523e 100644
Binary files a/share/images/icons/Atlassian Confluence.png and b/share/images/icons/Atlassian Confluence.png differ
diff --git a/share/images/icons/Atlassian Jira.png b/share/images/icons/Atlassian Jira.png
index 0e20a66c7..564f1a18b 100644
Binary files a/share/images/icons/Atlassian Jira.png and b/share/images/icons/Atlassian Jira.png differ
diff --git a/share/images/icons/BIGACE.png b/share/images/icons/BIGACE.png
index 543acf11e..a9ac614e6 100644
Binary files a/share/images/icons/BIGACE.png and b/share/images/icons/BIGACE.png differ
diff --git a/share/images/icons/Backbone.js.png b/share/images/icons/Backbone.js.png
index b80ead023..e17c0b9c0 100644
Binary files a/share/images/icons/Backbone.js.png and b/share/images/icons/Backbone.js.png differ
diff --git a/share/images/icons/BaseHTTP.png b/share/images/icons/BaseHTTP.png
index b1715bacd..d5aecbb53 100755
Binary files a/share/images/icons/BaseHTTP.png and b/share/images/icons/BaseHTTP.png differ
diff --git a/share/images/icons/BigDump.png b/share/images/icons/BigDump.png
index 82de06207..6171a0b83 100644
Binary files a/share/images/icons/BigDump.png and b/share/images/icons/BigDump.png differ
diff --git a/share/images/icons/Bigcommerce.png b/share/images/icons/Bigcommerce.png
index 62a650b97..2cdc10861 100644
Binary files a/share/images/icons/Bigcommerce.png and b/share/images/icons/Bigcommerce.png differ
diff --git a/share/images/icons/Bigware.png b/share/images/icons/Bigware.png
index 5ab10f9f9..5b32e3948 100644
Binary files a/share/images/icons/Bigware.png and b/share/images/icons/Bigware.png differ
diff --git a/share/images/icons/BittAds.png b/share/images/icons/BittAds.png
index c10d514b6..a8f37476f 100644
Binary files a/share/images/icons/BittAds.png and b/share/images/icons/BittAds.png differ
diff --git a/share/images/icons/Blogger.png b/share/images/icons/Blogger.png
index 52fec6cdb..17bd56bd6 100644
Binary files a/share/images/icons/Blogger.png and b/share/images/icons/Blogger.png differ
diff --git a/share/images/icons/Boa.png b/share/images/icons/Boa.png
index 82de06207..207559d8a 100644
Binary files a/share/images/icons/Boa.png and b/share/images/icons/Boa.png differ
diff --git a/share/images/icons/Brother.png b/share/images/icons/Brother.png
index fbc41595e..737a03288 100755
Binary files a/share/images/icons/Brother.png and b/share/images/icons/Brother.png differ
diff --git a/share/images/icons/BrowserCMS.png b/share/images/icons/BrowserCMS.png
index 9af4e824a..e0aa64890 100644
Binary files a/share/images/icons/BrowserCMS.png and b/share/images/icons/BrowserCMS.png differ
diff --git a/share/images/icons/Bugzilla.png b/share/images/icons/Bugzilla.png
index 91c4ced31..184aa8e08 100644
Binary files a/share/images/icons/Bugzilla.png and b/share/images/icons/Bugzilla.png differ
diff --git a/share/images/icons/Burning Board.png b/share/images/icons/Burning Board.png
index 0d40f00d0..7117d8fa3 100644
Binary files a/share/images/icons/Burning Board.png and b/share/images/icons/Burning Board.png differ
diff --git a/share/images/icons/Business Catalyst.png b/share/images/icons/Business Catalyst.png
index b3b324083..2c1f2ea03 100644
Binary files a/share/images/icons/Business Catalyst.png and b/share/images/icons/Business Catalyst.png differ
diff --git a/share/images/icons/CFML.png b/share/images/icons/CFML.png
index d29d36e85..b8424fb73 100644
Binary files a/share/images/icons/CFML.png and b/share/images/icons/CFML.png differ
diff --git a/share/images/icons/CKEditor.png b/share/images/icons/CKEditor.png
index 3d1874ddb..c2c6883e9 100644
Binary files a/share/images/icons/CKEditor.png and b/share/images/icons/CKEditor.png differ
diff --git a/share/images/icons/CMS Made Simple.png b/share/images/icons/CMS Made Simple.png
index 8d0136e50..afd497d89 100644
Binary files a/share/images/icons/CMS Made Simple.png and b/share/images/icons/CMS Made Simple.png differ
diff --git a/share/images/icons/Cargo.png b/share/images/icons/Cargo.png
index d0b9fec43..c8c74cd6a 100644
Binary files a/share/images/icons/Cargo.png and b/share/images/icons/Cargo.png differ
diff --git a/share/images/icons/CentOS.png b/share/images/icons/CentOS.png
index e128ad470..b2fbd5a45 100644
Binary files a/share/images/icons/CentOS.png and b/share/images/icons/CentOS.png differ
diff --git a/share/images/icons/Chameleon.png b/share/images/icons/Chameleon.png
index afb9960c0..9494e745f 100644
Binary files a/share/images/icons/Chameleon.png and b/share/images/icons/Chameleon.png differ
diff --git a/share/images/icons/Cherokee.png b/share/images/icons/Cherokee.png
index 7dd4c4bf5..a0d513b9c 100644
Binary files a/share/images/icons/Cherokee.png and b/share/images/icons/Cherokee.png differ
diff --git a/share/images/icons/CherryPy.png b/share/images/icons/CherryPy.png
index 284963120..75fa50094 100755
Binary files a/share/images/icons/CherryPy.png and b/share/images/icons/CherryPy.png differ
diff --git a/share/images/icons/ClickHeat.png b/share/images/icons/ClickHeat.png
index fb97a99cf..19b40064d 100644
Binary files a/share/images/icons/ClickHeat.png and b/share/images/icons/ClickHeat.png differ
diff --git a/share/images/icons/ClickTale.png b/share/images/icons/ClickTale.png
index 592cbfc5f..186d83d11 100644
Binary files a/share/images/icons/ClickTale.png and b/share/images/icons/ClickTale.png differ
diff --git a/share/images/icons/CloudFlare.png b/share/images/icons/CloudFlare.png
index 85fc2cae1..5630c550a 100644
Binary files a/share/images/icons/CloudFlare.png and b/share/images/icons/CloudFlare.png differ
diff --git a/share/images/icons/CodeIgniter.png b/share/images/icons/CodeIgniter.png
index 206726a64..8d3f6bd9b 100644
Binary files a/share/images/icons/CodeIgniter.png and b/share/images/icons/CodeIgniter.png differ
diff --git a/share/images/icons/Commerce Server.png b/share/images/icons/Commerce Server.png
index 0a7a91e9d..f0e1c1232 100644
Binary files a/share/images/icons/Commerce Server.png and b/share/images/icons/Commerce Server.png differ
diff --git a/share/images/icons/Contens.png b/share/images/icons/Contens.png
index d5c8d9cec..8bb39880f 100644
Binary files a/share/images/icons/Contens.png and b/share/images/icons/Contens.png differ
diff --git a/share/images/icons/ConversionLab.png b/share/images/icons/ConversionLab.png
index 13c5ec6fd..a8396bfb2 100644
Binary files a/share/images/icons/ConversionLab.png and b/share/images/icons/ConversionLab.png differ
diff --git a/share/images/icons/CouchDB.png b/share/images/icons/CouchDB.png
index 141690977..a0a44225a 100644
Binary files a/share/images/icons/CouchDB.png and b/share/images/icons/CouchDB.png differ
diff --git a/share/images/icons/D3.png b/share/images/icons/D3.png
new file mode 100644
index 000000000..8645ec897
Binary files /dev/null and b/share/images/icons/D3.png differ
diff --git a/share/images/icons/Debian.png b/share/images/icons/Debian.png
index bd7b20476..21a8e88f2 100644
Binary files a/share/images/icons/Debian.png and b/share/images/icons/Debian.png differ
diff --git a/share/images/icons/DirectAdmin.png b/share/images/icons/DirectAdmin.png
index 726e93305..b7a17e969 100644
Binary files a/share/images/icons/DirectAdmin.png and b/share/images/icons/DirectAdmin.png differ
diff --git a/share/images/icons/Disqus.png b/share/images/icons/Disqus.png
index 9eb361b26..d0d67e07c 100644
Binary files a/share/images/icons/Disqus.png and b/share/images/icons/Disqus.png differ
diff --git a/share/images/icons/Django CMS.png b/share/images/icons/Django CMS.png
index 08a5399fe..59837dff9 100644
Binary files a/share/images/icons/Django CMS.png and b/share/images/icons/Django CMS.png differ
diff --git a/share/images/icons/Django.png b/share/images/icons/Django.png
index 354306e58..ae23f6fec 100644
Binary files a/share/images/icons/Django.png and b/share/images/icons/Django.png differ
diff --git a/share/images/icons/Dojo.png b/share/images/icons/Dojo.png
index 617adf5e1..96833c395 100644
Binary files a/share/images/icons/Dojo.png and b/share/images/icons/Dojo.png differ
diff --git a/share/images/icons/Dokeos.png b/share/images/icons/Dokeos.png
index 049389d1b..bc9baed38 100644
Binary files a/share/images/icons/Dokeos.png and b/share/images/icons/Dokeos.png differ
diff --git a/share/images/icons/DotNetNuke.png b/share/images/icons/DotNetNuke.png
index 837994a72..ab3c8226a 100644
Binary files a/share/images/icons/DotNetNuke.png and b/share/images/icons/DotNetNuke.png differ
diff --git a/share/images/icons/Drupal Commerce.png b/share/images/icons/Drupal Commerce.png
index df859f669..93a571f96 100644
Binary files a/share/images/icons/Drupal Commerce.png and b/share/images/icons/Drupal Commerce.png differ
diff --git a/share/images/icons/Drupal.png b/share/images/icons/Drupal.png
index 92d8e847c..1703a47b4 100644
Binary files a/share/images/icons/Drupal.png and b/share/images/icons/Drupal.png differ
diff --git a/share/images/icons/Dynamicweb.png b/share/images/icons/Dynamicweb.png
index 36c8392d0..e1e4be9ac 100644
Binary files a/share/images/icons/Dynamicweb.png and b/share/images/icons/Dynamicweb.png differ
diff --git a/share/images/icons/EPiServer.png b/share/images/icons/EPiServer.png
index 7329fc6d7..c175a4c82 100644
Binary files a/share/images/icons/EPiServer.png and b/share/images/icons/EPiServer.png differ
diff --git a/share/images/icons/EPrints.png b/share/images/icons/EPrints.png
index b365399ef..d75acab6c 100644
Binary files a/share/images/icons/EPrints.png and b/share/images/icons/EPrints.png differ
diff --git a/share/images/icons/Ecodoo.png b/share/images/icons/Ecodoo.png
new file mode 100755
index 000000000..5e9854648
Binary files /dev/null and b/share/images/icons/Ecodoo.png differ
diff --git a/share/images/icons/EdgeCast.png b/share/images/icons/EdgeCast.png
index 5ef195cb5..eebbd802f 100644
Binary files a/share/images/icons/EdgeCast.png and b/share/images/icons/EdgeCast.png differ
diff --git a/share/images/icons/Eloqua.png b/share/images/icons/Eloqua.png
index 832bcbf51..0934c9da6 100644
Binary files a/share/images/icons/Eloqua.png and b/share/images/icons/Eloqua.png differ
diff --git a/share/images/icons/Embedthis-http.png b/share/images/icons/Embedthis-http.png
index 23192d7e2..a591e6096 100644
Binary files a/share/images/icons/Embedthis-http.png and b/share/images/icons/Embedthis-http.png differ
diff --git a/share/images/icons/Ember.js.png b/share/images/icons/Ember.js.png
index 290a0567c..e123ab062 100644
Binary files a/share/images/icons/Ember.js.png and b/share/images/icons/Ember.js.png differ
diff --git a/share/images/icons/Enyo.png b/share/images/icons/Enyo.png
index 02a958707..40fb00108 100644
Binary files a/share/images/icons/Enyo.png and b/share/images/icons/Enyo.png differ
diff --git a/share/images/icons/Erlang.png b/share/images/icons/Erlang.png
index 070b5f08e..5de4f739a 100755
Binary files a/share/images/icons/Erlang.png and b/share/images/icons/Erlang.png differ
diff --git a/share/images/icons/Exhibit.png b/share/images/icons/Exhibit.png
index 2d5c833d9..ea147ff97 100644
Binary files a/share/images/icons/Exhibit.png and b/share/images/icons/Exhibit.png differ
diff --git a/share/images/icons/Express.png b/share/images/icons/Express.png
index 82de06207..a298292ad 100644
Binary files a/share/images/icons/Express.png and b/share/images/icons/Express.png differ
diff --git a/share/images/icons/ExpressionEngine.png b/share/images/icons/ExpressionEngine.png
index 88f9dcb99..997b8c110 100644
Binary files a/share/images/icons/ExpressionEngine.png and b/share/images/icons/ExpressionEngine.png differ
diff --git a/share/images/icons/FWP.png b/share/images/icons/FWP.png
index 5b912c837..2f556e7b3 100644
Binary files a/share/images/icons/FWP.png and b/share/images/icons/FWP.png differ
diff --git a/share/images/icons/Fact Finder.png b/share/images/icons/Fact Finder.png
index 5cdd6c9a5..2ec03c073 100644
Binary files a/share/images/icons/Fact Finder.png and b/share/images/icons/Fact Finder.png differ
diff --git a/share/images/icons/FlashCom.png b/share/images/icons/FlashCom.png
index 82de06207..f70af8eef 100644
Binary files a/share/images/icons/FlashCom.png and b/share/images/icons/FlashCom.png differ
diff --git a/share/images/icons/FlexCMP.png b/share/images/icons/FlexCMP.png
index f2d8b673a..965533fff 100644
Binary files a/share/images/icons/FlexCMP.png and b/share/images/icons/FlexCMP.png differ
diff --git a/share/images/icons/FreeBSD.png b/share/images/icons/FreeBSD.png
index 9eb2a324b..55c2e284a 100644
Binary files a/share/images/icons/FreeBSD.png and b/share/images/icons/FreeBSD.png differ
diff --git a/share/images/icons/FrontPage.png b/share/images/icons/FrontPage.png
index 25c1de4a8..36cc942f3 100644
Binary files a/share/images/icons/FrontPage.png and b/share/images/icons/FrontPage.png differ
diff --git a/share/images/icons/G-WAN.png b/share/images/icons/G-WAN.png
index 9f2c68d9b..6e8707a79 100644
Binary files a/share/images/icons/G-WAN.png and b/share/images/icons/G-WAN.png differ
diff --git a/share/images/icons/GX WebManager.png b/share/images/icons/GX WebManager.png
index fc792a8ed..0e4edcb84 100644
Binary files a/share/images/icons/GX WebManager.png and b/share/images/icons/GX WebManager.png differ
diff --git a/share/images/icons/Gambio.png b/share/images/icons/Gambio.png
index 13cd4881a..866dc0cf0 100644
Binary files a/share/images/icons/Gambio.png and b/share/images/icons/Gambio.png differ
diff --git a/share/images/icons/Gauges.png b/share/images/icons/Gauges.png
index d2ce5c8f3..73849914f 100644
Binary files a/share/images/icons/Gauges.png and b/share/images/icons/Gauges.png differ
diff --git a/share/images/icons/Gentoo.png b/share/images/icons/Gentoo.png
index 10864c0c5..1014eed68 100644
Binary files a/share/images/icons/Gentoo.png and b/share/images/icons/Gentoo.png differ
diff --git a/share/images/icons/Get Satisfaction.png b/share/images/icons/Get Satisfaction.png
index 78963b47f..06c62411e 100644
Binary files a/share/images/icons/Get Satisfaction.png and b/share/images/icons/Get Satisfaction.png differ
diff --git a/share/images/icons/Ghost.png b/share/images/icons/Ghost.png
new file mode 100644
index 000000000..93830a93e
Binary files /dev/null and b/share/images/icons/Ghost.png differ
diff --git a/share/images/icons/GoAhead.png b/share/images/icons/GoAhead.png
index 23192d7e2..a591e6096 100644
Binary files a/share/images/icons/GoAhead.png and b/share/images/icons/GoAhead.png differ
diff --git a/share/images/icons/GoStats.png b/share/images/icons/GoStats.png
index d84b2d94c..e753ba1ce 100644
Binary files a/share/images/icons/GoStats.png and b/share/images/icons/GoStats.png differ
diff --git a/share/images/icons/Google AdSense.png b/share/images/icons/Google AdSense.png
index 2acf27dd9..8169e9683 100644
Binary files a/share/images/icons/Google AdSense.png and b/share/images/icons/Google AdSense.png differ
diff --git a/share/images/icons/Google Analytics.png b/share/images/icons/Google Analytics.png
index 593898bc5..2c64f78ba 100644
Binary files a/share/images/icons/Google Analytics.png and b/share/images/icons/Google Analytics.png differ
diff --git a/share/images/icons/Google App Engine.png b/share/images/icons/Google App Engine.png
index db4506ed1..2a672ddfe 100644
Binary files a/share/images/icons/Google App Engine.png and b/share/images/icons/Google App Engine.png differ
diff --git a/share/images/icons/Google Code Prettify.png b/share/images/icons/Google Code Prettify.png
index 9e526a2b5..6eedad51e 100644
Binary files a/share/images/icons/Google Code Prettify.png and b/share/images/icons/Google Code Prettify.png differ
diff --git a/share/images/icons/Google Font API.png b/share/images/icons/Google Font API.png
index 59c87b22d..432832532 100644
Binary files a/share/images/icons/Google Font API.png and b/share/images/icons/Google Font API.png differ
diff --git a/share/images/icons/Google Friend Connect.png b/share/images/icons/Google Friend Connect.png
new file mode 100644
index 000000000..b7312ccd6
Binary files /dev/null and b/share/images/icons/Google Friend Connect.png differ
diff --git a/share/images/icons/Google Maps.png b/share/images/icons/Google Maps.png
index a8d141451..a1801e681 100644
Binary files a/share/images/icons/Google Maps.png and b/share/images/icons/Google Maps.png differ
diff --git a/share/images/icons/Google PageSpeed.png b/share/images/icons/Google PageSpeed.png
index dd417a6ac..8f830f0e4 100644
Binary files a/share/images/icons/Google PageSpeed.png and b/share/images/icons/Google PageSpeed.png differ
diff --git a/share/images/icons/Google Sites.png b/share/images/icons/Google Sites.png
index 428df7729..74823b014 100644
Binary files a/share/images/icons/Google Sites.png and b/share/images/icons/Google Sites.png differ
diff --git a/share/images/icons/Google Web Toolkit.png b/share/images/icons/Google Web Toolkit.png
index 2b6970769..2910082f3 100644
Binary files a/share/images/icons/Google Web Toolkit.png and b/share/images/icons/Google Web Toolkit.png differ
diff --git a/share/images/icons/Graffiti CMS.png b/share/images/icons/Graffiti CMS.png
index 1cdf4d9a4..fdeeffe85 100644
Binary files a/share/images/icons/Graffiti CMS.png and b/share/images/icons/Graffiti CMS.png differ
diff --git a/share/images/icons/Gravatar.png b/share/images/icons/Gravatar.png
index 4bb7fc315..81617329d 100644
Binary files a/share/images/icons/Gravatar.png and b/share/images/icons/Gravatar.png differ
diff --git a/share/images/icons/Gravity Insights.png b/share/images/icons/Gravity Insights.png
index 333c908eb..54228a3f0 100644
Binary files a/share/images/icons/Gravity Insights.png and b/share/images/icons/Gravity Insights.png differ
diff --git a/share/images/icons/Handlebars.png b/share/images/icons/Handlebars.png
index 904749127..a29a77f28 100644
Binary files a/share/images/icons/Handlebars.png and b/share/images/icons/Handlebars.png differ
diff --git a/share/images/icons/Hello Bar.png b/share/images/icons/Hello Bar.png
new file mode 100644
index 000000000..0750ebf07
Binary files /dev/null and b/share/images/icons/Hello Bar.png differ
diff --git a/share/images/icons/Hiawatha.png b/share/images/icons/Hiawatha.png
index 26fbeafa6..b3b29d230 100644
Binary files a/share/images/icons/Hiawatha.png and b/share/images/icons/Hiawatha.png differ
diff --git a/share/images/icons/Hogan.js.png b/share/images/icons/Hogan.js.png
index 82de06207..e0b2c5a8a 100644
Binary files a/share/images/icons/Hogan.js.png and b/share/images/icons/Hogan.js.png differ
diff --git a/share/images/icons/Hotaru CMS.png b/share/images/icons/Hotaru CMS.png
index 7c4d5e824..af1576ff9 100644
Binary files a/share/images/icons/Hotaru CMS.png and b/share/images/icons/Hotaru CMS.png differ
diff --git a/share/images/icons/HubSpot.png b/share/images/icons/HubSpot.png
index db5f23399..ebf24d623 100644
Binary files a/share/images/icons/HubSpot.png and b/share/images/icons/HubSpot.png differ
diff --git a/share/images/icons/Hybris.png b/share/images/icons/Hybris.png
index 9d6dcf8dc..f448296b8 100644
Binary files a/share/images/icons/Hybris.png and b/share/images/icons/Hybris.png differ
diff --git a/share/images/icons/IBM Coremetrics.png b/share/images/icons/IBM Coremetrics.png
new file mode 100644
index 000000000..26106b25f
Binary files /dev/null and b/share/images/icons/IBM Coremetrics.png differ
diff --git a/share/images/icons/IIS.png b/share/images/icons/IIS.png
index 1fff4b6fd..16e7b712e 100644
Binary files a/share/images/icons/IIS.png and b/share/images/icons/IIS.png differ
diff --git a/share/images/icons/ImpressCMS.png b/share/images/icons/ImpressCMS.png
index a61e4a629..023f159d6 100644
Binary files a/share/images/icons/ImpressCMS.png and b/share/images/icons/ImpressCMS.png differ
diff --git a/share/images/icons/Incapsula.png b/share/images/icons/Incapsula.png
new file mode 100644
index 000000000..997f02fe8
Binary files /dev/null and b/share/images/icons/Incapsula.png differ
diff --git a/share/images/icons/Indexhibit.png b/share/images/icons/Indexhibit.png
index 82de06207..5459fd787 100644
Binary files a/share/images/icons/Indexhibit.png and b/share/images/icons/Indexhibit.png differ
diff --git a/share/images/icons/InstantCMS.png b/share/images/icons/InstantCMS.png
index 128f46a00..389b3dbc0 100644
Binary files a/share/images/icons/InstantCMS.png and b/share/images/icons/InstantCMS.png differ
diff --git a/share/images/icons/Intercom.png b/share/images/icons/Intercom.png
index b64833cac..506fdefd6 100644
Binary files a/share/images/icons/Intercom.png and b/share/images/icons/Intercom.png differ
diff --git a/share/images/icons/JS Charts.png b/share/images/icons/JS Charts.png
index 201e3b565..b5ed61d07 100644
Binary files a/share/images/icons/JS Charts.png and b/share/images/icons/JS Charts.png differ
diff --git a/share/images/icons/Jalios.png b/share/images/icons/Jalios.png
index 5054a4fb6..9cf7872af 100644
Binary files a/share/images/icons/Jalios.png and b/share/images/icons/Jalios.png differ
diff --git a/share/images/icons/Java Servlet.png b/share/images/icons/Java Servlet.png
index 07343e523..396923fb7 100644
Binary files a/share/images/icons/Java Servlet.png and b/share/images/icons/Java Servlet.png differ
diff --git a/share/images/icons/Java.png b/share/images/icons/Java.png
index 07343e523..396923fb7 100644
Binary files a/share/images/icons/Java.png and b/share/images/icons/Java.png differ
diff --git a/share/images/icons/JavaServer Pages.png b/share/images/icons/JavaServer Pages.png
index 07343e523..396923fb7 100644
Binary files a/share/images/icons/JavaServer Pages.png and b/share/images/icons/JavaServer Pages.png differ
diff --git a/share/images/icons/Javascript Infovis Toolkit.png b/share/images/icons/Javascript Infovis Toolkit.png
index 82de06207..3440fc088 100644
Binary files a/share/images/icons/Javascript Infovis Toolkit.png and b/share/images/icons/Javascript Infovis Toolkit.png differ
diff --git a/share/images/icons/Jetty.png b/share/images/icons/Jetty.png
index e92d10ce9..b5ee0f043 100755
Binary files a/share/images/icons/Jetty.png and b/share/images/icons/Jetty.png differ
diff --git a/share/images/icons/Jo.png b/share/images/icons/Jo.png
index 9ff98037e..477faf75b 100644
Binary files a/share/images/icons/Jo.png and b/share/images/icons/Jo.png differ
diff --git a/share/images/icons/JobberBase.png b/share/images/icons/JobberBase.png
index 376317019..119bb9196 100644
Binary files a/share/images/icons/JobberBase.png and b/share/images/icons/JobberBase.png differ
diff --git a/share/images/icons/K2.png b/share/images/icons/K2.png
index 437430900..deb9d443e 100644
Binary files a/share/images/icons/K2.png and b/share/images/icons/K2.png differ
diff --git a/share/images/icons/KISSmetrics.png b/share/images/icons/KISSmetrics.png
index e31d177e6..17671200a 100644
Binary files a/share/images/icons/KISSmetrics.png and b/share/images/icons/KISSmetrics.png differ
diff --git a/share/images/icons/Kampyle.png b/share/images/icons/Kampyle.png
index eccb4d15b..e2641f009 100644
Binary files a/share/images/icons/Kampyle.png and b/share/images/icons/Kampyle.png differ
diff --git a/share/images/icons/KineticJS.png b/share/images/icons/KineticJS.png
index 786f497e1..d2832f6f2 100644
Binary files a/share/images/icons/KineticJS.png and b/share/images/icons/KineticJS.png differ
diff --git a/share/images/icons/Knockout.js.png b/share/images/icons/Knockout.js.png
index a3c1b7967..c05fd0897 100644
Binary files a/share/images/icons/Knockout.js.png and b/share/images/icons/Knockout.js.png differ
diff --git a/share/images/icons/Koego.png b/share/images/icons/Koego.png
index 08bac03aa..72e498be8 100644
Binary files a/share/images/icons/Koego.png and b/share/images/icons/Koego.png differ
diff --git a/share/images/icons/Kohana.png b/share/images/icons/Kohana.png
index 78cb8518a..0dbc574fe 100644
Binary files a/share/images/icons/Kohana.png and b/share/images/icons/Kohana.png differ
diff --git a/share/images/icons/Kolibri CMS.png b/share/images/icons/Kolibri CMS.png
index 00c9fa1b9..79b1ae3c6 100644
Binary files a/share/images/icons/Kolibri CMS.png and b/share/images/icons/Kolibri CMS.png differ
diff --git a/share/images/icons/LEPTON.png b/share/images/icons/LEPTON.png
index 9837b17ab..f5e3b690b 100644
Binary files a/share/images/icons/LEPTON.png and b/share/images/icons/LEPTON.png differ
diff --git a/share/images/icons/LabVIEW.png b/share/images/icons/LabVIEW.png
index 5b7b191c8..72e2cb0ee 100755
Binary files a/share/images/icons/LabVIEW.png and b/share/images/icons/LabVIEW.png differ
diff --git a/share/images/icons/Laravel.png b/share/images/icons/Laravel.png
index 334f6b516..4c2d0f141 100644
Binary files a/share/images/icons/Laravel.png and b/share/images/icons/Laravel.png differ
diff --git a/share/images/icons/Less.png b/share/images/icons/Less.png
index 4d7b6bf2b..0a2c19e7e 100644
Binary files a/share/images/icons/Less.png and b/share/images/icons/Less.png differ
diff --git a/share/images/icons/Lift.png b/share/images/icons/Lift.png
index 692ba31bd..9ee1c2e5e 100644
Binary files a/share/images/icons/Lift.png and b/share/images/icons/Lift.png differ
diff --git a/share/images/icons/LightMon Engine.png b/share/images/icons/LightMon Engine.png
index 6c2765511..7f8d2660b 100644
Binary files a/share/images/icons/LightMon Engine.png and b/share/images/icons/LightMon Engine.png differ
diff --git a/share/images/icons/Lightbox.png b/share/images/icons/Lightbox.png
index 1307f6daf..5201c0668 100644
Binary files a/share/images/icons/Lightbox.png and b/share/images/icons/Lightbox.png differ
diff --git a/share/images/icons/LimeSurvey.png b/share/images/icons/LimeSurvey.png
index 194c581ac..9b585257f 100644
Binary files a/share/images/icons/LimeSurvey.png and b/share/images/icons/LimeSurvey.png differ
diff --git a/share/images/icons/LiveJournal.png b/share/images/icons/LiveJournal.png
index 81969d86c..62416e00e 100644
Binary files a/share/images/icons/LiveJournal.png and b/share/images/icons/LiveJournal.png differ
diff --git a/share/images/icons/Livefyre.png b/share/images/icons/Livefyre.png
index f603ac2a5..c94224e81 100644
Binary files a/share/images/icons/Livefyre.png and b/share/images/icons/Livefyre.png differ
diff --git a/share/images/icons/Locomotive.png b/share/images/icons/Locomotive.png
index 43d0bee95..8efe08707 100644
Binary files a/share/images/icons/Locomotive.png and b/share/images/icons/Locomotive.png differ
diff --git a/share/images/icons/Logitech Media Server.png b/share/images/icons/Logitech Media Server.png
index 49fdebdd9..0fd207417 100755
Binary files a/share/images/icons/Logitech Media Server.png and b/share/images/icons/Logitech Media Server.png differ
diff --git a/share/images/icons/MOBOTIX.png b/share/images/icons/MOBOTIX.png
index 23f842a04..a4574629c 100755
Binary files a/share/images/icons/MOBOTIX.png and b/share/images/icons/MOBOTIX.png differ
diff --git a/share/images/icons/MODx.png b/share/images/icons/MODx.png
index fd46660ca..77c322ab8 100644
Binary files a/share/images/icons/MODx.png and b/share/images/icons/MODx.png differ
diff --git a/share/images/icons/Magento.png b/share/images/icons/Magento.png
index d5e01b402..7d4769e28 100644
Binary files a/share/images/icons/Magento.png and b/share/images/icons/Magento.png differ
diff --git a/share/images/icons/MantisBT.png b/share/images/icons/MantisBT.png
index 6d32af05a..3b042a3d6 100644
Binary files a/share/images/icons/MantisBT.png and b/share/images/icons/MantisBT.png differ
diff --git a/share/images/icons/ManyContacts.png b/share/images/icons/ManyContacts.png
new file mode 100644
index 000000000..570450fe5
Binary files /dev/null and b/share/images/icons/ManyContacts.png differ
diff --git a/share/images/icons/Marketo.png b/share/images/icons/Marketo.png
index 0a7294c8f..a3452e34a 100644
Binary files a/share/images/icons/Marketo.png and b/share/images/icons/Marketo.png differ
diff --git a/share/images/icons/MathJax.png b/share/images/icons/MathJax.png
new file mode 100644
index 000000000..0ad53b380
Binary files /dev/null and b/share/images/icons/MathJax.png differ
diff --git a/share/images/icons/MaxSite CMS.png b/share/images/icons/MaxSite CMS.png
index 45e35d5d9..425f58fec 100644
Binary files a/share/images/icons/MaxSite CMS.png and b/share/images/icons/MaxSite CMS.png differ
diff --git a/share/images/icons/MediaElement.js.png b/share/images/icons/MediaElement.js.png
index 507102dfd..a95762dfd 100644
Binary files a/share/images/icons/MediaElement.js.png and b/share/images/icons/MediaElement.js.png differ
diff --git a/share/images/icons/MediaWiki.png b/share/images/icons/MediaWiki.png
index e9efb9ed9..0878bb1d3 100644
Binary files a/share/images/icons/MediaWiki.png and b/share/images/icons/MediaWiki.png differ
diff --git a/share/images/icons/Meebo.png b/share/images/icons/Meebo.png
index a93bedc39..f872d0393 100644
Binary files a/share/images/icons/Meebo.png and b/share/images/icons/Meebo.png differ
diff --git a/share/images/icons/Methode.png b/share/images/icons/Methode.png
new file mode 100644
index 000000000..d1cf1b672
Binary files /dev/null and b/share/images/icons/Methode.png differ
diff --git a/share/images/icons/MiniServ.png b/share/images/icons/MiniServ.png
index 82de06207..4129d1827 100644
Binary files a/share/images/icons/MiniServ.png and b/share/images/icons/MiniServ.png differ
diff --git a/share/images/icons/Mint.png b/share/images/icons/Mint.png
index a9b63e459..888004275 100644
Binary files a/share/images/icons/Mint.png and b/share/images/icons/Mint.png differ
diff --git a/share/images/icons/Mixpanel.png b/share/images/icons/Mixpanel.png
index a57131c0b..ea1b74d04 100644
Binary files a/share/images/icons/Mixpanel.png and b/share/images/icons/Mixpanel.png differ
diff --git a/share/images/icons/MochiKit.png b/share/images/icons/MochiKit.png
index cb0d34472..baa80a120 100644
Binary files a/share/images/icons/MochiKit.png and b/share/images/icons/MochiKit.png differ
diff --git a/share/images/icons/Mojolicious.png b/share/images/icons/Mojolicious.png
index 1bdf24d81..eb286535e 100644
Binary files a/share/images/icons/Mojolicious.png and b/share/images/icons/Mojolicious.png differ
diff --git a/share/images/icons/Mondo Media.png b/share/images/icons/Mondo Media.png
index 09441d91c..24512feeb 100644
Binary files a/share/images/icons/Mondo Media.png and b/share/images/icons/Mondo Media.png differ
diff --git a/share/images/icons/MongoDB.png b/share/images/icons/MongoDB.png
index cf331738d..9a6d5f0d3 100644
Binary files a/share/images/icons/MongoDB.png and b/share/images/icons/MongoDB.png differ
diff --git a/share/images/icons/Mongrel.png b/share/images/icons/Mongrel.png
index 60a180250..798526980 100644
Binary files a/share/images/icons/Mongrel.png and b/share/images/icons/Mongrel.png differ
diff --git a/share/images/icons/MooTools.png b/share/images/icons/MooTools.png
index 85b14a9e1..dac800869 100644
Binary files a/share/images/icons/MooTools.png and b/share/images/icons/MooTools.png differ
diff --git a/share/images/icons/Moogo.png b/share/images/icons/Moogo.png
index be6a65db7..22f2bdae5 100644
Binary files a/share/images/icons/Moogo.png and b/share/images/icons/Moogo.png differ
diff --git a/share/images/icons/Movable Type.png b/share/images/icons/Movable Type.png
index 67f3dd730..a176899ea 100644
Binary files a/share/images/icons/Movable Type.png and b/share/images/icons/Movable Type.png differ
diff --git a/share/images/icons/Mura CMS.png b/share/images/icons/Mura CMS.png
index dc656c2f6..030b2624c 100644
Binary files a/share/images/icons/Mura CMS.png and b/share/images/icons/Mura CMS.png differ
diff --git a/share/images/icons/Mustache.png b/share/images/icons/Mustache.png
index 756ff9d45..9f99dc890 100644
Binary files a/share/images/icons/Mustache.png and b/share/images/icons/Mustache.png differ
diff --git a/share/images/icons/MyBB.png b/share/images/icons/MyBB.png
index c1cb3177b..e97f9306d 100644
Binary files a/share/images/icons/MyBB.png and b/share/images/icons/MyBB.png differ
diff --git a/share/images/icons/MyBlogLog.png b/share/images/icons/MyBlogLog.png
index fe06aab7a..4960c0b2e 100644
Binary files a/share/images/icons/MyBlogLog.png and b/share/images/icons/MyBlogLog.png differ
diff --git a/share/images/icons/MySQL.png b/share/images/icons/MySQL.png
index 0cd0335b8..3b33b319f 100644
Binary files a/share/images/icons/MySQL.png and b/share/images/icons/MySQL.png differ
diff --git a/share/images/icons/Mynetcap.png b/share/images/icons/Mynetcap.png
index 212890dd7..01ee5bc86 100644
Binary files a/share/images/icons/Mynetcap.png and b/share/images/icons/Mynetcap.png differ
diff --git a/share/images/icons/Nedstat.png b/share/images/icons/Nedstat.png
index 5447a5d1e..98bc8c15b 100644
Binary files a/share/images/icons/Nedstat.png and b/share/images/icons/Nedstat.png differ
diff --git a/share/images/icons/Netmonitor.png b/share/images/icons/Netmonitor.png
index 891572e9d..979d8af8e 100644
Binary files a/share/images/icons/Netmonitor.png and b/share/images/icons/Netmonitor.png differ
diff --git a/share/images/icons/Nginx.png b/share/images/icons/Nginx.png
index e8aed0fed..4e4b68196 100644
Binary files a/share/images/icons/Nginx.png and b/share/images/icons/Nginx.png differ
diff --git a/share/images/icons/Nokia Maps.png b/share/images/icons/Nokia Maps.png
index b3e7e3c4f..3cd87079b 100644
Binary files a/share/images/icons/Nokia Maps.png and b/share/images/icons/Nokia Maps.png differ
diff --git a/share/images/icons/OneStat.png b/share/images/icons/OneStat.png
index a00ba25b5..2cfdb26e1 100644
Binary files a/share/images/icons/OneStat.png and b/share/images/icons/OneStat.png differ
diff --git a/share/images/icons/OpenCart.png b/share/images/icons/OpenCart.png
index 6d3a86612..e0c2098f9 100644
Binary files a/share/images/icons/OpenCart.png and b/share/images/icons/OpenCart.png differ
diff --git a/share/images/icons/OpenGSE.png b/share/images/icons/OpenGSE.png
index b38aca4fa..12740cb8f 100644
Binary files a/share/images/icons/OpenGSE.png and b/share/images/icons/OpenGSE.png differ
diff --git a/share/images/icons/OpenLayers.png b/share/images/icons/OpenLayers.png
index b1bdefb25..7fa4ec6ab 100644
Binary files a/share/images/icons/OpenLayers.png and b/share/images/icons/OpenLayers.png differ
diff --git a/share/images/icons/OpenNemas.png b/share/images/icons/OpenNemas.png
index ece320ce9..f0d3701ee 100644
Binary files a/share/images/icons/OpenNemas.png and b/share/images/icons/OpenNemas.png differ
diff --git a/share/images/icons/Ophal.png b/share/images/icons/Ophal.png
index 896f0f190..22dc9c137 100644
Binary files a/share/images/icons/Ophal.png and b/share/images/icons/Ophal.png differ
diff --git a/share/images/icons/Optimizely.png b/share/images/icons/Optimizely.png
index dde19d42d..cb21ba05c 100644
Binary files a/share/images/icons/Optimizely.png and b/share/images/icons/Optimizely.png differ
diff --git a/share/images/icons/Oracle Application Server.png b/share/images/icons/Oracle Application Server.png
index 832bcbf51..fe549fca5 100644
Binary files a/share/images/icons/Oracle Application Server.png and b/share/images/icons/Oracle Application Server.png differ
diff --git a/share/images/icons/Oracle Recommendations On Demand.png b/share/images/icons/Oracle Recommendations On Demand.png
index c2c693860..466d55146 100644
Binary files a/share/images/icons/Oracle Recommendations On Demand.png and b/share/images/icons/Oracle Recommendations On Demand.png differ
diff --git a/share/images/icons/PANSITE.png b/share/images/icons/PANSITE.png
index 4a241ebb0..a2d74d998 100644
Binary files a/share/images/icons/PANSITE.png and b/share/images/icons/PANSITE.png differ
diff --git a/share/images/icons/PHP-Fusion.png b/share/images/icons/PHP-Fusion.png
index f2e0fcf1a..2c6bcd7ff 100644
Binary files a/share/images/icons/PHP-Fusion.png and b/share/images/icons/PHP-Fusion.png differ
diff --git a/share/images/icons/PHP.png b/share/images/icons/PHP.png
index dbfcbb760..b8f6b466c 100644
Binary files a/share/images/icons/PHP.png and b/share/images/icons/PHP.png differ
diff --git a/share/images/icons/Pardot.png b/share/images/icons/Pardot.png
index 985bccaa8..a80803bcc 100644
Binary files a/share/images/icons/Pardot.png and b/share/images/icons/Pardot.png differ
diff --git a/share/images/icons/Parse.ly.png b/share/images/icons/Parse.ly.png
index 13f8b44c7..346974db8 100644
Binary files a/share/images/icons/Parse.ly.png and b/share/images/icons/Parse.ly.png differ
diff --git a/share/images/icons/Perl.png b/share/images/icons/Perl.png
index 508efd87a..4228f48c1 100644
Binary files a/share/images/icons/Perl.png and b/share/images/icons/Perl.png differ
diff --git a/share/images/icons/Phpcms.png b/share/images/icons/Phpcms.png
index 4e5d86a75..11b28ab2d 100644
Binary files a/share/images/icons/Phpcms.png and b/share/images/icons/Phpcms.png differ
diff --git a/share/images/icons/Plentymarkets.png b/share/images/icons/Plentymarkets.png
index 4527302b7..2c047fdef 100644
Binary files a/share/images/icons/Plentymarkets.png and b/share/images/icons/Plentymarkets.png differ
diff --git a/share/images/icons/Plesk.png b/share/images/icons/Plesk.png
index 6908f871c..de4c44d81 100644
Binary files a/share/images/icons/Plesk.png and b/share/images/icons/Plesk.png differ
diff --git a/share/images/icons/Pligg.png b/share/images/icons/Pligg.png
index 396c47bd7..52a28d4ad 100644
Binary files a/share/images/icons/Pligg.png and b/share/images/icons/Pligg.png differ
diff --git a/share/images/icons/Plone.png b/share/images/icons/Plone.png
index b69810e2b..30e4f7f6c 100644
Binary files a/share/images/icons/Plone.png and b/share/images/icons/Plone.png differ
diff --git a/share/images/icons/Plura.png b/share/images/icons/Plura.png
index 68c76f525..ed1c1148b 100644
Binary files a/share/images/icons/Plura.png and b/share/images/icons/Plura.png differ
diff --git a/share/images/icons/Po.st.png b/share/images/icons/Po.st.png
index c4644bcb1..8679c872d 100644
Binary files a/share/images/icons/Po.st.png and b/share/images/icons/Po.st.png differ
diff --git a/share/images/icons/Powergap.png b/share/images/icons/Powergap.png
index d90bd2ddb..ba702bba2 100644
Binary files a/share/images/icons/Powergap.png and b/share/images/icons/Powergap.png differ
diff --git a/share/images/icons/Prefix-Free.png b/share/images/icons/Prefix-Free.png
index 51bc39f65..722f0f1f6 100644
Binary files a/share/images/icons/Prefix-Free.png and b/share/images/icons/Prefix-Free.png differ
diff --git a/share/images/icons/Prestashop.png b/share/images/icons/Prestashop.png
index 4fa7049c2..2b9598633 100644
Binary files a/share/images/icons/Prestashop.png and b/share/images/icons/Prestashop.png differ
diff --git a/share/images/icons/Prototype.png b/share/images/icons/Prototype.png
index 260c8f1ec..372d35366 100644
Binary files a/share/images/icons/Prototype.png and b/share/images/icons/Prototype.png differ
diff --git a/share/images/icons/Protovis.png b/share/images/icons/Protovis.png
index 82de06207..198c25072 100644
Binary files a/share/images/icons/Protovis.png and b/share/images/icons/Protovis.png differ
diff --git a/share/images/icons/Python.png b/share/images/icons/Python.png
index b1715bacd..795219ab6 100644
Binary files a/share/images/icons/Python.png and b/share/images/icons/Python.png differ
diff --git a/share/images/icons/Quantcast.png b/share/images/icons/Quantcast.png
index 2da1533f2..39e2b8237 100644
Binary files a/share/images/icons/Quantcast.png and b/share/images/icons/Quantcast.png differ
diff --git a/share/images/icons/Quick.CMS.png b/share/images/icons/Quick.CMS.png
new file mode 100644
index 000000000..4f250d8c1
Binary files /dev/null and b/share/images/icons/Quick.CMS.png differ
diff --git a/share/images/icons/RBS Change.png b/share/images/icons/RBS Change.png
index 74d241a9d..cce994edb 100644
Binary files a/share/images/icons/RBS Change.png and b/share/images/icons/RBS Change.png differ
diff --git a/share/images/icons/RCMS.png b/share/images/icons/RCMS.png
index d7cf63aab..ef48b165f 100644
Binary files a/share/images/icons/RCMS.png and b/share/images/icons/RCMS.png differ
diff --git a/share/images/icons/RackCache.png b/share/images/icons/RackCache.png
index cac13376d..8438c6021 100644
Binary files a/share/images/icons/RackCache.png and b/share/images/icons/RackCache.png differ
diff --git a/share/images/icons/Raphael.png b/share/images/icons/Raphael.png
index 87bb78103..c317e2b2c 100644
Binary files a/share/images/icons/Raphael.png and b/share/images/icons/Raphael.png differ
diff --git a/share/images/icons/ReallyCMS.png b/share/images/icons/ReallyCMS.png
index c9465b68a..72c20a7d5 100644
Binary files a/share/images/icons/ReallyCMS.png and b/share/images/icons/ReallyCMS.png differ
diff --git a/share/images/icons/Red Hat.png b/share/images/icons/Red Hat.png
index 4c06b8ea7..da1a33353 100644
Binary files a/share/images/icons/Red Hat.png and b/share/images/icons/Red Hat.png differ
diff --git a/share/images/icons/Reddit.png b/share/images/icons/Reddit.png
index 4a75935a6..d7167ea42 100644
Binary files a/share/images/icons/Reddit.png and b/share/images/icons/Reddit.png differ
diff --git a/share/images/icons/Redmine.png b/share/images/icons/Redmine.png
index 253215ef5..b42dc027c 100644
Binary files a/share/images/icons/Redmine.png and b/share/images/icons/Redmine.png differ
diff --git a/share/images/icons/RequireJS.png b/share/images/icons/RequireJS.png
index e5229c5dd..a9e3a95b0 100644
Binary files a/share/images/icons/RequireJS.png and b/share/images/icons/RequireJS.png differ
diff --git a/share/images/icons/Reveal.js.png b/share/images/icons/Reveal.js.png
index 086813423..63bb6777c 100644
Binary files a/share/images/icons/Reveal.js.png and b/share/images/icons/Reveal.js.png differ
diff --git a/share/images/icons/RiteCMS.png b/share/images/icons/RiteCMS.png
index f813ce926..939024adc 100644
Binary files a/share/images/icons/RiteCMS.png and b/share/images/icons/RiteCMS.png differ
diff --git a/share/images/icons/RoundCube.png b/share/images/icons/RoundCube.png
index 282816135..03138588c 100644
Binary files a/share/images/icons/RoundCube.png and b/share/images/icons/RoundCube.png differ
diff --git a/share/images/icons/Ruby on Rails.png b/share/images/icons/Ruby on Rails.png
index 47adbada0..52b8ed837 100644
Binary files a/share/images/icons/Ruby on Rails.png and b/share/images/icons/Ruby on Rails.png differ
diff --git a/share/images/icons/Ruby.png b/share/images/icons/Ruby.png
index 8dea8a683..918cd5a15 100644
Binary files a/share/images/icons/Ruby.png and b/share/images/icons/Ruby.png differ
diff --git a/share/images/icons/SAP.png b/share/images/icons/SAP.png
index 08f1233c7..4c213e796 100644
Binary files a/share/images/icons/SAP.png and b/share/images/icons/SAP.png differ
diff --git a/share/images/icons/SDL Tridion.png b/share/images/icons/SDL Tridion.png
index 7925be2a2..aee365988 100644
Binary files a/share/images/icons/SDL Tridion.png and b/share/images/icons/SDL Tridion.png differ
diff --git a/share/images/icons/SOBI 2.png b/share/images/icons/SOBI 2.png
index 0ebfcad6d..75ff050af 100644
Binary files a/share/images/icons/SOBI 2.png and b/share/images/icons/SOBI 2.png differ
diff --git a/share/images/icons/SPDY.png b/share/images/icons/SPDY.png
index 3f77ec286..7b1cd1fec 100644
Binary files a/share/images/icons/SPDY.png and b/share/images/icons/SPDY.png differ
diff --git a/share/images/icons/SQLite.png b/share/images/icons/SQLite.png
index ed1e16f46..678a660f5 100644
Binary files a/share/images/icons/SQLite.png and b/share/images/icons/SQLite.png differ
diff --git a/share/images/icons/SUSE.png b/share/images/icons/SUSE.png
index 7a19b9956..dd9288e07 100644
Binary files a/share/images/icons/SUSE.png and b/share/images/icons/SUSE.png differ
diff --git a/share/images/icons/SWFObject.png b/share/images/icons/SWFObject.png
index d0fd6118a..b341bc07c 100644
Binary files a/share/images/icons/SWFObject.png and b/share/images/icons/SWFObject.png differ
diff --git a/share/images/icons/Scala.png b/share/images/icons/Scala.png
index d7c12a357..38e964c20 100644
Binary files a/share/images/icons/Scala.png and b/share/images/icons/Scala.png differ
diff --git a/share/images/icons/Sencha Touch.png b/share/images/icons/Sencha Touch.png
index 88669f027..181921d92 100644
Binary files a/share/images/icons/Sencha Touch.png and b/share/images/icons/Sencha Touch.png differ
diff --git a/share/images/icons/Sentinel Keys Server.png b/share/images/icons/Sentinel Keys Server.png
index 50e127fbf..9fa007fc2 100755
Binary files a/share/images/icons/Sentinel Keys Server.png and b/share/images/icons/Sentinel Keys Server.png differ
diff --git a/share/images/icons/Sentinel License Monitor.png b/share/images/icons/Sentinel License Monitor.png
index 50e127fbf..9fa007fc2 100755
Binary files a/share/images/icons/Sentinel License Monitor.png and b/share/images/icons/Sentinel License Monitor.png differ
diff --git a/share/images/icons/Sentinel Protection Server.png b/share/images/icons/Sentinel Protection Server.png
index 50e127fbf..9fa007fc2 100755
Binary files a/share/images/icons/Sentinel Protection Server.png and b/share/images/icons/Sentinel Protection Server.png differ
diff --git a/share/images/icons/Seoshop.png b/share/images/icons/Seoshop.png
index 6242d6cec..29f50bec2 100644
Binary files a/share/images/icons/Seoshop.png and b/share/images/icons/Seoshop.png differ
diff --git a/share/images/icons/Serendipity.png b/share/images/icons/Serendipity.png
new file mode 100644
index 000000000..4c51340a2
Binary files /dev/null and b/share/images/icons/Serendipity.png differ
diff --git a/share/images/icons/ShinyStat.png b/share/images/icons/ShinyStat.png
index 6f08a5ae1..11f956024 100644
Binary files a/share/images/icons/ShinyStat.png and b/share/images/icons/ShinyStat.png differ
diff --git a/share/images/icons/Shopify.png b/share/images/icons/Shopify.png
index c196a88f1..5db40b4ea 100644
Binary files a/share/images/icons/Shopify.png and b/share/images/icons/Shopify.png differ
diff --git a/share/images/icons/Shopware.png b/share/images/icons/Shopware.png
index 7da7b369b..8387cd683 100644
Binary files a/share/images/icons/Shopware.png and b/share/images/icons/Shopware.png differ
diff --git a/share/images/icons/Silva.png b/share/images/icons/Silva.png
index ae211de69..595ab7a0d 100644
Binary files a/share/images/icons/Silva.png and b/share/images/icons/Silva.png differ
diff --git a/share/images/icons/SilverStripe.png b/share/images/icons/SilverStripe.png
index 1bee739fe..12208dbd5 100644
Binary files a/share/images/icons/SilverStripe.png and b/share/images/icons/SilverStripe.png differ
diff --git a/share/images/icons/SiteDNK.png b/share/images/icons/SiteDNK.png
new file mode 100644
index 000000000..40da93be8
Binary files /dev/null and b/share/images/icons/SiteDNK.png differ
diff --git a/share/images/icons/Smartstore.png b/share/images/icons/Smartstore.png
index 163b16848..1c35a5195 100644
Binary files a/share/images/icons/Smartstore.png and b/share/images/icons/Smartstore.png differ
diff --git a/share/images/icons/Snap.svg.png b/share/images/icons/Snap.svg.png
index c2eb909e9..df78fc588 100644
Binary files a/share/images/icons/Snap.svg.png and b/share/images/icons/Snap.svg.png differ
diff --git a/share/images/icons/Snoobi.png b/share/images/icons/Snoobi.png
index 8830fe1a5..aec2092b0 100644
Binary files a/share/images/icons/Snoobi.png and b/share/images/icons/Snoobi.png differ
diff --git a/share/images/icons/Sphinx.png b/share/images/icons/Sphinx.png
index dc68d600d..e0edb8e17 100644
Binary files a/share/images/icons/Sphinx.png and b/share/images/icons/Sphinx.png differ
diff --git a/share/images/icons/Splunk.png b/share/images/icons/Splunk.png
index 52de0b59f..aec997697 100755
Binary files a/share/images/icons/Splunk.png and b/share/images/icons/Splunk.png differ
diff --git a/share/images/icons/Splunkd.png b/share/images/icons/Splunkd.png
index 52de0b59f..aec997697 100755
Binary files a/share/images/icons/Splunkd.png and b/share/images/icons/Splunkd.png differ
diff --git a/share/images/icons/Spree.png b/share/images/icons/Spree.png
index 29e27d40f..25cf4541c 100644
Binary files a/share/images/icons/Spree.png and b/share/images/icons/Spree.png differ
diff --git a/share/images/icons/Squiz Matrix.png b/share/images/icons/Squiz Matrix.png
index 47c78a362..0440ed0da 100644
Binary files a/share/images/icons/Squiz Matrix.png and b/share/images/icons/Squiz Matrix.png differ
diff --git a/share/images/icons/Store Systems.png b/share/images/icons/Store Systems.png
index bdd779087..33761006f 100644
Binary files a/share/images/icons/Store Systems.png and b/share/images/icons/Store Systems.png differ
diff --git a/share/images/icons/SublimeVideo.png b/share/images/icons/SublimeVideo.png
index cf11ecbdc..8d4bf5d42 100644
Binary files a/share/images/icons/SublimeVideo.png and b/share/images/icons/SublimeVideo.png differ
diff --git a/share/images/icons/Subrion.png b/share/images/icons/Subrion.png
index 123e29f21..8d246fd92 100755
Binary files a/share/images/icons/Subrion.png and b/share/images/icons/Subrion.png differ
diff --git a/share/images/icons/SunOS.png b/share/images/icons/SunOS.png
old mode 100755
new mode 100644
index 832bcbf51..fe549fca5
Binary files a/share/images/icons/SunOS.png and b/share/images/icons/SunOS.png differ
diff --git a/share/images/icons/Swiftlet.png b/share/images/icons/Swiftlet.png
index 0672a6602..055149f7d 100644
Binary files a/share/images/icons/Swiftlet.png and b/share/images/icons/Swiftlet.png differ
diff --git a/share/images/icons/TYPO3.png b/share/images/icons/TYPO3.png
index 46927f902..d1a22279f 100644
Binary files a/share/images/icons/TYPO3.png and b/share/images/icons/TYPO3.png differ
diff --git a/share/images/icons/TYPOlight.png b/share/images/icons/TYPOlight.png
new file mode 100644
index 000000000..d711f83f4
Binary files /dev/null and b/share/images/icons/TYPOlight.png differ
diff --git a/share/images/icons/Tealeaf.png b/share/images/icons/Tealeaf.png
index 1618befa5..9ff279599 100644
Binary files a/share/images/icons/Tealeaf.png and b/share/images/icons/Tealeaf.png differ
diff --git a/share/images/icons/Tiki Wiki CMS Groupware.png b/share/images/icons/Tiki Wiki CMS Groupware.png
index 3349e3980..9eff83bd0 100644
Binary files a/share/images/icons/Tiki Wiki CMS Groupware.png and b/share/images/icons/Tiki Wiki CMS Groupware.png differ
diff --git a/share/images/icons/Timeline.png b/share/images/icons/Timeline.png
new file mode 100644
index 000000000..ce6051cc8
Binary files /dev/null and b/share/images/icons/Timeline.png differ
diff --git a/share/images/icons/Timeplot.png b/share/images/icons/Timeplot.png
index b436d2e59..89af95088 100644
Binary files a/share/images/icons/Timeplot.png and b/share/images/icons/Timeplot.png differ
diff --git a/share/images/icons/TinyMCE.png b/share/images/icons/TinyMCE.png
index da042f6f6..d8fd9b82c 100644
Binary files a/share/images/icons/TinyMCE.png and b/share/images/icons/TinyMCE.png differ
diff --git a/share/images/icons/TomatoCart.png b/share/images/icons/TomatoCart.png
index 83c1ff69c..8646e911e 100644
Binary files a/share/images/icons/TomatoCart.png and b/share/images/icons/TomatoCart.png differ
diff --git a/share/images/icons/Tumblr.png b/share/images/icons/Tumblr.png
index 764e74818..34a9fb875 100644
Binary files a/share/images/icons/Tumblr.png and b/share/images/icons/Tumblr.png differ
diff --git a/share/images/icons/Twitter Bootstrap.png b/share/images/icons/Twitter Bootstrap.png
index ad559df4d..9b150e666 100644
Binary files a/share/images/icons/Twitter Bootstrap.png and b/share/images/icons/Twitter Bootstrap.png differ
diff --git a/share/images/icons/TypePad.png b/share/images/icons/TypePad.png
index 0e82db822..98456e528 100644
Binary files a/share/images/icons/TypePad.png and b/share/images/icons/TypePad.png differ
diff --git a/share/images/icons/Typekit.png b/share/images/icons/Typekit.png
index f98d127ec..ddddf9294 100644
Binary files a/share/images/icons/Typekit.png and b/share/images/icons/Typekit.png differ
diff --git a/share/images/icons/UIKit.png b/share/images/icons/UIKit.png
index d36b1106e..c9cc221a0 100644
Binary files a/share/images/icons/UIKit.png and b/share/images/icons/UIKit.png differ
diff --git a/share/images/icons/UNIX.png b/share/images/icons/UNIX.png
index 528c8aa61..84801bb16 100644
Binary files a/share/images/icons/UNIX.png and b/share/images/icons/UNIX.png differ
diff --git a/share/images/icons/Ubercart.png b/share/images/icons/Ubercart.png
index 97aa87c4a..d2dcbc2ed 100644
Binary files a/share/images/icons/Ubercart.png and b/share/images/icons/Ubercart.png differ
diff --git a/share/images/icons/Ubuntu.png b/share/images/icons/Ubuntu.png
index cca82a0c6..58088c65b 100644
Binary files a/share/images/icons/Ubuntu.png and b/share/images/icons/Ubuntu.png differ
diff --git a/share/images/icons/Umbraco.png b/share/images/icons/Umbraco.png
index 373a15048..690b53bb4 100644
Binary files a/share/images/icons/Umbraco.png and b/share/images/icons/Umbraco.png differ
diff --git a/share/images/icons/UserRules.png b/share/images/icons/UserRules.png
index a6d574e70..218603d15 100644
Binary files a/share/images/icons/UserRules.png and b/share/images/icons/UserRules.png differ
diff --git a/share/images/icons/UserVoice.png b/share/images/icons/UserVoice.png
index 751e02129..cab9a0cd3 100644
Binary files a/share/images/icons/UserVoice.png and b/share/images/icons/UserVoice.png differ
diff --git a/share/images/icons/VIVVO.png b/share/images/icons/VIVVO.png
index 976bbfc7b..c821f52c0 100644
Binary files a/share/images/icons/VIVVO.png and b/share/images/icons/VIVVO.png differ
diff --git a/share/images/icons/VP-ASP.png b/share/images/icons/VP-ASP.png
index ad2882a19..1a9ed9a2c 100644
Binary files a/share/images/icons/VP-ASP.png and b/share/images/icons/VP-ASP.png differ
diff --git a/share/images/icons/Vanilla.png b/share/images/icons/Vanilla.png
index 8d43a2b60..d81ce670b 100644
Binary files a/share/images/icons/Vanilla.png and b/share/images/icons/Vanilla.png differ
diff --git a/share/images/icons/Varnish.png b/share/images/icons/Varnish.png
index d0aa93911..e547d7467 100644
Binary files a/share/images/icons/Varnish.png and b/share/images/icons/Varnish.png differ
diff --git a/share/images/icons/Vimeo.png b/share/images/icons/Vimeo.png
index 50ba5ab04..c18915a4f 100644
Binary files a/share/images/icons/Vimeo.png and b/share/images/icons/Vimeo.png differ
diff --git a/share/images/icons/VisualPath.png b/share/images/icons/VisualPath.png
index 13c5ec6fd..a8396bfb2 100644
Binary files a/share/images/icons/VisualPath.png and b/share/images/icons/VisualPath.png differ
diff --git a/share/images/icons/Vox.png b/share/images/icons/Vox.png
index 57e5baf82..8644dd574 100644
Binary files a/share/images/icons/Vox.png and b/share/images/icons/Vox.png differ
diff --git a/share/images/icons/W3 Total Cache.png b/share/images/icons/W3 Total Cache.png
index a6267666c..36f470fab 100644
Binary files a/share/images/icons/W3 Total Cache.png and b/share/images/icons/W3 Total Cache.png differ
diff --git a/share/images/icons/W3Counter.png b/share/images/icons/W3Counter.png
index 7e506bfe4..7080bd2cb 100644
Binary files a/share/images/icons/W3Counter.png and b/share/images/icons/W3Counter.png differ
diff --git a/share/images/icons/WP Rocket.png b/share/images/icons/WP Rocket.png
new file mode 100644
index 000000000..d0b437829
Binary files /dev/null and b/share/images/icons/WP Rocket.png differ
diff --git a/share/images/icons/Web2py.png b/share/images/icons/Web2py.png
index bd0a414ec..252c602a0 100644
Binary files a/share/images/icons/Web2py.png and b/share/images/icons/Web2py.png differ
diff --git a/share/images/icons/WebGUI.png b/share/images/icons/WebGUI.png
index b3490fbad..76b6213e8 100644
Binary files a/share/images/icons/WebGUI.png and b/share/images/icons/WebGUI.png differ
diff --git a/share/images/icons/WebPublisher.png b/share/images/icons/WebPublisher.png
index c7e15c148..7b19c19f4 100644
Binary files a/share/images/icons/WebPublisher.png and b/share/images/icons/WebPublisher.png differ
diff --git a/share/images/icons/Webix.png b/share/images/icons/Webix.png
new file mode 100644
index 000000000..0b46bc9de
Binary files /dev/null and b/share/images/icons/Webix.png differ
diff --git a/share/images/icons/WebsPlanet.png b/share/images/icons/WebsPlanet.png
index ce07887e9..f8d2240e3 100644
Binary files a/share/images/icons/WebsPlanet.png and b/share/images/icons/WebsPlanet.png differ
diff --git a/share/images/icons/Websale.png b/share/images/icons/Websale.png
index 45b54c597..b2994840a 100644
Binary files a/share/images/icons/Websale.png and b/share/images/icons/Websale.png differ
diff --git a/share/images/icons/WebsiteBaker.png b/share/images/icons/WebsiteBaker.png
index 710552e1e..47addd18e 100644
Binary files a/share/images/icons/WebsiteBaker.png and b/share/images/icons/WebsiteBaker.png differ
diff --git a/share/images/icons/Webtrekk.png b/share/images/icons/Webtrekk.png
index e79460130..4c543b9cf 100644
Binary files a/share/images/icons/Webtrekk.png and b/share/images/icons/Webtrekk.png differ
diff --git a/share/images/icons/Weebly.png b/share/images/icons/Weebly.png
index 4f93e1bf0..9bb827b56 100644
Binary files a/share/images/icons/Weebly.png and b/share/images/icons/Weebly.png differ
diff --git a/share/images/icons/WikkaWiki.png b/share/images/icons/WikkaWiki.png
index a640a2790..513204d3e 100644
Binary files a/share/images/icons/WikkaWiki.png and b/share/images/icons/WikkaWiki.png differ
diff --git a/share/images/icons/Windows Server.png b/share/images/icons/Windows Server.png
index 267bba2fe..3ca9ef8d2 100644
Binary files a/share/images/icons/Windows Server.png and b/share/images/icons/Windows Server.png differ
diff --git a/share/images/icons/Wix.png b/share/images/icons/Wix.png
index bc07ee07c..9a9230f2e 100644
Binary files a/share/images/icons/Wix.png and b/share/images/icons/Wix.png differ
diff --git a/share/images/icons/Wolf CMS.png b/share/images/icons/Wolf CMS.png
index ba307e7c4..67815a97e 100644
Binary files a/share/images/icons/Wolf CMS.png and b/share/images/icons/Wolf CMS.png differ
diff --git a/share/images/icons/WooCommerce.png b/share/images/icons/WooCommerce.png
index c110a188d..9772015ac 100644
Binary files a/share/images/icons/WooCommerce.png and b/share/images/icons/WooCommerce.png differ
diff --git a/share/images/icons/WordPress Super Cache.png b/share/images/icons/WordPress Super Cache.png
index 82de06207..bfd267159 100644
Binary files a/share/images/icons/WordPress Super Cache.png and b/share/images/icons/WordPress Super Cache.png differ
diff --git a/share/images/icons/WordPress.png b/share/images/icons/WordPress.png
index 8dc0a3b5b..9ec6d00a1 100644
Binary files a/share/images/icons/WordPress.png and b/share/images/icons/WordPress.png differ
diff --git a/share/images/icons/XAMPP.png b/share/images/icons/XAMPP.png
index 4b57a7897..578a726dd 100755
Binary files a/share/images/icons/XAMPP.png and b/share/images/icons/XAMPP.png differ
diff --git a/share/images/icons/Xajax.png b/share/images/icons/Xajax.png
index 52236052e..fe9a4868e 100644
Binary files a/share/images/icons/Xajax.png and b/share/images/icons/Xajax.png differ
diff --git a/share/images/icons/Xanario.png b/share/images/icons/Xanario.png
index 17bec271f..6c35bd95f 100644
Binary files a/share/images/icons/Xanario.png and b/share/images/icons/Xanario.png differ
diff --git a/share/images/icons/XenForo.png b/share/images/icons/XenForo.png
index 5b15271d9..137d792a8 100644
Binary files a/share/images/icons/XenForo.png and b/share/images/icons/XenForo.png differ
diff --git a/share/images/icons/XiTi.png b/share/images/icons/XiTi.png
new file mode 100755
index 000000000..25ef4fba1
Binary files /dev/null and b/share/images/icons/XiTi.png differ
diff --git a/share/images/icons/YUI Doc.png b/share/images/icons/YUI Doc.png
index 0f5cde96b..efc1b8c61 100644
Binary files a/share/images/icons/YUI Doc.png and b/share/images/icons/YUI Doc.png differ
diff --git a/share/images/icons/YaBB.png b/share/images/icons/YaBB.png
index afb280787..c765b0155 100644
Binary files a/share/images/icons/YaBB.png and b/share/images/icons/YaBB.png differ
diff --git a/share/images/icons/Yahoo! Ecommerce.png b/share/images/icons/Yahoo! Ecommerce.png
index 0f5cde96b..c92e15a2a 100644
Binary files a/share/images/icons/Yahoo! Ecommerce.png and b/share/images/icons/Yahoo! Ecommerce.png differ
diff --git a/share/images/icons/Yahoo! Web Analytics.png b/share/images/icons/Yahoo! Web Analytics.png
index 0f5cde96b..253d9317d 100644
Binary files a/share/images/icons/Yahoo! Web Analytics.png and b/share/images/icons/Yahoo! Web Analytics.png differ
diff --git a/share/images/icons/Yandex.Metrika.png b/share/images/icons/Yandex.Metrika.png
index 9098da2b4..7ea5db9fd 100644
Binary files a/share/images/icons/Yandex.Metrika.png and b/share/images/icons/Yandex.Metrika.png differ
diff --git a/share/images/icons/ZK.png b/share/images/icons/ZK.png
index 88db528c2..21b06f260 100644
Binary files a/share/images/icons/ZK.png and b/share/images/icons/ZK.png differ
diff --git a/share/images/icons/Zen Cart.png b/share/images/icons/Zen Cart.png
index e2396487e..a6d56c9ad 100644
Binary files a/share/images/icons/Zen Cart.png and b/share/images/icons/Zen Cart.png differ
diff --git a/share/images/icons/Zepto.png b/share/images/icons/Zepto.png
index 0e0ce9e48..f363ebe1b 100644
Binary files a/share/images/icons/Zepto.png and b/share/images/icons/Zepto.png differ
diff --git a/share/images/icons/Zinnia.png b/share/images/icons/Zinnia.png
index 33466739c..7a12466c9 100644
Binary files a/share/images/icons/Zinnia.png and b/share/images/icons/Zinnia.png differ
diff --git a/share/images/icons/Zope.png b/share/images/icons/Zope.png
index 461ed8940..59084da13 100644
Binary files a/share/images/icons/Zope.png and b/share/images/icons/Zope.png differ
diff --git a/share/images/icons/basket.js.png b/share/images/icons/basket.js.png
index 9464e5c09..2dc6a00e3 100644
Binary files a/share/images/icons/basket.js.png and b/share/images/icons/basket.js.png differ
diff --git a/share/images/icons/comScore.png b/share/images/icons/comScore.png
index d346d109c..83d4030d8 100644
Binary files a/share/images/icons/comScore.png and b/share/images/icons/comScore.png differ
diff --git a/share/images/icons/d3.png b/share/images/icons/d3.png
deleted file mode 100644
index 82de06207..000000000
Binary files a/share/images/icons/d3.png and /dev/null differ
diff --git a/share/images/icons/dashCommerce.png b/share/images/icons/dashCommerce.png
index 82de06207..03dd0167e 100644
Binary files a/share/images/icons/dashCommerce.png and b/share/images/icons/dashCommerce.png differ
diff --git a/share/images/icons/debut.png b/share/images/icons/debut.png
index fbc41595e..737a03288 100755
Binary files a/share/images/icons/debut.png and b/share/images/icons/debut.png differ
diff --git a/share/images/icons/default.png b/share/images/icons/default.png
index 82de06207..9618b719b 100644
Binary files a/share/images/icons/default.png and b/share/images/icons/default.png differ
diff --git a/share/images/icons/dwhttpd.png b/share/images/icons/dwhttpd.png
index 82de06207..932c2b43b 100644
Binary files a/share/images/icons/dwhttpd.png and b/share/images/icons/dwhttpd.png differ
diff --git a/share/images/icons/e107.png b/share/images/icons/e107.png
index 4c622c083..dd7d87d13 100644
Binary files a/share/images/icons/e107.png and b/share/images/icons/e107.png differ
diff --git a/share/images/icons/eHTTP.png b/share/images/icons/eHTTP.png
index 82de06207..14d8cbe9d 100644
Binary files a/share/images/icons/eHTTP.png and b/share/images/icons/eHTTP.png differ
diff --git a/share/images/icons/eSyndiCat.png b/share/images/icons/eSyndiCat.png
index 6cb34ccc7..238adac49 100755
Binary files a/share/images/icons/eSyndiCat.png and b/share/images/icons/eSyndiCat.png differ
diff --git a/share/images/icons/eZ Publish.png b/share/images/icons/eZ Publish.png
index e4b3e7945..ec649027f 100644
Binary files a/share/images/icons/eZ Publish.png and b/share/images/icons/eZ Publish.png differ
diff --git a/share/images/icons/iCongo.png b/share/images/icons/iCongo.png
index 9d6dcf8dc..f448296b8 100644
Binary files a/share/images/icons/iCongo.png and b/share/images/icons/iCongo.png differ
diff --git a/share/images/icons/jQuery Mobile.png b/share/images/icons/jQuery Mobile.png
index d637e8817..386bdc228 100644
Binary files a/share/images/icons/jQuery Mobile.png and b/share/images/icons/jQuery Mobile.png differ
diff --git a/share/images/icons/jQuery Sparklines.png b/share/images/icons/jQuery Sparklines.png
index 82de06207..cc657aa90 100644
Binary files a/share/images/icons/jQuery Sparklines.png and b/share/images/icons/jQuery Sparklines.png differ
diff --git a/share/images/icons/jQuery.png b/share/images/icons/jQuery.png
index d637e8817..72f558245 100644
Binary files a/share/images/icons/jQuery.png and b/share/images/icons/jQuery.png differ
diff --git a/share/images/icons/jqPlot.png b/share/images/icons/jqPlot.png
index 0ee0526f6..3e11977c1 100644
Binary files a/share/images/icons/jqPlot.png and b/share/images/icons/jqPlot.png differ
diff --git a/share/images/icons/libwww-perl-daemon.png b/share/images/icons/libwww-perl-daemon.png
old mode 100755
new mode 100644
index 508efd87a..4228f48c1
Binary files a/share/images/icons/libwww-perl-daemon.png and b/share/images/icons/libwww-perl-daemon.png differ
diff --git a/share/images/icons/lighttpd.png b/share/images/icons/lighttpd.png
index 78717a518..5e4b17388 100644
Binary files a/share/images/icons/lighttpd.png and b/share/images/icons/lighttpd.png differ
diff --git a/share/images/icons/mod_auth_pam.png b/share/images/icons/mod_auth_pam.png
index d268dcca8..1023dc06d 100755
Binary files a/share/images/icons/mod_auth_pam.png and b/share/images/icons/mod_auth_pam.png differ
diff --git a/share/images/icons/mod_fastcgi.png b/share/images/icons/mod_fastcgi.png
index d268dcca8..f89495068 100644
Binary files a/share/images/icons/mod_fastcgi.png and b/share/images/icons/mod_fastcgi.png differ
diff --git a/share/images/icons/mod_jk.png b/share/images/icons/mod_jk.png
index d268dcca8..a01182b2d 100755
Binary files a/share/images/icons/mod_jk.png and b/share/images/icons/mod_jk.png differ
diff --git a/share/images/icons/mod_perl.png b/share/images/icons/mod_perl.png
index c894b3712..ee03c39ec 100755
Binary files a/share/images/icons/mod_perl.png and b/share/images/icons/mod_perl.png differ
diff --git a/share/images/icons/node.js.png b/share/images/icons/node.js.png
index e7bb269d8..6178fb44c 100644
Binary files a/share/images/icons/node.js.png and b/share/images/icons/node.js.png differ
diff --git a/share/images/icons/openEngine.png b/share/images/icons/openEngine.png
index 62cf13cba..a1257cd2e 100644
Binary files a/share/images/icons/openEngine.png and b/share/images/icons/openEngine.png differ
diff --git a/share/images/icons/osCSS.png b/share/images/icons/osCSS.png
index 6b59ff5ee..9d797793b 100644
Binary files a/share/images/icons/osCSS.png and b/share/images/icons/osCSS.png differ
diff --git a/share/images/icons/osCommerce.png b/share/images/icons/osCommerce.png
index aa61e7405..3b31c4566 100644
Binary files a/share/images/icons/osCommerce.png and b/share/images/icons/osCommerce.png differ
diff --git a/share/images/icons/papaya CMS.png b/share/images/icons/papaya CMS.png
index 5c6f66628..6e6a7e360 100644
Binary files a/share/images/icons/papaya CMS.png and b/share/images/icons/papaya CMS.png differ
diff --git a/share/images/icons/phpAlbum.png b/share/images/icons/phpAlbum.png
index e6783e68c..1df3afb07 100644
Binary files a/share/images/icons/phpAlbum.png and b/share/images/icons/phpAlbum.png differ
diff --git a/share/images/icons/phpBB.png b/share/images/icons/phpBB.png
index d9d47d5e2..c0318e27b 100644
Binary files a/share/images/icons/phpBB.png and b/share/images/icons/phpBB.png differ
diff --git a/share/images/icons/phpMyAdmin.png b/share/images/icons/phpMyAdmin.png
index cceca22a0..ca62f0153 100644
Binary files a/share/images/icons/phpMyAdmin.png and b/share/images/icons/phpMyAdmin.png differ
diff --git a/share/images/icons/punBB.png b/share/images/icons/punBB.png
index ed779f456..9d92fbeb7 100644
Binary files a/share/images/icons/punBB.png and b/share/images/icons/punBB.png differ
diff --git a/share/images/icons/s9y.png b/share/images/icons/s9y.png
deleted file mode 100644
index 29a31b440..000000000
Binary files a/share/images/icons/s9y.png and /dev/null differ
diff --git a/share/images/icons/sIFR.png b/share/images/icons/sIFR.png
index 06b21092c..4e82ecb70 100644
Binary files a/share/images/icons/sIFR.png and b/share/images/icons/sIFR.png differ
diff --git a/share/images/icons/script.aculo.us.png b/share/images/icons/script.aculo.us.png
index 12798316c..984e26d7c 100644
Binary files a/share/images/icons/script.aculo.us.png and b/share/images/icons/script.aculo.us.png differ
diff --git a/share/images/icons/uCore.png b/share/images/icons/uCore.png
index 63645c9a2..1328d72c6 100755
Binary files a/share/images/icons/uCore.png and b/share/images/icons/uCore.png differ
diff --git a/share/images/icons/vBulletin.png b/share/images/icons/vBulletin.png
index b5cb04b9a..2f8e783bc 100644
Binary files a/share/images/icons/vBulletin.png and b/share/images/icons/vBulletin.png differ
diff --git a/share/images/icons/viennaCMS.png b/share/images/icons/viennaCMS.png
index 82de06207..e7d6edf3c 100644
Binary files a/share/images/icons/viennaCMS.png and b/share/images/icons/viennaCMS.png differ
diff --git a/share/images/icons/xtCommerce.png b/share/images/icons/xtCommerce.png
index 4d0663508..8041b13d1 100644
Binary files a/share/images/icons/xtCommerce.png and b/share/images/icons/xtCommerce.png differ
diff --git a/share/images/icons/xui.png b/share/images/icons/xui.png
index 5e699aa5a..a1c8869f7 100644
Binary files a/share/images/icons/xui.png and b/share/images/icons/xui.png differ
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index bca3b64f3..a3ecc857a 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -26,7 +26,7 @@ var wappalyzer = (function() {
 		 * Calculate confidence total
 		 */
 		getConfidence: function() {
-			var total = 0;
+			var total = 0, id;
 
 			for ( id in this.confidence ) {
 				total += this.confidence[id];
@@ -199,7 +199,7 @@ var wappalyzer = (function() {
 
 		config: {
 			environment: 'dev', // dev | live
-			websiteURL: 'http://wappalyzer.com/',
+			websiteURL: 'https://wappalyzer.com/',
 			twitterURL: 'https://twitter.com/Wappalyzer',
 			githubURL:  'https://github.com/ElbertF/Wappalyzer',
 		},
@@ -243,7 +243,7 @@ var wappalyzer = (function() {
 		 */
 		analyze: function(hostname, url, data) {
 			var
-				i, j, app, confidence, type, regexMeta, regexScript, match, content, meta, header, checkImplies, version,
+				i, j, app, confidence, type, regexMeta, regexScript, match, content, meta, header, checkImplies, version, id,
 				profiler = new Profiler(),
 				apps     = {}
 				;
@@ -333,9 +333,10 @@ var wappalyzer = (function() {
 
 										parse(w.apps[app].meta[meta]).forEach(function(pattern) {
 
-											if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
-												apps[app].setDetected(pattern, type, content[2], meta);
-											}
+										if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
+											apps[app].setDetected(pattern, type, content[2], meta);
+										}
+
 										profiler.checkPoint(app, type, pattern.regex);
 										});
 									}
@@ -486,7 +487,7 @@ var wappalyzer = (function() {
 				w.log({ hostname: hostname, ping: w.ping.hostnames[hostname] });
 			}
 
-			if ( Object.keys(w.ping.hostnames).length >= 50 ) { driver('ping'); }
+			if ( Object.keys(w.ping.hostnames).length >= 20 ) { driver('ping'); }
 
 			apps = null;
 			data = null;
@@ -501,6 +502,5 @@ var wappalyzer = (function() {
 // CommonJS package
 // See http://wiki.commonjs.org/wiki/CommonJS
 if ( typeof exports === 'object' ) {
-	exports.definitions = require('../apps.json');
 	exports.wappalyzer = wappalyzer;
 }
