move theming from plugin to theme