diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 000a27d19..179e52e49 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/chrome/_locales/en/messages.json b/drivers/chrome/_locales/en/messages.json
index cdcd5119f..1a1ee7696 100644
--- a/drivers/chrome/_locales/en/messages.json
+++ b/drivers/chrome/_locales/en/messages.json
@@ -44,5 +44,8 @@
 	"categoryName30":           { "message": "Web Mail" },
 	"categoryName31":           { "message": "CDN" },
 	"categoryName32":           { "message": "Marketing Automation" },
-	"categoryName33":           { "message": "Web Server Extensions" }
+	"categoryName33":           { "message": "Web Server Extension" },
+	"categoryName34":           { "message": "Database" },
+	"categoryName35":           { "message": "Map" },
+	"categoryName36":           { "message": "Advertizing Netork" }
 }
diff --git a/drivers/chrome/_locales/fr/messages.json b/drivers/chrome/_locales/fr/messages.json
index 1bc071eb8..461f640a8 100644
--- a/drivers/chrome/_locales/fr/messages.json
+++ b/drivers/chrome/_locales/fr/messages.json
@@ -102,7 +102,16 @@
       "message": "Logiciel de marketing"
    },
    "categoryName33": {
-      "message": "Web Server Extensions"
+      "message": "Web Server Extension"
+   },
+   "categoryName34": {
+      "message": "Database"
+   },
+   "categoryName35": {
+      "message": "Map"
+   },
+   "categoryName36": {
+      "message": "Advertzing Network"
    },
    "github": {
       "message": "Forker Wappalyzer sur GitHub!"
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 000a27d19..179e52e49 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 982d47939..876bcef13 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -194,6 +194,7 @@
 			21, // LMS
 			 7, // Photo Gallery
 			 3, // Database Manager
+			34, // Database
 			 4, // Documentation Tool
 			 9, // Hosting Panel
 			29, // Search Engine
@@ -211,10 +212,12 @@
 			23, // Cache Tool
 			17, // Font Script
 			24, // Rich Text Editor
+			35, // Map
 			 5, // Widget
 			14, // Video Player
 			16, // Captcha
-			33, // Web Server Extensions
+			33, // Web Server Extension
+			36, // Advertising Network
 			19  // Miscellaneous
 			]
 	};
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 000a27d19..179e52e49 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 000a27d19..179e52e49 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index e899fc6f4..3eb7087d8 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -48,6 +48,7 @@
 			<preference id="wappalyzer-cat31" name="extensions.wappalyzer.cat31" type="bool"/>
 			<preference id="wappalyzer-cat32" name="extensions.wappalyzer.cat32" type="bool"/>
 			<preference id="wappalyzer-cat33" name="extensions.wappalyzer.cat33" type="bool"/>
+			<preference id="wappalyzer-cat34" name="extensions.wappalyzer.cat34" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -95,50 +96,56 @@
 					</columns>
 					<rows>
 						<row>
