Color fixes
Merge successful