Adding watermark and tweaking regexes