Fixed colors pt 2
merged