diff --git a/data/colors.txt b/data/colors.txt
index 552a00367d..0eaf151082 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -623,7 +623,6 @@
 3427361097
 3428218198
 3428990335
-3430108454
 3431500856
 3432785840
 3435428607
@@ -640,6 +639,7 @@
 3653532415
 3657174555
 3942645760
+4000533798
 4043309055
 4278401920
 4278542285
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 32eef36d79..1248807d07 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index a7cb172129..bf50f8b108 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -16379,7 +16379,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16394,7 +16394,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16409,7 +16409,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16424,7 +16424,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16439,7 +16439,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16454,7 +16454,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16469,7 +16469,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16481,66 +16481,6 @@ cont {
       priority: 6700
     }
   }
-  element {
-    scale: 17
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -53709,65 +53649,35 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 499543fd70..73ccee4e58 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 036fe8f48e..8d897e3aae 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -15765,7 +15765,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15780,7 +15780,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15795,7 +15795,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15810,7 +15810,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15825,7 +15825,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15840,7 +15840,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15855,7 +15855,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15867,66 +15867,6 @@ cont {
       priority: 6700
     }
   }
-  element {
-    scale: 17
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16489,69 +16429,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area"
@@ -16668,57 +16545,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -16870,69 +16696,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17049,57 +16812,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17216,57 +16928,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17383,57 +17044,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17550,57 +17160,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17717,57 +17276,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "building"
@@ -51119,65 +50627,35 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 037f158a43..2b2a9373e9 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 760e4e4553..b69b141a5e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -15765,7 +15765,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15780,7 +15780,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15795,7 +15795,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15810,7 +15810,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15825,7 +15825,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15840,7 +15840,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15855,7 +15855,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -15867,66 +15867,6 @@ cont {
       priority: 6700
     }
   }
-  element {
-    scale: 17
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16489,69 +16429,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area"
@@ -16668,57 +16545,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -16870,69 +16696,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17049,57 +16812,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17216,57 +16928,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17383,57 +17044,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17550,57 +17160,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17717,57 +17276,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "building"
@@ -51383,65 +50891,35 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 11
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
 }
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index ebc15447ef..867c3e6272 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 5d6a89cf9e..23f3165b7e 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -16227,7 +16227,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16242,7 +16242,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16257,7 +16257,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16272,7 +16272,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16287,7 +16287,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16302,7 +16302,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16317,7 +16317,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16329,66 +16329,6 @@ cont {
       priority: 6700
     }
   }
-  element {
-    scale: 17
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 872415231
-      }
-      priority: 6700
-    }
-  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16965,69 +16905,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area"
@@ -17161,57 +17038,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -17377,69 +17203,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17573,57 +17336,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17757,57 +17469,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17941,57 +17602,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -18125,57 +17735,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -18309,57 +17868,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "building"
@@ -54307,65 +53815,35 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 19
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 20
-    area {
-      color: 3431500856
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 3832097
-        stroke_color: 452984831
+        height: 10
+        color: 4473924
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
 }
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 9a52aeba5b..b46bc62087 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 78a2180b2e..2c8a20e66d 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -16227,7 +16227,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16242,7 +16242,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16257,7 +16257,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16272,7 +16272,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16287,7 +16287,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16302,7 +16302,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16317,7 +16317,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 3430108454
+      color: 4000533798
       priority: 20
     }
     caption {
@@ -16329,66 +16329,6 @@ cont {
       priority: 6700
     }
   }
-  element {
-    scale: 17
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3430108454
-      priority: 20
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6967599
-        stroke_color: 856032768
-      }
-      priority: 6700
-    }
-  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16965,69 +16905,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area"
@@ -17161,57 +17038,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -17377,69 +17203,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17573,57 +17336,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17757,57 +17469,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17941,57 +17602,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -18125,57 +17735,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -18309,57 +17868,6 @@ cont {
       priority: -3300
     }
   }
-  element {
-    scale: 18
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
-    caption {
-      primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -3300
-    }
-  }
 }
 cont {
   name: "building"
@@ -54571,65 +54079,35 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 19
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
   element {
     scale: 20
-    area {
-      color: 3425648640
-      priority: 20
-    }
-    symbol {
-      name: "nparkf-outline-m"
-      priority: 6700
-    }
     caption {
       primary {
-        height: 12
-        color: 2836760
-        stroke_color: 436602368
+        height: 10
+        color: 9211020
         offset_y: 1
-        is_optional: true
       }
-      priority: -3300
+      priority: 6700
     }
   }
 }
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index ad70614ea5..d497875d28 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -458,12 +458,12 @@ waterway-dam                                        # line z14- and area z14- (a
 === 30
 
 amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # area z10- (also has caption z10-)
