diff --git a/src/c_plus_plus_serializer.hpp b/src/c_plus_plus_serializer.hpp
index cbecacc..fa783d9 100644
--- a/src/c_plus_plus_serializer.hpp
+++ b/src/c_plus_plus_serializer.hpp
@@ -296,8 +296,7 @@ static inline std::istream &operator>>(std::istream &in, Bits< C< T, N > & > v)
 ////////////////////////////////////////////////////////////////////////////
 
 template < template < class K, class V, class Compare = std::less< K >,
-                      class Alloc = std::allocator< std::pair< const K, V > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, V > > > class M,
            class K, class V >
 
 static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, V > & > const m)
@@ -314,8 +313,7 @@ static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, V > & > co
 }
 
 template < template < class K, class V, class Compare = std::less< K >,
-                      class Alloc = std::allocator< std::pair< const K, V > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, V > > > class M,
            class K, class V >
 
 static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, const V > & > const m)
@@ -332,8 +330,7 @@ static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, const V >
 }
 
 template < template < class K, class V, class Compare = std::less< K >,
-                      class Alloc = std::allocator< std::pair< const K, V > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, V > > > class M,
            class K, class V >
 
 static inline std::istream &operator>>(std::istream &in, Bits< M< K, V > & > m)
@@ -360,8 +357,7 @@ static inline std::istream &operator>>(std::istream &in, Bits< M< K, V > & > m)
 ////////////////////////////////////////////////////////////////////////////
 
 template < template < class K, class T, class Hash = std::hash< K >, class Pred = std::equal_to< K >,
-                      class Alloc = std::allocator< std::pair< const K, T > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, T > > > class M,
            class K, class V >
 
 static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, V > & > const m)
@@ -378,8 +374,7 @@ static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, V > & > co
 }
 
 template < template < class K, class T, class Hash = std::hash< K >, class Pred = std::equal_to< K >,
-                      class Alloc = std::allocator< std::pair< const K, T > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, T > > > class M,
            class K, class V >
 
 static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, const V > & > const m)
@@ -396,8 +391,7 @@ static inline std::ostream &operator<<(std::ostream &out, Bits< M< K, const V >
 }
 
 template < template < class K, class T, class Hash = std::hash< K >, class Pred = std::equal_to< K >,
-                      class Alloc = std::allocator< std::pair< const K, T > > >
-           class M,
+                      class Alloc = std::allocator< std::pair< const K, T > > > class M,
            class K, class V >
 
 static inline std::istream &operator>>(std::istream &in, Bits< M< K, V > & > m)
@@ -439,9 +433,9 @@ static inline std::ostream &operator<<(std::ostream &out, Bits< M< K > & > const
   return out;
 }
 
