Organized the colors and added some more