-boundary-national_park                              # area z10- (also has icon z11-, caption(optional) z12-)
-boundary-protected_area-1                           # area z10- (also has icon z11-, caption(optional) z12-)
+boundary-aboriginal_lands                           # area z10-16 (also has caption z10-16)
+boundary-national_park                              # area z10-17 (also has icon z11-17, caption(optional) z12-17)
+boundary-protected_area-1                           # area z10-17 (also has icon z11-17, caption(optional) z12-17)
 landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
 landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-leisure-nature_reserve                              # area z10- (also has icon z11-, caption(optional) z12-)
+leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
 === 20
 
 piste:type-snow_park                                # area z14- (also has caption z15-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index f979ae1d12..514fc552ef 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -94,16 +94,16 @@ highway-trunk-bridge::shield                        # shield::shield z10- (also
 highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-)
 === 6740
 
-boundary-aboriginal_lands                           # caption z10- (also has area z10-)
-boundary-national_park                              # icon z11- (also has caption(optional) z12-, area z10-)
-boundary-protected_area                             # icon z11- (also has caption(optional) z12-)
-boundary-protected_area-1                           # icon z11- (also has caption(optional) z12-, area z10-)
-boundary-protected_area-2                           # icon z11- (also has caption(optional) z12-)
-boundary-protected_area-3                           # icon z11- (also has caption(optional) z12-)
-boundary-protected_area-4                           # icon z11- (also has caption(optional) z12-)
-boundary-protected_area-5                           # icon z11- (also has caption(optional) z12-)
-boundary-protected_area-6                           # icon z11- (also has caption(optional) z12-)
-leisure-nature_reserve                              # icon z11- (also has caption(optional) z12-, area z10-)
+boundary-aboriginal_lands                           # caption z10-16 (also has area z10-16)
+boundary-national_park                              # icon z11-17 (also has caption(optional) z12-17, area z10-17)
+boundary-protected_area                             # icon z11-17 (also has caption(optional) z12-17)
+boundary-protected_area-1                           # icon z11-17 (also has caption(optional) z12-17, area z10-17)
+boundary-protected_area-2                           # icon z11-17 (also has caption(optional) z12-17)
+boundary-protected_area-3                           # icon z11-17 (also has caption(optional) z12-17)
+boundary-protected_area-4                           # icon z11-17 (also has caption(optional) z12-17)
+boundary-protected_area-5                           # icon z11-17 (also has caption(optional) z12-17)
+boundary-protected_area-6                           # icon z11-17 (also has caption(optional) z12-17)
+leisure-nature_reserve                              # icon z11-17 and caption z18- (also has caption(optional) z12-17, area z10-17)
 === 6700
 
 landuse-reservoir                                   # caption z10- (also has area z12-)
@@ -1255,15 +1255,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station                                   # caption(optional) z12- (also has icon z12-)
 # === -3200
 
-# boundary-national_park                            # caption(optional) z12- (also has icon z11-, area z10-)
-# boundary-protected_area                           # caption(optional) z12- (also has icon z11-)
-# boundary-protected_area-1                         # caption(optional) z12- (also has icon z11-, area z10-)
-# boundary-protected_area-2                         # caption(optional) z12- (also has icon z11-)
-# boundary-protected_area-3                         # caption(optional) z12- (also has icon z11-)
-# boundary-protected_area-4                         # caption(optional) z12- (also has icon z11-)
-# boundary-protected_area-5                         # caption(optional) z12- (also has icon z11-)
-# boundary-protected_area-6                         # caption(optional) z12- (also has icon z11-)
-# leisure-nature_reserve                            # caption(optional) z12- (also has icon z11-, area z10-)
+# boundary-national_park                            # caption(optional) z12-17 (also has icon z11-17, area z10-17)
+# boundary-protected_area                           # caption(optional) z12-17 (also has icon z11-17)
+# boundary-protected_area-1                         # caption(optional) z12-17 (also has icon z11-17, area z10-17)
+# boundary-protected_area-2                         # caption(optional) z12-17 (also has icon z11-17)
+# boundary-protected_area-3                         # caption(optional) z12-17 (also has icon z11-17)
+# boundary-protected_area-4                         # caption(optional) z12-17 (also has icon z11-17)
+# boundary-protected_area-5                         # caption(optional) z12-17 (also has icon z11-17)
+# boundary-protected_area-6                         # caption(optional) z12-17 (also has icon z11-17)
+# leisure-nature_reserve                            # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17)
 # === -3300
 
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index a90d77befd..22c445263c 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -458,12 +458,12 @@ waterway-dam                                        # line z14- and area z14- (a
 === 30
 
 amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # area z10- (also has caption z10-)
