diff --git a/js/apps.js b/js/apps.js
index 49540a1..e7c6c28 100644
--- a/js/apps.js
+++ b/js/apps.js
@@ -8,871 +8,871 @@
  **/
 
 var appinfo = {
-	// ==== zh-cn ====
-	'\u767e\u5ea6\u7edf\u8ba1': {	// 百度统计
-		icon: 'bdtongji.ico',
-		url: 'http://tongji.baidu.com',
-		priority: 3
-	},
-	'cnzz': {
-		icon: 'cnzz.ico',
-		url: 'http://www.cnzz.com',
-		priority: 3
-	},
-	'bShare': {
-		icon: 'bshare.ico',
-		url: 'http://www.bshare.cn',
-		priority: 2.9
-	},
-	'\u767e\u5ea6\u5206\u4eab': {	// 百度分享
-		icon: 'baidushare.ico',
-		url: 'http://share.baidu.com',
-		priority: 2.9
-	},
-	'\u591a\u8bf4': {	// 多说
-		icon: 'duoshuo.ico',
-		url: 'http://www.duoshuo.com',
-		priority: 2.9
-	},
-	'\u53cb\u8350': {	// 友荐 
-		icon: 'ujian.ico',
-		url: 'http://www.ujian.cc',
-		priority: 2.9
-	},
-	'\u53cb\u8a00': {	// 友言 
-		icon: 'uyan.ico',
-		url: 'http://www.uyan.cc',
-		priority: 2.9
-	},
-	'JiaThis': {
-		icon: 'jiathis.ico',
-		url: 'http://www.jiathis.com',
-		priority: 2.9
-	},
-	'\u65e0\u89c5': { // 无觅相关文章插件
-		icon: 'wumii.ico',
-		url: 'http://www.wumii.com/widget/getWidget',
-		priority: 2.9
-	},
-	'segmentfault': {
-		icon: 'segmentfault.ico',
-		url: 'http://segmentfault.com',
-		priority: 2.9
-	},
-	'\u4e03\u725b\u4e91\u5b58\u50a8\u52a0\u901f': { // 七牛云存储加速
-		icon: 'qiniu.png',
-		url: 'http://www.qiniu.com',
-		priority: 0.9
-	},
+    // ==== zh-cn ====
+    '\u767e\u5ea6\u7edf\u8ba1': { // 百度统计
+        icon: 'bdtongji.ico',
+        url: 'http://tongji.baidu.com',
+        priority: 3
+    },
+    'cnzz': {
+        icon: 'cnzz.ico',
+        url: 'http://www.cnzz.com',
+        priority: 3
+    },
+    'bShare': {
+        icon: 'bshare.ico',
+        url: 'http://www.bshare.cn',
+        priority: 2.9
+    },
+    '\u767e\u5ea6\u5206\u4eab': { // 百度分享
+        icon: 'baidushare.ico',
+        url: 'http://share.baidu.com',
+        priority: 2.9
+    },
+    '\u591a\u8bf4': { // 多说
+        icon: 'duoshuo.ico',
+        url: 'http://www.duoshuo.com',
+        priority: 2.9
+    },
+    '\u53cb\u8350': { // 友荐 
+        icon: 'ujian.ico',
+        url: 'http://www.ujian.cc',
+        priority: 2.9
+    },
+    '\u53cb\u8a00': { // 友言 
+        icon: 'uyan.ico',
+        url: 'http://www.uyan.cc',
+        priority: 2.9
+    },
+    'JiaThis': {
+        icon: 'jiathis.ico',
+        url: 'http://www.jiathis.com',
+        priority: 2.9
+    },
+    '\u65e0\u89c5': { // 无觅相关文章插件
+        icon: 'wumii.ico',
+        url: 'http://www.wumii.com/widget/getWidget',
+        priority: 2.9
+    },
+    'segmentfault': {
+        icon: 'segmentfault.ico',
+        url: 'http://segmentfault.com',
+        priority: 2.9
+    },
+    '\u4e03\u725b\u4e91\u5b58\u50a8\u52a0\u901f': { // 七牛云存储加速
+        icon: 'qiniu.png',
+        url: 'http://www.qiniu.com',
+        priority: 0.9
+    },
 
-	// ==== services ====
-	'Tumblr': {
-		icon: 'Tumblr.ico',
-		url: 'http://tumblr.com',
-		priority: 0.9
-	},
-	'TypePad': {
-		icon: 'TypePad.ico',
-		url: 'http://typepad.com',
-		priority: 0.9
-	},
-	'Blogger': {
-		icon: 'Blogger.ico',
-		url: 'http://blogger.com',
-		priority: 0.9
-	},
-	
-	'Webs': {
-		icon: 'webs.ico',
-		url: 'http://www.webs.com/',
-		priority: 0.9
-	},
-	'Weebly': {
-		icon: 'weebly.ico',
-		url: 'http://www.weebly.com/',
-		priority: 0.9
-	},
-	'Webnode': {
-		icon: 'webnode.ico',
-		url: 'http://www.webnode.com/',
-		priority: 0.9
-	},
-	'Jimdo': {
-		icon: 'jimdo.ico',
-		url: 'http://www.jimdo.com',
-		priority: 0.9
-	},
-	'Jigsy': {
-		icon: 'jigsy.ico',
-		url: 'http://jigsy.com',
-		priority: 0.9
-	},
-	'Yola': {
-		icon: 'yola.ico',
-		url: 'http://www.yola.com/',
-		priority: 0.9
-	},
+    // ==== services ====
+    'Tumblr': {
+        icon: 'Tumblr.ico',
+        url: 'http://tumblr.com',
+        priority: 0.9
+    },
+    'TypePad': {
+        icon: 'TypePad.ico',
+        url: 'http://typepad.com',
+        priority: 0.9
+    },
+    'Blogger': {
+        icon: 'Blogger.ico',
+        url: 'http://blogger.com',
+        priority: 0.9
+    },
 
-	// ==== cms or framework ====
-	'CodeIgniter': {
-		icon: 'codeigniter.ico',
-		url: 'http://codeigniter.com',
-		priority: 1
-	},
-	
-	'vBulletin': {
-		icon: 'vBulletin.ico',
-		url: 'http://www.vbulletin.com/',
-		priority: 1
-	},
-	'SMF': {
-		title: 'Simple Machines Forum',
-		icon: 'SMF.ico',
-		url: 'http://www.simplemachines.org/',
-		priority: 1
-	},
-	'phpBB': {
-		icon: 'phpBB.ico',
-		url: 'http://www.phpbb.com',
-		priority: 1
-	},
-	'IPB': {
-		title: 'Invision Power Board',
-		icon: 'IPB.ico',
-		url: 'http://invisionpower.com/',
-		priority: 1
-	},
-	'miniBB': {
-		icon: 'miniBB.ico',
-		url: 'http://www.minibb.com/',
-		priority: 1
-	},
-	'MyBB': {
-		icon: 'mybb.ico',
-		url: 'http://www.mybb.com/',
-		priority: 1
-	},
-	'XenForo': {
-		icon: 'xenforo.ico',
-		url: 'http://xenforo.com',
-		priority: 1
-	},
+    'Webs': {
+        icon: 'webs.ico',
+        url: 'http://www.webs.com/',
+        priority: 0.9
+    },
+    'Weebly': {
+        icon: 'weebly.ico',
+        url: 'http://www.weebly.com/',
+        priority: 0.9
+    },
+    'Webnode': {
+        icon: 'webnode.ico',
+        url: 'http://www.webnode.com/',
+        priority: 0.9
+    },
+    'Jimdo': {
+        icon: 'jimdo.ico',
+        url: 'http://www.jimdo.com',
+        priority: 0.9
+    },
+    'Jigsy': {
+        icon: 'jigsy.ico',
+        url: 'http://jigsy.com',
+        priority: 0.9
+    },
+    'Yola': {
+        icon: 'yola.ico',
+        url: 'http://www.yola.com/',
+        priority: 0.9
+    },
 
-	'Drupal': {
-		icon: 'Drupal.ico',
-		url: 'http://drupal.org',
-		priority: 1
-	},
-	'Ubercart': {
-		icon: 'Ubercart.ico',
-		url: 'http://www.ubercart.org/',
-		priority: 0.9 // higher priority compared with Drupal
-	},
-	
-	'AlphaCMS': {
-		icon: 'alphacms.ico',
-		url: 'http://www.mego.com.vn',
-		priority: 1
-	},
-	'TomatoCMS': {
-		icon: 'tomatocms.ico',
-		url: 'http://www.tomatocms.com/',
-		priority: 1
-	},
-	
-	'WordPress': {
-		icon: 'WordPress.ico',
-		url: 'http://wordpress.org',
-		priority: 1
-	},
-	'WPML': {
-		icon: 'WPML.ico',
-		url: 'http://wpml.org/',
-		priority: 1.1
-	},
-	
-	'bbPress': {
-		icon: 'bbPress.ico',
-		url: 'http://bbpress.org',
-		priority: 1
-	},
-	'Movable Type': {
-		icon: 'MovableType.ico',
-		url: 'http://www.movabletype.org/',
-		priority: 1
-	},
-	'Serendipity': {
-		icon: 'Serendipity.png',
-		url: 'http://www.s9y.org/',
-		priority: 1
-	},
-	'concrete5': {
-		icon: 'concrete5.gif',
-		url: 'http://www.concrete5.org',
-		priority: 1
-	},
-	
-	'MediaWiki': {
-		icon: 'MediaWiki.ico',
-		url: 'http://www.mediawiki.org/',
-		priority: 1
-	},
-	'DokuWiki': {
-		icon: 'DokuWiki.ico',
-		url: 'http://www.dokuwiki.org/',
-		priority: 1
-	},
+    // ==== cms or framework ====
+    'CodeIgniter': {
+        icon: 'codeigniter.ico',
+        url: 'http://codeigniter.com',
+        priority: 1
+    },
 
-	'OpenACS': {
-		icon: 'openacs.ico',
-		url: 'http://openacs.org',
-		priority: 1
-	},
+    'vBulletin': {
+        icon: 'vBulletin.ico',
+        url: 'http://www.vbulletin.com/',
+        priority: 1
+    },
+    'SMF': {
+        title: 'Simple Machines Forum',
+        icon: 'SMF.ico',
+        url: 'http://www.simplemachines.org/',
+        priority: 1
+    },
+    'phpBB': {
+        icon: 'phpBB.ico',
+        url: 'http://www.phpbb.com',
+        priority: 1
+    },
+    'IPB': {
+        title: 'Invision Power Board',
+        icon: 'IPB.ico',
+        url: 'http://invisionpower.com/',
+        priority: 1
+    },
+    'miniBB': {
+        icon: 'miniBB.ico',
+        url: 'http://www.minibb.com/',
+        priority: 1
+    },
+    'MyBB': {
+        icon: 'mybb.ico',
+        url: 'http://www.mybb.com/',
+        priority: 1
+    },
+    'XenForo': {
+        icon: 'xenforo.ico',
+        url: 'http://xenforo.com',
+        priority: 1
+    },
 
-	'Joomla': {
-		icon: 'Joomla.ico',
-		url: 'http://joomla.org',
-		priority: 1
-	},
-	'Magento': {
-		icon: 'Magento.ico',
-		url: 'http://www.magentocommerce.com/',
-		priority: 1
-	},
-	'XOOPS': {
-		icon: 'XOOPS.ico',
-		url: 'http://xoops.org',
-		priority: 1
-	},
-	'Plone': {
-		icon: 'Plone.ico',
-		url: 'http://plone.org/',
-		priority: 1
-	},
-	'CMSMadeSimple': {
-		title: 'CMS Made Simple',
-		icon: 'CMSMadeSimple.ico',
-		url: 'http://www.cmsmadesimple.org/',
-		priority: 1
-	},
-	'SilverStripe': {
-		icon: 'SilverStripe.png',
-		url: 'http://silverstripe.org',
-		priority: 1
-	},
-	'MODx': {
-		icon: 'MODx.ico',
-		url: 'http://modxcms.com/',
-		priority: 1
-	},
-	'Amiro.CMS': {
-		icon: 'Amiro.CMS.ico',
-		url: 'http://www.amirocms.com/',
-		priority: 1
-	},
-	'JaliosJCMS': {
-		icon: 'JaliosJCMS.ico',
-		url: 'http://www.jalios.com',
-		priority: 1,
-		title: 'Jalios JCMS'
-	},
-	'Koobi': {
-		icon: 'Koobi.ico',
-		url: 'http://www.dream4.de/cms/',
-		priority: 1
-	},
-	'Liferay': {
-		icon: 'LifeRay.ico',
-		url: 'http://www.liferay.com',
-		priority: 1
-	},
-	'TYPO3': {
-		icon: 'TYPO3.ico',
-		url: 'http://typo3.org/',
-		priority: 1
-	},
-	'Contao': {
-		icon: 'contao.ico',
-		url: 'http://www.contao.org',
-		priority: 1
-	},
-	'Fatwire': {
-		icon: 'Fatwire.ico',
-		url: 'http://www.fatwire.com',
-		priority: 1
-	},
-	'PHP-Fusion': {
-		icon: 'PHP-Fusion.ico',
-		url: 'http://php-fusion.co.uk/',
-		priority: 1
-	},
-	'PHP-Nuke': {
-		icon: 'PHP-Nuke.ico',
-		url: 'http://phpnuke.org/',
-		priority: 1
-	},
-	'WebGUI': {
-		icon: 'WebGUI.ico',
-		url: 'http://www.webgui.org/',
-		priority: 1
-	},
-	'ez Publish': {
-		icon: 'eZ.ico',
-		url: 'http://ez.no/',
-		priority: 1
-	},
-	'BIGACE': {
-		icon: 'BIGACE.ico',
-		url: 'http://www.bigace.de/',
-		priority: 1
-	},
-	'OpenCMS': {
-		icon: 'opencms.ico',
-		url: 'http://www.opencms.org/',
-		priority: 1
-	},
-	'1c-bitrix': {
-		icon: '1c-bitrix.ico',
-		url: 'http://www.1c-bitrix.ru/',
-		priority: 1
-	},
-	'MojoMotor': {
-		icon: 'mojomotor.ico',
-		url: '	http://mojomotor.com',
-		priority: 1
-	},
-	'GetSimple': {
-		icon: 'getsimple.png',
-		url: '	http://get-simple.info/',
-		priority: 1
-	},
-	'Perch': { // not yet supported
-		icon: 'perch.ico',
-		url: 'http://grabaperch.com/',
-		priority: 1
-	},
-	'DataLifeEngine': {
-		title: 'DataLife Engine',
-		icon: 'datalife.ico',
-		url: 'http://dle-news.ru/',
-    priority: 1
-	},
-	
-	'Elgg': {
-		icon: 'Elgg.ico',
-		url: 'http://www.elgg.org/',
-		priority: 1
-	},
-	
-	'DotNetNuke': {
-		icon: 'DotNetNuke.ico',
-		url: 'http://www.dotnetnuke.com/',
-		priority: 1
-	},
-	'Sitefinity': {
-		icon: 'Sitefinity.ico',
-		url: 'http://www.sitefinity.com/',
-		priority: 1
-	},
-	'SharePoint': {
-		icon: 'SharePoint.png',
-		url: 'http://sharepoint.microsoft.com',
-		priority: 1,
-		title: 'Microsoft SharePoint'
-	},
-	
-	'ZenPhoto': {
-		icon: 'ZenPhoto.ico',
-		url: 'http://www.zenphoto.org',
-		priority: 1
-	},
-	'Gallery2': {
-		icon: 'Gallery2.ico',
-		url: 'http://gallery.menalto.com/',
-		priority: 1
-	},
-	
-	'Avactis': {
-		icon: 'avactis.ico',
-		url: 'http://www.avactis.com',
-		priority: 1
-	},
-	'PrestaShop': {
-		icon: 'PrestaShop.ico',
-		url: 'http://www.prestashop.com/',
-		priority: 1
-	},
-	'Prostores': {
-		icon: 'prostores.ico',
-		url: 'http://www.prostores.com',
-		priority: 1
-	},
-	'ZenCart': {
-		icon: 'zencart.ico',
-		url: 'http://www.zen-cart.com',
-		priority: 1
-	},
-	'ErainCart': {
-		icon: 'eraincart.ico',
-		url: 'http://eraincart.com',
-		priority: 1
-	},
-	'Volusion': {
-		icon: 'volusion.ico',
-		url: 'http://www.volusion.com',
-		priority: 1
-	},
-	'osCommerce': {
-		icon: 'osCommerce.ico',
-		url: 'http://www.oscommerce.com',
-		priority: 1
-	},
-	'OpenCart': {
-		icon: 'opencart.png',
-		url: 'http://www.opencart.com',
-		priority: 1
-	},
+    'Drupal': {
+        icon: 'Drupal.ico',
+        url: 'http://drupal.org',
+        priority: 1
+    },
+    'Ubercart': {
+        icon: 'Ubercart.ico',
+        url: 'http://www.ubercart.org/',
+        priority: 0.9 // higher priority compared with Drupal
+    },
 
-	'Moodle': {
-		icon: 'moodle.png',
-		url: 'http://moodle.org',
-		priority: 1
-	},
-	'SugarCRM': {
-		icon: 'sugarcrm.ico',
-		url: 'http://www.sugarcrm.com',
-		priority: 1
-	},
-	'PivotX': {
-		icon: 'pivotx.ico',
-		url: 'http://pivotx.net',
-		priority: 1
-	},	
-	
-	'Shibboleth': {
-		icon: 'shibboleth.png',
-		url:  'http://shibboleth.internet2.edu/',
-		priority: 1
-	},
-	'Alfresco': {
-		icon: 'Alfresco.png',
-		url: 'http://www.alfresco.com',
-		priority: 1
-	},
+    'AlphaCMS': {
+        icon: 'alphacms.ico',
+        url: 'http://www.mego.com.vn',
+        priority: 1
+    },
+    'TomatoCMS': {
+        icon: 'tomatocms.ico',
+        url: 'http://www.tomatocms.com/',
+        priority: 1
+    },
 
-	'ClanSphere': {
-		icon: 'ClanSphere.png',
-		url:  'http://csphere.eu',
-		priority: 1
-	},
-	
-	// ==== js framework ====
-	'Highcharts': {
-		icon: 'highcharts.png',
-		url: 'http://www.highcharts.com',
-		priority: 2
-	},
-	'Zepto.js': {
-		icon: 'zepto.png',
-		url: 'http://zeptojs.com',
-		priority: 2
-	},
-	'jQuery': {
-		icon: 'jQuery.ico',
-		url: 'http://jquery.com',
-		priority: 2
-	},
-	'jQuery UI': {
-		icon: 'jQuery_UI.ico',
-		url: 'http://jqueryui.com/',
-		priority: 1.9
-	},
-	'ExtJS': {
-		icon: 'ExtJS.ico',
-		url: 'http://www.extjs.com/',
-		priority: 2
-	},
-	'Prototype': {
-		icon: 'Prototype.ico',
-		url: 'http://www.prototypejs.org/',
-		priority: 2
-	},
-	'Closure': {
-		icon: 'Closure.png',
-		url: 'http://code.google.com/closure/',
-		priority: 2
-	},
-	'MooTools': {
-		icon: 'MooTools.ico',
-		url: 'http://mootools.net/',
-		priority: 2
-	},
-	'Dojo': {
-		icon: 'dojo.ico',
-		url: 'http://www.dojotoolkit.org/',
-		priority: 2
-	},
-	'script.aculo.us': {
-		icon: 'script.aculo.us.ico',
-		url: 'http://script.aculo.us/',
-		priority: 1.9
-	},
-	'YUI': {
-		icon: 'YUI.ico',
-		url: 'http://developer.yahoo.com/yui/2/',
-		priority: 2
-	},
-	'YUI 3': {
-		icon: 'yui3.png',
-		url: 'http://yuilibrary.com',
-		priority: 2
-	},
-	'Cappuccino': {
-		icon: 'cappuccino.png',
-		url: 'http://cappuccino.org/',
-		priority: 2
-	},
-	'RightJS': {
-		icon: 'rightjs.png',
-		url: 'http://RightJS.org/',
-		priority: 2
-	},
-	'Spine': {
-		icon: 'spine.ico',
-		url: 'http://spinejs.com',
-		priority: 1.9
-	},
-  'Angular': {
-    icon: 'angular.ico',
-    url: 'http://angularjs.org/',
-    priority: 1.5
-  },
-  'D3': {
-  	icon: 'D3.svg',
-  	url: 'http://d3js.org/',
-  	priority: 2
-  },
-	
-	// ==== js tools ====
-	'Raphael': {
-		icon: 'raphael.ico',
-		url: 'http://raphaeljs.com/',
-		priority: 2.9
-	},
-	'Typekit': {
-		icon: 'typekit.ico',
-		url: 'http://typekit.com/',
-		priority: 2.9
-	},
-	'Cufon': {
-		icon: 'cufon.ico',
-		url: 'http://cufon.shoqolate.com/',
-		priority: 2.9
-	},
-	'sIFR': {
-		icon: 'sifr.gif',
-		url: 'http://www.mikeindustries.com/blog/sifr/',
-		priority: 2.9
-	},
-	'Modernizr': {
-		icon: 'modernizr.ico',
-		url: 'http://www.modernizr.com/',
-		priority: 2.9
-	},
-	'Facebook': {
-		title: 'Facebook Social plugins',
-		icon: 'facebook.ico',
-		url: 'http://developers.facebook.com/',
-		priority: 2.9
-	},
-	'Twitter': {
-		title: 'Twitter plugins',
-		icon: 'twitter.ico',
-		url: 'http://dev.twitter.com',
-		priority: 2.9
-	},
-	'Buzz': {
-		title: 'Google Buzz Button',
-		icon: 'buzz.png',
-		url: 'http://www.google.com/buzz/stuff',
-		priority: 2.9
-	},
-	'Plus1': {
-		title: 'Google Plus 1',
-		icon: 'plus1.png',
-		url: 'http://www.google.com/+1/button/',
-		priority: 2.9
-	},
-	'AddThis': {
-		icon: 'addthis.ico',
-		url: 'http://www.addthis.com',
-		priority: 2.9
-	},
-	'Backbone.js': {
-		icon: 'Backbone.png',
-		url: 'http://documentcloud.github.com/backbone/',
-		priority: 1.9
-	},
-	'Underscore.js': {
-		icon: 'Underscore.png',
-		url: 'http://documentcloud.github.com/underscore/',
-		priority: 2.9
-	},
-	
-	'Head JS': {
-		icon: 'headjs.gif',
-		url: 'http://headjs.com',
-		priority: 2.9
-	},
-	'Google Loader': {
-		icon: 'google.ico',
-		url: 'http://code.google.com/apis/loader',
-		priority: 2.9
-	},
-	
-	'Woopra': {
-		icon: 'woopra.ico',
-		url: 'http://www.woopra.com',
-		priority: 3
-	},
-	'OpenWebAnalytics': {
-		icon: 'owa.ico',
-		url: 'http://www.openwebanalytics.com',
-		priority: 3
-	},
-	'Google Analytics': {
-		icon: 'Google_Analytics.ico',
-		url: 'https://www.google.com/analytics/?hl=zh-CN',
-		priority: 3
-	},
-	'SiteCatalyst': {
-		icon: 'SiteCatalyst.ico',
-		url: 'http://www.omniture.com',
-		priority: 3
-	},
-	'Coremetrics': {
-		icon: 'coremetrics.ico',
-		url: 'http://www.coremetrics.com',
-		priority: 3
-	},
-	'Quantcast': {
-		icon: 'Quantcast.ico',
-		url: 'http://www.quantcast.com/',
-		priority: 3
-	},
-	'Xiti': {
-		title: 'Xiti Tracker',
-		icon: 'xiti.ico',
-		url: 'http://xiti.com/',
-		priority: 3
-	},
-	'Piwik': {
-		icon: 'Piwik.ico',
-		url: 'http://piwik.org/',
-		priority: 3
-	},
-	'Clicky': {
-		icon: 'clicky.ico',
-		url: 'http://getclicky.com/',
-		priority: 3
-	},
-	
-	'Disqus': {
-		icon: 'Disqus.ico',
-		url: 'http://disqus.com/',
-    priority: 1
-	},
-	'GetSatisfaction': {
-		icon: 'GetSatisfaction.gif',
-		url: 'http://getsatisfaction.com',
-		priority: 3
-	},
-	'Wibiya': {
-		icon: 'Wibiya.ico',
-		url: 'http://wibiya.com/',
-		priority: 3
-	},
-	'Prettify': {
-		title: 'Google Code Prettify',
-		icon: 'google.ico',
-		url: 'http://code.google.com/p/google-code-prettify/',
-		priority: 3
-	},
-	'reCaptcha': {
-		icon: 'reCaptcha.ico',
-		url: 'http://recaptcha.net/',
-		priority: 4
-	},
-	'Mollom': {
-		icon: 'mollom.ico',
-		url: 'http://mollom.com',
-		priority: 4
-	},
-	'GoogleFontApi': {
-		title: 'Google Font API',
-		icon: 'google-font-api.gif',
-		url: 'http://code.google.com/apis/webfonts/',
-		priority: 4
-	},
-	'GoogleMapApi': {
-		title: 'Google Map API',
-		icon: 'gmap.png',
-		url: 'http://code.google.com/apis/maps/',
-		priority: 4
-	},
-	'SWFObject': {
-		icon: 'SWFObject.ico',
-		url: 'http://code.google.com/p/swfobject/',
-		priority: 4
-	},
-	
-	'OpenX': {
-		icon: 'OpenX.ico',
-		url: 'http://openx.org',
-		priority: 5
-	},
-	'AdSense': {
-		icon: 'AdSense.gif',
-		url: 'https://www.google.com/adsense',
-		priority: 5
-	},
-	'Chitika': {
-		icon: 'chitika.ico',
-		url: 'http://chitika.com/',
-		priority: 5
-	},
-	'BuySellAds': {
-		icon: 'buysellads.ico',
-		url: 'http://buysellads.com/',
-		priority: 5
-	},
-  'HumansTxt': {
-    icon: 'humanstxt.ico',
-    url: 'http://humanstxt.org/',
-    priority: 5
-  },
-	'Bootstrap': {
-		icon: 'bootstrap.ico',    
-		url: 'http://twitter.github.com/bootstrap/',
-		priority: 5
-	},
-  'Ning': {
-    icon: 'ning.ico',
-    url: 'http://www.ning.com/',
-    priority: 1
-  },
-  'ektron': {
-    icon: 'ektron.ico',
-    url: 'http://www.ektron.com/',
-    priority: 1
-  },
-  'Mura CMS': {
-    title: 'Mura CMS',
-    icon: 'muracms.ico',
-    url: 'http://www.getmura.com/',
-    priority: 1
-  },
-  'Tiki Wiki CMS Groupware': {
-    title: 'Tiki Wiki CMS Groupware',
-    icon: 'TikiWikiCms.ico',
-    url: 'http://info.tiki.org/',
-    priority: 1
-  },
-  'etracker': {
-    title: 'etracker',
-    icon: 'etracker.ico',
-    url: 'http://etracker.com/',
-    priority: 1.2
-  },
-  'OpenTag': {
-    icon: 'OpenTag.ico',
-    url: 'http://opentag.qubitproducts.com',
-    priority: 1.2
-  },
-  'SPDY': {
-    icon: 'spdy.ico',
-    url: 'http://www.chromium.org/spdy',
-    priority: 5
-  },
-  'KISSmetrics': {
-    icon: 'kissmetrics.ico',
-    url: 'http://kissmetrics.com/',
-    priority: 1
-  },
-  'LiveStreet': {
-    icon: 'LiveStreetCms.ico',
-    url: 'http://livestreetcms.com/',
-    priority: 1
-  },
-  'PHP': {
-    icon: 'php.ico',
-    url: 'http://php.net/',
-    priority: 1.5
-  },
-  'Java': {
-    icon: 'java.ico',
-    url: 'http://www.java.com',
-    priority: 1.5
-  },
-  'Tengine': {
-    icon: 'tengine.ico',
-    url: 'http://tengine.taobao.org',
-    priority: 1.5
-  },
-  'Apache': {
-    icon: 'apache.ico',
-    url: 'http://httpd.apache.org/',
-    priority: 1.5
-  },
-  'Tomcat': {
-    icon: 'tomcat.ico',
-    url: 'http://tomcat.apache.org/',
-    priority: 1.5
-  },
-  'Domino': {
-    icon: 'domino.ico',
-    url: 'http://www.ibm.com/software/lotus/products/domino/',
-    priority: 1.5
-  },
-  'Play': {
-    icon: 'play.ico',
-    url: 'https://www.playframework.com/',
-    priority: 1
-  },
-  'nginx': {
-    icon: 'nginx.ico',
-    url: 'http://nginx.org/en/',
-    priority: 1.5
-  },
-  'GitHub': {
-    icon: 'github.ico',
-    url: 'https://github.com',
-    priority: 1.5
-  },
-  'Varnish': {
-    icon: 'varnish.ico',
-    url: 'https://www.varnish-cache.org/',
-    priority: 1.5
-  },
-  'IIS': {
-    icon: 'iis.ico',
-    url: 'http://www.iis.net/',
-    priority: 1.5
-  },
-  'ASP.NET': {
-    icon: 'asp.net.ico',
-    url: 'http://www.asp.net/',
-    priority: 1.5
-  },
-  'Nette': {
-    icon: 'nette.ico',
-    url: 'http://nette.org/',
-    priority: 1.5
-  },
+    'WordPress': {
+        icon: 'WordPress.ico',
+        url: 'http://wordpress.org',
+        priority: 1
+    },
+    'WPML': {
+        icon: 'WPML.ico',
+        url: 'http://wpml.org/',
+        priority: 1.1
+    },
 
-	// ==== misc ====
-	'': { // default
-		icon: 'unknown.jpg',
-		url: 'http://google.com/search?q=%s'
-	}
-};
+    'bbPress': {
+        icon: 'bbPress.ico',
+        url: 'http://bbpress.org',
+        priority: 1
+    },
+    'Movable Type': {
+        icon: 'MovableType.ico',
+        url: 'http://www.movabletype.org/',
+        priority: 1
+    },
+    'Serendipity': {
+        icon: 'Serendipity.png',
+        url: 'http://www.s9y.org/',
+        priority: 1
+    },
+    'concrete5': {
+        icon: 'concrete5.gif',
+        url: 'http://www.concrete5.org',
+        priority: 1
+    },
+
+    'MediaWiki': {
+        icon: 'MediaWiki.ico',
+        url: 'http://www.mediawiki.org/',
+        priority: 1
+    },
+    'DokuWiki': {
+        icon: 'DokuWiki.ico',
+        url: 'http://www.dokuwiki.org/',
+        priority: 1
+    },
+
+    'OpenACS': {
+        icon: 'openacs.ico',
+        url: 'http://openacs.org',
+        priority: 1
+    },
+
+    'Joomla': {
+        icon: 'Joomla.ico',
+        url: 'http://joomla.org',
+        priority: 1
+    },
+    'Magento': {
+        icon: 'Magento.ico',
+        url: 'http://www.magentocommerce.com/',
+        priority: 1
+    },
+    'XOOPS': {
+        icon: 'XOOPS.ico',
+        url: 'http://xoops.org',
+        priority: 1
+    },
+    'Plone': {
+        icon: 'Plone.ico',
+        url: 'http://plone.org/',
+        priority: 1
+    },
+    'CMSMadeSimple': {
+        title: 'CMS Made Simple',
+        icon: 'CMSMadeSimple.ico',
+        url: 'http://www.cmsmadesimple.org/',
+        priority: 1
+    },
+    'SilverStripe': {
+        icon: 'SilverStripe.png',
+        url: 'http://silverstripe.org',
+        priority: 1
+    },
+    'MODx': {
+        icon: 'MODx.ico',
+        url: 'http://modxcms.com/',
+        priority: 1
+    },
+    'Amiro.CMS': {
+        icon: 'Amiro.CMS.ico',
+        url: 'http://www.amirocms.com/',
+        priority: 1
+    },
+    'JaliosJCMS': {
+        icon: 'JaliosJCMS.ico',
+        url: 'http://www.jalios.com',
+        priority: 1,
+        title: 'Jalios JCMS'
+    },
+    'Koobi': {
+        icon: 'Koobi.ico',
+        url: 'http://www.dream4.de/cms/',
+        priority: 1
+    },
+    'Liferay': {
+        icon: 'LifeRay.ico',
+        url: 'http://www.liferay.com',
+        priority: 1
+    },
+    'TYPO3': {
+        icon: 'TYPO3.ico',
+        url: 'http://typo3.org/',
+        priority: 1
+    },
+    'Contao': {
+        icon: 'contao.ico',
+        url: 'http://www.contao.org',
+        priority: 1
+    },
+    'Fatwire': {
+        icon: 'Fatwire.ico',
+        url: 'http://www.fatwire.com',
+        priority: 1
+    },
+    'PHP-Fusion': {
+        icon: 'PHP-Fusion.ico',
+        url: 'http://php-fusion.co.uk/',
+        priority: 1
+    },
+    'PHP-Nuke': {
+        icon: 'PHP-Nuke.ico',
+        url: 'http://phpnuke.org/',
+        priority: 1
+    },
+    'WebGUI': {
+        icon: 'WebGUI.ico',
+        url: 'http://www.webgui.org/',
+        priority: 1
+    },
+    'ez Publish': {
+        icon: 'eZ.ico',
+        url: 'http://ez.no/',
+        priority: 1
+    },
+    'BIGACE': {
+        icon: 'BIGACE.ico',
+        url: 'http://www.bigace.de/',
+        priority: 1
+    },
+    'OpenCMS': {
+        icon: 'opencms.ico',
+        url: 'http://www.opencms.org/',
+        priority: 1
+    },
+    '1c-bitrix': {
+        icon: '1c-bitrix.ico',
+        url: 'http://www.1c-bitrix.ru/',
+        priority: 1
+    },
+    'MojoMotor': {
+        icon: 'mojomotor.ico',
+        url: '	http://mojomotor.com',
+        priority: 1
+    },
+    'GetSimple': {
+        icon: 'getsimple.png',
+        url: '	http://get-simple.info/',
+        priority: 1
+    },
+    'Perch': { // not yet supported
+        icon: 'perch.ico',
+        url: 'http://grabaperch.com/',
+        priority: 1
+    },
+    'DataLifeEngine': {
+        title: 'DataLife Engine',
+        icon: 'datalife.ico',
+        url: 'http://dle-news.ru/',
+        priority: 1
+    },
+
+    'Elgg': {
+        icon: 'Elgg.ico',
+        url: 'http://www.elgg.org/',
+        priority: 1
+    },
+
+    'DotNetNuke': {
+        icon: 'DotNetNuke.ico',
+        url: 'http://www.dotnetnuke.com/',
+        priority: 1
+    },
+    'Sitefinity': {
+        icon: 'Sitefinity.ico',
+        url: 'http://www.sitefinity.com/',
+        priority: 1
+    },
+    'SharePoint': {
+        icon: 'SharePoint.png',
+        url: 'http://sharepoint.microsoft.com',
+        priority: 1,
+        title: 'Microsoft SharePoint'
+    },
+
+    'ZenPhoto': {
+        icon: 'ZenPhoto.ico',
+        url: 'http://www.zenphoto.org',
+        priority: 1
+    },
+    'Gallery2': {
+        icon: 'Gallery2.ico',
+        url: 'http://gallery.menalto.com/',
+        priority: 1
+    },
+
+    'Avactis': {
+        icon: 'avactis.ico',
+        url: 'http://www.avactis.com',
+        priority: 1
+    },
+    'PrestaShop': {
+        icon: 'PrestaShop.ico',
+        url: 'http://www.prestashop.com/',
+        priority: 1
+    },
+    'Prostores': {
+        icon: 'prostores.ico',
+        url: 'http://www.prostores.com',
+        priority: 1
+    },
+    'ZenCart': {
+        icon: 'zencart.ico',
+        url: 'http://www.zen-cart.com',
+        priority: 1
+    },
+    'ErainCart': {
+        icon: 'eraincart.ico',
+        url: 'http://eraincart.com',
+        priority: 1
+    },
+    'Volusion': {
+        icon: 'volusion.ico',
+        url: 'http://www.volusion.com',
+        priority: 1
+    },
+    'osCommerce': {
+        icon: 'osCommerce.ico',
+        url: 'http://www.oscommerce.com',
+        priority: 1
+    },
+    'OpenCart': {
+        icon: 'opencart.png',
+        url: 'http://www.opencart.com',
+        priority: 1
+    },
+
+    'Moodle': {
+        icon: 'moodle.png',
+        url: 'http://moodle.org',
+        priority: 1
+    },
+    'SugarCRM': {
+        icon: 'sugarcrm.ico',
+        url: 'http://www.sugarcrm.com',
+        priority: 1
+    },
+    'PivotX': {
+        icon: 'pivotx.ico',
+        url: 'http://pivotx.net',
+        priority: 1
+    },
+
+    'Shibboleth': {
+        icon: 'shibboleth.png',
+        url: 'http://shibboleth.internet2.edu/',
+        priority: 1
+    },
+    'Alfresco': {
+        icon: 'Alfresco.png',
+        url: 'http://www.alfresco.com',
+        priority: 1
+    },
+
+    'ClanSphere': {
+        icon: 'ClanSphere.png',
+        url: 'http://csphere.eu',
+        priority: 1
+    },
+
+    // ==== js framework ====
+    'Highcharts': {
+        icon: 'highcharts.png',
+        url: 'http://www.highcharts.com',
+        priority: 2
+    },
+    'Zepto.js': {
+        icon: 'zepto.png',
+        url: 'http://zeptojs.com',
+        priority: 2
+    },
+    'jQuery': {
+        icon: 'jQuery.ico',
+        url: 'http://jquery.com',
+        priority: 2
+    },
+    'jQuery UI': {
+        icon: 'jQuery_UI.ico',
+        url: 'http://jqueryui.com/',
+        priority: 1.9
+    },
+    'ExtJS': {
+        icon: 'ExtJS.ico',
+        url: 'http://www.extjs.com/',
+        priority: 2
+    },
+    'Prototype': {
+        icon: 'Prototype.ico',
+        url: 'http://www.prototypejs.org/',
+        priority: 2
+    },
+    'Closure': {
+        icon: 'Closure.png',
+        url: 'http://code.google.com/closure/',
+        priority: 2
+    },
+    'MooTools': {
+        icon: 'MooTools.ico',
+        url: 'http://mootools.net/',
+        priority: 2
+    },
+    'Dojo': {
+        icon: 'dojo.ico',
+        url: 'http://www.dojotoolkit.org/',
+        priority: 2
+    },
+    'script.aculo.us': {
+        icon: 'script.aculo.us.ico',
+        url: 'http://script.aculo.us/',
+        priority: 1.9
+    },
+    'YUI': {
+        icon: 'YUI.ico',
+        url: 'http://developer.yahoo.com/yui/2/',
+        priority: 2
+    },
+    'YUI 3': {
+        icon: 'yui3.png',
+        url: 'http://yuilibrary.com',
+        priority: 2
+    },
+    'Cappuccino': {
+        icon: 'cappuccino.png',
+        url: 'http://cappuccino.org/',
+        priority: 2
+    },
+    'RightJS': {
+        icon: 'rightjs.png',
+        url: 'http://RightJS.org/',
+        priority: 2
+    },
+    'Spine': {
+        icon: 'spine.ico',
+        url: 'http://spinejs.com',
+        priority: 1.9
+    },
+    'Angular': {
+        icon: 'angular.ico',
+        url: 'http://angularjs.org/',
+        priority: 1.5
+    },
+    'D3': {
+        icon: 'D3.svg',
+        url: 'http://d3js.org/',
+        priority: 2
+    },
+
+    // ==== js tools ====
+    'Raphael': {
+        icon: 'raphael.ico',
+        url: 'http://raphaeljs.com/',
+        priority: 2.9
+    },
+    'Typekit': {
+        icon: 'typekit.ico',
+        url: 'http://typekit.com/',
+        priority: 2.9
+    },
+    'Cufon': {
+        icon: 'cufon.ico',
+        url: 'http://cufon.shoqolate.com/',
+        priority: 2.9
+    },
+    'sIFR': {
+        icon: 'sifr.gif',
+        url: 'http://www.mikeindustries.com/blog/sifr/',
+        priority: 2.9
+    },
+    'Modernizr': {
+        icon: 'modernizr.ico',
+        url: 'http://www.modernizr.com/',
+        priority: 2.9
+    },
+    'Facebook': {
+        title: 'Facebook Social plugins',
+        icon: 'facebook.ico',
+        url: 'http://developers.facebook.com/',
+        priority: 2.9
+    },
+    'Twitter': {
+        title: 'Twitter plugins',
+        icon: 'twitter.ico',
+        url: 'http://dev.twitter.com',
+        priority: 2.9
+    },
+    'Buzz': {
+        title: 'Google Buzz Button',
+        icon: 'buzz.png',
+        url: 'http://www.google.com/buzz/stuff',
+        priority: 2.9
+    },
+    'Plus1': {
+        title: 'Google Plus 1',
+        icon: 'plus1.png',
+        url: 'http://www.google.com/+1/button/',
+        priority: 2.9
+    },
+    'AddThis': {
+        icon: 'addthis.ico',
+        url: 'http://www.addthis.com',
+        priority: 2.9
+    },
+    'Backbone.js': {
+        icon: 'Backbone.png',
+        url: 'http://documentcloud.github.com/backbone/',
+        priority: 1.9
+    },
+    'Underscore.js': {
+        icon: 'Underscore.png',
+        url: 'http://documentcloud.github.com/underscore/',
+        priority: 2.9
+    },
+
+    'Head JS': {
+        icon: 'headjs.gif',
+        url: 'http://headjs.com',
+        priority: 2.9
+    },
+    'Google Loader': {
+        icon: 'google.ico',
+        url: 'http://code.google.com/apis/loader',
+        priority: 2.9
+    },
+
+    'Woopra': {
+        icon: 'woopra.ico',
+        url: 'http://www.woopra.com',
+        priority: 3
+    },
+    'OpenWebAnalytics': {
+        icon: 'owa.ico',
+        url: 'http://www.openwebanalytics.com',
+        priority: 3
+    },
+    'Google Analytics': {
+        icon: 'Google_Analytics.ico',
+        url: 'https://www.google.com/analytics/?hl=zh-CN',
+        priority: 3
+    },
+    'SiteCatalyst': {
+        icon: 'SiteCatalyst.ico',
+        url: 'http://www.omniture.com',
+        priority: 3
+    },
+    'Coremetrics': {
+        icon: 'coremetrics.ico',
+        url: 'http://www.coremetrics.com',
+        priority: 3
+    },
+    'Quantcast': {
+        icon: 'Quantcast.ico',
+        url: 'http://www.quantcast.com/',
+        priority: 3
+    },
+    'Xiti': {
+        title: 'Xiti Tracker',
+        icon: 'xiti.ico',
+        url: 'http://xiti.com/',
+        priority: 3
+    },
+    'Piwik': {
+        icon: 'Piwik.ico',
+        url: 'http://piwik.org/',
+        priority: 3
+    },
+    'Clicky': {
+        icon: 'clicky.ico',
+        url: 'http://getclicky.com/',
+        priority: 3
+    },
+
+    'Disqus': {
+        icon: 'Disqus.ico',
+        url: 'http://disqus.com/',
+        priority: 1
+    },
+    'GetSatisfaction': {
+        icon: 'GetSatisfaction.gif',
+        url: 'http://getsatisfaction.com',
+        priority: 3
+    },
+    'Wibiya': {
+        icon: 'Wibiya.ico',
+        url: 'http://wibiya.com/',
+        priority: 3
+    },
+    'Prettify': {
+        title: 'Google Code Prettify',
+        icon: 'google.ico',
+        url: 'http://code.google.com/p/google-code-prettify/',
+        priority: 3
+    },
+    'reCaptcha': {
+        icon: 'reCaptcha.ico',
+        url: 'http://recaptcha.net/',
+        priority: 4
+    },
+    'Mollom': {
+        icon: 'mollom.ico',
+        url: 'http://mollom.com',
+        priority: 4
+    },
+    'GoogleFontApi': {
+        title: 'Google Font API',
+        icon: 'google-font-api.gif',
+        url: 'http://code.google.com/apis/webfonts/',
+        priority: 4
+    },
+    'GoogleMapApi': {
+        title: 'Google Map API',
+        icon: 'gmap.png',
+        url: 'http://code.google.com/apis/maps/',
+        priority: 4
+    },
+    'SWFObject': {
+        icon: 'SWFObject.ico',
+        url: 'http://code.google.com/p/swfobject/',
+        priority: 4
+    },
+
+    'OpenX': {
+        icon: 'OpenX.ico',
+        url: 'http://openx.org',
+        priority: 5
+    },
+    'AdSense': {
+        icon: 'AdSense.gif',
+        url: 'https://www.google.com/adsense',
+        priority: 5
+    },
+    'Chitika': {
+        icon: 'chitika.ico',
+        url: 'http://chitika.com/',
+        priority: 5
+    },
+    'BuySellAds': {
+        icon: 'buysellads.ico',
+        url: 'http://buysellads.com/',
+        priority: 5
+    },
+    'HumansTxt': {
+        icon: 'humanstxt.ico',
+        url: 'http://humanstxt.org/',
+        priority: 5
+    },
+    'Bootstrap': {
+        icon: 'bootstrap.ico',
+        url: 'http://twitter.github.com/bootstrap/',
+        priority: 5
+    },
+    'Ning': {
+        icon: 'ning.ico',
+        url: 'http://www.ning.com/',
+        priority: 1
+    },
+    'ektron': {
+        icon: 'ektron.ico',
+        url: 'http://www.ektron.com/',
+        priority: 1
+    },
+    'Mura CMS': {
+        title: 'Mura CMS',
+        icon: 'muracms.ico',
+        url: 'http://www.getmura.com/',
+        priority: 1
+    },
+    'Tiki Wiki CMS Groupware': {
+        title: 'Tiki Wiki CMS Groupware',
+        icon: 'TikiWikiCms.ico',
+        url: 'http://info.tiki.org/',
+        priority: 1
+    },
+    'etracker': {
+        title: 'etracker',
+        icon: 'etracker.ico',
+        url: 'http://etracker.com/',
+        priority: 1.2
+    },
+    'OpenTag': {
+        icon: 'OpenTag.ico',
+        url: 'http://opentag.qubitproducts.com',
+        priority: 1.2
+    },
+    'SPDY': {
+        icon: 'spdy.ico',
+        url: 'http://www.chromium.org/spdy',
+        priority: 5
+    },
+    'KISSmetrics': {
+        icon: 'kissmetrics.ico',
+        url: 'http://kissmetrics.com/',
+        priority: 1
+    },
+    'LiveStreet': {
+        icon: 'LiveStreetCms.ico',
+        url: 'http://livestreetcms.com/',
+        priority: 1
+    },
+    'PHP': {
+        icon: 'php.ico',
+        url: 'http://php.net/',
+        priority: 1.5
+    },
+    'Java': {
+        icon: 'java.ico',
+        url: 'http://www.java.com',
+        priority: 1.5
+    },
+    'Tengine': {
+        icon: 'tengine.ico',
+        url: 'http://tengine.taobao.org',
+        priority: 1.5
+    },
+    'Apache': {
+        icon: 'apache.ico',
+        url: 'http://httpd.apache.org/',
+        priority: 1.5
+    },
+    'Tomcat': {
+        icon: 'tomcat.ico',
+        url: 'http://tomcat.apache.org/',
+        priority: 1.5
+    },
+    'Domino': {
+        icon: 'domino.ico',
+        url: 'http://www.ibm.com/software/lotus/products/domino/',
+        priority: 1.5
+    },
+    'Play': {
+        icon: 'play.ico',
+        url: 'https://www.playframework.com/',
+        priority: 1
+    },
+    'nginx': {
+        icon: 'nginx.ico',
+        url: 'http://nginx.org/en/',
+        priority: 1.5
+    },
+    'GitHub': {
+        icon: 'github.ico',
+        url: 'https://github.com',
+        priority: 1.5
+    },
+    'Varnish': {
+        icon: 'varnish.ico',
+        url: 'https://www.varnish-cache.org/',
+        priority: 1.5
+    },
+    'IIS': {
+        icon: 'iis.ico',
+        url: 'http://www.iis.net/',
+        priority: 1.5
+    },
+    'ASP.NET': {
+        icon: 'asp.net.ico',
+        url: 'http://www.asp.net/',
+        priority: 1.5
+    },
+    'Nette': {
+        icon: 'nette.ico',
+        url: 'http://nette.org/',
+        priority: 1.5
+    },
+
+    // ==== misc ====
+    '': { // default
+        icon: 'unknown.jpg',
+        url: 'http://google.com/search?q=%s'
+    }
+};
\ No newline at end of file
diff --git a/js/background.js b/js/background.js
index bc23a03..79ca60e 100644
--- a/js/background.js
+++ b/js/background.js
@@ -7,129 +7,127 @@
  * To change this template use File | Settings | File Templates.
  */
 
