Cleanup SCSS

Incomplete, just adding this here so I don't forget about it.