diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index c616f2f6c4..9e661d9ccc 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 9db75aa95d..b11244e9c1 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -31086,14 +31086,14 @@ cont {
     scale: 10
     area {
       color: 15592899
-      priority: 1075
+      priority: -15926
     }
   }
   element {
     scale: 11
     area {
       color: 15592899
-      priority: 1075
+      priority: -15926
     }
   }
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 6ff8daa86d..dbee901e27 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 4bdcb44e1a..7dfef789f5 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -30878,14 +30878,14 @@ cont {
     scale: 10
     area {
       color: 15592899
-      priority: 1075
+      priority: -15926
     }
   }
   element {
     scale: 11
     area {
       color: 15592899
-      priority: 1075
+      priority: -15926
     }
   }
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 83a174b8fd..f9482cef5d 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 9cddf8e96f..2f9da04efc 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -31029,14 +31029,14 @@ cont {
     scale: 10
     area {
       color: 1381632
-      priority: 1075
+      priority: -15926
     }
   }
   element {
     scale: 11
     area {
       color: 1381632
-      priority: 1075
+      priority: -15926
     }
   }
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 9109364aef..4246b03708 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 811cbd3403..e1c6c8c935 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -18857,42 +18857,42 @@ cont {
     scale: 14
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 15
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 16
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 17
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 18
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 19
     area {
       color: 15592899
-      priority: 1118
+      priority: -15883
     }
   }
 }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 3803d0a404..7dd32cd2c4 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 58d5aa150c..ce3ab87a1c 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -19247,42 +19247,42 @@ cont {
     scale: 14
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 15
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 16
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 17
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 18
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
   element {
     scale: 19
     area {
       color: 1381632
-      priority: 1118
+      priority: -15883
     }
   }
 }
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 5ac6afce23..50dcc061a7 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -3,24 +3,25 @@
 1.Z-INDEX of BASEMAP
 2.LAND
 3.BOUNDARY
-	3.1 Countries
-	3.2 Region
+  3.1 Countries
+  3.2 Region
 4.VEGETATION
 5.BEACH & GLACIER
 6.WATER
-	6.1 Area water(lake,pond etc.)
-	6.2 Line water(river,canal etc.)
+  6.1 Area water(lake,pond etc.)
+  6.2 Line water(river,canal etc.)
 7.LANDUSE
-	7.1 Industrial
-	7.2 Hostital
-	7.3 University & Sport
-	7.4 Cemetry
-	7.5 Pedestrian areas
-    7.6 Airports
-    7.7 Agricultural
+  7.1 Industrial
+  7.2 Hostital
+  7.3 University & Sport
+  7.4 Cemetry
+  7.5 Pedestrian areas
+  7.6 Airports
+  7.7 Religion
+  7.8 Agricultural
 8.BUILDINGS
   8.1 Pier
-	8.2 Building
+  8.2 Building
   8.3 Barrier
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
@@ -248,7 +249,6 @@ area|z12-[landuse=grass],
 area|z12-[natural=grassland],
 area|z12-[leisure=golf_course],
 area|z12-[natural=heath],
-area|z12-[landuse=farmland],
 area|z12-[landuse=allotments],
 area|z12-[natural=scrub],
 area|z12-[landuse=orchard],
@@ -570,7 +570,7 @@ area|z15-[landuse=churchyard]
 
 /* 7.8 Agricultural */
 area|z10-[landuse=farmland],
-{fill-color: @farmland;fill-opacity: 1;}
+{fill-position: background; fill-color: @farmland; fill-opacity: 1;}
 
 /* Parking */
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 206e617549..8a68cd20fd 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -3,24 +3,25 @@
 1.Z-INDEX of BASEMAP
 2.LAND
 3.BOUNDARY
-	3.1 Countries
-	3.2 Region
+  3.1 Countries
+  3.2 Region
 4.VEGETATION
 5.BEACH & GLACIER
 6.WATER
-	6.1 Area water(lake,pond etc.)
-	6.2 Line water(river,canal etc.)
+  6.1 Area water(lake,pond etc.)
+  6.2 Line water(river,canal etc.)
 7.LANDUSE
-	7.1 Industrial
-	7.2 Hostital
-	7.3 University & Sport
-	7.4 Cemetry
-	7.5 Pedestrian areas
-    7.6 Airports
-    7.7 Agricultural
+  7.1 Industrial
+  7.2 Hostital
+  7.3 University & Sport
+  7.4 Cemetry
+  7.5 Pedestrian areas
+  7.6 Airports
+  7.7 Religion
+  7.8 Agricultural
 8.BUILDINGS
   8.1 Pier
-	8.2 Building
+  8.2 Building
   8.3 Barrier
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
@@ -516,7 +517,7 @@ area|z15-[landuse=churchyard]
 
 /* 7.8 Agricultural */
 area|z14-[landuse=farmland],
-{fill-color: @farmland;fill-opacity: 1;}
+{fill-position: background; fill-color: @farmland; fill-opacity: 1;}
 
 /* Parking */