Improvements to SCSS