diff --git a/drivers/chrome/_locales/en/messages.json b/drivers/chrome/_locales/en/messages.json
index df2429b81..546e063d2 100644
--- a/drivers/chrome/_locales/en/messages.json
+++ b/drivers/chrome/_locales/en/messages.json
@@ -47,5 +47,12 @@
 	"categoryName40":           { "message": "Printer" },
 	"categoryName41":           { "message": "Payment Processor" },
 	"categoryName42":           { "message": "Tag Manager" },
-	"categoryName43":           { "message": "Paywall" }
-}
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" }
+}
\ No newline at end of file
diff --git a/drivers/chrome/_locales/es/messages.json b/drivers/chrome/_locales/es/messages.json
index e9457dc7c..5d94e74ee 100644
--- a/drivers/chrome/_locales/es/messages.json
+++ b/drivers/chrome/_locales/es/messages.json
@@ -51,5 +51,12 @@
 	"categoryName40":           { "message": "Printer" },
 	"categoryName41":           { "message": "Payment Processor" },
 	"categoryName42":           { "message": "Tag Manager" },
-	"categoryName43":           { "message": "Paywall" }
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" }
 }
diff --git a/drivers/chrome/_locales/fr/messages.json b/drivers/chrome/_locales/fr/messages.json
index bb585609f..599e0c4ab 100644
--- a/drivers/chrome/_locales/fr/messages.json
+++ b/drivers/chrome/_locales/fr/messages.json
@@ -21,7 +21,7 @@
 	"categoryName10":       { "message": "Outil de statistiques" },
 	"categoryName11":       { "message": "Blog" },
 	"categoryName12":       { "message": "Framework JavaScript" },
-	"categoryName13":       { "message": "Outils de suivi de problèmes" },
+	"categoryName13":       { "message": "Outil de suivi de problèmes" },
 	"categoryName14":       { "message": "Lecteur de vidéos" },
 	"categoryName15":       { "message": "Système de commentaires" },
 	"categoryName16":       { "message": "Captcha" },
@@ -41,15 +41,22 @@
 	"categoryName30":       { "message": "Web Mail" },
 	"categoryName31":       { "message": "CDN" },
 	"categoryName32":       { "message": "Logiciel de marketing" },
-	"categoryName33":       { "message": "Web Server Extension" },
-	"categoryName34":       { "message": "Database" },
-	"categoryName35":       { "message": "Map" },
-	"categoryName36":       { "message": "Advertzing Network" },
-	"categoryName37":       { "message": "Network Sevice" },
-	"categoryName38":       { "message": "Media Server" },
+	"categoryName33":       { "message": "Extension de serveur web" },
+	"categoryName34":       { "message": "Base de données" },
+	"categoryName35":       { "message": "Carte" },
+	"categoryName36":       { "message": "Réseau publicitaire" },
+	"categoryName37":       { "message": "Périphérique réseau" },
+	"categoryName38":       { "message": "Serveur multimédia" },
 	"categoryName39":       { "message": "Webcam" },
-	"categoryName40":       { "message": "Printer" },
-	"categoryName41":       { "message": "Payment Processor" },
+	"categoryName40":       { "message": "Imprimante" },
+	"categoryName41":       { "message": "Service de paiement" },
 	"categoryName42":       { "message": "Tag Manager" },
-	"categoryName43":       { "message": "Paywall" }
+	"categoryName43":       { "message": "Paywall" },
+	"categoryName44":       { "message": "Système CI" },
+	"categoryName45":       { "message": "Système SCADA" },
+	"categoryName46":       { "message": "Accès à distance" },
+	"categoryName47":       { "message": "Outil de développement" },
+	"categoryName48":       { "message": "Stockage réseau" },
+	"categoryName49":       { "message": "Lecteur RSS" },
+	"categoryName50":       { "message": "Système de gestion de documents" }
 }
diff --git a/drivers/chrome/_locales/ro/messages.json b/drivers/chrome/_locales/ro/messages.json
index 9d63e7a6c..c81bc44cd 100644
--- a/drivers/chrome/_locales/ro/messages.json
+++ b/drivers/chrome/_locales/ro/messages.json
@@ -47,5 +47,12 @@
 	"categoryName40":           { "message": "Imprimantă" },
 	"categoryName41":           { "message": "Sistem de plată" },
 	"categoryName42":           { "message": "Manager cuvinte cheie" },
-	"categoryName43":           { "message": "Paywall" }
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" }
 }
diff --git a/drivers/chrome/_locales/ru/messages.json b/drivers/chrome/_locales/ru/messages.json
index d0190a5c8..7ef2cb603 100644
--- a/drivers/chrome/_locales/ru/messages.json
+++ b/drivers/chrome/_locales/ru/messages.json
@@ -113,6 +113,13 @@
 	"categoryName43": {
 		"message": "Paywall"
 	},
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" },
 	"categoryName5": {
 		"message": "Виджет"
 	},
diff --git a/drivers/firefox/locale/de-DE.properties b/drivers/firefox/locale/de-DE.properties
index 1b938fd95..e0a2574b9 100755
--- a/drivers/firefox/locale/de-DE.properties
+++ b/drivers/firefox/locale/de-DE.properties
@@ -57,3 +57,10 @@ cat40                = Printer
 cat41                = Payment Processor
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/drivers/firefox/locale/en-GB.properties b/drivers/firefox/locale/en-GB.properties
index 487405e65..9af14dc47 100755
--- a/drivers/firefox/locale/en-GB.properties
+++ b/drivers/firefox/locale/en-GB.properties
@@ -57,3 +57,10 @@ cat40                = Printer
 cat41                = Payment Processor
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/drivers/firefox/locale/en-US.properties b/drivers/firefox/locale/en-US.properties
index 487405e65..9af14dc47 100755
--- a/drivers/firefox/locale/en-US.properties
+++ b/drivers/firefox/locale/en-US.properties
@@ -57,3 +57,10 @@ cat40                = Printer
 cat41                = Payment Processor
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/drivers/firefox/locale/es-ES.properties b/drivers/firefox/locale/es-ES.properties
index 5c66522b5..9a1d6fb4d 100755
--- a/drivers/firefox/locale/es-ES.properties
+++ b/drivers/firefox/locale/es-ES.properties
@@ -57,3 +57,10 @@ cat40                = Impresora
 cat41                = Payment Processor
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/drivers/firefox/locale/fr-FR.properties b/drivers/firefox/locale/fr-FR.properties
index f2ac72343..4e1f59c71 100644
--- a/drivers/firefox/locale/fr-FR.properties
+++ b/drivers/firefox/locale/fr-FR.properties
@@ -57,3 +57,10 @@ cat40                = Imprimante
 cat41                = Service de paiement
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Système CI
+cat45                = Système SCADA
+cat46                = Accès à distance
+cat47                = Outil de développement
+cat48                = Stockage réseau
+cat49                = Lecteur RSS
+cat50                = Système de gestion de documents
\ No newline at end of file
diff --git a/drivers/firefox/locale/nl-NL.properties b/drivers/firefox/locale/nl-NL.properties
index a210a7c58..78e48cae7 100755
--- a/drivers/firefox/locale/nl-NL.properties
+++ b/drivers/firefox/locale/nl-NL.properties
@@ -57,3 +57,10 @@ cat40                = Printer
 cat41                = Betalingsverwerker
 cat42                = Tag Manager
 cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/drivers/firefox/locale/ro-RO.properties b/drivers/firefox/locale/ro-RO.properties
