Dok/feature/svg helper updates