added more label and colour options