Updated SCSS and other