Further work on migrating to Sass