index 3cae6f00c..52e3c61c4 100644
--- a/drivers/firefox/locale/ro-RO.properties
+++ b/drivers/firefox/locale/ro-RO.properties
@@ -53,4 +53,11 @@ cat39                = Webcam
 cat40                = Imprimantă
 cat41                = Sistem de plată
 cat42                = Manager cuvinte cheie
-cat43                = Paywall
\ No newline at end of file
+cat43                = Paywall
+cat44                = Build/CI System
+cat45                = SCADA System
+cat46                = Remote Access
+cat47                = Development Tool
+cat48                = Network Storage
+cat49                = Feed Readers
+cat50                = Document Management Systems
\ No newline at end of file
diff --git a/share/apps.json b/share/apps.json
index 52768c9a5..63aabfe19 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -42,7 +42,14 @@
 		"40": "printers",
 		"41": "payment-processors",
 		"42": "tag-managers",
-		"43": "paywalls"
+		"43": "paywalls",
+		"44": "build-ci-systems",
+		"45": "control-systems",
+		"46": "remote-access",
+		"47": "dev-tools",
+		"48": "network-storage",
+		"49": "feed-readers",
+		"50": "document-management-systems"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -131,6 +138,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1" }
 		},
+		"Adobe Muse": {
+			"website": "muse.adobe.com",
+			"cats": [ 20 ],
+			"meta": { "generator": "^Muse(?:$| ?/?(\\d[\\d.]+))\\;version:\\1" }
+		},
 		"Adobe RoboHelp": {
 			"website": "adobe.com/products/robohelp.html",
 			"cats": [ 4 ],
@@ -180,6 +192,11 @@
 			"cats": [ 31 ],
 			"headers": { "X-Akamai-Transformed": ".*" }
 		},
+		"Allegro RomPager": {
+			"website": "allegrosoft.com/embedded-web-server-s2",
+			"cats": [ 22 ],
+			"headers": { "Server": "Allegro-Software-RomPager(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"AlloyUI": {
 			"website": "www.alloyui.com",
 			"cats": [ 12 ],
@@ -261,7 +278,7 @@
 		"Apache Tomcat": {
 			"website": "tomcat.apache.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:" }
+			"headers": { "Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:", "X-Powered-By": "\\bTomcat\\b(?:-([\\d.]+))?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"website": "trafficserver.apache.org/",
@@ -285,6 +302,19 @@
 			"cats": [ 2 ],
 			"html": "ping\\.src = node\\.href;"
 		},
+		"Artifactory Web Server": {
+			"website": "jfrog.com/open-source/#os-arti",
+			"cats": [ 22 ],
+			"headers": { "Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Artifactory" ]
+		},
+		"Artifactory": {
+			"website": "jfrog.com/open-source/#os-arti",
+			"cats": [ 47 ],
+			"env": "^ArtifactoryUpdates$",
+			"script": [ "wicket/resource/org.artifactory." ],
+			"html": [ "<span class=\"version\">Artifactory(?: Pro)(?: Power Pack)(?: ([\\d.]+))?\\;version:\\1" ]
+		},
 		"AsciiDoc": {
 			"website": "www.methods.co.nz/asciidoc",
 			"cats": [ 1, 20, 27 ],
@@ -294,7 +324,7 @@
 		"ATEN": {
 			"website": "www.aten.com",
 			"cats": [ 22 ],
-			"headers": { "Server": "ATEN HTTP Server(:?\\(V?([\\d\\.]+)\\))?\\;version:\\1" }
+			"headers": { "Server": "ATEN HTTP Server(?:\\(?V?([\\d\\.]+)\\)?)?\\;version:\\1" }
 		},
 		"ATG Web Commerce": {
 			"website": "oracle.com/us/products/applications/web-commerce/atg",
@@ -302,6 +332,12 @@
 			"headers": { "X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1" },
 			"html": "<[^>]+_DARGS"
 		},
+		"Atlassian Bitbucket": {
+			"website": "www.atlassian.com/software/bitbucket/overview/",
+			"cats": [ 47 ],
+			"meta": { "application-name": "Bitbucket" },
+			"env": "^bitbucket$"
+		},
 		"Atlassian Confluence": {
 			"website": "www.atlassian.com/software/confluence/overview/team-collaboration-software",
 			"cats": [ 8 ],
@@ -312,13 +348,23 @@
 		},
 		"Atlassian Jira": {
 			"website": "www.atlassian.com/software/jira/overview/",
-			"cats": [ 13 ],
+			"cats": [ 13, 47 ],
+			"meta": { "application-name": "JIRA", "ajs-version-number": "([\\d\\.]+)\\;version:\\1" },
 			"env": "^jira$",
-			"script": "/jira/s/",
-			"url": "/secure/Dashboard\\.jspa",
 			"html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(\\.\\d+)?))?\\;version:\\1",
 			"implies": "Java"
 		},
+		"Atlassian Jira Issue Collector": {
+			"website": "www.atlassian.com/software/jira/overview/",
+			"cats": [ 13, 47 ],
+			"script": [ "jira-issue-collector-plugin", "atlassian.jira.collector.plugin" ]
+		},
+		"Atlassian FishEye": {
+			"website": "www.atlassian.com/software/fisheyet/overview/",
+			"cats": [ 47 ],
+			"headers": { "Set-cookie": "FESESSIONID" },
+			"html": "<title>(?:Log in to )?FishEye (?:and Crucible )?([\\d.]+)?</title>\\;version:\\1"
+		},
 		"Avangate": {
 			"website": "avangate.com",
 			"cats": [ 6 ],
@@ -404,6 +450,11 @@
 			"meta": { "generator": "blogger" },
 			"url": "\\.blogspot\\.com"
 		},
+		"Bluefish": {
+			"website": "sourceforge.net/projects/bluefish",
+			"cats": [ 20 ],
+			"meta": { "generator": "Bluefish(?:\\s([\\d.]+))?\\;version:\\1" }
+		},
 		"Boa": {
 			"website": "www.boa.org",
 			"cats": [ 22 ],
@@ -421,7 +472,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "Bolt" },
 			"implies": "PHP"
-		},		
+		},
 		"Brother": {
 			"website": "www.brother.com",
 			"cats": [ 40 ]
@@ -473,6 +524,12 @@
 			"website": "www.canon.com",
 			"cats": [ 40 ]
 		},
+		"Canon HTTP Server": {
+			"website": "www.canon.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Canon" ]
+		},
 		"CakePHP": {
 			"website": "cakephp.org",
 			"cats": [ 18 ],
@@ -501,6 +558,11 @@
 			"headers": { "Server": "Catwalk\\/?([\\d\\.]+)?\\;version:\\1" },
 			"implies": "Canon"
 		},
