Refactor svg

:+1: This could probably do with kwargs, too.