Continue to rewrite templates. Update icon set.