Updated SCSS order