Fixes to colors