fixed colors
merged