Fix images and add source name