diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3e0b3a9640..70b4c4df44 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 5fb3a8f910..84305e5227 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -16053,6 +16053,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -16067,6 +16075,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -16081,6 +16097,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -16095,6 +16119,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -16109,6 +16141,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -44069,6 +44109,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -44083,6 +44131,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -44097,6 +44153,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -44111,6 +44175,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -44125,6 +44197,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -55893,6 +55973,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 19
@@ -55907,6 +55995,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 20
@@ -55921,6 +56017,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
 }
 cont {
@@ -58611,6 +58715,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 17
@@ -58625,6 +58737,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 18
@@ -58639,6 +58759,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 19
@@ -58653,6 +58781,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 20
@@ -58667,6 +58803,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 0613990dbc..dbc81ebb5e 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index cfab49fbb8..c292431800 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -15307,6 +15307,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -15321,6 +15329,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -15335,6 +15351,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -15349,6 +15373,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -15363,6 +15395,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -41542,6 +41582,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -41556,6 +41604,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -41570,6 +41626,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -41584,6 +41648,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -41598,6 +41670,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -53172,6 +53252,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
   element {
     scale: 19
@@ -53186,6 +53274,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
   element {
     scale: 20
@@ -53200,6 +53296,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
 }
 cont {
@@ -55318,6 +55422,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 17
@@ -55332,6 +55444,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 18
@@ -55346,6 +55466,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 19
@@ -55360,6 +55488,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 20
@@ -55374,6 +55510,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 04fe60c5b6..0f7cc76ad3 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 2fa8663f69..d530faed13 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -15307,6 +15307,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -15321,6 +15329,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -15335,6 +15351,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -15349,6 +15373,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -15363,6 +15395,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -41272,6 +41312,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -41286,6 +41334,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -41300,6 +41356,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -41314,6 +41378,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -41328,6 +41400,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -52917,6 +52997,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 19
@@ -52931,6 +53019,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 20
@@ -52945,6 +53041,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
 }
 cont {
@@ -55072,6 +55176,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 17
@@ -55086,6 +55198,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 18
@@ -55100,6 +55220,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 19
@@ -55114,6 +55242,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 20
@@ -55128,6 +55264,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 16cc5a2f80..2a522f87f1 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 372276a8a4..2d797f1462 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -15864,6 +15864,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -15878,6 +15886,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -15892,6 +15908,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -15906,6 +15930,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -15920,6 +15952,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -43987,6 +44027,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -44001,6 +44049,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -44015,6 +44071,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -44029,6 +44093,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -44043,6 +44115,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -55921,6 +56001,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
   element {
     scale: 19
@@ -55935,6 +56023,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
   element {
     scale: 20
@@ -55949,6 +56045,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 470
+    }
   }
 }
 cont {
@@ -59118,6 +59222,14 @@ cont {
       priority: 100
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 15
@@ -59133,6 +59245,14 @@ cont {
       priority: 100
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 16
@@ -59147,6 +59267,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 17
@@ -59161,6 +59289,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 18
@@ -59175,6 +59311,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 19
@@ -59189,6 +59333,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 20
@@ -59203,6 +59355,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 1500
+    }
   }
 }
 cont {
@@ -74231,6 +74391,14 @@ cont {
       priority: 350
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 16
@@ -74248,6 +74416,14 @@ cont {
       color: 2150839091
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 17
@@ -74265,6 +74441,14 @@ cont {
       color: 1714631475
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 18
@@ -74282,6 +74466,14 @@ cont {
       color: 1714631475
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 19
@@ -74299,6 +74491,14 @@ cont {
       color: 1714631475
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 20
@@ -74316,6 +74516,14 @@ cont {
       color: 1714631475
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 1292964096
+      }
+      priority: 1000
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index f96035dfd4..93f4a76550 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 207546f5ed..1dae4b09de 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -15864,6 +15864,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -15878,6 +15886,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -15892,6 +15908,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -15906,6 +15930,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -15920,6 +15952,14 @@ cont {
       }
       priority: 320
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -43717,6 +43757,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 17
@@ -43731,6 +43779,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 9
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 18
@@ -43745,6 +43801,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 19
@@ -43759,6 +43823,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
   element {
     scale: 20
@@ -43773,6 +43845,14 @@ cont {
       }
       priority: 360
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2957
+    }
   }
 }
 cont {
@@ -55666,6 +55746,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 19
@@ -55680,6 +55768,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
   element {
     scale: 20
@@ -55694,6 +55790,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 470
+    }
   }
 }
 cont {
@@ -58872,6 +58976,14 @@ cont {
       priority: 100
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 15
@@ -58887,6 +58999,14 @@ cont {
       priority: 100
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 16
@@ -58901,6 +59021,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 17
@@ -58915,6 +59043,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 18
@@ -58929,6 +59065,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 19
@@ -58943,6 +59087,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 1500
+    }
   }
   element {
     scale: 20
@@ -58957,6 +59109,14 @@ cont {
       }
       priority: 100
     }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 1500
+    }
   }
 }
 cont {
@@ -74016,6 +74176,14 @@ cont {
       priority: 350
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 16
@@ -74033,6 +74201,14 @@ cont {
       color: 2157352326
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 17
@@ -74050,6 +74226,14 @@ cont {
       color: 1721144710
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 18
@@ -74067,6 +74251,14 @@ cont {
       color: 1721144710
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 19
@@ -74084,6 +74276,14 @@ cont {
       color: 1721144710
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
   element {
     scale: 20
@@ -74101,6 +74301,14 @@ cont {
       color: 1721144710
       priority: 350
     }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 1307438043
+      }
+      priority: 1000
+    }
   }
 }
 cont {
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 809bd68dc5..2193f09b64 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -36,7 +36,7 @@ aerialway-rope_tow                                  # line z13- (also has line::
 aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
 === 370
 
-historic-citywalls                                  # line z14-
+historic-citywalls                                  # line z14- (also has pathtext z16-)
 === 360
 
 power-line                                          # line z19- (also has line::dash z19-)
@@ -56,7 +56,7 @@ hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
 
-barrier-city_wall                                   # line z14-
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z16-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
@@ -417,8 +417,8 @@ landuse-garages                                     # area z15-
 === 110
 
 barrier-retaining_wall                              # line z16-
-man_made-embankment                                 # line z16-
-natural-cliff                                       # line z14-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z14- (also has pathtext z16-)
 natural-earth_bank                                  # line z14-
 === 100
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 25fcb087d4..f1bef3c174 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -656,8 +656,8 @@ highway-tertiary-bridge::shield                     # shield::shield z13- (also
 highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
-barrier-city_wall
-historic-citywalls
+barrier-city_wall                                   # pathtext z16- (also has line z14-)
+historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
 highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
@@ -1002,7 +1002,7 @@ amenity-shelter-public_transport                    # icon z17- (also has captio
 emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
-natural-cliff
+natural-cliff                                       # pathtext z16- (also has line z14-)
 === 1500
 
 sport-american_football                             # icon z17- (also has caption(optional) z17-)
@@ -1162,7 +1162,7 @@ shop-wholesale                                      # icon z18- (also has captio
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
-man_made-embankment
+man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 441889b669..208ef8ec33 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -36,13 +36,13 @@ aerialway-rope_tow                                  # line z13- (also has line::
 aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
 === 370
 
-historic-citywalls                                  # line z14-
+historic-citywalls                                  # line z14- (also has pathtext z16-)
 === 360
 
-power-line                                          # line z15- (also has line::dash z15-)
+power-line                                          # line z15- (also has line::dash z15-, pathtext z15-)
 === 350
 
-power-line::dash                                    # line::dash z15- (also has line z15-)
+power-line::dash                                    # line::dash z15- (also has line z15-, pathtext z15-)
 === 340
 
 highway-cycleway                                    # line z11- (also has pathtext z13-)
@@ -56,7 +56,7 @@ hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
 
-barrier-city_wall                                   # line z14-
+barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z15-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
@@ -417,8 +417,8 @@ landuse-garages                                     # area z15-
 === 110
 
 barrier-retaining_wall                              # line z16-
-man_made-embankment                                 # line z16-
-natural-cliff                                       # line z12-
+man_made-embankment                                 # line z16- (also has pathtext z18-)
+natural-cliff                                       # line z12- (also has pathtext z14-)
 natural-earth_bank                                  # line z12-
 === 100
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 74068f4bef..70a1edd3a0 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -656,8 +656,8 @@ highway-tertiary-bridge::shield                     # shield::shield z13- (also
 highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
-barrier-city_wall
-historic-citywalls
+barrier-city_wall                                   # pathtext z16- (also has line z14-)
+historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957
 
 highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
@@ -1002,7 +1002,7 @@ amenity-shelter-public_transport                    # icon z14- (also has captio
 emergency-lifeguard                                 # icon z14- (also has caption(optional) z18-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
-natural-cliff
+natural-cliff                                       # pathtext z14- (also has line z12-)
 === 1500
 
 sport-american_football                             # icon z17- (also has caption(optional) z17-)
@@ -1073,7 +1073,7 @@ natural-spring-drinking_water_no                    # icon z12- (also has captio
 
 isoline-step_10                                     # pathtext z16- (also has line z15-)
 isoline-zero                                        # pathtext z15- (also has line z15-)
-power-line
+power-line                                          # pathtext z15- (also has line z15-, line::dash z15-)
 === 1000
 
 amenity-grave_yard                                  # icon z17- (also has caption(optional) z17-, area z14-)
@@ -1163,7 +1163,7 @@ shop-wholesale                                      # icon z18- (also has captio
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z15- (also has caption(optional) z18-)
-man_made-embankment
+man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470