More colours, code cleanup and another sample.