diff --git a/data/classificator.txt b/data/classificator.txt
index 59f5e2f0be..450fb15fee 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -354,6 +354,7 @@ world  +
         boundary_stone  -
         castle  -
         citywalls  -
+        fort  -
         memorial  -
         monument  -
         museum  -
@@ -367,10 +368,12 @@ world  +
         bidir_bicycle  -
         lit  -
         nobicycle  -
+        nocar  -
         nofoot  -
         oneway  -
         private  -
         yesbicycle  -
+        yescar  -
         yesfoot  -
         {}
     internet_access  +
@@ -853,6 +856,7 @@ world  +
         camp_site  -
         caravan_site  -
         chalet  -
+        gallery  -
         guest_house  -
         hostel  -
         hotel  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 4dcd65656e..f10c6102ac 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 51806683bc..a81e2588c7 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -32522,6 +32522,133 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-fort"
+  element {
+    scale: 12
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-m"
+      priority: 16901
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-m"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -77305,6 +77432,87 @@ cont {
     }
   }
 }
+cont {
+  name: "tourism-gallery"
+  element {
+    scale: 15
+    symbol {
+      name: "gallery-m"
+      apply_for_type: 1
+      priority: 16843
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15843
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gallery-m"
+      priority: 16833
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gallery-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+}
 cont {
   name: "tourism-guest_house"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b3a17a4060..612804c745 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 7b3d60a9d0..707bf8364b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -28440,6 +28440,133 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-fort"
+  element {
+    scale: 12
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-m"
+      priority: 16901
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-m"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -66209,6 +66336,87 @@ cont {
     }
   }
 }
+cont {
+  name: "tourism-gallery"
+  element {
+    scale: 15
+    symbol {
+      name: "gallery-m"
+      apply_for_type: 1
+      priority: 16843
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15843
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gallery-m"
+      priority: 16833
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gallery-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+}
 cont {
   name: "tourism-guest_house"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 9daad6edcc..0da1ae38a6 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 172b44e8ab..4bf32d2a12 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -28440,6 +28440,133 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-fort"
+  element {
+    scale: 12
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-s"
+      priority: 16901
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-m"
+      priority: 16901
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-m"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 12
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "remains-l"
+      priority: 16901
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15901
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -66209,6 +66336,87 @@ cont {
     }
   }
 }
+cont {
+  name: "tourism-gallery"
+  element {
+    scale: 15
+    symbol {
+      name: "gallery-m"
+      apply_for_type: 1
+      priority: 16843
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15843
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gallery-m"
+      priority: 16833
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 12
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gallery-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "gallery-l"
+      priority: 16637
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 12
+      }
+      priority: 15637
+    }
+  }
+}
 cont {
   name: "tourism-guest_house"
   element {
diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin
index 529fbdf144..659808cd47 100644
Binary files a/data/drules_proto_legacy.bin and b/data/drules_proto_legacy.bin differ
diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt
index 867b068783..224856409d 100644
--- a/data/drules_proto_legacy.txt
+++ b/data/drules_proto_legacy.txt
@@ -32544,6 +32544,45 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-fort"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -66007,6 +66046,45 @@ cont {
     }
   }
 }
+cont {
+  name: "tourism-gallery"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
 cont {
   name: "tourism-guest_house"
   element {
diff --git a/data/types.txt b/data/types.txt
index ec1c4a7f1f..bc79430407 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1147,3 +1147,7 @@ sponsored|banner|viator
 sponsored|banner|geerbest_de
 sponsored|banner|geerbest_fr
 sponsored|banner|raileurope
+hwtag|yescar
+hwtag|nocar
+tourism|gallery
+historic|fort
diff --git a/data/visibility.txt b/data/visibility.txt
index f01e9188ca..f584ecb860 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -354,6 +354,7 @@ world  00000000000000000000  +
         boundary_stone  00000000000000000111  -
         castle  00000000000000001111  -
         citywalls  00000000000000001111  -
+        fort  00000000000000000111  -
         memorial  00000000000000001111  -
         monument  00000000000000001111  -
         museum  00000000000000001111  -
@@ -367,10 +368,12 @@ world  00000000000000000000  +
         bidir_bicycle  00000000000000000000  -
         lit  00000000000000000000  -
         nobicycle  00000000000000000000  -
+        nocar  00000000000000000000  -
         nofoot  00000000000000000000  -
         oneway  00000000000000001111  -
         private  00000000000000000000  -
         yesbicycle  00000000000000000000  -
+        yescar  00000000000000000000  -
         yesfoot  00000000000000000000  -
         {}
     internet_access  00000000000000000111  +
@@ -853,6 +856,7 @@ world  00000000000000000000  +
         camp_site  00000000000011111111  -
         caravan_site  00000000000011111111  -
         chalet  00000000000000000111  -
+        gallery  00000000000000000111  -
         guest_house  00000000000000001111  -
         hostel  00000000000000001111  -
         hotel  00000000000000001111  -