Temporary color fixes