diff --git a/drivers/bookmarklet/images/icons/MoinMoin.png b/drivers/bookmarklet/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/drivers/bookmarklet/images/icons/MoinMoin.png differ
diff --git a/drivers/bookmarklet/images/icons/SobiPro.png b/drivers/bookmarklet/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/drivers/bookmarklet/images/icons/SobiPro.png differ
diff --git a/drivers/bookmarklet/images/icons/VideoJS.png b/drivers/bookmarklet/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/drivers/bookmarklet/images/icons/VideoJS.png differ
diff --git a/drivers/bookmarklet/images/icons/ZK.png b/drivers/bookmarklet/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/drivers/bookmarklet/images/icons/ZK.png differ
diff --git a/drivers/bookmarklet/images/icons/phpAlbum.png b/drivers/bookmarklet/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/drivers/bookmarklet/images/icons/phpAlbum.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index e9c0a5867..34fe66485 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/chrome/images/icons/MoinMoin.png b/drivers/chrome/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/drivers/chrome/images/icons/MoinMoin.png differ
diff --git a/drivers/chrome/images/icons/SobiPro.png b/drivers/chrome/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/drivers/chrome/images/icons/SobiPro.png differ
diff --git a/drivers/chrome/images/icons/VideoJS.png b/drivers/chrome/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/drivers/chrome/images/icons/VideoJS.png differ
diff --git a/drivers/chrome/images/icons/ZK.png b/drivers/chrome/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/drivers/chrome/images/icons/ZK.png differ
diff --git a/drivers/chrome/images/icons/phpAlbum.png b/drivers/chrome/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/drivers/chrome/images/icons/phpAlbum.png differ
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/firefox-jetpack/images/icons/MoinMoin.png b/drivers/firefox-jetpack/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/MoinMoin.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SobiPro.png b/drivers/firefox-jetpack/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/SobiPro.png differ
diff --git a/drivers/firefox-jetpack/images/icons/VideoJS.png b/drivers/firefox-jetpack/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/VideoJS.png differ
diff --git a/drivers/firefox-jetpack/images/icons/ZK.png b/drivers/firefox-jetpack/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/ZK.png differ
diff --git a/drivers/firefox-jetpack/images/icons/phpAlbum.png b/drivers/firefox-jetpack/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/phpAlbum.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 0c7053621..34fe66485 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/firefox/skin/images/icons/MoinMoin.png b/drivers/firefox/skin/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/drivers/firefox/skin/images/icons/MoinMoin.png differ
diff --git a/drivers/firefox/skin/images/icons/SobiPro.png b/drivers/firefox/skin/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/drivers/firefox/skin/images/icons/SobiPro.png differ
diff --git a/drivers/firefox/skin/images/icons/VideoJS.png b/drivers/firefox/skin/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/drivers/firefox/skin/images/icons/VideoJS.png differ
diff --git a/drivers/firefox/skin/images/icons/ZK.png b/drivers/firefox/skin/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/drivers/firefox/skin/images/icons/ZK.png differ
diff --git a/drivers/firefox/skin/images/icons/phpAlbum.png b/drivers/firefox/skin/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/drivers/firefox/skin/images/icons/phpAlbum.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/html/images/icons/MoinMoin.png b/drivers/html/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/drivers/html/images/icons/MoinMoin.png differ
diff --git a/drivers/html/images/icons/SobiPro.png b/drivers/html/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/drivers/html/images/icons/SobiPro.png differ
diff --git a/drivers/html/images/icons/VideoJS.png b/drivers/html/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/drivers/html/images/icons/VideoJS.png differ
diff --git a/drivers/html/images/icons/ZK.png b/drivers/html/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/drivers/html/images/icons/ZK.png differ
diff --git a/drivers/html/images/icons/phpAlbum.png b/drivers/html/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/drivers/html/images/icons/phpAlbum.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/share/apps.json b/share/apps.json
index e9c0a5867..34fe66485 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/share/images/icons/MoinMoin.png b/share/images/icons/MoinMoin.png
new file mode 100644
index 000000000..3839586cd
Binary files /dev/null and b/share/images/icons/MoinMoin.png differ
diff --git a/share/images/icons/SobiPro.png b/share/images/icons/SobiPro.png
new file mode 100644
index 000000000..b1463bb40
Binary files /dev/null and b/share/images/icons/SobiPro.png differ
diff --git a/share/images/icons/VideoJS.png b/share/images/icons/VideoJS.png
new file mode 100644
index 000000000..1c414feee
Binary files /dev/null and b/share/images/icons/VideoJS.png differ
diff --git a/share/images/icons/ZK.png b/share/images/icons/ZK.png
new file mode 100644
index 000000000..3d2b3182d
Binary files /dev/null and b/share/images/icons/ZK.png differ
diff --git a/share/images/icons/phpAlbum.png b/share/images/icons/phpAlbum.png
new file mode 100644
index 000000000..550aff41c
Binary files /dev/null and b/share/images/icons/phpAlbum.png differ