refractored sass dependencies to align to better theme.scss override