Move png generation to wpr