Continue the big scss refactor