Add proposed subclade coloring to non-2y builds

Add proposed subclade coloring to non-2y builds #640