sync and correct generic css
Merge pull request #1541 from dereuromark/master-css

sync and correct generic css