diff --git a/share/apps.json b/share/apps.json
index e2bdd48f8..0b323c854 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -94,7 +94,7 @@
 		"AdInfinity": {
 			"website": "adinfinity.com.au",
 			"cats": [ 36 ],
-			"script": [ "adinfinity\\.com\\.au" ]
+			"script": "adinfinity\\.com\\.au"
 		},
 		"Adobe ColdFusion": {
 			"website": "adobe.com/products/coldfusion-family.html",
@@ -108,7 +108,7 @@
 		"Adobe CQ5": {
 			"website": "adobe.com/products/cq.html",
 			"cats": [ 1 ],
-			"html": [ "<div class=\"[^\"]*parbase","_jcr_content","/etc/designs/","/etc/clientlibs/" ],
+			"html": [ "<div class=\"[^\"]*parbase", "_jcr_content", "/etc/designs/", "/etc/clientlibs/" ],
 			"implies": "Java"
 		},
 		"Adobe GoLive": {
@@ -121,7 +121,7 @@
 			"cats": [ 36 ],
 			"env": "^adriver$",
 			"html": "(?:<embed[^>]+(?:src=\"https?://mh\\d?\\.adriver\\.ru/|flashvars=\"[^\"]*(?:http:%3A//(?:ad|mh\\d?)\\.adriver\\.ru/|adriver_banner))|<(?:(?:iframe|img)[^>]+src|a[^>]+href)=\"https?://ad\\.adriver\\.ru/)",
-			"script": [ "(?:adriver\\.core\\.\\d\\.js|https?://(?:content|ad|masterh\\d)\\.adriver\\.ru/)" ]
+			"script": "(?:adriver\\.core\\.\\d\\.js|https?://(?:content|ad|masterh\\d)\\.adriver\\.ru/)"
 		},
 		"Advanced Web Stats": {
 			"website": "www.advancedwebstats.com",
@@ -242,7 +242,7 @@
 		"ATEN": {
 			"website": "www.aten.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "ATEN HTTP Server(\\(V?([\\d\\.]+)\\))?\\;version:\\2" }
+			"headers": { "Server": "ATEN HTTP Server(:?\\(V?([\\d\\.]+)\\))?\\;version:\\1" }
 		},
 		"ATG Web Commerce": {
 			"website": "oracle.com/us/products/applications/web-commerce/atg",
@@ -270,7 +270,7 @@
 		"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": {
@@ -473,7 +473,7 @@
 		"ClickTale": {
 			"website": "www.clicktale.com",
 			"cats": [ 10 ],
-			"html": "if\\(typeof ClickTale(Tag)*==\\\"function\\\"\\)",
+			"html": "if\\(typeof ClickTale\\(Tag\\)*==\\\"function\\\"\\)",
 			"env": "^ClickTale"
 		},
 		"Clicky": {
@@ -647,7 +647,7 @@
 		"D3": {
 			"website": "d3js.org",
 			"cats": [ 25 ],
-			"script": "d3(?:\\. v[0-9]+)?(?:\\.min)?\\.js",
+			"script": "d3(?:\\. v[\\d]+)?(?:\\.min)?\\.js",
 			"env": "^d3$"
 		},
 		"Dancer": {
@@ -736,7 +736,7 @@
 		"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-z\\d]{32}\" type=\"hidden\"></div>)\\;version:\\1",
 			"env": "^__admin_media_prefix__",
 			"implies": "Python"
 		},
@@ -786,7 +786,7 @@
 			"website": "stack.nl/~dimitri/doxygen",
 			"cats": [ 4 ],
 			"meta": { "generator": "Doxygen ([\\d.]+)\\;version:\\1" },
-			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
+			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen\\.css)\\;version:\\1"
 		},
 		"DTG": {
 			"website": "www.dtg.nl",
@@ -829,7 +829,7 @@
 		"e107": {
 			"website": "e107.org",
 			"cats": [ 1 ],
-			"script": "[^a-z0-9]e107\\.js",
+			"script": "[^a-z\\d]e107\\.js",
 			"headers": { "Set-Cookie": "e107_tz[^;]+=", "X-Powered-By": "e107" },
 			"implies": "PHP"
 		},
@@ -909,7 +909,7 @@
 			"meta": { "generator": "^eSyndiCat " },
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
 			"env": "^esyndicat$",
-			"implies": [ "PHP" ]
+			"implies": "PHP"
 		},
 		"EWS-NIC4": {
 			"website": "dell.com",
@@ -927,13 +927,13 @@
 			"website": "expressjs.com",
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "^Express$" },
-			"implies": [ "node.js" ]
+			"implies": "node.js"
 		},
 		"total.js": {
 			"website": "totaljs.com",
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "^total\\.js" },
-			"implies": [ "node.js" ]
+			"implies": "node.js"
 		},
 		"ExpressionEngine": {
 			"website": "expressionengine.com",
@@ -977,7 +977,7 @@
 			"website": "fatfreeframework.com",
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "Fat-Free Framework" },
-			"implies": [ "PHP" ]
+			"implies": "PHP"
 		},
 		"Fedora": {
 			"website": "fedoraproject.org",
@@ -1088,7 +1088,7 @@
 			"env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ],
 			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ],
 			"env": "^google_ad_",
