diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 4d9f5caa1..10e878c6e 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.20",
+	"version": "2.21",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 88cbcdea1..63e9649f9 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.7.0</em:version>
+		<em:version>2.7.1</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -12,7 +12,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>20.*</em:maxVersion>
+				<em:maxVersion>22.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],
diff --git a/share/apps.json b/share/apps.json
index eb038e45f..b71fe4cf2 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -410,7 +410,7 @@
 			"website": "commerceserver.net",
 			"cats": [ 6 ],
 			"headers": { "COMMERCE-SERVER-SOFTWARE": ".+" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"comScore": {
 			"website": "comscore.com",
@@ -711,7 +711,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
 			"headers": { "Set-Cookie": "EPi(?:Trace|Server)[^;]*=" },
-			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
+			"implies": [ "Microsoft ASP.NET" ]
 		},
 		"EPrints": {
 			"website": "www.eprints.org",
@@ -1371,7 +1371,7 @@
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
-			"implies": [ "IIS", "Windows Server" ]
+			"implies": [ "IIS\\;confidence:50" ]
 		},
 		"Microsoft SharePoint": {
 			"website": "sharepoint.microsoft.com",
@@ -1487,6 +1487,11 @@
 			"website": "www.mongodb.org",
 			"cats": [ 24 ]
 		},
+		"Mono": {
+			"website": "mono-project.com",
+			"cats": [ 18 ],
+			"headers": { "X-Powered-By": "Mono" }
+		},
 		"Moodle": {
 			"website": "moodle.org",
 			"cats": [ 21 ],