Fixed the ordering of the SCSS.
Merge branch 'fix/main-scss-vars'