+		"CenteHTTPd": {
+			"website": "cente.jp/cente/app/HTTPdc.html",
+			"cats": [ 22 ],
+			"headers": { "Server": "CenteHTTPd(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"CentOS": {
 			"website": "centos.org",
 			"cats": [ 28 ],
@@ -805,6 +867,11 @@
 			"meta": { "generator": "DataLife Engine" },
 			"implies": [ "PHP", "Apache" ]
 		},
+		"DAV": {
+			"website": "???",
+			"cats": [ 33 ],
+			"headers": { "Server": "\\bDAV\\b(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"David Webbox": {
 			"website": "www.tobit.com",
 			"cats": [ 22 ],
@@ -821,6 +888,11 @@
 			"headers": { "Server": "debut\\/?([\\d\\.]+)?\\;version:\\1" },
 			"implies": "Brother"
 		},
+		"Decorum": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"DedeCMS": {
 			"website": "dedecms.com",
 			"cats": [ 1 ],
@@ -858,9 +930,11 @@
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Discourse": {
-			"website": "www.discourse.org/",
+			"website": "discourse.org",
 			"cats": [ 2 ],
-			"env": "Discourse"
+			"meta": { "generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1" },
+			"env": "Discourse",
+			"implies": [ "Ruby on Rails" ]
 		},
 		"Disqus": {
 			"website": "disqus.com",
@@ -940,6 +1014,7 @@
 			"script": "drupal\\.js",
 			"html": "<(?:link|style)[^>]+sites/(?:default|all)/(?:themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1", "Expires": "19 Nov 1978" },
+			"meta": { "generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -968,6 +1043,11 @@
 			"headers": { "Set-Cookie": "e107_tz[^;]+=", "X-Powered-By": "e107" },
 			"implies": "PHP"
 		},
+		"eDevice SmartStack": {
+			"website": "edevice.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "eDevice SmartStack(?: ?/?([\\d.]+))?\\;version:\\1" }
+		},
 		"EdgeCast": {
 			"website": "www.edgecast.com",
 			"cats": [ 31 ],
@@ -997,6 +1077,11 @@
 			"script": "elqCfg\\.js",
 			"env": "^elq(?:SiteID|Load|CurESite)$"
 		},
+		"EmbedThis Appweb": {
+			"website": "embedthis.com/appweb",
+			"cats": [ 22 ],
+			"headers": { "Server": "Mbedthis-Appweb(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Ember.js": {
 			"website": "emberjs.com",
 			"cats": [ 12 ],
@@ -1044,6 +1129,11 @@
 			"cats": [ 27 ],
 			"headers": { "Server": "Erlang( OTP/([\\-\\d\\.ABR]+))?\\;version:\\1" }
 		},
+		"ESERV-10": {
+			"website": "www.violasystems.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "ESERV-10(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"eSyndiCat": {
 			"website": "esyndicat.com",
 			"cats": [ 1 ],
@@ -1202,7 +1292,7 @@
 		"FrontPage": {
 			"website": "office.microsoft.com/frontpage",
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(?:\\s([\\d.]+))?\\;version:\\1" },
+			"meta": { "generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
@@ -1259,11 +1349,33 @@
 			"meta": { "generator": "Ghost(?:\\s([\\d.]+))?\\;version:\\1" },
 			"headers": { "X-Ghost-Cache-Status": ".*" }
 		},
+		"git": {
+			"website": "git-scm.com",
+			"cats": [ 47 ],
+			"meta": { "generator": "\\bgit/([\\d.]+\\d)\\;version:\\1" }
+		},
+		"GitBook": {
+			"website": "gitbook.io",
+			"cats": [ 4 ],
+			"meta": { "generator": "GitBook(?:.([\\d.]+))?\\;version:\\1" }
+		},
+		"GitLab": {
+			"website": "about.gitlab.com",
+			"cats": [ 19, 13 ],
+			"headers": { "Set-cookie": "_gitlab_session" }
+		},
 		"gitweb": {
 			"website": "git-scm.com",
-			"cats": [ 19 ],
+			"cats": [ 47 ],
+			"meta": { "generator": "gitweb(?:/([\\d.]+\\d))?\\;version:\\1" },
 			"html": "<!-- git web interface version",
-			"implies": "Perl"
+			"implies": [ "Perl", "git" ]
+		},
+		"GlassFish": {
+			"website": "glassfish.java.net",
+			"cats": [ 22 ],
+			"headers": { "Server": "GlassFish(?: Server)(?: Open Source Edition)(?: ?/?([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Java" ]
 		},
 		"Glyphicons": {
 			"website": "glyphicons.com",
@@ -1314,7 +1426,7 @@
 		"Google Maps": {
 			"website": "maps.google.com",
 			"cats": [ 35 ],
-			"script": "(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1"
+			"script": [ "(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1", "//maps.googleapis.com/maps/api/js" ]
 		},
 		"Google PageSpeed": {
 			"website": "developers.google.com/speed/pagespeed/mod",
@@ -1341,6 +1453,7 @@
 			"website": "developers.google.com/web-toolkit",
 			"cats": [ 18 ],
 			"env": "^__gwt_",
+			"meta": { "gwt:property": "" },
 			"implies": "Java"
 		},
 		"GoStats": {
@@ -1377,6 +1490,12 @@
 			"meta": { "DC.identifier": "/content\\.jsp\\?objectid=" },
 			"html": "<img[^>]+/dsresource\\?objectid="
 		},
+		"gunicorn": {
+			"website": "gunicorn.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Python" ]
+		},
 		"G-WAN": {
 			"website": "gwan.com",
 			"cats": [ 22 ],
@@ -1395,6 +1514,11 @@
 			"script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
 			"html": "<[^>]*type=[^>]text\\/x-handlebars-template"
 		},
+		"Happy ICS Server": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"HeadJS": {
 			"website": "headjs.com",
 			"cats": [ 12 ],
@@ -1442,10 +1566,40 @@
 			"meta": { "generator": "Hotaru CMS" },
 			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
+		"HP": {
+			"website": "hp.com",
+			"cats": [ 40 ]
+		},
+		"HP ChaiServer": {
+			"website": "hp.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "HP-Chai(?:Server|SOE)(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "HP" ]
+		},
+		"HP Compact Server": {
+			"website": "hp.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "HP_Compact_Server(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"HP iLO": {
+			"website": "hp.com",
+			"cats": [ 22, 46 ],
+			"headers": { "Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1" }
+		},
+		"HP System Management": {
+			"website": "hp.com",
+			"cats": [ 46 ],
+			"headers": { "Server": "HP System Management" }
+		},
 		"HP ProCurve": {
 			"website": "hp.com/networking",
 			"cats": [ 37 ]
 		},
+		"HTTP-Server": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "HTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1" }
+		},
 		"HubSpot": {
 			"website": "hubspot.com",
 			"cats": [ 32 ],
@@ -1469,6 +1623,11 @@
 			"cats": [ 22 ],
 			"headers": { "Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1" }
 		},
+		"IBM Tivoli Storage Manager": {
+			"website": "ibm.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "TSM_HTTP(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"IBM WebSphere Portal": {
 			"website": "ibm.com/software/websphere/portal",
 			"cats": [ 1 ],
@@ -1526,6 +1685,11 @@
 			"headers": { "Set-cookie": "MAKACSESSION" },
 			"html": "Powered by\\s+(?:CERN )?<a href=\"http://(?:cdsware\\.cern\\.ch/indico/|indico-software\\.org|cern\\.ch/indico)\">(?:CDS )?Indico( [\\d\\.]+)?\\;version:\\1"
 		},
+		"Indy": {
+			"website": "indyproject.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "Indy(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"InProces": {
 			"website": "www.brein.nl/oplossing/product/website",
 			"cats": [ 1 ],
@@ -1538,6 +1702,11 @@
 			"meta": { "generator": "InstantCMS" },
 			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
+		"Intel Active Management Technology": {
+			"website": "intel.com",
+			"cats": [ 22, 46 ],
+			"headers": { "Server": "Intel\\(R\\) Active Management Technology(?: ([\\d.]+))?\\;version:\\1" }
+		},
 		"IntenseDebate": {
 			"website": "intensedebate.com",
 			"cats": [ 15 ],
@@ -1556,7 +1725,7 @@
 		},
 		"Invenio": {
 			"website": "invenio-software.org",
-			"cats": [ 19 ],
+			"cats": [ 50 ],
 			"headers": { "Set-cookie": "INVENIOSESSION" },
 			"html": "(?:Powered by|System)\\s+(?:CERN )?<a (?:class=\"footer\" )?href=\"http://(?:cdsware\\.cern\\.ch(?:/invenio)?|invenio-software\\.org|cern\\.ch/invenio)(?:/)?\">(?:CDS )?Invenio</a>\\s*v?([\\d\\.]+)?\\;version:\\1"
 		},
@@ -1634,15 +1803,27 @@
 			"implies": "JBoss Application Server",
 			"excludes": "Apache Tomcat"
 		},
+		"JC-HTTPD": {
+			"website": "canon.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "JC-HTTPD(?:/([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Canon" ],
+			"excludes": "Apache"
+		},
 		"Jekyll": {
 			"website": "jekyllrb.com",
 			"cats": [ 1, 11 ],
 			"meta": { "generator": "Jekyll (v[\\d.]+)?\\;version:\\1" }
 		},
+		"Jenkins": {
+			"website": "jenkins-ci.org",
+			"cats": [ 44 ],
+			"headers": { "X-Jenkins": "([\\d\\.]+)\\;version:\\1" }
+		},
 		"Jetty": {
 			"website": "www.eclipse.org/jetty",
 			"cats": [ 22 ],
-			"headers": { "Server": "Jetty(?:\\(([\\d\\.]+\\d+))?\\;version:\\1" },
+			"headers": { "Server": "Jetty(?:\\(([\\d\\.]*\\d+))?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -2031,6 +2212,11 @@
 			"headers": { "X-Powered-By": "ASP\\.NET\\;confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": "IIS\\;confidence:50"
 		},
+		"Microsoft HTTPAPI": {
+			"website": "microsoft.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
 			"cats": [ 1 ],
@@ -2038,6 +2224,11 @@
 			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
 			"env": "^_spBodyOnLoadCalled$"
 		},
+		"mini_httpd": {
+			"website": "acme.com/software/mini_httpd",
+			"cats": [ 22 ],
+			"headers": { "Server": "mini_httpd(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"MiniBB": {
 			"website": "www.minibb.com",
 			"cats": [ 2 ],
@@ -2078,6 +2269,11 @@
 			"script": "MochiKit(?:\\.min)?\\.js",
 			"env": "^MochiKit$"
 		},
+		"MochiWeb": {
+			"website": "github.com/mochi/mochiweb",
+			"cats": [ 22 ],
+			"headers": { "Server": "MochiWeb(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Modernizr": {
 			"website": "www.modernizr.com",
 			"cats": [ 12 ],
@@ -2114,7 +2310,7 @@
 			"website": "perl.apache.org",
 			"cats": [ 33 ],
 			"headers": { "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1" },
-			"implies": "Apache"
+			"implies": [ "Perl", "Apache" ]
 		},
 		"mod_python": {
 			"website": "www.modpython.org",
@@ -2229,11 +2425,22 @@
 			"script": "mootools.*\\.js",
 			"env": "^MooTools$"
 		},
+		"Motion-httpd": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "Motion-httpd(?:/([\\d.]+))?\\;version:\\1" },
+			"excludes": "Apache"
+		},
 		"Movable Type": {
 			"website": "movabletype.org",
 			"cats": [ 1 ],
 			"meta": { "generator": "Movable Type" }
 		},
+		"Moxa": {
+			"website": "moxa.com",
+			"cats": [ 37 ],
+			"headers": { "Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Mozard Suite": {
 			"website": "mozard.nl",
 			"cats": [ 1 ],
@@ -2344,6 +2551,13 @@
 			"cats": [ 36 ],
 			"env": "^OAS_AD$"
 		},
+		"Open Journal Systems": {
+			"website": "pkp.sfu.ca/ojs",
+			"cats": [ 50 ],
+			"headers": { "Set-Cookie": "\\bOJSSID\\b" },
+			"meta": { "generator": "Open Journal Systems(?: ([\\d.]+))?\\;version:\\1" },
+			"implies": [ "PHP" ]
+		},
 		"Open Web Analytics": {
 			"website": "openwebanalytics.com",
 			"cats": [ 10 ],
@@ -2419,13 +2633,29 @@
 		"Oracle Application Server": {
 			"website": "www.oracle.com/technetwork/middleware/ias/overview/index.html",
 			"cats": [ 22 ],
-			"headers": { "Server": "Oracle\\bApplication\\bServer(?:\\b(\\d+[a-z]?))?\\;version:\\1" }
+			"headers": { "Server": "Oracle(?:-| )Application(?:-| )Server(?: Containers for J2EE)?(?:(?:-| )(\\d[\\da-z./]+))?\\;version:\\1" }
+		},
+		"Oracle Dynamic Monitoring Service": {
+			"website": "oracle.com",
+			"cats": [ 19 ],
+			"headers": { "x-oracle-dms-ecid": "" }
+		},
+		"Oracle HTTP Server": {
+			"website": "oracle.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1" },
+			"excludes": [ "HTTP-Server" ]
 		},
 		"Oracle Recommendations On Demand": {
 			"website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html",
 			"cats": [ 10 ],
 			"script": "atgsvcs.+atgsvcs\\.js"
 		},
+		"Oracle Web Cache": {
+			"website": "oracle.com",
+			"cats": [ 23 ],
+			"headers": { "Server": "Oracle(?:AS)?(?:-| )Web(?:-| )Cache(?:(?:[- /])([\\da-z./]+))?\\;version:\\1" }
+		},
 		"osCommerce": {
 			"website": "www.oscommerce.com",
 			"cats": [ 6 ],
@@ -2451,6 +2681,12 @@
 			"env": "^(?:(?:g_f)?Owa|IsOwaPremiumBrowser)$",
 			"implies": "Microsoft ASP.NET"
 		},
+		"ownCloud": {
+			"website": "owncloud.org",
+			"cats": [ 19 ],
+			"meta": { "apple-itunes-app": "app-id=543672169" },
+			"html": "<a href=\"https://owncloud.com\" target=\"_blank\">ownCloud Inc.</a><br/>Your Cloud, Your Data, Your Way!"
+		},
 		"OXID eShop": {
 			"website": "oxid-esales.com",
 			"cats": [ 6 ],
@@ -2516,6 +2752,7 @@
 		"Perl": {
 			"website": "perl.org",
 			"cats": [ 27 ],
+			"headers": { "Server": "\\bPerl\\b(?: ?/?v?([\\d.]+))?\\;version:\\1" },
 			"url": "\\.pl(?:$|\\?)"
 		},
 		"Petrojs": {
@@ -2606,6 +2843,7 @@
 			"cats": [ 10 ],
 			"script": "piwik\\.js|piwik\\.php",
 			"html": "var piwikTracker = Piwik\\.getTracker\\(",
+			"meta": { "generator": "Piwik - Open Source Web Analytics", "apple-itunes-app": "app-id=737216887", "google-play-app": "app-id=org.piwik.mobile2" },
 			"env": [ "^Piwik$", "^_paq$" ]
 		},
 		"Piano Solo":{
@@ -2614,6 +2852,11 @@
 			"env": "^PianoMedia$",
 			"headers": { "Set-Cookie": "pianovisitkey" }
 		},
+		"Planet": {
+			"website": "planetplanet.org",
+			"cats": [ 49 ],
+			"meta": { "generator": "^Planet(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Plentymarkets": {
 			"website": "plentymarkets.eu",
 			"cats": [ 6 ],
@@ -2746,12 +2989,22 @@
 			"headers": { "X-Rack-Cache": ".+" },
 			"implies": "Ruby"
 		},
+		"RAID HTTPServer": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Raphael": {
 			"website": "raphaeljs.com",
 			"cats": [ 25 ],
 			"script": "raphael.*\\.js",
 			"env": "^Raphael$"
 		},
+		"Rapid Logic": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"RBS Change": {
 			"website": "www.rbschange.fr",
 			"cats": [ 1, 6 ],
@@ -2843,7 +3096,7 @@
 			"cats": [ 18 ],
 			"script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
 			"meta": { "csrf-param": "authenticity_token\\;confidence:50" },
-			"headers": { "Server": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50", "X-Powered-By": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50" },
+			"headers": { "Server": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50", "X-Powered-By": "(?:mod_rails|mod_rack|Phusion[\\._ ]Passenger)(?: \\(mod_rails/mod_rack\\))(?: ?/?([\\d\\.]+))?\\;version:\\1\\;confidence:50" },
 			"implies": "Ruby"
 		},
 		"S.Builder": {
@@ -2851,6 +3104,11 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "S\\.Builder" }
 		},
+		"Saia PCD": {
+			"website": "saia-pcd.com",
+			"cats": [ 45 ],
+			"headers": { "Server": "Saia PCD(?:([/a-zA-Z\\d.]+))?\\;version:\\1" }
+		},
 		"Serendipity": {
 			"website": "s9y.org",
 			"cats": [ 1, 11 ],
@@ -2872,6 +3130,16 @@
 			"website": "www.scala-lang.org",
 			"cats": [ 27 ]
 		},
+		"Schneider": {
+			"website": "schneider-electric.com",
+			"cats": [ 45 ]
+		},
+		"Schneider Web Server": {
+			"website": "schneider-electric.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Schneider-WEB(?:/V?([\\d.]+))?\\;version:\\1" },
+			"implies": [ "Schneider" ]
+		},
 		"script.aculo.us": {
 			"website": "script.aculo.us",
 			"cats": [ 12 ],
@@ -2969,6 +3237,11 @@
 			"meta": { "generator": "SilverStripe" },
 			"html": "Powered by <a href=\"[^>]+SilverStripe"
 		},
+		"SimpleHTTP": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"SIMsite": {
 			"website": "simgroep.nl/internet/portfolio-contentbeheer_41623/",
 			"cats": [ 1 ],
@@ -3106,6 +3379,11 @@
 			"env": "^DOCUMENTATION_OPTIONS$",
 			"implies": "Python"
 		},
+		"SpiderControl iniNet": {
+			"website": "spidercontrol.net/ininet",
+			"cats": [ 45 ],
+			"meta": { "generator": "iniNet SpiderControl" }
+		},
 		"spin.js": {
 			"website": "fgnass.github.io/spin.js/",
 			"cats": [ 12, 25 ],
@@ -3115,7 +3393,7 @@
 		"SPIP": {
 			"website": "www.spip.net",
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
+			"meta": { "generator": "(?:^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
 		"Spree": {
@@ -3233,6 +3511,18 @@
 			"headers": { "X-Swiftlet-Cache": ".*", "X-Powered-By": "Swiftlet", "X-Generator": "Swiftlet" },
 			"implies": "PHP"
 		},
+		"Synology DiskStation": {
+			"website": "synology.com",
+			"cats": [ 48 ],
+			"meta": { "application-name": "Synology DiskStation" }
+		},
+		"TeamCity": {
+			"website": "jetbrains.com/teamcity",
+			"cats": [ 44 ],
+			"meta": { "application-name": "TeamCity" },
+			"html": [ "http://www.jetbrains.com/teamcity/feedback\\?source=footer&version=([\\d\\.]+)\\;version:\\1", "\\n\\s*<span class=\"versionTag\"><span class=\"vWord\">Version</span> ([\\d\\.]+) \\(build \\d+\\)</span>\\;version:\\1" ],
+			"implies": [ "jQuery", "Prototype" ]
+		},
 		"Textpattern CMS": {
 			"website": "textpattern.com",
 			"cats": [ 1 ],
@@ -3244,6 +3534,11 @@
 			"script": "three(?:\\.min)?\\.js",
 			"env": "^THREE$"
 		},
+		"thttpd": {
+			"website": "acme.com/software/thttpd",
+			"cats": [ 22 ],
+			"headers": { "Server": "\\bthttpd(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"TiddlyWiki": {
 			"website": "tiddlywiki.com",
 			"cats": [ 1, 2, 4, 8 ],
@@ -3290,6 +3585,11 @@
 			"meta": { "generator": "TomatoCart" },
 			"env": "^AjaxShoppingCart$"
 		},
+		"TornadoServer": {
+			"website": "tornadoweb.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "TornadoServer(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"Trac": {
 			"website": "trac.edgewall.org",
 			"cats": [ 13 ],
@@ -3321,6 +3621,11 @@
 			"cats": [ 1 ],
 			"headers": { "X-Powered-CMS": "Twilight CMS" }
 		},
+		"TwistedWeb": {
+			"website": "twistedmatrix.com/trac/wiki/TwistedWeb",
+			"cats": [ 22 ],
+			"headers": { "Server": "TwistedWeb(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"TwistPHP": {
 			"website": "twistphp.com",
 			"cats": [ 18 ],
@@ -3492,6 +3797,12 @@
 			"cats": [ 14 ],
 			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
 		},
+		"Virata EmWeb": {
+			"website": "???",
+			"cats": [ 22 ],
+			"headers": { "Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1" },
+			"implies": [ "HP" ]
+		},
 		"VirtueMart": {
 			"website": "virtuemart.net",
 			"cats": [ 6 ],
@@ -3559,6 +3870,7 @@
 			"cats": [ 18 ],
 			"script": "web2py\\.js",
 			"headers": { "X-Powered-By": "web2py" },
+			"meta": { "generator": "^Web2py" },
 			"implies": [ "Python", "jQuery" ]
 		},
 		"Webix": {
@@ -3632,6 +3944,11 @@
 			"meta": { "generator": "WikkaWiki" },
 			"html": "Powered by <a href=\"[^>]+WikkaWiki"
 		},
+		"Windows CE": {
+			"website": "microsoft.com",
+			"cats": [ 28 ],
+			"headers": { "Server": "\\bWinCE\\b" }
+		},
 		"Windows Server": {
 			"website": "microsoft.com/windowsserver",
 			"cats": [ 28 ],
@@ -3643,6 +3960,11 @@
 			"script": "(?:_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Winstone Servlet Container": {
+			"website": "winstone.sourceforge.net",
+			"cats": [ 22 ],
+			"headers": { "Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1", "X-Powered-By": "Winstone(?:.([\\d.]+))?\\;version:\\1" }
+		},
 		"Wix": {
 			"website": "wix.com",
 			"cats": [ 1 ],
@@ -3746,6 +4068,11 @@
 			"env": "^xChart$",
 			"implies": "D3"
 		},
+		"Xitami": {
+			"website": "xitami.com",
+			"cats": [ 22 ],
+			"headers": { "Server": "Xitami(?:/([\\d.]+))?\\;version:\\1" }
+		},
 		"XMB": {
 			"website": "www.xmbforum.com",
 			"cats": [ 2 ],
@@ -3825,6 +4152,12 @@
 			"cats": [ 36 ],
 			"script": "^https?://(?:[^/]+\\.)?yieldlab\\.net/"
 		},
+		"Yii": {
+			"website": "yiiframework.com",
+			"cats": [ 18 ],
+			"html": [ "Powered by <a href=\"http://www.yiiframework.com/\" rel=\"external\">Yii Framework</a>" ],
+			"implies": [ "PHP" ]
+		},
 		"YouTube": {
 			"website": "www.youtube.com",
 			"cats": [ 14 ],
@@ -3863,7 +4196,7 @@
 		"Zend": {
 			"website": "zend.com",
 			"cats": [ 22 ],
-			"headers": { "X-Powered-By": "Zend" }
+			"headers": { "X-Powered-By": "Zend", "Set-Cookie": "ZENDSERVERSESSID" }
 		},
 		"Zepto": {
 			"website": "zeptojs.com",
diff --git a/share/images/icons/Adobe Muse.png b/share/images/icons/Adobe Muse.png
new file mode 100644
index 000000000..95f4cc8ce
Binary files /dev/null and b/share/images/icons/Adobe Muse.png differ
diff --git a/share/images/icons/Allegro RomPager.png b/share/images/icons/Allegro RomPager.png
new file mode 100644
index 000000000..2815e76bd
Binary files /dev/null and b/share/images/icons/Allegro RomPager.png differ
diff --git a/share/images/icons/Artifactory Web Server.png b/share/images/icons/Artifactory Web Server.png
new file mode 100644
index 000000000..27d157e98
Binary files /dev/null and b/share/images/icons/Artifactory Web Server.png differ
diff --git a/share/images/icons/Artifactory.png b/share/images/icons/Artifactory.png
new file mode 100644
index 000000000..27d157e98
Binary files /dev/null and b/share/images/icons/Artifactory.png differ
diff --git a/share/images/icons/Atlassian Bitbucket.png b/share/images/icons/Atlassian Bitbucket.png
new file mode 100644
index 000000000..675cc8dd0
Binary files /dev/null and b/share/images/icons/Atlassian Bitbucket.png differ
diff --git a/share/images/icons/Atlassian FishEye.png b/share/images/icons/Atlassian FishEye.png
new file mode 100644
index 000000000..fb5e32099
Binary files /dev/null and b/share/images/icons/Atlassian FishEye.png differ
diff --git a/share/images/icons/Atlassian Jira Issue Collector.png b/share/images/icons/Atlassian Jira Issue Collector.png
new file mode 100644
index 000000000..4c3963d75
Binary files /dev/null and b/share/images/icons/Atlassian Jira Issue Collector.png differ
diff --git a/share/images/icons/Bluefish.png b/share/images/icons/Bluefish.png
new file mode 100644
index 000000000..846a3a640
Binary files /dev/null and b/share/images/icons/Bluefish.png differ
diff --git a/share/images/icons/Canon HTTP Server.png b/share/images/icons/Canon HTTP Server.png
new file mode 100755
index 000000000..1f55e03b3
Binary files /dev/null and b/share/images/icons/Canon HTTP Server.png differ
diff --git a/share/images/icons/CenteHTTPd.png b/share/images/icons/CenteHTTPd.png
new file mode 100644
index 000000000..72040708d
Binary files /dev/null and b/share/images/icons/CenteHTTPd.png differ
diff --git a/share/images/icons/DAV.png b/share/images/icons/DAV.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/DAV.png differ
diff --git a/share/images/icons/Decorum.png b/share/images/icons/Decorum.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Decorum.png differ
diff --git a/share/images/icons/ESERV-10.png b/share/images/icons/ESERV-10.png
new file mode 100644
index 000000000..3e2c434ef
Binary files /dev/null and b/share/images/icons/ESERV-10.png differ
diff --git a/share/images/icons/EmbedThis Appweb.png b/share/images/icons/EmbedThis Appweb.png
new file mode 100644
index 000000000..b1df2e5b0
Binary files /dev/null and b/share/images/icons/EmbedThis Appweb.png differ
diff --git a/share/images/icons/GitBook.png b/share/images/icons/GitBook.png
new file mode 100644
index 000000000..3b7b1894d
Binary files /dev/null and b/share/images/icons/GitBook.png differ
diff --git a/share/images/icons/GitLab.png b/share/images/icons/GitLab.png
new file mode 100644
index 000000000..d65722d94
Binary files /dev/null and b/share/images/icons/GitLab.png differ
diff --git a/share/images/icons/GlassFish.png b/share/images/icons/GlassFish.png
new file mode 100644
index 000000000..16b873b02
Binary files /dev/null and b/share/images/icons/GlassFish.png differ
diff --git a/share/images/icons/HP ChaiServer.png b/share/images/icons/HP ChaiServer.png
new file mode 100755
index 000000000..44629e6f9
Binary files /dev/null and b/share/images/icons/HP ChaiServer.png differ
diff --git a/share/images/icons/HP Compact Server.png b/share/images/icons/HP Compact Server.png
new file mode 100755
index 000000000..44629e6f9
Binary files /dev/null and b/share/images/icons/HP Compact Server.png differ
diff --git a/share/images/icons/HP System Management.png b/share/images/icons/HP System Management.png
new file mode 100755
index 000000000..44629e6f9
Binary files /dev/null and b/share/images/icons/HP System Management.png differ
diff --git a/share/images/icons/HP iLO.png b/share/images/icons/HP iLO.png
new file mode 100755
index 000000000..44629e6f9
Binary files /dev/null and b/share/images/icons/HP iLO.png differ
diff --git a/share/images/icons/HP.png b/share/images/icons/HP.png
new file mode 100755
index 000000000..44629e6f9
Binary files /dev/null and b/share/images/icons/HP.png differ
diff --git a/share/images/icons/HTTP-Server.png b/share/images/icons/HTTP-Server.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/HTTP-Server.png differ
diff --git a/share/images/icons/Happy ICS Server.png b/share/images/icons/Happy ICS Server.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Happy ICS Server.png differ
diff --git a/share/images/icons/IBM Tivoli Storage Manager.png b/share/images/icons/IBM Tivoli Storage Manager.png
new file mode 100644
index 000000000..26106b25f
Binary files /dev/null and b/share/images/icons/IBM Tivoli Storage Manager.png differ
diff --git a/share/images/icons/Indy.png b/share/images/icons/Indy.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Indy.png differ
diff --git a/share/images/icons/Intel Active Management Technology.png b/share/images/icons/Intel Active Management Technology.png
new file mode 100644
index 000000000..df1d93777
Binary files /dev/null and b/share/images/icons/Intel Active Management Technology.png differ
diff --git a/share/images/icons/JC-HTTPD.png b/share/images/icons/JC-HTTPD.png
new file mode 100755
index 000000000..1f55e03b3
Binary files /dev/null and b/share/images/icons/JC-HTTPD.png differ
diff --git a/share/images/icons/Jenkins.png b/share/images/icons/Jenkins.png
new file mode 100644
index 000000000..8a712a941
Binary files /dev/null and b/share/images/icons/Jenkins.png differ
diff --git a/share/images/icons/Microsoft HTTPAPI.png b/share/images/icons/Microsoft HTTPAPI.png
new file mode 100644
index 000000000..deabbd57e
Binary files /dev/null and b/share/images/icons/Microsoft HTTPAPI.png differ
diff --git a/share/images/icons/MochiWeb.png b/share/images/icons/MochiWeb.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/MochiWeb.png differ
diff --git a/share/images/icons/Motion-httpd.png b/share/images/icons/Motion-httpd.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Motion-httpd.png differ
diff --git a/share/images/icons/Moxa.png b/share/images/icons/Moxa.png
new file mode 100644
index 000000000..df126a68b
Binary files /dev/null and b/share/images/icons/Moxa.png differ
diff --git a/share/images/icons/Open Journal Systems.png b/share/images/icons/Open Journal Systems.png
new file mode 100644
index 000000000..57c1795ad
Binary files /dev/null and b/share/images/icons/Open Journal Systems.png differ
diff --git a/share/images/icons/Oracle Dynamic Monitoring Service.png b/share/images/icons/Oracle Dynamic Monitoring Service.png
new file mode 100644
index 000000000..435d816e1
Binary files /dev/null and b/share/images/icons/Oracle Dynamic Monitoring Service.png differ
diff --git a/share/images/icons/Oracle HTTP Server.png b/share/images/icons/Oracle HTTP Server.png
new file mode 100644
index 000000000..435d816e1
Binary files /dev/null and b/share/images/icons/Oracle HTTP Server.png differ
diff --git a/share/images/icons/Oracle Web Cache.png b/share/images/icons/Oracle Web Cache.png
new file mode 100644
index 000000000..435d816e1
Binary files /dev/null and b/share/images/icons/Oracle Web Cache.png differ
diff --git a/share/images/icons/Planet.png b/share/images/icons/Planet.png
new file mode 100644
index 000000000..022a4d86a
Binary files /dev/null and b/share/images/icons/Planet.png differ
diff --git a/share/images/icons/RAID HTTPServer.png b/share/images/icons/RAID HTTPServer.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/RAID HTTPServer.png differ
diff --git a/share/images/icons/Rapid Logic.png b/share/images/icons/Rapid Logic.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Rapid Logic.png differ
diff --git a/share/images/icons/Saia PCD.png b/share/images/icons/Saia PCD.png
new file mode 100644
index 000000000..c560a637c
Binary files /dev/null and b/share/images/icons/Saia PCD.png differ
diff --git a/share/images/icons/Schneider Web Server.png b/share/images/icons/Schneider Web Server.png
new file mode 100644
index 000000000..d795ac7f5
Binary files /dev/null and b/share/images/icons/Schneider Web Server.png differ
diff --git a/share/images/icons/Schneider.png b/share/images/icons/Schneider.png
new file mode 100644
index 000000000..d795ac7f5
Binary files /dev/null and b/share/images/icons/Schneider.png differ
diff --git a/share/images/icons/SimpleHTTP.png b/share/images/icons/SimpleHTTP.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/SimpleHTTP.png differ
diff --git a/share/images/icons/SpiderControl iniNet.png b/share/images/icons/SpiderControl iniNet.png
new file mode 100644
index 000000000..545cd1033
Binary files /dev/null and b/share/images/icons/SpiderControl iniNet.png differ
diff --git a/share/images/icons/Synology DiskStation.png b/share/images/icons/Synology DiskStation.png
new file mode 100644
index 000000000..68ed5ff34
Binary files /dev/null and b/share/images/icons/Synology DiskStation.png differ
diff --git a/share/images/icons/TeamCity.png b/share/images/icons/TeamCity.png
new file mode 100644
index 000000000..e7999734f
Binary files /dev/null and b/share/images/icons/TeamCity.png differ
diff --git a/share/images/icons/TornadoServer.png b/share/images/icons/TornadoServer.png
new file mode 100644
index 000000000..d52d546d3
Binary files /dev/null and b/share/images/icons/TornadoServer.png differ
diff --git a/share/images/icons/TwistedWeb.png b/share/images/icons/TwistedWeb.png
new file mode 100644
index 000000000..c7fe5e13c
Binary files /dev/null and b/share/images/icons/TwistedWeb.png differ
diff --git a/share/images/icons/Virata EmWeb.png b/share/images/icons/Virata EmWeb.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Virata EmWeb.png differ
diff --git a/share/images/icons/Windows CE.png b/share/images/icons/Windows CE.png
new file mode 100644
index 000000000..deabbd57e
Binary files /dev/null and b/share/images/icons/Windows CE.png differ
diff --git a/share/images/icons/Winstone Servlet Container.png b/share/images/icons/Winstone Servlet Container.png
new file mode 100644
index 000000000..2e51915b0
Binary files /dev/null and b/share/images/icons/Winstone Servlet Container.png differ
diff --git a/share/images/icons/Xitami.png b/share/images/icons/Xitami.png
new file mode 100644
index 000000000..c58a76143
Binary files /dev/null and b/share/images/icons/Xitami.png differ
diff --git a/share/images/icons/Yii.png b/share/images/icons/Yii.png
new file mode 100644
index 000000000..4b5b980d2
Binary files /dev/null and b/share/images/icons/Yii.png differ
diff --git a/share/images/icons/eDevice SmartStack.png b/share/images/icons/eDevice SmartStack.png
new file mode 100644
index 000000000..efb8bac3f
Binary files /dev/null and b/share/images/icons/eDevice SmartStack.png differ
diff --git a/share/images/icons/git.png b/share/images/icons/git.png
new file mode 100644
index 000000000..bf3c05959
Binary files /dev/null and b/share/images/icons/git.png differ
diff --git a/share/images/icons/gunicorn.png b/share/images/icons/gunicorn.png
new file mode 100644
index 000000000..e33ac860c
Binary files /dev/null and b/share/images/icons/gunicorn.png differ
diff --git a/share/images/icons/mini_httpd.png b/share/images/icons/mini_httpd.png
new file mode 100644
index 000000000..d7a9bbcaa
Binary files /dev/null and b/share/images/icons/mini_httpd.png differ
diff --git a/share/images/icons/ownCloud.png b/share/images/icons/ownCloud.png
new file mode 100644
index 000000000..4c53d113e
Binary files /dev/null and b/share/images/icons/ownCloud.png differ
diff --git a/share/images/icons/thttpd.png b/share/images/icons/thttpd.png
new file mode 100644
index 000000000..d7a9bbcaa
Binary files /dev/null and b/share/images/icons/thttpd.png differ