Fixed various color bugs