Removed chart-oriented style sheets from generic  and put them into  so that my play is less destructive.
Resolve upstream merge conflict with styles.css.