Continuing transition to SCSS