diff --git a/packages/components/src/Provider.js b/packages/components/src/Provider.js
index 7b4d996..00372fb 100644
--- a/packages/components/src/Provider.js
+++ b/packages/components/src/Provider.js
@@ -7,7 +7,7 @@ import mdxComponents from './mdx-components'
 const DefaultProvider = props => <>{props.children}</>
 
 export const Provider = props => {
-  const { headTags, theme, mdx } = props
+  const { headTags, theme = {}, mdx } = props
   const {
     Provider: UserProvider = DefaultProvider,
     components: themeComponents = {},
diff --git a/packages/gatsby-theme/README.md b/packages/gatsby-theme/README.md
index 3e72368..b92c747 100644
--- a/packages/gatsby-theme/README.md
+++ b/packages/gatsby-theme/README.md
@@ -11,7 +11,7 @@ _Note:_ This theme **requires MDX v1** and will not work with previous versions
 ```js
 // gatsby-config.js
 module.exports = {
-  __experimentalThemes: ['@mdx-deck/gatsby-theme'],
+  plugins: ['@mdx-deck/gatsby-theme'],
 }
 ```
 
@@ -50,7 +50,7 @@ The following options can be passed to the gatsby theme.
 ```js
 // gatsby-config.js
 module.exports = {
-  __experimentalThemes: [
+  plugins: [
     {
       resolve: '@mdx-deck/gatsby-theme',
       options: {
diff --git a/packages/gatsby-theme/src/decks/hello.mdx b/packages/gatsby-theme/src/decks/hello.mdx
index da408af..ea1c4a2 100644
--- a/packages/gatsby-theme/src/decks/hello.mdx
+++ b/packages/gatsby-theme/src/decks/hello.mdx
@@ -22,7 +22,7 @@ This is the MDX Deck Gatsby theme
 ```js
 // gatsby-config.js
 module.exports = {
-  __experimentalThemes: [
+  plugins: [
     '@mdx-deck/gatsby-theme',
   ]
 }
diff --git a/packages/gatsby-theme/src/layouts/footer.js b/packages/gatsby-theme/src/layouts/footer.js
deleted file mode 100644
index d060da7..0000000
--- a/packages/gatsby-theme/src/layouts/footer.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => false
diff --git a/packages/gatsby-theme/src/layouts/header.js b/packages/gatsby-theme/src/layouts/header.js
deleted file mode 100644
index d060da7..0000000
--- a/packages/gatsby-theme/src/layouts/header.js
+++ /dev/null
@@ -1 +0,0 @@
-export default () => false
diff --git a/packages/gatsby-theme/src/layouts/index.js b/packages/gatsby-theme/src/layouts/index.js
index bc3a8ac..ba2fc62 100644
--- a/packages/gatsby-theme/src/layouts/index.js
+++ b/packages/gatsby-theme/src/layouts/index.js
@@ -2,8 +2,6 @@ import React from 'react'
 import { navigate } from 'gatsby'
 import { Embed } from '@mdx-deck/components'
 import Root from './root'
-import Header from './header'
-import Footer from './footer'
 
 const Thumb = props => (
   <div
@@ -30,7 +28,6 @@ const Thumb = props => (
 
 export default props => (
   <Root>
-    <Header {...props} />
     <ul
       css={{
         listStyle: 'none',
@@ -57,6 +54,5 @@ export default props => (
         </li>
       ))}
     </ul>
-    <Footer {...props} />
   </Root>
 )
diff --git a/packages/gatsby-theme/src/splitter.js b/packages/gatsby-theme/src/splitter.js
deleted file mode 100644
index b21dae5..0000000
--- a/packages/gatsby-theme/src/splitter.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react'
-
-export default props => {
-  const { basepath } = props.pageContext || {}
-  const { theme, themes } = props
-  const arr = React.Children.toArray(props.children)
-  const splits = []
-  const slides = []
-
-  arr.forEach((child, i) => {
-    if (child.props.mdxType === 'hr') splits.push(i)
-  })
-
-  let previousSplit = 0
-  splits.forEach(i => {
-    const children = [...arr.slice(previousSplit, i)]
-    slides.push(() => children)
-    previousSplit = i + 1
-  })
-  slides.push(() => [...arr.slice(previousSplit)])
-
-  return {
-    ...props,
-    theme,
-    themes,
-    slides,
-    basepath,
-  }
-}
diff --git a/packages/gatsby-theme/src/templates/deck.js b/packages/gatsby-theme/src/templates/deck.js
index 134c322..e052721 100644
--- a/packages/gatsby-theme/src/templates/deck.js
+++ b/packages/gatsby-theme/src/templates/deck.js
@@ -1,11 +1,11 @@
 import React from 'react'
-import MDXRenderer from 'gatsby-mdx/mdx-renderer'
+import { MDXRenderer } from 'gatsby-plugin-mdx'
 import { graphql } from 'gatsby'
 import Layout from '../layouts/deck'
 
 export default props => {
   const { mdx } = props.data
-  const Component = props => <MDXRenderer {...props} children={mdx.code.body} />
+  const Component = props => <MDXRenderer {...props} children={mdx.body} />
 
   return <Layout Component={Component} basepath={props.pageContext.basepath} />
 }
@@ -14,9 +14,7 @@ export const query = graphql`
   query($id: String!) {
     mdx(id: { eq: $id }) {
       id
-      code {
-        body
-      }
+      body
     }
   }
 `
diff --git a/packages/gatsby-theme/src/templates/index.js b/packages/gatsby-theme/src/templates/index.js
index c921285..71b818a 100644
--- a/packages/gatsby-theme/src/templates/index.js
+++ b/packages/gatsby-theme/src/templates/index.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { graphql } from 'gatsby'
-import MDXRenderer from 'gatsby-mdx/mdx-renderer'
+import { MDXRenderer } from 'gatsby-plugin-mdx'
 import get from 'lodash.get'
 import Layout from '../layouts/index'
 
@@ -15,8 +15,8 @@ export default props => {
       ...node,
       slug: node.fields.deck,
       title: getTitle(node),
-      children: <MDXRenderer children={node.code.body} />,
-      Component: props => <MDXRenderer {...props} children={node.code.body} />,
+      children: <MDXRenderer children={node.body} />,
+      Component: props => <MDXRenderer {...props} children={node.body} />,
     }))
     .filter(node => node.parent.sourceInstanceName === 'decks')
   return <Layout {...props} decks={decks} />
@@ -31,9 +31,7 @@ export const query = graphql`
           fields {
             deck
           }
-          code {
-            body
-          }
+          body
           headings {
             depth
             value