Added watermark.html and images cleanup