Refactor structure of theme SCSS