Master goes pink

Merge of master and colourful branch