diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 7c07d37c8e..8fc406588a 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 e6fe8a46b8..81b53857ce 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -23355,6 +23355,52 @@ cont {
     apply_if: "bbox_area<10000000"
   }
 }
+cont {
+  name: "leisure-common"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-dog_park"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "leisure-dog_park-tennis"
   element {
@@ -23504,19 +23550,15 @@ cont {
       name: "garden-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "garden-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -23528,19 +23570,15 @@ cont {
       name: "garden-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "garden-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -23551,6 +23589,13 @@ cont {
       name: "golf-l"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 19
@@ -23558,6 +23603,36 @@ cont {
       name: "golf-l"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-landscape_reserve"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
   }
 }
 cont {
@@ -23706,6 +23781,15 @@ cont {
       name: "nparkf-l"
       priority: 16603
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 12
+      }
+      priority: 15603
+    }
   }
   element {
     scale: 19
@@ -23717,6 +23801,15 @@ cont {
       name: "nparkf-l"
       priority: 16603
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 12
+      }
+      priority: 15603
+    }
   }
 }
 cont {
@@ -23875,19 +23968,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -23899,19 +23988,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24070,19 +24155,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24094,19 +24175,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24265,19 +24342,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24289,19 +24362,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24460,19 +24529,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24484,19 +24549,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 11189094
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 2583691263
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24526,6 +24587,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15222
+    }
   }
   element {
     scale: 19
@@ -24538,6 +24606,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15222
+    }
   }
 }
 cont {
@@ -24630,6 +24705,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15222
+    }
   }
   element {
     scale: 19
@@ -24642,6 +24724,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15222
+    }
   }
 }
 cont {
@@ -24758,6 +24847,52 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-recreation_ground"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-slipway"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "leisure-sports_centre"
   element {
@@ -24930,6 +25065,13 @@ cont {
       name: "swimming-l"
       priority: 16269
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15269
+    }
   }
   element {
     scale: 19
@@ -24941,6 +25083,59 @@ cont {
       name: "swimming-l"
       priority: 16269
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15269
+    }
+  }
+}
+cont {
+  name: "leisure-track"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-water_park"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15000
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 4e59ab79ba..807f7c24b8 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 eb4dfcac9e..c3238de1a8 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -23355,6 +23355,52 @@ cont {
     apply_if: "bbox_area<10000000"
   }
 }
+cont {
+  name: "leisure-common"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-dog_park"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "leisure-dog_park-tennis"
   element {
@@ -23504,19 +23550,15 @@ cont {
       name: "garden-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "garden-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -23528,19 +23570,15 @@ cont {
       name: "garden-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "garden-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -23551,6 +23589,13 @@ cont {
       name: "golf-l"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 19
@@ -23558,6 +23603,36 @@ cont {
       name: "golf-l"
       priority: 16000
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-landscape_reserve"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
 }
 cont {
@@ -23706,6 +23781,15 @@ cont {
       name: "nparkf-l"
       priority: 16603
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2568032512
+        offset_y: 12
+      }
+      priority: 15603
+    }
   }
   element {
     scale: 19
@@ -23717,6 +23801,15 @@ cont {
       name: "nparkf-l"
       priority: 16603
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2568032512
+        offset_y: 12
+      }
+      priority: 15603
+    }
   }
 }
 cont {
@@ -23875,19 +23968,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -23899,19 +23988,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24070,19 +24155,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24094,19 +24175,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24265,19 +24342,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24289,19 +24362,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24460,19 +24529,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 18
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
   element {
     scale: 19
@@ -24484,19 +24549,15 @@ cont {
       name: "park-l"
       priority: 16142
     }
-    apply_if: "name"
-  }
-  element {
-    scale: 19
-    area {
-      color: 1122816
-      priority: 1143
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        stroke_color: 2571387972
+        offset_y: 10
+      }
+      priority: 15142
     }
-    symbol {
-      name: "park-l"
-      priority: 16142
-    }
-    apply_if: "!name"
   }
 }
 cont {
@@ -24526,6 +24587,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15222
+    }
   }
   element {
     scale: 19
@@ -24538,6 +24606,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15222
+    }
   }
 }
 cont {
@@ -24630,6 +24705,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15222
+    }
   }
   element {
     scale: 19
@@ -24642,6 +24724,13 @@ cont {
       apply_for_type: 1
       priority: 16222
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15222
+    }
   }
 }
 cont {
@@ -24758,6 +24847,52 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-recreation_ground"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-slipway"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "leisure-sports_centre"
   element {
@@ -24930,6 +25065,13 @@ cont {
       name: "swimming-l"
       priority: 16269
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15269
+    }
   }
   element {
     scale: 19
@@ -24941,6 +25083,59 @@ cont {
       name: "swimming-l"
       priority: 16269
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15269
+    }
+  }
+}
+cont {
+  name: "leisure-track"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "leisure-water_park"
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
 }
 cont {