Fix watermark rendering, livereload, kill dead code