diff --git a/mapserver/mapfiles/basemap.map b/mapserver/mapfiles/basemap.map
index 293f40e2dc34e917412f52c0e8a979c38ec09d70..33e7edfb5e0d9b250a00faa20c2ba767f0a98fa9 100644
--- a/mapserver/mapfiles/basemap.map
+++ b/mapserver/mapfiles/basemap.map
@@ -2,10 +2,11 @@ MAP
   NAME "Basemap"
   STATUS ON
   MAXSIZE 5000
-  SIZE 2048 1024
-  IMAGETYPE      PNG
-  SIZE           256 256
+  SIZE 1024 1024
+  IMAGECOLOR 192 192 192
+  IMAGETYPE png256
   EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
+  FONTSET "/work/mapfiles/fonts.list"
 
   PROJECTION
     "init=epsg:930916"
@@ -19,8 +20,6 @@ MAP
   END
 
   INCLUDE '/work/mapfiles/output_formats.map'
-  IMAGECOLOR 192 192 192
-  IMAGETYPE png256
 
   LAYER
     NAME "m10_countries"
diff --git a/mapserver/mapfiles/borders.map b/mapserver/mapfiles/borders.map
index 49767a2e9bc5914c2afb50e0471a730d77044c36..337c5e3c85362611308a0616cab65f545e36bbd3 100644
--- a/mapserver/mapfiles/borders.map
+++ b/mapserver/mapfiles/borders.map
@@ -2,10 +2,11 @@ MAP
   NAME "Borders"
   STATUS ON
   MAXSIZE 5000
-  SIZE 2048 1024
-  IMAGETYPE      PNG
-  SIZE           256 256
+  SIZE 1024 1024
+  IMAGECOLOR 128 128 128
+  IMAGETYPE rgb
   EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
+  FONTSET "/work/mapfiles/fonts.list"
 
   PROJECTION
     "init=epsg:930916"
@@ -19,8 +20,6 @@ MAP
   END
 
   INCLUDE '/work/mapfiles/output_formats.map'
-  IMAGECOLOR 128 128 128
-  IMAGETYPE rgb
 
   LAYER
     NAME "m10_countries"
diff --git a/mapserver/mapfiles/graticules.map b/mapserver/mapfiles/graticules.map
index 80e2e53d59398a5176f281406b1c7a875a611a96..b7dea2b309cf8dbdae9d17fc3f7622b3e3ff331a 100644
--- a/mapserver/mapfiles/graticules.map
+++ b/mapserver/mapfiles/graticules.map
@@ -2,7 +2,7 @@ MAP
   NAME "latlongrid"
   STATUS ON
   MAXSIZE 5000
-  SIZE 2048 1024
+  SIZE 1024 1024
   EXTENT -180 -90 180 90
   UNITS DD
   FONTSET "/work/mapfiles/fonts.list"
@@ -53,7 +53,7 @@ MAP
         COLOR 255 255 255
         OUTLINECOLOR 0 0 0
         MINSCALEDENOM 1
-        MaXSCALEDENOM 5000000
+        MAXSCALEDENOM 5000000
       END
       STYLE
         PATTERN 16 16 END