-							<checkbox preference="wappalyzer-cat1"  label="&wappalyzer.cat1;" />
-							<checkbox preference="wappalyzer-cat2"  label="&wappalyzer.cat2;" />
-							<checkbox preference="wappalyzer-cat3"  label="&wappalyzer.cat3;" />
-							<checkbox preference="wappalyzer-cat4"  label="&wappalyzer.cat4;" />
-							<checkbox preference="wappalyzer-cat5"  label="&wappalyzer.cat5;" />
+							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat36;"/><!-- Advertising networks-->
+							<checkbox preference="wappalyzer-cat10" label="&wappalyzer.cat10;"/><!-- Analytics -->
+							<checkbox preference="wappalyzer-cat11" label="&wappalyzer.cat11;"/><!-- Blogs -->
+							<checkbox preference="wappalyzer-cat23" label="&wappalyzer.cat23;"/><!-- Cache tools -->
+							<checkbox preference="wappalyzer-cat16" label="&wappalyzer.cat16;"/><!-- CAPTCHAs -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat6"  label="&wappalyzer.cat6;" />
-							<checkbox preference="wappalyzer-cat7"  label="&wappalyzer.cat7;" />
-							<checkbox preference="wappalyzer-cat8"  label="&wappalyzer.cat8;" />
-							<checkbox preference="wappalyzer-cat9"  label="&wappalyzer.cat9;" />
-							<checkbox preference="wappalyzer-cat10" label="&wappalyzer.cat10;"/>
+							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat31;"/><!-- CDN -->
+							<checkbox preference="wappalyzer-cat1"  label="&wappalyzer.cat1;" /><!-- CMS -->
+							<checkbox preference="wappalyzer-cat15" label="&wappalyzer.cat15;"/><!-- Comment systems -->
+							<checkbox preference="wappalyzer-cat34" label="&wappalyzer.cat34;"/><!-- Database -->
+							<checkbox preference="wappalyzer-cat3"  label="&wappalyzer.cat3;" /><!-- Database managers -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat11" label="&wappalyzer.cat11;"/>
-							<checkbox preference="wappalyzer-cat12" label="&wappalyzer.cat12;"/>
-							<checkbox preference="wappalyzer-cat13" label="&wappalyzer.cat13;"/>
-							<checkbox preference="wappalyzer-cat14" label="&wappalyzer.cat14;"/>
-							<checkbox preference="wappalyzer-cat15" label="&wappalyzer.cat15;"/>
+							<checkbox preference="wappalyzer-cat4"  label="&wappalyzer.cat4;" /><!-- Documentation tools -->
+							<checkbox preference="wappalyzer-cat20" label="&wappalyzer.cat20;"/><!-- Editors -->
+							<checkbox preference="wappalyzer-cat17" label="&wappalyzer.cat17;"/><!-- Font scripts -->
+							<checkbox preference="wappalyzer-cat9"  label="&wappalyzer.cat9;" /><!-- Hosting panels -->
+							<checkbox preference="wappalyzer-cat13" label="&wappalyzer.cat13;"/><!-- Issue trackers -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat16" label="&wappalyzer.cat16;"/>
-							<checkbox preference="wappalyzer-cat17" label="&wappalyzer.cat17;"/>
-							<checkbox preference="wappalyzer-cat18" label="&wappalyzer.cat18;"/>
-							<checkbox preference="wappalyzer-cat19" label="&wappalyzer.cat19;"/>
-							<checkbox preference="wappalyzer-cat20" label="&wappalyzer.cat20;"/>
+							<checkbox preference="wappalyzer-cat12" label="&wappalyzer.cat12;"/><!-- JavaScript frameworks -->
+							<checkbox preference="wappalyzer-cat25" label="&wappalyzer.cat25;"/><!-- Javascript graphics -->
+							<checkbox preference="wappalyzer-cat21" label="&wappalyzer.cat21;"/><!-- LMS -->
+							<checkbox preference="wappalyzer-cat35" label="&wappalyzer.cat35;"/><!-- Maps -->
+							<checkbox preference="wappalyzer-cat32" label="&wappalyzer.cat32;"/><!-- Marketing automation -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat21" label="&wappalyzer.cat21;"/>
-							<checkbox preference="wappalyzer-cat22" label="&wappalyzer.cat22;"/>
-							<checkbox preference="wappalyzer-cat23" label="&wappalyzer.cat23;"/>
-							<checkbox preference="wappalyzer-cat24" label="&wappalyzer.cat24;"/>
-							<checkbox preference="wappalyzer-cat25" label="&wappalyzer.cat25;"/>
+							<checkbox preference="wappalyzer-cat2"  label="&wappalyzer.cat2;" /><!-- Message boards -->
+							<checkbox preference="wappalyzer-cat19" label="&wappalyzer.cat19;"/><!-- Miscellaneous -->
+							<checkbox preference="wappalyzer-cat26" label="&wappalyzer.cat26;"/><!-- Mobile frameworks -->
+							<checkbox preference="wappalyzer-cat28" label="&wappalyzer.cat28;"/><!-- Operating systems -->
+							<checkbox preference="wappalyzer-cat7"  label="&wappalyzer.cat7;" /><!-- Photo galleries -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat26" label="&wappalyzer.cat26;"/>
-							<checkbox preference="wappalyzer-cat27" label="&wappalyzer.cat27;"/>
-							<checkbox preference="wappalyzer-cat28" label="&wappalyzer.cat28;"/>
-							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat29;"/>
-							<checkbox preference="wappalyzer-cat30" label="&wappalyzer.cat30;"/>
+							<checkbox preference="wappalyzer-cat27" label="&wappalyzer.cat27;"/><!-- Programming languages -->
+							<checkbox preference="wappalyzer-cat24" label="&wappalyzer.cat24;"/><!-- Rich text editors -->
+							<checkbox preference="wappalyzer-cat29" label="&wappalyzer.cat29;"/><!-- Search engines -->
+							<checkbox preference="wappalyzer-cat14" label="&wappalyzer.cat14;"/><!-- Video players -->
+							<checkbox preference="wappalyzer-cat18" label="&wappalyzer.cat18;"/><!-- Web frameworks -->
 						</row>
 						<row>
