diff --git a/README.md b/README.md
index 30511e626..88cd4b6c9 100644
--- a/README.md
+++ b/README.md
@@ -178,14 +178,14 @@ Work in progress, experimental. See https://wiki.mozilla.org/Jetpack.
 
 ### Python
 
-A Python port by [SebastianLopienski](https://github.com/SebastianLopienski).
+A Python port by [SebastianLopienski](https://github.com/SebastianLopienski). Part of a research project at [CERN](http://cern.ch).
 
 https://github.com/SebastianLopienski/WAD
 
 
 ### Python
 
-A Python driver by [@ebradbury](https://github.com/ebradbury). Part of a research project at [CERN](http://cern.ch).
+A Python driver by [@ebradbury](https://github.com/ebradbury). 
 
 https://github.com/ebradbury/Wappalyzer/tree/master/drivers/python
 
diff --git a/share/apps.json b/share/apps.json
index 179e52e49..a068f1848 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -120,7 +120,7 @@
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -161,7 +161,7 @@
 			"cats": [ 13 ],
 			"env": "^jira$",
 			"script": "/jira/s/",
-			"url": "/secure/Dashboard.jspa",			
+			"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:\\4",
 			"implies": [ "Java" ]
 		},
@@ -529,7 +529,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },			
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
 		},
@@ -553,6 +553,10 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
+		"Embedthis-http": {
+			"cats": [ 22 ],
+			"headers": { "Server": "Embedthis-http" }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -658,6 +662,10 @@
 			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
+		"GoAhead": {
+			"cats": [ 22 ],
+			"headers": { "Server": "GoAhead" }
+		},
 		"Google Analytics": {
 			"cats": [ 10 ],
 			"html": "_gaq\\.push\\(\\['_setAccount",
@@ -804,7 +812,7 @@
 		"JAlbum": {
 			"cats": [ 7 ],
 			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
-			"implies": [ "Java" ]			
+			"implies": [ "Java" ]
 		},
 		"Jalios": {
 			"cats": [ 1 ],
@@ -822,17 +830,17 @@
 		"JavaServer Faces": {
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
-			"implies": [ "Java" ]			
+			"implies": [ "Java" ]
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
-			"implies": [ "Java" ]			
+			"implies": [ "Java" ]
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
 			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
-			"implies": [ "Java" ]			
+			"implies": [ "Java" ]
 		},
 		"Jirafe": {
 			"cats": [ 10, 32 ],
@@ -869,7 +877,7 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"scripts": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ], 			
+			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
@@ -920,7 +928,7 @@
 		"KineticJS": {
 			"cats": [ 25 ],
 			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
-		},		
+		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
 			"env": "^KM_COOKIE_DOMAIN$"
@@ -964,7 +972,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd" }
+			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -979,6 +987,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
+    "Locomotive": {
+      "cats": [ 1 ],
+      "html": "\/sites\/[a-zA-Z0-9]{24}\/theme\/stylesheets\/",
+      "implies": [ "Ruby", "Ruby on Rails" ]
+    },
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1061,16 +1074,16 @@
 			"env": "^MODX_MEDIA_PATH$",
 			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
 			"implies": [ "PHP" ]
-		},		
+		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },			
-			"implies": [ "Apache" ]		
-		},		
+			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "Apache" ]
+		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },			
-			"implies": [ "Python", "Apache" ]		
+			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
@@ -1084,14 +1097,14 @@
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },			
-			"implies": [ "Apache" ]		
+			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"implies": [ "Apache" ]
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
 			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
-		},						
+		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin(_static(\\d)(\\d)(\\d)|.+)/common/js/common\\.js\\;version:\\2.\\3.\\4",
@@ -1204,7 +1217,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },			
+			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
 			"implies": [ "Java" ]
 		},
 		"OpenGSE": {
@@ -1223,8 +1236,8 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }			
-		},				
+			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
 			"html": "<!--[^>]+published by Open Text Web Solutions",
@@ -1236,7 +1249,7 @@
 		},
 		"Oracle Application Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Oracle(-| )Application(-| )Server((-| )(\\d+[a-z]?))?\\;version:\\5" }		
+			"headers": { "Server": "Oracle(-| )Application(-| )Server((-| )(\\d+[a-z]?))?\\;version:\\5" }
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [ 10 ],
@@ -1393,7 +1406,7 @@
 			"cats": [ 12 ],
 			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
-		},		
+		},
 		"Protovis": {
 			"cats": [ 25 ],
 			"script": "protovis.*\\.js",
@@ -1406,7 +1419,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }					
+			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1620,7 +1633,7 @@
 		"Squiz Matrix": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Squiz Matrix" },
-			"html": "  Running (MySource|Squiz) Matrix", 
+			"html": "  Running (MySource|Squiz) Matrix",
 			"headers": { "X-Powered-By": "Squiz Matrix" },
 			"implies": [ "PHP" ]
 		},
@@ -1638,17 +1651,17 @@
 			"env": "^sublimevideo$"
 		},
 		"Supersized": {
-			"cats": [ 7, 25 ],			
+			"cats": [ 7, 25 ],
 			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
-		},			
+		},
 		"SUSE": {
 			"cats": [ 28 ],
 			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
-		},		
+		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
 			"headers": { "Server": "Scientific Linux", "X-Powered-By": "Scientific Linux" }
