Some changes i don't remember doing
Resolved a conflict
Built the program
The f*$#ing shapes should be the right color now, and hopefully STAY that way