-template < template < class K, class Compare = std::less< const K >, class Allocator = std::allocator< const K > >
-           class M,
-           class K >
+template <
+    template < class K, class Compare = std::less< const K >, class Allocator = std::allocator< const K > > class M,
+    class K >
 
 static inline std::ostream &operator<<(std::ostream &out, Bits< M< K > & > const m)
 {
diff --git a/src/color1.cpp b/src/color1.cpp
index d672671..778954a 100644
--- a/src/color1.cpp
+++ b/src/color1.cpp
@@ -10,75 +10,75 @@
 #include <strings.h>
 
 // begin sort marker1 {
-color AQUAMARINE;
 color AQUAMARINE1;
 color AQUAMARINE2;
 color AQUAMARINE3;
 color AQUAMARINE4;
-color AZURE;
+color AQUAMARINE;
 color AZURE1;
 color AZURE2;
 color AZURE3;
 color AZURE4;
+color AZURE;
 color BEIGE;
-color BISQUE;
 color BISQUE1;
 color BISQUE2;
 color BISQUE3;
 color BISQUE4;
+color BISQUE;
 color BLACK;
 color BLANCHEDALMOND;
-color BLUE;
 color BLUE1;
 color BLUE2;
 color BLUE3;
 color BLUE4;
-color BLUE_VIOLET;
+color BLUE;
 color BLUEVIOLET;
-color BROWN;
+color BLUE_VIOLET;
 color BROWN1;
 color BROWN2;
 color BROWN3;
 color BROWN4;
-color BURLYWOOD;
+color BROWN;
 color BURLYWOOD1;
 color BURLYWOOD2;
 color BURLYWOOD3;
 color BURLYWOOD4;
-color CADET_BLUE;
-color CADETBLUE;
+color BURLYWOOD;
 color CADETBLUE1;
 color CADETBLUE2;
 color CADETBLUE3;
 color CADETBLUE4;
-color CHARTREUSE;
+color CADETBLUE;
+color CADET_BLUE;
 color CHARTREUSE1;
 color CHARTREUSE2;
 color CHARTREUSE3;
 color CHARTREUSE4;
-color CHOCOLATE;
+color CHARTREUSE;
 color CHOCOLATE1;
 color CHOCOLATE2;
 color CHOCOLATE3;
 color CHOCOLATE4;
+color CHOCOLATE;
 color COLOR_NONE;
-color CORAL;
 color CORAL1;
 color CORAL2;
 color CORAL3;
 color CORAL4;
-color CORNFLOWER_BLUE;
+color CORAL;
 color CORNFLOWERBLUE;
-color CORNSILK;
+color CORNFLOWER_BLUE;
 color CORNSILK1;
 color CORNSILK2;
 color CORNSILK3;
 color CORNSILK4;
-color CYAN;
+color CORNSILK;
 color CYAN1;
 color CYAN2;
 color CYAN3;
 color CYAN4;
+color CYAN;
 color DARKBLUE;
 color DARKCYAN;
 color DARKGRAY;
@@ -86,74 +86,74 @@ color DARKGREEN;
 color DARKGREY;
 color DARKKHAKI;
 color DARKMAGENTA;
-color DARKOLIVEGREEN;
 color DARKOLIVEGREEN1;
 color DARKOLIVEGREEN2;
 color DARKOLIVEGREEN3;
 color DARKOLIVEGREEN4;
-color DARKORANGE;
+color DARKOLIVEGREEN;
 color DARKORANGE1;
 color DARKORANGE2;
 color DARKORANGE3;
 color DARKORANGE4;
+color DARKORANGE;
 color DARKRED;
-color DARKSEAGREEN;
 color DARKSEAGREEN1;
 color DARKSEAGREEN2;
 color DARKSEAGREEN3;
 color DARKSEAGREEN4;
+color DARKSEAGREEN;
 color DARKSLATEBLUE;
-color DARKSLATEGRAY;
 color DARKSLATEGRAY1;
 color DARKSLATEGRAY2;
 color DARKSLATEGRAY3;
 color DARKSLATEGRAY4;
-color DARKSLATEGREY;
+color DARKSLATEGRAY;
 color DARKSLATEGREY1;
 color DARKSLATEGREY2;
 color DARKSLATEGREY3;
 color DARKSLATEGREY4;
+color DARKSLATEGREY;
 color DARKTURQUOISE;
 color DARKVIOLET;
 color DEEPBLUE;
-color DEEP_PINK;
-color DEEPPINK;
 color DEEPPINK1;
 color DEEPPINK2;
 color DEEPPINK3;
 color DEEPPINK4;
-color DEEPSKYBLUE;
+color DEEPPINK;
 color DEEPSKYBLUE1;
 color DEEPSKYBLUE2;
 color DEEPSKYBLUE3;
 color DEEPSKYBLUE4;
-color DIM_GRAY;
+color DEEPSKYBLUE;
+color DEEP_PINK;
 color DIMGRAY;
-color DIM_GREY;
 color DIMGREY;
-color DODGER_BLUE;
-color DODGERBLUE;
+color DIM_GRAY;
+color DIM_GREY;
 color DODGERBLUE1;
 color DODGERBLUE2;
 color DODGERBLUE3;
 color DODGERBLUE4;
-color FIREBRICK;
+color DODGERBLUE;
+color DODGER_BLUE;
 color FIREBRICK1;
 color FIREBRICK2;
 color FIREBRICK3;
 color FIREBRICK4;
-color FLORAL_WHITE;
+color FIREBRICK;
 color FLORALWHITE;
-color FOREST_GREEN;
+color FLORAL_WHITE;
 color FORESTGREEN;
+color FOREST_GREEN;
 color GAINSBORO;
-color GHOST_WHITE;
 color GHOSTWHITE;
-color GOLD;
+color GHOST_WHITE;
 color GOLD1;
 color GOLD2;
 color GOLD3;
 color GOLD4;
+color GOLD;
 color LIME;
 color LIMEGREEN;
 color PALEBLUE;
@@ -167,71 +167,71 @@ void color_init1(void)
   TRACE_AND_INDENT();
 
   // begin sort marker2 {
+  color_set("aquamarine", &AQUAMARINE, 127, 255, 212, 255);
   color_set("aquamarine1", &AQUAMARINE1, 127, 255, 212, 255);
   color_set("aquamarine2", &AQUAMARINE2, 118, 238, 198, 255);
   color_set("aquamarine3", &AQUAMARINE3, 102, 205, 170, 255);
   color_set("aquamarine4", &AQUAMARINE4, 69, 139, 116, 255);
-  color_set("aquamarine", &AQUAMARINE, 127, 255, 212, 255);
+  color_set("azure", &AZURE, 240, 255, 255, 255);
   color_set("azure1", &AZURE1, 240, 255, 255, 255);
   color_set("azure2", &AZURE2, 224, 238, 238, 255);
   color_set("azure3", &AZURE3, 193, 205, 205, 255);
   color_set("azure4", &AZURE4, 131, 139, 139, 255);
-  color_set("azure", &AZURE, 240, 255, 255, 255);
   color_set("beige", &BEIGE, 245, 245, 220, 255);
+  color_set("bisque", &BISQUE, 255, 228, 196, 255);
   color_set("bisque1", &BISQUE1, 255, 228, 196, 255);
   color_set("bisque2", &BISQUE2, 238, 213, 183, 255);
   color_set("bisque3", &BISQUE3, 205, 183, 158, 255);
   color_set("bisque4", &BISQUE4, 139, 125, 107, 255);
-  color_set("bisque", &BISQUE, 255, 228, 196, 255);
   color_set("black", &BLACK, 0, 0, 0, 255);
   color_set("blanchedalmond", &BLANCHEDALMOND, 255, 235, 205, 255);
+  color_set("blue", &BLUE, 0, 0, 255, 255);
   color_set("blue1", &BLUE1, 0, 0, 255, 255);
   color_set("blue2", &BLUE2, 0, 0, 238, 255);
   color_set("blue3", &BLUE3, 0, 0, 205, 255);
   color_set("blue4", &BLUE4, 0, 0, 139, 255);
-  color_set("blue", &BLUE, 0, 0, 255, 255);
   color_set("blueviolet", &BLUEVIOLET, 138, 43, 226, 255);
+  color_set("brown", &BROWN, 165, 42, 42, 255);
   color_set("brown1", &BROWN1, 255, 64, 64, 255);
   color_set("brown2", &BROWN2, 238, 59, 59, 255);
   color_set("brown3", &BROWN3, 205, 51, 51, 255);
   color_set("brown4", &BROWN4, 139, 35, 35, 255);
-  color_set("brown", &BROWN, 165, 42, 42, 255);
+  color_set("burlywood", &BURLYWOOD, 222, 184, 135, 255);
   color_set("burlywood1", &BURLYWOOD1, 255, 211, 155, 255);
   color_set("burlywood2", &BURLYWOOD2, 238, 197, 145, 255);
   color_set("burlywood3", &BURLYWOOD3, 205, 170, 125, 255);
   color_set("burlywood4", &BURLYWOOD4, 139, 115, 85, 255);
-  color_set("burlywood", &BURLYWOOD, 222, 184, 135, 255);
+  color_set("cadetblue", &CADETBLUE, 95, 158, 160, 255);
   color_set("cadetblue1", &CADETBLUE1, 152, 245, 255, 255);
   color_set("cadetblue2", &CADETBLUE2, 142, 229, 238, 255);
   color_set("cadetblue3", &CADETBLUE3, 122, 197, 205, 255);
   color_set("cadetblue4", &CADETBLUE4, 83, 134, 139, 255);
-  color_set("cadetblue", &CADETBLUE, 95, 158, 160, 255);
+  color_set("chartreuse", &CHARTREUSE, 127, 255, 0, 255);
   color_set("chartreuse1", &CHARTREUSE1, 127, 255, 0, 255);
   color_set("chartreuse2", &CHARTREUSE2, 118, 238, 0, 255);
   color_set("chartreuse3", &CHARTREUSE3, 102, 205, 0, 255);
   color_set("chartreuse4", &CHARTREUSE4, 69, 139, 0, 255);
-  color_set("chartreuse", &CHARTREUSE, 127, 255, 0, 255);
+  color_set("chocolate", &CHOCOLATE, 210, 105, 30, 255);
   color_set("chocolate1", &CHOCOLATE1, 255, 127, 36, 255);
   color_set("chocolate2", &CHOCOLATE2, 238, 118, 33, 255);
   color_set("chocolate3", &CHOCOLATE3, 205, 102, 29, 255);
   color_set("chocolate4", &CHOCOLATE4, 139, 69, 19, 255);
-  color_set("chocolate", &CHOCOLATE, 210, 105, 30, 255);
+  color_set("coral", &CORAL, 255, 127, 80, 255);
   color_set("coral1", &CORAL1, 255, 114, 86, 255);
   color_set("coral2", &CORAL2, 238, 106, 80, 255);
   color_set("coral3", &CORAL3, 205, 91, 69, 255);
   color_set("coral4", &CORAL4, 139, 62, 47, 255);
-  color_set("coral", &CORAL, 255, 127, 80, 255);
   color_set("cornflowerblue", &CORNFLOWERBLUE, 100, 149, 237, 255);
+  color_set("cornsilk", &CORNSILK, 255, 248, 220, 255);
   color_set("cornsilk1", &CORNSILK1, 255, 248, 220, 255);
   color_set("cornsilk2", &CORNSILK2, 238, 232, 205, 255);
   color_set("cornsilk3", &CORNSILK3, 205, 200, 177, 255);
   color_set("cornsilk4", &CORNSILK4, 139, 136, 120, 255);
-  color_set("cornsilk", &CORNSILK, 255, 248, 220, 255);
+  color_set("cyan", &CYAN, 0, 255, 255, 255);
   color_set("cyan1", &CYAN1, 0, 255, 255, 255);
   color_set("cyan2", &CYAN2, 0, 238, 238, 255);
   color_set("cyan3", &CYAN3, 0, 205, 205, 255);
   color_set("cyan4", &CYAN4, 0, 139, 139, 255);
-  color_set("cyan", &CYAN, 0, 255, 255, 255);
   color_set("darkblue", &DARKBLUE, 0, 0, 139, 255);
   color_set("darkcyan", &DARKCYAN, 0, 139, 139, 255);
   color_set("darkgray", &DARKGRAY, 169, 169, 169, 255);
@@ -239,73 +239,73 @@ void color_init1(void)
   color_set("darkgrey", &DARKGREY, 169, 169, 169, 255);
   color_set("darkkhaki", &DARKKHAKI, 189, 183, 107, 255);
   color_set("darkmagenta", &DARKMAGENTA, 139, 0, 139, 255);
+  color_set("darkolivegreen", &DARKOLIVEGREEN, 85, 107, 47, 255);
   color_set("darkolivegreen1", &DARKOLIVEGREEN1, 202, 255, 112, 255);
   color_set("darkolivegreen2", &DARKOLIVEGREEN2, 188, 238, 104, 255);
   color_set("darkolivegreen3", &DARKOLIVEGREEN3, 162, 205, 90, 255);
   color_set("darkolivegreen4", &DARKOLIVEGREEN4, 110, 139, 61, 255);
-  color_set("darkolivegreen", &DARKOLIVEGREEN, 85, 107, 47, 255);
+  color_set("darkorange", &DARKORANGE, 255, 140, 0, 255);
   color_set("darkorange1", &DARKORANGE1, 255, 127, 0, 255);
   color_set("darkorange2", &DARKORANGE2, 238, 118, 0, 255);
   color_set("darkorange3", &DARKORANGE3, 205, 102, 0, 255);
   color_set("darkorange4", &DARKORANGE4, 139, 69, 0, 255);
-  color_set("darkorange", &DARKORANGE, 255, 140, 0, 255);
   color_set("darkred", &DARKRED, 139, 0, 0, 255);
+  color_set("darkseagreen", &DARKSEAGREEN, 143, 188, 143, 255);
   color_set("darkseagreen1", &DARKSEAGREEN1, 193, 255, 193, 255);
   color_set("darkseagreen2", &DARKSEAGREEN2, 180, 238, 180, 255);
   color_set("darkseagreen3", &DARKSEAGREEN3, 155, 205, 155, 255);
   color_set("darkseagreen4", &DARKSEAGREEN4, 105, 139, 105, 255);
-  color_set("darkseagreen", &DARKSEAGREEN, 143, 188, 143, 255);
   color_set("darkslateblue", &DARKSLATEBLUE, 72, 61, 139, 255);
+  color_set("darkslategray", &DARKSLATEGRAY, 47, 79, 79, 255);
   color_set("darkslategray1", &DARKSLATEGRAY1, 151, 255, 255, 255);
   color_set("darkslategray2", &DARKSLATEGRAY2, 141, 238, 238, 255);
   color_set("darkslategray3", &DARKSLATEGRAY3, 121, 205, 205, 255);
   color_set("darkslategray4", &DARKSLATEGRAY4, 82, 139, 139, 255);
-  color_set("darkslategray", &DARKSLATEGRAY, 47, 79, 79, 255);
+  color_set("darkslategrey", &DARKSLATEGREY, 47, 79, 79, 255);
   color_set("darkslategrey1", &DARKSLATEGREY1, 151, 255, 255, 255);
   color_set("darkslategrey2", &DARKSLATEGREY2, 141, 238, 238, 255);
   color_set("darkslategrey3", &DARKSLATEGREY3, 121, 205, 205, 255);
   color_set("darkslategrey4", &DARKSLATEGREY4, 82, 139, 139, 255);
-  color_set("darkslategrey", &DARKSLATEGREY, 47, 79, 79, 255);
   color_set("darkturquoise", &DARKTURQUOISE, 0, 206, 209, 255);
   color_set("darkviolet", &DARKVIOLET, 148, 0, 211, 255);
-  color_set("deepblue2", &DEEPBLUE, 12, 50, 80, 255);
   color_set("deepblue", &DEEPBLUE, 12, 20, 50, 255);
+  color_set("deepblue2", &DEEPBLUE, 12, 50, 80, 255);
+  color_set("deeppink", &DEEPPINK, 255, 20, 147, 255);
   color_set("deeppink1", &DEEPPINK1, 255, 20, 147, 255);
   color_set("deeppink2", &DEEPPINK2, 238, 18, 137, 255);
   color_set("deeppink3", &DEEPPINK3, 205, 16, 118, 255);
   color_set("deeppink4", &DEEPPINK4, 139, 10, 80, 255);
-  color_set("deeppink", &DEEPPINK, 255, 20, 147, 255);
+  color_set("deepskyblue", &DEEPSKYBLUE, 0, 191, 255, 255);
   color_set("deepskyblue1", &DEEPSKYBLUE1, 0, 191, 255, 255);
   color_set("deepskyblue2", &DEEPSKYBLUE2, 0, 178, 238, 255);
   color_set("deepskyblue3", &DEEPSKYBLUE3, 0, 154, 205, 255);
   color_set("deepskyblue4", &DEEPSKYBLUE4, 0, 104, 139, 255);
-  color_set("deepskyblue", &DEEPSKYBLUE, 0, 191, 255, 255);
   color_set("dimgray", &DIMGRAY, 105, 105, 105, 255);
   color_set("dimgrey", &DIMGREY, 105, 105, 105, 255);
+  color_set("dodgerblue", &DODGERBLUE, 30, 144, 255, 255);
   color_set("dodgerblue1", &DODGERBLUE1, 30, 144, 255, 255);
   color_set("dodgerblue2", &DODGERBLUE2, 28, 134, 238, 255);
   color_set("dodgerblue3", &DODGERBLUE3, 24, 116, 205, 255);
   color_set("dodgerblue4", &DODGERBLUE4, 16, 78, 139, 255);
-  color_set("dodgerblue", &DODGERBLUE, 30, 144, 255, 255);
+  color_set("firebrick", &FIREBRICK, 178, 34, 34, 255);
   color_set("firebrick1", &FIREBRICK1, 255, 48, 48, 255);
   color_set("firebrick2", &FIREBRICK2, 238, 44, 44, 255);
   color_set("firebrick3", &FIREBRICK3, 205, 38, 38, 255);
   color_set("firebrick4", &FIREBRICK4, 139, 26, 26, 255);
-  color_set("firebrick", &FIREBRICK, 178, 34, 34, 255);
   color_set("floralwhite", &FLORALWHITE, 255, 250, 240, 255);
   color_set("forestgreen", &FORESTGREEN, 34, 139, 34, 255);
   color_set("gainsboro", &GAINSBORO, 220, 220, 220, 255);
   color_set("ghostwhite", &GHOSTWHITE, 248, 248, 255, 255);
+  color_set("gold", &GOLD, 255, 215, 0, 255);
   color_set("gold1", &GOLD1, 255, 215, 0, 255);
   color_set("gold2", &GOLD2, 238, 201, 0, 255);
   color_set("gold3", &GOLD3, 205, 173, 0, 255);
   color_set("gold4", &GOLD4, 139, 117, 0, 255);
-  color_set("gold", &GOLD, 255, 215, 0, 255);
-  color_set("limegreen", &LIMEGREEN, 50, 205, 50, 255);
   color_set("lime", &LIME, 50, 205, 50, 255);
+  color_set("limegreen", &LIMEGREEN, 50, 205, 50, 255);
   color_set("none", &COLOR_NONE, 0, 0, 0, 0);
-  color_set("paleblue2", &PALEBLUE, 75, 120, 200, 255);
   color_set("paleblue", &PALEBLUE, 75, 75, 150, 255);
+  color_set("paleblue2", &PALEBLUE, 75, 120, 200, 255);
   color_set("silver", &SILVER, 192, 192, 192, 255);
   color_set("vdarkslateblue", &VDARKSLATEBLUE, 42, 31, 109, 255);
   color_set("vvdarkslateblue", &VVDARKSLATEBLUE, 32, 21, 99, 255);
diff --git a/src/color2.cpp b/src/color2.cpp
index 4732aec..e1c3d10 100644
--- a/src/color2.cpp
+++ b/src/color2.cpp
@@ -10,8 +10,6 @@
 #include <strings.h>
 
 // begin sort marker1 {
-color GRAY;
-color GRAY1;
 color GRAY10;
 color GRAY11;
 color GRAY12;
@@ -22,7 +20,7 @@ color GRAY16;
 color GRAY17;
 color GRAY18;
 color GRAY19;
-color GRAY2;
+color GRAY1;
 color GRAY20;
 color GRAY21;
 color GRAY22;
@@ -33,7 +31,7 @@ color GRAY26;
 color GRAY27;
 color GRAY28;
 color GRAY29;
-color GRAY3;
+color GRAY2;
 color GRAY30;
 color GRAY31;
 color GRAY32;
@@ -44,7 +42,7 @@ color GRAY36;
 color GRAY37;
 color GRAY38;
 color GRAY39;
-color GRAY4;
+color GRAY3;
 color GRAY40;
 color GRAY41;
 color GRAY42;
@@ -55,7 +53,7 @@ color GRAY46;
 color GRAY47;
 color GRAY48;
 color GRAY49;
-color GRAY5;
+color GRAY4;
 color GRAY50;
 color GRAY51;
 color GRAY52;
@@ -66,7 +64,7 @@ color GRAY56;
 color GRAY57;
 color GRAY58;
 color GRAY59;
-color GRAY6;
+color GRAY5;
 color GRAY60;
 color GRAY61;
 color GRAY62;
@@ -77,7 +75,7 @@ color GRAY66;
 color GRAY67;
 color GRAY68;
 color GRAY69;
-color GRAY7;
+color GRAY6;
 color GRAY70;
 color GRAY71;
 color GRAY72;
@@ -88,7 +86,7 @@ color GRAY76;
 color GRAY77;
 color GRAY78;
 color GRAY79;
-color GRAY8;
+color GRAY7;
 color GRAY80;
 color GRAY81;
 color GRAY82;
@@ -99,7 +97,7 @@ color GRAY86;
 color GRAY87;
 color GRAY88;
 color GRAY89;
-color GRAY9;
+color GRAY8;
 color GRAY90;
 color GRAY91;
 color GRAY92;
@@ -110,15 +108,15 @@ color GRAY96;
 color GRAY97;
 color GRAY98;
 color GRAY99;
-color GREEN;
+color GRAY9;
+color GRAY;
 color GREEN1;
 color GREEN2;
 color GREEN3;
 color GREEN4;
-color GREEN_YELLOW;
+color GREEN;
 color GREENYELLOW;
-color GREY;
-color GREY1;
+color GREEN_YELLOW;
 color GREY10;
 color GREY11;
 color GREY12;
@@ -129,7 +127,7 @@ color GREY16;
 color GREY17;
 color GREY18;
 color GREY19;
-color GREY2;
+color GREY1;
 color GREY20;
 color GREY21;
 color GREY22;
@@ -140,7 +138,7 @@ color GREY26;
 color GREY27;
 color GREY28;
 color GREY29;
-color GREY3;
+color GREY2;
 color GREY30;
 color GREY31;
 color GREY32;
@@ -151,7 +149,7 @@ color GREY36;
 color GREY37;
 color GREY38;
 color GREY39;
-color GREY4;
+color GREY3;
 color GREY40;
 color GREY41;
 color GREY42;
@@ -162,7 +160,7 @@ color GREY46;
 color GREY47;
 color GREY48;
 color GREY49;
-color GREY5;
+color GREY4;
 color GREY50;
 color GREY51;
 color GREY52;
@@ -173,7 +171,7 @@ color GREY56;
 color GREY57;
 color GREY58;
 color GREY59;
-color GREY6;
+color GREY5;
 color GREY60;
 color GREY61;
 color GREY62;
@@ -184,7 +182,7 @@ color GREY66;
 color GREY67;
 color GREY68;
 color GREY69;
-color GREY7;
+color GREY6;
 color GREY70;
 color GREY71;
 color GREY72;
@@ -195,7 +193,7 @@ color GREY76;
 color GREY77;
 color GREY78;
 color GREY79;
-color GREY8;
+color GREY7;
 color GREY80;
 color GREY81;
 color GREY82;
@@ -206,7 +204,7 @@ color GREY86;
 color GREY87;
 color GREY88;
 color GREY89;
-color GREY9;
+color GREY8;
 color GREY90;
 color GREY91;
 color GREY92;
@@ -217,6 +215,8 @@ color GREY96;
 color GREY97;
 color GREY98;
 color GREY99;
+color GREY9;
+color GREY;
 // end sort marker1 }
 
 void color_init2(void)
@@ -224,6 +224,8 @@ void color_init2(void)
   TRACE_AND_INDENT();
 
   // begin sort marker2 {
+  color_set("gray", &GRAY, 190, 190, 190, 255);
+  color_set("gray1", &GRAY1, 3, 3, 3, 255);
   color_set("gray10", &GRAY10, 26, 26, 26, 255);
   color_set("gray11", &GRAY11, 28, 28, 28, 255);
   color_set("gray12", &GRAY12, 31, 31, 31, 255);
@@ -234,7 +236,7 @@ void color_init2(void)
   color_set("gray17", &GRAY17, 43, 43, 43, 255);
   color_set("gray18", &GRAY18, 46, 46, 46, 255);
   color_set("gray19", &GRAY19, 48, 48, 48, 255);
-  color_set("gray1", &GRAY1, 3, 3, 3, 255);
+  color_set("gray2", &GRAY2, 5, 5, 5, 255);
   color_set("gray20", &GRAY20, 51, 51, 51, 255);
   color_set("gray21", &GRAY21, 54, 54, 54, 255);
   color_set("gray22", &GRAY22, 56, 56, 56, 255);
@@ -245,7 +247,7 @@ void color_init2(void)
   color_set("gray27", &GRAY27, 69, 69, 69, 255);
   color_set("gray28", &GRAY28, 71, 71, 71, 255);
   color_set("gray29", &GRAY29, 74, 74, 74, 255);
-  color_set("gray2", &GRAY2, 5, 5, 5, 255);
+  color_set("gray3", &GRAY3, 8, 8, 8, 255);
   color_set("gray30", &GRAY30, 77, 77, 77, 255);
   color_set("gray31", &GRAY31, 79, 79, 79, 255);
   color_set("gray32", &GRAY32, 82, 82, 82, 255);
@@ -256,7 +258,7 @@ void color_init2(void)
   color_set("gray37", &GRAY37, 94, 94, 94, 255);
   color_set("gray38", &GRAY38, 97, 97, 97, 255);
   color_set("gray39", &GRAY39, 99, 99, 99, 255);
-  color_set("gray3", &GRAY3, 8, 8, 8, 255);
+  color_set("gray4", &GRAY4, 10, 10, 10, 255);
   color_set("gray40", &GRAY40, 102, 102, 102, 255);
   color_set("gray41", &GRAY41, 105, 105, 105, 255);
   color_set("gray42", &GRAY42, 107, 107, 107, 255);
@@ -267,7 +269,7 @@ void color_init2(void)
   color_set("gray47", &GRAY47, 120, 120, 120, 255);
   color_set("gray48", &GRAY48, 122, 122, 122, 255);
   color_set("gray49", &GRAY49, 125, 125, 125, 255);
-  color_set("gray4", &GRAY4, 10, 10, 10, 255);
+  color_set("gray5", &GRAY5, 13, 13, 13, 255);
   color_set("gray50", &GRAY50, 127, 127, 127, 255);
   color_set("gray51", &GRAY51, 130, 130, 130, 255);
   color_set("gray52", &GRAY52, 133, 133, 133, 255);
@@ -278,7 +280,7 @@ void color_init2(void)
   color_set("gray57", &GRAY57, 145, 145, 145, 255);
   color_set("gray58", &GRAY58, 148, 148, 148, 255);
   color_set("gray59", &GRAY59, 150, 150, 150, 255);
-  color_set("gray5", &GRAY5, 13, 13, 13, 255);
+  color_set("gray6", &GRAY6, 15, 15, 15, 255);
   color_set("gray60", &GRAY60, 153, 153, 153, 255);
   color_set("gray61", &GRAY61, 156, 156, 156, 255);
   color_set("gray62", &GRAY62, 158, 158, 158, 255);
@@ -289,7 +291,7 @@ void color_init2(void)
   color_set("gray67", &GRAY67, 171, 171, 171, 255);
   color_set("gray68", &GRAY68, 173, 173, 173, 255);
   color_set("gray69", &GRAY69, 176, 176, 176, 255);
-  color_set("gray6", &GRAY6, 15, 15, 15, 255);
+  color_set("gray7", &GRAY7, 18, 18, 18, 255);
   color_set("gray70", &GRAY70, 179, 179, 179, 255);
   color_set("gray71", &GRAY71, 181, 181, 181, 255);
   color_set("gray72", &GRAY72, 184, 184, 184, 255);
@@ -300,7 +302,7 @@ void color_init2(void)
   color_set("gray77", &GRAY77, 196, 196, 196, 255);
   color_set("gray78", &GRAY78, 199, 199, 199, 255);
   color_set("gray79", &GRAY79, 201, 201, 201, 255);
-  color_set("gray7", &GRAY7, 18, 18, 18, 255);
+  color_set("gray8", &GRAY8, 20, 20, 20, 255);
   color_set("gray80", &GRAY80, 204, 204, 204, 255);
   color_set("gray81", &GRAY81, 207, 207, 207, 255);
   color_set("gray82", &GRAY82, 209, 209, 209, 255);
@@ -311,7 +313,7 @@ void color_init2(void)
   color_set("gray87", &GRAY87, 222, 222, 222, 255);
   color_set("gray88", &GRAY88, 224, 224, 224, 255);
   color_set("gray89", &GRAY89, 227, 227, 227, 255);
-  color_set("gray8", &GRAY8, 20, 20, 20, 255);
+  color_set("gray9", &GRAY9, 23, 23, 23, 255);
   color_set("gray90", &GRAY90, 229, 229, 229, 255);
   color_set("gray91", &GRAY91, 232, 232, 232, 255);
   color_set("gray92", &GRAY92, 235, 235, 235, 255);
@@ -322,14 +324,14 @@ void color_init2(void)
   color_set("gray97", &GRAY97, 247, 247, 247, 255);
   color_set("gray98", &GRAY98, 250, 250, 250, 255);
   color_set("gray99", &GRAY99, 252, 252, 252, 255);
-  color_set("gray9", &GRAY9, 23, 23, 23, 255);
-  color_set("gray", &GRAY, 190, 190, 190, 255);
+  color_set("green", &GREEN, 0, 255, 0, 255);
   color_set("green1", &GREEN1, 0, 255, 0, 255);
   color_set("green2", &GREEN2, 0, 238, 0, 255);
   color_set("green3", &GREEN3, 0, 205, 0, 255);
   color_set("green4", &GREEN4, 0, 139, 0, 255);
-  color_set("green", &GREEN, 0, 255, 0, 255);
   color_set("greenyellow", &GREENYELLOW, 173, 255, 47, 255);
+  color_set("grey", &GREY, 190, 190, 190, 255);
+  color_set("grey1", &GREY1, 3, 3, 3, 255);
   color_set("grey10", &GREY10, 26, 26, 26, 255);
   color_set("grey11", &GREY11, 28, 28, 28, 255);
   color_set("grey12", &GREY12, 31, 31, 31, 255);
@@ -340,7 +342,7 @@ void color_init2(void)
   color_set("grey17", &GREY17, 43, 43, 43, 255);
   color_set("grey18", &GREY18, 46, 46, 46, 255);
   color_set("grey19", &GREY19, 48, 48, 48, 255);
-  color_set("grey1", &GREY1, 3, 3, 3, 255);
+  color_set("grey2", &GREY2, 5, 5, 5, 255);
   color_set("grey20", &GREY20, 51, 51, 51, 255);
   color_set("grey21", &GREY21, 54, 54, 54, 255);
   color_set("grey22", &GREY22, 56, 56, 56, 255);
@@ -351,7 +353,7 @@ void color_init2(void)
   color_set("grey27", &GREY27, 69, 69, 69, 255);
   color_set("grey28", &GREY28, 71, 71, 71, 255);
   color_set("grey29", &GREY29, 74, 74, 74, 255);
-  color_set("grey2", &GREY2, 5, 5, 5, 255);
+  color_set("grey3", &GREY3, 8, 8, 8, 255);
   color_set("grey30", &GREY30, 77, 77, 77, 255);
   color_set("grey31", &GREY31, 79, 79, 79, 255);
   color_set("grey32", &GREY32, 82, 82, 82, 255);
@@ -362,7 +364,7 @@ void color_init2(void)
   color_set("grey37", &GREY37, 94, 94, 94, 255);
   color_set("grey38", &GREY38, 97, 97, 97, 255);
   color_set("grey39", &GREY39, 99, 99, 99, 255);
-  color_set("grey3", &GREY3, 8, 8, 8, 255);
+  color_set("grey4", &GREY4, 10, 10, 10, 255);
   color_set("grey40", &GREY40, 102, 102, 102, 255);
   color_set("grey41", &GREY41, 105, 105, 105, 255);
   color_set("grey42", &GREY42, 107, 107, 107, 255);
@@ -373,7 +375,7 @@ void color_init2(void)
   color_set("grey47", &GREY47, 120, 120, 120, 255);
   color_set("grey48", &GREY48, 122, 122, 122, 255);
   color_set("grey49", &GREY49, 125, 125, 125, 255);
-  color_set("grey4", &GREY4, 10, 10, 10, 255);
+  color_set("grey5", &GREY5, 13, 13, 13, 255);
   color_set("grey50", &GREY50, 127, 127, 127, 255);
   color_set("grey51", &GREY51, 130, 130, 130, 255);
   color_set("grey52", &GREY52, 133, 133, 133, 255);
@@ -384,7 +386,7 @@ void color_init2(void)
   color_set("grey57", &GREY57, 145, 145, 145, 255);
   color_set("grey58", &GREY58, 148, 148, 148, 255);
   color_set("grey59", &GREY59, 150, 150, 150, 255);
-  color_set("grey5", &GREY5, 13, 13, 13, 255);
+  color_set("grey6", &GREY6, 15, 15, 15, 255);
   color_set("grey60", &GREY60, 153, 153, 153, 255);
   color_set("grey61", &GREY61, 156, 156, 156, 255);
   color_set("grey62", &GREY62, 158, 158, 158, 255);
@@ -395,7 +397,7 @@ void color_init2(void)
   color_set("grey67", &GREY67, 171, 171, 171, 255);
   color_set("grey68", &GREY68, 173, 173, 173, 255);
   color_set("grey69", &GREY69, 176, 176, 176, 255);
-  color_set("grey6", &GREY6, 15, 15, 15, 255);
+  color_set("grey7", &GREY7, 18, 18, 18, 255);
   color_set("grey70", &GREY70, 179, 179, 179, 255);
   color_set("grey71", &GREY71, 181, 181, 181, 255);
   color_set("grey72", &GREY72, 184, 184, 184, 255);
@@ -406,7 +408,7 @@ void color_init2(void)
   color_set("grey77", &GREY77, 196, 196, 196, 255);
   color_set("grey78", &GREY78, 199, 199, 199, 255);
   color_set("grey79", &GREY79, 201, 201, 201, 255);
-  color_set("grey7", &GREY7, 18, 18, 18, 255);
+  color_set("grey8", &GREY8, 20, 20, 20, 255);
   color_set("grey80", &GREY80, 204, 204, 204, 255);
   color_set("grey81", &GREY81, 207, 207, 207, 255);
   color_set("grey82", &GREY82, 209, 209, 209, 255);
@@ -417,7 +419,7 @@ void color_init2(void)
   color_set("grey87", &GREY87, 222, 222, 222, 255);
   color_set("grey88", &GREY88, 224, 224, 224, 255);
   color_set("grey89", &GREY89, 227, 227, 227, 255);
-  color_set("grey8", &GREY8, 20, 20, 20, 255);
+  color_set("grey9", &GREY9, 23, 23, 23, 255);
   color_set("grey90", &GREY90, 229, 229, 229, 255);
   color_set("grey91", &GREY91, 232, 232, 232, 255);
   color_set("grey92", &GREY92, 235, 235, 235, 255);
@@ -428,7 +430,5 @@ void color_init2(void)
   color_set("grey97", &GREY97, 247, 247, 247, 255);
   color_set("grey98", &GREY98, 250, 250, 250, 255);
   color_set("grey99", &GREY99, 252, 252, 252, 255);
-  color_set("grey9", &GREY9, 23, 23, 23, 255);
-  color_set("grey", &GREY, 190, 190, 190, 255);
   // end sort marker2 }
 }