-			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ]
+			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net" ]
 		},
 		"Google App Engine": {
 			"website": "code.google.com/appengine",
@@ -1164,7 +1164,7 @@
 		"Gravatar": {
 			"website": "gravatar.com",
 			"cats": [ 19 ],
-			"html": "(secure\\.)?gravatar\\.com/avatar/.+",
+			"html": "gravatar\\.com/avatar/",
 			"env": "^Gravatar$"
 		},
 		"Gravity Insights": {
@@ -1200,8 +1200,8 @@
 		"Hello Bar": {
 			"website": "hellobar.com",
 			"cats": [ 5 ],
-			"script": "(hellobar\\.com/hellobar\\.js|new HelloBar)",
-			"html": "/hellobar\\.js" 
+			"script": "(?:hellobar\\.com/hellobar\\.js|new HelloBar)",
+			"html": "/hellobar\\.js"
 		},
 		"Hiawatha": {
 			"website": "hiawatha-webserver.org",
@@ -1328,7 +1328,7 @@
 		"Intercom": {
 			"website": "intercom.io",
 			"cats": [ 10 ],
-			"script": "(api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
+			"script": "(?:api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
 			"env": "^Intercom$"
 		},
 		"Intershop": {
@@ -1440,7 +1440,7 @@
 			"meta": { "generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1" },
 			"html": "(?:<div[^>]+id=\"wrapper_r\"|<[^>]+(?:feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
 			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
-			"env": "^(jcomments|Joomla)$",
+			"env": "^(?:jcomments|Joomla)$",
 			"implies": "PHP"
 		},
 		"jqPlot": {
@@ -1622,7 +1622,7 @@
 			"website": "lokeshdhakar.com/projects/lightbox2/",
 			"cats": [ 7, 12 ],
 			"script": "lightbox.*\\.js",
-			"html": "<link [^>]*href=\"[^\"]+lightbox(\\.min)?\\.css"
+			"html": "<link [^>]*href=\"[^\"]+lightbox(?:\\.min)?\\.css"
 		},
 		"LightMon Engine": {
 			"website": "en.lightmon.ru",
@@ -1671,7 +1671,7 @@
 		"Locomotive": {
 			"website": "www.locomotivecms.com",
 			"cats": [ 1 ],
-			"html": "<link[^>]*/sites/[a-z0-9]{24}/theme/stylesheets/.*>",
+			"html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets/.*>",
 			"implies": [ "Ruby on Rails", "MongoDB" ]
 		},
 		"Logitech Media Server": {
@@ -1733,7 +1733,7 @@
 		"MathJax": {
 			"website": "mathjax.org",
 			"cats": [ 25 ],
-			"script": "mathjax.js",
+			"script": "mathjax\\.js",
 			"env": "^MathJax$"
 		},
 		"math.js": {
@@ -1755,7 +1755,7 @@
 		"MediaTomb": {
 			"website": "mediatomb.cc",
 			"cats": [ 38 ],
-			"headers": { "Server": "MediaTomb(?:/([0-9.]+))?\\;version:\\1" }
+			"headers": { "Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1" }
 		},
 		"MediaWiki": {
 			"website": "www.mediawiki.org",
@@ -1766,14 +1766,14 @@
 		"Meebo": {
 			"website": "www.meebo.com",
 			"cats": [ 5 ],
-			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\(?:'domReady'\\))"
+			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\('domReady'\\))"
 		},
 		"Methode": {
 			"website": "www.eidosmedia.com/solutions",
 			"cats": [ 1 ],
 			"env": "^eidosBase$\\;confidence:99",
-			"html": "<!-- Methode uuid: \"[a-f0-9]+\" ?-->",
-			"meta": { "eomportal-instanceid": "[0-9]+", "eomportal-id": "[0-9]+", "eomportal-loid": "[0-9.]+", "eomportal-uuid": "[a-f0-9]+", "eomportal-lastUpdate": ".*" }
+			"html": "<!-- Methode uuid: \"[a-f\\d]+\" ?-->",
+			"meta": { "eomportal-instanceid": "[\\d]+", "eomportal-id": "[\\d]+", "eomportal-loid": "[\\d.]+", "eomportal-uuid": "[a-f\\d]+", "eomportal-lastUpdate": ".*" }
 		},
 		"Microsoft ASP.NET": {
 			"website": "www.asp.net",
@@ -1821,7 +1821,7 @@
 		"MochiKit": {
 			"website": "mochikit.com",
 			"cats": [ 12 ],
-			"script": "MochiKit(\\.min)?\\.js",
+			"script": "MochiKit(?:\\.min)?\\.js",
 			"env": "^MochiKit$"
 		},
 		"Modernizr": {
@@ -1860,7 +1860,7 @@
 			"website": "perl.apache.org",
 			"cats": [ 33 ],
 			"headers": { "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1" },
-			"implies": [ "Apache" ]
+			"implies": "Apache"
 		},
 		"mod_python": {
 			"website": "www.modpython.org",
@@ -1908,19 +1908,19 @@
 		"Mollom": {
 			"website": "mollom.com",
 			"cats": [ 16 ],
-			"script": "mollom(\\.min)?\\.js",
+			"script": "mollom(?:\\.min)?\\.js",
 			"html": "<img[^>]+\\.mollom\\.com"
 		},
 		"Moment.js": {
 			"website": "momentjs.com",
 			"cats": [ 12 ],
-			"script": "moment(\\.min)?\\.js",
+			"script": "moment(?:\\.min)?\\.js",
 			"env": "^moment$"
 		},
 		"Moment Timezone": {
 			"website": "momentjs.com/timezone/",
 			"cats": [ 12 ],
-			"script": "moment-timezone(\\-data)?(\\.min)?\\.js",
+			"script": "moment-timezone(?:\\-data)?(?:\\.min)?\\.js",
 			"implies": "Moment.js"
 		},
 		"Mondo Media": {
@@ -1946,7 +1946,7 @@
 		"Mono.net": {
 			"website": "www.mono.net",
 			"cats": [ 1 ],
-			"script": "monotracker(\\.min)?\\.js",
+			"script": "monotracker(?:\\.min)?\\.js",
 			"env": "_monoTracker",
 			"html": "var u=\\(\\('https:' == d\\.location\\.protocol\\) \\? 'https://resellerstat\\.mono\\.net/mono/' : 'http://resellerstat\\.mono\\.net/mono/'\\);",
 			"implies": "Piwik"
@@ -1962,7 +1962,7 @@
 		"Moogo": {
 			"website": "www.moogo.com",
 			"cats": [ 1 ],
-			"script": "kotisivukone(\\.min)?\\.js"
+			"script": "kotisivukone(?:\\.min)?\\.js"
 		},
 		"MooTools": {
 			"website": "mootools.net",
@@ -1984,7 +1984,7 @@
 		"Mustache": {
 			"website": "mustache.github.com",
 			"cats": [ 12 ],
-			"script": "mustache(\\.min)?\\.js",
+			"script": "mustache(?:\\.min)?\\.js",
 			"env": "^Mustache$"
 		},
 		"MyBB": {
@@ -2046,7 +2046,7 @@
 		"NOIX": {
 			"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",
@@ -2102,7 +2102,7 @@
 		"OpenNemas": {
 			"website": "www.opennemas.com",
 			"cats": [ 1 ],
-			"meta": { "generator": "OpenNemas(.*)" },
+			"meta": { "generator": "OpenNemas" },
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
 		"OpenSSL": {
@@ -2233,7 +2233,7 @@
 			"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)",
+			"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"
@@ -2334,7 +2334,7 @@
 			"website": "polymer-project.org",
 			"cats": [ 12 ],
 			"env": "^Polymer$",
-			"html": "(?:<(?:polymer-)[^>]+|<link[^>]+(?:rel=\"import\")+(?:(?:.*)/polymer.html\"))",
+			"html": "(?:<polymer-[^>]+|<link[^>]+rel=\"import\"+.*/polymer\\.html\")",
 			"script": "polymer\\.js"
 		},
 		"Posterous": {
@@ -2365,7 +2365,7 @@
 			"website": "no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/",
 			"cats": [ 7, 12 ],
 			"script": "jquery\\.prettyPhoto\\.js",
-			"html": "(?:<link [^>]*href=\"[^\"]*prettyPhoto(\\.min)?\\.css|<a [^>]*rel=\"prettyPhoto)",
+			"html": "(?:<link [^>]*href=\"[^\"]*prettyPhoto(?:\\.min)?\\.css|<a [^>]*rel=\"prettyPhoto)",
 			"env": "pp_(?:alreadyInitialized|descriptions|images|titles)",
 			"implies": "jQuery"
 		},
@@ -2451,7 +2451,7 @@
 			"website": "recaptcha.net",
 			"cats": [ 16 ],
 			"script": "(?:api-secure\\.recaptcha\\.net|recaptcha_ajax\\.js)",
-			"html": "(?:<div[^>]+id=\"recaptcha_image|<link[^>]+recaptcha|document\\.getElementById\\(?:'recaptcha)",
+			"html": "(?:<div[^>]+id=\"recaptcha_image|<link[^>]+recaptcha|document\\.getElementById\\('recaptcha)",
 			"env": "^Recaptcha$"
 		},
 		"Red Hat": {
@@ -2572,7 +2572,7 @@
 		"Sentinel License Monitor": {
 			"website": "www.safenet-inc.com/software-monetization/sentinel-rms/",
 			"cats": [ 19 ],
-			"html": "<title>Sentinel (Keys )?License Monitor</title>"
+			"html": "<title>Sentinel (?:Keys )?License Monitor</title>"
 		},
 		"Seoshop": {
 			"website": "getseoshop.com",
@@ -2675,7 +2675,7 @@
 		"Snap.svg": {
 			"website": "snapsvg.io",
 			"cats": [ 12 ],
-			"script": "snap\\.svg(-min)?\\.js",
+			"script": "snap\\.svg(?:-min)?\\.js",
 			"env": "^Snap$"
 		},
 		"Snoobi": {
@@ -2728,7 +2728,7 @@
 		"Spree": {
 			"website": "spreecommerce.com",
 			"cats": [ 6 ],
-			"html": "(<link[^>]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|<script>\\s*Spree\\.(routes|translations|api_key))",
+			"html": "(?:<link[^>]*/assets/store/all-[a-z\\d]{32}\\.css[^>]+>|<script>\\s*Spree\\.(?:routes|translations|api_key))",
 			"implies": "Ruby on Rails"
 		},
 		"SQL Buddy": {
@@ -2808,7 +2808,7 @@
 			"website": "splunk.com",
 			"cats": [ 19 ],
 			"meta": { "author": "Splunk Inc\\;confidence:50" },
-			"html": "<p class=\"footer\">&copy; [-0-9]+ Splunk Inc.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1"
+			"html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1"
 		},
 		"Splunkd": {
 			"website": "splunk.com",
@@ -2913,7 +2913,7 @@
 			"website": "getbootstrap.com",
 			"cats": [ 18 ],
 			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.js|\\.min\\.js))",
-			"html": "<link.+?href=\"[^\"]+bootstrap(\\.min)?\\.css",
+			"html": "<link.+?href=\"[^\"]+bootstrap(?:\\.min)?\\.css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
@@ -2944,7 +2944,7 @@
 		"TYPO3 Neos": {
 			"website": "neos.typo3.org",
 			"cats": [ 1 ],
-			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[0-9]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
+			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[\\d]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
 			"url": "/neos/",
 			"implies": [ "PHP", "TYPO3 Flow" ],
 			"excludes": "TYPO3 CMS"
@@ -3102,7 +3102,7 @@
 		"Webix": {
 			"website": "webix.com",
 			"cats": [ 12 ],
-			"script": [ "\bwebix.js" ],
+			"script": "\\bwebix\\.js",
 			"env": "^webix$"
 		},
 		"Web Optimizer": {
@@ -3240,8 +3240,8 @@
 			"website": "x-cart.com",
 			"cats": [ 6 ],
 			"meta": { "generator": "X-Cart(?: (\\d+))?\\;version:\\1" },
-			"headers": { "Set-Cookie": "xid=[a-z0-9]{32}(?:;|$)" },
-			"html": [ "Powered by X-Cart(?: (\\d+))? <a[^>]+href=\"http://www\\.x-cart\\.com/\"[^>]*>\\;version:\\1", "<a[^>]+href=\"[^\"]*(?:\\?|&)xcart_form_id=[a-z0-9]{32}(?:&|$)" ],
+			"headers": { "Set-Cookie": "xid=[a-z\\d]{32}(?:;|$)" },
+			"html": [ "Powered by X-Cart(?: (\\d+))? <a[^>]+href=\"http://www\\.x-cart\\.com/\"[^>]*>\\;version:\\1", "<a[^>]+href=\"[^\"]*(?:\\?|&)xcart_form_id=[a-z\\d]{32}(?:&|$)" ],
 			"script": "/skin/common_files/modules/Product_Options/func\\.js",
 			"env": "^(?:xcart_web_dir|xliteConfig)$",
 			"implies": "PHP"
@@ -3302,8 +3302,8 @@
 			"website": "advertising.yahoo.com",
 			"cats": [ 36 ],
 			"html": [ "<iframe[^>]+adserver\\.yahoo\\.com", "<img[^>]+clicks\\.beap\\.bc\\.yahoo\\.com" ],
-			"env": [ "^adxinserthtml$" ],
-			"script": [ "adinterax.com" ]
+			"env": "^adxinserthtml$",
+			"script": "adinterax\\.com"
 		},
 		"Yahoo! Ecommerce": {
 			"website": "smallbusiness.yahoo.com/ecommerce",
@@ -3323,7 +3323,7 @@
 			"cats": [ 36 ],
 			"env": [ "^yandex_partner_id$", "^yandex_ad_format$", "^yandex_direct_" ],
 			"html": "<yatag class=\"ya-partner__ads\">",
-			"script": [ "https?://an\\.yandex\\.ru/" ]
+			"script": "https?://an\\.yandex\\.ru/"
 		},
 		"Yandex.Metrika": {
 			"website": "metrika.yandex.com",
@@ -3379,8 +3379,8 @@
 		"Zeuscart": {
 			"website": "zeuscart.com",
 			"cats": [ 6 ],
-			"url": "\\?do=prodetail&action=show&prodid=\\d+",
-			"html": "<form name=\"product\" method=\"post\" action=\"[^\"]+\\?do=addtocart&prodid=\\d+\"(?:(?!<\\/form>).+)<input type=\"hidden\" name=\"addtocart\" value=\"\\d+\">",
+			"url": "\\?do=prodetail&action=show&prodid=",
+			"html": "<form name=\"product\" method=\"post\" action=\"[^\"]+\\?do=addtocart&prodid=\\d+\"(?!<\\/form>).+<input type=\"hidden\" name=\"addtocart\" value=\"\\d+\">",
 			"implies": "PHP"
 		},
 		"Zinnia": {