some color changes
merged
some color changes