Enhancements to export styles