Fix imports in style, upgrade r.js