Moving the plugin stuff into the theme