diff --git a/share/apps.json b/share/apps.json
index 713047dc5..242ec7ba1 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -117,10 +117,12 @@
 			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"implies": "Java"
 		},
-		"Alloy": {
+		"AlloyUI": {
 			"website": "www.alloyui.com",
 			"cats": [ 12 ],
-			"env": "^AUI$"
+			"env": "^AUI$",
+			"script": "^https?://cdn\\.alloyui.com/",
+			"implies": [ "Twitter Bootstrap", "YUI" ]
 		},
 		"Amaya": {
 			"website": "www.w3.org/Amaya",
@@ -1804,7 +1806,7 @@
 		"Nginx": {
 			"website": "nginx.org",
 			"cats": [ 22 ],
-			"headers": { "Server": "nginx" }
+			"headers": { "Server": "nginx(?:/([\\d.]+))?\\;version:\\1" }
 		},
 		"node.js": {
 			"website": "nodejs.org",
@@ -1866,8 +1868,9 @@
 			"env": "^OpenLayers$"
 		},
 		"OpenNemas": {
-			"website": "openhost.es/en/opennemas",
+			"website": "www.opennemas.com",
 			"cats": [ 1 ],
+			"meta": { "generator": "OpenNemas(.*)" },
 			"headers": { "X-Powered-By": "OpenNemas" }
 		},
 		"OpenSSL": {
@@ -2035,7 +2038,7 @@
 		"Plentymarkets": {
 			"website": "plentymarkets.eu",
 			"cats": [ 6 ],
-			"meta": { "generator": "^www\\.plentyMarkets" }
+			"meta": { "generator": "plentymarkets" }
 		},
 		"Plesk": {
 			"website": "parallels.com/products/plesk",
@@ -2788,7 +2791,7 @@
 		"Windows Server": {
 			"website": "microsoft.com/windowsserver",
 			"cats": [ 28 ],
-			"headers": { "Server": "Win32" }
+			"headers": { "Server": "Win32|Win64" }
 		},
 		"Wink": {
 			"website": "winktoolkit.org",
@@ -2964,6 +2967,11 @@
 			"html": "<!-- ZK [\\.\\d\\s]+-->",
 			"implies": "Java"
 		},
+		"Zope": {
+			"website": "zope.org",
+			"cats": [ 22 ],
+			"headers": { "Server": "^Zope/" }
+		},
 		"ZURB Foundation": {
 			"website": "foundation.zurb.com",
 			"cats": [ 18 ],
@@ -2973,6 +2981,11 @@
 			"website": "livestreetcms.com",
 			"cats": [ 1 ],
 			"headers": { "X-Powered-By": "LiveStreet CMS" }
+		},
+		"Ophal": {
+			"website": "ophal.org",
+			"cats": [ 1, 11, 18 ],
+			"headers": { "X-Powered-By": "^Ophal/" }
 		}
 	}
 }
diff --git a/share/images/icons/Alloy.png b/share/images/icons/Alloy.png
deleted file mode 100644
index 56a9952fd..000000000
Binary files a/share/images/icons/Alloy.png and /dev/null differ
diff --git a/share/images/icons/AlloyUI.png b/share/images/icons/AlloyUI.png
new file mode 100644
index 000000000..ab2a6a584
Binary files /dev/null and b/share/images/icons/AlloyUI.png differ
diff --git a/share/images/icons/Google Font API.png b/share/images/icons/Google Font API.png
index f4a82184d..59c87b22d 100644
Binary files a/share/images/icons/Google Font API.png and b/share/images/icons/Google Font API.png differ
diff --git a/share/images/icons/Ophal.png b/share/images/icons/Ophal.png
new file mode 100644
index 000000000..896f0f190
Binary files /dev/null and b/share/images/icons/Ophal.png differ
diff --git a/share/images/icons/Zope.png b/share/images/icons/Zope.png
new file mode 100644
index 000000000..461ed8940
Binary files /dev/null and b/share/images/icons/Zope.png differ