adopt to changes in feature-119-scss branch