From 0432abc30002e1cef32e8b74eebbd64d7e12dc83 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 18 Apr 2024 21:56:06 +0300
Subject: [PATCH] [styles] Regenerate for reserves

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/colors.txt                               |   2 +-
 data/drules_proto.bin                         | Bin 428813 -> 428530 bytes
 data/drules_proto.txt                         | 122 +---
 data/drules_proto_clear.bin                   | Bin 415545 -> 413786 bytes
 data/drules_proto_clear.txt                   | 554 +-----------------
 data/drules_proto_dark.bin                    | Bin 414137 -> 412378 bytes
 data/drules_proto_dark.txt                    | 554 +-----------------
 data/drules_proto_outdoors_clear.bin          | Bin 434032 -> 432273 bytes
 data/drules_proto_outdoors_clear.txt          | 554 +-----------------
 data/drules_proto_outdoors_dark.bin           | Bin 432505 -> 430746 bytes
 data/drules_proto_outdoors_dark.txt           | 554 +-----------------
 .../clear/include/priorities_3_FG.prio.txt    |   8 +-
 .../include/priorities_4_overlays.prio.txt    |  38 +-
 .../outdoors/include/priorities_3_FG.prio.txt |   8 +-
 .../include/priorities_4_overlays.prio.txt    |  38 +-
 15 files changed, 127 insertions(+), 2305 deletions(-)

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 32eef36d799c796207918a34dba1e24882f16959..1248807d075c59a5bcfdd9f6c0668648199cb15a 100644
GIT binary patch
delta 190
zcmeC3CiQ8u)Q0pcOr1=VGq0#Jede1y;fex;lH}x(;^0^|>nvDMa`M|N>`;lx{8wR2
zPJU!HoB~KZvF2Y_xBt4z$bXz^Ez5T9xlErJt%W#*wD`C<Ik*IlbWCK@V3b&6A|%8i
aj73ZYU9A1|d?p}f24a@&r{}Xey#@fZ4Md{=

