Added handling of colours + added log