diff --git a/example/index.html b/example/index.html
index 5b7a299d..aa1c14e8 100644
--- a/example/index.html
+++ b/example/index.html
@@ -82,6 +82,11 @@
       },
       toBlock: function(obj) {
         return '{{< youtube ' + obj.id + ' >}}';
+      },
+      toPreview: function(obj) {
+        return (
+          '<img src="http://img.youtube.com/vi/' + obj.id + '/maxresdefault.jpg" alt="Youtube Video"/>'
+        );
       }
     })
   </script>
diff --git a/package.json b/package.json
index 8ecbec91..05201017 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,6 @@
   },
   "dependencies": {
     "bricks.js": "^1.7.0",
-    "commonmark": "^0.24.0",
-    "commonmark-react-renderer": "^4.1.2",
     "fuzzy": "^0.1.1",
     "js-base64": "^2.1.9",
     "json-loader": "^0.5.4",
diff --git a/src/components/Widgets/MarkdownPreview.js b/src/components/Widgets/MarkdownPreview.js
index 37fe084a..f9f0021c 100644
--- a/src/components/Widgets/MarkdownPreview.js
+++ b/src/components/Widgets/MarkdownPreview.js
@@ -1,17 +1,25 @@
 import React, { PropTypes } from 'react';
-import CommonMark from 'commonmark';
-import ReactRenderer from 'commonmark-react-renderer';
-
-const parser = new CommonMark.Parser();
-const renderer = new ReactRenderer();
+import MarkupIt from 'markup-it';
+import { getSyntaxes } from './richText';
 
 export default class MarkdownPreview extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    const { markdown, html } = getSyntaxes();
+    this.markdown = new MarkupIt(markdown);
+    this.html = new MarkupIt(html);
+  }
   render() {
     const { value } = this.props;
     if (value == null) { return null; }
+    const content = this.markdown.toContent(value);
+    const contentHtml =  { __html: this.html.toText(content) };
 
-    const ast = parser.parse(value);
-    return React.createElement.apply(React, ['div', {}].concat(renderer.render(ast)));
+    return (
+      <div dangerouslySetInnerHTML={contentHtml} />
+    );
   }
 }
 
diff --git a/src/components/Widgets/richText.js b/src/components/Widgets/richText.js
index 7879edb0..08a8331c 100644
--- a/src/components/Widgets/richText.js
+++ b/src/components/Widgets/richText.js
@@ -26,15 +26,17 @@ function processEditorPlugins(plugins) {
   if (plugins === processedPlugins) return;
 
   plugins.forEach(plugin => {
-    const markdownRule = MarkupIt.Rule(plugin.id)
-      .regExp(plugin.pattern, function(state, match) {
-        return { data: plugin.fromBlock(match) };
-      })
-      .toText(function(state, token) { return plugin.toBlock(token.getData().toObject()) + '\n\n'; });
+    const basicRule = MarkupIt.Rule(plugin.id).regExp(plugin.pattern, (state, match) => (
+      { data: plugin.fromBlock(match) }
+    ));
 
-    const htmlRule = MarkupIt.Rule(plugin.id)
-      .regExp(plugin.pattern, function(state, match) { return plugin.fromBlock(match); })
-      .toText(function(state, token) { return plugin.toPreview(token.getData()); });
+    const markdownRule = basicRule.toText((state, token) => (
+      plugin.toBlock(token.getData().toObject()) + '\n\n'
+    ));
+
+    const htmlRule = basicRule.toText((state, token) => (
+      plugin.toPreview(token.getData().toObject())
+    ));
 
     const nodeRenderer = (props) => {
       const { node, state } = props;
@@ -61,35 +63,40 @@ function processEditorPlugins(plugins) {
 }
 
 function processMediaProxyPlugins(getMedia) {
-  const customImageRule = MarkupIt.Rule('mediaproxy')
-    .regExp(reInline.link, function(state, match) {
-      if (match[0].charAt(0) !== '!') {
-        // Return if this is not an image
-        return;
-      }
+  const mediaProxyRule = MarkupIt.Rule('mediaproxy').regExp(reInline.link, (state, match) => {
+    if (match[0].charAt(0) !== '!') {
+      // Return if this is not an image
+      return;
+    }
 
-      var imgData = Map({
-        alt:   match[1],
-        src:   getMedia(match[2]),
-        title: match[3]
-      }).filter(Boolean);
+    var imgData = Map({
+      alt:   match[1],
+      src:   match[2],
+      title: match[3]
+    }).filter(Boolean);
 
-      return {
-        data: imgData
-      };
-    })
-    .toText(function(state, token) {
-      var data  = token.getData();
-      var alt   = data.get('alt', '');
-      var src   = getMedia(data.get('src', ''));
-      var title = data.get('title', '');
+    return {
+      data: imgData
+    };
+  });
+  const mediaProxyMarkdownRule = mediaProxyRule.toText((state, token) => {
+    var data  = token.getData();
+    var alt   = data.get('alt', '');
+    var src   = getMedia(data.get('src', ''));
+    var title = data.get('title', '');
 
-      if (title) {
-        return '![' + alt + '](' + src + ' "' + title + '")';
-      } else {
-        return '![' + alt + '](' + src + ')';
-      }
-    });
+    if (title) {
+      return '![' + alt + '](' + src + ' "' + title + '")';
+    } else {
+      return '![' + alt + '](' + src + ')';
+    }
+  });
+  const mediaProxyHTMLRule = mediaProxyRule.toText((state, token) => {
+    var data  = token.getData();
+    var alt   = data.get('alt', '');
+    var src   = data.get('src', '');
+    return `<img src=${src} alt=${alt} />`;
+  });
 
   nodes['mediaproxy'] = (props) => {
     /* eslint react/prop-types: 0 */
@@ -101,7 +108,8 @@ function processMediaProxyPlugins(getMedia) {
       <img {...props.attributes} src={getMedia(src)} className={className} />
     );
   };
-  augmentedMarkdownSyntax = augmentedMarkdownSyntax.addInlineRules(customImageRule);
+  augmentedMarkdownSyntax = augmentedMarkdownSyntax.addInlineRules(mediaProxyMarkdownRule);
+  augmentedHTMLSyntax = augmentedHTMLSyntax.addInlineRules(mediaProxyHTMLRule);
 }
 
 function getPlugins() {
@@ -115,7 +123,9 @@ function getNodes() {
 }
 
 function getSyntaxes(getMedia) {
-  processMediaProxyPlugins(getMedia);
+  if (getMedia) {
+    processMediaProxyPlugins(getMedia);
+  }
   return { markdown: augmentedMarkdownSyntax, html:augmentedHTMLSyntax };
 }