From c34f89f58df92d33d97757738aafbe03ac883e53 Mon Sep 17 00:00:00 2001
From: Andrew Van Tassel <andrew@andrewvantassel.com>
Date: Mon, 26 Dec 2016 12:42:40 -0700
Subject: [PATCH] Removed old js and css Updated locales

---
 chrome.manifest                               |   2 -
 .../images/btn-add-to-slack-122x35.png        | Bin 3921 -> 0 bytes
 chrome/content/mailhops.js                    |   2 +-
 chrome/content/msgNotificationBar.js          |  11 +-
 chrome/content/msgNotificationBar.xul         |   2 +-
 chrome/content/pb-overlay.js                  | 504 ------------------
 chrome/content/pb-overlay.xul                 |  82 ---
 chrome/content/tb-overlay.js                  | 322 -----------
 chrome/content/tb-overlay.xul                 |  44 --
 chrome/content/utils.js                       |  14 -
 chrome/locale/de/strings.dtd                  |   4 +-
 chrome/locale/de/strings.properties           |   3 +-
 chrome/locale/en/strings.dtd                  |   2 -
 chrome/locale/en/strings.properties           |   4 +-
 chrome/locale/es/strings.dtd                  |   4 +-
 chrome/locale/es/strings.properties           |   3 +-
 chrome/locale/fr/strings.dtd                  |   4 +-
 chrome/locale/fr/strings.properties           |   2 +-
 chrome/locale/ja/strings.dtd                  |   4 +-
 chrome/locale/ja/strings.properties           |   3 +-
 chrome/locale/pt-BR/strings.dtd               |   4 +-
 chrome/locale/pt-BR/strings.properties        |   3 +-
 chrome/locale/ru/strings.dtd                  |   4 +-
 chrome/locale/ru/strings.properties           |   3 +-
 chrome/locale/zh-CN/strings.dtd               |   4 +-
 chrome/locale/zh-CN/strings.properties        |   3 +-
 ...tion-styles.css => msgNotificationBar.css} |   0
 chrome/skin/classic/pb-styles.css             | 157 ------
 chrome/skin/classic/tb-styles.css             |  32 --
 install.rdf                                   |   3 +-
 30 files changed, 26 insertions(+), 1203 deletions(-)
 delete mode 100644 chrome/content/images/btn-add-to-slack-122x35.png
 delete mode 100644 chrome/content/pb-overlay.js
 delete mode 100644 chrome/content/pb-overlay.xul
 delete mode 100644 chrome/content/tb-overlay.js
 delete mode 100644 chrome/content/tb-overlay.xul
 rename chrome/skin/classic/{mh-notification-styles.css => msgNotificationBar.css} (100%)
 delete mode 100644 chrome/skin/classic/pb-styles.css
 delete mode 100644 chrome/skin/classic/tb-styles.css

diff --git a/chrome.manifest b/chrome.manifest
index 050468c..c29d2eb 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -10,9 +10,7 @@ locale    mailhops   ru             jar:chrome/mailhops.jar!/locale/ru/
 locale    mailhops   zh-CN          jar:chrome/mailhops.jar!/locale/zh-CN/
 
 # Postbox
-# overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://mailhops/content/pb-overlay.xul application=postbox@postbox-inc.com
 overlay chrome://messenger/content/mailWindowOverlay.xul chrome://mailhops/content/msgNotificationBar.xul application=postbox@postbox-inc.com
 
 # Thunberbird
-# overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://mailhops/content/tb-overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
 overlay chrome://messenger/content/mailWindowOverlay.xul chrome://mailhops/content/msgNotificationBar.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
