Merge with theme.css