Merge with new scss style