SCSS almost back to scratch