Add png generation
Further D() removals