diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index ecf78df..821ef3c 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -67,6 +67,8 @@ mailHops.loadPref = function()
   mailHops.options.client_location = mailHops.getCharPref('mail.mailHops.client_location','');
 
   mailHops.options.api_url = mailHops.getCharPref('mail.mailHops.api_url','http://api.mailhops.com');
+
+  mailHops.options.map_provider = mailHops.getCharPref('mail.mailHops.map_provider','OpenStreetMap.Mapnik');
   
   if(mailHops.options.client_location == ''){
 		mailHops.setClientLocation(function(response){
diff --git a/chrome/content/mailhopsMap.xul b/chrome/content/mailhopsMap.xul
index defe109..7d3080e 100644
--- a/chrome/content/mailhopsMap.xul
+++ b/chrome/content/mailhopsMap.xul
@@ -9,6 +9,12 @@
 	title="MailHops Map"
 	buttonlabelcancel="Close">
 
+<script>
+window.saveTemplate = function(template){
+	alert(template);
+};
+</script>
+
 <iframe id="mailhops_iframe" flex="1" width="1024" height="768" style="overflow:hidden;" type="content"></iframe>
 		
 <script>
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 6880a6c..5ba9e83 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -13,11 +13,10 @@ var mailHopPreferences = {
 
   	this.fkey = document.getElementById("mailhop.fkey");
 
-  	if(pref.getCharPref("mail.mailHops.lang",'en')=='en')
-	    document.getElementById("mailhop.lang").selectedIndex = 0;
-	else
-	    document.getElementById("mailhop.lang").selectedIndex = 1;
-	    
+	document.getElementById("mailhop.lang").value = pref.getCharPref("mail.mailHops.lang",'en');
+	
+	document.getElementById("mailhop.map_provider").value = pref.getCharPref("mail.mailHops.map_provider",'OpenStreetMap.Mapnik');
+
 	if(pref.getCharPref("mail.mailHops.unit",'mi')=='mi')
 	    document.getElementById("mailhop.unit").selectedIndex = 0;
 	else
@@ -90,6 +89,7 @@ var mailHopPreferences = {
   },
   savePreferences: function() {
     pref.setCharPref("mail.mailHops.lang", document.getElementById("mailhop.lang").selectedItem.value) ;
+    pref.setCharPref("mail.mailHops.map_provider", document.getElementById("mailhop.map_provider").selectedItem.value) ;
     pref.setCharPref("mail.mailHops.unit", document.getElementById("mailhop.unit").selectedItem.value) ;
     pref.setCharPref("mail.mailHops.show_details", String(document.getElementById("mailhop.show_details").checked)) ;
     pref.setCharPref("mail.mailHops.show_meta", String(document.getElementById("mailhop.show_meta").checked)) ;
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 3276a73..136e9e8 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -45,6 +45,114 @@
 					<radio value="km" label="Kilometers and ºC"/>
 				</radiogroup>
 			</groupbox>
+
+			<groupbox>
+				<caption label="Default Map"/>
+				<menulist id="mailhop.map_provider">
+					<menupopup>
+					<menuitem value="OpenStreetMap.Mapnik" label="OpenStreetMap.Mapnik" />
+					<menuitem value="OpenStreetMap.BlackAndWhite" label="OpenStreetMap.BlackAndWhite" />
+					<menuitem value="OpenStreetMap.DE" label="OpenStreetMap.DE" />
+					<menuitem value="OpenStreetMap.France" label="OpenStreetMap.France" />
+					<menuitem value="OpenStreetMap.HOT" label="OpenStreetMap.HOT" />
+					<menuitem value="OpenSeaMap" label="OpenSeaMap" />
+					<menuitem value="OpenTopoMap" label="OpenTopoMap" />
+					<menuitem value="Thunderforest.OpenCycleMap" label="Thunderforest.OpenCycleMap" />
+					<menuitem value="Thunderforest.Transport" label="Thunderforest.Transport" />
+					<menuitem value="Thunderforest.TransportDark" label="Thunderforest.TransportDark" />
+					<menuitem value="Thunderforest.Landscape" label="Thunderforest.Landscape" />
+					<menuitem value="Thunderforest.Outdoors" label="Thunderforest.Outdoors" />
+					<menuitem value="OpenMapSurfer.Roads" label="OpenMapSurfer.Roads" />
+					<menuitem value="OpenMapSurfer.AdminBounds" label="OpenMapSurfer.AdminBounds" />
+					<menuitem value="OpenMapSurfer.Grayscale" label="OpenMapSurfer.Grayscale" />
+					<menuitem value="Hydda.Full" label="Hydda.Full" />
+					<menuitem value="Hydda.Base" label="Hydda.Base" />
+					<menuitem value="Hydda.RoadsAndLabels" label="Hydda.RoadsAndLabels" />
+					<menuitem value="MapQuestOpen.OSM" label="MapQuestOpen.OSM" />
+					<menuitem value="MapQuestOpen.Aerial" label="MapQuestOpen.Aerial" />
+					<menuitem value="MapQuestOpen.HybridOverlay" label="MapQuestOpen.HybridOverlay" />
+					<menuitem value="MapBox" label="MapBox" />
+					<menuitem value="Stamen.Toner" label="Stamen.Toner" />
+					<menuitem value="Stamen.TonerBackground" label="Stamen.TonerBackground" />
+					<menuitem value="Stamen.TonerHybrid" label="Stamen.TonerHybrid" />
+					<menuitem value="Stamen.TonerLines" label="Stamen.TonerLines" />
+					<menuitem value="Stamen.TonerLabels" label="Stamen.TonerLabels" />
+					<menuitem value="Stamen.TonerLite" label="Stamen.TonerLite" />
+					<menuitem value="Stamen.Watercolor" label="Stamen.Watercolor" />
+					<menuitem value="Stamen.Terrain" label="Stamen.Terrain" />
+					<menuitem value="Stamen.TerrainBackground" label="Stamen.TerrainBackground" />
+					<menuitem value="Stamen.TopOSMRelief" label="Stamen.TopOSMRelief" />
+					<menuitem value="Stamen.TopOSMFeatures" label="Stamen.TopOSMFeatures" />
+					<menuitem value="Esri.WorldStreetMap" label="Esri.WorldStreetMap" />
+					<menuitem value="Esri.DeLorme" label="Esri.DeLorme" />
+					<menuitem value="Esri.WorldTopoMap" label="Esri.WorldTopoMap" />
+					<menuitem value="Esri.WorldImagery" label="Esri.WorldImagery" />
+					<menuitem value="Esri.WorldTerrain" label="Esri.WorldTerrain" />
+					<menuitem value="Esri.WorldShadedRelief" label="Esri.WorldShadedRelief" />
+					<menuitem value="Esri.WorldPhysical" label="Esri.WorldPhysical" />
+					<menuitem value="Esri.OceanBasemap" label="Esri.OceanBasemap" />
+					<menuitem value="Esri.NatGeoWorldMap" label="Esri.NatGeoWorldMap" />
+					<menuitem value="Esri.WorldGrayCanvas" label="Esri.WorldGrayCanvas" />
+					<menuitem value="OpenWeatherMap.Clouds" label="OpenWeatherMap.Clouds" />
+					<menuitem value="OpenWeatherMap.CloudsClassic" label="OpenWeatherMap.CloudsClassic" />
+					<menuitem value="OpenWeatherMap.Precipitation" label="OpenWeatherMap.Precipitation" />
+					<menuitem value="OpenWeatherMap.PrecipitationClassic" label="OpenWeatherMap.PrecipitationClassic" />
+					<menuitem value="OpenWeatherMap.Rain" label="OpenWeatherMap.Rain" />
+					<menuitem value="OpenWeatherMap.RainClassic" label="OpenWeatherMap.RainClassic" />
+					<menuitem value="OpenWeatherMap.Pressure" label="OpenWeatherMap.Pressure" />
+					<menuitem value="OpenWeatherMap.PressureContour" label="OpenWeatherMap.PressureContour" />
+					<menuitem value="OpenWeatherMap.Wind" label="OpenWeatherMap.Wind" />
+					<menuitem value="OpenWeatherMap.Temperature" label="OpenWeatherMap.Temperature" />
+					<menuitem value="OpenWeatherMap.Snow" label="OpenWeatherMap.Snow" />
+					<menuitem value="HERE.normalDay" label="HERE.normalDay" />
+					<menuitem value="HERE.normalDayCustom" label="HERE.normalDayCustom" />
+					<menuitem value="HERE.normalDayGrey" label="HERE.normalDayGrey" />
+					<menuitem value="HERE.normalDayMobile" label="HERE.normalDayMobile" />
+					<menuitem value="HERE.normalDayGreyMobile" label="HERE.normalDayGreyMobile" />
+					<menuitem value="HERE.normalDayTransit" label="HERE.normalDayTransit" />
+					<menuitem value="HERE.normalDayTransitMobile" label="HERE.normalDayTransitMobile" />
+					<menuitem value="HERE.normalNight" label="HERE.normalNight" />
+					<menuitem value="HERE.normalNightMobile" label="HERE.normalNightMobile" />
+					<menuitem value="HERE.normalNightGrey" label="HERE.normalNightGrey" />
+					<menuitem value="HERE.normalNightGreyMobile" label="HERE.normalNightGreyMobile" />
+					<menuitem value="HERE.carnavDayGrey" label="HERE.carnavDayGrey" />
+					<menuitem value="HERE.hybridDay" label="HERE.hybridDay" />
+					<menuitem value="HERE.hybridDayMobile" label="HERE.hybridDayMobile" />
+					<menuitem value="HERE.pedestrianDay" label="HERE.pedestrianDay" />
+					<menuitem value="HERE.pedestrianNight" label="HERE.pedestrianNight" />
+					<menuitem value="HERE.satelliteDay" label="HERE.satelliteDay" />
+					<menuitem value="HERE.terrainDay" label="HERE.terrainDay" />
+					<menuitem value="HERE.terrainDayMobile" label="HERE.terrainDayMobile" />
+					<menuitem value="Acetate.basemap" label="Acetate.basemap" />
+					<menuitem value="Acetate.terrain" label="Acetate.terrain" />
+					<menuitem value="Acetate.all" label="Acetate.all" />
+					<menuitem value="Acetate.foreground" label="Acetate.foreground" />
+					<menuitem value="Acetate.roads" label="Acetate.roads" />
+					<menuitem value="Acetate.labels" label="Acetate.labels" />
+					<menuitem value="Acetate.hillshading" label="Acetate.hillshading" />
+					<menuitem value="FreeMapSK" label="FreeMapSK" />
+					<menuitem value="MtbMap" label="MtbMap" />
+					<menuitem value="CartoDB.Positron" label="CartoDB.Positron" />
+					<menuitem value="CartoDB.PositronNoLabels" label="CartoDB.PositronNoLabels" />
+					<menuitem value="CartoDB.DarkMatter" label="CartoDB.DarkMatter" />
+					<menuitem value="CartoDB.DarkMatterNoLabels" label="CartoDB.DarkMatterNoLabels" />
+					<menuitem value="HikeBike.HikeBike" label="HikeBike.HikeBike" />
+					<menuitem value="HikeBike.HillShading" label="HikeBike.HillShading" />
+					<menuitem value="BasemapAT.basemap" label="BasemapAT.basemap" />
+					<menuitem value="BasemapAT.grau" label="BasemapAT.grau" />
+					<menuitem value="BasemapAT.overlay" label="BasemapAT.overlay" />
+					<menuitem value="BasemapAT.highdpi" label="BasemapAT.highdpi" />
+					<menuitem value="BasemapAT.orthofoto" label="BasemapAT.orthofoto" />
+					<menuitem value="NASAGIBS.ModisTerraTrueColorCR" label="NASAGIBS.ModisTerraTrueColorCR" />
+					<menuitem value="NASAGIBS.ModisTerraBands367CR" label="NASAGIBS.ModisTerraBands367CR" />
+					<menuitem value="NASAGIBS.ViirsEarthAtNight2012" label="NASAGIBS.ViirsEarthAtNight2012" />
+					<menuitem value="NASAGIBS.ModisTerraLSTDay" label="NASAGIBS.ModisTerraLSTDay" />
+					<menuitem value="NASAGIBS.ModisTerraSnowCover" label="NASAGIBS.ModisTerraSnowCover" />
+					<menuitem value="NASAGIBS.ModisTerraAOD" label="NASAGIBS.ModisTerraAOD" />
+					<menuitem value="NASAGIBS.ModisTerraChlorophyll" label="NASAGIBS.ModisTerraChlorophyll" />
+					</menupopup>
+				</menulist>
+			</groupbox>
 	    </tabpanel>
 	    <tabpanel> 
 	    	<groupbox>
@@ -55,12 +163,12 @@
 				<checkbox id="mailhop.show_meta" label="Show Meta" checked="true"/>
 			</groupbox>	
 			<groupbox>
-				<caption label="Details Options"/>			
+				<caption label="Details menuitems"/>			
 				<label class="mailhopsHostPref"><checkbox id="mailhop.show_host" label="Show Host" checked="true"/></label>
 				<label class="mailhopsSecurePref"><checkbox id="mailhop.show_secure" label="Show Secure Transmission" checked="true"/></label>
 			</groupbox>
 			<groupbox>
-				<caption label="Authentication Options"/>			
+				<caption label="Authentication menuitems"/>			
 				<checkbox id="mailhop.show_mailer" label="Show Mailer" checked="true"/>
 				<checkbox id="mailhop.show_spf" label="Show SPF" checked="true"/>
 				<checkbox id="mailhop.show_dkim" label="Show DKIM" checked="true"/>
diff --git a/chrome/content/utils.js b/chrome/content/utils.js
index bf5687d..2ae628e 100644
--- a/chrome/content/utils.js
+++ b/chrome/content/utils.js
@@ -143,6 +143,9 @@ launchMap: function(route,options){
     if(options.fkey != '')
       lookupURL += '&fkey='+options.fkey;
 
+    if(options.map_provider)
+      lookupURL += '&mp='+options.map_provider;
+
       window.openDialog("chrome://mailhops/content/mailhopsMap.xul","MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=1024,height=768,resizable=yes', {src: lookupURL});    
    }
 },
diff --git a/install.rdf b/install.rdf
index 0e5cf6c..65acdee 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>1.0.1</em:version>
+		<em:version>1.0.2</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>
diff --git a/mailhops.xpi b/mailhops.xpi
index 82f2f3b..97e26da 100644
Binary files a/mailhops.xpi and b/mailhops.xpi differ