Improved SVG output. Easier to manipulet inside Inkscape.