diff --git a/demo/demo.js b/demo/demo.js
index 95e1d42..0e6097b 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -10,7 +10,7 @@ document.addEventListener('DOMContentLoaded', function () {
           programmingLanguage: 'text/javascript'
         },
         id: 'd4be36b0-d18e-438c-8564-9ae79963b5e4',
-        html: '<pre>let foo = \'bar\';\n&lt;blink&gt;Hello&lt;/blink&gt;</pre>'
+        html: '<pre>&amp;amp;\nlet foo = \'bar\';\n&lt;blink&gt;Hello&period;&period;&period;&lt;/blink&gt;</pre>'
       }
     }, '*');
   });
@@ -18,9 +18,11 @@ document.addEventListener('DOMContentLoaded', function () {
   window.addEventListener('message', function (message) {
     let iframe = document.getElementById('demo');
     let preview = document.getElementById('preview');
+    let block = document.getElementById('block');
 
     switch (message.data.topic) {
       case 'changed':
+        block.textContent = JSON.stringify(message.data.payload, null, 2)
         preview.innerHTML = message.data.payload.html
         let previewLang = document.getElementById('preview_language')
         previewLang.innerHTML = message.data.payload.metadata.programmingLanguage
diff --git a/demo/index.html b/demo/index.html
index e9840be..36d3bcf 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -8,5 +8,7 @@ <h2>Editor</h2>
     <iframe id="demo" src="../editor/index.html"></iframe>
     <h2>Results <span id="preview_language"></span></h2>
     <div id="preview"></div>
+    <h2>Block</h2>
+    <pre id="block"></pre>
   </body>
 </html>
diff --git a/package.json b/package.json
index 7069a5d..01285b9 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "codemirror": "^5.10.0",
-    "entities": "^1.1.1"
+    "he": "^0.5.0"
   },
   "devDependencies": {
     "babel-core": "^6.3.26",
diff --git a/src/index.js b/src/index.js
index 64e1531..46bb5f1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,7 @@
+import {encode} from 'he'
+encode.options.useNamedReferences = true
+
 import * as CodeMirror from 'codemirror'
-import {encodeHTML,decodeHTML} from 'entities'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/theme/monokai.css'
 
@@ -15,6 +17,7 @@ import 'codemirror/mode/shell/shell'
 import 'codemirror/mode/swift/swift'
 import 'codemirror/mode/yaml/yaml'
 
+
 export default class CEd {
   constructor (options) {
     if (!options) options = {}
@@ -62,7 +65,7 @@ export default class CEd {
   }
 
   prepareHTML (code, mime) {
-    return '<pre><code class="' + this.mimeToMode(mime) + '">' + encodeHTML(code) + '</code></pre>'
+    return '<pre><code class="' + this.mimeToMode(mime) + '">' + encode(code) + '</code></pre>'
   }
 
   set mode (mode) {
@@ -76,7 +79,7 @@ export default class CEd {
     this.id = block.id
     let el = document.createElement('div')
     el.innerHTML = this.block.html
-    this.editor.setValue(decodeHTML(el.textContent))
+    this.editor.setValue(el.textContent)
     if (this.block.metadata && this.block.metadata.programmingLanguage) {
       this.mode = this.block.metadata.programmingLanguage
       if (this.selector) this.selector.value = this.block.metadata.programmingLanguage