diff --git a/drivers/firefox/skin/images/icon128x128.png b/drivers/firefox/skin/images/icon128x128.png
new file mode 100644
index 000000000..4ddebb142
Binary files /dev/null and b/drivers/firefox/skin/images/icon128x128.png differ
diff --git a/share/images/icons/AOLserver.ico b/share/images/icons/AOLserver.ico
new file mode 100644
index 000000000..0860d2b14
Binary files /dev/null and b/share/images/icons/AOLserver.ico differ
diff --git a/share/images/icons/Apache Traffic Server.ico b/share/images/icons/Apache Traffic Server.ico
new file mode 100644
index 000000000..a96494d7c
Binary files /dev/null and b/share/images/icons/Apache Traffic Server.ico differ
diff --git a/share/images/icons/CKEditor.ico b/share/images/icons/CKEditor.ico
new file mode 100644
index 000000000..fdf1f3b70
Binary files /dev/null and b/share/images/icons/CKEditor.ico differ
diff --git a/share/images/icons/Cargo.ico b/share/images/icons/Cargo.ico
new file mode 100644
index 000000000..0444194da
Binary files /dev/null and b/share/images/icons/Cargo.ico differ
diff --git a/share/images/icons/CodeIgniter.ico b/share/images/icons/CodeIgniter.ico
new file mode 100644
index 000000000..5edc76373
Binary files /dev/null and b/share/images/icons/CodeIgniter.ico differ
diff --git a/share/images/icons/Handlebars.ico b/share/images/icons/Handlebars.ico
new file mode 100644
index 000000000..9fa97b1c7
Binary files /dev/null and b/share/images/icons/Handlebars.ico differ
diff --git a/share/images/icons/Indexhibit.ico b/share/images/icons/Indexhibit.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/share/images/icons/Indexhibit.ico differ
diff --git a/share/images/icons/Kohana.ico b/share/images/icons/Kohana.ico
new file mode 100644
index 000000000..a2b3cbf7e
Binary files /dev/null and b/share/images/icons/Kohana.ico differ
diff --git a/share/images/icons/Mustache.ico b/share/images/icons/Mustache.ico
new file mode 100644
index 000000000..a69e88460
Binary files /dev/null and b/share/images/icons/Mustache.ico differ
diff --git a/share/images/icons/SoundManager.ico b/share/images/icons/SoundManager.ico
new file mode 100644
index 000000000..2c8677344
Binary files /dev/null and b/share/images/icons/SoundManager.ico differ
diff --git a/share/images/icons/Timeline.ico b/share/images/icons/Timeline.ico
index 36829b9a5..5d2a5bcff 100644
Binary files a/share/images/icons/Timeline.ico and b/share/images/icons/Timeline.ico differ
diff --git a/share/images/icons/TinyMCE.ico b/share/images/icons/TinyMCE.ico
new file mode 100644
index 000000000..2ed9d2f6c
Binary files /dev/null and b/share/images/icons/TinyMCE.ico differ
diff --git a/share/images/icons/YUI.ico b/share/images/icons/YUI.ico
index d7761e5a9..5bb513bb8 100644
Binary files a/share/images/icons/YUI.ico and b/share/images/icons/YUI.ico differ
diff --git a/share/images/icons/Zepto.ico b/share/images/icons/Zepto.ico
new file mode 100644
index 000000000..fb0fc1aee
Binary files /dev/null and b/share/images/icons/Zepto.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index be281f046..bb116ff48 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -44,6 +44,7 @@
 		'AOLserver':             { cats: { 1: 22 }, headers: { 'Server': /AOLserver/i } },
 		'Apache':                { cats: { 1: 22 }, headers: { 'Server': /(Apache($|[^-])|HTTPD)/i } },
 		'Apache Tomcat':         { cats: { 1: 22 }, headers: { 'Server': /Apache-Coyote/i } },
