diff --git a/packages/docusaurus-plugin-content-blog/src/index.js b/packages/docusaurus-plugin-content-blog/src/index.js
index 08a555129a..32d70b64e9 100644
--- a/packages/docusaurus-plugin-content-blog/src/index.js
+++ b/packages/docusaurus-plugin-content-blog/src/index.js
@@ -338,10 +338,6 @@ module.exports = function(context, opts) {
       }
     },
 
-    getThemePath() {
-      return path.resolve(__dirname, './theme');
-    },
-
     configureWebpack(config, isServer, {getBabelLoader, getCacheLoader}) {
       const {rehypePlugins, remarkPlugins} = options;
       return {
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index 14dba922c4..36db4957fe 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -17,10 +17,8 @@
   },
   "peerDependencies": {
     "@docusaurus/core": "^2.0.0",
-    "classnames": "^2.2.6",
     "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "react-router-config": "^5.0.1"
+    "react-dom": "^16.8.4"
   },
   "engines": {
     "node": ">=8"
diff --git a/packages/docusaurus-plugin-content-docs/src/index.js b/packages/docusaurus-plugin-content-docs/src/index.js
index 1826c77015..2f99812cf4 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.js
+++ b/packages/docusaurus-plugin-content-docs/src/index.js
@@ -155,10 +155,6 @@ module.exports = function(context, opts) {
       });
     },
 
