Updating SCSS to use variables correctly

Or maybe just more correctly.  Depends on how good of a job I did.
Regenerating files