Added (untested) colour conversion and png support