diff --git a/src/color3.cpp b/src/color3.cpp
index d272af6..ac7fad3 100644
--- a/src/color3.cpp
+++ b/src/color3.cpp
@@ -11,60 +11,60 @@
 
 // begin sort marker1 {
 color DEEPWATER;
-color HOT_PINK;
-color HOTPINK;
 color HOTPINK1;
 color HOTPINK2;
 color HOTPINK3;
 color HOTPINK4;
-color INDIAN_RED;
-color INDIANRED;
+color HOTPINK;
+color HOT_PINK;
 color INDIANRED1;
 color INDIANRED2;
 color INDIANRED3;
 color INDIANRED4;
-color IVORY;
+color INDIANRED;
+color INDIAN_RED;
 color IVORY1;
 color IVORY2;
 color IVORY3;
 color IVORY4;
-color KHAKI;
+color IVORY;
 color KHAKI1;
 color KHAKI2;
 color KHAKI3;
 color KHAKI4;
+color KHAKI;
 color LAVENDER;
-color LEMON_CHIFFON;
-color LEMONCHIFFON;
 color LEMONCHIFFON1;
 color LEMONCHIFFON2;
 color LEMONCHIFFON3;
 color LEMONCHIFFON4;
-color LIGHTBLUE;
+color LEMONCHIFFON;
+color LEMON_CHIFFON;
 color LIGHTBLUE1;
 color LIGHTBLUE2;
 color LIGHTBLUE3;
 color LIGHTBLUE4;
