Move more colors to bundles, better default color
remove duplicate colors