diff --git a/www/assets/js/map_mapbox.js b/www/assets/js/map_mapbox.js
index b8b9162..d31590c 100644
--- a/www/assets/js/map_mapbox.js
+++ b/www/assets/js/map_mapbox.js
@@ -10,6 +10,9 @@ var firstload = true;
 
 function mapboxMap() {
 
+    /* Pre-load workers and stuff, and enable re-using them even after map unloaded */
+    mapboxgl.prewarm();
+
     var mapsource = "auto";
 
     if (getStorage("mapsource") == null) {
diff --git a/www/settings.js b/www/settings.js
index 803a800..94525fe 100644
--- a/www/settings.js
+++ b/www/settings.js
@@ -27,10 +27,10 @@ var SETTINGS = {
             bgcolor: "#EDF5F3"
         },
         satellite: {
-          url: "https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/{z}/{x}/{y}?access_token={mapboxpublictoken}",
-          json: "mapbox://styles/mapbox/satellite-streets-v11",
-          name: "Satellite",
-          bgcolor: "#EDF5F3"
+            url: "https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/{z}/{x}/{y}?access_token={mapboxpublictoken}",
+            json: "mapbox://styles/mapbox/satellite-streets-v11",
+            name: "Satellite",
+            bgcolor: "#EDF5F3"
         },
         fiord: {
             url: "https://maps.netsyms.net/styles/fiord-color/{z}/{x}/{y}.png",