Keep the theme in sync with wind from upstream/master