House keeping

Move colors to the root