diff --git a/chrome/content/images/btn-add-to-slack-122x35.png b/chrome/content/images/btn-add-to-slack-122x35.png
deleted file mode 100644
index f2661ae002f55e7e2d5c2f9a94aba6de690e3306..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3921
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
S&zD`g0swAkW<b_+$NU#fOJ%PB

diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 22b04e8..c0399b8 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -9,7 +9,7 @@ var mailHops =
   msgURI:	null,
   isLoaded: false,
   options: {
-      'version':'MailHops Plugin 2.0.0',
+      'version':'MailHops Plugin 3.0.0',
       'lan':'en',
       'unit':'mi',
       'api_http':'https://',
diff --git a/chrome/content/msgNotificationBar.js b/chrome/content/msgNotificationBar.js
index c59f3e5..997297b 100644
--- a/chrome/content/msgNotificationBar.js
+++ b/chrome/content/msgNotificationBar.js
@@ -10,12 +10,14 @@ var mailHopsDisplay =
   mailhopsDataPaneDNSBL:  null,
   mailhopsResultWeather:  null,
   mailhopsUnsubscribe:    null,
+  mailhopsNoficationBox:  null,
   options:                null,
 
   init: function(options){
 
     this.options = options;
 
+    this.mailhopsNoficationBox = document.getElementById("mailhopsNoficationBox");
     this.container = document.getElementById("mailhopsBox");
     this.resultBox = document.getElementById("mailhopsResult");
     this.resultText = document.getElementById("mailhopsResultText");
@@ -184,10 +186,13 @@ var mailHopsDisplay =
         this.resultDetails.removeChild(this.resultDetails.firstChild);
     }
 
-    if(no_ips)
+    if(no_ips){
+      this.resultText.style.backgroundImage = "url('chrome://mailhops/content/images/local.png')";
       this.resultText.value = ' Looks like a local message';
-    else
+    } else {
+      this.resultText.style.backgroundImage = "url('chrome://mailhops/content/images/refresh.png')";
       this.resultText.value = ' Looking Up Route...';
+    }
   },
 
   route: function ( header_route, message, response, meta, lookup_url ){
@@ -296,7 +301,7 @@ var mailHopsDisplay =
     //set weather of sender
     if(weatherRoute){
       this.mailhopsResultWeather.style.display = 'block';
-      this.mailhopsResultWeather.setAttribute('tooltiptext','Weather');
+      this.mailhopsResultWeather.setAttribute('tooltiptext','Weather in '+weatherRoute.city+' '+weatherRoute.state);
       this.mailhopsResultWeather.value = weatherRoute.weather.summary+' '+Math.round(weatherRoute.weather.temp)+'\u00B0';
       this.mailhopsResultWeather.style.backgroundImage = 'url('+mailHopsUtils.getWeatherIcon(weatherRoute.weather.icon)+')';
       if(weatherRoute.coords)
diff --git a/chrome/content/msgNotificationBar.xul b/chrome/content/msgNotificationBar.xul
index a5f8bb8..19885b0 100644
--- a/chrome/content/msgNotificationBar.xul
+++ b/chrome/content/msgNotificationBar.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE overlay SYSTEM "chrome://mailhops/locale/strings.dtd" >
 
-<?xml-stylesheet href="chrome://mailhops/skin/mh-notification-styles.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mailhops/skin/msgNotificationBar.css" type="text/css"?>
 
 <overlay id="mailhopsNotificationOverlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/chrome/content/pb-overlay.js b/chrome/content/pb-overlay.js
deleted file mode 100644
index a080c19..0000000
--- a/chrome/content/pb-overlay.js
+++ /dev/null
@@ -1,504 +0,0 @@
-var mailHopsDisplay =
-{
-  resultTextDataPane:		null,
-  resultTextDataPane2:		null,
-  resultTextDataPane3:      null,
-  resultContainerDataPane:	null,
-  resultContainerDetails: 	null,
-  resultDetails:			null,
-  resultMapLink:			null,
-  resultSlackLink:    null,
-  mailhopsDataPaneSPF:		null,
-  mailhopsDataPaneDKIM:		null,
-  mailhopsDataPaneMailer:	null,
-  mailhopsDataPaneDNSBL:	null,
-  mailhopsListContainer:	null,
-  mailhopsAuthContainer:	null,
-  resultListDataPane:		null,
-  resultMeta:				null,
-  options: 					null,
-
-  init: function(options){
-
-  	  this.options = options;
-
-  	  this.resultContainerDataPane = document.getElementById ( "mailhopsDataPane");
-  	  this.resultTextDataPane = document.getElementById ( "mailhopsDataPaneText");
-  	  this.resultTextDataPane2 = document.getElementById ( "mailhopsDataPaneText2");
-  	  this.resultTextDataPane3 = document.getElementById ( "mailhopsDataPaneText3");
-
-  	  this.resultContainerDetails = document.getElementById ( "mailhopsDetailsContainer");
-  	  this.resultDetails = document.getElementById ( "mailhopsDataPaneDetails");
-  	  this.resultMeta = document.getElementById ( "mailhopsDataPaneMeta");
-  	  this.resultMapLink = document.getElementById ( "mailhopsDataPaneMapLink");
-      this.resultSlackLink = document.getElementById ( "mailhopsDataPaneSlackLink");
-
-  	  //auth
-  	  this.mailhopsAuthContainer = document.getElementById ( "dataPaneMailHopsAuthContainer");
-  	  this.mailhopsDataPaneSPF = document.getElementById ( "mailhopsDataPaneSPF");
-  	  this.mailhopsDataPaneDKIM = document.getElementById ( "mailhopsDataPaneDKIM");
-  	  this.mailhopsDataPaneMailer = document.getElementById ( "mailhopsDataPaneMailer");
-  	  this.mailhopsDataPaneDNSBL = document.getElementById ( "mailhopsDataPaneDNSBL");
-  	  //list
-  	  this.mailhopsListContainer = document.getElementById ( "dataPaneMailHopsListContainer");
-
-  	  this.resultListDataPane = document.getElementById ( "mailhopsListDataPane");
-
-  	  if(this.options.show_meta)
-   	    document.getElementById('dataPaneMailHopsMetaContainer').style.display='';
-   	  else
-   	  	document.getElementById('dataPaneMailHopsMetaContainer').style.display='none';
-
-  	  //event listner for route click to launch map
-  	  this.resultMapLink.addEventListener("click", function () {
-	  		if(this.hasAttribute("data-route"))
-		  		mailHopsUtils.launchMap( String(this.getAttribute("data-route")), options );
-	  	});
-
-  	  this.mailhopsDataPaneDNSBL.addEventListener("click", function () {
-  			if(this.hasAttribute('data-ip'))
-  		  		mailHopsUtils.launchSpamHausURL(this.getAttribute('data-ip'));
-	  	});
-
-      this.resultSlackLink.addEventListener("click", function () {
-        mailHopsUtils.postToWebhook( String(this.getAttribute("data-api_url")), options );
-	  	});
-
-	  //display auth
-	  if(!this.options.show_auth)
-		  this.displayResultAuth(headXMailer,headUserAgent,headXMimeOLE,headAuth,headReceivedSPF);
-	  else
-	    this.mailhopsAuthContainer.style.display='none';
-
-  }, //end init
-
-  lists: function( header_unsubscribe ){
-  	while(this.resultListDataPane.firstChild) {
-    	this.resultListDataPane.removeChild(this.resultListDataPane.firstChild);
-  	}
-  	this.mailhopsListContainer.style.display='';
-  	if(header_unsubscribe){
-  		var listArr=header_unsubscribe.split(',');
-  		var href='';
-  		if(listArr.length){
-  			for(var h=0;h<listArr.length;h++){
-  				href = listArr[h].replace('<','').replace('>','');
-  				var label = document.createElement('label');
-
-  				label.setAttribute('class','text-link dataPaneURLitem');
-
-  				if(href.indexOf('mailto:')!=-1){
-  					label.setAttribute('value','Unsubscribe via Email');
-  					if(href.toLowerCase().indexOf('subject=')==-1){
-  						if(href.indexOf('?')==-1)
-  							href+='?subject=Unsubscribe';
-  						else
-  							href+='&subject=Unsubscribe';
-  					}
-  				}
-  				else{
-  					label.setAttribute('value','Unsubscribe via Web');
-  				}
-  				label.setAttribute('tooltiptext',href);
-  				label.setAttribute('href',href);
-  				this.resultListDataPane.appendChild(label);
-  			}
-  		}
-  	}
-  },
-
-  auth: function( header_xmailer, header_useragent, header_xmimeole, header_auth, header_spf ){
-  	this.mailhopsAuthContainer.style.display='';
-  	//SPF
-  	if(header_spf){
-  		header_spf=header_spf.replace(/^\s+/,"");
-  		var headerSPFArr=header_spf.split(' ');
-  		this.mailhopsDataPaneSPF.setAttribute('value','SPF: '+headerSPFArr[0]);
-  		this.mailhopsDataPaneSPF.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+headerSPFArr[0]+'.png)';
-  		this.mailhopsDataPaneSPF.setAttribute('tooltiptext',header_spf+'\n'+mailHopsUtils.spf(headerSPFArr[0]));
-  		this.mailhopsDataPaneSPF.style.display='block';
-  	} else {
-  		this.mailhopsDataPaneSPF.style.display='none';
-  	}
-  	//Authentication-Results
-  	//http://tools.ietf.org/html/rfc5451
-  	if(header_auth){
-  		var headerAuthArr=header_auth.split(';');
-  		var dkim_result;
-  		var spf_result;
-  		for(var h=0;h<headerAuthArr.length;h++){
-  			if(headerAuthArr[h].indexOf('dkim=')!=-1){
-  				dkim_result = headerAuthArr[h];
-  				if(header_spf)
-  					break;
-  			}
-  			if(!header_spf && headerAuthArr[h].indexOf('spf=')!=-1){
-  				spf_result = headerAuthArr[h];
-  				if(dkim_result)
-  					break;
-  			}
-  		}
-
-  		if(this.options.show_dkim && dkim_result){
-  			dkim_result=dkim_result.replace(/^\s+/,"");
-  			var dkimArr=dkim_result.split(' ');
-  			this.mailhopsDataPaneDKIM.setAttribute('value','DKIM: '+dkimArr[0].replace('dkim=',''));
-  			this.mailhopsDataPaneDKIM.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+dkimArr[0].replace('dkim=','')+'.png)';
-  			this.mailhopsDataPaneDKIM.setAttribute('tooltiptext',dkim_result+'\n'+mailHopsUtils.dkim(dkimArr[0].replace('dkim=','')));
-  			this.mailhopsDataPaneDKIM.style.display='block';
-  		} else {
-  			this.mailhopsDataPaneDKIM.style.display='none';
-  		}
-
-  		if(this.options.show_spf && spf_result){
-  			spf_result=spf_result.replace(/^\s+/,"");
-  			var spfArr=spf_result.split(' ');
-  			this.mailhopsDataPaneSPF.setAttribute('value','SPF: '+spfArr[0].replace('spf=',''));
-  			this.mailhopsDataPaneSPF.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+spfArr[0].replace('spf=','')+'.png)';
-  			this.mailhopsDataPaneSPF.setAttribute('tooltiptext',spf_result+'\n'+mailHopsUtils.spf(spfArr[0].replace('spf=','')));
-  			this.mailhopsDataPaneSPF.style.display='block';
-  		}
-  	} else {
-  		this.mailhopsDataPaneDKIM.style.display='none';
-  	}
-  	//X-Mailer, User-Agent or X-MimeOLE
-  	if(header_xmailer){
-  		this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-  		if(header_xmailer.indexOf('(')!=-1)
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer.substring(0,header_xmailer.indexOf('(')));
-  		else if(header_xmailer.indexOf('[')!=-1)
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer.substring(0,header_xmailer.indexOf('[')));
-  		else
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer);
-  		this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_xmailer);
-  		this.mailhopsDataPaneMailer.style.display='block';
-  	} else if(header_useragent){
-  		this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-  		if(header_useragent.indexOf('(')!=-1)
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_useragent.substring(0,header_useragent.indexOf('(')));
-  		else if(header_useragent.indexOf('[')!=-1)
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_useragent.substring(0,header_useragent.indexOf('[')));
-  		else
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_useragent);
-  		this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_useragent);
-  		this.mailhopsDataPaneMailer.style.display='block';
-  	} else if(header_xmimeole){
-  		this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-
-  		if(header_xmimeole.indexOf('(')!=-1)
-  			header_xmimeole = header_xmimeole.substring(0,header_xmimeole.indexOf('('));
-  		else if(header_xmimeole.indexOf('[')!=-1)
-  			header_xmimeole = header_xmimeole.substring(0,header_xmimeole.indexOf('['));
-
-  		if(header_xmimeole.indexOf('Produced By ')!=-1)
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_xmimeole.replace('Produced By ',''));
-  		else
-  			this.mailhopsDataPaneMailer.setAttribute('value',header_xmimeole);
-
-  		this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_xmimeole);
-  		this.mailhopsDataPaneMailer.style.display='block';
-  	} else {
-  		this.mailhopsDataPaneMailer.style.display='none';
-  	}
-  },
-
-  error: function(status,data){
-  	this.resultMapLink.removeAttribute("route");
-	  this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/error.png)';
-
-	  if(data && data.error){
-	  	this.resultTextDataPane.value = status+': '+data.error.message;
-	  	this.resultTextDataPane.setAttribute('tooltiptext',data.error.message);
-	  } else {
-	  	this.resultTextDataPane.value = ' Service Unavailable.';
-	  	this.resultTextDataPane.setAttribute('tooltiptext',' Could not connect to MailHops API.');
-	  }
-	  this.resultTextDataPane2.style.display = 'none';
-	  this.resultTextDataPane2.value = '';
-	  this.resultTextDataPane2.style.backgroundImage = '';
-	  this.resultTextDataPane2.setAttribute('tooltiptext','');
-
-    this.resultTextDataPane3.style.display = 'none';
-    this.resultTextDataPane3.value = '';
-  },
-
-  clear: function(no_ips){
-  	this.resultTextDataPane2.style.display = 'none';
-  	this.resultContainerDetails.style.display = 'none';
-  	this.resultMapLink.style.display = 'none';
-  	this.mailhopsDataPaneDNSBL.style.display = 'none';
-
-  	if(no_ips){
-  		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/help.png)';
-  		this.resultTextDataPane.value = ' No IPs';
-  		this.resultTextDataPane.setAttribute('tooltiptext','There were no received headers found');
-  	} else {
-  		this.resultTextDataPane.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
-  		this.resultTextDataPane.value = ' Looking Up Route';
-  		this.resultTextDataPane.setAttribute('tooltiptext','Looking Up Route');
-  	}
-
-  	this.resultTextDataPane2.value = '';
-  	this.resultTextDataPane2.style.backgroundImage = '';
-  	this.resultTextDataPane2.setAttribute('tooltiptext','');
-
-      this.resultTextDataPane3.style.display = 'none';
-      this.resultTextDataPane3.value = '';
-
-  	//remove child details
-  	while(this.resultDetails.firstChild) {
-      	this.resultDetails.removeChild(this.resultDetails.firstChild);
-  	}
-    if(this.options.show_meta){
- 	    while(this.resultMeta.firstChild) {
-    		this.resultMeta.removeChild(this.resultMeta.firstChild);
-  		}
-    }
-  },
-
-  route: function(header_route, message, response, meta, lookup_url){
-
-	  var displayText=''
-		  , distanceText=''
-		  , image='chrome://mailhops/content/images/local.png'
-		  , secureToolTipText=false
-		  , weather=null
-		  , first=null;
-
-	  //remove child details
-	  while(this.resultDetails.firstChild) {
-	    	this.resultDetails.removeChild(this.resultDetails.firstChild);
-	  }
-
-  	//append meta
-    try {
-    	if(this.options.show_meta){
-    		for(var i in meta){
-            var mlabel = document.createElement('label');
-            if(typeof meta[i] == 'object'){
-              mlabel.setAttribute('value',i+': ');
-              this.resultMeta.appendChild(mlabel);
-              for(var ii in meta[i]){
-                var mlabel = document.createElement('label');
-                if(ii=='reset'){
-                  if(parseInt(meta[i][ii])/60 < 60)
-                    mlabel.setAttribute('value','   '+ii+': '+Math.round(parseInt(meta[i][ii])/60).toString()+' min.');
-                  else
-                    mlabel.setAttribute('value','   '+ii+': '+Math.round(parseInt(meta[i][ii])/60/60).toString()+' hr.');
-                } else {
-                  mlabel.setAttribute('value','   '+ii+': '+meta[i][ii]);
-                }
-                this.resultMeta.appendChild(mlabel);
-              }
-            } else {
-              mlabel.setAttribute('value',i+': '+meta[i]);
-              this.resultMeta.appendChild(mlabel);
-            }
-    	  }
-        var mlabel = document.createElement('label');
-    		mlabel.setAttribute('value','api url');
-    		mlabel.setAttribute('class','text-link');
-    		mlabel.setAttribute('href',lookup_url);
-    		this.resultMeta.appendChild(mlabel);
-      }
-    } catch(e){
-      // parseInt error?
-    }
-
-  if(response && response.route && response.route.length){
-
-  		if(this.options.client_location){
-  			var client_location = JSON.parse(this.options.client_location);
-        //get distance from last route to client_location and add to response.distance.miles or kilometers
-        if(!response.route[response.route.length-1]['private']){
-          if(this.options.unit=='km')
-            response.distance.kilometers += mailHopsUtils.getDistance(response.route[response.route.length-1],client_location.route[0],this.options.unit);
-          else
-            response.distance.miles += mailHopsUtils.getDistance(response.route[response.route.length-1],client_location.route[0],this.options.unit);
-        }
-        //push client location to the end of the route
-        response.route.push(client_location.route[0]);
-  		}
-
-   		for(var i=0; i<response.route.length;i++){
-  			//get the first hop location
-	   		if(!first && !response.route[i].private && !response.route[i].client){
-	   			first = response.route[i];
-	   			if(!!response.route[i].countryCode)
-		   			image='chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png';
-	   		}
-
-	   		var label = document.createElement('label');
-
-	   		if(response.route[i].countryCode)
-		   		label.style.backgroundImage = 'url(chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png)';
-		   	else
-		   		label.style.backgroundImage = 'url(chrome://mailhops/content/images/local.png)';
-		   	label.setAttribute('class','dataPaneAddressitem mailhopsDetail');
-
-	   		if(response.route[i].city && response.route[i].state){
-		   		label.setAttribute('value','Hop #'+(i+1)+' '+response.route[i].city+', '+response.route[i].state);
-          label.setAttribute('data-ip',response.route[i].ip);
-	   			label.addEventListener("click", function (e) {
-            mailHopsUtils.launchWhoIs(this.getAttribute('data-ip'));
-          }, false);
-	   		}
-		   	else if(response.route[i].city){
-		   		label.setAttribute('value','Hop #'+(i+1)+' '+response.route[i].city+', '+response.route[i].countryCode);
-          label.setAttribute('data-ip',response.route[i].ip);
-		   		label.addEventListener("click", function () {
-            mailHopsUtils.launchWhoIs(this.getAttribute('data-ip'));
-          }, false);
-		   	}
-  			else if(response.route[i].countryName){
-  				label.setAttribute('value','Hop #'+(i+1)+' '+response.route[i].countryName);
-          label.setAttribute('data-ip',response.route[i].ip);
-  				label.addEventListener("click", function () {
-            mailHopsUtils.launchWhoIs(this.getAttribute('data-ip'));
-          }, false);
-  			} else {
-          label.setAttribute('value','Hop #'+(i+1)+' Private');
-        }
-
-			//build tooltip
-			var tiptext = response.route[i].ip;
-
-			if(!this.options.show_host){
-				if(response.route[i].host)
-				   	tiptext+=' '+response.route[i].host;
-				if(response.route[i].whois && response.route[i].whois.descr)
-				   	tiptext+=' '+response.route[i].whois.descr;
-				if(response.route[i].whois && response.route[i].whois.netname)
-				   	tiptext+=' '+response.route[i].whois.netname;
-			}
-
-			label.setAttribute('tooltiptext','Click for whois '+tiptext);
-
-		  //append details
-   		this.resultDetails.appendChild(label);
-
-      //append weather
-      if(!weather && response.route[i].weather){
-        weather = response.route[i].weather;
-      }
-
-	   	if(this.options.show_secure){
-				//reset the tooltip
-				secureToolTipText=mailHopsUtils.getSecureTrans(response.route[i].ip, message);
-				//check for secure transmission
-				if(secureToolTipText){
-					var secure = document.createElement('label');
-					secure.setAttribute('class','dataPaneAddressitem mailhopsSecure');
-					secure.setAttribute('value','secured '+secureToolTipText);
-					this.resultDetails.appendChild(secure);
-				}
-			}
-
-	   	// append host
-	   	if(this.options.show_host && response.route[i].host){
-				var host = document.createElement('label');
-				host.setAttribute('value',response.route[i].host);
-				if(secureToolTipText)
-					host.setAttribute('class','dataPaneAddressitem mailhopsSecureHost');
-				else
-					host.setAttribute('class','dataPaneAddressitem mailhopsHost');
-				this.resultDetails.appendChild(host);
-			}
-
-			// auth & dnsbl
-			if(!response.route[i].private && response.route[i].dnsbl && response.route[i].dnsbl.listed){
-				this.mailhopsDataPaneDNSBL.setAttribute('value','Blacklisted '+mailHopsUtils.dnsbl(response.route[i].dnsbl.record,true));
-				this.mailhopsDataPaneDNSBL.setAttribute('data-ip',response.route[i].ip);
-				if(response.route[i].dnsbl.record)
-					this.mailhopsDataPaneDNSBL.setAttribute('tooltiptext','Click for more details.\n'+mailHopsUtils.dnsbl(response.route[i].dnsbl.record));
-				else
-					this.mailhopsDataPaneDNSBL.setAttribute('tooltiptext','Click for more details.');
-				this.mailhopsDataPaneDNSBL.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/bomb.png)';
-				this.mailhopsDataPaneDNSBL.style.display = 'block';
-			}
-
-	      // if(response.route[i].ip.indexOf(':') !== -1){
-	      //   var ipv6 = document.createElement('label');
-	      //     ipv6.setAttribute('class','dataPaneAddressitem mailhopsipv6');
-	      //     ipv6.setAttribute('value','IPV6');
-	      //     this.resultDetails.appendChild(ipv6);
-	      // }
-
-	      if(response.route[i].w3w){
-	          var w3w = document.createElement('label');
-            w3w.setAttribute('data-w3w',response.route[i].w3w.url);
-	          w3w.setAttribute('class','dataPaneAddressitem mailhopsW3w');
-	          w3w.setAttribute('value',response.route[i].w3w.words.join('.'));
-	          w3w.addEventListener("click", function () {
-              mailHopsUtils.launchExternalURL(this.getAttribute('data-w3w'));
-            });
-	          this.resultDetails.appendChild(w3w);
-	      }
- 	  }
- }
-
- if(image.indexOf('local')!=-1) {
-  	displayText = ' Local message.';
-  } else {
-
-  	if(!!first){
-      if(!!first.city && !!first.state)
-          displayText = first.city+', '+first.state;
-      else if(!!first.city)
-          displayText = first.city+', '+first.countryCode;
-      else if(!!first.countryName)
-          displayText = first.countryName;
-    }
-
-    if(response.distance){
-    	if(this.options.unit=='km' && response.distance.kilometers > 0)
-			   distanceText = mailHopsUtils.addCommas(Math.round(response.distance.kilometers))+' km traveled';
-		  else if(response.distance.miles > 0)
-			   distanceText = mailHopsUtils.addCommas(Math.round(response.distance.miles))+' mi traveled';
-	  }
-  	else if(displayText=='')
-  		displayText = ' Local message.';
-  }
-
-  if(message.time != null){
-    message.time = message.time/1000;
-    if(message.time < 60)
-      distanceText += ' in '+message.time+' sec.';
-    else if(message.time < 3600) //something is wrong if it takes this long
-      distanceText += ' in '+Math.round(message.time/60)+' min.';
-    else //something is wrong if it takes this long
-      distanceText += ' in '+Math.round(message.time/60/60)+' hrs.';
-  }
-
-  if(header_route){
-    this.resultMapLink.setAttribute("data-route", header_route);
-    this.resultSlackLink.setAttribute("data-api_url", lookup_url.replace('lookup','map'));
-  } else {
-    this.resultMapLink.removeAttribute("data-route");
-    this.resultSlackLink.removeAttribute("data-api_url");
-  }
-
-  this.resultTextDataPane.style.backgroundImage = 'url('+image+')';
-  this.resultTextDataPane.value = displayText;
-
-  if(distanceText){
-	   this.resultTextDataPane2.style.display = 'block';
-	   this.resultTextDataPane2.value = ' ( '+distanceText+' )';
-  } else {
-  	this.resultTextDataPane2.style.display = 'none';
-  }
-
-  //set weather of sender
-  if(weather){
-    this.resultTextDataPane3.style.display = 'block';
-    this.resultTextDataPane3.setAttribute('tooltiptext',new Date(weather.time*1000));
-    this.resultTextDataPane3.value = weather.summary+' '+Math.round(weather.temp)+'\u00B0';
-    this.resultTextDataPane3.style.backgroundImage = 'url('+mailHopsUtils.getWeatherIcon(weather.icon)+')';
-  }
-
-  //show the detail link
-  this.resultMapLink.style.display = 'block';
-  this.resultContainerDetails.style.display = 'block';
-
-	} //end route
-};
diff --git a/chrome/content/pb-overlay.xul b/chrome/content/pb-overlay.xul
deleted file mode 100644
index d2880d1..0000000
--- a/chrome/content/pb-overlay.xul
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE overlay SYSTEM "chrome://mailhops/locale/strings.dtd" >
-
-<?xml-stylesheet href="chrome://mailhops/skin/pb-styles.css" type="text/css"?>
-
-<overlay id="mailhopsOverlay"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/pb-overlay.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
-
-	<vbox id="dataPane2">
-		<vbox id="dataPaneMailHopsContainer" class="dataPaneBox">
-			<hbox flex="1" pack="start" align="center">
-				<label class="dataPaneHeader" crop="right" value="&mailhops_header_route_label;"></label>
-				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>
-
-      <hbox class="mailHopsLinkContainer">
-				<vbox><button id="mailhopsDataPaneMapLink" class="navButton">&mailhops_route_nav_map_label;</button></vbox>
-				<vbox><button id="mailhopsDataPaneRefreshLink" class="navButton">&mailhops_route_nav_refresh_label;</button></vbox>
-				<vbox><button id="mailhopsDataPanePrefsLink" class="navButton">&mailhops_route_nav_options_label;</button></vbox>
-			</hbox>
-
-			<vbox id="mailhopsDataPane" flex="1">
-				<label id="mailhopsDataPaneText" class="dataPaneAddressitem" tooltiptext=""></label>
-				<label id="mailhopsDataPaneText2" class="dataPaneAddressitem" tooltiptext=""></label>
-				<label id="mailhopsDataPaneText3" class="dataPaneAddressitem" tooltiptext=""></label>
-			</vbox>
-
-			<hbox id="mailhopsDetailsContainer" class="mailhopsContainer">
-				<vbox id="mailhopsDataPaneDetails" flex="1">
-				</vbox>
-			</hbox>
-
-		</vbox>
-
-		<vbox id="dataPaneMailHopsAuthContainer" class="dataPaneBox">
-			<hbox flex="1" pack="start" align="center">
-				<label class="dataPaneHeader" crop="right" value="&mailhops_header_auth_label;"></label>
-				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>
-
-			<vbox id="mailhopsAuthDataPane" flex="1">
-				<label id="mailhopsDataPaneMailer" class="dataPaneAddressitem auth-item" value="" tooltiptext="Mailer"></label>
-				<label id="mailhopsDataPaneSPF" class="dataPaneAddressitem auth-item" value="" tooltiptext="SPF"></label>
-				<label id="mailhopsDataPaneDKIM" class="dataPaneAddressitem auth-item" value="" tooltiptext="DKIM"></label>
-				<label id="mailhopsDataPaneDNSBL" class="text-link dataPaneAddressitem auth-item" value="" tooltiptext="DNSBL"></label>
-			</vbox>
-		</vbox>
-
-		<vbox id="dataPaneMailHopsListContainer" class="dataPaneBox">
-			<hbox flex="1" pack="start" align="center">
-				<label class="dataPaneHeader" crop="right" value="&mailhops_header_lists_label;"></label>
-				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>
-			<vbox id="mailhopsListDataPane" flex="1"></vbox>
-		</vbox>
-
-		<vbox id="dataPaneMailHopsMetaContainer" class="dataPaneBox">
-			<hbox flex="1" pack="start" align="center">
-				<label class="dataPaneHeader" crop="right" value="&mailhops_header_meta_label;"></label>
-				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>
-			<vbox id="mailhopsDataPaneMeta" flex="1"></vbox>
-		</vbox>
-
-    <vbox id="dataPaneMailHopsFunContainer" class="dataPaneBox">
-			<hbox flex="1" pack="start" align="center">
-				<label class="dataPaneHeader" crop="right" value="&mailhops_header_fun_label;"></label>
-				<separator class="dataPaneBoxSeparator" flex="1"></separator>
-			</hbox>
-      <hbox class="mailHopsLinkContainer">
-				<vbox><image id="mailhopsDataPaneSlackLink" src="chrome://mailhops/content/images/btn-add-to-slack-122x35.png" width="122" height="35" /></vbox>
-			</hbox>
-		</vbox>
-
-	</vbox>
-
-</overlay>
diff --git a/chrome/content/tb-overlay.js b/chrome/content/tb-overlay.js
deleted file mode 100644
index fcc7617..0000000
--- a/chrome/content/tb-overlay.js
+++ /dev/null
@@ -1,322 +0,0 @@
-var mailHopsDisplay =
-{
-  resultBox:              null,
-  resultText:             null,
-  resultDetails:          null,
-  container:              null,
-  mapLink:                null,
-  mailhopsDataPaneSPF:    null,
-  mailhopsDataPaneDKIM:   null,
-  mailhopsDataPaneMailer: null,
-  mailhopsDataPaneDNSBL:  null,
-  mailhopsResultWeather:  null,
-  options:                null,
-
-  init: function(options){
-
-    this.options = options;
-
-    this.container = document.getElementById("mailhopsBox");
-    this.resultBox = document.getElementById("mailhopsResult");
-    this.resultText = document.getElementById("mailhopsResultText");
-    this.mailhopsResultWeather = document.getElementById("mailhopsResultWeather");
-    this.resultDetails = document.getElementById("mailhopsDataPaneDetails");
-    this.mapLink = document.getElementById("mailhopsMapLink");
-    //auth
-    this.mailhopsDataPaneSPF = document.getElementById("mailhopsDataPaneSPF");
-    this.mailhopsDataPaneDKIM = document.getElementById("mailhopsDataPaneDKIM");
-    this.mailhopsDataPaneMailer = document.getElementById("mailhopsDataPaneMailer");
-    this.mailhopsDataPaneDNSBL = document.getElementById("mailhopsDataPaneDNSBL");
-
-    //event listner for route click to launch map
-    this.mailhopsDataPaneDNSBL.addEventListener("click", function () {
-        if(this.hasAttribute('data-ip'))
-          mailHopsUtils.launchSpamHausURL( this.getAttribute('data-ip') );
-      });
-
-    this.mapLink.addEventListener("click", function () {
-      if(this.hasAttribute('data-route'))
-        mailHopsUtils.launchMap( String(this.getAttribute('data-route')), options );
-      });
-  },
-
-  lists: function( header_unsubscribe ){
-
-  },
-
-  auth: function( header_xmailer, header_useragent, header_xmimeole, header_auth, header_spf ){
-    //SPF
-    if(header_spf){
-      header_spf=header_spf.replace(/^\s+/,"");
-      var headerSPFArr=header_spf.split(' ');
-      this.mailhopsDataPaneSPF.setAttribute('value','SPF: '+headerSPFArr[0]);
-      this.mailhopsDataPaneSPF.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+headerSPFArr[0]+'.png)';
-      this.mailhopsDataPaneSPF.setAttribute('tooltiptext',header_spf+'\n'+mailHopsUtils.spf(headerSPFArr[0]));
-      this.mailhopsDataPaneSPF.style.display='block';
-    } else {
-      this.mailhopsDataPaneSPF.style.display='none';
-    }
-    //Authentication-Results
-    //http://tools.ietf.org/html/rfc5451
-    if(header_auth){
-      var headerAuthArr=header_auth.split(';');
-      var dkim_result;
-      var spf_result;
-      for(var h=0;h<headerAuthArr.length;h++){
-        if(headerAuthArr[h].indexOf('dkim=')!=-1){
-          dkim_result = headerAuthArr[h];
-          if(header_spf)
-            break;
-        }
-        if(!header_spf && headerAuthArr[h].indexOf('spf=')!=-1){
-          spf_result = headerAuthArr[h];
-          if(dkim_result)
-            break;
-        }
-      }
-      if(this.options.show_dkim && dkim_result){
-        dkim_result=dkim_result.replace(/^\s+/,"");
-        var dkimArr=dkim_result.split(' ');
-        this.mailhopsDataPaneDKIM.setAttribute('value','DKIM: '+dkimArr[0].replace('dkim=',''));
-        this.mailhopsDataPaneDKIM.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+dkimArr[0].replace('dkim=','')+'.png)';
-        this.mailhopsDataPaneDKIM.setAttribute('tooltiptext',dkim_result+'\n'+mailHopsUtils.dkim(dkimArr[0].replace('dkim=','')));
-        this.mailhopsDataPaneDKIM.style.display='block';
-      } else {
-        this.mailhopsDataPaneDKIM.style.display='none';
-      }
-      if(this.options.show_spf && spf_result){
-        spf_result=spf_result.replace(/^\s+/,"");
-        var spfArr=spf_result.split(' ');
-        this.mailhopsDataPaneSPF.setAttribute('value','SPF: '+spfArr[0].replace('spf=',''));
-        this.mailhopsDataPaneSPF.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/'+spfArr[0].replace('spf=','')+'.png)';
-        this.mailhopsDataPaneSPF.setAttribute('tooltiptext',spf_result+'\n'+mailHopsUtils.spf(spfArr[0].replace('spf=','')));
-        this.mailhopsDataPaneSPF.style.display='block';
-      }
-    } else {
-      this.mailhopsDataPaneDKIM.style.display='none';
-    }
-    //X-Mailer, User-Agent or X-MimeOLE
-    if(header_xmailer){
-      this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-      if(header_xmailer.indexOf('(')!=-1)
-        this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer.substring(0,header_xmailer.indexOf('(')));
-      else if(header_xmailer.indexOf('[')!=-1)
-        this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer.substring(0,header_xmailer.indexOf('[')));
-      else
-        this.mailhopsDataPaneMailer.setAttribute('value',header_xmailer);
-      this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_xmailer);
-      this.mailhopsDataPaneMailer.style.display='block';
-    } else if(header_useragent){
-      this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-      if(header_useragent.indexOf('(')!=-1)
-        this.mailhopsDataPaneMailer.setAttribute('value',header_useragent.substring(0,header_useragent.indexOf('(')));
-      else if(header_useragent.indexOf('[')!=-1)
-        this.mailhopsDataPaneMailer.setAttribute('value',header_useragent.substring(0,header_useragent.indexOf('[')));
-      else
-        this.mailhopsDataPaneMailer.setAttribute('value',header_useragent);
-      this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_useragent);
-      this.mailhopsDataPaneMailer.style.display='block';
-    } else if(header_xmimeole){
-      this.mailhopsDataPaneMailer.style.backgroundImage = 'url(chrome://mailhops/content/images/email.png)';
-
-      if(header_xmimeole.indexOf('(')!=-1)
-        header_xmimeole = header_xmimeole.substring(0,header_xmimeole.indexOf('('));
-      else if(header_xmimeole.indexOf('[')!=-1)
-        header_xmimeole = header_xmimeole.substring(0,header_xmimeole.indexOf('['));
-
-      if(header_xmimeole.indexOf('Produced By ')!=-1)
-        this.mailhopsDataPaneMailer.setAttribute('value',header_xmimeole.replace('Produced By ',''));
-      else
-        this.mailhopsDataPaneMailer.setAttribute('value',header_xmimeole);
-
-      this.mailhopsDataPaneMailer.setAttribute('tooltiptext',header_xmimeole);
-      this.mailhopsDataPaneMailer.style.display='block';
-    } else {
-      this.mailhopsDataPaneMailer.style.display='none';
-    }
-  },
-
-  error: function(status,data){
-    this.container.removeAttribute("route");
-    this.resultText.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/error.png)';
-
-    if(data && data.error){
-      this.resultText.setAttribute('value', status+': '+data.error.message);
-      this.resultText.setAttribute('tooltiptext',data.error.message);
-    } else {
-      this.resultText.setAttribute('value', ' Service Unavailable.');
-      this.resultText.setAttribute('tooltiptext',' Could not connect to MailHops API.');
-    }
-  },
-
-  clear: function(no_ips){
-
-    this.mailhopsDataPaneDNSBL.style.display = 'none';
-    this.mailhopsResultWeather.style.display = 'none';
-
-    if(no_ips){
-      this.resultText.style.backgroundImage='url(chrome://mailhops/content/images/loader.gif)';
-      this.resultText.setAttribute('value',' Looking Up Route');
-      this.resultText.setAttribute('tooltiptext',' Looking Up Route');
-    } else {
-      this.resultText.style.backgroundImage = 'url(chrome://mailhops/content/images/loader.gif)';
-      this.resultText.value = ' Looking Up Route';
-      this.resultText.setAttribute('tooltiptext','Looking Up Route');
-    }
-  },
-
-  route: function ( header_route, message, response, meta, lookup_url ){
-
-  var displayText=''
-    , distanceText=''
-    , image='chrome://mailhops/content/images/local.png'
-    , weather=null
-    , first=null;
-
-  //remove child details
-  while(this.resultDetails.firstChild) {
-      this.resultDetails.removeChild(this.resultDetails.firstChild);
-  }
-
-  if(response && response.route && response.route.length){
-
-      if(this.options.client_location){
-        var client_location = JSON.parse(this.options.client_location);
-        //get distance from last route to client_location and add to response.distance.miles or kilometers
-        if(!response.route[response.route.length-1]['private']){
-          if(this.options.unit=='km')
-            response.distance.kilometers += mailHopsUtils.getDistance(response.route[response.route.length-1],client_location.route[0],this.options.unit);
-          else
-            response.distance.miles += mailHopsUtils.getDistance(response.route[response.route.length-1],client_location.route[0],this.options.unit);
-        }
-        //push client location to the end of the route
-        response.route.push(client_location.route[0]);
-      }
-      for(var i=0; i<response.route.length;i++){
-            //get the first hop location
-            if(!first && !response.route[i].private && !response.route[i].client){
-              first = response.route[i];
-              if(!!response.route[i].countryCode)
-                image='chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png';
-                if(response.route[i].city)
-                  this.resultText.setAttribute('tooltiptext','From '+response.route[i].city+', '+response.route[i].state);
-                else
-                  this.resultText.setAttribute('tooltiptext','From '+response.route[i].countryName);
-            }
-
-            var menuitem = document.createElement('menuitem');
-            var label = '';
-
-            menuitem.setAttribute('class','menuitem-iconic');
-
-            if(response.route[i].countryCode)
-              menuitem.setAttribute('image','chrome://mailhops/content/images/flags/'+response.route[i].countryCode.toLowerCase()+'.png');
-            else
-              menuitem.setAttribute('image','chrome://mailhops/content/images/local.png');
-
-            if(response.route[i].city){
-              if(response.route[i].city && response.route[i].state)
-                label='Hop #'+(i+1)+' '+response.route[i].city+', '+response.route[i].state;
-              else
-                label='Hop #'+(i+1)+' '+response.route[i].city+', '+response.route[i].countryCode;
-
-              menuitem.setAttribute('tooltiptext','Click for WhoIs');
-              menuitem.setAttribute('data-ip',response.route[i].ip);
-              menuitem.addEventListener("click", function () {
-                  mailHopsUtils.launchWhoIs(this.getAttribute('data-ip'));
-                }
-              , false);
-          } else if(response.route[i].countryName){
-            label='Hop #'+(i+1)+' '+response.route[i].countryName;
-            menuitem.setAttribute('tooltiptext','Click for WhoIs');
-            menuitem.setAttribute('data-ip',response.route[i].ip);
-            menuitem.addEventListener("click", function () {
-                  mailHopsUtils.launchWhoIs(this.getAttribute('data-ip'));
-                }
-              , false);
-          } else {
-            label='Hop #'+(i+1)+' Private';
-          }
-
-          label+=' '+response.route[i].ip;
-
-          if(response.route[i].host)
-              label+=' '+response.route[i].host;
-          if(response.route[i].whois && response.route[i].whois.descr)
-              label+=' '+response.route[i].whois.descr;
-          if(response.route[i].whois && response.route[i].whois.netname)
-              label+=' '+response.route[i].whois.netname;
-
-          menuitem.setAttribute('label',label);
-
-          //append weather
-          if(!weather && response.route[i].weather){
-            weather = response.route[i].weather;
-          }
-
-          //append details
-          this.resultDetails.appendChild(menuitem);
-
-            //auth & dnsbl
-          if(!response.route[i].private && response.route[i].dnsbl && response.route[i].dnsbl.listed){
-            this.mailhopsDataPaneDNSBL.setAttribute('value','Blacklisted '+mailHopsUtils.dnsbl(response.route[i].dnsbl.record,true));
-            this.mailhopsDataPaneDNSBL.setAttribute('data-ip',response.route[i].ip);
-            if(response.route[i].dnsbl.record)
-              this.mailhopsDataPaneDNSBL.setAttribute('tooltiptext','Click for more details.\n'+mailHopsUtils.dnsbl(response.route[i].dnsbl.record));
-            else
-              this.mailhopsDataPaneDNSBL.setAttribute('tooltiptext','Click for more details.');
-            this.mailhopsDataPaneDNSBL.style.backgroundImage = 'url(chrome://mailhops/content/images/auth/bomb.png)';
-            this.mailhopsDataPaneDNSBL.style.display = 'block';
-          }
-        }
-    }
-
-    //set weather of sender
-    if(weather){
-      this.mailhopsResultWeather.style.display = 'block';
-      this.mailhopsResultWeather.setAttribute('tooltiptext',new Date(weather.time*1000));
-      this.mailhopsResultWeather.value = weather.summary+' '+Math.round(weather.temp)+'\u00B0';
-      this.mailhopsResultWeather.style.backgroundImage = 'url('+mailHopsUtils.getWeatherIcon(weather.icon)+')';
-    }
-
-    if(image.indexOf('local')!=-1) {
-      displayText = ' Local message.';
-    } else {
-
-      if(!!first){
-        if(!!first.city && !!first.state)
-            displayText = first.city+', '+first.state;
-        else if(!!first.city)
-            displayText = first.city+', '+first.countryCode;
-        else if(!!first.countryName)
-            displayText = first.countryName;
-      }
-
-      if(response.distance){
-        if(this.options.unit=='km' && response.distance.kilometers > 0)
-          distanceText = mailHopsUtils.addCommas(Math.round(response.distance.kilometers))+' km traveled';
-        else if(response.distance.miles > 0)
-          distanceText = mailHopsUtils.addCommas(Math.round(response.distance.miles))+' mi traveled';
-      } else if(displayText=='')
-        displayText = ' Local message.';
-    }
-
-    if(message.time != null){
-      message.time = message.time/1000;
-      if(message.time < 60)
-        distanceText += ' in '+message.time+' sec.';
-      else if(message.time < 3600) //something is wrong if it takes this long
-        distanceText += ' in '+Math.round(message.time/60)+' min.';
-      else //something is wrong if it takes this long
-        distanceText += ' in '+Math.round(message.time/60/60)+' hr.';
-    }
-
-    if(header_route)
-      this.mapLink.setAttribute("data-route", header_route);
-    else
-      this.mapLink.removeAttribute("data-route");
-
-    this.resultText.setAttribute('value', displayText+' ( '+distanceText+' )');
-    this.resultText.style.backgroundImage = 'url('+image+')';
-  }//end route
-};
diff --git a/chrome/content/tb-overlay.xul b/chrome/content/tb-overlay.xul
deleted file mode 100644
index eea0ec0..0000000
--- a/chrome/content/tb-overlay.xul
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE overlay SYSTEM "chrome://mailhops/locale/strings.dtd" >
-
-<?xml-stylesheet href="chrome://mailhops/skin/tb-styles.css" type="text/css"?>
-
-<overlay id="mailhopsOverlay"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<script type="application/x-javascript" src="chrome://mailhops/content/utils.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/tb-overlay.js"/>
-	<script type="application/x-javascript" src="chrome://mailhops/content/mailhops.js"/>
-
-	<rows id="expandedHeader2Rows">
-		<row id="mailhopsBox" collapsed="false">
-			    <label id="mailhopsLabel" value="&mailhops_header_route_label; " class="headerName"></label>
-       		<hbox id="mailhopsResult" flex="1">
-       			<label id="mailhopsResultText"></label>
-            <label id="mailhopsResultWeather"></label>
-
-       			<button type="menu" class="msgHeaderView-button msgHeaderView-flat-button" label="hops" tooltiptext="Click to view route.">
-         				<menupopup id="mailhopsDataPaneDetails">
-  					    </menupopup>
-    				</button>
-
-    				<button id="mailhopsMapLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_map_label;"></button>
-
-    				<button id="mailhopsDataPaneRefreshLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_refresh_label;"></button>
-
-    				<button id="mailhopsDataPanePrefsLink" class="msgHeaderView-button msgHeaderView-flat-button" label="&mailhops_route_nav_options_label;"></button>
-
-    				<label id="mailhopsDataPaneMailer" class="auth-item" value="" tooltiptext="Mailer"></label>
-
-    				<label id="mailhopsDataPaneSPF" class="auth-item" value="" tooltiptext="SPF"></label>
-
-    				<label id="mailhopsDataPaneDKIM" class="auth-item" value="" tooltiptext="DKIM"></label>
-
-    				<label id="mailhopsDataPaneDNSBL" class="text-link auth-item" value="" tooltiptext="DNSBL"></label>
-
-       		</hbox>
-		</row>
-	</rows>
-
-</overlay>
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index 1cbb325..a2302c5 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -209,19 +209,5 @@ getDistance: function(from, to, unit) {
       };
     }
     return '';
-  },
-
-  postToWebhook: function(mapUrl,options){
-    var slackUrl = 'https://hooks.slack.com/services/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';
-    var xhr = new XMLHttpRequest();
-    xhr.open("POST", slackUrl, false);
-    xhr.setRequestHeader("Content-type", "application/json");
-    xhr.onreadystatechange = function() {
-      if(xhr.readyState === 4 && xhr.status == 200) {
-        return JSON.parse(xmlhttp.responseText);
-      }
-    }
-    var payload = {"text":"MailHops <"+mapUrl+"|Map> "};
-    xhr.send(JSON.stringify(payload));
   }
 };
diff --git a/chrome/locale/de/strings.dtd b/chrome/locale/de/strings.dtd
index 26d30e4..129be3b 100644
--- a/chrome/locale/de/strings.dtd
+++ b/chrome/locale/de/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops Strecke">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
-<!ENTITY mailhops_header_lists_label           "MailHops MailHops Listen">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-
 <!ENTITY mailhops_route_nav_map_label          "Karte">
 <!ENTITY mailhops_route_nav_details_label      "Einzelheiten">
 <!ENTITY mailhops_route_nav_refresh_label      "erfrischen">
-<!ENTITY mailhops_route_nav_options_label      "Optionen">
+<!ENTITY mailhops_route_nav_options_label      "Vorlieben">
diff --git a/chrome/locale/de/strings.properties b/chrome/locale/de/strings.properties
index e5d983b..088a8a4 100644
--- a/chrome/locale/de/strings.properties
+++ b/chrome/locale/de/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHops Strecke
 mailhops_header_auth_label=MailHops/Auth
-mailhops_header_lists_label=MailHops Listen
 mailhops_header_meta_label=MailHops Meta
 mailhops_route_nav_map_label=Karte
 mailhops_route_nav_details_label=Einzelheiten
 mailhops_route_nav_refresh_label=erfrischen
-mailhops_route_nav_options_label=Optionen
+mailhops_route_nav_options_label=Vorlieben
diff --git a/chrome/locale/en/strings.dtd b/chrome/locale/en/strings.dtd
index ccea7d5..03cb2e7 100644
--- a/chrome/locale/en/strings.dtd
+++ b/chrome/locale/en/strings.dtd
@@ -1,8 +1,6 @@
 <!ENTITY mailhops_header_route_label           "MailHops Route">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-<!ENTITY mailhops_header_fun_label             "MailHops Fun">
-
 <!ENTITY mailhops_route_nav_map_label          "map">
 <!ENTITY mailhops_route_nav_details_label      "details">
 <!ENTITY mailhops_route_nav_refresh_label      "refresh">
diff --git a/chrome/locale/en/strings.properties b/chrome/locale/en/strings.properties
index f4e81fc..0b959dd 100644
--- a/chrome/locale/en/strings.properties
+++ b/chrome/locale/en/strings.properties
@@ -1,9 +1,7 @@
 mailhops_header_route_label=MailHops Route
 mailhops_header_auth_label=MailHops/Auth
-mailhops_header_lists_label=MailHops Lists
 mailhops_header_meta_label=MailHops Meta
-mailhops_header_fun_label=MailHops Fun
 mailhops_route_nav_map_label=map
 mailhops_route_nav_details_label=details
 mailhops_route_nav_refresh_label=refresh
-mailhops_route_nav_options_label=options
+mailhops_route_nav_options_label=Preferences
diff --git a/chrome/locale/es/strings.dtd b/chrome/locale/es/strings.dtd
index 70910cb..3a1caa7 100644
--- a/chrome/locale/es/strings.dtd
+++ b/chrome/locale/es/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops Ruta">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Aut">
-<!ENTITY mailhops_header_lists_label           "MailHops Listas">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-
 <!ENTITY mailhops_route_nav_map_label          "mapa">
 <!ENTITY mailhops_route_nav_details_label      "detalles">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
-<!ENTITY mailhops_route_nav_options_label      "opciones">
+<!ENTITY mailhops_route_nav_options_label      "Preferencias">
diff --git a/chrome/locale/es/strings.properties b/chrome/locale/es/strings.properties
index f1e5788..ecf39ef 100644
--- a/chrome/locale/es/strings.properties
+++ b/chrome/locale/es/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHops Ruta
 mailhops_header_auth_label=MailHops Mailer/Aut
-mailhops_header_lists_label=MailHops Listas
 mailhops_header_meta_label=MailHops Meta
 mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalles
 mailhops_route_nav_refresh_label=refrescar
-mailhops_route_nav_options_label=opciones
+mailhops_route_nav_options_label=Preferencias
diff --git a/chrome/locale/fr/strings.dtd b/chrome/locale/fr/strings.dtd
index 85e8c5d..302c16e 100644
--- a/chrome/locale/fr/strings.dtd
+++ b/chrome/locale/fr/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops Route">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
-<!ENTITY mailhops_header_lists_label           "MailHops listes">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-
 <!ENTITY mailhops_route_nav_map_label          "carte">
 <!ENTITY mailhops_route_nav_details_label      "détails">
 <!ENTITY mailhops_route_nav_refresh_label      "rafraîchir">
-<!ENTITY mailhops_route_nav_options_label      "les options">
+<!ENTITY mailhops_route_nav_options_label      "Préférences">
diff --git a/chrome/locale/fr/strings.properties b/chrome/locale/fr/strings.properties
index 041039f..e3c24e1 100644
--- a/chrome/locale/fr/strings.properties
+++ b/chrome/locale/fr/strings.properties
@@ -5,4 +5,4 @@ mailhops_header_meta_label=MailHops Meta
 mailhops_route_nav_map_label=carte
 mailhops_route_nav_details_label=détails
 mailhops_route_nav_refresh_label=rafraîchir
-mailhops_route_nav_options_label=les options
+mailhops_route_nav_options_label=Préférences
diff --git a/chrome/locale/ja/strings.dtd b/chrome/locale/ja/strings.dtd
index a5dc497..1a2c5f1 100644
--- a/chrome/locale/ja/strings.dtd
+++ b/chrome/locale/ja/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHopsルート">
 <!ENTITY mailhops_header_auth_label            "MailHopsメーラー/認証">
-<!ENTITY mailhops_header_lists_label           "リストをMailHops">
 <!ENTITY mailhops_header_meta_label            "MailHopsメタ">
-
 <!ENTITY mailhops_route_nav_map_label          "マップ">
 <!ENTITY mailhops_route_nav_details_label      "細部">
 <!ENTITY mailhops_route_nav_refresh_label      "リフレッシュ">
-<!ENTITY mailhops_route_nav_options_label      "オプション">
+<!ENTITY mailhops_route_nav_options_label      "設定">
diff --git a/chrome/locale/ja/strings.properties b/chrome/locale/ja/strings.properties
index 9b8157c..88fdb6f 100644
--- a/chrome/locale/ja/strings.properties
+++ b/chrome/locale/ja/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHopsルート
 mailhops_header_auth_label=MailHopsメーラー/認証
-mailhops_header_lists_label=リストをMailHops
 mailhops_header_meta_label=MailHopsメタ
 mailhops_route_nav_map_label=マップ
 mailhops_route_nav_details_label=細部
 mailhops_route_nav_refresh_label=リフレッシュ
-mailhops_route_nav_options_label=オプション
+mailhops_route_nav_options_label=設定
diff --git a/chrome/locale/pt-BR/strings.dtd b/chrome/locale/pt-BR/strings.dtd
index 82571ce..78df835 100644
--- a/chrome/locale/pt-BR/strings.dtd
+++ b/chrome/locale/pt-BR/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops Route">
 <!ENTITY mailhops_header_auth_label            "MailHops Mailer/Auth">
-<!ENTITY mailhops_header_lists_label           "MailHops Lists">
 <!ENTITY mailhops_header_meta_label            "MailHops Meta">
-
 <!ENTITY mailhops_route_nav_map_label          "mapa">
 <!ENTITY mailhops_route_nav_details_label      "detalhes">
 <!ENTITY mailhops_route_nav_refresh_label      "refrescar">
-<!ENTITY mailhops_route_nav_options_label      "opções">
+<!ENTITY mailhops_route_nav_options_label      "Preferências">
diff --git a/chrome/locale/pt-BR/strings.properties b/chrome/locale/pt-BR/strings.properties
index c8ca83c..8f3ff12 100644
--- a/chrome/locale/pt-BR/strings.properties
+++ b/chrome/locale/pt-BR/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHops Route
 mailhops_header_auth_label=MailHops Mailer/Auth
-mailhops_header_lists_label=MailHops Lists
 mailhops_header_meta_label=MailHops Meta
 mailhops_route_nav_map_label=mapa
 mailhops_route_nav_details_label=detalhes
 mailhops_route_nav_refresh_label=refrescar
-mailhops_route_nav_options_label=opções
+mailhops_route_nav_options_label=Preferências
diff --git a/chrome/locale/ru/strings.dtd b/chrome/locale/ru/strings.dtd
index 286518a..70da776 100644
--- a/chrome/locale/ru/strings.dtd
+++ b/chrome/locale/ru/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops маршрута">
 <!ENTITY mailhops_header_auth_label            "MailHops Мейлер / Авт">
-<!ENTITY mailhops_header_lists_label           "MailHops списки">
 <!ENTITY mailhops_header_meta_label            "MailHops Мета">
-
 <!ENTITY mailhops_route_nav_map_label          "карта">
 <!ENTITY mailhops_route_nav_details_label      "подробности">
 <!ENTITY mailhops_route_nav_refresh_label      "обновление">
-<!ENTITY mailhops_route_nav_options_label      "опции">
+<!ENTITY mailhops_route_nav_options_label      "предпочтения">
diff --git a/chrome/locale/ru/strings.properties b/chrome/locale/ru/strings.properties
index 0a9362e..325a1bb 100644
--- a/chrome/locale/ru/strings.properties
+++ b/chrome/locale/ru/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHops маршрута
 mailhops_header_auth_label=MailHops Мейлер / Авт
-mailhops_header_lists_label=MailHops списки
 mailhops_header_meta_label=MailHops Мета
 mailhops_route_nav_map_label=карта
 mailhops_route_nav_details_label=подробности
 mailhops_route_nav_refresh_label=обновление
-mailhops_route_nav_options_label=опции
+mailhops_route_nav_options_label=предпочтения
diff --git a/chrome/locale/zh-CN/strings.dtd b/chrome/locale/zh-CN/strings.dtd
index 19a8725..f900c4c 100644
--- a/chrome/locale/zh-CN/strings.dtd
+++ b/chrome/locale/zh-CN/strings.dtd
@@ -1,9 +1,7 @@
 <!ENTITY mailhops_header_route_label           "MailHops路线">
 <!ENTITY mailhops_header_auth_label            "MailHops梅勒/验证">
-<!ENTITY mailhops_header_lists_label           "MailHops列表">
 <!ENTITY mailhops_header_meta_label            "MailHops元">
-
 <!ENTITY mailhops_route_nav_map_label          "地圖">
 <!ENTITY mailhops_route_nav_details_label      "詳細信息">
 <!ENTITY mailhops_route_nav_refresh_label      "刷新">
-<!ENTITY mailhops_route_nav_options_label      "選項">
+<!ENTITY mailhops_route_nav_options_label      "优先">
diff --git a/chrome/locale/zh-CN/strings.properties b/chrome/locale/zh-CN/strings.properties
index 59556eb..8738c2e 100644
--- a/chrome/locale/zh-CN/strings.properties
+++ b/chrome/locale/zh-CN/strings.properties
@@ -1,8 +1,7 @@
 mailhops_header_route_label=MailHops路线
 mailhops_header_auth_label=MailHops梅勒/验证
-mailhops_header_lists_label=MailHops列表
 mailhops_header_meta_label=MailHops元
 mailhops_route_nav_map_label=地圖
 mailhops_route_nav_details_label=詳細信息
 mailhops_route_nav_refresh_label=刷新
-mailhops_route_nav_options_label="選項
+mailhops_route_nav_options_label=优先
diff --git a/chrome/skin/classic/mh-notification-styles.css b/chrome/skin/classic/msgNotificationBar.css
similarity index 100%
rename from chrome/skin/classic/mh-notification-styles.css
rename to chrome/skin/classic/msgNotificationBar.css
diff --git a/chrome/skin/classic/pb-styles.css b/chrome/skin/classic/pb-styles.css
deleted file mode 100644
index 3c01dce..0000000
--- a/chrome/skin/classic/pb-styles.css
+++ /dev/null
@@ -1,157 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#mailhopsBox {cursor:pointer;}
-
-#mailhopsResultText {padding-left:4px;}
-
-#mailHopsResultImage {padding-left:4px;display: none;}
-
-#mailhopsDataPaneDetailsLink{
-	margin-left: 10px;
-	text-align: center;
-	padding-right: 14px;
-}
-
-button {
-	padding: 10px;
-}
-
-#mailhopsDataPaneDetailsLink.active{
-	color: #FFF;
-	margin-left: 10px;
-	background-color: #98a5b3;
-	-moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    -khtml-border-radius: 10px;
-    border-radius: 10px;
-    text-align: center;
-    padding-right: 14px;
-}
-
-#mailhopsDataPane{
-	padding-bottom: 4px;
-}
-
-.mailhopsDetail{
-	padding-bottom: 2px;
-	cursor: pointer;
-}
-
-.mailHopsLinkContainer{
-	padding-bottom: 4px;
-}
-
-.mailhopsContainer{
-	margin-left: 10px;
-	margin-right: 10px;
-	border: 1px solid #e1e2e5;
-	background-color: #f7f8f9;
-	-moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -khtml-border-radius: 5px;
-    border-radius: 5px;
-    padding: 8px;
-    word-wrap: break-word;
-}
-
-.mailhopsWeather, .mailhopsHost, .mailhopsSecureHost, .mailhopsSecure, .mailhopsW3w {
-	margin-left: 30px;
-	padding-bottom: 2px;
-}
-
-.mailhopsSecureHost{
-	background-image: url(chrome://mailhops/content/images/secure_host.png);
-	background-repeat: no-repeat;
-}
-
-.mailhopsHost{
-	background-image: url(chrome://mailhops/content/images/host.png);
-	background-repeat: no-repeat;
-}
-
-.mailhopsSecure{
-	background-image: url(chrome://mailhops/content/images/secure.png);
-	background-repeat: no-repeat;
-}
-
-.mailhopsW3w {
-	background-image: url(chrome://mailhops/content/images/w3w.png);
-	background-repeat: no-repeat;
-	cursor: pointer;
-}
-
-.auth-item{
-	display: none;
-}
-
-#mailhopsDataPaneMeta label{
-	padding-left: 20px;
-}
-
-#mhTabs .act {
-	padding: 5px 10px 5px 20px;
-	outline: none;
-	display: inline-block;
-	position: relative;
-	background-repeat: no-repeat;
-}
-
-#mailHopsPreferences {
-		font-family: 'Raleway',Arial,sans-serif;
-		font-size: 14px;
-}
-
-#mailHopsPreferences textbox {
-	font-size: 14px;
-	padding: 5px;
-	color: #777;
-}
-
-#mailHopsPreferences tab {
-	font-size: 14px;
-	padding: 5px;
-	color: #333;
-}
-
-.fa-lock {
-	padding-top: 7px;
-	color: rgba(73,163,127,1);
-}
-
-.fa-unlock-alt {
-	padding-top: 7px;
-	color: rgba(255,0,0,1);
-}
-
-.mailHopsLinkContainer button, #mailHopsPreferences button{
-	height: 35px;
-	color: #333;
-}
-
-.mailHopsLinkContainer button.navButton, button.navButton {
-	height: 25px;
-	width: 10px;
-	text-align: center;
-	color: #333;
-}
-
-@-webkit-keyframes pulsate{0%{-moz-transform:scale(.3);opacity:.2}100%{-moz-transform:scale(1.1);opacity:1}}@-webkit-keyframes pulsate{0%{-webkit-transform:scale(.3);opacity:.2}100%{-webkit-transform:scale(1.1);opacity:1}}@keyframes pulsate{0%{-webkit-transform:scale(.3);transform:scale(.3);opacity:.2}100%{-webkit-transform:scale(1.1);transform:scale(1.1);opacity:1}}.SmartStatus-container{max-width:165px;display:flex}.SmartStatus-iconContainer{padding:2px;flex:0 1 auto}.SmartStatus--success{color:#5CB85C;margin-bottom:20px;padding:0}.SmartStatus--failed{color:#D9534F;margin-top:20px;padding:0}.SmartStatus--running{color:#848992;margin-top:10px;padding:0;-webkit-animation:pulsate 1.5s linear infinite alternate;-moz-animation:pulsate 1.5s linear infinite alternate;animation:pulsate 1.5s linear infinite alternate}.SmartStatus-tooltip{text-align:left;max-width:250px;padding:10px;line-height:22px}.SmartStatus-tooltip--successful,.SmartStatus-tooltip--success{color:#5CB85C;padding-left:5px;padding-right:0;text-shadow:-1px -1px 0 #FFFFFF,1px -1px 0 #FFFFFF,-1px 1px 0 #FFFFFF,1px 1px 0 #FFFFFF}.SmartStatus-tooltip--failed{color:#D9534F;padding-left:5px;padding-right:0;text-shadow:-1px -1px 0 #FFFFFF,1px -1px 0 #FFFFFF,-1px 1px 0 #FFFFFF,1px 1px 0 #FFFFFF}.SmartStatus-tooltip--running{color:#161B1F;padding-left:5px;padding-right:0;text-shadow:-1px -1px 0 #FFFFFF,1px -1px 0 #FFFFFF,-1px 1px 0 #FFFFFF,1px 1px 0 #FFFFFF;-webkit-animation:pulsate 1.5s linear infinite alternate;-moz-animation:pulsate 1.5s linear infinite alternate;animation:pulsate 1.5s linear infinite alternate}
-.running {
-	font-size: 13px;
-	animation: pulsate 1.5s linear infinite alternate;
-	color: #5CB85C;
-}
-.running:before {
-  content: "\f111"
-}
-.error {
-	font-size: 13px;
-	color: rgba(255,0,0,.6);
-}
-.error:before {
-  content: "\f111"
-}
-
-.mailhopsDataPaneSlackLink{
-	cursor: pointer;
-}
diff --git a/chrome/skin/classic/tb-styles.css b/chrome/skin/classic/tb-styles.css
deleted file mode 100644
index 624543f..0000000
--- a/chrome/skin/classic/tb-styles.css
+++ /dev/null
@@ -1,32 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#mailhopsBox #mailhopsResultText { padding-left:20px; background-repeat: no-repeat; }
-
-#mailhopsBox menuitem .menu-iconic-icon { width: 16px; height: 11px; }
-
-#mailhopsBox .auth-item { display: none; background-repeat: no-repeat; padding-left: 18px; }
-
-#mhTabs .act { padding-left: 20px; background-repeat: no-repeat; outline : none;}
-
-#mailhopsResultWeather { display: none; background-repeat: no-repeat; padding-left: 18px; }
-
-#mailHopsPreferences {
-		font-family: 'Raleway',Arial,sans-serif;
-		font-size: 14px;
-}
-
-#mailHopsPreferences textbox {
-	font-size: 14px;
-	padding: 5px;
-	color: #777;
-}
-
-#mailHopsPreferences tab {
-	font-size: 14px;
-	padding: 5px;
-	color: #333;
-}
-
-#mailhopsResult label {
-	margin-top: 8px;
-}
diff --git a/install.rdf b/install.rdf
index 2d59802..28c42e7 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>2.0.0</em:version>
+		<em:version>3.0.0</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>
@@ -13,7 +13,6 @@
 		<em:homepageURL>https://www.mailhops.com</em:homepageURL>
 		<em:creator>Andrew Van Tassel</em:creator>
 		<em:optionsURL>chrome://mailhops/content/preferences.xul</em:optionsURL>
-		<!-- <em:updateURL>https://dl.dropbox.com/u/1533417/mailhops_update.rdf</em:updateURL> -->
 
 	 	<!-- Postbox -->
 		<em:targetApplication>