More color bugs fixed