color issues fixed