Total remake, now adapting to images in project folder