xshortcodes changed to x-shortcodes