+		'Apache Traffic Server': { cats: { 1: 22 }, headers: { 'Server': /YTS/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 },
 		'Atlassian Jira':        { cats: { 1: 13 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i },
@@ -63,13 +64,14 @@
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
 		'Chamilo':               { cats: { 1: 21 }, meta: { 'generator': /Chamilo/i }, headers: { 'X-Powered-By': /Chamilo/ } },
 		'Cherokee':              { cats: { 1: 22 }, headers: { 'Server': /Cherokee/i } },
+		'CKEditor':              { cats: { 1: 24 }, env: /^CKEDITOR$/ },
 		'ClickHeat':             { cats: { 1: 10 }, script: /clickheat.*\.js/i, env: /^clickHeatBrowser$/ },
-		'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
+		'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/, env: /^ClickTale/i },
 		'Clicky':                { cats: { 1: 10 }, script: /static\.getclicky\.com/ },
 		'CMS Made Simple':       { cats: { 1:  1 }, meta: { 'generator': /CMS Made Simple/i } },
 		'CO2Stats':              { cats: { 1: 10 }, html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
 		'CodeIgniter':           { cats: { 1: 18 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker|ci_session)/ } },
-		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
+		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/, env: /^COMSCORE$/i },
 		'Concrete5':             { cats: { 1:  1 }, meta: { 'generator': /concrete5/i } },
 		'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
 		'Contens':               { cats: { 1:  1 }, meta: { 'generator': /contens/i } },
@@ -88,7 +90,7 @@
 		'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("|')/ },
+		'Disqus':                { cats: { 1: 15 }, script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/, env: /^DISQUS/i },
 		'dojo':                  { cats: { 1: 12 }, script: /dojo(\.xd)?\.js/, env: /^dojo$/ },
 		'Dokeos':                { cats: { 1: 21 }, meta: { 'generator': /Dokeos/i }, html: /Portal <a[^>]+>Dokeos|@import "[^"]+dokeos_blue/i, headers: { 'X-Powered-By': /Dokeos/ } },
 		'DokuWiki':              { cats: { 1:  8 }, meta: { 'generator': /DokuWiki/i } },
