diff --git a/frontend/server/demo.js b/frontend/server/demo.js
index 8fca05cc..486eb484 100644
--- a/frontend/server/demo.js
+++ b/frontend/server/demo.js
@@ -458,7 +458,7 @@ module.exports = function (configLocation) {
 		};
 
 		mission(req, res){
-			var ret = {mission: {theatre: "PersianGulf"}};
+			var ret = {mission: {theatre: "Nevada"}};
 			ret.time = Date.now();
 
 			ret.mission.dateAndTime = {
diff --git a/frontend/website/src/map/map.ts b/frontend/website/src/map/map.ts
index 79bbcecf..d77396ad 100644
--- a/frontend/website/src/map/map.ts
+++ b/frontend/website/src/map/map.ts
@@ -321,7 +321,8 @@ export class Map extends L.Map {
     }
 
     setLayer(layerName: string) {
-        this.eachLayer((layer) => this.removeLayer(layer))
+        if (this.#layer)
+            this.removeLayer(this.#layer);
 
         let theatre = getApp().getMissionManager()?.getTheatre() ?? "Nevada";
 
diff --git a/olympus.json b/olympus.json
index d6f2b804..4cbdaf22 100644
--- a/olympus.json
+++ b/olympus.json
@@ -1,37 +1,36 @@
 {
-    "backend": {
-        "address": "localhost",
-        "port": 4512
-    },
-    "authentication": {
-        "gameMasterPassword": "4b8823ed9e5c2392ab4a791913bb8ce41956ea32e308b760eefb97536746dd33",
-        "blueCommanderPassword": "b0ea4230c1558c5313165eda1bdb7fced008ca7f2ca6b823fb4d26292f309098",
-        "redCommanderPassword": "302bcbaf2a3fdcf175b689bf102d6cdf9328f68a13d4096101bba806482bfed9"
-    },
-    "frontend": {
-        "port": 3000,
-        "elevationProvider": {
-            "provider": "https://srtm.fasma.org/{lat}{lng}.SRTMGL3S.hgt.zip",
-            "username": null,
-            "password": null
-        }, 
-		"additionalMaps": {
-			"TestMap": [
-				{
-					"urlTemplate": "http://localhost:3000/maps/TestMap/{z}/{x}/{y}.png",
-					"minNativeZoom": 1,
-					"maxNativeZoom": 13,
-					"minZoom": 1,
-					"maxZoom": 20
-				},
-				{
-					"urlTemplate": "http://localhost:3000/maps/TestMap/{z}/{x}/{y}.png",
-					"minNativeZoom": 14,
-					"maxNativeZoom": 17,
-					"minZoom": 14,
-					"maxZoom": 20
-				}
-			]
+	"backend": {
+		"address": "localhost",
+		"port": 4512
+	},
+	"authentication": {
+		"gameMasterPassword": "4b8823ed9e5c2392ab4a791913bb8ce41956ea32e308b760eefb97536746dd33",
+		"blueCommanderPassword": "b0ea4230c1558c5313165eda1bdb7fced008ca7f2ca6b823fb4d26292f309098",
+		"redCommanderPassword": "302bcbaf2a3fdcf175b689bf102d6cdf9328f68a13d4096101bba806482bfed9"
+	},
+	"frontend": {
+		"port": 3000,
+		"elevationProvider": {
+			"provider": "https://srtm.fasma.org/{lat}{lng}.SRTMGL3S.hgt.zip",
+			"username": null,
+			"password": null
+		},
+		"mapLayers": {
+			"ArcGIS Satellite": {
+				"urlTemplate": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
+				"minZoom": 1,
+				"maxZoom": 19,
+				"attribution": "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Mapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+			},
+			"OpenStreetMap Mapnik": {
+				"urlTemplate": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+				"minZoom": 1,
+				"maxZoom": 20,
+				"attribution": "OpenStreetMap contributors"
+			}
+		},
+		"mapMirrors": {
+			"DCS Map (Refugees)": "https://refugees.dcsolympus.com/maps"
 		}
-    }
-}
\ No newline at end of file
+	}
+}