Added colour code support