+color LIGHTBLUE;
 color LIGHTCORAL;
-color LIGHTCYAN;
 color LIGHTCYAN1;
 color LIGHTCYAN2;
 color LIGHTCYAN3;
 color LIGHTCYAN4;
+color LIGHTCYAN;
 color LIGHTGRAY;
 color LIGHTGREEN;
 color LIGHTGREY;
-color LIGHTPINK;
 color LIGHTPINK1;
 color LIGHTPINK2;
 color LIGHTPINK3;
 color LIGHTPINK4;
+color LIGHTPINK;
 color LIGHTSEAGREEN;
-color LIGHTSKYBLUE;
 color LIGHTSKYBLUE1;
 color LIGHTSKYBLUE2;
 color LIGHTSKYBLUE3;
 color LIGHTSKYBLUE4;
+color LIGHTSKYBLUE;
 color LIGHTSLATEBLUE;
 color LIGHTSLATEGRAY;
 color LIGHTSLATEGREY;
@@ -78,58 +78,58 @@ void color_init3(void)
 
   // begin sort marker2 {
   color_set("deepwater", &DEEPWATER, 20, 38, 124, 255);
+  color_set("hotpink", &HOTPINK, 255, 105, 180, 255);
   color_set("hotpink1", &HOTPINK1, 255, 110, 180, 255);
   color_set("hotpink2", &HOTPINK2, 238, 106, 167, 255);
   color_set("hotpink3", &HOTPINK3, 205, 96, 144, 255);
   color_set("hotpink4", &HOTPINK4, 139, 58, 98, 255);
