diff --git a/src/assets/basemapat.json b/src/assets/basemapat.json
index db68c1d..ea37220 100644
--- a/src/assets/basemapat.json
+++ b/src/assets/basemapat.json
@@ -32,6 +32,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://sotl.as/sprites",
@@ -44,6 +48,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "basemapat",
       "type": "raster",
diff --git a/src/assets/caltopo.json b/src/assets/caltopo.json
index a7f90ab..d2a147c 100644
--- a/src/assets/caltopo.json
+++ b/src/assets/caltopo.json
@@ -32,6 +32,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://sotl.as/sprites",
@@ -44,6 +48,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "caltopo",
       "type": "raster",
diff --git a/src/assets/norkart.json b/src/assets/norkart.json
index 2296778..790e4df 100644
--- a/src/assets/norkart.json
+++ b/src/assets/norkart.json
@@ -32,6 +32,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://sotl.as/sprites",
@@ -44,6 +48,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "norkart",
       "type": "raster",
diff --git a/src/assets/swisstopo.json b/src/assets/swisstopo.json
index 3dcb9d8..282dc83 100644
--- a/src/assets/swisstopo.json
+++ b/src/assets/swisstopo.json
@@ -89,6 +89,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite",
@@ -105,6 +109,34 @@
         "background-color": "rgba(255, 255, 255, 1)"
       }
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "relief_shading",
       "type": "raster",
diff --git a/src/assets/swisstopo_aerial.json b/src/assets/swisstopo_aerial.json
index 168a096..7ef8de6 100644
--- a/src/assets/swisstopo_aerial.json
+++ b/src/assets/swisstopo_aerial.json
@@ -86,6 +86,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite",
@@ -98,6 +102,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "swisstopo",
       "type": "raster",
diff --git a/src/assets/swisstopo_raster.json b/src/assets/swisstopo_raster.json
index bb74d75..07e1bef 100644
--- a/src/assets/swisstopo_raster.json
+++ b/src/assets/swisstopo_raster.json
@@ -86,6 +86,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite",
@@ -98,6 +102,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "swisstopo",
       "type": "raster",
diff --git a/src/assets/toposvalbard.json b/src/assets/toposvalbard.json
index fd39dbe..a3622c9 100644
--- a/src/assets/toposvalbard.json
+++ b/src/assets/toposvalbard.json
@@ -32,6 +32,10 @@
     "az": {
       "type": "vector",
       "url": "https://1.{mapServer}.map.sotl.as/data/az.json"
+    },
+    "openmaptiles": {
+      "type": "vector",
+      "url": "https://0.{mapServer}.map.sotl.as/data/osm-sotlas.json"
     }
   },
   "sprite": "https://sotl.as/sprites",
@@ -44,6 +48,34 @@
       "layout": {"visibility": "visible"},
       "paint": {"background-color": "rgba(255, 255, 255, 1)"}
     },
+    {
+      "id": "water",
+      "type": "fill",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "water",
+      "filter": ["all"],
+      "layout": {"visibility": "visible"},
+      "paint": {"fill-color": "rgba(103, 166, 196, 0.2)"}
+    },
+    {
+      "id": "boundary_2",
+      "type": "line",
+      "metadata": {},
+      "source": "openmaptiles",
+      "source-layer": "boundary",
+      "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]],
+      "layout": {
+        "line-cap": "round",
+        "line-join": "round",
+        "visibility": "visible"
+      },
+      "paint": {
+        "line-color": "rgba(136, 136, 136, 1)",
+        "line-opacity": 0.2,
+        "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]}
+      }
+    },
     {
       "id": "toposvalbard",
       "type": "raster",