Improve exporting to SVG