Moving more CSS to theme.css