-							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat31;"/>
-							<checkbox preference="wappalyzer-cat32" label="&wappalyzer.cat31;"/>
+							<checkbox preference="wappalyzer-cat30" label="&wappalyzer.cat30;"/><!-- Web mail -->
+							<checkbox preference="wappalyzer-cat22" label="&wappalyzer.cat22;"/><!-- Web servers -->
+							<checkbox preference="wappalyzer-cat33" label="&wappalyzer.cat33;"/><!-- Web server extensions -->
+							<checkbox preference="wappalyzer-cat6"  label="&wappalyzer.cat6;" /><!-- Web shops -->
+							<checkbox preference="wappalyzer-cat5"  label="&wappalyzer.cat5;" /><!-- Widgets -->
+						</row>
+						<row>
+							<checkbox preference="wappalyzer-cat8"  label="&wappalyzer.cat8;" /><!-- Wikis -->
 						</row>
 					</rows>
 				</grid>
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.dtd b/drivers/firefox/locale/de-DE/wappalyzer.dtd
index 236bc6cff..c1df0cfe4 100755
--- a/drivers/firefox/locale/de-DE/wappalyzer.dtd
+++ b/drivers/firefox/locale/de-DE/wappalyzer.dtd
@@ -50,4 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automation">
-<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat33             "Web Server Extension">
+<!ENTITY wappalyzer.cat34             "Database">
+<!ENTITY wappalyzer.cat35             "Map">
+<!ENTITY wappalyzer.cat36             "Advertizing Network">
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.properties b/drivers/firefox/locale/de-DE/wappalyzer.properties
index e905a10fe..90ea8a16c 100755
--- a/drivers/firefox/locale/de-DE/wappalyzer.properties
+++ b/drivers/firefox/locale/de-DE/wappalyzer.properties
@@ -34,4 +34,7 @@ wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web mail
 wappalyzer.cat31          = CDN
 wappalyzer.cat32          = Marketing Automation
-wappalyzer.cat33          = Web Server Extensions
+wappalyzer.cat33          = Web Server Extension
+wappalyzer.cat34          = Database
+wappalyzer.cat35          = Map 
+wappalyzer.cat36          = Advertizing Network
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index b53b531f7..6f8ef8982 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -50,4 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automation">
-<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat33             "Web Server Extension">
+<!ENTITY wappalyzer.cat34             "Database">
+<!ENTITY wappalyzer.cat35             "Map">
+<!ENTITY wappalyzer.cat36             "Advertizing Network">
diff --git a/drivers/firefox/locale/en-US/wappalyzer.properties b/drivers/firefox/locale/en-US/wappalyzer.properties
index 0f4d3ff9f..576bdf83d 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.properties
+++ b/drivers/firefox/locale/en-US/wappalyzer.properties
@@ -34,4 +34,7 @@ wappalyzer.cat29          = Search Engine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
 wappalyzer.cat32          = Marketing Automation