-		},				
+		},
 		"SWFObject": {
 			"cats": [ 19 ],
 			"script": "swfobject.*\\.js",
diff --git a/share/images/icons/Amaya.png b/share/images/icons/Amaya.png
new file mode 100644
index 000000000..900a305f5
Binary files /dev/null and b/share/images/icons/Amaya.png differ
diff --git a/share/images/icons/CMSimple.png b/share/images/icons/CMSimple.png
new file mode 100644
index 000000000..39c8ddea8
Binary files /dev/null and b/share/images/icons/CMSimple.png differ
diff --git a/share/images/icons/Embedthis-http.png b/share/images/icons/Embedthis-http.png
new file mode 100644
index 000000000..6d67489eb
Binary files /dev/null and b/share/images/icons/Embedthis-http.png differ
diff --git a/share/images/icons/GoAhead.png b/share/images/icons/GoAhead.png
new file mode 100644
index 000000000..6d67489eb
Binary files /dev/null and b/share/images/icons/GoAhead.png differ
diff --git a/share/images/icons/JAlbum.png b/share/images/icons/JAlbum.png
new file mode 100644
index 000000000..f4e4be306
Binary files /dev/null and b/share/images/icons/JAlbum.png differ
diff --git a/share/images/icons/Java Servlet.png b/share/images/icons/Java Servlet.png
new file mode 100644
index 000000000..a7ea0ab57
Binary files /dev/null and b/share/images/icons/Java Servlet.png differ
diff --git a/share/images/icons/JavaServer Faces.png b/share/images/icons/JavaServer Faces.png
new file mode 100644
index 000000000..d14c81289
Binary files /dev/null and b/share/images/icons/JavaServer Faces.png differ
diff --git a/share/images/icons/JavaServer Pages.png b/share/images/icons/JavaServer Pages.png
new file mode 100644
index 000000000..a7ea0ab57
Binary files /dev/null and b/share/images/icons/JavaServer Pages.png differ
diff --git a/share/images/icons/KineticJS.png b/share/images/icons/KineticJS.png
new file mode 100644
index 000000000..786f497e1
Binary files /dev/null and b/share/images/icons/KineticJS.png differ
diff --git a/share/images/icons/Locomotive.png b/share/images/icons/Locomotive.png
new file mode 100644
index 000000000..aee4a650a
Binary files /dev/null and b/share/images/icons/Locomotive.png differ
diff --git a/share/images/icons/OpenGrok.png b/share/images/icons/OpenGrok.png
new file mode 100644
index 000000000..806ed021c
Binary files /dev/null and b/share/images/icons/OpenGrok.png differ
diff --git a/share/images/icons/OpenSSL.png b/share/images/icons/OpenSSL.png
new file mode 100644
index 000000000..96bac2d48
Binary files /dev/null and b/share/images/icons/OpenSSL.png differ
diff --git a/share/images/icons/Oracle Application Server.png b/share/images/icons/Oracle Application Server.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/share/images/icons/Oracle Application Server.png differ
diff --git a/share/images/icons/SUSE.gif b/share/images/icons/SUSE.gif
new file mode 100644
index 000000000..3dfea2f3d
Binary files /dev/null and b/share/images/icons/SUSE.gif differ
diff --git a/share/images/icons/Sarka-SPIP.png b/share/images/icons/Sarka-SPIP.png
new file mode 100644
index 000000000..941f27d92
Binary files /dev/null and b/share/images/icons/Sarka-SPIP.png differ
diff --git a/share/images/icons/Scientific Linux.png b/share/images/icons/Scientific Linux.png
new file mode 100644
index 000000000..c500660b5
Binary files /dev/null and b/share/images/icons/Scientific Linux.png differ
diff --git a/share/images/icons/Supersized.png b/share/images/icons/Supersized.png
new file mode 100644
index 000000000..653a70046
Binary files /dev/null and b/share/images/icons/Supersized.png differ
diff --git a/share/images/icons/mod_fastcgi.png b/share/images/icons/mod_fastcgi.png
new file mode 100644
index 000000000..d268dcca8
Binary files /dev/null and b/share/images/icons/mod_fastcgi.png differ
diff --git a/share/images/icons/mod_python.png b/share/images/icons/mod_python.png
new file mode 100644
index 000000000..35989b4a3
Binary files /dev/null and b/share/images/icons/mod_python.png differ
diff --git a/share/images/icons/mod_rack.png b/share/images/icons/mod_rack.png
new file mode 100644
index 000000000..3a7b0c7bc
Binary files /dev/null and b/share/images/icons/mod_rack.png differ
diff --git a/share/images/icons/mod_rails.png b/share/images/icons/mod_rails.png
new file mode 100644
index 000000000..3a7b0c7bc
Binary files /dev/null and b/share/images/icons/mod_rails.png differ
diff --git a/share/images/icons/mod_ssl.png b/share/images/icons/mod_ssl.png
new file mode 100644
index 000000000..96bac2d48
Binary files /dev/null and b/share/images/icons/mod_ssl.png differ
diff --git a/share/images/icons/mod_wsgi.png b/share/images/icons/mod_wsgi.png
new file mode 100644
index 000000000..5e1d905e2
Binary files /dev/null and b/share/images/icons/mod_wsgi.png differ