-  color_set("hotpink", &HOTPINK, 255, 105, 180, 255);
+  color_set("indianred", &INDIANRED, 205, 92, 92, 255);
   color_set("indianred1", &INDIANRED1, 255, 106, 106, 255);
   color_set("indianred2", &INDIANRED2, 238, 99, 99, 255);
   color_set("indianred3", &INDIANRED3, 205, 85, 85, 255);
   color_set("indianred4", &INDIANRED4, 139, 58, 58, 255);
-  color_set("indianred", &INDIANRED, 205, 92, 92, 255);
+  color_set("ivory", &IVORY, 255, 255, 240, 255);
   color_set("ivory1", &IVORY1, 255, 255, 240, 255);
   color_set("ivory2", &IVORY2, 238, 238, 224, 255);
   color_set("ivory3", &IVORY3, 205, 205, 193, 255);
   color_set("ivory4", &IVORY4, 139, 139, 131, 255);
-  color_set("ivory", &IVORY, 255, 255, 240, 255);
+  color_set("khaki", &KHAKI, 240, 230, 140, 255);
   color_set("khaki1", &KHAKI1, 255, 246, 143, 255);
   color_set("khaki2", &KHAKI2, 238, 230, 133, 255);
   color_set("khaki3", &KHAKI3, 205, 198, 115, 255);
   color_set("khaki4", &KHAKI4, 139, 134, 78, 255);
-  color_set("khaki", &KHAKI, 240, 230, 140, 255);
   color_set("lavender", &LAVENDER, 230, 230, 250, 255);
+  color_set("lemon_chiffon", &LEMON_CHIFFON, 255, 250, 205, 255);
+  color_set("lemonchiffon", &LEMONCHIFFON, 255, 250, 205, 255);
   color_set("lemonchiffon1", &LEMONCHIFFON1, 255, 250, 205, 255);
   color_set("lemonchiffon2", &LEMONCHIFFON2, 238, 233, 191, 255);
   color_set("lemonchiffon3", &LEMONCHIFFON3, 205, 201, 165, 255);
   color_set("lemonchiffon4", &LEMONCHIFFON4, 139, 137, 112, 255);
-  color_set("lemon_chiffon", &LEMON_CHIFFON, 255, 250, 205, 255);
-  color_set("lemonchiffon", &LEMONCHIFFON, 255, 250, 205, 255);
+  color_set("lightblue", &LIGHTBLUE, 173, 216, 230, 255);
   color_set("lightblue1", &LIGHTBLUE1, 191, 239, 255, 255);
   color_set("lightblue2", &LIGHTBLUE2, 178, 223, 238, 255);
   color_set("lightblue3", &LIGHTBLUE3, 154, 192, 205, 255);
   color_set("lightblue4", &LIGHTBLUE4, 104, 131, 139, 255);
-  color_set("lightblue", &LIGHTBLUE, 173, 216, 230, 255);
   color_set("lightcoral", &LIGHTCORAL, 240, 128, 128, 255);
+  color_set("lightcyan", &LIGHTCYAN, 224, 255, 255, 255);
   color_set("lightcyan1", &LIGHTCYAN1, 224, 255, 255, 255);
   color_set("lightcyan2", &LIGHTCYAN2, 209, 238, 238, 255);
   color_set("lightcyan3", &LIGHTCYAN3, 180, 205, 205, 255);
   color_set("lightcyan4", &LIGHTCYAN4, 122, 139, 139, 255);
-  color_set("lightcyan", &LIGHTCYAN, 224, 255, 255, 255);
   color_set("lightgray", &LIGHTGRAY, 211, 211, 211, 255);
   color_set("lightgreen", &LIGHTGREEN, 144, 238, 144, 255);
   color_set("lightgrey", &LIGHTGREY, 211, 211, 211, 255);
