Fixing colour issues