delta 262
zcmew~S*mxM)Q0pcOcR+WXI@cdddxF<!W9JwCCSMn#lf*`)>*Ki<m9(k*r5`W`LDv5
zoczdYI0cY-^@1>-gou_97cU35!1_finI-=J|39BuVvUKA0*4Sm6~Y8nh~QGuoO5-1
n&Q(Uy<4gxww>QsW`ouVS&7Je@8|N_rF*6XeY~MJK)$ug|9(QA;

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 499543fd708166dedb02f9f7728ff01631d61683..73ccee4e58c19c819e89a85eb83ec4f7f8fc04a3 100644
GIT binary patch
delta 292
zcmdnFPV&|Q$qi4>Fm*Cbett%k=`-JCgR_#H+)^AI%VwPg^Auo$yhwtQlY7syLnS7!
zhch_^kkp86t~lq$%Jh+W^MT7B8CkjJF>{Ge{&-h>^PFp~jLckLm?yu#E4BIkjaxv@
z0tjd8?KUuH^ZUCC5TdaUAfjOP8y_KYSf92rHrqVkZu6W`athO0mhIuyOrIF7g*b$?
s__#PZxCD-LOk~nvlvraTB*Y<%MN9-;tX;g035c12m}R?o9jnq!0RBj9Bme*a

delta 540
zcmcb$Kyv3g$qi4>Fim8h{QQh6(_@~=24^KXxurNbmd!c~<|)7gd65JqC-<IZhe}Ld
z4`*@;Agietgz+Rqw1l{LIk*MZFIveg@&Et-`OFe)OoS9Tgb1n-Ca6LLmx|4=&ib%2
z9bnyTarq-7i;y#i&~(ExCKpCw2qgld99g-}vv7$|K7UPov+LDXpfXDip~(yGSuqNO
z$jKkCSTY@Eog8pqYV-4Jw{V)m%yp3ktmxj2Hmqhqr5kVIl~%cfSNix}T+*8Z?k~V*
qZ}Z0o+dn>Fl$ZhxhV9&?OrIE;u?IuDML81?GXpWpc8hXWrJDdP7{sIi

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 037f158a43f8c7dd2bf5eb4923ae81950faeed8f..2b2a9373e9f53e2e178c5db75e162c168366bb3e 100644
GIT binary patch
delta 295
zcmdnFSn}3X$qk)nm^zszcb`#Z`ph@E?yMvyw-g7*vRP*#yvc9RutOy#^Phz=Ir)&)
zaPp(@1dw=Qn`O?qu`+#R-kfszBO@!<JZ3KO$&R<hH#=NwWn||1!aUjjw$$dyH*Ntr
z3z#?C-(CP_fJN8dZ9{MvA0Tl;A3->q`=2aeY<}=;`-5kU%ce1{W!c_Q%k+uST8KkP
ti;s(wgG-=i<|Y;mMu{~hLP8wESj0ro#o9d@n1GlWh*`FKG_V$41OUYAYFz*T

delta 540
zcmcaLRdVNI$qk)nm?kn$?mnZ+^q6OI-B~dnAq5U@DGrWhv(7>UCciqv1(lo3a~96j
zLofs2Ops;)WX<(J0YR96gou_97cU35!1_finI#%}X3SugSYrZIAw*DxFhLa}SXFH9
zKI_lQbbxj9ol74XS%jQ9geKp=?!qVxCPjdxBQw`|mdzKg%md0=0%Z?gwF1h5NRi1G
zZ(1-NX5CzP?F%lg7g;73UX$9~bfXQ2cBlf?TLcuGxQ$!E=D@oP@Egx}ABXPdsSmbK
leZaVM8ZZd9+mthXVr0e=1nrrXOhC*G#4Ou0D_ILK0sty|$X5UW

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 ebc15447ef55777d784fa6f01d7cbcb4f4e3c1e4..867c3e6272deb2ac284a01eed82aaebd558e7779 100644
GIT binary patch
delta 302
zcmeycPio>usSWOzm^zszdtOpy`ph@E;F1D_lH}x(;^0^|>nvDMa`M?r>`;lx@8L{N
zeq=SA0!Tcu&9^SQu`;b-*{pO^gNd2zCi7;QJ2x3wxmL4qNluo#Bfk02Js~DmuG`E|
z?*4~|fU<C|-xCz>-DfD=oR=uv->(lbHs`(Dp7)NiZX?qZmhJE6Gifqe3vmc(@o{l-
pa0wjgn8>8TD6z&wNQgrii<k(ySo_mOOhC*G#4OvNE@JKe0|24#Z#Dn`

delta 595
zcmbQZQR>4!sSWOzm?kn$_PnIZ^q6OI!6gL<CCSMn#lf*`)>*Ki<m9uL*r5`W-@}=l
z{K#rJ1(135f-s(hh?Wo+F9)~4`b8_5CI0{aKc87*jfs!~hY&#(!UR=_;8L;K=duqg
z(|6X*vu<cGu?RVH2u*Ih<p^R3!x$n!h7(H{E0_4>i}%Dg-@A2ykwwT7s4(!6Ifx+)
zV~7A57EHfbH!r-Sjn6Em9@fbV??`QadG8=zlc36uKOjok(nmxoYkoqMvczY2l{G8B
n*slD7v34Uc=(aDK$)w4|j5Fxk+2=3;F*6XeY-gXt+Vuwj%2CWY

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 9a52aeba5b1c4d88442ae4df7e052f26d43d6ec4..b46bc6208757952e77e9b6080a290d333518cda0 100644
GIT binary patch
delta 293
zcmeylNov+osSU3$GIcUdetS`s=`-Kt2bUx#>t14qG5z68PF^Vvj%BmXLey~bq44-o
zcmhZ~vCVat-B_7cuxvhdLxYK#>n8K&1GjH7GIOnF+3b5y8z^#{d9v?4sm&=54+2G@
zoX?MuI8D!xID#*cI164MWNa3Cw_WHRBl{MnCoJ2g7cprvSqpIpY4LG!a&QUs%-qDH
i!6>oDL`aB37>k$)x>&o=QYIi~24a@&LQ7fGzW@N{w{2Sh

delta 647
zcmbQWRO;s@sSU3$GEHQj{Pv<M(_@~=4=#yK*1E(6WBMSNc?jkNIFm<6frDR)gJapO
zvk=W70Rd!zdZ2(HOh7_JONfh?gIi$zqLs`N4LvhvFiWg40jdxps6v>a3K6U-Hov{(
z&&u?jb+g?K4JH;LXAYt1g>#wICcl3y4dMx-@I+ud8I~?qF7e5RkHj}O-8#U?B4o)S
zG<oAwa}Yxq#t;EAESP?=P7Zt^wK@KdAPL4Z^+0s>-aClb@E+F9fe&sIPy)8!^ARDF
zz{=F05T%Uu8D3@0$DeOM{+y9*3ou}}pP$X7$;3=-z_y#rV*+AkAZFQaGLJRw3jile
B;(Y)B

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-)