Refactored SASS & upstream changes