+  color_set("lightpink", &LIGHTPINK, 255, 182, 193, 255);
   color_set("lightpink1", &LIGHTPINK1, 255, 174, 185, 255);
   color_set("lightpink2", &LIGHTPINK2, 238, 162, 173, 255);
   color_set("lightpink3", &LIGHTPINK3, 205, 140, 149, 255);
   color_set("lightpink4", &LIGHTPINK4, 139, 95, 101, 255);
-  color_set("lightpink", &LIGHTPINK, 255, 182, 193, 255);
   color_set("lightseagreen", &LIGHTSEAGREEN, 32, 178, 170, 255);
+  color_set("lightskyblue", &LIGHTSKYBLUE, 135, 206, 250, 255);
   color_set("lightskyblue1", &LIGHTSKYBLUE1, 176, 226, 255, 255);
   color_set("lightskyblue2", &LIGHTSKYBLUE2, 164, 211, 238, 255);
   color_set("lightskyblue3", &LIGHTSKYBLUE3, 141, 182, 205, 255);
   color_set("lightskyblue4", &LIGHTSKYBLUE4, 96, 123, 139, 255);
-  color_set("lightskyblue", &LIGHTSKYBLUE, 135, 206, 250, 255);
   color_set("lightslateblue", &LIGHTSLATEBLUE, 132, 112, 255, 255);
   color_set("lightslategray", &LIGHTSLATEGRAY, 119, 136, 153, 255);
   color_set("lightslategrey", &LIGHTSLATEGREY, 119, 136, 153, 255);
diff --git a/src/level_cursor.cpp b/src/level_cursor.cpp
index c7bfcd4..4c3709b 100644
--- a/src/level_cursor.cpp
+++ b/src/level_cursor.cpp
@@ -375,4 +375,3 @@ void level_cursor_update(Levelp l)
   //
   level_cursor_path_apply(l, cursor_path);
 }
-
diff --git a/src/my_color_defs.hpp b/src/my_color_defs.hpp
index e40d4a7..2b01262 100644
--- a/src/my_color_defs.hpp
+++ b/src/my_color_defs.hpp
@@ -9,75 +9,75 @@
 #include "my_color.hpp"
 
 // begin sort marker1 {
-extern color AQUAMARINE;
 extern color AQUAMARINE1;
 extern color AQUAMARINE2;
 extern color AQUAMARINE3;
 extern color AQUAMARINE4;
-extern color AZURE;
+extern color AQUAMARINE;
 extern color AZURE1;
 extern color AZURE2;
 extern color AZURE3;
 extern color AZURE4;
+extern color AZURE;
 extern color BEIGE;
-extern color BISQUE;
 extern color BISQUE1;
 extern color BISQUE2;
 extern color BISQUE3;
 extern color BISQUE4;
+extern color BISQUE;
 extern color BLACK;
 extern color BLANCHEDALMOND;
-extern color BLUE;
 extern color BLUE1;
 extern color BLUE2;
 extern color BLUE3;
 extern color BLUE4;
-extern color BLUE_VIOLET;
+extern color BLUE;
 extern color BLUEVIOLET;
-extern color BROWN;
+extern color BLUE_VIOLET;
 extern color BROWN1;
 extern color BROWN2;
 extern color BROWN3;
 extern color BROWN4;
-extern color BURLYWOOD;
+extern color BROWN;
 extern color BURLYWOOD1;
 extern color BURLYWOOD2;
 extern color BURLYWOOD3;
 extern color BURLYWOOD4;
-extern color CADET_BLUE;
-extern color CADETBLUE;
+extern color BURLYWOOD;
 extern color CADETBLUE1;
 extern color CADETBLUE2;
 extern color CADETBLUE3;
 extern color CADETBLUE4;
-extern color CHARTREUSE;
+extern color CADETBLUE;
+extern color CADET_BLUE;
 extern color CHARTREUSE1;
 extern color CHARTREUSE2;
 extern color CHARTREUSE3;
 extern color CHARTREUSE4;
-extern color CHOCOLATE;
+extern color CHARTREUSE;
 extern color CHOCOLATE1;
 extern color CHOCOLATE2;
 extern color CHOCOLATE3;
 extern color CHOCOLATE4;
+extern color CHOCOLATE;
 extern color COLOR_NONE;
-extern color CORAL;
 extern color CORAL1;
 extern color CORAL2;
 extern color CORAL3;
 extern color CORAL4;
-extern color CORNFLOWER_BLUE;
+extern color CORAL;
 extern color CORNFLOWERBLUE;
-extern color CORNSILK;
+extern color CORNFLOWER_BLUE;
 extern color CORNSILK1;
 extern color CORNSILK2;
 extern color CORNSILK3;
 extern color CORNSILK4;
-extern color CYAN;
+extern color CORNSILK;
 extern color CYAN1;
 extern color CYAN2;
 extern color CYAN3;
 extern color CYAN4;
+extern color CYAN;
 extern color DARKBLUE;
 extern color DARKCYAN;
 extern color DARKGRAY;
@@ -85,78 +85,76 @@ extern color DARKGREEN;
 extern color DARKGREY;
 extern color DARKKHAKI;
 extern color DARKMAGENTA;
-extern color DARKOLIVEGREEN;
 extern color DARKOLIVEGREEN1;
 extern color DARKOLIVEGREEN2;
 extern color DARKOLIVEGREEN3;
 extern color DARKOLIVEGREEN4;
-extern color DARKORANGE;
+extern color DARKOLIVEGREEN;
 extern color DARKORANGE1;
 extern color DARKORANGE2;
 extern color DARKORANGE3;
 extern color DARKORANGE4;
+extern color DARKORANGE;
 extern color DARKRED;
-extern color DARKSEAGREEN;
 extern color DARKSEAGREEN1;
 extern color DARKSEAGREEN2;
 extern color DARKSEAGREEN3;
 extern color DARKSEAGREEN4;
+extern color DARKSEAGREEN;
 extern color DARKSLATEBLUE;
-extern color DARKSLATEGRAY;
 extern color DARKSLATEGRAY1;
 extern color DARKSLATEGRAY2;
 extern color DARKSLATEGRAY3;
 extern color DARKSLATEGRAY4;
-extern color DARKSLATEGREY;
+extern color DARKSLATEGRAY;
 extern color DARKSLATEGREY1;
 extern color DARKSLATEGREY2;
 extern color DARKSLATEGREY3;
 extern color DARKSLATEGREY4;
+extern color DARKSLATEGREY;
 extern color DARKTURQUOISE;
 extern color DARKVIOLET;
-extern color DEEPBLUE;
 extern color DEEPBLUE2;
-extern color DEEP_PINK;
-extern color DEEPPINK;
+extern color DEEPBLUE;
 extern color DEEPPINK1;
 extern color DEEPPINK2;
 extern color DEEPPINK3;
 extern color DEEPPINK4;
-extern color DEEPSKYBLUE;
+extern color DEEPPINK;
 extern color DEEPSKYBLUE1;
 extern color DEEPSKYBLUE2;
 extern color DEEPSKYBLUE3;
 extern color DEEPSKYBLUE4;
+extern color DEEPSKYBLUE;
 extern color DEEPWATER;
-extern color DIM_GRAY;
+extern color DEEP_PINK;
 extern color DIMGRAY;
-extern color DIM_GREY;
 extern color DIMGREY;
-extern color DODGER_BLUE;
-extern color DODGERBLUE;
+extern color DIM_GRAY;
+extern color DIM_GREY;
 extern color DODGERBLUE1;
 extern color DODGERBLUE2;
 extern color DODGERBLUE3;
 extern color DODGERBLUE4;
-extern color FIREBRICK;
+extern color DODGERBLUE;
+extern color DODGER_BLUE;
 extern color FIREBRICK1;
 extern color FIREBRICK2;
 extern color FIREBRICK3;
 extern color FIREBRICK4;
-extern color FLORAL_WHITE;
+extern color FIREBRICK;
 extern color FLORALWHITE;
-extern color FOREST_GREEN;
+extern color FLORAL_WHITE;
 extern color FORESTGREEN;
+extern color FOREST_GREEN;
 extern color GAINSBORO;
-extern color GHOST_WHITE;
 extern color GHOSTWHITE;
-extern color GOLD;
+extern color GHOST_WHITE;
 extern color GOLD1;
 extern color GOLD2;
 extern color GOLD3;
 extern color GOLD4;
-extern color GRAY;
-extern color GRAY1;
+extern color GOLD;
 extern color GRAY10;
 extern color GRAY11;
 extern color GRAY12;
@@ -167,7 +165,7 @@ extern color GRAY16;
 extern color GRAY17;
 extern color GRAY18;
 extern color GRAY19;
-extern color GRAY2;
+extern color GRAY1;
 extern color GRAY20;
 extern color GRAY21;
 extern color GRAY22;
@@ -178,7 +176,7 @@ extern color GRAY26;
 extern color GRAY27;
 extern color GRAY28;
 extern color GRAY29;
-extern color GRAY3;
+extern color GRAY2;
 extern color GRAY30;
 extern color GRAY31;
 extern color GRAY32;
@@ -189,7 +187,7 @@ extern color GRAY36;
 extern color GRAY37;
 extern color GRAY38;
 extern color GRAY39;
-extern color GRAY4;
+extern color GRAY3;
 extern color GRAY40;
 extern color GRAY41;
 extern color GRAY42;
