Fix imports for newer version
Use data-attributes and classes instead of hard-coded strings