Fixed bookmark button in FF

.gitattributes

@@ -0,0 +1,19 @@
+# End-of-line normalization
+* text=auto
+
+*.cmd			text eol=lf
+*.sh			text eol=lf
+*.md			text eol=lf
+*.json			text eol=lf
+*.js			text eol=lf
+*.html			text eol=lf
+*.css			text eol=lf
+*.manifest		text eol=lf
+*.rdf			text eol=lf
+*.xul			text eol=lf
+*.dtd			text eol=lf
+*.properties	text eol=lf
+*.php			text eol=lf
+
+*.png			binary
+*.gif			binary

README.md

@@ -1,139 +1,139 @@
-Wappalyzer
+Wappalyzer
-==========
+==========
-
+
-[Wappalyzer](http://wappalyzer.com/) is a 
+[Wappalyzer](http://wappalyzer.com/) is a 
-[browser extension](http://wappalyzer.com/download) that uncovers the 
+[browser extension](http://wappalyzer.com/download) that uncovers the 
-technologies used on websites.  It detects
+technologies used on websites.  It detects
-[content management systems](http://wappalyzer.com/categories/cms),
+[content management systems](http://wappalyzer.com/categories/cms),
-[web shops](http://wappalyzer.com/categories/web-shops),
+[web shops](http://wappalyzer.com/categories/web-shops),
-[web servers](http://wappalyzer.com/categories/web-servers), 
+[web servers](http://wappalyzer.com/categories/web-servers), 
-[JavaScript frameworks](http://wappalyzer.com/categories/javascript-frameworks),
+[JavaScript frameworks](http://wappalyzer.com/categories/javascript-frameworks),
-[analytics tools](http://wappalyzer.com/categories/analytics) and
+[analytics tools](http://wappalyzer.com/categories/analytics) and
-[many more](http://wappalyzer.com/applications).
+[many more](http://wappalyzer.com/applications).
-
+
-
+
-Contributing
+Contributing
-------------
+------------
-
+
-**Adding a new application**
+**Adding a new application**
-
+
-* Edit `share/apps.json`
+* Edit `share/apps.json` and use a validator like http://jsonformatter.curiousconcept.com/ to verify your modification.
-* Add a 16x16 PNG image to `share/images/icons` matching the application name.
+* Add a 16x16 PNG image to `share/images/icons` matching the application name and compressed with a loss-less tools like http://www.smushit.com/ or optipng http://optipng.sourceforge.net/.
-* Provide the URL to the application's website when submitting a pull request.
+* Provide the URL to the application's website when submitting a pull request.
-
+
-Example:
+Example:
-
+
-```javascript
+```javascript
-"Application Name": { 
+"Application Name": { 
-	cats:    [ "1" ], 
+	cats:    [ "1" ], 
-	headers: { "X-Powered-By": "Application Name" },
+	headers: { "X-Powered-By": "Application Name" },
-	url:     ".+\\.application-name\\.com",
+	url:     ".+\\.application-name\\.com",
-	html:    "<link[^>]application-name\\.css", 
+	html:    "<link[^>]application-name\\.css", 
-	meta:    { "generator": "Application Name" },
+	meta:    { "generator": "Application Name" },
-	script:  "application-name\\.js",
+	script:  "application-name\\.js",
-	env:     "ApplicationName",
+	env:     "ApplicationName",
-	implies: [ "PHP" ]
+	implies: [ "PHP" ]
-	}
+	}
-```
+```
-
+
-
+
-Drivers
+Drivers
--------
+-------
-
+
-Wappalyzer is multi-platform. The main code lives in the `share/` directory and
+Wappalyzer is multi-platform. The main code lives in the `share/` directory and
-platform specific code in `drivers/`. The sections below describe how to set up
+platform specific code in `drivers/`. The sections below describe how to set up
-a development environment for the various existing drivers.
+a development environment for the various existing drivers.
-
+
-To keep files synchronised between drivers, run the `links.sh` script (UNIX-like 
+To keep files synchronised between drivers, run the `links.sh` script (UNIX-like 
-systems only, Windows users can use `links.cmd`.)
+systems only, Windows users can use `links.cmd`.)
-
+
-
+
-**Mozilla Firefox**
+**Mozilla Firefox**
-
+
-* Place a file called `wappalyzer@crunchlabz.com` in the extensions directory in
+* Place a file called `wappalyzer@crunchlabz.com` in the extensions directory in
-  your [profile folder](http://kb.mozillazine.org/Profile_folder_-_Firefox) 
+  your [profile folder](http://kb.mozillazine.org/Profile_folder_-_Firefox) 
-	(`~/.mozilla/firefox/xxxxx.default/extensions/` on Linux) containing the full
+	(`~/.mozilla/firefox/xxxxx.default/extensions/` on Linux) containing the full
-	path to `drivers/firefox`.
+	path to `drivers/firefox`.
-* Restart Firefox
+* Restart Firefox
-* Navigate to `about:config` and set `extensions.wappalyzer.debug` to `true`.
+* Navigate to `about:config` and set `extensions.wappalyzer.debug` to `true`.
-* Ctrl+Shift+J brings up a console for debugging.
+* Ctrl+Shift+J brings up a console for debugging.
-
+
-
+
-**Google Chrome**
+**Google Chrome**
-
+
-The Chrome version needs some love, if anyone wants to pick it up. It's
+The Chrome version needs some love, if anyone wants to pick it up. It's
-currently not as feature-rich as the Firefox add-on (although partially due to 
+currently not as feature-rich as the Firefox add-on (although partially due to 
-API limitations.)
+API limitations.)
-
+
-* Navigate to `about:extensions`
+* Navigate to `about:extensions`
-* Check "Developer mode"
+* Check "Developer mode"
-* Click "Load unpacked extension..."
+* Click "Load unpacked extension..."
-* Select `drivers/chrome/`
+* Select `drivers/chrome/`
-
+
-
+
-**Bookmarklet**
+**Bookmarklet**
-
+
-Beta version available for testing at [wappalyzer.com/bookmarklet](http://wappalyzer.com/bookmarklet).
+Beta version available for testing at [wappalyzer.com/bookmarklet](http://wappalyzer.com/bookmarklet).
-
+
-
+
-**HTML**
+**HTML**
-
+
-The HTML driver serves purely as an example. It's a good starting point if you
+The HTML driver serves purely as an example. It's a good starting point if you
-want to port Wappalyzer to a new platform.
+want to port Wappalyzer to a new platform.
-
+
-* Navigate to `drivers/html/`
+* Navigate to `drivers/html/`
-
+
-
+
-**PHP**
+**PHP**
-
+
-The PHP driver requires the [V8js](http://php.net/manual/en/book.v8js.php) class. Installing V8js 
+The PHP driver requires the [V8js](http://php.net/manual/en/book.v8js.php) class. Installing V8js 
-using [PECL](http://pecl.php.net/) on Debian Linux or Ubuntu should be very straight forward:
+using [PECL](http://pecl.php.net/) on Debian Linux or Ubuntu should be very straight forward:
-
+
-* `# aptitude install php5-dev php-pear libv8-dev`
+* `# aptitude install php5-dev php-pear libv8-dev`
-* `# pecl install channel://pecl.php.net/v8js-0.1.3`
+* `# pecl install channel://pecl.php.net/v8js-0.1.3`
-* `# echo "extension=v8js.so" > /etc/php5/conf.d/v8js.ini`
+* `# echo "extension=v8js.so" > /etc/php5/conf.d/v8js.ini`
-
+
-Runnning Wappalyzer from the command line:
+Runnning Wappalyzer from the command line:
-
+
-`$ php drivers/php/index.php wappalyzer.com`
+`$ php drivers/php/index.php wappalyzer.com`
-
+
-Running Wappalyzer inside a PHP script:
+Running Wappalyzer inside a PHP script:
-
+
-```php
+```php
-require('WappalyzerException.php');
+require('WappalyzerException.php');
-require('Wappalyzer.php');
+require('Wappalyzer.php');
-
+
-$wappalyzer = new Wappalyzer($url);
+$wappalyzer = new Wappalyzer($url);
-
+
-$detectedApps = $wappalyzer->analyze();
+$detectedApps = $wappalyzer->analyze();
-```
+```
-
+
-
+
-**Mozilla Jetpack**
+**Mozilla Jetpack**
-
+
-Work in progress, experimental. See https://wiki.mozilla.org/Jetpack.
+Work in progress, experimental. See https://wiki.mozilla.org/Jetpack.
-
+
-
+
-Unofficial drivers and ports
+Unofficial drivers and ports
-----------------------------
+----------------------------
-
+
-**Python**
+**Python**
-
+
-A Python driver by [@ebradbury](https://github.com/ebradbury).
+A Python driver by [@ebradbury](https://github.com/ebradbury).
-
+
-https://github.com/ebradbury/Wappalyzer/tree/master/drivers/python
+https://github.com/ebradbury/Wappalyzer/tree/master/drivers/python
-
+
-
+
-**Ruby**
+**Ruby**
-
+
-A Ruby port by [@skroutz](https://github.com/skroutz).
+A Ruby port by [@skroutz](https://github.com/skroutz).
-
+
-https://github.com/skroutz/wappalyzer-ruby
+https://github.com/skroutz/wappalyzer-ruby
-
+
-
+
-Screenshot
+Screenshot
-----------
+----------
-
+
-Wappalyzer on Firefox:
+Wappalyzer on Firefox:
-
+
-![Screenshot](http://wappalyzer.com/sites/default/themes/wappalyzer/images/installed.png)
+![Screenshot](http://wappalyzer.com/sites/default/themes/wappalyzer/images/installed.png)

drivers/bookmarklet/json

@@ -53,7 +53,7 @@
 		"3dCart": {
 			"cats": [ 1, 6 ],
 			"headers": { "X-Powered-By": "3DCART" },
-			"script": "(twlh(track)?\\.asp|3d_upsell.js)"
+			"script": "(twlh(track)?\\.asp|3d_upsell\\.js)"
 		},
 		"Accessible Portal": {
 			"cats": [ 1 ],
@@ -77,7 +77,7 @@
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
-			"html": "aws.src = [^<]+caphyon-analytics",
+			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"implies": [ "Java" ]
 		},
 		"Alloy": {
@@ -87,7 +87,7 @@
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
-			"script": "STools.js",
+			"script": "STools\\.js",
 			"implies": [ "Java" ]
 		},
 		"Amiro.CMS": {
@@ -99,7 +99,7 @@
 		"AMPcms": {
 			"cats": [ 1 ],
 			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
-			"env": "amp_js_init",
+			"env": "^amp_js_init$",
 			"implies": [ "PHP" ]
 		},
 		"AngularJS": {
@@ -112,7 +112,7 @@
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|[^-])|HTTPD)" } 
+			"headers": { "Server": "(Apache($|[^-])|HTTPD)" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -122,7 +122,7 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" } 
+			"headers": { "Server": "Apache-Coyote" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
@@ -132,6 +132,11 @@
 			"cats": [ 2 ],
 			"html": "ping\\.src = node\\.href;"
 		},
+		"AsciiDoc": {
+			"cats": [ 1, 20, 27 ],
+			"meta": { "generator": "^AsciiDoc" },
+			"env": "^asciidoc$"
+		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
 			"headers": { "X-ATG-Version": "ATG" },
@@ -139,13 +144,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -171,11 +176,11 @@
 			"implies": [ "PHP" ]
 		},
 		"Bigcommerce": {
-			"cats":	[ 6 ],
+			"cats": [ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
-			"env": "compareProducts"
+			"env": "^compareProducts$"
 		},
 		"BigDump": {
 			"cats": [ 3 ],
@@ -184,8 +189,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"url": "(\\?|&)bigWAdminID=[a-z\\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -195,8 +200,7 @@
 		},
 		"Blogger": {
 			"cats": [ 11 ],
-			"meta": { "generator": "blogger"
+			"meta": { "generator": "blogger" },
-			},
 			"url": "^(www.)?.+\\.blogspot\\.com"
 		},
 		"BrowserCMS": {
@@ -227,7 +231,7 @@
 		},
 		"Cargo": {
 			"cats": [ 1 ],
-			"meta": {"cargo_title": ".*" },
+			"meta": { "cargo_title": ".*" },
 			"script": "/cargo\\.",
 			"html": "<link [^>]+Cargo feed",
 			"implies": [ "PHP" ]
@@ -240,7 +244,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -250,7 +254,8 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" }, "headers": { "X-Powered-By": "Chamilo" },
+			"meta": { "generator": "Chamilo" },
+			"headers": { "X-Powered-By": "Chamilo" },
 			"implies": [ "PHP" ]
 		},
 		"Chartbeat": {
@@ -259,7 +264,8 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" } },
+			"headers": { "Server": "Cherokee" }
+		},
 		"CKEditor": {
 			"cats": [ 24 ],
 			"env": "^CKEDITOR$",
@@ -293,7 +299,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -314,7 +320,7 @@
 			"cats": [ 1 ],
 			"script": "concrete/js/",
 			"meta": { "generator": "concrete5" },
-			"env": "CCM_IMAGE_PATH",
+			"env": "^CCM_IMAGE_PATH$",
 			"implies": [ "PHP" ]
 		},
 		"Connect": {
@@ -323,8 +329,13 @@
 			"implies": [ "node.js" ]
 		},
 		"Contao": {
+<<<<<<< HEAD
 			"cats": [ 1 ],
 			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+=======
+			"cats": [ 1, 6 ],
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao)\\.css)",
+>>>>>>> 64745b6d507c0e1ee95f2e8a4a09b6be7448aee5
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -372,23 +383,23 @@
 		},
 		"Crazy Egg": {
 			"cats": [ 10 ],
-			"env": "CE2",
+			"env": "^CE2$",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
-			"env": "fn_compare_strings",
+			"env": "^fn_compare_strings$",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -408,7 +419,7 @@
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": {"X-Powered-By": "CMS Danneo.*"},
+			"headers": { "X-Powered-By": "CMS Danneo.*" },
 			"meta": { "generator": "Danneo" },
 			"implies": [ "Apache", "PHP" ]
 		},
@@ -418,7 +429,7 @@
 		},
 		"DataLife Engine": {
 			"cats": [ 1 ],
-			"env": "dle_root",
+			"env": "^dle_root$",
 			"meta": { "generator": "DataLife Engine" },
 			"implies": [ "PHP", "Apache" ]
 		},
@@ -438,9 +449,9 @@
 		},
 		"Demandware": {
 			"cats": [ 6 ],
-			"headers": { "Server" : "Demandware eCommerce Server" },
+			"headers": { "Server": "Demandware eCommerce Server" },
 			"html": "<[^>]+demandware.edgesuite",
-			"env": "^dwAnalytics"
+			"env": "^dwAnalytics$"
 		},
 		"DHTMLX": {
 			"cats": [ 12 ],
@@ -455,7 +466,7 @@
 			"cats": [ 15 ],
 			"script": "disqus_url",
 			"html": "<div[^>]+id=\\\"disqus_thread\\\"",
-			"env": "^DISQUS"
+			"env": "^DISQUS$"
 		},
 		"Django": {
 			"cats": [ 18 ],
@@ -486,11 +497,11 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
-			"env": "^DotNetNuke",
+			"env": "^DotNetNuke$",
 			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Doxygen": {
@@ -504,7 +515,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -523,10 +534,10 @@
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
-			"implies": [ "PHP"]
+			"implies": [ "PHP" ]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +546,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -562,7 +573,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish" },
+			"headers": { "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -591,7 +602,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org)"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -604,16 +615,16 @@
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": {"generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" }
 		},
 		"Gallery": {
 			"cats": [ 7 ],
-			"env": "galleryAuthToken",
+			"env": "^galleryAuthToken$",
 			"html": "<div id=\\\"gsNavBar\\\" class=\\\"gcBorder1\\\">"
 		},
 		"Gambio": {
 			"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": {
@@ -623,7 +634,7 @@
 		},
 		"Gentoo": {
 			"cats": [ 28 ],
-			"headers": { "X-Powered-By": "-?gentoo"}
+			"headers": { "X-Powered-By": "-?gentoo" }
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
@@ -631,7 +642,7 @@
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
-			"meta": {"generator": "GetSimple" },
+			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
 		"Google Analytics": {
@@ -652,8 +663,8 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
-			"env": "^WebFont"
+			"env": "^WebFonts$"
 		},
 		"Google Maps": {
 			"cats": [ 5 ],
@@ -665,7 +676,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -766,7 +777,7 @@
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard",
+			"env": "^IPBoard$",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
@@ -804,9 +815,9 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill)",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
-			"env": "^(jcomments)$",
+			"env": "^jcomments$",
 			"implies": [ "PHP" ]
 		},
 		"jqPlot": {
@@ -910,13 +921,18 @@
 			"cats": [ 11 ],
 			"url": "^(www.)?.+\\.livejournal\\.com"
 		},
+		"Lockerz Share": {
+			"cats": [ 5 ],
+			"script": "addtoany\\.com/menu/page\\.js",
+			"env": "^a2apage_init$"
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
 		},
 		"Magento": {
 			"cats": [ 6 ],
-			"script": "/(js/mage|skin/frontend/(default|enterprise))/",
+			"script": "(js/mage|skin/frontend/(default|enterprise))",
 			"headers": { "Set-Cookie": "frontend=" },
 			"env": "^(Mage|VarienForm)$",
 			"implies": [ "PHP" ]
@@ -974,7 +990,7 @@
 		"Mixpanel": {
 			"cats": [ 10 ],
 			"script": "api\\.mixpanel\\.com/track",
-			"env": "^Mixpanel"
+			"env": "^Mixpanel$"
 		},
 		"MochiKit": {
 			"cats": [ 12 ],
@@ -988,7 +1004,16 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(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}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
+		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "^show_switch2gui$",
+			"implies": [ "Python" ]
 		},
 		"Mojolicious": {
 			"cats": [ 18 ],
@@ -1035,8 +1060,8 @@
 		},
 		"MyBB": {
 			"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"
+			"env": "^MyBB$"
 		},
 		"MyBlogLog": {
 			"cats": [ 5 ],
@@ -1048,12 +1073,12 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
 			"script": "netmonitor\\.fi/nmtracker\\.js",
-			"env": "^netmonitor"
+			"env": "^netmonitor$"
 		},
 		"New Relic": {
 			"cats": [ 10 ],
@@ -1082,11 +1107,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1114,7 +1139,7 @@
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
-			"env": "^optimizely"
+			"env": "^optimizely$"
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [ 10 ],
@@ -1122,7 +1147,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1130,8 +1156,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1164,6 +1190,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,10 +1234,16 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
+		"phpwind": {
+			"cats": [ 1, 2 ],
+			"meta": { "generator": "^phpwind" },
+			"html": "Powered by <a href=\\\".+phpwind\\.net",
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1214,7 +1251,7 @@
 		},
 		"Plentymarkets": {
 			"cats": [ 6 ],
-			"meta": { "generator": "www\\.plentyMarkets\\." }
+			"meta": { "generator": "^www\\.plentyMarkets" }
 		},
 		"Plesk": {
 			"cats": [ 9 ],
@@ -1225,7 +1262,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "Pligg" },
 			"html": "<span[^>]+id=\\\"xvotes-0",
-			"env": "pligg_"
+			"env": "^pligg_"
 		},
 		"Plone": {
 			"cats": [ 1 ],
@@ -1234,7 +1271,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1310,7 +1347,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1337,7 +1374,7 @@
 		"RoundCube": {
 			"cats": [ 30 ],
 			"html": "<title>RoundCube",
-			"env": "(rcmail|rcube_|roundcube)",
+			"env": "^(rcmail|rcube_|roundcube)",
 			"implies": [ "PHP" ]
 		},
 		"Ruby": {
@@ -1346,9 +1383,9 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
-			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
+			"headers": { "Server": "(mod_rails|mod_rack|Phusion\\.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion\\.Passenger)" },
 			"implies": [ "Ruby" ]
 		},
 		"S.Builder": {
@@ -1369,7 +1406,7 @@
 			"html": "mfinfo\\.application='Tridion"
 		},
 		"Sencha Touch": {
-			"cats": [ 26, 12 ],
+			"cats": [ 12, 26 ],
 			"script": "sencha-touch.*\\.js"
 		},
 		"Seoshop": {
@@ -1407,7 +1444,7 @@
 		},
 		"Site Meter": {
 			"cats": [ 10 ],
-			"script": "sitemeter.com/js/counter\\.js\\?site="
+			"script": "sitemeter\\.com/js/counter\\.js\\?site="
 		},
 		"SiteCatalyst": {
 			"cats": [ 10 ],
@@ -1435,11 +1472,19 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"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": {
+			"cats": [ 19 ],
+			"env": "^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1457,8 +1502,7 @@
 		"SPIP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "SPIP" },
-			"headers": {
+			"headers": { "X-Spip-Cache": ".*" }
-				"X-Spip-Cache": ".*" }
 		},
 		"SQL Buddy": {
 			"cats": [ 3 ],
@@ -1480,11 +1524,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1509,7 +1553,7 @@
 		},
 		"three.js": {
 			"cats": [ 25 ],
-			"script": "three.js",
+			"script": "three\\.js",
 			"env": "^THREE$"
 		},
 		"Tiki Wiki CMS Groupware": {
@@ -1537,12 +1581,12 @@
 		},
 		"Trac": {
 			"cats": [ 13 ],
-			"html": "(<a id=\\\"tracpowered)",
+			"html": "<a id=\\\"tracpowered",
 			"implies": [ "Python" ]
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1558,7 +1602,7 @@
 		},
 		"Typekit": {
 			"cats": [ 17 ],
-			"script": "use.typekit.com",
+			"script": "use\\.typekit\\.com",
 			"env": "^Typekit$"
 		},
 		"TypePad": {
@@ -1623,6 +1667,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1633,7 +1683,7 @@
 		},
 		"Vimeo": {
 			"cats": [ 14 ],
-			"html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
+			"html": "<(param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com"
 		},
 		"VirtueMart": {
 			"cats": [ 6 ],
@@ -1645,8 +1695,8 @@
 		},
 		"VIVVO": {
 			"cats": [ 1 ],
-			"headers": { "Set-Cookie": "VivvoSessionId",
+			"headers": { "Set-Cookie": "VivvoSessionId" },
-				"env": "^vivvo" }
+			"env": "^vivvo"
 		},
 		"Volusion": {
 			"cats": [ 6 ],
@@ -1694,7 +1744,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1725,7 +1775,7 @@
 		},
 		"Wolf CMS": {
 			"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": {
 			"cats": [ 10 ],
@@ -1753,11 +1803,11 @@
 		},
 		"XenForo": {
 			"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"
 		},
 		"XiTi": {
 			"cats": [ 10 ],
-			"html": "<[^>]+src=\\\"[^>]+xiti.com/hit.xiti",
+			"html": "(<[^>]+src=\\\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
 		},
 		"XMB": {
@@ -1798,7 +1848,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
@@ -1815,13 +1865,19 @@
 		},
 		"Zepto": {
 			"cats": [ 12 ],
-			"script": "zepto.*.js",
+			"script": "zepto.*\\.js",
 			"env": "^Zepto$"
 		},
 		"Zinnia": {
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }

drivers/chrome/apps.json

@@ -53,7 +53,7 @@
 		"3dCart": {
 			"cats": [ 1, 6 ],
 			"headers": { "X-Powered-By": "3DCART" },
-			"script": "(twlh(track)?\\.asp|3d_upsell.js)"
+			"script": "(twlh(track)?\\.asp|3d_upsell\\.js)"
 		},
 		"Accessible Portal": {
 			"cats": [ 1 ],
@@ -77,7 +77,7 @@
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
-			"html": "aws.src = [^<]+caphyon-analytics",
+			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"implies": [ "Java" ]
 		},
 		"Alloy": {
@@ -87,7 +87,7 @@
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
-			"script": "STools.js",
+			"script": "STools\\.js",
 			"implies": [ "Java" ]
 		},
 		"Amiro.CMS": {
@@ -99,7 +99,7 @@
 		"AMPcms": {
 			"cats": [ 1 ],
 			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
-			"env": "amp_js_init",
+			"env": "^amp_js_init$",
 			"implies": [ "PHP" ]
 		},
 		"AngularJS": {
@@ -112,7 +112,7 @@
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|[^-])|HTTPD)" } 
+			"headers": { "Server": "(Apache($|[^-])|HTTPD)" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -122,7 +122,7 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" } 
+			"headers": { "Server": "Apache-Coyote" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
@@ -132,6 +132,11 @@
 			"cats": [ 2 ],
 			"html": "ping\\.src = node\\.href;"
 		},
+		"AsciiDoc": {
+			"cats": [ 1, 20, 27 ],
+			"meta": { "generator": "^AsciiDoc" },
+			"env": "^asciidoc$"
+		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
 			"headers": { "X-ATG-Version": "ATG" },
@@ -139,13 +144,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -171,11 +176,11 @@
 			"implies": [ "PHP" ]
 		},
 		"Bigcommerce": {
-			"cats":	[ 6 ],
+			"cats": [ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
-			"env": "compareProducts"
+			"env": "^compareProducts$"
 		},
 		"BigDump": {
 			"cats": [ 3 ],
@@ -184,8 +189,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"url": "(\\?|&)bigWAdminID=[a-z\\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -195,8 +200,7 @@
 		},
 		"Blogger": {
 			"cats": [ 11 ],
-			"meta": { "generator": "blogger"
+			"meta": { "generator": "blogger" },
-			},
 			"url": "^(www.)?.+\\.blogspot\\.com"
 		},
 		"BrowserCMS": {
@@ -227,7 +231,7 @@
 		},
 		"Cargo": {
 			"cats": [ 1 ],
-			"meta": {"cargo_title": ".*" },
+			"meta": { "cargo_title": ".*" },
 			"script": "/cargo\\.",
 			"html": "<link [^>]+Cargo feed",
 			"implies": [ "PHP" ]
@@ -240,7 +244,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -250,7 +254,8 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" }, "headers": { "X-Powered-By": "Chamilo" },
+			"meta": { "generator": "Chamilo" },
+			"headers": { "X-Powered-By": "Chamilo" },
 			"implies": [ "PHP" ]
 		},
 		"Chartbeat": {
@@ -259,7 +264,8 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" } },
+			"headers": { "Server": "Cherokee" }
+		},
 		"CKEditor": {
 			"cats": [ 24 ],
 			"env": "^CKEDITOR$",
@@ -293,7 +299,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -314,7 +320,7 @@
 			"cats": [ 1 ],
 			"script": "concrete/js/",
 			"meta": { "generator": "concrete5" },
-			"env": "CCM_IMAGE_PATH",
+			"env": "^CCM_IMAGE_PATH$",
 			"implies": [ "PHP" ]
 		},
 		"Connect": {
@@ -323,8 +329,13 @@
 			"implies": [ "node.js" ]
 		},
 		"Contao": {
+<<<<<<< HEAD
 			"cats": [ 1 ],
 			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+=======
+			"cats": [ 1, 6 ],
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao)\\.css)",
+>>>>>>> 64745b6d507c0e1ee95f2e8a4a09b6be7448aee5
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -372,23 +383,23 @@
 		},
 		"Crazy Egg": {
 			"cats": [ 10 ],
-			"env": "CE2",
+			"env": "^CE2$",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
-			"env": "fn_compare_strings",
+			"env": "^fn_compare_strings$",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -408,7 +419,7 @@
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": {"X-Powered-By": "CMS Danneo.*"},
+			"headers": { "X-Powered-By": "CMS Danneo.*" },
 			"meta": { "generator": "Danneo" },
 			"implies": [ "Apache", "PHP" ]
 		},
@@ -418,7 +429,7 @@
 		},
 		"DataLife Engine": {
 			"cats": [ 1 ],
-			"env": "dle_root",
+			"env": "^dle_root$",
 			"meta": { "generator": "DataLife Engine" },
 			"implies": [ "PHP", "Apache" ]
 		},
@@ -438,9 +449,9 @@
 		},
 		"Demandware": {
 			"cats": [ 6 ],
-			"headers": { "Server" : "Demandware eCommerce Server" },
+			"headers": { "Server": "Demandware eCommerce Server" },
 			"html": "<[^>]+demandware.edgesuite",
-			"env": "^dwAnalytics"
+			"env": "^dwAnalytics$"
 		},
 		"DHTMLX": {
 			"cats": [ 12 ],
@@ -455,7 +466,7 @@
 			"cats": [ 15 ],
 			"script": "disqus_url",
 			"html": "<div[^>]+id=\\\"disqus_thread\\\"",
-			"env": "^DISQUS"
+			"env": "^DISQUS$"
 		},
 		"Django": {
 			"cats": [ 18 ],
@@ -486,11 +497,11 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
-			"env": "^DotNetNuke",
+			"env": "^DotNetNuke$",
 			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"Doxygen": {
@@ -504,7 +515,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -523,10 +534,10 @@
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
-			"implies": [ "PHP"]
+			"implies": [ "PHP" ]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +546,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -562,7 +573,7 @@
 		"eZ Publish": {
 			"cats": [ 1, 6 ],
 			"meta": { "generator": "eZ Publish" },
-			"headers": {  "X-Powered-By": "^eZ Publish" },
+			"headers": { "X-Powered-By": "^eZ Publish" },
 			"implies": [ "PHP" ]
 		},
 		"Fact Finder": {
@@ -591,7 +602,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org)"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -604,16 +615,16 @@
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": {"generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" }
 		},
 		"Gallery": {
 			"cats": [ 7 ],
-			"env": "galleryAuthToken",
+			"env": "^galleryAuthToken$",
 			"html": "<div id=\\\"gsNavBar\\\" class=\\\"gcBorder1\\\">"
 		},
 		"Gambio": {
 			"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": {
@@ -623,7 +634,7 @@
 		},
 		"Gentoo": {
 			"cats": [ 28 ],
-			"headers": { "X-Powered-By": "-?gentoo"}
+			"headers": { "X-Powered-By": "-?gentoo" }
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
@@ -631,7 +642,7 @@
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
-			"meta": {"generator": "GetSimple" },
+			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
 		"Google Analytics": {
@@ -652,8 +663,8 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
-			"env": "^WebFont"
+			"env": "^WebFonts$"
 		},
 		"Google Maps": {
 			"cats": [ 5 ],
@@ -665,7 +676,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -766,7 +777,7 @@
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard",
+			"env": "^IPBoard$",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
@@ -804,9 +815,9 @@
 			"cats": [ 1 ],
 			"url": "option=com_",
 			"meta": { "generator": "Joomla" },
-			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill\\\")",
+			"html": "(<div[^>]+id=\\\"wrapper_r\\\"|<[^>]+(feed|components)/com_|<table[^>]+class=\\\"pill)",
 			"headers": { "X-Content-Encoded-By": "Joomla" },
-			"env": "^(jcomments)$",
+			"env": "^jcomments$",
 			"implies": [ "PHP" ]
 		},
 		"jqPlot": {
@@ -910,13 +921,18 @@
 			"cats": [ 11 ],
 			"url": "^(www.)?.+\\.livejournal\\.com"
 		},
+		"Lockerz Share": {
+			"cats": [ 5 ],
+			"script": "addtoany\\.com/menu/page\\.js",
+			"env": "^a2apage_init$"
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
 		},
 		"Magento": {
 			"cats": [ 6 ],
-			"script": "/(js/mage|skin/frontend/(default|enterprise))/",
+			"script": "(js/mage|skin/frontend/(default|enterprise))",
 			"headers": { "Set-Cookie": "frontend=" },
 			"env": "^(Mage|VarienForm)$",
 			"implies": [ "PHP" ]
@@ -974,7 +990,7 @@
 		"Mixpanel": {
 			"cats": [ 10 ],
 			"script": "api\\.mixpanel\\.com/track",
-			"env": "^Mixpanel"
+			"env": "^Mixpanel$"
 		},
 		"MochiKit": {
 			"cats": [ 12 ],
@@ -988,7 +1004,16 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(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}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
+		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "^show_switch2gui$",
+			"implies": [ "Python" ]
 		},
 		"Mojolicious": {
 			"cats": [ 18 ],
@@ -1035,8 +1060,8 @@
 		},
 		"MyBB": {
 			"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"
+			"env": "^MyBB$"
 		},
 		"MyBlogLog": {
 			"cats": [ 5 ],
@@ -1048,12 +1073,12 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
 			"script": "netmonitor\\.fi/nmtracker\\.js",
-			"env": "^netmonitor"
+			"env": "^netmonitor$"
 		},
 		"New Relic": {
 			"cats": [ 10 ],
@@ -1082,11 +1107,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1114,7 +1139,7 @@
 		},
 		"Optimizely": {
 			"cats": [ 10 ],
-			"env": "^optimizely"
+			"env": "^optimizely$"
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [ 10 ],
@@ -1122,7 +1147,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1130,8 +1156,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1164,6 +1190,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,10 +1234,16 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
+		"phpwind": {
+			"cats": [ 1, 2 ],
+			"meta": { "generator": "^phpwind" },
+			"html": "Powered by <a href=\\\".+phpwind\\.net",
+			"implies": [ "PHP" ]
+		},
 		"Piwik": {
 			"cats": [ 10 ],
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
@@ -1214,7 +1251,7 @@
 		},
 		"Plentymarkets": {
 			"cats": [ 6 ],
-			"meta": { "generator": "www\\.plentyMarkets\\." }
+			"meta": { "generator": "^www\\.plentyMarkets" }
 		},
 		"Plesk": {
 			"cats": [ 9 ],
@@ -1225,7 +1262,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "Pligg" },
 			"html": "<span[^>]+id=\\\"xvotes-0",
-			"env": "pligg_"
+			"env": "^pligg_"
 		},
 		"Plone": {
 			"cats": [ 1 ],
@@ -1234,7 +1271,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1310,7 +1347,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1337,7 +1374,7 @@
 		"RoundCube": {
 			"cats": [ 30 ],
 			"html": "<title>RoundCube",
-			"env": "(rcmail|rcube_|roundcube)",
+			"env": "^(rcmail|rcube_|roundcube)",
 			"implies": [ "PHP" ]
 		},
 		"Ruby": {
@@ -1346,9 +1383,9 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
-			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
+			"headers": { "Server": "(mod_rails|mod_rack|Phusion\\.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion\\.Passenger)" },
 			"implies": [ "Ruby" ]
 		},
 		"S.Builder": {
@@ -1369,7 +1406,7 @@
 			"html": "mfinfo\\.application='Tridion"
 		},
 		"Sencha Touch": {
-			"cats": [ 26, 12 ],
+			"cats": [ 12, 26 ],
 			"script": "sencha-touch.*\\.js"
 		},
 		"Seoshop": {
@@ -1407,7 +1444,7 @@
 		},
 		"Site Meter": {
 			"cats": [ 10 ],
-			"script": "sitemeter.com/js/counter\\.js\\?site="
+			"script": "sitemeter\\.com/js/counter\\.js\\?site="
 		},
 		"SiteCatalyst": {
 			"cats": [ 10 ],
@@ -1435,11 +1472,19 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"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": {
+			"cats": [ 19 ],
+			"env": "^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1457,8 +1502,7 @@
 		"SPIP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "SPIP" },
-			"headers": {
+			"headers": { "X-Spip-Cache": ".*" }
-				"X-Spip-Cache": ".*" }
 		},
 		"SQL Buddy": {
 			"cats": [ 3 ],
@@ -1480,11 +1524,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1509,7 +1553,7 @@
 		},
 		"three.js": {
 			"cats": [ 25 ],
-			"script": "three.js",
+			"script": "three\\.js",
 			"env": "^THREE$"
 		},
 		"Tiki Wiki CMS Groupware": {
@@ -1537,12 +1581,12 @@
 		},
 		"Trac": {
 			"cats": [ 13 ],
-			"html": "(<a id=\\\"tracpowered)",
+			"html": "<a id=\\\"tracpowered",
 			"implies": [ "Python" ]
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1558,7 +1602,7 @@
 		},
 		"Typekit": {
 			"cats": [ 17 ],
-			"script": "use.typekit.com",
+			"script": "use\\.typekit\\.com",
 			"env": "^Typekit$"
 		},
 		"TypePad": {
@@ -1623,6 +1667,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1633,7 +1683,7 @@
 		},
 		"Vimeo": {
 			"cats": [ 14 ],
-			"html": "(<(param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
+			"html": "<(param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com"
 		},
 		"VirtueMart": {
 			"cats": [ 6 ],
@@ -1645,8 +1695,8 @@
 		},
 		"VIVVO": {
 			"cats": [ 1 ],
-			"headers": { "Set-Cookie": "VivvoSessionId",
+			"headers": { "Set-Cookie": "VivvoSessionId" },
-				"env": "^vivvo" }
+			"env": "^vivvo"
 		},
 		"Volusion": {
 			"cats": [ 6 ],
@@ -1694,7 +1744,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1725,7 +1775,7 @@
 		},
 		"Wolf CMS": {
 			"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": {
 			"cats": [ 10 ],
@@ -1753,11 +1803,11 @@
 		},
 		"XenForo": {
 			"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"
 		},
 		"XiTi": {
 			"cats": [ 10 ],
-			"html": "<[^>]+src=\\\"[^>]+xiti.com/hit.xiti",
+			"html": "(<[^>]+src=\\\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
 		},
 		"XMB": {
@@ -1798,7 +1848,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
@@ -1815,13 +1865,19 @@
 		},
 		"Zepto": {
 			"cats": [ 12 ],
-			"script": "zepto.*.js",
+			"script": "zepto.*\\.js",
 			"env": "^Zepto$"
 		},
 		"Zinnia": {
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }