Bugfix and svgs