Improved color management

Change-Id: I7e2389e1012c38ec4fad74bfb133b19acbb0eb02
Reviewed-on: https://iffwww.iff.kfa-juelich.de/review/26
Reviewed-by: Josef Heinen <j.heinen@fz-juelich.de>