Make colour changes happen earlier