Clean up SCSS and add color variables