diff --git a/share/apps.json b/share/apps.json
index 2d3d4aa5c..468e8d4e9 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -42,14 +42,14 @@
 			"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))",
+			"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=",
+			"url": "\/shop\/catalog\/browse\\?sessid=",
 			"implies": "PHP"
 		},
 		"2z Project": {
@@ -61,7 +61,7 @@
 			"website": "www.3dcart.com",
 			"cats": [ 1, 6 ],
 			"headers": { "X-Powered-By": "3DCART" },
-			"script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)"
+			"script": "(twlh(track)?\\.asp|3d_upsell\\.js)"
 		},
 		"Accessible Portal": {
 			"website": "www.accessibleportal.com",
@@ -72,29 +72,20 @@
 		"AddThis": {
 			"website": "www.addthis.com",
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
+			"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",
+			"website": "adobe.com\/products\/cq.html",
 			"cats": [ 1 ],
-			"url": "/etc/designs/",
+			"url": "\/etc\/designs\/",
 			"html": "<div class=\"[^\"]*parbase",
 			"implies": "Java"
 		},
 		"Adobe GoLive": {
-			"website": "www.adobe.com/products/golive",
+			"website": "www.adobe.com\/products\/golive",
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"website": "www.advancedwebstats.com",
@@ -108,9 +99,9 @@
 			"env": "^AUI$"
 		},
 		"Amaya": {
-			"website": "www.w3.org/Amaya",
+			"website": "www.w3.org\/Amaya",
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"amCharts": {
 			"website": "amcharts.com",
@@ -121,7 +112,7 @@
 		"Ametys": {
 			"website": "ametys.org",
 			"cats": [ 1 ],
-			"meta": { "generator": "(?:Ametys|Anyware Technologies)" },
+			"meta": { "generator": "(Ametys|Anyware Technologies)" },
 			"script": "STools\\.js",
 			"implies": "Java"
 		},
@@ -129,7 +120,7 @@
 			"website": "amirocms.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(?:js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\1",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
@@ -147,12 +138,12 @@
 		"AOLserver": {
 			"website": "aolserver.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver\/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"website": "apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1" }
+			"headers": { "Server": "(Apache($|\/([\\d.]+)|[^\/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"website": "jspwiki.org",
@@ -164,12 +155,12 @@
 		"Apache Tomcat": {
 			"website": "tomcat.apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote\/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
-			"website": "trafficserver.apache.org/",
+			"website": "trafficserver.apache.org\/",
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS\/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"website": "arclanguage.org",
@@ -177,42 +168,42 @@
 			"html": "ping\\.src = node\\.href;"
 		},
 		"AsciiDoc": {
-			"website": "www.methods.co.nz/asciidoc",
+			"website": "www.methods.co.nz\/asciidoc",
 			"cats": [ 1, 20, 27 ],
 			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
-			"website": "oracle.com/us/products/applications/web-commerce/atg",
+			"website": "oracle.com\/us\/products\/applications\/web-commerce\/atg",
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" },
+			"headers": { "X-ATG-Version": "(ATGPlatform\/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
-			"website": "www.atlassian.com/software/confluence/overview/team-collaboration-software",
+			"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",
+			"html": "Powered by <a href=[^>]+atlassian\\.com\/software\/confluence([^>]+>Atlassian Confluence<\/a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
 		},
 		"Atlassian Jira": {
-			"website": "www.atlassian.com/software/jira/overview/",
+			"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",
+			"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:\\4",
 			"implies": "Java"
 		},
 		"AWStats": {
 			"website": "awstats.sourceforge.net",
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d.]+(?: \\(?:build [\\d.]+\\))?)\\;version:\\1" },
+			"meta": { "generator": "AWStats ([\\d.]+( \\(build [\\d.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
-			"website": "documentcloud.github.com/backbone",
+			"website": "documentcloud.github.com\/backbone",
 			"cats": [ 12 ],
 			"script": "backbone.*\\.js",
 			"env": "^Backbone$",
@@ -221,26 +212,26 @@
 		"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",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org\/\">[a-z]+<\/a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"website": "bigace.de",
 			"cats": [ 1 ],
 			"meta": { "generator": "BIGACE ([\\d.]+)\\;version:\\1" },
-			"html": "(?:Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
+			"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",
+			"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",
+			"website": "www.ozerov.de\/bigdump.php",
 			"cats": [ 3 ],
 			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\\. ([\\d.b]+)\\;version:\\1",
 			"implies": "PHP"
@@ -248,27 +239,27 @@
 		"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)" },
+			"html": "Diese <a href=.+bigware\\.de|<a href=[^>]+\/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\\d]+(&|$)",
+			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
 		"BittAds": {
 			"website": "bittads.com",
 			"cats": [ 36 ],
-			"script": "bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com\/js\/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
 			"website": "blip.tv",
 			"cats": [ 14 ],
-			"html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play"
+			"html": "<(param|embed|iframe)[^>]+blip\\.tv\/play"
 		},
 		"Blogger": {
 			"website": "www.blogger.com",
 			"cats": [ 11 ],
 			"meta": { "generator": "blogger" },
-			"url": "\\.blogspot\\.com"
+			"url": "^(www.)?.+\\.blogspot\\.com"
 		},
 		"BrowserCMS": {
 			"website": "browsercms.org",
@@ -305,7 +296,7 @@
 			"website": "cargocollective.com",
 			"cats": [ 1 ],
 			"meta": { "cargo_title": ".*" },
-			"script": "/cargo\\.",
+			"script": "\/cargo\\.",
 			"html": "<link [^>]+Cargo feed",
 			"implies": "PHP"
 		},
@@ -315,7 +306,7 @@
 			"headers": { "Server": "CentOS", "X-Powered-By": "CentOS" }
 		},
 		"CFML": {
-			"website": "adobe.com/products/coldfusion-family.html",
+			"website": "adobe.com\/products\/coldfusion-family.html",
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
@@ -332,7 +323,7 @@
 		"Chamilo": {
 			"website": "www.chamilo.org",
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"html": "\">Chamilo ([\\d.]+)<\/a>\\;version:\\1",
 			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
@@ -341,12 +332,12 @@
 			"website": "chartbeat.com",
 			"cats": [ 10 ],
 			"html": "function loadChartbeat\\(\\) {",
-			"script": "chartbeat\\.js"
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"website": "www.cherokee-project.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee\/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"website": "ckeditor.com",
@@ -355,7 +346,7 @@
 			"implies": "PHP"
 		},
 		"ClickHeat": {
-			"website": "www.labsmedia.com/clickheat/index.html",
+			"website": "www.labsmedia.com\/clickheat\/index.html",
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
 			"env": "^clickHeat",
@@ -364,6 +355,7 @@
 		"ClickTale": {
 			"website": "www.clicktale.com",
 			"cats": [ 10 ],
+			"html": "if\\(typeof ClickTale(Tag)*==\"function\"\\)",
 			"env": "^ClickTale"
 		},
 		"Clicky": {
@@ -385,7 +377,7 @@
 			"implies": "PHP"
 		},
 		"CMSimple": {
-			"website": "www.cmsimple.org/en",
+			"website": "www.cmsimple.org\/en",
 			"cats": [ 1 ],
 			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
@@ -393,12 +385,12 @@
 		"CO2Stats": {
 			"website": "co2stats.com",
 			"cats": [ 10 ],
-			"html": "src=[^>]+co2stats\\.com/propres\\.php"
+			"html": "src=[^>]+co2stats\\.com\/propres\\.php"
 		},
 		"CodeIgniter": {
 			"website": "codeigniter.com",
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_session)" },
+			"headers": { "Set-Cookie": "(exp_last_activity|exp_tracker|ci_session)" },
 			"implies": "PHP"
 		},
 		"Commerce Server": {
@@ -410,19 +402,19 @@
 		"comScore": {
 			"website": "comscore.com",
 			"cats": [ 10 ],
-			"html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)",
+			"html": "<i{1}frame[^>]* (id=\"comscore\"|scr=[^>]+comscore)",
 			"env": "^_?COMSCORE$"
 		},
 		"Concrete5": {
 			"website": "concrete5.org",
 			"cats": [ 1 ],
-			"script": "concrete/js/",
+			"script": "concrete\/js\/",
 			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
 		"Connect": {
-			"website": "www.senchalabs.org/connect",
+			"website": "www.senchalabs.org\/connect",
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "^Connect$" },
 			"implies": "node.js"
@@ -430,25 +422,25 @@
 		"Contao": {
 			"website": "contao.org",
 			"cats": [ 1 ],
-			"html": "(?:<!--[^>]+powered by (?:TYPOlight|Contao)-->|<link[^>]+(?:typolight|contao)\\.css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao)\\.css)",
 			"implies": "PHP"
 		},
 		"Contenido": {
-			"website": "contenido.org/en",
+			"website": "contenido.org\/en",
 			"cats": [ 1 ],
 			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
-			"website": "www.contens.com/en/pub/index.cfm",
+			"website": "www.contens.com\/en\/pub\/index.cfm",
 			"cats": [ 1 ],
 			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
-			"website": "www.trackset.it/conversionlab",
+			"website": "www.trackset.it\/conversionlab",
 			"cats": [ 10 ],
-			"script": "conversionlab\\.trackset\\.com/track/tsend\\.js"
+			"script": "conversionlab\\.trackset\\.com\/track\/tsend\\.js"
 		},
 		"Coppermine": {
 			"website": "coppermine-gallery.net",
@@ -470,12 +462,12 @@
 		"CouchDB": {
 			"website": "couchdb.apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB\/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"website": "www.cpanel.net",
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd\/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -489,25 +481,40 @@
 			"website": "crazyegg.com",
 			"cats": [ 10 ],
 			"env": "^CE2$",
-			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
+			"script": "cetrk\\.com\/pages\/scripts\/\\d+\/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"website": "datadesk.crsspxl.com",
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "tag\\.crsspxl\\.com/s1\\.js"
+			"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)",
+			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"website": "adobe.com\/products\/coldfusion-family.html",
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "\/cfajax\/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
+		"ContentBox": {
+			"website": "www.gocontentbox.org",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "ContentBox powered by ColdBox" },
+			"implies": "Adobe ColdFusion"
+		},
 		"CubeCart": {
 			"website": "www.cubecart.com",
 			"cats": [ 6 ],
-			"html": "(?:Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": "PHP"
 		},
@@ -518,9 +525,9 @@
 			"env": "^Cufon$"
 		},
 		"d3": {
-			"website": "mbostock.github.com/d3",
+			"website": "mbostock.github.com\/d3",
 			"cats": [ 25 ],
-			"script": "d3(?:\\.v2)?(?:\\.min)?\\.js"
+			"script": "d3(\\.v2)(\\.min)?\\.js"
 		},
 		"Dancer": {
 			"website": "perldancer.org",
@@ -535,6 +542,11 @@
 			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
+		"dashCommerce": {
+			"website": "dashcommerce.org",
+			"cats": [ 6 ],
+			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+		},
 		"DataLife Engine": {
 			"website": "dle-news.ru",
 			"cats": [ 1 ],
@@ -545,12 +557,13 @@
 		"David Webbox": {
 			"website": "www.tobit.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
+			"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" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2"
+			}
 		},
 		"DedeCMS": {
 			"website": "dedecms.com",
@@ -563,7 +576,7 @@
 			"website": "demandware.com",
 			"cats": [ 6 ],
 			"headers": { "Server": "Demandware eCommerce Server" },
-			"html": "<[^>]+demandware\\.edgesuite",
+			"html": "<[^>]+demandware.edgesuite",
 			"env": "^dwAnalytics$"
 		},
 		"DHTMLX": {
@@ -574,7 +587,7 @@
 		"DirectAdmin": {
 			"website": "www.directadmin.com",
 			"cats": [ 9 ],
-			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"html": "<a[^>]+>DirectAdmin<\/a> Web Control Panel",
 			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
@@ -588,28 +601,28 @@
 		"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",
+			"html": "(powered by <a[^>]+>Django ?([\\d.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"><\/div>)\\;version:\\2",
 			"env": "^__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"website": "django-cms.org",
 			"cats": [ 1 ],
-			"script": "media/cms/js/csrf\\.js",
+			"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",
+			"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)",
+			"html": "Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue",
 			"headers": { "X-Powered-By": "Dokeos" },
 			"implies": [ "PHP", "Xajax", "jQuery", "CKEditor" ]
 		},
@@ -624,34 +637,35 @@
 			"website": "dotnetnuke.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+"
+			},
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke$",
 			"implies": "Microsoft ASP.NET"
 		},
 		"Doxygen": {
-			"website": "stack.nl/~dimitri/doxygen",
+			"website": "stack.nl\/~dimitri\/doxygen",
 			"cats": [ 4 ],
-			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
-			"website": "www.adobe.com/products/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:\\3"
 		},
 		"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" },
+			"html": "<(link|style)[^>]+sites\/(default|all)\/(themes|modules)\/",
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "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)",
+			"html": "id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field",
 			"implies": "Drupal"
 		},
 		"Dynamicweb": {
@@ -677,17 +691,17 @@
 			"website": "eloqua.com",
 			"cats": [ 32 ],
 			"script": "elqCfg\\.js",
-			"env": "^elq(?:SiteID|Load|CurESite)$"
+			"env": "^elq(SiteID|Load|CurESite)$"
 		},
 		"Embedthis-http": {
-			"website": "github.com/embedthis/http",
+			"website": "github.com\/embedthis\/http",
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http(?:/([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "Embedthis-http(\/([\\d.]+))?\\;version:\\2" }
 		},
 		"E-Merchant": {
 			"website": "e-merchant.com",
 			"cats": [ 6 ],
-			"script": "cdn\\.e-merchant\\.com"
+			"script": "cdn.e-merchant.com"
 		},
 		"Enyo": {
 			"website": "enyojs.com",
@@ -699,7 +713,7 @@
 			"website": "episerver.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
-			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
@@ -718,7 +732,7 @@
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
-			"website": "simile-widgets.org/exhibit/",
+			"website": "simile-widgets.org\/exhibit\/",
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
 			"env": "^Exhibit$"
@@ -732,7 +746,7 @@
 		"ExpressionEngine": {
 			"website": "expressionengine.com",
 			"cats": [ 1 ],
-			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker)" },
+			"headers": { "Set-Cookie": "(exp_last_activity|exp_tracker)" },
 			"implies": "PHP"
 		},
 		"ExtJS": {
@@ -753,17 +767,17 @@
 			"cats": [ 29 ],
 			"html": "<!-- Factfinder",
 			"script": "Suggest\\.ff",
-			"url": "(?:/ViewParametricSearch|ffsuggest\\.[a-z]htm)"
+			"url": "\/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
-			"website": "microsoft.com/enterprisesearch",
+			"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",
+			"website": "sharepoint.microsoft.com\/en-us\/product\/capabilities\/search\/Pages\/Fast-Search.aspx",
 			"cats": [ 29 ],
-			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"url": "Pages\/SearchResults\\.aspx\\?k=",
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
@@ -773,32 +787,33 @@
 			"headers": { "Server": "Fedora" }
 		},
 		"FlexCMP": {
-			"website": "http://www.flexcmp.com/cms/home",
+			"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": ".+" }
+			"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"
+			"html": "Powered by (<strong>)?<a href=\"[^>]+fluxbb"
 		},
 		"Flyspray": {
 			"website": "flyspray.org",
 			"cats": [ 13 ],
-			"html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"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" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
-			"website": "office.microsoft.com/frontpage",
+			"website": "office.microsoft.com\/frontpage",
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(?:\\s([\\d.]+))?\\;version:\\1" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
@@ -816,19 +831,20 @@
 		"Gambio": {
 			"website": "gambio.de",
 			"cats": [ 6 ],
-			"html": "(?:<link[^>]* href=\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->)",
+			"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_[^;]+=" },
+			"html": "t\\.src = '\/\/secure\\.gaug\\.es\/track\\.js",
 			"env": "^_gauges$"
 		},
 		"Gentoo": {
 			"website": "www.gentoo.org",
 			"cats": [ 28 ],
-			"headers": { "X-Powered-By": "gentoo" }
+			"headers": { "X-Powered-By": "-?gentoo" }
 		},
 		"Get Satisfaction": {
 			"website": "getsatisfaction.com",
@@ -842,57 +858,57 @@
 			"implies": "PHP"
 		},
 		"GoAhead": {
-			"website": "embedthis.com/products/goahead/index.html",
+			"website": "embedthis.com\/products\/goahead\/index.html",
 			"cats": [ 22 ],
 			"headers": { "Server": "GoAhead" }
 		},
 		"Google Analytics": {
-			"website": "google.com/analytics",
+			"website": "google.com\/analytics",
 			"cats": [ 10 ],
 			"html": "_gaq\\.push\\(\\['_setAccount",
-			"script": "(?:\\.google-analytics\\.com/ga\\.js|google-analytics\\.com/urchin\\.js)",
+			"script": "(\\.google-analytics\\.com\/ga\\.js|google-analytics\\.com\/urchin\\.js)",
 			"headers": { "Set-Cookie": "__utma" },
 			"env": "^gaGlobal$"
 		},
 		"Google App Engine": {
-			"website": "code.google.com/appengine",
+			"website": "code.google.com\/appengine",
 			"cats": [ 22 ],
 			"headers": { "Server": "Google Frontend" }
 		},
 		"Google Code Prettify": {
-			"website": "code.google.com/p/google-code-prettify",
+			"website": "code.google.com\/p\/google-code-prettify",
 			"cats": [ 19 ],
 			"env": "^prettyPrint$"
 		},
 		"Google Font API": {
-			"website": "code.google.com/apis/webfonts",
+			"website": "code.google.com\/apis\/webfonts",
 			"cats": [ 17 ],
-			"script": "googleapis\\.com/.+webfont",
+			"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"
+			"script": "(maps\\.google\\.com\/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com\/maps\/api\/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
-			"website": "developers.google.com/speed/pagespeed/mod",
+			"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"
+			"url": "sites.google.com"
 		},
 		"Google Tag Manager": {
-			"website": "www.google.com/tagmanager",
+			"website": "www.google.com\/tagmanager",
 			"cats": [ 19 ],
-			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com\/ns\\.html[^>]+><\/iframe>"
 		},
 		"Google Web Toolkit": {
-			"website": "developers.google.com/web-toolkit",
+			"website": "developers.google.com\/web-toolkit",
 			"cats": [ 18 ],
 			"env": "^__gwt_",
 			"implies": "Java"
@@ -900,13 +916,13 @@
 		"GoStats": {
 			"website": "gostats.com",
 			"cats": [ 10 ],
-			"env": "^_go(?:stats|_track)"
+			"env": "^_go(stats|_track)"
 		},
 		"Graffiti CMS": {
 			"website": "graffiticms.codeplex.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
-			"script": "/graffiti\\.js",
+			"script": "\/graffiti.js",
 			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
@@ -917,6 +933,7 @@
 		"Gravity Insights": {
 			"website": "insights.gravity.com",
 			"cats": [ 10 ],
+			"html": "gravityInsightsParams\\.site_guid = '",
 			"env": "^GravityInsights$"
 		},
 		"G-WAN": {
@@ -925,9 +942,9 @@
 			"headers": { "Server": "G-WAN" }
 		},
 		"GX WebManager": {
-			"website": "www.gxsoftware.com/en/products/web-content-management.htm",
+			"website": "www.gxsoftware.com\/en\/products\/web-content-management.htm",
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager(?: ([\\d.]+))?\\;version:\\1" },
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
 			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
@@ -947,7 +964,7 @@
 			"env": "^Highcharts$"
 		},
 		"Hogan.js": {
-			"website": "twitter.github.com/hogan.js",
+			"website": "twitter.github.com\/hogan.js",
 			"cats": [ 12 ],
 			"env": "^Hogan$"
 		},
@@ -961,51 +978,50 @@
 			"website": "hubspot.com",
 			"cats": [ 32 ],
 			"html": "<!-- Start of Async HubSpot",
-			"env": "^(?:_hsq|hubspot)$"
+			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
 			"website": "hybris.com",
 			"cats": [ 6 ],
-			"html": "(?:/sys_master/|/hybr/|/_ui/desktop/)",
+			"html": "(\/sys_master\/|\/hybr\/|\/_ui\/desktop\/)",
 			"headers": { "Set-Cookie": "_hybris" },
 			"implies": "Java"
 		},
 		"IBM HTTP Server": {
-			"website": "ibm.com/software/webservers/httpservers",
+			"website": "ibm.com\/software\/webservers\/httpservers",
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "IBM_HTTP_Server(\/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
-			"website": "ibm.com/software/websphere/portal",
+			"website": "ibm.com\/software\/websphere\/portal",
 			"cats": [ 1 ],
 			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
-			"url": "/wps/",
+			"url": "\/wps\/",
 			"implies": "Java"
 		},
 		"IBM WebSphere Commerce": {
-			"website": "ibm.com/software/genservers/commerceproductline",
+			"website": "ibm.com\/software\/genservers\/commerceproductline",
 			"cats": [ 6 ],
-			"url": "/wcs/",
+			"url": "\/wcs\/",
 			"implies": "Java"
 		},
 		"iCongo": {
-			"website": "hybris.com/icongo",
+			"website": "hybris.com\/icongo",
 			"cats": [ 6 ],
-			"meta":	"iCongo",
-			"implies": "Adobe ColdFusion"
-		},
+			"html": "<meta[^>]+\"iCongo", "implies": "Adobe ColdFusion" },
 		"IIS": {
 			"website": "www.iis.net",
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "Server": "IIS(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"website": "www.impresscms.org",
 			"cats": [ 1 ],
-			"script": "include/linkexternal\\.js",
+			"script": "include\/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+="
+			},
 			"implies": "PHP"
 		},
 		"ImpressPages": {
@@ -1018,7 +1034,7 @@
 			"website": "www.indexhibit.org",
 			"cats": [ 1 ],
 			"meta": { "generator": "Indexhibit" },
-			"html": "<(?:link|a href) [^>]+ndxz-studio",
+			"html": "<(link|a href) [^>]+ndxz-studio",
 			"implies": [ "PHP", "Apache", "Exhibit" ]
 		},
 		"InstantCMS": {
@@ -1035,22 +1051,22 @@
 		"Intershop": {
 			"website": "intershop.com",
 			"cats": [ 6 ],
-			"script": "(?:is-bin|INTERSHOP)"
+			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"website": "www.invisionpower.com",
 			"cats": [ 2 ],
-			"script": "jscripts/ips_",
-			"env": "^(?:IPBoard$|ipb_var)",
+			"script": "jscripts\/ips_",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
-			"website": "apple.com/ilife/iweb",
+			"website": "apple.com\/ilife\/iweb",
 			"cats": [ 20 ],
 			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
-			"website": "jalbum.net/en",
+			"website": "jalbum.net\/en",
 			"cats": [ 7 ],
 			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
@@ -1074,31 +1090,31 @@
 		"JavaServer Faces": {
 			"website": "javaserverfaces.java.net",
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "X-Powered-By": "JSF(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
-			"website": "www.oracle.com/technetwork/java/javaee/jsp/index.html",
+			"website": "www.oracle.com\/technetwork\/java\/javaee\/jsp\/index.html",
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "X-Powered-By": "JSP(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
-			"website": "www.oracle.com/technetwork/java/index-jsp-135475.html",
+			"website": "www.oracle.com\/technetwork\/java\/index-jsp-135475.html",
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "X-Powered-By": "Servlet(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
 			"website": "jirafe.com",
 			"cats": [ 10, 32 ],
-			"script": "/jirafe\\.js",
+			"script": "\/jirafe\\.js",
 			"env": "^jirafe$"
 		},
 		"Jo": {
 			"website": "joapp.com",
 			"cats": [ 26, 12 ],
-			"env": "^jo(?:Cache|DOM|Event)$"
+			"env": "^jo(Cache|DOM|Event)$"
 		},
 		"JobberBase": {
 			"website": "jobberbase.com",
@@ -1110,8 +1126,8 @@
 			"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",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
+			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)\/com_|<table[^>]+class=\"pill)\\;confidence:50",
 			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
@@ -1119,7 +1135,8 @@
 		"jqPlot": {
 			"website": "www.jqplot.com",
 			"cats": [ 25 ],
-			"script": "jqplot.*\\.js"
+			"script": "jqplot.*\\.js",
+			"env": "^jQuery.jqplot$"
 		},
 		"jQTouch": {
 			"website": "jqtouch.com",
@@ -1130,17 +1147,17 @@
 		"jQuery": {
 			"website": "jquery.com",
 			"cats": [ 12 ],
-			"script": [ "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^\/]*\\.js\\;version:\\2", "([\\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",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
-			"website": "omnipotent.net/jquery.sparkline/",
+			"website": "omnipotent.net\/jquery.sparkline\/",
 			"cats": [ 25 ],
 			"script": "jquery\\.sparkline.*\\.js",
 			"implies": "jQuery"
@@ -1148,7 +1165,7 @@
 		"jQuery UI": {
 			"website": "jqueryui.com",
 			"cats": [ 12 ],
-			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
+			"script": "jqueryui\/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -1158,22 +1175,22 @@
 			"env": "^JSChart$"
 		},
 		"JTL Shop": {
-			"website": "www.jtl-software.de/produkte/jtl-shop3",
+			"website": "www.jtl-software.de\/produkte\/jtl-shop3",
 			"cats": [ 6 ],
-			"html": "(?:<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
 			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"website": "getk2.org",
 			"cats": [ 19 ],
-			"html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
 		"Kampyle": {
 			"website": "www.kampyle.com",
 			"cats": [ 10, 13 ],
-			"script": "cf\\.kampyle\\.com/k_button\\.js",
+			"script": "cf\\.kampyle\\.com\/k_button\\.js",
 			"headers": { "Set-Cookie": "k_visit" },
 			"env": "^k_track$"
 		},
@@ -1181,7 +1198,7 @@
 			"website": "www.kendoui.com",
 			"cats": [ 18 ],
 			"env": "^kendo$",
-			"html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
+			"html": "<link[^>]*\\s+href=['\"]?[^'\"\\s>]*styles\/kendo\\.common(\\.min)?\\.css['\"\\s\/>]",
 			"implies": "jQuery"
 		},
 		"Kentico CMS": {
@@ -1193,7 +1210,7 @@
 		"KineticJS": {
 			"website": "kineticjs.com",
 			"cats": [ 25 ],
-			"script": "kinetic(?:-v?([\\d.]+))?\\.js\\;version:\\1",
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
 			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
@@ -1202,15 +1219,16 @@
 			"env": "^KM_COOKIE_DOMAIN$"
 		},
 		"Koego": {
-			"website": "www.koego.com/en",
+			"website": "www.koego.com\/en",
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"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" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1"
+			},
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
@@ -1226,7 +1244,7 @@
 			"implies": "PHP"
 		},
 		"Koobi": {
-			"website": "dream4.de/cms",
+			"website": "dream4.de\/cms",
 			"cats": [ 1 ],
 			"meta": { "generator": "Koobi" },
 			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
@@ -1259,7 +1277,7 @@
 		"lighttpd": {
 			"website": "www.lighttpd.net",
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "lighttpd(\/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"website": "limesurvey.org/",
@@ -1280,31 +1298,31 @@
 		"LiveJournal": {
 			"website": "www.livejournal.com",
 			"cats": [ 11 ],
-			"url": "\\.livejournal\\.com"
+			"url": "^(www.)?.+\\.livejournal\\.com"
 		},
 		"Lockerz Share": {
 			"website": "share.lockerz.com",
 			"cats": [ 5 ],
-			"script": "addtoany\\.com/menu/page\\.js",
+			"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/.*>",
+			"html": "<link[^>]*\/sites\/[a-zA-Z0-9]{24}\/theme\/stylesheets\/.*>",
 			"implies": [ "Ruby on Rails", "MongoDB" ]
 		},
 		"Lotus Domino": {
-			"website": "www-01.ibm.com/software/lotus/products/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",
+			"script": "(js\/mage|skin\/frontend\/(default|(enterprise)))\\;version:\\3?Enterprise:Community",
 			"headers": { "Set-Cookie": "frontend=\\;confidence:50" },
-			"env": "^(?:Mage|VarienForm)$",
+			"env": "^(Mage|VarienForm)$",
 			"implies": "PHP"
 		},
 		"Mambo": {
@@ -1320,7 +1338,7 @@
 		"Marketo": {
 			"website": "www.marketo.com",
 			"cats": [ 32 ],
-			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
+			"script": "munchkin\\.marketo\\.net\/munchkin\\.js",
 			"env": "^Munchkin$"
 		},
 		"MaxSite CMS": {
@@ -1337,19 +1355,20 @@
 			"website": "www.mediawiki.org",
 			"cats": [ 8 ],
 			"meta": { "generator": "MediaWiki" },
-			"html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)"
+			"html": "(<a[^>]+>Powered by MediaWiki<\/a>|<[^>]+id=\"t-specialpages)"
 		},
 		"Meebo": {
 			"website": "www.meebo.com",
 			"cats": [ 5 ],
-			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\(?:'domReady'\\))"
+			"html": "(<iframe id=\"meebo-iframe\"|Meebo\\('domReady'\\))"
 		},
 		"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" },
+			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1"
+			},
 			"implies": [ "IIS", "Windows Server" ]
 		},
 		"Microsoft SharePoint": {
@@ -1367,13 +1386,13 @@
 		"Mint": {
 			"website": "haveamint.com",
 			"cats": [ 10 ],
-			"script": "mint/\\?js",
+			"script": "mint\/\\?js",
 			"env": "^Mint$"
 		},
 		"Mixpanel": {
 			"website": "mixpanel.com",
 			"cats": [ 10 ],
-			"script": "api\\.mixpanel\\.com/track",
+			"script": "api\\.mixpanel\\.com\/track",
 			"env": "^Mixpanel$"
 		},
 		"MochiKit": {
@@ -1385,57 +1404,61 @@
 		"Modernizr": {
 			"website": "www.modernizr.com",
 			"cats": [ 12 ],
-			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"website": "modxcms.com",
 			"cats": [ 1 ],
-			"html": "(?:<a[^>]+>Powered by MODx</a>|<(?:link|script)[^>]+assets/snippets/)",
+			"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}" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}"
+			},
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
-			"website": "www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html",
+			"website": "www.fastcgi.com\/mod_fastcgi\/docs\/mod_fastcgi.html",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "Server": "mod_fastcgi(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"website": "www.modpython.org",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "Server": "mod_python(\/([\\d.]+))?\\;version:\\2" },
 			"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" },
+			"headers": { "Server": "mod_rack(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(\/([\\d.]+))?\\;version:\\2"
+			},
 			"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" },
+			"headers": { "Server": "mod_rails(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(\/([\\d.]+))?\\;version:\\2"
+			},
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"website": "modssl.org",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "Server": "mod_ssl(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
-			"website": "code.google.com/p/modwsgi",
+			"website": "code.google.com\/p\/modwsgi",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1", "X-Powered-By": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1" },
+			"headers": { "Server": "mod_wsgi(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(\/([\\d.]+))?\\;version:\\2"
+			},
 			"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",
+			"script": "moin(_static(\\d)(\\d)(\\d)|.+)\/common\/js\/common\\.js\\;version:\\2.\\3.\\4",
 			"env": "^show_switch2gui$",
 			"implies": "Python"
 		},
@@ -1449,7 +1472,7 @@
 			"website": "mollom.com",
 			"cats": [ 16 ],
 			"script": "mollom\\.js",
-			"html": "<img[^>]+/.mollom/.com"
+			"html": "<img[^>]+\/.mollom\/.com"
 		},
 		"Mondo Media": {
 			"website": "mondo-media.de",
@@ -1469,7 +1492,7 @@
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
-			"html": "<img[^>]+moodlelogo",
+			"html": "(var moodleConfigFn = function\\(me\\)|<img[^>]+moodlelogo)",
 			"headers": { "Set-Cookie": "MoodleSession" },
 			"env": "^moodle",
 			"implies": "PHP"
@@ -1477,7 +1500,7 @@
 		"Moogo": {
 			"website": "www.moogo.com",
 			"cats": [ 1 ],
-			"script": "kotisivukone\\.js"
+			"script": "kotisivukone.js"
 		},
 		"MooTools": {
 			"website": "mootools.net",
@@ -1498,7 +1521,7 @@
 		"MyBB": {
 			"website": "www.mybboard.net",
 			"cats": [ 2 ],
-			"html": "(?:<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
+			"html": "<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB",
 			"env": "^MyBB$"
 		},
 		"MyBlogLog": {
@@ -1515,20 +1538,27 @@
 			"website": "mysql.com",
 			"cats": [ 34 ]
 		},
+		"Mura CMS": {
+			"website": "www.getmura.com",
+			"cats": [ 1, 11 ],
+			"meta": { "generator": "Mura CMS ([\\d\\.]+)" },
+			"implies": "Adobe ColdFusion"
+		},
 		"Nedstat": {
 			"website": "www.nedstat.com",
 			"cats": [ 10 ],
 			"html": "sitestat\\(\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
-			"website": "netmonitor.fi/en",
+			"website": "netmonitor.fi\/en",
 			"cats": [ 10 ],
-			"script": "netmonitor\\.fi/nmtracker\\.js",
+			"script": "netmonitor\\.fi\/nmtracker\\.js",
 			"env": "^netmonitor$"
 		},
 		"New Relic": {
 			"website": "newrelic.com",
 			"cats": [ 10 ],
+			"html": "<script[^>]+>(var NREUMQ=NREUMQ|if \\(!NREUMQ\\.f)",
 			"env": "^NREUM"
 		},
 		"Nginx": {
@@ -1545,46 +1575,44 @@
 			"cats": [ 35 ]
 		},
 		"NOIX": {
-			"website": "www.noix.com.br/tecnologias/joomla",
+			"website": "www.noix.com.br\/tecnologias\/joomla",
 			"cats": [ 19 ],
-			"html": "(?:<[^>]+(?:src|href)=[^>]*(?:/media/noix)|<!-- NOIX)"
+			"html": "<[^>]+(src|href)=[^>]*(\/media\/noix)|<!-- NOIX"
 		},
 		"nopCommerce": {
 			"website": "www.nopcommerce.com",
 			"cats": [ 6 ],
-			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
+			"html": "(<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
 		"Open Web Analytics": {
 			"website": "openwebanalytics.com",
 			"cats": [ 10 ],
-			"html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
+			"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"
+			"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)",
+			"html": "index\\.php\\?route=[a-z]+\/|Powered By <a href=\"[^>]+OpenCart",
 			"implies": "PHP"
 		},
 		"openEngine": {
-			"website": "openengine.de/html/pages/de/",
+			"website": "openengine.de\/html\/pages\/de\/",
 			"cats": [ 1 ],
-			"meta": "openEngine"
-			},
-		"OpenGrok": {
-			"website": "hub.opensolaris.org/bin/view/Project+opengrok/WebHome",
+			"html": "<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" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
-			"website": "code.google.com/p/opengse",
+			"website": "code.google.com\/p\/opengse",
 			"cats": [ 22 ],
 			"headers": { "Server": "GSE" },
 			"implies": "Java"
@@ -1596,14 +1624,14 @@
 			"env": "^OpenLayers$"
 		},
 		"OpenNemas": {
-			"website": "openhost.es/en/opennemas",
+			"website": "openhost.es\/en\/opennemas",
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
 		"OpenSSL": {
 			"website": "openssl.org",
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1" }
+			"headers": { "Server": "OpenSSL(\/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"website": "websolutions.opentext.com",
@@ -1617,19 +1645,19 @@
 			"env": "^optimizely$"
 		},
 		"Oracle Application Server": {
-			"website": "www.oracle.com/technetwork/middleware/ias/overview/index.html",
+			"website": "www.oracle.com\/technetwork\/middleware\/ias\/overview\/index.html",
 			"cats": [ 22 ],
-			"headers": { "Server": "Oracle\\bApplication\\bServer(?:\\b(\\d+[a-z]?))?\\;version:\\1" }
+			"headers": { "Server": "Oracle(-| )Application(-| )Server((-| )(\\d+[a-z]?))?\\;version:\\5" }
 		},
 		"Oracle Recommendations On Demand": {
-			"website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html",
+			"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)",
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce<\/a>|<[^]+class=\"[^>]*infoBoxHeading)",
 			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
@@ -1640,30 +1668,31 @@
 		"Outbrain": {
 			"website": "outbrain.com",
 			"cats": [ 5 ],
-			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
-			"env": "^(?:OutbrainPermaLink|OB_releaseVer)$"
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com\/lang_",
+			"script": "widgets\\.outbrain\\.com\/outbrain\\.js",
+			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
 			"website": "oxid-esales.com",
 			"cats": [ 6 ],
-			"html": "<!--[^-]*OXID eShop",
-			"env": "^ox(?:TopMenu|ModalPopup|LoginBox|InputValidator)"
+			"html": "<!--.*OXID eShop",
+			"env": "^ox(TopMenu|ModalPopup|LoginBox|InputValidator)"
 		},
 		"PANSITE": {
-			"website": "panvision.de/Produkte/Content_Management/index.asp",
+			"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/"
+			"html": "<link[^>]*\/papaya-themes\/"
 		},
 		"Pardot": {
 			"website": "pardot.com",
 			"cats": [ 32 ],
-			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
-			"env": "^pi(?:Tracker|Hostname|Protocol|CId|AId)$"
+			"html": "piProtocol + \"pi\\.pardot\\.com\/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
 		},
 		"Parse.ly": {
 			"website": "parse.ly",
@@ -1673,7 +1702,7 @@
 		"Percussion": {
 			"website": "percussion.com",
 			"cats": [ 1 ],
-			"meta": { "generator": "(?:Percussion|Rhythmyx)" },
+			"meta": { "generator": "(Percussion|Rhythmyx)" },
 			"html": "<[^>]+class=\"perc-region\""
 		},
 		"Perl": {
@@ -1683,7 +1712,7 @@
 		"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" },
+			"headers": { "Server": "php\/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php\/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum": {
@@ -1696,8 +1725,8 @@
 			"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_)",
+			"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"
 		},
@@ -1722,8 +1751,7 @@
 		"phpMyAdmin": {
 			"website": "www.phpmyadmin.net",
 			"cats": [ 3 ],
-			"html": "(?:PMA_sendHeaderLocation\\(|<title>phpMyAdmin</title>)",
-			"env":	"pma_absolute_uri",
+			"html": "(var pma_absolute_uri = '|PMA_sendHeaderLocation\\(|<title>phpMyAdmin<\/title>)",
 			"implies": [ "PHP", "MySQL" ]
 		},
 		"PHP-Nuke": {
@@ -1735,13 +1763,13 @@
 		"phpPgAdmin": {
 			"website": "phppgadmin.sourceforge.net",
 			"cats": [ 3 ],
-			"html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
+			"html": "(<title>phpPgAdmin<\/title>|<span class=\"appname\">phpPgAdmin)",
 			"implies": "PHP"
 		},
 		"phpSQLiteCMS": {
 			"website": "phpsqlitecms.net",
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS(?: (.+))?$\\;version:\\1" },
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
 			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
@@ -1754,6 +1782,7 @@
 		"Piwik": {
 			"website": "piwik.org",
 			"cats": [ 10 ],
+			"html": "var piwikTracker = Piwik\\.getTracker\\(",
 			"env": "^Piwik$"
 		},
 		"Plentymarkets": {
@@ -1762,7 +1791,7 @@
 			"meta": { "generator": "^www\\.plentyMarkets" }
 		},
 		"Plesk": {
-			"website": "parallels.com/products/plesk",
+			"website": "parallels.com\/products\/plesk",
 			"cats": [ 9 ],
 			"headers": { "X-Powered-By-Plesk": "Plesk", "X-Powered-By": "PleskLin" },
 			"script": "common\\.js\\?plesk"
@@ -1786,7 +1815,7 @@
 			"html": "<iframe src=\"[^>]+pluraserver\\.com"
 		},
 		"Po.st": {
-			"website": "http://www.po.st/",
+			"website": "http:\/\/www.po.st\/",
 			"cats": [ 5 ],
 			"env": "^pwidget_config$"
 		},
@@ -1799,7 +1828,7 @@
 		"Powergap": {
 			"website": "powergap.de",
 			"cats": [ 6 ],
-			"html": "s\\d\\d\\.php\\?shopid=\\1"
+			"html": "(s\\d\\d)\\.php\\?shopid=\\1"
 		},
 		"Prestashop": {
 			"website": "www.prestashop.com",
@@ -1811,11 +1840,11 @@
 		"Prototype": {
 			"website": "www.prototypejs.org",
 			"cats": [ 12 ],
-			"script": "(?:prototype|protoaculous)(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
-			"website": "mbostock.github.com/protovis",
+			"website": "mbostock.github.com\/protovis",
 			"cats": [ 25 ],
 			"script": "protovis.*\\.js",
 			"env": "^protovis$"
@@ -1829,21 +1858,21 @@
 		"Python": {
 			"website": "python.org",
 			"cats": [ 27 ],
-			"headers": { "Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;confidence:50\\;version:\\1" }
+			"headers": { "Server": "(^|\\s)Python(\/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"website": "www.quantcast.com",
 			"cats": [ 10 ],
-			"script": "edge\\.quantserve\\.com/quant\\.js",
+			"script": "edge\\.quantserve\\.com\/quant\\.js",
 			"env": "^quantserve$"
 		},
 		"Quick.Cart": {
 			"website": "opensolution.org",
 			"cats": [ 6 ],
-			"html": "<a href=\"[^>]+opensolution\\.org/\">Powered by"
+			"html": "<a href=\"[^>]+opensolution\\.org\/\">Powered by"
 		},
 		"RackCache": {
-			"website": "github.com/rtomayko/rack-cache",
+			"website": "github.com\/rtomayko\/rack-cache",
 			"cats": [ 23 ],
 			"headers": { "X-Rack-Cache": ".+" },
 			"implies": "Ruby"
@@ -1864,25 +1893,25 @@
 		"RCMS": {
 			"website": "www.rcms.fi",
 			"cats": [ 1 ],
-			"meta": { "generator": "^(?:RCMS|ReallyCMS)" }
+			"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)",
+			"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" }
+			"headers": { "Server": "(.*rhel(\\d+)|Red Hat)\\;version:\\2", "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",
+			"html": "(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)",
+			"url": "^(www\\.)?reddit\\.com",
 			"env": "^reddit$",
 			"implies": "Python"
 		},
@@ -1896,6 +1925,7 @@
 		"Reinvigorate": {
 			"website": "www.reinvigorate.net",
 			"cats": [ 10 ],
+			"html": "reinvigorate\\.track\\(\"",
 			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
@@ -1907,33 +1937,33 @@
 		"Reveal.js": {
 			"website": "lab.hakim.se/reveal-js",
 			"cats": [ 12 ],
-			"script": "reveal(?:\\.min)?\\.js",
+			"script": "reveal(\\.min)?\\.js",
 			"env": "^Reveal$"
 		},
 		"RiteCMS": {
 			"website": "ritecms.com",
 			"cats": [ 1 ],
-			"meta": { "generator": "^RiteCMS(?: (.+))?\\;version:\\1" },
+			"meta": { "generator": "^RiteCMS(?: ([0-9.ab]+))?\\;version:\\1" },
 			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"RoundCube": {
 			"website": "roundcube.net",
 			"cats": [ 30 ],
 			"html": "<title>RoundCube",
-			"env": "^(?:rcmail|rcube_|roundcube)",
+			"env": "^(rcmail|rcube_|roundcube)",
 			"implies": "PHP"
 		},
 		"Ruby": {
 			"website": "ruby-lang.org",
 			"cats": [ 27 ],
-			"headers": { "Server": "(?:Mongrel|WEBrick|Ruby)" }
+			"headers": { "Server": "(Mongrel|WEBrick|Ruby)" }
 		},
 		"Ruby on Rails": {
 			"website": "rubyonrails.org",
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
+			"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" },
+			"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": {
@@ -1944,7 +1974,8 @@
 		"s9y": {
 			"website": "s9y.org",
 			"cats": [ 1 ],
-			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity v\\.(.+)\\;version:\\1" }
+			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity"
+			}
 		},
 		"SAP": {
 			"website": "sap.com",
@@ -1954,35 +1985,35 @@
 		"Sarka-SPIP": {
 			"website": "sarka-spip.net",
 			"cats": [ 1 ],
-			"meta": { "generator": "Sarka-SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
 		"script.aculo.us": {
 			"website": "script.aculo.us",
 			"cats": [ 12 ],
-			"script": "(?:scriptaculous|protoaculous)\\.js",
+			"script": "(scriptaculous|protoaculous)\\.js",
 			"env": "^Scriptaculous$"
 		},
 		"SDL Tridion": {
-			"website": "www.sdl.com/products/tridion",
+			"website": "www.sdl.com\/products\/tridion",
 			"cats": [ 1 ],
 			"html": "mfinfo\\.application='Tridion"
 		},
 		"Sencha Touch": {
-			"website": "sencha.com/products/touch",
+			"website": "sencha.com\/products\/touch",
 			"cats": [ 12, 26 ],
 			"script": "sencha-touch.*\\.js"
 		},
 		"Seoshop": {
 			"website": "getseoshop.com",
 			"cats": [ 6 ],
-			"html": "http://www\\.getseoshop\\.com"
+			"html": "http:\/\/www\\.getseoshop\\.com"
 		},
 		"ShareThis": {
 			"website": "sharethis.com",
 			"cats": [ 5 ],
-			"script": "w\\.sharethis\\.com/",
+			"script": "w\\.sharethis\\.com\/",
 			"env": "^SHARETHIS$"
 		},
 		"Shopalize": {
@@ -2012,7 +2043,7 @@
 			"implies": "PHP"
 		},
 		"sIFR": {
-			"website": "www.mikeindustries.com/blog/sifr",
+			"website": "www.mikeindustries.com\/blog\/sifr",
 			"cats": [ 17 ],
 			"script": "sifr\\.js"
 		},
@@ -2025,11 +2056,12 @@
 		"Site Meter": {
 			"website": "www.sitemeter.com",
 			"cats": [ 10 ],
-			"script": "sitemeter\\.com/js/counter\\.js\\?site="
+			"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 ],
+			"html": "var s_code=s\\.t\\(\\);if\\(s_code\\)document\\.write\\(s_code\\)",
 			"env": "^s_account$"
 		},
 		"SiteEdit": {
@@ -2045,6 +2077,7 @@
 		"SMF": {
 			"website": "www.simplemachines.org",
 			"cats": [ 2 ],
+			"html": "<script [^>]+\\s+var smf_",
 			"env": "^smf_",
 			"implies": "PHP"
 		},
@@ -2056,29 +2089,29 @@
 		"Snoobi": {
 			"website": "www.snoobi.com",
 			"cats": [ 10 ],
-			"script": "snoobi\\.com/snoop\\.php",
+			"script": "snoobi\\.com\/snoop\\.php",
 			"env": "^snoobi$"
 		},
 		"SOBI 2": {
-			"website": "www.sigsiu.net/sobi2.html",
+			"website": "www.sigsiu.net\/sobi2.html",
 			"cats": [ 19 ],
-			"html": "(?:<!-- start of Sigsiu Online Business Index|<div[^>]* class=\"sobi2)",
+			"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.*>",
+			"html": " <(script|link)[^>].*com_sobipro.*>",
 			"implies": "Joomla"
 		},
 		"SoundManager": {
-			"website": "www.schillmania.com/projects/soundmanager2",
+			"website": "www.schillmania.com\/projects\/soundmanager2",
 			"cats": [ 12 ],
-			"env": "^(?:SoundManager|BaconPlayer)$"
+			"env": "^(SoundManager|BaconPlayer)$"
 		},
 		"SPDY": {
-			"website": "chromium.org/spdy",
+			"website": "chromium.org\/spdy",
 			"cats": [ 19 ],
 			"headers": { "X-Firefox-Spdy": ".*" }
 		},
@@ -2091,19 +2124,19 @@
 		"SPIP": {
 			"website": "www.spip.net",
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
 		"Spree": {
 			"website": "spreecommerce.com",
 			"cats": [ 6 ],
-			"html": "<link[^>]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>",
+			"html": "<link[^>]*\/assets\/store\/all-[a-zA-Z0-9]{32}\\.css.+>",
 			"implies": "Ruby on Rails"
 		},
 		"SQL Buddy": {
 			"website": "www.sqlbuddy.com",
 			"cats": [ 3 ],
-			"html": "(?:<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
+			"html": "(<title>SQL Buddy<\/title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
 		"SQLite": {
 			"website": "www.sqlite.org",
@@ -2112,6 +2145,7 @@
 		"Squarespace": {
 			"website": "www.squarespace.com",
 			"cats": [ 1 ],
+			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
 			"headers": { "X-ServedBy": "squarespace" },
 			"env": "^Squarespace"
 		},
@@ -2119,14 +2153,14 @@
 			"website": "squiz.net",
 			"cats": [ 1 ],
 			"meta": { "generator": "Squiz Matrix" },
-			"html": "  Running (?:MySource|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"
+			"script": "statcounter\\.com\/counter\/counter"
 		},
 		"Store Systems": {
 			"website": "store-systems.de",
@@ -2136,7 +2170,7 @@
 		"SublimeVideo": {
 			"website": "sublimevideo.net",
 			"cats": [ 14 ],
-			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net\/js\/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"Subrion": {
@@ -2147,14 +2181,14 @@
 			"implies": "PHP"
 		},
 		"Supersized": {
-			"website": "buildinternet.com/project/supersized",
+			"website": "buildinternet.com\/project\/supersized",
 			"cats": [ 7, 25 ],
-			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"website": "suse.com",
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1", "X-Powered-By": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "SUSE(\/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(\/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"website": "scientificlinux.org",
@@ -2162,13 +2196,13 @@
 			"headers": { "Server": "Scientific Linux", "X-Powered-By": "Scientific Linux" }
 		},
 		"SWFObject": {
-			"website": "blog.deconcept.com/swfobject",
+			"website": "blog.deconcept.com\/swfobject",
 			"cats": [ 19 ],
 			"script": "swfobject.*\\.js",
 			"env": "^SWFObject$"
 		},
 		"swift.engine": {
-			"website": "mittec.ru/default",
+			"website": "mittec.ru\/default",
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "swift\\.engine" }
 		},
@@ -2186,7 +2220,7 @@
 			"meta": { "generator": "Textpattern" }
 		},
 		"three.js": {
-			"website": "mrdoob.github.com/three.js",
+			"website": "mrdoob.github.com\/three.js",
 			"cats": [ 25 ],
 			"script": "three\\.js",
 			"env": "^THREE$"
@@ -2194,11 +2228,11 @@
 		"Tiki Wiki CMS Groupware": {
 			"website": "tiki.org",
 			"cats": [ 1, 2, 8, 11, 13 ],
-			"script": "(?:/|_)tiki",
+			"script": "(\/|_)tiki",
 			"meta": { "generator": "^Tiki" }
 		},
 		"Timeplot": {
-			"website": "www.simile-widgets.org/timeplot/",
+			"website": "www.simile-widgets.org\/timeplot\/",
 			"cats": [ 25 ],
 			"script": "timeplot.*\\.js",
 			"env": "^Timeplot$"
@@ -2229,7 +2263,7 @@
 			"website": "www.tumblr.com",
 			"cats": [ 11 ],
 			"html": "<iframe src=\"[^>]+tumblr\\.com",
-			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
+			"url": "^https?:\/\/(www\\.)?[^\/]+\\.tumblr\\.com\/",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
@@ -2238,9 +2272,9 @@
 			"headers": { "X-Powered-CMS": "Twilight CMS" }
 		},
 		"Twitter Bootstrap": {
-			"website": "twitter.github.com/bootstrap",
+			"website": "twitter.github.com\/bootstrap",
 			"cats": [ 18 ],
-			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.js|\\.min\\.js))",
+			"script": "(twitter\\.github\\.com\/bootstrap|bootstrap(\\.js|\\.min\\.js))",
 			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
@@ -2254,27 +2288,28 @@
 			"website": "www.typepad.com",
 			"cats": [ 11 ],
 			"meta": { "generator": "typepad" },
-			"url": "typepad\\.com"
+			"url": "^(www.)?.+\\.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/",
+			"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",
+			"script": "uc_cart\/uc_cart_block\\.js",
 			"implies": "Drupal"
 		},
 		"Ubuntu": {
-			"website": "ubuntu.com/business/server/overview",
+			"website": "ubuntu.com\/business\/server\/overview",
 			"cats": [ 28 ],
-			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu" }
+			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu"
+			}
 		},
 		"Umbraco": {
 			"website": "umbraco.com",
@@ -2285,7 +2320,7 @@
 			"implies": "Microsoft ASP.NET"
 		},
 		"Underscore.js": {
-			"website": "documentcloud.github.com/underscore",
+			"website": "documentcloud.github.com\/underscore",
 			"cats": [ 12 ],
 			"script": "underscore.*\\.js"
 		},
@@ -2297,6 +2332,7 @@
 		"UserRules": {
 			"website": "www.userrules.com",
 			"cats": [ 13 ],
+			"html": "var _usrp =",
 			"env": "^_usrp$"
 		},
 		"UserVoice": {
@@ -2307,7 +2343,7 @@
 		"Vanilla": {
 			"website": "vanillaforums.org",
 			"cats": [ 2 ],
-			"html": "<body id=\"(?:DiscussionsPage|vanilla)",
+			"html": "<body id=\"(DiscussionsPage|vanilla)",
 			"headers": { "X-Powered-By": "Vanilla" },
 			"implies": "PHP"
 		},
@@ -2320,7 +2356,7 @@
 			"website": "www.vbulletin.com",
 			"cats": [ 2 ],
 			"meta": { "generator": "vBulletin" },
-			"env": "^(?:vBulletin|vB_[^g])",
+			"env": "^(vBulletin|vB_[^g])",
 			"implies": "PHP"
 		},
 		"VideoJS": {
@@ -2328,7 +2364,7 @@
 			"cats": [ 14 ],
 			"env": "^VideoJS$",
 			"html": "<div[^>]+class=\"video-js+\">",
-			"script": "zencdn\\.net/c/video\\.js"
+			"script": "zencdn\\.net\/c\/video\\.js"
 		},
 		"viennaCMS": {
 			"website": "www.viennacms.nl",
@@ -2338,12 +2374,12 @@
 		"Vignette": {
 			"website": "www.vignette.com",
 			"cats": [ 1 ],
-			"html": "<[^>]+=\"vgn-?ext"
+			"html": "<[^>]+?=\"(vgn-ext|vgnext)"
 		},
 		"Vimeo": {
 			"website": "vimeo.com",
 			"cats": [ 14 ],
-			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
+			"html": "<(param|embed)[^>]+vimeo\\.com\/moogaloop|<iframe[^>]player\\.vimeo\\.com"
 		},
 		"VirtueMart": {
 			"website": "virtuemart.net",
@@ -2351,9 +2387,9 @@
 			"html": "<div id=\"vmMainPage"
 		},
 		"VisualPath": {
-			"website": "www.trackset.com/web-analytics-software/visualpath",
+			"website": "www.trackset.com\/web-analytics-software\/visualpath",
 			"cats": [ 10 ],
-			"script": "visualpath[^/]*\\.trackset\\.it/[^/]+/track/include\\.js"
+			"script": "visualpath[^\/]*\\.trackset\\.it\/[^\/]+\/track\/include\\.js"
 		},
 		"VIVVO": {
 			"website": "vivvo.net",
@@ -2364,30 +2400,29 @@
 		"Volusion": {
 			"website": "volusion.com",
 			"cats": [ 6 ],
-			"html": "/v/vspfiles(?:/.)*/css/.+\\.css"
+			"html": "\/v\/vspfiles(\/.)*\/css\/.+\\.css"
 		},
 		"Vox": {
 			"website": "www.vox.com",
 			"cats": [ 11 ],
-			"url": "\\.vox\\.com"
+			"url": "^(www.)?.+\\.vox\\.com"
 		},
 		"VP-ASP": {
 			"website": "www.vpasp.com",
 			"cats": [ 6 ],
 			"script": "vs350\\.js",
-			"html": "<a[^>]+>Powered By VP-ASP Shopping Cart</a>",
+			"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"
+			"script": "w3counter\\.com\/tracker\\.js"
 		},
 		"W3 Total Cache": {
-			"website": "www.w3-edge.com/wordpress-plugins/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"
 		},
 		"Web Optimizer": {
@@ -2396,9 +2431,10 @@
 			"html": "<title [^>]*lang=\"wo\">"
 		},
 		"webEdition": {
-			"website": "webedition.de/en",
+			"website": "webedition.de\/en",
 			"cats": [ 1 ],
-			"meta": { "generator": "webEdition", "DC.title": "webEdition" }
+			"meta": { "generator": "webEdition", "DC.title": "webEdition"
+			}
 		},
 		"WebGUI": {
 			"website": "www.webgui.org",
@@ -2413,10 +2449,10 @@
 		"Websale": {
 			"website": "websale.de",
 			"cats": [ 6 ],
-			"url": "/websale7/"
+			"url": "\/websale7\/"
 		},
 		"WebsiteBaker": {
-			"website": "websitebaker2.org/en/home.php",
+			"website": "websitebaker2.org\/en\/home.php",
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
 			"implies": [ "PHP", "MySQL" ]
@@ -2429,13 +2465,13 @@
 		"Webtrekk": {
 			"website": "www.webtrekk.com",
 			"cats": [ 10 ],
-			"env": "^webtrekk"
+			"html": "var webtrekk = new Object"
 		},
 		"Webtrends": {
 			"website": "worldwide.webtrends.com",
 			"cats": [ 10 ],
 			"html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
-			"env": "^(?:WTOptimize|WebTrends)"
+			"env": "^(WTOptimize|WebTrends)"
 		},
 		"Weebly": {
 			"website": "www.weebly.com",
@@ -2449,27 +2485,28 @@
 			"html": "Powered by <a href=\"[^>]+WikkaWiki"
 		},
 		"Windows Server": {
-			"website": "microsoft.com/windowsserver",
+			"website": "microsoft.com\/windowsserver",
 			"cats": [ 28 ],
 			"headers": { "Server": "Win32" }
 		},
 		"Wink": {
 			"website": "winktoolkit.org",
 			"cats": [ 26, 12 ],
-			"script": "(?:_base/js/base|wink).*\\.js",
+			"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)"
+			"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)"
+			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
 		},
 		"Woopra": {
 			"website": "www.woopra.com",
@@ -2485,7 +2522,7 @@
 			"implies": "PHP"
 		},
 		"WordPress Super Cache": {
-			"website": "ocaoimh.ie/wp-super-cache/",
+			"website": "ocaoimh.ie\/wp-super-cache\/",
 			"cats": [ 23 ],
 			"html": "<!--[^>]+WP-Super-Cache",
 			"implies": "WordPress"
@@ -2503,17 +2540,17 @@
 		"XenForo": {
 			"website": "xenforo.com",
 			"cats": [ 2 ],
-			"html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding)"
+			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
 		"AT Internet Analyzer": {
-			"website": "atinternet.com/en",
+			"website": "atinternet.com\/en",
 			"cats": [ 10 ],
 			"env": "^xtsite$"
 		},
 		"AT Internet XiTi": {
-			"website": "atinternet.com/en",
+			"website": "atinternet.com\/en",
 			"cats": [ 10 ],
-			"script": "xiti\\.com/hit\\.xiti",
+			"script": "xiti\\.com\/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
@@ -2537,7 +2574,7 @@
 		"xui": {
 			"website": "xuijs.com",
 			"cats": [ 26, 12 ],
-			"script": "[^a-z]xui.*\\.js",
+			"script": "[^a-zA-Z]xui.*\\.js",
 			"env": "^xui$"
 		},
 		"YaBB": {
@@ -2546,37 +2583,37 @@
 			"html": "Powered by <a href=\"[^>]+yabbforum"
 		},
 		"Yahoo! Ecommerce": {
-			"website": "smallbusiness.yahoo.com/ecommerce",
+			"website": "smallbusiness.yahoo.com\/ecommerce",
 			"cats": [ 6 ],
 			"html": "<link[^>]+store\\.yahoo\\.net",
-			"headers": { "X-XRDS-Location": "/ystore/" },
+			"headers": { "X-XRDS-Location": "\/ystore\/" },
 			"env": "^YStore$"
 		},
 		"Yahoo! Web Analytics": {
 			"website": "web.analytics.yahoo.com",
 			"cats": [ 10 ],
-			"script": "d\\.yimg\\.com/mi/ywa\\.js",
+			"script": "d\\.yimg\\.com\/mi\/ywa\\.js",
 			"env": "^YWA$"
 		},
 		"Yandex.Metrika": {
 			"website": "metrika.yandex.com",
 			"cats": [ 10 ],
-			"script": "mc\\.yandex\\.ru/metrika/watch\\.js"
+			"script": "mc\\.yandex\\.ru\/metrika\/watch\\.js"
 		},
 		"YouTube": {
 			"website": "www.youtube.com",
 			"cats": [ 14 ],
-			"html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)"
+			"html": "<(param|embed|iframe)[^>]+youtube(-nocookie)?\\.com\/(v|embed)"
 		},
 		"YUI Doc": {
-			"website": "developer.yahoo.com/yui/yuidoc",
+			"website": "developer.yahoo.com\/yui\/yuidoc",
 			"cats": [ 4 ],
-			"html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)"
+			"html": "(<html[^>]* yuilibrary\\.com\/rdf\/[\\d.]+\/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)"
 		},
 		"YUI": {
 			"website": "yuilibrary.com",
 			"cats": [ 12 ],
-			"script": "(?:/yui/|yui\\.yahooapis\\.com)",
+			"script": "\/yui\/|yui\\.yahooapis\\.com",
 			"env": "^YAHOO$"
 		},
 		"Zen Cart": {
@@ -2604,7 +2641,7 @@
 		"ZK": {
 			"website": "zkoss.org",
 			"cats": [ 18 ],
-			"script": "zkau/",
+			"script": "zkau\/",
 			"html": "<!-- ZK [\\.\\d\\s]+-->",
 			"implies": "Java"
 		},
diff --git a/share/images/icons/ContentBox.png b/share/images/icons/ContentBox.png
new file mode 100644
index 000000000..eb387c210
Binary files /dev/null and b/share/images/icons/ContentBox.png differ
diff --git a/share/images/icons/Mura CMS.png b/share/images/icons/Mura CMS.png
new file mode 100644
index 000000000..2565e5831
Binary files /dev/null and b/share/images/icons/Mura CMS.png differ