@@ -200,7 +198,7 @@ extern color GRAY46;
 extern color GRAY47;
 extern color GRAY48;
 extern color GRAY49;
-extern color GRAY5;
+extern color GRAY4;
 extern color GRAY50;
 extern color GRAY51;
 extern color GRAY52;
@@ -211,7 +209,7 @@ extern color GRAY56;
 extern color GRAY57;
 extern color GRAY58;
 extern color GRAY59;
-extern color GRAY6;
+extern color GRAY5;
 extern color GRAY60;
 extern color GRAY61;
 extern color GRAY62;
@@ -222,7 +220,7 @@ extern color GRAY66;
 extern color GRAY67;
 extern color GRAY68;
 extern color GRAY69;
-extern color GRAY7;
+extern color GRAY6;
 extern color GRAY70;
 extern color GRAY71;
 extern color GRAY72;
@@ -233,7 +231,7 @@ extern color GRAY76;
 extern color GRAY77;
 extern color GRAY78;
 extern color GRAY79;
-extern color GRAY8;
+extern color GRAY7;
 extern color GRAY80;
 extern color GRAY81;
 extern color GRAY82;
@@ -244,7 +242,7 @@ extern color GRAY86;
 extern color GRAY87;
 extern color GRAY88;
 extern color GRAY89;
-extern color GRAY9;
+extern color GRAY8;
 extern color GRAY90;
 extern color GRAY91;
 extern color GRAY92;
@@ -255,15 +253,15 @@ extern color GRAY96;
 extern color GRAY97;
 extern color GRAY98;
 extern color GRAY99;
-extern color GREEN;
+extern color GRAY9;
+extern color GRAY;
 extern color GREEN1;
 extern color GREEN2;
 extern color GREEN3;
 extern color GREEN4;
-extern color GREEN_YELLOW;
+extern color GREEN;
 extern color GREENYELLOW;
-extern color GREY;
-extern color GREY1;
+extern color GREEN_YELLOW;
 extern color GREY10;
 extern color GREY11;
 extern color GREY12;
@@ -274,7 +272,7 @@ extern color GREY16;
 extern color GREY17;
 extern color GREY18;
 extern color GREY19;
-extern color GREY2;
+extern color GREY1;
 extern color GREY20;
 extern color GREY21;
 extern color GREY22;
@@ -285,7 +283,7 @@ extern color GREY26;
 extern color GREY27;
 extern color GREY28;
 extern color GREY29;
-extern color GREY3;
+extern color GREY2;
 extern color GREY30;
 extern color GREY31;
 extern color GREY32;
@@ -296,7 +294,7 @@ extern color GREY36;
 extern color GREY37;
 extern color GREY38;
 extern color GREY39;
-extern color GREY4;
+extern color GREY3;
 extern color GREY40;
 extern color GREY41;
 extern color GREY42;
@@ -307,7 +305,7 @@ extern color GREY46;
 extern color GREY47;
 extern color GREY48;
 extern color GREY49;
-extern color GREY5;
+extern color GREY4;
 extern color GREY50;
 extern color GREY51;
 extern color GREY52;
@@ -318,7 +316,7 @@ extern color GREY56;
 extern color GREY57;
 extern color GREY58;
 extern color GREY59;
-extern color GREY6;
+extern color GREY5;
 extern color GREY60;
 extern color GREY61;
 extern color GREY62;
@@ -329,7 +327,7 @@ extern color GREY66;
 extern color GREY67;
 extern color GREY68;
 extern color GREY69;
-extern color GREY7;
+extern color GREY6;
 extern color GREY70;
 extern color GREY71;
 extern color GREY72;
@@ -340,7 +338,7 @@ extern color GREY76;
 extern color GREY77;
 extern color GREY78;
 extern color GREY79;
-extern color GREY8;
+extern color GREY7;
 extern color GREY80;
 extern color GREY81;
 extern color GREY82;
@@ -351,7 +349,7 @@ extern color GREY86;
 extern color GREY87;
 extern color GREY88;
 extern color GREY89;
-extern color GREY9;
+extern color GREY8;
 extern color GREY90;
 extern color GREY91;
 extern color GREY92;
@@ -362,93 +360,95 @@ extern color GREY96;
 extern color GREY97;
 extern color GREY98;
 extern color GREY99;
-extern color HOT_PINK;
-extern color HOTPINK;
+extern color GREY9;
+extern color GREY;
 extern color HOTPINK1;
 extern color HOTPINK2;
 extern color HOTPINK3;
 extern color HOTPINK4;
-extern color INDIAN_RED;
-extern color INDIANRED;
+extern color HOTPINK;
+extern color HOT_PINK;
 extern color INDIANRED1;
 extern color INDIANRED2;
 extern color INDIANRED3;
 extern color INDIANRED4;
-extern color IVORY;
+extern color INDIANRED;
+extern color INDIAN_RED;
 extern color IVORY1;
 extern color IVORY2;
 extern color IVORY3;
 extern color IVORY4;
-extern color KHAKI;
+extern color IVORY;
 extern color KHAKI1;
 extern color KHAKI2;
 extern color KHAKI3;
 extern color KHAKI4;
+extern color KHAKI;
 extern color LAVENDER;
-extern color LEMON_CHIFFON;
-extern color LEMONCHIFFON;
 extern color LEMONCHIFFON1;
 extern color LEMONCHIFFON2;
 extern color LEMONCHIFFON3;
 extern color LEMONCHIFFON4;
-extern color LIGHTBLUE;
+extern color LEMONCHIFFON;
+extern color LEMON_CHIFFON;
 extern color LIGHTBLUE1;
 extern color LIGHTBLUE2;
 extern color LIGHTBLUE3;
 extern color LIGHTBLUE4;
+extern color LIGHTBLUE;
 extern color LIGHTCORAL;
-extern color LIGHTCYAN;
 extern color LIGHTCYAN1;
 extern color LIGHTCYAN2;
 extern color LIGHTCYAN3;
 extern color LIGHTCYAN4;
+extern color LIGHTCYAN;
 extern color LIGHTGRAY;
 extern color LIGHTGREEN;
 extern color LIGHTGREY;
-extern color LIGHTPINK;
 extern color LIGHTPINK1;
 extern color LIGHTPINK2;
 extern color LIGHTPINK3;
 extern color LIGHTPINK4;
+extern color LIGHTPINK;
 extern color LIGHTSEAGREEN;
-extern color LIGHTSKYBLUE;
 extern color LIGHTSKYBLUE1;
 extern color LIGHTSKYBLUE2;
 extern color LIGHTSKYBLUE3;
 extern color LIGHTSKYBLUE4;
+extern color LIGHTSKYBLUE;
 extern color LIGHTSLATEBLUE;
 extern color LIGHTSLATEGRAY;
 extern color LIGHTSLATEGREY;
-extern color LIGHTSTEELBLUE;
 extern color LIGHTSTEELBLUE1;
 extern color LIGHTSTEELBLUE2;
 extern color LIGHTSTEELBLUE3;
 extern color LIGHTSTEELBLUE4;
-extern color LIGHTYELLOW;
+extern color LIGHTSTEELBLUE;
 extern color LIGHTYELLOW1;
 extern color LIGHTYELLOW2;
 extern color LIGHTYELLOW3;
 extern color LIGHTYELLOW4;
+extern color LIGHTYELLOW;
 extern color LIME;
 extern color LIMEGREEN;
 extern color LINEN;
-extern color MAGENTA;
 extern color MAGENTA1;
 extern color MAGENTA2;
 extern color MAGENTA3;
 extern color MAGENTA4;
-extern color MAROON;
+extern color MAGENTA;
 extern color MAROON1;
 extern color MAROON2;
 extern color MAROON3;
 extern color MAROON4;
+extern color MAROON;
 extern color MEDIUMAQUAMARINE;
 extern color MEDIUMBLUE;
-extern color MEDIUMPURPLE;
 extern color MEDIUMPURPLE1;
 extern color MEDIUMPURPLE2;
 extern color MEDIUMPURPLE3;
 extern color MEDIUMPURPLE4;
+extern color MEDIUMPURPLE;
 extern color MEDIUMSEAGREEN;
 extern color MEDIUMSLATEBLUE;
 extern color MEDIUMSPRINGGREEN;
@@ -459,152 +459,152 @@ extern color MINTCREAM;
 extern color MOCCASIN;
 extern color NAVY;
 extern color NAVYBLUE;
-extern color OLIVE_DRAB;
-extern color OLIVEDRAB;
 extern color OLIVEDRAB1;
 extern color OLIVEDRAB2;
 extern color OLIVEDRAB3;
 extern color OLIVEDRAB4;
-extern color ORANGE;
+extern color OLIVEDRAB;
+extern color OLIVE_DRAB;
 extern color ORANGE1;
 extern color ORANGE2;
 extern color ORANGE3;
 extern color ORANGE4;
-extern color ORANGERED;
+extern color ORANGE;
 extern color ORANGERED1;
 extern color ORANGERED2;
 extern color ORANGERED3;
 extern color ORANGERED4;
-extern color PALEBLUE;
+extern color ORANGERED;
 extern color PALEBLUE2;
-extern color PALEGREEN;
+extern color PALEBLUE;
 extern color PALEGREEN1;
 extern color PALEGREEN2;
 extern color PALEGREEN3;
 extern color PALEGREEN4;
