Made some small changes to enable inline includes for svg format