From 1e78c3b8d784cf2d6d2a44ca72cc0c7a07d4e6f6 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 17 Apr 2024 22:07:15 +0300
Subject: [PATCH] [styles] Regenerate for path grades

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt                        |   8 +-
 data/colors.txt                               |   8 +
 data/drules_proto.bin                         | Bin 422936 -> 420494 bytes
 data/drules_proto.txt                         | 832 ++--------------
 data/drules_proto_clear.bin                   | Bin 409440 -> 407550 bytes
 data/drules_proto_clear.txt                   | 640 +-----------
 data/drules_proto_dark.bin                    | Bin 408032 -> 406142 bytes
 data/drules_proto_dark.txt                    | 640 +-----------
 data/drules_proto_outdoors_clear.bin          | Bin 426263 -> 423677 bytes
 data/drules_proto_outdoors_clear.txt          | 910 ++----------------
 data/drules_proto_outdoors_dark.bin           | Bin 424736 -> 422150 bytes
 data/drules_proto_outdoors_dark.txt           | 910 ++----------------
 data/drules_proto_vehicle_clear.bin           | Bin 276105 -> 275239 bytes
 data/drules_proto_vehicle_clear.txt           | 208 +---
 data/drules_proto_vehicle_dark.bin            | Bin 276265 -> 275399 bytes
 data/drules_proto_vehicle_dark.txt            | 208 +---
 data/patterns.txt                             |  12 +
 .../clear/include/priorities_3_FG.prio.txt    |   4 +-
 .../include/priorities_4_overlays.prio.txt    |   4 +-
 .../outdoors/include/priorities_3_FG.prio.txt |   4 +-
 .../include/priorities_4_overlays.prio.txt    |   4 +-
 .../vehicle/include/priorities_3_FG.prio.txt  |   4 +-
 data/types.txt                                |  28 +-
 data/visibility.txt                           |   8 +-
 24 files changed, 342 insertions(+), 4090 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 349c71f9d1..ae2eae1738 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -436,15 +436,11 @@ world  +
             tunnel  -
             {}
         path  +
-            alpine_hiking  -
             bicycle  -
             bridge  -
-            demanding_alpine_hiking  -
-            demanding_mountain_hiking  -
-            difficult_alpine_hiking  -
-            hiking  -
+            difficult  -
+            expert  -
             horse  -
-            mountain_hiking  -
             tunnel  -
             {}
         pedestrian  +
diff --git a/data/colors.txt b/data/colors.txt
index 2b14268c0f..c13c7d2039 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -96,6 +96,7 @@
 3881273
 3881787
 3968060
+4007447
 4016230
 4065802
 4073251
@@ -127,6 +128,7 @@
 5196359
 5286655
 5378955
+5389875
 5395026
 5459435
 5592405
@@ -345,9 +347,11 @@
 859315988
 859519289
 859519803
+859645463
 860111940
 860571203
 860629531
+861027891
 861097451
 861295871
 861355571
@@ -406,6 +410,7 @@
 1295527997
 1295658816
 1295727419
+1295853079
 1295855912
 1296187970
 1296316234
@@ -420,6 +425,7 @@
 1296977469
 1297041991
 1297109072
+1297235507
 1297305067
 1297438037
 1297563187
@@ -490,10 +496,12 @@
 1714860223
 1715089216
 1715157819
+1715283479
 1715287582
 1715749956
 1715771835
 1716276300
+1716665907
 1716868437
 1716933887
 1717328977
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 451a23d004fba99824fcd901fe75dd743ac5fd70..595ddeed0c59f3f1772c2a4207f3c760a30fedfd 100644
GIT binary patch
delta 626
zcmbR7LbC6wWWyH5BQe`$;~9h5q%N^=iDhJ_XOt&a>J}uHWay@3rln;jm*$jAPsn1F
zXZm12eN_~r4v4-1rP-n(d=n`BR+~|N`h+w_X^yjJK;V!4^n4vg+36QBg#^+WrP<TK
zfNlE0+l+G41JW5er?(U^3ZV*5z%D!^hfzc?wW1)ks6<GIgIh?06Jq5Xdx7a^zHDTZ
z65<kI0D}+q5L#gR#wbQHNnElH(-Wi^MeA`&D{Nu3U<6vlM~qbt5Y-MG{6N*SW`e*+
z+zx}Nwi4pv<(MvG$jA!{LLmvbOCb7xLcJj|UGXua7$`^yDFFsCSjkLgP+&mA+5r+6
y3ey$E808gVf}k+Nt}Kx_Wedd^CAYuLV+>?!pIOWZ#2}g(h*^M`b^6R=wt4_;9lxpo

