diff --git a/content.js b/content.js
index 78fdc17..b5f749b 100644
--- a/content.js
+++ b/content.js
@@ -2,30 +2,61 @@
 chrome.runtime.onMessage.addListener(
   function(request, sender, sendResponse) {
     if( request.message === "clicked_browser_action" ) {
-      //var firstHref = $("a[href^='http']").eq(0).attr("href");
 
-			url = window.location.href + '/wp-content/plugins/bb-plugin/changelog.txt'
-    //  console.log(url);
+			bbplugin = window.location.href + '/wp-content/plugins/bb-plugin/changelog.txt'
+			bbtheme = window.location.href + '/wp-content/themes/bb-theme/changelog.txt'
+			themer = window.location.href + '/wp-content/plugins/bb-theme-builder/changelog.txt'
 
-		$.get( url, function(data) {
+			var bboutput = false;
 
-			if( data.length < 1 ) {
-				return false;
+			result = GetResult( bbplugin )
+			version = ParseResult( result )
+			if( version ) {
+				bboutput = 'Beaver Builder version ' + version + ' detected!\n'
 			}
-			var lines = data.split("\n");
-			line = lines[0]
 
-			versions = line.match(/<h4>([0-9\.]+)/)
-
-			if(typeof(versions[1]) != "undefined" && versions[1] !== null) {
-				alert( 'BB version ' + versions[1] + ' detected!' )
+			result = GetResult( bbtheme )
+			version = ParseResult( result )
+			if( version ) {
+				bboutput += 'Beaver Theme version ' + version + ' detected!\n'
 			}
 
+			result = GetResult( themer )
+			version = ParseResult( result )
+			if( version ) {
+				bboutput += 'Beaver Themer version ' + version + ' detected!\n'
+			}
 
-			//$("#dynamicdate").html(data);
-		});
-      // This line is new!
-    //  chrome.runtime.sendMessage({"message": "open_new_tab", "url": url});
+			if( bboutput ) {
+				alert( bboutput )
+			}
     }
   }
 );
+
+function ParseResult( data ) {
+	if( data.length < 1 ) {
+		return false;
+	}
+	var lines = data.split("\n");
+	line = lines[0]
+	versions = line.match(/<h4>([a-z0-9\.-]+)/)
+	if( typeof( versions[1] ) != "undefined" && versions[1] !== null ) {
+		return versions[1];
+	}
+	return false;
+}
+
+function GetResult( url ) {
+     var result = null;
+     $.ajax({
+        url: url,
+        type: 'get',
+        dataType: 'html',
+        async: false,
+        success: function(data) {
+            result = data;
+        }
+     });
+     return result;
+}
diff --git a/manifest.json b/manifest.json
index 64240a0..a85f623 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "BB Detector",
   "description": "Detects Beaver Builder version string.",
-  "version": "0.1",
+  "version": "0.2",
   "background": {
     "scripts": ["background.js"]
   },