diff --git a/share/images/icons/CentOS.ico b/share/images/icons/CentOS.ico
new file mode 100644
index 000000000..188bd11cc
Binary files /dev/null and b/share/images/icons/CentOS.ico differ
diff --git a/share/images/icons/Gauges.ico b/share/images/icons/Gauges.ico
new file mode 100644
index 000000000..11261b690
Binary files /dev/null and b/share/images/icons/Gauges.ico differ
diff --git a/share/images/icons/UNIX.ico b/share/images/icons/UNIX.ico
new file mode 100644
index 000000000..741e374fe
Binary files /dev/null and b/share/images/icons/UNIX.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index 6b723154e..57beed736 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -41,7 +41,7 @@
 		'Adobe GoLive':          { cats: { 1: 20 }, meta: { 'generator': /Adobe GoLive/i } },
 		'Advanced Web Stats':    { cats: { 1: 10 }, html: /aws.src = [^<]+caphyon\-analytics/i },
 		'Amiro.CMS':             { cats: { 1:  1 }, meta: { 'generator': /Amiro/i } },
-		'Apache':                { cats: { 1: 22 }, headers: { 'Server': /Apache($|[^-])/i } },
+		'Apache':                { cats: { 1: 22 }, headers: { 'Server': /(Apache($|[^-])|HTTPD)/i } },
 		'Apache Tomcat':         { cats: { 1: 22 }, headers: { 'Server': /Apache-Coyote/i } },
 		'Arc Forum':             { cats: { 1:  2 }, html: /ping\.src = node\.href;/ },
 		'Atlassian Confluence':  { cats: { 1:  8 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/confluence/i },
@@ -82,7 +82,7 @@
 		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/, env: /^d3$/ },
 		'Danneo CMS':            { cats: { 1:  1 }, meta: { 'generator': /Danneo/i } },
 		'DataLife Engine':       { cats: { 1:  1 }, meta: { 'generator': /DataLife Engine/i } },
-		'Debian':                { cats: { 1: 28 }, headers: { 'Server': /Debian/i, 'X-Powered-By': /(Debian|dotdeb|lenny|squeeze)/i } },
+		'Debian':                { cats: { 1: 28 }, headers: { 'Server': /Debian/i, 'X-Powered-By': /(Debian|dotdeb|etch|lenny|squeeze|wheezy)/i } },
 		'DHTMLX':                { cats: { 1: 12 }, script: /dhtmlxcommon\.js/ },
 		'DirectAdmin':           { cats: { 1:  9 }, html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 		'Disqus':                { cats: { 1: 15 }, script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/ },
@@ -102,6 +102,7 @@
 		'FluxBB':                { cats: { 1:  2 }, html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
 		'Flyspray':              { cats: { 1: 13 }, html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },
 		'FrontPage':             { cats: { 1: 20 }, meta: { 'generator': /Microsoft FrontPage/ }, html: /<html[^>]+urn:schemas\-microsoft\-com:office:office/i },
+		'Gauges':                { cats: { 1: 10 }, html: /t\.src = '\/\/secure\.gaug\.es\/track\.js/, env: /^_gauges$/ },
 		'Get Satisfaction':      { cats: { 1: 13 }, html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
 		'Google Analytics':      { cats: { 1: 10 }, script: /(\.google\-analytics\.com\/ga\.js|google-analytics\.com\/urchin\.js)/, env: /^gaGlobal$/ },
 		'Google App Engine':     { cats: { 1: 22 }, headers: { 'Server': /Google Frontend/i } },
@@ -231,7 +232,7 @@
 		'Twitter Bootstrap':     { cats: { 1: 18 }, script: /twitter\.github\.com\/bootstrap/, html: /<link[^>]+bootstrap[^>]+css/, env: /^Twipsy$/ },
 		'Typekit':               { cats: { 1: 17 }, script: /use.typekit.com/, env: /^Typekit$/ },
 		'TypePad':               { cats: { 1: 11 }, meta: { 'generator': /typepad/i }, url: /^(www.)?.+\.typepad\.com/i },
-		'TYPO3':                 { cats: { 1:  1 }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)/i, url: /\/typo3/i },
+		'TYPO3':                 { cats: { 1:  1 }, headers: { 'Set-Cookie': /fe_typo_user/ }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)/i, url: /\/typo3/i },
 		'Ubercart':              { cats: { 1:  6 }, script: /uc_cart\/uc_cart_block\.js/ },
 		'Ubuntu':                { cats: { 1: 28 }, headers: { 'Server': /Ubuntu/i, 'X-Powered-By': /Ubuntu/i } },
 		'Umbraco':               { cats: { 1:  1 }, meta: { 'generator': /umbraco/i }, headers: { 'X-Umbraco-Version': /.+/ }, html: /powered by <a href=[^>]+umbraco/i },