adopt to updated feature-119-scss branch