-wappalyzer.cat33          = Web Server Extensions
+wappalyzer.cat33          = Web Server Extension
+wappalyzer.cat34          = Database
+wappalyzer.cat35          = Map 
+wappalyzer.cat36          = Advertizing Network
diff --git a/drivers/firefox/locale/fr-FR/wappalyzer.dtd b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
index 6c99ff207..33c2ffe26 100644
--- a/drivers/firefox/locale/fr-FR/wappalyzer.dtd
+++ b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
@@ -50,4 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Logiciel de marketing">
-<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat33             "Web Server Extension">
+<!ENTITY wappalyzer.cat34             "Database">
+<!ENTITY wappalyzer.cat35             "Map">
+<!ENTITY wappalyzer.cat36             "Advertizing Network">
diff --git a/drivers/firefox/locale/fr-FR/wappalyzer.properties b/drivers/firefox/locale/fr-FR/wappalyzer.properties
index b60d698b6..dceb57cc3 100644
--- a/drivers/firefox/locale/fr-FR/wappalyzer.properties
+++ b/drivers/firefox/locale/fr-FR/wappalyzer.properties
@@ -34,4 +34,7 @@ wappalyzer.cat29          = Moteur de recherche
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
 wappalyzer.cat32          = Logiciel de marketing
-wappalyzer.cat33          = Web Server Extensions
+wappalyzer.cat33          = Web Server Extension
+wappalyzer.cat34          = Database
+wappalyzer.cat35          = Map 
+wappalyzer.cat36          = Advertizing Network
diff --git a/drivers/firefox/locale/nl-NL/wappalyzer.dtd b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
index 65811d90e..230edc0ed 100755
--- a/drivers/firefox/locale/nl-NL/wappalyzer.dtd
+++ b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
@@ -49,4 +49,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automatisering">
-<!ENTITY wappalyzer.cat33             "Web Server Extenties">
+<!ENTITY wappalyzer.cat33             "Web Server Extentie">
+<!ENTITY wappalyzer.cat34             "Database">
+<!ENTITY wappalyzer.cat35             "Map">
+<!ENTITY wappalyzer.cat36             "Advertizing Network">
diff --git a/drivers/firefox/locale/nl-NL/wappalyzer.properties b/drivers/firefox/locale/nl-NL/wappalyzer.properties
index 998ea4450..572e0ede8 100755
--- a/drivers/firefox/locale/nl-NL/wappalyzer.properties
+++ b/drivers/firefox/locale/nl-NL/wappalyzer.properties
@@ -34,4 +34,7 @@ wappalyzer.cat29          = Zoek Machine
 wappalyzer.cat30          = Web Mail
 wappalyzer.cat31          = CDN
 wappalyzer.cat32          = Marketing Automatisering
-wappalyzer.cat33          = Web Server Extenties
+wappalyzer.cat33          = Web Server Extentie
+wappalyzer.cat34          = Database
+wappalyzer.cat35          = Landkaart
+wappalyzer.cat36          = Advertentie Netwerk
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 000a27d19..179e52e49 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 000a27d19..179e52e49 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/share/apps.json b/share/apps.json
index 000a27d19..179e52e49 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -32,7 +32,10 @@
 		"30": "web-mail",
 		"31": "cdn",
 		"32": "marketing-automation",
-		"33": "web-server-extension"
+		"33": "web-server-extension",
+		"34": "databases",
+		"35": "maps",
+		"36": "advertizing-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -1712,7 +1715,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>]+css",
+			"html": "<link[^>]+bootstrap[^>"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {