diff --git a/data/colors.txt b/data/colors.txt
index 38e757eed6..4c75526a6e 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -56,6 +56,7 @@
 2004720
 2038026
 2038555
+2171142
 2171163
 2171169
 2229797
@@ -260,10 +261,12 @@
 15014691
 15022389
 15037299
+15062700
 15066325
 15086900
 15094016
 15214341
+15260347
 15263452
 15459493
 15590876
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index cd406c8a6e..86e23ec228 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 50700dd2ca..365bb32fc8 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -38653,43 +38653,43 @@ cont {
   element {
     scale: 10
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 11
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 12
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 13
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 14
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 15
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38702,8 +38702,8 @@ cont {
   element {
     scale: 16
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38716,8 +38716,8 @@ cont {
   element {
     scale: 17
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38730,8 +38730,8 @@ cont {
   element {
     scale: 18
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38744,8 +38744,8 @@ cont {
   element {
     scale: 19
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -40012,61 +40012,38 @@ cont {
 }
 cont {
   name: "landuse-garages"
-  element {
-    scale: 14
-    area {
-      color: 2160707771
-      priority: 110
-    }
-  }
   element {
     scale: 15
     area {
-      color: 1724500155
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 16
     area {
-      color: 868862139
-      border {
-        width: 1.0
-        color: 10592406
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 17
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 18
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 19
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 67504d0a2e..39bdc01142 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 272cfc4c4c..3904eab022 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -38345,43 +38345,43 @@ cont {
   element {
     scale: 10
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 11
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 12
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 13
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 14
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
   }
   element {
     scale: 15
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38394,8 +38394,8 @@ cont {
   element {
     scale: 16
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38408,8 +38408,8 @@ cont {
   element {
     scale: 17
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38422,8 +38422,8 @@ cont {
   element {
     scale: 18
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -38436,8 +38436,8 @@ cont {
   element {
     scale: 19
     area {
-      color: 15459493
-      priority: -1920
+      color: 15062700
+      priority: -1919
     }
     caption {
       primary {
@@ -39704,61 +39704,38 @@ cont {
 }
 cont {
   name: "landuse-garages"
-  element {
-    scale: 14
-    area {
-      color: 2160707771
-      priority: 110
-    }
-  }
   element {
     scale: 15
     area {
-      color: 1724500155
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 16
     area {
-      color: 868862139
-      border {
-        width: 1.0
-        color: 10592406
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 17
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 18
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
   element {
     scale: 19
     area {
-      color: 12763315
-      border {
-        width: 1.0
-        color: 10197647
-      }
+      color: 15000299
       priority: 110
     }
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 750640fc65..6f394d66b7 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 14c5b1d3b6..8bb9849f7e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -38506,43 +38506,43 @@ cont {
   element {
     scale: 10
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
   }
   element {
     scale: 11
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
   }
   element {
     scale: 12
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
   }
   element {
     scale: 13
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
   }
   element {
     scale: 14
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
   }
   element {
     scale: 15
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
     caption {
       primary {
@@ -38555,8 +38555,8 @@ cont {
   element {
     scale: 16
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
     caption {
       primary {
@@ -38569,8 +38569,8 @@ cont {
   element {
     scale: 17
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
     caption {
       primary {
@@ -38583,8 +38583,8 @@ cont {
   element {
     scale: 18
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
     caption {
       primary {
@@ -38597,8 +38597,8 @@ cont {
   element {
     scale: 19
     area {
-      color: 1381632
-      priority: -1920
+      color: 2171142
+      priority: -1919
     }
     caption {
       primary {
@@ -39865,61 +39865,38 @@ cont {
 }
 cont {
   name: "landuse-garages"
-  element {
-    scale: 14
-    area {
-      color: 2150246954
-      priority: 110
-    }
-  }
   element {
     scale: 15
     area {
-      color: 1714039338
+      color: 1643545
       priority: 110
     }
   }
   element {
     scale: 16
     area {
-      color: 858401322
-      border {
-        width: 1.0
-        color: 3158064
-      }
+      color: 1643545
       priority: 110
     }
   }
   element {
     scale: 17
     area {
-      color: 3881787
-      border {
-        width: 1.0
-        color: 4671303
-      }
+      color: 1643545
       priority: 110
     }
   }
   element {
     scale: 18
     area {
-      color: 3881787
-      border {
-        width: 1.0
-        color: 4671303
-      }
+      color: 1643545
       priority: 110
     }
   }
   element {
     scale: 19
     area {
-      color: 3881787
-      border {
-        width: 1.0
-        color: 4671303
-      }
+      color: 1643545
       priority: 110
     }
   }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 45a9ff4245..f8845ef84f 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index b3164a416d..261ec24672 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -22651,6 +22651,51 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-farmyard"
+  element {
+    scale: 14
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15260347
+      priority: -1929
+    }
+  }
+}
 cont {
   name: "landuse-field"
   element {
@@ -23849,55 +23894,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 1523897290
-      border {
-        width: 1.0
-        color: 13947850
-      }
+      color: 14802147
       priority: 90
     }
   }
   element {
     scale: 16
     area {
-      color: 1943327690
-      border {
-        width: 1.0
-        color: 13947850
-      }
+      color: 14802147
       priority: 90
     }
   }
   element {
     scale: 17
     area {
-      color: 1943327690
-      border {
-        width: 1.0
-        color: 13947850
-      }
+      color: 14802147
       priority: 90
     }
   }
   element {
     scale: 18
     area {
-      color: 1943327690
-      border {
-        width: 1.0
-        color: 13947850
-      }
+      color: 14802147
       priority: 90
     }
   }
   element {
     scale: 19
     area {
-      color: 1943327690
-      border {
-        width: 1.0
-        color: 13947850
-      }
+      color: 14802147
       priority: 90
     }
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index f74b123d11..3faa845d36 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 9463ee413e..a5140eba40 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -23063,6 +23063,51 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-farmyard"
+  element {
+    scale: 14
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2171142
+      priority: -1929
+    }
+  }
+}
 cont {
   name: "landuse-field"
   element {
@@ -24261,55 +24306,35 @@ cont {
   element {
     scale: 15
     area {
-      color: 1511594265
-      border {
-        width: 1.0
-        color: 1842204
-      }
+      color: 854541
       priority: 90
     }
   }
   element {
     scale: 16
     area {
-      color: 1931024665
-      border {
-        width: 1.0
-        color: 1842204
-      }
+      color: 854541
       priority: 90
     }
   }
   element {
     scale: 17
     area {
-      color: 1931024665
-      border {
-        width: 1.0
-        color: 1842204
-      }
+      color: 854541
       priority: 90
     }
   }
   element {
     scale: 18
     area {
-      color: 1931024665
-      border {
-        width: 1.0
-        color: 1842204
-      }
+      color: 854541
       priority: 90
     }
   }
   element {
     scale: 19
     area {
-      color: 1931024665
-      border {
-        width: 1.0
-        color: 1842204
-      }
+      color: 854541
       priority: 90
     }
   }
diff --git a/data/visibility.txt b/data/visibility.txt
index c27d55cadc..eb394ef759 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -614,7 +614,7 @@ world  00000000000000000000  +
         education  00000000000000000000  -
         farm  00000000000000000000  -
         farmland  00000000000000111111  -
-        farmyard  00000000000000000000  -
+        farmyard  00000000000000111111  -
         field  00000000000000111111  -
         flowerbed  00000000000000000000  -
         forest  00000000001111111111  +