diff --git a/share/apps.json b/share/apps.json
index a9c7ea49f..1207ef062 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -88,20 +88,19 @@
 		"AddThis": {
 			"website": "www.addthis.com",
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"AdInfinity": {
 			"website": "adinfinity.com.au",
 			"cats": [ 36 ],
-			"script": "adinfinity\\.com\\.au"
+			"script": [ "adinfinity\\.com\\.au" ]
 		},
 		"Adobe ColdFusion": {
 			"website": "adobe.com/products/coldfusion-family.html",
 			"cats": [ 18 ],
 			"url": "\\.cfm(?:$|\\?)",
 			"html": "<!-- START headerTags\\.cfm",
-			"headers": { "Cookie": "CFTOKEN=" },
 			"script": "/cfajax/",
 			"env": "^_cfEmails$",
 			"implies": "CFML"
@@ -109,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": {
@@ -117,19 +116,12 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1" }
 		},
-		"Adobe RoboHelp": {
-			"website": "adobe.com/products/robohelp.html",
-			"cats": [ 4 ],
-			"meta": { "generator": "^Adobe RoboHelp(?: ([\\d]+))?\\;version:\\1" },
-			"script": "(?:wh(?:utils|ver|proxy|lang|topic|msg)|ehlpdhtm)\\.js",
-			"env": "^gbWh(?:Ver|Lang|Msg|Util|Proxy)$"
-		},
 		"AdRiver": {
 			"website": "adriver.ru",
 			"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",
@@ -223,7 +215,7 @@
 		"Apache Tomcat": {
 			"website": "tomcat.apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1<:" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"website": "trafficserver.apache.org/",
@@ -250,7 +242,7 @@
 		"ATEN": {
 			"website": "www.aten.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "ATEN HTTP Server(:?\\(V?([\\d\\.]+)\\))?\\;version:\\1" }
+			"headers": { "Server": "ATEN HTTP Server(\\(V?([\\d\\.]+)\\))?\\;version:\\2" }
 		},
 		"ATG Web Commerce": {
 			"website": "oracle.com/us/products/applications/web-commerce/atg",
@@ -278,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": {
@@ -291,7 +283,6 @@
 		"Banshee": {
 			"website": "www.banshee-php.org",
 			"cats": [ 1, 18 ],
-			"meta": { "generator": "Banshee PHP" },
 			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(?:v([\\d.]+))?\\;version:\\1",
 			"implies": "PHP"
 		},
@@ -358,12 +349,6 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1" }
 		},
-		"Bonfire": {
-			"website": "cibonfire.com",
-			"cats": [ 18 ],
-			"html": "Powered by <a[^>]+href=\"https?://(?:www\\.)?cibonfire\\.com[^>]*>Bonfire v([^<]+)\\;version:\\1",
-			"implies": "CodeIgniter"
-		},
 		"Brother": {
 			"website": "www.brother.com",
 			"cats": [ 40 ]
@@ -488,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": {
@@ -524,7 +509,6 @@
 			"website": "codeigniter.com",
 			"cats": [ 18 ],
 			"headers": { "Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_session)" },
-			"html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
 			"implies": "PHP"
 		},
 		"CodeMirror": {
@@ -663,7 +647,7 @@
 		"D3": {
 			"website": "d3js.org",
 			"cats": [ 25 ],
-			"script": "d3(?:\\. v[\\d]+)?(?:\\.min)?\\.js",
+			"script": "d3(?:\\. v[0-9]+)?(?:\\.min)?\\.js",
 			"env": "^d3$"
 		},
 		"Dancer": {
@@ -752,7 +736,7 @@
 		"Django": {
 			"website": "djangoproject.com",
 			"cats": [ 18 ],
-			"html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z\\d]{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:\\1",
 			"env": "^__admin_media_prefix__",
 			"implies": "Python"
 		},
@@ -802,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",
@@ -845,7 +829,7 @@
 		"e107": {
 			"website": "e107.org",
 			"cats": [ 1 ],
-			"script": "[^a-z\\d]e107\\.js",
+			"script": "[^a-z0-9]e107\\.js",
 			"headers": { "Set-Cookie": "e107_tz[^;]+=", "X-Powered-By": "e107" },
 			"implies": "PHP"
 		},
@@ -859,7 +843,7 @@
 			"website": "???",
 			"cats": [ 22 ],
 			"headers": { "Server": "\\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1" },
-			"implies": [ "HP ProCurve" ]
+			"implies": [ "HP ProCurve"]
 		},
 		"ELOG": {
 			"website": "midas.psi.ch/elog",
@@ -925,7 +909,7 @@
 			"meta": { "generator": "^eSyndiCat " },
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
 			"env": "^esyndicat$",
-			"implies": "PHP"
+			"implies": [ "PHP" ]
 		},
 		"EWS-NIC4": {
 			"website": "dell.com",
@@ -943,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",
@@ -993,7 +977,7 @@
 			"website": "fatfreeframework.com",
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "Fat-Free Framework" },
-			"implies": "PHP"
+			"implies": [ "PHP" ]
 		},
 		"Fedora": {
 			"website": "fedoraproject.org",
@@ -1033,11 +1017,6 @@
 			"cats": [ 28 ],
 			"headers": { "Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1" }
 		},
-		"Fireblade": {
-			"website": "fireblade.com",
-			"cats": [ 31 ],
-			"headers": { "Server": "fbs" }
-		},
 		"FrontPage": {
 			"website": "office.microsoft.com/frontpage",
 			"cats": [ 20 ],
@@ -1089,6 +1068,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Ghost(?:\\s([\\d.]+))?\\;version:\\1" },
 			"headers": { "X-Ghost-Cache-Status": ".*" }
+ 		},
+		"Glyphicons": {
+			"website": "glyphicons.com",
+			"cats": [ 17 ],
+			"html": "<link[^>]* href=[^>]+glyphicons(?:\\.min)?\\.css",
+			"url": "glyphicons"
 		},
 		"GoAhead": {
 			"website": "embedthis.com/products/goahead/index.html",
@@ -1099,7 +1084,7 @@
 			"website": "google.com/analytics",
 			"cats": [ 10 ],
 			"html": "_gaq\\.push\\(\\['_setAccount|i\\['GoogleAnalyticsObject'\\]|ga\\.async = true",
-			"script": "^https?://[^\/]+\\.google-analytics\\.com\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?Universal Analytics:",
+			"script": "(?:\\.google-analytics\\.com\/ga\\.js|\/urchin\\.js|\\.google-analytics\\.com\/analytics\\.js)",
 			"headers": { "Set-Cookie": "__utma" },
 			"env": "^gaGlobal$"
 		},
@@ -1107,7 +1092,9 @@
 			"website": "google.com/adsense",
 			"cats": [ 36 ],
 			"env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ],
-			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ]
+			"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" ]
 		},
 		"Google App Engine": {
 			"website": "code.google.com/appengine",
@@ -1128,7 +1115,7 @@
 			"website": "code.google.com/apis/webfonts",
 			"cats": [ 17 ],
 			"script": "googleapis\\.com/.+webfont",
-			"html": "<link[^>]* href=[^>]+fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=[^>]+fonts\\.(googleapis|google)\\.com",
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
@@ -1183,7 +1170,7 @@
 		"Gravatar": {
 			"website": "gravatar.com",
 			"cats": [ 19 ],
-			"html": "gravatar\\.com/avatar/",
+			"html": "(secure\\.)?gravatar\\.com/avatar/.+",
 			"env": "^Gravatar$"
 		},
 		"Gravity Insights": {
@@ -1219,8 +1206,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",
@@ -1347,7 +1334,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": {
@@ -1426,7 +1413,7 @@
 		},
 		"Jekyll": {
 			"website": "jekyllrb.com",
-			"cats": [ 1, 11 ],
+			"cats": [ 1, 11],
 			"meta": { "generator": "Jekyll(?:v[\\d.]+)?\\;version:\\1" }
 		},
 		"Jetty": {
@@ -1459,7 +1446,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": {
@@ -1540,7 +1527,7 @@
 		"KineticJS": {
 			"website": "kineticjs.com",
 			"cats": [ 25 ],
-			"script": "kinetic(?:-v?([\\d.]+))?\\.js\\;version:\\1",
+			"script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
 			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
@@ -1594,7 +1581,7 @@
 			"website": "www.canon.com",
 			"cats": [ 22 ],
 			"headers": { "Server": "KS_HTTP\\/?([\\d\\.]+)?\\;version:\\1" },
-			"implies": [ "Canon" ]
+			"implies": [ "Canon"]
 		},
 		"LabVIEW": {
 			"website": "ni.com/labview",
@@ -1641,7 +1628,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",
@@ -1669,7 +1656,7 @@
 			"cats": [ 15 ],
 			"html": "<[^>]+(?:id|class)=\"livefyre",
 			"script": "livefyre_init\\.js",
-			"env": [ "^fyre$", "^FyreLoader$" ]
+			"env": [ "^fyre$", "^FyreLoader$", "^LF$" ]
 		},
 		"LiveJournal": {
 			"website": "www.livejournal.com",
@@ -1690,14 +1677,9 @@
 		"Locomotive": {
 			"website": "www.locomotivecms.com",
 			"cats": [ 1 ],
-			"html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets/.*>",
+			"html": "<link[^>]*/sites/[a-z0-9]{24}/theme/stylesheets/.*>",
 			"implies": [ "Ruby on Rails", "MongoDB" ]
 		},
-		"Lo-dash": {
-			"website": "www.lodash.com",
-			"cats": [ 12 ],
-			"script": "lodash.*\\.js"
-		},
 		"Logitech Media Server": {
 			"website": "www.mysqueezebox.com",
 			"cats": [ 22, 38 ],
@@ -1716,12 +1698,12 @@
 		"M.R. Inc Webserver": {
 			"website": "mrincworld.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "M\\.R\\. Inc Webserver" }
+			"headers": { "Server": "M\\.R\\. Inc Inc Webserver" }
 		},
 		"M.R. Inc Wild CMS": {
 			"website": "mrincworld.com",
 			"cats": [ 1, 6 ],
-			"headers": { "X-Powered-By": "M\\.R\\. Inc Wild CMS" }
+			"headers": { "X-Powered-By": "M\\.R\\. Inc Inc Wild CMS" }
 		},
 		"Magento": {
 			"website": "www.magentocommerce.com",
@@ -1757,7 +1739,7 @@
 		"MathJax": {
 			"website": "mathjax.org",
 			"cats": [ 25 ],
-			"script": "mathjax\\.js",
+			"script": "mathjax.js",
 			"env": "^MathJax$"
 		},
 		"math.js": {
@@ -1779,7 +1761,7 @@
 		"MediaTomb": {
 			"website": "mediatomb.cc",
 			"cats": [ 38 ],
-			"headers": { "Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1" }
+			"headers": { "Server": "MediaTomb(?:/([0-9.]+))?\\;version:\\1" }
 		},
 		"MediaWiki": {
 			"website": "www.mediawiki.org",
@@ -1790,14 +1772,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-f\\d]+\" ?-->",
-			"meta": { "eomportal-instanceid": "[\\d]+", "eomportal-id": "[\\d]+", "eomportal-loid": "[\\d.]+", "eomportal-uuid": "[a-f\\d]+", "eomportal-lastUpdate": ".*" }
+			"html": "<!-- Methode uuid: \"[a-f0-9]+\" ?-->",
+			"meta": { "eomportal-instanceid": "[0-9]+", "eomportal-id": "[0-9]+", "eomportal-loid": "[0-9.]+", "eomportal-uuid": "[a-f0-9]+", "eomportal-lastUpdate": ".*" }
 		},
 		"Microsoft ASP.NET": {
 			"website": "www.asp.net",
@@ -1845,7 +1827,7 @@
 		"MochiKit": {
 			"website": "mochikit.com",
 			"cats": [ 12 ],
-			"script": "MochiKit(?:\\.min)?\\.js",
+			"script": "MochiKit(\\.min)?\\.js",
 			"env": "^MochiKit$"
 		},
 		"Modernizr": {
@@ -1884,7 +1866,7 @@
 			"website": "perl.apache.org",
 			"cats": [ 33 ],
 			"headers": { "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1" },
-			"implies": "Apache"
+			"implies": [ "Apache" ]
 		},
 		"mod_python": {
 			"website": "www.modpython.org",
@@ -1932,19 +1914,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": {
@@ -1970,7 +1952,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"
@@ -1986,7 +1968,7 @@
 		"Moogo": {
 			"website": "www.moogo.com",
 			"cats": [ 1 ],
-			"script": "kotisivukone(?:\\.min)?\\.js"
+			"script": "kotisivukone(\\.min)?\\.js"
 		},
 		"MooTools": {
 			"website": "mootools.net",
@@ -2008,7 +1990,7 @@
 		"Mustache": {
 			"website": "mustache.github.com",
 			"cats": [ 12 ],
-			"script": "mustache(?:\\.min)?\\.js",
+			"script": "mustache(\\.min)?\\.js",
 			"env": "^Mustache$"
 		},
 		"MyBB": {
@@ -2046,7 +2028,7 @@
 		"Nette Framework": {
 			"website": "nette.org",
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Nette Framework" },
+			"headers": {"X-Powered-By": "Nette Framework"},
 			"implies": "PHP"
 		},
 		"New Relic": {
@@ -2070,13 +2052,21 @@
 		"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",
 			"cats": [ 6 ],
 			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)"
 		},
+		"NVD3": {
+			"website": "nvd3.org",
+			"cats": [ 25 ],
+			"script": "nv\\.d3(?:\\.min)?\\.js",
+			"html": "<link[^>]* href=[^>]+nv\\.d3(?:\\.min)?\\.css",
+			"env": "^nv$",
+			"implies": "D3"
+		},
 		"Open AdStream": {
 			"website": "xaxis.com",
 			"cats": [ 36 ],
@@ -2126,7 +2116,7 @@
 		"OpenNemas": {
 			"website": "www.opennemas.com",
 			"cats": [ 1 ],
-			"meta": { "generator": "OpenNemas" },
+			"meta": { "generator": "OpenNemas(.*)" },
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
 		"OpenSSL": {
@@ -2257,7 +2247,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"
@@ -2284,7 +2274,7 @@
 			"website": "www.phpmyadmin.net",
 			"cats": [ 3 ],
 			"html": "(?:PMA_sendHeaderLocation\\(|<title>phpMyAdmin</title>)",
-			"env": "pma_absolute_uri",
+			"env":	"pma_absolute_uri",
 			"implies": [ "PHP", "MySQL" ]
 		},
 		"PHP-Nuke": {
@@ -2358,7 +2348,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": {
@@ -2389,7 +2379,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"
 		},
@@ -2465,11 +2455,6 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "^(?:RCMS|ReallyCMS)" }
 		},
-		"RDoc": {
-			"website": "rdoc.rubyforge.org",
-			"cats": [ 4 ],
-			"html": [ "<frame (?:(?:src=\"fr_file_index\\.html\"\\s+title=\"Files\"\\s+name=\"Files\"|src=\"fr_file_index\\.html\"\\s+name=\"Files\"\\s+title=\"Files\"|title=\"Files\"\\s+src=\"fr_file_index\\.html\"\\s+name=\"Files\"|title=\"Files\"\\s+name=\"Files\"\\s+src=\"fr_file_index\\.html\"|name=\"Files\"\\s+src=\"fr_file_index\\.html\"\\s+title=\"Files\"|name=\"Files\"\\s+title=\"Files\"\\s+src=\"fr_file_index\\.html\")|(?:src=\"fr_class_index\\.html\"\\s+name=\"Classes\"|name=\"Classes\"\\s+src=\"fr_class_index\\.html\")|(?:src=\"fr_method_index\\.html\"\\s+name=\"Methods\"|name=\"Methods\"\\s+src=\"fr_method_index\\.html\"))", "<link[^>]+href=\"[^\"]*rdoc-style\\.css", "Generated by <a[^>]+href=\"https?://rdoc\\.rubyforge\\.org[^>]+>RDoc</a> ([\\d.]*\\d)\\;version:\\1" ]
-		},
 		"React": {
 			"website": "facebook.github.io/react",
 			"cats": [ 12 ],
@@ -2480,7 +2465,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": {
@@ -2601,7 +2586,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",
@@ -2704,7 +2689,7 @@
 		"Snap.svg": {
 			"website": "snapsvg.io",
 			"cats": [ 12 ],
-			"script": "snap\\.svg(?:-min)?\\.js",
+			"script": "snap\\.svg(-min)?\\.js",
 			"env": "^Snap$"
 		},
 		"Snoobi": {
@@ -2726,12 +2711,6 @@
 			"html": " <(?:script|link)[^>].*com_sobipro.*>",
 			"implies": "Joomla"
 		},
-		"Solodev": {
-			"website": "www.solodev.com",
-			"cats": [ 1 ],
-			"html": "<div class='dynamicDiv' id='dd\\.\\d\\.\\d'>",
-			"implies": "PHP"
-		},		
 		"SoundManager": {
 			"website": "www.schillmania.com/projects/soundmanager2",
 			"cats": [ 12 ],
@@ -2763,7 +2742,7 @@
 		"Spree": {
 			"website": "spreecommerce.com",
 			"cats": [ 6 ],
-			"html": "(?:<link[^>]*/assets/store/all-[a-z\\d]{32}\\.css[^>]+>|<script>\\s*Spree\\.(?:routes|translations|api_key))",
+			"html": "(<link[^>]*/assets/store/all-[a-z0-9]{32}\\.css[^>]+>|<script>\\s*Spree\\.(routes|translations|api_key))",
 			"implies": "Ruby on Rails"
 		},
 		"SQL Buddy": {
@@ -2843,7 +2822,7 @@
 			"website": "splunk.com",
 			"cats": [ 19 ],
 			"meta": { "author": "Splunk Inc\\;confidence:50" },
-			"html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1"
+			"html": "<p class=\"footer\">&copy; [-0-9]+ Splunk Inc.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1"
 		},
 		"Splunkd": {
 			"website": "splunk.com",
@@ -2880,6 +2859,13 @@
 			"script": "three(?:\\.min)?\\.js",
 			"env": "^THREE$"
 		},
+		"TiddlyWiki": {
+			"website": "tiddlywiki.com",
+			"cats": [ 1, 2, 4, 8 ],
+			"html": "<[^>]*type=[^>]text\\/vnd.tiddlywiki",
+			"env": "tiddler",
+			"meta": { "generator": "^TiddlyWiki$", "application-name": "^TiddlyWiki$", "tiddlywiki-version": ".*\\;version:\\1", "copyright": "^TiddlyWiki created by Jeremy Ruston\\, \\(jeremy \\[at\\] jermolene \\[dot\\] com\\) Copyright © Jeremy Ruston 2004-2007 Copyright &copy UnaMesa Association 2007-2014 Redistribution and use in source and binary forms\\, with or without modification\\, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice\\, this list of conditions and the following disclaimer\\. Redistributions in binary form must reproduce the above copyright notice\\, this list of conditions and the following disclaimer in the documentation and\\/or other materials provided with the distribution\\. Neither the name of the UnaMesa Association nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission\\. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES\\, INCLUDING\\, BUT NOT LIMITED TO\\, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED\\. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT\\, INDIRECT\\, INCIDENTAL\\, SPECIAL\\, EXEMPLARY\\, OR CONSEQUENTIAL DAMAGES \\(INCLUDING\\, BUT NOT LIMITED TO\\, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE\\, DATA\\, OR PROFITS; OR BUSINESS INTERRUPTION\\) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY\\, WHETHER IN CONTRACT\\, STRICT LIABILITY\\, OR TORT \\(INCLUDING NEGLIGENCE OR OTHERWISE\\) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE\\, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE\\.$" }
+		},
 		"Tiki Wiki CMS Groupware": {
 			"website": "tiki.org",
 			"cats": [ 1, 2, 8, 11, 13 ],
@@ -2936,8 +2922,8 @@
 			"website": "twiki.org",
 			"cats": [ 8 ],
 			"headers": { "Set-cookie": "TWIKISID" },
-			"script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
-			"html": "<img [^>]*(?:title|alt)=\"This site is powered by the TWiki collaboration platform"
+			"script": "(TWikiJavascripts|twikilib(\\.js|\\.min\\.js))",
+			"html": "This site is powered by the TWiki collaboration platform"
 		},
 		"Twilight CMS": {
 			"website": "www.twilightcms.com",
@@ -2948,7 +2934,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": {
@@ -2979,7 +2965,7 @@
 		"TYPO3 Neos": {
 			"website": "neos.typo3.org",
 			"cats": [ 1 ],
-			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[\\d]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
+			"html": "xmlns:typo3=\\\"http:\\/\\/www\\.typo3\\.org\\/ns\\/[0-9]{4}\\/Flow\\/Packages\\/Neos\\/Content\\/",
 			"url": "/neos/",
 			"implies": [ "PHP", "TYPO3 Flow" ],
 			"excludes": "TYPO3 CMS"
@@ -3137,7 +3123,7 @@
 		"Webix": {
 			"website": "webix.com",
 			"cats": [ 12 ],
-			"script": "\\bwebix\\.js",
+			"script": [ "\bwebix.js" ],
 			"env": "^webix$"
 		},
 		"Web Optimizer": {
@@ -3275,8 +3261,8 @@
 			"website": "x-cart.com",
 			"cats": [ 6 ],
 			"meta": { "generator": "X-Cart(?: (\\d+))?\\;version:\\1" },
-			"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}(?:&|$)" ],
+			"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}(?:&|$)" ],
 			"script": "/skin/common_files/modules/Product_Options/func\\.js",
 			"env": "^(?:xcart_web_dir|xliteConfig)$",
 			"implies": "PHP"
@@ -3337,8 +3323,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",
@@ -3358,7 +3344,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",
@@ -3414,8 +3400,8 @@
 		"Zeuscart": {
 			"website": "zeuscart.com",
 			"cats": [ 6 ],
-			"url": "\\?do=prodetail&action=show(?:(?:popup)?prod)?&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=\\d+",
+			"html": "<form name=\"product\" method=\"post\" action=\"[^\"]+\\?do=addtocart&prodid=\\d+\"(?:(?!<\\/form>).+)<input type=\"hidden\" name=\"addtocart\" value=\"\\d+\">",
 			"implies": "PHP"
 		},
 		"Zinnia": {
@@ -3440,12 +3426,6 @@
 			"website": "foundation.zurb.com",
 			"cats": [ 18 ],
 			"html": "<link[^>]+foundation[^>\"]+css"
-		},
-		"October CMS": {
-			"website": "octobercms.com",
-			"cats": [ 1 ],
-			"headers": { "Set-Cookie": "october_session=" },
-			"implies": "Laravel"
 		}
 	}
 }
diff --git a/share/images/icons/Ghost.png b/share/images/icons/Ghost.png
index 1fbd84702..f3971b879 100644
Binary files a/share/images/icons/Ghost.png and b/share/images/icons/Ghost.png differ
diff --git a/share/images/icons/Glyphicons.png b/share/images/icons/Glyphicons.png
new file mode 100644
index 000000000..a46d3965c
Binary files /dev/null and b/share/images/icons/Glyphicons.png differ
diff --git a/share/images/icons/JS Charts.png b/share/images/icons/JS Charts.png
index 77d48df33..ff7e89ad7 100644
Binary files a/share/images/icons/JS Charts.png and b/share/images/icons/JS Charts.png differ
diff --git a/share/images/icons/KineticJS.png b/share/images/icons/KineticJS.png
index 7086b8600..8cc5bf037 100644
Binary files a/share/images/icons/KineticJS.png and b/share/images/icons/KineticJS.png differ
diff --git a/share/images/icons/Lodash.png b/share/images/icons/Lodash.png
new file mode 100644
index 000000000..140aaaa36
Binary files /dev/null and b/share/images/icons/Lodash.png differ
diff --git a/share/images/icons/NVD3.png b/share/images/icons/NVD3.png
new file mode 100644
index 000000000..42cbe9c11
Binary files /dev/null and b/share/images/icons/NVD3.png differ
diff --git a/share/images/icons/TiddlyWiki.png b/share/images/icons/TiddlyWiki.png
new file mode 100644
index 000000000..b2e28ef9c
Binary files /dev/null and b/share/images/icons/TiddlyWiki.png differ