Bug fixes, adding colour changing support