-window.dd = function(msg)
-{
-  console.log(msg);
+window.dd = function(msg) {
+    console.log(msg);
 };
 
 var tabinfo = {};
 
 // initial list of header detection.  will move this to a separate file later.
 var knownHeaders = {
-  'x-powered-by': {
-    // 'Ruby on Rails': /Phusion Passenger/,
-    'Express.js': /Express/,
-    'PHP': /PHP\/?(.*)/,
-    'ASP.NET': /ASP\.NET/,
-    'Nette': /Nette Framework/
-  },
-  'server': {    
-    'Tengine': /Tengine(.*)/,
-    'Apache': /Apache[^-]\/?(.*)/,
-    'Tomcat': /Apache-Coyote\/?.*/,
-    'GitHub': /GitHub.com/,
-    'Domino': /Lotus-Domino/,
-    'Play': /Play\/?(.*)/,
-    'nginx': /nginx\/?(.*)/,
-    'IIS': /Microsoft-IIS\/?(.*)/
-  },
-  'via': {
-    'Varnish': /(.*) varnish/
-  }
+    'x-powered-by': {
+        // 'Ruby on Rails': /Phusion Passenger/,
+        'Express.js': /Express/,
+        'PHP': /PHP\/?(.*)/,
+        'ASP.NET': /ASP\.NET/,
+        'Nette': /Nette Framework/
+    },
+    'server': {
+        'Tengine': /Tengine(.*)/,
+        'Apache': /Apache[^-]\/?(.*)/,
+        'Tomcat': /Apache-Coyote\/?.*/,
+        'GitHub': /GitHub.com/,
+        'Domino': /Lotus-Domino/,
+        'Play': /Play\/?(.*)/,
+        'nginx': /nginx\/?(.*)/,
+        'IIS': /Microsoft-IIS\/?(.*)/
+    },
+    'via': {
+        'Varnish': /(.*) varnish/
+    }
 };
 
 // Scans through the headers finding matches, and returning the val from appinfo (apps.js)
-var headerDetector = function (headers) {
-  var appsFound = [];
-
-  // loop through all the headers received
-  for (var i = headers.length - 1; i >= 0; i--) {
-    var apps = knownHeaders[headers[i].name.toLowerCase()];
-    if (!apps) {
-      continue;
-    }
-    for (var app in apps) {
-      var matches = headers[i].value.match(apps[app]);
-      if (matches) {
-        var version = matches[1] || -1;
-        appsFound[app] = version;
-      }
+var headerDetector = function(headers) {
+    var appsFound = [];
+
+    // loop through all the headers received
+    for (var i = headers.length - 1; i >= 0; i--) {
+        var apps = knownHeaders[headers[i].name.toLowerCase()];
+        if (!apps) {
+            continue;
+        }
+        for (var app in apps) {
+            var matches = headers[i].value.match(apps[app]);
+            if (matches) {
+                var version = matches[1] || -1;
+                appsFound[app] = version;
+            }
+        }
     }
-  }
 
-  return appsFound;
+    return appsFound;
 };
 
 // collect apps from header information:
-chrome.webRequest.onHeadersReceived.addListener(
-  function (details) {
+chrome.webRequest.onHeadersReceived.addListener(function(details) {
     var appsFound = headerDetector(details.responseHeaders);
     tabinfo[details.tabId] = tabinfo[details.tabId] || {};
     tabinfo[details.tabId]['headers'] = appsFound;
-  },
-  {
+},
+{
     urls: ['<all_urls>'],
     types: ['main_frame']
-  },
-  ['responseHeaders']
-);
-
+},
+['responseHeaders']);
 
-chrome.tabs.onRemoved.addListener(function (tabId) {
-  // free memory
-  delete tabinfo[tabId];
+chrome.tabs.onRemoved.addListener(function(tabId) {
+    // free memory
+    delete tabinfo[tabId];
 });
 
-chrome.extension.onMessage.addListener(function (request, sender, sendResponse) {
-  // 'result' event issued by main.js once app identification is complete
-  if (request.msg == 'result') {
-    var thisTab = tabinfo[sender.tab.id];
-    thisTab['apps'] = request.apps;
-
-    // load in any apps we discovered from headers:
-    for (var header in thisTab['headers']) {
-      thisTab['apps'][header] = thisTab['headers'][header];
-    }
-
-    // change the tab icon
-    var mainApp = null;
+chrome.extension.onMessage.addListener(function(request, sender, sendResponse) {
+    // 'result' event issued by main.js once app identification is complete
+    if (request.msg == 'result') {
+        var thisTab = tabinfo[sender.tab.id];
+        thisTab['apps'] = request.apps;
 
-    for (var app in request.apps) {
-      if (mainApp === null) {
-        mainApp = app;
-        continue;
-      }
-
-      if (appinfo[app].priority) {
-        if (!appinfo[mainApp].priority) {
-          mainApp = app;
-        }
-        else if (appinfo[mainApp].priority > appinfo[app].priority) {
-          mainApp = app;
+        // load in any apps we discovered from headers:
+        for (var header in thisTab['headers']) {
+            thisTab['apps'][header] = thisTab['headers'][header];
         }
-      }
-    }
 
-    var mainAppInfo = appinfo[mainApp];
-    if (mainAppInfo) { // lazy bug
-      var appTitle = mainAppInfo.title ? mainAppInfo.title : mainApp;
+        // change the tab icon
+        var mainApp = null;
+
+        for (var app in request.apps) {
+            if (mainApp === null) {
+                mainApp = app;
+                continue;
+            }
+
+            if (appinfo[app].priority) {
+                if (!appinfo[mainApp].priority) {
+                    mainApp = app;
+                } else if (appinfo[mainApp].priority > appinfo[app].priority) {
+                    mainApp = app;
+                }
+            }
+        }
 
-      if (request.apps[mainApp] != "-1") {
-        appTitle = mainApp + ' ' + request.apps[mainApp];
-      }
+        var mainAppInfo = appinfo[mainApp];
+        if (mainAppInfo) { // lazy bug
+            var appTitle = mainAppInfo.title ? mainAppInfo.title: mainApp;
+
+            if (request.apps[mainApp] != "-1") {
+                appTitle = mainApp + ' ' + request.apps[mainApp];
+            }
+
+            chrome.pageAction.setIcon({
+                tabId: sender.tab.id,
+                path: 'apps/' + mainAppInfo.icon
+            });
+            chrome.pageAction.setTitle({
+                tabId: sender.tab.id,
+                title: appTitle
+            });
+        }
 
-      chrome.pageAction.setIcon({tabId: sender.tab.id, path: 'apps/' + mainAppInfo.icon});
-      chrome.pageAction.setTitle({tabId: sender.tab.id, title: appTitle});
+        chrome.pageAction.show(sender.tab.id);
+        sendResponse({});
+    } else if (request.msg == 'get') {
+        // Request for 'get' comes from the popup page, asking for the list of apps
+        var apps = tabinfo[request.tab];
+        sendResponse(apps);
     }
-
-    chrome.pageAction.show(sender.tab.id);
-    sendResponse({});
-  }
-  else if (request.msg == 'get') {
-    // Request for 'get' comes from the popup page, asking for the list of apps
-    var apps = tabinfo[request.tab];
-    sendResponse(apps);
-  }
-});
-
-
+});
\ No newline at end of file
diff --git a/js/detector.js b/js/detector.js
index f934ba4..106b715 100644
--- a/js/detector.js
+++ b/js/detector.js
@@ -8,519 +8,508 @@
  * @author justjavac <justjavac@gmail.com>
  * @license GPLv3
  **/
- 
-(function () {
-	var _apps = {};
-	var doc = document.documentElement;
-	var name;
-  	var r;
 
-	// 1: detect by meta tags, the first matching group will be version
-	// 根据 meta 信息判断
-	var metas = doc.getElementsByTagName("meta");
-	var meta_tests = {
-		'generator': {
-			'Joomla': /joomla!?\s*([\d\.]+)?/i,
-			'vBulletin': /vBulletin\s*(.*)/i,
-			'WordPress': /WordPress\s*(.*)/i,
-			'XOOPS': /xoops/i,
-			'Plone': /plone/i,
-			'MediaWiki': /MediaWiki/i,
-			'CMSMadeSimple': /CMS Made Simple/i,
-			'SilverStripe': /SilverStripe/i,
-			'Movable Type': /Movable Type/i,
-			'Amiro.CMS': /Amiro/i,
-			'Koobi': /koobi/i,
-			'bbPress': /bbPress/i,
-			'DokuWiki': /dokuWiki/i,
-			'TYPO3': /TYPO3/i,
-			'PHP-Nuke': /PHP-Nuke/i,
-			'DotNetNuke': /DotNetNuke/i,
-			'Sitefinity': /Sitefinity\s+(.*)/i,
-			'WebGUI': /WebGUI/i,
-			'ez Publish': /eZ\s*Publish/i,
-			'BIGACE': /BIGACE/i,
-			'TypePad': /typepad\.com/i,
-			'Blogger': /blogger/i,
-			'PrestaShop': /PrestaShop/i,
-			'SharePoint': /SharePoint/,
-			'JaliosJCMS': /Jalios JCMS/i,
-			'ZenCart': /zen-cart/i,
-			'WPML': /WPML/i,
-			'PivotX': /PivotX/i,
-			'OpenACS': /OpenACS/i,
-			'AlphaCMS': /alphacms\s+(.*)/i,
-			'concrete5': /concrete5 -\s*(.*)$/,
-			'Webnode': /Webnode/,
-			'GetSimple': /GetSimple/,
-			'DataLifeEngine': /DataLife Engine/,
-			'ClanSphere': /ClanSphere/,
-		    'Mura CMS': /Mura CMS\s*(.*)/i,
-		    'Tiki Wiki CMS Groupware': /Tiki/i
-		},
-		'copyright': {
-			'phpBB': /phpBB/i
-		},
-		'elggrelease': {
-			'Elgg': /.+/
-		},
-		'powered-by': {
-      		'Serendipity': /Serendipity/i
-		},
-		'author': {
-			'Avactis': /Avactis Team/i
-		}
-	};
+(function() {
+    var _apps = {};
+    var doc = document.documentElement;
+    var name;
+    var r;
 
-  for (var idx in metas) {
-		var m = metas[idx];
-    	name = m.name ? m.name.toLowerCase() : "";
+    // 1: detect by meta tags, the first matching group will be version
+    // 根据 meta 信息判断
+    var metas = doc.getElementsByTagName("meta");
+    var meta_tests = {
+        'generator': {
+            'Joomla': /joomla!?\s*([\d\.]+)?/i,
+            'vBulletin': /vBulletin\s*(.*)/i,
+            'WordPress': /WordPress\s*(.*)/i,
+            'XOOPS': /xoops/i,
+            'Plone': /plone/i,
+            'MediaWiki': /MediaWiki/i,
+            'CMSMadeSimple': /CMS Made Simple/i,
+            'SilverStripe': /SilverStripe/i,
+            'Movable Type': /Movable Type/i,
+            'Amiro.CMS': /Amiro/i,
+            'Koobi': /koobi/i,
+            'bbPress': /bbPress/i,
+            'DokuWiki': /dokuWiki/i,
+            'TYPO3': /TYPO3/i,
+            'PHP-Nuke': /PHP-Nuke/i,
+            'DotNetNuke': /DotNetNuke/i,
+            'Sitefinity': /Sitefinity\s+(.*)/i,
+            'WebGUI': /WebGUI/i,
+            'ez Publish': /eZ\s*Publish/i,
+            'BIGACE': /BIGACE/i,
+            'TypePad': /typepad\.com/i,
+            'Blogger': /blogger/i,
+            'PrestaShop': /PrestaShop/i,
+            'SharePoint': /SharePoint/,
+            'JaliosJCMS': /Jalios JCMS/i,
+            'ZenCart': /zen-cart/i,
+            'WPML': /WPML/i,
+            'PivotX': /PivotX/i,
+            'OpenACS': /OpenACS/i,
+            'AlphaCMS': /alphacms\s+(.*)/i,
+            'concrete5': /concrete5 -\s*(.*)$/,
+            'Webnode': /Webnode/,
+            'GetSimple': /GetSimple/,
+            'DataLifeEngine': /DataLife Engine/,
+            'ClanSphere': /ClanSphere/,
+            'Mura CMS': /Mura CMS\s*(.*)/i,
+            'Tiki Wiki CMS Groupware': /Tiki/i
+        },
+        'copyright': {
+            'phpBB': /phpBB/i
+        },
+        'elggrelease': {
+            'Elgg': /.+/
+        },
+        'powered-by': {
+            'Serendipity': /Serendipity/i
+        },
+        'author': {
+            'Avactis': /Avactis Team/i
+        }
+    };
+
+    for (var idx in metas) {
+        var m = metas[idx];
+        name = m.name ? m.name.toLowerCase() : "";
+
+        if (!meta_tests[name]) continue;
 
-		if (!meta_tests[name]) continue;
-		
-    for (var t in meta_tests[name]) {
-			if (t in _apps) continue;
-			
-      r = meta_tests[name][t].exec(m.content);
-      if (r) {
-        _apps[t] = r[1] ? r[1] : -1;
-			}
-		}
-	}
+        for (var t in meta_tests[name]) {
+            if (t in _apps) continue;
 
-	// 2: detect by script tags
-	// 根据 script 标签判断
-	var scripts = doc.getElementsByTagName("script");
-	
-	var script_tests = {
-		'\u767e\u5ea6\u7edf\u8ba1': /hm\.baidu\.com\/hm?\.js/i,	// 百度统计
-		'cnzz': /(w|s\d+)\.cnzz\.com\/(c|stat)\.php/i,
-		'bShare':  /static\.bshare\.cn\/b/,
-		'\u767e\u5ea6\u5206\u4eab': /bdimg\.share\.baidu\.com\/static\/js\//,	// 百度分享
-		'\u591a\u8bf4': /static\.duoshuo\.com\/embed\.js/,	// 多说
-		'\u53cb\u8350': /v\d\.ujian\.cc\/code\/ujian\.js/,	// 友荐 
-		'\u53cb\u8a00': /v\d\.uyan\.cc\/(code\/uyan\.js|js\/iframe\.js)/,	// 友言
-		'JiaThis': /v\d\.jiathis\.com\/code(_mini)?\/(jiathis|jia)/,
-		'\u65e0\u89c5': /widget\.wumii\.(cn|com)\/ext\/relatedItemsWidget/,		// 无觅相关文章插件
-		'segmentfault': /w\.segmentfault\.com\/card\/\d+\.js/i,		
+            r = meta_tests[name][t].exec(m.content);
+            if (r) {
+                _apps[t] = r[1] ? r[1] : -1;
+            }
+        }
+    }
 
-		'Google Analytics': /google-analytics\.com\/(ga|urchin|analytics).js/i,
-		'Quantcast': /quantserve\.com\/quant\.js/i,
-		'Prototype': /prototype\.js/i,
-		'Joomla': /\/components\/com_/,
-		'Ubercart': /uc_cart/i,
-		'Closure': /\/goog\/base\.js/i,
-		'MODx': /\/min\/b=.*f=.*/,
-		'MooTools': /mootools/i,
-		'Dojo': /dojo(\.xd)?\.js/i,
-		'script.aculo.us': /scriptaculous\.js/i,
-    	'Disqus': /disqus.com/i,
-		'GetSatisfaction': /getsatisfaction\.com\/feedback/i,
-		'Wibiya': /wibiya\.com\/Loaders\//i,
-		'reCaptcha': /(google\.com\/recaptcha|api\.recaptcha\.net\/)/i,
-		'Mollom': /mollom\/mollom\.js/i, // only work on Drupal now
-		'ZenPhoto': /zp-core\/js/i,
-		'Gallery2': /main\.php\?.*g2_.*/i,
-		'AdSense': /pagead\/show_ads\.js/,
-		'XenForo': /js\/xenforo\//i,
-		'Cappuccino': /Frameworks\/Objective-J\/Objective-J\.js/,
-		'Avactis': /\/avactis-themes\//i,
-		'Volusion': /a\/j\/javascripts\.js/,
-		'AddThis': /addthis\.com\/js/,
-		
-		'BuySellAds': /buysellads.com\/.*bsa\.js/,
-		'Weebly': /weebly\.com\/weebly\//,
-		'Bootstrap': /bootstrap(-.*)?\.js/,
-		'Jigsy': /javascripts\/asterion\.js/, // may change later
-		'Yola': /analytics\.yola\.net/, // may change later
-	    'Alfresco': /(alfresco)+(-min)?(\/scripts\/menu)?\.js/, // both Alfresco Share and Explorer apps
-	    'Mura CMS': /mura\/js/,
-	    'Tiki Wiki CMS Groupware': /tiki-js/,
-	    'OpenTag': /opentag.*\.js/,
-	    'KISSmetrics': /i.kissmetrics.com\/i.js/
-	};
+    // 2: detect by script tags
+    // 根据 script 标签判断
+    var scripts = doc.getElementsByTagName("script");
 
-  for (var idx in scripts) {
-		var s = scripts[idx];
-		if (!s.src) continue;
-		s = s.src;
+    var script_tests = {
+        '\u767e\u5ea6\u7edf\u8ba1': /hm\.baidu\.com\/hm?\.js/i,
+        // 百度统计
+        'cnzz': /(w|s\d+)\.cnzz\.com\/(c|stat)\.php/i,
+        'bShare': /static\.bshare\.cn\/b/,
+        '\u767e\u5ea6\u5206\u4eab': /bdimg\.share\.baidu\.com\/static\/js\//,
+        // 百度分享
+        '\u591a\u8bf4': /static\.duoshuo\.com\/embed\.js/,
+        // 多说
+        '\u53cb\u8350': /v\d\.ujian\.cc\/code\/ujian\.js/,
+        // 友荐 
+        '\u53cb\u8a00': /v\d\.uyan\.cc\/(code\/uyan\.js|js\/iframe\.js)/,
+        // 友言
+        'JiaThis': /v\d\.jiathis\.com\/code(_mini)?\/(jiathis|jia)/,
+        '\u65e0\u89c5': /widget\.wumii\.(cn|com)\/ext\/relatedItemsWidget/,
+        // 无觅相关文章插件
+        'segmentfault': /w\.segmentfault\.com\/card\/\d+\.js/i,
 
-    for (var t in script_tests) {
-			if (t in _apps) continue;
-      if (script_tests[t].test(s)) {
-				_apps[t] = -1;
-			}
-		}
-	}
+        'Google Analytics': /google-analytics\.com\/(ga|urchin|analytics).js/i,
+        'Quantcast': /quantserve\.com\/quant\.js/i,
+        'Prototype': /prototype\.js/i,
+        'Joomla': /\/components\/com_/,
+        'Ubercart': /uc_cart/i,
+        'Closure': /\/goog\/base\.js/i,
+        'MODx': /\/min\/b=.*f=.*/,
+        'MooTools': /mootools/i,
+        'Dojo': /dojo(\.xd)?\.js/i,
+        'script.aculo.us': /scriptaculous\.js/i,
+        'Disqus': /disqus.com/i,
+        'GetSatisfaction': /getsatisfaction\.com\/feedback/i,
+        'Wibiya': /wibiya\.com\/Loaders\//i,
+        'reCaptcha': /(google\.com\/recaptcha|api\.recaptcha\.net\/)/i,
+        'Mollom': /mollom\/mollom\.js/i,
+        // only work on Drupal now
+        'ZenPhoto': /zp-core\/js/i,
+        'Gallery2': /main\.php\?.*g2_.*/i,
+        'AdSense': /pagead\/show_ads\.js/,
+        'XenForo': /js\/xenforo\//i,
+        'Cappuccino': /Frameworks\/Objective-J\/Objective-J\.js/,
+        'Avactis': /\/avactis-themes\//i,
+        'Volusion': /a\/j\/javascripts\.js/,
+        'AddThis': /addthis\.com\/js/,
 
-	// 3: detect by domains
-	// 根据 domain 信息判断
+        'BuySellAds': /buysellads.com\/.*bsa\.js/,
+        'Weebly': /weebly\.com\/weebly\//,
+        'Bootstrap': /bootstrap(-.*)?\.js/,
+        'Jigsy': /javascripts\/asterion\.js/,
+        // may change later
+        'Yola': /analytics\.yola\.net/,
+        // may change later
+        'Alfresco': /(alfresco)+(-min)?(\/scripts\/menu)?\.js/,
+        // both Alfresco Share and Explorer apps
+        'Mura CMS': /mura\/js/,
+        'Tiki Wiki CMS Groupware': /tiki-js/,
+        'OpenTag': /opentag.*\.js/,
+        'KISSmetrics': /i.kissmetrics.com\/i.js/
+    };
 
-	// 4: detect by regexp
-	// 用正则表达式判断
-	var text = document.documentElement.outerHTML;
-	var text_tests = {
-		'SMF': /<script .+\s+var smf_/i,
-		'Magento': /var BLANK_URL = '[^>]+js\/blank\.html'/i,
-		'Tumblr': /<iframe src=("|')http:\/\/\S+\.tumblr\.com/i,
-		'WordPress': /<link rel=("|')stylesheet("|') [^>]+wp-content/i,
-		'Closure': /<script[^>]*>.*goog\.require/i,
-		'Liferay': /<script[^>]*>.*LifeRay\.currentURL/i,
-		'vBulletin': /vbmenu_control/i,
-		'MODx': /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i,
-		'miniBB': /<a href=("|')[^>]+minibb.+\s*<!--End of copyright link/i,
-		'PHP-Fusion': /(href|src)=["']?infusions\//i, // @todo: recheck this pattern again
-		'OpenX': /(href|src)=["'].*delivery\/(afr|ajs|avw|ck)\.php[^"']*/,
-		'GetSatisfaction': /asset_host\s*\+\s*"javascripts\/feedback.*\.js/igm, // better recognization
-		'Fatwire': /\/Satellite\?|\/ContentServer\?/,
-		'Contao': /powered by (TYPOlight|Contao)/i,
-		'Moodle' : /<link[^>]*\/theme\/standard\/styles.php".*>|<link[^>]*\/theme\/styles.php\?theme=.*".*>/,
-		'1c-bitrix' : /<link[^>]*\/bitrix\/.*?>/i,
-		'OpenCMS' : /<link[^>]*\.opencms\..*?>/i,
-    	'HumansTxt': /<link[^>]*rel=['"]?author['"]?/i,
-		'GoogleFontApi': /ref=["']?http:\/\/fonts.googleapis.com\//i,
-		'Prostores' : /-legacycss\/Asset">/,
-		'osCommerce': /(product_info\.php\?products_id|_eof \/\/-->)/,
-		'OpenCart': /index.php\?route=product\/product/,
-		'\u4e03\u725b\u4e91\u5b58\u50a8\u52a0\u901f': /<(link|script|img)[^>]+(qiniudn\.com|qbox\.me|clouddn\.com|qiniu\.com)[^>]+>/i,	// 七牛云存储加速
-		'Shibboleth': /<form action="\/idp\/Authn\/UserPassword" method="post">/
-	};
+    for (var idx in scripts) {
+        var s = scripts[idx];
+        if (!s.src) continue;
+        s = s.src;
 
-  for (var t in text_tests) {
-		if (t in _apps) continue;
-    if (text_tests[t].test(text)) {
-			_apps[t] = -1;
-		}
-	}
-	
-	// TODO: merge inline detector with version detector
-	
-	// 5: detect by inline javascript
-	// 根据 inline javascript 判断
-	var js_tests = {		
-		'Highcharts': function() {
-			return window.Highcharts;
-		},
-		'Zepto.js': function() {
-			return window.Zepto && window.Zepto.fn;
-		},
-		'CodeIgniter': function() {
-			return document.cookie.indexOf("cisession") != -1;
-		},
-		'Java': function() {
-			return document.cookie.indexOf("JSESSIONID") != -1;
-		},
-		'Domino': function() {
-			return document.cookie.indexOf("LtpaToken") != -1||document.cookie.indexOf("DomAuthSessId") != -1;
-		},
-		'Drupal': function() {
-      		return window.Drupal;
-		},
-		'TomatoCMS': function() {
-      		return window.Tomato;
-		},
-		'MojoMotor': function() {
-      		return window.Mojo;
-		},
-		'ErainCart': function() {
-      		return window.fn_register_hooks;
-		},
-		'SugarCRM': function() {
-      		return window.SUGAR;
-		},
-		'YUI': function() {
-      		return window.YAHOO;
-		},
-		'YUI 3': function() {
-      		return window.YUI;
-		},
-		'jQuery': function() {
-      		return window.jQuery;
-		},
-		'jQuery UI': function() {
-      		return window.jQuery && window.jQuery.ui;
-		},
-		'Typekit': function() {
-      		return window.Typekit;
-		},
-		'Facebook': function() {
-      		return window.FB && window.FB.api;
-		},
-		'ExtJS': function() {
-      		return window.Ext;
-		},
-		'Modernizr': function() {
-      		return window.Modernizr;
-		},
-		'Raphael': function() {
-      		return window.Raphael;
-		},
-		'Cufon': function() {
-      		return window.Cufon;
-		},
-		'sIFR': function() {
-      		return window.sIFR;
-		},
-		'Xiti': function() {
-      		return window.xtsite && window.xtpage;
-		},
-		'Piwik': function() {
-      		return window.Piwik;
-		},
-		'IPB': function() {
-      		return window.IPBoard;
-		},
-		'MyBB': function() {
-      		return window.MyBB;
-		},
-		'Clicky': function() {
-      		return window.clicky;
-		},
-		'Woopra': function() {
-      		return window.woopraTracker;
-		},
-		'RightJS': function() {		
-      		return window.RightJS;
-		},
-		'OpenWebAnalytics': function() {
-      		return window.owa_baseUrl;
-		},
-		'Prettify': function() {
-      		return window.prettyPrint;
-		},
-		'SiteCatalyst': function() {
-      		return window.s_account;
-		},
-		'Twitter': function() {
-      		return window.twttr;
-		},
-		'Coremetrics': function() {
-      		return window.cmCreatePageviewTag;
-		},
-		'Buzz': function() {
-      		return window.google_buzz__base_url;
-		},
-		'Plus1': function() {
-			return window.gapi && window.gapi.plusone;
-		},
-		'Google Loader': function() {
-      		return window.google && window.google.load;
-		},
-		'GoogleMapApi': function() {
-      		return window.google && window.google.maps;
-		},
-		'Head JS': function() {
-      		return window.head && window.head.js;
-		},
-		'SWFObject': function() {
-      		return window.swfobject;
-		},
-		'Chitika': function() {
-			return window.ch_client && window.ch_write_iframe;
-		},
-		'Jimdo': function() {
-      		return window.jimdoData;
-		},
-		'Webs': function() {
-      		return window.webs;
-		},
-		'Backbone.js': function() {
-			return window.Backbone && typeof(window.Backbone.sync) === 'function';
-		},
-		'Underscore.js': function() {
-      		return window._ && typeof(window._.identity) === 'function' &&
-        		window._.identity('abc') === 'abc';
-		},
-		'Spine': function() {
-      		return window.Spine;
-    	},
-    	'Angular': function () {
-      		return window.angular;
-    	},
-    	'Ning': function () {
-      		return window.ning;
-    	},
-    	'ektron': function () {
-      		return window.Ektron;
-    	},
-    	'etracker': function () {
-      		return window.et_params;
-    	},
-    	'SPDY': function () {
-      		return window.chrome.loadTimes().wasFetchedViaSpdy;
-    	},
-    	'LiveStreet': function () {
-      		return window.LIVESTREET_SECURITY_KEY;
-		},
-    'D3': function () {
-      return window.d3;
+        for (var t in script_tests) {
+            if (t in _apps) continue;
+            if (script_tests[t].test(s)) {
+                _apps[t] = -1;
+            }
+        }
     }
-	};
-	
-  for (var t in js_tests) {
-		if (t in _apps) continue;
-    if (js_tests[t]()) {
-			_apps[t] = -1;
-		}
-	}
 
-	// 6: detect some script version when available
-	// 判断 javascript 版本
-	var js_versions = {
-		'Highcharts': function() {
-      		if ('Highcharts' in window && Highcharts.version !== undefined)
-        		return window.Highcharts.version;
-		},
-		'Prototype': function() {
-      		if ('Prototype' in window && Prototype.Version !== undefined)
-        		return window.Prototype.Version;
-		},
-		'script.aculo.us': function() {
-      		if ('Scriptaculous' in window && Scriptaculous.Version !== undefined)
-        		return window.Scriptaculous.Version;
-		},
-		'jQuery': function() {
-      		if (typeof jQuery === 'function' && jQuery.prototype.jquery !== undefined)
-        		return jQuery.prototype.jquery;
-		},
-		'jQuery UI': function() {
-      		if (typeof jQuery === 'function' && jQuery.ui && jQuery.ui.version !== undefined)
-        		return jQuery.ui.version;
-		},
-		'Dojo': function() {
-      		if (typeof dojo === 'object' && dojo.version.toString() !== undefined)
-        		return dojo.version;
-		},
-		'YUI': function() {
-      		if (typeof YAHOO === 'object' && YAHOO.VERSION !== undefined)
-        		return YAHOO.VERSION;
-		},
-		'YUI 3': function() {
-      		if ('YUI' in window && typeof YUI === 'function' && YUI().version !== undefined)
-        		return YUI().version;
-		},
-		'MooTools': function() {
-      		if (typeof MooTools === 'object' && MooTools.version !== undefined)
-        		return MooTools.version;
-		},
-		'ExtJS': function() {
-      		if (typeof Ext === 'object' && Ext.version !== undefined)
-        		return Ext.version;
-		},
-		'RightJS': function() {
-      		if ('RightJS' in window && RightJS.version !== undefined)
-        		return RightJS.version;
-		},
-		'Modernizr': function() {
-      		if (window.Modernizr && Modernizr._version !== undefined)
-        		return Modernizr._version;
-		},
-		'Raphael': function() {
-      		if (window.Raphael && Raphael.version !== undefined)
-        		return Raphael.version;
-		},
-		'Backbone.js': function() {
-			if (window.Backbone && window.Backbone.VERSION)
-				return window.Backbone.VERSION;
-		},
-		'Underscore.js': function() {
-			if (window._ && window._.VERSION)
-				return window._.VERSION;
-		},
-		'Spine': function() {
-			if(window.Spine && window.Spine.version)
-				return window.Spine.version;	
-    	},
-    	'Angular': function () {
-      		if (window.angular && window.angular.version && 'full' in window.angular.version)
-        		return window.angular.version.full;
-		},
-    'D3': function () {
-      if (window.d3 && window.d3.version)
-        return window.d3.version;
+    // 3: detect by domains
+    // 根据 domain 信息判断
+    // 4: detect by regexp
+    // 用正则表达式判断
+    var text = document.documentElement.outerHTML;
+    var text_tests = {
+        'SMF': /<script .+\s+var smf_/i,
+        'Magento': /var BLANK_URL = '[^>]+js\/blank\.html'/i,
+        'Tumblr': /<iframe src=("|')http:\/\/\S+\.tumblr\.com/i,
+        'WordPress': /<link rel=("|')stylesheet("|') [^>]+wp-content/i,
+        'Closure': /<script[^>]*>.*goog\.require/i,
+        'Liferay': /<script[^>]*>.*LifeRay\.currentURL/i,
+        'vBulletin': /vbmenu_control/i,
+        'MODx': /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i,
+        'miniBB': /<a href=("|')[^>]+minibb.+\s*<!--End of copyright link/i,
+        'PHP-Fusion': /(href|src)=["']?infusions\//i,
+        // @todo: recheck this pattern again
+        'OpenX': /(href|src)=["'].*delivery\/(afr|ajs|avw|ck)\.php[^"']*/,
+        'GetSatisfaction': /asset_host\s*\+\s*"javascripts\/feedback.*\.js/igm,
+        // better recognization
+        'Fatwire': /\/Satellite\?|\/ContentServer\?/,
+        'Contao': /powered by (TYPOlight|Contao)/i,
+        'Moodle': /<link[^>]*\/theme\/standard\/styles.php".*>|<link[^>]*\/theme\/styles.php\?theme=.*".*>/,
+        '1c-bitrix': /<link[^>]*\/bitrix\/.*?>/i,
+        'OpenCMS': /<link[^>]*\.opencms\..*?>/i,
+        'HumansTxt': /<link[^>]*rel=['"]?author['"]?/i,
+        'GoogleFontApi': /ref=["']?http:\/\/fonts.googleapis.com\//i,
+        'Prostores': /-legacycss\/Asset">/,
+        'osCommerce': /(product_info\.php\?products_id|_eof \/\/-->)/,
+        'OpenCart': /index.php\?route=product\/product/,
+        '\u4e03\u725b\u4e91\u5b58\u50a8\u52a0\u901f': /<(link|script|img)[^>]+(qiniudn\.com|qbox\.me|clouddn\.com|qiniu\.com)[^>]+>/i,
+        // 七牛云存储加速
+        'Shibboleth': /<form action="\/idp\/Authn\/UserPassword" method="post">/
+    };
+
+    for (var t in text_tests) {
+        if (t in _apps) continue;
+        if (text_tests[t].test(text)) {
+            _apps[t] = -1;
+        }
     }
-	};
-	
-  	for (var a in _apps) {
-    	if (_apps[a] === -1 && js_versions[a]) {
-      		r = js_versions[a]();
-      		_apps[a] = r ? r : -1;
-		}
-	}
 
-	// 7: detect by header
-	// 根据 header 信息判断
-	// @todo
+    // TODO: merge inline detector with version detector
+    // 5: detect by inline javascript
+    // 根据 inline javascript 判断
+    var js_tests = {
+        'Highcharts': function() {
+            return window.Highcharts;
+        },
+        'Zepto.js': function() {
+            return window.Zepto && window.Zepto.fn;
+        },
+        'CodeIgniter': function() {
+            return document.cookie.indexOf("cisession") != -1;
+        },
+        'Java': function() {
+            return document.cookie.indexOf("JSESSIONID") != -1;
+        },
+        'Domino': function() {
+            return document.cookie.indexOf("LtpaToken") != -1 || document.cookie.indexOf("DomAuthSessId") != -1;
+        },
+        'Drupal': function() {
+            return window.Drupal;
+        },
+        'TomatoCMS': function() {
+            return window.Tomato;
+        },
+        'MojoMotor': function() {
+            return window.Mojo;
+        },
+        'ErainCart': function() {
+            return window.fn_register_hooks;
+        },
+        'SugarCRM': function() {
+            return window.SUGAR;
+        },
+        'YUI': function() {
+            return window.YAHOO;
+        },
+        'YUI 3': function() {
+            return window.YUI;
+        },
+        'jQuery': function() {
+            return window.jQuery;
+        },
+        'jQuery UI': function() {
+            return window.jQuery && window.jQuery.ui;
+        },
+        'Typekit': function() {
+            return window.Typekit;
+        },
+        'Facebook': function() {
+            return window.FB && window.FB.api;
+        },
+        'ExtJS': function() {
+            return window.Ext;
+        },
+        'Modernizr': function() {
+            return window.Modernizr;
+        },
+        'Raphael': function() {
+            return window.Raphael;
+        },
+        'Cufon': function() {
+            return window.Cufon;
+        },
+        'sIFR': function() {
+            return window.sIFR;
+        },
+        'Xiti': function() {
+            return window.xtsite && window.xtpage;
+        },
+        'Piwik': function() {
+            return window.Piwik;
+        },
+        'IPB': function() {
+            return window.IPBoard;
+        },
+        'MyBB': function() {
+            return window.MyBB;
+        },
+        'Clicky': function() {
+            return window.clicky;
+        },
+        'Woopra': function() {
+            return window.woopraTracker;
+        },
+        'RightJS': function() {
+            return window.RightJS;
+        },
+        'OpenWebAnalytics': function() {
+            return window.owa_baseUrl;
+        },
+        'Prettify': function() {
+            return window.prettyPrint;
+        },
+        'SiteCatalyst': function() {
+            return window.s_account;
+        },
+        'Twitter': function() {
+            return window.twttr;
+        },
+        'Coremetrics': function() {
+            return window.cmCreatePageviewTag;
+        },
+        'Buzz': function() {
+            return window.google_buzz__base_url;
+        },
+        'Plus1': function() {
+            return window.gapi && window.gapi.plusone;
+        },
+        'Google Loader': function() {
+            return window.google && window.google.load;
+        },
+        'GoogleMapApi': function() {
+            return window.google && window.google.maps;
+        },
+        'Head JS': function() {
+            return window.head && window.head.js;
+        },
+        'SWFObject': function() {
+            return window.swfobject;
+        },
+        'Chitika': function() {
+            return window.ch_client && window.ch_write_iframe;
+        },
+        'Jimdo': function() {
+            return window.jimdoData;
+        },
+        'Webs': function() {
+            return window.webs;
+        },
+        'Backbone.js': function() {
+            return window.Backbone && typeof(window.Backbone.sync) === 'function';
+        },
+        'Underscore.js': function() {
+            return window._ && typeof(window._.identity) === 'function' && window._.identity('abc') === 'abc';
+        },
+        'Spine': function() {
+            return window.Spine;
+        },
+        'Angular': function() {
+            return window.angular;
+        },
+        'Ning': function() {
+            return window.ning;
+        },
+        'ektron': function() {
+            return window.Ektron;
+        },
+        'etracker': function() {
+            return window.et_params;
+        },
+        'SPDY': function() {
+            return window.chrome.loadTimes().wasFetchedViaSpdy;
+        },
+        'LiveStreet': function() {
+            return window.LIVESTREET_SECURITY_KEY;
+        },
+        'D3': function() {
+            return window.d3;
+        }
+    };
 
-	// 8: detect based on built-in database
-	// 根据内建的数据库判断
-	// @todo
+    for (var t in js_tests) {
+        if (t in _apps) continue;
+        if (js_tests[t]()) {
+            _apps[t] = -1;
+        }
+    }
 
-	// 9: detect based on defined css classes
-	// 根据 css 类判断
-	var cssClasses = {
-		'Bootstrap': ['hero-unit', '.carousel-control', '[class^="icon-"]:last-child']
-	};
+    // 6: detect some script version when available
+    // 判断 javascript 版本
+    var js_versions = {
+        'Highcharts': function() {
+            if ('Highcharts' in window && Highcharts.version !== undefined) return window.Highcharts.version;
+        },
+        'Prototype': function() {
+            if ('Prototype' in window && Prototype.Version !== undefined) return window.Prototype.Version;
+        },
+        'script.aculo.us': function() {
+            if ('Scriptaculous' in window && Scriptaculous.Version !== undefined) return window.Scriptaculous.Version;
+        },
+        'jQuery': function() {
+            if (typeof jQuery === 'function' && jQuery.prototype.jquery !== undefined) return jQuery.prototype.jquery;
+        },
+        'jQuery UI': function() {
+            if (typeof jQuery === 'function' && jQuery.ui && jQuery.ui.version !== undefined) return jQuery.ui.version;
+        },
+        'Dojo': function() {
+            if (typeof dojo === 'object' && dojo.version.toString() !== undefined) return dojo.version;
+        },
+        'YUI': function() {
+            if (typeof YAHOO === 'object' && YAHOO.VERSION !== undefined) return YAHOO.VERSION;
+        },
+        'YUI 3': function() {
+            if ('YUI' in window && typeof YUI === 'function' && YUI().version !== undefined) return YUI().version;
+        },
+        'MooTools': function() {
+            if (typeof MooTools === 'object' && MooTools.version !== undefined) return MooTools.version;
+        },
+        'ExtJS': function() {
+            if (typeof Ext === 'object' && Ext.version !== undefined) return Ext.version;
+        },
+        'RightJS': function() {
+            if ('RightJS' in window && RightJS.version !== undefined) return RightJS.version;
+        },
+        'Modernizr': function() {
+            if (window.Modernizr && Modernizr._version !== undefined) return Modernizr._version;
+        },
+        'Raphael': function() {
+            if (window.Raphael && Raphael.version !== undefined) return Raphael.version;
+        },
+        'Backbone.js': function() {
+            if (window.Backbone && window.Backbone.VERSION) return window.Backbone.VERSION;
+        },
+        'Underscore.js': function() {
+            if (window._ && window._.VERSION) return window._.VERSION;
+        },
+        'Spine': function() {
+            if (window.Spine && window.Spine.version) return window.Spine.version;
+        },
+        'Angular': function() {
+            if (window.angular && window.angular.version && 'full' in window.angular.version) return window.angular.version.full;
+        },
+        'D3': function() {
+            if (window.d3 && window.d3.version) return window.d3.version;
+        }
+    };
 
-  for (var t in cssClasses) {
-		if (t in _apps) continue;
+    for (var a in _apps) {
+        if (_apps[a] === -1 && js_versions[a]) {
+            r = js_versions[a]();
+            _apps[a] = r ? r: -1;
+        }
+    }
 
-		var found = true;
-    for (var css in cssClasses[t]) {
-			var act = false;
-      name = cssClasses[t][css];
+    // 7: detect by header
+    // 根据 header 信息判断
+    // @todo
+    // 8: detect based on built-in database
+    // 根据内建的数据库判断
+    // @todo
+    // 9: detect based on defined css classes
+    // 根据 css 类判断
+    var cssClasses = {
+        'Bootstrap': ['hero-unit', '.carousel-control', '[class^="icon-"]:last-child']
+    };
 
-      /* Iterate through all registered css classes and check for presence */
-      for (var cssFile in document.styleSheets) {
-        for (var cssRule in document.styleSheets[cssFile].cssRules) {
-          var style = document.styleSheets[cssFile].cssRules[cssRule];
+    for (var t in cssClasses) {
+        if (t in _apps) continue;
 
-          if (typeof style === "undefined") continue;
-          if (typeof style.selectorText === "undefined") continue;
+        var found = true;
+        for (var css in cssClasses[t]) {
+            var act = false;
+            name = cssClasses[t][css];
 
-          if (style.selectorText.indexOf(name) !== -1) {
-            act = true;
-            break;
-          }
-        }
-        if (act === true) break;
-      }
+            /* Iterate through all registered css classes and check for presence */
+            for (var cssFile in document.styleSheets) {
+                for (var cssRule in document.styleSheets[cssFile].cssRules) {
+                    var style = document.styleSheets[cssFile].cssRules[cssRule];
+
+                    if (typeof style === "undefined") continue;
+                    if (typeof style.selectorText === "undefined") continue;
 
-			found = found & act;
-		}
+                    if (style.selectorText.indexOf(name) !== -1) {
+                        act = true;
+                        break;
+                    }
+                }
+                if (act === true) break;
+            }
 
-    if (found === true) {
-			_apps[t] = -1;
+            found = found & act;
+        }
+
+        if (found === true) {
+            _apps[t] = -1;
+        } else {
+            break;
+        }
     }
-    else {
-			break;
-		}
-	}
 
-  // 10: 根据引用的css文件的href判断
-  var cssLinkName ={
-    'Bootstrap': /bootstrap(-theme)?\.(min\.)?css/
-  };
+    // 10: 根据引用的css文件的href判断
+    var cssLinkName = {
+        'Bootstrap': /bootstrap(-theme)?\.(min\.)?css/
+    };
 
-  cssLinks = document.styleSheets;
-  for (var i = 0; i < cssLinks.length; i++) {
-    if (!cssLinks[i].href) continue;
-    for (var app in cssLinkName) {
-      if (app in _apps) continue;
-      if (cssLinkName[app].test(cssLinks[i].href)) {
-        _apps[app] = -1;
-      }
+    cssLinks = document.styleSheets;
+    for (var i = 0; i < cssLinks.length; i++) {
+        if (!cssLinks[i].href) continue;
+        for (var app in cssLinkName) {
+            if (app in _apps) continue;
+            if (cssLinkName[app].test(cssLinks[i].href)) {
+                _apps[app] = -1;
+            }
+        }
     }
-  }
-  
-	// convert to array
-	var jsonString = JSON.stringify(_apps);
-	// send back to background page
-	var meta = document.getElementById('chromesniffer_meta');
-	meta.content = jsonString;
 
-	//Notify Background Page
-	var done = document.createEvent('Event');
-	done.initEvent('ready', true, true);
-	meta.dispatchEvent(done);
-})();
+    // convert to array
+    var jsonString = JSON.stringify(_apps);
+    // send back to background page
+    var meta = document.getElementById('chromesniffer_meta');
+    meta.content = jsonString;
+
+    //Notify Background Page
+    var done = document.createEvent('Event');
+    done.initEvent('ready', true, true);
+    meta.dispatchEvent(done);
+})();
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 48c8ed0..7e849b2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -9,26 +9,30 @@
  * @license GPLv3
  **/
 
-(function () {
-  var head = document.getElementsByTagName('head')[0];
+(function() {
+    var head = document.getElementsByTagName('head')[0];
 
-  if (head) {
-    var script = document.createElement('script');
-    script.type = 'application/x-js';
-    script.src = chrome.extension.getURL('js/detector.js');
+    if (head) {
+        var script = document.createElement('script');
+        script.type = 'application/x-js';
+        script.src = chrome.extension.getURL('js/detector.js');
 
-    var meta = document.createElement('meta');
-    meta.name = 'chromesniffer';
-    meta.id = 'chromesniffer_meta';
-    head.appendChild(meta);
-    head.appendChild(script);
+        var meta = document.createElement('meta');
+        meta.name = 'chromesniffer';
+        meta.id = 'chromesniffer_meta';
+        head.appendChild(meta);
+        head.appendChild(script);
 
-    meta.addEventListener('ready', function () {
-      var apps = JSON.parse(meta.content);
+        meta.addEventListener('ready',
+        function() {
+            var apps = JSON.parse(meta.content);
 
-      if (Object.keys(apps).length > 0) {
-        chrome.extension.sendMessage({msg: "result", apps: apps});
-      }
-    });
-  }
+            if (Object.keys(apps).length > 0) {
+                chrome.extension.sendMessage({
+                    msg: "result",
+                    apps: apps
+                });
+            }
+        });
+    }
 })();
\ No newline at end of file
diff --git a/js/popup.js b/js/popup.js
index d5d60c4..a927ede 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -1,56 +1,57 @@
 var bg = chrome.extension.getBackgroundPage();
 
-chrome.tabs.getSelected(null,function(tab){
-	chrome.extension.sendMessage({msg: "get",tab: tab.id}, function(response){
-		var display = document.getElementById('app_list');
-	
-		var apps = response && response.apps ? response.apps : {};
-		var html = '';
-		
-		var appinfo = bg.appinfo;
-		var count = 0;
-	
-		for (var appid in apps)
-		{
-			app = appinfo[appid] ? appinfo[appid] : {};
-			
-			// i'm lazy to fill all kind of the information :(
-			if (!app.title) app.title = appid;
-			if (!app.url) app.url = appinfo[''].url.replace('%s',appid); // it's google one
-			if (!app.icon) app.icon = appinfo[''].icon;
-			
-			if( apps[appid] != "-1")
-			{
-				app.title = appid + ' ' + apps[appid] 
-			}
-			
-			// use DOM to avoid error
-			var link = document.createElement('a');
-			var icon = document.createElement('img');
-			
-			link.target = "_blank";
-			link.title = app.title;
-			link.href = app.url;
-			
-			icon.alt = app.title;
-			icon.width = 16;
-			icon.height = 16;
-			icon.src = "apps/" + app.icon;
-			
-			link.appendChild(icon);
-			display.appendChild(link);
-			
-			count++;
-		}
-		
-		if (count < 8) // correct the width for better view
-		{
-			display.style.width = (count*20) + "px";
-		}
-		else
-		{
-			display.style.width = "160px";
-		}
-
-	});
+chrome.tabs.getSelected(null,
+function(tab) {
+    chrome.extension.sendMessage({
+        msg: "get",
+        tab: tab.id
+    },
+    function(response) {
+        var display = document.getElementById('app_list');
+
+        var apps = response && response.apps ? response.apps: {};
+        var html = '';
+
+        var appinfo = bg.appinfo;
+        var count = 0;
+
+        for (var appid in apps) {
+            app = appinfo[appid] ? appinfo[appid] : {};
+
+            // i'm lazy to fill all kind of the information :(
+            if (!app.title) app.title = appid;
+            if (!app.url) app.url = appinfo[''].url.replace('%s', appid); // it's google one
+            if (!app.icon) app.icon = appinfo[''].icon;
+
+            if (apps[appid] != "-1") {
+                app.title = appid + ' ' + apps[appid]
+            }
+
+            // use DOM to avoid error
+            var link = document.createElement('a');
+            var icon = document.createElement('img');
+
+            link.target = "_blank";
+            link.title = app.title;
+            link.href = app.url;
+
+            icon.alt = app.title;
+            icon.width = 16;
+            icon.height = 16;
+            icon.src = "apps/" + app.icon;
+
+            link.appendChild(icon);
+            display.appendChild(link);
+
+            count++;
+        }
+
+        if (count < 8) // correct the width for better view
+        {
+            display.style.width = (count * 20) + "px";
+        } else {
+            display.style.width = "160px";
+        }
+
+    });
 });
\ No newline at end of file