diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d3b8f07649..ed9ec9364a 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 8453cb53e7..c5f962a19c 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -68913,26 +68913,10 @@ cont {
   }
 }
 colors {
-  value {
-    name: "BookmarkPurple"
-    color: 10233776
-  }
-  value {
-    name: "RatingText"
-    color: 16777215
-  }
   value {
     name: "TrafficOutline"
     color: 15263452
   }
-  value {
-    name: "RouteMaskPedestrian"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkBlue"
-    color: 28359
-  }
   value {
     name: "RoadShieldWhiteText"
     color: 16777215
@@ -68941,22 +68925,10 @@ colors {
     name: "TrackUnknownDistance"
     color: 6381921
   }
-  value {
-    name: "MyPositionAccuracy"
-    color: 3942645760
-  }
-  value {
-    name: "RatingLocalAds"
-    color: 2399474
-  }
   value {
     name: "GuiText"
     color: 609045837
   }
-  value {
-    name: "PoiHotelTextOutline"
-    color: 1728053247
-  }
   value {
     name: "BookmarkRed"
     color: 15014691
@@ -68969,208 +68941,40 @@ colors {
     name: "RouteMaskBicycle"
     color: 2147483648
   }
-  value {
-    name: "LocalAdsPrimaryText"
-  }
   value {
     name: "RoadShieldUKYellowText"
     color: 16765952
   }
-  value {
-    name: "BookmarkBlueGray"
-    color: 6323595
-  }
   value {
     name: "RoadShieldBlueBackground"
     color: 1728193
   }
-  value {
-    name: "RatingGood"
-    color: 9682745
-  }
-  value {
-    name: "RouteArrowsMaskCar"
-    color: 3422763904
-  }
-  value {
-    name: "BookmarkCyan"
-    color: 113876
-  }
-  value {
-    name: "BookmarkBrown"
-    color: 7951688
-  }
   value {
     name: "BookmarkDeepOrange"
     color: 6323595
   }
-  value {
-    name: "Arrow3DShadow"
-    color: 3258727484
-  }
-  value {
-    name: "RatingExcellent"
-    color: 3968060
-  }
-  value {
-    name: "RouteTrafficG2"
-    color: 15214341
-  }
-  value {
-    name: "BookmarkPink"
-    color: 16728450
-  }
-  value {
-    name: "LocalAdsSecondaryText"
-  }
-  value {
-    name: "RatingNone"
-    color: 5862272
-  }
-  value {
-    name: "BookmarkGray"
-    color: 7697781
-  }
-  value {
-    name: "TransitBackground"
-    color: 2583691263
-  }
   value {
     name: "RoadShieldOrangeBackground"
     color: 16760320
   }
-  value {
-    name: "RatingNormal"
-    color: 16762880
-  }
-  value {
-    name: "Arrow3DOutline"
-    color: 16777215
-  }
-  value {
-    name: "LocalAdsPrimaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RoadShieldRedBackground"
-    color: 15086900
-  }
-  value {
-    name: "RouteMarkPrimaryText"
-  }
-  value {
-    name: "RouteMarkPrimaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RouteTrafficG3"
-    color: 4294960384
-  }
   value {
     name: "BookmarkDeepPurple"
     color: 6765239
   }
-  value {
-    name: "RatingBad"
-    color: 15754290
-  }
-  value {
-    name: "RoadShieldBlackText"
-  }
-  value {
-    name: "RoutePedestrian"
-    color: 857551774
-  }
-  value {
-    name: "Route"
-    color: 34815
-  }
   value {
     name: "RouteOutline"
     color: 352205
   }
-  value {
-    name: "TrackHumanSpeed"
-    color: 1913758
-  }
-  value {
-    name: "RouteMarkSecondaryText"
-  }
-  value {
-    name: "TrackPlaneSpeed"
-    color: 11057133
-  }
   value {
     name: "RatingHorrible"
     color: 15088685
   }
-  value {
-    name: "TrafficG0"
-    color: 8263442
-  }
-  value {
-    name: "RouteArrowsMaskBicycle"
-    color: 3432785840
-  }
-  value {
-    name: "BookmarkLightBlue"
-    color: 240116
-  }
-  value {
-    name: "RoutePreview"
-    color: 3003121664
-  }
-  value {
-    name: "LocalAdsSecondaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RouteMaskCar"
-    color: 3003121664
-  }
-  value {
-    name: "BookmarkGreen"
-    color: 3706428
-  }
-  value {
-    name: "Arrow3D"
-    color: 5286655
-  }
   value {
     name: "BookmarkTeal"
     color: 38280
   }
   value {
-    name: "TrafficG3"
-    color: 4294761984
-  }
-  value {
-    name: "BookmarkOrange"
-    color: 16752640
-  }
-  value {
-    name: "TrafficG1"
-    color: 14951168
-  }
-  value {
-    name: "TrackCarSpeed"
-    color: 8163038
-  }
-  value {
-    name: "TrafficTempBlock"
-    color: 5395026
-  }
-  value {
-    name: "BookmarkYellow"
-    color: 16762880
-  }
-  value {
-    name: "TrafficG5"
-    color: 3773998
-  }
-  value {
-    name: "Selection"
-    color: 1545508592
+    name: "TransitMarkSecondaryText"
   }
   value {
     name: "Arrow3DObsolete"
@@ -69180,20 +68984,7 @@ colors {
     name: "TrafficUnknown"
   }
   value {
-    name: "TrafficG2"
-    color: 14951168
-  }
-  value {
-    name: "RoadShieldGreenBackground"
-    color: 3183362
-  }
-  value {
-    name: "DefaultTrackColor"
-    color: 2004720
-  }
-  value {
-    name: "TrafficArrowLight"
-    color: 16777215
+    name: "TransitTransferOuterMarker"
   }
   value {
     name: "RouteTrafficG1"
@@ -69203,6 +68994,109 @@ colors {
     name: "RouteTrafficG0"
     color: 10167040
   }
+  value {
+    name: "RouteTrafficG3"
+    color: 4294960384
+  }
+  value {
+    name: "RouteTrafficG2"
+    color: 15214341
+  }
+  value {
+    name: "RatingText"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkBlue"
+    color: 28359
+  }
+  value {
+    name: "MyPositionAccuracy"
+    color: 3942645760
+  }
+  value {
+    name: "BookmarkOrange"
+    color: 16752640
+  }
+  value {
+    name: "TrafficArrowLight"
+    color: 16777215
+  }
+  value {
+    name: "TransitMarkSecondaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "RatingGood"
+    color: 9682745
+  }
+  value {
+    name: "RatingExcellent"
+    color: 3968060
+  }
+  value {
+    name: "BookmarkCyan"
+    color: 113876
+  }
+  value {
+    name: "TransitBackground"
+    color: 2583691263
+  }
+  value {
+    name: "Arrow3DOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGray"
+    color: 7697781
+  }
+  value {
+    name: "RouteMarkSecondaryText"
+  }
+  value {
+    name: "TrackPlaneSpeed"
+    color: 11057133
+  }
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
+  value {
+    name: "LocalAdsSecondaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGreen"
+    color: 3706428
+  }
+  value {
+    name: "TrafficG3"
+    color: 4294761984
+  }
+  value {
+    name: "BookmarkBlueGray"
+    color: 6323595
+  }
+  value {
+    name: "TrafficG1"
+    color: 14951168
+  }
+  value {
+    name: "Selection"
+    color: 1545508592
+  }
+  value {
+    name: "TrafficG5"
+    color: 3773998
+  }
+  value {
+    name: "TrafficG4"
+    color: 3773998
+  }
+  value {
+    name: "RatingNone"
+    color: 5862272
+  }
   value {
     name: "RouteMarkSecondaryTextOutline"
     color: 16777215
@@ -69211,10 +69105,6 @@ colors {
     name: "BookmarkLime"
     color: 8306489
   }
-  value {
-    name: "TrafficG4"
-    color: 3773998
-  }
   value {
     name: "RouteBicycle"
     color: 865871792
@@ -69223,4 +69113,139 @@ colors {
     name: "TrafficArrowDark"
     color: 4666933
   }
+  value {
+    name: "TransitStopInnerMarker"
+    color: 16777215
+  }
+  value {
+    name: "RatingLocalAds"
+    color: 2399474
+  }
+  value {
+    name: "TrackHumanSpeed"
+    color: 1913758
+  }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3422763904
+  }
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+  }
+  value {
+    name: "RoutePedestrian"
+    color: 857551774
+  }
+  value {
+    name: "RouteMarkPrimaryText"
+  }
+  value {
+    name: "Arrow3DShadow"
+    color: 3258727484
+  }
+  value {
+    name: "RoadShieldBlackText"
+  }
+  value {
+    name: "TransitMarkPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "TrafficG0"
+    color: 8263442
+  }
+  value {
+    name: "RoutePreview"
+    color: 3003121664
+  }
+  value {
+    name: "RouteMaskCar"
+    color: 3003121664
+  }
+  value {
+    name: "Arrow3D"
+    color: 5286655
+  }
+  value {
+    name: "TrafficTempBlock"
+    color: 5395026
+  }
+  value {
+    name: "BookmarkYellow"
+    color: 16762880
+  }
+  value {
+    name: "TransitTransferInnerMarker"
+    color: 16777215
+  }
+  value {
+    name: "LocalAdsPrimaryText"
+  }
+  value {
+    name: "LocalAdsPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkPurple"
+    color: 10233776
+  }
+  value {
+    name: "TransitMarkPrimaryText"
+  }
+  value {
+    name: "BookmarkPink"
+    color: 16728450
+  }
+  value {
+    name: "PoiHotelTextOutline"
+    color: 1728053247
+  }
+  value {
+    name: "BookmarkBrown"
+    color: 7951688
+  }
+  value {
+    name: "BookmarkLightBlue"
+    color: 240116
+  }
+  value {
+    name: "RatingNormal"
+    color: 16762880
+  }
+  value {
+    name: "RoadShieldRedBackground"
+    color: 15086900
+  }
+  value {
+    name: "RouteMarkPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "LocalAdsSecondaryText"
+  }
+  value {
+    name: "Route"
+    color: 34815
+  }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 3432785840
+  }
+  value {
+    name: "RatingBad"
+    color: 15754290
+  }
+  value {
+    name: "TrackCarSpeed"
+    color: 8163038
+  }
+  value {
+    name: "TrafficG2"
+    color: 14951168
+  }
+  value {
+    name: "RoadShieldGreenBackground"
+    color: 3183362
+  }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index e2d3721513..ee493b4834 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index d0a24ec81d..213b560c2d 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -69005,26 +69005,10 @@ cont {
   }
 }
 colors {
-  value {
-    name: "BookmarkPurple"
-    color: 10233776
-  }
-  value {
-    name: "RatingText"
-    color: 16777215
-  }
   value {
     name: "TrafficOutline"
     color: 3684408
   }
-  value {
-    name: "RouteMaskPedestrian"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkBlue"
-    color: 28359
-  }
   value {
     name: "RoadShieldWhiteText"
     color: 12039862
@@ -69033,22 +69017,10 @@ colors {
     name: "TrackUnknownDistance"
     color: 9868950
   }
-  value {
-    name: "MyPositionAccuracy"
-    color: 4043309055
-  }
-  value {
-    name: "RatingLocalAds"
-    color: 4962790
-  }
   value {
     name: "GuiText"
     color: 1308622847
   }
-  value {
-    name: "PoiHotelTextOutline"
-    color: 1711276032
-  }
   value {
     name: "BookmarkRed"
     color: 15014691
@@ -69061,210 +69033,41 @@ colors {
     name: "RouteMaskBicycle"
     color: 2147483648
   }
-  value {
-    name: "LocalAdsPrimaryText"
-    color: 8947848
-  }
   value {
     name: "RoadShieldUKYellowText"
     color: 11836942
   }
-  value {
-    name: "BookmarkBlueGray"
-    color: 6323595
-  }
   value {
     name: "RoadShieldBlueBackground"
     color: 2706568
   }
-  value {
-    name: "RatingGood"
-    color: 9682745
-  }
-  value {
-    name: "RouteArrowsMaskCar"
-    color: 3003473869
-  }
-  value {
-    name: "BookmarkCyan"
-    color: 113876
-  }
-  value {
-    name: "BookmarkBrown"
-    color: 7951688
-  }
   value {
     name: "BookmarkDeepOrange"
     color: 6323595
   }
-  value {
-    name: "Arrow3DShadow"
-    color: 3258727484
-  }
-  value {
-    name: "RatingExcellent"
-    color: 3968060
-  }
-  value {
-    name: "RouteTrafficG2"
-    color: 8327953
-  }
-  value {
-    name: "BookmarkPink"
-    color: 16728450
-  }
-  value {
-    name: "LocalAdsSecondaryText"
-    color: 8947848
-  }
-  value {
-    name: "RatingNone"
-    color: 5862272
-  }
-  value {
-    name: "BookmarkGray"
-    color: 7697781
-  }
-  value {
-    name: "TransitBackground"
-    color: 2566914048
-  }
   value {
     name: "RoadShieldOrangeBackground"
     color: 1272880
   }
-  value {
-    name: "RatingNormal"
-    color: 16762880
-  }
-  value {
-    name: "Arrow3DOutline"
-    color: 16777215
-  }
-  value {
-    name: "LocalAdsPrimaryTextOutline"
-  }
-  value {
-    name: "RoadShieldRedBackground"
-    color: 10426903
-  }
-  value {
-    name: "RouteMarkPrimaryText"
-    color: 8947848
-  }
-  value {
-    name: "RouteMarkPrimaryTextOutline"
-  }
-  value {
-    name: "RouteTrafficG3"
-    color: 4288578070
-  }
   value {
     name: "BookmarkDeepPurple"
     color: 6765239
   }
-  value {
-    name: "RatingBad"
-    color: 15754290
-  }
-  value {
-    name: "RoadShieldBlackText"
-    color: 2171169
-  }
-  value {
-    name: "RoutePedestrian"
-    color: 1308604747
-  }
-  value {
-    name: "Route"
-    color: 34815
-  }
   value {
     name: "RouteOutline"
     color: 352205
   }
-  value {
-    name: "TrackHumanSpeed"
-    color: 16750592
-  }
-  value {
-    name: "RouteMarkSecondaryText"
-    color: 8947848
-  }
-  value {
-    name: "TrackPlaneSpeed"
-    color: 16774560
-  }
   value {
     name: "RatingHorrible"
     color: 15088685
   }
-  value {
-    name: "TrafficG0"
-    color: 4985359
-  }
-  value {
-    name: "RouteArrowsMaskBicycle"
-    color: 2164214668
-  }
-  value {
-    name: "BookmarkLightBlue"
-    color: 240116
-  }
-  value {
-    name: "RoutePreview"
-    color: 3019898879
-  }
-  value {
-    name: "LocalAdsSecondaryTextOutline"
-  }
-  value {
-    name: "RouteMaskCar"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkGreen"
-    color: 3706428
-  }
-  value {
-    name: "Arrow3D"
-    color: 4311295
-  }
   value {
     name: "BookmarkTeal"
     color: 38280
   }
   value {
-    name: "TrafficG3"
-    color: 4287393810
-  }
-  value {
-    name: "BookmarkOrange"
-    color: 16752640
-  }
-  value {
-    name: "TrafficG1"
-    color: 7542806
-  }
-  value {
-    name: "TrackCarSpeed"
-    color: 16763432
-  }
-  value {
-    name: "TrafficTempBlock"
-    color: 2302755
-  }
-  value {
-    name: "BookmarkYellow"
-    color: 16762880
-  }
-  value {
-    name: "TrafficG5"
-    color: 3629602
-  }
-  value {
-    name: "Selection"
-    color: 1548466662
+    name: "TransitMarkSecondaryText"
+    color: 8947848
   }
   value {
     name: "Arrow3DObsolete"
@@ -69274,20 +69077,7 @@ colors {
     name: "TrafficUnknown"
   }
   value {
-    name: "TrafficG2"
-    color: 7542806
-  }
-  value {
-    name: "RoadShieldGreenBackground"
-    color: 1272880
-  }
-  value {
-    name: "DefaultTrackColor"
-    color: 2004720
-  }
-  value {
-    name: "TrafficArrowLight"
-    color: 12895428
+    name: "TransitTransferOuterMarker"
   }
   value {
     name: "RouteTrafficG1"
@@ -69297,6 +69087,108 @@ colors {
     name: "RouteTrafficG0"
     color: 6164237
   }
+  value {
+    name: "RouteTrafficG3"
+    color: 4288578070
+  }
+  value {
+    name: "RouteTrafficG2"
+    color: 8327953
+  }
+  value {
+    name: "RatingText"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkBlue"
+    color: 28359
+  }
+  value {
+    name: "MyPositionAccuracy"
+    color: 4043309055
+  }
+  value {
+    name: "BookmarkOrange"
+    color: 16752640
+  }
+  value {
+    name: "TrafficArrowLight"
+    color: 12895428
+  }
+  value {
+    name: "TransitMarkSecondaryTextOutline"
+  }
+  value {
+    name: "RatingGood"
+    color: 9682745
+  }
+  value {
+    name: "RatingExcellent"
+    color: 3968060
+  }
+  value {
+    name: "BookmarkCyan"
+    color: 113876
+  }
+  value {
+    name: "TransitBackground"
+    color: 2566914048
+  }
+  value {
+    name: "Arrow3DOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGray"
+    color: 7697781
+  }
+  value {
+    name: "RouteMarkSecondaryText"
+    color: 8947848
+  }
+  value {
+    name: "TrackPlaneSpeed"
+    color: 16774560
+  }
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
+  value {
+    name: "LocalAdsSecondaryTextOutline"
+  }
+  value {
+    name: "BookmarkGreen"
+    color: 3706428
+  }
+  value {
+    name: "TrafficG3"
+    color: 4287393810
+  }
+  value {
+    name: "BookmarkBlueGray"
+    color: 6323595
+  }
+  value {
+    name: "TrafficG1"
+    color: 7542806
+  }
+  value {
+    name: "Selection"
+    color: 1548466662
+  }
+  value {
+    name: "TrafficG5"
+    color: 3629602
+  }
+  value {
+    name: "TrafficG4"
+    color: 3629602
+  }
+  value {
+    name: "RatingNone"
+    color: 5862272
+  }
   value {
     name: "RouteMarkSecondaryTextOutline"
   }
@@ -69304,10 +69196,6 @@ colors {
     name: "BookmarkLime"
     color: 8306489
   }
-  value {
-    name: "TrafficG4"
-    color: 3629602
-  }
   value {
     name: "RouteBicycle"
     color: 1308576652
@@ -69316,4 +69204,140 @@ colors {
     name: "TrafficArrowDark"
     color: 1644825
   }
+  value {
+    name: "TransitStopInnerMarker"
+  }
+  value {
+    name: "RatingLocalAds"
+    color: 4962790
+  }
+  value {
+    name: "TrackHumanSpeed"
+    color: 16750592
+  }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3003473869
+  }
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+  }
+  value {
+    name: "RoutePedestrian"
+    color: 1308604747
+  }
+  value {
+    name: "RouteMarkPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "Arrow3DShadow"
+    color: 3258727484
+  }
+  value {
+    name: "RoadShieldBlackText"
+    color: 2171169
+  }
+  value {
+    name: "TransitMarkPrimaryTextOutline"
+  }
+  value {
+    name: "TrafficG0"
+    color: 4985359
+  }
+  value {
+    name: "RoutePreview"
+    color: 3019898879
+  }
+  value {
+    name: "RouteMaskCar"
+    color: 2147483648
+  }
+  value {
+    name: "Arrow3D"
+    color: 4311295
+  }
+  value {
+    name: "TrafficTempBlock"
+    color: 2302755
+  }
+  value {
+    name: "BookmarkYellow"
+    color: 16762880
+  }
+  value {
+    name: "TransitTransferInnerMarker"
+    color: 8947848
+  }
+  value {
+    name: "LocalAdsPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "LocalAdsPrimaryTextOutline"
+  }
+  value {
+    name: "BookmarkPurple"
+    color: 10233776
+  }
+  value {
+    name: "TransitMarkPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "BookmarkPink"
+    color: 16728450
+  }
+  value {
+    name: "PoiHotelTextOutline"
+    color: 1711276032
+  }
+  value {
+    name: "BookmarkBrown"
+    color: 7951688
+  }
+  value {
+    name: "BookmarkLightBlue"
+    color: 240116
+  }
+  value {
+    name: "RatingNormal"
+    color: 16762880
+  }
+  value {
+    name: "RoadShieldRedBackground"
+    color: 10426903
+  }
+  value {
+    name: "RouteMarkPrimaryTextOutline"
+  }
+  value {
+    name: "LocalAdsSecondaryText"
+    color: 8947848
+  }
+  value {
+    name: "Route"
+    color: 34815
+  }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 2164214668
+  }
+  value {
+    name: "RatingBad"
+    color: 15754290
+  }
+  value {
+    name: "TrackCarSpeed"
+    color: 16763432
+  }
+  value {
+    name: "TrafficG2"
+    color: 7542806
+  }
+  value {
+    name: "RoadShieldGreenBackground"
+    color: 1272880
+  }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c61d56bf8a..4fe0240853 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 3bcce2eabd..a623457fc2 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -42391,26 +42391,10 @@ cont {
   }
 }
 colors {
-  value {
-    name: "BookmarkPurple"
-    color: 10233776
-  }
-  value {
-    name: "RatingText"
-    color: 16777215
-  }
   value {
     name: "TrafficOutline"
     color: 15790320
   }
-  value {
-    name: "RouteMaskPedestrian"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkBlue"
-    color: 28359
-  }
   value {
     name: "RoadShieldWhiteText"
     color: 16777215
@@ -42419,22 +42403,10 @@ colors {
     name: "TrackUnknownDistance"
     color: 6381921
   }
-  value {
-    name: "MyPositionAccuracy"
-    color: 3942645760
-  }
-  value {
-    name: "RatingLocalAds"
-    color: 2399474
-  }
   value {
     name: "GuiText"
     color: 609045837
   }
-  value {
-    name: "PoiHotelTextOutline"
-    color: 1728053247
-  }
   value {
     name: "BookmarkRed"
     color: 15014691
@@ -42447,208 +42419,40 @@ colors {
     name: "RouteMaskBicycle"
     color: 2147483648
   }
-  value {
-    name: "LocalAdsPrimaryText"
-  }
   value {
     name: "RoadShieldUKYellowText"
     color: 16765952
   }
-  value {
-    name: "BookmarkBlueGray"
-    color: 6323595
-  }
   value {
     name: "RoadShieldBlueBackground"
     color: 1728193
   }
-  value {
-    name: "RatingGood"
-    color: 9682745
-  }
-  value {
-    name: "RouteArrowsMaskCar"
-    color: 3422763904
-  }
-  value {
-    name: "BookmarkCyan"
-    color: 113876
-  }
-  value {
-    name: "BookmarkBrown"
-    color: 7951688
-  }
   value {
     name: "BookmarkDeepOrange"
     color: 6323595
   }
-  value {
-    name: "Arrow3DShadow"
-    color: 3258727484
-  }
-  value {
-    name: "RatingExcellent"
-    color: 3968060
-  }
-  value {
-    name: "RouteTrafficG2"
-    color: 15214341
-  }
-  value {
-    name: "BookmarkPink"
-    color: 16728450
-  }
-  value {
-    name: "LocalAdsSecondaryText"
-  }
-  value {
-    name: "RatingNone"
-    color: 5862272
-  }
-  value {
-    name: "BookmarkGray"
-    color: 7697781
-  }
-  value {
-    name: "TransitBackground"
-    color: 2583691263
-  }
   value {
     name: "RoadShieldOrangeBackground"
     color: 16760320
   }
-  value {
-    name: "RatingNormal"
-    color: 16762880
-  }
-  value {
-    name: "Arrow3DOutline"
-    color: 16777215
-  }
-  value {
-    name: "LocalAdsPrimaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RoadShieldRedBackground"
-    color: 15086900
-  }
-  value {
-    name: "RouteMarkPrimaryText"
-  }
-  value {
-    name: "RouteMarkPrimaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RouteTrafficG3"
-    color: 4294960384
-  }
   value {
     name: "BookmarkDeepPurple"
     color: 6765239
   }
-  value {
-    name: "RatingBad"
-    color: 15754290
-  }
-  value {
-    name: "RoadShieldBlackText"
-  }
-  value {
-    name: "RoutePedestrian"
-    color: 857551774
-  }
-  value {
-    name: "Route"
-    color: 34815
-  }
   value {
     name: "RouteOutline"
     color: 352205
   }
-  value {
-    name: "TrackHumanSpeed"
-    color: 1913758
-  }
-  value {
-    name: "RouteMarkSecondaryText"
-  }
-  value {
-    name: "TrackPlaneSpeed"
-    color: 11057133
-  }
   value {
     name: "RatingHorrible"
     color: 15088685
   }
-  value {
-    name: "TrafficG0"
-    color: 8263442
-  }
-  value {
-    name: "RouteArrowsMaskBicycle"
-    color: 3432785840
-  }
-  value {
-    name: "BookmarkLightBlue"
-    color: 240116
-  }
-  value {
-    name: "RoutePreview"
-    color: 3003121664
-  }
-  value {
-    name: "LocalAdsSecondaryTextOutline"
-    color: 16777215
-  }
-  value {
-    name: "RouteMaskCar"
-    color: 3003121664
-  }
-  value {
-    name: "BookmarkGreen"
-    color: 3706428
-  }
-  value {
-    name: "Arrow3D"
-    color: 5286655
-  }
   value {
     name: "BookmarkTeal"
     color: 38280
   }
   value {
-    name: "TrafficG3"
-    color: 4294761984
-  }
-  value {
-    name: "BookmarkOrange"
-    color: 16752640
-  }
-  value {
-    name: "TrafficG1"
-    color: 14951168
-  }
-  value {
-    name: "TrackCarSpeed"
-    color: 8163038
-  }
-  value {
-    name: "TrafficTempBlock"
-    color: 4605510
-  }
-  value {
-    name: "BookmarkYellow"
-    color: 16762880
-  }
-  value {
-    name: "TrafficG5"
-    color: 3773998
-  }
-  value {
-    name: "Selection"
-    color: 1545508592
+    name: "TransitMarkSecondaryText"
   }
   value {
     name: "Arrow3DObsolete"
@@ -42658,20 +42462,7 @@ colors {
     name: "TrafficUnknown"
   }
   value {
-    name: "TrafficG2"
-    color: 14951168
-  }
-  value {
-    name: "RoadShieldGreenBackground"
-    color: 3183362
-  }
-  value {
-    name: "DefaultTrackColor"
-    color: 2004720
-  }
-  value {
-    name: "TrafficArrowLight"
-    color: 16777215
+    name: "TransitTransferOuterMarker"
   }
   value {
     name: "RouteTrafficG1"
@@ -42681,6 +42472,109 @@ colors {
     name: "RouteTrafficG0"
     color: 10167040
   }
+  value {
+    name: "RouteTrafficG3"
+    color: 4294960384
+  }
+  value {
+    name: "RouteTrafficG2"
+    color: 15214341
+  }
+  value {
+    name: "RatingText"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkBlue"
+    color: 28359
+  }
+  value {
+    name: "MyPositionAccuracy"
+    color: 3942645760
+  }
+  value {
+    name: "BookmarkOrange"
+    color: 16752640
+  }
+  value {
+    name: "TrafficArrowLight"
+    color: 16777215
+  }
+  value {
+    name: "TransitMarkSecondaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "RatingGood"
+    color: 9682745
+  }
+  value {
+    name: "RatingExcellent"
+    color: 3968060
+  }
+  value {
+    name: "BookmarkCyan"
+    color: 113876
+  }
+  value {
+    name: "TransitBackground"
+    color: 2583691263
+  }
+  value {
+    name: "Arrow3DOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGray"
+    color: 7697781
+  }
+  value {
+    name: "RouteMarkSecondaryText"
+  }
+  value {
+    name: "TrackPlaneSpeed"
+    color: 11057133
+  }
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
+  value {
+    name: "LocalAdsSecondaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGreen"
+    color: 3706428
+  }
+  value {
+    name: "TrafficG3"
+    color: 4294761984
+  }
+  value {
+    name: "BookmarkBlueGray"
+    color: 6323595
+  }
+  value {
+    name: "TrafficG1"
+    color: 14951168
+  }
+  value {
+    name: "Selection"
+    color: 1545508592
+  }
+  value {
+    name: "TrafficG5"
+    color: 3773998
+  }
+  value {
+    name: "TrafficG4"
+    color: 3773998
+  }
+  value {
+    name: "RatingNone"
+    color: 5862272
+  }
   value {
     name: "RouteMarkSecondaryTextOutline"
     color: 16777215
@@ -42689,10 +42583,6 @@ colors {
     name: "BookmarkLime"
     color: 8306489
   }
-  value {
-    name: "TrafficG4"
-    color: 3773998
-  }
   value {
     name: "RouteBicycle"
     color: 865871792
@@ -42701,4 +42591,139 @@ colors {
     name: "TrafficArrowDark"
     color: 4666933
   }
+  value {
+    name: "TransitStopInnerMarker"
+    color: 16777215
+  }
+  value {
+    name: "RatingLocalAds"
+    color: 2399474
+  }
+  value {
+    name: "TrackHumanSpeed"
+    color: 1913758
+  }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3422763904
+  }
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+  }
+  value {
+    name: "RoutePedestrian"
+    color: 857551774
+  }
+  value {
+    name: "RouteMarkPrimaryText"
+  }
+  value {
+    name: "Arrow3DShadow"
+    color: 3258727484
+  }
+  value {
+    name: "RoadShieldBlackText"
+  }
+  value {
+    name: "TransitMarkPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "TrafficG0"
+    color: 8263442
+  }
+  value {
+    name: "RoutePreview"
+    color: 3003121664
+  }
+  value {
+    name: "RouteMaskCar"
+    color: 3003121664
+  }
+  value {
+    name: "Arrow3D"
+    color: 5286655
+  }
+  value {
+    name: "TrafficTempBlock"
+    color: 4605510
+  }
+  value {
+    name: "BookmarkYellow"
+    color: 16762880
+  }
+  value {
+    name: "TransitTransferInnerMarker"
+    color: 16777215
+  }
+  value {
+    name: "LocalAdsPrimaryText"
+  }
+  value {
+    name: "LocalAdsPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkPurple"
+    color: 10233776
+  }
+  value {
+    name: "TransitMarkPrimaryText"
+  }
+  value {
+    name: "BookmarkPink"
+    color: 16728450
+  }
+  value {
+    name: "PoiHotelTextOutline"
+    color: 1728053247
+  }
+  value {
+    name: "BookmarkBrown"
+    color: 7951688
+  }
+  value {
+    name: "BookmarkLightBlue"
+    color: 240116
+  }
+  value {
+    name: "RatingNormal"
+    color: 16762880
+  }
+  value {
+    name: "RoadShieldRedBackground"
+    color: 15086900
+  }
+  value {
+    name: "RouteMarkPrimaryTextOutline"
+    color: 16777215
+  }
+  value {
+    name: "LocalAdsSecondaryText"
+  }
+  value {
+    name: "Route"
+    color: 34815
+  }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 3432785840
+  }
+  value {
+    name: "RatingBad"
+    color: 15754290
+  }
+  value {
+    name: "TrackCarSpeed"
+    color: 8163038
+  }
+  value {
+    name: "TrafficG2"
+    color: 14951168
+  }
+  value {
+    name: "RoadShieldGreenBackground"
+    color: 3183362
+  }
 }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 3a41182506..d548acc7f2 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 0afbdf5719..83ceaa014c 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -42781,26 +42781,10 @@ cont {
   }
 }
 colors {
-  value {
-    name: "BookmarkPurple"
-    color: 10233776
-  }
-  value {
-    name: "RatingText"
-    color: 16777215
-  }
   value {
     name: "TrafficOutline"
     color: 3684408
   }
-  value {
-    name: "RouteMaskPedestrian"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkBlue"
-    color: 28359
-  }
   value {
     name: "RoadShieldWhiteText"
     color: 12039862
@@ -42809,22 +42793,10 @@ colors {
     name: "TrackUnknownDistance"
     color: 9868950
   }
-  value {
-    name: "MyPositionAccuracy"
-    color: 4043309055
-  }
-  value {
-    name: "RatingLocalAds"
-    color: 4962790
-  }
   value {
     name: "GuiText"
     color: 1308622847
   }
-  value {
-    name: "PoiHotelTextOutline"
-    color: 1711276032
-  }
   value {
     name: "BookmarkRed"
     color: 15014691
@@ -42837,210 +42809,41 @@ colors {
     name: "RouteMaskBicycle"
     color: 2147483648
   }
-  value {
-    name: "LocalAdsPrimaryText"
-    color: 8947848
-  }
   value {
     name: "RoadShieldUKYellowText"
     color: 11836942
   }
-  value {
-    name: "BookmarkBlueGray"
-    color: 6323595
-  }
   value {
     name: "RoadShieldBlueBackground"
     color: 2706568
   }
-  value {
-    name: "RatingGood"
-    color: 9682745
-  }
-  value {
-    name: "RouteArrowsMaskCar"
-    color: 3003473869
-  }
-  value {
-    name: "BookmarkCyan"
-    color: 113876
-  }
-  value {
-    name: "BookmarkBrown"
-    color: 7951688
-  }
   value {
     name: "BookmarkDeepOrange"
     color: 6323595
   }
-  value {
-    name: "Arrow3DShadow"
-    color: 3258727484
-  }
-  value {
-    name: "RatingExcellent"
-    color: 3968060
-  }
-  value {
-    name: "RouteTrafficG2"
-    color: 8327953
-  }
-  value {
-    name: "BookmarkPink"
-    color: 16728450
-  }
-  value {
-    name: "LocalAdsSecondaryText"
-    color: 8947848
-  }
-  value {
-    name: "RatingNone"
-    color: 5862272
-  }
-  value {
-    name: "BookmarkGray"
-    color: 7697781
-  }
-  value {
-    name: "TransitBackground"
-    color: 2566914048
-  }
   value {
     name: "RoadShieldOrangeBackground"
     color: 1272880
   }
-  value {
-    name: "RatingNormal"
-    color: 16762880
-  }
-  value {
-    name: "Arrow3DOutline"
-    color: 16777215
-  }
-  value {
-    name: "LocalAdsPrimaryTextOutline"
-  }
-  value {
-    name: "RoadShieldRedBackground"
-    color: 10426903
-  }
-  value {
-    name: "RouteMarkPrimaryText"
-    color: 8947848
-  }
-  value {
-    name: "RouteMarkPrimaryTextOutline"
-  }
-  value {
-    name: "RouteTrafficG3"
-    color: 4288578070
-  }
   value {
     name: "BookmarkDeepPurple"
     color: 6765239
   }
-  value {
-    name: "RatingBad"
-    color: 15754290
-  }
-  value {
-    name: "RoadShieldBlackText"
-    color: 2171169
-  }
-  value {
-    name: "RoutePedestrian"
-    color: 1308604747
-  }
-  value {
-    name: "Route"
-    color: 34815
-  }
   value {
     name: "RouteOutline"
     color: 352205
   }
-  value {
-    name: "TrackHumanSpeed"
-    color: 16750592
-  }
-  value {
-    name: "RouteMarkSecondaryText"
-    color: 8947848
-  }
-  value {
-    name: "TrackPlaneSpeed"
-    color: 16774560
-  }
   value {
     name: "RatingHorrible"
     color: 15088685
   }
-  value {
-    name: "TrafficG0"
-    color: 4985359
-  }
-  value {
-    name: "RouteArrowsMaskBicycle"
-    color: 2164214668
-  }
-  value {
-    name: "BookmarkLightBlue"
-    color: 240116
-  }
-  value {
-    name: "RoutePreview"
-    color: 3019898879
-  }
-  value {
-    name: "LocalAdsSecondaryTextOutline"
-  }
-  value {
-    name: "RouteMaskCar"
-    color: 2147483648
-  }
-  value {
-    name: "BookmarkGreen"
-    color: 3706428
-  }
-  value {
-    name: "Arrow3D"
-    color: 4311295
-  }
   value {
     name: "BookmarkTeal"
     color: 38280
   }
   value {
-    name: "TrafficG3"
-    color: 4287393810
-  }
-  value {
-    name: "BookmarkOrange"
-    color: 16752640
-  }
-  value {
-    name: "TrafficG1"
-    color: 7542806
-  }
-  value {
-    name: "TrackCarSpeed"
-    color: 16763432
-  }
-  value {
-    name: "TrafficTempBlock"
-    color: 2302755
-  }
-  value {
-    name: "BookmarkYellow"
-    color: 16762880
-  }
-  value {
-    name: "TrafficG5"
-    color: 3629602
-  }
-  value {
-    name: "Selection"
-    color: 1548466662
+    name: "TransitMarkSecondaryText"
+    color: 8947848
   }
   value {
     name: "Arrow3DObsolete"
@@ -43050,20 +42853,7 @@ colors {
     name: "TrafficUnknown"
   }
   value {
-    name: "TrafficG2"
-    color: 7542806
-  }
-  value {
-    name: "RoadShieldGreenBackground"
-    color: 1272880
-  }
-  value {
-    name: "DefaultTrackColor"
-    color: 2004720
-  }
-  value {
-    name: "TrafficArrowLight"
-    color: 11184810
+    name: "TransitTransferOuterMarker"
   }
   value {
     name: "RouteTrafficG1"
@@ -43073,6 +42863,108 @@ colors {
     name: "RouteTrafficG0"
     color: 6164237
   }
+  value {
+    name: "RouteTrafficG3"
+    color: 4288578070
+  }
+  value {
+    name: "RouteTrafficG2"
+    color: 8327953
+  }
+  value {
+    name: "RatingText"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkBlue"
+    color: 28359
+  }
+  value {
+    name: "MyPositionAccuracy"
+    color: 4043309055
+  }
+  value {
+    name: "BookmarkOrange"
+    color: 16752640
+  }
+  value {
+    name: "TrafficArrowLight"
+    color: 11184810
+  }
+  value {
+    name: "TransitMarkSecondaryTextOutline"
+  }
+  value {
+    name: "RatingGood"
+    color: 9682745
+  }
+  value {
+    name: "RatingExcellent"
+    color: 3968060
+  }
+  value {
+    name: "BookmarkCyan"
+    color: 113876
+  }
+  value {
+    name: "TransitBackground"
+    color: 2566914048
+  }
+  value {
+    name: "Arrow3DOutline"
+    color: 16777215
+  }
+  value {
+    name: "BookmarkGray"
+    color: 7697781
+  }
+  value {
+    name: "RouteMarkSecondaryText"
+    color: 8947848
+  }
+  value {
+    name: "TrackPlaneSpeed"
+    color: 16774560
+  }
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
+  value {
+    name: "LocalAdsSecondaryTextOutline"
+  }
+  value {
+    name: "BookmarkGreen"
+    color: 3706428
+  }
+  value {
+    name: "TrafficG3"
+    color: 4287393810
+  }
+  value {
+    name: "BookmarkBlueGray"
+    color: 6323595
+  }
+  value {
+    name: "TrafficG1"
+    color: 7542806
+  }
+  value {
+    name: "Selection"
+    color: 1548466662
+  }
+  value {
+    name: "TrafficG5"
+    color: 3629602
+  }
+  value {
+    name: "TrafficG4"
+    color: 3629602
+  }
+  value {
+    name: "RatingNone"
+    color: 5862272
+  }
   value {
     name: "RouteMarkSecondaryTextOutline"
   }
@@ -43080,10 +42972,6 @@ colors {
     name: "BookmarkLime"
     color: 8306489
   }
-  value {
-    name: "TrafficG4"
-    color: 3629602
-  }
   value {
     name: "RouteBicycle"
     color: 1308576652
@@ -43092,4 +42980,140 @@ colors {
     name: "TrafficArrowDark"
     color: 1973790
   }
+  value {
+    name: "TransitStopInnerMarker"
+  }
+  value {
+    name: "RatingLocalAds"
+    color: 4962790
+  }
+  value {
+    name: "TrackHumanSpeed"
+    color: 16750592
+  }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3003473869
+  }
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+  }
+  value {
+    name: "RoutePedestrian"
+    color: 1308604747
+  }
+  value {
+    name: "RouteMarkPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "Arrow3DShadow"
+    color: 3258727484
+  }
+  value {
+    name: "RoadShieldBlackText"
+    color: 2171169
+  }
+  value {
+    name: "TransitMarkPrimaryTextOutline"
+  }
+  value {
+    name: "TrafficG0"
+    color: 4985359
+  }
+  value {
+    name: "RoutePreview"
+    color: 3019898879
+  }
+  value {
+    name: "RouteMaskCar"
+    color: 2147483648
+  }
+  value {
+    name: "Arrow3D"
+    color: 4311295
+  }
+  value {
+    name: "TrafficTempBlock"
+    color: 2302755
+  }
+  value {
+    name: "BookmarkYellow"
+    color: 16762880
+  }
+  value {
+    name: "TransitTransferInnerMarker"
+    color: 8947848
+  }
+  value {
+    name: "LocalAdsPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "LocalAdsPrimaryTextOutline"
+  }
+  value {
+    name: "BookmarkPurple"
+    color: 10233776
+  }
+  value {
+    name: "TransitMarkPrimaryText"
+    color: 8947848
+  }
+  value {
+    name: "BookmarkPink"
+    color: 16728450
+  }
+  value {
+    name: "PoiHotelTextOutline"
+    color: 1711276032
+  }
+  value {
+    name: "BookmarkBrown"
+    color: 7951688
+  }
+  value {
+    name: "BookmarkLightBlue"
+    color: 240116
+  }
+  value {
+    name: "RatingNormal"
+    color: 16762880
+  }
+  value {
+    name: "RoadShieldRedBackground"
+    color: 10426903
+  }
+  value {
+    name: "RouteMarkPrimaryTextOutline"
+  }
+  value {
+    name: "LocalAdsSecondaryText"
+    color: 8947848
+  }
+  value {
+    name: "Route"
+    color: 34815
+  }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 2164214668
+  }
+  value {
+    name: "RatingBad"
+    color: 15754290
+  }
+  value {
+    name: "TrackCarSpeed"
+    color: 16763432
+  }
+  value {
+    name: "TrafficG2"
+    color: 7542806
+  }
+  value {
+    name: "RoadShieldGreenBackground"
+    color: 1272880
+  }
 }