diff --git a/demo/index.js b/demo/index.js
index 2d3f6d8..9db4393 100644
--- a/demo/index.js
+++ b/demo/index.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 
 import * as ReactMobiledoc from '../src';
@@ -19,37 +18,31 @@ const config = {
 const imgPayload = { caption: "Edit this right meow!", src: "http://www.placekitten.com/200/200" };
 
 
-const ImageButton = (props, context) => {
+const ImageButton = (props) => {
   const { isEditing } = props;
-  const { editor } = context;
+  const { editor } = React.useContext(ReactMobiledoc.ReactMobileDocContext);
 
   const onClick = () => editor.insertCard('ImageCard', imgPayload, isEditing);
   return <button onClick={onClick}>Image Card</button>;
 };
 
-ImageButton.contextTypes = {
-  editor: PropTypes.object
-};
-
 
-const ClickCounterButton = (props, context) => {
-  const { editor } = context;
+const ClickCounterButton = () => {
+  const { editor } = React.useContext(ReactMobiledoc.ReactMobileDocContext);
   const onClick = () => editor.insertAtom('Counter', '', { clicks: 0 });
   return <button onClick={onClick}>Click Counter Atom</button>;
 };
 
-ClickCounterButton.contextTypes = {
-  editor: PropTypes.object
-};
-
 
 
-ReactDOM.render(<ReactMobiledoc.Container {...config}>
-                  <ReactMobiledoc.Toolbar />
-                  <ImageButton />
-                  <ClickCounterButton />
-                  <ReactMobiledoc.Editor />
-                </ReactMobiledoc.Container>,
-                document.getElementById('root'));
+ReactDOM.render(
+  <ReactMobiledoc.Container {...config}>
+    <ReactMobiledoc.Toolbar />
+    <ImageButton />
+    <ClickCounterButton />
+    <ReactMobiledoc.Editor />
+  </ReactMobiledoc.Container>,
+  document.getElementById('root')
+);
 
 require("!style-loader!css-loader!../node_modules/mobiledoc-kit/dist/mobiledoc.css");
diff --git a/package.json b/package.json
index adbc3d9..52e05c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-mobiledoc-editor",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "A Mobiledoc editor for React apps",
   "repository": "joshfrench/react-mobiledoc-editor",
   "homepage": "https://github.com/joshfrench/react-mobiledoc-editor",
diff --git a/src/components/Container.js b/src/components/Container.js
index 7c3f657..6827efa 100644
--- a/src/components/Container.js
+++ b/src/components/Container.js
@@ -5,13 +5,6 @@ import { LATEST_MOBILEDOC_VERSION, EMPTY_MOBILEDOC } from '../utils/mobiledoc';
 import { ReactMobileDocContext } from "./Context";
 
 class Container extends React.Component {
-  static childContextTypes = {
-    editor: PropTypes.object,
-    activeMarkupTags: PropTypes.array,
-    activeSectionTags: PropTypes.array,
-    activeSectionAttributes: PropTypes.array
-  }
-
   static defaultProps = {
     atoms: [],
     autofocus: true,
diff --git a/src/index.js b/src/index.js
index 336c457..7698be0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,6 +2,7 @@ import { classToDOMCard } from './utils/classToCard';
 import { classToDOMAtom } from './utils/classToAtom';
 import { EMPTY_MOBILEDOC } from './utils/mobiledoc';
 import Container from './components/Container';
+import { ReactMobileDocContext } from "./components/Context";
 import Editor from './components/Editor';
 import LinkButton from './components/LinkButton';
 import MarkupButton from './components/MarkupButton';
@@ -21,5 +22,6 @@ export {
   AttributeSelect,
   SectionButton,
   SectionSelect,
-  Toolbar
+  Toolbar,
+  ReactMobileDocContext
 };