Improve Color management !! And test it !