Progress on SASS improvement
Finished upgrading SASS