Sass improvements

Improvements to Sass support