Improve SVG support

For @Caged.