diff --git a/drivers/firefox/locale/en-UK/wappalyzer.dtd b/drivers/firefox/locale/en-UK/wappalyzer.dtd
new file mode 100755
index 000000000..09aa3de29
--- /dev/null
+++ b/drivers/firefox/locale/en-UK/wappalyzer.dtd
@@ -0,0 +1,56 @@
+<!ENTITY wappalyzer.name              "Wappalyzer">
+<!ENTITY wappalyzer.help              "Wappalyzer - Click for more detail and settings">
+
+<!ENTITY wappalyzer.showIcons         "Show application icons">
+<!ENTITY wappalyzer.preferences       "Options">
+<!ENTITY wappalyzer.addonBar          "Place in addon-bar (press Ctrl+/ to toggle)">
+<!ENTITY wappalyzer.categories        "Categories">
+<!ENTITY wappalyzer.performance       "Performance">
+<!ENTITY wappalyzer.interface         "Interface">
+<!ENTITY wappalyzer.tracking          "Tracking">
+<!ENTITY wappalyzer.research          "Anonymously send reports on detected applications to wappalyzer.com for research">
+<!ENTITY wappalyzer.analyzeHeaders    "Analyze response headers">
+<!ENTITY wappalyzer.analyzeJavaScript "Analyze JavaScript">
+<!ENTITY wappalyzer.analyzeOnload     "Analyze onLoad events">
+
+<!ENTITY wappalyzer.feedback          "Feedback">
+<!ENTITY wappalyzer.github            "Github">
+<!ENTITY wappalyzer.twitter           "Twitter">
+<!ENTITY wappalyzer.website           "Go to wappalyzer.com">
+
+<!ENTITY wappalyzer.cat1              "CMS">
+<!ENTITY wappalyzer.cat2              "Message boards">
+<!ENTITY wappalyzer.cat3              "Database managers">
+<!ENTITY wappalyzer.cat4              "Documentation tools">
+<!ENTITY wappalyzer.cat5              "Widgets">
+<!ENTITY wappalyzer.cat6              "Web shops">
+<!ENTITY wappalyzer.cat7              "Photo galleries">
+<!ENTITY wappalyzer.cat8              "Wikis">
+<!ENTITY wappalyzer.cat9              "Hosting panels">
+<!ENTITY wappalyzer.cat10             "Analytics">
+<!ENTITY wappalyzer.cat11             "Blogs">
+<!ENTITY wappalyzer.cat12             "JavaScript frameworks">
+<!ENTITY wappalyzer.cat13             "Issue trackers">
+<!ENTITY wappalyzer.cat14             "Video players">
+<!ENTITY wappalyzer.cat15             "Comment systems">
+<!ENTITY wappalyzer.cat16             "CAPTCHAs">
+<!ENTITY wappalyzer.cat17             "Font scripts">
+<!ENTITY wappalyzer.cat18             "Web frameworks">
+<!ENTITY wappalyzer.cat19             "Miscellaneous">
+<!ENTITY wappalyzer.cat20             "Editors">
+<!ENTITY wappalyzer.cat21             "LMS">
+<!ENTITY wappalyzer.cat22             "Web servers">
+<!ENTITY wappalyzer.cat23             "Cache tools">
+<!ENTITY wappalyzer.cat24             "Rich text editors">
+<!ENTITY wappalyzer.cat25             "Javascript Graphics">
+<!ENTITY wappalyzer.cat26             "Mobile Frameworks">
+<!ENTITY wappalyzer.cat27             "Programming Languages">
+<!ENTITY wappalyzer.cat28             "Operating Systems">
+<!ENTITY wappalyzer.cat29             "Search Engines">
+<!ENTITY wappalyzer.cat30             "Web Mail">
+<!ENTITY wappalyzer.cat31             "CDN">
+<!ENTITY wappalyzer.cat32             "Marketing Automation">
+<!ENTITY wappalyzer.cat33             "Web Server Extension">
+<!ENTITY wappalyzer.cat34             "Database">
+<!ENTITY wappalyzer.cat35             "Map">
+<!ENTITY wappalyzer.cat36             "Advertising Network">
diff --git a/drivers/firefox/locale/en-UK/wappalyzer.properties b/drivers/firefox/locale/en-UK/wappalyzer.properties
new file mode 100755
index 000000000..45341b4d2
--- /dev/null
+++ b/drivers/firefox/locale/en-UK/wappalyzer.properties
@@ -0,0 +1,40 @@
+wappalyzer.name           = Wappalyzer
+wappalyzer.noAppsDetected = No applications detected
+wappalyzer.addonBar       = Wappalyzer has been placed in the add-on bar.\n\nTo show the add-on bar, close this window and press Ctrl+/.
+
+wappalyzer.cat1	          = CMS
+wappalyzer.cat2	          = Message Board 
+wappalyzer.cat3	          = Database Manager
+wappalyzer.cat4	          = Documentation Tool
+wappalyzer.cat5	          = Widget
+wappalyzer.cat6	          = Web Shop
+wappalyzer.cat7	          = Photo Gallery
+wappalyzer.cat8	          = Wiki
+wappalyzer.cat9	          = Hosting Panel
+wappalyzer.cat10          = Analytics
+wappalyzer.cat11          = Blog
+wappalyzer.cat12          = JavaScript Framework
+wappalyzer.cat13          = Issue Tracker
+wappalyzer.cat14          = Video Player
+wappalyzer.cat15          = Comment System
+wappalyzer.cat16          = CAPTCHA
+wappalyzer.cat17          = Font Script
+wappalyzer.cat18          = Web Framework
+wappalyzer.cat19          = Miscellaneous
+wappalyzer.cat20          = Editor
+wappalyzer.cat21          = LMS
+wappalyzer.cat22          = Web Server
+wappalyzer.cat23          = Cache Tool
+wappalyzer.cat24          = Rich Text Editor
+wappalyzer.cat25          = Javascript Graphics
+wappalyzer.cat26          = Mobile Framework
+wappalyzer.cat27          = Programming Language
+wappalyzer.cat28          = Operating System
+wappalyzer.cat29          = Search Engine
+wappalyzer.cat30          = Web Mail
+wappalyzer.cat31          = CDN
+wappalyzer.cat32          = Marketing Automation
+wappalyzer.cat33          = Web Server Extension
+wappalyzer.cat34          = Database
+wappalyzer.cat35          = Map 
+wappalyzer.cat36          = Advertising Network
diff --git a/share/apps.json b/share/apps.json
index a068f1848..4ad4503d2 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -990,7 +990,7 @@
     "Locomotive": {
       "cats": [ 1 ],
       "html": "\/sites\/[a-zA-Z0-9]{24}\/theme\/stylesheets\/",
-      "implies": [ "Ruby", "Ruby on Rails" ]
+      "implies": [ "Ruby", "Ruby on Rails", "MongoDB" ]
     },
 		"Lotus Domino": {
 			"cats": [ 22 ],
@@ -1130,6 +1130,9 @@
 			"headers": { "Server": "Mongrel" },
 			"implies": [ "Ruby" ]
 		},
+		"MongoDB": {
+			"cats": [ 24 ]
+		},
 		"Moodle": {
 			"cats": [ 21 ],
 			"html": "(var moodleConfigFn = function\\(me\\)|<img[^>]+moodlelogo)",
@@ -1167,6 +1170,9 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "Mynetcap" }
 		},
+		"MySQL": {
+			"cats": [ 24 ]
+		},
 		"Nedstat": {
 			"cats": [ 10 ],
 			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
@@ -1331,7 +1337,7 @@
 		"phpMyAdmin": {
 			"cats": [ 3 ],
 			"html": "(var pma_absolute_uri = '|PMA_sendHeaderLocation\\(|<title>phpMyAdmin</title>)",
-			"implies": [ "PHP" ]
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"PHP-Nuke": {
 			"cats": [ 2 ],
diff --git a/share/images/icons/MongoDB.png b/share/images/icons/MongoDB.png
new file mode 100644
index 000000000..5d499fe2f
Binary files /dev/null and b/share/images/icons/MongoDB.png differ
diff --git a/share/images/icons/MySQL.png b/share/images/icons/MySQL.png
new file mode 100644
index 000000000..96af0876f
Binary files /dev/null and b/share/images/icons/MySQL.png differ