diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index 3f22ea855..a3cf8eb70 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -23,8 +23,9 @@ if ( typeof wappalyzer != 'undefined' ) {
 		21: { name: 'LMS',                  plural: 'LMS' },
 		22: { name: 'Web server',           plural: 'Web servers' },
 		23: { name: 'Cache tool',           plural: 'Cache tools' },
-		24: { name: 'Rich text editor',     plural: 'Rich text editors' }
-		};
+		24: { name: 'Rich text editor',     plural: 'Rich text editors' },
+		25: { name: 'Javascript Graphics',  plural: 'Javascript Graphics' }
+	};
 
 	wappalyzer.apps = {
 		'1C-Bitrix':             { cats: { 1:  1 }, html: /(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i },
@@ -35,6 +36,8 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Amiro.CMS':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Amiro/i },
 		'Apache':                { cats: { 1: 22 }, headers: { 'Server': /Apache/i } },
 		'Apache Tomcat':         { cats: { 1: 22 }, headers: { 'Server': /Apache-Coyote/i } },
+		'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 },
 		'AWStats':               { cats: { 1: 10 }, html: /<meta name=("|')generator("|') [^>]+AWStats/i },
 		'Backbone.js':           { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*backbone[^>]*\.js/i, env: /^Backbone$/ },
 		'BIGACE':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
@@ -53,6 +56,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
 		'Concrete5':             { cats: { 1:  1 }, html: /<meta name=("|')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 }, html: /<meta name=("|')generator("|') [^>]+contens/i },
 		'ConversionLab':         { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
 		'Coppermine':            { cats: { 1:  7 }, html: /<!--Coppermine Photo Gallery/i },
 		'Cotonti':               { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Cotonti/i },
@@ -61,7 +65,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'CS Cart':               { cats: { 1:  6 }, html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':              { cats: { 1:  6 }, html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
 		'cufon':                 { cats: { 1: 17 }, html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
-		'd3':                    { cats: { 1: 12 }, html: /<script[^>]*src=[^>]+d3[^>]*\.js/i, env: 'd3' },
+		'd3':                    { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+d3[^>]*\.js/i, env: '/^d3$/' },
 		'Danneo CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Danneo/i },
 		'DataLife Engine':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
 		'DHTMLX':                { cats: { 1: 12 }, html: /<script [^>]+dhtmlxcommon\.js/i },
@@ -75,6 +79,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Drupal':                { cats: { 1:  1 }, html: /(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style[^>]+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/, 'Expires': /19 Nov 1978/ }, env: /^Drupal$/ },
 		'Dynamicweb':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Dynamicweb/i },
 		'e107':                  { cats: { 1:  1 }, html: /<script [^>]+e107\.js/i },
+		'Exhibit':               { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+exhibit[^>]*\.js/i, env: '/^Exhibit$/' },
 		'ExtJS':                 { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*ext\-base\.js("|')/i, env: /^Ext$/ },
 		'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /exp_last_activity/ } },
 		'eZ Publish':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+eZ Publish/i },
@@ -88,15 +93,20 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Google Maps':           { cats: { 1:  5 }, html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
 		'Graffiti CMS':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Graffiti CMS/i },
 		'Gravity Insights':      { cats: { 1: 10 }, html: /gravityInsightsParams\.site_guid = '/ },
+		'Highcharts':            { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+highcharts[^>]*\.js/i, env: '/^Highcharts$/' },
 		'Hotaru CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Hotaru CMS/i },
 		'IIS':                   { cats: { 1: 22 }, headers: { 'Server': /IIS/i } },
 		'InstantCMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+InstantCMS/i },
 		'IPB':                   { cats: { 1:  2 }, html: /<script [^>]+jscripts\/ips_/i },
 		'iWeb':                  { cats: { 1: 20 }, html: /<meta name=("|')generator("|') [^>]+iWeb/i },
 		'Jalios':                { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Jalios/i },
+		'Javascript Infovis Toolkit': { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+jit[^>]*\.js/i, env: '/^\$jit$/' },
 		'Joomla':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+Joomla|<!\-\- JoomlaWorks "K2")/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
+		'jqPlot':                { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+jqplot[^>]*\.js/i, env: '/^jQuery.jqplot$/' },
 		'jQuery UI':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*jquery\-ui[^>]*\.js/i },
 		'jQuery':                { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i, env: /^jQuery$/ },
+		'jQuery Sparklines':     { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+sparkline[^>]*\.js/i, env: '/^jQuery.fn.sparkline$/' },
+		'JS Charts':             { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+jscharts[^>]*\.js/i, env: '/^JSChart$/' },
 		'JTL Shop':              { cats: { 1:  6 }, html: /(<input[^>]+name=('|")JTLSHOP|<a href=('|")jtl\.php)/i },
 		'K2':                    { cats: { 1: 19 }, html: /<!\-\- JoomlaWorks "K2"/ },
 		'Kampyle':               { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/cf\.kampyle\.com\/k_button\.js("|')/ },
@@ -152,11 +162,11 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i },
 		'Prestashop':            { cats: { 1:  6 }, html: /(<meta name=("|')generator("|') [^>]+PrestaShop|Powered by <a href=("|')[^>]+PrestaShop)/i },
 		'Prototype':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*(prototype|protoaculous)\.js("|')/i, env: /^Prototype$/ },
-		'Protovis':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*protovis[^>]*\.js/i, env: /^protovis$/ },
+		'Protovis':              { cats: { 1: 25 }, html: /<script[^>]* src=("|')[^>]*protovis[^>]*\.js/i, env: /^protovis$/ },
 		'punBB':                 { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+punbb/i },
 		'Quantcast':             { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i, env: /^quantserve$/ },
 		'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
-		'Raphael':               { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*raphael[^>]*\.js/i, env: /^Raphael$/ },
+		'Raphael':               { cats: { 1: 25 }, html: /<script[^>]* src=("|')[^>]*raphael[^>]*\.js/i, env: /^Raphael$/ },
 		'reCAPTCHA':             { cats: { 1: 16 }, html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')(api\-secure\.recaptcha\.net|recaptcha_ajax\.js))/ },
 		'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www.)?reddit\.com/ },
 		'Redmine':               { cats: { 1: 13 }, html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
@@ -182,6 +192,8 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'swift.engine':          { cats: { 1:  1 }, headers: { 'X-Powered-By': /swift\.engine/ } },
 		'Swiftlet':              { cats: { 1:  1, 2: 18 }, html: /(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
 		'Textpattern CMS':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Textpattern/i },
+		'Timeline':              { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+timeline[^>]*\.js/i, env: '/^Timeline$/' },
+		'Timeplot':              { cats: { 1: 25 }, html: /<script[^>]*src=[^>]+timeplot[^>]*\.js/i, env: '/^Timeplot$/' },
 		'TomatoCart':            { cats: { 1:  6 }, html: /<meta name=("|')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': /.*/ } },
diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index d9828bdb9..15bd93743 100755
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -192,6 +192,16 @@
 										<checkbox preference="wappalyzer-cat23" id="wappalyzer-option-cat23" label="&wappalyzer.cat23;"/>
 									</hbox>
 								</row>
+								<row>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat24" id="wappalyzer-option-cat24" label="&wappalyzer.cat24;"/>
+									</hbox>
+								</row>
+								<row>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat25" id="wappalyzer-option-cat25" label="&wappalyzer.cat25;"/>
+									</hbox>
+								</row>
 							</rows>
 						</grid>
 					</groupbox>
diff --git a/chrome/locale/en-US/wappalyzer.dtd b/chrome/locale/en-US/wappalyzer.dtd
index 2ed67d872..08415d3c4 100755
--- a/chrome/locale/en-US/wappalyzer.dtd
+++ b/chrome/locale/en-US/wappalyzer.dtd
@@ -46,4 +46,5 @@
 <!ENTITY wappalyzer.cat21          "LMS">
 <!ENTITY wappalyzer.cat22          "Web servers">
 <!ENTITY wappalyzer.cat23          "Cache tools">
-
+<!ENTITY wappalyzer.cat24          "Rich text editors">
+<!ENTITY wappalyzer.cat25          "Javascript Graphics">
diff --git a/chrome/skin/icons/Atlassian Confluence.ico b/chrome/skin/icons/Atlassian Confluence.ico
new file mode 100644
index 000000000..d0a42183a
Binary files /dev/null and b/chrome/skin/icons/Atlassian Confluence.ico differ
diff --git a/chrome/skin/icons/Atlassian Jira.ico b/chrome/skin/icons/Atlassian Jira.ico
new file mode 100644
index 000000000..e2738055c
Binary files /dev/null and b/chrome/skin/icons/Atlassian Jira.ico differ
diff --git a/chrome/skin/icons/Contens.ico b/chrome/skin/icons/Contens.ico
new file mode 100644
index 000000000..b1c5d8da6
Binary files /dev/null and b/chrome/skin/icons/Contens.ico differ
diff --git a/chrome/skin/icons/Exhibit.ico b/chrome/skin/icons/Exhibit.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/Exhibit.ico differ
diff --git a/chrome/skin/icons/Highcharts.ico b/chrome/skin/icons/Highcharts.ico
new file mode 100644
index 000000000..714abab53
Binary files /dev/null and b/chrome/skin/icons/Highcharts.ico differ
diff --git a/chrome/skin/icons/JS Charts.ico b/chrome/skin/icons/JS Charts.ico
new file mode 100644
index 000000000..b2b1a76f9
Binary files /dev/null and b/chrome/skin/icons/JS Charts.ico differ
diff --git a/chrome/skin/icons/Javascript Infovis Toolkit.ico b/chrome/skin/icons/Javascript Infovis Toolkit.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/Javascript Infovis Toolkit.ico differ
diff --git a/chrome/skin/icons/Timeline.ico b/chrome/skin/icons/Timeline.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/Timeline.ico differ
diff --git a/chrome/skin/icons/Timeplot.ico b/chrome/skin/icons/Timeplot.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/Timeplot.ico differ
diff --git a/chrome/skin/icons/jQuery Sparklines.ico b/chrome/skin/icons/jQuery Sparklines.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/jQuery Sparklines.ico differ
diff --git a/chrome/skin/icons/jqPlot.ico b/chrome/skin/icons/jqPlot.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/chrome/skin/icons/jqPlot.ico differ
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index 97a91f546..44fe72afc 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -31,3 +31,5 @@ pref('wappalyzer.cat20',          true);
 pref('wappalyzer.cat21',          true);
 pref('wappalyzer.cat22',          true);
 pref('wappalyzer.cat23',          true);
+pref('wappalyzer.cat24',          true);
+pref('wappalyzer.cat25',          true);