diff --git a/mapserver/mapfiles/overlays.map b/mapserver/mapfiles/overlays.map
new file mode 100644
index 0000000000000000000000000000000000000000..20117becf5c247216fd7413610c78c0725df0fcc
--- /dev/null
+++ b/mapserver/mapfiles/overlays.map
@@ -0,0 +1,280 @@
+MAP
+  NAME "Map Overlays"
+  STATUS ON
+  MAXSIZE 5000
+  SIZE 1024 1024
+  IMAGECOLOR 128 128 128
+  IMAGETYPE rgb
+  EXTENT -5434894.885 -5434894.885 5434894.885 5434894.885
+  FONTSET "/work/mapfiles/fonts.list"
+
+  PROJECTION
+    "init=epsg:930916"
+  END
+
+  WEB
+    METADATA
+      "wms_title" "Overlays"
+      INCLUDE "/work/mapfiles/generic_metadata.map"
+    END
+  END
+
+  INCLUDE '/work/mapfiles/output_formats.map'
+
+  LAYER
+    NAME "m10_countries"
+    DATA /work/shapefiles/ne_10m_admin_0_countries
+    EXTENT -180 -89.9998 180 83.6338
+    STATUS ON
+    TYPE POLYGON
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP bw_map
+    METADATA
+     "wms_title"          "m10_countries"
+    END
+    MINSCALEDENOM 1
+    MAXSCALEDENOM 11000000000
+    OFFSITE 128 128 128
+    CLASS
+      NAME '10m_countries'
+      STYLE
+        WIDTH 2
+        OUTLINECOLOR 0 0 0
+      END
+      STYLE
+        WIDTH 1
+        OUTLINECOLOR 255 255 255
+      END
+    END
+  END
+
+  LAYER
+    NAME "m10_states"
+    DATA /work/shapefiles/ne_10m_admin_1_states_provinces_lines
+    EXTENT  -139.047 -49.2507 178.449 81.1382
+    STATUS ON
+    # don't show this for some countries to avoid conflicting lines between layers
+    FILTER (("[adm0_name]" == "Australia") OR ("[adm0_name]" == "Canada") OR ("[adm0_name]" == "United States of America"))
+    TYPE LINE
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP bw_map
+    METADATA
+     "wms_title"          "m10_states"
+    END
+    MINSCALEDENOM 1
+    MAXSCALEDENOM 150000000
+    OFFSITE 128 128 128
+    CLASS
+      NAME '10m_states'
+      STYLE
+        WIDTH 2
+        COLOR 0 0 0
+      END
+      STYLE
+        WIDTH 1
+        COLOR 255 255 255
+      END
+    END
+  END
+
+  LAYER
+    NAME "m10_lakes"
+    DATA /work/shapefiles/ne_10m_lakes
+    EXTENT -165.966 -50.6696 176.094 81.9553
+    STATUS ON
+    TYPE POLYGON
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP bw_map
+    METADATA
+     "wms_title"          "m10_lakes"
+    END
+    MINSCALEDENOM 1
+    #MAXSCALEDENOM 37500000
+    MAXSCALEDENOM 3750000
+    OFFSITE 128 128 128
+    CLASS
+      NAME '10m_lakes'
+      STYLE
+        WIDTH 2
+        OUTLINECOLOR 0 0 0
+      END
+      STYLE
+        WIDTH 1
+        OUTLINECOLOR 255 255 255
+      END
+    END
+  END
+
+
+  LAYER
+    NAME "cb_2018_us_county_500k"
+    DATA /work/shapefiles/cb_2018_us_county_500k
+    EXTENT -179.147 -14.5487 179.778 71.3526
+    # Limit to 50 states based on FIPS codes (exclude Hawaii)
+    FILTER ("[STATEFP]" <= "56" AND "[STATEFP]" != "03" AND "[STATEFP]" != "7" AND "[STATEFP]" != "14" AND "[STATEFP]" != "43" AND "[STATEFP]" != "52" AND "[STATEFP]" != "15")
+    STATUS ON
+    TYPE POLYGON
+    PROJECTION
+      "init=epsg:4269"
+    END
+    GROUP bw_map
+    METADATA
+     "wms_title"          "cb_2018_us_county_500k"
+    END
+    MINSCALEDENOM 1
+    #MAXSCALEDENOM 5000000
+    MAXSCALEDENOM 200000
+    OFFSITE 128 128 128
+    CLASS
+      NAME 'cb_2018_us_county_500k'
+      STYLE
+        WIDTH 2
+        OUTLINECOLOR 0 0 0
+      END
+      STYLE
+        WIDTH 1
+        OUTLINECOLOR 255 255 255
+      END
+    END
+  END
+
+  # Graticule Lines
+  LAYER
+    NAME "1degree_grid"
+    DATA /work/shapefiles/ne_10m_graticules_1
+    EXTENT -180 -90 180 90
+    STATUS ON
+    TYPE LINE
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP latlongrid
+    METADATA
+     "wms_title"          "10m resolution 1 degree grid"
+    END
+    MINSCALEDENOM 1
+    MAXSCALEDENOM 5000000
+    OFFSITE 127 127 127
+    CLASS
+      NAME '1degree_grid'
+      TEXT '[degrees]°'
+      LABEL
+        TYPE TRUETYPE
+        FONT arial
+        SIZE 10
+        FORCE FALSE
+        PARTIALS FALSE
+        POSITION AUTO
+        MINDISTANCE 1024
+        COLOR 255 255 255
+        OUTLINECOLOR 0 0 0
+        MINSCALEDENOM 1
+        MAXSCALEDENOM 5000000
+      END
+      STYLE
+        PATTERN 16 16 END
+        WIDTH 2
+        COLOR 0 0 0
+      END
+      STYLE
+        PATTERN 16 16 END
+        WIDTH 1
+        COLOR 255 255 255
+      END
+    END
+  END
+
+  LAYER
+    NAME "5degree_grid"
+    DATA /work/shapefiles/ne_10m_graticules_5
+    EXTENT -180 -90 180 90
+    STATUS ON
+    TYPE LINE
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP latlongrid
+    METADATA
+     "wms_title"          "10m resolution 5 degree grid"
+    END
+    MINSCALEDENOM 5000000
+    MAXSCALEDENOM 50000000
+    OFFSITE 127 127 127
+    CLASS
+      NAME '5degree_grid'
+      TEXT '[degrees]°'
+      LABEL
+        TYPE TRUETYPE
+        FONT arial
+        SIZE 10
+        FORCE FALSE
+        PARTIALS FALSE
+        POSITION AUTO
+        MINDISTANCE 1024
+        COLOR 255 255 255
+        OUTLINECOLOR 0 0 0
+        MINSCALEDENOM 5000000
+        MAXSCALEDENOM 50000000
+      END
+      STYLE
+        PATTERN 32 32 END
+        WIDTH 2
+        COLOR 0 0 0
+      END
+      STYLE
+        PATTERN 32 32 END
+        WIDTH 1
+        COLOR 255 255 255
+      END
+    END
+  END
+
+  LAYER
+    NAME "10degree_grid"
+    DATA /work/shapefiles/ne_10m_graticules_10
+    EXTENT -180 -90 180 90
+    STATUS ON
+    TYPE LINE
+    PROJECTION
+      "init=epsg:4326"
+    END
+    GROUP latlongrid
+    METADATA
+     "wms_title"          "10m resolution 10 degree grid"
+    END
+    MINSCALEDENOM 50000000
+    MAXSCALEDENOM 11000000000
+    OFFSITE 127 127 127
+    CLASS
+      NAME '10degree_grid'
+      TEXT '[degrees]°'
+      LABEL
+        TYPE TRUETYPE
+        FONT arial
+        SIZE 10
+        FORCE FALSE
+        PARTIALS FALSE
+        POSITION AUTO
+        MINDISTANCE 1024
+        COLOR 255 255 255
+        OUTLINECOLOR 0 0 0
+        MINSCALEDENOM 50000000
+        MAXSCALEDENOM 11000000000
+      END
+      STYLE
+        WIDTH 2
+        COLOR 0 0 0
+      END
+      STYLE
+        WIDTH 1
+        COLOR 255 255 255
+      END
+    END
+  END
+END