Reworked image definitions.