More better SASS
Fixed merge conflicts