@@ -115,6 +117,7 @@
 		'Google Sites':          { cats: { 1:  1 }, url: /sites.google.com/ },
 		'Graffiti CMS':          { cats: { 1:  1 }, meta: { 'generator': /Graffiti CMS/i } },
 		'Gravity Insights':      { cats: { 1: 10 }, html: /gravityInsightsParams\.site_guid = '/ },
+		'Handlebars':            { cats: { 1: 12 }, env: /^Handlebars$/ },
 		'Hiawatha':              { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
 		'Highcharts':            { cats: { 1: 25 }, script: /highcharts.*\.js/, env: /^Highcharts$/ },
 		'Hotaru CMS':            { cats: { 1:  1 }, meta: { 'generator': /Hotaru CMS/i } },
@@ -154,10 +157,10 @@
 		'Microsoft ASP.NET':     { cats: { 1: 18 }, html: /<input[^>]+name=("|')__VIEWSTATE/, headers: { 'X-Powered-By': /ASP\.NET/, 'X-AspNet-Version': /.+/ } },
 		'Microsoft SharePoint':  { cats: { 1:  1 }, meta: { 'generator': /Microsoft SharePoint/i }, headers: { 'MicrosoftSharePointTeamServices': /.*/, 'X-SharePointHealthScore': /.*/, 'SPRequestGuid': /.*/ } },
 		'MiniBB':                { cats: { 1:  2 }, html: /<a href=("|')[^>]+minibb.+\s+<!--End of copyright link/i },
-		'Mint':                  { cats: { 1: 10 }, script: /mint\/\?js/ },
+		'Mint':                  { cats: { 1: 10 }, script: /mint\/\?js/, env: /^Mint$/ },
 		'Mixpanel':              { cats: { 1: 10 }, script: /api\.mixpanel\.com\/track/ },
 		'MochiKit':              { cats: { 1: 12 }, script: /MochiKit\.js/, env: /^MochiKit$/ },
-		'Modernizr':             { cats: { 1: 12 }, script: /modernizr.*\.js/ },
+		'Modernizr':             { cats: { 1: 12 }, script: /modernizr.*\.js/, env: /^Modernizr$/ },
 		'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)|<(link|script)[^>]+assets\/(templates|snippets)\//i },
 		'Mollom':                { cats: { 1: 16 }, script: /mollom\.js/, html: /<img[^>]+\/.mollom\/.com/i },
 		'Mongrel':               { cats: { 1: 22 }, headers: { 'Server': /Mongrel/ } },
@@ -165,6 +168,8 @@
 		'Moogo':                 { cats: { 1:  1 }, script: /kotisivukone.js/ },
 		'MooTools':              { cats: { 1: 12 }, script: /mootools.*\.js/, env: /^MooTools$/ },
 		'Movable Type':          { cats: { 1:  1 }, meta: { 'generator': /Movable Type/i } },
+		'Mustache':              { cats: { 1: 12 }, env: /^Mustache$/ },
+		'Hiawatha':              { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
 		'MyBB':                  { cats: { 1:  2 }, html: /(<script [^>]+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i },
 		'MyBlogLog':             { cats: { 1:  5 }, script: /pub\.mybloglog\.com/i },
 		'Mynetcap':              { cats: { 1:  1 }, meta: { 'generator': /Mynetcap/i } },
@@ -192,7 +197,7 @@
 		'Plesk':                 { cats: { 1:  9 }, script: /common\.js\?plesk/i },
 		'Plone':                 { cats: { 1:  1 }, meta: { 'generator': /Plone/i } },
 		'Plura':                 { cats: { 1: 19 }, html: /<iframe src="http:\/\/pluraserver\.com/ },
-		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i },
+		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i, env: /^Posterous/i },
 		'Prestashop':            { cats: { 1:  6 }, meta: { 'generator': /PrestaShop/i }, html: /Powered by <a href=("|')[^>]+PrestaShop/i },
 		'Prototype':             { cats: { 1: 12 }, script: /(prototype|protoaculous)\.js/, env: /^Prototype$/ },
 		'Protovis':              { cats: { 1: 25 }, script: /protovis.*\.js/, env: /^protovis$/ },
@@ -219,6 +224,7 @@
 		'sNews':                 { cats: { 1:  1 }, meta: { 'generator': /sNews/ } },
 		'Snoobi':                { cats: { 1: 10 }, script: /snoobi\.com\/snoop\.php/ },
 		'SOBI 2':                { cats: { 1: 19 }, html: /(<!\-\- start of Sigsiu Online Business Index|<div[^>]* class=("|')sobi2)/i },
+		'SoundManager':          { cats: { 1: 12 }, env: /^(SoundManager|BaconPlayer)$/ },
 		'SPIP':                  { cats: { 1:  1 }, meta: { 'generator': /SPIP/i }, headers: { 'X-Spip-Cache': /.*/ } },
 		'SQL Buddy':             { cats: { 1:  3 }, html: /(<title>SQL Buddy<\/title>|<[^>]+onclick=("|')sideMainClick\(("|')home\.php)/i },
 		'Squarespace':           { cats: { 1:  1 }, html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
@@ -230,6 +236,7 @@
 		'Textpattern CMS':       { cats: { 1:  1 }, meta: { 'generator': /Textpattern/i } },
 		'Timeline':              { cats: { 1: 25 }, script: /timeline.*\.js/, env: /^Timeline$/ },
 		'Timeplot':              { cats: { 1: 25 }, script: /timeplot.*\.js/, env: /^Timeplot$/ },
+		'TinyMCE':               { cats: { 1: 24 }, env: /^tinyMCE$/ },
 		'TomatoCart':            { cats: { 1:  6 }, meta: { 'generator': /TomatoCart/i } },
 		'Trac':                  { cats: { 1: 13 }, html: /(<a id=("|')tracpowered)/i },
 		'Tumblr':                { cats: { 1: 11 }, html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
@@ -261,7 +268,7 @@
 		'WebPublisher':          { cats: { 1:  1 }, meta: { 'generator': /WEB\|Publisher/i } },
 		'WebsiteBaker':          { cats: { 1:  1 }, meta: { 'generator': /WebsiteBaker/i } },
 		'Webtrekk':              { cats: { 1: 10 }, html: /var webtrekk = new Object/ },
-		'Webtrends':             { cats: { 1: 10 }, html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i, env: /WTOptimize/i },
+		'Webtrends':             { cats: { 1: 10 }, html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i, env: /^(WTOptimize|WebTrends)/i },
 		'Weebly':                { cats: { 1:  1 }, html: /<[^>]+class=("|')weebly/i },
 		'WikkaWiki':             { cats: { 1:  8 }, meta: { 'generator': /WikkaWiki/ }, html: /Powered by <a href=("|')[^>]+WikkaWiki/i },
 		'wink':                  { cats: { 1: 26, 2: 12 }, script: /(\_base\/js\/base|wink).*\.js/i, env: /^wink$/ },