diff --git a/data/colors.txt b/data/colors.txt
index b6fde1f82..a2c71ff82 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -200,11 +200,15 @@
 9211020
 9326109
 9404166
+9482692
+9614535
 9682745
 9718290
+9746121
 9815480
 9868939
 9868950
+9877964
 10066329
 10167040
 10167474
@@ -215,7 +219,6 @@
 10395294
 10426903
 10592406
-10597310
 10790054
 11053224
 11057133
@@ -276,6 +279,7 @@
 15263452
 15263939
 15265772
+15524822
 15592411
 15592899
 15656370
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ed0e97a2f..85d286575 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 1f2b3b846..53dd835c9 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2124,28 +2124,28 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
   }
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
   }
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
   }
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
   }
@@ -2320,7 +2320,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2372,7 +2372,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
     symbol {
@@ -2393,7 +2393,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
     symbol {
@@ -2414,7 +2414,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2442,7 +2442,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
     symbol {
@@ -2638,7 +2638,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -75171,14 +75171,14 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
   }
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75192,7 +75192,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75206,7 +75206,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75220,7 +75220,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -76944,7 +76944,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -76958,7 +76958,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -76972,7 +76972,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -76986,7 +76986,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77000,7 +77000,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 74ac2a825..ff62d4d5f 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index ae8fb7e60..3c5593263 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -2124,28 +2124,28 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
   }
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
   }
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
   }
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
   }
@@ -2320,7 +2320,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2372,7 +2372,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
     symbol {
@@ -2393,7 +2393,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
     symbol {
@@ -2414,7 +2414,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2442,7 +2442,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
     symbol {
@@ -2638,7 +2638,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -70280,14 +70280,14 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
   }
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -70301,7 +70301,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -70315,7 +70315,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -70329,7 +70329,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -71847,7 +71847,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -71861,7 +71861,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -71875,7 +71875,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -71889,7 +71889,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -71903,7 +71903,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 42aa74659..28bc1ced8 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 08a843c2f..eb22ed338 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -2124,28 +2124,28 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
   }
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
   }
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
   }
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
   }
@@ -2320,7 +2320,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2372,7 +2372,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 10597310
+      color: 9877964
       priority: -1970
     }
     symbol {
@@ -2393,7 +2393,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 10597310
+      color: 9746121
       priority: -1970
     }
     symbol {
@@ -2414,7 +2414,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -2442,7 +2442,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 10597310
+      color: 9482692
       priority: -1970
     }
     symbol {
@@ -2638,7 +2638,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 10597310
+      color: 9614535
       priority: -1970
     }
     symbol {
@@ -75565,14 +75565,14 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
   }
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75586,7 +75586,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75600,7 +75600,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -75614,7 +75614,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77314,7 +77314,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77328,7 +77328,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77342,7 +77342,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77356,7 +77356,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {
@@ -77370,7 +77370,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16248287
+      color: 15524822
       priority: -1890
     }
     caption {