Refactoring some classes, preparing the new color picker directly from image. Refactoring of related test classes.