format for images
changed coloring
resolved merge