Bug with color assignments - WIP