-    getThemePath() {
-      return path.resolve(__dirname, './theme');
-    },
-
     configureWebpack(config, isServer, {getBabelLoader, getCacheLoader}) {
       const {rehypePlugins, remarkPlugins} = options;
       return {
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogListPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.js
similarity index 95%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogListPage/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogListPage/index.js
index 9e114bd1cb..c6959a7725 100644
--- a/packages/docusaurus-plugin-content-blog/src/theme/BlogListPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import Layout from '@theme/Layout'; // eslint-disable-line
+import Layout from '@theme/Layout';
 import BlogPostItem from '@theme/BlogPostItem';
 import BlogListPaginator from '@theme/BlogListPaginator';
 
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogListPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js
similarity index 100%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogListPaginator/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogPostItem/index.js b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.js
similarity index 93%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogPostItem/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.js
index b8d76f02c4..82cdbea782 100644
--- a/packages/docusaurus-plugin-content-blog/src/theme/BlogPostItem/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.js
@@ -6,7 +6,10 @@
  */
 
 import React from 'react';
+import {MDXProvider} from '@mdx-js/react';
+
 import Link from '@docusaurus/Link';
+import MDXComponents from '@theme/MDXComponents';
 
 function BlogPostItem(props) {
   const {children, frontMatter, metadata, truncated} = props;
@@ -80,7 +83,9 @@ function BlogPostItem(props) {
   return (
     <div>
       {renderPostHeader()}
-      <article className="markdown">{children}</article>
+      <article className="markdown">
+        <MDXProvider components={MDXComponents}>{children}</MDXProvider>
+      </article>
       <div className="row margin-vert--lg">
         <div className="col">
           {tags.length > 0 && (
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogPostPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
similarity index 94%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogPostPage/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
index 442433f9b8..bb3ffb8050 100644
--- a/packages/docusaurus-plugin-content-blog/src/theme/BlogPostPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import Layout from '@theme/Layout'; // eslint-disable-line
+import Layout from '@theme/Layout';
 import BlogPostItem from '@theme/BlogPostItem';
 import BlogPostPaginator from '@theme/BlogPostPaginator';
 
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogPostPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js
similarity index 100%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogPostPaginator/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogTagsListPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.js
similarity index 96%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogTagsListPage/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.js
index 2cbf87546c..9bf0ffac2d 100644
--- a/packages/docusaurus-plugin-content-blog/src/theme/BlogTagsListPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import Layout from '@theme/Layout'; // eslint-disable-line
+import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
 
 const CHARS_IN_ALPHABET = 26;
diff --git a/packages/docusaurus-plugin-content-blog/src/theme/BlogTagsPostsPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js
similarity index 96%
rename from packages/docusaurus-plugin-content-blog/src/theme/BlogTagsPostsPage/index.js
rename to packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js
index 14fc41418b..774fb3d5d4 100644
--- a/packages/docusaurus-plugin-content-blog/src/theme/BlogTagsPostsPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import Layout from '@theme/Layout'; // eslint-disable-line
+import Layout from '@theme/Layout';
 import BlogPostItem from '@theme/BlogPostItem';
 import Link from '@docusaurus/Link';
 
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js b/packages/docusaurus-theme-classic/src/theme/DocItem/index.js
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js
rename to packages/docusaurus-theme-classic/src/theme/DocItem/index.js
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css b/packages/docusaurus-theme-classic/src/theme/DocItem/styles.module.css
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocItem/styles.module.css
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
similarity index 75%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js
rename to packages/docusaurus-theme-classic/src/theme/DocPage/index.js
index fefa8c6eb6..887b91bf32 100644
--- a/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.js
@@ -6,11 +6,12 @@
  */
 
 import React from 'react';
-import {renderRoutes} from 'react-router-config';
-
-import Layout from '@theme/Layout'; // eslint-disable-line
+import {MDXProvider} from '@mdx-js/react';
 
+import renderRoutes from '@docusaurus/renderRoutes';
+import Layout from '@theme/Layout';
 import DocSidebar from '@theme/DocSidebar';
+import MDXComponents from '@theme/MDXComponents';
 
 function DocPage(props) {
   const {route, docsMetadata, location} = props;
@@ -29,7 +30,9 @@ function DocPage(props) {
             <DocSidebar docsMetadata={docsMetadata} sidebar={sidebar} />
           </div>
           <main className="col">
-            {renderRoutes(route.routes, {docsMetadata})}
+            <MDXProvider components={MDXComponents}>
+              {renderRoutes(route.routes, {docsMetadata})}
+            </MDXProvider>
           </main>
         </div>
       </div>
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocPaginator/index.js
rename to packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocSidebar/index.js b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocSidebar/index.js
rename to packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocSidebar/styles.module.css b/packages/docusaurus-theme-classic/src/theme/DocSidebar/styles.module.css
similarity index 100%
rename from packages/docusaurus-plugin-content-docs/src/theme/DocSidebar/styles.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocSidebar/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
index 240d86e22a..21d10687a0 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js
@@ -6,13 +6,11 @@
  */
 
 import React from 'react';
-import {MDXProvider} from '@mdx-js/react';
 import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import withBaseUrl from '@docusaurus/withBaseUrl';
 import Navbar from '@theme/Navbar';
 import Footer from '@theme/Footer';
-import MDXComponents from '@theme/MDXComponents';
 
 import './styles.css';
 
@@ -32,7 +30,7 @@ function Layout(props) {
         )}
       </Head>
       <Navbar />
-      <MDXProvider components={MDXComponents}>{children}</MDXProvider>
+      {children}
       {!noFooter && <Footer />}
     </React.Fragment>
   );
diff --git a/packages/docusaurus/src/client/App.js b/packages/docusaurus/src/client/App.js
index 0203454dc8..cf6d996e43 100644
--- a/packages/docusaurus/src/client/App.js
+++ b/packages/docusaurus/src/client/App.js
@@ -6,11 +6,10 @@
  */
 
 import React from 'react';
-import {renderRoutes} from 'react-router-config';
 
 import routes from '@generated/routes';
 import siteConfig from '@generated/docusaurus.config';
-
+import renderRoutes from '@docusaurus/renderRoutes';
 import DocusaurusContext from '@docusaurus/context';
 import PendingNavigation from './PendingNavigation';
 
diff --git a/packages/docusaurus/src/client/exports/renderRoutes.js b/packages/docusaurus/src/client/exports/renderRoutes.js
new file mode 100644
index 0000000000..947c253739
--- /dev/null
+++ b/packages/docusaurus/src/client/exports/renderRoutes.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {renderRoutes} from 'react-router-config';
+
+export default renderRoutes;
diff --git a/website/docs/writing-docs.mdx b/website/docs/writing-docs.mdx
index 9e2fc2080d..85151fa672 100644
--- a/website/docs/writing-docs.mdx
+++ b/website/docs/writing-docs.mdx
@@ -78,8 +78,9 @@ The headers are well-spaced so that the hierarchy is clear.
 
 - lists will help you
 - present the key points
-- that you want your users to quickly remember
-  - and you may nest them - multiple layers
+- that you want your users to remember
+  - and you may nest them
+    - multiple times
 
 </BrowserWindow>