Build fixed, everything working using new colour implementation.