diff --git a/demos/blockfactory/factory_utils.js b/demos/blockfactory/factory_utils.js
index c5dc38982..1792630d9 100644
--- a/demos/blockfactory/factory_utils.js
+++ b/demos/blockfactory/factory_utils.js
@@ -867,7 +867,7 @@ FactoryUtils.defineAndGetBlockTypes = function(blockDefsString, format) {
 FactoryUtils.injectCode = function(code, id) {
   var pre = document.getElementById(id);
   pre.textContent = code;
-  code = pre.innerHTML;
+  code = pre.textContent;
   code = prettyPrintOne(code, 'js');
   pre.innerHTML = code;
 };
diff --git a/demos/blockfactory/workspacefactory/wfactory_init.js b/demos/blockfactory/workspacefactory/wfactory_init.js
index 49a78fe94..e84ddebe0 100644
--- a/demos/blockfactory/workspacefactory/wfactory_init.js
+++ b/demos/blockfactory/workspacefactory/wfactory_init.js
@@ -63,29 +63,21 @@ WorkspaceFactoryInit.initWorkspaceFactory = function(controller) {
  * @private
  */
 WorkspaceFactoryInit.initColorPicker_ = function(controller) {
-  // Array of Blockly category colors, variety of hues with saturation 45%
-  // and value 65% as specified in Blockly Developer documentation:
-  // developers.google.com/blockly/guides/create-custom-blocks/define-blocks
-  var colors = [
-    '#A6795C', '#A69F5C', '#88A65C', '#5EA65C', '#5CA67E', '#5CA6A4', '#5C83A6',
-        '#5E5CA6', '#835CA6', '#A65CA4', '#A65C7E', '#A65C5E',
-    '#A6725C', '#A6975C', '#90A65C', '#66A65C', '#5CA677', '#5CA69C', '#5C8BA6',
-        '#5C61A6', '#7C5CA6', '#A15CA6', '#A65C86', '#A65C61',
-    '#A66A5C', '#A6905C', '#97A65C', '#6FA65C', '#5CA66F', '#5CA695', '#5C92A6',
-        '#5C6AA6', '#745CA6', '#9A5CA6', '#A65C8D', '#A65C66',
-    '#A6635C', '#A6885C', '#9FA65C', '#79A65C', '#5CA668', '#5CA68D', '#5C9AA6',
-        '#5C74A6', '#6D5CA6', '#925CA6', '#A65C95', '#A65C6F',
-    '#A65C5C', '#A6815C', '#A6A65C', '#81A65C', '#5CA661', '#5CA686', '#5CA1A6',
-        '#5C7CA6', '#665CA6', '#8B5CA6', '#A65C9C', '#A65C77'
-  ];
+  // Array of Blockly category colours, consitent with the 15 degree default
+  // of the block factory's colour wheel.
+  var colours = [];
+  for (var hue = 0; hue < 360; hue += 15) {
+    colours.push(WorkspaceFactoryInit.hsvToHex_(hue,
+        Blockly.HSV_SATURATION, Blockly.HSV_VALUE));
+  }
 
-  // Create color picker with specific set of Blockly colors.
-  var colorPicker = new goog.ui.ColorPicker();
-  colorPicker.setSize(12);
-  colorPicker.setColors(colors);
+  // Create color picker with specific set of Blockly colours.
+  var colourPicker = new goog.ui.ColorPicker();
+  colourPicker.setSize(6);
+  colourPicker.setColors(colours);
 
-  // Create and render the popup color picker and attach to button.
-  var popupPicker = new goog.ui.PopupColorPicker(null, colorPicker);
+  // Create and render the popup colour picker and attach to button.
+  var popupPicker = new goog.ui.PopupColorPicker(null, colourPicker);
   popupPicker.render();
   popupPicker.attach(document.getElementById('dropdown_color'));
   popupPicker.setFocusable(true);
@@ -95,6 +87,70 @@ WorkspaceFactoryInit.initColorPicker_ = function(controller) {
   });
 };
 
+/**
+ * Converts from h,s,v values to a hex string
+ * @param {number} h Hue, in [0, 360].
+ * @param {number} s Saturation, in [0, 1].
+ * @param {number} v Value, in [0, 1].
+ * @return {string} hex representation of the color.
+ * @private
+ */
+WorkspaceFactoryInit.hsvToHex_ = function(h, s, v) {
+  var brightness = v * 255;
+  var red = 0;
+  var green = 0;
+  var blue = 0;
+  if (s == 0) {
+    red = brightness;
+    green = brightness;
+    blue = brightness;
+  } else {
+    var sextant = Math.floor(h / 60);
+    var remainder = (h / 60) - sextant;
+    var val1 = brightness * (1 - s);
+    var val2 = brightness * (1 - (s * remainder));
+    var val3 = brightness * (1 - (s * (1 - remainder)));
+    switch (sextant) {
+      case 1:
+        red = val2;
+        green = brightness;
+        blue = val1;
+        break;
+      case 2:
+        red = val1;
+        green = brightness;
+        blue = val3;
+        break;
+      case 3:
+        red = val1;
+        green = val2;
+        blue = brightness;
+        break;
+      case 4:
+        red = val3;
+        green = val1;
+        blue = brightness;
+        break;
+      case 5:
+        red = brightness;
+        green = val1;
+        blue = val2;
+        break;
+      case 6:
+      case 0:
+        red = brightness;
+        green = val3;
+        blue = val1;
+        break;
+    }
+  }
+
+  var hexR = ('0' + Math.floor(red).toString(16)).slice(-2);
+  var hexG = ('0' + Math.floor(green).toString(16)).slice(-2);
+  var hexB = ('0' + Math.floor(blue).toString(16)).slice(-2);
+  return '#' + hexR + hexG + hexB;
+};
+
 /**
  * Assign click handlers for workspace factory.
  * @param {!FactoryController} controller The controller for the workspace
diff --git a/demos/blockfactory_old/factory.js b/demos/blockfactory_old/factory.js
index 4af5ff28a..79df6f148 100644
--- a/demos/blockfactory_old/factory.js
+++ b/demos/blockfactory_old/factory.js
@@ -748,7 +748,7 @@ function updatePreview() {
 function injectCode(code, id) {
   var pre = document.getElementById(id);
   pre.textContent = code;
-  code = pre.innerHTML;
+  code = pre.textContent;
   code = prettyPrintOne(code, 'js');
   pre.innerHTML = code;
 }
diff --git a/demos/code/code.js b/demos/code/code.js
index 65a2621ff..a5774df43 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -314,7 +314,7 @@ Code.renderContent = function() {
     var code = Blockly.JavaScript.workspaceToCode(Code.workspace);
     content.textContent = code;
     if (typeof prettyPrintOne == 'function') {
-      code = content.innerHTML;
+      code = content.textContent;
       code = prettyPrintOne(code, 'js');
       content.innerHTML = code;
     }
@@ -322,7 +322,7 @@ Code.renderContent = function() {
     code = Blockly.Python.workspaceToCode(Code.workspace);
     content.textContent = code;
     if (typeof prettyPrintOne == 'function') {
-      code = content.innerHTML;
+      code = content.textContent;
       code = prettyPrintOne(code, 'py');
       content.innerHTML = code;
     }
@@ -330,7 +330,7 @@ Code.renderContent = function() {
     code = Blockly.PHP.workspaceToCode(Code.workspace);
     content.textContent = code;
     if (typeof prettyPrintOne == 'function') {
-      code = content.innerHTML;
+      code = content.textContent;
       code = prettyPrintOne(code, 'php');
       content.innerHTML = code;
     }
@@ -338,7 +338,7 @@ Code.renderContent = function() {
     code = Blockly.Dart.workspaceToCode(Code.workspace);
     content.textContent = code;
     if (typeof prettyPrintOne == 'function') {
-      code = content.innerHTML;
+      code = content.textContent;
       code = prettyPrintOne(code, 'dart');
       content.innerHTML = code;
     }
@@ -346,7 +346,7 @@ Code.renderContent = function() {
     code = Blockly.Lua.workspaceToCode(Code.workspace);
     content.textContent = code;
     if (typeof prettyPrintOne == 'function') {
-      code = content.innerHTML;
+      code = content.textContent;
       code = prettyPrintOne(code, 'lua');
       content.innerHTML = code;
     }
diff --git a/demos/maxBlocks/index.html b/demos/maxBlocks/index.html
index 841120121..17a967339 100644
--- a/demos/maxBlocks/index.html
+++ b/demos/maxBlocks/index.html
@@ -86,7 +86,7 @@
          toolbox: document.getElementById('toolbox')});
 
     function onchange(event) {
-      document.getElementById('capacity').innerHTML =
+      document.getElementById('capacity').textContent =
           workspace.remainingCapacity();
     }