Move scoped style into proper scope
Add scoped style fallback