diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index b15718483..7a2a4d908 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -56,6 +56,9 @@ class Blocks extends React.Component {
const workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
+ // Load the toolbox from the GUI (otherwise we get the scratch-blocks default toolbox)
+ this.workspace.updateToolbox(this.props.toolboxXML);
+
// @todo change this when blockly supports UI events
addFunctionListener(this.workspace, 'translate', this.onWorkspaceMetricsChange);
addFunctionListener(this.workspace, 'zoom', this.onWorkspaceMetricsChange);
diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index cbdbf771e..598cec673 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -71,6 +71,17 @@ const motion = `
+
+
+
+ 1
+
+
+
+
+
+
+
@@ -321,6 +332,20 @@ const pen = `
+
+
+
+ 10
+
+
+
+
+
+
+ 50
+
+
+
`;
@@ -620,12 +645,12 @@ const makeToolboxXML = function (categoriesXML) {
motion, gap,
looks, gap,
sound, gap,
- pen, gap,
- data, gap,
events, gap,
control, gap,
sensing, gap,
- operators
+ pen, gap,
+ operators, gap,
+ data
];
if (categoriesXML) {