Fixed solution. colour class and helpers added