Concluded upgrade to proper SASS