diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index f452f0115..7af1a0354 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.0.4</em:version>
+		<em:version>2.0.5</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/share/images/icons/CodeIgniter.ico b/share/images/icons/CodeIgniter.ico
index 5edc76373..6db9a9c7a 100644
Binary files a/share/images/icons/CodeIgniter.ico and b/share/images/icons/CodeIgniter.ico differ
diff --git a/share/images/icons/FreeBSD.ico b/share/images/icons/FreeBSD.ico
new file mode 100644
index 000000000..78a95684d
Binary files /dev/null and b/share/images/icons/FreeBSD.ico differ
diff --git a/share/images/icons/Gravatar.ico b/share/images/icons/Gravatar.ico
new file mode 100644
index 000000000..0eaaa5d57
Binary files /dev/null and b/share/images/icons/Gravatar.ico differ
diff --git a/share/images/icons/Optimizely.ico b/share/images/icons/Optimizely.ico
new file mode 100644
index 000000000..7991a5d71
Binary files /dev/null and b/share/images/icons/Optimizely.ico differ
diff --git a/share/images/icons/Parse.ly.ico b/share/images/icons/Parse.ly.ico
new file mode 100644
index 000000000..236f6a119
Binary files /dev/null and b/share/images/icons/Parse.ly.ico differ
diff --git a/share/images/icons/UserVoice.ico b/share/images/icons/UserVoice.ico
new file mode 100644
index 000000000..f1188cb50
Binary files /dev/null and b/share/images/icons/UserVoice.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index 2055e1e27..2ccbfa776 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -106,6 +106,7 @@
 		'eZ Publish':            { cats: { 1:  1 }, meta: { 'generator': /eZ Publish/i } },
 		'FluxBB':                { cats: { 1:  2 }, html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
 		'Flyspray':              { cats: { 1: 13 }, html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },
+		'FreeBSD':               { cats: { 1: 28 }, headers: { 'Server': /FreeBSD/i } },
 		'FrontPage':             { cats: { 1: 20 }, meta: { 'generator': /Microsoft FrontPage/ }, html: /<html[^>]+urn:schemas\-microsoft\-com:office:office/i },
 		'Gauges':                { cats: { 1: 10 }, html: /t\.src = '\/\/secure\.gaug\.es\/track\.js/, env: /^_gauges$/ },
 		'Get Satisfaction':      { cats: { 1: 13 }, html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
@@ -208,12 +209,12 @@
 		'Quantcast':             { cats: { 1: 10 }, script: /edge\.quantserve\.com\/quant\.js/, env: /^quantserve$/ },
 		'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
 		'Raphael':               { cats: { 1: 25 }, script: /raphael.*\.js/, env: /^Raphael$/ },
-		'reCAPTCHA':             { cats: { 1: 16 }, script: /(api\-secure\.recaptcha\.net|recaptcha_ajax\.js)/, html: /<div[^>]+id=("|')recaptcha_image/ },
+		'reCAPTCHA':             { cats: { 1: 16 }, script: /(api\-secure\.recaptcha\.net|recaptcha_ajax\.js)/, html: /<div[^>]+id=("|')recaptcha_image/, env: /^Recaptcha$/ },
 		'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 }, meta: { 'description': /Redmine/i }, html: /Powered by <a href=("|')[^>]+Redmine/i },
 		'Reinvigorate':          { cats: { 1: 10 }, html: /reinvigorate\.track\("/ },
 		'RequireJS':             { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
-		'Ruby':                  { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion Passenger)/i } },
+		'Ruby':                  { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion.Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion.Passenger)/i } },
 		'S.Builder':             { cats: { 1:  1 }, meta: { 'generator': /S\.Builder/i } },
 		's9y':                   { cats: { 1:  1 }, meta: { 'generator': /Serendipity/i } },
 		'script.aculo.us':       { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
@@ -254,6 +255,7 @@
 		'Underscore.js':         { cats: { 1: 12 }, script: /underscore.*\.js/ },
 		'UNIX':                  { cats: { 1: 28 }, headers: { 'Server': /Unix/i } },
 		'UserRules':             { cats: { 1: 13 }, html: /var _usrp =/ , env: /^\_usrp$/ },
+		'UserVoice':             { cats: { 1: 13 }, env: /^UserVoice$/ },
 		'Vanilla':               { cats: { 1:  2 }, html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
 		'Varnish':               { cats: { 1: 22 }, headers: { 'X-Varnish': /.+/, 'X-Varnish-Age': /.+/, 'X-Varnish-Cache': /.+/, 'X-Varnish-Action': /.+/, 'X-Varnish-Hostname': /.+/, 'Via': /Varnish/i } },
 		'vBulletin':             { cats: { 1:  2 }, meta: { 'generator': /vBulletin/i } },
@@ -282,7 +284,7 @@
 		'XenForo':               { cats: { 1:  2 }, html: /(jQuery\.extend\(true, XenForo|Forum software by XenForo&trade;|<!\-\-XF:branding)/ },
 		'XiTi':                  { cats: { 1: 10 }, html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i },
 		'XMB':                   { cats: { 1:  2 }, html: /<!-- Powered by XMB/i },
-		'xui':                   { cats: { 1: 26, 2: 12 }, script: /[^a-zA-Z]xui.*\.js/i, env: /^x\$$/ },
+		'xui':                   { cats: { 1: 26, 2: 12 }, script: /[^a-zA-Z]xui.*\.js/i, env: /^xui$/ },
 		'XOOPS':                 { cats: { 1:  1 }, meta: { 'generator': /XOOPS/i } },
 		'xtCommerce':            { cats: { 1:  6 }, meta: { 'generator': /xt:Commerce/ }, html: /<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce/i },
 		'YaBB':                  { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },