diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 6cc76e9892..ddcc86632d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -291,9 +291,11 @@ cont {
   element {
     scale: 16
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11573
     }
     circle {
@@ -305,9 +307,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11809
     }
     circle {
@@ -356,9 +360,11 @@ cont {
       priority: 69
     }
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10640
     }
   }
@@ -454,18 +460,22 @@ cont {
       priority: 451
     }
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10485
     }
   }
   element {
     scale: 14
     caption {
-      height: 20
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 20
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10641
     }
   }
@@ -548,8 +558,10 @@ cont {
   element {
     scale: 17
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 11786
     }
   }
@@ -982,9 +994,11 @@ cont {
       priority: 1590
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -998,9 +1012,11 @@ cont {
       priority: 1589
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1014,9 +1030,11 @@ cont {
       priority: 1533
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1030,9 +1048,11 @@ cont {
       priority: 1546
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1046,9 +1066,11 @@ cont {
       priority: 1584
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1062,9 +1084,11 @@ cont {
       priority: 1591
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1085,9 +1109,11 @@ cont {
       priority: 1520
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1101,9 +1127,11 @@ cont {
       priority: 1534
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1114,9 +1142,11 @@ cont {
       priority: 1534
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1130,9 +1160,11 @@ cont {
       priority: 1592
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1146,9 +1178,11 @@ cont {
       priority: 1539
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1273,9 +1307,11 @@ cont {
       priority: 1527
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1289,9 +1325,11 @@ cont {
       priority: 1588
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1305,9 +1343,11 @@ cont {
       priority: 1594
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1321,9 +1361,11 @@ cont {
       priority: 1582
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1360,9 +1402,11 @@ cont {
       priority: 1587
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1376,9 +1420,11 @@ cont {
       priority: 1583
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1518,9 +1564,11 @@ cont {
       priority: 1526
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1534,9 +1582,11 @@ cont {
       priority: 1578
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -1661,9 +1711,11 @@ cont {
       priority: 1581
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2006,9 +2058,11 @@ cont {
       priority: 1528
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2022,9 +2076,11 @@ cont {
       priority: 1544
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2038,9 +2094,11 @@ cont {
       priority: 1530
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2054,9 +2112,11 @@ cont {
       priority: 1529
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2070,9 +2130,11 @@ cont {
       priority: 1532
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2083,9 +2145,11 @@ cont {
       priority: 1532
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2099,9 +2163,11 @@ cont {
       priority: 1585
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2115,9 +2181,11 @@ cont {
       priority: 1536
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2128,9 +2196,11 @@ cont {
       priority: 1536
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2288,9 +2358,11 @@ cont {
       priority: 1577
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2311,9 +2383,11 @@ cont {
       priority: 1531
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2327,9 +2401,11 @@ cont {
       priority: 1593
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2343,9 +2419,11 @@ cont {
       priority: 1540
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2356,9 +2434,11 @@ cont {
       priority: 1540
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -2372,9 +2452,11 @@ cont {
       priority: 11586
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 14829
     }
   }
@@ -2385,9 +2467,11 @@ cont {
       priority: 1586
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -4451,9 +4535,11 @@ cont {
       priority: 721
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xF0F0E0
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xF0F0E0
+      }
       priority: 11832
     }
   }
@@ -4682,9 +4768,11 @@ cont {
       priority: 694
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11537
     }
   }
@@ -4696,9 +4784,11 @@ cont {
       priority: 735
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11770
     }
   }
@@ -5558,9 +5648,11 @@ cont {
       priority: 1519
     }
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11807
     }
   }
@@ -5714,9 +5806,11 @@ cont {
       priority: 697
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11538
     }
   }
@@ -5752,9 +5846,11 @@ cont {
       priority: 738
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11771
     }
   }
@@ -6337,9 +6433,11 @@ cont {
       priority: 287
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10609
     }
   }
@@ -6351,9 +6449,11 @@ cont {
       priority: 399
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10820
     }
   }
@@ -6365,9 +6465,11 @@ cont {
       priority: 715
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11546
     }
   }
@@ -6379,9 +6481,11 @@ cont {
       priority: 757
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11779
     }
   }
@@ -6582,9 +6686,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11748
     }
   }
@@ -6796,9 +6902,11 @@ cont {
       priority: 689
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11532
     }
   }
@@ -6810,9 +6918,11 @@ cont {
       priority: 730
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11765
     }
   }
@@ -7735,9 +7845,11 @@ cont {
       priority: 687
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11529
     }
   }
@@ -7749,9 +7861,11 @@ cont {
       priority: 728
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11762
     }
   }
@@ -8258,9 +8372,11 @@ cont {
       priority: 686
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11528
     }
   }
@@ -8272,9 +8388,11 @@ cont {
       priority: 727
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11761
     }
   }
@@ -9642,9 +9760,11 @@ cont {
       priority: 397
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10819
     }
   }
@@ -9670,9 +9790,11 @@ cont {
       priority: 713
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11545
     }
   }
@@ -9698,9 +9820,11 @@ cont {
       priority: 755
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11778
     }
   }
@@ -9909,9 +10033,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11747
     }
   }
@@ -10175,9 +10301,11 @@ cont {
       priority: 291
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10607
     }
   }
@@ -10189,9 +10317,11 @@ cont {
       priority: 395
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10818
     }
   }
@@ -10203,9 +10333,11 @@ cont {
       priority: 709
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11544
     }
   }
@@ -10217,9 +10349,11 @@ cont {
       priority: 751
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11777
     }
   }
@@ -10458,9 +10592,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11746
     }
   }
@@ -11019,9 +11155,11 @@ cont {
       priority: 570
     }
     path_text {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xf08800
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xf08800
+      }
       priority: 1200
     }
   }
@@ -11038,9 +11176,11 @@ cont {
       priority: 570
     }
     path_text {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xf08800
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xf08800
+      }
       priority: 1200
     }
   }
@@ -11057,9 +11197,11 @@ cont {
       priority: 570
     }
     path_text {
-      height: 17
-      color: 0x202020
-      stroke_color: 0xf08800
+      primary {
+        height: 17
+        color: 0x202020
+        stroke_color: 0xf08800
+      }
       priority: 1200
     }
   }
@@ -11076,9 +11218,11 @@ cont {
       priority: 570
     }
     path_text {
-      height: 18
-      color: 0x202020
-      stroke_color: 0xf08800
+      primary {
+        height: 18
+        color: 0x202020
+        stroke_color: 0xf08800
+      }
       priority: 1200
     }
   }
@@ -11095,9 +11239,11 @@ cont {
       priority: 570
     }
     path_text {
-      height: 18
-      color: 0x202020
-      stroke_color: 0xf08800
+      primary {
+        height: 18
+        color: 0x202020
+        stroke_color: 0xf08800
+      }
       priority: 1200
     }
   }
@@ -11658,18 +11804,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11469
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11758
     }
   }
@@ -12210,81 +12360,99 @@ cont {
   element {
     scale: 6
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 126
     }
   }
   element {
     scale: 7
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 127
     }
   }
   element {
     scale: 8
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 58
     }
   }
   element {
     scale: 9
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 58
     }
   }
   element {
     scale: 10
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 136
     }
   }
   element {
     scale: 11
     caption {
-      height: 1
-      color: 0x202020
-      stroke_color: 0xFF
+      primary {
+        height: 1
+        color: 0x202020
+        stroke_color: 0xFF
+      }
       priority: 136
     }
   }
   element {
     scale: 15
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 594
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 914
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1524
     }
   }
@@ -12363,9 +12531,11 @@ cont {
       priority: 299
     }
     path_text {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10617
     }
   }
@@ -12377,9 +12547,11 @@ cont {
       priority: 407
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10828
     }
   }
@@ -12391,9 +12563,11 @@ cont {
       priority: 722
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11459
     }
   }
@@ -12405,9 +12579,11 @@ cont {
       priority: 764
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11737
     }
   }
@@ -12642,18 +12818,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11470
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11759
     }
   }
@@ -13174,9 +13354,11 @@ cont {
       priority: 693
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11536
     }
   }
@@ -13188,9 +13370,11 @@ cont {
       priority: 734
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11769
     }
   }
@@ -13439,9 +13623,11 @@ cont {
       priority: 690
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11534
     }
   }
@@ -13453,9 +13639,11 @@ cont {
       priority: 731
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11767
     }
   }
@@ -14426,9 +14614,11 @@ cont {
       priority: 691
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11535
     }
   }
@@ -14440,9 +14630,11 @@ cont {
       priority: 732
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11768
     }
   }
@@ -15096,9 +15288,11 @@ cont {
       priority: 466
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11530
     }
   }
@@ -15115,9 +15309,11 @@ cont {
       priority: 466
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11763
     }
   }
@@ -15332,9 +15528,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11743
     }
   }
@@ -15547,9 +15745,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 10
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 10
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -15566,9 +15766,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 12
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 12
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -15585,9 +15787,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 14
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 14
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 11784
     }
   }
@@ -15604,9 +15808,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 16
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 16
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -15623,9 +15829,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 17
-      color: 0x404040
-      stroke_color: 0xffb84f
+      primary {
+        height: 17
+        color: 0x404040
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -15642,9 +15850,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 17
-      color: 0x404040
-      stroke_color: 0xffb84f
+      primary {
+        height: 17
+        color: 0x404040
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -15936,18 +16146,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11465
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11754
     }
   }
@@ -16546,9 +16760,11 @@ cont {
       priority: 297
     }
     path_text {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10615
     }
   }
@@ -16560,9 +16776,11 @@ cont {
       priority: 405
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10826
     }
   }
@@ -16574,9 +16792,11 @@ cont {
       priority: 720
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11457
     }
   }
@@ -16588,9 +16808,11 @@ cont {
       priority: 762
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11735
     }
   }
@@ -16882,18 +17104,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11466
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11755
     }
   }
@@ -18011,9 +18237,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 9
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -18030,9 +18258,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 12
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -18049,9 +18279,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 12
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -18290,9 +18522,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11745
     }
   }
@@ -18828,9 +19062,11 @@ cont {
       priority: 288
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10610
     }
   }
@@ -18842,9 +19078,11 @@ cont {
       priority: 400
     }
     path_text {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10821
     }
   }
@@ -18856,9 +19094,11 @@ cont {
       priority: 711
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11547
     }
   }
@@ -18870,9 +19110,11 @@ cont {
       priority: 753
     }
     path_text {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11780
     }
   }
@@ -19002,9 +19244,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11749
     }
   }
@@ -19534,9 +19778,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 10
-      color: 0x404040
-      stroke_color: 0xfffb80
+      primary {
+        height: 10
+        color: 0x404040
+        stroke_color: 0xfffb80
+      }
       priority: 1150
     }
   }
@@ -19553,9 +19799,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 11
-      color: 0x404040
-      stroke_color: 0xfffb80
+      primary {
+        height: 11
+        color: 0x404040
+        stroke_color: 0xfffb80
+      }
       priority: 1150
     }
   }
@@ -19572,9 +19820,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 12
-      color: 0x404040
-      stroke_color: 0xfffb80
+      primary {
+        height: 12
+        color: 0x404040
+        stroke_color: 0xfffb80
+      }
       priority: 1150
     }
   }
@@ -19591,9 +19841,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 14
-      color: 0x404040
-      stroke_color: 0xfffb80
+      primary {
+        height: 14
+        color: 0x404040
+        stroke_color: 0xfffb80
+      }
       priority: 1150
     }
   }
@@ -19610,9 +19862,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 16
-      color: 0x404040
-      stroke_color: 0xfffb80
+      primary {
+        height: 16
+        color: 0x404040
+        stroke_color: 0xfffb80
+      }
       priority: 1150
     }
   }
@@ -19904,18 +20158,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11463
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11752
     }
   }
@@ -20474,9 +20732,11 @@ cont {
       priority: 295
     }
     path_text {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10613
     }
   }
@@ -20488,9 +20748,11 @@ cont {
       priority: 403
     }
     path_text {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10824
     }
   }
@@ -20502,9 +20764,11 @@ cont {
       priority: 718
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11455
     }
   }
@@ -20516,9 +20780,11 @@ cont {
       priority: 760
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11733
     }
   }
@@ -20810,18 +21076,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11464
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11753
     }
   }
@@ -21388,9 +21658,11 @@ cont {
       priority: 707
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11541
     }
   }
@@ -21402,9 +21674,11 @@ cont {
       priority: 749
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11774
     }
   }
@@ -22796,9 +23070,11 @@ cont {
       priority: 685
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11527
     }
   }
@@ -22844,9 +23120,11 @@ cont {
       priority: 726
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11760
     }
   }
@@ -23604,9 +23882,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 10
-      color: 0x404040
-      stroke_color: 0xFFFF90
+      primary {
+        height: 10
+        color: 0x404040
+        stroke_color: 0xFFFF90
+      }
       priority: 1150
     }
   }
@@ -23623,9 +23903,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 10
-      color: 0x404040
-      stroke_color: 0xFFFF90
+      primary {
+        height: 10
+        color: 0x404040
+        stroke_color: 0xFFFF90
+      }
       priority: 1150
     }
   }
@@ -23642,9 +23924,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 12
-      color: 0x404040
-      stroke_color: 0xFFFF90
+      primary {
+        height: 12
+        color: 0x404040
+        stroke_color: 0xFFFF90
+      }
       priority: 1150
     }
   }
@@ -23661,9 +23945,11 @@ cont {
       priority: 490
     }
     path_text {
-      height: 12
-      color: 0x404040
-      stroke_color: 0xFFFF90
+      primary {
+        height: 12
+        color: 0x404040
+        stroke_color: 0xFFFF90
+      }
       priority: 1150
     }
   }
@@ -23955,9 +24241,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11750
     }
   }
@@ -24531,9 +24819,11 @@ cont {
       priority: 401
     }
     path_text {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10822
     }
   }
@@ -24545,9 +24835,11 @@ cont {
       priority: 716
     }
     path_text {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11453
     }
   }
@@ -24559,9 +24851,11 @@ cont {
       priority: 758
     }
     path_text {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11731
     }
   }
@@ -24853,9 +25147,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11751
     }
   }
@@ -25426,9 +25722,11 @@ cont {
       priority: 704
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11539
     }
   }
@@ -25440,9 +25738,11 @@ cont {
       priority: 745
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11772
     }
   }
@@ -26894,9 +27194,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11742
     }
   }
@@ -27645,9 +27947,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 10
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 10
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -27664,9 +27968,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 12
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 12
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -27683,9 +27989,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 14
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 14
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 11784
     }
   }
@@ -27702,9 +28010,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 16
-      color: 0x303030
-      stroke_color: 0xffb84f
+      primary {
+        height: 16
+        color: 0x303030
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -27721,9 +28031,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 17
-      color: 0x404040
-      stroke_color: 0xffb84f
+      primary {
+        height: 17
+        color: 0x404040
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -27740,9 +28052,11 @@ cont {
       priority: 530
     }
     path_text {
-      height: 17
-      color: 0x404040
-      stroke_color: 0xffb84f
+      primary {
+        height: 17
+        color: 0x404040
+        stroke_color: 0xffb84f
+      }
       priority: 1180
     }
   }
@@ -28405,18 +28719,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11467
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11756
     }
   }
@@ -29084,9 +29402,11 @@ cont {
       priority: 298
     }
     path_text {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10616
     }
   }
@@ -29103,9 +29423,11 @@ cont {
       priority: 406
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10827
     }
   }
@@ -29122,9 +29444,11 @@ cont {
       priority: 721
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11458
     }
   }
@@ -29141,9 +29465,11 @@ cont {
       priority: 763
     }
     path_text {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11736
     }
   }
@@ -29480,18 +29806,22 @@ cont {
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11468
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11757
     }
   }
@@ -30084,9 +30414,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 9
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -30103,9 +30435,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 12
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -30122,9 +30456,11 @@ cont {
       priority: 440
     }
     path_text {
-      height: 12
-      color: 0x505050
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x505050
+        stroke_color: 0xFFFFFF
+      }
       priority: 1100
     }
   }
@@ -30363,9 +30699,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11744
     }
   }
@@ -30925,9 +31263,11 @@ cont {
       priority: 705
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11540
     }
   }
@@ -30939,9 +31279,11 @@ cont {
       priority: 746
     }
     path_text {
-      height: 10
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 11773
     }
   }
@@ -31215,9 +31557,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11741
     }
   }
@@ -31766,9 +32110,11 @@ cont {
       priority: 1579
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -31786,9 +32132,11 @@ cont {
       priority: 1638
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -31839,8 +32187,10 @@ cont {
       priority: 43
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -31855,8 +32205,10 @@ cont {
       priority: 43
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -31871,8 +32223,10 @@ cont {
       priority: 43
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -31989,8 +32343,10 @@ cont {
       priority: 127
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32005,8 +32361,10 @@ cont {
       priority: 129
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32021,8 +32379,10 @@ cont {
       priority: 131
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32139,8 +32499,10 @@ cont {
       priority: 127
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32155,8 +32517,10 @@ cont {
       priority: 129
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32171,8 +32535,10 @@ cont {
       priority: 131
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32289,8 +32655,10 @@ cont {
       priority: 127
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32305,8 +32673,10 @@ cont {
       priority: 129
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32321,8 +32691,10 @@ cont {
       priority: 131
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32439,8 +32811,10 @@ cont {
       priority: 127
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32455,8 +32829,10 @@ cont {
       priority: 129
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32471,8 +32847,10 @@ cont {
       priority: 131
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32519,8 +32897,10 @@ cont {
       priority: -9227
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32535,8 +32915,10 @@ cont {
       priority: -8617
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32551,8 +32933,10 @@ cont {
       priority: -8342
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32641,8 +33025,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32657,8 +33043,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32673,8 +33061,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32763,8 +33153,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32779,8 +33171,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32795,8 +33189,10 @@ cont {
       priority: 3
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -32885,8 +33281,10 @@ cont {
       priority: -9225
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -32901,8 +33299,10 @@ cont {
       priority: -8615
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -32917,8 +33317,10 @@ cont {
       priority: -8340
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -33310,8 +33712,10 @@ cont {
       priority: -9224
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -33326,8 +33730,10 @@ cont {
       priority: -8614
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -33342,8 +33748,10 @@ cont {
       priority: -8339
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -33394,8 +33802,10 @@ cont {
       priority: 39
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -33410,8 +33820,10 @@ cont {
       priority: 39
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -33426,8 +33838,10 @@ cont {
       priority: 39
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -33478,8 +33892,10 @@ cont {
       priority: 40
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -33494,8 +33910,10 @@ cont {
       priority: 40
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -33510,8 +33928,10 @@ cont {
       priority: 40
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -33588,8 +34008,10 @@ cont {
       priority: -9230
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -33600,8 +34022,10 @@ cont {
       priority: -8620
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -33612,8 +34036,10 @@ cont {
       priority: -8345
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -33865,8 +34291,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -33881,8 +34309,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -33897,8 +34327,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34015,8 +34447,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34031,8 +34465,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34047,8 +34483,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34176,9 +34614,11 @@ cont {
       priority: 32
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 3508
     }
   }
@@ -34306,8 +34746,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34322,8 +34764,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34338,8 +34782,10 @@ cont {
       priority: 32
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34353,8 +34799,10 @@ cont {
       priority: -9222
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34365,8 +34813,10 @@ cont {
       priority: -8612
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34377,8 +34827,10 @@ cont {
       priority: -8337
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34429,8 +34881,10 @@ cont {
       priority: 42
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34445,8 +34899,10 @@ cont {
       priority: 42
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34461,8 +34917,10 @@ cont {
       priority: 42
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34509,8 +34967,10 @@ cont {
       priority: -9223
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34525,8 +34985,10 @@ cont {
       priority: -8613
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34541,8 +35003,10 @@ cont {
       priority: -8338
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34552,24 +35016,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34658,8 +35128,10 @@ cont {
       priority: -9228
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34674,8 +35146,10 @@ cont {
       priority: -8618
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34690,8 +35164,10 @@ cont {
       priority: -8343
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34731,8 +35207,10 @@ cont {
       priority: 0
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34747,8 +35225,10 @@ cont {
       priority: 0
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34763,8 +35243,10 @@ cont {
       priority: 0
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34881,8 +35363,10 @@ cont {
       priority: 41
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34897,8 +35381,10 @@ cont {
       priority: 41
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34913,8 +35399,10 @@ cont {
       priority: 41
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -34965,8 +35453,10 @@ cont {
       priority: -9217
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -34981,8 +35471,10 @@ cont {
       priority: -8607
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -34997,8 +35489,10 @@ cont {
       priority: -8347
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35008,24 +35502,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35072,8 +35572,10 @@ cont {
       priority: 1
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -35088,8 +35590,10 @@ cont {
       priority: 1
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -35104,8 +35608,10 @@ cont {
       priority: 1
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35513,8 +36019,10 @@ cont {
       priority: -9226
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -35529,8 +36037,10 @@ cont {
       priority: -8616
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -35545,8 +36055,10 @@ cont {
       priority: -8341
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35597,8 +36109,10 @@ cont {
       priority: 45
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -35613,8 +36127,10 @@ cont {
       priority: 45
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -35629,8 +36145,10 @@ cont {
       priority: 45
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35747,8 +36265,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -35763,8 +36283,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -35779,8 +36301,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -35897,8 +36421,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -35913,8 +36439,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -35929,8 +36457,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -36047,8 +36577,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -36063,8 +36595,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -36079,8 +36613,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -36197,8 +36733,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -36213,8 +36751,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -36229,8 +36769,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -36347,8 +36889,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -36363,8 +36907,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -36379,8 +36925,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -36497,8 +37045,10 @@ cont {
       priority: 122
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -36513,8 +37063,10 @@ cont {
       priority: 124
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -36529,8 +37081,10 @@ cont {
       priority: 126
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -36706,8 +37260,10 @@ cont {
       priority: -9229
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -36722,8 +37278,10 @@ cont {
       priority: -8619
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -36738,8 +37296,10 @@ cont {
       priority: -8344
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -37088,24 +37648,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -37391,24 +37957,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -37525,8 +38097,10 @@ cont {
       priority: 44
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -37541,8 +38115,10 @@ cont {
       priority: 44
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -37557,8 +38133,10 @@ cont {
       priority: 44
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -37598,8 +38176,10 @@ cont {
       priority: 6
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -37614,8 +38194,10 @@ cont {
       priority: 6
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -37630,8 +38212,10 @@ cont {
       priority: 6
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -38579,9 +39163,11 @@ cont {
       priority: 47
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -39122,9 +39708,11 @@ cont {
       priority: 46
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -39263,9 +39851,11 @@ cont {
       priority: 46
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -39404,9 +39994,11 @@ cont {
       priority: 46
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -39545,9 +40137,11 @@ cont {
       priority: 46
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -39686,9 +40280,11 @@ cont {
       priority: 46
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -40519,9 +41115,11 @@ cont {
       priority: 65
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -40660,9 +41258,11 @@ cont {
       priority: 64
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -42040,162 +42640,198 @@ cont {
   element {
     scale: 0
     caption {
-      height: 6
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 6
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 1
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 2
     caption {
-      height: 24
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 24
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 3
     caption {
-      height: 48
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 48
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 4
     caption {
-      height: 97
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 97
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 5
     caption {
-      height: 195
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 195
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 6
     caption {
-      height: 390
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 390
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 7
     caption {
-      height: 781
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 781
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 8
     caption {
-      height: 1562
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 1562
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 9
     caption {
-      height: 3125
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 3125
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 10
     caption {
-      height: 6250
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 6250
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 11
     caption {
-      height: 12500
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 12500
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 12
     caption {
-      height: 25000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 25000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 13
     caption {
-      height: 50000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 50000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 14
     caption {
-      height: 100000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 100000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 15
     caption {
-      height: 200000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 200000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 16
     caption {
-      height: 400000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 400000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
   element {
     scale: 17
     caption {
-      height: 800000
-      color: 0x202020
-      stroke_color: 0x202020
+      primary {
+        height: 800000
+        color: 0x202020
+        stroke_color: 0x202020
+      }
       priority: 1
     }
   }
@@ -42215,24 +42851,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42242,24 +42884,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42300,24 +42948,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42331,8 +42985,10 @@ cont {
       priority: 544
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -42343,8 +42999,10 @@ cont {
       priority: 715
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -42355,8 +43013,10 @@ cont {
       priority: 1206
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -42367,8 +43027,10 @@ cont {
       priority: 1358
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42378,24 +43040,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42624,24 +43292,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42651,24 +43325,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42678,24 +43358,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42705,24 +43391,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42732,24 +43424,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -42855,8 +43553,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -42871,8 +43571,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -42887,8 +43589,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -42903,8 +43607,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43010,8 +43716,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -43026,8 +43734,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -43042,8 +43752,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -43058,8 +43770,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43165,8 +43879,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -43181,8 +43897,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -43197,8 +43915,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -43213,8 +43933,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43320,8 +44042,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -43336,8 +44060,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -43352,8 +44078,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -43368,8 +44096,10 @@ cont {
       priority: 29
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43379,24 +44109,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43497,24 +44233,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43524,24 +44266,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43551,24 +44299,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43647,24 +44401,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43770,8 +44530,10 @@ cont {
       priority: 109
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -43786,8 +44548,10 @@ cont {
       priority: 114
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -43802,8 +44566,10 @@ cont {
       priority: 116
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -43818,8 +44584,10 @@ cont {
       priority: 118
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -43964,24 +44732,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44038,24 +44812,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44065,24 +44845,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44092,24 +44878,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44137,8 +44929,10 @@ cont {
       priority: 542
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -44149,8 +44943,10 @@ cont {
       priority: 712
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -44161,8 +44957,10 @@ cont {
       priority: 1203
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -44173,8 +44971,10 @@ cont {
       priority: 1356
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44319,24 +45119,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44346,24 +45152,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44373,24 +45185,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44400,24 +45218,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44427,24 +45251,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44454,24 +45284,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44757,24 +45593,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44801,24 +45643,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44828,24 +45676,30 @@ cont {
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -44873,8 +45727,10 @@ cont {
       priority: 543
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -44885,8 +45741,10 @@ cont {
       priority: 713
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -44897,8 +45755,10 @@ cont {
       priority: 1204
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -44909,8 +45769,10 @@ cont {
       priority: 1357
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -45016,8 +45878,10 @@ cont {
       priority: 107
     }
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10629
     }
   }
@@ -45032,8 +45896,10 @@ cont {
       priority: 112
     }
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10893
     }
   }
@@ -45048,8 +45914,10 @@ cont {
       priority: 114
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11553
     }
   }
@@ -45064,8 +45932,10 @@ cont {
       priority: 116
     }
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11787
     }
   }
@@ -45754,8 +46624,10 @@ cont {
       priority: 534
     }
     path_text {
-      height: 7
-      color: 0x202020
+      primary {
+        height: 7
+        color: 0x202020
+      }
       priority: 537
     }
   }
@@ -45865,8 +46737,10 @@ cont {
       priority: 535
     }
     path_text {
-      height: 7
-      color: 0x202020
+      primary {
+        height: 7
+        color: 0x202020
+      }
       priority: 538
     }
   }
@@ -45988,8 +46862,10 @@ cont {
       priority: 533
     }
     path_text {
-      height: 7
-      color: 0x202020
+      primary {
+        height: 7
+        color: 0x202020
+      }
       priority: 536
     }
   }
@@ -46457,87 +47333,107 @@ cont {
   element {
     scale: 5
     caption {
-      height: 7
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 7
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 1
     }
   }
   element {
     scale: 6
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 7
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 8
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 9
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 10
     caption {
-      height: 15
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 15
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 11
     caption {
-      height: 18
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 18
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 5
     }
   }
   element {
     scale: 12
     caption {
-      height: 20
-      color: 0x202020
+      primary {
+        height: 20
+        color: 0x202020
+      }
       priority: 10500
     }
   }
   element {
     scale: 13
     caption {
-      height: 20
-      color: 0x202020
+      primary {
+        height: 20
+        color: 0x202020
+      }
       priority: 10500
     }
   }
   element {
     scale: 14
     caption {
-      height: 14
-      color: 0x202020
+      primary {
+        height: 14
+        color: 0x202020
+      }
       priority: 10650
     }
   }
@@ -46547,88 +47443,108 @@ cont {
   element {
     scale: 5
     caption {
-      height: 7
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 7
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 6
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 7
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 8
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 9
     caption {
-      height: 11
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 10
     caption {
-      height: 15
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 15
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 11
     caption {
-      height: 18
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 18
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 6
     }
   }
   element {
     scale: 12
     caption {
-      height: 20
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 20
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10501
     }
   }
   element {
     scale: 13
     caption {
-      height: 22
-      color: 0x606060
+      primary {
+        height: 22
+        color: 0x606060
+      }
       priority: 10501
     }
   }
   element {
     scale: 14
     caption {
-      height: 22
-      color: 0x606060
+      primary {
+        height: 22
+        color: 0x606060
+      }
       priority: 10651
     }
   }
@@ -46638,18 +47554,22 @@ cont {
   element {
     scale: 1
     caption {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 1
     }
   }
   element {
     scale: 2
     caption {
-      height: 12
-      color: 0x606060
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x606060
+        stroke_color: 0xFFFFFF
+      }
       priority: 1
     }
   }
@@ -46659,27 +47579,33 @@ cont {
   element {
     scale: 3
     caption {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 1
     }
   }
   element {
     scale: 4
     caption {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 1
     }
   }
   element {
     scale: 5
     caption {
-      height: 11
-      color: 0xFFFFFF
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 11
+        color: 0xFFFFFF
+        stroke_color: 0xFFFFFF
+      }
       priority: 10
     }
   }
@@ -46689,62 +47615,76 @@ cont {
   element {
     scale: 6
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 7
     caption {
-      height: 0
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 0
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 8
     caption {
-      height: 9
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 9
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 9
     caption {
-      height: 3
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 3
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 10
     caption {
-      height: 7
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 7
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 11
     caption {
-      height: 1
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 1
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 2
     }
   }
   element {
     scale: 12
     caption {
-      height: 20
-      color: 0x202020
+      primary {
+        height: 20
+        color: 0x202020
+      }
       priority: 10452
     }
   }
@@ -46754,32 +47694,40 @@ cont {
   element {
     scale: 14
     caption {
-      height: 6
-      color: 0x202020
+      primary {
+        height: 6
+        color: 0x202020
+      }
       priority: 10637
     }
   }
   element {
     scale: 15
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10902
     }
   }
   element {
     scale: 16
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 11562
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 11798
     }
   }
@@ -46789,32 +47737,40 @@ cont {
   element {
     scale: 14
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10635
     }
   }
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10900
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11560
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11796
     }
   }
@@ -46824,80 +47780,100 @@ cont {
   element {
     scale: 8
     caption {
-      height: 5
-      color: 0x202020
+      primary {
+        height: 5
+        color: 0x202020
+      }
       priority: 67
     }
   }
   element {
     scale: 9
     caption {
-      height: 6
-      color: 0x202020
+      primary {
+        height: 6
+        color: 0x202020
+      }
       priority: 67
     }
   }
   element {
     scale: 10
     caption {
-      height: 6
-      color: 0x202020
+      primary {
+        height: 6
+        color: 0x202020
+      }
       priority: 153
     }
   }
   element {
     scale: 11
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 153
     }
   }
   element {
     scale: 12
     caption {
-      height: 10
-      color: 0x202020
+      primary {
+        height: 10
+        color: 0x202020
+      }
       priority: 10452
     }
   }
   element {
     scale: 13
     caption {
-      height: 10
-      color: 0x202020
+      primary {
+        height: 10
+        color: 0x202020
+      }
       priority: 10479
     }
   }
   element {
     scale: 14
     caption {
-      height: 10
-      color: 0x202020
+      primary {
+        height: 10
+        color: 0x202020
+      }
       priority: 10631
     }
   }
   element {
     scale: 15
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 10896
     }
   }
   element {
     scale: 16
     caption {
-      height: 24
-      color: 0x202020
+      primary {
+        height: 24
+        color: 0x202020
+      }
       priority: 11556
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11792
     }
   }
@@ -46907,40 +47883,50 @@ cont {
   element {
     scale: 13
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10480
     }
   }
   element {
     scale: 14
     caption {
-      height: 8
-      color: 0x202020
+      primary {
+        height: 8
+        color: 0x202020
+      }
       priority: 10632
     }
   }
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 10897
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
+      primary {
+        height: 16
+        color: 0x202020
+      }
       priority: 11557
     }
   }
   element {
     scale: 17
     caption {
-      height: 12
-      color: 0x202020
+      primary {
+        height: 12
+        color: 0x202020
+      }
       priority: 11793
     }
   }
@@ -46950,36 +47936,44 @@ cont {
   element {
     scale: 14
     caption {
-      height: 8
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10636
     }
   }
   element {
     scale: 15
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10901
     }
   }
   element {
     scale: 16
     caption {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11561
     }
   }
   element {
     scale: 17
     caption {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11797
     }
   }
@@ -46989,18 +47983,22 @@ cont {
   element {
     scale: 8
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 71
     }
   }
   element {
     scale: 9
     caption {
-      height: 4
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 4
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 71
     }
   }
@@ -47010,18 +48008,22 @@ cont {
   element {
     scale: 8
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 70
     }
   }
   element {
     scale: 9
     caption {
-      height: 5
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 5
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 70
     }
   }
@@ -47031,45 +48033,55 @@ cont {
   element {
     scale: 13
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10484
     }
   }
   element {
     scale: 14
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10634
     }
   }
   element {
     scale: 15
     caption {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10899
     }
   }
   element {
     scale: 16
     caption {
-      height: 24
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 24
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11559
     }
   }
   element {
     scale: 17
     caption {
-      height: 24
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 24
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11795
     }
   }
@@ -47079,81 +48091,99 @@ cont {
   element {
     scale: 6
     caption {
-      height: 3
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 3
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 7
     caption {
-      height: 4
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 4
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 8
     caption {
-      height: 5
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 5
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 9
     caption {
-      height: 6
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 6
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 10
     caption {
-      height: 6
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 6
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 11
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 3
     }
   }
   element {
     scale: 12
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10453
     }
   }
   element {
     scale: 13
     caption {
-      height: 15
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 15
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10480
     }
   }
   element {
     scale: 14
     caption {
-      height: 12
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10625
     }
   }
@@ -47163,45 +48193,55 @@ cont {
   element {
     scale: 13
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10483
     }
   }
   element {
     scale: 14
     caption {
-      height: 10
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10633
     }
   }
   element {
     scale: 15
     caption {
-      height: 16
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 16
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 10898
     }
   }
   element {
     scale: 16
     caption {
-      height: 24
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 24
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11558
     }
   }
   element {
     scale: 17
     caption {
-      height: 24
-      color: 0x202020
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 24
+        color: 0x202020
+        stroke_color: 0xFFFFFF
+      }
       priority: 11794
     }
   }
@@ -49419,9 +50459,11 @@ cont {
   element {
     scale: 16
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11569
     }
     circle {
@@ -49433,9 +50475,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11805
     }
     circle {
@@ -51853,9 +52897,11 @@ cont {
       priority: 327
     }
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 10639
     }
     circle {
@@ -51886,9 +52932,11 @@ cont {
       priority: 435
     }
     caption {
-      height: 12
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 10905
     }
     circle {
@@ -51919,9 +52967,11 @@ cont {
       priority: 752
     }
     caption {
-      height: 12
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11565
     }
     circle {
@@ -51952,9 +53002,11 @@ cont {
       priority: 794
     }
     caption {
-      height: 12
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11801
     }
     circle {
@@ -52863,9 +53915,11 @@ cont {
   element {
     scale: 16
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xF8FCFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xF8FCFF
+      }
       priority: 15567
     }
     circle {
@@ -52882,9 +53936,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xF8FCFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xF8FCFF
+      }
       priority: 15803
     }
     circle {
@@ -53711,9 +54767,11 @@ cont {
   element {
     scale: 16
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11571
     }
     circle {
@@ -53725,9 +54783,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 10
-      color: 0x3050D8
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
       priority: 11807
     }
     circle {
@@ -54188,9 +55248,11 @@ cont {
       priority: 1573
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -54204,9 +55266,11 @@ cont {
       priority: 1572
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -54220,9 +55284,11 @@ cont {
       priority: 1574
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -54236,9 +55302,11 @@ cont {
       priority: 1572
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11829
     }
   }
@@ -54508,9 +55576,11 @@ cont {
       priority: 78
     }
     caption {
-      height: 8
-      color: 0x303030
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x303030
+        stroke_color: 0xFFFFFF
+      }
       priority: 10903
     }
   }
@@ -54521,9 +55591,11 @@ cont {
       priority: 80
     }
     caption {
-      height: 10
-      color: 0x303030
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 10
+        color: 0x303030
+        stroke_color: 0xFFFFFF
+      }
       priority: 11563
     }
   }
@@ -54534,9 +55606,11 @@ cont {
       priority: 81
     }
     caption {
-      height: 8
-      color: 0x303030
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x303030
+        stroke_color: 0xFFFFFF
+      }
       priority: 11799
     }
   }
@@ -54647,9 +55721,11 @@ cont {
       priority: 1429
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11842
     }
   }
@@ -54744,9 +55820,11 @@ cont {
       priority: 84
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11841
     }
   }
@@ -54895,9 +55973,11 @@ cont {
       priority: 1545
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11840
     }
   }
@@ -54907,9 +55987,11 @@ cont {
   element {
     scale: 17
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11838
     }
   }
@@ -55028,9 +56110,11 @@ cont {
       priority: 82
     }
     caption {
-      height: 8
-      color: 0x404040
-      stroke_color: 0xFFFFFF
+      primary {
+        height: 8
+        color: 0x404040
+        stroke_color: 0xFFFFFF
+      }
       priority: 11839
     }
   }
@@ -55144,8 +56228,10 @@ cont {
       priority: 103
     }
     path_text {
-      height: 6
-      color: 0xFFFFFF
+      primary {
+        height: 6
+        color: 0xFFFFFF
+      }
       priority: 10602
     }
   }
@@ -55162,8 +56248,10 @@ cont {
       priority: 108
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 10813
     }
   }
@@ -55180,8 +56268,10 @@ cont {
       priority: 110
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11429
     }
   }
@@ -55198,8 +56288,10 @@ cont {
       priority: 112
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11707
     }
   }
@@ -55381,8 +56473,10 @@ cont {
       priority: 112
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11419
     }
   }
@@ -55399,8 +56493,10 @@ cont {
       priority: 114
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11697
     }
   }
@@ -55734,8 +56830,10 @@ cont {
       priority: 111
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11421
     }
   }
@@ -55752,8 +56850,10 @@ cont {
       priority: 113
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11699
     }
   }
@@ -55994,8 +57094,10 @@ cont {
       priority: 99
     }
     path_text {
-      height: 6
-      color: 0x507CEA
+      primary {
+        height: 6
+        color: 0x507CEA
+      }
       priority: 10604
     }
   }
@@ -56012,8 +57114,10 @@ cont {
       priority: 104
     }
     path_text {
-      height: 6
-      color: 0x507CEA
+      primary {
+        height: 6
+        color: 0x507CEA
+      }
       priority: 10815
     }
   }
@@ -56030,8 +57134,10 @@ cont {
       priority: 106
     }
     path_text {
-      height: 8
-      color: 0x507CEA
+      primary {
+        height: 8
+        color: 0x507CEA
+      }
       priority: 11433
     }
   }
@@ -56048,8 +57154,10 @@ cont {
       priority: 108
     }
     path_text {
-      height: 12
-      color: 0x507CEA
+      primary {
+        height: 12
+        color: 0x507CEA
+      }
       priority: 11711
     }
   }
@@ -56383,8 +57491,10 @@ cont {
       priority: 109
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11431
     }
   }
@@ -56401,8 +57511,10 @@ cont {
       priority: 111
     }
     path_text {
-      height: 12
-      color: 0xFFFFFF
+      primary {
+        height: 12
+        color: 0xFFFFFF
+      }
       priority: 11709
     }
   }
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 31f1da4a35..8e89e11532 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -1115,7 +1115,8 @@ namespace
       return (pSrc->GetFillColor() | GetStoringAlpha(pSrc));
     }
 
-    void ConvertImpl(BaseRule const * pSrc, LineRuleProto * pDest) const
+    template <class T>
+    void ConvertLineStyle(BaseRule const * pSrc, T * pDest) const
     {
       pDest->set_width(ToPixels(pSrc->GetWidth()));
       pDest->set_color(GetColor(pSrc));
@@ -1135,11 +1136,16 @@ namespace
       }
     }
 
+    void ConvertImpl(BaseRule const * pSrc, LineRuleProto * pDest) const
+    {
+      ConvertLineStyle(pSrc, pDest);
+    }
+
     void ConvertImpl(BaseRule const * pSrc, AreaRuleProto * pDest) const
     {
       pDest->set_color(GetFillColor(pSrc));
       if (pSrc->GetColor() != -1)
-        ConvertImpl(pSrc, pDest->mutable_border());
+        ConvertLineStyle(pSrc, pDest->mutable_border());
     }
 
     void ConvertImpl(BaseRule const * pSrc, SymbolRuleProto * pDest) const
@@ -1150,7 +1156,7 @@ namespace
     }
 
     template <class T>
-    void ConvertCaptionT(BaseRule const * pSrc, T * pDest) const
+    void ConvertCaptionStyle(BaseRule const * pSrc, T * pDest) const
     {
       pDest->set_height(ToPixels(pSrc->GetTextHeight()));
       pDest->set_color((pSrc->GetFillColor() != -1) ? GetFillColor(pSrc) : 0);
@@ -1161,12 +1167,12 @@ namespace
 
     void ConvertImpl(BaseRule const * pSrc, CaptionRuleProto * pDest) const
     {
-      ConvertCaptionT(pSrc, pDest);
+      ConvertCaptionStyle(pSrc, pDest->mutable_primary());
     }
 
     void ConvertImpl(BaseRule const * pSrc, PathTextRuleProto * pDest) const
     {
-      ConvertCaptionT(pSrc, pDest);
+      ConvertCaptionStyle(pSrc, pDest->mutable_primary());
     }
 
     void ConvertImpl(BaseRule const * pSrc, CircleRuleProto * pDest) const
@@ -1278,7 +1284,8 @@ namespace
       return (255 - c);
     }
 
-    void GetPattern(LineRuleProto const & ln, vector<double> & v, double & offset)
+    template <class T>
+    void GetPattern(T const & ln, vector<double> & v, double & offset)
     {
       offset = 0.0;
       if (ln.has_dashdot())
@@ -1379,22 +1386,24 @@ namespace
     template <class T> class CaptionT : public MyBase
     {
       T m_caption;
+      inline CaptionDefProto const & primary() const { return m_caption.primary(); }
+
     public:
       CaptionT(T const & r) : m_caption(r) {}
 
       virtual int GetColor() const
       {
-        if (m_caption.has_stroke_color())
-          return m_caption.stroke_color();
+        if (primary().has_stroke_color())
+          return primary().stroke_color();
         return -1;
       }
       virtual int GetFillColor() const
       {
-        return m_caption.color();
+        return primary().color();
       }
       virtual double GetTextHeight() const
       {
-        return m_caption.height();
+        return primary().height();
       }
       virtual unsigned char GetAlpha() const
       {
diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc
index 89394c292d..268c04ecc2 100644
--- a/indexer/drules_struct.pb.cc
+++ b/indexer/drules_struct.pb.cc
@@ -21,12 +21,18 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* LineRuleProto_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   LineRuleProto_reflection_ = NULL;
+const ::google::protobuf::Descriptor* LineDefProto_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  LineDefProto_reflection_ = NULL;
 const ::google::protobuf::Descriptor* AreaRuleProto_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   AreaRuleProto_reflection_ = NULL;
 const ::google::protobuf::Descriptor* SymbolRuleProto_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SymbolRuleProto_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CaptionDefProto_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CaptionDefProto_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CaptionRuleProto_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CaptionRuleProto_reflection_ = NULL;
@@ -89,7 +95,24 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(LineRuleProto));
-  AreaRuleProto_descriptor_ = file->message_type(2);
+  LineDefProto_descriptor_ = file->message_type(2);
+  static const int LineDefProto_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, width_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, color_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, dashdot_),
+  };
+  LineDefProto_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      LineDefProto_descriptor_,
+      LineDefProto::default_instance_,
+      LineDefProto_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LineDefProto, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(LineDefProto));
+  AreaRuleProto_descriptor_ = file->message_type(3);
   static const int AreaRuleProto_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, color_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AreaRuleProto, border_),
@@ -106,7 +129,7 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AreaRuleProto));
-  SymbolRuleProto_descriptor_ = file->message_type(3);
+  SymbolRuleProto_descriptor_ = file->message_type(4);
   static const int SymbolRuleProto_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SymbolRuleProto, apply_for_type_),
@@ -123,11 +146,27 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SymbolRuleProto));
-  CaptionRuleProto_descriptor_ = file->message_type(4);
-  static const int CaptionRuleProto_offsets_[4] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, height_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, stroke_color_),
+  CaptionDefProto_descriptor_ = file->message_type(5);
+  static const int CaptionDefProto_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, height_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, color_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, stroke_color_),
+  };
+  CaptionDefProto_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CaptionDefProto_descriptor_,
+      CaptionDefProto::default_instance_,
+      CaptionDefProto_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionDefProto, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CaptionDefProto));
+  CaptionRuleProto_descriptor_ = file->message_type(6);
+  static const int CaptionRuleProto_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, primary_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, secondary_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CaptionRuleProto, priority_),
   };
   CaptionRuleProto_reflection_ =
@@ -141,7 +180,7 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CaptionRuleProto));
-  CircleRuleProto_descriptor_ = file->message_type(5);
+  CircleRuleProto_descriptor_ = file->message_type(7);
   static const int CircleRuleProto_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, radius_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CircleRuleProto, color_),
@@ -159,11 +198,10 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CircleRuleProto));
-  PathTextRuleProto_descriptor_ = file->message_type(6);
-  static const int PathTextRuleProto_offsets_[4] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, height_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, color_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, stroke_color_),
+  PathTextRuleProto_descriptor_ = file->message_type(8);
+  static const int PathTextRuleProto_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, primary_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, secondary_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PathTextRuleProto, priority_),
   };
   PathTextRuleProto_reflection_ =
@@ -177,7 +215,7 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PathTextRuleProto));
-  DrawElementProto_descriptor_ = file->message_type(7);
+  DrawElementProto_descriptor_ = file->message_type(9);
   static const int DrawElementProto_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, scale_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrawElementProto, lines_),
@@ -198,7 +236,7 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DrawElementProto));
-  ClassifElementProto_descriptor_ = file->message_type(8);
+  ClassifElementProto_descriptor_ = file->message_type(10);
   static const int ClassifElementProto_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClassifElementProto, element_),
@@ -214,7 +252,7 @@ void protobuf_AssignDesc_drules_5fstruct_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ClassifElementProto));
-  ContainerProto_descriptor_ = file->message_type(9);
+  ContainerProto_descriptor_ = file->message_type(11);
   static const int ContainerProto_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ContainerProto, cont_),
   };
@@ -245,10 +283,14 @@ void protobuf_RegisterTypes(const ::std::string&) {
     DashDotProto_descriptor_, &DashDotProto::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     LineRuleProto_descriptor_, &LineRuleProto::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    LineDefProto_descriptor_, &LineDefProto::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     AreaRuleProto_descriptor_, &AreaRuleProto::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SymbolRuleProto_descriptor_, &SymbolRuleProto::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CaptionDefProto_descriptor_, &CaptionDefProto::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CaptionRuleProto_descriptor_, &CaptionRuleProto::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -270,10 +312,14 @@ void protobuf_ShutdownFile_drules_5fstruct_2eproto() {
   delete DashDotProto_reflection_;
   delete LineRuleProto::default_instance_;
   delete LineRuleProto_reflection_;
+  delete LineDefProto::default_instance_;
+  delete LineDefProto_reflection_;
   delete AreaRuleProto::default_instance_;
   delete AreaRuleProto_reflection_;
   delete SymbolRuleProto::default_instance_;
   delete SymbolRuleProto_reflection_;
+  delete CaptionDefProto::default_instance_;
+  delete CaptionDefProto_reflection_;
   delete CaptionRuleProto::default_instance_;
   delete CaptionRuleProto_reflection_;
   delete CircleRuleProto::default_instance_;
@@ -298,34 +344,40 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() {
     "\n\023drules_struct.proto\"*\n\014DashDotProto\022\n\n"
     "\002dd\030\001 \003(\001\022\016\n\006offset\030\002 \001(\001\"_\n\rLineRulePro"
     "to\022\r\n\005width\030\001 \002(\001\022\r\n\005color\030\002 \002(\r\022\036\n\007dash"
-    "dot\030\003 \001(\0132\r.DashDotProto\022\020\n\010priority\030\004 \001"
-    "(\005\"P\n\rAreaRuleProto\022\r\n\005color\030\001 \002(\r\022\036\n\006bo"
-    "rder\030\002 \001(\0132\016.LineRuleProto\022\020\n\010priority\030\003"
-    " \002(\005\"I\n\017SymbolRuleProto\022\014\n\004name\030\001 \002(\t\022\026\n"
-    "\016apply_for_type\030\002 \001(\005\022\020\n\010priority\030\003 \002(\005\""
-    "Y\n\020CaptionRuleProto\022\016\n\006height\030\001 \002(\005\022\r\n\005c"
-    "olor\030\002 \002(\r\022\024\n\014stroke_color\030\003 \001(\r\022\020\n\010prio"
-    "rity\030\004 \002(\005\"b\n\017CircleRuleProto\022\016\n\006radius\030"
-    "\001 \002(\001\022\r\n\005color\030\002 \002(\r\022\036\n\006border\030\003 \001(\0132\016.L"
-    "ineRuleProto\022\020\n\010priority\030\004 \002(\005\"Z\n\021PathTe"
-    "xtRuleProto\022\016\n\006height\030\001 \002(\005\022\r\n\005color\030\002 \002"
-    "(\r\022\024\n\014stroke_color\030\003 \001(\r\022\020\n\010priority\030\004 \002"
-    "(\005\"\355\001\n\020DrawElementProto\022\r\n\005scale\030\001 \002(\005\022\035"
-    "\n\005lines\030\002 \003(\0132\016.LineRuleProto\022\034\n\004area\030\003 "
-    "\001(\0132\016.AreaRuleProto\022 \n\006symbol\030\004 \001(\0132\020.Sy"
-    "mbolRuleProto\022\"\n\007caption\030\005 \001(\0132\021.Caption"
-    "RuleProto\022 \n\006circle\030\006 \001(\0132\020.CircleRulePr"
-    "oto\022%\n\tpath_text\030\007 \001(\0132\022.PathTextRulePro"
-    "to\"G\n\023ClassifElementProto\022\014\n\004name\030\001 \002(\t\022"
-    "\"\n\007element\030\002 \003(\0132\021.DrawElementProto\"4\n\016C"
-    "ontainerProto\022\"\n\004cont\030\001 \003(\0132\024.ClassifEle"
-    "mentProto", 969);
+    "dot\030\003 \001(\0132\r.DashDotProto\022\020\n\010priority\030\004 \002"
+    "(\005\"L\n\014LineDefProto\022\r\n\005width\030\001 \002(\001\022\r\n\005col"
+    "or\030\002 \002(\r\022\036\n\007dashdot\030\003 \001(\0132\r.DashDotProto"
+    "\"O\n\rAreaRuleProto\022\r\n\005color\030\001 \002(\r\022\035\n\006bord"
+    "er\030\002 \001(\0132\r.LineDefProto\022\020\n\010priority\030\003 \002("
+    "\005\"I\n\017SymbolRuleProto\022\014\n\004name\030\001 \002(\t\022\026\n\016ap"
+    "ply_for_type\030\002 \001(\005\022\020\n\010priority\030\003 \002(\005\"F\n\017"
+    "CaptionDefProto\022\016\n\006height\030\001 \002(\005\022\r\n\005color"
+    "\030\002 \002(\r\022\024\n\014stroke_color\030\003 \001(\r\"l\n\020CaptionR"
+    "uleProto\022!\n\007primary\030\001 \002(\0132\020.CaptionDefPr"
+    "oto\022#\n\tsecondary\030\002 \001(\0132\020.CaptionDefProto"
+    "\022\020\n\010priority\030\003 \002(\005\"a\n\017CircleRuleProto\022\016\n"
+    "\006radius\030\001 \002(\001\022\r\n\005color\030\002 \002(\r\022\035\n\006border\030\003"
+    " \001(\0132\r.LineDefProto\022\020\n\010priority\030\004 \002(\005\"m\n"
+    "\021PathTextRuleProto\022!\n\007primary\030\001 \002(\0132\020.Ca"
+    "ptionDefProto\022#\n\tsecondary\030\002 \001(\0132\020.Capti"
+    "onDefProto\022\020\n\010priority\030\003 \002(\005\"\355\001\n\020DrawEle"
+    "mentProto\022\r\n\005scale\030\001 \002(\005\022\035\n\005lines\030\002 \003(\0132"
+    "\016.LineRuleProto\022\034\n\004area\030\003 \001(\0132\016.AreaRule"
+    "Proto\022 \n\006symbol\030\004 \001(\0132\020.SymbolRuleProto\022"
+    "\"\n\007caption\030\005 \001(\0132\021.CaptionRuleProto\022 \n\006c"
+    "ircle\030\006 \001(\0132\020.CircleRuleProto\022%\n\tpath_te"
+    "xt\030\007 \001(\0132\022.PathTextRuleProto\"G\n\023ClassifE"
+    "lementProto\022\014\n\004name\030\001 \002(\t\022\"\n\007element\030\002 \003"
+    "(\0132\021.DrawElementProto\"4\n\016ContainerProto\022"
+    "\"\n\004cont\030\001 \003(\0132\024.ClassifElementProto", 1155);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "drules_struct.proto", &protobuf_RegisterTypes);
   DashDotProto::default_instance_ = new DashDotProto();
   LineRuleProto::default_instance_ = new LineRuleProto();
+  LineDefProto::default_instance_ = new LineDefProto();
   AreaRuleProto::default_instance_ = new AreaRuleProto();
   SymbolRuleProto::default_instance_ = new SymbolRuleProto();
+  CaptionDefProto::default_instance_ = new CaptionDefProto();
   CaptionRuleProto::default_instance_ = new CaptionRuleProto();
   CircleRuleProto::default_instance_ = new CircleRuleProto();
   PathTextRuleProto::default_instance_ = new PathTextRuleProto();
@@ -334,8 +386,10 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() {
   ContainerProto::default_instance_ = new ContainerProto();
   DashDotProto::default_instance_->InitAsDefaultInstance();
   LineRuleProto::default_instance_->InitAsDefaultInstance();
+  LineDefProto::default_instance_->InitAsDefaultInstance();
   AreaRuleProto::default_instance_->InitAsDefaultInstance();
   SymbolRuleProto::default_instance_->InitAsDefaultInstance();
+  CaptionDefProto::default_instance_->InitAsDefaultInstance();
   CaptionRuleProto::default_instance_->InitAsDefaultInstance();
   CircleRuleProto::default_instance_->InitAsDefaultInstance();
   PathTextRuleProto::default_instance_->InitAsDefaultInstance();
@@ -731,7 +785,7 @@ bool LineRuleProto::MergePartialFromCodedStream(
         break;
       }
       
-      // optional int32 priority = 4;
+      // required int32 priority = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -781,7 +835,7 @@ void LineRuleProto::SerializeWithCachedSizes(
       3, this->dashdot(), output);
   }
   
-  // optional int32 priority = 4;
+  // required int32 priority = 4;
   if (has_priority()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
   }
@@ -811,7 +865,7 @@ void LineRuleProto::SerializeWithCachedSizes(
         3, this->dashdot(), target);
   }
   
-  // optional int32 priority = 4;
+  // required int32 priority = 4;
   if (has_priority()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target);
   }
@@ -846,7 +900,7 @@ int LineRuleProto::ByteSize() const {
           this->dashdot());
     }
     
-    // optional int32 priority = 4;
+    // required int32 priority = 4;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
@@ -909,7 +963,7 @@ void LineRuleProto::CopyFrom(const LineRuleProto& from) {
 }
 
 bool LineRuleProto::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+  if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false;
   
   return true;
 }
@@ -935,6 +989,297 @@ void LineRuleProto::Swap(LineRuleProto* other) {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int LineDefProto::kWidthFieldNumber;
+const int LineDefProto::kColorFieldNumber;
+const int LineDefProto::kDashdotFieldNumber;
+#endif  // !_MSC_VER
+
+LineDefProto::LineDefProto()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void LineDefProto::InitAsDefaultInstance() {
+  dashdot_ = const_cast< ::DashDotProto*>(&::DashDotProto::default_instance());
+}
+
+LineDefProto::LineDefProto(const LineDefProto& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void LineDefProto::SharedCtor() {
+  _cached_size_ = 0;
+  width_ = 0;
+  color_ = 0u;
+  dashdot_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+LineDefProto::~LineDefProto() {
+  SharedDtor();
+}
+
+void LineDefProto::SharedDtor() {
+  if (this != default_instance_) {
+    delete dashdot_;
+  }
+}
+
+void LineDefProto::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* LineDefProto::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return LineDefProto_descriptor_;
+}
+
+const LineDefProto& LineDefProto::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+}
+
+LineDefProto* LineDefProto::default_instance_ = NULL;
+
+LineDefProto* LineDefProto::New() const {
+  return new LineDefProto;
+}
+
+void LineDefProto::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    width_ = 0;
+    color_ = 0u;
+    if (has_dashdot()) {
+      if (dashdot_ != NULL) dashdot_->::DashDotProto::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool LineDefProto::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required double width = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &width_)));
+          set_has_width();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_color;
+        break;
+      }
+      
+      // required uint32 color = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_color:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &color_)));
+          set_has_color();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_dashdot;
+        break;
+      }
+      
+      // optional .DashDotProto dashdot = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_dashdot:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_dashdot()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+      
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void LineDefProto::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required double width = 1;
+  if (has_width()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->width(), output);
+  }
+  
+  // required uint32 color = 2;
+  if (has_color()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
+  }
+  
+  // optional .DashDotProto dashdot = 3;
+  if (has_dashdot()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->dashdot(), output);
+  }
+  
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* LineDefProto::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required double width = 1;
+  if (has_width()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->width(), target);
+  }
+  
+  // required uint32 color = 2;
+  if (has_color()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
+  }
+  
+  // optional .DashDotProto dashdot = 3;
+  if (has_dashdot()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->dashdot(), target);
+  }
+  
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int LineDefProto::ByteSize() const {
+  int total_size = 0;
+  
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required double width = 1;
+    if (has_width()) {
+      total_size += 1 + 8;
+    }
+    
+    // required uint32 color = 2;
+    if (has_color()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->color());
+    }
+    
+    // optional .DashDotProto dashdot = 3;
+    if (has_dashdot()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->dashdot());
+    }
+    
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void LineDefProto::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const LineDefProto* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const LineDefProto*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void LineDefProto::MergeFrom(const LineDefProto& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_width()) {
+      set_width(from.width());
+    }
+    if (from.has_color()) {
+      set_color(from.color());
+    }
+    if (from.has_dashdot()) {
+      mutable_dashdot()->::DashDotProto::MergeFrom(from.dashdot());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void LineDefProto::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void LineDefProto::CopyFrom(const LineDefProto& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool LineDefProto::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+  
+  return true;
+}
+
+void LineDefProto::Swap(LineDefProto* other) {
+  if (other != this) {
+    std::swap(width_, other->width_);
+    std::swap(color_, other->color_);
+    std::swap(dashdot_, other->dashdot_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata LineDefProto::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = LineDefProto_descriptor_;
+  metadata.reflection = LineDefProto_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
@@ -949,7 +1294,7 @@ AreaRuleProto::AreaRuleProto()
 }
 
 void AreaRuleProto::InitAsDefaultInstance() {
-  border_ = const_cast< ::LineRuleProto*>(&::LineRuleProto::default_instance());
+  border_ = const_cast< ::LineDefProto*>(&::LineDefProto::default_instance());
 }
 
 AreaRuleProto::AreaRuleProto(const AreaRuleProto& from)
@@ -1000,7 +1345,7 @@ void AreaRuleProto::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     color_ = 0u;
     if (has_border()) {
-      if (border_ != NULL) border_->::LineRuleProto::Clear();
+      if (border_ != NULL) border_->::LineDefProto::Clear();
     }
     priority_ = 0;
   }
@@ -1029,7 +1374,7 @@ bool AreaRuleProto::MergePartialFromCodedStream(
         break;
       }
       
-      // optional .LineRuleProto border = 2;
+      // optional .LineDefProto border = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -1082,7 +1427,7 @@ void AreaRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->color(), output);
   }
   
-  // optional .LineRuleProto border = 2;
+  // optional .LineDefProto border = 2;
   if (has_border()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->border(), output);
@@ -1106,7 +1451,7 @@ void AreaRuleProto::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->color(), target);
   }
   
-  // optional .LineRuleProto border = 2;
+  // optional .LineDefProto border = 2;
   if (has_border()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -1136,7 +1481,7 @@ int AreaRuleProto::ByteSize() const {
           this->color());
     }
     
-    // optional .LineRuleProto border = 2;
+    // optional .LineDefProto border = 2;
     if (has_border()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -1181,7 +1526,7 @@ void AreaRuleProto::MergeFrom(const AreaRuleProto& from) {
       set_color(from.color());
     }
     if (from.has_border()) {
-      mutable_border()->::LineRuleProto::MergeFrom(from.border());
+      mutable_border()->::LineDefProto::MergeFrom(from.border());
     }
     if (from.has_priority()) {
       set_priority(from.priority());
@@ -1539,76 +1884,73 @@ void SymbolRuleProto::Swap(SymbolRuleProto* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CaptionRuleProto::kHeightFieldNumber;
-const int CaptionRuleProto::kColorFieldNumber;
-const int CaptionRuleProto::kStrokeColorFieldNumber;
-const int CaptionRuleProto::kPriorityFieldNumber;
+const int CaptionDefProto::kHeightFieldNumber;
+const int CaptionDefProto::kColorFieldNumber;
+const int CaptionDefProto::kStrokeColorFieldNumber;
 #endif  // !_MSC_VER
 
-CaptionRuleProto::CaptionRuleProto()
+CaptionDefProto::CaptionDefProto()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CaptionRuleProto::InitAsDefaultInstance() {
+void CaptionDefProto::InitAsDefaultInstance() {
 }
 
-CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from)
+CaptionDefProto::CaptionDefProto(const CaptionDefProto& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CaptionRuleProto::SharedCtor() {
+void CaptionDefProto::SharedCtor() {
   _cached_size_ = 0;
   height_ = 0;
   color_ = 0u;
   stroke_color_ = 0u;
-  priority_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CaptionRuleProto::~CaptionRuleProto() {
+CaptionDefProto::~CaptionDefProto() {
   SharedDtor();
 }
 
-void CaptionRuleProto::SharedDtor() {
+void CaptionDefProto::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
-void CaptionRuleProto::SetCachedSize(int size) const {
+void CaptionDefProto::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() {
+const ::google::protobuf::Descriptor* CaptionDefProto::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CaptionRuleProto_descriptor_;
+  return CaptionDefProto_descriptor_;
 }
 
-const CaptionRuleProto& CaptionRuleProto::default_instance() {
+const CaptionDefProto& CaptionDefProto::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
 }
 
-CaptionRuleProto* CaptionRuleProto::default_instance_ = NULL;
+CaptionDefProto* CaptionDefProto::default_instance_ = NULL;
 
-CaptionRuleProto* CaptionRuleProto::New() const {
-  return new CaptionRuleProto;
+CaptionDefProto* CaptionDefProto::New() const {
+  return new CaptionDefProto;
 }
 
-void CaptionRuleProto::Clear() {
+void CaptionDefProto::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     height_ = 0;
     color_ = 0u;
     stroke_color_ = 0u;
-    priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CaptionRuleProto::MergePartialFromCodedStream(
+bool CaptionDefProto::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -1657,12 +1999,288 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_priority;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
       
-      // required int32 priority = 4;
-      case 4: {
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CaptionDefProto::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required int32 height = 1;
+  if (has_height()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output);
+  }
+  
+  // required uint32 color = 2;
+  if (has_color()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
+  }
+  
+  // optional uint32 stroke_color = 3;
+  if (has_stroke_color()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output);
+  }
+  
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CaptionDefProto::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required int32 height = 1;
+  if (has_height()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target);
+  }
+  
+  // required uint32 color = 2;
+  if (has_color()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
+  }
+  
+  // optional uint32 stroke_color = 3;
+  if (has_stroke_color()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->stroke_color(), target);
+  }
+  
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CaptionDefProto::ByteSize() const {
+  int total_size = 0;
+  
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required int32 height = 1;
+    if (has_height()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->height());
+    }
+    
+    // required uint32 color = 2;
+    if (has_color()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->color());
+    }
+    
+    // optional uint32 stroke_color = 3;
+    if (has_stroke_color()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->stroke_color());
+    }
+    
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CaptionDefProto::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CaptionDefProto* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CaptionDefProto*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CaptionDefProto::MergeFrom(const CaptionDefProto& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_height()) {
+      set_height(from.height());
+    }
+    if (from.has_color()) {
+      set_color(from.color());
+    }
+    if (from.has_stroke_color()) {
+      set_stroke_color(from.stroke_color());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CaptionDefProto::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CaptionDefProto::CopyFrom(const CaptionDefProto& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CaptionDefProto::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+  
+  return true;
+}
+
+void CaptionDefProto::Swap(CaptionDefProto* other) {
+  if (other != this) {
+    std::swap(height_, other->height_);
+    std::swap(color_, other->color_);
+    std::swap(stroke_color_, other->stroke_color_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CaptionDefProto::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CaptionDefProto_descriptor_;
+  metadata.reflection = CaptionDefProto_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CaptionRuleProto::kPrimaryFieldNumber;
+const int CaptionRuleProto::kSecondaryFieldNumber;
+const int CaptionRuleProto::kPriorityFieldNumber;
+#endif  // !_MSC_VER
+
+CaptionRuleProto::CaptionRuleProto()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CaptionRuleProto::InitAsDefaultInstance() {
+  primary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance());
+  secondary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance());
+}
+
+CaptionRuleProto::CaptionRuleProto(const CaptionRuleProto& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CaptionRuleProto::SharedCtor() {
+  _cached_size_ = 0;
+  primary_ = NULL;
+  secondary_ = NULL;
+  priority_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CaptionRuleProto::~CaptionRuleProto() {
+  SharedDtor();
+}
+
+void CaptionRuleProto::SharedDtor() {
+  if (this != default_instance_) {
+    delete primary_;
+    delete secondary_;
+  }
+}
+
+void CaptionRuleProto::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CaptionRuleProto::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CaptionRuleProto_descriptor_;
+}
+
+const CaptionRuleProto& CaptionRuleProto::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto();  return *default_instance_;
+}
+
+CaptionRuleProto* CaptionRuleProto::default_instance_ = NULL;
+
+CaptionRuleProto* CaptionRuleProto::New() const {
+  return new CaptionRuleProto;
+}
+
+void CaptionRuleProto::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_primary()) {
+      if (primary_ != NULL) primary_->::CaptionDefProto::Clear();
+    }
+    if (has_secondary()) {
+      if (secondary_ != NULL) secondary_->::CaptionDefProto::Clear();
+    }
+    priority_ = 0;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CaptionRuleProto::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .CaptionDefProto primary = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_primary()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_secondary;
+        break;
+      }
+      
+      // optional .CaptionDefProto secondary = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_secondary:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_secondary()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_priority;
+        break;
+      }
+      
+      // required int32 priority = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
          parse_priority:
@@ -1695,24 +2313,21 @@ bool CaptionRuleProto::MergePartialFromCodedStream(
 
 void CaptionRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required int32 height = 1;
-  if (has_height()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output);
+  // required .CaptionDefProto primary = 1;
+  if (has_primary()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->primary(), output);
   }
   
-  // required uint32 color = 2;
-  if (has_color()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
+  // optional .CaptionDefProto secondary = 2;
+  if (has_secondary()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->secondary(), output);
   }
   
-  // optional uint32 stroke_color = 3;
-  if (has_stroke_color()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output);
-  }
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   if (has_priority()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
   if (!unknown_fields().empty()) {
@@ -1723,24 +2338,23 @@ void CaptionRuleProto::SerializeWithCachedSizes(
 
 ::google::protobuf::uint8* CaptionRuleProto::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required int32 height = 1;
-  if (has_height()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target);
+  // required .CaptionDefProto primary = 1;
+  if (has_primary()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->primary(), target);
   }
   
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
+  // optional .CaptionDefProto secondary = 2;
+  if (has_secondary()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->secondary(), target);
   }
   
-  // optional uint32 stroke_color = 3;
-  if (has_stroke_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->stroke_color(), target);
-  }
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target);
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
   }
   
   if (!unknown_fields().empty()) {
@@ -1754,28 +2368,21 @@ int CaptionRuleProto::ByteSize() const {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required int32 height = 1;
-    if (has_height()) {
+    // required .CaptionDefProto primary = 1;
+    if (has_primary()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->height());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->primary());
     }
     
-    // required uint32 color = 2;
-    if (has_color()) {
+    // optional .CaptionDefProto secondary = 2;
+    if (has_secondary()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->color());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->secondary());
     }
     
-    // optional uint32 stroke_color = 3;
-    if (has_stroke_color()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->stroke_color());
-    }
-    
-    // required int32 priority = 4;
+    // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
@@ -1809,14 +2416,11 @@ void CaptionRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
 void CaptionRuleProto::MergeFrom(const CaptionRuleProto& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_height()) {
-      set_height(from.height());
+    if (from.has_primary()) {
+      mutable_primary()->::CaptionDefProto::MergeFrom(from.primary());
     }
-    if (from.has_color()) {
-      set_color(from.color());
-    }
-    if (from.has_stroke_color()) {
-      set_stroke_color(from.stroke_color());
+    if (from.has_secondary()) {
+      mutable_secondary()->::CaptionDefProto::MergeFrom(from.secondary());
     }
     if (from.has_priority()) {
       set_priority(from.priority());
@@ -1838,16 +2442,21 @@ void CaptionRuleProto::CopyFrom(const CaptionRuleProto& from) {
 }
 
 bool CaptionRuleProto::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false;
+  if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
   
+  if (has_primary()) {
+    if (!this->primary().IsInitialized()) return false;
+  }
+  if (has_secondary()) {
+    if (!this->secondary().IsInitialized()) return false;
+  }
   return true;
 }
 
 void CaptionRuleProto::Swap(CaptionRuleProto* other) {
   if (other != this) {
-    std::swap(height_, other->height_);
-    std::swap(color_, other->color_);
-    std::swap(stroke_color_, other->stroke_color_);
+    std::swap(primary_, other->primary_);
+    std::swap(secondary_, other->secondary_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -1879,7 +2488,7 @@ CircleRuleProto::CircleRuleProto()
 }
 
 void CircleRuleProto::InitAsDefaultInstance() {
-  border_ = const_cast< ::LineRuleProto*>(&::LineRuleProto::default_instance());
+  border_ = const_cast< ::LineDefProto*>(&::LineDefProto::default_instance());
 }
 
 CircleRuleProto::CircleRuleProto(const CircleRuleProto& from)
@@ -1932,7 +2541,7 @@ void CircleRuleProto::Clear() {
     radius_ = 0;
     color_ = 0u;
     if (has_border()) {
-      if (border_ != NULL) border_->::LineRuleProto::Clear();
+      if (border_ != NULL) border_->::LineDefProto::Clear();
     }
     priority_ = 0;
   }
@@ -1977,7 +2586,7 @@ bool CircleRuleProto::MergePartialFromCodedStream(
         break;
       }
       
-      // optional .LineRuleProto border = 3;
+      // optional .LineDefProto border = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -2035,7 +2644,7 @@ void CircleRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
   }
   
-  // optional .LineRuleProto border = 3;
+  // optional .LineDefProto border = 3;
   if (has_border()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->border(), output);
@@ -2064,7 +2673,7 @@ void CircleRuleProto::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
   }
   
-  // optional .LineRuleProto border = 3;
+  // optional .LineDefProto border = 3;
   if (has_border()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -2099,7 +2708,7 @@ int CircleRuleProto::ByteSize() const {
           this->color());
     }
     
-    // optional .LineRuleProto border = 3;
+    // optional .LineDefProto border = 3;
     if (has_border()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -2147,7 +2756,7 @@ void CircleRuleProto::MergeFrom(const CircleRuleProto& from) {
       set_color(from.color());
     }
     if (from.has_border()) {
-      mutable_border()->::LineRuleProto::MergeFrom(from.border());
+      mutable_border()->::LineDefProto::MergeFrom(from.border());
     }
     if (from.has_priority()) {
       set_priority(from.priority());
@@ -2201,9 +2810,8 @@ void CircleRuleProto::Swap(CircleRuleProto* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int PathTextRuleProto::kHeightFieldNumber;
-const int PathTextRuleProto::kColorFieldNumber;
-const int PathTextRuleProto::kStrokeColorFieldNumber;
+const int PathTextRuleProto::kPrimaryFieldNumber;
+const int PathTextRuleProto::kSecondaryFieldNumber;
 const int PathTextRuleProto::kPriorityFieldNumber;
 #endif  // !_MSC_VER
 
@@ -2213,6 +2821,8 @@ PathTextRuleProto::PathTextRuleProto()
 }
 
 void PathTextRuleProto::InitAsDefaultInstance() {
+  primary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance());
+  secondary_ = const_cast< ::CaptionDefProto*>(&::CaptionDefProto::default_instance());
 }
 
 PathTextRuleProto::PathTextRuleProto(const PathTextRuleProto& from)
@@ -2223,9 +2833,8 @@ PathTextRuleProto::PathTextRuleProto(const PathTextRuleProto& from)
 
 void PathTextRuleProto::SharedCtor() {
   _cached_size_ = 0;
-  height_ = 0;
-  color_ = 0u;
-  stroke_color_ = 0u;
+  primary_ = NULL;
+  secondary_ = NULL;
   priority_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -2236,6 +2845,8 @@ PathTextRuleProto::~PathTextRuleProto() {
 
 void PathTextRuleProto::SharedDtor() {
   if (this != default_instance_) {
+    delete primary_;
+    delete secondary_;
   }
 }
 
@@ -2261,9 +2872,12 @@ PathTextRuleProto* PathTextRuleProto::New() const {
 
 void PathTextRuleProto::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    height_ = 0;
-    color_ = 0u;
-    stroke_color_ = 0u;
+    if (has_primary()) {
+      if (primary_ != NULL) primary_->::CaptionDefProto::Clear();
+    }
+    if (has_secondary()) {
+      if (secondary_ != NULL) secondary_->::CaptionDefProto::Clear();
+    }
     priority_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -2276,55 +2890,35 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required int32 height = 1;
+      // required .CaptionDefProto primary = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &height_)));
-          set_has_height();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_primary()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_color;
+        if (input->ExpectTag(18)) goto parse_secondary;
         break;
       }
       
-      // required uint32 color = 2;
+      // optional .CaptionDefProto secondary = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_color:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &color_)));
-          set_has_color();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_secondary:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_secondary()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_stroke_color;
+        if (input->ExpectTag(24)) goto parse_priority;
         break;
       }
       
-      // optional uint32 stroke_color = 3;
+      // required int32 priority = 3;
       case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_stroke_color:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &stroke_color_)));
-          set_has_stroke_color();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_priority;
-        break;
-      }
-      
-      // required int32 priority = 4;
-      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
          parse_priority:
@@ -2357,24 +2951,21 @@ bool PathTextRuleProto::MergePartialFromCodedStream(
 
 void PathTextRuleProto::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required int32 height = 1;
-  if (has_height()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output);
+  // required .CaptionDefProto primary = 1;
+  if (has_primary()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->primary(), output);
   }
   
-  // required uint32 color = 2;
-  if (has_color()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output);
+  // optional .CaptionDefProto secondary = 2;
+  if (has_secondary()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->secondary(), output);
   }
   
-  // optional uint32 stroke_color = 3;
-  if (has_stroke_color()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output);
-  }
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   if (has_priority()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->priority(), output);
   }
   
   if (!unknown_fields().empty()) {
@@ -2385,24 +2976,23 @@ void PathTextRuleProto::SerializeWithCachedSizes(
 
 ::google::protobuf::uint8* PathTextRuleProto::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required int32 height = 1;
-  if (has_height()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->height(), target);
+  // required .CaptionDefProto primary = 1;
+  if (has_primary()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->primary(), target);
   }
   
-  // required uint32 color = 2;
-  if (has_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->color(), target);
+  // optional .CaptionDefProto secondary = 2;
+  if (has_secondary()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->secondary(), target);
   }
   
-  // optional uint32 stroke_color = 3;
-  if (has_stroke_color()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->stroke_color(), target);
-  }
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   if (has_priority()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->priority(), target);
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->priority(), target);
   }
   
   if (!unknown_fields().empty()) {
@@ -2416,28 +3006,21 @@ int PathTextRuleProto::ByteSize() const {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required int32 height = 1;
-    if (has_height()) {
+    // required .CaptionDefProto primary = 1;
+    if (has_primary()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->height());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->primary());
     }
     
-    // required uint32 color = 2;
-    if (has_color()) {
+    // optional .CaptionDefProto secondary = 2;
+    if (has_secondary()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->color());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->secondary());
     }
     
-    // optional uint32 stroke_color = 3;
-    if (has_stroke_color()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->stroke_color());
-    }
-    
-    // required int32 priority = 4;
+    // required int32 priority = 3;
     if (has_priority()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
@@ -2471,14 +3054,11 @@ void PathTextRuleProto::MergeFrom(const ::google::protobuf::Message& from) {
 void PathTextRuleProto::MergeFrom(const PathTextRuleProto& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_height()) {
-      set_height(from.height());
+    if (from.has_primary()) {
+      mutable_primary()->::CaptionDefProto::MergeFrom(from.primary());
     }
-    if (from.has_color()) {
-      set_color(from.color());
-    }
-    if (from.has_stroke_color()) {
-      set_stroke_color(from.stroke_color());
+    if (from.has_secondary()) {
+      mutable_secondary()->::CaptionDefProto::MergeFrom(from.secondary());
     }
     if (from.has_priority()) {
       set_priority(from.priority());
@@ -2500,16 +3080,21 @@ void PathTextRuleProto::CopyFrom(const PathTextRuleProto& from) {
 }
 
 bool PathTextRuleProto::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false;
+  if ((_has_bits_[0] & 0x00000005) != 0x00000005) return false;
   
+  if (has_primary()) {
+    if (!this->primary().IsInitialized()) return false;
+  }
+  if (has_secondary()) {
+    if (!this->secondary().IsInitialized()) return false;
+  }
   return true;
 }
 
 void PathTextRuleProto::Swap(PathTextRuleProto* other) {
   if (other != this) {
-    std::swap(height_, other->height_);
-    std::swap(color_, other->color_);
-    std::swap(stroke_color_, other->stroke_color_);
+    std::swap(primary_, other->primary_);
+    std::swap(secondary_, other->secondary_);
     std::swap(priority_, other->priority_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h
index a41012ecf0..9d3b27ba46 100644
--- a/indexer/drules_struct.pb.h
+++ b/indexer/drules_struct.pb.h
@@ -32,8 +32,10 @@ void protobuf_ShutdownFile_drules_5fstruct_2eproto();
 
 class DashDotProto;
 class LineRuleProto;
+class LineDefProto;
 class AreaRuleProto;
 class SymbolRuleProto;
+class CaptionDefProto;
 class CaptionRuleProto;
 class CircleRuleProto;
 class PathTextRuleProto;
@@ -214,7 +216,7 @@ class LineRuleProto : public ::google::protobuf::Message {
   inline ::DashDotProto* mutable_dashdot();
   inline ::DashDotProto* release_dashdot();
   
-  // optional int32 priority = 4;
+  // required int32 priority = 4;
   inline bool has_priority() const;
   inline void clear_priority();
   static const int kPriorityFieldNumber = 4;
@@ -251,6 +253,109 @@ class LineRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class LineDefProto : public ::google::protobuf::Message {
+ public:
+  LineDefProto();
+  virtual ~LineDefProto();
+  
+  LineDefProto(const LineDefProto& from);
+  
+  inline LineDefProto& operator=(const LineDefProto& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+  
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+  
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const LineDefProto& default_instance();
+  
+  void Swap(LineDefProto* other);
+  
+  // implements Message ----------------------------------------------
+  
+  LineDefProto* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const LineDefProto& from);
+  void MergeFrom(const LineDefProto& from);
+  void Clear();
+  bool IsInitialized() const;
+  
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  
+  ::google::protobuf::Metadata GetMetadata() const;
+  
+  // nested types ----------------------------------------------------
+  
+  // accessors -------------------------------------------------------
+  
+  // required double width = 1;
+  inline bool has_width() const;
+  inline void clear_width();
+  static const int kWidthFieldNumber = 1;
+  inline double width() const;
+  inline void set_width(double value);
+  
+  // required uint32 color = 2;
+  inline bool has_color() const;
+  inline void clear_color();
+  static const int kColorFieldNumber = 2;
+  inline ::google::protobuf::uint32 color() const;
+  inline void set_color(::google::protobuf::uint32 value);
+  
+  // optional .DashDotProto dashdot = 3;
+  inline bool has_dashdot() const;
+  inline void clear_dashdot();
+  static const int kDashdotFieldNumber = 3;
+  inline const ::DashDotProto& dashdot() const;
+  inline ::DashDotProto* mutable_dashdot();
+  inline ::DashDotProto* release_dashdot();
+  
+  // @@protoc_insertion_point(class_scope:LineDefProto)
+ private:
+  inline void set_has_width();
+  inline void clear_has_width();
+  inline void set_has_color();
+  inline void clear_has_color();
+  inline void set_has_dashdot();
+  inline void clear_has_dashdot();
+  
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+  
+  double width_;
+  ::DashDotProto* dashdot_;
+  ::google::protobuf::uint32 color_;
+  
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  
+  friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
+  friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
+  friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
+  
+  void InitAsDefaultInstance();
+  static LineDefProto* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class AreaRuleProto : public ::google::protobuf::Message {
  public:
   AreaRuleProto();
@@ -312,13 +417,13 @@ class AreaRuleProto : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
   
-  // optional .LineRuleProto border = 2;
+  // optional .LineDefProto border = 2;
   inline bool has_border() const;
   inline void clear_border();
   static const int kBorderFieldNumber = 2;
-  inline const ::LineRuleProto& border() const;
-  inline ::LineRuleProto* mutable_border();
-  inline ::LineRuleProto* release_border();
+  inline const ::LineDefProto& border() const;
+  inline ::LineDefProto* mutable_border();
+  inline ::LineDefProto* release_border();
   
   // required int32 priority = 3;
   inline bool has_priority() const;
@@ -338,7 +443,7 @@ class AreaRuleProto : public ::google::protobuf::Message {
   
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   
-  ::LineRuleProto* border_;
+  ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
   
@@ -460,6 +565,108 @@ class SymbolRuleProto : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class CaptionDefProto : public ::google::protobuf::Message {
+ public:
+  CaptionDefProto();
+  virtual ~CaptionDefProto();
+  
+  CaptionDefProto(const CaptionDefProto& from);
+  
+  inline CaptionDefProto& operator=(const CaptionDefProto& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+  
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+  
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CaptionDefProto& default_instance();
+  
+  void Swap(CaptionDefProto* other);
+  
+  // implements Message ----------------------------------------------
+  
+  CaptionDefProto* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CaptionDefProto& from);
+  void MergeFrom(const CaptionDefProto& from);
+  void Clear();
+  bool IsInitialized() const;
+  
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+  
+  ::google::protobuf::Metadata GetMetadata() const;
+  
+  // nested types ----------------------------------------------------
+  
+  // accessors -------------------------------------------------------
+  
+  // required int32 height = 1;
+  inline bool has_height() const;
+  inline void clear_height();
+  static const int kHeightFieldNumber = 1;
+  inline ::google::protobuf::int32 height() const;
+  inline void set_height(::google::protobuf::int32 value);
+  
+  // required uint32 color = 2;
+  inline bool has_color() const;
+  inline void clear_color();
+  static const int kColorFieldNumber = 2;
+  inline ::google::protobuf::uint32 color() const;
+  inline void set_color(::google::protobuf::uint32 value);
+  
+  // optional uint32 stroke_color = 3;
+  inline bool has_stroke_color() const;
+  inline void clear_stroke_color();
+  static const int kStrokeColorFieldNumber = 3;
+  inline ::google::protobuf::uint32 stroke_color() const;
+  inline void set_stroke_color(::google::protobuf::uint32 value);
+  
+  // @@protoc_insertion_point(class_scope:CaptionDefProto)
+ private:
+  inline void set_has_height();
+  inline void clear_has_height();
+  inline void set_has_color();
+  inline void clear_has_color();
+  inline void set_has_stroke_color();
+  inline void clear_has_stroke_color();
+  
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+  
+  ::google::protobuf::int32 height_;
+  ::google::protobuf::uint32 color_;
+  ::google::protobuf::uint32 stroke_color_;
+  
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  
+  friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
+  friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
+  friend void protobuf_ShutdownFile_drules_5fstruct_2eproto();
+  
+  void InitAsDefaultInstance();
+  static CaptionDefProto* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class CaptionRuleProto : public ::google::protobuf::Message {
  public:
   CaptionRuleProto();
@@ -514,54 +721,46 @@ class CaptionRuleProto : public ::google::protobuf::Message {
   
   // accessors -------------------------------------------------------
   
-  // required int32 height = 1;
-  inline bool has_height() const;
-  inline void clear_height();
-  static const int kHeightFieldNumber = 1;
-  inline ::google::protobuf::int32 height() const;
-  inline void set_height(::google::protobuf::int32 value);
+  // required .CaptionDefProto primary = 1;
+  inline bool has_primary() const;
+  inline void clear_primary();
+  static const int kPrimaryFieldNumber = 1;
+  inline const ::CaptionDefProto& primary() const;
+  inline ::CaptionDefProto* mutable_primary();
+  inline ::CaptionDefProto* release_primary();
   
-  // required uint32 color = 2;
-  inline bool has_color() const;
-  inline void clear_color();
-  static const int kColorFieldNumber = 2;
-  inline ::google::protobuf::uint32 color() const;
-  inline void set_color(::google::protobuf::uint32 value);
+  // optional .CaptionDefProto secondary = 2;
+  inline bool has_secondary() const;
+  inline void clear_secondary();
+  static const int kSecondaryFieldNumber = 2;
+  inline const ::CaptionDefProto& secondary() const;
+  inline ::CaptionDefProto* mutable_secondary();
+  inline ::CaptionDefProto* release_secondary();
   
-  // optional uint32 stroke_color = 3;
-  inline bool has_stroke_color() const;
-  inline void clear_stroke_color();
-  static const int kStrokeColorFieldNumber = 3;
-  inline ::google::protobuf::uint32 stroke_color() const;
-  inline void set_stroke_color(::google::protobuf::uint32 value);
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
-  static const int kPriorityFieldNumber = 4;
+  static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
   
   // @@protoc_insertion_point(class_scope:CaptionRuleProto)
  private:
-  inline void set_has_height();
-  inline void clear_has_height();
-  inline void set_has_color();
-  inline void clear_has_color();
-  inline void set_has_stroke_color();
-  inline void clear_has_stroke_color();
+  inline void set_has_primary();
+  inline void clear_has_primary();
+  inline void set_has_secondary();
+  inline void clear_has_secondary();
   inline void set_has_priority();
   inline void clear_has_priority();
   
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   
-  ::google::protobuf::int32 height_;
-  ::google::protobuf::uint32 color_;
-  ::google::protobuf::uint32 stroke_color_;
+  ::CaptionDefProto* primary_;
+  ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
   
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
   
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
@@ -640,13 +839,13 @@ class CircleRuleProto : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 color() const;
   inline void set_color(::google::protobuf::uint32 value);
   
-  // optional .LineRuleProto border = 3;
+  // optional .LineDefProto border = 3;
   inline bool has_border() const;
   inline void clear_border();
   static const int kBorderFieldNumber = 3;
-  inline const ::LineRuleProto& border() const;
-  inline ::LineRuleProto* mutable_border();
-  inline ::LineRuleProto* release_border();
+  inline const ::LineDefProto& border() const;
+  inline ::LineDefProto* mutable_border();
+  inline ::LineDefProto* release_border();
   
   // required int32 priority = 4;
   inline bool has_priority() const;
@@ -669,7 +868,7 @@ class CircleRuleProto : public ::google::protobuf::Message {
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   
   double radius_;
-  ::LineRuleProto* border_;
+  ::LineDefProto* border_;
   ::google::protobuf::uint32 color_;
   ::google::protobuf::int32 priority_;
   
@@ -739,54 +938,46 @@ class PathTextRuleProto : public ::google::protobuf::Message {
   
   // accessors -------------------------------------------------------
   
-  // required int32 height = 1;
-  inline bool has_height() const;
-  inline void clear_height();
-  static const int kHeightFieldNumber = 1;
-  inline ::google::protobuf::int32 height() const;
-  inline void set_height(::google::protobuf::int32 value);
+  // required .CaptionDefProto primary = 1;
+  inline bool has_primary() const;
+  inline void clear_primary();
+  static const int kPrimaryFieldNumber = 1;
+  inline const ::CaptionDefProto& primary() const;
+  inline ::CaptionDefProto* mutable_primary();
+  inline ::CaptionDefProto* release_primary();
   
-  // required uint32 color = 2;
-  inline bool has_color() const;
-  inline void clear_color();
-  static const int kColorFieldNumber = 2;
-  inline ::google::protobuf::uint32 color() const;
-  inline void set_color(::google::protobuf::uint32 value);
+  // optional .CaptionDefProto secondary = 2;
+  inline bool has_secondary() const;
+  inline void clear_secondary();
+  static const int kSecondaryFieldNumber = 2;
+  inline const ::CaptionDefProto& secondary() const;
+  inline ::CaptionDefProto* mutable_secondary();
+  inline ::CaptionDefProto* release_secondary();
   
-  // optional uint32 stroke_color = 3;
-  inline bool has_stroke_color() const;
-  inline void clear_stroke_color();
-  static const int kStrokeColorFieldNumber = 3;
-  inline ::google::protobuf::uint32 stroke_color() const;
-  inline void set_stroke_color(::google::protobuf::uint32 value);
-  
-  // required int32 priority = 4;
+  // required int32 priority = 3;
   inline bool has_priority() const;
   inline void clear_priority();
-  static const int kPriorityFieldNumber = 4;
+  static const int kPriorityFieldNumber = 3;
   inline ::google::protobuf::int32 priority() const;
   inline void set_priority(::google::protobuf::int32 value);
   
   // @@protoc_insertion_point(class_scope:PathTextRuleProto)
  private:
-  inline void set_has_height();
-  inline void clear_has_height();
-  inline void set_has_color();
-  inline void clear_has_color();
-  inline void set_has_stroke_color();
-  inline void clear_has_stroke_color();
+  inline void set_has_primary();
+  inline void clear_has_primary();
+  inline void set_has_secondary();
+  inline void clear_has_secondary();
   inline void set_has_priority();
   inline void clear_has_priority();
   
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   
-  ::google::protobuf::int32 height_;
-  ::google::protobuf::uint32 color_;
-  ::google::protobuf::uint32 stroke_color_;
+  ::CaptionDefProto* primary_;
+  ::CaptionDefProto* secondary_;
   ::google::protobuf::int32 priority_;
   
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
   
   friend void  protobuf_AddDesc_drules_5fstruct_2eproto();
   friend void protobuf_AssignDesc_drules_5fstruct_2eproto();
@@ -1260,7 +1451,7 @@ inline ::DashDotProto* LineRuleProto::release_dashdot() {
   return temp;
 }
 
-// optional int32 priority = 4;
+// required int32 priority = 4;
 inline bool LineRuleProto::has_priority() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -1284,6 +1475,83 @@ inline void LineRuleProto::set_priority(::google::protobuf::int32 value) {
 
 // -------------------------------------------------------------------
 
+// LineDefProto
+
+// required double width = 1;
+inline bool LineDefProto::has_width() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void LineDefProto::set_has_width() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void LineDefProto::clear_has_width() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void LineDefProto::clear_width() {
+  width_ = 0;
+  clear_has_width();
+}
+inline double LineDefProto::width() const {
+  return width_;
+}
+inline void LineDefProto::set_width(double value) {
+  set_has_width();
+  width_ = value;
+}
+
+// required uint32 color = 2;
+inline bool LineDefProto::has_color() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void LineDefProto::set_has_color() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void LineDefProto::clear_has_color() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void LineDefProto::clear_color() {
+  color_ = 0u;
+  clear_has_color();
+}
+inline ::google::protobuf::uint32 LineDefProto::color() const {
+  return color_;
+}
+inline void LineDefProto::set_color(::google::protobuf::uint32 value) {
+  set_has_color();
+  color_ = value;
+}
+
+// optional .DashDotProto dashdot = 3;
+inline bool LineDefProto::has_dashdot() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void LineDefProto::set_has_dashdot() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void LineDefProto::clear_has_dashdot() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void LineDefProto::clear_dashdot() {
+  if (dashdot_ != NULL) dashdot_->::DashDotProto::Clear();
+  clear_has_dashdot();
+}
+inline const ::DashDotProto& LineDefProto::dashdot() const {
+  return dashdot_ != NULL ? *dashdot_ : *default_instance_->dashdot_;
+}
+inline ::DashDotProto* LineDefProto::mutable_dashdot() {
+  set_has_dashdot();
+  if (dashdot_ == NULL) dashdot_ = new ::DashDotProto;
+  return dashdot_;
+}
+inline ::DashDotProto* LineDefProto::release_dashdot() {
+  clear_has_dashdot();
+  ::DashDotProto* temp = dashdot_;
+  dashdot_ = NULL;
+  return temp;
+}
+
+// -------------------------------------------------------------------
+
 // AreaRuleProto
 
 // required uint32 color = 1;
@@ -1308,7 +1576,7 @@ inline void AreaRuleProto::set_color(::google::protobuf::uint32 value) {
   color_ = value;
 }
 
-// optional .LineRuleProto border = 2;
+// optional .LineDefProto border = 2;
 inline bool AreaRuleProto::has_border() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1319,20 +1587,20 @@ inline void AreaRuleProto::clear_has_border() {
   _has_bits_[0] &= ~0x00000002u;
 }
 inline void AreaRuleProto::clear_border() {
-  if (border_ != NULL) border_->::LineRuleProto::Clear();
+  if (border_ != NULL) border_->::LineDefProto::Clear();
   clear_has_border();
 }
-inline const ::LineRuleProto& AreaRuleProto::border() const {
+inline const ::LineDefProto& AreaRuleProto::border() const {
   return border_ != NULL ? *border_ : *default_instance_->border_;
 }
-inline ::LineRuleProto* AreaRuleProto::mutable_border() {
+inline ::LineDefProto* AreaRuleProto::mutable_border() {
   set_has_border();
-  if (border_ == NULL) border_ = new ::LineRuleProto;
+  if (border_ == NULL) border_ = new ::LineDefProto;
   return border_;
 }
-inline ::LineRuleProto* AreaRuleProto::release_border() {
+inline ::LineDefProto* AreaRuleProto::release_border() {
   clear_has_border();
-  ::LineRuleProto* temp = border_;
+  ::LineDefProto* temp = border_;
   border_ = NULL;
   return temp;
 }
@@ -1467,83 +1735,145 @@ inline void SymbolRuleProto::set_priority(::google::protobuf::int32 value) {
 
 // -------------------------------------------------------------------
 
-// CaptionRuleProto
+// CaptionDefProto
 
 // required int32 height = 1;
-inline bool CaptionRuleProto::has_height() const {
+inline bool CaptionDefProto::has_height() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CaptionRuleProto::set_has_height() {
+inline void CaptionDefProto::set_has_height() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CaptionRuleProto::clear_has_height() {
+inline void CaptionDefProto::clear_has_height() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CaptionRuleProto::clear_height() {
+inline void CaptionDefProto::clear_height() {
   height_ = 0;
   clear_has_height();
 }
-inline ::google::protobuf::int32 CaptionRuleProto::height() const {
+inline ::google::protobuf::int32 CaptionDefProto::height() const {
   return height_;
 }
-inline void CaptionRuleProto::set_height(::google::protobuf::int32 value) {
+inline void CaptionDefProto::set_height(::google::protobuf::int32 value) {
   set_has_height();
   height_ = value;
 }
 
 // required uint32 color = 2;
-inline bool CaptionRuleProto::has_color() const {
+inline bool CaptionDefProto::has_color() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CaptionRuleProto::set_has_color() {
+inline void CaptionDefProto::set_has_color() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CaptionRuleProto::clear_has_color() {
+inline void CaptionDefProto::clear_has_color() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CaptionRuleProto::clear_color() {
+inline void CaptionDefProto::clear_color() {
   color_ = 0u;
   clear_has_color();
 }
-inline ::google::protobuf::uint32 CaptionRuleProto::color() const {
+inline ::google::protobuf::uint32 CaptionDefProto::color() const {
   return color_;
 }
-inline void CaptionRuleProto::set_color(::google::protobuf::uint32 value) {
+inline void CaptionDefProto::set_color(::google::protobuf::uint32 value) {
   set_has_color();
   color_ = value;
 }
 
 // optional uint32 stroke_color = 3;
-inline bool CaptionRuleProto::has_stroke_color() const {
+inline bool CaptionDefProto::has_stroke_color() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CaptionRuleProto::set_has_stroke_color() {
+inline void CaptionDefProto::set_has_stroke_color() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CaptionRuleProto::clear_has_stroke_color() {
+inline void CaptionDefProto::clear_has_stroke_color() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CaptionRuleProto::clear_stroke_color() {
+inline void CaptionDefProto::clear_stroke_color() {
   stroke_color_ = 0u;
   clear_has_stroke_color();
 }
-inline ::google::protobuf::uint32 CaptionRuleProto::stroke_color() const {
+inline ::google::protobuf::uint32 CaptionDefProto::stroke_color() const {
   return stroke_color_;
 }
-inline void CaptionRuleProto::set_stroke_color(::google::protobuf::uint32 value) {
+inline void CaptionDefProto::set_stroke_color(::google::protobuf::uint32 value) {
   set_has_stroke_color();
   stroke_color_ = value;
 }
 
-// required int32 priority = 4;
+// -------------------------------------------------------------------
+
+// CaptionRuleProto
+
+// required .CaptionDefProto primary = 1;
+inline bool CaptionRuleProto::has_primary() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CaptionRuleProto::set_has_primary() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CaptionRuleProto::clear_has_primary() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CaptionRuleProto::clear_primary() {
+  if (primary_ != NULL) primary_->::CaptionDefProto::Clear();
+  clear_has_primary();
+}
+inline const ::CaptionDefProto& CaptionRuleProto::primary() const {
+  return primary_ != NULL ? *primary_ : *default_instance_->primary_;
+}
+inline ::CaptionDefProto* CaptionRuleProto::mutable_primary() {
+  set_has_primary();
+  if (primary_ == NULL) primary_ = new ::CaptionDefProto;
+  return primary_;
+}
+inline ::CaptionDefProto* CaptionRuleProto::release_primary() {
+  clear_has_primary();
+  ::CaptionDefProto* temp = primary_;
+  primary_ = NULL;
+  return temp;
+}
+
+// optional .CaptionDefProto secondary = 2;
+inline bool CaptionRuleProto::has_secondary() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CaptionRuleProto::set_has_secondary() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CaptionRuleProto::clear_has_secondary() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CaptionRuleProto::clear_secondary() {
+  if (secondary_ != NULL) secondary_->::CaptionDefProto::Clear();
+  clear_has_secondary();
+}
+inline const ::CaptionDefProto& CaptionRuleProto::secondary() const {
+  return secondary_ != NULL ? *secondary_ : *default_instance_->secondary_;
+}
+inline ::CaptionDefProto* CaptionRuleProto::mutable_secondary() {
+  set_has_secondary();
+  if (secondary_ == NULL) secondary_ = new ::CaptionDefProto;
+  return secondary_;
+}
+inline ::CaptionDefProto* CaptionRuleProto::release_secondary() {
+  clear_has_secondary();
+  ::CaptionDefProto* temp = secondary_;
+  secondary_ = NULL;
+  return temp;
+}
+
+// required int32 priority = 3;
 inline bool CaptionRuleProto::has_priority() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
 inline void CaptionRuleProto::set_has_priority() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000004u;
 }
 inline void CaptionRuleProto::clear_has_priority() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000004u;
 }
 inline void CaptionRuleProto::clear_priority() {
   priority_ = 0;
@@ -1605,7 +1935,7 @@ inline void CircleRuleProto::set_color(::google::protobuf::uint32 value) {
   color_ = value;
 }
 
-// optional .LineRuleProto border = 3;
+// optional .LineDefProto border = 3;
 inline bool CircleRuleProto::has_border() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1616,20 +1946,20 @@ inline void CircleRuleProto::clear_has_border() {
   _has_bits_[0] &= ~0x00000004u;
 }
 inline void CircleRuleProto::clear_border() {
-  if (border_ != NULL) border_->::LineRuleProto::Clear();
+  if (border_ != NULL) border_->::LineDefProto::Clear();
   clear_has_border();
 }
-inline const ::LineRuleProto& CircleRuleProto::border() const {
+inline const ::LineDefProto& CircleRuleProto::border() const {
   return border_ != NULL ? *border_ : *default_instance_->border_;
 }
-inline ::LineRuleProto* CircleRuleProto::mutable_border() {
+inline ::LineDefProto* CircleRuleProto::mutable_border() {
   set_has_border();
-  if (border_ == NULL) border_ = new ::LineRuleProto;
+  if (border_ == NULL) border_ = new ::LineDefProto;
   return border_;
 }
-inline ::LineRuleProto* CircleRuleProto::release_border() {
+inline ::LineDefProto* CircleRuleProto::release_border() {
   clear_has_border();
-  ::LineRuleProto* temp = border_;
+  ::LineDefProto* temp = border_;
   border_ = NULL;
   return temp;
 }
@@ -1660,81 +1990,73 @@ inline void CircleRuleProto::set_priority(::google::protobuf::int32 value) {
 
 // PathTextRuleProto
 
-// required int32 height = 1;
-inline bool PathTextRuleProto::has_height() const {
+// required .CaptionDefProto primary = 1;
+inline bool PathTextRuleProto::has_primary() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void PathTextRuleProto::set_has_height() {
+inline void PathTextRuleProto::set_has_primary() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void PathTextRuleProto::clear_has_height() {
+inline void PathTextRuleProto::clear_has_primary() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void PathTextRuleProto::clear_height() {
-  height_ = 0;
-  clear_has_height();
+inline void PathTextRuleProto::clear_primary() {
+  if (primary_ != NULL) primary_->::CaptionDefProto::Clear();
+  clear_has_primary();
 }
-inline ::google::protobuf::int32 PathTextRuleProto::height() const {
-  return height_;
+inline const ::CaptionDefProto& PathTextRuleProto::primary() const {
+  return primary_ != NULL ? *primary_ : *default_instance_->primary_;
 }
-inline void PathTextRuleProto::set_height(::google::protobuf::int32 value) {
-  set_has_height();
-  height_ = value;
+inline ::CaptionDefProto* PathTextRuleProto::mutable_primary() {
+  set_has_primary();
+  if (primary_ == NULL) primary_ = new ::CaptionDefProto;
+  return primary_;
+}
+inline ::CaptionDefProto* PathTextRuleProto::release_primary() {
+  clear_has_primary();
+  ::CaptionDefProto* temp = primary_;
+  primary_ = NULL;
+  return temp;
 }
 
-// required uint32 color = 2;
-inline bool PathTextRuleProto::has_color() const {
+// optional .CaptionDefProto secondary = 2;
+inline bool PathTextRuleProto::has_secondary() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void PathTextRuleProto::set_has_color() {
+inline void PathTextRuleProto::set_has_secondary() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void PathTextRuleProto::clear_has_color() {
+inline void PathTextRuleProto::clear_has_secondary() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void PathTextRuleProto::clear_color() {
-  color_ = 0u;
-  clear_has_color();
+inline void PathTextRuleProto::clear_secondary() {
+  if (secondary_ != NULL) secondary_->::CaptionDefProto::Clear();
+  clear_has_secondary();
 }
-inline ::google::protobuf::uint32 PathTextRuleProto::color() const {
-  return color_;
+inline const ::CaptionDefProto& PathTextRuleProto::secondary() const {
+  return secondary_ != NULL ? *secondary_ : *default_instance_->secondary_;
 }
-inline void PathTextRuleProto::set_color(::google::protobuf::uint32 value) {
-  set_has_color();
-  color_ = value;
+inline ::CaptionDefProto* PathTextRuleProto::mutable_secondary() {
+  set_has_secondary();
+  if (secondary_ == NULL) secondary_ = new ::CaptionDefProto;
+  return secondary_;
+}
+inline ::CaptionDefProto* PathTextRuleProto::release_secondary() {
+  clear_has_secondary();
+  ::CaptionDefProto* temp = secondary_;
+  secondary_ = NULL;
+  return temp;
 }
 
-// optional uint32 stroke_color = 3;
-inline bool PathTextRuleProto::has_stroke_color() const {
+// required int32 priority = 3;
+inline bool PathTextRuleProto::has_priority() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void PathTextRuleProto::set_has_stroke_color() {
+inline void PathTextRuleProto::set_has_priority() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void PathTextRuleProto::clear_has_stroke_color() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void PathTextRuleProto::clear_stroke_color() {
-  stroke_color_ = 0u;
-  clear_has_stroke_color();
-}
-inline ::google::protobuf::uint32 PathTextRuleProto::stroke_color() const {
-  return stroke_color_;
-}
-inline void PathTextRuleProto::set_stroke_color(::google::protobuf::uint32 value) {
-  set_has_stroke_color();
-  stroke_color_ = value;
-}
-
-// required int32 priority = 4;
-inline bool PathTextRuleProto::has_priority() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void PathTextRuleProto::set_has_priority() {
-  _has_bits_[0] |= 0x00000008u;
-}
 inline void PathTextRuleProto::clear_has_priority() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000004u;
 }
 inline void PathTextRuleProto::clear_priority() {
   priority_ = 0;
diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto
index 065447b5b7..53b22096b1 100644
--- a/indexer/drules_struct.proto
+++ b/indexer/drules_struct.proto
@@ -11,13 +11,20 @@ message LineRuleProto
   required double width = 1;
   required uint32 color = 2;
   optional DashDotProto dashdot = 3;
-  optional int32 priority = 4;    // optional, because it can be used as part of AreaRule
+  required int32 priority = 4;
+}
+
+message LineDefProto
+{
+  required double width = 1;
+  required uint32 color = 2;
+  optional DashDotProto dashdot = 3;
 }
 
 message AreaRuleProto
 {
   required uint32 color = 1;
-  optional LineRuleProto border = 2;
+  optional LineDefProto border = 2;
   required int32 priority = 3;
 }
 
@@ -28,28 +35,33 @@ message SymbolRuleProto
   required int32 priority = 3;
 }
 
-message CaptionRuleProto
+message CaptionDefProto
 {
   required int32 height = 1;
   required uint32 color = 2;
   optional uint32 stroke_color = 3;
-  required int32 priority = 4;
+}
+
+message CaptionRuleProto
+{
+  required CaptionDefProto primary = 1;
+  optional CaptionDefProto secondary = 2;
+  required int32 priority = 3;
 }
 
 message CircleRuleProto
 {
   required double radius = 1;
   required uint32 color = 2;
-  optional LineRuleProto border = 3;
+  optional LineDefProto border = 3;
   required int32 priority = 4;
 }
 
 message PathTextRuleProto
 {
-  required int32 height = 1;
-  required uint32 color = 2;
-  optional uint32 stroke_color = 3;
-  required int32 priority = 4;
+  required CaptionDefProto primary = 1;
+  optional CaptionDefProto secondary = 2;
+  required int32 priority = 3;
 }
 
 // WayMarkerRule not used yet