Fixed ordering and added some more colors