-extern color PALETURQUOISE;
+extern color PALEGREEN;
 extern color PALETURQUOISE1;
 extern color PALETURQUOISE2;
 extern color PALETURQUOISE3;
 extern color PALETURQUOISE4;
-extern color PALEVIOLETRED;
+extern color PALETURQUOISE;
 extern color PALEVIOLETRED1;
 extern color PALEVIOLETRED2;
 extern color PALEVIOLETRED3;
 extern color PALEVIOLETRED4;
-extern color PEACHPUFF;
+extern color PALEVIOLETRED;
 extern color PEACHPUFF1;
 extern color PEACHPUFF2;
 extern color PEACHPUFF3;
 extern color PEACHPUFF4;
+extern color PEACHPUFF;
 extern color PERU;
-extern color PINK;
 extern color PINK1;
 extern color PINK2;
 extern color PINK3;
 extern color PINK4;
-extern color PLUM;
+extern color PINK;
 extern color PLUM1;
 extern color PLUM2;
 extern color PLUM3;
 extern color PLUM4;
+extern color PLUM;
 extern color POWDERBLUE;
-extern color PURPLE;
 extern color PURPLE1;
 extern color PURPLE2;
 extern color PURPLE3;
 extern color PURPLE4;
-extern color RED;
+extern color PURPLE;
 extern color RED1;
 extern color RED2;
 extern color RED3;
 extern color RED4;
-extern color SADDLE_BROWN;
+extern color RED;
 extern color SADDLEBROWN;
-extern color SEAGREEN;
+extern color SADDLE_BROWN;
 extern color SEAGREEN1;
 extern color SEAGREEN2;
 extern color SEAGREEN3;
 extern color SEAGREEN4;
-extern color SIENNA;
+extern color SEAGREEN;
 extern color SIENNA1;
 extern color SIENNA2;
 extern color SIENNA3;
 extern color SIENNA4;
+extern color SIENNA;
 extern color SILVER;
-extern color SKYBLUE;
 extern color SKYBLUE1;
 extern color SKYBLUE2;
 extern color SKYBLUE3;
 extern color SKYBLUE4;
-extern color SLATEBLUE;
+extern color SKYBLUE;
 extern color SLATEBLUE1;
 extern color SLATEBLUE2;
 extern color SLATEBLUE3;
 extern color SLATEBLUE4;
-extern color SLATEGRAY;
+extern color SLATEBLUE;
 extern color SLATEGRAY1;
 extern color SLATEGRAY2;
 extern color SLATEGRAY3;
 extern color SLATEGRAY4;
-extern color SLATEGREY;
+extern color SLATEGRAY;
 extern color SLATEGREY1;
 extern color SLATEGREY2;
 extern color SLATEGREY3;
 extern color SLATEGREY4;
-extern color SNOW;
+extern color SLATEGREY;
 extern color SNOW1;
 extern color SNOW2;
 extern color SNOW3;
 extern color SNOW4;
-extern color SPRINGGREEN;
+extern color SNOW;
 extern color SPRINGGREEN1;
 extern color SPRINGGREEN2;
 extern color SPRINGGREEN3;
 extern color SPRINGGREEN4;
-extern color STEELBLUE;
+extern color SPRINGGREEN;
 extern color STEELBLUE1;
 extern color STEELBLUE2;
 extern color STEELBLUE3;
 extern color STEELBLUE4;
-extern color TAN;
+extern color STEELBLUE;
 extern color TAN1;
 extern color TAN2;
 extern color TAN3;
 extern color TAN4;
-extern color THISTLE;
+extern color TAN;
 extern color THISTLE1;
 extern color THISTLE2;
 extern color THISTLE3;
 extern color THISTLE4;
-extern color TOMATO;
+extern color THISTLE;
 extern color TOMATO1;
 extern color TOMATO2;
 extern color TOMATO3;
 extern color TOMATO4;
-extern color TURQUOISE;
+extern color TOMATO;
 extern color TURQUOISE1;
 extern color TURQUOISE2;
 extern color TURQUOISE3;
 extern color TURQUOISE4;
+extern color TURQUOISE;
 extern color VDARKSLATEBLUE;
 extern color VIOLET;
-extern color VIOLETRED;
 extern color VIOLETRED1;
 extern color VIOLETRED2;
 extern color VIOLETRED3;
 extern color VIOLETRED4;
+extern color VIOLETRED;
 extern color VVDARKSLATEBLUE;
 extern color WALL;
 extern color WATER;
 extern color WHITE;
-extern color WHITE_SMOKE;
 extern color WHITESMOKE;
-extern color YELLOW;
+extern color WHITE_SMOKE;
 extern color YELLOW1;
 extern color YELLOW2;
 extern color YELLOW3;
 extern color YELLOW4;
+extern color YELLOW;
 extern color YELLOWGREEN;
 // end sort marker1 }
 
diff --git a/src/my_tps.hpp b/src/my_tps.hpp
index 1a9fc82..c2e13cd 100644
--- a/src/my_tps.hpp
+++ b/src/my_tps.hpp
@@ -2,7 +2,6 @@
 // Copyright Neil McGill, goblinhack@gmail.com
 //
 
-/* clang-format off */
 bool templates_init(void);
 
 /* begin shell marker1 */
@@ -10,13 +9,12 @@ bool templates_init(void);
 /* shell do */
 /* shell echo "bool $i();" */
 /* shell done */
-bool tp_load_player();
-bool tp_load_cursor_path();
-bool tp_load_cursor_at();
+bool tp_load_floor();
+bool tp_load_wall();
 bool tp_load_key();
 bool tp_load_exit();
 bool tp_load_door();
-bool tp_load_wall();
-bool tp_load_floor();
+bool tp_load_cursor_path();
+bool tp_load_cursor_at();
+bool tp_load_player();
 /* end shell marker1 */
-/* clang-format on */
diff --git a/src/pcg_basic.cpp b/src/pcg_basic.cpp
index f6443a2..d1681a5 100644
--- a/src/pcg_basic.cpp
+++ b/src/pcg_basic.cpp
@@ -39,10 +39,7 @@ struct pcg_state_setseq_64 { // Internals are *Private*.
 };
 typedef struct pcg_state_setseq_64 pcg32_random_t;
 
-#define PCG32_INITIALIZER                                                                                            \
-  {                                                                                                                  \
-    0x853c49e6748fea9bULL, 0xda3e39cb94b95bdbULL                                                                     \
-  }
+#define PCG32_INITIALIZER {0x853c49e6748fea9bULL, 0xda3e39cb94b95bdbULL}
 pcg32_random_t pcg32_global = PCG32_INITIALIZER;
 
 uint32_t pcg32_random_r(pcg32_random_t *rng)
diff --git a/src/things/player/tp_player.cpp b/src/things/player/tp_player.cpp
index 51a47fe..8595250 100644
--- a/src/things/player/tp_player.cpp
+++ b/src/things/player/tp_player.cpp
@@ -19,9 +19,8 @@ bool tp_load_player(void)
     tp_flag_set(tp, is_player, true);
     tp_flag_set(tp, is_tickable, true);
     tp_player_index_set(tp, player - 1);
-    tp_z_depth_set(tp, MAP_Z_DEPTH_PLAYER);
     tp_speed_set(tp, 100);
-
+    tp_z_depth_set(tp, MAP_Z_DEPTH_PLAYER);
     // end sort marker1 }
 
     auto delay = 100;
diff --git a/src/tp.cpp b/src/tp.cpp
index 0244c52..ff5636d 100644
--- a/src/tp.cpp
+++ b/src/tp.cpp
@@ -35,12 +35,12 @@ std::initializer_list< std::string > tps = {
     /* shell do */
     /* shell echo "    \"$i\"", */
     /* shell done */
-    "cursor_path",
-    "cursor_at",
+    "floor",
     "key",
     "exit",
     "door",
-    "floor",
+    "cursor_path",
+    "cursor_at",
   /* end shell marker1 */
 };
 /* clang-format on */
diff --git a/src/tps.cpp b/src/tps.cpp
index c081077..92d150b 100644
--- a/src/tps.cpp
+++ b/src/tps.cpp
@@ -4,7 +4,6 @@
 
 #include "my_callstack.hpp"
 #include "my_tps.hpp"
-/* clang-format off */
 
 bool templates_init(void)
 {
@@ -15,13 +14,10 @@ bool templates_init(void)
   /* shell do */
   /* shell echo "  if (!$i()) { return false; }" */
   /* shell done */
-  if (! tp_load_player()) {
-    return false;
-  }
-  if (! tp_load_cursor_path()) {
+  if (! tp_load_floor()) {
     return false;
   }
-  if (! tp_load_cursor_at()) {
+  if (! tp_load_wall()) {
     return false;
   }
   if (! tp_load_key()) {
@@ -33,14 +29,16 @@ bool templates_init(void)
   if (! tp_load_door()) {
     return false;
   }
-  if (! tp_load_wall()) {
+  if (! tp_load_cursor_path()) {
     return false;
   }
-  if (! tp_load_floor()) {
+  if (! tp_load_cursor_at()) {
+    return false;
+  }
+  if (! tp_load_player()) {
     return false;
   }
   /* end shell marker1 */
 
   return true;
 }
-/* clang-format on */