modern merge with base.css,  bug fix