diff --git a/share/apps.json b/share/apps.json
index 04e789f27..8bede7de9 100755
--- a/share/apps.json
+++ b/share/apps.json
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d\\.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d\\.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d\\.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d\\.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d\\.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d\\.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,11 +634,12 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d\\.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
@@ -641,7 +648,8 @@
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -702,7 +711,7 @@
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d\\.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d\\.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d+\\.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,11 +773,8 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
-		},
-		"Hubspot": {
-			"cats": [ 32 ],
-			"env": "^(_hsq|hubspot)$"
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
 		"Hybris": {
 			"cats": [ 6 ],
@@ -775,11 +784,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d\\.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +799,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d\\.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,17 +822,17 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
@@ -879,10 +888,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"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" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d\\.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -903,16 +912,17 @@
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d\\.]+rc\\d))?.*\\.js(\\?ver=([\\d\\.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d\\.]+).js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +932,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,7 +955,8 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d\\.R]+ \\(build [\\d\\.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
@@ -956,16 +968,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +988,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d\\.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d\\.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -1093,7 +1109,7 @@
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
@@ -1288,7 +1304,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],