-boundary-national_park                              # area z10- (also has icon z10-, caption(optional) z11-)
-boundary-protected_area-1                           # area z10- (also has icon z10-, caption(optional) z11-)
+boundary-aboriginal_lands                           # area z10-16 (also has caption z10-16)
+boundary-national_park                              # area z10-17 (also has icon z10-17, caption(optional) z11-17)
+boundary-protected_area-1                           # area z10-17 (also has icon z10-17, caption(optional) z11-17)
 landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
 landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-leisure-nature_reserve                              # area z10- (also has icon z10-, caption(optional) z11-)
+leisure-nature_reserve                              # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-)
 === 20
 
 piste:type-downhill-advanced-area                   # area z13-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 3ead5e97e0..5c576bcf6f 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -94,16 +94,16 @@ highway-trunk-bridge::shield                        # shield::shield z10- (also
 highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-)
 === 6740
 
-boundary-aboriginal_lands                           # caption z10- (also has area z10-)
-boundary-national_park                              # icon z10- (also has caption(optional) z11-, area z10-)
-boundary-protected_area                             # icon z10- (also has caption(optional) z11-)
-boundary-protected_area-1                           # icon z10- (also has caption(optional) z11-, area z10-)
-boundary-protected_area-2                           # icon z10- (also has caption(optional) z11-)
-boundary-protected_area-3                           # icon z10- (also has caption(optional) z11-)
-boundary-protected_area-4                           # icon z10- (also has caption(optional) z11-)
-boundary-protected_area-5                           # icon z10- (also has caption(optional) z11-)
-boundary-protected_area-6                           # icon z10- (also has caption(optional) z11-)
-leisure-nature_reserve                              # icon z10- (also has caption(optional) z11-, area z10-)
+boundary-aboriginal_lands                           # caption z10-16 (also has area z10-16)
+boundary-national_park                              # icon z10-17 (also has caption(optional) z11-17, area z10-17)
+boundary-protected_area                             # icon z10-17 (also has caption(optional) z11-17)
+boundary-protected_area-1                           # icon z10-17 (also has caption(optional) z11-17, area z10-17)
+boundary-protected_area-2                           # icon z10-17 (also has caption(optional) z11-17)
+boundary-protected_area-3                           # icon z10-17 (also has caption(optional) z11-17)
+boundary-protected_area-4                           # icon z10-17 (also has caption(optional) z11-17)
+boundary-protected_area-5                           # icon z10-17 (also has caption(optional) z11-17)
+boundary-protected_area-6                           # icon z10-17 (also has caption(optional) z11-17)
+leisure-nature_reserve                              # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17)
 === 6700
 
 landuse-reservoir                                   # caption z10- (also has area z12-)
@@ -1255,15 +1255,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station                                   # caption(optional) z12- (also has icon z12-)
 # === -3200
 
-# boundary-national_park                            # caption(optional) z11- (also has icon z10-, area z10-)
-# boundary-protected_area                           # caption(optional) z11- (also has icon z10-)
-# boundary-protected_area-1                         # caption(optional) z11- (also has icon z10-, area z10-)
-# boundary-protected_area-2                         # caption(optional) z11- (also has icon z10-)
-# boundary-protected_area-3                         # caption(optional) z11- (also has icon z10-)
-# boundary-protected_area-4                         # caption(optional) z11- (also has icon z10-)
-# boundary-protected_area-5                         # caption(optional) z11- (also has icon z10-)
-# boundary-protected_area-6                         # caption(optional) z11- (also has icon z10-)
-# leisure-nature_reserve                            # caption(optional) z11- (also has icon z10-, area z10-)
+# boundary-national_park                            # caption(optional) z11-17 (also has icon z10-17, area z10-17)
+# boundary-protected_area                           # caption(optional) z11-17 (also has icon z10-17)
+# boundary-protected_area-1                         # caption(optional) z11-17 (also has icon z10-17, area z10-17)
+# boundary-protected_area-2                         # caption(optional) z11-17 (also has icon z10-17)
+# boundary-protected_area-3                         # caption(optional) z11-17 (also has icon z10-17)
+# boundary-protected_area-4                         # caption(optional) z11-17 (also has icon z10-17)
+# boundary-protected_area-5                         # caption(optional) z11-17 (also has icon z10-17)
+# boundary-protected_area-6                         # caption(optional) z11-17 (also has icon z10-17)
+# leisure-nature_reserve                            # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17)
 # === -3300
 
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)