delta 371
zcmeCXDmmkYWWyH5BQbK<Sh%DzGSf546DxHK5=%046LShO^HSq8GP5)D(x)3HGs;g-
zh-T#89+1T-$he$8laX=zkr>8cHjM`?Tq-C!Q&Mvi^HPAi;t89f^@xQ_4TtXB{L;LV
z#LPT=Zop!DW?EWia%oNp5w=gyNo5pd!{^0)>5PF)3O87|WKbMQz-jHk-~nPLAZ7+)
O79eKb&Y#Iv&j<jzfqJC?

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index e62d187752..4e99b5d0c0 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -27280,182 +27280,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -27924,17 +27748,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 11
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27944,10 +27768,10 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27957,10 +27781,10 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27970,10 +27794,10 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27983,10 +27807,10 @@ cont {
       width: 1.1
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28004,10 +27828,10 @@ cont {
       width: 1.5
       color: 1721782290
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28024,10 +27848,10 @@ cont {
       width: 2.0
       color: 1721782290
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28044,10 +27868,10 @@ cont {
       width: 2.8
       color: 866144274
       dashdot {
-        dd: 6.0
+        dd: 2.8
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28061,13 +27885,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 3.7
+      width: 2.8
       color: 866144274
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28081,13 +27905,13 @@ cont {
   element {
     scale: 20
     lines {
-      width: 3.7
+      width: 2.8
       color: 866144274
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28100,17 +27924,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
+  name: "highway-path-expert"
   element {
     scale: 11
     lines {
       width: 0.9
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28118,12 +27942,12 @@ cont {
     scale: 12
     lines {
       width: 0.9
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28131,12 +27955,12 @@ cont {
     scale: 13
     lines {
       width: 0.9
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28144,12 +27968,12 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28157,12 +27981,12 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28178,12 +28002,12 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28198,12 +28022,12 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28218,12 +28042,12 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 866144274
+      color: 859645463
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.8
+        dd: 8.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28236,190 +28060,14 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
+      color: 859645463
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28432,190 +28080,14 @@ cont {
   }
   element {
     scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
-  element {
-    scale: 11
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
+      color: 859645463
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28803,182 +28275,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-tunnel"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 5172840a03728d16b7949862b74de18b5c36e451..cd1a6d4db5bf35678e2fc62a3d55b7fa74621925 100644
GIT binary patch
delta 503
zcmaFxPvYNuiH0qVM(*1gJsJP9NS$Ej63fU;&nQo<)GbIX$<R&7OiRm5F3l;K-ss9G
z&-1~a0RkKpwoDK7V^m`LU_bqWE29<1*)t&U$A0=<DMs1p0U?aiXhIW!LhNZ^z&3rN
z8>6};l;a>UX+h&$W+@>q0VHW<SrH*MPP|GKrgsH13K^zW6r>iF2<dR}32AUbobkq9
zVEUOa8`(f+Lfi{;xB%4Q!V<U?OfQsUl$b6M!YG7LGHWIX{DgX5V){o<M#<?m?2P;b
zl$;KND4B`uI|qo16s9|R11)OsU}RT>dlTp=JZcXRtyXe-a46$(#`f0{Aj|~B%s|Yt
K{dELu=`#T79iDgq

delta 481
zcmezOUgE(&iH0qVM(%QFn7O1fGSf546DxHK5=%046LShO^HSq8GP5)D(x*4NGHOj1
z@M2_{elC!)dAbcdBmeYWUW|s*t$Z0Jrt5n%YE0)0WNg@O<j(k)MdKPXmkNquDXF=M
zc_~1H;>j{r>jpEI8V&<<^Gowe5;OBibSV}$W~QZOCYR=vkmttfzkC@5*+>koL;j4%
h85PbkbIG9ij&wh@14AE(nShuXh*`FC2C{yA1_0MAp9}y1

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 4355590aa5..98e565df37 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -25596,143 +25596,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -26105,17 +25968,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 14
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26125,10 +25988,10 @@ cont {
       width: 1.1
       color: 1721782290
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26146,10 +26009,10 @@ cont {
       width: 1.5
       color: 1721782290
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26166,10 +26029,10 @@ cont {
       width: 2.0
       color: 1721782290
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26186,10 +26049,10 @@ cont {
       width: 2.8
       color: 866144274
       dashdot {
-        dd: 6.0
+        dd: 2.8
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26203,13 +26066,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 3.7
+      width: 2.8
       color: 866144274
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26223,13 +26086,13 @@ cont {
   element {
     scale: 20
     lines {
-      width: 3.7
+      width: 2.8
       color: 866144274
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26242,17 +26105,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
+  name: "highway-path-expert"
   element {
     scale: 14
     lines {
       width: 0.9
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26260,12 +26123,12 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26281,12 +26144,12 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26301,12 +26164,12 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1721782290
+      color: 1715283479
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26321,12 +26184,12 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 866144274
+      color: 859645463
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.8
+        dd: 8.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26339,151 +26202,14 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
+      color: 859645463
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26496,151 +26222,14 @@ cont {
   }
   element {
     scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
+      color: 859645463
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26789,143 +26378,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 866144274
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 866144274
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-tunnel"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 600cc27347f84c03847b77582827d6b0e21d8024..d71b6a130d60e8b85a75ed3d3e5757528665a42f 100644
GIT binary patch
delta 491
zcmaFxS>oRliH0qVH{7=`_hkIbB6Wh9ODrQZJ)=CaQnw(nBtthPGc7GMxiqI_dP5MS
zJktmJ=^k#3Iw1OkB%}QFcR`HO0%y;Fz#n@CFko?*evpGvV)}tFMhWav)4~}g*wes(
zZTfpDM!D(hf*CodANFSyLKS|8U05%KQA97bq9C=XL`a8&Pe_9k;(|B!0-OJw*u*9!
z#3cZ6%Lk~N1g87DF^Wmxly&rCl%C!Y#>g)TS2AlR2>gT^AOZE%12%$cfWG4g*))q8
z<PNAe9U$&em|nmI44MtWjO>aq8IYUtsQo~+TFLD{Lm7`Vwoi-%VJ0AE24a@&6C+vu
G9{>QquA3zQ

delta 306
zcmezOMB>3`iH0qVH{9jUFmp*|WTt17CsyhfB$j08Cgv1m=B37GWM*gPrB8qF!zjOf
zZUEyX#_c!U8UM0qTw~@^K~bNQnwyxH0#qB1OQ+TiW-c`xdUEqi^GXsk^DynhVpC>X
zT4r)-P6<w%rZ4bg6lBA6dPV@_aYlu6%v>@k&cJ4QJJ7R0%ml>DK+FR4JnO@U0MhDq
Apa1{>

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index e864e69816..60c550962b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -25662,143 +25662,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 865356306
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -26171,17 +26034,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 14
     lines {
       width: 0.9
       color: 1720994322
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26191,10 +26054,10 @@ cont {
       width: 1.1
       color: 1720994322
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26212,10 +26075,10 @@ cont {
       width: 1.5
       color: 1720994322
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26232,10 +26095,10 @@ cont {
       width: 2.0
       color: 1720994322
       dashdot {
-        dd: 4.0
+        dd: 1.8
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26252,10 +26115,10 @@ cont {
       width: 2.8
       color: 865356306
       dashdot {
-        dd: 6.0
+        dd: 2.8
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26269,13 +26132,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 3.7
+      width: 2.8
       color: 865356306
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26289,13 +26152,13 @@ cont {
   element {
     scale: 20
     lines {
-      width: 3.7
+      width: 2.8
       color: 865356306
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 2.8
+        dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26308,17 +26171,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
+  name: "highway-path-expert"
   element {
     scale: 14
     lines {
       width: 0.9
-      color: 1720994322
+      color: 1716665907
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26326,12 +26189,12 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1720994322
+      color: 1716665907
       dashdot {
-        dd: 3.5
-        dd: 2.0
+        dd: 1.0
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26347,12 +26210,12 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1720994322
+      color: 1716665907
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26367,12 +26230,12 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1720994322
+      color: 1716665907
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.6
+        dd: 6.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26387,12 +26250,12 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 865356306
+      color: 861027891
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.8
+        dd: 8.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26405,151 +26268,14 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 865356306
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 865356306
+      color: 861027891
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26562,151 +26288,14 @@ cont {
   }
   element {
     scale: 20
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.8
-      color: 865356306
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 865356306
+      color: 861027891
       dashdot {
+        dd: 2.8
         dd: 8.0
-        dd: 4.5
       }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26855,143 +26444,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.8
-      color: 865356306
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 3.7
-      color: 865356306
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-tunnel"
   element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 64366b1e55d130488c07664f09ba737633ae0100..9cd3b18d191e8b43054917db61c9af2c70ec3ad8 100644
GIT binary patch
delta 587
zcmbQ<B=z^LWWyH58DZN+BN<!SSiZ4viA`UZ!YC#pq{qQ6q{Ybq1|RGNCM{@uJNYBC
z@brWbMj5`j%u+&J0x-$xv(*{pr~emb<YW3_Km8PlqbI_s0OI@#VYKIDae$~4n9dl=
zC_OzPmr<6HWqRRdM!D$=5*b;iZ%Aeo<v)7{1bCoIMW!=`0hK<;#V%ujUHN@}?8+sk
z8>BM|Nu^d4q!yK+`)vA|FE3#}lN1E<W@36y94O2P@^Ts&e6xpmNM!m&bw&x0XN7R8
z0D4&qO_B-fNhNrA@Z(ki3I<>R@xoO=tcC@Y8a$xzs?fl%9T;$UwM%SYmdRMg)IK|p
U5r{!FGZ3=?G3)l(d2BU80IFS<U;qFB

delta 505
zcmezSR&siiRKpg=8DVn2Sh%DzGSf546DxHK5=%046LShO^HSq8GP5)D(x-0-W7L{H
zUzd@6`^gkWBgW|p{EV{G6;c>grr!-^RGV%P!zey|9#kxG`;0KgRyK_mRxTA3BU4gy
z6Z2Al#>G=$xK<l0ml_UZbMs5{N)j{k$Z|Cc$i34QV;RNxC~@EPY4MDLY-9x+PZDD(
jlfoYsE*TX6k?X5=VEh0v6A&{4F$)m0ZdXWQyDJ0$Z!x1C

diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 1b7ac43ba1..22f42f2a6d 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -26907,200 +26907,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1302351890
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -27600,17 +27406,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1721782290
+      color: 1302351890
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27619,12 +27425,12 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 1302351890
+      color: 866144274
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27635,10 +27441,10 @@ cont {
       width: 1.3
       color: 10506258
       dashdot {
-        dd: 4.0
+        dd: 1.5
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27656,10 +27462,10 @@ cont {
       width: 1.6
       color: 10506258
       dashdot {
-        dd: 4.0
+        dd: 1.5
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27677,10 +27483,10 @@ cont {
       width: 2.0
       color: 10506258
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.5
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27698,10 +27504,10 @@ cont {
       width: 2.6
       color: 10506258
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.5
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27718,10 +27524,10 @@ cont {
       width: 3.3
       color: 10506258
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27738,10 +27544,10 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27758,10 +27564,10 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27778,10 +27584,10 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27794,17 +27600,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
+  name: "highway-path-expert"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1721782290
+      color: 1295853079
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27813,12 +27619,12 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 1302351890
+      color: 859645463
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27827,12 +27633,12 @@ cont {
     scale: 13
     lines {
       width: 1.3
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.4
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27848,12 +27654,12 @@ cont {
     scale: 14
     lines {
       width: 1.6
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.4
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27869,12 +27675,12 @@ cont {
     scale: 15
     lines {
       width: 2.0
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.3
+        dd: 9.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27890,12 +27696,12 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.3
+        dd: 9.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27910,12 +27716,12 @@ cont {
     scale: 17
     lines {
       width: 3.3
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27930,12 +27736,12 @@ cont {
     scale: 18
     lines {
       width: 4.0
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27950,12 +27756,12 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 10506258
+      color: 4007447
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27970,400 +27776,12 @@ cont {
     scale: 20
     lines {
       width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1721782290
+      color: 4007447
       dashdot {
         dd: 3.5
-        dd: 2.0
+        dd: 11.0
       }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1302351890
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1302351890
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28569,200 +27987,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1302351890
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 10506258
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 10506258
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-tunnel"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index a3f607f97f164c37b16db1ca0ec8840335cb2086..92af2daaf67eff67f05e636e3be913ad8e9a61ad 100644
GIT binary patch
delta 540
zcmZ4RO|tEgWWyFlyYTJ1BN<!Sq`t9miDhJ_XOt&a>J}uHWay@3rln;jm*$jAPvm73
zW_&aGBeU>ywopbHzB$ZNLR<n2VDQ0yx<M$TF4GVD>G7eA_8@uzkmh7@fXE9>e-One
zJ-s1<QI?Tq`opV?a?|)3S*M>(WEAB;dj<q}pejYC8^$n7PM?s;D2`p`Ko~BW|2SkM
zre8~E6p~D>C`c_T5z^z}7SiH`IO~JGz~(<ECOh(pfV?Cr2;|H{^OZWIyf{#p3FOx_
zF!*K<(JV6kqY9(MG(JWloC?66wvS-sM^nKB^{f&+Sa7QV2giP(8O%UuOh0%C7zt|d
rFv1iB1`nnnFl5jLCARxyF_tm4JLWS2F^FacViq7~-R_vrcApynT5F^J

delta 581
zcmZpBB)Q<5WWyFlyKuQ*EL>6<nduqjiIutqi6t4ji8%$Cd8zRknc10n>C+Q=8Re({
z3t{A*o^Qm+zCAyc(TH)nLp-DS^mT%aY||5B7?q~igSZD$7`3J!h-VZ9vC_BOg)_FY
zX|%9%sh}91lA4>CmjX06o+{R8wXt%k;jkb#zcjBTF*A=spJ4GrW?EWia%oNpb^I{h
vCV^3qjl$sGl*Cxdr0|D@O9mx0C=Y{nU~B?06A&{4F$)m0Za<L1=Eeg6e|W{6

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 2aad6acbd8..49719b1950 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -26973,200 +26973,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1301563922
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -27666,17 +27472,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1720994322
+      color: 1301563922
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27685,12 +27491,12 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 1301563922
+      color: 865356306
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27701,10 +27507,10 @@ cont {
       width: 1.3
       color: 9718290
       dashdot {
-        dd: 4.0
+        dd: 1.5
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27722,10 +27528,10 @@ cont {
       width: 1.6
       color: 9718290
       dashdot {
-        dd: 4.0
+        dd: 1.5
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27743,10 +27549,10 @@ cont {
       width: 2.0
       color: 9718290
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.5
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27764,10 +27570,10 @@ cont {
       width: 2.6
       color: 9718290
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.5
+        dd: 4.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27784,10 +27590,10 @@ cont {
       width: 3.3
       color: 9718290
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27804,10 +27610,10 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27824,10 +27630,10 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27844,10 +27650,10 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.6
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27860,17 +27666,17 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
+  name: "highway-path-expert"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1720994322
+      color: 1297235507
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27879,12 +27685,12 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 1301563922
+      color: 861027891
       dashdot {
-        dd: 3.5
+        dd: 1.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27893,12 +27699,12 @@ cont {
     scale: 13
     lines {
       width: 1.3
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.4
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27914,12 +27720,12 @@ cont {
     scale: 14
     lines {
       width: 1.6
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 4.0
-        dd: 2.5
+        dd: 1.4
+        dd: 5.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27935,12 +27741,12 @@ cont {
     scale: 15
     lines {
       width: 2.0
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.3
+        dd: 9.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27956,12 +27762,12 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 6.0
-        dd: 3.5
+        dd: 2.3
+        dd: 9.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27976,12 +27782,12 @@ cont {
     scale: 17
     lines {
       width: 3.3
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27996,12 +27802,12 @@ cont {
     scale: 18
     lines {
       width: 4.0
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28016,12 +27822,12 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 9718290
+      color: 5389875
       dashdot {
-        dd: 8.0
-        dd: 4.5
+        dd: 3.5
+        dd: 11.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28036,400 +27842,12 @@ cont {
     scale: 20
     lines {
       width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1720994322
+      color: 5389875
       dashdot {
         dd: 3.5
-        dd: 2.0
+        dd: 11.0
       }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1301563922
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1301563922
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28635,200 +28053,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 1301563922
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.3
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9718290
-      dashdot {
-        dd: 6.0
-        dd: 3.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.3
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 9718290
-      dashdot {
-        dd: 8.0
-        dd: 4.5
-      }
-      priority: 155
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2820
-    }
-  }
-}
 cont {
   name: "highway-path-tunnel"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 0769c44728d480a5fb198bbb0595fbb6766410f1..1957187780f28b62342f7a502cdd34ceb9705e81 100644
GIT binary patch
delta 63
zcmeBtE3o{Tz=r2DH*cFYk&)#DBbV6Z|8vDA=g-+Vxqh}FTWUo?YEcQ8J7@m!W|M{O
QCJPyXm}$GoLgvt^0Mk?*HUIzs

delta 255
zcmZ4fOrZ0vz=r2D<<2m2No8cFXOt&a>J}uHWauX56lCV5#%E+^XXd3(R-C(W^YfV#
z88xmka;c!GOG(X5%u4~PiO0~Pb%T*h4Ts{~{L;LV#LPS-3$U1-nU<EBT$)pYY4+p|
ovjo`?j+@Lq_qf72MlKl?>(DG|R-D_eIF}KKnYJs=WoDZO0H&5@p#T5?

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index d8ee2fd4d3..4ca1dc6771 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -11949,57 +11949,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -12103,7 +12052,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 17
     lines {
@@ -12154,109 +12103,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
+  name: "highway-path-expert"
   element {
     scale: 17
     lines {
@@ -12357,57 +12204,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1721782290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1721782290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-pedestrian"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 29dbdaf6bff8bddbedfb37566d7b0aabcb05d2ea..fb2f5005ad473abb772ad1753f43bbb3359e8966 100644
GIT binary patch
delta 63
zcmZ4aPT=@+fepuJZ=N=1A|uNQMlP|*_vedE_Mf+La{OFDw$zG()S?nFw`Sq-W|771
QB8wS;m}$GnVrJ1P0KMoN?EnA(

delta 255
zcmX^9TwvupfepuJ%bj85lFG<T&nQo<)GbIX$<R&ADag!AjnBx;&df`n%s7AJ=Hs&`
zGHP67<WfOVmy(*Bn3n=n6OW-o>jop28V<#|`K5U!iJ5sw7GN<uGc7GMxiqH))9lF;
o<_NMO95?y(yyFVz7`bFntV6S;nQ?wQ<9tRSX4=j;pZVAn0E`=E8UO$Q

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 56b457e20a..73aca95be3 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -12081,57 +12081,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-alpine_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -12235,7 +12184,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_alpine_hiking"
+  name: "highway-path-difficult"
   element {
     scale: 17
     lines {
@@ -12286,109 +12235,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-demanding_mountain_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-path-difficult_alpine_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-path-hiking"
+  name: "highway-path-expert"
   element {
     scale: 17
     lines {
@@ -12489,57 +12336,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-mountain_hiking"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.5
-      color: 1720994322
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-pedestrian"
   element {
diff --git a/data/patterns.txt b/data/patterns.txt
index 633763d57e..730a234d1b 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -48,6 +48,12 @@
 3.5 2.7
 6.0 4.7
 8.0 6.2
+1.0 2.0
+1.8 2.5
+2.8 3.5
+1.0 4.0
+1.6 6.0
+2.8 8.0
 1.5 1.3
 1.8 1.6
 2.5 2.2
@@ -82,6 +88,12 @@
 4.0 3.0
 6.0 4.5
 8.0 6.0
+1.5 2.5
+2.5 4.0
+3.6 5.0
+1.4 5.0
+2.3 9.0
+3.5 11.0
 12.0 4.0
 6.0 8.5 12.0 2.3
 1.0 50.0
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index f897420bc3..7d72106787 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -272,8 +272,8 @@ highway-footway-area                                # line z15- and area z14- (a
 highway-footway-bicycle                             # line z14- (also has line::cycleline z14-, pathtext z15-)
 highway-path                                        # line z14- (also has pathtext z15-)
 highway-path-bicycle                                # line z14- (also has line::cycleline z14-, pathtext z15-)
-highway-path-difficult
-highway-path-expert
+highway-path-difficult                              # line z14- (also has pathtext z15-)
+highway-path-expert                                 # line z14- (also has pathtext z15-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
 highway-track                                       # line z14- (also has pathtext z15-)
 highway-track-area                                  # line z14- (also has pathtext z15-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 73f15d1146..a2a732ad40 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -695,8 +695,8 @@ highway-bridleway-tunnel                            # pathtext z15- (also has li
 highway-path                                        # pathtext z15- (also has line z14-)
 highway-path-bicycle                                # pathtext z15- (also has line z14-, line::cycleline z14-)
 highway-path-bridge                                 # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-path-difficult
-highway-path-expert
+highway-path-difficult                              # pathtext z15- (also has line z14-)
+highway-path-expert                                 # pathtext z15- (also has line z14-)
 highway-path-horse                                  # pathtext z15- (also has line z14-)
 highway-path-tunnel                                 # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 51e15d85c0..67dceba427 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -272,8 +272,8 @@ highway-footway-area                                # line z11- and area z14- (a
 highway-footway-bicycle                             # line z11- (also has line::cycleline z12-, pathtext z13-)
 highway-path                                        # line z11- (also has pathtext z13-)
 highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
-highway-path-difficult
-highway-path-expert
+highway-path-difficult                              # line z11- (also has pathtext z13-)
+highway-path-expert                                 # line z11- (also has pathtext z13-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
 highway-track                                       # line z11- (also has pathtext z13-)
 highway-track-area                                  # line z11- (also has pathtext z13-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 5d64b8040c..786ae8c9f6 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -695,8 +695,8 @@ highway-bridleway-tunnel                            # pathtext z13- (also has li
 highway-path                                        # pathtext z13- (also has line z11-)
 highway-path-bicycle                                # pathtext z13- (also has line z11-, line::cycleline z12-)
 highway-path-bridge                                 # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-path-difficult
-highway-path-expert
+highway-path-difficult                              # pathtext z13- (also has line z11-)
+highway-path-expert                                 # pathtext z13- (also has line z11-)
 highway-path-horse                                  # pathtext z13- (also has line z11-)
 highway-path-tunnel                                 # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 7ed4c84000..d0ae8468e7 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -254,8 +254,8 @@ highway-footway-sidewalk                            # line z19-
 highway-path                                        # line z17-
 highway-path-bicycle                                # line z17-
 highway-path-bridge                                 # line z17-
-highway-path-difficult
-highway-path-expert
+highway-path-difficult                              # line z17-
+highway-path-expert                                 # line z17-
 highway-path-horse                                  # line z17-
 highway-pedestrian                                  # line z18-
 highway-pedestrian-area                             # line z18-
diff --git a/data/types.txt b/data/types.txt
index fd6c14c6a0..656f961166 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -110,7 +110,7 @@ mapswithme
 *leisure|garden
 *landuse|commercial
 *railway|station
-*highway|path|hiking
+highway|path
 *amenity|hospital
 *waterway|stream|ephemeral
 *highway|trunk|bridge
@@ -163,7 +163,7 @@ highway|footway
 *highway|construction
 *highway|cycleway|bridge
 *leisure|sports_centre
-*highway|path|mountain_hiking
+highway|path
 *tourism|camp_site
 *highway|bridleway
 *natural|heath
@@ -297,7 +297,7 @@ mapswithme
 *highway|secondary|tunnel
 *railway|abandoned|bridge
 *man_made|lighthouse
-*highway|path|demanding_mountain_hiking
+highway|path|difficult
 *man_made|storage_tank
 *man_made|silo
 *power|generator
@@ -311,7 +311,7 @@ man_made|pipeline
 *man_made|tower|communication
 *sport|equestrian
 *tourism|information|office
-highway|path|hiking
+highway|path
 *aeroway|gate
 *railway|preserved
 *highway|path|horse
@@ -347,7 +347,7 @@ amenity|parking|permissive
 *piste:type|downhill|advanced
 *sport|shooting
 *place|country
-*highway|path|alpine_hiking
+highway|path|expert
 *tourism|zoo|petting
 *sport|scuba_diving
 highway|cycleway
@@ -358,7 +358,7 @@ highway|cycleway
 *amenity|parking|street_side
 *amenity|parking|multi-storey
 *leisure|recreation_ground
-highway|path|mountain_hiking
+highway|path
 highway|service|driveway
 *amenity|parking|multi-storey|fee
 *sport|9pin
@@ -392,7 +392,7 @@ highway|service|driveway
 *landuse|education
 *man_made|cairn
 *railway|preserved|bridge
-*highway|path|demanding_alpine_hiking
+highway|path|expert
 *railway|rail|spur|tunnel
 *highway|secondary_link|bridge
 *railway|tram|tunnel
@@ -441,7 +441,7 @@ mapswithme
 *aerialway|t-bar
 *amenity|parking|lane|fee
 *amenity|parking|street_side|fee
-*highway|path|difficult_alpine_hiking
+highway|path|expert
 *earthquake:damage|spontaneous_camp
 *natural|water|drain
 mapswithme
@@ -449,7 +449,7 @@ mapswithme
 *natural|water|moat
 *natural|water|wastewater
 mapswithme
-highway|path|demanding_mountain_hiking
+highway|path|difficult
 *amenity|shelter|basic_hut
 *amenity|shelter|lean_to
 *landuse|orchard
@@ -461,8 +461,8 @@ mapswithme
 *sport|handball
 mapswithme
 *piste:type|downhill|freeride
-mapswithme
-mapswithme
+*highway|path|difficult
+*highway|path|expert
 *piste:type|downhill|expert
 *landuse|salt_pond
 *cemetery|grave
@@ -526,7 +526,7 @@ mapswithme
 mapswithme
 mapswithme
 *highway|primary_link|tunnel
-highway|path|alpine_hiking
+highway|path|expert
 mapswithme
 mapswithme
 mapswithme
@@ -552,7 +552,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|path|demanding_alpine_hiking
+highway|path|expert
 mapswithme
 mapswithme
 mapswithme
@@ -624,7 +624,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|path|difficult_alpine_hiking
+highway|path|expert
 mapswithme
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index b6590b8964..821058f10d 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -436,15 +436,11 @@ world  000000000000000000000  +
             tunnel  000000000011111111111  -
             {}
         path  000000000000000001111  +
-            alpine_hiking  000000000000000001111  -
             bicycle  000000000000000001111  -
             bridge  000000000000000001111  -
-            demanding_alpine_hiking  000000000000000001111  -
-            demanding_mountain_hiking  000000000000000001111  -
-            difficult_alpine_hiking  000000000000000001111  -
-            hiking  000000000000000001111  -
+            difficult  000000000000000001111  -
+            expert  000000000000000001111  -
             horse  000000000000000001111  -
-            mountain_hiking  000000000000000001111  -
             tunnel  000000000000000000000  -
             {}
         pedestrian  000000000000000000111  +