New version, changed some colors