[styles] Regenerated styles.

1 files changed, 141 insertions, 406 deletions

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 1903e26bda..6d134c7367 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -43197,65 +43197,6 @@ cont {
   }
 }
 cont {
-  name: "natural-marsh"
-  element {
-    scale: 11
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13229526
-      priority: -15795
-    }
-  }
-}
-cont {
   name: "natural-meadow"
   element {
     scale: 15
@@ -44906,47 +44847,113 @@ cont {
   }
 }
 cont {
+  name: "natural-wetland-marsh"
+  element {
+    scale: 11
+    area {
+      color: 10535864
+      priority: -16376
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 10535864
+      priority: -16376
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 10535864
+      priority: -16376
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 10535864
+      priority: -16376
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 10535864
+      priority: -16377
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 10535864
+      priority: -16378
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 10535864
+      priority: -16379
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 10535864
+      priority: -16380
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 10535864
+      priority: -16381
+    }
+  }
+}
+cont {
   name: "natural-wood"
   element {
     scale: 10
     area {
       color: 11720357
-      priority: -16376
+      priority: -16382
     }
   }
   element {
     scale: 11
     area {
       color: 11720357
-      priority: -16377
+      priority: -16383
     }
   }
   element {
     scale: 12
     area {
       color: 11720357
-      priority: -16378
+      priority: -16384
     }
   }
   element {
     scale: 13
     area {
       color: 11720357
-      priority: -16379
+      priority: -16385
     }
   }
   element {
     scale: 14
     area {
       color: 11720357
-      priority: -16380
+      priority: -16386
     }
   }
   element {
     scale: 15
     area {
       color: 11720357
-      priority: -16381
+      priority: -16387
     }
     caption {
       primary {
@@ -44960,7 +44967,7 @@ cont {
     scale: 16
     area {
       color: 11720357
-      priority: -16382
+      priority: -16388
     }
     caption {
       primary {
@@ -44975,7 +44982,7 @@ cont {
     scale: 17
     area {
       color: 11720357
-      priority: -16383
+      priority: -16389
     }
     caption {
       primary {
@@ -44990,7 +44997,7 @@ cont {
     scale: 18
     area {
       color: 11720357
-      priority: -16384
+      priority: -16390
     }
     caption {
       primary {
@@ -45005,7 +45012,7 @@ cont {
     scale: 19
     area {
       color: 11720357
-      priority: -16385
+      priority: -16391
     }
     caption {
       primary {
@@ -45023,42 +45030,42 @@ cont {
     scale: 10
     area {
       color: 11720357
-      priority: -16386
+      priority: -16392
     }
   }
   element {
     scale: 11
     area {
       color: 11720357
-      priority: -16387
+      priority: -16393
     }
   }
   element {
     scale: 12
     area {
       color: 11720357
-      priority: -16388
+      priority: -16394
     }
   }
   element {
     scale: 13
     area {
       color: 11720357
-      priority: -16389
+      priority: -16395
     }
   }
   element {
     scale: 14
     area {
       color: 11720357
-      priority: -16390
+      priority: -16396
     }
   }
   element {
     scale: 15
     area {
       color: 11720357
-      priority: -16391
+      priority: -16397
     }
     caption {
       primary {
@@ -45072,7 +45079,7 @@ cont {
     scale: 16
     area {
       color: 11720357
-      priority: -16392
+      priority: -16398
     }
     caption {
       primary {
@@ -45087,7 +45094,7 @@ cont {
     scale: 17
     area {
       color: 11720357
-      priority: -16393
+      priority: -16399
     }
     caption {
       primary {
@@ -45102,7 +45109,7 @@ cont {
     scale: 18
     area {
       color: 11720357
-      priority: -16394
+      priority: -16400
     }
     caption {
       primary {
@@ -45117,7 +45124,7 @@ cont {
     scale: 19
     area {
       color: 11720357
-      priority: -16395
+      priority: -16401
     }
     caption {
       primary {
@@ -45135,42 +45142,42 @@ cont {
     scale: 10
     area {
       color: 11720357
-      priority: -16396
+      priority: -16402
     }
   }
   element {
     scale: 11
     area {
       color: 11720357
-      priority: -16397
+      priority: -16403
     }
   }
   element {
     scale: 12
     area {
       color: 11720357
-      priority: -16398
+      priority: -16404
     }
   }
   element {
     scale: 13
     area {
       color: 11720357
-      priority: -16399
+      priority: -16405
     }
   }
   element {
     scale: 14
     area {
       color: 11720357
-      priority: -16400
+      priority: -16406
     }
   }
   element {
     scale: 15
     area {
       color: 11720357
-      priority: -16401
+      priority: -16407
     }
     caption {
       primary {
@@ -45184,7 +45191,7 @@ cont {
     scale: 16
     area {
       color: 11720357
-      priority: -16402
+      priority: -16408
     }
     caption {
       primary {
@@ -45199,7 +45206,7 @@ cont {
     scale: 17
     area {
       color: 11720357
-      priority: -16403
+      priority: -16409
     }
     caption {
       primary {
@@ -45214,7 +45221,7 @@ cont {
     scale: 18
     area {
       color: 11720357
-      priority: -16404
+      priority: -16410
     }
     caption {
       primary {
@@ -45229,7 +45236,7 @@ cont {
     scale: 19
     area {
       color: 11720357
-      priority: -16405
+      priority: -16411
     }
     caption {
       primary {
@@ -45247,42 +45254,42 @@ cont {
     scale: 10
     area {
       color: 11720357
-      priority: -16406
+      priority: -16412
     }
   }
   element {
     scale: 11
     area {
       color: 11720357
-      priority: -16407
+      priority: -16413
     }
   }
   element {
     scale: 12
     area {
       color: 11720357
-      priority: -16408
+      priority: -16414
     }
   }
   element {
     scale: 13
     area {
       color: 11720357
-      priority: -16409
+      priority: -16415
     }
   }
   element {
     scale: 14
     area {
       color: 11720357
-      priority: -16410
+      priority: -16416
     }
   }
   element {
     scale: 15
     area {
       color: 11720357
-      priority: -16411
+      priority: -16417
     }
     caption {
       primary {
@@ -45296,7 +45303,7 @@ cont {
     scale: 16
     area {
       color: 11720357
-      priority: -16412
+      priority: -16418
     }
     caption {
       primary {
@@ -45311,7 +45318,7 @@ cont {
     scale: 17
     area {
       color: 11720357
-      priority: -16413
+      priority: -16419
     }
     caption {
       primary {
@@ -45326,7 +45333,7 @@ cont {
     scale: 18
     area {
       color: 11720357
-      priority: -16414
+      priority: -16420
     }
     caption {
       primary {
@@ -45341,7 +45348,7 @@ cont {
     scale: 19
     area {
       color: 11720357
-      priority: -16415
+      priority: -16421
     }
     caption {
       primary {
@@ -50921,7 +50928,7 @@ cont {
     scale: 14
     area {
       color: 14539465
-      priority: -16416
+      priority: -16422
     }
     caption {
       primary {
@@ -50935,7 +50942,7 @@ cont {
     scale: 15
     area {
       color: 14539465
-      priority: -16417
+      priority: -16423
     }
     caption {
       primary {
@@ -50949,7 +50956,7 @@ cont {
     scale: 16
     area {
       color: 14539465
-      priority: -16418
+      priority: -16424
     }
     caption {
       primary {
@@ -50963,7 +50970,7 @@ cont {
     scale: 17
     area {
       color: 14539465
-      priority: -16419
+      priority: -16425
     }
     caption {
       primary {
@@ -50977,7 +50984,7 @@ cont {
     scale: 18
     area {
       color: 14539465
-      priority: -16420
+      priority: -16426
     }
     caption {
       primary {
@@ -50991,7 +50998,7 @@ cont {
     scale: 19
     area {
       color: 14539465
-      priority: -16421
+      priority: -16427
     }
     caption {
       primary {
@@ -52388,14 +52395,14 @@ cont {
     scale: 11
     area {
       color: 14539465
-      priority: -16422
+      priority: -16428
     }
   }
   element {
     scale: 12
     area {
       color: 14539465
-      priority: -16423
+      priority: -16429
     }
     caption {
       primary {
@@ -52410,7 +52417,7 @@ cont {
     scale: 13
     area {
       color: 14539465
-      priority: -16424
+      priority: -16430
     }
     caption {
       primary {
@@ -52432,7 +52439,7 @@ cont {
     scale: 14
     area {
       color: 14539465
-      priority: -16425
+      priority: -16431
     }
     caption {
       primary {
@@ -52454,7 +52461,7 @@ cont {
     scale: 15
     area {
       color: 14539465
-      priority: -16426
+      priority: -16432
     }
     caption {
       primary {
@@ -52476,7 +52483,7 @@ cont {
     scale: 16
     area {
       color: 14539465
-      priority: -16427
+      priority: -16433
     }
     caption {
       primary {
@@ -52498,7 +52505,7 @@ cont {
     scale: 17
     area {
       color: 14539465
-      priority: -16428
+      priority: -16434
     }
     caption {
       primary {
@@ -52520,7 +52527,7 @@ cont {
     scale: 18
     area {
       color: 14539465
-      priority: -16429
+      priority: -16435
     }
     caption {
       primary {
@@ -52542,7 +52549,7 @@ cont {
     scale: 19
     area {
       color: 14539465
-      priority: -16430
+      priority: -16436
     }
     caption {
       primary {
@@ -72266,21 +72273,21 @@ cont {
     scale: 12
     area {
       color: 13626551
-      priority: -16431
+      priority: -16437
     }
   }
   element {
     scale: 13
     area {
       color: 13626551
-      priority: -16432
+      priority: -16438
     }
   }
   element {
     scale: 14
     area {
       color: 13626551
-      priority: -16433
+      priority: -16439
     }
     symbol {
       name: "campsite"
@@ -72291,7 +72298,7 @@ cont {
     scale: 15
     area {
       color: 13626551
-      priority: -16434
+      priority: -16440
     }
     symbol {
       name: "campsite"
@@ -72302,7 +72309,7 @@ cont {
     scale: 16
     area {
       color: 13626551
-      priority: -16435
+      priority: -16441
     }
     symbol {
       name: "campsite"
@@ -72376,35 +72383,35 @@ cont {
     scale: 12
     area {
       color: 13626551
-      priority: -16436
+      priority: -16442
     }
   }
   element {
     scale: 13
     area {
       color: 13626551
-      priority: -16437
+      priority: -16443
     }
   }
   element {
     scale: 14
     area {
       color: 13626551
-      priority: -16438
+      priority: -16444
     }
   }
   element {
     scale: 15
     area {
       color: 13626551
-      priority: -16439
+      priority: -16445
     }
   }
   element {
     scale: 16
     area {
       color: 13626551
-      priority: -16440
+      priority: -16446
     }
   }
   element {
@@ -73229,35 +73236,35 @@ cont {
     scale: 12
     area {
       color: 13626551
-      priority: -16441
+      priority: -16447
     }
   }
   element {
     scale: 13
     area {
       color: 13626551
-      priority: -16442
+      priority: -16448
     }
   }
   element {
     scale: 14
     area {
       color: 13626551
-      priority: -16443
+      priority: -16449
     }
   }
   element {
     scale: 15
     area {
       color: 13626551
-      priority: -16444
+      priority: -16450
     }
   }
   element {
     scale: 16
     area {
       color: 13626551
-      priority: -16445
+      priority: -16451
     }
   }
   element {
@@ -73413,35 +73420,35 @@ cont {
     scale: 12
     area {
       color: 13626551
-      priority: -16446
+      priority: -16452
     }
   }
   element {
     scale: 13
     area {
       color: 13626551
-      priority: -16447
+      priority: -16453
     }
   }
   element {
     scale: 14
     area {
       color: 13626551
-      priority: -16448
+      priority: -16454
     }
   }
   element {
     scale: 15
     area {
       color: 13626551
-      priority: -16449
+      priority: -16455
     }
   }
   element {
     scale: 16
     area {
       color: 13626551
-      priority: -16450
+      priority: -16456
     }
   }
   element {
@@ -73640,111 +73647,6 @@ cont {
   }
 }
 cont {
-  name: "waterway-canal-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-}
-cont {
   name: "waterway-dam"
   element {
     scale: 14
@@ -73926,37 +73828,6 @@ cont {
   }
 }
 cont {
-  name: "waterway-ditch-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1972
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1972
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
   name: "waterway-dock"
   element {
     scale: 0
@@ -74253,37 +74124,6 @@ cont {
   }
 }
 cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1972
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1972
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
   name: "waterway-lock"
   element {
     scale: 14
@@ -75127,111 +74967,6 @@ cont {
   }
 }
 cont {
-  name: "waterway-stream-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 0.7
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 16972
-    }
-  }
-}
-cont {
   name: "waterway-waterfall"
   element {
     scale: 11