added new colors in a dumb way, and changed some other things